andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

recieved

This commit is contained in:
Andrei 2017-05-23 21:05:46 +03:00
parent d473fbf94f
commit 896059e267
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
firmware/console/binary/tunerstudio.cpp
View File

@ -443,13 +443,13 @@ void runBinaryProtocolLoop(ts_channel_s *tsChannel, bool isConsoleRedirect) {
tsState.totalCounter++; tsState.totalCounter++;
uint8_t firstByte; uint8_t firstByte;
int received = tunerStudioReadData(tsChannel, &firstByte, 1); int recieved = tunerStudioReadData(tsChannel, &firstByte, 1);
#if EFI_SIMULATOR || defined(__DOXYGEN__) #if EFI_SIMULATOR || defined(__DOXYGEN__)
logMsg("received %d\r\n", received); logMsg("recieved %d\r\n", recieved);
#endif #endif
if (received != 1) { if (recieved != 1) {
// tunerStudioError("ERROR: no command"); // tunerStudioError("ERROR: no command");
continue; continue;
} }
@ -468,8 +468,8 @@ void runBinaryProtocolLoop(ts_channel_s *tsChannel, bool isConsoleRedirect) {
continue; continue;
uint8_t secondByte; uint8_t secondByte;
received = tunerStudioReadData(tsChannel, &secondByte, 1); recieved = tunerStudioReadData(tsChannel, &secondByte, 1);
if (received != 1) { if (recieved != 1) {
tunerStudioError("TS: ERROR: no second byte"); tunerStudioError("TS: ERROR: no second byte");
continue; continue;
} }
@ -490,8 +490,8 @@ void runBinaryProtocolLoop(ts_channel_s *tsChannel, bool isConsoleRedirect) {
continue; continue;
} }
received = tunerStudioReadData(tsChannel, (uint8_t* )tsChannel->crcReadBuffer, 1); recieved = tunerStudioReadData(tsChannel, (uint8_t* )tsChannel->crcReadBuffer, 1);
if (received != 1) { if (recieved != 1) {
tunerStudioError("ERROR: did not receive command"); tunerStudioError("ERROR: did not receive command");
continue; continue;
} }
@ -510,11 +510,11 @@ void runBinaryProtocolLoop(ts_channel_s *tsChannel, bool isConsoleRedirect) {
// scheduleMsg(logger, "TunerStudio: reading %d+4 bytes(s)", incomingPacketSize); // scheduleMsg(logger, "TunerStudio: reading %d+4 bytes(s)", incomingPacketSize);
received = tunerStudioReadData(tsChannel, (uint8_t * ) (tsChannel->crcReadBuffer + 1), recieved = tunerStudioReadData(tsChannel, (uint8_t * ) (tsChannel->crcReadBuffer + 1),
incomingPacketSize + CRC_VALUE_SIZE - 1); incomingPacketSize + CRC_VALUE_SIZE - 1);
int expectedSize = incomingPacketSize + CRC_VALUE_SIZE - 1; int expectedSize = incomingPacketSize + CRC_VALUE_SIZE - 1;
if (received != expectedSize) { if (recieved != expectedSize) {
scheduleMsg(&tsLogger, "Got only %d bytes while expecting %d for command %c", received, scheduleMsg(&tsLogger, "Got only %d bytes while expecting %d for command %c", recieved,
expectedSize, command); expectedSize, command);
tunerStudioError("ERROR: not enough bytes in stream"); tunerStudioError("ERROR: not enough bytes in stream");
sendResponseCode(TS_CRC, tsChannel, TS_RESPONSE_UNDERRUN); sendResponseCode(TS_CRC, tsChannel, TS_RESPONSE_UNDERRUN);
@ -659,8 +659,8 @@ bool handlePlainCommand(ts_channel_s *tsChannel, uint8_t command) {
handleTestCommand(tsChannel); handleTestCommand(tsChannel);
return true; return true;
} else if (command == TS_PAGE_COMMAND) { } else if (command == TS_PAGE_COMMAND) {
int received = tunerStudioReadData(tsChannel, (uint8_t * )&pageIn, sizeof(pageIn)); int recieved = tunerStudioReadData(tsChannel, (uint8_t * )&pageIn, sizeof(pageIn));
if (received != sizeof(pageIn)) { if (recieved != sizeof(pageIn)) {
tunerStudioError("ERROR: not enough for PAGE"); tunerStudioError("ERROR: not enough for PAGE");
return true; return true;
} }
@ -669,8 +669,8 @@ bool handlePlainCommand(ts_channel_s *tsChannel, uint8_t command) {
} else if (command == TS_BURN_COMMAND) { } else if (command == TS_BURN_COMMAND) {
scheduleMsg(&tsLogger, "Got naked BURN"); scheduleMsg(&tsLogger, "Got naked BURN");
uint16_t page; uint16_t page;
int received = tunerStudioReadData(tsChannel, (uint8_t * )&page, sizeof(page)); int recieved = tunerStudioReadData(tsChannel, (uint8_t * )&page, sizeof(page));
if (received != sizeof(page)) { if (recieved != sizeof(page)) {
tunerStudioError("ERROR: Not enough for plain burn"); tunerStudioError("ERROR: Not enough for plain burn");
return true; return true;
} }
@ -678,15 +678,15 @@ bool handlePlainCommand(ts_channel_s *tsChannel, uint8_t command) {
return true; return true;
} else if (command == TS_CHUNK_WRITE_COMMAND) { } else if (command == TS_CHUNK_WRITE_COMMAND) {
scheduleMsg(&tsLogger, "Got naked CHUNK_WRITE"); scheduleMsg(&tsLogger, "Got naked CHUNK_WRITE");
int received = tunerStudioReadData(tsChannel, (uint8_t * )&writeChunkRequest, sizeof(writeChunkRequest)); int recieved = tunerStudioReadData(tsChannel, (uint8_t * )&writeChunkRequest, sizeof(writeChunkRequest));
if (received != sizeof(writeChunkRequest)) { if (recieved != sizeof(writeChunkRequest)) {
scheduleMsg(&tsLogger, "ERROR: Not enough for plain chunk write header: %d", received); scheduleMsg(&tsLogger, "ERROR: Not enough for plain chunk write header: %d", recieved);
tsState.errorCounter++; tsState.errorCounter++;
return true; return true;
} }
received = tunerStudioReadData(tsChannel, (uint8_t * )&tsChannel->crcReadBuffer, writeChunkRequest.count); recieved = tunerStudioReadData(tsChannel, (uint8_t * )&tsChannel->crcReadBuffer, writeChunkRequest.count);
if (received != writeChunkRequest.count) { if (recieved != writeChunkRequest.count) {
scheduleMsg(&tsLogger, "ERROR: Not enough for plain chunk write content: %d while expecting %d", received, scheduleMsg(&tsLogger, "ERROR: Not enough for plain chunk write content: %d while expecting %d", recieved,
writeChunkRequest.count); writeChunkRequest.count);
tsState.errorCounter++; tsState.errorCounter++;
return true; return true;
@ -698,8 +698,8 @@ bool handlePlainCommand(ts_channel_s *tsChannel, uint8_t command) {
return true; return true;
} else if (command == TS_READ_COMMAND) { } else if (command == TS_READ_COMMAND) {
//scheduleMsg(logger, "Got naked READ PAGE???"); //scheduleMsg(logger, "Got naked READ PAGE???");
int received = tunerStudioReadData(tsChannel, (uint8_t * )&readRequest, sizeof(readRequest)); int recieved = tunerStudioReadData(tsChannel, (uint8_t * )&readRequest, sizeof(readRequest));
if (received != sizeof(readRequest)) { if (recieved != sizeof(readRequest)) {
tunerStudioError("Not enough for plain read header"); tunerStudioError("Not enough for plain read header");
return true; return true;
} }