Explorar o código

led lustre control ok

button0 still bugging (freeze) but seems ok with all the others
Etienne Landon %!s(int64=8) %!d(string=hai) anos
pai
achega
369d9d6069
Modificáronse 4 ficheiros con 15 adicións e 10 borrados
  1. 1 1
      DownTigerDown.ino
  2. 10 7
      SDcard.ino
  3. 1 0
      eventually.ino
  4. 3 2
      fastLed.ino

+ 1 - 1
DownTigerDown.ino

@@ -62,7 +62,7 @@ CRGB lustreLeds[NUM_LEDS_LUSTRE];
 float lustre_currentBrightness ;     //for fading
 float lustre_targetBrightness = 255 ;
 float lustre_stepBrightness;
-CRGBPalette16 lustre_currentPalette( CRGB::Blue);
+CRGBPalette16 lustre_currentPalette( CRGB::Green);
 CRGBPalette16 lustre_targetPalette( CRGB::Red );
 
 #define NUM_LEDS_TABLE 50

+ 10 - 7
SDcard.ino

@@ -83,15 +83,18 @@ bool readSDFile() {
         String palette = getSubstring(buf, ' ', 2);
         String bright = getSubstring(buf, ' ', 3);
         String fadeTime = getSubstring(buf, ' ', 4);
-        
+        Serial.println(getSubstring(buf, ' ', 2));
         if (zone == "lustre"){ 
-          if (palette = "MER"){lustre_targetPalette = palette_MER ;}
-          else if (palette = "SOLEIL"){lustre_targetPalette = palette_SOLEIL ;}
-          else if (palette = "CREPUSCULE"){lustre_targetPalette = palette_CREPUSCULE ;}
-          else if (palette = "FLAMINGO"){lustre_targetPalette = palette_FLAMINGO ;}
+          if (palette == "MER"){lustre_targetPalette = palette_MER ;}
+          else if (palette == "SOLEIL"){lustre_targetPalette = palette_SOLEIL ;}
+          else if (palette == "CREPUSCULE"){lustre_targetPalette = palette_CREPUSCULE ;}
+          else if (palette == "FLAMINGO"){lustre_targetPalette = palette_FLAMINGO ;}
           lustre_targetBrightness = bright.toInt();
-          lustre_stepBrightness = 10 * (lustre_targetBrightness - lustre_currentBrightness) / (float)(fadeTime.toInt()/refreshRate) ;
-          Serial.print ("LEDS : palette ");
+          lustre_stepBrightness = constrain( abs((lustre_targetBrightness - lustre_currentBrightness)) / (float)(fadeTime.toInt()/refreshRate), 1, 255) ;
+          if(lustre_currentBrightness > lustre_targetBrightness) { lustre_stepBrightness *= -1 ;}
+          Serial.print ("LEDS : zone ");
+          Serial.print (zone);
+          Serial.print (" - palette ");
           Serial.print (palette);
           Serial.print (" - brightness : ");
           Serial.print (lustre_targetBrightness);

+ 1 - 0
eventually.ino

@@ -61,6 +61,7 @@ void buttonFocus(int index) {
   
   //et après ya plein de trucs à faire
   btnFile.close();
+  delay(50);
   String file = "button";
   file+=index ;
   file+=".txt";

+ 3 - 2
fastLed.ino

@@ -11,9 +11,10 @@ void FillLEDsFromPaletteColors( CRGB leds[], int NUM_LED, CRGBPalette16 palette,
 }
 
 float FadingBrightness (int FastLEDindex, float currentBrightness, float targetBrightness, int step) {
-  if (currentBrightness != targetBrightness) { currentBrightness += step ;}
+  //if (currentBrightness != targetBrightness) { currentBrightness += step ;}
+  if ( (step > 0 && currentBrightness < targetBrightness) || (step < 0 && currentBrightness > targetBrightness) ) { currentBrightness += step ;}
   //else Serial.println("fade done");
-  Serial.println(currentBrightness);
+  //Serial.println(currentBrightness);
   FastLED[FastLEDindex].showLeds((int)currentBrightness) ;
   return currentBrightness ;
 }