djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply suggestions from code review

Browse Source 
Eliminates the "pet" function

Co-authored-by: Scott Shawcroft <scott@tannewt.org>
This commit is contained in:
Jeff Epler 2021-10-19 13:25:28 -05:00 committed by GitHub
parent d38cf05e59
commit 39795430a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ports/atmel-samd/common-hal/watchdog/WatchDogTimer.c
View File

@ -34,12 +34,8 @@
#include "component/wdt.h" #include "component/wdt.h"
void pet(void) {
WDT->CLEAR.reg = WDT_CLEAR_CLEAR_KEY;
}
void common_hal_watchdog_feed(watchdog_watchdogtimer_obj_t *self) { void common_hal_watchdog_feed(watchdog_watchdogtimer_obj_t *self) {
pet(); WDT->CLEAR.reg = WDT_CLEAR_CLEAR_KEY;
} }
void common_hal_watchdog_deinit(watchdog_watchdogtimer_obj_t *self) { void common_hal_watchdog_deinit(watchdog_watchdogtimer_obj_t *self) {
@ -54,7 +50,7 @@ mp_float_t common_hal_watchdog_get_timeout(watchdog_watchdogtimer_obj_t *self) {
return self->timeout; return self->timeout;
} }
void setup_wdt(int setting) { void setup_wdt(watchdog_watchdogtimer_obj_t *self, int setting) {
OSC32KCTRL->OSCULP32K.bit.EN1K = 1; // Enable out 1K (for WDT) OSC32KCTRL->OSCULP32K.bit.EN1K = 1; // Enable out 1K (for WDT)
// disable watchdog for config // disable watchdog for config
@ -67,7 +63,7 @@ void setup_wdt(int setting) {
WDT->CTRLA.bit.WEN = 0; // Disable window mode WDT->CTRLA.bit.WEN = 0; // Disable window mode
while (WDT->SYNCBUSY.reg) { // Sync CTRL write while (WDT->SYNCBUSY.reg) { // Sync CTRL write
} }
pet(); // Clear watchdog interval common_hal_watchdog_feed(self); // Clear watchdog interval
WDT->CTRLA.bit.ENABLE = 1; // Start watchdog now! WDT->CTRLA.bit.ENABLE = 1; // Start watchdog now!
while (WDT->SYNCBUSY.reg) { while (WDT->SYNCBUSY.reg) {
} }
@ -87,7 +83,7 @@ void common_hal_watchdog_set_timeout(watchdog_watchdogtimer_obj_t *self, mp_floa
float timeout = (8 << setting) / 1024.f; float timeout = (8 << setting) / 1024.f;
if (self->mode == WATCHDOGMODE_RESET) { if (self->mode == WATCHDOGMODE_RESET) {
setup_wdt(setting); setup_wdt(self, setting);
} }
self->timeout = timeout; self->timeout = timeout;
} }