From 1bdad62496994abc4ded63770170f00f46d7e3dc Mon Sep 17 00:00:00 2001 From: Jared Boone Date: Mon, 28 Sep 2015 12:36:04 -0700 Subject: [PATCH] Simplify PacketBuilder pattern matching and symbol accumulation. --- firmware/baseband/packet_builder.hpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/firmware/baseband/packet_builder.hpp b/firmware/baseband/packet_builder.hpp index 618fc849..973c79d1 100644 --- a/firmware/baseband/packet_builder.hpp +++ b/firmware/baseband/packet_builder.hpp @@ -51,13 +51,13 @@ public: break; case State::Payload: + if( !found_stuffing_bit() ) { + payload[bits_received++] = symbol; + } + if( found_end_flag() || packet_truncated() ) { payload_handler(payload, bits_received); reset_state(); - } else { - if( !found_stuffing_bit() ) { - payload[bits_received++] = symbol; - } } break; @@ -74,7 +74,7 @@ private: }; bool packet_truncated() const { - return bits_received > payload.size(); + return bits_received >= payload.size(); } bool found_preamble() const {