A little Bme68x cleanup

WildernessLabs · Jan 2, 2022 · bd3b0b1 · bd3b0b1
1 parent a9b4b2e
commit bd3b0b1
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 17 deletions.
diff --git a/....Bme680/Sensors.Atmospheric.Bme680.csproj → ....Bme680/Sensors.Atmospheric.Bme68x.csproj b/....Bme680/Sensors.Atmospheric.Bme680.csproj → ....Bme680/Sensors.Atmospheric.Bme68x.csproj
@@ -4,21 +4,18 @@
     <Authors>Wilderness Labs, Inc</Authors>
     <TargetFramework>netstandard2.1</TargetFramework>
     <OutputType>Library</OutputType>
-    <AssemblyName>Bme680</AssemblyName>
+    <AssemblyName>Bme68x</AssemblyName>
     <Company>Wilderness Labs, Inc</Company>
     <PackageProjectUrl>http://developer.wildernesslabs.co/Meadow/Meadow.Foundation/</PackageProjectUrl>
-    <PackageId>Meadow.Foundation.Sensors.Atmospheric.Bme680</PackageId>
+    <PackageId>Meadow.Foundation.Sensors.Atmospheric.Bme68x</PackageId>
     <RepositoryUrl>https://github.com/WildernessLabs/Meadow.Foundation</RepositoryUrl>
-    <PackageTags>Meadow.Foundation, Atmospheric, BME680</PackageTags>
+    <PackageTags>Meadow.Foundation, Atmospheric, BME680, BME688</PackageTags>
     <Version>0.0.36</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Description>Bosch BME680 I2C humidity, barometric pressure, ambient temperature and gas (VOC) sensor</Description>
+    <Description>Bosch BME68x I2C and SPI humidity, barometric pressure, ambient temperature and gas (VOC) sensor</Description>
     <Nullable>enable</Nullable>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <LangVersion>8.0</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup>
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <ItemGroup>

diff --git a/...ndation.Peripherals/Sensors.Atmospheric.Bme680/Samples/Bme680_Sample/Bme680_Sample.csproj b/...ndation.Peripherals/Sensors.Atmospheric.Bme680/Samples/Bme680_Sample/Bme680_Sample.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Meadow.Sdk/1.1.0">
+<Project Sdk="Meadow.Sdk/1.1.0">
   <PropertyGroup>
     <RepositoryUrl>https://github.com/WildernessLabs/Meadow.Foundation</RepositoryUrl>
     <Company>Wilderness Labs, Inc</Company>
@@ -9,14 +9,11 @@
     <AssemblyName>App</AssemblyName>
     <Nullable>enable</Nullable>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <LangVersion>8.0</LangVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+  <PropertyGroup>
     <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\..\..\Meadow.Core\Source\Meadow.F7\Meadow.F7.csproj" />
-    <ProjectReference Include="..\..\Driver\Sensors.Atmospheric.BME680\Sensors.Atmospheric.Bme680.csproj" />
+    <ProjectReference Include="..\..\Driver\Sensors.Atmospheric.Bme680\Sensors.Atmospheric.Bme68x.csproj" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/...adow.Foundation.Peripherals/Sensors.Atmospheric.Bme680/Samples/Bme680_Sample/MeadowApp.cs b/...adow.Foundation.Peripherals/Sensors.Atmospheric.Bme680/Samples/Bme680_Sample/MeadowApp.cs
@@ -83,7 +83,7 @@ async Task ReadConditions()
             var conditions = await sensor.Read();
             Console.WriteLine("Initial Readings:");
             Console.WriteLine($"  Temperature: {conditions.Temperature?.Celsius:N2}C");
-            Console.WriteLine($"  Pressure: {conditions.Pressure?.Bar:N2}hPa");
+            Console.WriteLine($"  Pressure: {conditions.Pressure?.Hectopascal:N2}hPa");
             Console.WriteLine($"  Relative Humidity: {conditions.Humidity?.Percent:N2}%");
         }
 

diff --git a/Source/Meadow.Foundation.sln b/Source/Meadow.Foundation.sln
@@ -730,7 +730,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sensors.Atmospheric.Bme680"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{01926B24-03D6-4ACC-ABB7-FF90E5861557}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sensors.Atmospheric.Bme680", "Meadow.Foundation.Peripherals\Sensors.Atmospheric.Bme680\Driver\Sensors.Atmospheric.Bme680\Sensors.Atmospheric.Bme680.csproj", "{12449481-3CDD-446F-8968-5816E65F62F6}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sensors.Atmospheric.Bme68x", "Meadow.Foundation.Peripherals\Sensors.Atmospheric.Bme680\Driver\Sensors.Atmospheric.Bme680\Sensors.Atmospheric.Bme68x.csproj", "{12449481-3CDD-446F-8968-5816E65F62F6}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bme680_Sample", "Meadow.Foundation.Peripherals\Sensors.Atmospheric.Bme680\Samples\Bme680_Sample\Bme680_Sample.csproj", "{0C1F063F-1C44-450D-90FC-A9A95AA03B97}"
 EndProject