Merge remote-tracking branch 'origin/main'

This commit is contained in:
Hosted Weblate 2021-11-05 19:40:04 +01:00
commit 0e086678e1
No known key found for this signature in database
GPG Key ID: A3FAAA06E6569B4C

View File

@ -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) { 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) { if (wdt_cycles < 8) {
wdt_cycles = 8; wdt_cycles = 8;
} }