Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BLE Rx parsing improvements #1566

Merged
merged 5 commits into from
Nov 7, 2023
Merged

BLE Rx parsing improvements #1566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4878e60
Running simple state machine to better catch in between buffers.
iNetro Nov 7, 2023
48afc2a
Merge branch 'next' into rx_parsing_improvements
iNetro Nov 7, 2023
1f15464
clang13 formatting
iNetro Nov 7, 2023
0bbae7f
My attempt at trying to minimize uncleared str buffers
iNetro Nov 7, 2023
665c56e
fix formatting
iNetro Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions firmware/application/apps/ble_rx_app.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,11 +201,12 @@ void BleRecentEntryDetailView::set_entry(const BleRecentEntry& entry) {

void BleRecentEntryDetailView::launch_bletx(BleRecentEntry packetEntry) {
BLETxPacket bleTxPacket;
memset(&bleTxPacket, 0, sizeof(BLETxPacket));

std::string macAddressStr = to_string_mac_address(packetEntry.packetData.macAddress, 6, true);

strncpy(bleTxPacket.macAddress, macAddressStr.c_str(), 13);
strncpy(bleTxPacket.advertisementData, packetEntry.dataString.c_str(), (packetEntry.packetData.dataLen * 2) + 1);
strncpy(bleTxPacket.macAddress, macAddressStr.c_str(), 12);
strncpy(bleTxPacket.advertisementData, packetEntry.dataString.c_str(), packetEntry.packetData.dataLen * 2);
strncpy(bleTxPacket.packetCount, "50", 3);
bleTxPacket.packet_count = 50;

Expand Down
267 changes: 139 additions & 128 deletions firmware/baseband/proc_btlerx.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,200 +302,211 @@ void BTLERxProcessor::execute(const buffer_c8_t& buffer) {

//--------------Start Parsing For Access Address---------------//

static uint8_t demod_buf_access[SAMPLE_PER_SYMBOL][LEN_DEMOD_BUF_ACCESS];
if (parseState == Parse_State_Begin) {
static uint8_t demod_buf_access[SAMPLE_PER_SYMBOL][LEN_DEMOD_BUF_ACCESS];

uint32_t uint32_tmp = DEFAULT_ACCESS_ADDR;
uint8_t accessAddrBits[LEN_DEMOD_BUF_ACCESS];
uint32_t uint32_tmp = DEFAULT_ACCESS_ADDR;
uint8_t accessAddrBits[LEN_DEMOD_BUF_ACCESS];

uint32_t accesssAddress = 0;
uint32_t accesssAddress = 0;

// Filling up addressBits with the access address we are looking to find.
for (i = 0; i < 32; i++) {
accessAddrBits[i] = 0x01 & uint32_tmp;
uint32_tmp = (uint32_tmp >> 1);
}
// Filling up addressBits with the access address we are looking to find.
for (i = 0; i < 32; i++) {
accessAddrBits[i] = 0x01 & uint32_tmp;
uint32_tmp = (uint32_tmp >> 1);
}

memset(demod_buf_access, 0, SAMPLE_PER_SYMBOL * demod_buf_len);
memset(demod_buf_access, 0, SAMPLE_PER_SYMBOL * demod_buf_len);

for (i = 0; i < num_symbol_left * SAMPLE_PER_SYMBOL; i += SAMPLE_PER_SYMBOL) {
sp = ((demod_buf_offset - demod_buf_len + 1) & (demod_buf_len - 1));
for (i = 0; i < num_symbol_left * SAMPLE_PER_SYMBOL; i += SAMPLE_PER_SYMBOL) {
sp = ((demod_buf_offset - demod_buf_len + 1) & (demod_buf_len - 1));

for (j = 0; j < SAMPLE_PER_SYMBOL; j++) {
// Sample and compare with the adjacent next sample.
I0 = dst_buffer.p[i + j].real();
Q0 = dst_buffer.p[i + j].imag();
I1 = dst_buffer.p[i + j + 1].real();
Q1 = dst_buffer.p[i + j + 1].imag();
for (j = 0; j < SAMPLE_PER_SYMBOL; j++) {
// Sample and compare with the adjacent next sample.
I0 = dst_buffer.p[i + j].real();
Q0 = dst_buffer.p[i + j].imag();
I1 = dst_buffer.p[i + j + 1].real();
Q1 = dst_buffer.p[i + j + 1].imag();

phase_idx = j;
phase_idx = j;

demod_buf_access[phase_idx][demod_buf_offset] = (I0 * Q1 - I1 * Q0) > 0 ? 1 : 0;
demod_buf_access[phase_idx][demod_buf_offset] = (I0 * Q1 - I1 * Q0) > 0 ? 1 : 0;

k = sp;
unequal_flag = false;
k = sp;
unequal_flag = false;

accesssAddress = 0;
accesssAddress = 0;

for (p = 0; p < demod_buf_len; p++) {
if (demod_buf_access[phase_idx][k] != accessAddrBits[p]) {
unequal_flag = true;
hit_idx = (-1);
break;
}
for (p = 0; p < demod_buf_len; p++) {
if (demod_buf_access[phase_idx][k] != accessAddrBits[p]) {
unequal_flag = true;
hit_idx = (-1);
break;
}

accesssAddress = (accesssAddress & (~(1 << p))) | (demod_buf_access[phase_idx][k] << p);
accesssAddress = (accesssAddress & (~(1 << p))) | (demod_buf_access[phase_idx][k] << p);

k = ((k + 1) & (demod_buf_len - 1));
k = ((k + 1) & (demod_buf_len - 1));
}

if (unequal_flag == false) {
hit_idx = (i + j - (demod_buf_len - 1) * SAMPLE_PER_SYMBOL);
break;
}
}

if (unequal_flag == false) {
hit_idx = (i + j - (demod_buf_len - 1) * SAMPLE_PER_SYMBOL);
break;
}
}

if (unequal_flag == false) {
break;
demod_buf_offset = ((demod_buf_offset + 1) & (demod_buf_len - 1));
}

demod_buf_offset = ((demod_buf_offset + 1) & (demod_buf_len - 1));
}

if (hit_idx == -1) {
// Process more samples.
return;
}
if (hit_idx == -1) {
// Process more samples.
return;
}

symbols_eaten += hit_idx;
symbols_eaten += hit_idx;

symbols_eaten += (8 * NUM_ACCESS_ADDR_BYTE * SAMPLE_PER_SYMBOL); // move to beginning of PDU header
symbols_eaten += (8 * NUM_ACCESS_ADDR_BYTE * SAMPLE_PER_SYMBOL); // move to beginning of PDU header

num_symbol_left = num_symbol_left - symbols_eaten;
num_symbol_left = num_symbol_left - symbols_eaten;

//--------------Start PDU Header Parsing-----------------------//
//--------------Start PDU Header Parsing-----------------------//

num_demod_byte = 2; // PDU header has 2 octets
num_demod_byte = 2; // PDU header has 2 octets

symbols_eaten += 8 * num_demod_byte * SAMPLE_PER_SYMBOL;
symbols_eaten += 8 * num_demod_byte * SAMPLE_PER_SYMBOL;

if (symbols_eaten > (int)dst_buffer.count) {
return;
parseState = Parse_State_PDU_Header;
}

// //Demod the PDU Header
uint8_t bit_decision;
if (parseState == Parse_State_PDU_Header) {
if (symbols_eaten > (int)dst_buffer.count) {
return;
}

// Jump back down to beginning of PDU header.
int sample_idx = symbols_eaten - (8 * num_demod_byte * SAMPLE_PER_SYMBOL);
// //Demod the PDU Header
// Jump back down to beginning of PDU header.
sample_idx = symbols_eaten - (8 * num_demod_byte * SAMPLE_PER_SYMBOL);

uint16_t packet_index = 0;
packet_index = 0;

for (i = 0; i < num_demod_byte; i++) {
rb_buf[packet_index] = 0;
for (i = 0; i < num_demod_byte; i++) {
rb_buf[packet_index] = 0;

for (j = 0; j < 8; j++) {
I0 = dst_buffer.p[sample_idx].real();
Q0 = dst_buffer.p[sample_idx].imag();
I1 = dst_buffer.p[sample_idx + 1].real();
Q1 = dst_buffer.p[sample_idx + 1].imag();
for (j = 0; j < 8; j++) {
I0 = dst_buffer.p[sample_idx].real();
Q0 = dst_buffer.p[sample_idx].imag();
I1 = dst_buffer.p[sample_idx + 1].real();
Q1 = dst_buffer.p[sample_idx + 1].imag();

bit_decision = (I0 * Q1 - I1 * Q0) > 0 ? 1 : 0;
rb_buf[packet_index] = rb_buf[packet_index] | (bit_decision << j);
bit_decision = (I0 * Q1 - I1 * Q0) > 0 ? 1 : 0;
rb_buf[packet_index] = rb_buf[packet_index] | (bit_decision << j);

sample_idx += SAMPLE_PER_SYMBOL;
}
sample_idx += SAMPLE_PER_SYMBOL;
}

packet_index++;
}
packet_index++;
}

// demod_byte(num_demod_byte, rb_buf);
// demod_byte(num_demod_byte, rb_buf);

scramble_byte(rb_buf, num_demod_byte, scramble_table[channel_number], rb_buf);
scramble_byte(rb_buf, num_demod_byte, scramble_table[channel_number], rb_buf);

uint8_t pdu_type = (ADV_PDU_TYPE)(rb_buf[0] & 0x0F);
// uint8_t tx_add = ((rb_buf[0] & 0x40) != 0);
// uint8_t rx_add = ((rb_buf[0] & 0x80) != 0);
uint8_t payload_len = (rb_buf[1] & 0x3F);
pdu_type = (ADV_PDU_TYPE)(rb_buf[0] & 0x0F);
// uint8_t tx_add = ((rb_buf[0] & 0x40) != 0);
// uint8_t rx_add = ((rb_buf[0] & 0x80) != 0);
payload_len = (rb_buf[1] & 0x3F);

// Not valid Advertise Payload.
if ((payload_len < 6) || (payload_len > 37)) {
return;
}
// Not valid Advertise Payload.
if ((payload_len < 6) || (payload_len > 37)) {
parseState = Parse_State_Begin;
return;
}

//--------------Start Payload Parsing--------------------------//
//--------------Start Payload Parsing--------------------------//

num_demod_byte = (payload_len + 3);
symbols_eaten += 8 * num_demod_byte * SAMPLE_PER_SYMBOL;
num_demod_byte = (payload_len + 3);
symbols_eaten += 8 * num_demod_byte * SAMPLE_PER_SYMBOL;

if (symbols_eaten > (int)dst_buffer.count) {
return;
parseState = Parse_State_PDU_Payload;
}

// sample_idx = symbols_eaten - (8 * num_demod_byte * SAMPLE_PER_SYMBOL);
if (parseState == Parse_State_PDU_Payload) {
if (symbols_eaten > (int)dst_buffer.count) {
return;
}

// sample_idx = symbols_eaten - (8 * num_demod_byte * SAMPLE_PER_SYMBOL);

for (i = 0; i < num_demod_byte; i++) {
rb_buf[packet_index] = 0;
for (i = 0; i < num_demod_byte; i++) {
rb_buf[packet_index] = 0;

for (j = 0; j < 8; j++) {
I0 = dst_buffer.p[sample_idx].real();
Q0 = dst_buffer.p[sample_idx].imag();
I1 = dst_buffer.p[sample_idx + 1].real();
Q1 = dst_buffer.p[sample_idx + 1].imag();
for (j = 0; j < 8; j++) {
I0 = dst_buffer.p[sample_idx].real();
Q0 = dst_buffer.p[sample_idx].imag();
I1 = dst_buffer.p[sample_idx + 1].real();
Q1 = dst_buffer.p[sample_idx + 1].imag();

bit_decision = (I0 * Q1 - I1 * Q0) > 0 ? 1 : 0;
rb_buf[packet_index] = rb_buf[packet_index] | (bit_decision << j);
bit_decision = (I0 * Q1 - I1 * Q0) > 0 ? 1 : 0;
rb_buf[packet_index] = rb_buf[packet_index] | (bit_decision << j);

sample_idx += SAMPLE_PER_SYMBOL;
sample_idx += SAMPLE_PER_SYMBOL;
}

packet_index++;
}

packet_index++;
}
parseState = Parse_State_Begin;

// demod_byte(num_demod_byte, rb_buf + 2);
// demod_byte(num_demod_byte, rb_buf + 2);

scramble_byte(rb_buf + 2, num_demod_byte, scramble_table[channel_number] + 2, rb_buf + 2);
scramble_byte(rb_buf + 2, num_demod_byte, scramble_table[channel_number] + 2, rb_buf + 2);

//--------------Start CRC Checking-----------------------------//
//--------------Start CRC Checking-----------------------------//

// Check CRC
bool crc_flag = crc_check(rb_buf, payload_len + 2, crc_init_internal);
// pkt_count++;
// Check CRC
bool crc_flag = crc_check(rb_buf, payload_len + 2, crc_init_internal);
// pkt_count++;

// This should be the flag that determines if the data should be sent to the application layer.
bool sendPacket = false;
// This should be the flag that determines if the data should be sent to the application layer.
bool sendPacket = false;

// Checking CRC and excluding Reserved PDU types.
if (pdu_type < RESERVED0 && !crc_flag) {
if (parse_adv_pdu_payload_byte(rb_buf + 2, payload_len, (ADV_PDU_TYPE)pdu_type, (void*)(&adv_pdu_payload)) == 0) {
sendPacket = true;
}
// Checking CRC and excluding Reserved PDU types.
if (pdu_type < RESERVED0 && !crc_flag) {
if (parse_adv_pdu_payload_byte(rb_buf + 2, payload_len, (ADV_PDU_TYPE)pdu_type, (void*)(&adv_pdu_payload)) == 0) {
sendPacket = true;
}

// TODO: Make this a packet builder function?
if (sendPacket) {
blePacketData.max_dB = max_dB;
// TODO: Make this a packet builder function?
if (sendPacket) {
blePacketData.max_dB = max_dB;

blePacketData.type = pdu_type;
blePacketData.size = payload_len;
blePacketData.type = pdu_type;
blePacketData.size = payload_len;

blePacketData.macAddress[0] = macAddress[0];
blePacketData.macAddress[1] = macAddress[1];
blePacketData.macAddress[2] = macAddress[2];
blePacketData.macAddress[3] = macAddress[3];
blePacketData.macAddress[4] = macAddress[4];
blePacketData.macAddress[5] = macAddress[5];
blePacketData.macAddress[0] = macAddress[0];
blePacketData.macAddress[1] = macAddress[1];
blePacketData.macAddress[2] = macAddress[2];
blePacketData.macAddress[3] = macAddress[3];
blePacketData.macAddress[4] = macAddress[4];
blePacketData.macAddress[5] = macAddress[5];

// Skip Header Byte and MAC Address
uint8_t startIndex = 8;
// Skip Header Byte and MAC Address
uint8_t startIndex = 8;

for (i = 0; i < payload_len - 6; i++) {
blePacketData.data[i] = rb_buf[startIndex++];
}
for (i = 0; i < payload_len - 6; i++) {
blePacketData.data[i] = rb_buf[startIndex++];
}

blePacketData.dataLen = i;
blePacketData.dataLen = i;

BLEPacketMessage data_message{&blePacketData};
BLEPacketMessage data_message{&blePacketData};

shared_memory.application_queue.push(data_message);
shared_memory.application_queue.push(data_message);
}
}
}
}
Expand Down
19 changes: 16 additions & 3 deletions firmware/baseband/proc_btlerx.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@ class BTLERxProcessor : public BasebandProcessor {
static constexpr uint32_t DEFAULT_ACCESS_ADDR{0x8E89BED6};
static constexpr int NUM_ACCESS_ADDR_BYTE{4};

enum Parse_State {
Parse_State_Begin = 0,
Parse_State_PDU_Header,
Parse_State_PDU_Payload
};

enum ADV_PDU_TYPE {
ADV_IND = 0,
ADV_DIRECT_IND = 1,
Expand Down Expand Up @@ -111,13 +117,13 @@ class BTLERxProcessor : public BasebandProcessor {
// void demod_byte(int num_byte, uint8_t *out_byte);
int parse_adv_pdu_payload_byte(uint8_t* payload_byte, int num_payload_byte, ADV_PDU_TYPE pdu_type, void* adv_pdu_payload);

std::array<complex16_t, 1024> dst{};
std::array<complex16_t, 512> dst{};
const buffer_c16_t dst_buffer{
dst.data(),
dst.size()};

static constexpr int RB_SIZE = 2048;
uint8_t rb_buf[2048];
static constexpr int RB_SIZE = 512;
uint8_t rb_buf[RB_SIZE];

dsp::decimate::FIRC8xR16x24FS4Decim4 decim_0{};

Expand All @@ -131,6 +137,13 @@ class BTLERxProcessor : public BasebandProcessor {
bool configured{false};
BlePacketData blePacketData{};

Parse_State parseState{};
uint16_t packet_index{0};
int sample_idx{0};
uint8_t bit_decision{0};
uint8_t payload_len{0};
uint8_t pdu_type{0};

/* NB: Threads should be the last members in the class definition. */
BasebandThread baseband_thread{baseband_fs, this, baseband::Direction::Receive};
RSSIThread rssi_thread{};
Expand Down