Push SignalType inside tpms::Packet.

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

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),