Merge with latest 2.3

2019-12-13 12:30:02 +01:00
parent 5ffeb7317e 20cc9f9c3f
commit 6cab260ee6
52 changed files with 10502 additions and 7011 deletions
@@ -37,10 +37,13 @@ bool isBootloader(const char * filename)
 void bootloaderFlash(const char * filename)
 {
  FIL file;
-  f_open(&file, filename, FA_READ);
  uint8_t buffer[1024];
  UINT count;

+  pausePulses();
+
+  f_open(&file, filename, FA_READ);
+
  static uint8_t unlocked = 0;
  if (!unlocked) {
    unlocked = 1;
@@ -71,6 +74,7 @@ void bootloaderFlash(const char * filename)
  }

  watchdogSuspend(0);
+  WDG_RESET();

  if (unlocked) {
    lockFlash();
@@ -78,4 +82,6 @@ void bootloaderFlash(const char * filename)
  }

  f_close(&file);
+
+  resumePulses();
 }