Merge remote-tracking branch 'origin/main'

weblate · weblate · commit 0e086678e154 · 2021-11-05T19:40:04.000+01:00
diff --git a/ports/atmel-samd/common-hal/watchdog/WatchDogTimer.c b/ports/atmel-samd/common-hal/watchdog/WatchDogTimer.c
@@ -70,7 +70,7 @@ void setup_wdt(watchdog_watchdogtimer_obj_t *self, int setting) {
 }
 
 void common_hal_watchdog_set_timeout(watchdog_watchdogtimer_obj_t *self, mp_float_t new_timeout) {
-    int wdt_cycles = (int)(new_timeout * 1000);
+    int wdt_cycles = (int)(new_timeout * 1024);
     if (wdt_cycles < 8) {
         wdt_cycles = 8;
     }

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ void setup_wdt(watchdog_watchdogtimer_obj_t *self, int setting) {`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`void common_hal_watchdog_set_timeout(watchdog_watchdogtimer_obj_t *self, mp_float_t new_timeout) {`
`73`		`- int wdt_cycles = (int)(new_timeout * 1000);`
	`73`	`+ int wdt_cycles = (int)(new_timeout * 1024);`
`74`	`74`	`if (wdt_cycles < 8) {`
`75`	`75`	`wdt_cycles = 8;`
`76`	`76`	`}`