diff --git a/README.md b/README.md index 1df1dfb..b1854bc 100644 --- a/README.md +++ b/README.md @@ -49,9 +49,9 @@ Screen list ### v1.7.5 2020-11-17 - Settings: Debug screen off/on - Settings: LCD brightness (auto, 20, 50, 100%) -- Speed screen: added motor rpm -- Speed screen: brake lights indicator +- Speed screen: added motor rpm, brake lights indicator - Soc% to kWh is now calibrated for NiroEV/KonaEV 2020 +- eNiroDashboard speed improvements ### v1.7.4 2020-11-12 - Added default screen option to settings diff --git a/car_kia_eniro.h b/car_kia_eniro.h index ee3b958..0184c1d 100644 --- a/car_kia_eniro.h +++ b/car_kia_eniro.h @@ -1,5 +1,5 @@ -#define commandQueueCountKiaENiro 32 +#define commandQueueCountKiaENiro 30 #define commandQueueLoopFromKiaENiro 10 String commandQueueKiaENiro[commandQueueCountKiaENiro] = { @@ -14,10 +14,9 @@ String commandQueueKiaENiro[commandQueueCountKiaENiro] = { //"AT H1", // Headers on (debug only) //"AT D1", // Display of the DLC on //"AT CAF0", // Automatic formatting off - "AT AT0", // disabled the adaptive timing - "AT ST 01", // reduced the time out to 1 + ////"AT AT0", // disabled adaptive timing "AT DP", - "AT ST10", // orig ST16 + "AT ST10", // reduced timeout to 1, orig.16 // Loop from (KIA ENIRO) diff --git a/dist/enirodashboard.ino.bin b/dist/enirodashboard.ino.bin index 2131a48..4e120ca 100644 Binary files a/dist/enirodashboard.ino.bin and b/dist/enirodashboard.ino.bin differ diff --git a/enirodashboard.ino b/enirodashboard.ino index b1430ab..a9b1974 100644 --- a/enirodashboard.ino +++ b/enirodashboard.ino @@ -1811,8 +1811,6 @@ void setup(void) { */ void loop() { - //Serial.println("Loop"); - // Connect BLE device if (bleConnect == true && foundMyBleDevice != NULL) { pServerAddress = new BLEAddress(settings.obdMacAddress); @@ -1833,13 +1831,12 @@ void loop() { } } - // Send line from TTY to OBD (custom command) + // Send command from TTY to OBD2 if (bleConnected) { if (Serial.available()) { ch = Serial.read(); line = line + ch; if (ch == '\r' || ch == '\n') { - Serial.print("Sending line: "); Serial.println(line); pRemoteCharacteristicWrite->writeValue(line.c_str(), line.length()); line = ""; @@ -1853,7 +1850,9 @@ void loop() { } } - // Handle buttons (under construction) LOW - pressed, HIGH - not pressed + /////////////////////////////////////////////////////////////////////// + // Handle buttons + // MIDDLE - menu select if (digitalRead(BUTTON_MIDDLE) == HIGH) { btnMiddlePressed = false; } else { @@ -1866,6 +1865,7 @@ void loop() { } } } + // LEFT - screen rotate, menu if (digitalRead((settings.displayRotation == 1) ? BUTTON_RIGHT : BUTTON_LEFT) == HIGH) { btnLeftPressed = false; } else { @@ -1884,6 +1884,7 @@ void loop() { } } } + // RIGHT - menu, debug screen rotation if (digitalRead((settings.displayRotation == 1) ? BUTTON_LEFT : BUTTON_RIGHT) == HIGH) { btnRightPressed = false; } else {