Skip to content

Commit 030a840

Browse files
committed
2024 05 16 Backup
1 parent 4c434dc commit 030a840

File tree

112 files changed

+1176
-490
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

112 files changed

+1176
-490
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFramework>net8.0</TargetFramework>
4+
<RootNamespace>CSLibrary</RootNamespace>
5+
<AssemblyName>CSLibrary2024.NET8.MAUI</AssemblyName>
6+
<Version>3.0.3</Version>
7+
</PropertyGroup>
8+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
9+
<Optimize>true</Optimize>
10+
</PropertyGroup>
11+
<ItemGroup>
12+
<Compile Remove="Source\HAL\Acr.ble\**" />
13+
<Compile Remove="Source\HAL\btframework\**" />
14+
<Compile Remove="Source\HAL\MvvmCross.Plugin.BLE\**" />
15+
<Compile Remove="Source\HAL\UWP\**" />
16+
<Compile Remove="Source\RFIDReader\Antenna\**" />
17+
<Compile Remove="Source\RFIDReader\API_EM4325\**" />
18+
<Compile Remove="Source\RFIDReader\API_FM13DT160\**" />
19+
<EmbeddedResource Remove="Source\HAL\Acr.ble\**" />
20+
<EmbeddedResource Remove="Source\HAL\btframework\**" />
21+
<EmbeddedResource Remove="Source\HAL\MvvmCross.Plugin.BLE\**" />
22+
<EmbeddedResource Remove="Source\HAL\UWP\**" />
23+
<EmbeddedResource Remove="Source\RFIDReader\Antenna\**" />
24+
<EmbeddedResource Remove="Source\RFIDReader\API_EM4325\**" />
25+
<EmbeddedResource Remove="Source\RFIDReader\API_FM13DT160\**" />
26+
<None Remove="Source\HAL\Acr.ble\**" />
27+
<None Remove="Source\HAL\btframework\**" />
28+
<None Remove="Source\HAL\MvvmCross.Plugin.BLE\**" />
29+
<None Remove="Source\HAL\UWP\**" />
30+
<None Remove="Source\RFIDReader\Antenna\**" />
31+
<None Remove="Source\RFIDReader\API_EM4325\**" />
32+
<None Remove="Source\RFIDReader\API_FM13DT160\**" />
33+
</ItemGroup>
34+
<ItemGroup>
35+
<Compile Remove="CSLibrary.cs" />
36+
<Compile Remove="Properties\AssemblyInfo.cs" />
37+
<Compile Remove="Properties\Resources.Designer.cs" />
38+
<Compile Remove="Source\SystemInformation\ClassdBm2dBV.cs" />
39+
</ItemGroup>
40+
<ItemGroup>
41+
<EmbeddedResource Remove="Properties\Resources.resx" />
42+
</ItemGroup>
43+
<ItemGroup>
44+
<None Remove=".DS_Store" />
45+
<None Remove="CSLibrary-UWP.projitems" />
46+
</ItemGroup>
47+
<ItemGroup>
48+
<Folder Include="Properties\" />
49+
<Folder Include="Source\RFIDReader\Comm_Protocol\" />
50+
</ItemGroup>
51+
<ItemGroup>
52+
<PackageReference Include="Plugin.BLE" Version="3.0.0" />
53+
</ItemGroup>
54+
</Project>

CSLibrary2024/Readme.txt

-7
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@ SOFTWARE.
2121

2222
CSLibrary is CS108 RFID reader framework
2323

24-
CSLibrary type
25-
--------------
26-
1. CSLibrary-NETStandard is a .netstandard library for iOS and Android MVVM apps
27-
2. CSLibrary-DESKTOP is a DLL library for Widnows 10 Desktop apps (WINFORMS and WPF)
28-
3. CSLibrary-UWP is a link project for Widnows 10 UWP apps
29-
30-
3124
CLibrary structure
3225
------------------
3326
CSLibrary : Main library

CSLibrary2024/Source/HAL/MvvmCross.Plugin.BLE/CodeFileBLE.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public async Task<bool> DisconnectAsync()
174174
/// return error code
175175
/// </summary>
176176
/// <returns></returns>
177-
private async Task<bool> BLE_Send (byte[] data)
177+
private async Task<int> BLE_Send (byte[] data)
178178
{
179179
return await _characteristicWrite.WriteAsync(data);
180180
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
/*
2+
Copyright (c) 2018 Convergence Systems Limited
3+
4+
Permission is hereby granted, free of charge, to any person obtaining a copy
5+
of this software and associated documentation files (the "Software"), to deal
6+
in the Software without restriction, including without limitation the rights
7+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
8+
copies of the Software, and to permit persons to whom the Software is
9+
furnished to do so, subject to the following conditions:
10+
The above copyright notice and this permission notice shall be included in all
11+
copies or substantial portions of the Software.
12+
13+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19+
SOFTWARE.
20+
*/
21+
22+
using System;
23+
24+
namespace CSLibrary
25+
{
26+
public static class Debug
27+
{
28+
public static void WriteBytes(string header, byte[] data)
29+
{
30+
string str = "";
31+
for (int cnt = 0; cnt < data.Length; cnt++)
32+
str += data[cnt].ToString("X2") + " ";
33+
WriteLine ("CSLibrary : " + header + " {0}:{1}", data.Length, str);
34+
}
35+
36+
public static void WriteLine(string format, params object[] args)
37+
{
38+
Console.WriteLine(string.Format(format, args));
39+
//Plugin.BLE.Abstractions.Trace.Message(string.Format(format, args));
40+
}
41+
42+
public static void Write(string format, params object[] args)
43+
{
44+
Console.Write(string.Format(format, args));
45+
//Plugin.BLE.Abstractions.Trace.Message(string.Format(format, args));
46+
}
47+
}
48+
}

0 commit comments

Comments
 (0)