mirror/second-movement
3
0
Fork 0
mirror of https://github.com/joeycastillo/second-movement.git synced 2026-02-04 12:55:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Undo some workarounds implemented to fix race conditions that are no longer needed

Browse Source
This commit is contained in:
Alessandro Genova
2025-08-09 20:21:10 -04:00
parent a71967a015
commit 96682a513b
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -207,7 +207,7 @@ void watch_rtc_schedule_next_comp(void) {
} }
// Because of the hardware, the soonest we can schedule is the next tick // Because of the hardware, the soonest we can schedule is the next tick
// curr_counter +=1; curr_counter += 1;
bool schedule_any = false; bool schedule_any = false;
rtc_counter_t comp_counter; rtc_counter_t comp_counter;
@ -278,7 +278,7 @@ void watch_rtc_disable_comp_callback_no_schedule(uint8_t index) {
void watch_rtc_callback(uint16_t interrupt_cause) { void watch_rtc_callback(uint16_t interrupt_cause) {
// First read all relevant registers, to ensure no changes occurr during the callbacks // First read all relevant registers, to ensure no changes occurr during the callbacks
rtc_counter_t counter = watch_rtc_get_counter(); rtc_counter_t comp_counter = RTC->MODE0.COMP[0].reg;
uint16_t interrupt_enabled = (uint16_t)RTC->MODE0.INTENSET.reg; uint16_t interrupt_enabled = (uint16_t)RTC->MODE0.INTENSET.reg;
if ((interrupt_cause & interrupt_enabled) & RTC_MODE0_INTFLAG_PER_Msk) { if ((interrupt_cause & interrupt_enabled) & RTC_MODE0_INTFLAG_PER_Msk) {
@ -307,14 +307,8 @@ void watch_rtc_callback(uint16_t interrupt_cause) {
} }
if ((interrupt_cause & interrupt_enabled) & RTC_MODE0_INTFLAG_CMP0) { if ((interrupt_cause & interrupt_enabled) & RTC_MODE0_INTFLAG_CMP0) {
// The comp interrupt is generated one tick after the matched counter
// rtc_counter_t comp_counter = counter - 1;
for (uint8_t index = 0; index < WATCH_RTC_N_COMP_CB; ++index) { for (uint8_t index = 0; index < WATCH_RTC_N_COMP_CB; ++index) {
// Give it a little bit of wiggle room, if a comp callback is enabled and is just passed if (comp_callbacks[index].enabled && comp_counter == comp_callbacks[index].counter) {
if (comp_callbacks[index].enabled &&
(counter - comp_callbacks[index].counter) <= RTC_CNT_HZ
) {
comp_callbacks[index].enabled = false; comp_callbacks[index].enabled = false;
comp_callbacks[index].callback(); comp_callbacks[index].callback();
} }