This commit is contained in:
2026-04-14 19:59:36 +09:00
parent 53a72e35dd
commit e659db6dbf
5 changed files with 15 additions and 7 deletions

5
.gitignore vendored
View File

@@ -52,3 +52,8 @@ desktop.ini
*.tmp *.tmp
*.bak *.bak
data/curcuit 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

View File

@@ -100,11 +100,11 @@ __WEAK void app_error_fault_handler(uint32_t id, uint32_t pc, uint32_t info)
NRF_BREAKPOINT_COND; NRF_BREAKPOINT_COND;
// On assert, the system can only recover with a reset. // On assert, the system can only recover with a reset.
#ifndef DEBUG #ifndef DEBUG // DEBUG 모드가 아닌 경우 = RELEASE 모드인 경우
NRF_LOG_WARNING("System reset"); NRF_LOG_WARNING("System reset");
NVIC_SystemReset(); NVIC_SystemReset();
#else #else // DEBUG 모드인 경우
app_error_save_and_stop(id, pc, info); app_error_save_and_stop(id, pc, info);
#endif // DEBUG #endif
} }
/*lint -restore */ /*lint -restore */

View File

@@ -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 ---*/ /*--- Step 2: Select piezo channel ---*/
dr_piezo_select_channel(piezo_ch); dr_piezo_select_channel(piezo_ch);
/* MUX 전환 후 S/H 커패시터 안정화를 위한 dummy read */
(void)spim_read_raw();
/*--- Step 3~5: Burst + Delay + Capture ---*/ /*--- Step 3~5: Burst + Delay + Capture ---*/
if (averaging == 1) { if (averaging == 1) {
/*=== SINGLE MEASUREMENT (no averaging) - direct path ===*/ /*=== SINGLE MEASUREMENT (no averaging) - direct path ===*/

View File

@@ -120,7 +120,6 @@
/*============================================================================== /*==============================================================================
* 빌드 설정 * 빌드 설정
* DEBUG_MINIMAL_BOOT 삭제 26.03.26 jhChun
*============================================================================*/ *============================================================================*/
#define BLE_DEV_MODE 1 /* 1: 개발 모드 (보안 없음), 0: 양산 모드 (패스키 필수) */ #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) 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); uint32_t err_code = sd_ble_gap_disconnect(m_conn_handle, BLE_HCI_CONN_INTERVAL_UNACCEPTABLE);
APP_ERROR_CHECK(err_code); 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_GATTC_EVT_TIMEOUT:
case BLE_GATTS_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, err_code = sd_ble_gap_disconnect(p_ble_evt->evt.gap_evt.conn_handle,
BLE_HCI_REMOTE_USER_TERMINATED_CONNECTION); BLE_HCI_REMOTE_USER_TERMINATED_CONNECTION);
APP_ERROR_CHECK(err_code); APP_ERROR_CHECK(err_code);

View File

@@ -1504,7 +1504,7 @@
<Group> <Group>
<GroupName>nRF_BLE</GroupName> <GroupName>nRF_BLE</GroupName>
<tvExp>1</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
@@ -3148,7 +3148,7 @@
<Group> <Group>
<GroupName>ICM42670</GroupName> <GroupName>ICM42670</GroupName>
<tvExp>1</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>