TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-08-20 13:27:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move ERT packet type to its rightful place.

Browse Source 
No longer mixed up with Message types.
This commit is contained in:
Jared Boone
2015-12-08 16:19:27 -08:00
parent 7de187e267
commit eb1402764e
5 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
firmware/common/ert_packet.cpp
View File

@@ -37,27 +37,27 @@ rtc::RTC Packet::received_at() const {
return received_at_;
}
ERTPacketMessage::Type Packet::type() const {
Packet::Type Packet::type() const {
return type_;
}
ID Packet::id() const {
if( type() == ERTPacketMessage::Type::SCM ) {
if( type() == Type::SCM ) {
const auto msb = reader_.read(0, 2);
const auto lsb = reader_.read(35, 24);
return (msb << 24) | lsb;
}
if( type() == ERTPacketMessage::Type::IDM ) {
if( type() == Type::IDM ) {
return reader_.read(5 * 8, 32);
}
return invalid_id;
}
Consumption Packet::consumption() const {
if( type() == ERTPacketMessage::Type::SCM ) {
if( type() == Type::SCM ) {
return reader_.read(11, 24);
}
if( type() == ERTPacketMessage::Type::IDM ) {
if( type() == Type::IDM ) {
return reader_.read(25 * 8, 32);
}
return invalid_consumption;
@@ -69,9 +69,9 @@ ManchesterFormatted Packet::symbols_formatted() const {
bool Packet::crc_ok() const {
switch(type()) {
case ERTPacketMessage::Type::SCM: return crc_ok_scm();
case ERTPacketMessage::Type::IDM: return crc_ok_idm();
default: return false;
case Type::SCM: return crc_ok_scm();
case Type::IDM: return crc_ok_idm();
default: return false;
}
}