Skip to content

Commit 2da158b

Browse files
LeeLeahy2LeeLeahy2
committed
Add NETCONSUMER_* values
1 parent 83d6e91 commit 2da158b

File tree

2 files changed

+50
-38
lines changed

2 files changed

+50
-38
lines changed

‎Firmware/RTK_Everywhere/Network.ino

Lines changed: 36 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1605,7 +1605,7 @@ uint8_t networkConsumers(uint16_t *consumerTypes)
16051605
if (ntripClientNeedsNetwork() || online.ntripClient)
16061606
{
16071607
consumerCount++;
1608-
consumerId |= (1 << 0);
1608+
consumerId |= (1 << NETCONSUMER_NTRIP_CLIENT);
16091609

16101610
*consumerTypes = NETWORK_EWC; // Ask for eth/wifi/cellular
16111611
}
@@ -1624,7 +1624,7 @@ uint8_t networkConsumers(uint16_t *consumerTypes)
16241624
if (ntripServerNeedsNetwork() || ntripServerOnline)
16251625
{
16261626
consumerCount++;
1627-
consumerId |= (1 << 1);
1627+
consumerId |= (1 << NETCONSUMER_NTRIP_SERVER);
16281628

16291629
*consumerTypes = NETWORK_EWC; // Ask for eth/wifi/cellular
16301630
}
@@ -1633,15 +1633,15 @@ uint8_t networkConsumers(uint16_t *consumerTypes)
16331633
if (tcpClientNeedsNetwork() || online.tcpClient)
16341634
{
16351635
consumerCount++;
1636-
consumerId |= (1 << 2);
1636+
consumerId |= (1 << NETCONSUMER_TCP_CLIENT);
16371637
*consumerTypes = NETWORK_EWC; // Ask for eth/wifi/cellular
16381638
}
16391639

16401640
// Network needed for TCP Server
16411641
if (tcpServerNeedsNetwork() || online.tcpServer)
16421642
{
16431643
consumerCount++;
1644-
consumerId |= (1 << 3);
1644+
consumerId |= (1 << NETCONSUMER_TCP_SERVER);
16451645

16461646
*consumerTypes = NETWORK_EWC; // Ask for eth/wifi/cellular
16471647

@@ -1656,15 +1656,15 @@ uint8_t networkConsumers(uint16_t *consumerTypes)
16561656
if (udpServerNeedsNetwork() || online.udpServer)
16571657
{
16581658
consumerCount++;
1659-
consumerId |= (1 << 4);
1659+
consumerId |= (1 << NETCONSUMER_UDP_SERVER);
16601660
*consumerTypes = NETWORK_EWC; // Ask for eth/wifi/cellular
16611661
}
16621662

16631663
// Network needed for PointPerfect ZTP or key update requested by scheduler, from menu, or display menu
16641664
if (provisioningNeedsNetwork() || online.httpClient)
16651665
{
16661666
consumerCount++;
1667-
consumerId |= (1 << 5);
1667+
consumerId |= (1 << NETCONSUMER_PPL_KEY_UPDATE);
16681668
*consumerTypes = NETWORK_EWC; // Ask for eth/wifi/cellular
16691669
}
16701670

@@ -1673,23 +1673,23 @@ uint8_t networkConsumers(uint16_t *consumerTypes)
16731673
{
16741674
// PointPerfect is enabled, allow MQTT to begin
16751675
consumerCount++;
1676-
consumerId |= (1 << 6);
1676+
consumerId |= (1 << NETCONSUMER_PPL_MQTT_CLIENT);
16771677
*consumerTypes = NETWORK_EWC; // Ask for eth/wifi/cellular
16781678
}
16791679

16801680
// Network needed to obtain the latest firmware version or do a firmware update
16811681
if (otaNeedsNetwork() || online.otaClient)
16821682
{
16831683
consumerCount++;
1684-
consumerId |= (1 << 7);
1684+
consumerId |= (1 << NETCONSUMER_OTA_CLIENT);
16851685
*consumerTypes = (1 << NETIF_WIFI_STA); // OTA Pull library only supports WiFi
16861686
}
16871687

16881688
// Network needed for Web Config
16891689
if (webServerNeedsNetwork() || online.webServer)
16901690
{
16911691
consumerCount++;
1692-
consumerId |= (1 << 8);
1692+
consumerId |= (1 << NETCONSUMER_WEB_CONFIG);
16931693

16941694
*consumerTypes = NETWORK_EWC; // Ask for eth/wifi/cellular
16951695

@@ -1718,26 +1718,25 @@ uint8_t networkConsumers(uint16_t *consumerTypes)
17181718
{
17191719
systemPrintf("- Consumers: ", consumerCount);
17201720

1721-
if (consumerId & (1 << 0))
1721+
if (consumerId & (1 << NETCONSUMER_NTRIP_CLIENT))
17221722
systemPrint("Rover NTRIP Client, ");
1723-
if (consumerId & (1 << 1))
1723+
if (consumerId & (1 << NETCONSUMER_NTRIP_SERVER))
17241724
systemPrint("Base NTRIP Server, ");
1725-
if (consumerId & (1 << 2))
1725+
if (consumerId & (1 << NETCONSUMER_TCP_CLIENT))
17261726
systemPrint("TCP Client, ");
1727-
if (consumerId & (1 << 3))
1727+
if (consumerId & (1 << NETCONSUMER_TCP_SERVER))
17281728
systemPrint("TCP Server, ");
1729-
if (consumerId & (1 << 4))
1729+
if (consumerId & (1 << NETCONSUMER_UDP_SERVER))
17301730
systemPrint("UDP Server, ");
1731-
if (consumerId & (1 << 5))
1731+
if (consumerId & (1 << NETCONSUMER_PPL_KEY_UPDATE))
17321732
systemPrint("PPL Key Update Request, ");
1733-
if (consumerId & (1 << 6))
1733+
if (consumerId & (1 << NETCONSUMER_PPL_MQTT_CLIENT))
17341734
systemPrint("PPL MQTT Client, ");
1735-
if (consumerId & (1 << 7))
1735+
if (consumerId & (1 << NETCONSUMER_OTA_CLIENT))
17361736
systemPrint("OTA Version Check or Update, ");
1737-
if (consumerId & (1 << 8))
1737+
if (consumerId & (1 << NETCONSUMER_WEB_CONFIG))
17381738
systemPrint("Web Config, ");
17391739
}
1740-
17411740
systemPrintln();
17421741
}
17431742
}
@@ -1756,7 +1755,7 @@ uint8_t networkConsumersOnline()
17561755
if (online.ntripClient)
17571756
{
17581757
consumerCountOnline++;
1759-
consumerId |= (1 << 0);
1758+
consumerId |= (1 << NETCONSUMER_NTRIP_CLIENT);
17601759
}
17611760

17621761
// Network needed for NTRIP Server
@@ -1773,57 +1772,57 @@ uint8_t networkConsumersOnline()
17731772
if (ntripServerConnected)
17741773
{
17751774
consumerCountOnline++;
1776-
consumerId |= (1 << 1);
1775+
consumerId |= (1 << NETCONSUMER_NTRIP_SERVER);
17771776
}
17781777

17791778
// Network needed for TCP Client
17801779
if (online.tcpClient)
17811780
{
17821781
consumerCountOnline++;
1783-
consumerId |= (1 << 2);
1782+
consumerId |= (1 << NETCONSUMER_TCP_CLIENT);
17841783
}
17851784

17861785
// Network needed for TCP Server - May use WiFi AP or WiFi STA
17871786
if (online.tcpServer)
17881787
{
17891788
consumerCountOnline++;
1790-
consumerId |= (1 << 3);
1789+
consumerId |= (1 << NETCONSUMER_TCP_SERVER);
17911790
}
17921791

17931792
// Network needed for UDP Server
17941793
if (online.udpServer)
17951794
{
17961795
consumerCountOnline++;
1797-
consumerId |= (1 << 4);
1796+
consumerId |= (1 << NETCONSUMER_UDP_SERVER);
17981797
}
17991798

18001799
// Network needed for PointPerfect ZTP or key update requested by scheduler, from menu, or display menu
18011800
if (online.httpClient)
18021801
{
18031802
consumerCountOnline++;
1804-
consumerId |= (1 << 5);
1803+
consumerId |= (1 << NETCONSUMER_PPL_KEY_UPDATE);
18051804
}
18061805

18071806
// Network needed for PointPerfect Corrections MQTT client
18081807
if (online.mqttClient)
18091808
{
18101809
// PointPerfect is enabled, allow MQTT to begin
18111810
consumerCountOnline++;
1812-
consumerId |= (1 << 6);
1811+
consumerId |= (1 << NETCONSUMER_PPL_MQTT_CLIENT);
18131812
}
18141813

18151814
// Network needed to obtain the latest firmware version or do update
18161815
if (online.otaClient)
18171816
{
18181817
consumerCountOnline++;
1819-
consumerId |= (1 << 7);
1818+
consumerId |= (1 << NETCONSUMER_OTA_CLIENT);
18201819
}
18211820

18221821
// Network needed for Web Config
18231822
if (online.webServer)
18241823
{
18251824
consumerCountOnline++;
1826-
consumerId |= (1 << 8);
1825+
consumerId |= (1 << NETCONSUMER_WEB_CONFIG);
18271826
}
18281827

18291828
// Debug
@@ -1838,24 +1837,23 @@ uint8_t networkConsumersOnline()
18381837
if (consumerCountOnline > 0)
18391838
{
18401839
systemPrintf("- Consumers: ", consumerCountOnline);
1841-
1842-
if (consumerId & (1 << 0))
1840+
if (consumerId & (1 << NETCONSUMER_NTRIP_CLIENT))
18431841
systemPrint("Rover NTRIP Client, ");
1844-
if (consumerId & (1 << 1))
1842+
if (consumerId & (1 << NETCONSUMER_NTRIP_SERVER))
18451843
systemPrint("Base NTRIP Server, ");
1846-
if (consumerId & (1 << 2))
1844+
if (consumerId & (1 << NETCONSUMER_TCP_CLIENT))
18471845
systemPrint("TCP Client, ");
1848-
if (consumerId & (1 << 3))
1846+
if (consumerId & (1 << NETCONSUMER_TCP_SERVER))
18491847
systemPrint("TCP Server, ");
1850-
if (consumerId & (1 << 4))
1848+
if (consumerId & (1 << NETCONSUMER_UDP_SERVER))
18511849
systemPrint("UDP Server, ");
1852-
if (consumerId & (1 << 5))
1850+
if (consumerId & (1 << NETCONSUMER_PPL_KEY_UPDATE))
18531851
systemPrint("PPL Key Update Request, ");
1854-
if (consumerId & (1 << 6))
1852+
if (consumerId & (1 << NETCONSUMER_PPL_MQTT_CLIENT))
18551853
systemPrint("PPL MQTT Client, ");
1856-
if (consumerId & (1 << 7))
1854+
if (consumerId & (1 << NETCONSUMER_OTA_CLIENT))
18571855
systemPrint("OTA Version Check or Update, ");
1858-
if (consumerId & (1 << 8))
1856+
if (consumerId & (1 << NETCONSUMER_WEB_CONFIG))
18591857
systemPrint("Web Config, ");
18601858
}
18611859

‎Firmware/RTK_Everywhere/settings.h

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -565,6 +565,20 @@ enum
565565

566566
#define NETWORK_EWC ((1 << NETIF_ETHERNET) | (1 << NETIF_WIFI_STA) | (1 << NETIF_CELLULAR))
567567

568+
// Bitfield for describing the network consumers
569+
enum
570+
{
571+
NETCONSUMER_NTRIP_CLIENT = 0,
572+
NETCONSUMER_NTRIP_SERVER,
573+
NETCONSUMER_TCP_CLIENT,
574+
NETCONSUMER_TCP_SERVER,
575+
NETCONSUMER_UDP_SERVER,
576+
NETCONSUMER_PPL_KEY_UPDATE,
577+
NETCONSUMER_PPL_MQTT_CLIENT,
578+
NETCONSUMER_OTA_CLIENT,
579+
NETCONSUMER_WEB_CONFIG,
580+
};
581+
568582
// This is all the settings that can be set on RTK Product. It's recorded to NVM and the config file.
569583
// Avoid reordering. The order of these variables is mimicked in NVM/record/parse/create/update/get
570584
struct Settings

0 commit comments

Comments
 (0)