Merge branch 'ripplebiz:main' into faketec-support
This commit is contained in:
@@ -1298,7 +1298,13 @@ void setup() {
|
||||
|
||||
#ifdef BLE_PIN_CODE
|
||||
char dev_name[32+10];
|
||||
sprintf(dev_name, "MeshCore-%s", the_mesh.getNodeName());
|
||||
const char* prefix =
|
||||
#ifdef BLE_NAME_PREFIX
|
||||
BLE_NAME_PREFIX;
|
||||
#else
|
||||
"MeshCore-";
|
||||
#endif
|
||||
sprintf(dev_name, "%s%s", prefix, the_mesh.getNodeName());
|
||||
serial_interface.begin(dev_name, the_mesh.getBLEPin());
|
||||
#else
|
||||
#ifdef RAK_4631
|
||||
@@ -1316,7 +1322,13 @@ void setup() {
|
||||
serial_interface.begin(TCP_PORT);
|
||||
#elif defined(BLE_PIN_CODE)
|
||||
char dev_name[32+10];
|
||||
sprintf(dev_name, "MeshCore-%s", the_mesh.getNodeName());
|
||||
const char* prefix =
|
||||
#ifdef BLE_NAME_PREFIX
|
||||
BLE_NAME_PREFIX;
|
||||
#else
|
||||
"MeshCore-";
|
||||
#endif
|
||||
sprintf(dev_name, "%s%s", prefix, the_mesh.getNodeName());
|
||||
serial_interface.begin(dev_name, the_mesh.getBLEPin());
|
||||
#else
|
||||
serial_interface.begin(Serial);
|
||||
|
||||
Reference in New Issue
Block a user