Remove payload_length from PacketBuilder, etc.

This commit is contained in:
Jared Boone 2015-10-02 17:43:02 -07:00
parent 142617ad94
commit 37b1d7cf2f
5 changed files with 3 additions and 14 deletions

View File

@ -201,7 +201,6 @@ static constexpr FSKConfiguration fsk_configuration_ais = {
.access_code_tolerance = 1,
.unstuffing_pattern = 0b111110,
.unstuffing_length = 6,
.packet_length = 168 + 16 + 8,
};
static constexpr FSKConfiguration fsk_configuration_tpms_a = {
@ -211,7 +210,6 @@ static constexpr FSKConfiguration fsk_configuration_tpms_a = {
.access_code_tolerance = 1,
.unstuffing_pattern = 0,
.unstuffing_length = 0,
.packet_length = 160,
};
void ReceiverModel::update_fsk_configuration() {

View File

@ -23,16 +23,11 @@
void PacketBuilder::configure(
const BitPattern preamble,
const BitPattern unstuff,
size_t new_payload_length
const BitPattern unstuff
) {
preamble_pattern = preamble;
unstuff_pattern = unstuff;
if( new_payload_length <= payload.size() ) {
payload_length = new_payload_length;
}
reset_state();
}

View File

@ -42,8 +42,7 @@ public:
void configure(
const BitPattern preamble,
const BitPattern unstuffing,
size_t new_payload_length
const BitPattern unstuffing
);
void execute(
@ -104,7 +103,6 @@ private:
BitPattern unstuff_pattern { 0b111110, 6 };
BitPattern end_flag_pattern { 0b01111110, 8 };
size_t payload_length { 0 };
size_t bits_received { 0 };
State state { State::Preamble };
PayloadType payload;

View File

@ -47,8 +47,7 @@ void FSKProcessor::configure(const FSKConfiguration new_configuration) {
clock_recovery.configure(sampling_rate / 4, new_configuration.symbol_rate);
packet_builder.configure(
{ new_configuration.access_code, new_configuration.access_code_length, new_configuration.access_code_tolerance },
{ new_configuration.unstuffing_pattern, new_configuration.unstuffing_length },
new_configuration.packet_length
{ new_configuration.unstuffing_pattern, new_configuration.unstuffing_length }
);
}

View File

@ -200,7 +200,6 @@ struct FSKConfiguration {
size_t access_code_tolerance;
uint32_t unstuffing_pattern;
size_t unstuffing_length;
size_t packet_length;
};
class FSKConfigurationMessage : public Message {