From 6bf7c87f2ca069b71074e4c8d940c87f2b7c0567 Mon Sep 17 00:00:00 2001 From: Rysiek Labus Date: Mon, 15 Mar 2021 12:21:08 +0100 Subject: [PATCH] some clean up --- platformio.ini | 2 +- src/TTGO_T-Beam_LoRa_APRS.ino | 2 -- src/TTGO_T-Beam_LoRa_APRS_config.h | 52 ++++++++++++++++++------------ 3 files changed, 32 insertions(+), 24 deletions(-) diff --git a/platformio.ini b/platformio.ini index c55faaf..5555804 100644 --- a/platformio.ini +++ b/platformio.ini @@ -9,7 +9,7 @@ ; https://docs.platformio.org/page/projectconf.html [env] -platform = espressif32 @ +platform = espressif32 framework = arduino monitor_speed = 115200 diff --git a/src/TTGO_T-Beam_LoRa_APRS.ino b/src/TTGO_T-Beam_LoRa_APRS.ino index cfcacae..32e3d27 100644 --- a/src/TTGO_T-Beam_LoRa_APRS.ino +++ b/src/TTGO_T-Beam_LoRa_APRS.ino @@ -658,8 +658,6 @@ void setup(){ time_to_refresh = millis() + showRXTime; displayInvalidGPS(); digitalWrite(TXLED, HIGH); - Serial.begin(115200); - Serial.println('boot'); } // +---------------------------------------------------------------------+// diff --git a/src/TTGO_T-Beam_LoRa_APRS_config.h b/src/TTGO_T-Beam_LoRa_APRS_config.h index 33242cd..0343d59 100644 --- a/src/TTGO_T-Beam_LoRa_APRS_config.h +++ b/src/TTGO_T-Beam_LoRa_APRS_config.h @@ -6,32 +6,42 @@ // licensed under CC BY-NC-SA // USER DATA - USE THESE LINES TO MODIFY YOUR PREFERENCES -#define KISS_PROTOCOL // If enabled send and receive data in SIMPLE KISS format to serial port -#define CALLSIGN "NOCALL-0" //this option is available via WWW // enter your callsign here - less then 6 letter callsigns please add "spaces" so total length is 6 (without SSID) -#define DIGI_PATH "ECHO" //this option is available via WWW // one hope, please use simple ECHO alias -#define FIXED_BEACON_EN //this option is available via WWW // allows cyclic sending of a bicon when GPS is turned off -#define LATIDUDE_PRESET "0000.00N" //this option is available via WWW // please in APRS notation: DDMM.mmN or DDMM.mmS (used for manual or fixed beacon sending) -#define LONGITUDE_PRESET "00000.00E" //this option is available via WWW // please in APRS notation: DDDMM.mmE or DDDMM.mmW (used for manual or fixed beacon sending) -#define APRS_SYMBOL_TABLE "/" //this option is available via WWW // set primary or secondary symbols table -#define APRS_SYMBOL "[" //this option is available via WWW // other symbols are: "[" => RUNNER, "b" => BICYCLE, "<" => MOTORCYCLE, "R" => Recreation Vehicle -#define MY_COMMENT "Lora Tracker" //this option is available via WWW // add your coment here - if empty then no comment is sent max 64 bytes -//#define SHOW_ALT //this option is available via WWW // send Altitude in frame -#define SHOW_BATT //this option is available via WWW // send battery voltage at the end of comment (we need beggining for QSY message format) -#define SHOW_RX_PACKET //this option is available via WWW // uncomment to show received LoRa APS packets for the time given below -#define SHOW_RX_TIME 10000 //this option is available via WWW // show RX packet for milliseconds (5000 = 5secs) +#define KISS_PROTOCOL // If enabled send and receive data in SIMPLE KISS format to serial, bluetooth and tcp port +#define CALLSIGN "NOCALL-0" // this option is available via WWW // enter your callsign here - less then 6 letter callsigns please add "spaces" so total length is 6 (without SSID) +#define DIGI_PATH "ECHO" // this option is available via WWW // one hope, please use simple ECHO alias +#define FIXED_BEACON_EN // this option is available via WWW // allows cyclic sending of a bicon when GPS is turned off +#define LATIDUDE_PRESET "0000.00N" // this option is available via WWW // please in APRS notation: DDMM.mmN or DDMM.mmS (used for manual or fixed beacon sending) +#define LONGITUDE_PRESET "00000.00E" // this option is available via WWW // please in APRS notation: DDDMM.mmE or DDDMM.mmW (used for manual or fixed beacon sending) +#define APRS_SYMBOL_TABLE "/" // this option is available via WWW // set primary or secondary symbols table +#define APRS_SYMBOL "[" // this option is available via WWW // other symbols are: "[" => RUNNER, "b" => BICYCLE, "<" => MOTORCYCLE, "R" => Recreation Vehicle +#define MY_COMMENT "Lora Tracker" // this option is available via WWW // add your coment here - if empty then no comment is sent max 64 bytes +#define SHOW_ALT // this option is available via WWW // send Altitude in frame +#define SHOW_BATT // this option is available via WWW // send battery voltage at the end of comment (we need beggining for QSY message format) +#define SHOW_RX_PACKET // this option is available via WWW // uncomment to show received LoRa APS packets for the time given below +#define SHOW_RX_TIME 10000 // this option is available via WWW // show RX packet for milliseconds (5000 = 5secs) #define TXFREQ 433.775 // Set transmit frequency in MHz -#define TXdbmW 20 // Set transmit power in dBm 17-50mW, 18-63mW, 19-80mW, 20-100mW -//#define ENABLE_BLUETOOTH //this option is available via WWW // bluetooth KISS interface enable -#define ENABLE_OLED //this option is available via WWW // enable oled -//#define ENABLE_LED_SIGNALING // enable red and blue led signalling -//#define BLUETOOTH_PIN "0000" // bluetooth pairing pin +#define TXdbmW 20 // Set transmit power in dBm 17-50mW, 18-63mW, 19-80mW, 20-100mW +#define ENABLE_OLED // this option is available via WWW // enable oled +#define ENABLE_LED_SIGNALING // enable red and blue led signalling //#define ENABLE_TNC_SELF_TELEMETRY // //#define LOCAL_KISS_ECHO // echoing KISS frame back -//#define T_BEAM_V1_0 // if enabled t-beam v1.0 disabled t-beam V.0.7 //#define KISS_DEBUG // -#define ENABLE_WIFI // enable WiFi conection do not turn off #define NETWORK_TNC_PORT 8001 // Set KISS TCP Port //#define ENABLE_WIFI_CLIENT_DEBUG // #define MAX_TIME_TO_NEXT_TX 360000L // TRANSMIT INTERVAL set here MAXIMUM time in ms(!) for smart beaconing - minimum time is always 1 min = 60 secs = 60000L !!! #define FIX_BEACON_INTERVAL 1800000L // Fixed beacon interwal (when GPS is disabled and FIXED_BEACON_EN is enabled) 30min default -//#define TNC_SELF_TELEMETRY_INTERVAL (5 * 60 * 1000) // \ No newline at end of file +//#define TNC_SELF_TELEMETRY_INTERVAL (5 * 60 * 1000) // + +#ifdef T_BEAM_V1_0 + #define ENABLE_WIFI // enable WiFi conection do not turn off + #define ENABLE_BLUETOOTH // if enabled here this option is available via WWW // bluetooth KISS interface enabl + //#define BLUETOOTH_PIN "0000" // bluetooth pairing pin +#elif T_BEAM_V0_7 + #define ENABLE_WIFI // enable WiFi conection do not turn off + #define ENABLE_BLUETOOTH // if enabled here this option is available via WWW // bluetooth KISS interface enabl + //#define BLUETOOTH_PIN "0000" // bluetooth pairing pin +#else + #define ENABLE_WIFI // enable WiFi conection + //#define ENABLE_BLUETOOTH // Lora32 board WiFi or Bluetooth + //#define BLUETOOTH_PIN "0000" // bluetooth pairing pin +#endif \ No newline at end of file