Fix the button functions, clean up the project (#2266)

Author: beastoin

omi/firmware/devkit/prj_xiao_ble_sense_devkitv1-spisd.conf

@@ -98,7 +98,7 @@ CONFIG_LOG_DEFAULT_LEVEL=3
 CONFIG_OMI_CODEC_OPUS=y
 
 # SD Card Support
-CONFIG_OFFLINE_STORAGE=y
+CONFIG_OMI_OFFLINE_STORAGE=y
 CONFIG_DISK_ACCESS=y
 CONFIG_FILE_SYSTEM=y
 CONFIG_FAT_FILESYSTEM_ELM=y

omi/firmware/devkit/prj_xiao_ble_sense_devkitv2-adafruit.conf

@@ -41,7 +41,7 @@ CONFIG_BT_DIS_MODEL="Omi DevKit 2"
 CONFIG_BT_DIS_MANUF="Based Hardware"
 CONFIG_BT_DIS_FW_REV=y
 CONFIG_BT_DIS_HW_REV=y
-CONFIG_BT_DIS_FW_REV_STR="2.0.9"
+CONFIG_BT_DIS_FW_REV_STR="2.0.10"
 CONFIG_BT_DIS_HW_REV_STR="Seeed Xiao BLE Sense"
 
 #
@@ -79,8 +79,8 @@ CONFIG_NORDIC_QSPI_NOR=n
 # Console
 #
 # Disable the lines to enable console log
-CONFIG_CONSOLE=y
-CONFIG_PRINTK=y
+CONFIG_CONSOLE=n
+CONFIG_PRINTK=n
 
 #
 # Logs
@@ -95,7 +95,8 @@ CONFIG_PRINTK=y
 # CONFIG_LOG_BACKEND_UART_OUTPUT_TEXT=y
 
 # Enable the lines below to enable debug logs
-# CONFIG_LOG_DEFAULT_LEVEL=4
+# Warn: Level 4 is the cause of crashing
+# CONFIG_LOG_DEFAULT_LEVEL=3
 
 #
 # Log level and buffer size
@@ -199,7 +200,7 @@ CONFIG_PM_DEVICE=y
 
 CONFIG_OMI_CODEC_OPUS=y
 CONFIG_OMI_ENABLE_OFFLINE_STORAGE=y
-CONFIG_OMI_ENABLE_ACCELEROMETER=y
+CONFIG_OMI_ENABLE_ACCELEROMETER=n
 CONFIG_OMI_ENABLE_BUTTON=y
 CONFIG_OMI_ENABLE_SPEAKER=y
 CONFIG_OMI_ENABLE_BATTERY=y

omi/firmware/devkit/src/main.c

@@ -211,7 +211,6 @@ int main(void)
         LOG_ERR("Failed to mount SD card (err %d)", err);
         return err;
     }
-
     k_msleep(500);
 
     LOG_PRINTK("\n");
@@ -239,7 +238,7 @@ int main(void)
 #endif
 
     // Enable usb
-#ifdef CONFIG_ENABLE_USB
+#ifdef CONFIG_OMI_ENABLE_USB
     LOG_PRINTK("\n");
     LOG_INF("Initializing power supply check...\n");
 
@@ -265,28 +264,19 @@ int main(void)
     {
         LOG_ERR("Failed to start transport (err %d)", transportErr);
         // TODO: Detect the current core is app core or net core
-        // // Blink green LED to indicate error
-        // for (int i = 0; i < 5; i++)
-        // {
-        //     set_led_green(!gpio_pin_get_dt(&led_green));
-        //     k_msleep(200);
-        // }
-        // set_led_green(false);
-        // // return err;
+        // Blink green LED to indicate error
+        for (int i = 0; i < 5; i++)
+        {
+            set_led_green(!gpio_pin_get_dt(&led_green));
+            k_msleep(200);
+        }
+        set_led_green(false);
+
         return transportErr;
     }
 
 #ifdef CONFIG_OMI_ENABLE_SPEAKER
-#ifndef CONFIG_UART_CONSOLE
-    LOG_PRINTK("\n");
-    LOG_INF("Play boot sound...\n");
-
-    // This messes up the UART console, so comment out
-    // if console logs are enabled
     play_boot_sound();
-#else
-    LOG_INF("UART console enabled, not playing boot sound");
-#endif
 #endif
 
     LOG_PRINTK("\n");

omi/firmware/devkit/src/sdcard.c

@@ -52,6 +52,7 @@ int mount_sd_card(void)
         return -1;
 	}
     sd_enabled = true;
+
     //initialize the sd card
     const char *disk_pdrv = "SD";  
 	int err = disk_access_init(disk_pdrv); 

omi/firmware/devkit/src/transport.c

@@ -31,6 +31,7 @@ extern uint32_t file_num_array[2];
 struct bt_conn *current_connection = NULL;
 uint16_t current_mtu = 0;
 uint16_t current_package_index = 0;
+
 //
 // Internal
 //
@@ -66,7 +67,7 @@ static struct bt_gatt_attr audio_service_attr[] = {
     BT_GATT_CHARACTERISTIC(&audio_characteristic_data_uuid.uuid, BT_GATT_CHRC_READ | BT_GATT_CHRC_NOTIFY, BT_GATT_PERM_READ, audio_data_read_characteristic, NULL, NULL),
     BT_GATT_CCC(audio_ccc_config_changed_handler, BT_GATT_PERM_READ | BT_GATT_PERM_WRITE),
     BT_GATT_CHARACTERISTIC(&audio_characteristic_format_uuid.uuid, BT_GATT_CHRC_READ, BT_GATT_PERM_READ, audio_codec_read_characteristic, NULL, NULL),
-#ifdef CONFIG_ENABLE_SPEAKER
+#ifdef CONFIG_OMI_ENABLE_SPEAKER
     BT_GATT_CHARACTERISTIC(&audio_characteristic_speaker_uuid.uuid, BT_GATT_CHRC_WRITE | BT_GATT_CHRC_NOTIFY, BT_GATT_PERM_WRITE, NULL, audio_data_write_handler, NULL),
     BT_GATT_CCC(audio_ccc_config_changed_handler, BT_GATT_PERM_READ | BT_GATT_PERM_WRITE), //
 #endif
@@ -159,6 +160,7 @@ static void accel_ccc_config_changed_handler(const struct bt_gatt_attr *attr, ui
         LOG_ERR("Invalid CCC value: %u", value);
     }
 }
+
 int accel_start()
 {
     struct sensor_value odr_attr;
@@ -792,6 +794,7 @@ int bt_on()
 int transport_start()
 {
     k_mutex_init(&write_sdcard_mutex);
+
     // Configure callbacks
     bt_conn_cb_register(&_callback_references);
 
@@ -803,40 +806,17 @@ int transport_start()
         return err;
     }
     LOG_INF("Transport bluetooth initialized");
-    //  Enable accelerometer
-#ifdef CONFIG_ACCELEROMETER
-    err = accel_start();
-    if (!err)
-    {
-        LOG_INF("Accelerometer failed to activate\n");
-    }
-    else
-    {
-        LOG_INF("Accelerometer initialized");
-        bt_gatt_service_register(&accel_service);
-    }
-#endif
+
     //  Enable button
-#ifdef CONFIG_ENABLE_BUTTON
-    button_init();
+#ifdef CONFIG_OMI_ENABLE_BUTTON
     register_button_service();
-    activate_button_work();
 #endif
 
-#ifdef CONFIG_ENABLE_SPEAKER
-    err = speaker_init();
-    if (err)
-    {
-        LOG_ERR("Speaker failed to start");
-        return 0;
-    }
-    LOG_INF("Speaker initialized");
+#ifdef CONFIG_OMI_ENABLE_SPEAKER
     register_speaker_service();
-
-
 #endif
-    // Start advertising
 
+    // Start advertising
     memset(storage_temp_data, 0, OPUS_PADDED_LENGTH * 4);
     bt_gatt_service_register(&storage_service);
     bt_gatt_service_register(&audio_service);
@@ -864,8 +844,6 @@ int transport_start()
         LOG_INF("Battery initialized");
     }
 
-    // friend_init();
-
     // Start pusher
     ring_buf_init(&ring_buf, sizeof(tx_queue), tx_queue);
     k_thread_create(&pusher_thread, pusher_stack, K_THREAD_STACK_SIZEOF(pusher_stack), (k_thread_entry_t)pusher, NULL, NULL, NULL, K_PRIO_PREEMPT(7), 0, K_NO_WAIT);

omi/firmware/omi/src/lib/dk2/transport.c

@@ -754,7 +754,7 @@ int transport_start()
     }
     LOG_INF("Transport bluetooth initialized");
     //  Enable accelerometer
-#ifdef CONFIG_ACCELEROMETER
+#ifdef CONFIG_OMI_ENABLE_ACCELEROMETER
     err = accel_start();
     if (!err)
     {