From 87ea4651235dfd20dc012d7e0e6eb2ed1b907b3a Mon Sep 17 00:00:00 2001 From: "Hansi, dl9rdz" Date: Sat, 30 Oct 2021 12:02:29 +0200 Subject: [PATCH] unused code lines removal --- RX_FSK/RX_FSK.ino | 257 ---------------------------------------------- 1 file changed, 257 deletions(-) diff --git a/RX_FSK/RX_FSK.ino b/RX_FSK/RX_FSK.ino index 18372a1..7292ecf 100644 --- a/RX_FSK/RX_FSK.ino +++ b/RX_FSK/RX_FSK.ino @@ -326,25 +326,6 @@ const char *createQRGForm() { strcat(ptr, "\n"); strcat(ptr, "
"); strcat(ptr, "\n"); -#if 0 - strcat(ptr, ""); - for (int i = 0; i < sonde.config.maxsonde; i++) { - //String s = sondeTypeSelect(i >= sonde.nSonde ? 2 : sonde.sondeList[i].type); - String site = sonde.sondeList[i].launchsite; - sprintf(ptr + strlen(ptr), "" - "" - "" - //"", - "
IDActiveFreqLaunchsiteMode
%d", - i + 1, - i + 1, (i < sonde.nSonde && sonde.sondeList[i].active) ? "checked" : "", - i + 1, i >= sonde.nSonde ? 400.000 : sonde.sondeList[i].freq, - i + 1, i >= sonde.nSonde ? " " : sonde.sondeList[i].launchsite, - i + 1, i >= sonde.nSonde ? 2 : sondeTypeChar[sonde.sondeList[i].type] ); - //i + 1, s.c_str()); - } - strcat(ptr, "
"); -#endif //
"); HTMLSAVEBUTTON(ptr); HTMLBODYEND(ptr); @@ -620,110 +601,6 @@ void setupConfigData() { } -#if 0 -struct st_configitems config_list[] = { - /* General config settings */ - {"", "Software configuration", -5, NULL}, - {"wifi", "Wifi mode (0-Off/1-Client/2-Access Point/3-Debug)", 0, &sonde.config.wifi}, - {"debug", "Debug mode (0/1)", 0, &sonde.config.debug}, - {"maxsonde", "Maxsonde (max # QRG entries)", 0, &sonde.config.maxsonde}, - {"screenfile", "Screen config (0=automatic; 1-5=predefined; other=custom)", 0, &sonde.config.screenfile}, - {"display", "Display screens (scan,default,...)", -6, sonde.config.display}, - /* Spectrum display settings */ - {"spectrum", "Show spectrum (-1=no, 0=forever, >0=seconds)", 0, &sonde.config.spectrum}, - {"startfreq", "Startfreq (MHz)", 0, &sonde.config.startfreq}, - {"channelbw", "Bandwidth (kHz)", 0, &sonde.config.channelbw}, - {"marker", "Spectrum MHz marker", 0, &sonde.config.marker}, - {"noisefloor", "Spectrum noisefloor", 0, &sonde.config.noisefloor}, - /* decoder settings */ - {"", "Receiver configuration", -5, NULL}, - {"freqofs", "RX frequency offset (Hz)", 0, &sonde.config.freqofs}, - {"rs41.agcbw", "RS41 AGC bandwidth", 0, &sonde.config.rs41.agcbw}, - {"rs41.rxbw", "RS41 RX bandwidth", 0, &sonde.config.rs41.rxbw}, - {"rs92.rxbw", "RS92 RX (and AGC) bandwidth", 0, &sonde.config.rs92.rxbw}, - {"rs92.alt2d", "RS92 2D fix default altitude", 0, &sonde.config.rs92.alt2d}, - {"dfm.agcbw", "DFM AGC bandwidth", 0, &sonde.config.dfm.agcbw}, - {"dfm.rxbw", "DFM RX bandwidth", 0, &sonde.config.dfm.rxbw}, - {"m10m20.agcbw", "M10/M20 AGC bandwidth", 0, &sonde.config.m10m20.agcbw}, - {"m10m20.rxbw", "M10/M20 RX bandwidth", 0, &sonde.config.m10m20.rxbw}, - {"mp3h.agcbw", "MP3H AGC bandwidth", 0, &sonde.config.mp3h.agcbw}, - {"mp3h.rxbw", "MP3H RX bandwidth", 0, &sonde.config.mp3h.rxbw}, - {"ephftp", "FTP for eph (RS92)", 39, &sonde.config.ephftp}, - {"", "Data feed configuration", -5, NULL}, - /* APRS settings */ - {"call", "Call", 8, sonde.config.call}, - {"passcode", "Passcode", 0, &sonde.config.passcode}, - /* KISS tnc settings */ - {"kisstnc.active", "KISS TNC (port 14590) (needs reboot)", 0, &sonde.config.kisstnc.active}, - {"kisstnc.idformat", "KISS TNC ID Format", -2, &sonde.config.kisstnc.idformat}, - /* AXUDP settings */ - {"axudp.active", "AXUDP active", -3, &sonde.config.udpfeed.active}, - {"axudp.host", "AXUDP Host", 63, sonde.config.udpfeed.host}, - {"axudp.port", "AXUDP Port", 0, &sonde.config.udpfeed.port}, - {"axudp.idformat", "DFM ID Format", -2, &sonde.config.udpfeed.idformat}, - {"axudp.highrate", "Rate limit", 0, &sonde.config.udpfeed.highrate}, - /* APRS TCP settings, current not used */ - {"tcp.active", "APRS TCP active", -3, &sonde.config.tcpfeed.active}, - {"tcp.host", "ARPS TCP Host", 63, sonde.config.tcpfeed.host}, - {"tcp.port", "APRS TCP Port", 0, &sonde.config.tcpfeed.port}, - {"tcp.idformat", "DFM ID Format", -2, &sonde.config.tcpfeed.idformat}, - {"tcp.highrate", "Rate limit", 0, &sonde.config.tcpfeed.highrate}, - -#if FEATURE_MQTT - /* MQTT */ - {"mqtt.active", "MQTT Active (needs reboot)", 0, &sonde.config.mqtt.active}, - {"mqtt.id", "MQTT client ID", 63, &sonde.config.mqtt.id}, - {"mqtt.host", "MQTT server hostname", 63, &sonde.config.mqtt.host}, - {"mqtt.port", "MQTT Port", 0, &sonde.config.mqtt.port}, - {"mqtt.username", "MQTT Username", 63, &sonde.config.mqtt.username}, - {"mqtt.password", "MQTT Password", 63, &sonde.config.mqtt.password}, - {"mqtt.prefix", "MQTT Prefix", 63, &sonde.config.mqtt.prefix}, -#endif - - /* Hardware dependeing settings */ - {"", "Hardware configuration (requires reboot)", -5, NULL}, - {"disptype", "Display type (0=OLED/SSD1306, 1=ILI9225, 2=OLED/SH1106, 3=ILI9341, 4=ILI9342)", 0, &sonde.config.disptype}, - {"norx_timeout", "No-RX-Timeout in seconds (-1=disabled)", 0, &sonde.config.norx_timeout}, - {"oled_sda", "OLED SDA/TFT SDA", 0, &sonde.config.oled_sda}, - {"oled_scl", "OLED SCL/TFT CLK", 0, &sonde.config.oled_scl}, - {"oled_rst", "OLED RST/TFT RST (needs reboot)", 0, &sonde.config.oled_rst}, - {"tft_rs", "TFT RS", 0, &sonde.config.tft_rs}, - {"tft_cs", "TFT CS", 0, &sonde.config.tft_cs}, - {"tft_orient", "TFT orientation (0/1/2/3), OLED flip: 3", 0, &sonde.config.tft_orient}, - {"tft_spifreq", "TFT SPI speed", 0, &sonde.config.tft_spifreq}, - {"button_pin", "Button input port", -4, &sonde.config.button_pin}, - {"button2_pin", "Button 2 input port", -4, &sonde.config.button2_pin}, - {"button2_axp", "Use AXP192 PWR as Button 2", 0, &sonde.config.button2_axp}, - {"touch_thresh", "Touch button threshold
(0 for calib mode)", 0, &sonde.config.touch_thresh}, - {"power_pout", "Power control port", 0, &sonde.config.power_pout}, - {"led_pout", "LED output port", 0, &sonde.config.led_pout}, - {"gps_rxd", "GPS RXD pin (-1 to disable)", 0, &sonde.config.gps_rxd}, - {"gps_txd", "GPS TXD pin (not really needed)", 0, &sonde.config.gps_txd}, - {"batt_adc", "Battery measurement pin", 0, &sonde.config.batt_adc}, -#if 1 - {"sx1278_ss", "SX1278 SS", 0, &sonde.config.sx1278_ss}, - {"sx1278_miso", "SX1278 MISO", 0, &sonde.config.sx1278_miso}, - {"sx1278_mosi", "SX1278 MOSI", 0, &sonde.config.sx1278_mosi}, - {"sx1278_sck", "SX1278 SCK", 0, &sonde.config.sx1278_sck}, -#endif - {"mdnsname", "mDNS name", 14, &sonde.config.mdnsname}, - -#if FEATURE_SONDEHUB - /* SondeHub settings */ - {"", "SondeHub settings", -5, NULL}, - {"sondehub.active", "SondeHub reporting (0=disabled, 1=active)", 0, &sonde.config.sondehub.active}, - {"sondehub.chase", "SondeHub location reporting (0=off, 1=fixed, 2=chase/GPS, 3=auto)", 0, &sonde.config.sondehub.chase}, - {"sondehub.host", "SondeHub host (DO NOT CHANGE)", 63, &sonde.config.sondehub.host}, - {"sondehub.callsign", "Callsign", 63, &sonde.config.sondehub.callsign}, - {"sondehub.lat", "Latitude (optional, required to show station on SondeHub Tracker)", -7, &sonde.config.sondehub.lat}, - {"sondehub.lon", "Longitude (optional, required to show station on SondeHub Tracker)", -7, &sonde.config.sondehub.lon}, - {"sondehub.alt", "Altitude (optional, visible on SondeHub tracker)", 19, &sonde.config.sondehub.alt}, - {"sondehub.antenna", "Antenna (optional, visisble on SondeHub tracker)", 63, &sonde.config.sondehub.antenna}, - {"sondehub.email", "SondeHub email (optional, only used to contact in case of upload errors)", 63, &sonde.config.sondehub.email}, - {"sondehub.fimport", "SondeHub freq import (interval/maxdist/maxage [min/km/min])", 18, &sonde.config.sondehub.fimport}, -}; -#endif -#else struct st_configitems config_list[] = { /* General config settings */ {"wifi", 0, &sonde.config.wifi}, @@ -829,72 +706,9 @@ struct st_configitems config_list[] = { {"sondehub.fimaxage", 0, &sonde.config.sondehub.fimaxage}, #endif }; -#endif const int N_CONFIG = (sizeof(config_list) / sizeof(struct st_configitems)); -#if 0 -// old code, no longer needed (in js now) - -void addConfigStringEntry(char *ptr, int idx, const char *label, int len, char *field) { - sprintf(ptr + strlen(ptr), "%s\n", - label, idx, field); -} -void addConfigNumEntry(char *ptr, int idx, const char *label, int *value) { - sprintf(ptr + strlen(ptr), "%s\n", - label, idx, *value); -} -void addConfigDblEntry(char *ptr, int idx, const char *label, double * value) { - sprintf(ptr + strlen(ptr), "%s\n", - label, idx, *value); -} -void addConfigButtonEntry(char *ptr, int idx, const char *label, int *value) { - int v = *value, ck = 0; - if (v == 255) v = -1; - if (v != -1) { - if (v & 128) ck = 1; - v = v & 127; - } - - sprintf(ptr + strlen(ptr), "%s", - label, idx, v); - sprintf(ptr + strlen(ptr), " Touch \n", idx, ck ? " checked" : ""); -} -void addConfigTypeEntry(char *ptr, int idx, const char *label, int *value) { - // TODO -} -void addConfigOnOffEntry(char *ptr, int idx, const char *label, int *value) { - // TODO -} -void addConfigSeparatorEntry(char *ptr) { - strcat(ptr, "
\n"); -} -void addConfigHeading(char *ptr, const char *label) { - strcat(ptr, ""); - strcat(ptr, label); - strcat(ptr, "\n"); -} -void addConfigInt8List(char *ptr, int idx, const char *label, int8_t *list) { - sprintf(ptr + strlen(ptr), "%s using /screens%d.txt", label, Display::getScreenIndex(sonde.config.screenfile)); - for (int i = 0; i < disp.nLayouts; i++) { - sprintf(ptr + strlen(ptr), "
%d=%s", i, disp.layouts[i].label); - } - sprintf(ptr + strlen(ptr), "\n"); -} -#endif - const char *createConfigForm() { char *ptr = message; strcpy(ptr, HTMLHEAD); strcat(ptr, ""); @@ -941,43 +755,6 @@ const char *createConfigForm() { strcat(ptr, "\");\n"); } strcat(ptr, "configTable();\n "); -#if 0 - strcat(ptr, ""); - for (int i = 0; i < N_CONFIG; i++) { - Serial.printf("%d: %s -- %d\n", i, config_list[i].label, strlen(ptr)); - switch (config_list[i].type) { - case -5: // Heading - addConfigHeading(ptr, config_list[i].label); - break; - case -6: // List of int8 values - addConfigInt8List(ptr, i, config_list[i].label, (int8_t *)config_list[i].data); - break; - case -3: // on/off - addConfigOnOffEntry(ptr, i, config_list[i].label, (int *)config_list[i].data); - break; - case -2: // DFM format - addConfigTypeEntry(ptr, i, config_list[i].label, (int *)config_list[i].data); - break; - case -1: - addConfigSeparatorEntry(ptr); - break; - case 0: - addConfigNumEntry(ptr, i, config_list[i].label, (int *)config_list[i].data); - break; - case -4: - addConfigButtonEntry(ptr, i, config_list[i].label, (int *)config_list[i].data); - break; - case -7: /* double for lat/lon */ - addConfigDblEntry(ptr, i, config_list[i].label, (double *)config_list[i].data); - break; - default: - addConfigStringEntry(ptr, i, config_list[i].label, config_list[i].type, (char *)config_list[i].data); - break; - } - } - strcat(ptr, "
OptionValue
"); - //
"); -#endif HTMLSAVEBUTTON(ptr); HTMLBODYEND(ptr); Serial.printf("Config form: size=%d bytes\n", strlen(message)); @@ -1007,12 +784,6 @@ const char *handleConfigPost(AsyncWebServerRequest * request) { String strlabel = request->getParam(i)->name(); const char *label = strlabel.c_str(); if (label[strlen(label) - 1] == '#') continue; -#if 0 - if (strncmp(label, "CFG", 3) != 0) continue; - int idx = atoi(label + 3); - Serial.printf("idx is %d\n", idx); - if (config_list[idx].type == -1) continue; // skip separator entries, should not happen -#endif AsyncWebParameter *value = request->getParam(label, true); if (!value) continue; String strvalue = value->value(); @@ -1025,19 +796,6 @@ const char *handleConfigPost(AsyncWebServerRequest * request) { strvalue = String(i); } } -#if 0 - if (config_list[idx].type == -4) { // input button port with "touch" checkbox - char tmp[10]; - snprintf(tmp, 10, "TO%d", idx); - AsyncWebParameter *touch = request->getParam(tmp, true); - if (touch) { - int i = atoi(strvalue.c_str()); - if (i != -1 && i != 255) i += 128; - strvalue = String(i); - } - } - Serial.printf("Processing %s=%s\n", config_list[idx].name, strvalue.c_str()); -#endif Serial.printf("Processing %s=%s\n", label, strvalue.c_str()); //int wlen = f.printf("%s=%s\n", config_list[idx].name, strvalue.c_str()); int wlen = f.printf("%s=%s\n", label, strvalue.c_str()); @@ -1379,21 +1137,6 @@ const char *sendGPX(AsyncWebServerRequest * request) { return message; } -#if 0 -// no longer supported -// tcp socket / json for android app is used now -void onWsEvent(AsyncWebSocket * server, AsyncWebSocketClient * client, AwsEventType type, void * arg, uint8_t *data, size_t len) { - if (type == WS_EVT_CONNECT) { - Serial.println("Websocket client connection received"); - client->text("Hello from ESP32 Server"); - //globalClient = client; - } else if (type == WS_EVT_DISCONNECT) { - Serial.println("Client disconnected"); - globalClient = NULL; - } -} -#endif - const char* PARAM_MESSAGE = "message"; void SetupAsyncServer() {