Merge pull request #107 from recrof/dev

heltec v2: added display, room server role

examples/simple_room_server/main.cpp

@@ -71,6 +71,10 @@
   #include <helpers/HeltecV3Board.h>
   #include <helpers/CustomSX1262Wrapper.h>
   static HeltecV3Board board;
+#elif defined(HELTEC_LORA_V2)
+  #include <helpers/HeltecV2Board.h>
+  #include <helpers/CustomSX1276Wrapper.h>
+  static HeltecV2Board board;
 #elif defined(ARDUINO_XIAO_ESP32C3)
   #include <helpers/XiaoC3Board.h>
   #include <helpers/CustomSX1262Wrapper.h>

platformio.ini

@@ -42,16 +42,24 @@ board = heltec_wifi_lora_32_V2   ; heltec_wifi_lora_32_V2
 build_flags =
   ${esp32_base.build_flags}
   -D HELTEC_LORA_V2
+  -D PIN_BOARD_SDA=4
+  -D PIN_BOARD_SCL=15
+  -D PIN_USER_BTN=0
+  -D PIN_OLED_RESET=16
   -D RADIO_CLASS=CustomSX1276
   -D WRAPPER_CLASS=CustomSX1276Wrapper
   -D LORA_TX_POWER=20
   -D P_LORA_TX_LED=25
 build_src_filter = ${esp32_base.build_src_filter}
+lib_deps =
+  ${esp32_base.lib_deps}
+  adafruit/Adafruit SSD1306 @ ^2.5.13
 
 [env:Heltec_v2_repeater]
 extends = Heltec_lora32_v2
 build_flags =
   ${Heltec_lora32_v2.build_flags}
+  -D DISPLAY_CLASS=SSD1306Display
   -D ADVERT_NAME='"Heltec Repeater"'
   -D ADVERT_LAT=-37.0
   -D ADVERT_LON=145.0
@@ -59,7 +67,24 @@ build_flags =
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_lora32_v2.build_src_filter}
-  +<../examples/simple_repeater/main.cpp>
+  +<../examples/simple_repeater>
+  +<helpers/ui/*.cpp>
+
+[env:Heltec_v2_room_server]
+extends = Heltec_lora32_v2
+build_flags =
+  ${Heltec_lora32_v2.build_flags}
+  -D DISPLAY_CLASS=SSD1306Display
+  -D ADVERT_NAME='"Heltec Room"'
+  -D ADVERT_LAT=-37.0
+  -D ADVERT_LON=145.0
+  -D ADMIN_PASSWORD='"password"'
+  -D ROOM_PASSWORD='"hello"'
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+build_src_filter = ${Heltec_lora32_v2.build_src_filter}
+  +<helpers/ui/*.cpp>
+  +<../examples/simple_room_server>
 
 [env:Heltec_v2_terminal_chat]
 extends = Heltec_lora32_v2
@@ -79,13 +104,15 @@ lib_deps =
 extends = Heltec_lora32_v2
 build_flags =
   ${Heltec_lora32_v2.build_flags}
+  -D DISPLAY_CLASS=SSD1306Display
   -D MAX_CONTACTS=100
   -D MAX_GROUP_CHANNELS=8
 ; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
 ; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_lora32_v2.build_src_filter}
   +<helpers/esp32/*.cpp>
-  +<../examples/companion_radio/main.cpp>
+  +<helpers/ui/*.cpp>
+  +<../examples/companion_radio>
 lib_deps =
   ${Heltec_lora32_v2.lib_deps}
   densaugeo/base64 @ ~1.4.0
@@ -94,9 +121,10 @@ lib_deps =
 extends = Heltec_lora32_v2
 build_flags =
   ${Heltec_lora32_v2.build_flags}
+  -D DISPLAY_CLASS=SSD1306Display
   -D MAX_CONTACTS=100
   -D MAX_GROUP_CHANNELS=8
-  -D BLE_PIN_CODE=123456
+  -D BLE_PIN_CODE=0
   -D BLE_DEBUG_LOGGING=1
 ;  -D ENABLE_PRIVATE_KEY_IMPORT=1
 ;  -D ENABLE_PRIVATE_KEY_EXPORT=1
@@ -104,7 +132,8 @@ build_flags =
 ;  -D MESH_DEBUG=1
 build_src_filter = ${Heltec_lora32_v2.build_src_filter}
   +<helpers/esp32/*.cpp>
-  +<../examples/companion_radio/main.cpp>
+  +<helpers/ui/*.cpp>
+  +<../examples/companion_radio>
 lib_deps =
   ${Heltec_lora32_v2.lib_deps}
   densaugeo/base64 @ ~1.4.0