pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-11 16:07:13 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Merge branch 'master' into LocalConfig

Browse Source
This commit is contained in:
Thomas Göttgens 2022-06-16 21:59:55 +02:00 committed by GitHub
commit 68465f294a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protobufs

@ -1 +1 @@
Subproject commit a7bbc358664c83f5148bae2a502cb294e7cafee5 Subproject commit 94a4dbb842961e75f89de13dc6d0437a256098aa

10
src/main.cpp
View File

@ -101,9 +101,15 @@ const char *getDeviceName()
getMacAddr(dmac); getMacAddr(dmac);
// Meshtastic_ab3c // Meshtastic_ab3c or Shortname_abcd
static char name[20]; static char name[20];
sprintf(name, "Meshtastic_%02x%02x", dmac[4], dmac[5]); sprintf(name, "%02x%02x", dmac[4], dmac[5]);
// if the shortname exists and is NOT the new default of ab3c, use it for BLE name.
if ((owner.short_name != NULL) && (owner.short_name != name)) {
sprintf(name, "%s_%02x%02x", owner.short_name, dmac[4], dmac[5]);
} else {
sprintf(name, "Meshtastic_%02x%02x", dmac[4], dmac[5]);
}
return name; return name;
} }

2
src/mesh/NodeDB.cpp
View File

@ -204,7 +204,7 @@ void NodeDB::installDefaultDeviceState()
// Set default owner name // Set default owner name
pickNewNodeNum(); // based on macaddr now pickNewNodeNum(); // based on macaddr now
sprintf(owner.long_name, "Unknown %02x%02x", ourMacAddr[4], ourMacAddr[5]); sprintf(owner.long_name, "Meshtastic %02x%02x", ourMacAddr[4], ourMacAddr[5]);
sprintf(owner.short_name, "%02x%02x", ourMacAddr[4], ourMacAddr[5]); sprintf(owner.short_name, "%02x%02x", ourMacAddr[4], ourMacAddr[5]);
sprintf(owner.id, "!%08x", getNodeNum()); // Default node ID now based on nodenum sprintf(owner.id, "!%08x", getNodeNum()); // Default node ID now based on nodenum

6
src/mesh/generated/mesh.pb.h
View File

@ -4,7 +4,7 @@
#ifndef PB_MESH_PB_H_INCLUDED #ifndef PB_MESH_PB_H_INCLUDED
#define PB_MESH_PB_H_INCLUDED #define PB_MESH_PB_H_INCLUDED
#include <pb.h> #include <pb.h>
#include "localonly.pb.h" #include "config.pb.h"
#include "portnums.pb.h" #include "portnums.pb.h"
#include "telemetry.pb.h" #include "telemetry.pb.h"
@ -631,7 +631,7 @@ typedef struct _FromRadio {
union { union {
MyNodeInfo my_info; MyNodeInfo my_info;
NodeInfo node_info; NodeInfo node_info;
LocalConfig config; Config config;
LogRecord log_record; LogRecord log_record;
uint32_t config_complete_id; uint32_t config_complete_id;
bool rebooted; bool rebooted;
@ -980,7 +980,7 @@ X(a, STATIC, ONEOF, MESSAGE, (payloadVariant,packet,packet), 11)
#define FromRadio_DEFAULT NULL #define FromRadio_DEFAULT NULL
#define FromRadio_payloadVariant_my_info_MSGTYPE MyNodeInfo #define FromRadio_payloadVariant_my_info_MSGTYPE MyNodeInfo
#define FromRadio_payloadVariant_node_info_MSGTYPE NodeInfo #define FromRadio_payloadVariant_node_info_MSGTYPE NodeInfo
#define FromRadio_payloadVariant_config_MSGTYPE LocalConfig #define FromRadio_payloadVariant_config_MSGTYPE Config
#define FromRadio_payloadVariant_log_record_MSGTYPE LogRecord #define FromRadio_payloadVariant_log_record_MSGTYPE LogRecord
#define FromRadio_payloadVariant_packet_MSGTYPE MeshPacket #define FromRadio_payloadVariant_packet_MSGTYPE MeshPacket

5
src/nrf52/NRF52Bluetooth.cpp
View File

@ -225,6 +225,11 @@ void NRF52Bluetooth::setup()
Bluefruit.autoConnLed(false); Bluefruit.autoConnLed(false);
Bluefruit.begin(); Bluefruit.begin();
// Clear existing data.
Bluefruit.Advertising.stop();
Bluefruit.Advertising.clearData();
Bluefruit.ScanResponse.clearData();
// Set the advertised device name (keep it short!) // Set the advertised device name (keep it short!)
Bluefruit.setName(getDeviceName()); Bluefruit.setName(getDeviceName());