Merge pull request #5 from Keboo/v3-bundles

Add Support for firmware v3 app installation, app messaging, and bundle processing. PR #5. Should resolve issues #2 and #4 .
Keboo · Feb 20, 2016 · bb6a7f6 · bb6a7f6
2 parents c3e7200 + a925d86
commit bb6a7f6
Show file tree

Hide file tree

Showing 55 changed files with 2,333 additions and 750 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,34 +1,243 @@
-/PebbleSharp.Core/bin
-/PebbleSharp.Core/obj
-/PebbleSharp.Core.Tests/bin
-/PebbleSharp.Core.Tests/obj
-/PebbleSharp.Net45/bin
-/PebbleSharp.Net45/obj
-/PebbleSharp.Net45.Tests/bin/Debug
-/PebbleSharp.WinRT/bin/Debug
-/PebbleSharp.WinRT/obj/Debug
-/PebbleSharp.Net45.Tests/obj/Debug
-/PebbleSharp.Mobile/PebbleSharp.Mobile.WinPhone
-/PebbleSharp.Mobile/PebbleSharp.Mobile.iOS
-/PebbleSharp.Mobile/PebbleSharp.Mobile.Android/obj/Debug
-/Demo/PebbleSharp.WPF
-/PebbleSharp.Driod/obj/Debug
-/PebbleSharp.iOS/obj/Debug
-/PebbleSharp.Mobile/PebbleSharp.Mobile
-/PebbleSharp.sln.DotSettings.user
-/PebbleSharp.v12.suo
-/PebbleSharp.Universal/PebbleSharp.Universal.Windows/bin
-/PebbleSharp.Universal/PebbleSharp.Universal.Windows/obj
-/PebbleSharp.Universal/PebbleSharp.Universal.WindowsPhone/bin
-/PebbleSharp.Universal/PebbleSharp.Universal.WindowsPhone/obj
-/PebbleSharp.WinRT.Tests/bin
-/PebbleSharp.WinRT.Tests/obj
-/PebbleSharp.Universal/PebbleSharp.Universal.WindowsPhone/PebbleSharp.Universal.WindowsPhone.csproj.user
-/Demo/PebbleSharp.Universal/PebbleSharp.Universal.Windows/bin
-/Demo/PebbleSharp.Universal/PebbleSharp.Universal.Windows/obj
-/Demo/PebbleSharp.Universal/PebbleSharp.Universal.WindowsPhone/bin
-/Demo/PebbleSharp.Universal/PebbleSharp.Universal.WindowsPhone/obj
-/Demo/PebbleSharp.Universal/PebbleSharp.Universal.WindowsPhone/PebbleSharp.Universal.WindowsPhone.csproj.user
-/PebbleCmd/bin/Debug
-/PebbleCmd/obj/Debug
-/PebbleSharp.Core.Tests/PebbleSharp.Core.Tests.csproj.user
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+
+# User-specific files (MonoDevelop/Xamarin Studio)
+*.userprefs
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+bld/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+
+# Visual Studio 2015 cache/options directory
+.vs/
+# Uncomment if you have tasks that create the project's static files in wwwroot
+#wwwroot/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+# NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# Build Results of an ATL Project
+[Dd]ebugPS/
+[Rr]eleasePS/
+dlldata.c
+
+# DNX
+project.lock.json
+artifacts/
+
+*_i.c
+*_p.c
+*_i.h
+*.ilk
+*.meta
+*.obj
+*.pch
+*.pdb
+*.pgc
+*.pgd
+*.rsp
+*.sbr
+*.tlb
+*.tli
+*.tlh
+*.tmp
+*.tmp_proj
+*.log
+*.vspscc
+*.vssscc
+.builds
+*.pidb
+*.svclog
+*.scc
+
+# Chutzpah Test files
+_Chutzpah*
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opendb
+*.opensdf
+*.sdf
+*.cachefile
+
+# Visual Studio profiler
+*.psess
+*.vsp
+*.vspx
+*.sap
+
+# TFS 2012 Local Workspace
+$tf/
+
+# Guidance Automation Toolkit
+*.gpState
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+# JustCode is a .NET coding add-in
+.JustCode
+
+# TeamCity is a build add-in
+_TeamCity*
+
+# DotCover is a Code Coverage Tool
+*.dotCover
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+nCrunchTemp_*
+
+# MightyMoose
+*.mm.*
+AutoTest.Net/
+
+# Web workbench (sass)
+.sass-cache/
+
+# Installshield output folder
+[Ee]xpress/
+
+# DocProject is a documentation generator add-in
+DocProject/buildhelp/
+DocProject/Help/*.HxT
+DocProject/Help/*.HxC
+DocProject/Help/*.hhc
+DocProject/Help/*.hhk
+DocProject/Help/*.hhp
+DocProject/Help/Html2
+DocProject/Help/html
+
+# Click-Once directory
+publish/
+
+# Publish Web Output
+*.[Pp]ublish.xml
+*.azurePubxml
+# TODO: Comment the next line if you want to checkin your web deploy settings 
+# but database connection strings (with potential passwords) will be unencrypted
+*.pubxml
+*.publishproj
+
+# NuGet Packages
+*.nupkg
+# The packages folder can be ignored because of Package Restore
+**/packages/*
+# except build/, which is used as an MSBuild target.
+!**/packages/build/
+# Uncomment if necessary however generally it will be regenerated when needed
+#!**/packages/repositories.config
+# NuGet v3's project.json files produces more ignoreable files
+*.nuget.props
+*.nuget.targets
+
+# Microsoft Azure Build Output
+csx/
+*.build.csdef
+
+# Microsoft Azure Emulator
+ecf/
+rcf/
+
+# Microsoft Azure ApplicationInsights config file
+ApplicationInsights.config
+
+# Windows Store app package directories and files
+AppPackages/
+BundleArtifacts/
+Package.StoreAssociation.xml
+_pkginfo.txt
+
+# Visual Studio cache files
+# files ending in .cache can be ignored
+*.[Cc]ache
+# but keep track of directories ending in .cache
+!*.[Cc]ache/
+
+# Others
+ClientBin/
+~$*
+*~
+*.dbmdl
+*.dbproj.schemaview
+*.pfx
+*.publishsettings
+node_modules/
+orleans.codegen.cs
+
+# RIA/Silverlight projects
+Generated_Code/
+
+# Backup & report files from converting an old project file
+# to a newer Visual Studio version. Backup files are not needed,
+# because we have git ;-)
+_UpgradeReport_Files/
+Backup*/
+UpgradeLog*.XML
+UpgradeLog*.htm
+
+# SQL Server files
+*.mdf
+*.ldf
+
+# Business Intelligence projects
+*.rdl.data
+*.bim.layout
+*.bim_*.settings
+
+# Microsoft Fakes
+FakesAssemblies/
+
+# GhostDoc plugin setting file
+*.GhostDoc.xml
+
+# Node.js Tools for Visual Studio
+.ntvs_analysis.dat
+
+# Visual Studio 6 build log
+*.plg
+
+# Visual Studio 6 workspace options file
+*.opt
+
+# Visual Studio LightSwitch build output
+**/*.HTMLClient/GeneratedArtifacts
+**/*.DesktopClient/GeneratedArtifacts
+**/*.DesktopClient/ModelManifest.xml
+**/*.Server/GeneratedArtifacts
+**/*.Server/ModelManifest.xml
+_Pvt_Extensions
+
+# Paket dependency manager
+.paket/paket.exe
+
+# FAKE - F# Make
+.fake/
+
+# JetBrains Rider
+.idea/
+*.sln.imlobj
diff --git a/Demo/PebbleSharp.Universal/PebbleSharp.Universal.Shared/ViewModels/AppsViewModel.cs b/Demo/PebbleSharp.Universal/PebbleSharp.Universal.Shared/ViewModels/AppsViewModel.cs
@@ -29,7 +29,7 @@ public override async Task RefreshAsync()
 
         private async Task LoadAppsAsync()
         {
-            var appBankContents = await Pebble.GetAppbankContentsAsync();
+            var appBankContents = await Pebble.InstallClient.GetAppbankContentsAsync();
             Apps.Clear();
             if (appBankContents != null && appBankContents.AppBank != null && appBankContents.AppBank.Apps != null)
             {

diff --git a/.../PebbleSharp.Universal/PebbleSharp.Universal.Windows/PebbleSharp.Universal.Windows.csproj b/.../PebbleSharp.Universal/PebbleSharp.Universal.Windows/PebbleSharp.Universal.Windows.csproj
@@ -104,11 +104,11 @@
   </PropertyGroup>
   <ItemGroup>
     <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
-    <ProjectReference Include="..\..\PebbleSharp.Core\PebbleSharp.Core.csproj">
+    <ProjectReference Include="..\..\..\PebbleSharp.Core\PebbleSharp.Core.csproj">
       <Project>{ae0f69ff-97c2-4e55-a3c9-b73e68668dda}</Project>
       <Name>PebbleSharp.Core</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\PebbleSharp.WinRT\PebbleSharp.WinRT.csproj">
+    <ProjectReference Include="..\..\..\PebbleSharp.WinRT\PebbleSharp.WinRT.csproj">
       <Project>{c6f33ca9-eed4-4553-ae74-cd77e6bf3d75}</Project>
       <Name>PebbleSharp.WinRT</Name>
     </ProjectReference>

diff --git a/Demo/PebbleSharp.WPF/Messages/PebbleDisconnected.cs b/Demo/PebbleSharp.WPF/Messages/PebbleDisconnected.cs
@@ -0,0 +1,21 @@
+using System;
+using PebbleSharp.Core;
+
+namespace PebbleSharp.WPF.Messages
+{
+    public class PebbleDisconnected
+    {
+        private readonly Pebble _pebble;
+
+        public PebbleDisconnected( Pebble pebble )
+        {
+            if (pebble == null) throw new ArgumentNullException("pebble");
+            _pebble = pebble;
+        }
+
+        public Pebble Pebble
+        {
+            get { return _pebble; }
+        }
+    }
+}
diff --git a/Demo/PebbleSharp.WPF/PebbleSharp.WPF.csproj b/Demo/PebbleSharp.WPF/PebbleSharp.WPF.csproj
@@ -70,6 +70,7 @@
       <DependentUpon>App.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
+    <Compile Include="Messages\PebbleDisconnected.cs" />
     <Compile Include="Util\NativeMethods.cs" />
     <Compile Include="ViewModels\MainWindowViewModel.cs" />
     <Compile Include="ViewModels\PebbleAppsViewModel.cs" />
@@ -100,7 +101,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Messages\PebbleConnected.cs" />
-    <Compile Include="Messages\PebbleDisconnected.cs" />
     <Compile Include="Properties\AssemblyInfo.cs">
       <SubType>Code</SubType>
     </Compile>

diff --git a/Demo/PebbleSharp.WPF/ViewModels/PebbleAppsViewModel.cs b/Demo/PebbleSharp.WPF/ViewModels/PebbleAppsViewModel.cs
@@ -4,6 +4,7 @@
 using System.Windows.Input;
 using GalaSoft.MvvmLight.Command;
 using Microsoft.Win32;
+using PebbleSharp.Core;
 using PebbleSharp.Core.Bundles;
 using PebbleSharp.WPF.Messages;
 using PebbleSharp.Net45;
@@ -58,7 +59,7 @@ private async Task LoadAppsAsync()
                 return;
 
             Loading = true;
-            var appBankContents = await _pebble.GetAppbankContentsAsync();
+            var appBankContents = await _pebble.InstallClient.GetAppbankContentsAsync();
             _apps.Clear();
             if ( appBankContents.Success )
                 foreach ( var app in appBankContents.AppBank.Apps )
@@ -91,12 +92,13 @@ private async void OnInstallApp()
                 var bundle = new AppBundle();
                 using (var zip = new Zip())
                 {
-                    bundle.Load(openDialog.OpenFile(), zip);
+                    zip.Open(openDialog.OpenFile());
+                    bundle.Load(zip,_pebble.Firmware.HardwarePlatform.GetSoftwarePlatform());
                 }
 
                 if ( _pebble.IsAlive == false )
                     return;
-                await _pebble.InstallAppAsync( bundle );
+                await _pebble.InstallClient.InstallAppAsync( bundle );
                 await LoadAppsAsync();
             }
         }

diff --git a/Demo/PebbleSharp.WPF/ViewModels/PebbleInfoViewModel.cs b/Demo/PebbleSharp.WPF/ViewModels/PebbleInfoViewModel.cs
@@ -101,12 +101,13 @@ private async void OnUpdateFirmware()
                 var bundle = new FirmwareBundle();
                 using (var zip = new Zip())
                 {
-                    bundle.Load(openDialog.OpenFile(), zip);
+                    zip.Open(openDialog.OpenFile());
+                    bundle.Load(zip,_pebble.Firmware.HardwarePlatform.GetSoftwarePlatform());
                 }
 
                 if (_pebble.IsAlive == false)
                     return;
-                await _pebble.InstallFirmwareAsync(bundle);
+                await _pebble.InstallClient.InstallFirmwareAsync(bundle);
             }
         }
 

diff --git a/PebbleCmd/AppMessageTest.pbw b/PebbleCmd/AppMessageTest.pbw
diff --git a/PebbleCmd/PebbleCmd.csproj b/PebbleCmd/PebbleCmd.csproj
@@ -50,6 +50,9 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
+    <None Include="AppMessageTest.pbw">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\PebbleSharp.Core\PebbleSharp.Core.csproj">