last changes for 2.2.0

Board320_240.cpp

@@ -46,12 +46,14 @@ void Board320_240::afterSetup() {
     loadTestData();
   }
 
-  // Init from parent class
+  bool afterSetup = false;
-  syslog->println("BoardInterface::afterSetup");
-  BoardInterface::afterSetup();
 
   // Check if bard was sleeping
   if (bootCount > 1) {
+    // Init comm device
+    afterSetup = true;
+    BoardInterface::afterSetup();
+    // Wake or continue with sleeping
     afterSleep();
   }
 
@@ -115,6 +117,11 @@ void Board320_240::afterSetup() {
   if (liveData->settings.gprsHwSerialPort <= 2) {
     sim800lSetup();
   }
+
+  // Init comm device
+  if (!afterSetup) {
+    BoardInterface::afterSetup();
+  }
 }
 
 /**
@@ -1170,16 +1177,16 @@ void Board320_240::menuItemClick() {
       case 4031: liveData->settings.pressureUnit = 'b'; showParentMenu = true; break;
       case 4032: liveData->settings.pressureUnit = 'p'; showParentMenu = true; break;
       // Pair ble device
-      case 2: 
+      case 2:
         if (liveData->settings.commType == COMM_TYPE_OBD2CAN) {
-            displayMessage("Not supported", "in CAN mode");
+          displayMessage("Not supported", "in CAN mode");
-            delay(3000);
+          delay(3000);
-            hideMenu(); 
+          hideMenu();
-            return;
+          return;
         }
-        scanDevices = true; 
+        scanDevices = true;
-        liveData->menuCurrent = 9999; 
+        liveData->menuCurrent = 9999;
-        commInterface->scanDevices(); 
+        commInterface->scanDevices();
         return;
       // Reset settings
       case 8: resetSettings(); hideMenu(); return;
@@ -1543,12 +1550,10 @@ bool Board320_240::sdcardMount() {
   while (1) {
     syslog->print("Initializing SD card...");
 
-#ifdef BOARD_TTGO_T4
+    /*    syslog->print(" TTGO-T4 ");
-    syslog->print(" TTGO-T4 ");
+        SPIClass * hspi = new SPIClass(HSPI);
-    SPIClass * hspi = new SPIClass(HSPI);
+        spiSD.begin(pinSdcardSclk, pinSdcardMiso, pinSdcardMosi, pinSdcardCs); //SCK,MISO,MOSI,ss
-    spiSD.begin(pinSdcardSclk, pinSdcardMiso, pinSdcardMosi, pinSdcardCs); //SCK,MISO,MOSI,ss
+        SdState = SD.begin(pinSdcardCs, *hspi, SPI_FREQUENCY);*/
-    SdState = SD.begin(pinSdcardCs, *hspi, SPI_FREQUENCY);
-#endif BOARD_TTGO_T4
 
     syslog->print(" M5STACK ");
     SdState = SD.begin(pinSdcardCs);

BoardInterface.cpp

@@ -220,6 +220,8 @@ void BoardInterface::loadSettings() {
 */
 void BoardInterface::afterSetup() {
 
+  syslog->println("BoardInterface::afterSetup");
+
   // Init Comm iterface
   syslog->print("Init communication device: ");
   syslog->println(liveData->settings.commType);

config.h

@@ -2,8 +2,8 @@
 
 #include <BLEDevice.h>
 
-#define APP_VERSION "v2.2.0-dev"
+#define APP_VERSION "v2.2.0"
-#define APP_RELEASE_DATE "2020-12-14"
+#define APP_RELEASE_DATE "2020-12-29"
 
 // TFT COLORS FOR TTGO
 #define TFT_BLACK       0x0000      /*   0,   0,   0 */