TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-12-03 09:11:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Push SignalType inside tpms::Packet.

Browse Source
This commit is contained in:
Jared Boone
2016-05-25 17:58:32 -07:00
parent 83e4aec49c
commit 04c472e802
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
firmware/common/tpms_packet.cpp
View File

@@ -33,8 +33,8 @@ ManchesterFormatted Packet::symbols_formatted() const {
return format_manchester(decoder_);
}
Optional<Reading> Packet::reading(const SignalType signal_type) const {
if( signal_type == SignalType::FSK_19k2_Schrader ) {
Optional<Reading> Packet::reading() const {
if( signal_type() == SignalType::FSK_19k2_Schrader ) {
const auto length = crc_valid_length();
switch(length) {
@@ -67,7 +67,7 @@ Optional<Reading> Packet::reading(const SignalType signal_type) const {
}
}
if( signal_type == SignalType::OOK_8k192_Schrader ) {
if( signal_type() == SignalType::OOK_8k192_Schrader ) {
const auto flags = reader_.read(0, 3);
const auto checksum = reader_.read(35, 2);
@@ -80,7 +80,7 @@ Optional<Reading> Packet::reading(const SignalType signal_type) const {
};
}
if( signal_type == SignalType::OOK_8k4_Schrader ) {
if( signal_type() == SignalType::OOK_8k4_Schrader ) {
return Reading {
Reading::Type::GMC_96,
reader_.read(20, 32),

8
firmware/common/tpms_packet.hpp
View File

@@ -135,23 +135,27 @@ private:
class Packet {
public:
constexpr Packet(
const baseband::Packet& packet
const baseband::Packet& packet,
const SignalType signal_type
) : packet_ { packet },
signal_type_ { signal_type },
decoder_ { packet_, 0 },
reader_ { decoder_ }
{
}
SignalType signal_type() const { return signal_type_; }
Timestamp received_at() const;
ManchesterFormatted symbols_formatted() const;
Optional<Reading> reading(const SignalType signal_type) const;
Optional<Reading> reading() const;
private:
using Reader = FieldReader<ManchesterDecoder, BitRemapNone>;
const baseband::Packet packet_;
const SignalType signal_type_;
const ManchesterDecoder decoder_;
const Reader reader_;