pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-25 17:42:48 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Remove remaining \n from log lines. (#5675)

Browse Source
This commit is contained in:
Tom Fifield 2024-12-27 18:01:02 +11:00 committed by GitHub
parent 8f8e304216
commit ed39d14c85
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/detect/ScanI2CTwoWire.cpp
View File

@ -458,11 +458,11 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
i2cBus->endTransmission(); i2cBus->endTransmission();
len = i2cBus->readBytes(info, 5); len = i2cBus->readBytes(info, 5);
if (len == 5 && memcmp(expectedInfo, info, len) == 0) { if (len == 5 && memcmp(expectedInfo, info, len) == 0) {
LOG_INFO("NXP SE050 crypto chip found\n"); LOG_INFO("NXP SE050 crypto chip found");
type = NXP_SE050; type = NXP_SE050;
} else { } else {
LOG_INFO("FT6336U touchscreen found\n"); LOG_INFO("FT6336U touchscreen found");
type = FT6336U; type = FT6336U;
} }
break; break;
@ -510,4 +510,4 @@ void ScanI2CTwoWire::logFoundDevice(const char *device, uint8_t address)
{ {
LOG_INFO("%s found at address 0x%x", device, address); LOG_INFO("%s found at address 0x%x", device, address);
} }
#endif #endif

2
src/input/MPR121Keyboard.cpp
View File

@ -87,7 +87,7 @@ uint8_t MPR121_KeyMap[12] = {2, 5, 8, 11, 1, 4, 7, 10, 0, 3, 6, 9};
MPR121Keyboard::MPR121Keyboard() : m_wire(nullptr), m_addr(0), readCallback(nullptr), writeCallback(nullptr) MPR121Keyboard::MPR121Keyboard() : m_wire(nullptr), m_addr(0), readCallback(nullptr), writeCallback(nullptr)
{ {
// LOG_DEBUG("MPR121 @ %02x\n", m_addr); // LOG_DEBUG("MPR121 @ %02x", m_addr);
state = Init; state = Init;
last_key = -1; last_key = -1;
last_tap = 0L; last_tap = 0L;

6
src/input/TouchScreenBase.cpp
View File

@ -113,13 +113,13 @@ int32_t TouchScreenBase::runOnce()
if (_tapped) { if (_tapped) {
_tapped = false; _tapped = false;
e.touchEvent = static_cast<char>(TOUCH_ACTION_TAP); e.touchEvent = static_cast<char>(TOUCH_ACTION_TAP);
LOG_DEBUG("action TAP(%d/%d)\n", _last_x, _last_y); LOG_DEBUG("action TAP(%d/%d)", _last_x, _last_y);
} }
} else { } else {
if (_tapped && (time_t(millis()) - _start) > TIME_LONG_PRESS - 50) { if (_tapped && (time_t(millis()) - _start) > TIME_LONG_PRESS - 50) {
_tapped = false; _tapped = false;
e.touchEvent = static_cast<char>(TOUCH_ACTION_TAP); e.touchEvent = static_cast<char>(TOUCH_ACTION_TAP);
LOG_DEBUG("action TAP(%d/%d)\n", _last_x, _last_y); LOG_DEBUG("action TAP(%d/%d)", _last_x, _last_y);
} }
} }
#else #else
@ -156,4 +156,4 @@ void TouchScreenBase::hapticFeedback()
drv.setWaveform(1, 0); // end waveform drv.setWaveform(1, 0); // end waveform
drv.go(); drv.go();
#endif #endif
} }

2
src/mesh/NodeDB.cpp
View File

@ -1059,7 +1059,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

4
src/mesh/PhoneAPI.cpp
View File

@ -201,7 +201,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;
@ -664,4 +664,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 return timeout ? -1 : 0; // If we timed out, MeshService should stop iterating through observers as we just removed one
} }

8
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);
break; break;
} }
@ -488,7 +488,7 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c)
IS_ONE_OF(config.device.role, meshtastic_Config_DeviceConfig_Role_ROUTER, IS_ONE_OF(config.device.role, meshtastic_Config_DeviceConfig_Role_ROUTER,
meshtastic_Config_DeviceConfig_Role_REPEATER)) { meshtastic_Config_DeviceConfig_Role_REPEATER)) {
config.device.rebroadcast_mode = meshtastic_Config_DeviceConfig_RebroadcastMode_ALL; config.device.rebroadcast_mode = meshtastic_Config_DeviceConfig_RebroadcastMode_ALL;
const char *warning = "Rebroadcast mode can't be set to NONE for a router or repeater\n"; const char *warning = "Rebroadcast mode can't be set to NONE for a router or repeater";
LOG_WARN(warning); LOG_WARN(warning);
sendWarning(warning); sendWarning(warning);
} }
@ -1149,4 +1149,4 @@ void disableBluetooth()
nrf52Bluetooth->shutdown(); nrf52Bluetooth->shutdown();
#endif #endif
#endif #endif
} }

6
src/motion/QMA6100PSensor.cpp
View File

@ -88,13 +88,13 @@ bool QMA6100PSingleton::init(ScanI2C::FoundDevice device)
bool status = begin(device.address.address, &Wire); bool status = begin(device.address.address, &Wire);
#endif #endif
if (status != true) { if (status != true) {
LOG_WARN("QMA6100P init begin failed\n"); LOG_WARN("QMA6100P init begin failed");
return false; return false;
} }
delay(20); delay(20);
// SW reset to make sure the device starts in a known state // SW reset to make sure the device starts in a known state
if (softwareReset() != true) { if (softwareReset() != true) {
LOG_WARN("QMA6100P init reset failed\n"); LOG_WARN("QMA6100P init reset failed");
return false; return false;
} }
delay(20); delay(20);
@ -180,4 +180,4 @@ bool QMA6100PSingleton::setWakeOnMotion()
return true; return true;
} }
#endif #endif

18
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:
@ -180,4 +180,4 @@ bool RAK9154Sensor::isCharging()
{ {
return (dc_cur > 0) ? true : false; return (dc_cur > 0) ? true : false;
} }
#endif // HAS_RAKPROT #endif // HAS_RAKPROT