Skip to content

Commit b7c2d78

Browse files
lyusupovlyusupov
committed
[AG33] use of NavIC constellation for IN region
1 parent 7f02055 commit b7c2d78

5 files changed

Lines changed: 78 additions & 60 deletions

File tree

‎software/firmware/source/SkyView/WebHelper.cpp‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,8 @@ void handleSettings() {
136136

137137
/* SoC specific part 1 */
138138
if (SoC->id == SOC_ESP32 || SoC->id == SOC_ESP32S2 ||
139-
SoC->id == SOC_ESP32C3 || SoC->id == SOC_ESP32C6) {
139+
SoC->id == SOC_ESP32C3 || SoC->id == SOC_ESP32C5 ||
140+
SoC->id == SOC_ESP32C6) {
140141
snprintf_P ( offset, size,
141142
PSTR("\
142143
<tr>\
@@ -229,10 +230,10 @@ void handleSettings() {
229230
}
230231

231232
/* SoC specific part 4 */
232-
if (SoC->id == SOC_ESP32 || SoC->id == SOC_ESP32S3 ||
233-
SoC->id == SOC_ESP32C3 || SoC->id == SOC_ESP32C6 ||
234-
SoC->id == SOC_RP2040 || SoC->id == SOC_RP2350_RISC ||
235-
SoC->id == SOC_RP2350_ARM) {
233+
if (SoC->id == SOC_ESP32 || SoC->id == SOC_ESP32S3 ||
234+
SoC->id == SOC_ESP32C3 || SoC->id == SOC_ESP32C5 ||
235+
SoC->id == SOC_ESP32C6 || SoC->id == SOC_RP2040 ||
236+
SoC->id == SOC_RP2350_RISC || SoC->id == SOC_RP2350_ARM) {
236237
snprintf_P ( offset, size, PSTR("<option %s value='%d'>Bluetooth LE</option>"),
237238
(settings->connection == CON_BLUETOOTH_LE ? "selected" : ""), CON_BLUETOOTH_LE);
238239
len = strlen(offset);
@@ -289,10 +290,11 @@ void handleSettings() {
289290
size -= len;
290291

291292
/* SoC specific part 6 */
292-
if (SoC->id == SOC_ESP32 || SoC->id == SOC_ESP32S2 ||
293-
SoC->id == SOC_ESP32S3 || SoC->id == SOC_ESP32C3 ||
294-
SoC->id == SOC_ESP32C6 || SoC->id == SOC_RP2040 ||
295-
SoC->id == SOC_RP2350_RISC || SoC->id == SOC_RP2350_ARM) {
293+
if (SoC->id == SOC_ESP32 || SoC->id == SOC_ESP32S2 ||
294+
SoC->id == SOC_ESP32S3 || SoC->id == SOC_ESP32C3 ||
295+
SoC->id == SOC_ESP32C5 || SoC->id == SOC_ESP32C6 ||
296+
SoC->id == SOC_RP2040 || SoC->id == SOC_RP2350_RISC ||
297+
SoC->id == SOC_RP2350_ARM) {
296298
snprintf_P ( offset, size,
297299
PSTR("\
298300
<option %s value='%d'>115200</option>\
@@ -447,7 +449,8 @@ void handleSettings() {
447449
#if !defined(EXCLUDE_AUDIO)
448450
/* SoC specific part 7 */
449451
if (SoC->id == SOC_ESP32 || SoC->id == SOC_ESP32S2 ||
450-
SoC->id == SOC_ESP32C3 || SoC->id == SOC_ESP32C6) {
452+
SoC->id == SOC_ESP32C3 || SoC->id == SOC_ESP32C5 ||
453+
SoC->id == SOC_ESP32C6) {
451454
snprintf_P ( offset, size,
452455
PSTR("\
453456
<tr>\

‎software/firmware/source/SkyWatch/WebHelper.cpp‎

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -288,10 +288,11 @@ void handleSettings_master() {
288288
size -= len;
289289

290290
/* SoC specific part 1 */
291-
if (SoC->id == SOC_ESP32 || SoC->id == SOC_ESP32S2 ||
292-
SoC->id == SOC_ESP32S3 || SoC->id == SOC_ESP32C3 ||
293-
SoC->id == SOC_ESP32C6 || SoC->id == SOC_RP2040 ||
294-
SoC->id == SOC_RP2350_RISC || SoC->id == SOC_RP2350_ARM) {
291+
if (SoC->id == SOC_ESP32 || SoC->id == SOC_ESP32S2 ||
292+
SoC->id == SOC_ESP32S3 || SoC->id == SOC_ESP32C3 ||
293+
SoC->id == SOC_ESP32C5 || SoC->id == SOC_ESP32C6 ||
294+
SoC->id == SOC_RP2040 || SoC->id == SOC_RP2350_RISC ||
295+
SoC->id == SOC_RP2350_ARM) {
295296
snprintf_P ( offset, size,
296297
PSTR("\
297298
<option %s value='%d'>115200</option>\
@@ -356,7 +357,7 @@ void handleSettings_master() {
356357
size -= len;
357358

358359
} else if (SoC->id == SOC_ESP32S3 || SoC->id == SOC_ESP32C3 ||
359-
SoC->id == SOC_ESP32C6) {
360+
SoC->id == SOC_ESP32C5 || SoC->id == SOC_ESP32C6) {
360361
snprintf_P ( offset, size,
361362
PSTR("\
362363
<tr>\
@@ -401,10 +402,10 @@ void handleSettings_master() {
401402
size -= len;
402403

403404
/* SoC specific part 2 */
404-
if (SoC->id == SOC_ESP32 || SoC->id == SOC_ESP32S3 ||
405-
SoC->id == SOC_ESP32C3 || SoC->id == SOC_ESP32C6 ||
406-
SoC->id == SOC_RP2040 || SoC->id == SOC_RP2350_RISC ||
407-
SoC->id == SOC_RP2350_ARM) {
405+
if (SoC->id == SOC_ESP32 || SoC->id == SOC_ESP32S3 ||
406+
SoC->id == SOC_ESP32C3 || SoC->id == SOC_ESP32C5 ||
407+
SoC->id == SOC_ESP32C6 || SoC->id == SOC_RP2040 ||
408+
SoC->id == SOC_RP2350_RISC || SoC->id == SOC_RP2350_ARM) {
408409
snprintf_P ( offset, size,
409410
PSTR("\
410411
<option %s value='%d'>TCP</option>\
@@ -450,10 +451,10 @@ void handleSettings_master() {
450451
size -= len;
451452

452453
/* SoC specific part 3 */
453-
if (SoC->id == SOC_ESP32 || SoC->id == SOC_ESP32S3 ||
454-
SoC->id == SOC_ESP32C3 || SoC->id == SOC_ESP32C6 ||
455-
SoC->id == SOC_RP2040 || SoC->id == SOC_RP2350_RISC ||
456-
SoC->id == SOC_RP2350_ARM) {
454+
if (SoC->id == SOC_ESP32 || SoC->id == SOC_ESP32S3 ||
455+
SoC->id == SOC_ESP32C3 || SoC->id == SOC_ESP32C5 ||
456+
SoC->id == SOC_ESP32C6 || SoC->id == SOC_RP2040 ||
457+
SoC->id == SOC_RP2350_RISC || SoC->id == SOC_RP2350_ARM) {
457458
snprintf_P ( offset, size,
458459
PSTR("\
459460
<option %s value='%d'>Bluetooth</option>"),
@@ -486,10 +487,10 @@ void handleSettings_master() {
486487
size -= len;
487488

488489
/* SoC specific part 4 */
489-
if (SoC->id == SOC_ESP32 || SoC->id == SOC_ESP32S3 ||
490-
SoC->id == SOC_ESP32C3 || SoC->id == SOC_ESP32C6 ||
491-
SoC->id == SOC_RP2040 || SoC->id == SOC_RP2350_RISC ||
492-
SoC->id == SOC_RP2350_ARM) {
490+
if (SoC->id == SOC_ESP32 || SoC->id == SOC_ESP32S3 ||
491+
SoC->id == SOC_ESP32C3 || SoC->id == SOC_ESP32C5 ||
492+
SoC->id == SOC_ESP32C6 || SoC->id == SOC_RP2040 ||
493+
SoC->id == SOC_RP2350_RISC || SoC->id == SOC_RP2350_ARM) {
493494
snprintf_P ( offset, size,
494495
PSTR("\
495496
<option %s value='%d'>Bluetooth</option>"),
@@ -1104,7 +1105,8 @@ void handleSettings_slave() {
11041105
#if 0
11051106
/* SoC specific part 3 */
11061107
if (SoC->id == SOC_ESP32 || SoC->id == SOC_ESP32S3 ||
1107-
SoC->id == SOC_ESP32C3 || SoC->id == SOC_ESP32C6) {
1108+
SoC->id == SOC_ESP32C3 || SoC->id == SOC_ESP32C5 ||
1109+
SoC->id == SOC_ESP32C6) {
11081110
snprintf_P ( offset, size,
11091111
PSTR("\
11101112
<option %s value='%d'>Bluetooth</option>"),
@@ -1140,7 +1142,8 @@ void handleSettings_slave() {
11401142
#if 0
11411143
/* SoC specific part 4 */
11421144
if (SoC->id == SOC_ESP32 || SoC->id == SOC_ESP32S3 ||
1143-
SoC->id == SOC_ESP32C3 || SoC->id == SOC_ESP32C6) {
1145+
SoC->id == SOC_ESP32C3 || SoC->id == SOC_ESP32C5 ||
1146+
SoC->id == SOC_ESP32C6) {
11441147
snprintf_P ( offset, size,
11451148
PSTR("\
11461149
<option %s value='%d'>Bluetooth</option>"),

‎software/firmware/source/SoftRF/src/driver/GNSS.cpp‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1243,8 +1243,13 @@ static bool ag33_setup()
12431243
/* NMEA 0183 V4.10 and SBAS DGPS are enabled by default */
12441244
#endif
12451245

1246-
/* GPS + GLONASS + Galileo + BeiDou + QZSS */
1247-
Serial_GNSS_Out.write("$PAIR066,1,1,1,1,1,0*3B\r\n"); delay(250);
1246+
if (settings->band == RF_BAND_IN) {
1247+
/* GPS + GLONASS + Galileo + NAVIC + QZSS */
1248+
Serial_GNSS_Out.write("$PAIR066,1,1,1,0,1,1*3B\r\n"); delay(250);
1249+
} else {
1250+
/* GPS + GLONASS + Galileo + BeiDou + QZSS */
1251+
Serial_GNSS_Out.write("$PAIR066,1,1,1,1,1,0*3B\r\n"); delay(250);
1252+
}
12481253

12491254
Serial_GNSS_Out.write("$PAIR062,0,1*3F\r\n"); /* GGA 1s */ delay(250);
12501255
Serial_GNSS_Out.write("$PAIR062,4,1*3B\r\n"); /* RMC 1s */ delay(250);

‎software/firmware/source/SoftRF/src/platform/ESP32.h‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -534,6 +534,13 @@ extern const USB_Device_List_t supported_USB_devices[];
534534
#if defined(CONFIG_IDF_TARGET_ESP32C5)
535535
//#define EXCLUDE_BLUETOOTH
536536
//#define USE_NIMBLE
537+
#undef USE_BASICMAC
538+
#undef USE_RADIOLIB
539+
#define EXCLUDE_LR11XX
540+
#undef EXCLUDE_SOFTRF_HEARTBEAT
541+
#undef EXCLUDE_EGM96
542+
#undef EXCLUDE_TEST_MODE
543+
#define USE_NMEALIB
537544
#define USE_SOFTSPI
538545
#elif defined(CONFIG_IDF_TARGET_ESP32C6)
539546
#define USE_NIMBLE

‎software/firmware/source/SoftRF/src/ui/Web.cpp‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -545,8 +545,8 @@ char *Settings_content() {
545545
size -= len;
546546

547547
} else if (SoC->id == SOC_ESP32S3 || SoC->id == SOC_ESP32C2 ||
548-
SoC->id == SOC_ESP32C3 || SoC->id == SOC_ESP32C6 ||
549-
SoC->id == SOC_RA4M1) {
548+
SoC->id == SOC_ESP32C3 || SoC->id == SOC_ESP32C5 ||
549+
SoC->id == SOC_ESP32C6 || SoC->id == SOC_RA4M1) {
550550

551551
snprintf_P ( offset, size,
552552
PSTR("\
@@ -623,11 +623,11 @@ char *Settings_content() {
623623
size -= len;
624624

625625
/* SoC specific part 2 */
626-
if (SoC->id == SOC_ESP32 || SoC->id == SOC_ESP32S3 ||
627-
SoC->id == SOC_ESP32C2 || SoC->id == SOC_ESP32C3 ||
628-
SoC->id == SOC_ESP32C6 || SoC->id == SOC_RP2040 ||
629-
SoC->id == SOC_RP2350_ARM || SoC->id == SOC_RP2350_RISC ||
630-
SoC->id == SOC_RA4M1) {
626+
if (SoC->id == SOC_ESP32 || SoC->id == SOC_ESP32S3 ||
627+
SoC->id == SOC_ESP32C2 || SoC->id == SOC_ESP32C3 ||
628+
SoC->id == SOC_ESP32C5 || SoC->id == SOC_ESP32C6 ||
629+
SoC->id == SOC_RP2040 || SoC->id == SOC_RP2350_ARM ||
630+
SoC->id == SOC_RP2350_RISC || SoC->id == SOC_RA4M1) {
631631
snprintf_P ( offset, size,
632632
PSTR(
633633
#if defined(NMEA_TCP_SERVICE)
@@ -643,10 +643,10 @@ char *Settings_content() {
643643
offset += len;
644644
size -= len;
645645
}
646-
if (SoC->id == SOC_ESP32S2 || SoC->id == SOC_ESP32S3 ||
647-
SoC->id == SOC_ESP32C3 || SoC->id == SOC_ESP32C6 ||
648-
SoC->id == SOC_RP2040 || SoC->id == SOC_RP2350_ARM ||
649-
SoC->id == SOC_RP2350_RISC) {
646+
if (SoC->id == SOC_ESP32S2 || SoC->id == SOC_ESP32S3 ||
647+
SoC->id == SOC_ESP32C3 || SoC->id == SOC_ESP32C5 ||
648+
SoC->id == SOC_ESP32C6 || SoC->id == SOC_RP2040 ||
649+
SoC->id == SOC_RP2350_ARM || SoC->id == SOC_RP2350_RISC) {
650650
snprintf_P ( offset, size,
651651
PSTR("<option %s value='%d'>USB</option>"),
652652
(settings->nmea_out == NMEA_USB ? "selected" : ""), NMEA_USB);
@@ -679,11 +679,11 @@ char *Settings_content() {
679679

680680
#if !defined(EXCLUDE_BLUETOOTH)
681681
/* SoC specific part 3 */
682-
if (SoC->id == SOC_ESP32 || SoC->id == SOC_ESP32S3 ||
683-
SoC->id == SOC_ESP32C2 || SoC->id == SOC_ESP32C3 ||
684-
SoC->id == SOC_ESP32C6 || SoC->id == SOC_RP2040 ||
685-
SoC->id == SOC_RP2350_ARM || SoC->id == SOC_RP2350_RISC ||
686-
SoC->id == SOC_RA4M1) {
682+
if (SoC->id == SOC_ESP32 || SoC->id == SOC_ESP32S3 ||
683+
SoC->id == SOC_ESP32C2 || SoC->id == SOC_ESP32C3 ||
684+
SoC->id == SOC_ESP32C5 || SoC->id == SOC_ESP32C6 ||
685+
SoC->id == SOC_RP2040 || SoC->id == SOC_RP2350_ARM ||
686+
SoC->id == SOC_RP2350_RISC || SoC->id == SOC_RA4M1) {
687687
snprintf_P ( offset, size,
688688
PSTR("<option %s value='%d'>Bluetooth</option>"),
689689
(settings->gdl90 == GDL90_BLUETOOTH ? "selected" : ""), GDL90_BLUETOOTH);
@@ -694,10 +694,10 @@ char *Settings_content() {
694694
}
695695
#endif /* EXCLUDE_BLUETOOTH */
696696

697-
if (SoC->id == SOC_ESP32S2 || SoC->id == SOC_ESP32S3 ||
698-
SoC->id == SOC_ESP32C3 || SoC->id == SOC_ESP32C6 ||
699-
SoC->id == SOC_RP2040 || SoC->id == SOC_RP2350_ARM ||
700-
SoC->id == SOC_RP2350_RISC) {
697+
if (SoC->id == SOC_ESP32S2 || SoC->id == SOC_ESP32S3 ||
698+
SoC->id == SOC_ESP32C3 || SoC->id == SOC_ESP32C5 ||
699+
SoC->id == SOC_ESP32C6 || SoC->id == SOC_RP2040 ||
700+
SoC->id == SOC_RP2350_ARM || SoC->id == SOC_RP2350_RISC) {
701701
snprintf_P ( offset, size,
702702
PSTR("<option %s value='%d'>USB</option>"),
703703
(settings->gdl90 == GDL90_USB ? "selected" : ""), GDL90_USB);
@@ -728,11 +728,11 @@ char *Settings_content() {
728728

729729
#if !defined(EXCLUDE_BLUETOOTH)
730730
/* SoC specific part 4 */
731-
if (SoC->id == SOC_ESP32 || SoC->id == SOC_ESP32S3 ||
732-
SoC->id == SOC_ESP32C2 || SoC->id == SOC_ESP32C3 ||
733-
SoC->id == SOC_ESP32C6 || SoC->id == SOC_RP2040 ||
734-
SoC->id == SOC_RP2350_ARM || SoC->id == SOC_RP2350_RISC ||
735-
SoC->id == SOC_RA4M1) {
731+
if (SoC->id == SOC_ESP32 || SoC->id == SOC_ESP32S3 ||
732+
SoC->id == SOC_ESP32C2 || SoC->id == SOC_ESP32C3 ||
733+
SoC->id == SOC_ESP32C5 || SoC->id == SOC_ESP32C6 ||
734+
SoC->id == SOC_RP2040 || SoC->id == SOC_RP2350_ARM ||
735+
SoC->id == SOC_RP2350_RISC || SoC->id == SOC_RA4M1) {
736736
snprintf_P ( offset, size,
737737
PSTR("<option %s value='%d'>Bluetooth</option>"),
738738
(settings->d1090 == D1090_BLUETOOTH ? "selected" : ""), D1090_BLUETOOTH);
@@ -743,10 +743,10 @@ char *Settings_content() {
743743
}
744744
#endif /* EXCLUDE_BLUETOOTH */
745745

746-
if (SoC->id == SOC_ESP32S2 || SoC->id == SOC_ESP32S3 ||
747-
SoC->id == SOC_ESP32C3 || SoC->id == SOC_ESP32C6 ||
748-
SoC->id == SOC_RP2040 || SoC->id == SOC_RP2350_ARM ||
749-
SoC->id == SOC_RP2350_RISC) {
746+
if (SoC->id == SOC_ESP32S2 || SoC->id == SOC_ESP32S3 ||
747+
SoC->id == SOC_ESP32C3 || SoC->id == SOC_ESP32C5 ||
748+
SoC->id == SOC_ESP32C6 || SoC->id == SOC_RP2040 ||
749+
SoC->id == SOC_RP2350_ARM || SoC->id == SOC_RP2350_RISC) {
750750
snprintf_P ( offset, size,
751751
PSTR("<option %s value='%d'>USB</option>"),
752752
(settings->d1090 == D1090_USB ? "selected" : ""), D1090_USB);

0 commit comments

Comments
 (0)