diff --git a/data/igate_conf.json b/data/igate_conf.json index 3c53cea..681c02a 100644 --- a/data/igate_conf.json +++ b/data/igate_conf.json @@ -13,7 +13,7 @@ "comment": "LoRa APRS", "interval": 15, "overlay": "L", - "symbol": "#", + "symbol": "a", "path": "WIDE1-1", "sendViaAPRSIS": false, "sendViaRF": false @@ -62,4 +62,4 @@ "externalVoltageMeasurement": false, "externalVoltagePin": 34 } -} +} \ No newline at end of file diff --git a/images/Web001-Station.png b/images/Web001-Station.png new file mode 100644 index 0000000..109a7ee Binary files /dev/null and b/images/Web001-Station.png differ diff --git a/images/Web002-AutoAP.png b/images/Web002-AutoAP.png new file mode 100644 index 0000000..478ce2f Binary files /dev/null and b/images/Web002-AutoAP.png differ diff --git a/images/Web003-WiFi Access.png b/images/Web003-WiFi Access.png new file mode 100644 index 0000000..f5c0bea Binary files /dev/null and b/images/Web003-WiFi Access.png differ diff --git a/images/Web004-APRS-IS.png b/images/Web004-APRS-IS.png new file mode 100644 index 0000000..6c2f041 Binary files /dev/null and b/images/Web004-APRS-IS.png differ diff --git a/images/Web005-Display.png b/images/Web005-Display.png new file mode 100644 index 0000000..9f81da3 Binary files /dev/null and b/images/Web005-Display.png differ diff --git a/images/Web006-Digirepeating.png b/images/Web006-Digirepeating.png new file mode 100644 index 0000000..4c02813 Binary files /dev/null and b/images/Web006-Digirepeating.png differ diff --git a/images/Web007-OTA.png b/images/Web007-OTA.png new file mode 100644 index 0000000..667732e Binary files /dev/null and b/images/Web007-OTA.png differ diff --git a/images/Web008-Telemetry.png b/images/Web008-Telemetry.png new file mode 100644 index 0000000..006a809 Binary files /dev/null and b/images/Web008-Telemetry.png differ diff --git a/images/Web009-Beaconing.png b/images/Web009-Beaconing.png new file mode 100644 index 0000000..2332c0a Binary files /dev/null and b/images/Web009-Beaconing.png differ diff --git a/images/Web010-Syslog.png b/images/Web010-Syslog.png new file mode 100644 index 0000000..5711915 Binary files /dev/null and b/images/Web010-Syslog.png differ diff --git a/images/Web011-LoRa.png b/images/Web011-LoRa.png new file mode 100644 index 0000000..963083d Binary files /dev/null and b/images/Web011-LoRa.png differ diff --git a/platformio.ini b/platformio.ini index 231db75..a3c5efc 100644 --- a/platformio.ini +++ b/platformio.ini @@ -79,9 +79,13 @@ build_flags = -Werror -Wall -DTTGO_T_Beam_V1_0_SX1268 -DELEGANTOTA_USE_ASYNC_WEB board = ttgo-t-beam build_flags = -Werror -Wall -DTTGO_T_Beam_V1_2_SX1262 -DELEGANTOTA_USE_ASYNC_WEBSERVER=1 -[env:heltec_wireless_stick_lite] -platform = espressif32 -board = heltec_wireless_stick_lite -board_build.mcu = esp32c3 -board_build.f_cpu = 240000000L -build_flags = -Werror -Wall -DHELTEC_CT62 -DELEGANTOTA_USE_ASYNC_WEBSERVER=1 \ No newline at end of file +[env:heltec_wireless_stick] +board = heltec_wifi_lora_32_V3 +board_build.mcu = esp32s3 +build_flags = -Werror -Wall -DHELTEC_WS -DELEGANTOTA_USE_ASYNC_WEBSERVER=1 + +;[env:heltec_wireless_stick_lite] +;board = heltec_wireless_stick_lite +;board_build.mcu = esp32c3 +;board_build.f_cpu = 240000000L +;build_flags = -Werror -Wall -DHELTEC_WSL -DELEGANTOTA_USE_ASYNC_WEBSERVER=1 \ No newline at end of file diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp index 09bc4ee..7be6f2c 100644 --- a/src/LoRa_APRS_iGate.cpp +++ b/src/LoRa_APRS_iGate.cpp @@ -22,7 +22,7 @@ Configuration Config; WiFiClient espClient; -String versionDate = "2024.03.08"; +String versionDate = "2024.03.09"; int myWiFiAPIndex = 0; int myWiFiAPSize = Config.wifiAPs.size(); WiFi_AP *currentWiFi = &Config.wifiAPs[myWiFiAPIndex]; @@ -58,7 +58,7 @@ void setup() { #if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2) pinMode(batteryPin, INPUT); #endif - #if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2) || defined(HELTEC_V3) || defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_1W_LoRa) + #ifdef HAS_INTERNAL_LED pinMode(internalLedPin, OUTPUT); #endif if (Config.externalVoltageMeasurement) { diff --git a/src/lora_utils.cpp b/src/lora_utils.cpp index 45c35be..76fb4db 100644 --- a/src/lora_utils.cpp +++ b/src/lora_utils.cpp @@ -9,7 +9,7 @@ extern Configuration Config; -#if defined(HELTEC_V3) || defined(TTGO_T_Beam_V1_2_SX1262) +#if defined(HELTEC_V3) || defined(HELTEC_WS) || defined(TTGO_T_Beam_V1_2_SX1262) SX1262 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN); bool transmissionFlag = true; bool enableInterrupt = true; @@ -69,7 +69,7 @@ namespace LoRa_Utils { #if defined(ESP32_DIY_1W_LoRa) radio.setRfSwitchPins(RADIO_RXEN, RADIO_TXEN); #endif - #if defined(HELTEC_V3) || defined(TTGO_T_Beam_V1_0_SX1268) || defined(TTGO_T_Beam_V1_2_SX1262) + #if defined(HELTEC_V3) || defined(HELTEC_WS) || defined(TTGO_T_Beam_V1_0_SX1268) || defined(TTGO_T_Beam_V1_2_SX1262) state = radio.setOutputPower(Config.loramodule.power + 2); // values available: 10, 17, 22 --> if 20 in tracker_conf.json it will be updated to 22. #endif #ifdef ESP32_DIY_1W_LoRa_GPS @@ -113,7 +113,7 @@ namespace LoRa_Utils { changeFreqTx(); } - #if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2) || defined(HELTEC_V3) || defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_1W_LoRa) + #ifdef HAS_INTERNAL_LED digitalWrite(internalLedPin,HIGH); #endif #ifdef HAS_SX127X @@ -141,7 +141,7 @@ namespace LoRa_Utils { Serial.println(state); } #endif - #if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2) || defined(HELTEC_V3) || defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_1W_LoRa) + #ifdef HAS_INTERNAL_LED digitalWrite(internalLedPin,LOW); #endif SYSLOG_Utils::log("Tx", newPacket,0,0,0); diff --git a/src/pins_config.h b/src/pins_config.h index 96d92cf..8b60d0a 100644 --- a/src/pins_config.h +++ b/src/pins_config.h @@ -7,7 +7,7 @@ #undef OLED_SCL #undef OLED_RST -#if defined(HELTEC_V3) || defined(ESP32_DIY_1W_LoRa) || defined(TTGO_T_Beam_V1_0_SX1268) || defined(TTGO_T_Beam_V1_2_SX1262) +#if defined(HELTEC_V3) || defined(HELTEC_WS) || defined(ESP32_DIY_1W_LoRa) || defined(TTGO_T_Beam_V1_0_SX1268) || defined(TTGO_T_Beam_V1_2_SX1262) #define HAS_SX126X #endif @@ -34,7 +34,7 @@ #define LORA_IRQ 26 // GPIO26 - SX1276 IRQ ---->DIO0 #endif -#ifdef HELTEC_V3 +#if defined(HELTEC_V3) || defined(HELTEC_WS) #define RADIO_SCLK_PIN 9 // SX1262 SCK #define RADIO_MISO_PIN 11 // SX1262 MISO #define RADIO_MOSI_PIN 10 // SX1262 MOSI @@ -78,21 +78,26 @@ #ifdef HELTEC_V2 #define OLED_SDA 4 #define OLED_SCL 15 -#define OLED_RESET 16 +#define OLED_RESET 16 #endif -#ifdef HELTEC_V3 +#if defined(HELTEC_V3) || defined(HELTEC_WS) #define OLED_SDA 17 #define OLED_SCL 18 -#define OLED_RESET 21 +#define OLED_RESET 21 #endif + // Leds and other stuff +#if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2) || defined(HELTEC_V3) || defined(HELTEC_WS) || defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_1W_LoRa) +#define HAS_INTERNAL_LED +#endif + #if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2) #define internalLedPin 25 // Green Led #define batteryPin 35 #endif -#ifdef HELTEC_V3 +#if defined(HELTEC_V3) || defined(HELTEC_WS) #define internalLedPin 35 #endif #if defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_1W_LoRa) diff --git a/src/utils.cpp b/src/utils.cpp index f4667a6..23f06d2 100644 --- a/src/utils.cpp +++ b/src/utils.cpp @@ -69,12 +69,12 @@ namespace Utils { void setupDisplay() { setup_display(); - #if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2) || defined(HELTEC_V3) || defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_1W_LoRa) + #ifdef HAS_INTERNAL_LED digitalWrite(internalLedPin,HIGH); #endif Serial.println("\nStarting Station: " + Config.callsign + " Version: " + versionDate); show_display(" LoRa APRS", "", " ( iGATE & DIGI )", "", "", "Richonguzman / CA2RXU", " " + versionDate, 4000); - #if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2) || defined(HELTEC_V3) || defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_1W_LoRa) + #ifdef HAS_INTERNAL_LED digitalWrite(internalLedPin,LOW); #endif firstLine = Config.callsign; diff --git a/src/wifi_utils.cpp b/src/wifi_utils.cpp index 698b013..24316be 100644 --- a/src/wifi_utils.cpp +++ b/src/wifi_utils.cpp @@ -52,12 +52,12 @@ namespace WIFI_Utils { WiFi.begin(currentWiFi->ssid.c_str(), currentWiFi->password.c_str()); while (WiFi.status() != WL_CONNECTED && wifiCounter 10000){ @@ -78,7 +78,7 @@ namespace WIFI_Utils { } } } - #if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2) || defined(HELTEC_V3) || defined(ESP32_DIY_LoRa) || defined(ESP32_DIY_1W_LoRa) + #ifdef HAS_INTERNAL_LED digitalWrite(internalLedPin,LOW); #endif if (WiFi.status() == WL_CONNECTED) {