BLE 연결 해제 헬퍼 함수 및 에러별 분기 처리

- SEC_OPEN -> SEC_MITM
- 기존에는 SoftDevice 레벨에서 인증 전 write를 차단하지 않음

components/ble/ble_services/ble_dfu/ble_dfu_unbonded.c

@@ -216,9 +216,9 @@ uint32_t ble_dfu_buttonless_char_add(ble_dfu_buttonless_t * p_dfu)
     add_char_params.is_var_len          = true;
     add_char_params.max_len             = BLE_GATT_ATT_MTU_DEFAULT;
 
-    add_char_params.cccd_write_access = SEC_OPEN;
+    add_char_params.cccd_write_access = SEC_MITM;
-    add_char_params.write_access      = SEC_OPEN;
+    add_char_params.write_access      = SEC_MITM;
-    add_char_params.read_access       = SEC_OPEN;
+    add_char_params.read_access       = SEC_MITM;
 
     return characteristic_add(p_dfu->service_handle, &add_char_params, &p_dfu->control_point_char);
 }

components/ble/ble_services/ble_nus/ble_nus.c

@@ -283,8 +283,8 @@ uint32_t ble_nus_init(ble_nus_t * p_nus, ble_nus_init_t const * p_nus_init)
     add_char_params.char_props.write         = 1;
     add_char_params.char_props.write_wo_resp = 1;
 
-    add_char_params.read_access  = SEC_OPEN;
+    add_char_params.read_access  = SEC_MITM;
-    add_char_params.write_access = SEC_OPEN;
+    add_char_params.write_access = SEC_MITM;
 
     err_code = characteristic_add(p_nus->service_handle, &add_char_params, &p_nus->rx_handles);
     if (err_code != NRF_SUCCESS)
@@ -302,9 +302,9 @@ uint32_t ble_nus_init(ble_nus_t * p_nus, ble_nus_init_t const * p_nus_init)
     add_char_params.is_var_len        = true;
     add_char_params.char_props.notify = 1;
 
-    add_char_params.read_access       = SEC_OPEN;
+    add_char_params.read_access       = SEC_MITM;
-    add_char_params.write_access      = SEC_OPEN;
+    add_char_params.write_access      = SEC_MITM;
-    add_char_params.cccd_write_access = SEC_OPEN;
+    add_char_params.cccd_write_access = SEC_MITM;
 
     return characteristic_add(p_nus->service_handle, &add_char_params, &p_nus->tx_handles);
     /**@snippet [Adding proprietary characteristic to the SoftDevice] */

project/ble_peripheral/ble_app_bladder_patch/main.c

@@ -115,8 +115,6 @@
 #include "dr_piezo.h"           /* Piezo ultrasound driver */
 #include "led_control.h"        /* LED direct control driver */
 
-
-
 /*==============================================================================
  * Build Configuration
  *============================================================================*/
@@ -157,7 +155,6 @@
 #define POWER_ON_DELAY                  5           /* Power button polling interval (5ms) */
 #define POWER_OFF_DELAY                 3000        /* Power-off delay: 3s after LED indication */
 #define POWER_RESET_DELAY               2000        /* Reset delay: 2s */
-#define LED_NUM                         24          /* LED pin number */
 
 /*==============================================================================
  * BLE Instances (statically allocated via SoftDevice macros)
@@ -193,14 +190,11 @@ static uint8_t  c_addr[6] = {0};                         /* Connected peer BLE a
 
 static char * roles_str[] = {"INVALID_ROLE", "CENTRAL", "PERIPHERAL"};
 
-/*==============================================================================
- * Global Variables
- * IEC 62304 §5.5.3: all global buffers zero-initialized for deterministic startup
- *============================================================================*/
-volatile uint8_t Sj_type;                     /* Command type identifier */
 bool power_off_duble_prohibit = false;        /* Power-off double prevention flag */
-volatile bool power_state = false;            /* Power state tracking */
 
+/*==============================================================================
+ * Extern Variables and Functions
+ *============================================================================*/
 /* -- External module flags (defined in main_timer/power_control) -- */
 extern bool go_device_power_off;       /* Power-off request flag */
 extern bool go_sleep_mode_enter;       /* Sleep mode entry request flag */
@@ -212,6 +206,14 @@ extern bool info4;                     /* Device info transmission complete flag
 extern uint8_t add_cycle;              /* Additional measurement cycle counter */
 extern bool motion_raw_data_enabled;   /* Motion raw data streaming enabled */
 
+/* -- External module functions (used in DFU prepare / disconnect cleanup) -- */
+extern void maa_async_abort(void);
+extern bool maa_async_on_tx_ready(void);
+extern bool maa_async_is_busy(void);
+extern void dr_piezo_power_off(void);
+extern void battery_timer_stop(void);
+extern void main_timer_stop(void);
+
 uint16_t cnt_s;                                         /* Power button polling counter (5ms units, 150=0.75s) */
 char ble_tx_buffer[BLE_NUS_MAX_DATA_LEN] = {0};         /* BLE text transmission buffer */
 uint8_t ble_bin_buffer[BLE_NUS_MAX_DATA_LEN] = {0};     /* BLE binary response buffer */
@@ -485,6 +487,10 @@ static void ble_dfu_evt_handler(ble_dfu_buttonless_evt_type_t event)
     {
         case BLE_DFU_EVT_BOOTLOADER_ENTER_PREPARE:
             DBG_PRINTF("[DFU] Prepare\r\n");
+            maa_async_abort();
+            dr_piezo_power_off();
+            battery_timer_stop();
+            main_timer_stop();
             break;
         case BLE_DFU_EVT_BOOTLOADER_ENTER:
             DBG_PRINTF("[DFU] Enter\r\n");
@@ -494,7 +500,6 @@ static void ble_dfu_evt_handler(ble_dfu_buttonless_evt_type_t event)
             break;
         case BLE_DFU_EVT_RESPONSE_SEND_ERROR:
             DBG_PRINTF("[DFU] Error\r\n");
-            APP_ERROR_CHECK(false);
             break;
         default:
             break;
@@ -553,10 +558,6 @@ static void nrf_qwr_error_handler(uint32_t nrf_error)
     APP_ERROR_HANDLER(nrf_error);
 }
 
-/* Async MAA TX complete handler (forward declarations) */
-extern bool maa_async_on_tx_ready(void);
-extern bool maa_async_is_busy(void);
-extern void maa_async_abort(void);
 
 /* 2026-03-17: Prevent blocking in BLE callback -- buffer command for main loop processing */
 static volatile uint8_t  pending_cmd_buf[BLE_NUS_MAX_DATA_LEN] = {0};
@@ -573,6 +574,11 @@ static void nus_data_handler(ble_nus_evt_t * p_evt)
 {
     if (p_evt->type == BLE_NUS_EVT_RX_DATA)
     {
+        if (!ble_connection_st)
+        {
+            return;  /* Reject command before security is established */
+        }
+
         cmd_type_t = CMD_BLE;
         ble_got_new_data = true;
 
@@ -1048,11 +1054,14 @@ static void ble_evt_handler(ble_evt_t const * p_ble_evt, void * p_context)
         break;
 
         case BLE_GAP_EVT_CONNECTED:
-            DBG_PRINTF("[BLE] Connected\r\n");
+            DBG_PRINTF("[BLE] GAP Connected\r\n");
             
 #if FEATURE_SECURE_CONNECTION
-            ble_connection_st = 1;
+            if (BLE_DEV_MODE)
-            battery_timer_start();
+            {
+                ble_connection_st = 1;
+                battery_timer_start();
+            }
 #endif
             
             m_conn_handle = p_ble_evt->evt.gap_evt.conn_handle;
@@ -1624,7 +1633,7 @@ static void main_s(void * p_context)
             go_device_power_off = true;
             main_timer_start();
         }
-        else if (cnt_s > 250 || (m_reset_status == 2))  /* 250 x 5ms = 1.25s + α */
+        else if (cnt_s >= 250 || (m_reset_status == 2))  /* 250 x 5ms = 1.25s + α */
         {
             DBG_PRINTF("[BTN] Boot (cnt=%d)\r\n", cnt_s);
             device_reset = false;

project/ble_peripheral/ble_app_bladder_patch/main.h

@@ -36,8 +36,9 @@
 *      : Improved low-battery detection and automatic power-off handling.
 *      : Updated BLE security, bonding, and advertising timeout behavior.
 *      : Cleaned up command parsing and removed unused project files.
+*   - VBTFW0111 260421 jhChun
 ------------------------------------------------------------------------- */
-#define FIRMWARE_VERSION                "VBTFW0103"
+#define FIRMWARE_VERSION                "VBTFW0111"
 
 /*==============================================================================
  * Data Length Constants

project/ble_peripheral/ble_app_bladder_patch/system/security/ble_quick_security.c

@@ -20,6 +20,22 @@ static struct {
     bool bonds_delete_pending;
 } m_state = {0};
 
+static const char * sec_error_name(pm_sec_error_code_t error)
+{
+    switch (error) {
+        case PM_CONN_SEC_ERROR_PIN_OR_KEY_MISSING:
+            return "PIN_OR_KEY_MISSING";
+        case PM_CONN_SEC_ERROR_MIC_FAILURE:
+            return "MIC_FAILURE";
+        case PM_CONN_SEC_ERROR_DISCONNECT:
+            return "DISCONNECT";
+        case PM_CONN_SEC_ERROR_SMP_TIMEOUT:
+            return "SMP_TIMEOUT";
+        default:
+            return "UNKNOWN";
+    }
+}
+
 /**
  * @brief Initialize BLE security
  */
@@ -102,8 +118,9 @@ void ble_security_quick_pm_handler(pm_evt_t const *p_evt)
     
     // DEV mode: do not forward security failure events to SDK handler (prevent disconnect)
     if (m_state.dev_mode && p_evt->evt_id == PM_EVT_CONN_SEC_FAILED) {
-        DBG_PRINTF("Security failed: error=%d\r\n",
+        DBG_PRINTF("Security failed: error=%d (%s)\r\n",
-                  p_evt->params.conn_sec_failed.error);
+                  p_evt->params.conn_sec_failed.error,
+                  sec_error_name(p_evt->params.conn_sec_failed.error));
         DBG_PRINTF("DEV: Ignoring sec failure, keeping connection\r\n");
         return;
     }
@@ -129,8 +146,9 @@ void ble_security_quick_pm_handler(pm_evt_t const *p_evt)
             break;
 
         case PM_EVT_CONN_SEC_FAILED:
-            DBG_PRINTF("Security failed: error=%d\r\n",
+            DBG_PRINTF("Security failed: error=%d (%s)\r\n",
-                      p_evt->params.conn_sec_failed.error);
+                      p_evt->params.conn_sec_failed.error,
+                      sec_error_name(p_evt->params.conn_sec_failed.error));
 
             if (m_state.dev_mode) {
                 // DEV mode: ignore security failure, keep connection
@@ -138,6 +156,20 @@ void ble_security_quick_pm_handler(pm_evt_t const *p_evt)
                 break;
             }
 
+            if (p_evt->params.conn_sec_failed.error == PM_CONN_SEC_ERROR_DISCONNECT) {
+                // The peer/link already disconnected before security finished.
+                // There is no live connection to repair; BLE_GAP_EVT_DISCONNECTED
+                // will restart advertising.
+                DBG_PRINTF("Security ended by disconnect; waiting for reconnect\r\n");
+                break;
+            }
+
+            if (p_evt->params.conn_sec_failed.error == PM_CONN_SEC_ERROR_SMP_TIMEOUT) {
+                // The SDK cannot start another SMP procedure on this link.
+                pm_handler_disconnect_on_sec_failure(p_evt);
+                break;
+            }
+
             if (p_evt->params.conn_sec_failed.error == PM_CONN_SEC_ERROR_PIN_OR_KEY_MISSING) {
                 // Key missing: attempt re-pairing, fall back to disconnect on failure
                 err_code = pm_conn_secure(p_evt->conn_handle, true);