Skip to content

Commit fed957a

Browse files
committed
Merge branch 'release_candidate' into RC_Display_Refactoring
2 parents de204f5 + e562df4 commit fed957a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Firmware/RTK_Everywhere/form.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
// python main_js_zipper.py
2727

2828
static const uint8_t main_js[] PROGMEM = {
29-
0x1F, 0x8B, 0x08, 0x08, 0xEA, 0x0D, 0x0B, 0x66, 0x02, 0xFF, 0x6D, 0x61, 0x69, 0x6E, 0x2E, 0x6A,
29+
0x1F, 0x8B, 0x08, 0x08, 0xA3, 0x1F, 0x0C, 0x66, 0x02, 0xFF, 0x6D, 0x61, 0x69, 0x6E, 0x2E, 0x6A,
3030
0x73, 0x2E, 0x67, 0x7A, 0x69, 0x70, 0x00, 0xED, 0x7D, 0xEB, 0x7A, 0xDB, 0x38, 0xB2, 0xE0, 0xFF,
3131
0x3C, 0x05, 0x46, 0xDB, 0x3B, 0x92, 0x26, 0xB2, 0x4C, 0xC9, 0x97, 0x5C, 0x1C, 0xE7, 0xAC, 0x6F,
3232
0x49, 0xBC, 0x13, 0x3B, 0xFE, 0x2C, 0xA7, 0xBB, 0x93, 0x4C, 0xD6, 0x87, 0x16, 0x61, 0x99, 0x13,
@@ -808,7 +808,7 @@ static const uint8_t main_js[] PROGMEM = {
808808
// python index_html_zipper.py
809809

810810
static const uint8_t index_html[] PROGMEM = {
811-
0x1F, 0x8B, 0x08, 0x08, 0xEA, 0x0D, 0x0B, 0x66, 0x02, 0xFF, 0x69, 0x6E, 0x64, 0x65, 0x78, 0x2E,
811+
0x1F, 0x8B, 0x08, 0x08, 0xA3, 0x1F, 0x0C, 0x66, 0x02, 0xFF, 0x69, 0x6E, 0x64, 0x65, 0x78, 0x2E,
812812
0x68, 0x74, 0x6D, 0x6C, 0x2E, 0x67, 0x7A, 0x69, 0x70, 0x00, 0xED, 0x7D, 0xDB, 0x72, 0xDB, 0xC8,
813813
0x92, 0xE0, 0xBB, 0xBF, 0xA2, 0x86, 0xB3, 0xB3, 0x96, 0xE6, 0x88, 0x14, 0x49, 0x5D, 0x2C, 0xEB,
814814
0xD8, 0x8C, 0x90, 0x44, 0xC9, 0x56, 0x1C, 0x59, 0xE6, 0x8A, 0xF2, 0xE9, 0x6E, 0x6F, 0xEC, 0x76,

Firmware/RTK_Everywhere/settings.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1068,7 +1068,7 @@ typedef struct
10681068

10691069
// Point Perfect
10701070
char pointPerfectDeviceProfileToken[40] = "";
1071-
PointPerfect_Corrections_Source pointPerfectCorrectionsSource = POINTPERFECT_CORRECTIONS_IP;
1071+
PointPerfect_Corrections_Source pointPerfectCorrectionsSource = POINTPERFECT_CORRECTIONS_DISABLED;
10721072
bool autoKeyRenewal = true; // Attempt to get keys if we get under 28 days from the expiration date
10731073
char pointPerfectClientID[50] = ""; // Obtained during ZTP
10741074
char pointPerfectBrokerHost[50] = ""; // pp.services.u-blox.com

0 commit comments

Comments
 (0)