Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[LED RGB] Enable ON OFF Led power display depending on actuator status #1451

Merged
merged 3 commits into from
Feb 11, 2023
Merged

[LED RGB] Enable ON OFF Led power display depending on actuator status #1451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
46658c7
[LED] Enable ON OFF Led power display depending on actuator status
1technophile Feb 10, 2023
a4c0a4e
Define empty Indicators macro on a much larger scope
1technophile Feb 11, 2023
c8b6c3b
Do not use I2S with S3 and C3
1technophile Feb 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 29 additions & 10 deletions main/User_config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,13 @@ int lowpowermode = DEFAULT_LOW_POWER_MODE;
# define InfoIndicatorON() digitalWrite(LED_INFO, LED_INFO_ON)
# define InfoIndicatorOFF() digitalWrite(LED_INFO, !LED_INFO_ON)
# define CriticalIndicatorON() // Not used
# define CriticalIndicatorON() // Not used
# define PowerIndicatorON() // Not used
# define PowerIndicatorOFF() // Not used
#else // Management of Errors, reception/emission and informations indicators with RGB LED
# if !defined(CONFIG_IDF_TARGET_ESP32S3) && !defined(CONFIG_IDF_TARGET_ESP32C3) //I2S not available yet with Fastled on S3 and C3
# define FASTLED_ESP32_I2S // To avoid ESP32 instabilities https://github.com/FastLED/FastLED/issues/1438
# endif
# include <FastLED.h>
CRGB leds[FASTLED_IND_NUM_LEDS];
# ifdef FASTLED_IND_DATA_GPIO2 // Only used for Critical Indicator
Expand All @@ -480,11 +486,20 @@ CRGB leds2[FASTLED_IND_NUM_LEDS];
# define FASTLED_CRITICAL_LED 0 // First Led
# endif

# define SetupIndicators() \
pinMode(RGB_LED_POWER, OUTPUT); \
digitalWrite(RGB_LED_POWER, HIGH); \
FastLED.addLeds<FASTLED_IND_TYPE, FASTLED_IND_DATA_GPIO>(leds, FASTLED_IND_NUM_LEDS); \
FastLED.setBrightness(FASTLED_BRIGHTNESS)
# ifndef FASTLED_IND_DATA_GPIO2
# define SetupIndicators() \
pinMode(RGB_LED_POWER, OUTPUT); \
digitalWrite(RGB_LED_POWER, HIGH); \
FastLED.addLeds<FASTLED_IND_TYPE, FASTLED_IND_DATA_GPIO>(leds, FASTLED_IND_NUM_LEDS); \
FastLED.setBrightness(FASTLED_BRIGHTNESS)
# else
# define SetupIndicators() \
pinMode(RGB_LED_POWER, OUTPUT); \
digitalWrite(RGB_LED_POWER, HIGH); \
FastLED.addLeds<FASTLED_IND_TYPE, FASTLED_IND_DATA_GPIO>(leds, FASTLED_IND_NUM_LEDS); \
FastLED.addLeds<FASTLED_IND_TYPE, FASTLED_IND_DATA_GPIO2>(leds2, FASTLED_IND_NUM_LEDS); \
FastLED.setBrightness(FASTLED_BRIGHTNESS)
# endif
# define ErrorIndicatorON() \
leds[FASTLED_ERROR_LED] = CRGB::Orange; \
FastLED.show()
Expand All @@ -503,13 +518,17 @@ CRGB leds2[FASTLED_IND_NUM_LEDS];
# define InfoIndicatorOFF() \
leds[FASTLED_INFO_LED] = CRGB::Black; \
FastLED.show()
# ifdef FASTLED_IND_DATA_GPIO2
# ifdef FASTLED_IND_DATA_GPIO2 // Used for relay power indicator
// For the critical ON indicator there is no method to turn it off, the only way is to unplug the device
// This enable to have persistence of the indicator to inform the user
# define CriticalIndicatorON() \
FastLED.addLeds<FASTLED_IND_TYPE, FASTLED_IND_DATA_GPIO2>(leds2, FASTLED_IND_NUM_LEDS); \
FastLED.setBrightness(FASTLED_BRIGHTNESS); \
leds2[FASTLED_INFO_LED] = CRGB::Red; \
# define CriticalIndicatorON() \
leds2[FASTLED_INFO_LED] = CRGB::Red; \
FastLED.show()
# define PowerIndicatorON() \
leds2[FASTLED_INFO_LED] = CRGB::Green; \
FastLED.show()
# define PowerIndicatorOFF() \
leds2[FASTLED_INFO_LED] = CRGB::Black; \
FastLED.show()
# endif
#endif
Expand Down
15 changes: 15 additions & 0 deletions main/ZactuatorONOFF.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ void MQTTtoONOFF(char* topicOri, JsonObject& ONOFFdata) {
Log.notice(F("GPIO number: %d" CR), gpio);
pinMode(gpio, OUTPUT);
digitalWrite(gpio, boolSWITCHTYPE);
if (boolSWITCHTYPE == ACTUATOR_ON) {
PowerIndicatorON();
} else {
PowerIndicatorOFF();
}
// we acknowledge the sending by publishing the value to an acknowledgement topic
pub(subjectGTWONOFFtoMQTT, ONOFFdata);
} else {
Expand Down Expand Up @@ -103,6 +108,11 @@ void MQTTtoONOFF(char* topicOri, char* datacallback) {
ON = false;

digitalWrite(gpio, ON);
if (ON == ACTUATOR_ON) {
PowerIndicatorON();
} else {
PowerIndicatorOFF();
}
// we acknowledge the sending by publishing the value to an acknowledgement topic
char b = ON;
pub(subjectGTWONOFFtoMQTT, &b);
Expand Down Expand Up @@ -161,6 +171,11 @@ void ActuatorTrigger() {
uint8_t level = !digitalRead(ACTUATOR_ONOFF_GPIO);
Log.trace(F("Actuator triggered %d" CR), level);
digitalWrite(ACTUATOR_ONOFF_GPIO, level);
if (level == ACTUATOR_ON) {
PowerIndicatorON();
} else {
PowerIndicatorOFF();
}
// Send the state of the switch to the broker so as to update the status
StaticJsonDocument<JSON_MSG_BUFFER> jsonBuffer;
JsonObject ONOFFdata = jsonBuffer.to<JsonObject>();
Expand Down