sforkowany z mirror/meshtastic-firmware
Merge branch 'master' into picomputer-s3
commit
420f40d633
|
@ -30,3 +30,4 @@ __pycache__
|
|||
venv/
|
||||
release/
|
||||
.vscode/extensions.json
|
||||
/compile_commands.json
|
||||
|
|
|
@ -74,7 +74,7 @@ template <class T> class TypedQueue
|
|||
concurrency::OSThread *reader = NULL;
|
||||
|
||||
public:
|
||||
TypedQueue(int maxElements) {}
|
||||
explicit TypedQueue(int maxElements) {}
|
||||
|
||||
int numFree() { return 1; } // Always claim 1 free, because we can grow to any size
|
||||
|
||||
|
|
|
@ -553,9 +553,8 @@ void AdminModule::handleGetDeviceConnectionStatus(const meshtastic_MeshPacket &r
|
|||
{
|
||||
meshtastic_AdminMessage r = meshtastic_AdminMessage_init_default;
|
||||
|
||||
meshtastic_DeviceConnectionStatus conn;
|
||||
meshtastic_DeviceConnectionStatus conn = meshtastic_DeviceConnectionStatus_init_zero;
|
||||
|
||||
conn.wifi = {0};
|
||||
#if HAS_WIFI
|
||||
conn.has_wifi = true;
|
||||
conn.wifi.has_status = true;
|
||||
|
@ -571,11 +570,8 @@ void AdminModule::handleGetDeviceConnectionStatus(const meshtastic_MeshPacket &r
|
|||
conn.wifi.status.is_mqtt_connected = mqtt && mqtt->connected();
|
||||
conn.wifi.status.is_syslog_connected = false; // FIXME wire this up
|
||||
}
|
||||
#else
|
||||
conn.has_wifi = false;
|
||||
#endif
|
||||
|
||||
conn.ethernet = {0};
|
||||
#if HAS_ETHERNET
|
||||
conn.has_ethernet = true;
|
||||
conn.ethernet.has_status = true;
|
||||
|
@ -587,8 +583,6 @@ void AdminModule::handleGetDeviceConnectionStatus(const meshtastic_MeshPacket &r
|
|||
} else {
|
||||
conn.ethernet.status.is_connected = false;
|
||||
}
|
||||
#else
|
||||
conn.has_ethernet = false;
|
||||
#endif
|
||||
|
||||
#if HAS_BLUETOOTH
|
||||
|
|
|
@ -36,6 +36,7 @@ cstyleCast
|
|||
// ignore stuff that is not ours
|
||||
*:.pio/*
|
||||
*:*/libdeps/*
|
||||
*:*/generated/*
|
||||
noExplicitConstructor:*/mqtt/*
|
||||
postfixOperator:*/mqtt/*
|
||||
|
||||
|
@ -44,3 +45,5 @@ missingOverride
|
|||
virtualCallInConstructor
|
||||
|
||||
passedByValue:*/RedirectablePrint.h
|
||||
|
||||
internalAstError:*/CrossPlatformCryptoEngine.cpp
|
||||
|
|
Ładowanie…
Reference in New Issue