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

ble

Browse Source
This commit is contained in:
Lubos Petrovic
2020-12-20 16:22:32 +01:00
parent d1b0422c5e
commit 7657a724b6
5 changed files with 34 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CommInterface.cpp
View File

@@ -4,6 +4,8 @@
#include "LiveData.h" #include "LiveData.h"
void CommInterface::initComm(LiveData* pLiveData, BoardInterface* pBoard) { void CommInterface::initComm(LiveData* pLiveData, BoardInterface* pBoard) {
liveData = pLiveData; liveData = pLiveData;
board = pBoard; board = pBoard;
response = "";
} }

2
CommInterface.h
View File

@@ -11,7 +11,7 @@ class CommInterface {
LiveData* liveData; LiveData* liveData;
BoardInterface* board; BoardInterface* board;
char ch; char ch;
String line; String response;
public: public:
void initComm(LiveData* pLiveData, BoardInterface* pBoard); void initComm(LiveData* pLiveData, BoardInterface* pBoard);
virtual void connectDevice() = 0; virtual void connectDevice() = 0;

40
CommObd2Ble4.cpp
View File

@@ -117,7 +117,7 @@ static void notifyCallback (BLERemoteCharacteristic * pBLERemoteCharacteristic,
char ch; char ch;
// Parse multi line response to single lines // Parse multiframes to single response
liveDataObj->responseRow = ""; liveDataObj->responseRow = "";
for (int i = 0; i <= length; i++) { for (int i = 0; i <= length; i++) {
ch = pData[i]; ch = pData[i];
@@ -129,7 +129,9 @@ static void notifyCallback (BLERemoteCharacteristic * pBLERemoteCharacteristic,
liveDataObj->responseRow += ch; liveDataObj->responseRow += ch;
if (liveDataObj->responseRow == ">") { if (liveDataObj->responseRow == ">") {
if (liveDataObj->responseRowMerged != "") { if (liveDataObj->responseRowMerged != "") {
commObj->parseRowMerged(); Serial.print("merged:");
Serial.println(liveDataObj->responseRowMerged);
boardObj->parseRowMerged();
} }
liveDataObj->responseRowMerged = ""; liveDataObj->responseRowMerged = "";
liveDataObj->canSendNextAtCommand = true; liveDataObj->canSendNextAtCommand = true;
@@ -146,7 +148,6 @@ void CommObd2Ble4::connectDevice() {
commObj = this; commObj = this;
liveDataObj = liveData; liveDataObj = liveData;
boardObj = board; boardObj = board;
line = "";
Serial.println("BLE4 connectDevice"); Serial.println("BLE4 connectDevice");
@@ -313,7 +314,7 @@ bool CommObd2Ble4::connectToServer(BLEAddress pAddress) {
} }
/** /**
* Main loop Main loop
*/ */
void CommObd2Ble4::mainLoop() { void CommObd2Ble4::mainLoop() {
@@ -341,15 +342,15 @@ void CommObd2Ble4::mainLoop() {
if (Serial.available()) { if (Serial.available()) {
ch = Serial.read(); ch = Serial.read();
if (ch == '\r' || ch == '\n') { if (ch == '\r' || ch == '\n') {
board->customConsoleCommand(line); board->customConsoleCommand(response);
line = line + ch; response = response + ch;
Serial.println(line); Serial.println(response);
if (liveData->bleConnected) { if (liveData->bleConnected) {
liveData->pRemoteCharacteristicWrite->writeValue(line.c_str(), line.length()); liveData->pRemoteCharacteristicWrite->writeValue(response.c_str(), response.length());
} }
line = ""; response = "";
} else { } else {
line = line + ch; response = response + ch;
} }
} }
@@ -396,12 +397,11 @@ bool CommObd2Ble4::doNextAtCommand() {
} }
/** /**
Parse result from OBD, create single line liveData->responseRowMerged Parse result from OBD, merge frames to sigle response
*/ */
bool CommObd2Ble4::parseRow() { bool CommObd2Ble4::parseRow() {
// Simple 1 line responses // 1 frame data
Serial.print("");
Serial.println(liveData->responseRow); Serial.println(liveData->responseRow);
// Merge 0:xxxx 1:yyyy 2:zzzz to single xxxxyyyyzzzz string // Merge 0:xxxx 1:yyyy 2:zzzz to single xxxxyyyyzzzz string
@@ -411,17 +411,3 @@ bool CommObd2Ble4::parseRow() {
return true; return true;
} }
/**
Parse merged row (after merge completed)
*/
bool CommObd2Ble4::parseRowMerged() {
Serial.print("merged:");
Serial.println(liveData->responseRowMerged);
// Parse by selected car interface
board->parseRowMerged();
return true;
}

2
CommObd2Ble4.h
View File

@@ -18,5 +18,5 @@ class CommObd2Ble4 : public CommInterface {
bool connectToServer(BLEAddress pAddress); bool connectToServer(BLEAddress pAddress);
bool doNextAtCommand(); bool doNextAtCommand();
bool parseRow(); bool parseRow();
bool parseRowMerged(); //
}; };

2
CommObd2Can.cpp
View File

@@ -7,8 +7,6 @@
*/ */
void CommObd2Can::connectDevice() { void CommObd2Can::connectDevice() {
line = "";
Serial.println("CAN connectDevice"); Serial.println("CAN connectDevice");
} }