Browse Source

tested dimmer features

random ok
move working but to be tweaked
Etienne Landon 8 years ago
parent
commit
88b957da13
3 changed files with 20 additions and 3 deletions
  1. 4 2
      DownTigerDown.ino
  2. 1 1
      SDcard.ino
  3. 15 0
      eventually.ino

+ 4 - 2
DownTigerDown.ino

@@ -52,11 +52,12 @@ byte refreshRate = 25 ;
 //Dimmer
 #define DIMMER_PIN 9
 FadeLed dimmer(DIMMER_PIN);
+int dimmer_value = 50;
 byte dimmer_low = 20;
 byte dimmer_mid = 60;
 byte dimmer_high = 80;
-bool dimmer_random ; // activate short-circuit effect
-int dimmer_move = 10 ; // organic variation around base value
+bool dimmer_random = false; // activate short-circuit effect
+int dimmer_move = 0 ; // organic variation around base value
 
 // FastLED
 #define NUM_LEDS_LUSTRE 240
@@ -113,6 +114,7 @@ void setup() {
   // DIMMER
   dimmer.off();
 
+
   // LEDS
   FastLED.addLeds<NEOPIXEL, 2>(lustreLeds, NUM_LEDS_LUSTRE);
   FastLED.addLeds<NEOPIXEL, 14>(tableLeds, NUM_LEDS_TABLE);

+ 1 - 1
SDcard.ino

@@ -134,7 +134,7 @@ bool readSDFile() {
       else if (selector == "dimmer") {
         String dim_val = getSubstring(buf, ' ', 1);
         
-        int dimmer_value;
+        
         int dimmer_fade = getSubstring(buf, ' ', 2).toInt();
         Serial.println("Dimmer fade à " + dim_val + " en " + dimmer_fade + "ms");
         if (dim_val == "LOW") {dimmer_value = dimmer_low ;}

+ 15 - 0
eventually.ino

@@ -23,6 +23,21 @@ bool updateAll() {
   FadeLed::update();
   //tsunami.update();
   updateLeds() ;
+  if (dimmer_random){
+    dimmer.setTime(50);
+    if (random8(100) > 20) {
+      dimmer.set(percent2PWM(random8(100)));
+    }
+  }
+  else if (dimmer_move) {
+    if (random8(100) > 20) {
+      int timer = millis();
+      int delta = 2 * dimmer_move * (sin8( timer / 9 )-127) * (sin8(timer / 7 )-127) / 65536 ; //- dimmer_move/2
+      dimmer.setTime(150);
+      dimmer.set(percent2PWM(dimmer_value + delta));
+      Serial.println(dimmer_value + delta );
+    }
+  }
 //  FastLED.show();
   
   return false;