From b4f1bd5b9ccf490a285e21b4ffb8b950d16dc838 Mon Sep 17 00:00:00 2001 From: Julien Cabillot Date: Sat, 4 Mar 2017 01:45:23 +0100 Subject: [PATCH] ledEffect devient un string --- mqttfastledmenu.ino | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/mqttfastledmenu.ino b/mqttfastledmenu.ino index 8df162d..c2bf08a 100644 --- a/mqttfastledmenu.ino +++ b/mqttfastledmenu.ino @@ -9,7 +9,7 @@ int brightness = LED_BRIGHTNESS_DEFAULT; int color = LED_COLOR_DEFAULT; int speed = LED_SPEED_DEFAULT; CRGB leds[LED_NUM]; -int ledEffect = LED_EFFECT_CYLON; +String ledEffect = LED_EFFECT_CYLON; boolean ledState = false; // WIFI @@ -103,7 +103,7 @@ void callbackMQTT(char* topic, byte* payload, unsigned int length) } else if (stopic == MQTT_LED_EFFECT_COMMAND) { // Si on ne repasse pas tout à noir, cela peut faire des effets surprenants ledBlackAll(); - ledEffect = msgString.toInt(); + ledEffect = msgString; // TODO : a vraiment tester client.publish(MQTT_LED_EFFECT_STATE, message_buff, true); } else if (stopic == MQTT_LED_BRIGHTNESS_COMMAND) { @@ -205,17 +205,12 @@ void loop() { ledBlackAll(); FastLED.delay(1000); } else { - switch(ledEffect) - { - case LED_EFFECT_CYLON: - ledCylon(); - break; - case LED_EFFECT_FULLRED: - ledFullRed(); - break; - default: - ledError(); - break; + if (ledEffect == LED_EFFECT_CYLON) { + ledCylon(); + } else if (ledEffect == LED_EFFECT_FULLRED) { + ledFullRed(); + } else { + ledError(); } } }