Merge with latest 2.3

2019-11-07 15:04:45 +01:00
parent 579aa03cd1 50a07dc8d8
commit 071116afeb
286 changed files with 9956 additions and 10363 deletions
@@ -515,11 +515,9 @@ void perMain()
 #endif

 #if defined(STM32)
-  bool sdcardPresent = SD_CARD_PRESENT();
-  if (sdcardPresent && !globalData.sdcardPresent) {
+  if (SD_CARD_PRESENT() && !sdMounted()) {
    sdMount();
  }
-  globalData.sdcardPresent = sdcardPresent;
 #endif

 #if !defined(EEPROM)