added display support for RAK4631, removed Wire.begin(int, int) from nrf52 devices, cosmetic changes

platformio.ini

@@ -735,35 +735,40 @@ extends = nrf52840_base
 platform = https://github.com/maxgerhardt/platform-nordicnrf52.git#rak
 board = wiscore_rak4631
 board_check = true
-build_src_filter = ${nrf52840_base.build_src_filter}
-  +<helpers/nrf52/*.cpp>
 build_flags = ${nrf52840_base.build_flags}
   -D RAK_4631
+  -D PIN_USER_BTN=9
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
   -D SX126X_CURRENT_LIMIT=130
   -D SX126X_RX_BOOSTED_GAIN=1
+build_src_filter = ${nrf52840_base.build_src_filter}
+  +<helpers/nrf52/*.cpp>
+lib_deps =
+  ${nrf52840_base.lib_deps}
+  adafruit/Adafruit SSD1306 @ ^2.5.13
 
 [env:RAK_4631_Repeater]
 extends = rak4631
-build_src_filter = ${rak4631.build_src_filter}
-  +<../examples/simple_repeater/main.cpp>
 build_flags =
   ${rak4631.build_flags}
+  -D DISPLAY_CLASS=SSD1306Display
   -D ADVERT_NAME='"RAK4631 Repeater"'
   -D ADVERT_LAT=-37.0
   -D ADVERT_LON=145.0
   -D ADMIN_PASSWORD='"password"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
+build_src_filter = ${rak4631.build_src_filter}
+  +<helpers/ui/*.cpp>
+  +<../examples/simple_repeater>
 
 [env:RAK_4631_room_server]
 extends = rak4631
-build_src_filter = ${rak4631.build_src_filter}
-  +<../examples/simple_room_server/main.cpp>
 build_flags =
   ${rak4631.build_flags}
+  -D DISPLAY_CLASS=SSD1306Display
   -D ADVERT_NAME='"Test Room"'
   -D ADVERT_LAT=-37.0
   -D ADVERT_LON=145.0
@@ -771,6 +776,48 @@ build_flags =
   -D ROOM_PASSWORD='"hello"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
+build_src_filter = ${rak4631.build_src_filter}
+  +<helpers/ui/*.cpp>
+  +<../examples/simple_room_server>
+
+[env:RAK_4631_companion_radio_usb]
+extends = rak4631
+build_flags =
+  ${rak4631.build_flags}
+  -D DISPLAY_CLASS=SSD1306Display
+  -D MAX_CONTACTS=100
+  -D MAX_GROUP_CHANNELS=8
+;  -D ENABLE_PRIVATE_KEY_IMPORT=1
+;  -D ENABLE_PRIVATE_KEY_EXPORT=1
+; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
+; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
+build_src_filter = ${rak4631.build_src_filter}
+  +<helpers/ui/*.cpp>
+  +<../examples/companion_radio>
+lib_deps =
+  ${rak4631.lib_deps}
+  densaugeo/base64 @ ~1.4.0
+
+[env:RAK_4631_companion_radio_ble]
+extends = rak4631
+build_flags =
+  ${rak4631.build_flags}
+  -D DISPLAY_CLASS=SSD1306Display
+  -D MAX_CONTACTS=100
+  -D MAX_GROUP_CHANNELS=8
+  -D BLE_PIN_CODE=123456
+  -D BLE_DEBUG_LOGGING=1
+;  -D ENABLE_PRIVATE_KEY_IMPORT=1
+;  -D ENABLE_PRIVATE_KEY_EXPORT=1
+;  -D MESH_PACKET_LOGGING=1
+;  -D MESH_DEBUG=1
+build_src_filter = ${rak4631.build_src_filter}
+  +<helpers/ui/*.cpp>
+  +<helpers/nrf52/*.cpp>
+  +<../examples/companion_radio>
+lib_deps =
+  ${rak4631.lib_deps}
+  densaugeo/base64 @ ~1.4.0
 
 [env:RAK_4631_terminal_chat]
 extends = rak4631
@@ -786,41 +833,6 @@ lib_deps =
   ${rak4631.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:RAK_4631_companion_radio_usb]
-extends = rak4631
-build_flags =
-  ${rak4631.build_flags}
-  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=8
-;  -D ENABLE_PRIVATE_KEY_IMPORT=1
-;  -D ENABLE_PRIVATE_KEY_EXPORT=1
-; NOTE: DO NOT ENABLE -->  -D MESH_PACKET_LOGGING=1
-; NOTE: DO NOT ENABLE -->  -D MESH_DEBUG=1
-build_src_filter = ${rak4631.build_src_filter}
-  +<../examples/companion_radio/main.cpp>
-lib_deps =
-  ${rak4631.lib_deps}
-  densaugeo/base64 @ ~1.4.0
-
-[env:RAK_4631_companion_radio_ble]
-extends = rak4631
-build_flags =
-  ${rak4631.build_flags}
-  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=8
-  -D BLE_PIN_CODE=123456
-  -D BLE_DEBUG_LOGGING=1
-;  -D ENABLE_PRIVATE_KEY_IMPORT=1
-;  -D ENABLE_PRIVATE_KEY_EXPORT=1
-;  -D MESH_PACKET_LOGGING=1
-;  -D MESH_DEBUG=1
-build_src_filter = ${rak4631.build_src_filter}
-  +<helpers/nrf52/*.cpp>
-  +<../examples/companion_radio/main.cpp>
-lib_deps =
-  ${rak4631.lib_deps}
-  densaugeo/base64 @ ~1.4.0
-
 ; ----------------- NRF52 T1000e---------------------
 [nrf52840_t1000e]
 extends = nrf52_base