rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-19 17:22:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

stop explicitly using Serial.print for debug messages

Browse Source
This commit is contained in:
geeksville
2020-02-04 08:17:44 -08:00
parent 4a40b9499b
commit b04fb061c4
13 changed files with 103 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/MeshBluetoothService.cpp
View File

@@ -9,6 +9,7 @@
#include "MeshService.h"
#include "mesh-pb-constants.h"
#include "NodeDB.h"
#include "configuration.h"
// This scratch buffer is used for various bluetooth reads/writes - but it is safe because only one bt operation can be in proccess at once
static uint8_t trBytes[_max(_max(_max(_max(ToRadio_size, RadioConfig_size), User_size), MyNodeInfo_size), FromRadio_size)];
@@ -29,7 +30,7 @@ public:
void onRead(BLECharacteristic *c)
{
Serial.println("Got proto read");
DEBUG_MSG("Got proto read\n");
size_t numbytes = pb_encode_to_bytes(trBytes, sizeof(trBytes), fields, my_struct);
c->setValue(trBytes, numbytes);
}
@@ -37,7 +38,7 @@ public:
void onWrite(BLECharacteristic *c)
{
// dumpCharacteristic(pCharacteristic);
Serial.println("Got on proto write");
DEBUG_MSG("Got on proto write\n");
std::string src = c->getValue();
if (pb_decode_from_bytes((const uint8_t *)src.c_str(), src.length(), fields, my_struct))
{
@@ -57,7 +58,7 @@ public:
void onRead(BLECharacteristic *c)
{
Serial.println("Got nodeinfo read");
DEBUG_MSG("Got nodeinfo read\n");
const NodeInfo *info = nodeDB.readNextInfo();
if (info)
@@ -74,7 +75,7 @@ public:
void onWrite(BLECharacteristic *c)
{
// dumpCharacteristic(pCharacteristic);
Serial.println("Got on nodeinfo write");
DEBUG_MSG("Got on nodeinfo write\n");
nodeDB.resetReadPointer();
}
};
@@ -137,7 +138,7 @@ class BluetoothMeshCallbacks : public BLECharacteristicCallbacks
{
void onRead(BLECharacteristic *c)
{
Serial.println("Got on read");
DEBUG_MSG("Got on read\n");
if (c == &meshFromRadioCharacteristic)
{
@@ -147,12 +148,12 @@ class BluetoothMeshCallbacks : public BLECharacteristicCallbacks
// or make empty if the queue is empty
if (!mp)
{
Serial.println("toPhone queue is empty");
DEBUG_MSG("toPhone queue is empty\n");
c->setValue((uint8_t *)"", 0);
}
else
{
Serial.println("delivering toPhone packet to phone");
DEBUG_MSG("delivering toPhone packet to phone\n");
static FromRadio fradio;
@@ -176,7 +177,7 @@ class BluetoothMeshCallbacks : public BLECharacteristicCallbacks
void onWrite(BLECharacteristic *c)
{
// dumpCharacteristic(pCharacteristic);
Serial.println("Got on write");
DEBUG_MSG("Got on write\n");
if (c == &meshToRadioCharacteristic)
{
@@ -270,7 +271,7 @@ BLEService *createMeshBluetoothService(BLEServer *server)
service->start();
server->getAdvertising()->addServiceUUID(service->getUUID());
Serial.println("*** Mesh service:");
DEBUG_MSG("*** Mesh service:\n");
service->dump();
return service;