Sync while working on OT

firmware/apps/vest/boards/nrf52840dk_nrf52840.overlay

@@ -1,5 +0,0 @@
-/ {
-	chosen {
-		nordic,pm-ext-flash = &mx25r64;
-	};
-};

firmware/apps/vest/pm_static.yml

@@ -1,4 +0,0 @@
-littlefs_storage:
-  address: 0x0
-  size: 0x800000
-  region: external_flash

firmware/apps/vest/pm_static.yml

@@ -0,0 +1 @@
+../leader/pm_static.yml

firmware/apps/vest/prj.conf

@@ -1,40 +1,28 @@
-# Console and Logging
 CONFIG_LOG=y
 
+# UART basics
+CONFIG_SERIAL=y
+CONFIG_UART_INTERRUPT_DRIVEN=y
 
-# Shell and Built-in Commands
-CONFIG_SHELL=y
-CONFIG_DEVICE_SHELL=n
-CONFIG_DEVMEM_SHELL=n
+# Shell configuration
+CONFIG_SHELL_BACKEND_SERIAL=y
+CONFIG_FILE_SYSTEM_SHELL=y
 
+# Lasertag-specific configuration
+CONFIG_AUDIO=y
+CONFIG_AUDIO_LOG_LEVEL_DBG=y
 
-# --- STACK SIZE UPDATES (Fixes the MPU/Stack Fault) ---
-CONFIG_MAIN_STACK_SIZE=4096
-CONFIG_SYSTEM_WORKQUEUE_STACK_SIZE=4096
-CONFIG_BT_RX_STACK_SIZE=4096
+CONFIG_BLE_MGMT=y
 
-# Storage and Settings (NVS)
-CONFIG_FLASH=y
-CONFIG_FLASH_MAP=y
-CONFIG_NVS=y
-CONFIG_SETTINGS=y
-
-# Network and OpenThread
-# CONFIG_NETWORKING=y
-# CONFIG_NET_L2_OPENTHREAD=y
-# CONFIG_OPENTHREAD=y
-# CONFIG_OPENTHREAD_SHELL=y
-# CONFIG_OPENTHREAD_DEFAULT_TX_POWER=8
-
-# CONFIG_OPENTHREAD_COAP=y
-# CONFIG_OPENTHREAD_MANUAL_START=y
-
-
-# Enable Lasertag Shared Modules
-CONFIG_LASERTAG_UTILS=n
-CONFIG_THREAD_MGMT=n
-CONFIG_OPENTHREAD_FTD=y
-CONFIG_BLE_MGMT=n
 CONFIG_GAME_MGMT=y
+CONFIG_GAME_MGMT_SHELL=y
+CONFIG_GAME_MGMT_LOG_LEVEL_DBG=y
+
+CONFIG_THREAD_MGMT=y
+CONFIG_THREAD_MGMT_LOG_LEVEL_DBG=y
+CONFIG_THREAD_MGMT_SHELL=y
+
 CONFIG_FS_MGMT=y
 CONFIG_FS_MGMT_LOG_LEVEL_DBG=y
+
+CONFIG_LASERTAG_ROLE_VEST=y

firmware/apps/vest/src/main.c

@@ -1,72 +1,44 @@
 #include <zephyr/kernel.h>
 #include <zephyr/logging/log.h>
-#ifdef CONFIG_LASERTAG_UTILS
-#include <lasertag_utils.h>
-#endif
-#ifdef CONFIG_THREAD_MGMT
 #include <thread_mgmt.h>
-#endif
-#ifdef CONFIG_BLE_MGMT
-#include <ble_mgmt.h>
-#endif
-#ifdef CONFIG_FS_MGMT
+#include <game_mgmt.h>
+#include <lasertag_utils.h>
 #include <fs_mgmt.h>
-#endif
+#include <audio.h>
 
-LOG_MODULE_REGISTER(vest_app, CONFIG_LOG_DEFAULT_LEVEL);
+LOG_MODULE_REGISTER(OT_SAMPLE, LOG_LEVEL_INF);
 
 int main(void)
 {
-    int rc;
-
-    #ifdef CONFIG_LASERTAG_UTILS
-    /* Initialize shared project logic and NVS */
+    LOG_INF("Starting Thread Management test application...");
     lasertag_utils_init();
-    #endif
+    int rc = thread_mgmt_init();
+    if (rc < 0) {
+        LOG_ERR("Thread management initialization failed: %d", rc);
+        return rc;
+    }
+    LOG_INF("Thread management initialized successfully.");
 
-    #ifdef CONFIG_FS_MGMT
-    /* Initialize filesystem management */
     rc = fs_mgmt_init();
-    if (rc) {
-        LOG_ERR("Filesystem management initialization failed (err %d)", rc);
+    if (rc < 0) {
+        LOG_ERR("File system management initialization failed: %d", rc);
         return rc;
     }
-    #endif
+    LOG_INF("File system management initialized successfully.");
 
-    #ifdef CONFIG_BLE_MGMT
-    /* Initialize and start BLE management for provisioning */
-    rc = ble_mgmt_init(LT_TYPE_VEST);
-    if (rc) {
-        LOG_ERR("BLE initialization failed (err %d)", rc);
-        return rc;
-    } else {
-        LOG_INF("BLE Management initialized successfully.");
-    }
-
-    /* Start BLE advertising */
-    rc = ble_mgmt_adv_start();
-    if (rc) {
-        LOG_ERR("BLE advertising start failed (err %d)", rc);
-    } else {
-        LOG_INF("BLE advertising started.");
-    }
-    #endif
-
-    #ifdef CONFIG_THREAD_MGMT
-    /* Initialize and start OpenThread stack */
-    rc = thread_mgmt_init();
-    if (rc) {
-        LOG_ERR("Thread initialization failed (err %d)", rc);
-    } else {
-        LOG_INF("Vest Application successfully started with Thread Mesh.");
+    rc = audio_init();
+    if (rc < 0) {
+        LOG_ERR("Audio initialization failed: %d", rc);
         return rc;
     }
-    #endif
+    LOG_INF("Audio initialized successfully.");
 
-    while (1) {
-        /* Main loop - handle high-level game logic here */
-        k_sleep(K_MSEC(1000));
+    rc = game_mgmt_init();
+    if (rc < 0) {
+        LOG_ERR("Game management initialization failed: %d", rc);
+        return rc;
     }
-
+    LOG_INF(FORMAT_BRIGHT("Game management initialized successfully. Switching to LOBBY state..."));
+    game_mgmt_set_state(SYS_STATE_LOBBY);
     return 0;
-}
+}