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

Add Tamper Flags to ERT RX display and meter ID to log file (#1707)

Browse Source
This commit is contained in:
Mark Thompson
2024-01-03 13:17:33 -06:00
committed by GitHub
parent 58bf60695d
commit 715a2dd448
4 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
firmware/common/ert_packet.cpp
View File

@@ -82,6 +82,19 @@ CommodityType Packet::commodity_type() const {
return invalid_commodity_type;
}
TamperFlags Packet::tamper_flags() const {
if (type() == Type::SCM) {
return (reader_.read(9, 2) << 4) | reader_.read(3, 2); // Physical/Encoder tamper flags in lower/upper nibbles
}
if (type() == Type::SCMPLUS) {
return reader_.read(10 * 8, 16);
}
if (type() == Type::IDM) {
return reader_.read(11 * 8, 48);
}
return invalid_tamper_flags;
}
FormattedSymbols Packet::symbols_formatted() const {
return format_symbols(decoder_);
}

3
firmware/common/ert_packet.hpp
View File

@@ -34,10 +34,12 @@ namespace ert {
using ID = uint32_t;
using Consumption = uint32_t;
using CommodityType = uint32_t;
using TamperFlags = uint32_t;
constexpr ID invalid_id = 0;
constexpr CommodityType invalid_commodity_type = -1;
constexpr Consumption invalid_consumption = 0;
constexpr TamperFlags invalid_tamper_flags = 0;
class Packet {
public:
@@ -67,6 +69,7 @@ class Packet {
ID id() const;
CommodityType commodity_type() const;
Consumption consumption() const;
TamperFlags tamper_flags() const;
FormattedSymbols symbols_formatted() const;