Skip to content

Commit

Permalink
Merge branch 'main' into v1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
adrianstevens authored Aug 29, 2023
2 parents 4d054e0 + 85cb60d commit d6b6c25
Show file tree
Hide file tree
Showing 9 changed files with 818 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/nuget.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ jobs:
- name: Set VERSION variable from tag
run: echo "VERSION=${GITHUB_REF/refs\/tags\/v/}" >> $GITHUB_ENV
- name: Build
run: dotnet build -c Release ./Source/Clima/Meadow.Clima.csproj /p:Version=${VERSION}
run: dotnet build -c Release ./Source/Clima/Meadow.Clima/Meadow.Clima.csproj /p:Version=${VERSION}
- name: Pack
run: dotnet pack -c Release ./Source/Clima/Meadow.Clima.csproj /p:Version=${VERSION} --output .
run: dotnet pack -c Release ./Source/Clima/Meadow.Clima/Meadow.Clima.csproj /p:Version=${VERSION} --output .
- name: Push
run: dotnet nuget push Meadow.Clima.${VERSION}.nupkg -s https://api.nuget.org/v3/index.json -k ${NUGET_TOKEN}
env:
Expand Down
746 changes: 746 additions & 0 deletions Hardware_Design/v3.d/EasyEDA_Source.json

Large diffs are not rendered by default.

File renamed without changes.
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ We made an important change to the clima board to handle solar charging better.

![](/Image_Assets/Clima_w_new_Solar_Circuit.jpg)

If your Clima has the updated solar charging circuit, you're good to go! If you haven't received one it, it's on the way.
If your Clima has the updated solar charging circuit, you're good to go!

Check out the [Core-Compute Addon Modules](https://github.com/WildernessLabs/Hardware_Addon_Modules) if you want to dive into the new solar charging circuit design.

Expand Down Expand Up @@ -84,7 +84,6 @@ Instructions for assembly can be found [here](/Docs/Clima.Pro/Assembly_Instructi

## Known Issues

* **Battery Power** - The Meadow.OS Power and Sleep APIs haven't been released yet, so Clima can't go to sleep to conserve power. For that reason, it'll need to be plugged into USB. We're hoping to have the first sleep APIs available in b6.4.
* **Low-Power Raingauge** - The raingauge sensor is hooked to `D15`, which is a low-power counting timer, capable of counting pulses even when the Meadow is in low-power mode. This enables the rain gauge to collect data even while Clima is asleep. However, we haven't exposed that functionality via Meadow.Core yet.

# Clima.HackKit
Expand Down
40 changes: 40 additions & 0 deletions Source/Clima/Meadow.Clima/Clima.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<Project Sdk="Meadow.Sdk/1.1.0">
<PropertyGroup>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<PackageIcon>icon.png</PackageIcon>
<Authors>Wilderness Labs, Inc</Authors>
<TargetFramework>netstandard2.1</TargetFramework>
<OutputType>Library</OutputType>
<AssemblyName>Clima</AssemblyName>
<Company>Wilderness Labs, Inc</Company>
<PackageProjectUrl>https://github.com/WildernessLabs/Clima</PackageProjectUrl>
<PackageId>Meadow.Clima</PackageId>
<RepositoryUrl>https://github.com/WildernessLabs/Clima</RepositoryUrl>
<PackageTags>Meadow.Clima,Meadow,Clima,atmospheric,environmental,sensors,accelerator</PackageTags>
<Version>0.1.0</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Description>Library for the Meadow Clima IoT accelerator</Description>
<Nullable>enable</Nullable>
</PropertyGroup>
<PropertyGroup>
<LangVersion>10.0</LangVersion>
</PropertyGroup>

<ItemGroup>
<None Include="icon.png" Pack="true" PackagePath="" />
</ItemGroup>

<ItemGroup>
<None Include="icon.png" Pack="true" PackagePath="" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Meadow.F7" Version="*" />
<PackageReference Include="Meadow.Foundation.ICs.IOExpanders.Mcp23xxx" Version="*" />
<PackageReference Include="Meadow.Foundation.Sensors.Atmospheric.Bme68x" Version="*" />
<PackageReference Include="Meadow.Foundation.Sensors.Environmental.Scd4x" Version="*" />
<PackageReference Include="Meadow.Foundation.Sensors.Gnss.NeoM8" Version="*" />
<PackageReference Include="Meadow.Foundation.Sensors.Weather.SwitchingAnemometer" Version="*" />
<PackageReference Include="Meadow.Foundation.Sensors.Weather.SwitchingRainGauge" Version="*" />
<PackageReference Include="Meadow.Foundation.Sensors.Weather.WindVane" Version="*" />
</ItemGroup>
</Project>
29 changes: 29 additions & 0 deletions Source/Clima/MeadowClimaProKit/Meadow.Clima.ProKit.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<Project Sdk="Meadow.Sdk/1.1.0">
<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<OutputType>Library</OutputType>
<AssemblyName>App</AssemblyName>
<Nullable>enable</Nullable>
</PropertyGroup>
<PropertyGroup>
<LangVersion>9.0</LangVersion>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\Maple\Source\Web.Maple.MapleServer\Driver\Web.Maple.MapleServer.csproj" />
<PackageReference Include="Meadow.F7" Version="*" />
<PackageReference Include="Meadow.Foundation" Version="*" />
<PackageReference Include="Meadow.Foundation.Sensors.Atmospheric.Bme68x" Version="*" />
<PackageReference Include="Meadow.Foundation.Sensors.Weather.SwitchingAnemometer" Version="*" />
<PackageReference Include="Meadow.Foundation.Sensors.Weather.SwitchingRainGauge" Version="*" />
<PackageReference Include="Meadow.Foundation.Sensors.Weather.WindVane" Version="*" />
<PackageReference Include="sqlite-net-static" Version="1.*" />
<PackageReference Include="System.Text.Json" Version="*" />
</ItemGroup>
<ItemGroup>
<None Update="meadow.config.yaml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
<Import Project="..\CommonContracts\CommonContracts.projitems" Label="Shared" />
</Project>

0 comments on commit d6b6c25

Please sign in to comment.