Merge pull request #139 from OpenEarable/2.2.2

2.2.2

Author: TobiasRoeddiger

.github/workflows/build_firmware.yaml

@@ -50,9 +50,9 @@ jobs:
 
       - name: Install Zephyr SDK
         run: |
-          wget -q https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.16.4/zephyr-sdk-0.16.4_linux-x86_64_minimal.tar.xz
-          tar xf zephyr-sdk-0.16.4_linux-x86_64_minimal.tar.xz -C ~/
-          ~/zephyr-sdk-0.16.4/setup.sh -c -t arm-zephyr-eabi
+          wget -q https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v0.17.0/zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz
+          tar xf zephyr-sdk-0.17.0_linux-x86_64_minimal.tar.xz -C ~/
+          ~/zephyr-sdk-0.17.0/setup.sh -c -t arm-zephyr-eabi
 
       - name: Initialize Zephyr Workspace
         # Set up the Zephyr workspace and install the Python dependencies

CMakeLists.txt

@@ -55,6 +55,7 @@ zephyr_library_include_directories(
     src/SD_Card/SDLogger
     src/SD_Card/Benchmark
     src/SD_Card/SD_Card_Manager
+    src/time_sync
 )
 
 zephyr_library_include_directories(app PRIVATE
@@ -74,6 +75,7 @@ add_subdirectory(src/SensorManager)
 add_subdirectory(src/SD_Card/SDLogger)
 add_subdirectory(src/SD_Card/Benchmark)
 add_subdirectory(src/SD_Card/SD_Card_Manager)
+add_subdirectory(src/time_sync)
 
 ## Cirrus Logic
 if (CONFIG_HW_CODEC_CIRRUS_LOGIC)

README.md

@@ -2,7 +2,8 @@
 
 [OpenEarable](openearable.com) is the world's first fully open-source AI platform for ear-based sensing applications with true wireless audio. Packed with an unprecedented array of high-precision sensors, OpenEarable redefines what's possible in wearable tech. Designed for both development and research applications, OpenEarable is modular, reconfigurable, and built for the future.
 <br/><br/><br/>
-![image](https://github.com/user-attachments/assets/8cb55571-c6bc-4f51-b2ae-628f7be3661c)
+<img width="1323" height="568" alt="image" src="https://github.com/user-attachments/assets/ab4e2b0e-9645-4428-975f-466c7ef2f13b" />
+
 
 ## Table of Contents
 
@@ -63,56 +64,65 @@
         - Do not set any of the FOTA flags described above.
 
 9. **J-Link Setup**
-     - Wire your J-Link to the debugging breakout PCB as shown below.
-     ![image](https://github.com/user-attachments/assets/2eeec41e-6be1-4a4f-b986-7d9a07b0f8e5)
-     - If you do not own a J-Link yet, here are a few options (do **NOT** use J-Link clones, they will not work and are illegal!):
-          - [J-Link EDU Mini](https://mou.sr/3LrwiVe) (available to educational institutions, private persons, and students) with [JTAG adapter](https://www.adafruit.com/product/2094) and [cable](https://www.adafruit.com/product/1675).
-          - Full-scale J-Link for commercial use (e.g., [J-Link BASE Compact](https://mou.sr/4oQkAls)).
-          - ⚠️ The wiring show in the figure above is for the full-scale J-Link pinout. If you use the [JTAG adapter](https://www.adafruit.com/product/2094) the wiring may be different so make sure it is correct in your case! _(to be confirmed, picture coming soon)_.
-
-
-10. **Build and Flash**
+   - Wire your J-Link to the debugging breakout PCB as shown below.
+   ![image](https://github.com/user-attachments/assets/2eeec41e-6be1-4a4f-b986-7d9a07b0f8e5)
+   - If you do not own a J-Link yet, here are a few options (do **NOT** use J-Link clones, they will not work and are illegal!):
+      - [J-Link EDU Mini](https://mou.sr/3LrwiVe) (available to educational institutions, private persons, and students) with [JTAG adapter](https://www.adafruit.com/product/2094) and [cable](https://www.adafruit.com/product/1675).
+      - Full-scale J-Link for commercial use (e.g., [J-Link BASE Compact](https://mou.sr/4oQkAls)).
+      - ⚠️ The wiring show in the figure above is for the full-scale J-Link pinout. If you use the [JTAG adapter](https://www.adafruit.com/product/2094) the wiring may be different so make sure it is correct in your case!.
+
+11. **Build and Flash**
    - Click on `Generate and Build` and wait for the application to build (this will take some time)
    - Make sure your device is charged or powered via USB. If the battery is fully discharged, the charging management IC will no longer supply power to the MCU from the battery, so you won’t be able to flash the MCU unless the battery is charged or the device is directly powered via USB.
    - Open a new terminal in VS Code and run the following command from the root of the `open-earable-v2` directory to flash the FOTA build. Make sure to set the serial number of your J-Link (right click your J-Link in the `CONNECTED DEVICES` tab of the nRF connect extension and copy the serial number).
-     ```bash
-     # --right for the right ear device, or no flag to retain left/right bonding
-     # --hw version is optional and can only be used with --left or --right
-     ./tools/flash/flash_fota.sh --snr 123456789 --left --hw 2.0.1    
-   
-     ```
+   ```bash
+   # --right for the right ear device, or no flag to retain left/right bonding, --standalone for no pair   
+   # --hw version is optional and can only be used with --left or --right
+   ./tools/flash/flash_fota.sh --snr 123456789 --left --hw 2.0.1    
+   ```
+
    - or without FOTA
-     ```bash
-     # --right for the right ear device, or no flag to retain left/right bonding
-      # --hw version is optional and can only be used with --left or --right
-     ./tools/flash/flash.sh --snr 123456789 --left --hw 2.0.1      
-     ```
+   ```bash
+   # --right for the right ear device, or no flag to retain left/right bonding, --standalone for no pair
+   # --hw version is optional and can only be used with --left or --right
+
+   ./tools/flash/flash.sh --snr 123456789 --left    
+   ```
+     
    - The FOTA update script is also available for Windows as `./tools/flash/flash_fota.ps1`. To execute it, open PowerShell with administrative privileges.
 
 11. **Recover Board**
-- If the application or network core becomes unresponsive, or you encounter flashing issues, you can recover the board using the recovery script. The `--snr` parameter specifies the serial number of your J-Link debugger.
-- Ensure the device is powered via USB or that the battery is sufficiently charged before running the recovery process. Otherwise, the MCU may not power up correctly and the recovery will fail.
-     ```bash
-     ./tools/flash/recover.sh --snr 123456789
-     ```
-- After successful recovery, you can attempt to flash the firmware again (you will have to restore left/right bonding and hardware version).
+   - If the application or network core becomes unresponsive, or you encounter flashing issues, you can recover the board using the recovery script. The `--snr` parameter specifies the serial number of your J-Link debugger.
+   - Ensure the device is powered via USB or that the battery is sufficiently charged before running the recovery process. Otherwise, the MCU may not power up correctly and the recovery will fail.
+   ```bash
+   ./tools/flash/recover.sh --snr 123456789
+   ```
+   - After successful recovery, you can attempt to flash the firmware again.
 
 12. **Enable Debug Output**
-- Open the **J-Link Configuration** program on your computer.  
-   - On macOS: Press `CMD` + `Space` and search for `J-Link Config`.  
-   - On Windows: Search for the program from the taskbar.  
-- Ensure your J-Link is connected to your computer.  
-- In the **Connected via USB** table, locate your J-Link device. Double-click it or right-click and select **Configure**.  
-- Find the **Virtual COM-Port** option and select **Enable**. Click **OK** to apply the setting.  
-- Open **Visual Studio Code**.  
-- In the left sidebar, open the **Extensions** menu.  
-- Search for and install the [**Serial Monitor**](https://marketplace.visualstudio.com/items?itemName=ms-vscode.vscode-serial-monitor) extension.  
-- In the top menu bar, click **Terminal → New Terminal**.  
-- A terminal window will appear at the bottom of VS Code. Open the **Serial Monitor** tab.  
-- In the **Port** dropdown menu, select your J-Link’s COM port.  
-- Set the **Baud rate** to **115200**.  
-- Click **Start Monitoring**.  
-- Ensure your earable is connected to the debugger probe. You should now see debug output appearing when you interact with the device (e.g., press button).
+   - Open the **J-Link Configuration** program on your computer.  
+      - On macOS: Press `CMD` + `Space` and search for `J-Link Config`.  
+      - On Windows: Search for the program from the taskbar.  
+   - Ensure your J-Link is connected to your computer.  
+   - In the **Connected via USB** table, locate your J-Link device. Double-click it or right-click and select **Configure**.  
+   - Find the **Virtual COM-Port** option and select **Enable**. Click **OK** to apply the setting.  
+   - Open **Visual Studio Code**.  
+   - In the left sidebar, open the **Extensions** menu.  
+      - Search for and install the [**Serial Monitor**](https://marketplace.visualstudio.com/items?itemName=ms-vscode.vscode-serial-monitor) extension.  
+      - In the top menu bar, click **Terminal → New Terminal**.  
+      - A terminal window will appear at the bottom of VS Code. Open the **Serial Monitor** tab.  
+      - In the **Port** dropdown menu, select your J-Link’s COM port.  
+      - Set the **Baud rate** to **115200**.  
+      - Click **Start Monitoring**.  
+      - Ensure your earable is connected to the debugger probe. You should now see debug output appearing when you interact with the device (e.g., press button).
+
+13. **Recover Board**
+   - If the application or network core becomes unresponsive, or you encounter flashing issues, you can recover the board using the recovery script. The `--snr` parameter specifies the serial number of your J-Link debugger.
+   - Ensure the device is powered via USB or that the battery is sufficiently charged before running the recovery process. Otherwise, the MCU may not power up correctly and the recovery will fail.
+      ```bash
+      ./tools/flash/recover.sh --snr 123456789
+      ```
+   - After successful recovery, you can attempt to flash the firmware again (you will have to restore left/right bonding and hardware version).
 
 
 

VERSION

@@ -1,5 +1,5 @@
 VERSION_MAJOR = 2
 VERSION_MINOR = 2
-PATCHLEVEL = 1
+PATCHLEVEL = 2
 VERSION_TWEAK = 0
 EXTRAVERSION =

include/openearable_common.h

@@ -12,8 +12,19 @@
 
 #define SENSOR_DATA_FIXED_LENGTH 38
 
+
 #define millis() k_cyc_to_ms_floor64(k_uptime_ticks())
-#define micros() k_cyc_to_us_floor64(k_uptime_ticks())
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+uint64_t oe_micros();
+#ifdef __cplusplus
+}
+#endif
+#ifndef micros
+#define micros() oe_micros()
+#endif
 
 #define load_switch_sd_id DT_NODELABEL(load_switch_sd)
 #define load_switch_1_8_id DT_NODELABEL(load_switch)

prj_fota.conf

@@ -260,4 +260,4 @@ CONFIG_MCUMGR_GRP_OS_RESET_HOOK=y
 
 #CONFIG_MCUMGR_GRP_SETTINGS_ACCESS_HOOK=y
 
-CONFIG_SETUP_FUEL_GAUGE=y
+CONFIG_SETUP_FUEL_GAUGE=y

src/ParseInfo/SensorScheme.cpp

@@ -13,13 +13,6 @@
 
 LOG_MODULE_REGISTER(parse_info_service, CONFIG_LOG_DEFAULT_LEVEL);
 
-static void enable_notifies_handler(struct k_work *work)
-{
-    temp_disable_notifies(false);
-}
-
-K_WORK_DELAYABLE_DEFINE(enable_notifies_work, enable_notifies_handler);
-
 static char* parseInfoScheme;
 static size_t parseInfoSchemeSize;
 
@@ -40,11 +33,7 @@ static ssize_t read_parse_info(struct bt_conn *conn,
                 void *buf,
                 uint16_t len,
                 uint16_t offset) {
-	temp_disable_notifies(true);
     ssize_t ret = bt_gatt_attr_read(conn, attr, buf, len, offset, parseInfoScheme, parseInfoSchemeSize);
-    
-    // re-enable notifications after a delay
-    k_work_schedule(&enable_notifies_work, K_MSEC(500));
 
     return ret;
 }