diff --git a/ShimmerDriverPC/build.gradle b/ShimmerDriverPC/build.gradle
index 30d940db9..99d80bf33 100644
--- a/ShimmerDriverPC/build.gradle
+++ b/ShimmerDriverPC/build.gradle
@@ -33,6 +33,8 @@ test {
// this test requires a physical Shimmer2r to run
exclude '**/API_00001_ShimmerPC_GeneralBluetoothShimmer2R.class'
exclude '**/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sd_only.class'
+ exclude '**/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sync_master.class'
+ exclude '**/API_0000X_ByteCommunicationShimmer3lns0_16_11_w_sync_slave.class'
}
publishing {
diff --git a/ShimmerPCBasicExamples/libs/ShimmerBLEGrpc/Products/usr/local/bin/ShimmerBLEGrpc b/ShimmerPCBasicExamples/libs/ShimmerBLEGrpc/Products/usr/local/bin/ShimmerBLEGrpc
new file mode 100755
index 000000000..4da2ace06
Binary files /dev/null and b/ShimmerPCBasicExamples/libs/ShimmerBLEGrpc/Products/usr/local/bin/ShimmerBLEGrpc differ
diff --git a/ShimmerPCBasicExamples/libs/ShimmerBLEGrpc/Products/usr/local/bin/ShimmerBluetooth.framework/Resources b/ShimmerPCBasicExamples/libs/ShimmerBLEGrpc/Products/usr/local/bin/ShimmerBluetooth.framework/Resources
new file mode 120000
index 000000000..953ee36f3
--- /dev/null
+++ b/ShimmerPCBasicExamples/libs/ShimmerBLEGrpc/Products/usr/local/bin/ShimmerBluetooth.framework/Resources
@@ -0,0 +1 @@
+Versions/Current/Resources
\ No newline at end of file
diff --git a/ShimmerPCBasicExamples/libs/ShimmerBLEGrpc/Products/usr/local/bin/ShimmerBluetooth.framework/ShimmerBluetooth b/ShimmerPCBasicExamples/libs/ShimmerBLEGrpc/Products/usr/local/bin/ShimmerBluetooth.framework/ShimmerBluetooth
new file mode 120000
index 000000000..cf0e5e480
--- /dev/null
+++ b/ShimmerPCBasicExamples/libs/ShimmerBLEGrpc/Products/usr/local/bin/ShimmerBluetooth.framework/ShimmerBluetooth
@@ -0,0 +1 @@
+Versions/Current/ShimmerBluetooth
\ No newline at end of file
diff --git a/ShimmerPCBasicExamples/libs/ShimmerBLEGrpc/Products/usr/local/bin/ShimmerBluetooth.framework/Versions/A/Resources/Info.plist b/ShimmerPCBasicExamples/libs/ShimmerBLEGrpc/Products/usr/local/bin/ShimmerBluetooth.framework/Versions/A/Resources/Info.plist
new file mode 100644
index 000000000..1ad27178d
--- /dev/null
+++ b/ShimmerPCBasicExamples/libs/ShimmerBLEGrpc/Products/usr/local/bin/ShimmerBluetooth.framework/Versions/A/Resources/Info.plist
@@ -0,0 +1,52 @@
+
+
+
+
+ BuildMachineOSBuild
+ 24D70
+ CFBundleDevelopmentRegion
+ en
+ CFBundleDisplayName
+
+ CFBundleExecutable
+ ShimmerBluetooth
+ CFBundleIdentifier
+ com.shimmersensing.ShimmerBluetooth
+ CFBundleInfoDictionaryVersion
+ 6.0
+ CFBundleName
+ ShimmerBluetooth
+ CFBundlePackageType
+ FMWK
+ CFBundleShortVersionString
+ 1.0
+ CFBundleSupportedPlatforms
+
+ MacOSX
+
+ CFBundleVersion
+ 1
+ DTCompiler
+ com.apple.compilers.llvm.clang.1_0
+ DTPlatformBuild
+ 24B75
+ DTPlatformName
+ macosx
+ DTPlatformVersion
+ 15.1
+ DTSDKBuild
+ 24B75
+ DTSDKName
+ macosx15.1
+ DTXcode
+ 1610
+ DTXcodeBuild
+ 16B40
+ LSMinimumSystemVersion
+ 10.15
+ NSBluetoothAlwaysUsageDescription
+ Our app uses bluetooth to find, connect and transfer data between different devices
+ NSBluetoothPeripheralUsageDescription
+
+
+
diff --git a/ShimmerPCBasicExamples/libs/ShimmerBLEGrpc/Products/usr/local/bin/ShimmerBluetooth.framework/Versions/A/ShimmerBluetooth b/ShimmerPCBasicExamples/libs/ShimmerBLEGrpc/Products/usr/local/bin/ShimmerBluetooth.framework/Versions/A/ShimmerBluetooth
new file mode 100755
index 000000000..77d055d16
Binary files /dev/null and b/ShimmerPCBasicExamples/libs/ShimmerBLEGrpc/Products/usr/local/bin/ShimmerBluetooth.framework/Versions/A/ShimmerBluetooth differ
diff --git a/ShimmerPCBasicExamples/libs/ShimmerBLEGrpc/Products/usr/local/bin/ShimmerBluetooth.framework/Versions/A/_CodeSignature/CodeResources b/ShimmerPCBasicExamples/libs/ShimmerBLEGrpc/Products/usr/local/bin/ShimmerBluetooth.framework/Versions/A/_CodeSignature/CodeResources
new file mode 100644
index 000000000..9cd9450ec
--- /dev/null
+++ b/ShimmerPCBasicExamples/libs/ShimmerBLEGrpc/Products/usr/local/bin/ShimmerBluetooth.framework/Versions/A/_CodeSignature/CodeResources
@@ -0,0 +1,128 @@
+
+
+
+
+ files
+
+ Resources/Info.plist
+
+ fQHYkAnYLSPrp1z1w0a3qxFKxyQ=
+
+
+ files2
+
+ Resources/Info.plist
+
+ hash2
+
+ XLFdl8kPs0fAIPEdwbTkiG3FK/t6WrvGYQQfdx39EOs=
+
+
+
+ rules
+
+ ^Resources/
+
+ ^Resources/.*\.lproj/
+
+ optional
+
+ weight
+ 1000
+
+ ^Resources/.*\.lproj/locversion.plist$
+
+ omit
+
+ weight
+ 1100
+
+ ^Resources/Base\.lproj/
+
+ weight
+ 1010
+
+ ^version.plist$
+
+
+ rules2
+
+ .*\.dSYM($|/)
+
+ weight
+ 11
+
+ ^(.*/)?\.DS_Store$
+
+ omit
+
+ weight
+ 2000
+
+ ^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/
+
+ nested
+
+ weight
+ 10
+
+ ^.*
+
+ ^Info\.plist$
+
+ omit
+
+ weight
+ 20
+
+ ^PkgInfo$
+
+ omit
+
+ weight
+ 20
+
+ ^Resources/
+
+ weight
+ 20
+
+ ^Resources/.*\.lproj/
+
+ optional
+
+ weight
+ 1000
+
+ ^Resources/.*\.lproj/locversion.plist$
+
+ omit
+
+ weight
+ 1100
+
+ ^Resources/Base\.lproj/
+
+ weight
+ 1010
+
+ ^[^/]+$
+
+ nested
+
+ weight
+ 10
+
+ ^embedded\.provisionprofile$
+
+ weight
+ 20
+
+ ^version\.plist$
+
+ weight
+ 20
+
+
+
+
diff --git a/ShimmerPCBasicExamples/libs/ShimmerBLEGrpc/Products/usr/local/bin/ShimmerBluetooth.framework/Versions/Current b/ShimmerPCBasicExamples/libs/ShimmerBLEGrpc/Products/usr/local/bin/ShimmerBluetooth.framework/Versions/Current
new file mode 120000
index 000000000..8c7e5a667
--- /dev/null
+++ b/ShimmerPCBasicExamples/libs/ShimmerBLEGrpc/Products/usr/local/bin/ShimmerBluetooth.framework/Versions/Current
@@ -0,0 +1 @@
+A
\ No newline at end of file
diff --git a/ShimmerPCBasicExamples/src/main/java/com/shimmerresearch/simpleexamples/SensorMapsExample.java b/ShimmerPCBasicExamples/src/main/java/com/shimmerresearch/simpleexamples/SensorMapsExample.java
index 4a45d850d..0d9ee9f96 100644
--- a/ShimmerPCBasicExamples/src/main/java/com/shimmerresearch/simpleexamples/SensorMapsExample.java
+++ b/ShimmerPCBasicExamples/src/main/java/com/shimmerresearch/simpleexamples/SensorMapsExample.java
@@ -90,8 +90,12 @@ public class SensorMapsExample extends BasicProcessWithCallBack {
* @wbp.parser.entryPoint
*/
public void initialize() {
- //Set the default port to 50052, this is used if the software cannot start the gRPC server automatically
- BasicShimmerBluetoothManagerPc.mGRPCPort = 50052;
+ //Set the default port to 500XX, this is used if the software cannot start the gRPC server automatically
+ if(UtilShimmer.isOsMac()) {
+ BasicShimmerBluetoothManagerPc.mGRPCPort = 50000; //the bundled /libs/ShimmerBLEGrpc/ for Mac uses port 50000
+ } else {
+ BasicShimmerBluetoothManagerPc.mGRPCPort = 50052;
+ }
frame = new JFrame("Shimmer SensorMaps Example");
frame.setBounds(100, 100, 1200, 591);