diff --git a/.gitignore b/.gitignore index 9d7f9a3..9d90811 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ desktop.ini # Temporary files *.tmp *.bak +data/curcuit diff --git a/components/libraries/util/app_error.h b/components/libraries/util/app_error.h index 34dadfa..89312b7 100644 --- a/components/libraries/util/app_error.h +++ b/components/libraries/util/app_error.h @@ -157,6 +157,8 @@ void app_error_log_handle(uint32_t id, uint32_t pc, uint32_t info); /**@brief Macro for calling error handler function if supplied error code any other than NRF_SUCCESS. * * @param[in] ERR_CODE Error code supplied to the error handler. + * + * 시스템 에러 시 리셋(SoftDevice 초기화) 후 BLE Advertising 시작 */ #define APP_ERROR_CHECK(ERR_CODE) \ do \ diff --git a/project/ble_peripheral/ble_app_bladder_patch/pca10056/s140/config/sdk_config.h b/project/ble_peripheral/ble_app_bladder_patch/pca10056/s140/config/sdk_config.h index a3b2435..15ca3c1 100644 --- a/project/ble_peripheral/ble_app_bladder_patch/pca10056/s140/config/sdk_config.h +++ b/project/ble_peripheral/ble_app_bladder_patch/pca10056/s140/config/sdk_config.h @@ -2720,7 +2720,7 @@ // This settings means only that components for DCDC regulator are installed and it can be enabled. #ifndef NRFX_POWER_CONFIG_DEFAULT_DCDCEN -#define NRFX_POWER_CONFIG_DEFAULT_DCDCEN 0 +#define NRFX_POWER_CONFIG_DEFAULT_DCDCEN 1 #endif // NRFX_POWER_CONFIG_DEFAULT_DCDCENHV - The default configuration of High Voltage DCDC regulator @@ -5103,7 +5103,7 @@ // This settings means only that components for DCDC regulator are installed and it can be enabled. #ifndef POWER_CONFIG_DEFAULT_DCDCEN -#define POWER_CONFIG_DEFAULT_DCDCEN 0 +#define POWER_CONFIG_DEFAULT_DCDCEN 1 #endif // POWER_CONFIG_DEFAULT_DCDCENHV - The default configuration of High Voltage DCDC regulator diff --git a/project/ble_peripheral/ble_app_bladder_patch/tmp235_q1.c b/project/ble_peripheral/ble_app_bladder_patch/tmp235_q1.c index 4ce4e9d..23a9071 100644 --- a/project/ble_peripheral/ble_app_bladder_patch/tmp235_q1.c +++ b/project/ble_peripheral/ble_app_bladder_patch/tmp235_q1.c @@ -179,7 +179,13 @@ void tmp235_init(void) /* SAADC 드라이버 초기화 (기본 설정 + 온도센서 이벤트 핸들러 등록) */ ret_code_t err_code = nrf_drv_saadc_init(NULL, tmp235_voltage_handler); APP_ERROR_CHECK(err_code); - + /* + if (err_code != NRF_SUCCESS) + { + tmp235_saadc_done = true; // 대기 루프 탈출시킴 + return; + } + */ /* AIN3 채널 설정: TMP235-Q1 Vout 핀 (싱글엔드 입력) */ nrf_saadc_channel_config_t config = NRF_DRV_SAADC_DEFAULT_CHANNEL_CONFIG_SE(NRF_SAADC_INPUT_AIN3); /* TMP235_Q1 Voltage Output Measurement */ err_code = nrf_drv_saadc_channel_init(0, &config);