pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-06-14 09:02:14 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

remove newlines from debug log

Browse Source
This commit is contained in:
mverch67 2024-10-16 22:30:00 +02:00
parent 3e3ec710b6
commit 4121abc576
7 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/graphics/TFTDisplay.cpp
View File

@ -378,7 +378,7 @@ class LGFX : public lgfx::LGFX_Device
_panel_instance = new lgfx::Panel_HX8357D; _panel_instance = new lgfx::Panel_HX8357D;
else { else {
_panel_instance = new lgfx::Panel_NULL; _panel_instance = new lgfx::Panel_NULL;
LOG_ERROR("Unknown display panel configured!\n"); LOG_ERROR("Unknown display panel configured!");
} }
auto buscfg = _bus_instance.config(); auto buscfg = _bus_instance.config();

8
src/main.cpp
View File

@ -742,7 +742,7 @@ void setup()
#else #else
// ESP32 // ESP32
SPI.begin(LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS); SPI.begin(LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS);
LOG_DEBUG("SPI.begin(SCK=%d, MISO=%d, MOSI=%d, NSS=%d)\n", LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS); LOG_DEBUG("SPI.begin(SCK=%d, MISO=%d, MOSI=%d, NSS=%d)", LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS);
SPI.setFrequency(4000000); SPI.setFrequency(4000000);
#endif #endif
#if HAS_TFT #if HAS_TFT
@ -817,7 +817,7 @@ void setup()
PacketAPI::create(PacketServer::init()); PacketAPI::create(PacketServer::init());
deviceScreen->init(new PacketClient); deviceScreen->init(new PacketClient);
} else { } else {
LOG_INFO("Running without TFT display!\n"); LOG_INFO("Running without TFT display!");
} }
#else #else
deviceScreen = &DeviceScreen::create(); deviceScreen = &DeviceScreen::create();
@ -1239,8 +1239,8 @@ void setup()
#endif #endif
#ifdef ARDUINO_ARCH_ESP32 #ifdef ARDUINO_ARCH_ESP32
LOG_DEBUG("Free heap : %7d bytes\n", ESP.getFreeHeap()); LOG_DEBUG("Free heap : %7d bytes", ESP.getFreeHeap());
LOG_DEBUG("Free PSRAM : %7d bytes\n", ESP.getFreePsram()); LOG_DEBUG("Free PSRAM : %7d bytes", ESP.getFreePsram());
#endif #endif
} }
#endif #endif

2
src/mesh/NodeDB.cpp
View File

@ -794,7 +794,7 @@ void NodeDB::loadFromDisk()
state = loadProto(uiconfigFileName, meshtastic_DeviceUIConfig_size, sizeof(meshtastic_DeviceUIConfig), state = loadProto(uiconfigFileName, meshtastic_DeviceUIConfig_size, sizeof(meshtastic_DeviceUIConfig),
&meshtastic_DeviceUIConfig_msg, &uiconfig); &meshtastic_DeviceUIConfig_msg, &uiconfig);
if (state == LoadFileResult::LOAD_SUCCESS) { if (state == LoadFileResult::LOAD_SUCCESS) {
LOG_INFO("Loaded UIConfig\n"); LOG_INFO("Loaded UIConfig");
} }
// 2.4.X - configuration migration to update new default intervals // 2.4.X - configuration migration to update new default intervals

2
src/mesh/PhoneAPI.cpp
View File

@ -202,7 +202,7 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
break; break;
case STATE_SEND_UIDATA: case STATE_SEND_UIDATA:
LOG_INFO("getFromRadio=STATE_SEND_UIDATA\n"); LOG_INFO("getFromRadio=STATE_SEND_UIDATA");
fromRadioScratch.which_payload_variant = meshtastic_FromRadio_deviceuiConfig_tag; fromRadioScratch.which_payload_variant = meshtastic_FromRadio_deviceuiConfig_tag;
fromRadioScratch.deviceuiConfig = uiconfig; fromRadioScratch.deviceuiConfig = uiconfig;
state = STATE_SEND_OWN_NODEINFO; state = STATE_SEND_OWN_NODEINFO;

10
src/mesh/api/PacketAPI.cpp
View File

@ -38,7 +38,7 @@ bool PacketAPI::receivePacket(void)
meshtastic_ToRadio *mr; meshtastic_ToRadio *mr;
auto p = server->receivePacket()->move(); auto p = server->receivePacket()->move();
int id = p->getPacketId(); int id = p->getPacketId();
LOG_DEBUG("Received packet id=%u\n", id); LOG_DEBUG("Received packet id=%u", id);
mr = (meshtastic_ToRadio *)&static_cast<DataPacket<meshtastic_ToRadio> *>(p.get())->getData(); mr = (meshtastic_ToRadio *)&static_cast<DataPacket<meshtastic_ToRadio> *>(p.get())->getData();
switch (mr->which_payload_variant) { switch (mr->which_payload_variant) {
@ -50,22 +50,22 @@ bool PacketAPI::receivePacket(void)
} }
case meshtastic_ToRadio_want_config_id_tag: { case meshtastic_ToRadio_want_config_id_tag: {
uint32_t config_nonce = mr->want_config_id; uint32_t config_nonce = mr->want_config_id;
LOG_INFO("Screen wants config, nonce=%u\n", config_nonce); LOG_INFO("Screen wants config, nonce=%u", config_nonce);
handleStartConfig(); handleStartConfig();
break; break;
} }
case meshtastic_ToRadio_heartbeat_tag: case meshtastic_ToRadio_heartbeat_tag:
if (mr->heartbeat.dummy_field == 1) { if (mr->heartbeat.dummy_field == 1) {
if (nodeInfoModule) { if (nodeInfoModule) {
LOG_INFO("Broadcasting nodeinfo ping\n"); LOG_INFO("Broadcasting nodeinfo ping");
nodeInfoModule->sendOurNodeInfo(NODENUM_BROADCAST, true, 0, true); nodeInfoModule->sendOurNodeInfo(NODENUM_BROADCAST, true, 0, true);
} }
} else { } else {
LOG_DEBUG("Got client heartbeat\n"); LOG_DEBUG("Got client heartbeat");
} }
break; break;
default: default:
LOG_ERROR("Error: unhandled meshtastic_ToRadio variant: %d\n", mr->which_payload_variant); LOG_ERROR("Error: unhandled meshtastic_ToRadio variant: %d", mr->which_payload_variant);
break; break;
} }
} }

4
src/modules/AdminModule.cpp
View File

@ -176,7 +176,7 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
handleSetHamMode(r->set_ham_mode); handleSetHamMode(r->set_ham_mode);
break; break;
case meshtastic_AdminMessage_get_ui_config_request_tag: { case meshtastic_AdminMessage_get_ui_config_request_tag: {
LOG_INFO("Client is getting device-ui config\n"); LOG_INFO("Client is getting device-ui config");
handleGetDeviceUIConfig(mp); handleGetDeviceUIConfig(mp);
handled = true; handled = true;
break; break;
@ -241,7 +241,7 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
break; break;
} }
case meshtastic_AdminMessage_store_ui_config_tag: { case meshtastic_AdminMessage_store_ui_config_tag: {
LOG_INFO("Storing device-ui config\n"); LOG_INFO("Storing device-ui config");
handleStoreDeviceUIConfig(r->store_ui_config); handleStoreDeviceUIConfig(r->store_ui_config);
handled = true; handled = true;
break; break;

16
variants/rak2560/RAK9154Sensor.cpp
View File

@ -37,11 +37,11 @@ static void onewire_evt(const uint8_t pid, const uint8_t sid, const SNHUBAPI_EVT
break; break;
case SNHUBAPI_EVT_ADD_SID: case SNHUBAPI_EVT_ADD_SID:
// LOG_INFO("+ADD:SID:[%02x]\r\n", msg[0]); // LOG_INFO("+ADD:SID:[%02x]", msg[0]);
break; break;
case SNHUBAPI_EVT_ADD_PID: case SNHUBAPI_EVT_ADD_PID:
// LOG_INFO("+ADD:PID:[%02x]\r\n", msg[0]); // LOG_INFO("+ADD:PID:[%02x]", msg[0]);
#ifdef BOOT_DATA_REQ #ifdef BOOT_DATA_REQ
provision = msg[0]; provision = msg[0];
#endif #endif
@ -55,12 +55,12 @@ static void onewire_evt(const uint8_t pid, const uint8_t sid, const SNHUBAPI_EVT
case SNHUBAPI_EVT_SDATA_REQ: case SNHUBAPI_EVT_SDATA_REQ:
// LOG_INFO("+EVT:PID[%02x],IPSO[%02x]\r\n",pid,msg[0]); // LOG_INFO("+EVT:PID[%02x],IPSO[%02x]",pid,msg[0]);
// for( uint16_t i=1; i<len; i++) // for( uint16_t i=1; i<len; i++)
// { // {
// LOG_INFO("%02x,", msg[i]); // LOG_INFO("%02x,", msg[i]);
// } // }
// LOG_INFO("\r\n"); // LOG_INFO("");
switch (msg[0]) { switch (msg[0]) {
case RAK_IPSO_CAPACITY: case RAK_IPSO_CAPACITY:
dc_prec = msg[1]; dc_prec = msg[1];
@ -82,12 +82,12 @@ static void onewire_evt(const uint8_t pid, const uint8_t sid, const SNHUBAPI_EVT
break; break;
case SNHUBAPI_EVT_REPORT: case SNHUBAPI_EVT_REPORT:
// LOG_INFO("+EVT:PID[%02x],IPSO[%02x]\r\n",pid,msg[0]); // LOG_INFO("+EVT:PID[%02x],IPSO[%02x]",pid,msg[0]);
// for( uint16_t i=1; i<len; i++) // for( uint16_t i=1; i<len; i++)
// { // {
// LOG_INFO("%02x,", msg[i]); // LOG_INFO("%02x,", msg[i]);
// } // }
// LOG_INFO("\r\n"); // LOG_INFO("");
switch (msg[0]) { switch (msg[0]) {
case RAK_IPSO_CAPACITY: case RAK_IPSO_CAPACITY:
@ -110,11 +110,11 @@ static void onewire_evt(const uint8_t pid, const uint8_t sid, const SNHUBAPI_EVT
break; break;
case SNHUBAPI_EVT_CHKSUM_ERR: case SNHUBAPI_EVT_CHKSUM_ERR:
LOG_INFO("+ERR:CHKSUM\r\n"); LOG_INFO("+ERR:CHKSUM");
break; break;
case SNHUBAPI_EVT_SEQ_ERR: case SNHUBAPI_EVT_SEQ_ERR:
LOG_INFO("+ERR:SEQUCE\r\n"); LOG_INFO("+ERR:SEQUCE");
break; break;
default: default: