TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-05-29 20:58:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support for ERT SCM+ meter protocol

Browse Source
This commit is contained in:
Mark Thompson 2023-04-23 01:29:51 -05:00 committed by GitHub
parent 697876d86a
commit fe1d296b48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
firmware/common/ert_packet.cpp
View File

@ -47,6 +47,9 @@ ID Packet::id() const {
const auto lsb = reader_.read(35, 24); const auto lsb = reader_.read(35, 24);
return (msb << 24) | lsb; return (msb << 24) | lsb;
} }
if( type() == Type::SCMPLUS ) {
return reader_.read(2 * 8, 32);
}
if( type() == Type::IDM ) { if( type() == Type::IDM ) {
return reader_.read(5 * 8, 32); return reader_.read(5 * 8, 32);
} }
@ -57,6 +60,9 @@ Consumption Packet::consumption() const {
if( type() == Type::SCM ) { if( type() == Type::SCM ) {
return reader_.read(11, 24); return reader_.read(11, 24);
} }
if( type() == Type::SCMPLUS ) {
return reader_.read(6 * 8, 32);
}
if( type() == Type::IDM ) { if( type() == Type::IDM ) {
return reader_.read(25 * 8, 32); return reader_.read(25 * 8, 32);
} }
@ -67,6 +73,9 @@ CommodityType Packet::commodity_type() const {
if( type() == Type::SCM ) { if( type() == Type::SCM ) {
return reader_.read(5, 4); return reader_.read(5, 4);
} }
if( type() == Type::SCMPLUS ) {
return reader_.read(1 * 8 + 4, 4);
}
if( type() == Type::IDM ) { if( type() == Type::IDM ) {
return reader_.read(4 * 8 + 4, 4); return reader_.read(4 * 8 + 4, 4);
} }
@ -80,7 +89,8 @@ FormattedSymbols Packet::symbols_formatted() const {
bool Packet::crc_ok() const { bool Packet::crc_ok() const {
switch(type()) { switch(type()) {
case Type::SCM: return crc_ok_scm(); case Type::SCM: return crc_ok_scm();
case Type::IDM: return crc_ok_idm(); case Type::SCMPLUS:
case Type::IDM: return crc_ok_ccitt();
default: return false; default: return false;
} }
} }
@ -95,7 +105,7 @@ bool Packet::crc_ok_scm() const {
return ert_bch.checksum() == 0x0000; return ert_bch.checksum() == 0x0000;
} }
bool Packet::crc_ok_idm() const { bool Packet::crc_ok_ccitt() const {
CRC<16> ert_crc_ccitt { 0x1021, 0xffff, 0x1d0f }; CRC<16> ert_crc_ccitt { 0x1021, 0xffff, 0x1d0f };
for(size_t i=0; i<length(); i+=8) { for(size_t i=0; i<length(); i+=8) {
ert_crc_ccitt.process_byte(reader_.read(i, 8)); ert_crc_ccitt.process_byte(reader_.read(i, 8));