ftc/defrost_v2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Got rid of excess logging. Added logging of received data from subcommand

Browse Source
This commit is contained in:
ftc
2021-01-04 11:22:29 +03:00
parent 07afde2125
commit 2da60c22e9
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ModbusServiceWorker.cpp
-5
View File
@@ -21,12 +21,9 @@ void ModbusServiceWorker::Run()
string protocol_id = header.substr(2, 2); string protocol_id = header.substr(2, 2);
int length = ((int)(unsigned char)header[5]) | (((int)(unsigned char)header[4]) << 8); int length = ((int)(unsigned char)header[5]) | (((int)(unsigned char)header[4]) << 8);
string unit_identifier = header.substr(6, 1); string unit_identifier = header.substr(6, 1);
log->LogString("Receiving modbus frame of length " + ToString(length));
string data = s.Receive(length - 1); string data = s.Receive(length - 1);
log->LogString("Received modbus frame of length " + ToString(length));
string answer_data = ""; string answer_data = "";
int function = data[0]; int function = data[0];
log->LogString("Processing function " + ToString(function));
if (function == 3) if (function == 3)
{ {
LockMutex(register_mutex); LockMutex(register_mutex);
@@ -62,9 +59,7 @@ void ModbusServiceWorker::Run()
string length_str = ""; string length_str = "";
length_str += (char)((answer_data.length() >> 8) & 0xFF); length_str += (char)((answer_data.length() >> 8) & 0xFF);
length_str += (char)((answer_data.length()) & 0xFF); length_str += (char)((answer_data.length()) & 0xFF);
log->LogString("Sending answer");
s.Send(transaction_id + protocol_id + length_str + answer_data); s.Send(transaction_id + protocol_id + length_str + answer_data);
log->LogString("Answer sent");
} }
} }
catch (string s) catch (string s)
TemperatureThread.cpp
+1
View File
@@ -27,6 +27,7 @@ void TemperatureThread::Run()
if (output == nullptr) return; if (output == nullptr) return;
string value = Read(output); string value = Read(output);
pclose(output); pclose(output);
mainlog.LogString("TemperatureThread: received from command: " + value);
temperature = atof(value.c_str()); temperature = atof(value.c_str());
LockMutex(register_mutex); LockMutex(register_mutex);
registers[REGISTER_CUR_TEMP] = (int)(temperature * 100); registers[REGISTER_CUR_TEMP] = (int)(temperature * 100);