Skip to content

Commit

Permalink
updated package references; updated version info in Readme
Browse files Browse the repository at this point in the history
  • Loading branch information
nexussays committed Oct 9, 2018
1 parent 52d3427 commit a8b00d6
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 22 deletions.
8 changes: 4 additions & 4 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ It provides a consistent API across all supported platforms and hides most of th

| Platform | Version |
| ---------------- | :-------: |
| Xamarin.iOS | iOS 7+ |
| Xamarin.Android | API 18+ |
| Windows 10 (UWP) | 1511+ |
| Xamarin.iOS | iOS 8.3+ |
| Xamarin.Android | API 18+ |
| Windows 10 (UWP) | 1709+ |

> Note: Currently UWP only supports listening for broadcasts/advertisements, not connecting to devices.
Expand Down Expand Up @@ -71,7 +71,7 @@ Install the `ble.net (API)` package.
dotnet add package ble.net
```

> NOTE: BLE.net switched from a PCL (Profile7) to a .Net Standard (1.4) library in version `1.2.0`, if this causes problems please [file an issue](https://github.com/nexussays/ble.net/issues/new) and install version `1.1.1`
> NOTE: BLE.net switched from targetting `portable-net45+win8` in version `1.1.1`, to `.netstandard1.4` in version `1.2.0`, to `.netstandard2.0` in `1.2.1` (where it will remain for the forseeable future). If you are having problems please [file an issue](https://github.com/nexussays/ble.net/issues/new)
#### In your platform project(s)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@
<Version>6.5.1</Version>
</PackageReference>
<PackageReference Include="ble.net-android">
<Version>1.1.1</Version>
<Version>1.2.1</Version>
</PackageReference>
<PackageReference Include="nexus.core">
<Version>0.32.0</Version>
<Version>0.34.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms">
<Version>2.5.1.527436</Version>
Expand Down
4 changes: 2 additions & 2 deletions src/ble.net.sampleapp-ios/ble.net.sampleapp-ios.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -153,10 +153,10 @@
<Version>6.5.1</Version>
</PackageReference>
<PackageReference Include="ble.net-ios">
<Version>1.1.1</Version>
<Version>1.2.1</Version>
</PackageReference>
<PackageReference Include="nexus.core">
<Version>0.32.0</Version>
<Version>0.34.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms">
<Version>2.5.1.527436</Version>
Expand Down
6 changes: 3 additions & 3 deletions src/ble.net.sampleapp-uwp/ble.net.sampleapp-uwp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -130,13 +130,13 @@
<Version>6.5.1</Version>
</PackageReference>
<PackageReference Include="ble.net-uwp">
<Version>1.1.1</Version>
<Version>1.2.1</Version>
</PackageReference>
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
<Version>5.4.0</Version>
<Version>6.1.7</Version>
</PackageReference>
<PackageReference Include="nexus.core">
<Version>0.32.0</Version>
<Version>0.34.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms">
<Version>2.5.1.527436</Version>
Expand Down
4 changes: 2 additions & 2 deletions src/ble.net.sampleapp/ble.net.sampleapp.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
<Version>6.5.1</Version>
</PackageReference>
<PackageReference Include="ble.net">
<Version>1.1.1</Version>
<Version>1.2.1</Version>
</PackageReference>
<PackageReference Include="nexus.core">
<Version>0.32.0</Version>
<Version>0.34.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms">
<Version>2.5.1.527436</Version>
Expand Down
4 changes: 2 additions & 2 deletions src/ble.net/ble.net.csproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netstandard1.4</TargetFramework>
<TargetFramework>netstandard2.0</TargetFramework>
<RootNamespace>nexus.protocols.ble</RootNamespace>
<AssemblyName>ble.net</AssemblyName>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="nexus.core" Version="0.33.4" />
<PackageReference Include="nexus.core" Version="0.34.0" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/ble.net/scan/advertisement/BleAdvertisingUtils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ public static class BleAdvertisingUtils
/// <summary>
/// Convert the raw struct from the <see cref="BlePacket" /> into a typed advertisement class
/// </summary>
internal static IBlePeripheral AsUndirectedAdvertisement( this AdvertisingChannelPDU pdu, Int32 rssi = 0 )
internal static IBlePeripheral AsUndirectedAdvertisement( this AdvertisingChannelPdu pdu, Int32 rssi = 0 )
{
if(pdu.Type.CanCarryPayload() && pdu.payload.Length >= 6)
{
Expand Down
4 changes: 2 additions & 2 deletions src/ble.net/scan/advertisement/link/AdvertisingChannelPDU.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ namespace nexus.protocols.ble.scan.advertisement.link
/// TODO: In-progress
/// </summary>
[StructLayout( LayoutKind.Sequential, Pack = 1 )]
internal struct AdvertisingChannelPDU
internal struct AdvertisingChannelPdu
{
/// <summary>
/// 2 bytes
Expand Down Expand Up @@ -51,4 +51,4 @@ internal struct AdvertisingChannelPDU
/// </summary>
public Boolean RxAdd => ((header >> 8) & 1) == 1;
}
}
}
8 changes: 4 additions & 4 deletions src/ble.net/scan/advertisement/link/BlePacket.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,16 @@ public Byte[ /*3*/] Crc
/// <summary>
/// Parse <see cref="Pdu" /> as an advertisement
/// </summary>
public AdvertisingChannelPDU PduAsAdvertisement()
public AdvertisingChannelPdu PduAsAdvertisement()
{
if(!this.IsAdvertisingChannelPDU())
{
return default(AdvertisingChannelPDU);
return default(AdvertisingChannelPdu);
}

var pdu = Pdu;
// TODO: Can I just memory map the byte array into a AdvertisingChannelPDU struct?
return new AdvertisingChannelPDU {header = (UInt16)pdu.Slice( 0, 2 ).ToInt16(), payload = pdu.Slice( 3 )};
return new AdvertisingChannelPdu {header = (UInt16)pdu.Slice( 0, 2 ).ToInt16(), payload = pdu.Slice( 3 )};
}
}
}
}

0 comments on commit a8b00d6

Please sign in to comment.