projects/evDash
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring of commandQueue to support stxChar defined for each command

Browse Source
This commit is contained in:
Ján Mátik
2020-12-28 12:21:15 +01:00
parent b1d8f3a68d
commit 6cc3c5dcf4
10 changed files with 106 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
CarBmwI3.cpp
View File

@@ -8,44 +8,45 @@
void CarBmwI3::activateCommandQueue() { void CarBmwI3::activateCommandQueue() {
const uint16_t commandQueueLoopFrom = 18; const uint16_t commandQueueLoopFrom = 18;
const std::vector<String> commandQueue = { // const std::vector<String> commandQueue = {
"AT Z", // Reset all const std::vector<LiveData::Command_t> commandQueue = {
"AT D", // All to defaults {0, "ATZ"}, // Reset all
"AT I", // Print the version ID {0, "ATD"}, // All to defaults
"AT E0", // Echo off {0, "ATI"}, // Print the version ID
"AT PP2COFF", // Disable prog parameter 2C {0, "ATE0"}, // Echo off
//"AT SH6F1", // Set header to 6F1 {0, "ATPP2COFF"}, // Disable prog parameter 2C
"AT CF600", // Set the ID filter to 600 //{0, "ATSH6F1"}, // Set header to 6F1
"AT CM700", // Set the ID mask to 700 {0, "ATCF600"}, // Set the ID filter to 600
"AT PBC001", // Protocol B options and baudrate (div 1 = 500k) {0, "ATCM700"}, // Set the ID mask to 700
"AT SPB", // Set protocol to B and save it (USER1 11bit, 125kbaud) {0, "ATPBC001"}, // Protocol B options and baudrate (div 1 = 500k)
"AT AT0", // Adaptive timing off {0, "ATSPB"}, // Set protocol to B and save it (USER1 11bit, 125kbaud)
"AT STFF", // Set timeout to ff x 4ms {0, "ATAT0"}, // Adaptive timing off
"AT AL", // Allow long messages ( > 7 Bytes) {0, "ATSTFF"}, // Set timeout to ff x 4ms
"AT H1", // Additional headers on {0, "ATAL"}, // Allow long messages ( > 7 Bytes)
"AT S0", // Printing of spaces off {0, "ATH1"}, // Additional headers on
"AT L0", // Linefeeds off {0, "ATS0"}, // Printing of spaces off
"AT CSM0", // Silent monitoring off {0, "ATL0"}, // Linefeeds off
"AT CTM5", // Set timer multiplier to 5 {0, "ATCSM0"}, // Silent monitoring off
"AT JE", // Use J1939 SAE data format {0, "ATCTM5"}, // Set timer multiplier to 5
{0, "ATJE"}, // Use J1939 SAE data format
// Loop from (BMW i3) // Loop from (BMW i3)
// BMS // BMS
"ATSH6F1", {0, "ATSH6F1"},
"22402B", // STATUS_MESSWERTE_IBS - 12V Bat {0x12, "22402B"}, // STATUS_MESSWERTE_IBS - 12V Bat
//////"22F101", // STATUS_A_T_ELUE ??? //////{0x12, "22F101"}, // STATUS_A_T_ELUE ???
"22D85C", // Calculated indoor temperature {0x78, "22D85C"}, // Calculated indoor temperature
"22D96B", // Outdoor temperature {0x78, "22D96B"}, // Outdoor temperature
//"22DC61", // BREMSLICHT_SCHALTER //{0, "22DC61"}, // BREMSLICHT_SCHALTER
"22DD7B", // ALTERUNG_KAPAZITAET Aging of kapacity {0x07, "22DD7B"}, // ALTERUNG_KAPAZITAET Aging of kapacity
"22DD7C", // GW_INFO - should contain kWh but in some strange form {0x07, "22DD7C"}, // GW_INFO - should contain kWh but in some strange form
"22DDBF", // Min and Max cell voltage {0x07, "22DDBF"}, // Min and Max cell voltage
"22DDC0", // TEMPERATUREN {0x07, "22DDC0"}, // TEMPERATUREN
"22DD69", // HV_STORM {0x07, "22DD69"}, // HV_STORM
//"22DD6C", // KUEHLKREISLAUF_TEMP //{0x07, "22DD6C"}, // KUEHLKREISLAUF_TEMP
"22DDB4", // HV_SPANNUNG {0x07, "22DDB4"}, // HV_SPANNUNG
"22DDBC" // SOC {0x07, "22DDBC"} // SOC
}; };
@@ -65,17 +66,12 @@ void CarBmwI3::activateCommandQueue() {
liveData->params.tireRearRightTempC = 0; liveData->params.tireRearRightTempC = 0;
// Empty and fill command queue // Empty and fill command queue
for(auto item : liveData->commandQueue) { liveData->commandQueue.clear(); // probably not needed before assign
item = ""; liveData->commandQueue.assign(commandQueue.begin(), commandQueue.end());
}
for (int i = 0; i < commandQueue.size(); i++) {
liveData->commandQueue[i] = commandQueue[i];
}
liveData->commandQueueLoopFrom = commandQueueLoopFrom; liveData->commandQueueLoopFrom = commandQueueLoopFrom;
liveData->commandQueueCount = commandQueue.size(); liveData->commandQueueCount = commandQueue.size();
liveData->rxBuffOffset = 1; // there is one additional byte in received packets compared to other cars liveData->bAdditionalStartingChar = true; // there is one additional byte in received packets compared to other cars
liveData->expectedMinimalPacketLength = 6; // to filter occasional 5-bytes long packets liveData->expectedMinimalPacketLength = 6; // to filter occasional 5-bytes long packets
liveData->rxTimeoutMs = 500; // timeout for receiving of CAN response liveData->rxTimeoutMs = 500; // timeout for receiving of CAN response
liveData->delayBetweenCommandsMs = 100; // delay between commands, set to 0 if no delay is needed liveData->delayBetweenCommandsMs = 100; // delay between commands, set to 0 if no delay is needed

14
CarHyundaiIoniq.cpp
View File

@@ -1,6 +1,6 @@
#include "CarHyundaiIoniq.h" #include "CarHyundaiIoniq.h"
#include <vector>
#define commandQueueCountHyundaiIoniq 27
#define commandQueueLoopFromHyundaiIoniq 8 #define commandQueueLoopFromHyundaiIoniq 8
/** /**
@@ -8,7 +8,7 @@
*/ */
void CarHyundaiIoniq::activateCommandQueue() { void CarHyundaiIoniq::activateCommandQueue() {
String commandQueueHyundaiIoniq[commandQueueCountHyundaiIoniq] = { std::vector<String> commandQueueHyundaiIoniq = {
"AT Z", // Reset all "AT Z", // Reset all
"AT I", // Print the version ID "AT I", // Print the version ID
"AT E0", // Echo off "AT E0", // Echo off
@@ -68,15 +68,13 @@ void CarHyundaiIoniq::activateCommandQueue() {
liveData->params.batModuleTempCount = 12; liveData->params.batModuleTempCount = 12;
// Empty and fill command queue // Empty and fill command queue
for (int i = 0; i < 300; i++) { liveData->commandQueue.clear();
liveData->commandQueue[i] = ""; for (auto cmd : commandQueueHyundaiIoniq) {
} liveData->commandQueue.push_back({ 0, cmd });
for (int i = 0; i < commandQueueCountHyundaiIoniq; i++) {
liveData->commandQueue[i] = commandQueueHyundaiIoniq[i];
} }
liveData->commandQueueLoopFrom = commandQueueLoopFromHyundaiIoniq; liveData->commandQueueLoopFrom = commandQueueLoopFromHyundaiIoniq;
liveData->commandQueueCount = commandQueueCountHyundaiIoniq; liveData->commandQueueCount = commandQueueHyundaiIoniq.size();
} }
/** /**

15
CarKiaDebugObd2.cpp
View File

@@ -1,6 +1,7 @@
#include "CarKiaDebugObd2.h" #include "CarKiaDebugObd2.h"
#include <vector>
#define commandQueueCountDebugObd2Kia 256 //#define commandQueueCountDebugObd2Kia 256
#define commandQueueLoopFromDebugObd2Kia 8 #define commandQueueLoopFromDebugObd2Kia 8
/** /**
@@ -8,7 +9,7 @@
*/ */
void CarKiaDebugObd2::activateCommandQueue() { void CarKiaDebugObd2::activateCommandQueue() {
String commandQueueDebugObd2Kia[commandQueueCountDebugObd2Kia] = { std::vector<String> commandQueueDebugObd2Kia = {
"AT Z", // Reset all "AT Z", // Reset all
"AT I", // Print the version ID "AT I", // Print the version ID
"AT E0", // Echo off "AT E0", // Echo off
@@ -219,15 +220,13 @@ void CarKiaDebugObd2::activateCommandQueue() {
liveData->params.batteryTotalAvailableKWh = 64; liveData->params.batteryTotalAvailableKWh = 64;
// Empty and fill command queue // Empty and fill command queue
for (uint16_t i = 0; i < 300; i++) { liveData->commandQueue.clear();
liveData->commandQueue[i] = ""; for (auto cmd : commandQueueDebugObd2Kia) {
} liveData->commandQueue.push_back({ 0, cmd });
for (uint16_t i = 0; i < commandQueueCountDebugObd2Kia; i++) {
liveData->commandQueue[i] = commandQueueDebugObd2Kia[i];
} }
liveData->commandQueueLoopFrom = commandQueueLoopFromDebugObd2Kia; liveData->commandQueueLoopFrom = commandQueueLoopFromDebugObd2Kia;
liveData->commandQueueCount = commandQueueCountDebugObd2Kia; liveData->commandQueueCount = commandQueueDebugObd2Kia.size();
} }
/** /**

15
CarKiaEniro.cpp
View File

@@ -15,8 +15,8 @@
#include <sys/time.h> #include <sys/time.h>
#include "LiveData.h" #include "LiveData.h"
#include "CarKiaEniro.h" #include "CarKiaEniro.h"
#include <vector>
#define commandQueueCountKiaENiro 29
#define commandQueueLoopFromKiaENiro 8 #define commandQueueLoopFromKiaENiro 8
/** /**
@@ -24,7 +24,7 @@
*/ */
void CarKiaEniro::activateCommandQueue() { void CarKiaEniro::activateCommandQueue() {
String commandQueueKiaENiro[commandQueueCountKiaENiro] = { std::vector<String> commandQueueKiaENiro = {
"AT Z", // Reset all "AT Z", // Reset all
"AT I", // Print the version ID "AT I", // Print the version ID
"AT S0", // Printing of spaces on "AT S0", // Printing of spaces on
@@ -90,15 +90,14 @@ void CarKiaEniro::activateCommandQueue() {
} }
// Empty and fill command queue // Empty and fill command queue
for (int i = 0; i < 300; i++) { liveData->commandQueue.clear();
liveData->commandQueue[i] = ""; //for (int i = 0; i < commandQueueCountKiaENiro; i++) {
} for (auto cmd : commandQueueKiaENiro) {
for (int i = 0; i < commandQueueCountKiaENiro; i++) { liveData->commandQueue.push_back({ 0, cmd }); // stxChar not used, keep it 0
liveData->commandQueue[i] = commandQueueKiaENiro[i];
} }
liveData->commandQueueLoopFrom = commandQueueLoopFromKiaENiro; liveData->commandQueueLoopFrom = commandQueueLoopFromKiaENiro;
liveData->commandQueueCount = commandQueueCountKiaENiro; liveData->commandQueueCount = commandQueueKiaENiro.size();
} }
/** /**

14
CarKiaNiroPhev.cpp
View File

@@ -1,6 +1,6 @@
#include "CarKiaNiroPhev.h" #include "CarKiaNiroPhev.h"
#include <vector>
#define commandQueueCountKiaNiroPhev 25
#define commandQueueLoopFromKiaNiroPhev 8 #define commandQueueLoopFromKiaNiroPhev 8
/** /**
@@ -8,7 +8,7 @@
*/ */
void CarKiaNiroPhev::activateCommandQueue() { void CarKiaNiroPhev::activateCommandQueue() {
String commandQueueKiaNiroPhev[commandQueueCountKiaNiroPhev] = { std::vector<String> commandQueueKiaNiroPhev = {
"AT Z", // Reset all "AT Z", // Reset all
"AT I", // Print the version ID "AT I", // Print the version ID
"AT E0", // Echo off "AT E0", // Echo off
@@ -64,15 +64,13 @@ void CarKiaNiroPhev::activateCommandQueue() {
liveData->params.batModuleTempCount = 5; liveData->params.batModuleTempCount = 5;
// Empty and fill command queue // Empty and fill command queue
for (int i = 0; i < 300; i++) { liveData->commandQueue.clear();
liveData->commandQueue[i] = ""; for (auto cmd : commandQueueKiaNiroPhev) {
} liveData->commandQueue.push_back({ 0, cmd });
for (int i = 0; i < commandQueueCountKiaNiroPhev; i++) {
liveData->commandQueue[i] = commandQueueKiaNiroPhev[i];
} }
liveData->commandQueueLoopFrom = commandQueueLoopFromKiaNiroPhev; liveData->commandQueueLoopFrom = commandQueueLoopFromKiaNiroPhev;
liveData->commandQueueCount = commandQueueCountKiaNiroPhev; liveData->commandQueueCount = commandQueueKiaNiroPhev.size();
} }
/** /**

14
CarRenaultZoe.cpp
View File

@@ -5,8 +5,8 @@
#include <sys/time.h> #include <sys/time.h>
#include "LiveData.h" #include "LiveData.h"
#include "CarRenaultZoe.h" #include "CarRenaultZoe.h"
#include <vector>
#define commandQueueCountRenaultZoe 34
#define commandQueueLoopFromRenaultZoe 8 #define commandQueueLoopFromRenaultZoe 8
/** /**
@@ -14,7 +14,7 @@
*/ */
void CarRenaultZoe::activateCommandQueue() { void CarRenaultZoe::activateCommandQueue() {
String commandQueueRenaultZoe[commandQueueCountRenaultZoe] = { std::vector<String> commandQueueRenaultZoe = {
"AT Z", // Reset all "AT Z", // Reset all
"AT I", // Print the version ID "AT I", // Print the version ID
"AT S0", // Printing of spaces on "AT S0", // Printing of spaces on
@@ -113,15 +113,13 @@ void CarRenaultZoe::activateCommandQueue() {
// Empty and fill command queue // Empty and fill command queue
for (int i = 0; i < 300; i++) { liveData->commandQueue.clear();
liveData->commandQueue[i] = ""; for (auto cmd : commandQueueRenaultZoe) {
} liveData->commandQueue.push_back({ 0, cmd });
for (int i = 0; i < commandQueueCountRenaultZoe; i++) {
liveData->commandQueue[i] = commandQueueRenaultZoe[i];
} }
liveData->commandQueueLoopFrom = commandQueueLoopFromRenaultZoe; liveData->commandQueueLoopFrom = commandQueueLoopFromRenaultZoe;
liveData->commandQueueCount = commandQueueCountRenaultZoe; liveData->commandQueueCount = commandQueueRenaultZoe.size();
} }
/** /**

4
CommInterface.cpp
View File

@@ -54,7 +54,9 @@ bool CommInterface::doNextQueueCommand() {
} }
// Send AT command to obd // Send AT command to obd
liveData->commandRequest = liveData->commandQueue[liveData->commandQueueIndex]; liveData->commandRequest = liveData->commandQueue[liveData->commandQueueIndex].request;
liveData->commandStartChar = liveData->commandQueue[liveData->commandQueueIndex].startChar; // TODO: add to struct?
if (liveData->commandRequest.startsWith("ATSH")) { if (liveData->commandRequest.startsWith("ATSH")) {
liveData->currentAtshRequest = liveData->commandRequest; liveData->currentAtshRequest = liveData->commandRequest;
} }

48
CommObd2Can.cpp
View File

@@ -148,45 +148,43 @@ void CommObd2Can::sendPID(const uint16_t pid, const String& cmd) {
uint8_t txBuf[8] = { 0 }; // init with zeroes uint8_t txBuf[8] = { 0 }; // init with zeroes
String tmpStr; String tmpStr;
if (liveData->settings.carType == CAR_BMW_I3_2014) if (liveData->bAdditionalStartingChar)
{ {
struct Packet_t struct Packet_t
{ {
uint8_t startChar; uint8_t startChar;
uint8_t length; uint8_t length;
uint8_t data[6]; uint8_t payload[6];
}; };
Packet_t* pPacket = (Packet_t*)txBuf; Packet_t* pPacket = (Packet_t*)txBuf;
pPacket->startChar = liveData->commandStartChar; // todo: handle similar way as cmd input param?
if (cmd == "22402B" || cmd == "22F101") {
pPacket->startChar = txStartChar = 0x12;
} else if (cmd == "22D85C" || cmd == "22D96B") {
pPacket->startChar = txStartChar = 0x78;
} else {
pPacket->startChar = txStartChar = 0x07;
}
pPacket->length = cmd.length() / 2; pPacket->length = cmd.length() / 2;
for (uint8_t i = 0; i < sizeof(pPacket->data); i++) { for (uint8_t i = 0; i < sizeof(pPacket->payload); i++) {
tmpStr = cmd; tmpStr = cmd;
tmpStr = tmpStr.substring(i * 2, ((i + 1) * 2)); tmpStr = tmpStr.substring(i * 2, ((i + 1) * 2));
if (tmpStr != "") { if (tmpStr != "") {
pPacket->data[i] = liveData->hexToDec(tmpStr, 1, false); pPacket->payload[i] = liveData->hexToDec(tmpStr, 1, false);
} }
} }
} }
else else
{ {
txBuf[0] = cmd.length() / 2; struct Packet_t
{
uint8_t length;
uint8_t payload[7];
};
Packet_t* pPacket = (Packet_t*)txBuf;
pPacket->length = cmd.length() / 2;
for (uint8_t i = 0; i < 7; i++) { for (uint8_t i = 0; i < sizeof(pPacket->payload); i++) {
tmpStr = cmd; tmpStr = cmd;
tmpStr = tmpStr.substring(i * 2, ((i + 1) * 2)); tmpStr = tmpStr.substring(i * 2, ((i + 1) * 2));
if (tmpStr != "") { if (tmpStr != "") {
txBuf[i + 1] = liveData->hexToDec(tmpStr, 1, false); pPacket->payload[i] = liveData->hexToDec(tmpStr, 1, false);
} }
} }
} }
@@ -200,6 +198,7 @@ void CommObd2Can::sendPID(const uint16_t pid, const String& cmd) {
lastDataSent = millis(); lastDataSent = millis();
} else { } else {
syslog->infoNolf(DEBUG_COMM, "Error sending PID "); syslog->infoNolf(DEBUG_COMM, "Error sending PID ");
lastDataSent = millis();
} }
syslog->infoNolf(DEBUG_COMM, pid); syslog->infoNolf(DEBUG_COMM, pid);
for (uint8_t i = 0; i < 8; i++) { for (uint8_t i = 0; i < 8; i++) {
@@ -216,10 +215,10 @@ void CommObd2Can::sendFlowControlFrame() {
uint8_t txBuf[8] = { 0x30, requestFramesCount /*request count*/, 20 /*ms between frames*/ , 0, 0, 0, 0, 0 }; uint8_t txBuf[8] = { 0x30, requestFramesCount /*request count*/, 20 /*ms between frames*/ , 0, 0, 0, 0, 0 };
// insert 0x07 into beginning for BMW i3 // insert start char if needed
if (liveData->settings.carType == CAR_BMW_I3_2014) { if (liveData->bAdditionalStartingChar) {
memmove(txBuf + 1, txBuf, 7); memmove(txBuf + 1, txBuf, 7);
txBuf[0] = txStartChar; txBuf[0] = liveData->commandStartChar;
} }
const uint8_t sndStat = CAN->sendMsgBuf(lastPid, 0, 8, txBuf); // 11 bit const uint8_t sndStat = CAN->sendMsgBuf(lastPid, 0, 8, txBuf); // 11 bit
@@ -290,7 +289,8 @@ uint8_t CommObd2Can::receivePID() {
return 0xff; return 0xff;
} }
return rxBuf[0 + liveData->rxBuffOffset]; const uint8_t rxBuffOffset = liveData->bAdditionalStartingChar? 1 : 0;
return rxBuf[0 + rxBuffOffset]; // return byte containing frame type, which requires removing offset byte
} }
static void printHexBuffer(uint8_t* pData, const uint16_t length, const bool bAddNewLine) static void printHexBuffer(uint8_t* pData, const uint16_t length, const bool bAddNewLine)
@@ -340,10 +340,10 @@ CommObd2Can::enFrame_t CommObd2Can::getFrameType(const uint8_t firstByte) {
https://en.wikipedia.org/wiki/ISO_15765-2 https://en.wikipedia.org/wiki/ISO_15765-2
*/ */
bool CommObd2Can::processFrameBytes() { bool CommObd2Can::processFrameBytes() {
const uint8_t rxBuffOffset = liveData->bAdditionalStartingChar ? 1 : 0;
uint8_t* pDataStart = rxBuf + liveData->rxBuffOffset; // set pointer to data start based on specific offset of car uint8_t* pDataStart = rxBuf + rxBuffOffset; // set pointer to data start based on specific offset of car
const auto frameType = getFrameType(*pDataStart); const auto frameType = getFrameType(*pDataStart);
const uint8_t frameLenght = rxLen - liveData->rxBuffOffset; const uint8_t frameLenght = rxLen - rxBuffOffset;
switch (frameType) { switch (frameType) {
case enFrame_t::single: // Single frame case enFrame_t::single: // Single frame

1
CommObd2Can.h
View File

@@ -22,7 +22,6 @@ class CommObd2Can : public CommInterface {
char msgString[128]; // Array to store serial string char msgString[128]; // Array to store serial string
uint16_t lastPid; uint16_t lastPid;
unsigned long lastDataSent = 0; unsigned long lastDataSent = 0;
uint8_t txStartChar = 0; // set when sending PID, used when sending FlowControl
std::vector<uint8_t> mergedData; std::vector<uint8_t> mergedData;
std::unordered_map<uint16_t, std::vector<uint8_t>> dataRows; std::unordered_map<uint16_t, std::vector<uint8_t>> dataRows;

12
LiveData.h
View File

@@ -218,15 +218,21 @@ class LiveData {
protected: protected:
public: public:
// Command loop // Command loop
struct Command_t {
uint8_t startChar; // special starting character used by some cars
String request;
};
uint16_t commandQueueCount; uint16_t commandQueueCount;
uint16_t commandQueueLoopFrom; uint16_t commandQueueLoopFrom;
String commandQueue[300]; std::vector<Command_t> commandQueue;
String responseRow; String responseRow;
String responseRowMerged; String responseRowMerged;
std::vector<uint8_t> vResponseRowMerged; std::vector<uint8_t> vResponseRowMerged;
uint16_t commandQueueIndex; uint16_t commandQueueIndex;
bool canSendNextAtCommand = false; bool canSendNextAtCommand = false;
String commandRequest = ""; uint8_t commandStartChar;
String commandRequest = ""; // TODO: us Command_t struct
String currentAtshRequest = ""; String currentAtshRequest = "";
// Menu // Menu
bool menuVisible = false; bool menuVisible = false;
@@ -249,7 +255,7 @@ class LiveData {
BLEScan* pBLEScan; BLEScan* pBLEScan;
// Canbus // Canbus
uint8_t rxBuffOffset = 0; // offset of processing received data, in some cars needs to be set to 1, like in BMW i3 bool bAdditionalStartingChar = false; // some cars uses additional starting character in beginning of tx and rx messages
uint8_t expectedMinimalPacketLength = 0; // what length of packet should be accepted. Set to 0 to accept any length uint8_t expectedMinimalPacketLength = 0; // what length of packet should be accepted. Set to 0 to accept any length
uint16_t rxTimeoutMs = 100; // timeout for receiving of CAN response uint16_t rxTimeoutMs = 100; // timeout for receiving of CAN response
uint16_t delayBetweenCommandsMs = 0; // delay between commands, set to 0 if no delay is needed uint16_t delayBetweenCommandsMs = 0; // delay between commands, set to 0 if no delay is needed