Skip to content
This repository has been archived by the owner on Feb 24, 2021. It is now read-only.

Commit

Permalink
remaining pr issues addressed, updated .gitignore to github vs default
Browse files Browse the repository at this point in the history
  • Loading branch information
brookpatten committed Feb 20, 2016
1 parent b537f9c commit a925d86
Show file tree
Hide file tree
Showing 4 changed files with 266 additions and 36 deletions.
277 changes: 243 additions & 34 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
21 changes: 21 additions & 0 deletions Demo/PebbleSharp.WPF/Messages/PebbleDisconnected.cs
Original file line number Diff line number Diff line change
@@ -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; }
}
}
}
2 changes: 1 addition & 1 deletion PebbleSharp.Core/AppMessage/AppMessagePacket.cs
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ public abstract class AppMessageDictionaryEntry<T> : IAppMessageDictionaryEntry

public virtual ushort Length
{
get { return (ushort) System.Runtime.InteropServices.Marshal.SizeOf<T>(); }
get { return (ushort) System.Runtime.InteropServices.Marshal.SizeOf(typeof(T)); }
}

public virtual T Value { get; set; }
Expand Down
2 changes: 1 addition & 1 deletion PebbleSharp.Core/Install/InstallClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ private async Task InstallAppAsyncV3(AppBundle bundle,IProgress<ProgressValue> p
}
else
{
throw new DataMisalignedException("BlobDB Insert Failed");
throw new PebbleException("BlobDB Insert Failed");
}
}

Expand Down

0 comments on commit a925d86

Please sign in to comment.