Skip to content

Commit 0e13140

Browse files
committed
[LR2021] an update of reference bandwidth values
1 parent eaa4cba commit 0e13140

6 files changed

Lines changed: 26 additions & 15 deletions

File tree

software/firmware/source/SkyView/Platform_ESP32.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,7 @@ const uint16_t ESP32SX_Device_Version = SKYVIEW_USB_FW_VERSION;
385385
#include <ExtensionIOXL9555.hpp>
386386

387387
ExtensionIOXL9555 *xl9535 = nullptr;
388+
bool ESP32_has_gpio_extension = false;
388389

389390
#define EXAMPLE_SAMPLE_RATE 11025
390391
#define EXAMPLE_VOICE_VOLUME 75 // 0 - 100

software/firmware/source/SkyView/Platform_ESP32.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@
4242

4343
#define GT911_ADDRESS (0x5D)
4444
#define GT911_ADDRESS_ALT (0x14)
45+
#define XL9535_ADDRESS (0x20) /* A0 = A1 = A2 = LOW */
46+
#define ICM20948_ADDRESS (0x68)
47+
#define AW86224_ADDRESS (0x58)
48+
#define SGM38121_ADDRESS (0x28)
4549
#define HI8561_ADDRESS (0x68)
4650
#define GT9895_ADDRESS (0x5D) /* same as GT911,TBD */
4751

software/firmware/source/SoftRF/src/driver/radio/radiolib.cpp

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5073,14 +5073,14 @@ static void lr20xx_setup()
50735073
switch (RF_FreqPlan.Bandwidth)
50745074
{
50755075
case RF_RX_BANDWIDTH_SS_62KHZ:
5076-
bw = high ? 203.125 : 125.0; /* BW_125 */
5076+
bw = high ? 203 : 125.0; /* BW_125 */
50775077
break;
50785078
case RF_RX_BANDWIDTH_SS_250KHZ:
5079-
bw = high ? 812.5 : 500.0; /* BW_500 */
5079+
bw = high ? 812 : 500.0; /* BW_500 */
50805080
break;
50815081
case RF_RX_BANDWIDTH_SS_125KHZ:
50825082
default:
5083-
bw = high ? 406.25 : 250.0; /* BW_250 */
5083+
bw = high ? 406 : 250.0; /* BW_250 */
50845084
break;
50855085
}
50865086

@@ -5121,9 +5121,9 @@ static void lr20xx_setup()
51215121

51225122
switch (rl_protocol->bitrate)
51235123
{
5124-
case RF_BITRATE_1042KBPS:
5124+
case RF_BITRATE_2000KBPS:
51255125
default:
5126-
br = 1042.0;
5126+
br = 2000.0;
51275127
break;
51285128
}
51295129
state = radio_g4->setBitRate(br);
@@ -5143,7 +5143,7 @@ static void lr20xx_setup()
51435143
{
51445144
case RF_RX_BANDWIDTH_SS_1567KHZ:
51455145
default:
5146-
bw = 1567.0;
5146+
bw = 3076.0;
51475147
break;
51485148
}
51495149

@@ -5240,25 +5240,29 @@ static void lr20xx_setup()
52405240
switch (rl_protocol->bandwidth)
52415241
{
52425242
case RF_RX_BANDWIDTH_SS_50KHZ:
5243-
bw = 117.3;
5243+
bw = 119.0;
52445244
break;
52455245
case RF_RX_BANDWIDTH_SS_62KHZ:
5246-
bw = 156.2;
5246+
bw = 153.8;
52475247
break;
52485248
case RF_RX_BANDWIDTH_SS_100KHZ:
5249-
bw = 234.3;
5249+
bw = 238.1;
52505250
break;
52515251
case RF_RX_BANDWIDTH_SS_166KHZ:
5252-
bw = 312.0;
5252+
bw = 370.4;
52535253
break;
52545254
case RF_RX_BANDWIDTH_SS_200KHZ:
5255-
case RF_RX_BANDWIDTH_SS_250KHZ: /* TBD */
5256-
case RF_RX_BANDWIDTH_SS_1567KHZ: /* TBD */
5257-
bw = 467.0;
5255+
bw = 476.2;
5256+
break;
5257+
case RF_RX_BANDWIDTH_SS_250KHZ:
5258+
bw = 555.6;
5259+
break;
5260+
case RF_RX_BANDWIDTH_SS_1567KHZ:
5261+
bw = 3076.0;
52585262
break;
52595263
case RF_RX_BANDWIDTH_SS_125KHZ:
52605264
default:
5261-
bw = 234.3;
5265+
bw = 307.7;
52625266
break;
52635267
}
52645268

software/firmware/source/SoftRF/src/protocol/radio/ES1090.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ const rf_proto_desc_t es1090_proto_desc = {
4141
.crc_type = ES1090_CRC_TYPE,
4242
.crc_size = ES1090_CRC_SIZE,
4343

44-
.bitrate = RF_BITRATE_1042KBPS,
44+
.bitrate = RF_BITRATE_2000KBPS,
4545
.deviation = RF_FREQUENCY_DEVIATION_NONE,
4646
.whitening = RF_WHITENING_MANCHESTER,
4747
.bandwidth = RF_RX_BANDWIDTH_SS_1567KHZ,

software/firmware/source/libraries/arduino-basicmac/src/protocol.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ enum
6666
RF_BITRATE_100KBPS,
6767
RF_BITRATE_38400,
6868
RF_BITRATE_1042KBPS,
69+
RF_BITRATE_2000KBPS,
6970
};
7071

7172
enum

software/firmware/source/libraries/arduino-lmic/src/protocol.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ enum
6666
RF_BITRATE_100KBPS,
6767
RF_BITRATE_38400,
6868
RF_BITRATE_1042KBPS,
69+
RF_BITRATE_2000KBPS,
6970
};
7071

7172
enum

0 commit comments

Comments
 (0)