Skip to content

Commit f8d277d

Browse files
authored
Merge pull request #426 from 446564/feat-GH109
allows manual BLE pin even when device has display
2 parents 387e2c7 + f446315 commit f8d277d

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

examples/companion_radio/MyMesh.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -613,10 +613,10 @@ void MyMesh::begin(bool has_display) {
613613
_prefs.cr = constrain(_prefs.cr, 5, 8);
614614
_prefs.tx_power_dbm = constrain(_prefs.tx_power_dbm, 1, MAX_LORA_TX_POWER);
615615

616-
#ifdef BLE_PIN_CODE
616+
#ifdef BLE_PIN_CODE // 123456 by default
617617
if (_prefs.ble_pin == 0) {
618618
#ifdef DISPLAY_CLASS
619-
if (has_display) {
619+
if (has_display && BLE_PIN_CODE == 123456) {
620620
StdRNG rng;
621621
_active_ble_pin = rng.nextInt(100000, 999999); // random pin each session
622622
} else {

variants/heltec_v2/platformio.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ build_flags =
9696
-D DISPLAY_CLASS=SSD1306Display
9797
-D MAX_CONTACTS=100
9898
-D MAX_GROUP_CHANNELS=8
99-
-D BLE_PIN_CODE=0
99+
-D BLE_PIN_CODE=123456
100100
-D BLE_DEBUG_LOGGING=1
101101
-D OFFLINE_QUEUE_SIZE=256
102102
; -D MESH_PACKET_LOGGING=1

variants/heltec_v3/platformio.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ build_flags =
114114
-D MAX_CONTACTS=100
115115
-D MAX_GROUP_CHANNELS=8
116116
-D DISPLAY_CLASS=SSD1306Display
117-
-D BLE_PIN_CODE=0 ; dynamic, random PIN
117+
-D BLE_PIN_CODE=123456 ; dynamic, random PIN
118118
-D BLE_DEBUG_LOGGING=1
119119
-D OFFLINE_QUEUE_SIZE=256
120120
; -D MESH_PACKET_LOGGING=1

variants/nano_g2_ultra/platformio.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ build_flags =
3636
-I src/helpers/ui
3737
-D MAX_CONTACTS=100
3838
-D MAX_GROUP_CHANNELS=8
39-
-D BLE_PIN_CODE=0
39+
-D BLE_PIN_CODE=123456
4040
-D BLE_DEBUG_LOGGING=1
4141
-D OFFLINE_QUEUE_SIZE=256
4242
-D DISPLAY_CLASS=SH1106Display

0 commit comments

Comments
 (0)