From 909b1f9f3fb236fc1123306bd891c64ca6e03802 Mon Sep 17 00:00:00 2001 From: Jong Chern Date: Mon, 7 Mar 2022 12:48:18 +0800 Subject: [PATCH 01/20] update fody --- ShimmerBLE/ShimmerBLEAPI/FodyWeavers.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/ShimmerBLE/ShimmerBLEAPI/FodyWeavers.xml b/ShimmerBLE/ShimmerBLEAPI/FodyWeavers.xml index 39ad1cbf..4e68ed1a 100644 --- a/ShimmerBLE/ShimmerBLEAPI/FodyWeavers.xml +++ b/ShimmerBLE/ShimmerBLEAPI/FodyWeavers.xml @@ -1,5 +1,4 @@  - \ No newline at end of file From d147875b38d57530d840485ebd4979992a7e5208 Mon Sep 17 00:00:00 2001 From: Jong Chern Date: Mon, 7 Mar 2022 13:09:02 +0800 Subject: [PATCH 02/20] update fody --- ShimmerBLE/ShimmerBLEAPI/FodyWeavers.xsd | 31 +++++++++++++++++-- ShimmerBLE/ShimmerBLEAPI/ShimmerBLEAPI.csproj | 2 +- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/ShimmerBLE/ShimmerBLEAPI/FodyWeavers.xsd b/ShimmerBLE/ShimmerBLEAPI/FodyWeavers.xsd index a608e3f5..69dbe488 100644 --- a/ShimmerBLE/ShimmerBLEAPI/FodyWeavers.xsd +++ b/ShimmerBLE/ShimmerBLEAPI/FodyWeavers.xsd @@ -1,6 +1,6 @@  - + @@ -11,6 +11,16 @@ Used to control if the On_PropertyName_Changed feature is enabled. + + + Used to control if the Dependent properties feature is enabled. + + + + + Used to control if the IsChanged property feature is enabled. + + Used to change the name of the method that fires the notify event. This is a string that accepts multiple values in a comma separated form. @@ -31,17 +41,32 @@ Used to control if equality checks should use the static Equals method resolved from the base class. + + + Used to turn off build warnings from this weaver. + + + + + Used to turn off build warnings about mismatched On_PropertyName_Changed methods. + + - 'true' to run assembly verification on the target assembly after all weavers have been finished. + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. - A comma separated list of error codes that can be safely ignored in assembly verification. + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. diff --git a/ShimmerBLE/ShimmerBLEAPI/ShimmerBLEAPI.csproj b/ShimmerBLE/ShimmerBLEAPI/ShimmerBLEAPI.csproj index 78e64e35..b57ee6f2 100644 --- a/ShimmerBLE/ShimmerBLEAPI/ShimmerBLEAPI.csproj +++ b/ShimmerBLE/ShimmerBLEAPI/ShimmerBLEAPI.csproj @@ -23,11 +23,11 @@ + - From a8418276423a93cfc99817d3100ab39571b9ea38 Mon Sep 17 00:00:00 2001 From: Jong Chern Date: Mon, 7 Mar 2022 13:19:12 +0800 Subject: [PATCH 03/20] update --- ShimmerBLE/ShimmerBLETests/ShimmerBLETests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ShimmerBLE/ShimmerBLETests/ShimmerBLETests.csproj b/ShimmerBLE/ShimmerBLETests/ShimmerBLETests.csproj index 72d3dcd8..ff775d4b 100644 --- a/ShimmerBLE/ShimmerBLETests/ShimmerBLETests.csproj +++ b/ShimmerBLE/ShimmerBLETests/ShimmerBLETests.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net5.0 false From cfd7d26f70005ebc33b196b4212324c6b5c5c52a Mon Sep 17 00:00:00 2001 From: Jong Chern Date: Mon, 7 Mar 2022 17:33:11 +0800 Subject: [PATCH 04/20] restructure c api --- ShimmerAPI/ShimmerAPI.sln | 26 +++++ .../ShimmerBluetoothCommandsUnitTest.cs | 2 +- .../ShimmerBluetoothStreamingUnitTest.cs | 2 +- .../ShimmerBluetoothTests.csproj | 3 - .../ShimmerECGMDConstructor.cs | 2 +- .../OrderedTestECGMDConstructor.orderedtest | 7 ++ .../Properties/AssemblyInfo.cs | 36 ++++++ .../ShimmerBluetoothReadData.cs | 0 .../ShimmerReadDataPacketTest.cs | 0 .../ShimmerTest.cs | 0 .../ShimmerUnitTests/ShimmerUnitTests.csproj | 103 ++++++++++++++++++ ShimmerAPI/ShimmerUnitTests/packages.config | 4 + 12 files changed, 179 insertions(+), 6 deletions(-) create mode 100644 ShimmerAPI/ShimmerUnitTests/OrderedTestECGMDConstructor.orderedtest create mode 100644 ShimmerAPI/ShimmerUnitTests/Properties/AssemblyInfo.cs rename ShimmerAPI/{ShimmerBluetoothTests => ShimmerUnitTests}/ShimmerBluetoothReadData.cs (100%) rename ShimmerAPI/{ShimmerBluetoothTests => ShimmerUnitTests}/ShimmerReadDataPacketTest.cs (100%) rename ShimmerAPI/{ShimmerBluetoothTests => ShimmerUnitTests}/ShimmerTest.cs (100%) create mode 100644 ShimmerAPI/ShimmerUnitTests/ShimmerUnitTests.csproj create mode 100644 ShimmerAPI/ShimmerUnitTests/packages.config diff --git a/ShimmerAPI/ShimmerAPI.sln b/ShimmerAPI/ShimmerAPI.sln index dfc7f51c..6aef3ac5 100644 --- a/ShimmerAPI/ShimmerAPI.sln +++ b/ShimmerAPI/ShimmerAPI.sln @@ -25,6 +25,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shimmer32FeetAPI", "..\Shim EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShimmerAPI", "ShimmerAPI\ShimmerAPI.csproj", "{6E320423-1D88-47EE-97BA-51113E538D33}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShimmerUnitTests", "ShimmerUnitTests\ShimmerUnitTests.csproj", "{30C7273A-87CC-499F-9206-48F89082AE0C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -304,6 +306,30 @@ Global {6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPIBasic|x64.Build.0 = Debug|Any CPU {6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPIBasic|x86.ActiveCfg = Debug|Any CPU {6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPIBasic|x86.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x64.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x64.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x86.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x86.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|Any CPU.Build.0 = Release|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x64.ActiveCfg = Release|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x64.Build.0 = Release|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x86.ActiveCfg = Release|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x86.Build.0 = Release|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|Any CPU.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|Any CPU.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x64.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x64.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x86.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x86.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|Any CPU.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|Any CPU.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x64.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x64.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x86.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x86.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/ShimmerAPI/ShimmerBluetoothTests/ShimmerBluetoothCommandsUnitTest.cs b/ShimmerAPI/ShimmerBluetoothTests/ShimmerBluetoothCommandsUnitTest.cs index b9b02f96..63045bc4 100644 --- a/ShimmerAPI/ShimmerBluetoothTests/ShimmerBluetoothCommandsUnitTest.cs +++ b/ShimmerAPI/ShimmerBluetoothTests/ShimmerBluetoothCommandsUnitTest.cs @@ -11,7 +11,7 @@ namespace ShimmerBluetoothTests [TestClass] public class ShimmerBluetoothCommandsUnitTest { - String comPort = "COM29"; + String comPort = "COM4"; String deviceName = "testName"; ShimmerLogAndStreamSystemSerialPort shimmerDevice; diff --git a/ShimmerAPI/ShimmerBluetoothTests/ShimmerBluetoothStreamingUnitTest.cs b/ShimmerAPI/ShimmerBluetoothTests/ShimmerBluetoothStreamingUnitTest.cs index 7efca489..1d7be0b8 100644 --- a/ShimmerAPI/ShimmerBluetoothTests/ShimmerBluetoothStreamingUnitTest.cs +++ b/ShimmerAPI/ShimmerBluetoothTests/ShimmerBluetoothStreamingUnitTest.cs @@ -11,7 +11,7 @@ namespace ShimmerBluetoothTests [TestClass] public class ShimmerBluetoothUnitTest { - String comPort = "COM29"; + String comPort = "COM4"; String deviceName = "testName"; ShimmerLogAndStreamSystemSerialPort shimmerDevice; ObjectCluster ojc = null; diff --git a/ShimmerAPI/ShimmerBluetoothTests/ShimmerBluetoothTests.csproj b/ShimmerAPI/ShimmerBluetoothTests/ShimmerBluetoothTests.csproj index b28387ce..7cdb20c0 100644 --- a/ShimmerAPI/ShimmerBluetoothTests/ShimmerBluetoothTests.csproj +++ b/ShimmerAPI/ShimmerBluetoothTests/ShimmerBluetoothTests.csproj @@ -56,12 +56,9 @@ - - - diff --git a/ShimmerAPI/ShimmerBluetoothTests/ShimmerECGMDConstructor.cs b/ShimmerAPI/ShimmerBluetoothTests/ShimmerECGMDConstructor.cs index 3ce4249d..74ed948a 100644 --- a/ShimmerAPI/ShimmerBluetoothTests/ShimmerECGMDConstructor.cs +++ b/ShimmerAPI/ShimmerBluetoothTests/ShimmerECGMDConstructor.cs @@ -10,7 +10,7 @@ namespace ShimmerBluetoothTests public class ShimmerECGMDConstructor { - String comport = "COM29"; + String comport = "COM3"; ArrayList ojcArray = new ArrayList(); ObjectCluster ojc = null; diff --git a/ShimmerAPI/ShimmerUnitTests/OrderedTestECGMDConstructor.orderedtest b/ShimmerAPI/ShimmerUnitTests/OrderedTestECGMDConstructor.orderedtest new file mode 100644 index 00000000..765b0124 --- /dev/null +++ b/ShimmerAPI/ShimmerUnitTests/OrderedTestECGMDConstructor.orderedtest @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/ShimmerAPI/ShimmerUnitTests/Properties/AssemblyInfo.cs b/ShimmerAPI/ShimmerUnitTests/Properties/AssemblyInfo.cs new file mode 100644 index 00000000..c80e005f --- /dev/null +++ b/ShimmerAPI/ShimmerUnitTests/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("ShimmerBluetoothTests")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("ShimmerBluetoothTests")] +[assembly: AssemblyCopyright("Copyright © 2018")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// 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("f5dd4aa6-b826-49cb-96e2-a6dae01a1c47")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/ShimmerAPI/ShimmerBluetoothTests/ShimmerBluetoothReadData.cs b/ShimmerAPI/ShimmerUnitTests/ShimmerBluetoothReadData.cs similarity index 100% rename from ShimmerAPI/ShimmerBluetoothTests/ShimmerBluetoothReadData.cs rename to ShimmerAPI/ShimmerUnitTests/ShimmerBluetoothReadData.cs diff --git a/ShimmerAPI/ShimmerBluetoothTests/ShimmerReadDataPacketTest.cs b/ShimmerAPI/ShimmerUnitTests/ShimmerReadDataPacketTest.cs similarity index 100% rename from ShimmerAPI/ShimmerBluetoothTests/ShimmerReadDataPacketTest.cs rename to ShimmerAPI/ShimmerUnitTests/ShimmerReadDataPacketTest.cs diff --git a/ShimmerAPI/ShimmerBluetoothTests/ShimmerTest.cs b/ShimmerAPI/ShimmerUnitTests/ShimmerTest.cs similarity index 100% rename from ShimmerAPI/ShimmerBluetoothTests/ShimmerTest.cs rename to ShimmerAPI/ShimmerUnitTests/ShimmerTest.cs diff --git a/ShimmerAPI/ShimmerUnitTests/ShimmerUnitTests.csproj b/ShimmerAPI/ShimmerUnitTests/ShimmerUnitTests.csproj new file mode 100644 index 00000000..de406d8b --- /dev/null +++ b/ShimmerAPI/ShimmerUnitTests/ShimmerUnitTests.csproj @@ -0,0 +1,103 @@ + + + + Debug + AnyCPU + {30C7273A-87CC-499F-9206-48F89082AE0C} + Library + Properties + ShimmerBluetoothTests + ShimmerBluetoothTests + v4.7.2 + 512 + {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 10.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages + False + UnitTest + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + + ..\packages\System.IO.Ports.5.0.1\lib\net461\System.IO.Ports.dll + + + + + + + + + + + + False + + + + + + + + + + + + + PreserveNewest + + + + + + {6e320423-1d88-47ee-97ba-51113e538d33} + ShimmerAPI + + + + + + + False + + + False + + + False + + + False + + + + + + + + \ No newline at end of file diff --git a/ShimmerAPI/ShimmerUnitTests/packages.config b/ShimmerAPI/ShimmerUnitTests/packages.config new file mode 100644 index 00000000..9d2e8c4e --- /dev/null +++ b/ShimmerAPI/ShimmerUnitTests/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file From fc743f64fe14f578b9f90d7c292b0db706c4e8ac Mon Sep 17 00:00:00 2001 From: Jong Chern Date: Mon, 7 Mar 2022 17:37:57 +0800 Subject: [PATCH 05/20] add unit test from Shimmer Bluetooth API --- ShimmerBLE/ShimmerBLEAPITest.sln | 86 ++++++++++++++++++++++++++++++++ 1 file changed, 86 insertions(+) diff --git a/ShimmerBLE/ShimmerBLEAPITest.sln b/ShimmerBLE/ShimmerBLEAPITest.sln index 93cb6596..3d26570c 100644 --- a/ShimmerBLE/ShimmerBLEAPITest.sln +++ b/ShimmerBLE/ShimmerBLEAPITest.sln @@ -8,6 +8,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShimmerBLETests", "ShimmerB EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShimmerAPI", "..\ShimmerAPI\ShimmerAPI\ShimmerAPI.csproj", "{2230CC85-32B9-441C-A3C2-0DB4CC1D8CE9}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShimmerUnitTests", "..\ShimmerAPI\ShimmerUnitTests\ShimmerUnitTests.csproj", "{30C7273A-87CC-499F-9206-48F89082AE0C}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Ad-Hoc|Any CPU = Ad-Hoc|Any CPU @@ -306,6 +308,90 @@ Global {2230CC85-32B9-441C-A3C2-0DB4CC1D8CE9}.ShimmerAPIBasic|x64.Build.0 = Debug|Any CPU {2230CC85-32B9-441C-A3C2-0DB4CC1D8CE9}.ShimmerAPIBasic|x86.ActiveCfg = Debug|Any CPU {2230CC85-32B9-441C-A3C2-0DB4CC1D8CE9}.ShimmerAPIBasic|x86.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Ad-Hoc|x64.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Ad-Hoc|x86.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.AppStore|Any CPU.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.AppStore|ARM.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.AppStore|ARM.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.AppStore|ARM64.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.AppStore|ARM64.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.AppStore|iPhone.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.AppStore|iPhone.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.AppStore|x64.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.AppStore|x64.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.AppStore|x86.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.AppStore|x86.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|ARM.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|ARM.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|ARM64.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|ARM64.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|iPhone.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|iPhone.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x64.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x64.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x86.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x86.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|Any CPU.Build.0 = Release|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|ARM.ActiveCfg = Release|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|ARM.Build.0 = Release|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|ARM64.ActiveCfg = Release|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|ARM64.Build.0 = Release|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|iPhone.ActiveCfg = Release|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|iPhone.Build.0 = Release|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x64.ActiveCfg = Release|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x64.Build.0 = Release|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x86.ActiveCfg = Release|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x86.Build.0 = Release|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|Any CPU.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|Any CPU.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|ARM.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|ARM.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|ARM64.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|ARM64.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|iPhone.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|iPhone.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|iPhoneSimulator.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x64.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x64.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x86.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x86.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|Any CPU.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|Any CPU.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|ARM.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|ARM.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|ARM64.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|ARM64.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|iPhone.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|iPhone.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|iPhoneSimulator.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|iPhoneSimulator.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x64.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x64.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x86.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x86.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From d515809a3789580861e129265691e6e937463f1e Mon Sep 17 00:00:00 2001 From: Jong Chern Date: Mon, 7 Mar 2022 18:32:28 +0800 Subject: [PATCH 06/20] new solution --- ShimmerAPI/ShimmerAPITest.sln | 81 +++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 ShimmerAPI/ShimmerAPITest.sln diff --git a/ShimmerAPI/ShimmerAPITest.sln b/ShimmerAPI/ShimmerAPITest.sln new file mode 100644 index 00000000..370ec5f2 --- /dev/null +++ b/ShimmerAPI/ShimmerAPITest.sln @@ -0,0 +1,81 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30907.101 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShimmerAPI", "ShimmerAPI\ShimmerAPI.csproj", "{6E320423-1D88-47EE-97BA-51113E538D33}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShimmerUnitTests", "ShimmerUnitTests\ShimmerUnitTests.csproj", "{30C7273A-87CC-499F-9206-48F89082AE0C}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + ShimmerAPI|Any CPU = ShimmerAPI|Any CPU + ShimmerAPI|x64 = ShimmerAPI|x64 + ShimmerAPI|x86 = ShimmerAPI|x86 + ShimmerAPIBasic|Any CPU = ShimmerAPIBasic|Any CPU + ShimmerAPIBasic|x64 = ShimmerAPIBasic|x64 + ShimmerAPIBasic|x86 = ShimmerAPIBasic|x86 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {6E320423-1D88-47EE-97BA-51113E538D33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6E320423-1D88-47EE-97BA-51113E538D33}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6E320423-1D88-47EE-97BA-51113E538D33}.Debug|x64.ActiveCfg = Debug|Any CPU + {6E320423-1D88-47EE-97BA-51113E538D33}.Debug|x64.Build.0 = Debug|Any CPU + {6E320423-1D88-47EE-97BA-51113E538D33}.Debug|x86.ActiveCfg = Debug|Any CPU + {6E320423-1D88-47EE-97BA-51113E538D33}.Debug|x86.Build.0 = Debug|Any CPU + {6E320423-1D88-47EE-97BA-51113E538D33}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6E320423-1D88-47EE-97BA-51113E538D33}.Release|Any CPU.Build.0 = Release|Any CPU + {6E320423-1D88-47EE-97BA-51113E538D33}.Release|x64.ActiveCfg = Release|Any CPU + {6E320423-1D88-47EE-97BA-51113E538D33}.Release|x64.Build.0 = Release|Any CPU + {6E320423-1D88-47EE-97BA-51113E538D33}.Release|x86.ActiveCfg = Release|Any CPU + {6E320423-1D88-47EE-97BA-51113E538D33}.Release|x86.Build.0 = Release|Any CPU + {6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPI|Any CPU.ActiveCfg = Debug|Any CPU + {6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPI|Any CPU.Build.0 = Debug|Any CPU + {6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPI|x64.ActiveCfg = Debug|Any CPU + {6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPI|x64.Build.0 = Debug|Any CPU + {6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPI|x86.ActiveCfg = Debug|Any CPU + {6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPI|x86.Build.0 = Debug|Any CPU + {6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPIBasic|Any CPU.ActiveCfg = Debug|Any CPU + {6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPIBasic|Any CPU.Build.0 = Debug|Any CPU + {6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPIBasic|x64.ActiveCfg = Debug|Any CPU + {6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPIBasic|x64.Build.0 = Debug|Any CPU + {6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPIBasic|x86.ActiveCfg = Debug|Any CPU + {6E320423-1D88-47EE-97BA-51113E538D33}.ShimmerAPIBasic|x86.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x64.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x64.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x86.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x86.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|Any CPU.Build.0 = Release|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x64.ActiveCfg = Release|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x64.Build.0 = Release|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x86.ActiveCfg = Release|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x86.Build.0 = Release|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|Any CPU.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|Any CPU.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x64.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x64.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x86.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x86.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|Any CPU.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|Any CPU.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x64.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x64.Build.0 = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x86.ActiveCfg = Debug|Any CPU + {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x86.Build.0 = Debug|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {0118CC67-3FFA-4D59-B6DD-22E5138CDBBC} + EndGlobalSection +EndGlobal From d1473da6c90c16318c8a609bdc07941bc670ef08 Mon Sep 17 00:00:00 2001 From: Jong Chern Date: Mon, 7 Mar 2022 19:27:38 +0800 Subject: [PATCH 07/20] minor --- ShimmerBLE/ShimmerBLEAPITest.sln | 86 -------------------------------- 1 file changed, 86 deletions(-) diff --git a/ShimmerBLE/ShimmerBLEAPITest.sln b/ShimmerBLE/ShimmerBLEAPITest.sln index 3d26570c..93cb6596 100644 --- a/ShimmerBLE/ShimmerBLEAPITest.sln +++ b/ShimmerBLE/ShimmerBLEAPITest.sln @@ -8,8 +8,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShimmerBLETests", "ShimmerB EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShimmerAPI", "..\ShimmerAPI\ShimmerAPI\ShimmerAPI.csproj", "{2230CC85-32B9-441C-A3C2-0DB4CC1D8CE9}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ShimmerUnitTests", "..\ShimmerAPI\ShimmerUnitTests\ShimmerUnitTests.csproj", "{30C7273A-87CC-499F-9206-48F89082AE0C}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Ad-Hoc|Any CPU = Ad-Hoc|Any CPU @@ -308,90 +306,6 @@ Global {2230CC85-32B9-441C-A3C2-0DB4CC1D8CE9}.ShimmerAPIBasic|x64.Build.0 = Debug|Any CPU {2230CC85-32B9-441C-A3C2-0DB4CC1D8CE9}.ShimmerAPIBasic|x86.ActiveCfg = Debug|Any CPU {2230CC85-32B9-441C-A3C2-0DB4CC1D8CE9}.ShimmerAPIBasic|x86.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Ad-Hoc|Any CPU.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Ad-Hoc|Any CPU.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Ad-Hoc|ARM.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Ad-Hoc|ARM.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Ad-Hoc|ARM64.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Ad-Hoc|ARM64.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Ad-Hoc|iPhone.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Ad-Hoc|iPhone.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Ad-Hoc|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Ad-Hoc|iPhoneSimulator.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Ad-Hoc|x64.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Ad-Hoc|x64.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Ad-Hoc|x86.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Ad-Hoc|x86.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.AppStore|Any CPU.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.AppStore|Any CPU.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.AppStore|ARM.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.AppStore|ARM.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.AppStore|ARM64.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.AppStore|ARM64.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.AppStore|iPhone.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.AppStore|iPhone.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.AppStore|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.AppStore|iPhoneSimulator.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.AppStore|x64.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.AppStore|x64.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.AppStore|x86.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.AppStore|x86.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|ARM.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|ARM.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|ARM64.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|ARM64.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|iPhone.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|iPhone.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x64.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x64.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x86.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Debug|x86.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|Any CPU.Build.0 = Release|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|ARM.ActiveCfg = Release|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|ARM.Build.0 = Release|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|ARM64.ActiveCfg = Release|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|ARM64.Build.0 = Release|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|iPhone.ActiveCfg = Release|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|iPhone.Build.0 = Release|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|iPhoneSimulator.Build.0 = Release|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x64.ActiveCfg = Release|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x64.Build.0 = Release|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x86.ActiveCfg = Release|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.Release|x86.Build.0 = Release|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|Any CPU.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|Any CPU.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|ARM.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|ARM.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|ARM64.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|ARM64.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|iPhone.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|iPhone.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|iPhoneSimulator.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x64.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x64.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x86.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPI|x86.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|Any CPU.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|Any CPU.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|ARM.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|ARM.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|ARM64.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|ARM64.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|iPhone.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|iPhone.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|iPhoneSimulator.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|iPhoneSimulator.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x64.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x64.Build.0 = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x86.ActiveCfg = Debug|Any CPU - {30C7273A-87CC-499F-9206-48F89082AE0C}.ShimmerAPIBasic|x86.Build.0 = Debug|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From e5c2b392febf101ad402683d0734686397c6809e Mon Sep 17 00:00:00 2001 From: ShimmerEngineering Date: Mon, 7 Mar 2022 20:32:24 +0800 Subject: [PATCH 08/20] Update dotnet472.yml --- .github/workflows/dotnet472.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet472.yml b/.github/workflows/dotnet472.yml index 7d743e74..af96c80d 100644 --- a/.github/workflows/dotnet472.yml +++ b/.github/workflows/dotnet472.yml @@ -1,4 +1,4 @@ -name: .NET +name: ShimmerBluetoothAPIUnitTest on: push: From 08984b1c8a6959b32d2cba5392b2ca8ce21ced9a Mon Sep 17 00:00:00 2001 From: ShimmerEngineering Date: Mon, 7 Mar 2022 20:36:54 +0800 Subject: [PATCH 09/20] Update dotnet472.yml --- .github/workflows/dotnet472.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/dotnet472.yml b/.github/workflows/dotnet472.yml index af96c80d..5cfa8bce 100644 --- a/.github/workflows/dotnet472.yml +++ b/.github/workflows/dotnet472.yml @@ -15,8 +15,6 @@ jobs: - uses: actions/checkout@v2 - name: Setup MSBuild Path uses: microsoft/setup-msbuild@v1 - - name: Setup NuGet - uses: NuGet/setup-nuget@v1.0.2 - name: Build run: msbuild ./ShimmerAPI/ShimmerAPITest.sln - name: Test From d390048aaa46211257f5fc3231be51b7bd249bff Mon Sep 17 00:00:00 2001 From: ShimmerEngineering Date: Mon, 7 Mar 2022 20:43:43 +0800 Subject: [PATCH 10/20] Update dotnet472.yml --- .github/workflows/dotnet472.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/dotnet472.yml b/.github/workflows/dotnet472.yml index 5cfa8bce..02bb4020 100644 --- a/.github/workflows/dotnet472.yml +++ b/.github/workflows/dotnet472.yml @@ -13,8 +13,16 @@ jobs: steps: - uses: actions/checkout@v2 + - name: Setup .NET + uses: actions/setup-dotnet@v1 + with: + dotnet-version: 5.0.x - name: Setup MSBuild Path uses: microsoft/setup-msbuild@v1 + - name: Setup Nuget + uses: Nuget/setup-nuget@v1.0.5 + - name: Restore nuget packages + run: nuget restore ./ShimmerAPI/ShimmerAPITest.sln - name: Build run: msbuild ./ShimmerAPI/ShimmerAPITest.sln - name: Test From ee7e7e36bfe82e1cf70ec4cc5e0f2d9ad4537d20 Mon Sep 17 00:00:00 2001 From: JongChern Date: Mon, 7 Mar 2022 21:12:58 +0800 Subject: [PATCH 11/20] Update dotnet472.yml --- .github/workflows/dotnet472.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dotnet472.yml b/.github/workflows/dotnet472.yml index 02bb4020..bde0bd51 100644 --- a/.github/workflows/dotnet472.yml +++ b/.github/workflows/dotnet472.yml @@ -26,5 +26,5 @@ jobs: - name: Build run: msbuild ./ShimmerAPI/ShimmerAPITest.sln - name: Test - run: msbuild test ./ShimmerAPI/ShimmerAPITest.sln --no-build --verbosity normal + run: msbuild test ./ShimmerAPI/ShimmerUnitTests/ShimmerUnitTests.csproj From 22e3ba895ba666b6ba3481c719ee2150dae50011 Mon Sep 17 00:00:00 2001 From: JongChern Date: Mon, 7 Mar 2022 21:31:13 +0800 Subject: [PATCH 12/20] Update and rename dotnet472.yml to ShimmerBluetoothAPIUnitTest.yml --- .../{dotnet472.yml => ShimmerBluetoothAPIUnitTest.yml} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename .github/workflows/{dotnet472.yml => ShimmerBluetoothAPIUnitTest.yml} (83%) diff --git a/.github/workflows/dotnet472.yml b/.github/workflows/ShimmerBluetoothAPIUnitTest.yml similarity index 83% rename from .github/workflows/dotnet472.yml rename to .github/workflows/ShimmerBluetoothAPIUnitTest.yml index bde0bd51..d8932584 100644 --- a/.github/workflows/dotnet472.yml +++ b/.github/workflows/ShimmerBluetoothAPIUnitTest.yml @@ -25,6 +25,6 @@ jobs: run: nuget restore ./ShimmerAPI/ShimmerAPITest.sln - name: Build run: msbuild ./ShimmerAPI/ShimmerAPITest.sln - - name: Test - run: msbuild test ./ShimmerAPI/ShimmerUnitTests/ShimmerUnitTests.csproj + - name: Run a one-line script + run: '& "$(vswhere -property installationPath)\Common7\IDE\MSTest.exe" /help' From f29861c46b3ff66e53431a9d9b7531c6e4a486ee Mon Sep 17 00:00:00 2001 From: JongChern Date: Mon, 7 Mar 2022 21:53:30 +0800 Subject: [PATCH 13/20] Update ShimmerBluetoothAPIUnitTest.yml --- .github/workflows/ShimmerBluetoothAPIUnitTest.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ShimmerBluetoothAPIUnitTest.yml b/.github/workflows/ShimmerBluetoothAPIUnitTest.yml index d8932584..1ed06c5d 100644 --- a/.github/workflows/ShimmerBluetoothAPIUnitTest.yml +++ b/.github/workflows/ShimmerBluetoothAPIUnitTest.yml @@ -17,6 +17,8 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: 5.0.x + - name: Setup VSTest Path + uses: darenm/Setup-VSTest@v1 - name: Setup MSBuild Path uses: microsoft/setup-msbuild@v1 - name: Setup Nuget @@ -25,6 +27,7 @@ jobs: run: nuget restore ./ShimmerAPI/ShimmerAPITest.sln - name: Build run: msbuild ./ShimmerAPI/ShimmerAPITest.sln - - name: Run a one-line script - run: '& "$(vswhere -property installationPath)\Common7\IDE\MSTest.exe" /help' + - name: VSTest + run: vstest.console.exe ./ShimmerAPI/ShimmerUnitTests/ShimmerUnitTests.csproj + From ca4b914356d99187e1ed25296de4b6660370dc6c Mon Sep 17 00:00:00 2001 From: JongChern Date: Mon, 7 Mar 2022 22:05:10 +0800 Subject: [PATCH 14/20] Update ShimmerBluetoothAPIUnitTest.yml --- .github/workflows/ShimmerBluetoothAPIUnitTest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ShimmerBluetoothAPIUnitTest.yml b/.github/workflows/ShimmerBluetoothAPIUnitTest.yml index 1ed06c5d..5a069ce6 100644 --- a/.github/workflows/ShimmerBluetoothAPIUnitTest.yml +++ b/.github/workflows/ShimmerBluetoothAPIUnitTest.yml @@ -28,6 +28,6 @@ jobs: - name: Build run: msbuild ./ShimmerAPI/ShimmerAPITest.sln - name: VSTest - run: vstest.console.exe ./ShimmerAPI/ShimmerUnitTests/ShimmerUnitTests.csproj + run: vstest.console.exe ./ShimmerAPI/ShimmerUnitTests/bin/Debug/ShimmerBluetoothTests.dll From 65819cc80d89f873582679073246fc418fbe9683 Mon Sep 17 00:00:00 2001 From: Jong Chern Date: Mon, 7 Mar 2022 22:10:36 +0800 Subject: [PATCH 15/20] fail --- ShimmerAPI/ShimmerUnitTests/ShimmerReadDataPacketTest.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/ShimmerAPI/ShimmerUnitTests/ShimmerReadDataPacketTest.cs b/ShimmerAPI/ShimmerUnitTests/ShimmerReadDataPacketTest.cs index a92ca070..49a9650f 100644 --- a/ShimmerAPI/ShimmerUnitTests/ShimmerReadDataPacketTest.cs +++ b/ShimmerAPI/ShimmerUnitTests/ShimmerReadDataPacketTest.cs @@ -23,6 +23,7 @@ public void Initialize() [TestMethod] public void TestPacketParserNoErrors() { + Assert.Fail(); sbrd.start(); while (ojcArray.Count < 10) { From 59bce4e1ee55e0bf3cac982fc45d79fdfede312e Mon Sep 17 00:00:00 2001 From: Jong Chern Date: Mon, 7 Mar 2022 22:16:57 +0800 Subject: [PATCH 16/20] undo test --- ShimmerAPI/ShimmerUnitTests/ShimmerReadDataPacketTest.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/ShimmerAPI/ShimmerUnitTests/ShimmerReadDataPacketTest.cs b/ShimmerAPI/ShimmerUnitTests/ShimmerReadDataPacketTest.cs index 49a9650f..a92ca070 100644 --- a/ShimmerAPI/ShimmerUnitTests/ShimmerReadDataPacketTest.cs +++ b/ShimmerAPI/ShimmerUnitTests/ShimmerReadDataPacketTest.cs @@ -23,7 +23,6 @@ public void Initialize() [TestMethod] public void TestPacketParserNoErrors() { - Assert.Fail(); sbrd.start(); while (ojcArray.Count < 10) { From 965f49f136b871311cf90e67bb91d10c4a2da6e1 Mon Sep 17 00:00:00 2001 From: ShimmerEngineering Date: Mon, 7 Mar 2022 22:32:47 +0800 Subject: [PATCH 17/20] Update and rename dotnet.yml to ShimmerBLEAPIUnitTest.yml --- .github/workflows/{dotnet.yml => ShimmerBLEAPIUnitTest.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{dotnet.yml => ShimmerBLEAPIUnitTest.yml} (95%) diff --git a/.github/workflows/dotnet.yml b/.github/workflows/ShimmerBLEAPIUnitTest.yml similarity index 95% rename from .github/workflows/dotnet.yml rename to .github/workflows/ShimmerBLEAPIUnitTest.yml index fffa54f8..1507d51c 100644 --- a/.github/workflows/dotnet.yml +++ b/.github/workflows/ShimmerBLEAPIUnitTest.yml @@ -1,4 +1,4 @@ -name: .NET +name: ShimmerBLEAPIUnitTest on: push: From 1a5eb7dd08b2da7e4a6b1e7a11d3aa3ee4a001f9 Mon Sep 17 00:00:00 2001 From: Jong Chern Date: Mon, 7 Mar 2022 22:50:42 +0800 Subject: [PATCH 18/20] revert some changes --- .../ShimmerBluetoothTests/ShimmerBluetoothCommandsUnitTest.cs | 2 +- .../ShimmerBluetoothTests/ShimmerBluetoothStreamingUnitTest.cs | 2 +- ShimmerAPI/ShimmerBluetoothTests/ShimmerECGMDConstructor.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ShimmerAPI/ShimmerBluetoothTests/ShimmerBluetoothCommandsUnitTest.cs b/ShimmerAPI/ShimmerBluetoothTests/ShimmerBluetoothCommandsUnitTest.cs index 63045bc4..b9b02f96 100644 --- a/ShimmerAPI/ShimmerBluetoothTests/ShimmerBluetoothCommandsUnitTest.cs +++ b/ShimmerAPI/ShimmerBluetoothTests/ShimmerBluetoothCommandsUnitTest.cs @@ -11,7 +11,7 @@ namespace ShimmerBluetoothTests [TestClass] public class ShimmerBluetoothCommandsUnitTest { - String comPort = "COM4"; + String comPort = "COM29"; String deviceName = "testName"; ShimmerLogAndStreamSystemSerialPort shimmerDevice; diff --git a/ShimmerAPI/ShimmerBluetoothTests/ShimmerBluetoothStreamingUnitTest.cs b/ShimmerAPI/ShimmerBluetoothTests/ShimmerBluetoothStreamingUnitTest.cs index 1d7be0b8..7efca489 100644 --- a/ShimmerAPI/ShimmerBluetoothTests/ShimmerBluetoothStreamingUnitTest.cs +++ b/ShimmerAPI/ShimmerBluetoothTests/ShimmerBluetoothStreamingUnitTest.cs @@ -11,7 +11,7 @@ namespace ShimmerBluetoothTests [TestClass] public class ShimmerBluetoothUnitTest { - String comPort = "COM4"; + String comPort = "COM29"; String deviceName = "testName"; ShimmerLogAndStreamSystemSerialPort shimmerDevice; ObjectCluster ojc = null; diff --git a/ShimmerAPI/ShimmerBluetoothTests/ShimmerECGMDConstructor.cs b/ShimmerAPI/ShimmerBluetoothTests/ShimmerECGMDConstructor.cs index 74ed948a..3ce4249d 100644 --- a/ShimmerAPI/ShimmerBluetoothTests/ShimmerECGMDConstructor.cs +++ b/ShimmerAPI/ShimmerBluetoothTests/ShimmerECGMDConstructor.cs @@ -10,7 +10,7 @@ namespace ShimmerBluetoothTests public class ShimmerECGMDConstructor { - String comport = "COM3"; + String comport = "COM29"; ArrayList ojcArray = new ArrayList(); ObjectCluster ojc = null; From 17978af8d1682037fd528c4a7b82dbae4527bff5 Mon Sep 17 00:00:00 2001 From: Jong Chern Date: Mon, 7 Mar 2022 22:54:59 +0800 Subject: [PATCH 19/20] removed file --- .../OrderedTestECGMDConstructor.orderedtest | 7 ------- ShimmerAPI/ShimmerUnitTests/ShimmerUnitTests.csproj | 3 --- 2 files changed, 10 deletions(-) delete mode 100644 ShimmerAPI/ShimmerUnitTests/OrderedTestECGMDConstructor.orderedtest diff --git a/ShimmerAPI/ShimmerUnitTests/OrderedTestECGMDConstructor.orderedtest b/ShimmerAPI/ShimmerUnitTests/OrderedTestECGMDConstructor.orderedtest deleted file mode 100644 index 765b0124..00000000 --- a/ShimmerAPI/ShimmerUnitTests/OrderedTestECGMDConstructor.orderedtest +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/ShimmerAPI/ShimmerUnitTests/ShimmerUnitTests.csproj b/ShimmerAPI/ShimmerUnitTests/ShimmerUnitTests.csproj index de406d8b..cb3d2084 100644 --- a/ShimmerAPI/ShimmerUnitTests/ShimmerUnitTests.csproj +++ b/ShimmerAPI/ShimmerUnitTests/ShimmerUnitTests.csproj @@ -62,9 +62,6 @@ - - PreserveNewest - From d9fd588e69864aba6da96c3c9d847d6a6834a795 Mon Sep 17 00:00:00 2001 From: Mas Azalya Yusof Date: Tue, 8 Mar 2022 15:32:29 +0800 Subject: [PATCH 20/20] fix null exception on demo pair --- .../VerisenseBLEDemoApp/VerisenseBLEDemoApp/MainPage.xaml.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ShimmerBLE/VerisenseBLEDemoApp/VerisenseBLEDemoApp/MainPage.xaml.cs b/ShimmerBLE/VerisenseBLEDemoApp/VerisenseBLEDemoApp/MainPage.xaml.cs index 9df46711..883afaae 100644 --- a/ShimmerBLE/VerisenseBLEDemoApp/VerisenseBLEDemoApp/MainPage.xaml.cs +++ b/ShimmerBLE/VerisenseBLEDemoApp/VerisenseBLEDemoApp/MainPage.xaml.cs @@ -750,8 +750,11 @@ async void OnButtonClickedPair(object sender, EventArgs args) } LBLPairing.Text = "Pairing..."; - verisenseBLEDevice.ShimmerBLEEvent += ShimmerDevice_BLEEvent; var result = await bleManager.PairVerisenseDevice(DeviceToBePaired, new VerisenseBLEPairingKeyGenerator()); + if (verisenseBLEDevice != null) + { + verisenseBLEDevice.ShimmerBLEEvent += ShimmerDevice_BLEEvent; + } if (!result) { LBLPairing.Text = "Device Failed To Pair";