diff --git a/Board320_240.cpp b/Board320_240.cpp index 99b31d3..0c2da3e 100644 --- a/Board320_240.cpp +++ b/Board320_240.cpp @@ -1052,7 +1052,7 @@ 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: scanDevices = true; commInterface->scanDevices(); return; + case 2: scanDevices = true; liveData->menuCurrent = 9999; commInterface->scanDevices(); return; // Reset settings case 8: resetSettings(); hideMenu(); return; // Save settings diff --git a/CommObd2Ble4.cpp b/CommObd2Ble4.cpp index f25a8e0..37a09a5 100644 --- a/CommObd2Ble4.cpp +++ b/CommObd2Ble4.cpp @@ -215,10 +215,10 @@ void CommObd2Ble4::startBleScan() { board->displayMessage(" > Scanning BLE4 devices", tmpStr1); // Scan devices from menu, show list of devices - if (liveData->menuItemSelected == 2) { + if (liveData->menuCurrent == 9999) { Serial.println("Display menu with devices"); liveData->menuVisible = true; - liveData->menuCurrent = 9999; + //liveData->menuCurrent = 9999; liveData->menuItemSelected = 0; board->showMenu(); } else { diff --git a/README.md b/README.md index c832d6f..2331202 100644 --- a/README.md +++ b/README.md @@ -22,10 +22,14 @@ Many thanks to Blas, Jens, Калин, Aleš Dokupil and others for help. Thank Board - M5STACK CORE1 IOT Development Kit(~EUR 35) https://rlx.sk/sk/m5stack/7285-esp32-basic-core-iot-development-kit-m5-k001-m5stack.html +- optional M5 COMMU (CAN) module +- optional M5 GPS NEO-M8N (with external atenna) +- optional M5 SIM800L GPS module (dev) or -- LILYGO TTGO T4 v1.3 (~USD $30) https://www.banggood.com/LILYGO-TTGO-T-Watcher-BTC-Ticker-ESP32-For-Bitcoin-Price-Program-4M-SPI-Flash-Psram-LCD-Display-Module-p-1345292.html -I RECOMMEND TO REMOVE LION BATTERY DUE TO HIGH SUMMER TEMPERATURES +- older device LILYGO TTGO T4 v1.3 (~USD $30) + https://www.banggood.com/LILYGO-TTGO-T-Watcher-BTC-Ticker-ESP32-For-Bitcoin-Price-Program-4M-SPI-Flash-Psram-LCD-Display-Module-p-1345292.html + I RECOMMEND TO REMOVE LION BATTERY DUE TO HIGH SUMMER TEMPERATURES OBD2 adapter - Supported is only this model... Vgate iCar Pro Bluetooth 4.0 (BLE4) OBD2 (~USD $30) diff --git a/RELEASENOTES.md b/RELEASENOTES.md index 2af74e6..f79447e 100644 --- a/RELEASENOTES.md +++ b/RELEASENOTES.md @@ -3,6 +3,7 @@ ### Next version - removed debug screen - sdcard working only with m5stack +- M5 COMMU (CAN) module support. ### v2.1.1 2020-12-14 - tech refactoring: `hexToDecFromResponse`, `decFromResponse` diff --git a/config.h b/config.h index 2b4dfad..e9f5d75 100644 --- a/config.h +++ b/config.h @@ -2,7 +2,7 @@ #include -#define APP_VERSION "v2.1.1" +#define APP_VERSION "v2.2.0-dev" #define APP_RELEASE_DATE "2020-12-14" // TFT COLORS FOR TTGO diff --git a/dist/ttgo_t4_v13/evDash.ino.bin b/dist/ttgo_t4_v13/evDash.ino.bin index 0f5c42a..45e88e8 100644 Binary files a/dist/ttgo_t4_v13/evDash.ino.bin and b/dist/ttgo_t4_v13/evDash.ino.bin differ