Skip to content

Commit

Permalink
more accurate RF Rx packets counter
Browse files Browse the repository at this point in the history
  • Loading branch information
@lyusupov
lyusupov committed May 10, 2024
1 parent 0b32a85 commit 6b1a0bb
Show file tree
Hide file tree
Showing 4 changed files with 141 additions and 130 deletions.
6 changes: 3 additions & 3 deletions software/app/interface/SoftRF.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,22 +141,22 @@ enum
SOFTRF_PROTOCOL_ADSB_UAT, /* ADS-B UAT */
SOFTRF_PROTOCOL_FANET, /* Skytraxx */
SOFTRF_PROTOCOL_APRS, /* Ham's 'classic' APRS and 'APRS over LoRa' */
SOFTRF_PROTOCOL_ADSL_860, /* ADS-L.4.SRD-860 */
/* Volunteer contributors are welcome */
SOFTRF_PROTOCOL_EID, /* UAS eID */
SOFTRF_PROTOCOL_GOTENNA, /* goTenna Mesh */
SOFTRF_PROTOCOL_ADSL_860, /* ADS-L.4.SRD-860 */
};

enum
{
SOFTRF_BAND_AUTO = 0,
SOFTRF_BAND_AUTO = 0, /* Deprecated - treated as EU */
SOFTRF_BAND_EU = 1, /* 868.4 MHz band */
SOFTRF_BAND_US = 2, /* 915 MHz band */
SOFTRF_BAND_AU = 3, /* 921 MHz band */
SOFTRF_BAND_NZ = 4, /* 869.250 MHz band */
SOFTRF_BAND_RU = 5, /* 868.8 MHz band */
SOFTRF_BAND_CN = 6, /* 470 MHz band */
SOFTRF_BAND_UK = 7, /* 869.52 MHz band */
SOFTRF_BAND_UK = 7, /* 869.52 MHz band. Deprecated - treated as EU */
SOFTRF_BAND_IN = 8, /* 866.0 MHz band */
SOFTRF_BAND_IL = 9, /* 916.2 MHz band */
SOFTRF_BAND_KR = 10 /* 920.9 MHz band */
Expand Down
2 changes: 2 additions & 0 deletions software/firmware/source/SoftRF/src/TrafficHelper.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,8 @@ void ParseData()
if (settings->nmea_p) {
StdOut.println(F("$PSRFE,RF loopback is detected on Rx"));
}

rx_packets_counter--;
return;
}

Expand Down
259 changes: 134 additions & 125 deletions software/firmware/source/SoftRF/src/driver/radio/radiolib.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -478,156 +478,165 @@ static bool lr112x_receive()

if (lr112x_receive_complete == true) {

size_t size = 0;
uint8_t offset;

u1_t crc8, pkt_crc8;
u2_t crc16, pkt_crc16;

rxPacket.len = radio->getPacketLength();
state = radio->readData(rxPacket.payload, rxPacket.len);

RadioLib_DataPacket *rxPacket_ptr = &rxPacket;
if (rxPacket.len > 0) {
state = radio->readData(rxPacket.payload, rxPacket.len);
lr112x_receive_active = false;

switch (rl_protocol->crc_type)
{
case RF_CHECKSUM_TYPE_GALLAGER:
case RF_CHECKSUM_TYPE_CRC_MODES:
case RF_CHECKSUM_TYPE_NONE:
/* crc16 left not initialized */
break;
case RF_CHECKSUM_TYPE_CRC8_107:
crc8 = 0x71; /* seed value */
break;
case RF_CHECKSUM_TYPE_CCITT_0000:
crc16 = 0x0000; /* seed value */
break;
case RF_CHECKSUM_TYPE_CCITT_FFFF:
default:
crc16 = 0xffff; /* seed value */
break;
}
if (state == RADIOLIB_ERR_NONE) {
size_t size = 0;
uint8_t offset;

switch (rl_protocol->type)
{
case RF_PROTOCOL_LEGACY:
/* take in account NRF905/FLARM "address" bytes */
crc16 = update_crc_ccitt(crc16, 0x31);
crc16 = update_crc_ccitt(crc16, 0xFA);
crc16 = update_crc_ccitt(crc16, 0xB6);
break;
case RF_PROTOCOL_P3I:
case RF_PROTOCOL_OGNTP:
case RF_PROTOCOL_ADSL_860:
default:
break;
}
u1_t crc8, pkt_crc8;
u2_t crc16, pkt_crc16;

uint8_t i;
RadioLib_DataPacket *rxPacket_ptr = &rxPacket;

switch (rl_protocol->type)
{
case RF_PROTOCOL_P3I:
offset = rl_protocol->payload_offset;
for (i = 0; i < rl_protocol->payload_size; i++)
{
update_crc8(&crc8, (u1_t)(rxPacket_ptr->payload[i + offset]));
if (i < sizeof(RxBuffer)) {
RxBuffer[i] = rxPacket_ptr->payload[i + offset] ^
pgm_read_byte(&whitening_pattern[i]);
switch (rl_protocol->crc_type)
{
case RF_CHECKSUM_TYPE_GALLAGER:
case RF_CHECKSUM_TYPE_CRC_MODES:
case RF_CHECKSUM_TYPE_NONE:
/* crc16 left not initialized */
break;
case RF_CHECKSUM_TYPE_CRC8_107:
crc8 = 0x71; /* seed value */
break;
case RF_CHECKSUM_TYPE_CCITT_0000:
crc16 = 0x0000; /* seed value */
break;
case RF_CHECKSUM_TYPE_CCITT_FFFF:
default:
crc16 = 0xffff; /* seed value */
break;
}
}

pkt_crc8 = rxPacket_ptr->payload[i + offset];

if (crc8 == pkt_crc8) {
success = true;
}
break;
case RF_PROTOCOL_FANET:
offset = rl_protocol->payload_offset;
size = rl_protocol->payload_size + rl_protocol->crc_size;
for (i = 0; i < size; i++)
{
if (i < sizeof(RxBuffer)) {
RxBuffer[i] = rxPacket_ptr->payload[i + offset];
switch (rl_protocol->type)
{
case RF_PROTOCOL_LEGACY:
/* take in account NRF905/FLARM "address" bytes */
crc16 = update_crc_ccitt(crc16, 0x31);
crc16 = update_crc_ccitt(crc16, 0xFA);
crc16 = update_crc_ccitt(crc16, 0xB6);
break;
case RF_PROTOCOL_P3I:
case RF_PROTOCOL_OGNTP:
case RF_PROTOCOL_ADSL_860:
default:
break;
}
}
success = true;
break;
case RF_PROTOCOL_OGNTP:
case RF_PROTOCOL_ADSL_860:
case RF_PROTOCOL_LEGACY:
default:
offset = 0;
size = rl_protocol->payload_offset +
rl_protocol->payload_size +
rl_protocol->payload_size +
rl_protocol->crc_size +
rl_protocol->crc_size;
if (rxPacket_ptr->len >= (size + offset)) {
uint8_t val1, val2;
for (i = 0; i < size; i++) {
val1 = pgm_read_byte(&ManchesterDecode[rxPacket_ptr->payload[i + offset]]);
i++;
val2 = pgm_read_byte(&ManchesterDecode[rxPacket_ptr->payload[i + offset]]);
if ((i>>1) < sizeof(RxBuffer)) {
RxBuffer[i>>1] = ((val1 & 0x0F) << 4) | (val2 & 0x0F);

if (i < size - (rl_protocol->crc_size + rl_protocol->crc_size)) {
switch (rl_protocol->crc_type)
{
case RF_CHECKSUM_TYPE_GALLAGER:
case RF_CHECKSUM_TYPE_CRC_MODES:
case RF_CHECKSUM_TYPE_NONE:
break;
case RF_CHECKSUM_TYPE_CCITT_FFFF:
case RF_CHECKSUM_TYPE_CCITT_0000:
default:
crc16 = update_crc_ccitt(crc16, (u1_t)(RxBuffer[i>>1]));
break;
}

uint8_t i;

switch (rl_protocol->type)
{
case RF_PROTOCOL_P3I:
offset = rl_protocol->payload_offset;
for (i = 0; i < rl_protocol->payload_size; i++)
{
update_crc8(&crc8, (u1_t)(rxPacket_ptr->payload[i + offset]));
if (i < sizeof(RxBuffer)) {
RxBuffer[i] = rxPacket_ptr->payload[i + offset] ^
pgm_read_byte(&whitening_pattern[i]);
}
}
}

size = size>>1;
pkt_crc8 = rxPacket_ptr->payload[i + offset];

switch (rl_protocol->crc_type)
{
case RF_CHECKSUM_TYPE_GALLAGER:
if (LDPC_Check((uint8_t *) &RxBuffer[0]) == 0) {
if (crc8 == pkt_crc8) {
success = true;
}
break;
case RF_CHECKSUM_TYPE_CRC_MODES:
#if defined(ENABLE_ADSL)
if (ADSL_Packet::checkPI((uint8_t *) &RxBuffer[0], size) == 0) {
success = true;
case RF_PROTOCOL_FANET:
offset = rl_protocol->payload_offset;
size = rl_protocol->payload_size + rl_protocol->crc_size;
for (i = 0; i < size; i++)
{
if (i < sizeof(RxBuffer)) {
RxBuffer[i] = rxPacket_ptr->payload[i + offset];
}
}
#endif /* ENABLE_ADSL */
success = true;
break;
case RF_CHECKSUM_TYPE_CCITT_FFFF:
case RF_CHECKSUM_TYPE_CCITT_0000:
offset = rl_protocol->payload_offset + rl_protocol->payload_size;
if (offset + 1 < sizeof(RxBuffer)) {
pkt_crc16 = (RxBuffer[offset] << 8 | RxBuffer[offset+1]);
if (crc16 == pkt_crc16) {
case RF_PROTOCOL_OGNTP:
case RF_PROTOCOL_ADSL_860:
case RF_PROTOCOL_LEGACY:
default:
offset = 0;
size = rl_protocol->payload_offset +
rl_protocol->payload_size +
rl_protocol->payload_size +
rl_protocol->crc_size +
rl_protocol->crc_size;
if (rxPacket_ptr->len >= (size + offset)) {
uint8_t val1, val2;
for (i = 0; i < size; i++) {
val1 = pgm_read_byte(&ManchesterDecode[rxPacket_ptr->payload[i + offset]]);
i++;
val2 = pgm_read_byte(&ManchesterDecode[rxPacket_ptr->payload[i + offset]]);
if ((i>>1) < sizeof(RxBuffer)) {
RxBuffer[i>>1] = ((val1 & 0x0F) << 4) | (val2 & 0x0F);

if (i < size - (rl_protocol->crc_size + rl_protocol->crc_size)) {
switch (rl_protocol->crc_type)
{
case RF_CHECKSUM_TYPE_GALLAGER:
case RF_CHECKSUM_TYPE_CRC_MODES:
case RF_CHECKSUM_TYPE_NONE:
break;
case RF_CHECKSUM_TYPE_CCITT_FFFF:
case RF_CHECKSUM_TYPE_CCITT_0000:
default:
crc16 = update_crc_ccitt(crc16, (u1_t)(RxBuffer[i>>1]));
break;
}
}
}
}

size = size>>1;

success = true;
switch (rl_protocol->crc_type)
{
case RF_CHECKSUM_TYPE_GALLAGER:
if (LDPC_Check((uint8_t *) &RxBuffer[0]) == 0) {
success = true;
}
break;
case RF_CHECKSUM_TYPE_CRC_MODES:
#if defined(ENABLE_ADSL)
if (ADSL_Packet::checkPI((uint8_t *) &RxBuffer[0], size) == 0) {
success = true;
}
#endif /* ENABLE_ADSL */
break;
case RF_CHECKSUM_TYPE_CCITT_FFFF:
case RF_CHECKSUM_TYPE_CCITT_0000:
offset = rl_protocol->payload_offset + rl_protocol->payload_size;
if (offset + 1 < sizeof(RxBuffer)) {
pkt_crc16 = (RxBuffer[offset] << 8 | RxBuffer[offset+1]);
if (crc16 == pkt_crc16) {

success = true;
}
}
break;
default:
break;
}
}
break;
default:
break;
}

if (success) {
RF_last_rssi = radio->getRSSI();
rx_packets_counter++;
}
}
break;
}

if (success) {
// RF_last_rssi = rxPacket_ptr->rssi;
rx_packets_counter++;
memset(rxPacket.payload, 0, sizeof(rxPacket.payload));
rxPacket.len = 0;
}

lr112x_receive_complete = false;
Expand Down
4 changes: 2 additions & 2 deletions software/firmware/source/libraries/OGN/freqplan.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ enum

class FreqPlan
{ public:
uint8_t Protocol; // 0=Legacy, 1=OGNTP, 2=P3I, 3=1090ES, 4=UAT, 5=FANET
uint8_t Plan; // 1=Europe, 2=USA/Canada, 3=Australia/Chile, 4=New Zealand
uint8_t Protocol; // 0=Legacy, 1=OGNTP, 2=P3I, 3=ADS-B (1090ES), 4=UAT, 5=FANET, 6=APRS, 7=ADS-L (SRD860)
uint8_t Plan; // 1=Europe, 2=USA/Canada, 3=Australia/Chile, 4=New Zealand, ...
uint8_t Channels; // number of channels
uint32_t BaseFreq; // [Hz] base channel (#0) frequency
uint32_t ChanSepar; // [Hz] channel spacing
Expand Down

0 comments on commit 6b1a0bb

Please sign in to comment.