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

Fix exclude macros (#4233)

Browse Source 
* fix MESHTASTIC_EXCLUDE_BLUETOOTH

* fix HAS_SCREEN=0

* fix MESHTASTIC_EXCLUDE_GPS
This commit is contained in:
Manuel 2024-07-05 15:58:16 +02:00 committed by GitHub
parent c1df621711
commit ae420dcd21
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/RedirectablePrint.cpp
View File

@ -173,6 +173,7 @@ void RedirectablePrint::log_to_syslog(const char *logLevel, const char *format,
void RedirectablePrint::log_to_ble(const char *logLevel, const char *format, va_list arg) void RedirectablePrint::log_to_ble(const char *logLevel, const char *format, va_list arg)
{ {
#if !MESHTASTIC_EXCLUDE_BLUETOOTH
if (config.bluetooth.device_logging_enabled && !pauseBluetoothLogging) { if (config.bluetooth.device_logging_enabled && !pauseBluetoothLogging) {
bool isBleConnected = false; bool isBleConnected = false;
#ifdef ARCH_ESP32 #ifdef ARCH_ESP32
@ -211,6 +212,11 @@ void RedirectablePrint::log_to_ble(const char *logLevel, const char *format, va_
delete[] buffer; delete[] buffer;
} }
} }
#else
(void)logLevel;
(void)format;
(void)arg;
#endif
} }
meshtastic_LogRecord_Level RedirectablePrint::getLogLevel(const char *logLevel) meshtastic_LogRecord_Level RedirectablePrint::getLogLevel(const char *logLevel)

4
src/graphics/Screen.h
View File

@ -22,6 +22,10 @@ class Screen
void doDeepSleep() {} void doDeepSleep() {}
void forceDisplay(bool forceUiUpdate = false) {} void forceDisplay(bool forceUiUpdate = false) {}
void startFirmwareUpdateScreen() {} void startFirmwareUpdateScreen() {}
void increaseBrightness() {}
void decreaseBrightness() {}
void setFunctionSymbal(std::string) {}
void removeFunctionSymbal(std::string) {}
void startAlert(const char *) {} void startAlert(const char *) {}
void endAlert() {} void endAlert() {}
}; };

2
src/mesh/MeshService.cpp
View File

@ -269,7 +269,7 @@ bool MeshService::trySendPosition(NodeNum dest, bool wantReplies)
assert(node); assert(node);
if (hasValidPosition(node)) { if (hasValidPosition(node)) {
#if HAS_GPS #if HAS_GPS && !MESHTASTIC_EXCLUDE_GPS
if (positionModule) { if (positionModule) {
LOG_INFO("Sending position ping to 0x%x, wantReplies=%d, channel=%d\n", dest, wantReplies, node->channel); LOG_INFO("Sending position ping to 0x%x, wantReplies=%d, channel=%d\n", dest, wantReplies, node->channel);
positionModule->sendOurPosition(dest, wantReplies, node->channel); positionModule->sendOurPosition(dest, wantReplies, node->channel);

2
src/modules/AdminModule.cpp
View File

@ -232,9 +232,9 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
#if !MESHTASTIC_EXCLUDE_GPS #if !MESHTASTIC_EXCLUDE_GPS
if (gps != nullptr) if (gps != nullptr)
gps->enable(); gps->enable();
#endif
// Send our new fixed position to the mesh for good measure // Send our new fixed position to the mesh for good measure
positionModule->sendOurPosition(); positionModule->sendOurPosition();
#endif
} }
break; break;
} }