Archives/Farm-Data-Relay-System
2
0
Fork 0
mirror of https://github.com/timmbogner/Farm-Data-Relay-System synced 2024-11-08 13:10:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

add crc confirmation for logging and resending

Browse Source
This commit is contained in:
theFeiter 2022-07-27 16:31:54 +02:00
parent 22d6e37550
commit 18caa3f953
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
FDRS_Gateway/fdrs_functions.h
View File

@ -362,6 +362,15 @@ void releaseLogBuffer()
}
#endif
uint16_t stringCrc(const char input[]){
uint16_t calcCRC = 0x0000;
for(unsigned int i = 0; i < strlen(input); i++) {
calcCRC = crc16_update(calcCRC,input[i]);
}
return calcCRC;
}
void sendLog()
{
#if defined (USE_SD_LOG) || defined (USE_FS_LOG)
@ -376,7 +385,7 @@ void sendLog()
doc_0["time"] = time(nullptr);
String outgoingString;
serializeJson(doc, outgoingString);
outgoingString+="\r\n";
outgoingString = outgoingString + " " + stringCrc(outgoingString.c_str()) + "\r\n";
if (logBufferPos+outgoingString.length() >= (sizeof(logBuffer)/sizeof(char))) // if buffer would overflow, release first
{
releaseLogBuffer();
@ -473,6 +482,10 @@ void resendLog(){
while(1){
String line = logfile.readStringUntil('\n');
if (line.length() > 0){ // if line contains something
uint16_t readCrc;
char data[line.length()];
sscanf(line.c_str(),"%s %hd",data,&readCrc);
if(stringCrc(data)!=readCrc){continue;} // if CRCs don't match, skip the line
if (!client.publish(TOPIC_DATA, line.c_str())) {
break;
}else{