IS_ONE_OF macro to make long chains of conditions more concise and easy to follow (#4860)

* Is one of macro

* Moar

* Whoops

* Trunk

* isOneOf function backed macro
This commit is contained in:
Ben Meadors
2024-09-25 13:50:00 -05:00
committed by GitHub
parent 9dd769586f
commit 4128d75ad4
8 changed files with 46 additions and 20 deletions

View File

@@ -11,14 +11,15 @@
#include "main.h"
#include <OLEDDisplay.h>
#include <OLEDDisplayUi.h>
#include <meshUtils.h>
#define MAGIC_USB_BATTERY_LEVEL 101
int32_t DeviceTelemetryModule::runOnce()
{
refreshUptime();
bool isImpoliteRole = config.device.role == meshtastic_Config_DeviceConfig_Role_SENSOR ||
config.device.role == meshtastic_Config_DeviceConfig_Role_ROUTER;
bool isImpoliteRole =
IS_ONE_OF(config.device.role, meshtastic_Config_DeviceConfig_Role_SENSOR, meshtastic_Config_DeviceConfig_Role_ROUTER);
if (((lastSentToMesh == 0) ||
((uptimeLastMs - lastSentToMesh) >=
Default::getConfiguredOrDefaultMsScaled(moduleConfig.telemetry.device_update_interval,