diff options
| author | Michele Bini <michele.bini@gmail.com> | 2022-04-15 11:10:42 (GMT) |
|---|---|---|
| committer | Michele Bini <michele.bini@gmail.com> | 2022-04-16 12:16:03 (GMT) |
| commit | 9f682f4132a71ca1fef0b567b1334031df382abb (patch) | |
| tree | b76a59df388e507969b7d13ecd6ed4455af76c88 | |
| parent | 2e367ec0aea857a1aee7306a2de893f96a60f2df (diff) | |
remove app timer, with the exception of header, to keep APP_TIMER_TICKS definition.
| -rwxr-xr-x | cmake-nRF5x/CMake_nRF5x.cmake | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/components/alarm/AlarmController.cpp | 2 | ||||
| -rw-r--r-- | src/sdk_config.h | 2 | ||||
| -rw-r--r-- | src/systemtask/SystemTask.cpp | 2 |
5 files changed, 2 insertions, 7 deletions
diff --git a/cmake-nRF5x/CMake_nRF5x.cmake b/cmake-nRF5x/CMake_nRF5x.cmake index c7d0a68..9bf63f2 100755 --- a/cmake-nRF5x/CMake_nRF5x.cmake +++ b/cmake-nRF5x/CMake_nRF5x.cmake @@ -106,7 +106,6 @@ macro(nRF5x_setup) ${NRF5_SDK_PATH}/external/freertos/source/stream_buffer.c ${NRF5_SDK_PATH}/external/freertos/source/tasks.c ${NRF5_SDK_PATH}/external/freertos/source/timers.c - ${NRF5_SDK_PATH}/components/libraries/timer/app_timer_freertos.c ) # freertos include @@ -335,7 +334,6 @@ endmacro(nRF5x_addAppFIFO) # adds app-level Timer libraries macro(nRF5x_addAppTimer) list(APPEND SDK_SOURCE_FILES - "${NRF5_SDK_PATH}/components/libraries/timer/app_timer.c" ) endmacro(nRF5x_addAppTimer) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 86460c9..c0df7b2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -53,7 +53,6 @@ set(SDK_SOURCE_FILES ${NRF5_SDK_PATH}/external/freertos/source/stream_buffer.c ${NRF5_SDK_PATH}/external/freertos/source/tasks.c ${NRF5_SDK_PATH}/external/freertos/source/timers.c - ${NRF5_SDK_PATH}/components/libraries/timer/app_timer_freertos.c # Libs "${NRF5_SDK_PATH}/components/libraries/atomic/nrf_atomic.c" diff --git a/src/components/alarm/AlarmController.cpp b/src/components/alarm/AlarmController.cpp index 6e93f6d..0a2231f 100644 --- a/src/components/alarm/AlarmController.cpp +++ b/src/components/alarm/AlarmController.cpp @@ -61,7 +61,7 @@ void AlarmController::RescheduleAlarm() { } void AlarmController::ScheduleAlarm() { - // Determine the next time the alarm needs to go off and set the app_timer + // Determine the next time the alarm needs to go off and set the timer xTimerStop(alarmAppTimer, 0); auto now = dateTimeController.CurrentDateTime(); diff --git a/src/sdk_config.h b/src/sdk_config.h index 7634dca..fa9d630 100644 --- a/src/sdk_config.h +++ b/src/sdk_config.h @@ -6781,7 +6781,7 @@ // <e> APP_TIMER_ENABLED - app_timer - Application timer functionality //========================================================== #ifndef APP_TIMER_ENABLED - #define APP_TIMER_ENABLED 1 + #define APP_TIMER_ENABLED 0 #endif // <o> APP_TIMER_CONFIG_RTC_FREQUENCY - Configure RTC prescaler. diff --git a/src/systemtask/SystemTask.cpp b/src/systemtask/SystemTask.cpp index c1fd3c1..2f9c4f0 100644 --- a/src/systemtask/SystemTask.cpp +++ b/src/systemtask/SystemTask.cpp @@ -127,8 +127,6 @@ void SystemTask::Work() { NRF_LOG_INFO("Last reset reason : %s", Pinetime::Drivers::Watchdog::ResetReasonToString(watchdog.ResetReason())); APP_GPIOTE_INIT(2); - app_timer_init(); - spi.Init(); spiNorFlash.Init(); spiNorFlash.Wakeup(); |