This commit is contained in:
Lubos Petrovic
2020-11-18 07:38:36 +01:00
parent 9f220b8826
commit 11aff9d6b6
4 changed files with 11 additions and 11 deletions

View File

@@ -49,9 +49,9 @@ Screen list
### v1.7.5 2020-11-17 ### v1.7.5 2020-11-17
- Settings: Debug screen off/on - Settings: Debug screen off/on
- Settings: LCD brightness (auto, 20, 50, 100%) - Settings: LCD brightness (auto, 20, 50, 100%)
- Speed screen: added motor rpm - Speed screen: added motor rpm, brake lights indicator
- Speed screen: brake lights indicator
- Soc% to kWh is now calibrated for NiroEV/KonaEV 2020 - Soc% to kWh is now calibrated for NiroEV/KonaEV 2020
- eNiroDashboard speed improvements
### v1.7.4 2020-11-12 ### v1.7.4 2020-11-12
- Added default screen option to settings - Added default screen option to settings

View File

@@ -1,5 +1,5 @@
#define commandQueueCountKiaENiro 32 #define commandQueueCountKiaENiro 30
#define commandQueueLoopFromKiaENiro 10 #define commandQueueLoopFromKiaENiro 10
String commandQueueKiaENiro[commandQueueCountKiaENiro] = { String commandQueueKiaENiro[commandQueueCountKiaENiro] = {
@@ -14,10 +14,9 @@ String commandQueueKiaENiro[commandQueueCountKiaENiro] = {
//"AT H1", // Headers on (debug only) //"AT H1", // Headers on (debug only)
//"AT D1", // Display of the DLC on //"AT D1", // Display of the DLC on
//"AT CAF0", // Automatic formatting off //"AT CAF0", // Automatic formatting off
"AT AT0", // disabled the adaptive timing ////"AT AT0", // disabled adaptive timing
"AT ST 01", // reduced the time out to 1
"AT DP", "AT DP",
"AT ST10", // orig ST16 "AT ST10", // reduced timeout to 1, orig.16
// Loop from (KIA ENIRO) // Loop from (KIA ENIRO)

Binary file not shown.

View File

@@ -1811,8 +1811,6 @@ void setup(void) {
*/ */
void loop() { void loop() {
//Serial.println("Loop");
// Connect BLE device // Connect BLE device
if (bleConnect == true && foundMyBleDevice != NULL) { if (bleConnect == true && foundMyBleDevice != NULL) {
pServerAddress = new BLEAddress(settings.obdMacAddress); 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 (bleConnected) {
if (Serial.available()) { if (Serial.available()) {
ch = Serial.read(); ch = Serial.read();
line = line + ch; line = line + ch;
if (ch == '\r' || ch == '\n') { if (ch == '\r' || ch == '\n') {
Serial.print("Sending line: ");
Serial.println(line); Serial.println(line);
pRemoteCharacteristicWrite->writeValue(line.c_str(), line.length()); pRemoteCharacteristicWrite->writeValue(line.c_str(), line.length());
line = ""; 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) { if (digitalRead(BUTTON_MIDDLE) == HIGH) {
btnMiddlePressed = false; btnMiddlePressed = false;
} else { } else {
@@ -1866,6 +1865,7 @@ void loop() {
} }
} }
} }
// LEFT - screen rotate, menu
if (digitalRead((settings.displayRotation == 1) ? BUTTON_RIGHT : BUTTON_LEFT) == HIGH) { if (digitalRead((settings.displayRotation == 1) ? BUTTON_RIGHT : BUTTON_LEFT) == HIGH) {
btnLeftPressed = false; btnLeftPressed = false;
} else { } else {
@@ -1884,6 +1884,7 @@ void loop() {
} }
} }
} }
// RIGHT - menu, debug screen rotation
if (digitalRead((settings.displayRotation == 1) ? BUTTON_LEFT : BUTTON_RIGHT) == HIGH) { if (digitalRead((settings.displayRotation == 1) ? BUTTON_LEFT : BUTTON_RIGHT) == HIGH) {
btnRightPressed = false; btnRightPressed = false;
} else { } else {