|
|
|
@ -7,15 +7,6 @@ |
|
|
|
|
|
|
|
#include "alarmclock.h"
|
|
|
|
|
|
|
|
// LED
|
|
|
|
// Corresponds à un max brightness configurable via HA
|
|
|
|
int brightness = LED_BRIGHTNESS_DEFAULT; |
|
|
|
// Utilisé pour définir le seuil actuel de brightness
|
|
|
|
int curbrightness = 0; |
|
|
|
int color = LED_COLOR_DEFAULT; |
|
|
|
CRGB leds[LED_NUM]; |
|
|
|
boolean ledState = false; |
|
|
|
|
|
|
|
void setup() |
|
|
|
{ |
|
|
|
Serial.begin(SERIAL_SPEED); |
|
|
|
@ -25,21 +16,20 @@ void setup() |
|
|
|
setupWifi(); |
|
|
|
|
|
|
|
// LED
|
|
|
|
/*
|
|
|
|
brightness = LED_BRIGHTNESS_DEFAULT; |
|
|
|
maxBrightness = LED_MAXBRIGHTNESS_DEFAULT; |
|
|
|
curbrightness = LED_BRIGHTNESS_DEFAULT; |
|
|
|
color = LED_COLOR_DEFAULT; |
|
|
|
ledState = false; |
|
|
|
*/ |
|
|
|
|
|
|
|
LEDS.addLeds<LED_CHIPSET,LED_PIN, LED_COLOR_ORDER>(leds, LED_NUM).setCorrection(TypicalSMD5050); |
|
|
|
ledBlackAll(); |
|
|
|
FastLED.setBrightness(brightness); |
|
|
|
|
|
|
|
// MQTT
|
|
|
|
client.setServer(MQTT_SERVER, MQTT_PORT); |
|
|
|
client.setCallback(callbackMQTT); |
|
|
|
testConnectMQTT(); |
|
|
|
|
|
|
|
fps = 0; |
|
|
|
Serial.println("Ready"); |
|
|
|
|
|
|
|
/* MQTT
|
|
|
|
@ -119,13 +109,12 @@ void callbackMQTT(char* topic, byte* payload, unsigned int length) |
|
|
|
ledState = true; |
|
|
|
} else { |
|
|
|
ledState = false; |
|
|
|
curbrightness = 0; |
|
|
|
curbrightness = LED_BRIGHTNESS_DEFAULT; |
|
|
|
ledBlackAll(); |
|
|
|
} |
|
|
|
mqttSendState(); |
|
|
|
} else if (stopic == MQTT_LED_BRIGHTNESS_COMMAND) { |
|
|
|
brightness = msgString.toInt(); |
|
|
|
FastLED.setBrightness(brightness); |
|
|
|
maxBrightness = msgString.toInt(); |
|
|
|
mqttSendBrightnessState(); |
|
|
|
} else if (stopic == MQTT_LED_COLOR_COMMAND) { |
|
|
|
// Sample : 134,168,255
|
|
|
|
@ -146,7 +135,7 @@ void mqttSendState() |
|
|
|
void mqttSendBrightnessState() |
|
|
|
{ |
|
|
|
char buff[4]; |
|
|
|
itoa(brightness, buff, 10); |
|
|
|
itoa(maxBrightness, buff, 10); |
|
|
|
client.publish(MQTT_LED_BRIGHTNESS_STATE, buff, true); |
|
|
|
} |
|
|
|
|
|
|
|
@ -194,20 +183,47 @@ void ledError() |
|
|
|
*/ |
|
|
|
void ledDisplay() |
|
|
|
{ |
|
|
|
// Source : http://sean.voisen.org/blog/2011/10/breathing-led-with-arduino/
|
|
|
|
float breath = (exp(sin(millis() / 4000.0 * PI)) - 0.3678794) * 108.4; |
|
|
|
/* Natural Breathing LED
|
|
|
|
* Source : http://sean.voisen.org/blog/2011/10/breathing-led-with-arduino/
|
|
|
|
* La formule : (exp(sin(x / freq)) - (1/e)) * (maxBrightness/(e-(1/e)) |
|
|
|
* freq = 2000.0 * PI (-> interval de 4sec) |
|
|
|
* Fréquence respiratoire : https://fr.wikipedia.org/wiki/Fr%C3%A9quence_respiratoire
|
|
|
|
* Test perso rapide révéillé : 18 cycles par minutes -> interval de 3.33sec. |
|
|
|
* |
|
|
|
* En remplaçant 1/e par 0.349 on arrive à un minimal de 1.00x ce qui permet d'avoir les leds qui ne s'éteignent pas |
|
|
|
* Il faut alors remplacer maxBrightness par maxBrightness - 1 dans la dernière partie de l'équation |
|
|
|
*/ |
|
|
|
// J'ai essayé en précalculant la dernière partie à chaque changement de brightness.
|
|
|
|
// Cela ne change rien on nombre de frames traitées (400).
|
|
|
|
float breath = (exp(sin(millis() / 4500.0 * PI)) + 1.2) * ((curbrightness - 1) / (EULER - (1 / EULER))); |
|
|
|
|
|
|
|
fill_solid(leds, LED_NUM, color); |
|
|
|
FastLED.setBrightness(map(breath, 0, 255, 0, curbrightness)); |
|
|
|
FastLED.setBrightness(breath); |
|
|
|
/* Debug
|
|
|
|
EVERY_N_SECONDS(1) { |
|
|
|
Serial.print(breath); |
|
|
|
Serial.print(" | "); |
|
|
|
Serial.print(curbrightness); |
|
|
|
Serial.print("/"); |
|
|
|
Serial.println(maxBrightness); |
|
|
|
} |
|
|
|
*/ |
|
|
|
fps++; |
|
|
|
if (SHOW_FPS) { |
|
|
|
EVERY_N_SECONDS(1) { |
|
|
|
Serial.print("FPS : "); |
|
|
|
Serial.println(fps); |
|
|
|
fps=0; |
|
|
|
} |
|
|
|
} |
|
|
|
FastLED.show(); |
|
|
|
} |
|
|
|
|
|
|
|
void loop() { |
|
|
|
// TODO : à voir s'il est plus interressant d'augmenter vite mais graduellement
|
|
|
|
// TODO : ou de manière moins fréquence mais en faisant un saut de palier.
|
|
|
|
// TODO : la solution peut aussi etre un mix des deux
|
|
|
|
EVERY_N_SECONDS(10) { |
|
|
|
curbrightness++; |
|
|
|
if (curbrightness <= maxBrightness) { |
|
|
|
curbrightness++; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
// MQTT
|
|
|
|
|