TheArchive/mayhem-firmware
1
0
Fork 0
mirror of https://github.com/portapack-mayhem/mayhem-firmware.git synced 2025-06-22 07:58:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

TPMS: Extract packet readers.

Browse Source
This commit is contained in:
Jared Boone 2016-05-27 13:41:56 -07:00
parent e7aaf0e8cf
commit 05b55f2696
2 changed files with 63 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
firmware/common/tpms_packet.cpp
View File

@ -33,8 +33,7 @@ ManchesterFormatted Packet::symbols_formatted() const {
return format_manchester(decoder_); return format_manchester(decoder_);
} }
Optional<Reading> Packet::reading() const { Optional<Reading> Packet::reading_fsk_19k2_schrader() const {
if( signal_type() == SignalType::FSK_19k2_Schrader ) {
const auto length = crc_valid_length(); const auto length = crc_valid_length();
switch(length) { switch(length) {
@ -65,9 +64,9 @@ Optional<Reading> Packet::reading() const {
default: default:
return { }; return { };
} }
} }
if( signal_type() == SignalType::OOK_8k192_Schrader ) { Optional<Reading> Packet::reading_ook_8k192_schrader() const {
const auto flags = reader_.read(0, 3); const auto flags = reader_.read(0, 3);
const auto checksum = reader_.read(35, 2); const auto checksum = reader_.read(35, 2);
@ -78,17 +77,23 @@ Optional<Reading> Packet::reading() const {
{ }, { },
Flags { (flags << 4) | checksum } Flags { (flags << 4) | checksum }
}; };
} }
if( signal_type() == SignalType::OOK_8k4_Schrader ) { Optional<Reading> Packet::reading_ook_8k4_schrader() const {
return Reading { return Reading {
Reading::Type::GMC_96, Reading::Type::GMC_96,
reader_.read(20, 32), reader_.read(20, 32),
Pressure { static_cast<int>(reader_.read(52, 8)) } Pressure { static_cast<int>(reader_.read(52, 8)) }
}; };
} }
return { }; Optional<Reading> Packet::reading() const {
switch( signal_type() ) {
case SignalType::FSK_19k2_Schrader: return reading_fsk_19k2_schrader();
case SignalType::OOK_8k192_Schrader: return reading_ook_8k192_schrader();
case SignalType::OOK_8k4_Schrader: return reading_ook_8k4_schrader();
default: return { };
}
} }
size_t Packet::crc_valid_length() const { size_t Packet::crc_valid_length() const {

4
firmware/common/tpms_packet.hpp
View File

@ -160,6 +160,10 @@ private:
const Reader reader_; const Reader reader_;
Optional<Reading> reading_fsk_19k2_schrader() const;
Optional<Reading> reading_ook_8k192_schrader() const;
Optional<Reading> reading_ook_8k4_schrader() const;
size_t crc_valid_length() const; size_t crc_valid_length() const;
}; };