Merge branch 'inputbroker-v2' of github.com:meshtastic/Meshtastic-device into inputbroker-v2

src/SerialConsole.cpp

@@ -28,6 +28,16 @@ SerialConsole::SerialConsole() : StreamAPI(&Port), RedirectablePrint(&Port)
                       // setDestination(&noopPrint); for testing, try turning off 'all' debug output and see what leaks
 
     Port.begin(SERIAL_BAUD);
+#ifdef NRF52_SERIES
+    time_t timeout = millis();
+    while (!Port) {
+        if ((millis() - timeout) < 2000) {
+            delay(100);
+        } else {
+            break;
+        }
+    }
+#endif
     emitRebooted();
 }
 

src/esp32/ESP32Bluetooth.cpp

@@ -170,7 +170,7 @@ void ESP32Bluetooth::setup()
 
     //NimBLEDevice::deleteAllBonds();
 
-    NimBLEDevice::init("Meshtastic_1234");
+    NimBLEDevice::init(getDeviceName());
     NimBLEDevice::setPower(ESP_PWR_LVL_P9);
 
     NimBLEDevice::setSecurityAuth(true, true, true);

variants/tlora_v2_1_16/variant.h

@@ -3,9 +3,11 @@
 #define GPS_RX_PIN 15 // per @der_bear on the forum, 36 is incorrect for this board type and 15 is a better pick
 #define GPS_TX_PIN 13
 
+#define EXT_NOTIFY_OUT 2 // Default pin to use for Ext Notify Module.
+
 #define BATTERY_PIN 35 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
 // ratio of voltage divider = 2.0 (R42=100k, R43=100k)
-#define ADC_MULTIPLIER 2.2 // 2.0 + 10% for correction of display undervoltage.
+#define ADC_MULTIPLIER 2.11 // 2.0 + 10% for correction of display undervoltage.
 
 #define I2C_SDA 21 // I2C pins for this board
 #define I2C_SCL 22
@@ -23,3 +25,4 @@
 #define LORA_RESET 14
 #define LORA_DIO1 35 // Not really used
 #define LORA_DIO2 34 // Not really used
+