Add landing page for RTK Facet mosaic

nseidle · nseidle · commit 2d8fa0481694 · 2025-03-05T14:40:44.000-07:00
diff --git a/Firmware/RTK_Everywhere/menuPP.ino b/Firmware/RTK_Everywhere/menuPP.ino
@@ -30,13 +30,17 @@ MqttClient *menuppMqttClient;
 
 bool productVariantSupportsAssistNow()
 {
+    if (productVariant == RTK_EVK)
+        return true;
     if (productVariant == RTK_FACET_MOSAIC)
         return false;
     if (productVariant == RTK_TORCH)
         return false;
     if (productVariant == RTK_POSTCARD)
         return false;
-    return true;
+
+    systemPrintln("Uncaught productVariantSupportsAssistNow()");
+    return false;
 }
 
 void menuPointPerfectKeys()
@@ -759,7 +763,7 @@ void updateLBand()
             {
                 // Reconstruct the firmware version
                 snprintf(neoFirmwareVersion, sizeof(neoFirmwareVersion), "%s %d.%02d", i2cLBand.getFirmwareType(),
-                        i2cLBand.getFirmwareVersionHigh(), i2cLBand.getFirmwareVersionLow());
+                         i2cLBand.getFirmwareVersionHigh(), i2cLBand.getFirmwareVersionLow());
 
                 printNEOInfo(); // Print module firmware version
             }
@@ -791,8 +795,8 @@ void updateLBand()
                     {
                         LBandFreq = Regional_Information_Table[r].frequency;
                         if (settings.debugCorrections == true)
-                            systemPrintf("Setting L-Band frequency to %s (%dHz)\r\n", Regional_Information_Table[r].name,
-                                        LBandFreq);
+                            systemPrintf("Setting L-Band frequency to %s (%dHz)\r\n",
+                                         Regional_Information_Table[r].name, LBandFreq);
                         break;
                     }
                 }
@@ -801,15 +805,15 @@ void updateLBand()
                     LBandFreq = Regional_Information_Table[settings.geographicRegion].frequency;
                     if (settings.debugCorrections == true)
                         systemPrintf("Error: Unknown L-Band geographic region. Using %s (%dHz)\r\n",
-                                    Regional_Information_Table[settings.geographicRegion].name, LBandFreq);
+                                     Regional_Information_Table[settings.geographicRegion].name, LBandFreq);
                 }
             }
             else
             {
                 LBandFreq = Regional_Information_Table[settings.geographicRegion].frequency;
                 if (settings.debugCorrections == true)
                     systemPrintf("No fix available for L-Band geographic region determination. Using %s (%dHz)\r\n",
-                                Regional_Information_Table[settings.geographicRegion].name, LBandFreq);
+                                 Regional_Information_Table[settings.geographicRegion].name, LBandFreq);
             }
 
             bool response = true;
@@ -887,8 +891,8 @@ void updateLBand()
                     {
                         LBandFreq = Regional_Information_Table[r].frequency;
                         if (settings.debugCorrections == true)
-                            systemPrintf("Setting L-Band frequency to %s (%dHz)\r\n", Regional_Information_Table[r].name,
-                                        LBandFreq);
+                            systemPrintf("Setting L-Band frequency to %s (%dHz)\r\n",
+                                         Regional_Information_Table[r].name, LBandFreq);
                         break;
                     }
                 }
@@ -897,15 +901,15 @@ void updateLBand()
                     LBandFreq = Regional_Information_Table[settings.geographicRegion].frequency;
                     if (settings.debugCorrections == true)
                         systemPrintf("Error: Unknown L-Band geographic region. Using %s (%dHz)\r\n",
-                                    Regional_Information_Table[settings.geographicRegion].name, LBandFreq);
+                                     Regional_Information_Table[settings.geographicRegion].name, LBandFreq);
                 }
             }
             else
             {
                 LBandFreq = Regional_Information_Table[settings.geographicRegion].frequency;
                 if (settings.debugCorrections == true)
                     systemPrintf("No fix available for L-Band geographic region determination. Using %s (%dHz)\r\n",
-                                Regional_Information_Table[settings.geographicRegion].name, LBandFreq);
+                                 Regional_Information_Table[settings.geographicRegion].name, LBandFreq);
             }
 
             bool result = true;
@@ -930,7 +934,7 @@ void updateLBand()
                 online.lband_gnss = true;
             }
         }
-        //else if (online.lband_gnss && settings.enablePointPerfectCorrections)
+        // else if (online.lband_gnss && settings.enablePointPerfectCorrections)
         {
             // If no SPARTN data is received, the L-Band may need a 'kick'. Turn L-Band off and back on again!
             // But gnss->update will do this. No need to do it here
@@ -1427,6 +1431,9 @@ void provisioningUpdate()
             else if (productVariant == RTK_POSTCARD)
                 snprintf(landingPageUrl, sizeof(landingPageUrl),
                          "or goto https://www.sparkfun.com/rtk_postcard_registration ");
+            else if (productVariant == RTK_FACET_MOSAIC)
+                snprintf(landingPageUrl, sizeof(landingPageUrl),
+                         "or goto https://www.sparkfun.com/rtk_facet_mosaic_registration ");
             else
                 systemPrintln("pointperfectProvisionDevice(): Platform missing landing page");
 
@@ -1456,6 +1463,9 @@ void provisioningUpdate()
             else if (productVariant == RTK_POSTCARD)
                 snprintf(landingPageUrl, sizeof(landingPageUrl),
                          "or goto https://www.sparkfun.com/rtk_postcard_registration ");
+            else if (productVariant == RTK_FACET_MOSAIC)
+                snprintf(landingPageUrl, sizeof(landingPageUrl),
+                         "or goto https://www.sparkfun.com/rtk_facet_mosaic_registration ");
             else
                 systemPrintln("pointperfectProvisionDevice(): Platform missing landing page");
 

Original file line number	Diff line number	Diff line change
`@@ -30,13 +30,17 @@ MqttClient *menuppMqttClient;`
`30`	`30`
`31`	`31`	`bool productVariantSupportsAssistNow()`
`32`	`32`	`{`
	`33`	`+ if (productVariant == RTK_EVK)`
	`34`	`+ return true;`
`33`	`35`	`if (productVariant == RTK_FACET_MOSAIC)`
`34`	`36`	`return false;`
`35`	`37`	`if (productVariant == RTK_TORCH)`
`36`	`38`	`return false;`
`37`	`39`	`if (productVariant == RTK_POSTCARD)`
`38`	`40`	`return false;`
`39`		`- return true;`
	`41`	`+`
	`42`	`+ systemPrintln("Uncaught productVariantSupportsAssistNow()");`
	`43`	`+ return false;`
`40`	`44`	`}`
`41`	`45`
`42`	`46`	`void menuPointPerfectKeys()`
`@@ -759,7 +763,7 @@ void updateLBand()`
`759`	`763`	`{`
`760`	`764`	`// Reconstruct the firmware version`
`761`	`765`	`snprintf(neoFirmwareVersion, sizeof(neoFirmwareVersion), "%s %d.%02d", i2cLBand.getFirmwareType(),`
`762`		`- i2cLBand.getFirmwareVersionHigh(), i2cLBand.getFirmwareVersionLow());`
	`766`	`+ i2cLBand.getFirmwareVersionHigh(), i2cLBand.getFirmwareVersionLow());`
`763`	`767`
`764`	`768`	`printNEOInfo(); // Print module firmware version`
`765`	`769`	`}`
`@@ -791,8 +795,8 @@ void updateLBand()`
`791`	`795`	`{`
`792`	`796`	`LBandFreq = Regional_Information_Table[r].frequency;`
`793`	`797`	`if (settings.debugCorrections == true)`
`794`		`- systemPrintf("Setting L-Band frequency to %s (%dHz)\r\n", Regional_Information_Table[r].name,`
`795`		`- LBandFreq);`
	`798`	`+ systemPrintf("Setting L-Band frequency to %s (%dHz)\r\n",`
	`799`	`+ Regional_Information_Table[r].name, LBandFreq);`
`796`	`800`	`break;`
`797`	`801`	`}`
`798`	`802`	`}`
`@@ -801,15 +805,15 @@ void updateLBand()`
`801`	`805`	`LBandFreq = Regional_Information_Table[settings.geographicRegion].frequency;`
`802`	`806`	`if (settings.debugCorrections == true)`
`803`	`807`	`systemPrintf("Error: Unknown L-Band geographic region. Using %s (%dHz)\r\n",`
`804`		`- Regional_Information_Table[settings.geographicRegion].name, LBandFreq);`
	`808`	`+ Regional_Information_Table[settings.geographicRegion].name, LBandFreq);`
`805`	`809`	`}`
`806`	`810`	`}`
`807`	`811`	`else`
`808`	`812`	`{`
`809`	`813`	`LBandFreq = Regional_Information_Table[settings.geographicRegion].frequency;`
`810`	`814`	`if (settings.debugCorrections == true)`
`811`	`815`	`systemPrintf("No fix available for L-Band geographic region determination. Using %s (%dHz)\r\n",`
`812`		`- Regional_Information_Table[settings.geographicRegion].name, LBandFreq);`
	`816`	`+ Regional_Information_Table[settings.geographicRegion].name, LBandFreq);`
`813`	`817`	`}`
`814`	`818`
`815`	`819`	`bool response = true;`
`@@ -887,8 +891,8 @@ void updateLBand()`
`887`	`891`	`{`
`888`	`892`	`LBandFreq = Regional_Information_Table[r].frequency;`
`889`	`893`	`if (settings.debugCorrections == true)`
`890`		`- systemPrintf("Setting L-Band frequency to %s (%dHz)\r\n", Regional_Information_Table[r].name,`
`891`		`- LBandFreq);`
	`894`	`+ systemPrintf("Setting L-Band frequency to %s (%dHz)\r\n",`
	`895`	`+ Regional_Information_Table[r].name, LBandFreq);`
`892`	`896`	`break;`
`893`	`897`	`}`
`894`	`898`	`}`
`@@ -897,15 +901,15 @@ void updateLBand()`
`897`	`901`	`LBandFreq = Regional_Information_Table[settings.geographicRegion].frequency;`
`898`	`902`	`if (settings.debugCorrections == true)`
`899`	`903`	`systemPrintf("Error: Unknown L-Band geographic region. Using %s (%dHz)\r\n",`
`900`		`- Regional_Information_Table[settings.geographicRegion].name, LBandFreq);`
	`904`	`+ Regional_Information_Table[settings.geographicRegion].name, LBandFreq);`
`901`	`905`	`}`
`902`	`906`	`}`
`903`	`907`	`else`
`904`	`908`	`{`
`905`	`909`	`LBandFreq = Regional_Information_Table[settings.geographicRegion].frequency;`
`906`	`910`	`if (settings.debugCorrections == true)`
`907`	`911`	`systemPrintf("No fix available for L-Band geographic region determination. Using %s (%dHz)\r\n",`
`908`		`- Regional_Information_Table[settings.geographicRegion].name, LBandFreq);`
	`912`	`+ Regional_Information_Table[settings.geographicRegion].name, LBandFreq);`
`909`	`913`	`}`
`910`	`914`
`911`	`915`	`bool result = true;`
`@@ -930,7 +934,7 @@ void updateLBand()`
`930`	`934`	`online.lband_gnss = true;`
`931`	`935`	`}`
`932`	`936`	`}`
`933`		`- //else if (online.lband_gnss && settings.enablePointPerfectCorrections)`
	`937`	`+ // else if (online.lband_gnss && settings.enablePointPerfectCorrections)`
`934`	`938`	`{`
`935`	`939`	`// If no SPARTN data is received, the L-Band may need a 'kick'. Turn L-Band off and back on again!`
`936`	`940`	`// But gnss->update will do this. No need to do it here`
`@@ -1427,6 +1431,9 @@ void provisioningUpdate()`
`1427`	`1431`	`else if (productVariant == RTK_POSTCARD)`
`1428`	`1432`	`snprintf(landingPageUrl, sizeof(landingPageUrl),`
`1429`	`1433`	`"or goto https://www.sparkfun.com/rtk_postcard_registration ");`
	`1434`	`+ else if (productVariant == RTK_FACET_MOSAIC)`
	`1435`	`+ snprintf(landingPageUrl, sizeof(landingPageUrl),`
	`1436`	`+ "or goto https://www.sparkfun.com/rtk_facet_mosaic_registration ");`
`1430`	`1437`	`else`
`1431`	`1438`	`systemPrintln("pointperfectProvisionDevice(): Platform missing landing page");`
`1432`	`1439`
`@@ -1456,6 +1463,9 @@ void provisioningUpdate()`
`1456`	`1463`	`else if (productVariant == RTK_POSTCARD)`
`1457`	`1464`	`snprintf(landingPageUrl, sizeof(landingPageUrl),`
`1458`	`1465`	`"or goto https://www.sparkfun.com/rtk_postcard_registration ");`
	`1466`	`+ else if (productVariant == RTK_FACET_MOSAIC)`
	`1467`	`+ snprintf(landingPageUrl, sizeof(landingPageUrl),`
	`1468`	`+ "or goto https://www.sparkfun.com/rtk_facet_mosaic_registration ");`
`1459`	`1469`	`else`
`1460`	`1470`	`systemPrintln("pointperfectProvisionDevice(): Platform missing landing page");`
`1461`	`1471`