From 62240088b444caafca6e1442ce7c678051d2f9f2 Mon Sep 17 00:00:00 2001 From: Pawel Jalocha Date: Mon, 20 Mar 2023 11:39:17 +0000 Subject: [PATCH] Corrected cnfig files --- FollowMe.cfg | 47 +++++++++++++++++++++++++++++++---------------- T-Beam_v10.cfg | 26 ++++++++++++++++++++++---- 2 files changed, 53 insertions(+), 20 deletions(-) diff --git a/FollowMe.cfg b/FollowMe.cfg index 82ebb17..f65a9b0 100644 --- a/FollowMe.cfg +++ b/FollowMe.cfg @@ -3,6 +3,20 @@ #define DEFAULT_CONbaud 115200 #define DEFAULT_PPSdelay 100 #define DEFAULT_FreqPlan 0 +#define DEFAULT_DispPage 3 // Fab501 Page to Display After Boot or Reset + +#define WIFI_ADDRESS_IP1 192 // 192.168.1.1 for IP Address +#define WIFI_ADDRESS_IP2 168 +#define WIFI_ADDRESS_IP3 1 +#define WIFI_ADDRESS_IP4 1 +#define WIFI_ADDRESS_GW1 0 // 0.0.0.0 for Gateway +#define WIFI_ADDRESS_GW2 0 +#define WIFI_ADDRESS_GW3 0 +#define WIFI_ADDRESS_GW4 0 +#define WIFI_ADDRESS_MK1 255 // 255.255.255.0 for Mask +#define WIFI_ADDRESS_MK2 255 +#define WIFI_ADDRESS_MK3 255 +#define WIFI_ADDRESS_MK4 0 // #define WITH_HELTEC // HELTEC module: PCB LED on GPI025 // #define WITH_TTGO // TTGO module: PCB LED on GPIO2, GPIO25 free to use as DAC2 output @@ -20,12 +34,13 @@ #define WITH_U8G2_SH1106 // the bigger OLED controller #define WITH_U8G2_FLIP // flip the OLED screen -#define WITH_RFM95 // RF chip selection: FollowMe, HELTEC and TTGO use sx1276 which is same as RFM95 module +#define WITH_RFM95 // RF chip selection: both HELTEC and TTGO use sx1276 which is same as RFM95 +// #define WITH_SX1262 // RF chip selection: both HELTEC and TTGO use sx1276 which is same as RFM95 // #define WITH_SLEEP // with software sleep mode controlled by the long-press on the button // #define WITH_AXP // with AXP192 power controller (T-BEAM V1.0) -#define WITH_BQ // with BQ24295 power controller (new FollowMe) +#define WITH_BQ // with BQ24295 power controller (FollowMe) // #define WITH_LED_RX // #define WITH_LED_TX @@ -40,15 +55,15 @@ // #define WITH_MAVLINK // #define WITH_GPS_UBX_PASS // to pass directly UBX packets to/from GPS -// #define WITH_GPS_NMEA_PASS // to pass directly NMEA to/from GPS +// #define WITH_GPS_NMEA_PASS // to pass directly NMEA to/from GPS // #define WITH_BMP180 // BMP180 pressure sensor // #define WITH_BMP280 // BMP280 pressure sensor -#define WITH_BME280 // BMP280 with humidity (still works with BMP280) +#define WITH_BME280 // BMP280 with humidity (but still works with BMP280) // #define WITH_MS5607 // MS5607 pressure sensor -#define WITH_PFLAA // $PFLAU and $PFLAA for compatibility with XCsoar and LK8000 -// #define WITH_POGNT // $POGNT for traffic info +#define WITH_PFLAA // PFLAU and PFLAA for compatibility with XCsoar and LK8000 +// #define WITH_POGNT #define WITH_LOOKOUT #define WITH_CONFIG // interpret the console input: $POGNS to change parameters @@ -59,23 +74,23 @@ // #define WITH_KNOB // #define WITH_VARIO -#define WITH_LORAWAN // LoRaWAN TTN connectivity -// #define WITH_PAW // beta-code for PilotAware transmission -// #define WITH_FANET // beta-code for FANET transmissions, but breaks LoRaWAN, to be improved +#define WITH_ADSL +// #define WITH_PAW +// #define WITH_FANET +#define WITH_LORAWAN -#define WITH_AP // create WiFi Access Point for data, setup and log files -#define WITH_AP_BUTTON // activate Access Point only when button pressed at startup -#define WITH_HTTP // HTTP server, works with AP and Stratux -#define WITH_BT_SPP // (classic) Bluetooth serial port for smartphone/tablet link - -// #define WITH_STRATUX // beta-code: connect to Stratux WiFi and send GPS and traffic info +#define WITH_AP // WiFi Access Point: can work together with BT_SPP +// #define WITH_AP_BUTTON // only starts when button pressed at sartup +// #define WITH_BT_SPP // Bluetooth serial port for smartphone/tablet link: can work together with WiFi Access point +// #define WITH_STRATUX // beta-code: connect to Stratux WiFi and serve as GPS and OGN transmitter/receiver // #define WITH_APRS // alpha-code: attempt to connect to the wifi router for uploading the log files to APRS +#define WITH_HTTP // HTTP server, works with AP dna should work with Stratux as well + #define WITH_SD // use the SD card in SPI mode and FAT file system #define WITH_SPIFFS_FAT #define WITH_SPIFFS // use SPIFFS file system in Flash #define WITH_LOG // log own positions and other received to SPIFFS and possibly to uSD -#define WITH_SDLOG // // #define WITH_ENCRYPT // Encrypt (optionally) the position diff --git a/T-Beam_v10.cfg b/T-Beam_v10.cfg index 160f00c..43c2ad5 100644 --- a/T-Beam_v10.cfg +++ b/T-Beam_v10.cfg @@ -3,6 +3,20 @@ #define DEFAULT_CONbaud 115200 #define DEFAULT_PPSdelay 100 #define DEFAULT_FreqPlan 0 +#define DEFAULT_DispPage 3 // Fab501 Page to Display After Boot or Reset + +#define WIFI_ADDRESS_IP1 192 // 192.168.1.1 for IP Address +#define WIFI_ADDRESS_IP2 168 +#define WIFI_ADDRESS_IP3 1 +#define WIFI_ADDRESS_IP4 1 +#define WIFI_ADDRESS_GW1 0 // 0.0.0.0 for Gateway +#define WIFI_ADDRESS_GW2 0 +#define WIFI_ADDRESS_GW3 0 +#define WIFI_ADDRESS_GW4 0 +#define WIFI_ADDRESS_MK1 255 // 255.255.255.0 for Mask +#define WIFI_ADDRESS_MK2 255 +#define WIFI_ADDRESS_MK3 255 +#define WIFI_ADDRESS_MK4 0 // #define WITH_HELTEC // HELTEC module: PCB LED on GPI025 // #define WITH_TTGO // TTGO module: PCB LED on GPIO2, GPIO25 free to use as DAC2 output @@ -19,6 +33,7 @@ // #define WITH_U8G2_OLED // I2C OLED through the U8g2 library #define WITH_RFM95 // RF chip selection: both HELTEC and TTGO use sx1276 which is same as RFM95 +// #define WITH_SX1262 // RF chip selection: both HELTEC and TTGO use sx1276 which is same as RFM95 // #define WITH_SLEEP // with software sleep mode controlled by the long-press on the button @@ -51,19 +66,22 @@ #define WITH_CONFIG // interpret the console input: $POGNS to change parameters -#define WITH_BEEPER // with digital buzzer +// #define WITH_BEEPER // with digital buzzer // #define WITH_SOUND // with analog sound produced by DAC on pin 25 // #define WITH_KNOB // #define WITH_VARIO +#define WITH_ADSL +// #define WITH_PAW +// #define WITH_FANET #define WITH_LORAWAN #define WITH_AP // WiFi Access Point: can work together with BT_SPP -#define WITH_AP_BUTTON // only starts when button pressed at sartup -#define WITH_BT_SPP // Bluetooth serial port for smartphone/tablet link: can work together with WiFi Access point +// #define WITH_AP_BUTTON // only starts when button pressed at sartup +// #define WITH_BT_SPP // Bluetooth serial port for smartphone/tablet link: can work together with WiFi Access point // #define WITH_STRATUX // beta-code: connect to Stratux WiFi and serve as GPS and OGN transmitter/receiver -#define WITH_APRS // alpha-code: attempt to connect to the wifi router for uploading the log files to APRS +// #define WITH_APRS // alpha-code: attempt to connect to the wifi router for uploading the log files to APRS #define WITH_HTTP // HTTP server, works with AP dna should work with Stratux as well