andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 16:29:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix read_bitvalue() - for solar pump on/off in #397

Browse Source
This commit is contained in:
proddy
2020-06-22 20:51:08 +02:00
parent b643a7d8a7
commit 03500ceb3b
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/devices/solar.cpp
View File

@@ -188,7 +188,7 @@ void Solar::process_SM100Status(std::shared_ptr<const Telegram> telegram) {
* SM100Status2 - type 0x036A EMS+ for pump on/off at offset 0x0A - for SM100 and SM200 * SM100Status2 - type 0x036A EMS+ for pump on/off at offset 0x0A - for SM100 and SM200
* e.g. B0 00 FF 00 02 6A 03 03 03 03 01 03 03 03 03 03 01 03 * e.g. B0 00 FF 00 02 6A 03 03 03 03 01 03 03 03 03 03 01 03
* byte 4 = VS2 3-way valve for cylinder 2 : test=01, on=04 and off=03 * byte 4 = VS2 3-way valve for cylinder 2 : test=01, on=04 and off=03
* byte 10 = PS1 Solar circuit pump for collector array 1: test=01, on=04 and off=03 * byte 10 = PS1 Solar circuit pump for collector array 1: test=b0001(1), on=b0100(4) and off=b0011(3)
*/ */
void Solar::process_SM100Status2(std::shared_ptr<const Telegram> telegram) { void Solar::process_SM100Status2(std::shared_ptr<const Telegram> telegram) {
telegram->read_bitvalue(valveStatus_, 4, 2); // on if bit 2 set telegram->read_bitvalue(valveStatus_, 4, 2); // on if bit 2 set

2
src/telegram.h
View File

@@ -85,7 +85,7 @@ class Telegram {
return; // out of bounds return; // out of bounds
} }
value = (uint8_t)(((message_data[index]) >> (bit)) & 0x01); value = (uint8_t)(((message_data[index - offset]) >> (bit)) & 0x01);
} }
// read values from a telegram. We always store the value, regardless if its garbage // read values from a telegram. We always store the value, regardless if its garbage

9
src/test/test.cpp
View File

@@ -205,6 +205,15 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & command) {
EMSESP::show_values(shell); EMSESP::show_values(shell);
EMSESP::send_raw_telegram("B0 00 FF 18 02 62 80 00 B8"); EMSESP::send_raw_telegram("B0 00 FF 18 02 62 80 00 B8");
uart_telegram("30 00 FF 0A 02 6A 04"); // SM100 pump on 1
EMSESP::rxservice_.loop();
EMSESP::show_values(shell);
uart_telegram("30 00 FF 0A 02 6A 03"); // SM100 pump off 0
EMSESP::rxservice_.loop();
EMSESP::show_values(shell); EMSESP::show_values(shell);
} }