diff --git a/.gitignore b/.gitignore index 9d90811..0481f71 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,8 @@ desktop.ini *.tmp *.bak data/curcuit +project/ble_peripheral/ble_app_bladder_patch/pca10056/s140/arm5_no_packs/ble_app_bladder_patch_s140.uvprojx +project/ble_peripheral/ble_app_bladder_patch/pca10056/s140/arm5_no_packs/ble_app_bladder_patch_s140.uvoptx +data/Piezo 6채널 측정 시 에러 코드.md +data/Piezo 6채널 측정 시 에러 코드.pdf +data/pdf-style.css diff --git a/components/libraries/util/app_error_weak.c b/components/libraries/util/app_error_weak.c index 17cdcc0..78ee54a 100644 --- a/components/libraries/util/app_error_weak.c +++ b/components/libraries/util/app_error_weak.c @@ -100,11 +100,11 @@ __WEAK void app_error_fault_handler(uint32_t id, uint32_t pc, uint32_t info) NRF_BREAKPOINT_COND; // On assert, the system can only recover with a reset. -#ifndef DEBUG +#ifndef DEBUG // DEBUG 모드가 아닌 경우 = RELEASE 모드인 경우 NRF_LOG_WARNING("System reset"); NVIC_SystemReset(); -#else +#else // DEBUG 모드인 경우 app_error_save_and_stop(id, pc, info); -#endif // DEBUG +#endif } /*lint -restore */ diff --git a/pc_firm/dr_adc121s051/dr_adc121s051.c b/pc_firm/dr_adc121s051/dr_adc121s051.c index 03d136b..55e74d8 100644 --- a/pc_firm/dr_adc121s051/dr_adc121s051.c +++ b/pc_firm/dr_adc121s051/dr_adc121s051.c @@ -605,6 +605,9 @@ dr_adc_err_t dr_adc_burst_capture_transmit(uint8_t freq_option, uint16_t delay_u /*--- Step 2: Select piezo channel ---*/ dr_piezo_select_channel(piezo_ch); + /* MUX 전환 후 S/H 커패시터 안정화를 위한 dummy read */ + (void)spim_read_raw(); + /*--- Step 3~5: Burst + Delay + Capture ---*/ if (averaging == 1) { /*=== SINGLE MEASUREMENT (no averaging) - direct path ===*/ diff --git a/project/ble_peripheral/ble_app_bladder_patch/main.c b/project/ble_peripheral/ble_app_bladder_patch/main.c index a5b1099..3293cc9 100644 --- a/project/ble_peripheral/ble_app_bladder_patch/main.c +++ b/project/ble_peripheral/ble_app_bladder_patch/main.c @@ -120,7 +120,6 @@ /*============================================================================== * 빌드 설정 - * DEBUG_MINIMAL_BOOT 삭제 26.03.26 jhChun *============================================================================*/ #define BLE_DEV_MODE 1 /* 1: 개발 모드 (보안 없음), 0: 양산 모드 (패스키 필수) */ @@ -693,6 +692,7 @@ static void on_conn_params_evt(ble_conn_params_evt_t * p_evt) { if (p_evt->evt_type == BLE_CONN_PARAMS_EVT_FAILED) { + DBG_PRINTF("[CONN] Param negotiation FAILED -> disconnect\r\n"); uint32_t err_code = sd_ble_gap_disconnect(m_conn_handle, BLE_HCI_CONN_INTERVAL_UNACCEPTABLE); APP_ERROR_CHECK(err_code); } @@ -1093,7 +1093,7 @@ static void ble_evt_handler(ble_evt_t const * p_ble_evt, void * p_context) case BLE_GATTC_EVT_TIMEOUT: case BLE_GATTS_EVT_TIMEOUT: - DBG_PRINTF("[BLE] Timeout\r\n"); + DBG_PRINTF("[BLE] GATT Timeout -> disconnect\r\n"); err_code = sd_ble_gap_disconnect(p_ble_evt->evt.gap_evt.conn_handle, BLE_HCI_REMOTE_USER_TERMINATED_CONNECTION); APP_ERROR_CHECK(err_code); diff --git a/project/ble_peripheral/ble_app_bladder_patch/pca10056/s140/arm5_no_packs/ble_app_bladder_patch_s140.uvoptx b/project/ble_peripheral/ble_app_bladder_patch/pca10056/s140/arm5_no_packs/ble_app_bladder_patch_s140.uvoptx index d8f552b..83203de 100644 --- a/project/ble_peripheral/ble_app_bladder_patch/pca10056/s140/arm5_no_packs/ble_app_bladder_patch_s140.uvoptx +++ b/project/ble_peripheral/ble_app_bladder_patch/pca10056/s140/arm5_no_packs/ble_app_bladder_patch_s140.uvoptx @@ -1504,7 +1504,7 @@ nRF_BLE - 1 + 0 0 0 0 @@ -3148,7 +3148,7 @@ ICM42670 - 1 + 0 0 0 0