diff options
| author | Wesley Aptekar-Cassels <me@wesleyac.com> | 2024-01-21 02:08:28 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-21 02:08:28 -0500 |
| commit | 501ed8f9d2610eb14ea9f3858b296b4565e3d252 (patch) | |
| tree | 38e701ff1f61612e160edd17b16e665e3c07f029 /watch-library/hardware | |
| parent | 1120690e133fccaafc8fd413add5373ee56eee4a (diff) | |
| parent | 45ede8f256622642788193cad15c6b27b417f468 (diff) | |
| download | Sensor-Watch-501ed8f9d2610eb14ea9f3858b296b4565e3d252.tar.gz Sensor-Watch-501ed8f9d2610eb14ea9f3858b296b4565e3d252.tar.bz2 Sensor-Watch-501ed8f9d2610eb14ea9f3858b296b4565e3d252.zip | |
Merge branch 'main' into watch-face-save-load
Diffstat (limited to 'watch-library/hardware')
| -rw-r--r-- | watch-library/hardware/watch/watch_buzzer.c | 1 | ||||
| -rw-r--r-- | watch-library/hardware/watch/watch_rtc.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/watch-library/hardware/watch/watch_buzzer.c b/watch-library/hardware/watch/watch_buzzer.c index 18fb4db0..2dce8d23 100644 --- a/watch-library/hardware/watch/watch_buzzer.c +++ b/watch-library/hardware/watch/watch_buzzer.c @@ -23,6 +23,7 @@ */ #include "watch_buzzer.h" +#include "watch_private_buzzer.h" #include "../../../watch-library/hardware/include/saml22j18a.h" #include "../../../watch-library/hardware/include/component/tc.h" #include "../../../watch-library/hardware/hri/hri_tc_l22.h" diff --git a/watch-library/hardware/watch/watch_rtc.c b/watch-library/hardware/watch/watch_rtc.c index 881e2575..93cb9f1c 100644 --- a/watch-library/hardware/watch/watch_rtc.c +++ b/watch-library/hardware/watch/watch_rtc.c @@ -84,7 +84,7 @@ void watch_rtc_register_periodic_callback(ext_irq_cb_t callback, uint8_t frequen if (__builtin_popcount(frequency) != 1) return; // this left-justifies the period in a 32-bit integer. - uint32_t tmp = frequency << 24; + uint32_t tmp = (frequency & 0xFF) << 24; // now we can count the leading zeroes to get the value we need. // 0x01 (1 Hz) will have 7 leading zeros for PER7. 0xF0 (128 Hz) will have no leading zeroes for PER0. uint8_t per_n = __builtin_clz(tmp); @@ -99,7 +99,7 @@ void watch_rtc_register_periodic_callback(ext_irq_cb_t callback, uint8_t frequen void watch_rtc_disable_periodic_callback(uint8_t frequency) { if (__builtin_popcount(frequency) != 1) return; - uint8_t per_n = __builtin_clz(frequency << 24); + uint8_t per_n = __builtin_clz((frequency & 0xFF) << 24); RTC->MODE2.INTENCLR.reg = 1 << per_n; } |