Skip to content
This repository has been archived by the owner on Jan 30, 2019. It is now read-only.

Gpio one wire merge #544

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
15 changes: 12 additions & 3 deletions GpioOneWire/MainPage.xaml.h → GpioOneWire/CPP/MainPage.xaml.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,24 @@ namespace GpioOneWire

double Humidity ( ) const
{
//Humidity Bytes are bits 1 & 2 out of 5
//Byte 1 is integer Humidity - bit 2 is decimal humidity
//Byte 2 is always 00000000 for a DHT 11 - the DHT22 does decimal points
unsigned long long value = this->bits.to_ullong();
return ((value >> 24) & 0xffff) * 0.1;
double humidity = ((value >> 24) & 0xFF) * 0.1; //Decode the Decimal into Humidity
humidity = humidity + ((value >> 32) & 0xFF);// And add on the integer part of humidity
return humidity;
}

double Temperature ( ) const
{
//Temp Bytes are bits 3 & 4 out of 5
//Byte 3 is inteteger temp - bit 4 is decimal temp
//Byte 4 is always 00000000 for a DHT 11 - the DHT22 does decimal points
unsigned long long value = this->bits.to_ullong();
double temp = ((value >> 8) & 0x7FFF) * 0.1;
if ((value >> 8) & 0x8000)
double temp = ((value >> 8) & 0xFF) * 0.1; //Decode the Decimal into Temp
temp = temp + ((value >> 16) & 0x7F);// And add on the integer part of temp
if ((value >> 8) & 0x8000) // if the MSB of temp is 1 then its negative
temp = -temp;
return temp;
}
Expand Down
File renamed without changes.
File renamed without changes.
8 changes: 8 additions & 0 deletions GpioOneWire/CS/App.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<Application
x:Class="GpioOneWire.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:GpioOneWire"
RequestedTheme="Light">

</Application>
100 changes: 100 additions & 0 deletions GpioOneWire/CS/App.xaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Runtime.InteropServices.WindowsRuntime;
using Windows.ApplicationModel;
using Windows.ApplicationModel.Activation;
using Windows.Foundation;
using Windows.Foundation.Collections;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
using Windows.UI.Xaml.Controls.Primitives;
using Windows.UI.Xaml.Data;
using Windows.UI.Xaml.Input;
using Windows.UI.Xaml.Media;
using Windows.UI.Xaml.Navigation;

namespace GpioOneWire
{
/// <summary>
/// Provides application-specific behavior to supplement the default Application class.
/// </summary>
sealed partial class App : Application
{
/// <summary>
/// Initializes the singleton application object. This is the first line of authored code
/// executed, and as such is the logical equivalent of main() or WinMain().
/// </summary>
public App()
{
this.InitializeComponent();
this.Suspending += OnSuspending;
}

/// <summary>
/// Invoked when the application is launched normally by the end user. Other entry points
/// will be used such as when the application is launched to open a specific file.
/// </summary>
/// <param name="e">Details about the launch request and process.</param>
protected override void OnLaunched(LaunchActivatedEventArgs e)
{
Frame rootFrame = Window.Current.Content as Frame;

// Do not repeat app initialization when the Window already has content,
// just ensure that the window is active
if (rootFrame == null)
{
// Create a Frame to act as the navigation context and navigate to the first page
rootFrame = new Frame();

rootFrame.NavigationFailed += OnNavigationFailed;

if (e.PreviousExecutionState == ApplicationExecutionState.Terminated)
{
//TODO: Load state from previously suspended application
}

// Place the frame in the current Window
Window.Current.Content = rootFrame;
}

if (e.PrelaunchActivated == false)
{
if (rootFrame.Content == null)
{
// When the navigation stack isn't restored navigate to the first page,
// configuring the new page by passing required information as a navigation
// parameter
rootFrame.Navigate(typeof(MainPage), e.Arguments);
}
// Ensure the current window is active
Window.Current.Activate();
}
}

/// <summary>
/// Invoked when Navigation to a certain page fails
/// </summary>
/// <param name="sender">The Frame which failed navigation</param>
/// <param name="e">Details about the navigation failure</param>
void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
{
throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
}

/// <summary>
/// Invoked when application execution is being suspended. Application state is saved
/// without knowing whether the application will be terminated or resumed with the contents
/// of memory still intact.
/// </summary>
/// <param name="sender">The source of the suspend request.</param>
/// <param name="e">Details about the suspend request.</param>
private void OnSuspending(object sender, SuspendingEventArgs e)
{
var deferral = e.SuspendingOperation.GetDeferral();
//TODO: Save application state and stop any background activity
deferral.Complete();
}
}
}
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 GpioOneWire/CS/Assets/SplashScreen.scale-200.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.
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 GpioOneWire/CS/Assets/StoreLogo.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.
69 changes: 69 additions & 0 deletions GpioOneWire/CS/DhtSensorReading.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;

namespace GpioOneWire
{
public class DhtSensorReading
{
public BitArray Bits { get; } = new BitArray(40, false);

public bool IsValid()
{
ulong value = GetBitsValue();

ulong checksum =
((value >> 32) & 0xff) +
((value >> 24) & 0xff) +
((value >> 16) & 0xff) +
((value >> 8) & 0xff);

return (checksum & 0xff) == (value & 0xff);
}

public double Humidity()
{
//Humidity Bytes are bits 1 & 2 out of 5
//Byte 1 is integer Humidity - bit 2 is decimal humidity
//Byte 2 is always 00000000 for a DHT 11 - the DHT22 does decimal points
ulong value = GetBitsValue();
double humidity = ((value >> 24) & 0xFF) * 0.1; //Decode the Decimal into Humidity
humidity = humidity + ((value >> 32) & 0xFF);// And add on the integer part of humidity
return humidity;
}

public double Temperature()
{
//Temp Bytes are bits 3 & 4 out of 5
//Byte 3 is integer temp - bit 4 is decimal temp
//Byte 4 is always 00000000 for a DHT 11 - the DHT22 does decimal points
ulong value = GetBitsValue();
double temp = ((value >> 8) & 0xFF) * 0.1; //Decode the Decimal into Temp
temp = temp + ((value >> 16) & 0x7F);// And add on the integer part of temp
if ((value >> 8) & 0x8000) // if the MSB of temp is 1 then its negative
temp = -temp;
return temp;
}

private ulong GetBitsValue()
{
ulong value = 0;
ulong mask = 1;

for (int i = 0; i < Bits.Length; i++)
{
if (Bits[i])
{
value ^= mask;
}

mask <<= 1;
}

return value;
}
};
}
146 changes: 146 additions & 0 deletions GpioOneWire/CS/GpioOneWire.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProjectGuid>{FAA91481-2C5F-4985-BD5B-463EAF46F313}</ProjectGuid>
<OutputType>AppContainerExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>GpioOneWire</RootNamespace>
<AssemblyName>GpioOneWire</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
<TargetPlatformVersion Condition=" '$(TargetPlatformVersion)' == '' ">10.0.15063.0</TargetPlatformVersion>
<TargetPlatformMinVersion>10.0.15063.0</TargetPlatformMinVersion>
<MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WindowsXamlEnableOverview>true</WindowsXamlEnableOverview>
<PackageCertificateKeyFile>GpioOneWire_TemporaryKey.pfx</PackageCertificateKeyFile>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<NoWarn>;2008</NoWarn>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<Optimize>true</Optimize>
<NoWarn>;2008</NoWarn>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\ARM\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<NoWarn>;2008</NoWarn>
<DebugType>full</DebugType>
<PlatformTarget>ARM</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
<OutputPath>bin\ARM\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<Optimize>true</Optimize>
<NoWarn>;2008</NoWarn>
<DebugType>pdbonly</DebugType>
<PlatformTarget>ARM</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<NoWarn>;2008</NoWarn>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
<Optimize>true</Optimize>
<NoWarn>;2008</NoWarn>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<UseVSHostingProcess>false</UseVSHostingProcess>
<ErrorReport>prompt</ErrorReport>
<Prefer32Bit>true</Prefer32Bit>
<UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
</PropertyGroup>
<PropertyGroup>
<RestoreProjectStyle>PackageReference</RestoreProjectStyle>
</PropertyGroup>
<ItemGroup>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
</Compile>
<Compile Include="DhtSensorReading.cs" />
<Compile Include="MainPage.xaml.cs">
<DependentUpon>MainPage.xaml</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<AppxManifest Include="Package.appxmanifest">
<SubType>Designer</SubType>
</AppxManifest>
<None Include="GpioOneWire_TemporaryKey.pfx" />
</ItemGroup>
<ItemGroup>
<Content Include="Properties\Default.rd.xml" />
<Content Include="Assets\LockScreenLogo.scale-200.png" />
<Content Include="Assets\SplashScreen.scale-200.png" />
<Content Include="Assets\Square150x150Logo.scale-200.png" />
<Content Include="Assets\Square44x44Logo.scale-200.png" />
<Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
<Content Include="Assets\StoreLogo.png" />
<Content Include="Assets\Wide310x150Logo.scale-200.png" />
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="App.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Page Include="MainPage.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>5.3.3</Version>
</PackageReference>
</ItemGroup>
<PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
<VisualStudioVersion>14.0</VisualStudioVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
40 changes: 40 additions & 0 deletions GpioOneWire/CS/GpioOneWire.sln
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26430.14
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GpioOneWire", "GpioOneWire.csproj", "{FAA91481-2C5F-4985-BD5B-463EAF46F313}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|ARM = Debug|ARM
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|ARM = Release|ARM
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{FAA91481-2C5F-4985-BD5B-463EAF46F313}.Debug|ARM.ActiveCfg = Debug|ARM
{FAA91481-2C5F-4985-BD5B-463EAF46F313}.Debug|ARM.Build.0 = Debug|ARM
{FAA91481-2C5F-4985-BD5B-463EAF46F313}.Debug|ARM.Deploy.0 = Debug|ARM
{FAA91481-2C5F-4985-BD5B-463EAF46F313}.Debug|x64.ActiveCfg = Debug|x64
{FAA91481-2C5F-4985-BD5B-463EAF46F313}.Debug|x64.Build.0 = Debug|x64
{FAA91481-2C5F-4985-BD5B-463EAF46F313}.Debug|x64.Deploy.0 = Debug|x64
{FAA91481-2C5F-4985-BD5B-463EAF46F313}.Debug|x86.ActiveCfg = Debug|x86
{FAA91481-2C5F-4985-BD5B-463EAF46F313}.Debug|x86.Build.0 = Debug|x86
{FAA91481-2C5F-4985-BD5B-463EAF46F313}.Debug|x86.Deploy.0 = Debug|x86
{FAA91481-2C5F-4985-BD5B-463EAF46F313}.Release|ARM.ActiveCfg = Release|ARM
{FAA91481-2C5F-4985-BD5B-463EAF46F313}.Release|ARM.Build.0 = Release|ARM
{FAA91481-2C5F-4985-BD5B-463EAF46F313}.Release|ARM.Deploy.0 = Release|ARM
{FAA91481-2C5F-4985-BD5B-463EAF46F313}.Release|x64.ActiveCfg = Release|x64
{FAA91481-2C5F-4985-BD5B-463EAF46F313}.Release|x64.Build.0 = Release|x64
{FAA91481-2C5F-4985-BD5B-463EAF46F313}.Release|x64.Deploy.0 = Release|x64
{FAA91481-2C5F-4985-BD5B-463EAF46F313}.Release|x86.ActiveCfg = Release|x86
{FAA91481-2C5F-4985-BD5B-463EAF46F313}.Release|x86.Build.0 = Release|x86
{FAA91481-2C5F-4985-BD5B-463EAF46F313}.Release|x86.Deploy.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal
Binary file added GpioOneWire/CS/GpioOneWire_TemporaryKey.pfx
Binary file not shown.
Loading