Feature/audio response

.github/workflows/build_firmware.yaml

@@ -28,6 +28,7 @@ jobs:
           # Clone the repo to a subdirectory, so we can initialize the Zephyr
           # workspace in the parent directory.
           path: zephyr-workspace/open-earable-v2
+          submodules: recursive
 
       - name: Cache/Install APT Packages
         uses: awalsh128/cache-apt-pkgs-action@latest

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "protocol"]
+	path = protocol
+	url = https://github.com/OpenEarable/protocol.git

CMakeLists.txt

@@ -76,6 +76,9 @@ 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)
+add_subdirectory(protocol/generated/c)
+
+target_link_libraries(open_earable_protocols PRIVATE zephyr_interface)
 
 ## Cirrus Logic
 if (CONFIG_HW_CODEC_CIRRUS_LOGIC)
@@ -88,3 +91,5 @@ endif()
 
 include(version.cmake)
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/include)
+
+target_link_libraries(app PRIVATE open_earable_protocols)

include/openearable_common.h

@@ -115,7 +115,6 @@ struct sensor_config {
 	uint8_t storageOptions;
 } __attribute__((packed));
 
-
 struct battery_settings {
     float u_nominal;
     float u_term;

prj.conf

@@ -100,6 +100,10 @@ CONFIG_SFLOAT=y
 
 CONFIG_FPU=y
 
+CONFIG_CMSIS_DSP=y
+CONFIG_CMSIS_DSP_TRANSFORM=y
+CONFIG_CMSIS_DSP_COMPLEXMATH=y
+
 CONFIG_NEWLIB_LIBC=y
 CONFIG_NEWLIB_LIBC_FLOAT_PRINTF=y
 CONFIG_NEWLIB_LIBC_FLOAT_SCANF=y
@@ -182,7 +186,13 @@ CONFIG_FS_FATFS_EXFAT=y      # Enable exFAT support
 
 CONFIG_FDSP=y
 
+# CMSIS-DSP Configuration
+CONFIG_CMSIS_DSP=y
+CONFIG_CMSIS_DSP_TRANSFORM=y
+CONFIG_CMSIS_DSP_COMPLEXMATH=y
+
 CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
+CONFIG_AUDIO_RESPONSE_MAX_SAMPLES=32000
 
 #CONFIG_USB_MASS_STORAGE=y
 #CONFIG_MASS_STORAGE_STACK_SIZE=1024

prj_fota.conf

@@ -261,3 +261,9 @@ CONFIG_MCUMGR_GRP_OS_RESET_HOOK=y
 #CONFIG_MCUMGR_GRP_SETTINGS_ACCESS_HOOK=y
 
 CONFIG_SETUP_FUEL_GAUGE=y
+
+CONFIG_CMSIS_DSP=y
+CONFIG_CMSIS_DSP_TRANSFORM=y
+CONFIG_CMSIS_DSP_COMPLEXMATH=y
+
+CONFIG_AUDIO_RESPONSE_MAX_SAMPLES=32000

src/Battery/BQ25120a.cpp

@@ -243,10 +243,8 @@ uint8_t BQ25120a::write_LDO_voltage_control(float volt) {
 
         readReg(registers::LS_LDO_CTRL, &status, sizeof(status));
 
-        //status |= (((uint16_t)((volt - 0.8) * 10)) & 0x1F) << 2;
         status &= 1 << 7;
         status |= ((uint8_t)((volt - 0.8f) * 10 + EPS)) << 2;
-        //status |= 1 << 7;
 
         writeReg(registers::LS_LDO_CTRL, &status, sizeof(status));
 
@@ -292,8 +290,6 @@ chrg_state BQ25120a::read_termination_control() {
 
         struct chrg_state chrg;
 
-        // if (!ret) printk("failed to read\n");
-
         chrg.enabled = status & 0x2;
         //chrg.high_impedance = status & 0x1;
 
@@ -343,8 +339,6 @@ ilim_uvlo BQ25120a::read_uvlo_ilim() {
 
         bool ret = readReg(registers::ILIM_UVLO, (uint8_t *) &status, sizeof(status));
 
-        // if (!ret) printk("failed to read\n");
-
         param.uvlo_v = CLAMP(3.0f- 0.2f * ((status & 0x7) - 2), 2.2, 3.0);
         param.lim_mA = 50.f + 50.f * ((status >> 3) & 0x7);
 
@@ -410,8 +404,6 @@ button_state BQ25120a::read_button_state() {
         uint8_t status = 0;
         bool ret = readReg(registers::BTN_CTRL, (uint8_t *) &status, sizeof(status));
 
-        // if (!ret) printk("failed to read\n");
-
         btn.wake_1 = status & 0x2;
         btn.wake_2 = status & 0x1;
 

src/Battery/PowerManager.cpp

@@ -631,7 +631,7 @@ int PowerManager::power_down(bool fault) {
     ret = pm_device_action_run(ls_sd,  PM_DEVICE_ACTION_SUSPEND);
     ret = pm_device_action_run(ls_3_3, PM_DEVICE_ACTION_SUSPEND);
     ret = pm_device_action_run(ls_1_8, PM_DEVICE_ACTION_SUSPEND);
-    ret = pm_device_action_run(cons, PM_DEVICE_ACTION_SUSPEND);
+    ret = pm_device_action_run(cons,   PM_DEVICE_ACTION_SUSPEND);
 
     /*const struct device *const i2c = DEVICE_DT_GET(DT_NODELABEL(i2c1));
     ret = pm_device_action_run(i2c, PM_DEVICE_ACTION_SUSPEND);
@@ -666,27 +666,7 @@ void PowerManager::charge_task() {
         battery_controller.enable_charge();
     }
 
-    //if (last_charging_state != charging_state ||  ) {
-        k_work_submit(&fuel_gauge_work);
-        //state_inidicator.set_state()
-        /*switch (charging_state) {
-        case 0:
-            LOG_INF("charging state: ready");
-            break;
-        case 1:
-            LOG_INF("charging state: charging");
-            break;
-        case 2:
-            LOG_INF("charging state: done");
-            break;
-        case 3:
-            LOG_WRN("charging state: fault");
-
-            //battery_controller.setup(_battery_settings);
-
-            break;
-        }*/
-    //}
+    k_work_submit(&fuel_gauge_work);
 
     last_charging_state = charging_state;
 }

src/ParseInfo/ParseType.h

@@ -15,7 +15,7 @@ enum ParseType {
     PARSE_TYPE_DOUBLE,
 };
 
-const int parseTypeSizes[] = {
+static const int parseTypeSizes[] = {
     1,  // PARSE_TYPE_INT8
     1,  // PARSE_TYPE_UINT8
 

src/SD_Card/SDLogger/SDLogger.h

@@ -23,11 +23,6 @@ static_assert(BUFFER_SIZE % SD_BLOCK_SIZE == 0, "BUFFER_SIZE must be a multiple
 
 // Singleton pattern
 class SDLogger {
-protected:
-        // Add static instance pointer for work handler
-        //static SDLogger* instance_ptr;
-        //friend void sd_work_handler(struct k_work* work);
-
 private:
 
         SDCardManager* sd_card = nullptr;
@@ -84,14 +79,23 @@ class SDLogger {
         */
         int write_sensor_data(const void* const* data_blocks, const size_t* lengths, size_t block_count);
 
+        /**
+         * @brief Write a single sensor_data message to the log file
+         * @param msg The sensor_data message to write
+         * @return 0 on success, negative error code on failure
+         */
         int write_sensor_data(const sensor_data& msg);
 
         /**
-        * @brief End logging and close the current file
-        * @return 0 on success, negative error code on failure
-        */
+         * @brief End logging and close the current file
+         * @return 0 on success, negative error code on failure
+         */
         int end();
 
+        /**
+         * @brief Check if the logger is currently recording
+         * @return true if active, false otherwise
+         */
         bool is_active();
 
         SDLogger(SDLogger const&) = delete;

src/SensorManager/SensorManager.cpp

@@ -231,6 +231,7 @@ static void config_work_handler(struct k_work *work) {
 			std::string filename = recording_name_prefix + std::to_string(micros());
 			int ret = sdlogger.begin(filename);
 			if (ret == 0) state_indicator.set_sd_state(SD_RECORDING);
+			else LOG_ERR("Failed to start SDLogger, ret: %d", ret);
 		}
 	} else if (sd_sensors.find(config.sensorId) != sd_sensors.end()) {
 		sd_sensors.erase(config.sensorId);