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,25 +776,15 @@ build_flags =
   -D ROOM_PASSWORD='"hello"'
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
-
-[env:RAK_4631_terminal_chat]
-extends = rak4631
-build_flags =
-  ${rak4631.build_flags}
-  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=1
-  -D MESH_PACKET_LOGGING=1
-  -D MESH_DEBUG=1
 build_src_filter = ${rak4631.build_src_filter}
-  +<../examples/simple_secure_chat/main.cpp>
+  +<helpers/ui/*.cpp>
-lib_deps =
+  +<../examples/simple_room_server>
-  ${rak4631.lib_deps}
-  densaugeo/base64 @ ~1.4.0
 
 [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
@@ -797,7 +792,8 @@ build_flags =
 ; 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>
+  +<helpers/ui/*.cpp>
+  +<../examples/companion_radio>
 lib_deps =
   ${rak4631.lib_deps}
   densaugeo/base64 @ ~1.4.0
@@ -806,6 +802,7 @@ lib_deps =
 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
@@ -815,8 +812,23 @@ build_flags =
 ;  -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/main.cpp>
+  +<../examples/companion_radio>
+lib_deps =
+  ${rak4631.lib_deps}
+  densaugeo/base64 @ ~1.4.0
+
+[env:RAK_4631_terminal_chat]
+extends = rak4631
+build_flags =
+  ${rak4631.build_flags}
+  -D MAX_CONTACTS=100
+  -D MAX_GROUP_CHANNELS=1
+  -D MESH_PACKET_LOGGING=1
+  -D MESH_DEBUG=1
+build_src_filter = ${rak4631.build_src_filter}
+  +<../examples/simple_secure_chat/main.cpp>
 lib_deps =
   ${rak4631.lib_deps}
   densaugeo/base64 @ ~1.4.0

src/helpers/nrf52/RAK4631Board.cpp

@@ -6,14 +6,12 @@
 
 static BLEDfu bledfu;
 
-static void connect_callback(uint16_t conn_handle)
+static void connect_callback(uint16_t conn_handle) {
-{
   (void)conn_handle;
   MESH_DEBUG_PRINTLN("BLE client connected");
 }
 
-static void disconnect_callback(uint16_t conn_handle, uint8_t reason)
+static void disconnect_callback(uint16_t conn_handle, uint8_t reason) {
-{
   (void)conn_handle;
   (void)reason;
 
@@ -23,14 +21,10 @@ static void disconnect_callback(uint16_t conn_handle, uint8_t reason)
 void RAK4631Board::begin() {
   // for future use, sub-classes SHOULD call this from their begin()
   startup_reason = BD_STARTUP_NORMAL;
-
   pinMode(PIN_VBAT_READ, INPUT);
+  pinMode(PIN_USER_BTN, INPUT_PULLUP);
 
-#if defined(PIN_BOARD_SDA) && defined(PIN_BOARD_SCL)
-  Wire.begin(PIN_BOARD_SDA, PIN_BOARD_SCL);
-#else
   Wire.begin();
-#endif
 
   pinMode(SX126X_POWER_EN, OUTPUT);
   digitalWrite(SX126X_POWER_EN, HIGH);

src/helpers/nrf52/T1000eBoard.cpp

@@ -16,11 +16,7 @@ void T1000eBoard::begin()
   pinMode(LED_PIN, OUTPUT);
 #endif
 
-#if defined(PIN_BOARD_SDA) && defined(PIN_BOARD_SCL)
-  Wire.begin(PIN_BOARD_SDA, PIN_BOARD_SCL);
-#else
   Wire.begin();
-#endif
 
   delay(10);   // give sx1262 some time to power up
 }

src/helpers/nrf52/T114Board.cpp

@@ -26,11 +26,7 @@ void T114Board::begin() {
 
   pinMode(PIN_VBAT_READ, INPUT);
 
-#if defined(PIN_BOARD_SDA) && defined(PIN_BOARD_SCL)
-  Wire.begin(PIN_BOARD_SDA, PIN_BOARD_SCL);
-#else
   Wire.begin();
-#endif
 
 #ifdef P_LORA_TX_LED
   pinMode(P_LORA_TX_LED, OUTPUT);

src/helpers/nrf52/TechoBoard.cpp

@@ -26,11 +26,7 @@ void TechoBoard::begin() {
 
   pinMode(PIN_VBAT_READ, INPUT);
 
-#if defined(PIN_BOARD_SDA) && defined(PIN_BOARD_SCL)
-  Wire.begin(PIN_BOARD_SDA, PIN_BOARD_SCL);
-#else
   Wire.begin();
-#endif
 
   pinMode(SX126X_POWER_EN, OUTPUT);
   digitalWrite(SX126X_POWER_EN, HIGH);

src/helpers/nrf52/faketecBoard.h

@@ -31,11 +31,7 @@ public:
 
     pinMode(PIN_VBAT_READ, INPUT);
 
-    #if defined(PIN_BOARD_SDA) && defined(PIN_BOARD_SCL)
-      Wire.begin(PIN_BOARD_SDA, PIN_BOARD_SCL);
-    #else
     Wire.begin();
-    #endif
 
     pinMode(SX126X_POWER_EN, OUTPUT);
     digitalWrite(SX126X_POWER_EN, HIGH);