Skip to content

Commit

Permalink
Merge pull request #8 from cslrfid/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
ksclam authored Aug 23, 2024
2 parents c59ffc6 + 24ed1e5 commit 71f0472
Show file tree
Hide file tree
Showing 87 changed files with 7,940 additions and 757 deletions.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed APK Release/CS710SCSDemo0.1.7-070.apk
Binary file not shown.
Binary file removed APK Release/CS710SCSDemo0.1.8-074.aab
Binary file not shown.
224 changes: 224 additions & 0 deletions CS710S-C-Sharp-APP-for-UWP.sln

Large diffs are not rendered by default.

File renamed without changes.
268 changes: 268 additions & 0 deletions CS710S-C-Sharp-APP-for-iOS-ANDROID.sln

Large diffs are not rendered by default.

171 changes: 171 additions & 0 deletions Library/CSLibrary/CSLibrary2024-NET4.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" 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)' == '' ">AnyCPU</Platform>
<ProjectGuid>{B84B1CFC-D8C3-420C-9526-E604D2710959}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>CSLibrary</RootNamespace>
<AssemblyName>CSLibrary2024.NET4</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="wclBluetoothFramework">
<HintPath>Source\HAL\btframework\wclBluetoothFramework.dll</HintPath>
</Reference>
<Reference Include="wclCommon">
<HintPath>Source\HAL\btframework\wclCommon.dll</HintPath>
</Reference>
<Reference Include="wclCommunication">
<HintPath>Source\HAL\btframework\wclCommunication.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Source\BarcodeReader\ClassBarCode.cs" />
<Compile Include="Source\BarcodeReader\Constants\CSLibrary.Barcode.Constants.cs" />
<Compile Include="Source\BarcodeReader\Events\CSLibrary.Barcode.EventArgs.cs" />
<Compile Include="Source\BarcodeReader\Structures\CSLibrary.Barcode.Structures.cs" />
<Compile Include="Source\Battery\ClassBattery.cs" />
<Compile Include="Source\BluetoothIC\ClassBluetoothIC.cs" />
<Compile Include="Source\BluetoothProtocol\BTConnect.cs" />
<Compile Include="Source\BluetoothProtocol\BTReceive.cs" />
<Compile Include="Source\BluetoothProtocol\BTSend.cs" />
<Compile Include="Source\BluetoothProtocol\ClassBleDebug.cs" />
<Compile Include="Source\BluetoothProtocol\CSLibrary.Private.cs" />
<Compile Include="Source\CSLibrary.cs" />
<Compile Include="Source\HAL\btframework\ClassDebug.cs" />
<Compile Include="Source\HAL\btframework\ClassDeviceFinder.cs" />
<Compile Include="Source\HAL\btframework\CodeFileBLE.cs" />
<Compile Include="Source\Notification\ClassNotification.cs" />
<Compile Include="Source\RFIDReader\Comm_Protocol\Ex10Commands\ClassRFID.AdministrationCommands.cs" />
<Compile Include="Source\RFIDReader\Comm_Protocol\Ex10Commands\ClassRFID.OperationCommands.cs" />
<Compile Include="Source\RFIDReader\Comm_Protocol\Ex10Commands\ClassRFID.ReadRegister.cs" />
<Compile Include="Source\RFIDReader\Comm_Protocol\Ex10Commands\ClassRFID.Registers.cs" />
<Compile Include="Source\RFIDReader\Comm_Protocol\Ex10Commands\ClassRFID.UplinkPackets.cs" />
<Compile Include="Source\RFIDReader\Comm_Protocol\Ex10Commands\ClassRFID.WriteRegister.cs" />
<Compile Include="Source\RFIDReader\Comm_Protocol\RX000Commands\ClassRFID.Private.ByPassRegister.cs" />
<Compile Include="Source\RFIDReader\Comm_Protocol\RX000Commands\ClassRFID.Private.MacRegister.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\ClassRFID.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\ClassRFID.Private.Country.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\ClassRFID.Private.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\ClassRFID.Private.FrequencyChannel.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\ClassRFID.Private.Inventory.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\ClassRFID.Private.Read.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\ClassRFID.Private.Select.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\ClassRFID.Private.Write.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\ClassRFID.Public.Algorithm.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\ClassRFID.Public.Antenna.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\ClassRFID.Public.Country.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\ClassRFID.Public.FrequencyChannel.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\ClassRFID.Public.InventoryOptions.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\ClassRFID.Public.Operation.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\ClassRFID.Public.Power.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\ClassRFID.Public.Profile.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\ClassRFID.Public.QTCommandParms.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\ClassRFID.Public.RSSIFilter.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\ClassRFID.Public.SetLNA.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\ClassRFID.Puiblic.EngineeringAPI.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\ClassRFID.UCODE8.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\ClassRFID.UnifiedAPI.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS108\ClassRFID.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS108\ClassRFID.Private.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS108\ClassRFID.Private.FrequencyChannel.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS108\ClassRFID.Private.Inventory.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS108\ClassRFID.Private.OEM.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS108\ClassRFID.Private.PowerManager.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS108\ClassRFID.Private.Read.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS108\ClassRFID.Private.Select.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS108\ClassRFID.Private.Write.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS108\ClassRFID.Public.Algorithm.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS108\ClassRFID.Public.Antenna.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS108\ClassRFID.Public.Country.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS108\ClassRFID.Public.FrequencyChannel.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS108\ClassRFID.Public.Operation.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS108\ClassRFID.Public.Power.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS108\ClassRFID.Public.Profile.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS108\ClassRFID.Public.RSSIFilter.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS108\ClassRFID.Public.SetLNA.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS710S\Antenna\Antenna.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS710S\Antenna\AntennaConfig.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS710S\Antenna\AntennaList.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS710S\Antenna\AntennaStatus.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS710S\ClassRFID.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS710S\ClassRFID.Private.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS710S\ClassRFID.Private.Read.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS710S\ClassRFID.Private.Select.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS710S\ClassRFID.Private.Write.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS710S\ClassRFID.Public.Algorithm.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS710S\ClassRFID.Public.Antenna.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS710S\ClassRFID.Public.Country.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS710S\ClassRFID.Public.FrequencyChannel.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS710S\ClassRFID.Public.Operation.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS710S\ClassRFID.Public.Power.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS710S\ClassRFID.Public.Profile.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS710S\ClassRFID.Public.RSSIFilter.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_API\CS710S\ClassRFID.UnifiedAPI.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_Constants\AntennaPort.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_Constants\AntennaSequenceMode.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_Constants\CSLibrary.Constants.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_Constants\CSLibrary.Constants.Packet.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_Constants\FreqAgile.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_Constants\Intel.Constants.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_Constants\SelectFlags.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_Events\CSLibrary.Events.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_Structures\AntennaPortCollections.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_Structures\CSLibrary.Structures.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_Structures\CSLibrary.Structures.TagKill.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_Structures\CSLibrary.Structures.TagLock.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_Structures\CSLibrary.Structures.TagRead.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_Structures\CSLibrary.Structures.TagWrite.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\Basic_Structures\Intel.Structures.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\TAG_ASYN\ClassRFID.ASYN.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\TAG_EM4325\ClassRFID.EM4325.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\TAG_FM13DT160\ClassRFID.FM13DT160.cs" />
<Compile Include="Source\RFIDReader\CSLUnifiedAPI\TAG_FM13DT160\ClassRFID.Private.FM13DT160.cs" />
<Compile Include="Source\SystemInformation\ClassCountryInformation.cs" />
<Compile Include="Source\SiliconLabIC\ClassEvent.cs" />
<Compile Include="Source\SiliconLabIC\ClassSiliconLabIC.cs" />
<Compile Include="Source\SystemInformation\ClassDeviceInformation.cs" />
<Compile Include="Source\SystemInformation\ClassFrequencyBandInformation.cs" />
<Compile Include="Source\Tools\ClassCRC16.cs" />
<Compile Include="Source\Tools\ClassdBm2dBuV.cs" />
<Compile Include="Source\Tools\ClassFIFIQueue.cs" />
<Compile Include="Source\Tools\ClassTimer.cs" />
<Compile Include="Source\Tools\HexEncoding.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Content Include="Readme.txt" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
54 changes: 54 additions & 0 deletions Library/CSLibrary/CSLibrary2024-NET8-MAUI.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>CSLibrary</RootNamespace>
<AssemblyName>CSLibrary2024.NET8.MAUI</AssemblyName>
<Version>3.0.3</Version>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<Optimize>true</Optimize>
</PropertyGroup>
<ItemGroup>
<Compile Remove="Source\HAL\Acr.ble\**" />
<Compile Remove="Source\HAL\btframework\**" />
<Compile Remove="Source\HAL\MvvmCross.Plugin.BLE\**" />
<Compile Remove="Source\HAL\UWP\**" />
<Compile Remove="Source\RFIDReader\Antenna\**" />
<Compile Remove="Source\RFIDReader\API_EM4325\**" />
<Compile Remove="Source\RFIDReader\API_FM13DT160\**" />
<EmbeddedResource Remove="Source\HAL\Acr.ble\**" />
<EmbeddedResource Remove="Source\HAL\btframework\**" />
<EmbeddedResource Remove="Source\HAL\MvvmCross.Plugin.BLE\**" />
<EmbeddedResource Remove="Source\HAL\UWP\**" />
<EmbeddedResource Remove="Source\RFIDReader\Antenna\**" />
<EmbeddedResource Remove="Source\RFIDReader\API_EM4325\**" />
<EmbeddedResource Remove="Source\RFIDReader\API_FM13DT160\**" />
<None Remove="Source\HAL\Acr.ble\**" />
<None Remove="Source\HAL\btframework\**" />
<None Remove="Source\HAL\MvvmCross.Plugin.BLE\**" />
<None Remove="Source\HAL\UWP\**" />
<None Remove="Source\RFIDReader\Antenna\**" />
<None Remove="Source\RFIDReader\API_EM4325\**" />
<None Remove="Source\RFIDReader\API_FM13DT160\**" />
</ItemGroup>
<ItemGroup>
<Compile Remove="CSLibrary.cs" />
<Compile Remove="Properties\AssemblyInfo.cs" />
<Compile Remove="Properties\Resources.Designer.cs" />
<Compile Remove="Source\SystemInformation\ClassdBm2dBV.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Remove="Properties\Resources.resx" />
</ItemGroup>
<ItemGroup>
<None Remove=".DS_Store" />
<None Remove="CSLibrary-UWP.projitems" />
</ItemGroup>
<ItemGroup>
<Folder Include="Properties\" />
<Folder Include="Source\RFIDReader\Comm_Protocol\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Plugin.BLE" Version="3.0.0" />
</ItemGroup>
</Project>
3 changes: 3 additions & 0 deletions Library/CSLibrary/CSLibrary2024-NETStandard.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,21 @@
<ItemGroup>
<Compile Remove="Source\HAL\Acr.ble\**" />
<Compile Remove="Source\HAL\btframework\**" />
<Compile Remove="Source\HAL\Plugin.BLE\**" />
<Compile Remove="Source\HAL\UWP\**" />
<Compile Remove="Source\RFIDReader\Antenna\**" />
<Compile Remove="Source\RFIDReader\API_EM4325\**" />
<Compile Remove="Source\RFIDReader\API_FM13DT160\**" />
<EmbeddedResource Remove="Source\HAL\Acr.ble\**" />
<EmbeddedResource Remove="Source\HAL\btframework\**" />
<EmbeddedResource Remove="Source\HAL\Plugin.BLE\**" />
<EmbeddedResource Remove="Source\HAL\UWP\**" />
<EmbeddedResource Remove="Source\RFIDReader\Antenna\**" />
<EmbeddedResource Remove="Source\RFIDReader\API_EM4325\**" />
<EmbeddedResource Remove="Source\RFIDReader\API_FM13DT160\**" />
<None Remove="Source\HAL\Acr.ble\**" />
<None Remove="Source\HAL\btframework\**" />
<None Remove="Source\HAL\Plugin.BLE\**" />
<None Remove="Source\HAL\UWP\**" />
<None Remove="Source\RFIDReader\Antenna\**" />
<None Remove="Source\RFIDReader\API_EM4325\**" />
Expand Down
10 changes: 9 additions & 1 deletion Library/CSLibrary/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,19 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Convergence System Limited")]
[assembly: AssemblyProduct("CSLibrary")]
[assembly: AssemblyCopyright("Copyright � 2014")]
[assembly: AssemblyCopyright("Copyright � 2024")]
[assembly: AssemblyTrademark("CSL")]
[assembly: AssemblyCulture("")]
[assembly: NeutralResourcesLanguage("en")]

// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]

// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("3f5d0d75-9455-4797-9f63-28be05221609")]

// Version information for an assembly consists of the following four values:
//
// Major Version
Expand Down
9 changes: 1 addition & 8 deletions Library/CSLibrary/Readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,6 @@ SOFTWARE.

CSLibrary is CS108 RFID reader framework

CSLibrary type
--------------
1. CSLibrary-NETStandard is a .netstandard library for iOS and Android MVVM apps
2. CSLibrary-DESKTOP is a DLL library for Widnows 10 Desktop apps (WINFORMS and WPF)
3. CSLibrary-UWP is a link project for Widnows 10 UWP apps


CLibrary structure
------------------
CSLibrary : Main library
Expand All @@ -37,7 +30,7 @@ CSLibrary.rfid : RFID reader Class
CSLibrary.barcode : Barcode scan Class
CSLibrary.bluetoothIC : for internal uses
CSLibrary.siliconlabIC : for internal uses


API List
--------
Expand Down
Loading

0 comments on commit 71f0472

Please sign in to comment.