Skip to content

Commit f39a26c

Browse files
authored
Merge pull request #258 from sparkfun/Reinstate_present.um980
Replace gnssPlatform with present.gnss_zedf9p etc.
2 parents f1ec1b3 + 0b3fe63 commit f39a26c

File tree

15 files changed

+192
-207
lines changed

15 files changed

+192
-207
lines changed

Firmware/RTK_Everywhere/Begin.ino

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ void beginBoard()
131131
else if (productVariant == RTK_TORCH)
132132
{
133133
present.psram_2mb = true;
134+
present.gnss_um980 = true;
134135
present.radio_lora = true;
135136
present.fuelgauge_bq40z50 = true;
136137
present.charger_mp2762a = true;
@@ -224,6 +225,7 @@ void beginBoard()
224225
#ifdef EVKv1point1
225226
// Pin defs etc. for EVK v1.1
226227
present.psram_4mb = true;
228+
present.gnss_zedf9p = true;
227229
present.lband_neo = true;
228230
present.cellular_lara = true;
229231
present.ethernet_ws5500 = true;
@@ -291,6 +293,7 @@ void beginBoard()
291293
#else
292294
// EVK v1.0 - TODO: delete this once all five EVK v1.0's have been upgraded / replaced
293295
present.psram_4mb = true;
296+
present.gnss_zedf9p = true;
294297
present.lband_neo = true;
295298
present.cellular_lara = true;
296299
present.ethernet_ws5500 = true;
@@ -392,6 +395,7 @@ void beginBoard()
392395
else if (productVariant == RTK_FACET_V2)
393396
{
394397
present.psram_4mb = true;
398+
present.gnss_zedf9p = true;
395399
present.microSd = true;
396400
present.display_i2c0 = true;
397401
present.display_type = DISPLAY_64x48;
@@ -413,6 +417,7 @@ void beginBoard()
413417
else if (productVariant == RTK_FACET_MOSAIC)
414418
{
415419
present.psram_4mb = true;
420+
present.gnss_mosaicX5 = true;
416421
present.display_i2c0 = true;
417422
present.display_type = DISPLAY_64x48;
418423
present.i2c0BusSpeed_400 = true;

Firmware/RTK_Everywhere/Display.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2439,7 +2439,7 @@ void paintSystemTest()
24392439
oled->print(" ");
24402440
oled->print(gnssFirmwareVersionInt);
24412441
oled->print("-");
2442-
if ((gnssPlatform == PLATFORM_ZED) && (gnssFirmwareVersionInt < 130))
2442+
if ((present.gnss_zedf9p) && (gnssFirmwareVersionInt < 130))
24432443
oled->print("FAIL");
24442444
else
24452445
oled->print("OK");

Firmware/RTK_Everywhere/Form.ino

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ void createMessageList(String &returnText)
829829
{
830830
returnText = "";
831831

832-
if (gnssPlatform == PLATFORM_ZED)
832+
if (present.gnss_zedf9p)
833833
{
834834
for (int messageNumber = 0; messageNumber < MAX_UBX_MSG; messageNumber++)
835835
{
@@ -839,7 +839,7 @@ void createMessageList(String &returnText)
839839
}
840840
}
841841

842-
else if (gnssPlatform == PLATFORM_UM980)
842+
else if (present.gnss_um980)
843843
{
844844
for (int messageNumber = 0; messageNumber < MAX_UM980_NMEA_MSG; messageNumber++)
845845
{
@@ -863,7 +863,7 @@ void createMessageListBase(String &returnText)
863863
{
864864
returnText = "";
865865

866-
if (gnssPlatform == PLATFORM_ZED)
866+
if (present.gnss_zedf9p)
867867
{
868868
int firstRTCMRecord = getMessageNumberByName("UBX_RTCM_1005");
869869

@@ -875,7 +875,7 @@ void createMessageListBase(String &returnText)
875875
}
876876
}
877877

878-
else if (gnssPlatform == PLATFORM_UM980)
878+
else if (present.gnss_um980)
879879
{
880880
for (int messageNumber = 0; messageNumber < MAX_UM980_RTCM_MSG; messageNumber++)
881881
{

0 commit comments

Comments
 (0)