Apple Notification Center Service - iOS

jakkra · Nov 17, 2023 · 713a3e5 · 713a3e5
1 parent b7bf0b0
commit 713a3e5
Show file tree

Hide file tree

Showing 8 changed files with 618 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -47,7 +47,7 @@ jobs:
       - name: Build firmware for iOS
         working-directory: ZSWatch
         run: |
-          west build app --build-dir ${{ matrix.board }}_${{ matrix.built_type }}_ios -p -b ${{ matrix.board }} -- -DOVERLAY_CONFIG=boards/${{ matrix.built_type }}.conf -DCONFIG_BLE_USES_AMS="y"
+          west build app --build-dir ${{ matrix.board }}_${{ matrix.built_type }}_ios -p -b ${{ matrix.board }} -- -DOVERLAY_CONFIG=boards/${{ matrix.built_type }}.conf -DCONFIG_BLE_USES_IOS="y"
           cd ${{ matrix.board }}_${{ matrix.built_type }}/zephyr
           mv zephyr.hex ${{ matrix.board }}_${{ matrix.built_type }}.hex || true
       

diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -60,7 +60,8 @@ target_sources(app PRIVATE src/ble/ble_aoa.c)
 target_sources(app PRIVATE src/ble/ble_comm.c)
 target_sources(app PRIVATE src/ble/ble_transport.c)
 target_sources(app PRIVATE src/ble/zsw_gatt_sensor_server.c)
-target_sources_ifdef(CONFIG_BLE_USES_AMS app PRIVATE src/ble/ble_ams.c)
+target_sources_ifdef(CONFIG_BLE_USES_IOS app PRIVATE src/ble/ble_ams.c)
+target_sources_ifdef(CONFIG_BLE_USES_IOS app PRIVATE src/ble/ble_ancs.c)
 
 target_sources(app PRIVATE src/sensors/zsw_imu.c)
 target_sources(app PRIVATE src/sensors/zsw_pressure_sensor.c)

diff --git a/app/Kconfig b/app/Kconfig
@@ -170,10 +170,12 @@ menu "ZSWatch"
 
         config BLE_USES_GADGETBRIDGE
             prompt "Smartphone interaction and notifications uses Gadgetbridge"
-        config BLE_USES_AMS
-            prompt "Smartphone uses Apple Media Service Client"
+        config BLE_USES_IOS
+            prompt "Smartphone uses Apple Services Client"
+            select BT_GATTP
             select BT_GATT_DM
             select BT_AMS_CLIENT
+            select BT_ANCS_CLIENT
         endchoice
 
     endmenu

diff --git a/app/src/applications/music_control/music_control_app.c b/app/src/applications/music_control/music_control_app.c
@@ -3,7 +3,7 @@
 #include <zsw_clock.h>
 #include <zephyr/zbus/zbus.h>
 
-#ifdef CONFIG_BLE_USES_AMS
+#ifdef CONFIG_BLE_USES_IOS
 #include "ble/ble_ams.h"
 #endif
 
@@ -85,7 +85,7 @@ static void on_music_ui_evt_music(music_control_ui_evt_type_t evt_type)
         ble_comm_send(buf, msg_len);
     }
 
-#elif defined(CONFIG_BLE_USES_AMS)
+#elif defined(CONFIG_BLE_USES_IOS)
 
     switch (evt_type) {
         case MUSIC_CONTROL_UI_CLOSE:
@@ -105,7 +105,7 @@ static void on_music_ui_evt_music(music_control_ui_evt_type_t evt_type)
             break;
     }
 
-#endif // CONFIG_BLE_USES_AMS
+#endif // CONFIG_BLE_USES_IOS
 }
 
 static void zbus_ble_comm_data_callback(const struct zbus_channel *chan)