Merge from 2.3

2019-12-05 09:29:11 +01:00
parent 19022414c9 b334e1845d
commit 4c484017a4
161 changed files with 3682 additions and 10305 deletions
@@ -186,7 +186,7 @@ bool waitKeysReleased()
 #endif

  while (keyDown()) {
-    wdt_reset();
+    WDG_RESET();

 #if !defined(BOOT)
    if ((get_tmr10ms() - start) >= 300) {  // wait no more than 3 seconds