Compare commits

...

9 Commits

Author SHA1 Message Date
richonguzman 7995d23779 cleaned 2024-10-25 15:56:03 -03:00
richonguzman 7f150bc4a0 minor letter fix 2024-10-25 15:22:24 -03:00
richonguzman ff5650f0c5 readme and build update 2024-10-25 12:50:15 -03:00
richonguzman a91f0f3f3c WIRE update 2024-10-25 11:50:57 -03:00
richonguzman c9577b6c21 more display testing 2024-10-25 11:08:00 -03:00
richonguzman 10cb7c6e45 added LightGateway 2024-10-25 10:42:15 -03:00
richonguzman 99052e594a typo fix 2024-10-23 12:09:24 -03:00
richonguzman a05917c494 update 2024-10-22 22:14:29 -03:00
richonguzman e2e935797f images update for V2.1 2024-10-21 12:26:40 -03:00
20 changed files with 331 additions and 299 deletions
+2
View File
@@ -73,6 +73,8 @@ jobs:
chip: esp32c3 chip: esp32c3
- name: ESP32_C3_OctopusLab_LoRa - name: ESP32_C3_OctopusLab_LoRa
chip: esp32c3 chip: esp32c3
- name: QRPLabs_LightGateway_1_0
chip: esp32s3
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
+3
View File
@@ -38,6 +38,8 @@ ____________________________________________________
- HELTEC V2, V3 , Wireless Stick, Wireless Stick Lite, HT-CT62, Wireless Tracker. - HELTEC V2, V3 , Wireless Stick, Wireless Stick Lite, HT-CT62, Wireless Tracker.
- QRP Labs LightGateway 1.0.
- ESP32 Wroom + SX1278 LoRa Module or Ebyte 400M30S (or 900M30S) 1W LoRa Module for a DIY Versions. - ESP32 Wroom + SX1278 LoRa Module or Ebyte 400M30S (or 900M30S) 1W LoRa Module for a DIY Versions.
- ESP32C3 + Ebyte 400M30S(or 900M30S) 1W LoRa Module for another DIY version. - ESP32C3 + Ebyte 400M30S(or 900M30S) 1W LoRa Module for another DIY version.
@@ -50,6 +52,7 @@ ____________________________________________________
## Timeline (Versions): ## Timeline (Versions):
- 2024.10.25 Added QRP Labs LightGateway 1.0 support.
- 2024.10.21 Boards with GPS can now send Real-GPS Beacon (also posible: GPS ambiguity of ~ 1 km). - 2024.10.21 Boards with GPS can now send Real-GPS Beacon (also posible: GPS ambiguity of ~ 1 km).
- 2024.10.14 Received Packets in WebUI show real Local Time (NTP with GMT offset). - 2024.10.14 Received Packets in WebUI show real Local Time (NTP with GMT offset).
- 2024.10.08 New EcoMode for Remote Digirepeaters without WiFi/WiFiAP, Screen, Leds (Example: LILYGO LoRa32 uses only 24mA, with WifiAP and all was 150mA). APRS Message/Queries can start/stop this mode too. - 2024.10.08 New EcoMode for Remote Digirepeaters without WiFi/WiFiAP, Screen, Leds (Example: LILYGO LoRa32 uses only 24mA, with WifiAP and all was 150mA). APRS Message/Queries can start/stop this mode too.
+1 -1
View File
@@ -492,7 +492,7 @@
<label <label
for="beacon.sendViaAPRSIS" for="beacon.sendViaAPRSIS"
class="form-label" class="form-label"
>Send our beacon to >Send beacon to
APRS-IS APRS-IS
</label> </label>
</div> </div>
Binary file not shown.

Before

Width:  |  Height:  |  Size: 139 KiB

After

Width:  |  Height:  |  Size: 164 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 70 KiB

After

Width:  |  Height:  |  Size: 122 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 108 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 86 KiB

After

Width:  |  Height:  |  Size: 96 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 108 KiB

After

Width:  |  Height:  |  Size: 130 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 71 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 43 KiB

Before

Width:  |  Height:  |  Size: 203 KiB

After

Width:  |  Height:  |  Size: 203 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 147 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 184 KiB

+153 -171
View File
@@ -28,6 +28,29 @@ extra_scripts =
debug_tool = esp-prog debug_tool = esp-prog
[common] [common]
build_flags =
-Werror -Wall
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
-DRADIOLIB_EXCLUDE_CC1101=1
-DRADIOLIB_EXCLUDE_NRF24=1
-DRADIOLIB_EXCLUDE_RF69=1
-DRADIOLIB_EXCLUDE_SX1231=1
-DRADIOLIB_EXCLUDE_SX1233=1
-DRADIOLIB_EXCLUDE_SI443X=1
-DRADIOLIB_EXCLUDE_RFM2X=1
-DRADIOLIB_EXCLUDE_AFSK=1
-DRADIOLIB_EXCLUDE_BELL=1
-DRADIOLIB_EXCLUDE_HELLSCHREIBER=1
-DRADIOLIB_EXCLUDE_MORSE=1
-DRADIOLIB_EXCLUDE_RTTY=1
-DRADIOLIB_EXCLUDE_SSTV=1
-DRADIOLIB_EXCLUDE_AX25=1
-DRADIOLIB_EXCLUDE_DIRECT_RECEIVE=1
-DRADIOLIB_EXCLUDE_BELL=1
-DRADIOLIB_EXCLUDE_PAGER=1
-DRADIOLIB_EXCLUDE_FSK4=1
-DRADIOLIB_EXCLUDE_APRS=1
-DRADIOLIB_EXCLUDE_LORAWAN=1
lib_deps = lib_deps =
jgromes/RadioLib @ 6.6.0 jgromes/RadioLib @ 6.6.0
mikalhart/TinyGPSPlus @ 1.0.3 mikalhart/TinyGPSPlus @ 1.0.3
@@ -41,287 +64,251 @@ lib_deps =
mathieucarbou/ESPAsyncWebServer @ 3.2.3 mathieucarbou/ESPAsyncWebServer @ 3.2.3
mathieucarbou/AsyncTCP @ 3.2.5 mathieucarbou/AsyncTCP @ 3.2.5
arduino-libraries/NTPClient @ 3.2.1 arduino-libraries/NTPClient @ 3.2.1
display_libs =
adafruit/Adafruit GFX Library @ 1.11.9
adafruit/Adafruit SSD1306 @ 2.5.10
[env:ttgo-lora32-v21] [env:ttgo-lora32-v21]
board = ttgo-lora32-v21 board = ttgo-lora32-v21
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DTTGO_T_LORA32_V2_1 -DTTGO_T_LORA32_V2_1
-DHAS_SX1278 -DHAS_SX1278
-DHAS_ADC_CALIBRATION -DHAS_ADC_CALIBRATION
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 lib_deps =
lib_deps =
${common.lib_deps} ${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9 ${common.display_libs}
adafruit/Adafruit SSD1306 @ 2.5.10
[env:ttgo-lora32-v21_915] [env:ttgo-lora32-v21_915]
board = ttgo-lora32-v21 board = ttgo-lora32-v21
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DTTGO_T_LORA32_V2_1_915 -DTTGO_T_LORA32_V2_1_915
-DHAS_SX1276 -DHAS_SX1276
-DHAS_ADC_CALIBRATION -DHAS_ADC_CALIBRATION
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 lib_deps =
lib_deps =
${common.lib_deps} ${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9 ${common.display_libs}
adafruit/Adafruit SSD1306 @ 2.5.10
[env:heltec-lora32-v2] [env:heltec-lora32-v2]
board = ttgo-lora32-v21 board = ttgo-lora32-v21
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DHELTEC_V2 -DHELTEC_V2
-DHAS_SX1278 -DHAS_SX1278
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 lib_deps =
lib_deps =
${common.lib_deps} ${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9 ${common.display_libs}
adafruit/Adafruit SSD1306 @ 2.5.10
[env:heltec_wifi_lora_32_V3] [env:heltec_wifi_lora_32_V3]
board = heltec_wifi_lora_32_V3 board = heltec_wifi_lora_32_V3
board_build.mcu = esp32s3 board_build.mcu = esp32s3
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DHELTEC_V3 -DHELTEC_V3
-DHAS_SX1262 -DHAS_SX1262
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 lib_deps =
lib_deps =
${common.lib_deps} ${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9 ${common.display_libs}
adafruit/Adafruit SSD1306 @ 2.5.10
[env:heltec_wireless_stick] [env:heltec_wireless_stick]
board = esp32-s3-devkitc-1 board = esp32-s3-devkitc-1
board_build.mcu = esp32s3 board_build.mcu = esp32s3
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DHELTEC_WS -DHELTEC_WS
-DHAS_SX1262 -DHAS_SX1262
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 lib_deps =
lib_deps =
${common.lib_deps} ${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9 ${common.display_libs}
adafruit/Adafruit SSD1306 @ 2.5.10
[env:heltec_wireless_stick_lite_v3] [env:heltec_wireless_stick_lite_v3]
board = esp32-s3-devkitc-1 board = esp32-s3-devkitc-1
board_build.mcu = esp32s3 board_build.mcu = esp32s3
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DHELTEC_WSL_V3 -DHELTEC_WSL_V3
-DHAS_SX1262 -DHAS_SX1262
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 lib_deps =
lib_deps =
${common.lib_deps} ${common.lib_deps}
[env:heltec_wireless_stick_lite_v3_display] [env:heltec_wireless_stick_lite_v3_display]
board = esp32-s3-devkitc-1 board = esp32-s3-devkitc-1
board_build.mcu = esp32s3 board_build.mcu = esp32s3
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DHELTEC_WSL_V3_DISPLAY -DHELTEC_WSL_V3_DISPLAY
-DHAS_SX1262 -DHAS_SX1262
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 lib_deps =
lib_deps =
${common.lib_deps} ${common.lib_deps}
[env:ESP32_DIY_LoRa] [env:ESP32_DIY_LoRa]
board = esp32dev board = esp32dev
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DESP32_DIY_LoRa -DESP32_DIY_LoRa
-DHAS_SX1278 -DHAS_SX1278
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 lib_deps =
lib_deps =
${common.lib_deps} ${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9 ${common.display_libs}
adafruit/Adafruit SSD1306 @ 2.5.10
[env:ESP32_DIY_LoRa_915] [env:ESP32_DIY_LoRa_915]
board = esp32dev board = esp32dev
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DESP32_DIY_LoRa_915 -DESP32_DIY_LoRa_915
-DHAS_SX1276 -DHAS_SX1276
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 lib_deps =
lib_deps =
${common.lib_deps} ${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9 ${common.display_libs}
adafruit/Adafruit SSD1306 @ 2.5.10
[env:ESP32_DIY_1W_LoRa] [env:ESP32_DIY_1W_LoRa]
board = esp32dev board = esp32dev
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DESP32_DIY_1W_LoRa -DESP32_DIY_1W_LoRa
-DHAS_SX1268 -DHAS_SX1268
-DHAS_1W_LORA -DHAS_1W_LORA
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 lib_deps =
lib_deps =
${common.lib_deps} ${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9 ${common.display_libs}
adafruit/Adafruit SSD1306 @ 2.5.10
[env:ESP32_DIY_1W_LoRa_915] [env:ESP32_DIY_1W_LoRa_915]
board = esp32dev board = esp32dev
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DESP32_DIY_1W_LoRa_915 -DESP32_DIY_1W_LoRa_915
-DHAS_SX1262 -DHAS_SX1262
-DHAS_1W_LORA -DHAS_1W_LORA
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 lib_deps =
lib_deps =
${common.lib_deps} ${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9 ${common.display_libs}
adafruit/Adafruit SSD1306 @ 2.5.10
[env:ESP32_DIY_1W_LoRa_LLCC68] [env:ESP32_DIY_1W_LoRa_LLCC68]
board = esp32dev board = esp32dev
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DESP32_DIY_1W_LoRa_LLCC68 -DESP32_DIY_1W_LoRa_LLCC68
-DHAS_LLCC68 -DHAS_LLCC68
-DHAS_1W_LORA -DHAS_1W_LORA
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 lib_deps =
lib_deps =
${common.lib_deps} ${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9 ${common.display_libs}
adafruit/Adafruit SSD1306 @ 2.5.10
[env:ESP32_DIY_1W_LoRa_Mesh_V1_2] [env:ESP32_DIY_1W_LoRa_Mesh_V1_2]
board = esp32dev board = esp32dev
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DESP32_DIY_1W_LoRa_Mesh_V1_2 -DESP32_DIY_1W_LoRa_Mesh_V1_2
-DHAS_SX1268 -DHAS_SX1268
-DHAS_1W_LORA -DHAS_1W_LORA
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 lib_deps =
lib_deps =
${common.lib_deps} ${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9 ${common.display_libs}
adafruit/Adafruit SSD1306 @ 2.5.10
[env:ttgo-t-beam-v1_2] [env:ttgo-t-beam-v1_2]
board = ttgo-t-beam board = ttgo-t-beam
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DTTGO_T_Beam_V1_2 -DTTGO_T_Beam_V1_2
-DHAS_SX1278 -DHAS_SX1278
-DHAS_AXP2101 -DHAS_AXP2101
-DHAS_GPS -DHAS_GPS
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 lib_deps =
lib_deps =
${common.lib_deps} ${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9 ${common.display_libs}
adafruit/Adafruit SSD1306 @ 2.5.10
lewisxhe/XPowersLib @ 0.2.4 lewisxhe/XPowersLib @ 0.2.4
[env:ttgo-t-beam-v1_2_915] [env:ttgo-t-beam-v1_2_915]
board = ttgo-t-beam board = ttgo-t-beam
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DTTGO_T_Beam_V1_2_915 -DTTGO_T_Beam_V1_2_915
-DHAS_SX1276 -DHAS_SX1276
-DHAS_AXP2101 -DHAS_AXP2101
-DHAS_GPS -DHAS_GPS
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 lib_deps =
lib_deps =
${common.lib_deps} ${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9 ${common.display_libs}
adafruit/Adafruit SSD1306 @ 2.5.10
lewisxhe/XPowersLib @ 0.2.4 lewisxhe/XPowersLib @ 0.2.4
[env:ttgo-t-beam-v1] [env:ttgo-t-beam-v1]
board = ttgo-t-beam board = ttgo-t-beam
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DTTGO_T_Beam_V1_0 -DTTGO_T_Beam_V1_0
-DHAS_SX1278 -DHAS_SX1278
-DHAS_AXP192 -DHAS_AXP192
-DHAS_GPS -DHAS_GPS
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 lib_deps =
lib_deps =
${common.lib_deps} ${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9 ${common.display_libs}
adafruit/Adafruit SSD1306 @ 2.5.10
lewisxhe/XPowersLib @ 0.2.4 lewisxhe/XPowersLib @ 0.2.4
[env:ttgo-t-beam-v1_915] [env:ttgo-t-beam-v1_915]
board = ttgo-t-beam board = ttgo-t-beam
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DTTGO_T_Beam_V1_0_915 -DTTGO_T_Beam_V1_0_915
-DHAS_SX1276 -DHAS_SX1276
-DHAS_AXP192 -DHAS_AXP192
-DHAS_GPS -DHAS_GPS
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 lib_deps =
lib_deps =
${common.lib_deps} ${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9 ${common.display_libs}
adafruit/Adafruit SSD1306 @ 2.5.10
lewisxhe/XPowersLib @ 0.2.4 lewisxhe/XPowersLib @ 0.2.4
[env:ttgo-t-beam-v1_SX1268] [env:ttgo-t-beam-v1_SX1268]
board = ttgo-t-beam board = ttgo-t-beam
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DTTGO_T_Beam_V1_0_SX1268 -DTTGO_T_Beam_V1_0_SX1268
-DHAS_SX1268 -DHAS_SX1268
-DHAS_AXP192 -DHAS_AXP192
-DHAS_GPS -DHAS_GPS
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 lib_deps =
lib_deps =
${common.lib_deps} ${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9 ${common.display_libs}
adafruit/Adafruit SSD1306 @ 2.5.10
lewisxhe/XPowersLib @ 0.2.4 lewisxhe/XPowersLib @ 0.2.4
[env:ttgo-t-beam-v1_2_SX1262] [env:ttgo-t-beam-v1_2_SX1262]
board = ttgo-t-beam board = ttgo-t-beam
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DTTGO_T_Beam_V1_2_SX1262 -DTTGO_T_Beam_V1_2_SX1262
-DHAS_SX1262 -DHAS_SX1262
-DHAS_AXP2101 -DHAS_AXP2101
-DHAS_GPS -DHAS_GPS
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 lib_deps =
lib_deps =
${common.lib_deps} ${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9 ${common.display_libs}
adafruit/Adafruit SSD1306 @ 2.5.10
lewisxhe/XPowersLib @ 0.2.4 lewisxhe/XPowersLib @ 0.2.4
[env:ESP32_DIY_LoRa_A7670] [env:ESP32_DIY_LoRa_A7670]
board = esp32dev board = esp32dev
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DESP32_DIY_LoRa_A7670 -DESP32_DIY_LoRa_A7670
-DHAS_SX1278 -DHAS_SX1278
-DHAS_A7670 -DHAS_A7670
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 lib_deps =
lib_deps =
${common.lib_deps} ${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9 ${common.display_libs}
adafruit/Adafruit SSD1306 @ 2.5.10
vshymanskyy/TinyGSM @ 0.12.0 vshymanskyy/TinyGSM @ 0.12.0
vshymanskyy/StreamDebugger @ 1.0.1 vshymanskyy/StreamDebugger @ 1.0.1
[env:ESP32_DIY_LoRa_A7670_915] [env:ESP32_DIY_LoRa_A7670_915]
board = esp32dev board = esp32dev
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DESP32_DIY_LoRa_A7670_915 -DESP32_DIY_LoRa_A7670_915
-DHAS_SX1276 -DHAS_SX1276
-DHAS_A7670 -DHAS_A7670
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 lib_deps =
lib_deps =
${common.lib_deps} ${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9 ${common.display_libs}
adafruit/Adafruit SSD1306 @ 2.5.10
vshymanskyy/TinyGSM @ 0.12.0 vshymanskyy/TinyGSM @ 0.12.0
vshymanskyy/StreamDebugger @ 1.0.1 vshymanskyy/StreamDebugger @ 1.0.1
@@ -329,8 +316,8 @@ lib_deps =
[env:heltec_wireless_tracker] [env:heltec_wireless_tracker]
board = esp32-s3-devkitc-1 board = esp32-s3-devkitc-1
board_build.mcu = esp32s3 board_build.mcu = esp32s3
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DHELTEC_WIRELESS_TRACKER -DHELTEC_WIRELESS_TRACKER
-DHAS_SX1262 -DHAS_SX1262
-DHAS_GPS -DHAS_GPS
@@ -360,130 +347,125 @@ build_flags =
-D USE_HSPI_PORT -D USE_HSPI_PORT
-DARDUINO_USB_MODE=1 -DARDUINO_USB_MODE=1
-DARDUINO_USB_CDC_ON_BOOT=1 -DARDUINO_USB_CDC_ON_BOOT=1
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 lib_deps =
lib_deps =
${common.lib_deps} ${common.lib_deps}
bodmer/TFT_eSPI @ 2.5.43 bodmer/TFT_eSPI @ 2.5.43
[env:heltec_ht-ct62] [env:heltec_ht-ct62]
board = heltec_wireless_stick_lite board = heltec_wireless_stick_lite
board_build.mcu = esp32c3 board_build.mcu = esp32c3
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DHELTEC_HTCT62 -DHELTEC_HTCT62
-DHAS_SX1262 -DHAS_SX1262
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 lib_deps =
lib_deps =
${common.lib_deps} ${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9 ${common.display_libs}
adafruit/Adafruit SSD1306 @ 2.5.10
[env:heltec_wireless_paper] [env:heltec_wireless_paper]
board = esp32-s3-devkitc-1 board = esp32-s3-devkitc-1
board_build.mcu = esp32s3 board_build.mcu = esp32s3
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DHELTEC_WP -DHELTEC_WP
-DHAS_SX1262 -DHAS_SX1262
-DHAS_EPAPER -DHAS_EPAPER
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
lib_deps = lib_deps =
${common.lib_deps} ${common.lib_deps}
[env:OE5HWN_MeshCom] [env:OE5HWN_MeshCom]
board = esp32dev board = esp32dev
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DOE5HWN_MeshCom -DOE5HWN_MeshCom
-DHAS_SX1268 -DHAS_SX1268
-DHAS_1W_LORA -DHAS_1W_LORA
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 lib_deps =
lib_deps =
${common.lib_deps} ${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9 ${common.display_libs}
adafruit/Adafruit SSD1306 @ 2.5.10
[env:WEMOS-LOLIN32-OLED-DIY] [env:WEMOS-LOLIN32-OLED-DIY]
board = lolin32 board = lolin32
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DWEMOS_LOLIN32_OLED_DIY_LoRa -DWEMOS_LOLIN32_OLED_DIY_LoRa
-DHAS_SX1278 -DHAS_SX1278
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 lib_deps =
lib_deps =
${common.lib_deps} ${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9 ${common.display_libs}
adafruit/Adafruit SSD1306 @ 2.5.10
[env:WEMOS-D1-R32-RA02] [env:WEMOS-D1-R32-RA02]
board = wemos_d1_uno32 board = wemos_d1_uno32
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DWEMOS_D1_R32_RA02 -DWEMOS_D1_R32_RA02
-DHAS_SX1278 -DHAS_SX1278
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 lib_deps =
lib_deps =
${common.lib_deps} ${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9 ${common.display_libs}
adafruit/Adafruit SSD1306 @ 2.5.10
[env:WEMOS_S2_MINI_DIY_LoRa] [env:WEMOS_S2_MINI_DIY_LoRa]
board = lolin_s2_mini board = lolin_s2_mini
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DWEMOS_S2_MINI_DIY_LoRa -DWEMOS_S2_MINI_DIY_LoRa
-DHAS_SX1278 -DHAS_SX1278
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1 lib_deps =
lib_deps =
${common.lib_deps} ${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9 ${common.display_libs}
adafruit/Adafruit SSD1306 @ 2.5.10
[env:esp32c3_DIY_1W_LoRa] [env:esp32c3_DIY_1W_LoRa]
board = esp32-c3-devkitm-1 board = esp32-c3-devkitm-1
board_build.mcu = esp32c3 board_build.mcu = esp32c3
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DESP32C3_DIY_1W_LoRa -DESP32C3_DIY_1W_LoRa
-DHAS_SX1268 -DHAS_SX1268
-DHAS_1W_LORA -DHAS_1W_LORA
-DARDUINO_USB_MODE=1 -DARDUINO_USB_MODE=1
-DARDUINO_USB_CDC_ON_BOOT=1 -DARDUINO_USB_CDC_ON_BOOT=1
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
lib_deps = lib_deps =
${common.lib_deps} ${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9 ${common.display_libs}
adafruit/Adafruit SSD1306 @ 2.5.10
[env:esp32c3_DIY_1W_LoRa_915] [env:esp32c3_DIY_1W_LoRa_915]
board = esp32-c3-devkitm-1 board = esp32-c3-devkitm-1
board_build.mcu = esp32c3 board_build.mcu = esp32c3
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DESP32C3_DIY_1W_LoRa_915 -DESP32C3_DIY_1W_LoRa_915
-DHAS_SX1262 -DHAS_SX1262
-DHAS_1W_LORA -DHAS_1W_LORA
-DARDUINO_USB_MODE=1 -DARDUINO_USB_MODE=1
-DARDUINO_USB_CDC_ON_BOOT=1 -DARDUINO_USB_CDC_ON_BOOT=1
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
lib_deps = lib_deps =
${common.lib_deps} ${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9 ${common.display_libs}
adafruit/Adafruit SSD1306 @ 2.5.10
[env:ESP32_C3_OctopusLab_LoRa] [env:ESP32_C3_OctopusLab_LoRa]
board = esp32-c3-devkitm-1 board = esp32-c3-devkitm-1
board_build.mcu = esp32c3 board_build.mcu = esp32c3
build_flags = build_flags =
-Werror -Wall ${common.build_flags}
-DESP32_C3_OctopusLab_LoRa -DESP32_C3_OctopusLab_LoRa
-DHAS_SX1268 -DHAS_SX1268
-DRADIO_HAS_XTAL -DRADIO_HAS_XTAL
-DARDUINO_USB_MODE=1 -DARDUINO_USB_MODE=1
-DARDUINO_USB_CDC_ON_BOOT=1 -DARDUINO_USB_CDC_ON_BOOT=1
-DELEGANTOTA_USE_ASYNC_WEBSERVER=1
lib_deps = lib_deps =
${common.lib_deps} ${common.lib_deps}
adafruit/Adafruit GFX Library @ 1.11.9 ${common.display_libs}
adafruit/Adafruit SSD1306 @ 2.5.10
[env:QRPLabs_LightGateway_1_0]
board = esp32-s3-devkitc-1
board_build.mcu = esp32s3
build_flags =
${common.build_flags}
-DLIGHTGATEWAY_1_0
-DHAS_SX1268
-DARDUINO_USB_MODE=1
-DARDUINO_USB_CDC_ON_BOOT=1
lib_deps =
${common.lib_deps}
${common.display_libs}
+1 -1
View File
@@ -40,7 +40,7 @@ ________________________________________________________________________________
#include "A7670_utils.h" #include "A7670_utils.h"
#endif #endif
String versionDate = "2024.10.21"; String versionDate = "2024.10.25";
Configuration Config; Configuration Config;
WiFiClient espClient; WiFiClient espClient;
#ifdef HAS_GPS #ifdef HAS_GPS
+107 -78
View File
@@ -10,66 +10,66 @@
// LORA MODULES // LORA MODULES
#if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2) || defined(ESP32_DIY_LoRa) || defined(TTGO_T_Beam_V1_2) || defined(TTGO_T_Beam_V1_0) || defined(TTGO_T_LORA32_V2_1_915) || defined(ESP32_DIY_LoRa_915) || defined(TTGO_T_Beam_V1_2_915) || defined(TTGO_T_Beam_V1_0_915) #if defined(TTGO_T_LORA32_V2_1) || defined(HELTEC_V2) || defined(ESP32_DIY_LoRa) || defined(TTGO_T_Beam_V1_2) || defined(TTGO_T_Beam_V1_0) || defined(TTGO_T_LORA32_V2_1_915) || defined(ESP32_DIY_LoRa_915) || defined(TTGO_T_Beam_V1_2_915) || defined(TTGO_T_Beam_V1_0_915)
#define RADIO_SCLK_PIN 5 // GPIO5 - SX1278 SCK #define RADIO_SCLK_PIN 5 // GPIO5 - SX1278 SCK
#define RADIO_MISO_PIN 19 // GPIO19 - SX1278 MISO #define RADIO_MISO_PIN 19 // GPIO19 - SX1278 MISO
#define RADIO_MOSI_PIN 27 // GPIO27 - SX1278 MOSI #define RADIO_MOSI_PIN 27 // GPIO27 - SX1278 MOSI
#define RADIO_CS_PIN 18 // GPIO18 - SX1278 CS ---> NSS #define RADIO_CS_PIN 18 // GPIO18 - SX1278 CS ---> NSS
#define RADIO_RST_PIN 14 // GPIO14 - SX1278 RST #define RADIO_RST_PIN 14 // GPIO14 - SX1278 RST
#define RADIO_BUSY_PIN 26 // GPIO26 - SX1278 IRQ ---->DIO0 #define RADIO_BUSY_PIN 26 // GPIO26 - SX1278 IRQ ---->DIO0
#endif #endif
#if defined(HELTEC_V3) || defined(HELTEC_WSL_V3) || defined(HELTEC_WSL_V3_DISPLAY) || defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_WS) || defined(HELTEC_WP) #if defined(HELTEC_V3) || defined(HELTEC_WSL_V3) || defined(HELTEC_WSL_V3_DISPLAY) || defined(HELTEC_WIRELESS_TRACKER) || defined(HELTEC_WS) || defined(HELTEC_WP)
#define RADIO_SCLK_PIN 9 // SX1262 SCK #define RADIO_SCLK_PIN 9 // SX1262 SCK
#define RADIO_MISO_PIN 11 // SX1262 MISO #define RADIO_MISO_PIN 11 // SX1262 MISO
#define RADIO_MOSI_PIN 10 // SX1262 MOSI #define RADIO_MOSI_PIN 10 // SX1262 MOSI
#define RADIO_CS_PIN 8 // SX1262 NSS #define RADIO_CS_PIN 8 // SX1262 NSS
#define RADIO_RST_PIN 12 // SX1262 RST #define RADIO_RST_PIN 12 // SX1262 RST
#define RADIO_DIO1_PIN 14 // SX1262 DIO1 #define RADIO_DIO1_PIN 14 // SX1262 DIO1
#define RADIO_BUSY_PIN 13 // SX1262 BUSY #define RADIO_BUSY_PIN 13 // SX1262 BUSY
#endif #endif
#if defined(ESP32_DIY_1W_LoRa) || defined(ESP32_DIY_1W_LoRa_915) || defined(ESP32_DIY_1W_LoRa_LLCC68) // Ebyte E22 400M30S (SX1268) or E22 900M30S (SX1262) or E220 LLCC68 #if defined(ESP32_DIY_1W_LoRa) || defined(ESP32_DIY_1W_LoRa_915) || defined(ESP32_DIY_1W_LoRa_LLCC68) // Ebyte E22 400M30S (SX1268) or E22 900M30S (SX1262) or E220 LLCC68
#define RADIO_SCLK_PIN 18 #define RADIO_SCLK_PIN 18
#define RADIO_MISO_PIN 19 #define RADIO_MISO_PIN 19
#define RADIO_MOSI_PIN 23 #define RADIO_MOSI_PIN 23
#define RADIO_CS_PIN 5 #define RADIO_CS_PIN 5
#define RADIO_RST_PIN 27 #define RADIO_RST_PIN 27
#define RADIO_DIO1_PIN 12 #define RADIO_DIO1_PIN 12
#define RADIO_BUSY_PIN 14 #define RADIO_BUSY_PIN 14
#define RADIO_RXEN 32 #define RADIO_RXEN 32
#define RADIO_TXEN 25 #define RADIO_TXEN 25
#endif #endif
#if defined(ESP32_DIY_1W_LoRa_Mesh_V1_2) // https://github.com/NanoVHF/Meshtastic-DIY/tree/main/PCB/ESP-32-devkit_EBYTE-E22/Mesh-v1.02-2LCD-FreePins #if defined(ESP32_DIY_1W_LoRa_Mesh_V1_2) // https://github.com/NanoVHF/Meshtastic-DIY/tree/main/PCB/ESP-32-devkit_EBYTE-E22/Mesh-v1.02-2LCD-FreePins
#define RADIO_SCLK_PIN 5 #define RADIO_SCLK_PIN 5
#define RADIO_MISO_PIN 19 #define RADIO_MISO_PIN 19
#define RADIO_MOSI_PIN 27 #define RADIO_MOSI_PIN 27
#define RADIO_CS_PIN 18 #define RADIO_CS_PIN 18
#define RADIO_RST_PIN 23 #define RADIO_RST_PIN 23
#define RADIO_DIO1_PIN 33 #define RADIO_DIO1_PIN 33
#define RADIO_BUSY_PIN 32 #define RADIO_BUSY_PIN 32
#define RADIO_RXEN 14 #define RADIO_RXEN 14
#define RADIO_TXEN 13 #define RADIO_TXEN 13
#endif #endif
#ifdef WEMOS_LOLIN32_OLED_DIY_LoRa #ifdef WEMOS_LOLIN32_OLED_DIY_LoRa
#define RADIO_SCLK_PIN 15 #define RADIO_SCLK_PIN 15
#define RADIO_MISO_PIN 13 #define RADIO_MISO_PIN 13
#define RADIO_MOSI_PIN 12 #define RADIO_MOSI_PIN 12
#define RADIO_CS_PIN 14 #define RADIO_CS_PIN 14
#define RADIO_RST_PIN 2 #define RADIO_RST_PIN 2
#define RADIO_BUSY_PIN 25 #define RADIO_BUSY_PIN 25
#endif #endif
#if defined(TTGO_T_Beam_V1_0_SX1268) || defined(TTGO_T_Beam_V1_2_SX1262) #if defined(TTGO_T_Beam_V1_0_SX1268) || defined(TTGO_T_Beam_V1_2_SX1262)
#define RADIO_SCLK_PIN 5 #define RADIO_SCLK_PIN 5
#define RADIO_MISO_PIN 19 #define RADIO_MISO_PIN 19
#define RADIO_MOSI_PIN 27 #define RADIO_MOSI_PIN 27
#define RADIO_CS_PIN 18 #define RADIO_CS_PIN 18
#define RADIO_DIO0_PIN 26 #define RADIO_DIO0_PIN 26
#define RADIO_RST_PIN 23 #define RADIO_RST_PIN 23
#define RADIO_DIO1_PIN 33 #define RADIO_DIO1_PIN 33
#define RADIO_BUSY_PIN 32 #define RADIO_BUSY_PIN 32
#endif #endif
#if defined(OE5HWN_MeshCom) #if defined(OE5HWN_MeshCom)
@@ -85,39 +85,39 @@
#endif #endif
#if defined(HELTEC_HTCT62) #if defined(HELTEC_HTCT62)
#define RADIO_SCLK_PIN 10 // SX1262 SCK #define RADIO_SCLK_PIN 10 // SX1262 SCK
#define RADIO_MISO_PIN 6 // SX1262 MISO #define RADIO_MISO_PIN 6 // SX1262 MISO
#define RADIO_MOSI_PIN 7 // SX1262 MOSI #define RADIO_MOSI_PIN 7 // SX1262 MOSI
#define RADIO_CS_PIN 8 // SX1262 NSS #define RADIO_CS_PIN 8 // SX1262 NSS
#define RADIO_RST_PIN 5 // SX1262 RST #define RADIO_RST_PIN 5 // SX1262 RST
#define RADIO_DIO1_PIN 3 // SX1262 DIO1 #define RADIO_DIO1_PIN 3 // SX1262 DIO1
#define RADIO_BUSY_PIN 4 // SX1262 BUSY #define RADIO_BUSY_PIN 4 // SX1262 BUSY
#endif #endif
#if defined(ESP32_DIY_LoRa_A7670) || defined(ESP32_DIY_LoRa_A7670_915) #if defined(ESP32_DIY_LoRa_A7670) || defined(ESP32_DIY_LoRa_A7670_915)
#define RADIO_SCLK_PIN 18 #define RADIO_SCLK_PIN 18
#define RADIO_MISO_PIN 19 #define RADIO_MISO_PIN 19
#define RADIO_MOSI_PIN 23 #define RADIO_MOSI_PIN 23
#define RADIO_CS_PIN 2 #define RADIO_CS_PIN 2
#define RADIO_RST_PIN 0 #define RADIO_RST_PIN 0
#define RADIO_BUSY_PIN 32 #define RADIO_BUSY_PIN 32
#define A7670_PWR_PIN 4 #define A7670_PWR_PIN 4
#define A7670_ResetPin 5 #define A7670_ResetPin 5
#define A7670_TX_PIN 26 #define A7670_TX_PIN 26
#define A7670_RX_PIN 27 #define A7670_RX_PIN 27
#endif #endif
#ifdef WEMOS_D1_R32_RA02 #ifdef WEMOS_D1_R32_RA02
#define RADIO_SCLK_PIN 18 #define RADIO_SCLK_PIN 18
#define RADIO_MISO_PIN 19 #define RADIO_MISO_PIN 19
#define RADIO_MOSI_PIN 23 #define RADIO_MOSI_PIN 23
#define RADIO_CS_PIN 5 #define RADIO_CS_PIN 5
#define RADIO_BUSY_PIN 12 #define RADIO_BUSY_PIN 12
#define RADIO_RST_PIN 13 #define RADIO_RST_PIN 13
#define RADIO_DIO1_PIN 14 #define RADIO_DIO1_PIN 14
#define OLED_SDA 21 #define OLED_SDA 21
#define OLED_SCL 22 #define OLED_SCL 22
#define OLED_RST 36 #define OLED_RST 36
#endif #endif
#if defined(ESP32C3_DIY_1W_LoRa) || defined(ESP32C3_DIY_1W_LoRa_915) #if defined(ESP32C3_DIY_1W_LoRa) || defined(ESP32C3_DIY_1W_LoRa_915)
@@ -133,12 +133,25 @@
#endif #endif
#ifdef WEMOS_S2_MINI_DIY_LoRa #ifdef WEMOS_S2_MINI_DIY_LoRa
#define RADIO_SCLK_PIN 36 #define RADIO_SCLK_PIN 36
#define RADIO_MISO_PIN 37 #define RADIO_MISO_PIN 37
#define RADIO_MOSI_PIN 35 #define RADIO_MOSI_PIN 35
#define RADIO_CS_PIN 34 #define RADIO_CS_PIN 34
#define RADIO_BUSY_PIN 38 #define RADIO_BUSY_PIN 38
#define RADIO_RST_PIN 33 #define RADIO_RST_PIN 33
#endif
#ifdef LIGHTGATEWAY_1_0
#define RADIO_VCC_PIN 21
#define RADIO_SCLK_PIN 12
#define RADIO_MISO_PIN 13
#define RADIO_MOSI_PIN 11
#define RADIO_CS_PIN 10
#define RADIO_RST_PIN 9
#define RADIO_DIO1_PIN 5
#define RADIO_BUSY_PIN 6
#define RADIO_RXEN 42
#define RADIO_TXEN 14
#endif #endif
@@ -167,10 +180,18 @@
#define OLED_RST -1 #define OLED_RST -1
#endif #endif
#ifdef LIGHTGATEWAY_1_0
#define OLED_SDA 3
#define OLED_SCL 4
#define OLED_RST -1
#endif
#if !defined(HELTEC_HTCT62) && !defined(HELTEC_WSL_V3) && !defined(ESP32C3_DIY_1W_LoRa) && !defined(ESP32C3_DIY_1W_LoRa_915) && !defined(WEMOS_S2_MINI_DIY_LoRa) #if !defined(HELTEC_HTCT62) && !defined(HELTEC_WSL_V3) && !defined(ESP32C3_DIY_1W_LoRa) && !defined(ESP32C3_DIY_1W_LoRa_915) && !defined(WEMOS_S2_MINI_DIY_LoRa)
#define HAS_DISPLAY #define HAS_DISPLAY
#endif #endif
// Leds and other stuff // Leds and other stuff
#ifdef HELTEC_HTCT62 #ifdef HELTEC_HTCT62
#define BATTERY_PIN 1 #define BATTERY_PIN 1
@@ -256,6 +277,13 @@
#define RADIO_BUSY_PIN 8 #define RADIO_BUSY_PIN 8
#endif #endif
#ifdef LIGHTGATEWAY_1_0
#define BUTTON_PIN 0
#define INTERNAL_LED_PIN 16
#endif
// GPS
#if defined(TTGO_T_Beam_V1_2) || defined(TTGO_T_Beam_V1_2_915) || defined(TTGO_T_Beam_V1_0) || defined(TTGO_T_Beam_V1_0_915) || defined(TTGO_T_Beam_V1_0_SX1268) || defined(TTGO_T_Beam_V1_2_SX1262) #if defined(TTGO_T_Beam_V1_2) || defined(TTGO_T_Beam_V1_2_915) || defined(TTGO_T_Beam_V1_0) || defined(TTGO_T_Beam_V1_0_915) || defined(TTGO_T_Beam_V1_0_SX1268) || defined(TTGO_T_Beam_V1_2_SX1262)
#define GPS_RX 12 #define GPS_RX 12
#define GPS_TX 34 #define GPS_TX 34
@@ -266,6 +294,7 @@
#define GPS_TX 33 #define GPS_TX 33
#endif #endif
/* (Same pins for LILYGO LoRa32 and ESP32 Wroom Dev ) /* (Same pins for LILYGO LoRa32 and ESP32 Wroom Dev )
SX1278-------------------> ESP32 ttgo-lora32-v21 and ESP32 WROOM Dev SX1278-------------------> ESP32 ttgo-lora32-v21 and ESP32 WROOM Dev
GND GND GND GND
+45 -40
View File
@@ -33,9 +33,11 @@
#endif #endif
#endif #endif
extern Configuration Config; extern Configuration Config;
String oldHeader, oldFirstLine, oldSecondLine, oldThirdLine, oldFourthLine, oldFifthLine, oldSixthLine;
bool displayFound = false;
String oldHeader, oldFirstLine, oldSecondLine, oldThirdLine, oldFourthLine, oldFifthLine, oldSixthLine;
void cleanTFT() { void cleanTFT() {
#ifdef HAS_TFT #ifdef HAS_TFT
@@ -67,20 +69,19 @@ void displaySetup() {
digitalWrite(OLED_RST, HIGH); digitalWrite(OLED_RST, HIGH);
#endif #endif
if(!display.begin(SSD1306_SWITCHCAPVCC, SCREEN_ADDRESS)) { if(display.begin(SSD1306_SWITCHCAPVCC, SCREEN_ADDRESS)) {
Serial.println(F("SSD1306 allocation failed")); displayFound = true;
for(;;); // Don't proceed, loop forever if (Config.display.turn180) {
}
if (Config.display.turn180) {
display.setRotation(2); display.setRotation(2);
} }
display.clearDisplay(); display.clearDisplay();
display.setTextColor(WHITE); display.setTextColor(WHITE);
display.setTextSize(1); display.setTextSize(1);
display.setCursor(0, 0); display.setCursor(0, 0);
display.ssd1306_command(SSD1306_SETCONTRAST); display.ssd1306_command(SSD1306_SETCONTRAST);
display.ssd1306_command(1); display.ssd1306_command(1);
display.display(); display.display();
}
#endif #endif
#endif #endif
delay(1000); delay(1000);
@@ -96,7 +97,7 @@ void displayToggle(bool toggle) {
#if HAS_EPAPER #if HAS_EPAPER
// ... to be continued // ... to be continued
#else #else
display.ssd1306_command(SSD1306_DISPLAYON); if (displayFound) display.ssd1306_command(SSD1306_DISPLAYON);
#endif #endif
#endif #endif
} else { } else {
@@ -106,7 +107,7 @@ void displayToggle(bool toggle) {
#if HAS_EPAPER #if HAS_EPAPER
// ... to be continued // ... to be continued
#else #else
display.ssd1306_command(SSD1306_DISPLAYOFF); if (displayFound) display.ssd1306_command(SSD1306_DISPLAYOFF);
#endif #endif
#endif #endif
} }
@@ -160,18 +161,20 @@ void displayShow(const String& header, const String& line1, const String& line2,
#ifdef HAS_EPAPER #ifdef HAS_EPAPER
// ... to be continued // ... to be continued
#else #else
display.clearDisplay(); if (displayFound) {
display.setTextColor(WHITE); display.clearDisplay();
display.setTextSize(1); display.setTextColor(WHITE);
display.setCursor(0, 0); display.setTextSize(1);
display.println(header); display.setCursor(0, 0);
for (int i = 0; i < 3; i++) { display.println(header);
display.setCursor(0, 8 + (8 * i)); for (int i = 0; i < 3; i++) {
display.println(*lines[i]); display.setCursor(0, 8 + (8 * i));
display.println(*lines[i]);
}
display.ssd1306_command(SSD1306_SETCONTRAST);
display.ssd1306_command(1);
display.display();
} }
display.ssd1306_command(SSD1306_SETCONTRAST);
display.ssd1306_command(1);
display.display();
#endif #endif
#endif #endif
delay(wait); delay(wait);
@@ -198,19 +201,21 @@ void displayShow(const String& header, const String& line1, const String& line2,
#ifdef HAS_EPAPER #ifdef HAS_EPAPER
// ... to be continued // ... to be continued
#else #else
display.clearDisplay(); if (displayFound) {
display.setTextColor(WHITE); display.clearDisplay();
display.setTextSize(2); display.setTextColor(WHITE);
display.setCursor(0, 0); display.setTextSize(2);
display.println(header); display.setCursor(0, 0);
display.setTextSize(1); display.println(header);
for (int i = 0; i < 6; i++) { display.setTextSize(1);
display.setCursor(0, 16 + (8 * i)); for (int i = 0; i < 6; i++) {
display.println(*lines[i]); display.setCursor(0, 16 + (8 * i));
display.println(*lines[i]);
}
display.ssd1306_command(SSD1306_SETCONTRAST);
display.ssd1306_command(1);
display.display();
} }
display.ssd1306_command(SSD1306_SETCONTRAST);
display.ssd1306_command(1);
display.display();
#endif #endif
#endif #endif
delay(wait); delay(wait);
+14 -3
View File
@@ -20,7 +20,12 @@ bool transmitFlag = true;
SX1262 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN); SX1262 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN);
#endif #endif
#ifdef HAS_SX1268 #ifdef HAS_SX1268
SX1268 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN); #if defined(LIGHTGATEWAY_1_0)
SPIClass loraSPI(FSPI);
SX1268 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN, loraSPI);
#else
SX1268 radio = new Module(RADIO_CS_PIN, RADIO_DIO1_PIN, RADIO_RST_PIN, RADIO_BUSY_PIN);
#endif
#endif #endif
#ifdef HAS_SX1278 #ifdef HAS_SX1278
SX1278 radio = new Module(RADIO_CS_PIN, RADIO_BUSY_PIN, RADIO_RST_PIN); SX1278 radio = new Module(RADIO_CS_PIN, RADIO_BUSY_PIN, RADIO_RST_PIN);
@@ -42,7 +47,13 @@ namespace LoRa_Utils {
} }
void setup() { void setup() {
SPI.begin(RADIO_SCLK_PIN, RADIO_MISO_PIN, RADIO_MOSI_PIN); #ifdef LIGHTGATEWAY_1_0
pinMode(RADIO_VCC_PIN,OUTPUT);
digitalWrite(RADIO_VCC_PIN,HIGH);
loraSPI.begin(RADIO_SCLK_PIN, RADIO_MISO_PIN, RADIO_MOSI_PIN, RADIO_CS_PIN);
#else
SPI.begin(RADIO_SCLK_PIN, RADIO_MISO_PIN, RADIO_MOSI_PIN);
#endif
float freq = (float)Config.loramodule.rxFreq / 1000000; float freq = (float)Config.loramodule.rxFreq / 1000000;
#if defined(RADIO_HAS_XTAL) #if defined(RADIO_HAS_XTAL)
radio.XTAL = true; radio.XTAL = true;
@@ -70,7 +81,7 @@ namespace LoRa_Utils {
radio.setCodingRate(Config.loramodule.codingRate4); radio.setCodingRate(Config.loramodule.codingRate4);
radio.setCRC(true); radio.setCRC(true);
#if defined(RADIO_RXEN) && defined(RADIO_TXEN) #if (defined(RADIO_RXEN) && defined(RADIO_TXEN)) || defined(LIGHTGATEWAY_1_0) // QRP Labs LightGateway has 400M22S (SX1268)
radio.setRfSwitchPins(RADIO_RXEN, RADIO_TXEN); radio.setRfSwitchPins(RADIO_RXEN, RADIO_TXEN);
#endif #endif
+1 -1
View File
@@ -205,7 +205,7 @@ namespace POWER_Utils {
Wire1.begin(BOARD_I2C_SDA, BOARD_I2C_SCL); Wire1.begin(BOARD_I2C_SDA, BOARD_I2C_SCL);
#endif #endif
#if defined(HELTEC_V3) || defined(HELTEC_WS) #if defined(HELTEC_V3) || defined(HELTEC_WS) || defined(LIGHTGATEWAY_1_0)
Wire.begin(OLED_SDA, OLED_SCL); Wire.begin(OLED_SDA, OLED_SCL);
#endif #endif
+4 -4
View File
@@ -27,11 +27,11 @@ namespace WIFI_Utils {
if (backUpDigiMode) { if (backUpDigiMode) {
uint32_t WiFiCheck = millis() - lastBackupDigiTime; uint32_t WiFiCheck = millis() - lastBackupDigiTime;
if (WiFi.status() != WL_CONNECTED && WiFiCheck >= 15 * 60 * 1000) { if (WiFi.status() != WL_CONNECTED && WiFiCheck >= 15 * 60 * 1000) {
Serial.println("*** Stoping BackUp Digi Mode ***"); Serial.println("*** Stopping BackUp Digi Mode ***");
backUpDigiMode = false; backUpDigiMode = false;
wifiCounter = 0; wifiCounter = 0;
} else if (WiFi.status() == WL_CONNECTED) { } else if (WiFi.status() == WL_CONNECTED) {
Serial.println("*** WiFi Reconnect Success (Stoping Backup Digi Mode) ***"); Serial.println("*** WiFi Reconnect Success (Stopping Backup Digi Mode) ***");
backUpDigiMode = false; backUpDigiMode = false;
wifiCounter = 0; wifiCounter = 0;
} }
@@ -78,7 +78,7 @@ namespace WIFI_Utils {
WiFi.disconnect(); WiFi.disconnect();
delay(500); delay(500);
unsigned long start = millis(); unsigned long start = millis();
displayShow("", "Connecting to Wifi:", "", currentWiFi->ssid + " ...", 0); displayShow("", "Connecting to WiFi:", "", currentWiFi->ssid + " ...", 0);
Serial.print("\nConnecting to WiFi '"); Serial.print(currentWiFi->ssid); Serial.println("' ..."); Serial.print("\nConnecting to WiFi '"); Serial.print(currentWiFi->ssid); Serial.println("' ...");
WiFi.begin(currentWiFi->ssid.c_str(), currentWiFi->password.c_str()); WiFi.begin(currentWiFi->ssid.c_str(), currentWiFi->password.c_str());
while (WiFi.status() != WL_CONNECTED && wifiCounter<myWiFiAPSize) { while (WiFi.status() != WL_CONNECTED && wifiCounter<myWiFiAPSize) {
@@ -103,7 +103,7 @@ namespace WIFI_Utils {
currentWiFi = &Config.wifiAPs[myWiFiAPIndex]; currentWiFi = &Config.wifiAPs[myWiFiAPIndex];
start = millis(); start = millis();
Serial.print("\nConnecting to WiFi '"); Serial.print(currentWiFi->ssid); Serial.println("' ..."); Serial.print("\nConnecting to WiFi '"); Serial.print(currentWiFi->ssid); Serial.println("' ...");
displayShow("", "Connecting to Wifi:", "", currentWiFi->ssid + " ...", 0); displayShow("", "Connecting to WiFi:", "", currentWiFi->ssid + " ...", 0);
WiFi.disconnect(); WiFi.disconnect();
WiFi.begin(currentWiFi->ssid.c_str(), currentWiFi->password.c_str()); WiFi.begin(currentWiFi->ssid.c_str(), currentWiFi->password.c_str());
} }