Rename Ozi[Mux] -> OziPlotter UDP format

pull/52/head
Phil Crump 2018-05-06 12:19:13 +00:00
rodzic e5c6cae06b
commit e5467db92a
3 zmienionych plików z 10 dodań i 10 usunięć

Wyświetl plik

@ -5,7 +5,7 @@ The LoRa Gateway provides some socket interfaces, configurable in gateway.txt:
- ServerPort - TCP/IP server socket, allowing a single client. Sends status and packet information in JSON format. Also allows for gateway settings (e.g. frequency) to be polled or changed.
- DataPort - TCP/IP server socket, allowing a single client. Sends raw telemetry packets (e.g. $$...).
- UDPPort - UDP client broadcast socket, sending raw telemetry.
- OziPort - UDP client broadcast socket, sending basic telemetry reformatted as OziMux format.
- OziPlotterPort - UDP client broadcast socket, sending basic telemetry reformatted as OziPlotter CSV format.

Wyświetl plik

@ -921,8 +921,8 @@ void ProcessLineUKHAS(int Channel, char *Line)
Config.Payloads[PayloadIndex].Longitude,
Config.Payloads[PayloadIndex].Altitude);
// Send out to any OziMux clients
if (Config.OziPort > 0)
// Send out to any OziPlotter clients
if (Config.OziPlotterPort > 0)
{
char OziSentence[200];
sprintf(OziSentence, "TELEMETRY,%s,%lf,%lf,%d\n",
@ -930,7 +930,7 @@ void ProcessLineUKHAS(int Channel, char *Line)
Config.Payloads[PayloadIndex].Latitude,
Config.Payloads[PayloadIndex].Longitude,
Config.Payloads[PayloadIndex].Altitude);
UDPSend(OziSentence, Config.OziPort);
UDPSend(OziSentence, Config.OziPlotterPort);
}
}
@ -968,8 +968,8 @@ void ProcessLineHABpack(int Channel, received_t *Received)
Config.Payloads[PayloadIndex].Longitude,
Config.Payloads[PayloadIndex].Altitude);
// Send out to any OziMux clients
if (Config.OziPort > 0)
// Send out to any OziPlotter clients
if (Config.OziPlotterPort > 0)
{
char OziSentence[200];
sprintf(OziSentence, "TELEMETRY,%s,%lf,%lf,%d\n",
@ -977,7 +977,7 @@ void ProcessLineHABpack(int Channel, received_t *Received)
Config.Payloads[PayloadIndex].Latitude,
Config.Payloads[PayloadIndex].Longitude,
Config.Payloads[PayloadIndex].Altitude);
UDPSend(OziSentence, Config.OziPort);
UDPSend(OziSentence, Config.OziPlotterPort);
}
}
@ -1696,10 +1696,10 @@ void LoadConfigFile(void)
RegisterConfigInteger(MainSection, -1, "HABPort", &Config.HABPort, NULL); // Telnet server
RegisterConfigInteger(MainSection, -1, "DataPort", &Config.DataPort, NULL); // Raw data server
RegisterConfigInteger(MainSection, -1, "UDPPort", &Config.UDPPort, NULL); // UDP Broadcast socket (raw data)
RegisterConfigInteger(MainSection, -1, "OziPort", &Config.OziPort, NULL); // UDP Broadcast socket (OziMux format)
RegisterConfigInteger(MainSection, -1, "OziPlotterPort", &Config.OziPlotterPort, NULL); // UDP Broadcast socket (OziPlotter format)
if (Config.UDPPort > 0) LogMessage("UDP Broadcast of raw packets on port %d\n", Config.UDPPort);
if (Config.OziPort > 0) LogMessage("UDP Broadcast of OziMux packets on port %d\n", Config.OziPort);
if (Config.OziPlotterPort > 0) LogMessage("UDP Broadcast of OziPlotter packets on port %d\n", Config.OziPlotterPort);
// Timeout for HAB Telnet uplink
Config.HABTimeout = 4000;

Wyświetl plik

@ -116,7 +116,7 @@ struct TConfig
int InternetLED;
int ServerPort; // JSON port for telemetry, settings
int UDPPort; // UDP Broadcast port for raw received data packets
int OziPort; // UDP Broadcast port for OziMux formatted packets
int OziPlotterPort; // UDP Broadcast port for OziPlotter formatted packets
int HABPort; // Telnet style port for comms with HAB
int HABTimeout; // Timeout in ms for telnet uplink
int HABChannel; // LoRa Channel for uplink