uniformisation du code

This commit is contained in:
Julien Cabillot 2017-03-12 01:44:34 +01:00 committed by Cabillot Julien
parent e9377a2be5
commit 99319782aa

View File

@ -24,7 +24,6 @@ WiFiClient espClient;
char message_buff[100];
PubSubClient client(espClient);
///////////////////////////////////////////////
void setup()
{
@ -55,10 +54,10 @@ void setup()
client.loop();
}
//////////////////////////////////////////////// ColorPalette
//////////////////////////////// ColorPalette ///////////////////////////////
currentPalette = RainbowColors_p;
currentBlending = LINEARBLEND;
/////////////////////////////////////////////////////////////
//////////////////////////////// ColorPalette ///////////////////////////////
Serial.println("End of setup");
}
@ -130,7 +129,6 @@ void callbackMQTT(char* topic, byte* payload, unsigned int length)
// Si on ne repasse pas tout à noir, cela peut faire des effets surprenants
ledBlackAll();
ledEffect = msgString;
// TODO : a vraiment tester
client.publish(MQTT_LED_EFFECT_STATE, message_buff, true);
} else if (stopic == MQTT_LED_BRIGHTNESS_COMMAND) {
brightness = msgString.toInt();
@ -157,8 +155,6 @@ void ledBlackAll()
FastLED.show();
}
// TODO : faudra sortir toutes ces fonctions dans un autre fichier
void ledCylon()
{
// Effet cylon : on allume une led, on attends, on eteinds, on passe à la suivante
@ -248,14 +244,19 @@ void ledError()
void ledFullColor()
{
fill_solid(leds, LED_NUM, color);
int breath = (exp(sin(millis() / 2000.0 * PI)) - 0.36787944) * 108.4;
// TODO : il fadrait pas faire 0 -> 255 mais plutot 20 -> brightness
// Source : http://sean.voisen.org/blog/2011/10/breathing-led-with-arduino/
// Augmenter 2000 augmente la fréquence (c'est en fait sin((temps / 1000) * Pi/2)
// 0.36787944 ?? censé correspondre au minimum
// 108.4 ?? censé correspondre au maximum
int breath = (exp(sin(millis() / 2000.0 * PI)) - 0.3678794) * 108.4;
Serial.print(breath);
Serial.println(" / 255");
FastLED.setBrightness(breath);
FastLED.delay(100 / speed);
}
///////////////////////////////// ColorPalette
///////////////////// FastLED-3.1.5/examples/ColorPalette /////////////////////
void ledColorPattern()
{
ChangePalettePeriodically();
@ -279,7 +280,6 @@ void FillLEDsFromPaletteColors(uint8_t colorIndex)
}
}
// There are several different palettes of colors demonstrated here.
//
// FastLED provides several 'preset' palettes: RainbowColors_p, RainbowStripeColors_p,
@ -330,7 +330,6 @@ void SetupBlackAndWhiteStripedPalette()
currentPalette[4] = CRGB::White;
currentPalette[8] = CRGB::White;
currentPalette[12] = CRGB::White;
}
// This function sets up a palette of purple and green stripes.
@ -344,14 +343,12 @@ void SetupPurpleAndGreenPalette()
green, green, black, black,
purple, purple, black, black,
green, green, black, black,
purple, purple, black, black );
purple, purple, black, black
);
}
///////////////////// FastLED-3.1.5/examples/ColorPalette /////////////////////
//////////////////////////////////////////////////////////////////////////////
//////////////////////////////////////////////// ColorTemperature
/////////////////// FastLED-3.1.5/examples/ColorTemperature ///////////////////
void colorTemp()
{
// draw a generic, no-name rainbow
@ -377,10 +374,9 @@ void colorTemp()
FastLED.show();
FastLED.delay(8);
}
////////////////////////////////////////////////////////////////////
/////////////////// FastLED-3.1.5/examples/ColorTemperature ///////////////////
///////////////////////////////////////////////Fire202
//////////////////////// FastLED-3.1.5/examples/Fire202 ///////////////////////
void fire()
{
// Array of temperature readings at each simulation cell
@ -416,7 +412,7 @@ void fire()
FastLED.delay(1000 / speed);
}
/////////////////////////////////////////////
//////////////////////// FastLED-3.1.5/examples/Fire202 ///////////////////////
void loop() {
// MQTT