pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-09-10 21:19:07 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Trunk fmt

Browse Source
This commit is contained in:
Ben Meadors 2024-11-25 06:57:52 -06:00
parent 40d82faace
commit 9ab22c04cd
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/modules/ExternalNotificationModule.cpp
View File

@ -73,15 +73,14 @@ bool ascending = true;
#define ASCII_BELL 0x07 #define ASCII_BELL 0x07
struct ExternalNotificationModule::RGB { struct ExternalNotificationModule::RGB {
constexpr RGB(uint8_t red, uint8_t green,uint8_t blue) constexpr RGB(uint8_t red, uint8_t green, uint8_t blue) : red{red}, green{green}, blue{blue} {}
: red{red}, green{green}, blue{blue}
{} #define SCALE_ALPHA(COLOR, ALPHA) (uint8_t)((((uint16_t)COLOR) * ALPHA) / (uint16_t)255)
#define SCALE_ALPHA(COLOR, ALPHA) (uint8_t)((((uint16_t)COLOR) * ALPHA) / (uint16_t)255)
constexpr RGB(uint8_t red, uint8_t green, uint8_t blue, uint8_t alpha) constexpr RGB(uint8_t red, uint8_t green, uint8_t blue, uint8_t alpha)
: red{SCALE_ALPHA(red, alpha)}, green{SCALE_ALPHA(green, alpha)}, blue{SCALE_ALPHA(blue, alpha)} : red{SCALE_ALPHA(red, alpha)}, green{SCALE_ALPHA(green, alpha)}, blue{SCALE_ALPHA(blue, alpha)}
{} {
#undef SCALE_ALPHA }
#undef SCALE_ALPHA
uint8_t red = 0; uint8_t red = 0;
uint8_t green = 0; uint8_t green = 0;
@ -144,13 +143,14 @@ int32_t ExternalNotificationModule::runOnce()
if (externalTurnedOn[2] + (moduleConfig.external_notification.output_ms ? moduleConfig.external_notification.output_ms if (externalTurnedOn[2] + (moduleConfig.external_notification.output_ms ? moduleConfig.external_notification.output_ms
: EXT_NOTIFICATION_MODULE_OUTPUT_MS) < : EXT_NOTIFICATION_MODULE_OUTPUT_MS) <
millis()) { millis()) {
LOG_DEBUG("EXTERNAL 2 %d compared to %d", externalTurnedOn[2]+moduleConfig.external_notification.output_ms, millis()); LOG_DEBUG("EXTERNAL 2 %d compared to %d", externalTurnedOn[2] + moduleConfig.external_notification.output_ms,
millis());
setExternalState(2, !getExternal(2)); setExternalState(2, !getExternal(2));
} }
#ifdef HAS_LED #ifdef HAS_LED
red = (colorState & 4) ? 170 : 0; // Red enabled on colorState = 4,5,6,7 red = (colorState & 4) ? 170 : 0; // Red enabled on colorState = 4,5,6,7
green = (colorState & 2) ? 170 : 0; // Green enabled on colorState = 2,3,6,7 green = (colorState & 2) ? 170 : 0; // Green enabled on colorState = 2,3,6,7
blue = (colorState & 1) ? 255 : 0; // Blue enabled on colorState = 1,3,5,7 blue = (colorState & 1) ? 255 : 0; // Blue enabled on colorState = 1,3,5,7
setLEDs({red, green, blue, alphaValues[alphaIndex]}); setLEDs({red, green, blue, alphaValues[alphaIndex]});
#endif #endif
@ -254,7 +254,7 @@ void ExternalNotificationModule::stopNow()
#endif #endif
} }
void ExternalNotificationModule::setLEDs(const RGB& rgb) void ExternalNotificationModule::setLEDs(const RGB &rgb)
{ {
#ifdef HAS_LED #ifdef HAS_LED

2
src/modules/ExternalNotificationModule.h
View File

@ -47,7 +47,7 @@ class ExternalNotificationModule : public SinglePortModule, private concurrency:
void setExternalState(uint8_t index = 0, bool on = false); void setExternalState(uint8_t index = 0, bool on = false);
struct RGB; struct RGB;
void setLEDs(const RGB& rgba); void setLEDs(const RGB &rgba);
/** Called to handle a particular incoming message /** Called to handle a particular incoming message
@return ProcessMessage::STOP if you've guaranteed you've handled this message and no other handlers should be considered for @return ProcessMessage::STOP if you've guaranteed you've handled this message and no other handlers should be considered for