diff --git a/src/GPSStatus.h b/src/GPSStatus.h index 515e33600..4b7997935 100644 --- a/src/GPSStatus.h +++ b/src/GPSStatus.h @@ -85,6 +85,9 @@ class GPSStatus : public Status bool matches(const GPSStatus *newStatus) const { +#ifdef GPS_DEBUG + LOG_DEBUG("GPSStatus.match() new pos@%x to old pos@%x", newStatus->p.timestamp, p.timestamp); +#endif return (newStatus->hasLock != hasLock || newStatus->isConnected != isConnected || newStatus->isPowerSaving != isPowerSaving || newStatus->p.latitude_i != p.latitude_i || newStatus->p.longitude_i != p.longitude_i || newStatus->p.altitude != p.altitude || diff --git a/src/gps/GPS.cpp b/src/gps/GPS.cpp index 311066675..a6bf32b5a 100644 --- a/src/gps/GPS.cpp +++ b/src/gps/GPS.cpp @@ -794,6 +794,9 @@ void GPS::writePinEN(bool on) // Write and log enablePin->set(on); +#ifdef GPS_DEBUG + LOG_DEBUG("Pin EN %s", val == HIGH ? "HIGH" : "LOW"); +#endif } // Set the value of the STANDBY pin, if relevant @@ -813,6 +816,9 @@ void GPS::writePinStandby(bool standby) // Write and log pinMode(PIN_GPS_STANDBY, OUTPUT); digitalWrite(PIN_GPS_STANDBY, val); +#ifdef GPS_DEBUG + LOG_DEBUG("Pin STANDBY %s", val == HIGH ? "HIGH" : "LOW"); +#endif #endif } @@ -843,7 +849,9 @@ void GPS::setPowerPMU(bool on) // t-beam v1.1 GNSS power channel on ? PMU->enablePowerOutput(XPOWERS_LDO3) : PMU->disablePowerOutput(XPOWERS_LDO3); } - +#ifdef GPS_DEBUG + LOG_DEBUG("PMU %s", on ? "on" : "off"); +#endif #endif } @@ -889,6 +897,9 @@ void GPS::setPowerUBLOX(bool on, uint32_t sleepMs) // Send the UBX packet gps->_serial_gps->write(gps->UBXscratch, msglen); +#ifdef GPS_DEBUG + LOG_DEBUG("UBLOX: sleep for %dmS", sleepMs); +#endif } } @@ -1010,7 +1021,7 @@ int32_t GPS::runOnce() GNSS_MODEL_UBLOX10)) { // reset the GPS on next bootup if (devicestate.did_gps_reset && scheduling.elapsedSearchMs() > 60 * 1000UL && !hasFlow()) { - LOG_DEBUG("GPS is not communicating, trying factory reset on next boot."); + LOG_DEBUG("GPS is not communicating, trying factory reset on next boot"); devicestate.did_gps_reset = false; nodeDB->saveToDisk(SEGMENT_DEVICESTATE); return disable(); // Stop the GPS thread as it can do nothing useful until next reboot. @@ -1508,6 +1519,16 @@ bool GPS::lookForLocation() if (!hasLock()) return false; +#ifdef GPS_DEBUG + LOG_DEBUG("AGE: LOC=%d FIX=%d DATE=%d TIME=%d", reader.location.age(), +#ifndef TINYGPS_OPTION_NO_CUSTOM_FIELDS + gsafixtype.age(), +#else + 0, +#endif + reader.date.age(), reader.time.age()); +#endif // GPS_DEBUG + // Is this a new point or are we re-reading the previous one? if (!reader.location.isUpdated() && !reader.altitude.isUpdated()) return false; @@ -1529,9 +1550,15 @@ bool GPS::lookForLocation() // Bail out EARLY to avoid overwriting previous good data (like #857) if (toDegInt(loc.lat) > 900000000) { +#ifdef GPS_DEBUG + LOG_DEBUG("Bail out EARLY on LAT %i", toDegInt(loc.lat)); +#endif return false; } if (toDegInt(loc.lng) > 1800000000) { +#ifdef GPS_EDEBUG + LOG_DEBUG("Bail out EARLY on LNG %i", toDegInt(loc.lng)); +#endif return false; } diff --git a/src/mesh/MeshService.cpp b/src/mesh/MeshService.cpp index 5c57bc10b..de4750653 100644 --- a/src/mesh/MeshService.cpp +++ b/src/mesh/MeshService.cpp @@ -383,6 +383,9 @@ int MeshService::onGPSChanged(const meshtastic::GPSStatus *newStatus) pos = gps->p; } else { // The GPS has lost lock +#ifdef GPS_DEBUG + LOG_DEBUG("onGPSchanged() - lost validLocation"); +#endif } // Used fixed position if configured regardless of GPS lock if (config.position.fixed_position) { diff --git a/src/mesh/PhoneAPI.cpp b/src/mesh/PhoneAPI.cpp index f8d93a790..88ff95760 100644 --- a/src/mesh/PhoneAPI.cpp +++ b/src/mesh/PhoneAPI.cpp @@ -64,7 +64,7 @@ void PhoneAPI::handleStartConfig() void PhoneAPI::close() { - LOG_INFO("PhoneAPI::close()"); + LOG_DEBUG("PhoneAPI::close()"); if (state != STATE_SEND_NOTHING) { state = STATE_SEND_NOTHING; @@ -133,7 +133,7 @@ bool PhoneAPI::handleToRadio(const uint8_t *buf, size_t bufLength) break; #if !MESHTASTIC_EXCLUDE_MQTT case meshtastic_ToRadio_mqttClientProxyMessage_tag: - LOG_INFO("Got MqttClientProxy message"); + LOG_DEBUG("Got MqttClientProxy message"); if (mqtt && moduleConfig.mqtt.proxy_to_client_enabled && moduleConfig.mqtt.enabled && (channels.anyMqttEnabled() || moduleConfig.mqtt.map_reporting_enabled)) { mqtt->onClientProxyReceive(toRadioScratch.mqttClientProxyMessage); @@ -202,7 +202,7 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf) break; case STATE_SEND_OWN_NODEINFO: { - LOG_INFO("Sending My NodeInfo"); + LOG_DEBUG("Sending My NodeInfo"); auto us = nodeDB->readNextMeshNode(readIndex); if (us) { nodeInfoForPhone = TypeConversions::ConvertToNodeInfo(us); @@ -225,7 +225,7 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf) break; case STATE_SEND_CHANNELS: - LOG_INFO("Sending Channels"); + LOG_DEBUG("Sending Channels"); fromRadioScratch.which_payload_variant = meshtastic_FromRadio_channel_tag; fromRadioScratch.channel = channels.getByIndex(config_state); config_state++; @@ -237,7 +237,7 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf) break; case STATE_SEND_CONFIG: - LOG_INFO("Sending Radio config"); + LOG_DEBUG("Sending Radio config"); fromRadioScratch.which_payload_variant = meshtastic_FromRadio_config_tag; switch (config_state) { case meshtastic_Config_device_tag: @@ -292,7 +292,7 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf) break; case STATE_SEND_MODULECONFIG: - LOG_INFO("Sending Module Config"); + LOG_DEBUG("Sending Module Config"); fromRadioScratch.which_payload_variant = meshtastic_FromRadio_moduleConfig_tag; switch (config_state) { case meshtastic_ModuleConfig_mqtt_tag: @@ -361,7 +361,7 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf) break; case STATE_SEND_OTHER_NODEINFOS: { - LOG_INFO("Sending known nodes"); + LOG_DEBUG("Sending known nodes"); if (nodeInfoForPhone.num != 0) { LOG_INFO("nodeinfo: num=0x%x, lastseen=%u, id=%s, name=%s", nodeInfoForPhone.num, nodeInfoForPhone.last_heard, nodeInfoForPhone.user.id, nodeInfoForPhone.user.long_name); @@ -370,7 +370,7 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf) // Stay in current state until done sending nodeinfos nodeInfoForPhone.num = 0; // We just consumed a nodeinfo, will need a new one next time } else { - LOG_INFO("Done sending nodeinfo"); + LOG_DEBUG("Done sending nodeinfo"); state = STATE_SEND_FILEMANIFEST; // Go ahead and send that ID right now return getFromRadio(buf); diff --git a/src/mesh/RadioLibInterface.cpp b/src/mesh/RadioLibInterface.cpp index df73542fa..51d0ba540 100644 --- a/src/mesh/RadioLibInterface.cpp +++ b/src/mesh/RadioLibInterface.cpp @@ -171,7 +171,7 @@ ErrorCode RadioLibInterface::send(meshtastic_MeshPacket *p) } } else { - LOG_WARN("send - lora tx disabled: Region is not set"); + LOG_WARN("send - lora tx disabled: Region unset"); packetPool.release(p); return ERRNO_DISABLED; } @@ -379,7 +379,7 @@ void RadioLibInterface::handleReceiveInterrupt() #ifndef DISABLE_WELCOME_UNSET if (config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_UNSET) { - LOG_WARN("lora rx disabled: Region is not set"); + LOG_WARN("lora rx disabled: Region unset"); airTime->logAirtime(RX_ALL_LOG, xmitMsec); return; }