hueso/Sensor-Watch
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

Add new function to disable certain RTC periodic callbacks

Browse Source
This commit is contained in:
Alexsander Akers 2022-01-27 11:23:14 -05:00
parent d3e484dc98
commit a559d089f1
4 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
movement/movement.c
View File

@ -155,13 +155,7 @@ void movement_request_tick_frequency(uint8_t freq) {
if (freq == 128) return; // Movement uses the 128 Hz tick internally if (freq == 128) return; // Movement uses the 128 Hz tick internally
// disable all callbacks except the 128 Hz one // disable all callbacks except the 128 Hz one
#if __EMSCRIPTEN__ watch_rtc_disable_matching_periodic_callbacks(0b01111111);
for (int i = 1; i < 128; i = i << 1) {
watch_rtc_disable_periodic_callback(i);
}
#else
RTC->MODE2.INTENCLR.reg = 0xFE;
#endif
movement_state.subsecond = 0; movement_state.subsecond = 0;
movement_state.tick_frequency = freq; movement_state.tick_frequency = freq;

6
watch-library/hardware/watch/watch_rtc.c
View File

@ -102,8 +102,12 @@ void watch_rtc_disable_periodic_callback(uint8_t frequency) {
RTC->MODE2.INTENCLR.reg = 1 << per_n; RTC->MODE2.INTENCLR.reg = 1 << per_n;
} }
void watch_rtc_disable_matching_periodic_callbacks(uint8_t mask) {
RTC->MODE2.INTENCLR.reg = mask;
}
void watch_rtc_disable_all_periodic_callbacks(void) { void watch_rtc_disable_all_periodic_callbacks(void) {
RTC->MODE2.INTENCLR.reg = 0xFF; watch_rtc_disable_matching_periodic_callbacks(0xFF);
} }
void watch_rtc_register_alarm_callback(ext_irq_cb_t callback, watch_date_time alarm_time, watch_rtc_alarm_match mask) { void watch_rtc_register_alarm_callback(ext_irq_cb_t callback, watch_date_time alarm_time, watch_rtc_alarm_match mask) {

5
watch-library/shared/watch/watch_rtc.h
View File

@ -137,6 +137,11 @@ void watch_rtc_register_periodic_callback(ext_irq_cb_t callback, uint8_t frequen
*/ */
void watch_rtc_disable_periodic_callback(uint8_t frequency); void watch_rtc_disable_periodic_callback(uint8_t frequency);
/** @brief Disables tick callbacks for the given periods (as a bitmask).
* @param mask The frequencies of tick callbacks you wish to disable, in Hz. To disable the 2 and 4 Hz callbacks, pass 0b00000110;
*/
void watch_rtc_disable_matching_periodic_callbacks(uint8_t mask);
/** @brief Disables all periodic callbacks, including the once-per-second tick callback. /** @brief Disables all periodic callbacks, including the once-per-second tick callback.
*/ */
void watch_rtc_disable_all_periodic_callbacks(void); void watch_rtc_disable_all_periodic_callbacks(void);

8
watch-library/simulator/watch/watch_rtc.c
View File

@ -113,15 +113,19 @@ void watch_rtc_disable_periodic_callback(uint8_t frequency) {
} }
} }
void watch_rtc_disable_all_periodic_callbacks(void) { void watch_rtc_disable_matching_periodic_callbacks(uint8_t mask) {
for (int i = 0; i < 8; i++) { for (int i = 0; i < 8; i++) {
if (tick_callbacks[i] != -1) { if (tick_callbacks[i] != -1 && (mask & (1 << i)) != 0) {
emscripten_clear_interval(tick_callbacks[i]); emscripten_clear_interval(tick_callbacks[i]);
tick_callbacks[i] = -1; tick_callbacks[i] = -1;
} }
} }
} }
void watch_rtc_disable_all_periodic_callbacks(void) {
watch_rtc_disable_matching_periodic_callbacks(0xFF);
}
static void watch_invoke_alarm_interval_callback(void *userData) { static void watch_invoke_alarm_interval_callback(void *userData) {
if (alarm_callback) alarm_callback(); if (alarm_callback) alarm_callback();
} }