Skip to content

Commit

Permalink
Merge pull request #27 from WildernessLabs/jorge-updates
Browse files Browse the repository at this point in the history
Project Updates
  • Loading branch information
jorgedevs authored Apr 30, 2024
2 parents 8d8b06e + cf2cba5 commit 679a356
Show file tree
Hide file tree
Showing 168 changed files with 3,754 additions and 523 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/meadow-samples-develop-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,13 @@ jobs:
path: Meadow.ProjectLab
ref: develop

- name: Checkout Meadow.GnssTracker
uses: actions/checkout@v3
with:
repository: WildernessLabs/GNSS_Sensor_Tracker
path: GNSS_Sensor_Tracker
ref: develop

- name: Checkout Meadow.Samples
uses: actions/checkout@v3
with:
Expand Down
Binary file added Design/wildernesslabs-gnss-tracker-bluetooth.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Design/wildernesslabs-gnss-tracker-wifi.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
52 changes: 46 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ Contents:
* IoT Accelerators
* [Project Lab](#project-lab)
* [Juego](#juego)
* [GNSS Sensor Tracker](#gnss-sensor-tracker)
* [Clima](https://github.com/WildernessLabs/Clima)
* [GNSS Sensor Tracker](https://github.com/WildernessLabs/GNSS_Sensor_Tracker)
* [Support](#support)

## Meadow.Desktop
Expand Down Expand Up @@ -149,6 +149,7 @@ Also check the pinout to make sure to connect the peripheral or sensor on the ri
* [Battery Level](./Source/Meadow%20F7/OS/BatteryLevel/)
* [Charge State](./Source/Meadow%20F7/OS/ChargeState/)
* [Config Files](./Source/Meadow%20F7/OS/ConfigFiles/)
* [Crash Detection](./Source/Meadow%20F7/OS/CrashDetect/)
* [File System Basics](./Source/Meadow%20F7/OS/FileSystem_Basics/)
* [Json Basics](./Source/Meadow%20F7/OS/Json_Basics/)
* [Logging](./Source/Meadow%20F7/OS/Logging)
Expand Down Expand Up @@ -480,14 +481,14 @@ Meadow.Cloud provides secure, Over-the-Air (OtA) updates, which enable you to pu
<a href="Source/Meadow.Cloud/FeatherF7_OTA/">Source Code</a>
</td>
<td>
<a href="Source/Meadow.Cloud/CloudLogging/"><img src="Design/wildernesslabs-meadow-cloud-log.jpg"/></a><br/>
<a href="Source/Meadow.Cloud/MeadowF7_Logging/"><img src="Design/wildernesslabs-meadow-cloud-log.jpg"/></a><br/>
Send diagnostics logs from Meadow to Meadow.Cloud</br>
<a href="Source/Meadow.Cloud/CloudLogging/">Source Code</a>
<a href="Source/Meadow.Cloud/MeadowF7_Logging/">Source Code</a>
</td>
<td>
<a href="Source/Meadow.Cloud/HealthMetricsMonitoring/"><img src="Design/wildernesslabs-meadow-cloud-health-metrics.jpg"/></a><br/>
<a href="Source/Meadow.Cloud/MeadowF7_HealthMetrics/"><img src="Design/wildernesslabs-meadow-cloud-health-metrics.jpg"/></a><br/>
Check your Meadow's Health Metrics on Meadow.Cloud</br>
<a href="Source/Meadow.Cloud/HealthMetricsMonitoring/">Source Code</a>
<a href="Source/Meadow.Cloud/MeadowF7_HealthMetrics/">Source Code</a>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -524,7 +525,7 @@ Meadow.Cloud provides secure, Over-the-Air (OtA) updates, which enable you to pu

## Azure

[![Meadow.SBCs.Samples](Design/wildernesslabs-meadow-azure-banner.jpg)](/Source/RaspberryPi/)
[![Meadow.SBCs.Samples](Design/wildernesslabs-meadow-azure-banner.jpg)](/Source/Azure/)

Meadow project samples using Microsoft Azure. Click on any of these sample project to learn how they work.

Expand Down Expand Up @@ -731,6 +732,45 @@ A collection of samples for the Wilderness Labs [Juego IoT Accelerator](https://

[Back to top](#meadowsamples)

## Gnss Sensor Tracker

[![Gnss Sensor Tracker](Design/wildernesslabs-meadow-gnss-sensor-tracker.jpg)](/Source/GnssTracker/)

Meadow project samples with a Gnss Sensor Tracker. Click on any of these sample project to learn how they work.

<table>
<tr>
<td>
<a href="https://github.com/WildernessLabs/GNSS_Sensor_Tracker/tree/main/Source/GnssTracker_Demo"><img src="Design/wildernesslabs-gnss-tracker-getting-started.png" /></a><br/>
Getting started with GNSS Tracker running a diagnostics app</br>
<a href="https://github.com/WildernessLabs/GNSS_Sensor_Tracker/tree/main/Source/GnssTracker_Demo">Source Code</a>
</td>
<td>
<a href="Source/GnssTracker/Connectivity/"><img src="Design/wildernesslabs-gnss-tracker-bluetooth.png"/></a><br/>
Control a GNSS Tracker over Bluetooth with a MAUI app<br/>
<a href="Source/GnssTracker/Connectivity/">Source Code</a>
</td>
<td>
<a href="Source/GnssTracker/Connectivity/"><img src="Design/wildernesslabs-gnss-tracker-wifi.png"/></a><br/>
Control a GNSS Tracker over WiFi with a MAUI app</br>
<a href="Source/GnssTracker/Connectivity/">Source Code</a>
</td>
</tr>
<tr>
<td>
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>
</td>
<td>
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>
</td>
<td>
<p>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>
</td>
</tr>
</table>

[Back to top](#meadowsamples)

## Support

Having trouble building/running these projects?
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
using Meadow;
using Meadow.Hardware;
using Meadow.Units;
using ProjectLab_AzureIoTHub.Controllers;
using ProjectLab_AzureIoTHub.Hardware;
using System;
using System.Threading;
using System.Threading.Tasks;

namespace ProjectLab_AzureIoTHub;
namespace ProjectLab_AzureIoTHub.Controllers;

internal class MainController
{
bool useMQTT = true;
bool useMQTT = false;

int TIMEZONE_OFFSET = -8; // UTC-8

Expand Down
1 change: 1 addition & 0 deletions Source/Azure/ProjectLab_AzureIoTHub/MeadowApp.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Meadow;
using Meadow.Devices;
using Meadow.Hardware;
using ProjectLab_AzureIoTHub.Controllers;
using ProjectLab_AzureIoTHub.Hardware;
using System.Threading.Tasks;

Expand Down
21 changes: 14 additions & 7 deletions Source/Azure/ProjectLab_AzureIoTHub/app.config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,20 @@
# To learn more about these config options, including custom application configuration settings, check out the Application Settings Configuration documentation.
# http://developer.wildernesslabs.co/Meadow/Meadow.OS/Configuration/Application_Settings_Configuration/

# App lifecycle configuration.
Lifecycle:
# Control whether Meadow will restart when an unhandled app exception occurs. Combine with Lifecycle > AppFailureRestartDelaySeconds to control restart timing.
RestartOnAppFailure: false
# # When app set to restart automatically on app failure,
#AppFailureRestartDelaySeconds: 15

# Control whether Meadow will restart when an unhandled app exception occurs. Combine with Lifecycle > AppFailureRestartDelaySeconds to control restart timing.
RestartOnAppFailure: false

# Adjust the level of logging detail.
# When app set to restart automatically on app failure,
# AppFailureRestartDelaySeconds: 15

# Logging configuration.
Logging:
LogLevel:
Default: Trace

# Adjust the level of logging detail.
LogLevel:

# Trace, Debug, Information, Warning, or Error
Default: Trace
12 changes: 8 additions & 4 deletions Source/Azure/ProjectLab_AzureIoTHub/wifi.config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
# To learn more about these config options, including custom application configuration settings, check out the Application Settings Configuration documentation.
# http://developer.wildernesslabs.co/Meadow/Meadow.OS/Configuration/WiFi_Configuration/

# # To enable automatically connecting to a default network, make sure to enable the Coprocessor > AutomaticallyStartNetwork value in meadow.config.yaml.
#Credentials:
Ssid: YourSSID
Password: SSIDPassword
# WiFi network credentials
Credentials:

# WiFi SSID
Ssid: YourSSID

# WiFi Password
Password: SSIDPassword
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
namespace GnssTrackerConnectivity.Common.Bluetooth;

public static class CharacteristicsConstants
{
public const string LED_PAIRING = "19933423-6f14-41c0-bb03-637b2e6ef6b0";
public const string LED_TOGGLE = "2eb9edce-d7c4-4079-b3d3-5becfcf0c49d";
public const string LED_BLINK = "7cb9817d-6754-46e7-be72-d5790eaf678b";
public const string LED_PULSE = "23d3bd90-5966-4eff-9ac7-b6cafe9c182a";
public const string ATMOSPHERIC_DATA = "8787e846-51e5-4d9b-87aa-eaf4a8f0056f";
public const string MOTION_DATA = "29171115-4bbe-4ac1-a0b0-257b54bcc464";
public const string VOLTAGE_DATA = "8468a412-99ae-457c-b2fd-2085ab9aac37";
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
namespace GnssTrackerConnectivity.Common.Models;

public class AtmosphericReadingsDTO
{
public string? Temperature { get; set; }

public string? Pressure { get; set; }

public string? Humidity { get; set; }

public string? GasResistance { get; set; }

public string? Co2Concentration { get; set; }
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
namespace GnssTrackerConnectivity.Common.Models;

public class MotionReadingsDTO
{
public string Acceleration3dX { get; set; }
public string Acceleration3dY { get; set; }
public string Acceleration3dZ { get; set; }

public string AngularVelocity3dX { get; set; }
public string AngularVelocity3dY { get; set; }
public string AngularVelocity3dZ { get; set; }
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace GnssTrackerConnectivity.Common.Models;

public class VoltageReadingsDTO
{
public string? BatteryVoltage { get; set; }

public string? SolarVoltage { get; set; }
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
<HasSharedItems>true</HasSharedItems>
<SharedGUID>b37359b9-3d61-42bd-b485-fc76275f0585</SharedGUID>
</PropertyGroup>
<PropertyGroup Label="Configuration">
<Import_RootNamespace>GnssTrackerConnectivity.Common</Import_RootNamespace>
</PropertyGroup>
<ItemGroup>
<Folder Include="$(MSBuildThisFileDirectory)Bluetooth\" />
<Folder Include="$(MSBuildThisFileDirectory)DTOs\" />
</ItemGroup>
<ItemGroup>
<Compile Include="$(MSBuildThisFileDirectory)bluetooth\BluetoothConstants.cs" />
<Compile Include="$(MSBuildThisFileDirectory)DTOs\AtmosphericReadingsDTO.cs" />
<Compile Include="$(MSBuildThisFileDirectory)DTOs\MotionReadingsDTO.cs" />
<Compile Include="$(MSBuildThisFileDirectory)dtos\VoltageReadingsDTO.cs" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Globals">
<ProjectGuid>b37359b9-3d61-42bd-b485-fc76275f0585</ProjectGuid>
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
<PropertyGroup />
<Import Project="GnssTrackerConnectivity.Common.projitems" Label="Shared" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
namespace GnssTrackerConnectivity;

public enum ConnectionType
{
WiFi,
Bluetooth
}
Loading

0 comments on commit 679a356

Please sign in to comment.