TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2024-12-15 04:28:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

ERT CRC checking for SCM packets.

Browse Source 
IDM coming as soon as I can address packet truncation...
This commit is contained in:
Jared Boone 2015-12-07 11:38:35 -08:00
parent 1c01f54717
commit b9ea7fa786
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
firmware/application/app_ert.cpp
View File

@ -29,6 +29,7 @@ using namespace portapack;
#include "lpc43xx_cpp.hpp" #include "lpc43xx_cpp.hpp"
using namespace lpc43xx; using namespace lpc43xx;
#include "crc.hpp"
#include "string_format.hpp" #include "string_format.hpp"
namespace ert { namespace ert {
@ -71,6 +72,21 @@ Consumption Packet::consumption() const {
return invalid_consumption; return invalid_consumption;
} }
bool Packet::crc_ok() const {
if( type() == ERTPacket::Type::SCM ) {
CRC<uint16_t> ert_bch { 0x6f63 };
size_t start_bit = 5;
auto crc_calculated = ert_bch.calculate_byte(0x0000, reader_.read(0, start_bit));
for(size_t i=start_bit; i<length(); i+=8) {
const uint8_t byte = reader_.read(i, 8);
crc_calculated = ert_bch.calculate_byte(crc_calculated, byte);
}
return crc_calculated == 0x0000;
}
return false;
}
} /* namespace ert */ } /* namespace ert */
ERTModel::ERTModel() { ERTModel::ERTModel() {
@ -122,6 +138,7 @@ void ERTView::on_packet(const ert::Packet& packet) {
msg += to_string_dec_uint(packet.id(), 10); msg += to_string_dec_uint(packet.id(), 10);
msg += " "; msg += " ";
msg += to_string_dec_uint(packet.consumption(), 10); msg += to_string_dec_uint(packet.consumption(), 10);
msg += packet.crc_ok() ? " *" : " x";
break; break;
case ERTPacket::Type::IDM: case ERTPacket::Type::IDM:

2
firmware/application/app_ert.hpp
View File

@ -72,6 +72,8 @@ public:
ID id() const; ID id() const;
Consumption consumption() const; Consumption consumption() const;
bool crc_ok() const;
private: private:
using Reader = FieldReader<ManchesterDecoder, BitRemap>; using Reader = FieldReader<ManchesterDecoder, BitRemap>;