Merge pull request #315 from tofuatjava/master

heltec lora v3
lora-aprs · Aug 1, 2023 · 5c9317c · 5c9317c
2 parents f8a71a9 + ee9d781
commit 5c9317c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/lib/BoardFinder/BoardFinder.cpp b/lib/BoardFinder/BoardFinder.cpp
@@ -157,6 +157,7 @@ BoardConfig WT32_ETH_BOARD          ("WT32_ETH_BOARD",           eWT32_ETH_BOARD
 BoardConfig TRACKERD                ("TRACKERD",                 eTRACKERD,                 OledPins( 5,  4),     LoraPins(18, 19, 23, 16, 14, 26));
 BoardConfig HELTEC_WIFI_LORA_32_V1  ("HELTEC_WIFI_LORA_32_V1",   eHELTEC_WIFI_LORA_32_V1,   OledPins( 4, 15, 16), LoraPins( 5, 19, 27, 18, 14, 26));
 BoardConfig HELTEC_WIFI_LORA_32_V2  ("HELTEC_WIFI_LORA_32_V2",   eHELTEC_WIFI_LORA_32_V2,   OledPins( 4, 15, 16), LoraPins( 5, 19, 27, 18, 14, 26));
+BoardConfig HELTEC_WIFI_LORA_32_V3  ("HELTEC_WIFI_LORA_32_V3",   eHELTEC_WIFI_LORA_32_V3,   OledPins( 17, 18, 21), LoraPins( 9, 11, 10, 8, 12, 13));
 BoardConfig GUALTHERIUS_LORAHAM_v100("GUALTHERIUS_LORAHAM_v100", eGUALTHERIUS_LORAHAM_v100, OledPins(17, 16),     LoraPins(18, 19, 23,  5, 13, 35));
 BoardConfig GUALTHERIUS_LORAHAM_v106("GUALTHERIUS_LORAHAM_v106", eGUALTHERIUS_LORAHAM_v106, OledPins(17, 16),     LoraPins(18, 19, 23,  2, 13, 35));
 // clang-format on
diff --git a/lib/BoardFinder/BoardFinder.h b/lib/BoardFinder/BoardFinder.h
@@ -69,6 +69,7 @@ class ButtonPins {
 enum BoardType {
   eHELTEC_WIFI_LORA_32_V1,
   eHELTEC_WIFI_LORA_32_V2,
+  eHELTEC_WIFI_LORA_32_V3,
   eTTGO_LORA32_V1,
   eTTGO_LORA32_V2,
   eTTGO_T_Beam_V0_7,
@@ -125,6 +126,7 @@ extern BoardConfig WT32_ETH_BOARD;
 extern BoardConfig TRACKERD;
 extern BoardConfig HELTEC_WIFI_LORA_32_V1;
 extern BoardConfig HELTEC_WIFI_LORA_32_V2;
+extern BoardConfig HELTEC_WIFI_LORA_32_V3;
 extern BoardConfig GUALTHERIUS_LORAHAM_v100;
 extern BoardConfig GUALTHERIUS_LORAHAM_v106;
 

diff --git a/platformio.ini b/platformio.ini
@@ -1,3 +1,13 @@
+; PlatformIO Project Configuration File
+;
+;   Build options: build flags, source filter
+;   Upload options: custom upload port, speed and extra flags
+;   Library options: dependencies, extra library storages
+;   Advanced options: extra scripting
+;
+; Please visit documentation for the other options and examples
+; https://docs.platformio.org/page/projectconf.html
+
 [platformio]
 default_envs = lora_board
 
@@ -18,20 +28,19 @@ lib_deps =
 	shaggydog/OneButton @ 1.5.0
 	jgromes/RadioLib @ 6.1.0
 check_tool = cppcheck
-check_flags =
-	cppcheck: --std=c++20 --suppress=*:*.pio\* --inline-suppr --suppress=unusedFunction -DCPPCHECK --force lib -ilib/TimeLib
+check_flags = cppcheck: --std=c++20 --suppress=*:*.pio\* --inline-suppr --suppress=unusedFunction -DCPPCHECK --force lib -ilib/TimeLib
 check_skip_packages = yes
 test_build_src = yes
-# activate for OTA Update, use the CALLSIGN from is-cfg.json as upload_port:
-#upload_protocol = espota
-#upload_port = <CALLSIGN>.local
 
 [env:lora_board]
 board = esp32doit-devkit-v1
 build_flags = -Werror -Wall -DUNITY_INCLUDE_PRINT_FORMATTED
 
+[env:lora_v3_board]
+board = heltec_wifi_lora_32_V3
+build_flags = -Werror -Wall -DUNITY_INCLUDE_PRINT_FORMATTED
+
 [env:lora_board_debug]
 board = esp32doit-devkit-v1
 build_flags = -Werror -Wall -DCORE_DEBUG_LEVEL=5 -DUNITY_INCLUDE_PRINT_FORMATTED
 build_type = debug
-#monitor_filters = esp32_exception_decoder
diff --git a/src/LoRa_APRS_iGate.cpp b/src/LoRa_APRS_iGate.cpp
@@ -67,6 +67,7 @@ void setup() {
   boardConfigs.push_back(&TRACKERD);
   boardConfigs.push_back(&HELTEC_WIFI_LORA_32_V1);
   boardConfigs.push_back(&HELTEC_WIFI_LORA_32_V2);
+  boardConfigs.push_back(&HELTEC_WIFI_LORA_32_V3);
   boardConfigs.push_back(&GUALTHERIUS_LORAHAM_v100);
   boardConfigs.push_back(&GUALTHERIUS_LORAHAM_v106);