Skip to content

Commit f435ad4

Browse files
committed
Merge branch 'rtk-um980-class' into rtk-mosaic-class
2 parents e28193d + 8bf57f3 commit f435ad4

File tree

15 files changed

+245
-242
lines changed

15 files changed

+245
-242
lines changed

Firmware/RTK_Everywhere/Begin.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ void beginBoard()
190190
else if (productVariant == RTK_TORCH)
191191
{
192192
// Specify the GNSS radio
193-
gnss = (GNSS *) new RTK_UM980();
193+
gnss = (GNSS *) new GNSS_UM980();
194194

195195
present.psram_2mb = true;
196196
present.gnss_um980 = true;
@@ -287,7 +287,7 @@ void beginBoard()
287287
else if (productVariant == RTK_EVK)
288288
{
289289
// Specify the GNSS radio
290-
gnss = (GNSS *) new ZED();
290+
gnss = (GNSS *) new GNSS_ZED();
291291

292292
// Pin defs etc. for EVK v1.1
293293
present.psram_4mb = true;

Firmware/RTK_Everywhere/Form.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1108,7 +1108,7 @@ void createMessageListBase(String &returnText)
11081108

11091109
if (present.gnss_zedf9p)
11101110
{
1111-
ZED * zed = (ZED *)gnss;
1111+
GNSS_ZED * zed = (GNSS_ZED *)gnss;
11121112
int firstRTCMRecord = zed->getMessageNumberByName("RTCM_1005");
11131113

11141114
for (int messageNumber = 0; messageNumber < MAX_UBX_MSG_RTCM; messageNumber++)

Firmware/RTK_Everywhere/UM980.h renamed to Firmware/RTK_Everywhere/GNSS_UM980.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*------------------------------------------------------------------------------
2-
UM980.h
2+
GNSS_UM980.h
33
4-
Declarations and definitions for the UM980 GNSS receiver and the RTK_UM980 class
4+
Declarations and definitions for the UM980 GNSS receiver and the GNSS_UM980 class
55
------------------------------------------------------------------------------*/
66

7-
#ifndef _RTK_EVERYWHERE_UM980_H
8-
#define _RTK_EVERYWHERE_UM980_H
7+
#ifndef __GNSS_UM980_H__
8+
#define __GNSS_UM980_H__
99

1010
#ifdef COMPILE_UM980
1111

@@ -101,7 +101,7 @@ enum um980_Models
101101
UM980_DYN_MODEL_AUTOMOTIVE,
102102
};
103103

104-
class RTK_UM980 : GNSS
104+
class GNSS_UM980 : GNSS
105105
{
106106
private:
107107

@@ -469,4 +469,4 @@ class RTK_UM980 : GNSS
469469
};
470470

471471
#endif // COMPILE_UM980
472-
#endif // _RTK_EVERYWHERE_UM980_H
472+
#endif // __GNSS_UM980_H__

0 commit comments

Comments
 (0)