From c09434b77e1036e0aba80dcf643f3d653b2ec903 Mon Sep 17 00:00:00 2001 From: mverch67 Date: Wed, 16 Oct 2024 22:30:00 +0200 Subject: [PATCH] remove newlines from debug log --- arch/rp2xx0/rp2350.ini | 25 +++++++++++++++++++++++++ src/mesh/PhoneAPI.cpp | 2 +- src/mesh/api/PacketAPI.cpp | 10 +++++----- src/modules/AdminModule.cpp | 2 +- variants/rak2560/RAK9154Sensor.cpp | 16 ++++++++-------- 5 files changed, 40 insertions(+), 15 deletions(-) create mode 100644 arch/rp2xx0/rp2350.ini diff --git a/arch/rp2xx0/rp2350.ini b/arch/rp2xx0/rp2350.ini new file mode 100644 index 000000000..73662001b --- /dev/null +++ b/arch/rp2xx0/rp2350.ini @@ -0,0 +1,25 @@ +; Common settings for rp2040 Processor based targets +[rp2350_base] +platform = https://github.com/maxgerhardt/platform-raspberrypi.git#19e30129fb1428b823be585c787dcb4ac0d9014c ; For arduino-pico >=4.2.1 +extends = arduino_base +platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#6024e9a7e82a72e38dd90f42029ba3748835eb2e ; 4.3.0 with fix MDNS + +board_build.core = earlephilhower +board_build.filesystem_size = 0.5m +build_flags = + ${arduino_base.build_flags} -Wno-unused-variable + -Isrc/platform/rp2xx0 + -D__PLAT_RP2040__ +# -D _POSIX_THREADS +build_src_filter = + ${arduino_base.build_src_filter} - - - - - - - - - + +lib_ignore = + BluetoothOTA + lvgl + +lib_deps = + ${arduino_base.lib_deps} + ${environmental_base.lib_deps} + ${radiolib_base.lib_deps} + rweather/Crypto diff --git a/src/mesh/PhoneAPI.cpp b/src/mesh/PhoneAPI.cpp index f49718c5e..ba0d56919 100644 --- a/src/mesh/PhoneAPI.cpp +++ b/src/mesh/PhoneAPI.cpp @@ -657,4 +657,4 @@ int PhoneAPI::onNotify(uint32_t newValue) } return timeout ? -1 : 0; // If we timed out, MeshService should stop iterating through observers as we just removed one -} \ No newline at end of file +} diff --git a/src/mesh/api/PacketAPI.cpp b/src/mesh/api/PacketAPI.cpp index 348b32949..6c3604efd 100644 --- a/src/mesh/api/PacketAPI.cpp +++ b/src/mesh/api/PacketAPI.cpp @@ -38,7 +38,7 @@ bool PacketAPI::receivePacket(void) meshtastic_ToRadio *mr; auto p = server->receivePacket()->move(); int id = p->getPacketId(); - LOG_DEBUG("Received packet id=%u\n", id); + LOG_DEBUG("Received packet id=%u", id); mr = (meshtastic_ToRadio *)&static_cast *>(p.get())->getData(); switch (mr->which_payload_variant) { @@ -50,22 +50,22 @@ bool PacketAPI::receivePacket(void) } case meshtastic_ToRadio_want_config_id_tag: { 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(); break; } case meshtastic_ToRadio_heartbeat_tag: if (mr->heartbeat.dummy_field == 1) { if (nodeInfoModule) { - LOG_INFO("Broadcasting nodeinfo ping\n"); + LOG_INFO("Broadcasting nodeinfo ping"); nodeInfoModule->sendOurNodeInfo(NODENUM_BROADCAST, true, 0, true); } } else { - LOG_DEBUG("Got client heartbeat\n"); + LOG_DEBUG("Got client heartbeat"); } break; 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; } } diff --git a/src/modules/AdminModule.cpp b/src/modules/AdminModule.cpp index 2d33b723d..3392a3984 100644 --- a/src/modules/AdminModule.cpp +++ b/src/modules/AdminModule.cpp @@ -1123,4 +1123,4 @@ void disableBluetooth() nrf52Bluetooth->shutdown(); #endif #endif -} \ No newline at end of file +} diff --git a/variants/rak2560/RAK9154Sensor.cpp b/variants/rak2560/RAK9154Sensor.cpp index 9f660947e..5fb09c130 100644 --- a/variants/rak2560/RAK9154Sensor.cpp +++ b/variants/rak2560/RAK9154Sensor.cpp @@ -37,11 +37,11 @@ static void onewire_evt(const uint8_t pid, const uint8_t sid, const SNHUBAPI_EVT break; case SNHUBAPI_EVT_ADD_SID: - // LOG_INFO("+ADD:SID:[%02x]\r\n", msg[0]); + // LOG_INFO("+ADD:SID:[%02x]", msg[0]); break; 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 provision = msg[0]; #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: - // 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