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

2026-03-28 17:42:44 +01:00 · 2025-03-16 09:07:21 +01:00
parent 32436b953e
commit d525680b71
6 changed files with 93 additions and 103 deletions
--- a/platformio.ini
+++ b/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
--- a/src/helpers/nrf52/RAK4631Board.cpp
+++ b/src/helpers/nrf52/RAK4631Board.cpp
@@ -6,31 +6,25 @@

 static BLEDfu bledfu;

-static void connect_callback(uint16_t conn_handle)
-{
-    (void)conn_handle;
-    MESH_DEBUG_PRINTLN("BLE client connected");
+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)
-{
-    (void)conn_handle;
-    (void)reason;
+static void disconnect_callback(uint16_t conn_handle, uint8_t reason) {
+  (void)conn_handle;
+  (void)reason;

-    MESH_DEBUG_PRINTLN("BLE client disconnected");
+  MESH_DEBUG_PRINTLN("BLE client disconnected");
 }

 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);
@@ -38,43 +32,43 @@ void RAK4631Board::begin() {
 }

 bool RAK4631Board::startOTAUpdate() {
-    // Config the peripheral connection with maximum bandwidth
-    // more SRAM required by SoftDevice
-    // Note: All config***() function must be called before begin()
-    Bluefruit.configPrphBandwidth(BANDWIDTH_MAX);
-    Bluefruit.configPrphConn(92, BLE_GAP_EVENT_LENGTH_MIN, 16, 16);
+  // Config the peripheral connection with maximum bandwidth
+  // more SRAM required by SoftDevice
+  // Note: All config***() function must be called before begin()
+  Bluefruit.configPrphBandwidth(BANDWIDTH_MAX);
+  Bluefruit.configPrphConn(92, BLE_GAP_EVENT_LENGTH_MIN, 16, 16);

-    Bluefruit.begin(1, 0);
-    // Set max power. Accepted values are: -40, -30, -20, -16, -12, -8, -4, 0, 4
-    Bluefruit.setTxPower(4);
-    // Set the BLE device name
-    Bluefruit.setName("RAK4631_OTA");
+  Bluefruit.begin(1, 0);
+  // Set max power. Accepted values are: -40, -30, -20, -16, -12, -8, -4, 0, 4
+  Bluefruit.setTxPower(4);
+  // Set the BLE device name
+  Bluefruit.setName("RAK4631_OTA");

-    Bluefruit.Periph.setConnectCallback(connect_callback);
-    Bluefruit.Periph.setDisconnectCallback(disconnect_callback);
+  Bluefruit.Periph.setConnectCallback(connect_callback);
+  Bluefruit.Periph.setDisconnectCallback(disconnect_callback);

-    // To be consistent OTA DFU should be added first if it exists
-    bledfu.begin();
+  // To be consistent OTA DFU should be added first if it exists
+  bledfu.begin();

-    // Set up and start advertising
-    // Advertising packet
-    Bluefruit.Advertising.addFlags(BLE_GAP_ADV_FLAGS_LE_ONLY_GENERAL_DISC_MODE);
-    Bluefruit.Advertising.addTxPower();
-    Bluefruit.Advertising.addName();
+  // Set up and start advertising
+  // Advertising packet
+  Bluefruit.Advertising.addFlags(BLE_GAP_ADV_FLAGS_LE_ONLY_GENERAL_DISC_MODE);
+  Bluefruit.Advertising.addTxPower();
+  Bluefruit.Advertising.addName();

-    /* Start Advertising
-     - Enable auto advertising if disconnected
-     - Interval:  fast mode = 20 ms, slow mode = 152.5 ms
-     - Timeout for fast mode is 30 seconds
-     - Start(timeout) with timeout = 0 will advertise forever (until connected)
+  /* Start Advertising
+    - Enable auto advertising if disconnected
+    - Interval:  fast mode = 20 ms, slow mode = 152.5 ms
+    - Timeout for fast mode is 30 seconds
+    - Start(timeout) with timeout = 0 will advertise forever (until connected)

-     For recommended advertising interval
-     https://developer.apple.com/library/content/qa/qa1931/_index.html
-    */
-    Bluefruit.Advertising.restartOnDisconnect(true);
-    Bluefruit.Advertising.setInterval(32, 244); // in unit of 0.625 ms
-    Bluefruit.Advertising.setFastTimeout(30);   // number of seconds in fast mode
-    Bluefruit.Advertising.start(0);             // 0 = Don't stop advertising after n seconds
+    For recommended advertising interval
+    https://developer.apple.com/library/content/qa/qa1931/_index.html
+  */
+  Bluefruit.Advertising.restartOnDisconnect(true);
+  Bluefruit.Advertising.setInterval(32, 244); // in unit of 0.625 ms
+  Bluefruit.Advertising.setFastTimeout(30);   // number of seconds in fast mode
+  Bluefruit.Advertising.start(0);             // 0 = Don't stop advertising after n seconds

  return true;
 }
--- a/src/helpers/nrf52/T1000eBoard.cpp
+++ b/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
 }
--- a/src/helpers/nrf52/T114Board.cpp
+++ b/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);
--- a/src/helpers/nrf52/TechoBoard.cpp
+++ b/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);
--- a/src/helpers/nrf52/faketecBoard.h
+++ b/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
+    Wire.begin();

    pinMode(SX126X_POWER_EN, OUTPUT);
    digitalWrite(SX126X_POWER_EN, HIGH);