Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Theengs Decoder library translates these data chains into human readable data le

It's also a simplified way of defining the thing properties and how to decode these.

Theengs Decoder supports the decoding of [more than 120 Bluetooth devices](https://decoder.theengs.io/devices/devices.html).
Theengs Decoder supports the decoding of [more than 140 Bluetooth devices](https://decoder.theengs.io/devices/devices.html).

Theengs Decoder can be used on memory constraint environments like micro controllers (ESP32, ESP8266, Arduino), on a PC or on a Unix server.
Unit testing assures that the modification done on the library doesn't affect previous capabilities.
Expand Down
2 changes: 1 addition & 1 deletion docs/devices/VICTRON_ORIONTR.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
|Communication|BLE broadcast|
|Frequency|2.4Ghz|
|Power Source|From connected battery/alternator|
|Exchanged Data|device state, voltage out, voltage in, error code|
|Exchanged Data|device state, voltage in, voltage out, current in, current out, error code|
|Encrypted|Yes|
|Device Tracker|✅|
4 changes: 2 additions & 2 deletions docs/devices/VICTRON_SBS.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
|Model Id|[VICTSBS](https://github.com/theengs/decoder/blob/development/src/devices/VICTRON_SBS_json.h)|
|-|-|
|Brand|Victron Energy|
|Model|Smart Battery Sense, BMV-712 Smart and other battery monitoring devices|
|Model|Smart Battery Sense|
|Short Description|Wireless battery voltage and temperature sensor|
|Communication|BLE broadcast|
|Frequency|2.4Ghz|
|Power Source|From connected battery|
|Exchanged Data|time to go, voltage, current, temperature, consumed Ah, state of charge, alarm|
|Exchanged Data|voltage, temperature|
|Encrypted|Yes|
|Device Tracker|✅|
13 changes: 13 additions & 0 deletions docs/devices/VICTRON_SS.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Victron Energy SmartShunt

|Model Id|[VICTSBS](https://github.com/theengs/decoder/blob/development/src/devices/VICTRON_SBS_json.h)|
|-|-|
|Brand|Victron Energy|
|Model|SmartShunt|
|Short Description|Various battery monitoring SmartShunt models|
|Communication|BLE broadcast|
|Frequency|2.4Ghz|
|Power Source|From connected battery|
|Exchanged Data|voltage, auxiliary voltage, current, consumed Ah, time to go, state of charge|
|Encrypted|Yes|
|Device Tracker|✅|
13 changes: 13 additions & 0 deletions docs/devices/Victron_BM.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Victron Energy BMV-712 Smart Battery Monitor

|Model Id|[VICTSBS](https://github.com/theengs/decoder/blob/development/src/devices/VICTRON_SBS_json.h)|
|-|-|
|Brand|Victron Energy|
|Model|BMV-712 Smart Battery Monitor|
|Short Description|Wireless high precision battery monitor|
|Communication|BLE broadcast|
|Frequency|2.4Ghz|
|Power Source|From connected battery|
|Exchanged Data|time to go, voltage, current, consumed Ah, state of charge, alarm reason|
|Encrypted|Yes|
|Device Tracker|✅|
2 changes: 1 addition & 1 deletion docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Theengs Decoder library translates these data chains into human readable data le

It's also a simplified way of defining the thing properties and how to decode these.

Theengs Decoder supports the decoding of [more than 120 Bluetooth devices](./devices/devices).
Theengs Decoder supports the decoding of [more than 140 Bluetooth devices](./devices/devices).

Theengs Decoder can be used on memory constraint environments like micro controllers (ESP32, ESP8266, Arduino), on a PC or on a Unix server.
Unit testing assures that the modification done on the library doesn't affect previous capabilities.
Expand Down
2 changes: 1 addition & 1 deletion src/devices/VICTRON__ENCR_json.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,4 +53,4 @@ const char* _VICTRON_ENCR_json_props = "{\"properties\":{\"cipher\":{\"unit\":\"
"name":"message integrity check"
}
}
})"""";*/
})"""";*/
15 changes: 12 additions & 3 deletions tests/BLE/test_ble.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,9 @@ const char* expected_mfg[] = {
"{\"brand\":\"Victron Energy\",\"model\":\"Battery Monitor/Smart Battery Sense/SmartShunt\",\"model_id\":\"VICTSBS\",\"type\":\"ENRG\",\"track\":true,\"bvpp\":true,\"ttg\":14400,\"volt\":13.28,\"volt_aux\":12.47,\"current\":-0.116,\"consumed_ah\":-20.1,\"soc\":92,\"alarm_reason\":0}",
"{\"brand\":\"Victron Energy\",\"model\":\"Victron encrypted\",\"model_id\":\"VICTRON_ENCR\",\"type\":\"ENRG\",\"encr\":3,\"cipher\":\"0751889a5d8c22e24014\",\"ctr\":\"e308\",\"mic\":\"f9\"}",
"{\"brand\":\"Victron Energy\",\"model\":\"Orion TR\",\"model_id\":\"VICTORIONTR\",\"type\":\"ENRG\",\"track\":true,\"bvpp\":true,\"device_state\":\"off\",\"volt_in\":12.51,\"volt_out\":1.29,\"current_in\":0,\"error_code\":0}",
"{\"brand\":\"Victron Energy\",\"model\":\"Victron encrypted\",\"model_id\":\"VICTRON_ENCR\",\"type\":\"ENRG\",\"encr\":3,\"cipher\":\"378a5d06e864839e6311898e6911f7\",\"ctr\":\"0e02\",\"mic\":\"a6\"}",
"{\"brand\":\"Victron Energy\",\"model\":\"Battery Monitor/Smart Battery Sense/SmartShunt\",\"model_id\":\"VICTSBS\",\"type\":\"ENRG\",\"track\":true,\"bvpp\":true,\"ttg\":2169,\"volt\":13.92,\"volt_aux\":0,\"current\":-1.826,\"consumed_ah\":-0.1,\"soc\":99.9,\"alarm_reason\":0}",
"{\"brand\":\"Victron Energy\",\"model\":\"Battery Monitor/Smart Battery Sense/SmartShunt\",\"model_id\":\"VICTSBS\",\"type\":\"ENRG\",\"track\":true,\"bvpp\":true,\"volt\":12.93,\"volt_aux\":0,\"current\":-2.002,\"alarm_reason\":0}",
};

const char* expected_name_uuid_mfgsvcdata[] = {
Expand Down Expand Up @@ -836,9 +839,9 @@ const char* test_mfgdata[][3] = {
{"YPMS BR", "BR_1234", "401e1001a79692"},
{"YPMS BR", "BR_1234", "401e0f01a70ffa"},
{"YPMS BR", "BR_1234", "281e1401558536"},
{"Victron Battery Monitor/Smart Sense/SmartShunt ENCR", "", "e102100238c0020e02a6378a5d06e864839e6311898e6911f7"},
{"Victron Battery Monitor/Smart Sense/SmartShunt ENCR", "", "e102100238c0027c00a6caf5109829476880bc658f4afe79fd"},
{"Victron Battery Monitor/Smart Sense/SmartShunt ENCR", "", "e102100289a302b3b8f5ef9c2669e3b2e28f109d7cc484eef9"},
{"Victron Battery Monitor/Smart Battery Sense/SmartShunt ENCR", "", "e102100238c0020e02a6378a5d06e864839e6311898e6911f7"},
{"Victron Battery Monitor/Smart Battery Sense/SmartShunt ENCR", "", "e102100238c0027c00a6caf5109829476880bc658f4afe79fd"},
{"Victron Battery Monitor/Smart Battery Sense/SmartShunt ENCR", "", "e102100289a302b3b8f5ef9c2669e3b2e28f109d7cc484eef9"},
{"Victron Smart Battery Sense", "", "e1021180a5a302ffff7bffff130500008971feff7fffffffff"},
{"Victron Smart Battery Sense", "", "e1021180a5a302ffff7bffff790500008971feff7fffffffff"},
{"Victron Smart Battery Sense", "", "e1021100a4a302ffff7cffffc60400007d73feff7fffffffff"},
Expand All @@ -855,6 +858,9 @@ const char* test_mfgdata[][3] = {
{"Victron Battery Monitor", "", "e102110283a302ffff8d403830050000df0430feffc90080f9"},
{"Victron Orion TR Smart ENCR", "", "e1021000d0a304e308f90751889a5d8c22e24014"},
{"Victron Orion TR", "", "e1021100d0a304fffff90000e304ff7f81000000"},
{"Victron Battery Monitor/Smart Battery Sense/SmartShunt ENCR", "", "e102100232c0020e02a6378a5d06e864839e6311898e6911f7"},
{"Victron SmartShunt", "","e102110238c002ffffa6790870050000000078e3ff010070fe"},
{"Victron SmartShunt", "","e102110238c002ffffa6ffff0d0500000000b8e0ffffffffff"},
};

TheengsDecoder::BLE_ID_NUM test_mfgdata_id_num[]{
Expand Down Expand Up @@ -1088,6 +1094,9 @@ TheengsDecoder::BLE_ID_NUM test_mfgdata_id_num[]{
TheengsDecoder::BLE_ID_NUM::VICTSBS,
TheengsDecoder::BLE_ID_NUM::VICTRON_ENCR,
TheengsDecoder::BLE_ID_NUM::VICTORIONTR,
TheengsDecoder::BLE_ID_NUM::VICTRON_ENCR,
TheengsDecoder::BLE_ID_NUM::VICTSBS,
TheengsDecoder::BLE_ID_NUM::VICTSBS,
};

// uuid test input [test name] [device name] [uuid] [manufacturer data] [service data]
Expand Down
Loading