apply latest local changes

components/boards/pca10056.h

@@ -47,16 +47,15 @@ extern "C" {
 #include "nrf_gpio.h"
 
 // LEDs definitions for PCA10056
-#define LEDS_NUMBER    2
+#define LEDS_NUMBER    1
 
 #define LED_GR          NRF_GPIO_PIN_MAP(0,12)	//Green LED for Advertise
 #define LED_YL_TEST     NRF_GPIO_PIN_MAP(0,29)	// Yello LED for Function 260311
 
 #define LEDS_ACTIVE_STATE 0
-#define LEDS_LIST { LED_GR, LED_YL_TEST }
+#define LEDS_LIST { LED_GR }
 #define LEDS_INV_MASK  LEDS_MASK
 #define BSP_LED_0      LED_GR
-#define BSP_LED_1      LED_YL_TEST  // 260311
 
 #define BUTTONS_NUMBER 3
 

pc_firm/dr_adc121s051/dr_adc121s051.c

@@ -365,6 +365,7 @@ dr_adc_err_t dr_adc_analyze_echo(const uint16_t *buffer, uint16_t num_samples,
     
     /* Convert to voltage and time */
     echo->peak_mv = dr_adc_raw_to_mv(echo->peak_raw);
+
     /* peak_time_us: sample_index * 0.116us (8.6MHz sample rate) */
     echo->peak_time_us = (uint32_t)((float)echo->peak_index * DR_ADC_SAMPLE_INTERVAL_US);
     echo->num_samples = num_samples;
@@ -505,6 +506,9 @@ void dr_adc_print_buffer(const uint16_t *buffer, uint16_t num_samples)
 extern void dr_binary_tx_safe(uint8_t const *ble_bin_buff, uint16_t length);
 extern void dr_sd_delay_ms(uint32_t ms);
 
+/* Platform interface (log function) */
+#include "parser.h"
+
 /*==============================================================================
  * INTEGRATED BURST + CAPTURE + TRANSMIT
  *============================================================================*/
@@ -649,7 +653,7 @@ dr_adc_err_t dr_adc_burst_capture_transmit(uint8_t freq_option, uint16_t delay_u
         dr_adc_err_t err = dr_adc_capture_echo(m_echo_buffer, num_samples);
         if (err != DR_ADC_OK) return err;
 
-        ADC_LOG("mec: single measurement (no averaging)");
+        //ADC_LOG("mec: single measurement (no averaging)");
     }
     else {
         /*=== MULTIPLE MEASUREMENTS (with averaging) ===*/
@@ -795,7 +799,7 @@ dr_adc_err_t dr_adc_burst_capture_transmit(uint8_t freq_option, uint16_t delay_u
 
 
 /*==============================================================================
- * 4-CHANNEL CAPTURE FUNCTIONS (maa? command support)
+ * CHANNEL CAPTURE FUNCTIONS (maa? command support)
  *============================================================================*/
 
 dr_adc_err_t dr_adc_capture_channel_only(uint8_t freq_option, uint16_t delay_us,
@@ -816,31 +820,28 @@ dr_adc_err_t dr_adc_capture_channel_only(uint8_t freq_option, uint16_t delay_us,
     static uint32_t accum_buffer[MAA_SAMPLES_MAX];
     memset(accum_buffer, 0, num_samples * sizeof(uint32_t));
 
-    if (!m_initialized) {
+    if (!m_initialized)
+    {
         dr_adc_err_t init_err = dr_adc_init();
         if (init_err != DR_ADC_OK) return init_err;
     }
-    nrf_delay_us(100);
 
-    /* Select piezo channel */
+    //nrf_delay_us(100);
+
+    /* 채널 선택(MUX) : 1.3ms */
     dr_piezo_select_channel(piezo_ch);
 
-    /* Capture with averaging */
+    /* 채널당 반복 측정 횟수만큼 */
-    for (uint16_t avg_iter = 0; avg_iter < averaging; avg_iter++) {
+    for (uint16_t avg_iter = 0; avg_iter < averaging; avg_iter++)
-        if (avg_iter > 0) {
+    {
-            //nrf_delay_us(500);  /* Echo decay time */
+        /* TX 펄스 출력(Burst) */
-        }
-
-        //dr_piezo_select_channel(piezo_ch);
-
-        /* Execute piezo burst */
         switch (freq_option) {
             case 0:
             default:
                 dr_piezo_burst_sw_18mhz(cycles);
                 break;
             case 1:
-                dr_piezo_burst_sw(cycles);
+                dr_piezo_burst_sw(cycles); /* 2.1MHz */
                 break;
             case 2:
                 dr_piezo_burst_sw_20mhz(cycles);
@@ -850,24 +851,30 @@ dr_adc_err_t dr_adc_capture_channel_only(uint8_t freq_option, uint16_t delay_us,
                 break;
         }
 
-        if (delay_us > 0) {
+        /* TX 펄스 출력 후 ADC 시작 시까지 대기 시간 */
+        if (delay_us > 0)
+        {
             nrf_delay_us(delay_us);
         }
 
-        /* Capture to internal buffer */
+        /* 측정 ADC 샘플 수만큼 캡처 */
         dr_adc_err_t err = dr_adc_capture_echo(m_echo_buffer, num_samples);
+
         if (err != DR_ADC_OK) return err;
 
         /* Accumulate */
-        for (uint16_t i = 0; i < num_samples; i++) {
+        for (uint16_t i = 0; i < num_samples; i++)
+        {
             accum_buffer[i] += m_echo_buffer[i];
         }
     }
 
     /* Calculate average and copy to output */
-    for (uint16_t i = 0; i < num_samples; i++) {
+    for (uint16_t i = 0; i < num_samples; i++)
+    {
         out_channel->samples[i] = (uint16_t)(accum_buffer[i] / averaging);
     }
+
     out_channel->num_samples = num_samples;
 
     /* Analyze echo data */
@@ -877,8 +884,8 @@ dr_adc_err_t dr_adc_capture_channel_only(uint8_t freq_option, uint16_t delay_us,
     out_channel->peak_index = echo.peak_index;
     out_channel->baseline_raw = echo.baseline_raw;
 
-    ADC_LOG("maa capture CH%u: peak=%u idx=%u baseline=%u",
+    /* peak, index, baseline 확인용 로그 */
-            piezo_ch, out_channel->peak_raw, out_channel->peak_index, out_channel->baseline_raw);
+    //if (g_plat.log) g_plat.log("CH%u: peak=%u index=%u baseline=%u\r\n", piezo_ch, out_channel->peak_raw, out_channel->peak_index, out_channel->baseline_raw);
 
     return DR_ADC_OK;
 }
@@ -1059,7 +1066,8 @@ dr_adc_err_t dr_adc_transmit_channel_delta(const dr_maa_channel_t *ch_data,
 
     /* Data packets (rdd:) */
     uint16_t src_idx = 0;
-    for (uint16_t pkt = 0; pkt < data_packets; pkt++) {
+    for (uint16_t pkt = 0; pkt < data_packets; pkt++)
+    {
         ble_buffer[0] = 'r';
         ble_buffer[1] = 'd';
         ble_buffer[2] = 'd';
@@ -1069,13 +1077,15 @@ dr_adc_err_t dr_adc_transmit_channel_delta(const dr_maa_channel_t *ch_data,
 
         uint16_t dst_idx = 6;
         uint16_t bytes_this_pkt = 0;
-        while (src_idx < compressed_size && bytes_this_pkt < cont_pkt_data_cap) {
+        while (src_idx < compressed_size && bytes_this_pkt < cont_pkt_data_cap)
+        {
             ble_buffer[dst_idx++] = delta_buffer[src_idx++];
             bytes_this_pkt++;
         }
 
         /* Pad to word boundary if needed */
-        if (dst_idx & 1) {
+        if (dst_idx & 1)
+        {
             ble_buffer[dst_idx++] = 0;
         }
 
@@ -1117,8 +1127,6 @@ static dr_adc_err_t maa_async_capture_channel(uint8_t ch)
 {
     if (ch > (MAA_NUM_CHANNELS - 1)) return DR_ADC_ERR_INVALID_PARAM;
 
-    if (g_plat.log) g_plat.log("[maa] capturing CH%u\r\n", ch);
-
     dr_adc_err_t err = dr_adc_capture_channel_only(
         g_maa_ctx.freq_option,
         g_maa_ctx.delay_us,
@@ -1129,21 +1137,6 @@ static dr_adc_err_t maa_async_capture_channel(uint8_t ch)
         &g_maa_ctx.channels[ch]
     );
 
-    /* 캡처 성공 시 원시 데이터 덤프 (10진수) */
-    if (err == DR_ADC_OK && g_plat.log)
-    {
-        dr_maa_channel_t *c = &g_maa_ctx.channels[ch];
-        g_plat.log("[maa] CH%u raw (%u samples):\r\n", ch, c->num_samples);
-
-        for (uint16_t i = 0; i < c->num_samples; i++)
-        {
-            g_plat.log("%u ", c->samples[i]);
-            if ((i + 1) % 16 == 0) g_plat.log("\r\n");
-        }
-
-        if (c->num_samples % 16 != 0) g_plat.log("\r\n");
-    }
-
     return err;
 }
 
@@ -1176,13 +1169,25 @@ static void maa_async_send_header(void)
     buf[13] = (uint8_t)(ch->num_samples >> 8);
 
     dr_binary_tx_safe(buf, 7);  /* 14 bytes = 7 words */
+
+    /* 50ms BLE 대기 시간을 활용하여 raw 덤프 로그 (캡처 시간에 영향 없음) 
+    if (g_plat.log)
+    {
+        if (g_maa_ctx.current_ch > 0) g_plat.log("\r\n");
+        g_plat.log("CH%u raw (%u samples):\r\n", g_maa_ctx.current_ch, ch->num_samples);
+        for (uint16_t i = 0; i < ch->num_samples; i++)
+        {
+            g_plat.log("%u ", ch->samples[i]);
+            if ((i + 1) % 16 == 0) g_plat.log("\r\n");
+        }
+        if (ch->num_samples % 16 != 0) g_plat.log("\r\n");
+    }*/
+
     dr_sd_delay_ms(50);  /* Allow BLE stack to process TX */
 
     g_maa_ctx.current_pkt = 0;
     g_maa_ctx.data_offset = 0;
     g_maa_ctx.state = MAA_ASYNC_TX_DATA;
-
-    ADC_LOG("maa_async: CH%u reb: sent (pkts=%u)", g_maa_ctx.current_ch, g_maa_ctx.total_packets);
 }
 
 /**
@@ -1225,7 +1230,7 @@ static bool maa_async_send_data_packet(void)
     g_maa_ctx.data_offset += chunk_size;
     g_maa_ctx.current_pkt++;
 
-    ADC_LOG("maa_async: CH%u red:%u (%u/%u bytes)", g_maa_ctx.current_ch, pkt_idx, g_maa_ctx.data_offset, total_data_bytes);
+    //ADC_LOG("maa_async: CH%u red:%u (%u/%u bytes)", g_maa_ctx.current_ch, pkt_idx, g_maa_ctx.data_offset, total_data_bytes);
 
     return (g_maa_ctx.data_offset < total_data_bytes);
 }
@@ -1246,15 +1251,13 @@ static void maa_async_send_completion(uint16_t status)
 
     dr_binary_tx_safe(buf, 3);
 
-    /* 자동으로 켰으면 완료 후 전원 OFF */
+    //if (g_plat.log) g_plat.log("-------------------------------------------------------------------------------------\r\n");
-    if (g_maa_ctx.auto_powered) {
+
-        if (g_plat.log) g_plat.log("[Cmd_maa] TX/RX Active -> Sleep\r\n");
+    /* 캡처 완료 → Piezo TX/RX 전원 OFF */
-        dr_piezo_power_off();
+    dr_piezo_power_off();
-        g_maa_ctx.auto_powered = false;
-    }
 
     g_maa_ctx.state = MAA_ASYNC_IDLE;
-    ADC_LOG("maa_async: complete, status=0x%04X", status);
+    //ADC_LOG("maa_async: complete, status=0x%04X", status);
 
     /* 완료 콜백 호출 (mbb? 등에서 센서 측정 체인 트리거용) */
     if (g_maa_ctx.on_complete_cb)
@@ -1269,9 +1272,7 @@ static void maa_async_send_completion(uint16_t status)
  * PUBLIC ASYNC API
  *============================================================================*/
 
-dr_adc_err_t maa_async_start(uint8_t freq_option, uint16_t delay_us,
+dr_adc_err_t maa_async_start(uint8_t freq_option, uint16_t delay_us, uint16_t num_samples, uint8_t cycles, uint16_t averaging, uint8_t *ble_buffer)
-                              uint16_t num_samples, uint8_t cycles,
-                              uint16_t averaging, uint8_t *ble_buffer)
 {
     dr_adc_err_t err;
     uint8_t ch;
@@ -1298,28 +1299,25 @@ dr_adc_err_t maa_async_start(uint8_t freq_option, uint16_t delay_us,
     g_maa_ctx.data_offset = 0;
     g_maa_ctx.on_complete_cb = NULL;  /* 기본: 콜백 없음 (maa?) */
 
-    ADC_LOG("maa_async_start: freq=%u delay=%u samples=%u cycles=%u avg=%u",
-            freq_option, delay_us, num_samples, g_maa_ctx.cycles, g_maa_ctx.averaging);
-
     /* 전채널 캡처: BLE 전송 없이 6채널 전부 캡처 완료 후 TX 시작 */
     g_maa_ctx.state = MAA_ASYNC_CAPTURING;
+
     for (ch = 0; ch < MAA_NUM_CHANNELS; ch++)
     {
         err = maa_async_capture_channel(ch);
         if (err != DR_ADC_OK)
         {
-            //ADC_LOG("maa_async_start: CH%u capture failed (%d)", ch, err);
             if (g_plat.log) g_plat.log("[maa] maa_async_start: CH%u capture failed (%d)", ch, err);
             maa_async_send_completion(0xFFF0 | ch);
             return err;
         }
     }
-    //ADC_LOG("maa_async_start: all channels captured, starting TX");
-    if (g_plat.log) g_plat.log("[maa] maa_async_start: all channels captured, starting TX");
 
-    /* 캡처 완료 → 피에조 전원 OFF (BLE 전송 중 불필요) */
+    /* peak 로그와 raw 덤프 사이 구분 */
+    //if (g_plat.log) g_plat.log("\r\n");
+
+    /* 캡처 완료 → Piezo TX/RX 전원 OFF (BLE 전송 중 불필요) */
     dr_piezo_power_off();
-    g_maa_ctx.auto_powered = false;  /* 이미 껐으므로 완료 후 중복 OFF 방지 */
 
     /* Send CH0 header - this will trigger TX_RDY for subsequent packets */
     maa_async_send_header();
@@ -1398,11 +1396,6 @@ void maa_async_abort(void)
     }
 }
 
-void maa_async_set_auto_power(bool on)
-{
-    g_maa_ctx.auto_powered = on;
-}
-
 void maa_async_set_on_complete(void (*cb)(void))
 {
     g_maa_ctx.on_complete_cb = cb;

pc_firm/dr_adc121s051/dr_adc121s051.h

@@ -454,7 +454,6 @@ typedef struct {
     dr_maa_channel_t channels[MAA_NUM_CHANNELS]; /**< Captured data for each channel */
     uint16_t    total_packets;    /**< Total packets for current channel */
     uint16_t    data_packets;     /**< Data packets for current channel */
-    bool        auto_powered;     /**< true: 자동 전원 ON → 완료 후 OFF */
     bool        pre_capture_all;  /**< true: 전채널 캡처 완료 후 일괄 전송 (mbb용) */
     void      (*on_complete_cb)(void); /**< 비동기 캡처 완료 후 호출될 콜백 (NULL이면 미사용) */
 } maa_async_ctx_t;

pc_firm/parser.c

@@ -194,25 +194,27 @@ static bool dr_get_u16(const ParsedCmd *cmd, uint8_t word_index, uint16_t *out)
  * out:      추출된 문자열 저장 버퍼 (max_len+1 이상 크기 필요)
  * max_len:  최대 추출 길이 (바이트)
  */
-static void dr_get_ascii(const ParsedCmd *cmd, uint8_t offset,
+static void dr_get_ascii(const ParsedCmd *cmd, uint8_t offset, char *out, uint8_t max_len)
-                         char *out, uint8_t max_len)
 {
     uint8_t i;
     uint8_t remain;
 
     /* 오프셋이 데이터 범위를 초과하면 빈 문자열 반환 */
-    if (offset >= cmd->data_len) {
+    if (offset >= cmd->data_len)
+    {
         out[0] = '\0';
         return;
     }
 
     /* 실제 복사 가능한 길이 계산 (남은 데이터 vs 최대 길이 중 작은 값) */
     remain = (uint8_t)(cmd->data_len - offset);
-    if (remain > max_len) {
+    if (remain > max_len)
+    {
         remain = max_len;
     }
 
-    for (i = 0; i < remain; i++) {
+    for (i = 0; i < remain; i++)
+    {
         out[i] = (char)cmd->data[offset + i];
     }
     out[remain] = '\0';  /* 널 종료 보장 */
@@ -259,7 +261,8 @@ static bool dr_crc16_check_packet(const uint8_t *packet, uint32_t packet_len)
     uint16_t expected_crc;
     uint32_t data_len;
 
-    if (packet_len < 2) {
+    if (packet_len < 2)
+    {
         return false;   /* 최소 CRC 2바이트도 없으면 실패 */
     }
 
@@ -269,10 +272,6 @@ static bool dr_crc16_check_packet(const uint8_t *packet, uint32_t packet_len)
     expected_crc = (uint16_t)packet[packet_len - 2]
                  | ((uint16_t)packet[packet_len - 1] << 8);
 
-    if (g_plat.log && g_log_enable) {
-        g_plat.log("CRC check: expected=0x%04X\n", expected_crc);
-    }
-
     return dr_crc16_check(packet, data_len, expected_crc);
 }
 
@@ -294,8 +293,10 @@ static bool dr_parse_cmd(const uint8_t *buffer, uint8_t length, ParsedCmd *out)
     }
 
     /* CRC 검증이 활성화된 경우 패킷 무결성 확인 */
-    if (g_plat.crc_check) {
+    if (g_plat.crc_check)
-        if (!dr_crc16_check_packet(buffer, length)) {
+    {
+        if (!dr_crc16_check_packet(buffer, length))
+        {
             if (g_plat.log && g_log_enable) {
                 g_plat.log("CRC check FAILED!\n");
             }
@@ -304,10 +305,6 @@ static bool dr_parse_cmd(const uint8_t *buffer, uint8_t length, ParsedCmd *out)
 
         /* CRC 검증 성공 → CRC 2바이트를 제외한 실제 데이터 길이로 조정 */
         length = (uint8_t)(length - 2);
-        
-        if (g_plat.log && g_log_enable) {
-            g_plat.log("CRC check OK\n");
-        }
     }
 
     /* TAG 4바이트 복사 */
@@ -315,20 +312,17 @@ static bool dr_parse_cmd(const uint8_t *buffer, uint8_t length, ParsedCmd *out)
 
     /* TAG 이후 데이터 길이 계산 (최대 DR_MAX_DATA까지) */
     out->data_len = (length > 4) ? (uint8_t)(length - 4) : 0;
-    if (out->data_len > DR_MAX_DATA) {
+    if (out->data_len > DR_MAX_DATA)
+    {
         out->data_len = DR_MAX_DATA;
     }
 
     /* TAG 뒤의 데이터 바이트를 ParsedCmd.data[]에 복사 */
-    for (i = 0; i < out->data_len; i++) {
+    for (i = 0; i < out->data_len; i++)
+    {
         out->data[i] = buffer[4 + i];
     }
 
-    if (g_plat.log && g_log_enable) {
-        g_plat.log("parse_cmd: TAG='%s', data_len=%u\n",
-                   out->tag, out->data_len);
-    }
-
     return true;
 }
 
@@ -491,16 +485,12 @@ static int dr_cmd_dispatch(const ParsedCmd *cmd)
                 return 0;
             }
 
-            if (g_plat.log && g_log_enable) {
-                g_plat.log("Run handler '%s'\n", cmd->tag);
-            }
-
             /* 매칭된 핸들러 호출 */
             return g_cmd_table[i].handler(cmd);
         }
     }
 
-    /* 테이블에 없는 미지의 TAG */
+    /* 테이블에 없는 TAG 수신 시 */
     if (g_plat.log && g_log_enable) {
         g_plat.log("Unknown TAG '%s'\n", cmd->tag);
     }
@@ -522,8 +512,6 @@ int dr_cmd_parser(const uint8_t *buf, uint8_t len)
 {
     ParsedCmd cmd;
 
-    if (g_plat.log) g_plat.log("[PARSER] in len=%u crc=%u\r\n", len, g_plat.crc_check);
-
     /* 패킷 파싱 (CRC 검증 포함) */
     if (!dr_parse_cmd(buf, len, &cmd)) {
         if (g_plat.log) g_plat.log("[PARSER] PARSE FAIL\r\n");
@@ -536,7 +524,8 @@ int dr_cmd_parser(const uint8_t *buf, uint8_t len)
         return -1;  /* CRC/파싱 실패 → 음수 반환으로 레거시 파서에 위임 */
     }
 
-    if (g_plat.log) g_plat.log("[PARSER] tag=%s\r\n", cmd.tag);
+    /* 수신 명령어 종류 확인용 로그 */
+    //if (g_plat.log) g_plat.log("[PARSER] tag=%s\r\n", cmd.tag);
 
     /* 파싱 성공 → 명령 테이블에서 핸들러를 찾아 실행 */
     return dr_cmd_dispatch(&cmd);
@@ -551,9 +540,6 @@ int dr_cmd_parser(const uint8_t *buf, uint8_t len)
 static int Cmd_msn(const ParsedCmd *cmd)
 {
     (void)cmd;
-    if (g_plat.log && g_log_enable) {
-        g_plat.log("[Cmd_msn] Measure battery level\n");
-    }
     battery_level_meas();  /* ADC로 배터리 전압 측정 → BLE 응답 전송 */
     return 1;
 }
@@ -564,9 +550,6 @@ static int Cmd_msn(const ParsedCmd *cmd)
 static int Cmd_mso(const ParsedCmd *cmd)
 {
     (void)cmd;
-    if (g_plat.log && g_log_enable) {
-        g_plat.log("[Cmd_mso] TMP235 temperature measurement\n");
-    }
     tmp235_voltage_level_meas();
     return 1;
 }
@@ -596,9 +579,6 @@ static int Cmd_msi(const ParsedCmd *cmd)
 
     main_timer_start();  /* 타이머 콜백에서 IMU 데이터 읽기 + BLE 전송 */
 
-    if (g_plat.log && g_log_enable) {
-        g_plat.log("[Cmd_msi] Motion sensor raw, once=%u\r\n", motion_data_once);
-    }
     return 1;
 }
 
@@ -636,7 +616,7 @@ static int Cmd_msr(const ParsedCmd *cmd)
 {
     uint16_t val = 0;
     dr_get_u16(cmd, 0, &val);
-    if (g_plat.log) g_plat.log("[Cmd_msr] Bond delete + reset val=%u\r\n", val);
+    //if (g_plat.log) g_plat.log("[Cmd_msr] Bond delete + reset val=%u\r\n", val);
     single_format_data(ble_bin_buffer, "rsr:", val);
     dr_binary_tx_safe(ble_bin_buffer, 2);
 
@@ -656,13 +636,13 @@ static int Cmd_msr(const ParsedCmd *cmd)
 /* mss? - 디바이스 소프트 리셋 (리부팅)
  *
  * msr?과 유사하지만 본딩 정보는 삭제하지 않음
- * 리셋 상태 코드를 FDS에 저장하여 부팅 시 리셋 원인 확인 가능
+ * 리셋 상태 코드를 FDS에 저장하여 부팅 시 리셋 원인 확인 가능 =======> val 파라미터 확인
  */
 static int Cmd_mss(const ParsedCmd *cmd)
 {
     uint16_t val = 0;
     dr_get_u16(cmd, 0, &val);
-    if (g_plat.log) g_plat.log("[Cmd_mss] Device reset val=%u\r\n", val);
+    //if (g_plat.log) g_plat.log("[Cmd_mss] Device reset val=%u\r\n", val);
     single_format_data(ble_bin_buffer, "rss:", val);
     dr_binary_tx_safe(ble_bin_buffer, 2);
 
@@ -683,9 +663,6 @@ static int Cmd_mss(const ParsedCmd *cmd)
 static int Cmd_mfv(const ParsedCmd *cmd)
 {
     (void)cmd;
-    if (g_plat.log && g_log_enable) {
-        g_plat.log("[Cmd_mfv] FW=%s\r\n", DR_DEVICE_VERSION);
-    }
     ascii_format_data(ble_bin_buffer, "rfv:", DR_DEVICE_VERSION, 12);
     dr_binary_tx_safe(ble_bin_buffer, 8);  /* 4(TAG) + 12(버전) = 16바이트 = 8워드 */
     return 1;
@@ -701,13 +678,10 @@ static int Cmd_mpa(const ParsedCmd *cmd)
 {
     (void)cmd;
 
-    if (g_plat.log && g_log_enable) {
+    dr_piezo_power_on();  /* 부팅 시 init 완료, 전원만 ON */
-        g_plat.log("[Cmd_mpa] Piezo Activation\n");
-    }
 
-    dr_piezo_system_init();    /* 내부에서 power_on + init 수행 */
+    if (g_plat.tx_bin)
-
+    {
-    if (g_plat.tx_bin) {
         single_format_data(ble_bin_buffer, "rpa:", 1);
         dr_binary_tx_safe(ble_bin_buffer, 3);
     }
@@ -724,10 +698,6 @@ static int Cmd_mpb(const ParsedCmd *cmd)
 {
     (void)cmd;
 
-    if (g_plat.log && g_log_enable) {
-        g_plat.log("[Cmd_mpb] Piezo Deactivation\n");
-    }
-
     dr_piezo_power_off();  /* 피에조 보드 전원 OFF */
 
     if (g_plat.tx_bin) {
@@ -772,19 +742,9 @@ static int Cmd_mpc(const ParsedCmd *cmd)
     /* 채널 범위 검증: 초과 시 0으로 리셋 */
     if (piezo_ch >= MAA_NUM_CHANNELS) piezo_ch = 0;
 
-    if (g_plat.log && g_log_enable) {
-        const char *freq_str = (freq_option == 0) ? "1.8MHz" :
-                               (freq_option == 1) ? "2.1MHz" :
-                               (freq_option == 2) ? "2.0MHz" :
-                               (freq_option == 3) ? "1.7MHz" :
-                               (freq_option == 4) ? "2.2MHz" :
-                               (freq_option == 9) ? "1.9MHz" : "unknown";
-        g_plat.log("[Cmd_mpc] cycles=%u, freq=%u (%s), piezo=%u\r\n",
-                   cycles, freq_option, freq_str, piezo_ch);
-    }
-
     /* 사이클 범위 검증: 3~7 유효 */
-    if (cycles < 3 || cycles > 7) {
+    if (cycles < 3 || cycles > 7)
+    {
         dr_ble_return_1("rpc:", 2);  /* 에러 응답: 범위 초과 */
         return 1;
     }
@@ -793,7 +753,8 @@ static int Cmd_mpc(const ParsedCmd *cmd)
     dr_piezo_select_channel((uint8_t)piezo_ch);
 
     /* 선택된 주파수로 버스트 펄스 발생 */
-    switch (freq_option) {
+    switch (freq_option)
+    {
         case 0:  dr_piezo_burst_sw_18mhz((uint8_t)cycles);  break;  /* 1.8MHz */
         case 2:  dr_piezo_burst_sw_20mhz((uint8_t)cycles);  break;  /* 2.0MHz */
         case 3:  dr_piezo_burst_sw_17mhz((uint8_t)cycles);  break;  /* 1.7MHz */
@@ -810,8 +771,6 @@ static int Cmd_mpc(const ParsedCmd *cmd)
 }
 
 
-/* 2026-03-17: mdc? 삭제 (12비트 압축 전송, mec?로 대체) */
-
 /**
  * @brief mec? - 피에조 버스트 + 에코 캡처 (16비트 원시 데이터, 무압축)
  *
@@ -844,9 +803,10 @@ static int Cmd_mec(const ParsedCmd *cmd)
     uint16_t piezo_ch = 0;       /* 기본 채널 0 (유효: 0~7) */
 
     /* 피에조 전원이 꺼져 있으면 켜기 */
-    if (!dr_piezo_is_power_on()) {
+    if (!dr_piezo_is_power_on())
-        if (g_plat.log) g_plat.log("[Cmd_mec] TX/RX Sleep -> Active\r\n");
+    {
-        dr_piezo_system_init();
+        //if (g_plat.log) g_plat.log("[Cmd_mec] TX/RX Sleep -> Active\r\n");
+        dr_piezo_power_on();
     }
 
     /* 6개 파라미터 순서대로 추출 (데이터 부족 시 기본값 유지) */
@@ -864,6 +824,7 @@ static int Cmd_mec(const ParsedCmd *cmd)
     /* 피에조 채널 범위 검증 */
     if (piezo_ch >= MAA_NUM_CHANNELS) piezo_ch = 0;
     
+    /*
     if (g_plat.log && g_log_enable) {
         const char *freq_str = (freq_option == 0) ? "1.8MHz" :
                                (freq_option == 1) ? "2.1MHz" :
@@ -871,9 +832,10 @@ static int Cmd_mec(const ParsedCmd *cmd)
                                (freq_option == 3) ? "1.7MHz" :
                                (freq_option == 4) ? "2.2MHz" :
                                (freq_option == 9) ? "1.9MHz" : "unknown";
-        g_plat.log("[Cmd_mec] freq=%u (%s), delay=%uus, samples=%u, cycles=%u, avg=%u, piezo=%u\r\n",
+        g_plat.log("[Parameter] freq=%u (%s), delay=%uus, samples=%u, cycles=%u, avg=%u, piezo=%u\r\n",
                    freq_option, freq_str, delay_us, num_samples, cycles, averaging, piezo_ch);
     }
+    */
 
     /* 통합 버스트+캡처+전송 함수 호출 */
     dr_adc_err_t err = dr_adc_burst_capture_transmit(
@@ -885,10 +847,10 @@ static int Cmd_mec(const ParsedCmd *cmd)
         dr_ble_return_2("rer:", 0xEE00 | (uint16_t)err, num_samples);
     }
 
+    /* raw 데이터 덤프
     if (g_plat.log && g_log_enable) {
         g_plat.log("[Cmd_mec] result=%d\r\n", err);
 
-        /* raw 데이터 덤프 */
         const uint16_t *buf = dr_adc_get_echo_buffer();
         g_plat.log("[mec] CH%u raw (%u samples):\r\n", piezo_ch, num_samples);
         for (uint16_t i = 0; i < num_samples; i++) {
@@ -896,10 +858,9 @@ static int Cmd_mec(const ParsedCmd *cmd)
             if ((i + 1) % 16 == 0) g_plat.log("\r\n");
         }
         if (num_samples % 16 != 0) g_plat.log("\r\n");
-    }
+    }*/
 
-    /* 측정 완료 후 무조건 전원 OFF */
+    /* 측정 완료 후 Piezo TX/RX Sleep */
-    if (g_plat.log) g_plat.log("[Cmd_mec] TX/RX Active -> Sleep\r\n");
     dr_piezo_power_off();
 
     return 1;
@@ -988,48 +949,24 @@ static int Cmd_maa(const ParsedCmd *cmd)
 {
     dr_adc_err_t err;
 
-    /* 파라미터 5개 수신 시 FDS에 저장 — 디버그 중 비활성화
-    if (cmd->data_len >= 10) {
-        uint16_t freq, cycles, averaging, delay_us, num_samples;
-        dr_get_u16(cmd, 0, &freq);
-        dr_get_u16(cmd, 1, &cycles);
-        dr_get_u16(cmd, 2, &averaging);
-        dr_get_u16(cmd, 3, &delay_us);
-        dr_get_u16(cmd, 4, &num_samples);
-
-        m_config.piezo_freq_option = (uint8_t)freq;
-        m_config.piezo_cycles      = (uint8_t)cycles;
-        m_config.piezo_averaging   = averaging;
-        m_config.piezo_delay_us    = delay_us;
-        m_config.piezo_num_samples = num_samples;
-        config_save();
-
-        if (g_plat.log) g_plat.log("[Cmd_maa] params updated: freq=%u cyc=%u avg=%u delay=%u samples=%u\r\n",
-            m_config.piezo_freq_option, m_config.piezo_cycles,
-            m_config.piezo_averaging, m_config.piezo_delay_us,
-            m_config.piezo_num_samples);
-    }
-    */
-
     /* 이전 캡처가 진행 중인지 확인 (비동기이므로 중복 실행 방지) */
-    if (maa_async_is_busy()) {
+    if (maa_async_is_busy())
+    {
         dr_ble_return_1("raa:", 0xFFFE);  /* 처리 중(Busy) 에러 */
         return 1;
     }
 
-    /* 피에조 전원: OFF일 경우 ON → 완료 후 OFF */
+    /* Piezo TX/RX 전원: OFF일 경우 ON → maa_async_start()에서 캡처 완료 후 OFF */
     if (!dr_piezo_is_power_on())
     {
-        if (g_plat.log) g_plat.log("[Cmd_maa] TX/RX Sleep -> Active\r\n");
+        //if (g_plat.log) g_plat.log("[Cmd_maa] TX/RX Sleep -> Active\r\n");
-        dr_piezo_system_init();
+        dr_piezo_power_on();
     }
 
     /*=======================================================================
      * 비동기 6채널 캡처 시작
      *   - maa_async_start(): CH0 캡처 실행 + 첫 헤더 패킷 전송
      *   - 이후 패킷은 BLE_NUS_EVT_TX_RDY 콜백에서 자동 전송
-     *   - 블로킹 딜레이 없음 → SoftDevice 이벤트 정상 처리 가능
-     *   - auto_powered=true면 완료 후 자동 전원 OFF
      *=======================================================================*/
     err = maa_async_start(
         m_config.piezo_freq_option,
@@ -1040,7 +977,8 @@ static int Cmd_maa(const ParsedCmd *cmd)
         ble_bin_buffer
     );
 
-    if (err != DR_ADC_OK) {
+    if (err != DR_ADC_OK)
+    {
         /* 시작 실패 → 에러 응답 전송 (앱 타임아웃 방지) */
         if (g_plat.log) g_plat.log("[Cmd_maa] start failed err=%d\r\n", err);
         single_format_data(ble_bin_buffer, "raa:", (uint16_t)(0xFF00 | err));
@@ -1049,12 +987,6 @@ static int Cmd_maa(const ParsedCmd *cmd)
         return 1;
     }
 
-    /* 측정 완료 시 무조건 전원 OFF */
-    //maa_async_set_auto_power(true);
-    //dr_piezo_power_off();
-
-    /* 즉시 반환 → 비동기 전송 진행 중 */
-    /* 전체 완료 시 상태 머신이 "raa:" 응답 + 자동 power off 처리 */
     return 1;
 }
 
@@ -1066,28 +998,25 @@ static int Cmd_maa(const ParsedCmd *cmd)
  * info4 모드로 센서값을 전역 변수에 저장한 뒤, rbb: 패킷으로 일괄 전송
  * SAADC 측정은 비동기(콜백)이므로 dr_sd_delay_ms()로 완료 대기
  *
- * 순서: 배터리 → IMU → (피에조 ON) → 온도
+ * 순서: 배터리 → IMU → (Piezo TX/RX ON) → 온도
  * 응답: rbb: [배터리mV(2)] [IMU 6축(12)] [온도°Cx100(2)] = 20바이트
  */
 static void all_sensors(void)
 {
-    if (g_plat.log) g_plat.log("[Cmd_mbb] measuring sensors\r\n");
-
     info4 = true;  /* 센서값을 전역 변수에 저장 (BLE 전송 안 함) */
 
-    /* 1) 배터리 전압 측정 → info_batt에 저장 */
+    /* 1. 배터리 전압 측정 → info_batt에 저장 */
     battery_level_meas();
     dr_sd_delay_ms(1);   /* SAADC 콜백 완료 대기 */
 
-    /* 2) IMU 6축 단발 읽기 → info_imu[6]에 저장 */
+    /* 2. IMU 6축 단발 읽기 → info_imu[6]에 저장 */
     hw_i2c_init_once();
     imu_read_direct();
 
-    /* 3) 온도 측정 → info_temp에 저장 (TMP235는 피에조 전원 필요) */
+    /* 3. 온도 측정 → info_temp에 저장 (TMP235는 Piezo TX/RX 전원 필요) */
     if (!dr_piezo_is_power_on())
     {
-        if (g_plat.log) g_plat.log("[Cmd_mbb] TX/RX Sleep -> Active for TEMP\r\n");
+        dr_piezo_power_on();
-        dr_piezo_system_init();
     }
 
     tmp235_voltage_level_meas();
@@ -1111,10 +1040,11 @@ static void all_sensors(void)
     buf[18] = (uint8_t)(info_temp & 0xFF);
     buf[19] = (uint8_t)(info_temp >> 8);
     
-    if (g_plat.log) g_plat.log("[Cmd_mbb] rbb: TX before send, in_progress=%d\r\n", (int)data_tx_in_progress);
     dr_binary_tx_safe(buf, 10);  /* 20바이트 = 10워드 */
 
-    if (g_plat.log) g_plat.log("[Cmd_mbb] rbb: sent (batt=%u temp=%u)\r\n", info_batt, info_temp);
+    /* 배터리, IMU, 온도 확인용 로그 */
+    //if (g_plat.log) g_plat.log("-------------------------------------------------------------------------------------\r\n[Battery] %u\r\n[IMU] %d,%d,%d,%d,%d,%d\r\n[Temperature] %u\r\n\r\n", info_batt, (int16_t)info_imu[0], (int16_t)info_imu[1], (int16_t)info_imu[2],
+    //(int16_t)info_imu[3], (int16_t)info_imu[4], (int16_t)info_imu[5], info_temp);
 }
 
 
@@ -1123,8 +1053,6 @@ static void all_sensors(void)
  *
  * 센서 측정(rbb:) → 6채널 비동기 캡처(reb:/red:/raa:) → TX/RX OFF
  *
- * 파라미터: mode (uint16, word 0) - 현재 mode=0만 지원
- *
  * 응답 흐름:
  *   1) 센서 측정: rbb: [배터리(2) + IMU 6축(12) + 온도(2)]
  *   2) 각 채널(CH0~CH5): reb: [헤더] → red: [데이터...]
@@ -1135,30 +1063,7 @@ static int Cmd_mbb(const ParsedCmd *cmd)
 {
     dr_adc_err_t err;
 
-    if (g_plat.log) g_plat.log("[Cmd_mbb] params updated: freq=%u cyc=%u avg=%u delay=%u samples=%u\r\n",
+    all_sensors();  /* 배터리, IMU, 온도 센서 먼저 측정 */
-            m_config.piezo_freq_option, m_config.piezo_cycles,
-            m_config.piezo_averaging, m_config.piezo_delay_us,
-            m_config.piezo_num_samples);
-
-    // 파라미터 5개 수신 시 FDS에 저장 — 디버그 중 비활성화
-    /*
-    if (cmd->data_len >= 10) {
-        uint16_t freq, cycles, averaging, delay_us, num_samples;
-        dr_get_u16(cmd, 0, &freq);
-        dr_get_u16(cmd, 1, &cycles);
-        dr_get_u16(cmd, 2, &averaging);
-        dr_get_u16(cmd, 3, &delay_us);
-        dr_get_u16(cmd, 4, &num_samples);
-
-        m_config.piezo_freq_option = (uint8_t)freq;
-        m_config.piezo_cycles      = (uint8_t)cycles;
-        m_config.piezo_averaging   = averaging;
-        m_config.piezo_delay_us    = delay_us;
-        m_config.piezo_num_samples = num_samples;
-        config_save();
-    }*/
-
-    all_sensors();
 
     if (maa_async_is_busy())
     {
@@ -1166,22 +1071,16 @@ static int Cmd_mbb(const ParsedCmd *cmd)
         return 1;
     }
 
-    /* 피에조 전원: OFF일 경우 ON */
+    /* 측정 파라미터 확인용 로그 
-    if (!dr_piezo_is_power_on())
+    if (g_plat.log) g_plat.log("[Parameter] freq=%u cyc=%u avg=%u delay=%u samples=%u\r\n\r\n",
-    {
-        if (g_plat.log) g_plat.log("[Cmd_mbb] TX/RX Sleep -> Active\r\n");
-        dr_piezo_system_init();
-    }
-
-    if (g_plat.log) g_plat.log("[Cmd_mbb] freq=%u cyc=%u avg=%u delay=%u samples=%u\r\n",
         m_config.piezo_freq_option, m_config.piezo_cycles,
         m_config.piezo_averaging, m_config.piezo_delay_us,
-        m_config.piezo_num_samples);
+        m_config.piezo_num_samples);*/
 
-    /* 전채널 선캡처 모드: 모든 채널 캡처 완료 후 BLE 전송 */
+    /* 전채널 선캡처 모드: 모든 채널 캡처 완료 후 BLE 전송하도록 */
     maa_async_set_pre_capture_all(true);
 
-    /* 비동기 6채널 캡처 시작 (m_config 파라미터 사용) */
+    /* 비동기 6채널 캡처 시작 (FDS m_config 파라미터 사용) */
     err = maa_async_start(
         m_config.piezo_freq_option,
         m_config.piezo_delay_us,
@@ -1222,11 +1121,6 @@ static int Cmd_mcf(const ParsedCmd *cmd)
     buf[12] = (uint8_t)(m_config.piezo_num_samples & 0xFF); buf[13] = (uint8_t)(m_config.piezo_num_samples >> 8);
     dr_binary_tx_safe(buf, 7);  /* 14바이트 = 7워드 */
 
-    if (g_plat.log) g_plat.log("[Cmd_mcf] freq=%u cyc=%u avg=%u delay=%u samples=%u\r\n",
-        m_config.piezo_freq_option, m_config.piezo_cycles,
-        m_config.piezo_averaging, m_config.piezo_delay_us,
-        m_config.piezo_num_samples);
-
     return 1;
 }
 
@@ -1239,7 +1133,8 @@ static int Cmd_mcf(const ParsedCmd *cmd)
  */
 static int Cmd_mcs(const ParsedCmd *cmd)
 {
-    if (cmd->data_len < 10) {
+    if (cmd->data_len < 10)
+    {
         if (g_plat.log) g_plat.log("[Cmd_mcs] missing params (data_len=%u)\r\n", cmd->data_len);
         dr_ble_return_1("rcs:", 0xFFFF);
         return 1;
@@ -1259,10 +1154,12 @@ static int Cmd_mcs(const ParsedCmd *cmd)
     m_config.piezo_num_samples = num_samples;
     config_save();
 
+    /*
     if (g_plat.log) g_plat.log("[Cmd_mcs] saved: freq=%u cyc=%u avg=%u delay=%u samples=%u\r\n",
         m_config.piezo_freq_option, m_config.piezo_cycles,
         m_config.piezo_averaging, m_config.piezo_delay_us,
         m_config.piezo_num_samples);
+    */
 
     uint8_t *buf = ble_bin_buffer;
     buf[0] = 'r'; buf[1] = 'c'; buf[2] = 's'; buf[3] = ':';
@@ -1294,7 +1191,8 @@ static int Cmd_mwh(const ParsedCmd *cmd)
     char buf[13];
 
     /* 최소 12바이트 데이터 필요 */
-    if (cmd->data_len < 12) {
+    if (cmd->data_len < 12)
+    {
         dr_ble_return_1("rwh:", 0xFFFF);  /* 데이터 부족 에러 */
         return 1;
     }
@@ -1303,11 +1201,7 @@ static int Cmd_mwh(const ParsedCmd *cmd)
     dr_get_ascii(cmd, 0, buf, 12);
     memcpy(HW_NO, buf, 12);
     memcpy(m_config.hw_no, buf, 12);
-    config_save();  /* FDS(Flash)에 영구 저장 */
+    config_save();  /* FDS(Flash Memory)에 저장 */
-
-    if (g_plat.log && g_log_enable) {
-        g_plat.log("[Cmd_mwh] HW=%.12s saved to FDS\r\n", m_config.hw_no);
-    }
 
     ascii_format_data(ble_bin_buffer, "rwh:", buf, 12);
     dr_binary_tx_safe(ble_bin_buffer, 8);
@@ -1331,11 +1225,7 @@ static int Cmd_mws(const ParsedCmd *cmd)
     dr_get_ascii(cmd, 0, buf, 12);
     memcpy(SERIAL_NO, buf, 12);
     memcpy(m_config.serial_no, buf, 12);
-    config_save();
+    config_save();  /* FDS(Flash Memory)에 저장 */
-
-    if (g_plat.log && g_log_enable) {
-        g_plat.log("[Cmd_mws] S/N=%.12s saved to FDS\r\n", m_config.serial_no);
-    }
 
     ascii_format_data(ble_bin_buffer, "rws:", buf, 12);
     dr_binary_tx_safe(ble_bin_buffer, 8);
@@ -1379,9 +1269,7 @@ static int Cmd_mpz(const ParsedCmd *cmd)
 
     memcpy(m_static_passkey, passkey, 6);
     memcpy(m_config.static_passkey, m_static_passkey, 6);
-    config_save();
+    config_save();  /* FDS(Flash Memory)에 저장 */
-
-    if (g_plat.log) g_plat.log("[mpz] Passkey saved: %.6s\r\n", m_static_passkey);
 
     ascii_format_data(ble_bin_buffer, "rpz:", passkey, 6);
     dr_binary_tx_safe(ble_bin_buffer, 5);
@@ -1397,8 +1285,6 @@ static int Cmd_mqz(const ParsedCmd *cmd)
     (void)cmd;
     memcpy(m_static_passkey, m_config.static_passkey, 6);
 
-    if (g_plat.log) g_plat.log("[mqz] Passkey read: %.6s\r\n", m_static_passkey);
-
     ascii_format_data(ble_bin_buffer, "rqz:", m_static_passkey, 6);
     dr_binary_tx_safe(ble_bin_buffer, 5);
     return 1;
@@ -1420,13 +1306,10 @@ static int Cmd_msp(const ParsedCmd *cmd)
 {
     (void)cmd;
 
-    if (g_plat.log) g_plat.log("[MSP] enter\r\n");
-
     hw_i2c_init_once();  /* I2C 버스 초기화 (최초 1회) */
 
     /* IMU 레지스터 직접 읽기 - 타이머, DRDY 인터럽트, 콜백 없이 동기 실행 */
     int rc = imu_read_direct();
 
-    if (g_plat.log) g_plat.log("[MSP] rc=%d\r\n", rc);
     return 1;
 }

project/ble_peripheral/ble_app_bladder_patch/battery_saadc.c

@@ -257,7 +257,7 @@ void battery_event_handler( nrf_drv_saadc_evt_t const * p_event )
 		{
 			low_battery_check = false;
 
-			/* 배터리 전압이 LOW_BATTERY_VOLTAGE(3100mV) 이하인지 확인 */
+			/* 배터리 전압이 LOW_BATTERY_VOLTAGE(3500mV) 이하인지 확인 */
 			if(batt_lvl_in_milli_volt_1 <= LOW_BATTERY_VOLTAGE)
 			{
 				/* 10회 연속 저전압 감지 시 전원 OFF 시퀀스 시작 */
@@ -278,14 +278,13 @@ void battery_event_handler( nrf_drv_saadc_evt_t const * p_event )
 			}
 		}
 
-		/* === info4 모드: 전체 센서 수집 중 배터리 값 저장 === */
+		/* === info4 모드: 전체 센서 수집(mbb) 중 배터리 값 저장 === */
 		else if (info4 == true)
 		{
 			info_batt = batt_lvl_in_milli_volt_1;
-			DBG_PRINTF("INFOTn%d\r\n\r\n", batt_lvl_in_milli_volt_1);
 		}
 
-		/* === 일반 모드: 단독 배터리 측정 요청에 대한 응답 전송 === */
+		 /* === 일반 모드: 단독 배터리 측정 요청(msn)에 대한 응답 전송 === */
 		else
 		{
 			if (cmd_type_t == CMD_UART)
@@ -301,7 +300,6 @@ void battery_event_handler( nrf_drv_saadc_evt_t const * p_event )
 			}
 		}
 	}
-
 }
 
 
@@ -399,20 +397,22 @@ void battery_level_meas(void)
 }
 
 /**
- * @brief 압력센서 2채널 1회 측정 시작
+ * @brief 압력센서 2채널 1회 측정 시작 - 압력센서 미탑재
  *
  * SAADC를 압력센서 2채널용으로 설정 후 샘플링을 트리거한다.
  * 결과는 pressure_all_event_handler 콜백에서 비동기로 처리된다.
  */
+/*
 void pressure_all_level_meas(void)  //add cj add 25/11/19
 {
     ret_code_t err_code;
 
-    pressure_all_configure();   /* SAADC 압력센서 2채널 초기화 */
+    pressure_all_configure();
 
-    err_code = nrf_drv_saadc_sample(); /* ADC 샘플링 트리거 (비동기) */
+    err_code = nrf_drv_saadc_sample();
     APP_ERROR_CHECK(err_code);
 }
+*/
 
 /**
  * @brief 배터리 모니터링 타이머 콜백 (5초 주기)

project/ble_peripheral/ble_app_bladder_patch/battery_saadc.h

@@ -24,13 +24,13 @@
 #define _BATTERY_SAADC_H_
 
 /* 저전압 판정 임계값 (mV) — 이 값 이하가 10회 연속이면 자동 전원 OFF */
-#define LOW_BATTERY_VOLTAGE			3100	/* Low Battery 임계값 */
+#define LOW_BATTERY_VOLTAGE			3500	/* Low Battery 임계값 */
 
 
 /** @brief 배터리 전압 1회 측정 시작 (비동기, 결과는 콜백에서 처리) */
 void battery_level_meas(void);
 /** @brief 압력센서 2채널(AIN7, AIN4) 1회 측정 시작 (비동기) */
-void pressure_all_level_meas(void);
+//void pressure_all_level_meas(void); // 압력센서 미탑재
 /** @brief 배터리 모니터링 5초 반복 타이머 시작 */
 void battery_timer_start(void);
 /** @brief 배터리 모니터링 타이머 정지 */

project/ble_peripheral/ble_app_bladder_patch/icm42670p/app_raw/app_raw.c

@@ -482,8 +482,6 @@ int imu_read_direct(void)
 
 	static bool twi_ready = false;
 
-	DBG_PRINTF("[IMU] enter\r\n");
-
 	/* TWI(I2C) 초기화 — 최초 1회만 수행 (재초기화로 클린 상태 보장) */
 	if (!twi_ready) {
 		inv_i2c_master_uninitialize();
@@ -540,9 +538,6 @@ int imu_read_direct(void)
 	apply_mounting_matrix(icm_mounting_matrix, accel);
 	apply_mounting_matrix(icm_mounting_matrix, gyro);
 
-	DBG_PRINTF("[IMU] A:%d,%d,%d G:%d,%d,%d\r\n",
-		accel[0], accel[1], accel[2], gyro[0], gyro[1], gyro[2]);
-
 	/* 데이터 패킹 */
 	ssp_data[0] = (uint16_t)accel[0];
 	ssp_data[1] = (uint16_t)accel[1];
@@ -551,7 +546,8 @@ int imu_read_direct(void)
 	ssp_data[4] = (uint16_t)gyro[1];
 	ssp_data[5] = (uint16_t)gyro[2];
 
-	if (info4 == true) {
+	if (info4 == true)
+	{
 		/* info4 모드: 전역 배열에 저장 (mbb?에서 rbb: 패킷으로 일괄 전송) */
 		info_imu[0] = ssp_data[0];
 		info_imu[1] = ssp_data[1];
@@ -559,7 +555,9 @@ int imu_read_direct(void)
 		info_imu[3] = ssp_data[3];
 		info_imu[4] = ssp_data[4];
 		info_imu[5] = ssp_data[5];
-	} else {
+	}
+	else
+	{
 		/* 일반 모드: "rsp:" 태그로 BLE 즉시 전송 */
 		format_data(imu_bin_buffer, "rsp:", ssp_data, 12);
 		dr_binary_tx_safe(imu_bin_buffer, 8);
@@ -569,9 +567,7 @@ int imu_read_direct(void)
 	{
 		uint8_t pwr_off[2] = { 0x1F, 0x00 };  /* reg=PWR_MGMT0, val=0x00 */
 		icm42670_twi_tx(IMU_I2C_ADDR, pwr_off, 2, false);
-		DBG_PRINTF("[IMU] sleep\r\n");
 	}
 
-	DBG_PRINTF("[IMU] sent OK\r\n");
 	return 0;
 }

project/ble_peripheral/ble_app_bladder_patch/icm42670p/system_interface.h

@@ -9,8 +9,7 @@
 /*******************************************************************************
  * [헤더 개요] ICM42670P I2C 통신 인터페이스 선언
  *
- * nRF52840 TWI 하드웨어를 통해 ICM42670P IMU 센서와 통신하기 위한
+ * nRF52840 TWI 하드웨어를 통해 ICM42670P IMU 센서와 통신하기 위한 핀 정의, 함수 프로토타입 선언
- * 핀 정의, 함수 프로토타입을 선언한다.
  *
  * 핀 배치:
  *   - I2C SCL : P1.14

project/ble_peripheral/ble_app_bladder_patch/main.c

@@ -14,7 +14,6 @@
  *   - IMU: ICM42670P 6축 가속도/자이로 (I2C, 0x68)
  *   - 온도: TMP235-Q1 아날로그 센서 (SAADC AIN3)
  *   - 배터리: 분압 회로 (SAADC AIN2, 1/3 프리스케일)
- *   - 압력: 2채널 압력센서 (SAADC AIN7/AIN4)
  *   - 전원: POWER_HOLD(P0.8) 자가유지 회로, POWER_BUTTON(P1.8) 입력
  *
  * [소프트웨어 부트 시퀀스 — main() 함수]
@@ -121,6 +120,7 @@
 #include "parser.h"             /* 새 바이너리 명령 파서 (dr_cmd_parser) */
 #include "debug_print.h"        /* 디버그 출력 매크로 (DBG_PRINTF) */
 #include "fstorage.h"           /* Flash Storage 래퍼 (FDS 초기화/저장/로드) */
+#include "dr_piezo.h"           /* 피에조 초음파 드라이버 */
 
 
 #define HARDWARE_VERSION   "VB0HW0000"
@@ -635,7 +635,6 @@ static void nus_data_handler(ble_nus_evt_t * p_evt)
     {
         cmd_type_t = CMD_BLE;
         ble_got_new_data = true;
-        DBG_PRINTF("[NUS] RX len=%d\r\n", p_evt->params.rx_data.length);
         
         /* 콜백에서는 복사만 하고, 메인 루프에서 처리 */
         if (p_evt->params.rx_data.length <= BLE_NUS_MAX_DATA_LEN)
@@ -1783,6 +1782,10 @@ int main(void)
     g_log_enable     = true;
     DBG_PRINTF("  parser OK\r\n");
 
+    // PHASE 7.7: 피에조 드라이버 초기화 (GPIO/GPIOTE/Timer/PPI + 전원)
+    dr_piezo_system_init();
+    DBG_PRINTF("  piezo OK\r\n");
+
     // PHASE 8: 완료
     DBG_PRINTF("\r\n========================================\r\n");
     DBG_PRINTF(" READY [%s]\r\n", SERIAL_NO);

project/ble_peripheral/ble_app_bladder_patch/pca10056/s140/arm5_no_packs/ble_app_bladder_patch_s140.uvoptx

@@ -152,7 +152,7 @@
         <Bp>
           <Number>0</Number>
           <Type>0</Type>
-          <LineNumber>1238</LineNumber>
+          <LineNumber>1306</LineNumber>
           <EnabledFlag>1</EnabledFlag>
           <Address>0</Address>
           <ByteObject>0</ByteObject>
@@ -161,14 +161,14 @@
           <SizeOfObject>0</SizeOfObject>
           <BreakByAccess>0</BreakByAccess>
           <BreakIfRCount>0</BreakIfRCount>
-          <Filename>C:\jhChun\VesiScan-Basic\pc_firm\parser.c</Filename>
+          <Filename>..\..\..\..\..\..\pc_firm\dr_adc121s051\dr_adc121s051.c</Filename>
           <ExecCommand></ExecCommand>
           <Expression></Expression>
         </Bp>
         <Bp>
           <Number>1</Number>
           <Type>0</Type>
-          <LineNumber>1162</LineNumber>
+          <LineNumber>1238</LineNumber>
           <EnabledFlag>1</EnabledFlag>
           <Address>0</Address>
           <ByteObject>0</ByteObject>
@@ -184,7 +184,7 @@
         <Bp>
           <Number>2</Number>
           <Type>0</Type>
-          <LineNumber>191</LineNumber>
+          <LineNumber>1162</LineNumber>
           <EnabledFlag>1</EnabledFlag>
           <Address>0</Address>
           <ByteObject>0</ByteObject>
@@ -193,14 +193,14 @@
           <SizeOfObject>0</SizeOfObject>
           <BreakByAccess>0</BreakByAccess>
           <BreakIfRCount>0</BreakIfRCount>
-          <Filename>..\..\..\power_control.c</Filename>
+          <Filename>C:\jhChun\VesiScan-Basic\pc_firm\parser.c</Filename>
           <ExecCommand></ExecCommand>
           <Expression></Expression>
         </Bp>
         <Bp>
           <Number>3</Number>
           <Type>0</Type>
-          <LineNumber>188</LineNumber>
+          <LineNumber>191</LineNumber>
           <EnabledFlag>1</EnabledFlag>
           <Address>0</Address>
           <ByteObject>0</ByteObject>
@@ -216,7 +216,7 @@
         <Bp>
           <Number>4</Number>
           <Type>0</Type>
-          <LineNumber>692</LineNumber>
+          <LineNumber>188</LineNumber>
           <EnabledFlag>1</EnabledFlag>
           <Address>0</Address>
           <ByteObject>0</ByteObject>
@@ -225,14 +225,14 @@
           <SizeOfObject>0</SizeOfObject>
           <BreakByAccess>0</BreakByAccess>
           <BreakIfRCount>0</BreakIfRCount>
-          <Filename>C:\jhChun\VesiScan-Basic_0313\VesiScan-Basic\project\ble_peripheral\ble_app_bladder_patch\cmd_parse.c</Filename>
+          <Filename>..\..\..\power_control.c</Filename>
           <ExecCommand></ExecCommand>
           <Expression></Expression>
         </Bp>
         <Bp>
           <Number>5</Number>
           <Type>0</Type>
-          <LineNumber>386</LineNumber>
+          <LineNumber>692</LineNumber>
           <EnabledFlag>1</EnabledFlag>
           <Address>0</Address>
           <ByteObject>0</ByteObject>
@@ -248,6 +248,22 @@
         <Bp>
           <Number>6</Number>
           <Type>0</Type>
+          <LineNumber>386</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>0</Address>
+          <ByteObject>0</ByteObject>
+          <HtxType>0</HtxType>
+          <ManyObjects>0</ManyObjects>
+          <SizeOfObject>0</SizeOfObject>
+          <BreakByAccess>0</BreakByAccess>
+          <BreakIfRCount>0</BreakIfRCount>
+          <Filename>C:\jhChun\VesiScan-Basic_0313\VesiScan-Basic\project\ble_peripheral\ble_app_bladder_patch\cmd_parse.c</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression></Expression>
+        </Bp>
+        <Bp>
+          <Number>7</Number>
+          <Type>0</Type>
           <LineNumber>497</LineNumber>
           <EnabledFlag>1</EnabledFlag>
           <Address>0</Address>
@@ -262,7 +278,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>7</Number>
+          <Number>8</Number>
           <Type>0</Type>
           <LineNumber>525</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -278,7 +294,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>8</Number>
+          <Number>9</Number>
           <Type>0</Type>
           <LineNumber>529</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -294,7 +310,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>9</Number>
+          <Number>10</Number>
           <Type>0</Type>
           <LineNumber>394</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -310,7 +326,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>10</Number>
+          <Number>11</Number>
           <Type>0</Type>
           <LineNumber>695</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -326,7 +342,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>11</Number>
+          <Number>12</Number>
           <Type>0</Type>
           <LineNumber>527</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -342,7 +358,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>12</Number>
+          <Number>13</Number>
           <Type>0</Type>
           <LineNumber>531</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -358,7 +374,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>13</Number>
+          <Number>14</Number>
           <Type>0</Type>
           <LineNumber>698</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -374,7 +390,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>14</Number>
+          <Number>15</Number>
           <Type>0</Type>
           <LineNumber>701</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -390,7 +406,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>15</Number>
+          <Number>16</Number>
           <Type>0</Type>
           <LineNumber>2168</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -406,7 +422,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>16</Number>
+          <Number>17</Number>
           <Type>0</Type>
           <LineNumber>396</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -422,7 +438,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>17</Number>
+          <Number>18</Number>
           <Type>0</Type>
           <LineNumber>404</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -438,7 +454,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>18</Number>
+          <Number>19</Number>
           <Type>0</Type>
           <LineNumber>731</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -454,7 +470,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>19</Number>
+          <Number>20</Number>
           <Type>0</Type>
           <LineNumber>734</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -470,7 +486,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>20</Number>
+          <Number>21</Number>
           <Type>0</Type>
           <LineNumber>737</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -486,7 +502,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>21</Number>
+          <Number>22</Number>
           <Type>0</Type>
           <LineNumber>740</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -502,7 +518,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>22</Number>
+          <Number>23</Number>
           <Type>0</Type>
           <LineNumber>2207</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -518,7 +534,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>23</Number>
+          <Number>24</Number>
           <Type>0</Type>
           <LineNumber>195</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -534,7 +550,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>24</Number>
+          <Number>25</Number>
           <Type>0</Type>
           <LineNumber>198</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -550,7 +566,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>25</Number>
+          <Number>26</Number>
           <Type>0</Type>
           <LineNumber>533</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -566,7 +582,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>26</Number>
+          <Number>27</Number>
           <Type>0</Type>
           <LineNumber>535</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -582,7 +598,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>27</Number>
+          <Number>28</Number>
           <Type>0</Type>
           <LineNumber>258</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -598,7 +614,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>28</Number>
+          <Number>29</Number>
           <Type>0</Type>
           <LineNumber>1165</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -614,7 +630,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>29</Number>
+          <Number>30</Number>
           <Type>0</Type>
           <LineNumber>1164</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -630,7 +646,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>30</Number>
+          <Number>31</Number>
           <Type>0</Type>
           <LineNumber>1168</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -646,7 +662,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>31</Number>
+          <Number>32</Number>
           <Type>0</Type>
           <LineNumber>1167</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -662,7 +678,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>32</Number>
+          <Number>33</Number>
           <Type>0</Type>
           <LineNumber>1171</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -678,7 +694,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>33</Number>
+          <Number>34</Number>
           <Type>0</Type>
           <LineNumber>1253</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -694,7 +710,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>34</Number>
+          <Number>35</Number>
           <Type>0</Type>
           <LineNumber>210</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -710,7 +726,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>35</Number>
+          <Number>36</Number>
           <Type>0</Type>
           <LineNumber>213</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -726,7 +742,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>36</Number>
+          <Number>37</Number>
           <Type>0</Type>
           <LineNumber>217</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -742,7 +758,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>37</Number>
+          <Number>38</Number>
           <Type>0</Type>
           <LineNumber>220</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -758,7 +774,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>38</Number>
+          <Number>39</Number>
           <Type>0</Type>
           <LineNumber>280</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -774,7 +790,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>39</Number>
+          <Number>40</Number>
           <Type>0</Type>
           <LineNumber>1166</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -790,7 +806,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>40</Number>
+          <Number>41</Number>
           <Type>0</Type>
           <LineNumber>1169</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -806,7 +822,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>41</Number>
+          <Number>42</Number>
           <Type>0</Type>
           <LineNumber>1172</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -822,7 +838,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>42</Number>
+          <Number>43</Number>
           <Type>0</Type>
           <LineNumber>1175</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -838,7 +854,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>43</Number>
+          <Number>44</Number>
           <Type>0</Type>
           <LineNumber>1242</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -854,7 +870,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>44</Number>
+          <Number>45</Number>
           <Type>0</Type>
           <LineNumber>1257</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -870,7 +886,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>45</Number>
+          <Number>46</Number>
           <Type>0</Type>
           <LineNumber>97</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -886,7 +902,7 @@
           <Expression></Expression>
         </Bp>
         <Bp>
-          <Number>46</Number>
+          <Number>47</Number>
           <Type>0</Type>
           <LineNumber>96</LineNumber>
           <EnabledFlag>1</EnabledFlag>
@@ -901,6 +917,22 @@
           <ExecCommand></ExecCommand>
           <Expression></Expression>
         </Bp>
+        <Bp>
+          <Number>48</Number>
+          <Type>0</Type>
+          <LineNumber>34</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>0</Address>
+          <ByteObject>0</ByteObject>
+          <HtxType>0</HtxType>
+          <ManyObjects>0</ManyObjects>
+          <SizeOfObject>0</SizeOfObject>
+          <BreakByAccess>0</BreakByAccess>
+          <BreakIfRCount>0</BreakIfRCount>
+          <Filename>..\..\..\fstorage.c</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression></Expression>
+        </Bp>
       </Breakpoint>
       <Tracepoint>
         <THDelay>0</THDelay>

project/ble_peripheral/ble_app_bladder_patch/pca10056/s140/config/sdk_config.h

@@ -11473,7 +11473,7 @@
 // <i> or this value is actually used. It depends on which one is bigger.
 
 #ifndef SEGGER_RTT_CONFIG_BUFFER_SIZE_UP
-#define SEGGER_RTT_CONFIG_BUFFER_SIZE_UP 1024   // 512 -> 1024  jhChun 26.03.17
+#define SEGGER_RTT_CONFIG_BUFFER_SIZE_UP 4096   // 512 -> 1024 -> 4096  jhChun 26.03.17
 #endif
 
 // <o> SEGGER_RTT_CONFIG_MAX_NUM_UP_BUFFERS - Maximum number of upstream buffers. 

project/ble_peripheral/ble_app_bladder_patch/tmp235_q1.c

@@ -100,7 +100,7 @@ void tmp235_voltage_handler(nrf_drv_saadc_evt_t const * p_event)	/* TMP325 Vout
 
         /* ADC 변환 결과 읽기 */
         adc_result = p_event->data.done.p_buffer[0];
-        DBG_PRINTF("[TMP] adc=%d\r\n", adc_result);
+        //DBG_PRINTF("[TMP] adc=%d\r\n", adc_result);
 
 		/* SAADC 해제 — 배터리/압력센서 측정과 하드웨어 공유 */
 		nrf_drv_saadc_uninit();

project/ble_peripheral/dr_piezo/dr_piezo.c

@@ -215,17 +215,17 @@ void TIMER2_IRQHandler(void)
 /* 피에조 전원 ON: DC/DC 컨버터 활성화 → ±20V 생성 */
 void dr_piezo_power_on(void)
 {
-    nrf_delay_ms(20);
+    //nrf_delay_ms(20);
     
     nrf_gpio_cfg_output(DR_PIEZO_PWR_EN);
     nrf_gpio_pin_set(DR_PIEZO_PWR_EN);
     
     /* Wait for power stabilization */
-    nrf_delay_ms(10);
+    nrf_delay_ms(3);
     
     m_power_enabled = true;
     
-    DBG_PRINTF("[PIEZO] Power ON: +/-20V ready\r\n");
+    //DBG_PRINTF("[PIEZO] TX/RX Active: +/-20V ready\r\n");
 }
 
 /* 피에조 전원 OFF: TX 비활성화 → MUX 비활성화 → DC/DC 컨버터 차단 */
@@ -243,7 +243,7 @@ void dr_piezo_power_off(void)
 
     m_power_enabled = false;
 
-    DBG_PRINTF("[PIEZO] Power OFF\r\n");
+    //DBG_PRINTF("[PIEZO] Power OFF\r\n");
 }
 
 /* 피에조 전원 상태 확인 */
@@ -272,8 +272,6 @@ static void dr_piezo_gpio_init(void)
 
     /* Initialize MUX control pins */
     dr_piezo_mux_init();
-
-    DBG_PRINTF("[PIEZO] GPIO init done\r\n");
 }
 
 /* GPIOTE 초기화: P_OUT/N_OUT을 토글 모드로 설정 (PPI 연결 대상) */
@@ -296,8 +294,6 @@ static void dr_piezo_gpiote_init(void)
         NRF_GPIOTE_INITIAL_VALUE_LOW
     );
     nrf_gpiote_task_enable(GPIOTE_CH_N_OUT);
-    
-    DBG_PRINTF("[PIEZO] GPIOTE init done\r\n");
 }
 
 /*
@@ -345,8 +341,6 @@ static void dr_piezo_timer_init(void)
     
     NVIC_SetPriority(PIEZO_TIMER_IRQn, PIEZO_TIMER_IRQ_PRIORITY);
     NVIC_EnableIRQ(PIEZO_TIMER_IRQn);
-    
-    DBG_PRINTF("[DR_PIEZO] Timer init done (period=%d ticks)\r\n", m_period_ticks);
 }
 
 /*
@@ -394,8 +388,6 @@ static void dr_piezo_ppi_init(void)
         (uint32_t)&NRF_GPIOTE->TASKS_OUT[GPIOTE_CH_N_OUT]
     );
     nrf_ppi_channel_enable((nrf_ppi_channel_t)PPI_CH_N_OUT_TOGGLE_1);
-    
-    DBG_PRINTF("[DR_PIEZO] PPI init done (4 channels)\r\n");
 }
 
 /*==============================================================================
@@ -405,8 +397,6 @@ static void dr_piezo_ppi_init(void)
 /* TX 드라이버 초기화: GPIO → GPIOTE → Timer → PPI 순서로 설정 */
 void dr_piezo_init(void)
 {
-    DBG_PRINTF("[DR_PIEZO] Initializing TX driver...\r\n");
-    
     dr_piezo_gpio_init();
     dr_piezo_gpiote_init();
     dr_piezo_timer_init();
@@ -415,8 +405,6 @@ void dr_piezo_init(void)
     m_tx_active = false;
     m_remaining_cycles = 0;
     m_initialized = true;
-    
-    DBG_PRINTF("[DR_PIEZO] TX driver ready (2MHz)\r\n");
 }
 
 /* TX 드라이버 해제: 타이머 정지, PPI/GPIOTE 비활성화, 모든 핀 LOW */
@@ -441,8 +429,6 @@ void dr_piezo_uninit(void)
     
     m_tx_active = false;
     m_initialized = false;
-    
-    DBG_PRINTF("[DR_PIEZO] TX driver uninitialized\r\n");
 }
 
 /*
@@ -538,7 +524,6 @@ void dr_piezo_disable(void)
     nrf_gpio_pin_clear(DR_PIEZO_PIN_PE);
     nrf_gpio_pin_clear(DR_PIEZO_PIN_P_OUT);
     nrf_gpio_pin_clear(DR_PIEZO_PIN_N_OUT);
-    DBG_PRINTF("[DR_PIEZO] TX disabled\r\n");
 }
 
 /* TX 송신 중 여부 확인 (인터럽트 핸들러에서 false로 전환) */
@@ -577,16 +562,6 @@ void dr_piezo_set_frequency(uint32_t freq_hz)
 /* MUX 제어 핀 초기화: 4개 핀 모두 High Drive 출력으로 설정, 기본값 LOW */
 void dr_piezo_mux_init(void)
 {
-    /* Configure MUX control pins as outputs */
-    /*nrf_gpio_cfg_output(DR_PIEZO_MUX_SEL1);
-    nrf_gpio_cfg_output(DR_PIEZO_MUX_SEL2);
-    nrf_gpio_cfg_output(DR_PIEZO_MUX_SEL3);*/
-
-    /*nrf_gpio_cfg_output(DR_PIEZO_EN_MUXA);
-    nrf_gpio_cfg_output(DR_PIEZO_EN_MUXB);
-    nrf_gpio_cfg_output(DR_PIEZO_MUX_SEL0);
-    nrf_gpio_cfg_output(DR_PIEZO_MUX_SEL1);*/
-
     /* Configure pins as output with high drive strength */
     nrf_gpio_cfg(
         DR_PIEZO_MUX_SEL0,
@@ -624,17 +599,10 @@ void dr_piezo_mux_init(void)
         NRF_GPIO_PIN_NOSENSE
     );
 
-    /* Set MUX selection: P1.13=HIGH, P1.12=LOW, P1.11=LOW */
-    //nrf_gpio_pin_set(DR_PIEZO_MUX_SEL1);    /* P1.13 = HIGH */
-    //nrf_gpio_pin_clear(DR_PIEZO_MUX_SEL2);  /* P1.12 = LOW */
-    //nrf_gpio_pin_clear(DR_PIEZO_MUX_SEL3);  /* P1.11 = LOW */
-
     nrf_gpio_pin_clear(DR_PIEZO_EN_MUXA);     /* P0.21 = LOW, Select Channel -> HIGH */
     nrf_gpio_pin_clear(DR_PIEZO_EN_MUXB);     /* P0.23 = LOW, Select Channel -> HIGH */
     nrf_gpio_pin_clear(DR_PIEZO_MUX_SEL0);    /* P1.10 = LOW */
     nrf_gpio_pin_clear(DR_PIEZO_MUX_SEL1);    /* P0.28 = LOW */
-
-    DBG_PRINTF("[DR_PIEZO] MUX init done\r\n");
 }
 
 
@@ -687,7 +655,7 @@ void dr_piezo_select_channel(uint8_t channel)
             break;
     }
 
-    /* Delay for MUX settling (analog path stabilization) */
+    /* 채널 변경 시 MUX 안정화 시간 필요 (> 1.2ms) */
     nrf_delay_us(DR_PIEZO_MUX_SETTLING_US);
 }
 
@@ -735,13 +703,11 @@ void dr_piezo_test_pins(void)
  * 시스템 함수 (전원 + TX 드라이버 통합 제어)
  *============================================================================*/
 
-/* 시스템 전체 초기화: 전원 ON → TX 드라이버 초기화 */
+/* 시스템 전체 초기화: TX 드라이버 초기화 → 전원 ON (부팅 시 1회만 호출) */
 void dr_piezo_system_init(void)
 {
-    DBG_PRINTF("[PIEZO] System init...\r\n");
+    dr_piezo_init();      /* GPIO/GPIOTE/Timer/PPI 먼저 안전 상태로 설정 */
-    dr_piezo_power_on();
+    dr_piezo_power_on();  /* 그 다음 DC/DC 전원 인가 */
-    dr_piezo_init();
-    DBG_PRINTF("[PIEZO] System ready\r\n");
 }
 
 /* 시스템 전체 종료: TX 드라이버 해제 → 전원 OFF */
@@ -749,7 +715,6 @@ void dr_piezo_system_uninit(void)
 {
     dr_piezo_uninit();
     dr_piezo_power_off();
-    DBG_PRINTF("[DR_PIEZO] System shutdown\r\n");
 }
 
 /* 전원 확인 후 버스트 송신 (블로킹: 송신 완료까지 대기) */

project/ble_peripheral/dr_piezo/dr_piezo.h

@@ -68,9 +68,6 @@
  * 전원 제어 핀 (DC/DC 컨버터 +/-20V)
  * DR_PIEZO_PWR_EN: HIGH로 설정 시 DC/DC 컨버터가 +/-20V 고전압 생성
  *============================================================================*/
-//#define DR_PIEZO_PWR_SHDN       NRF_GPIO_PIN_MAP(0, 21)  /**< SHDN_VPP/VNN (LT3463) */    // P0.21 : PZT_EN_MUXA  jhChun 0128
-//#define DR_PIEZO_PWR_EN_10V     NRF_GPIO_PIN_MAP(0, 22)  /**< EN_+10V (MCP1804) */        // P0.22 : NIRS PIN     
-
 #define DR_PIEZO_PWR_EN       NRF_GPIO_PIN_MAP(1, 9)  /** Power Enable   jhChun 0128 */
 
 /*==============================================================================
@@ -81,15 +78,10 @@
  * N_OUT: Negative Output - 피에조 음극 구동 (P_OUT과 역상)
  * 주의: 이전 핀 할당(주석 처리)에서 새 보드 레이아웃으로 변경됨 (jhChun 0128)
  *============================================================================*/
-//#define DR_PIEZO_PIN_PE         NRF_GPIO_PIN_MAP(1, 5)   /**< Pulse Enable */
-//#define DR_PIEZO_PIN_DMP        NRF_GPIO_PIN_MAP(1, 9)   /**< Dump control */
-//#define DR_PIEZO_PIN_P_OUT      NRF_GPIO_PIN_MAP(1, 3)   /**< Positive output */
-//#define DR_PIEZO_PIN_N_OUT      NRF_GPIO_PIN_MAP(1, 2)   /**< Negative output */
-
 #define DR_PIEZO_PIN_PE         NRF_GPIO_PIN_MAP(0, 25)   /**< Pulse Enable */           // P1.05 -> P0.25
-#define DR_PIEZO_PIN_DMP        NRF_GPIO_PIN_MAP(1, 0)   /**< Dump control */            // P1.9 -> P1.0
+#define DR_PIEZO_PIN_DMP        NRF_GPIO_PIN_MAP(1, 0)    /**< Dump control */            // P1.9 -> P1.0
-#define DR_PIEZO_PIN_P_OUT      NRF_GPIO_PIN_MAP(1, 7)   /**< Positive output */         // P1.3 -> P1.7
+#define DR_PIEZO_PIN_P_OUT      NRF_GPIO_PIN_MAP(1, 7)    /**< Positive output */         // P1.3 -> P1.7
-#define DR_PIEZO_PIN_N_OUT      NRF_GPIO_PIN_MAP(1, 6)   /**< Negative output */         // P1.2 -> P1.6  jhChun 0128
+#define DR_PIEZO_PIN_N_OUT      NRF_GPIO_PIN_MAP(1, 6)    /**< Negative output */         // P1.2 -> P1.6  jhChun 0128
  
 /*==============================================================================
  * MUX 제어 핀 (에코 신호 경로 선택)
@@ -98,10 +90,6 @@
  * EN_MUXA/EN_MUXB: 각 MUX 활성화 (동시에 하나만 HIGH)
  * SEL0/SEL1: MUX 내부 4채널 중 하나를 선택하는 주소 비트
  *============================================================================*/
-//#define DR_PIEZO_MUX_SEL1       NRF_GPIO_PIN_MAP(1, 13)  /**< MUX Select 1 (HIGH) */
-//#define DR_PIEZO_MUX_SEL2       NRF_GPIO_PIN_MAP(1, 12)  /**< MUX Select 2 (LOW) */
-//#define DR_PIEZO_MUX_SEL3       NRF_GPIO_PIN_MAP(1, 11)  /**< MUX Select 3 (LOW) */
-
 /* Piezo MUX pins (8ch)    jhChun 0129 */
 #define DR_PIEZO_EN_MUXA        NRF_GPIO_PIN_MAP(0, 21)  /**< MUXA Enable */
 #define DR_PIEZO_EN_MUXB        NRF_GPIO_PIN_MAP(0, 23)  /**< MUXB Enable */
@@ -123,8 +111,8 @@
 #define DR_PIEZO_FREQ_HZ        2100000     /**< Target frequency (set PIEZO_FREQ_MHZ in .c) */
 #define DR_PIEZO_DEFAULT_CYCLES 5           /**< Default burst cycles (3~5) */
 #define DR_PIEZO_MIN_CYCLES     3
-#define DR_PIEZO_MAX_CYCLES     7       /* 3 -> 7  jhChun 26.03.12 */
+#define DR_PIEZO_MAX_CYCLES     7
-#define DR_PIEZO_MUX_SETTLING_US 1300   /**< MUX settling delay (us) */
+#define DR_PIEZO_MUX_SETTLING_US 1300       /**< MUX settling delay (us) */
 
 /*==============================================================================
  * 전원 제어 함수