Typos and messages in examples, keywords.txt is consistent to Arduino…

… specifications Signed-off-by: Fabiano Riccardi <[email protected]>
fabianoriccardi · Dec 16, 2018 · 0492cea · 0492cea
1 parent 10ca732
commit 0492cea
Show file tree

Hide file tree

Showing 8 changed files with 150 additions and 105 deletions.
diff --git a/examples/1_dimmable_light/1_dimmable_light.ino b/examples/1_dimmable_light/1_dimmable_light.ino
@@ -12,7 +12,7 @@ void setup() {
   Serial.begin(115200);
   while(!Serial);
   Serial.println();
-  Serial.println("Test HARDWARE timer for dimmer on ESP8266");
+  Serial.println("Dimmer for ESP8266");
 
   Serial.print("Init the dimmable light class... ");
   DimmableLight::setSyncPin(syncPin);

diff --git a/examples/2_dimmable_lights/2_dimmable_lights.ino b/examples/2_dimmable_lights/2_dimmable_lights.ino
@@ -13,7 +13,8 @@ void setup() {
   Serial.begin(115200);
   while(!Serial);
   Serial.println();
-  Serial.println("Test HARDWARE timer for dimmer on ESP8266");
+  Serial.println("Example for Dimmable Lights for ESP8266");
+  Serial.println();
 
   Serial.print("Init the dimmable light class... ");
   DimmableLight::setSyncPin(syncPin);

diff --git a/examples/3_dimmable_light_5_light/3_dimmable_light_5_light.ino b/examples/3_dimmable_light_5_light/3_dimmable_light_5_light.ino
@@ -1,5 +1,5 @@
 /**
- * In this example you will see a number of effect on multiple indipendent 
+ * In this example you will see a number of effects on different indipendent 
  * dimmable lights. To switch between effect, (un)comment the proper line
  * in the setup function.
  * 
@@ -23,7 +23,8 @@ void setup() {
   Serial.begin(115200);
   while(!Serial);
   Serial.println();
-  Serial.println("Test HARDWARE timer for dimmer on ESP8266");
+  Serial.println("Third example Dimmable Lights for ESP8266");
+  Serial.println();
 
   Serial.print("Init the dimmable light class... ");
   DimmableLight::setSyncPin(syncPin);

diff --git a/examples/4_dimmable_manager_n_lights/4_dimmable_manager_n_lights.ino b/examples/4_dimmable_manager_n_lights/4_dimmable_manager_n_lights.ino
@@ -1,5 +1,5 @@
 /**
- * This advance example aims to show how to use the Dimmable Light Manager.
+ * This advanced example aims to show how to use the Dimmable Light Manager.
  * Basically it gives you the ability to add a friendly/logic name to a Dimmable Light.
  * 
  * The main parameters to configure accordingly to your hardware settings are:
@@ -74,7 +74,7 @@ void setup() {
     if(dlm.add(String("light") + (i+1), pins[i])){
       Serial.println(String("   ") + (i+1) + "-th light added correctly");
     }else{
-      Serial.println("   Light isn't added, probably this was is already used...");
+      Serial.println("   Light isn't added, probably this name was already used...");
     }
   }
 

diff --git a/examples/5_8_lights_effects/5_8_lights_effects.ino b/examples/5_8_lights_effects/5_8_lights_effects.ino
@@ -12,7 +12,71 @@ SerialCommand serialCmd;
 
 int effectSelected = -1;
 void unrecognized(){
-    Serial.println("Command not recognized"); 
+  Serial.println("Command not recognized");
+  serialCmd.clearBuffer();
+}
+
+void selectEffect(unsigned char effectId){
+  if(effectSelected != effectId){
+    effectSelected = effectId;
+
+    switch(effectSelected){
+        case 0:
+          Serial.println("##New Effect Selected## Equal");
+          doEqual();
+          break;
+        case 1:
+          Serial.println("##New Effect Selected## Equal On Off");
+          doEqualOnOff();
+          break;
+        case 2:
+          Serial.println("##New Effect Selected## Dim Specific Step");
+          doDimSpecificStep();
+          break;
+        case 3:
+          Serial.println("##New Effect Selected## Range Limit");
+          doRangeLimit();
+          break;
+        case 4:
+          Serial.println("##New Effect Selected## Near Values");
+          doNearValues();
+          break;
+        case 5:
+          Serial.println("##New Effect Selected## Dim Mixed");
+          doDimMixed();
+          break;
+        case 6:
+          Serial.println("##New Effect Selected## Dim Sweep Equal");
+          doDimSweepEqual();
+          break;
+        case 7:
+          Serial.println("##New Effect Selected## On Off Sweep");
+          doOnOffSweep();
+          break;
+        case 8:
+          Serial.println("##New Effect Selected## Inverted Dim");
+          doInvertedDim();
+          break;
+        case 9:
+          Serial.println("##New Effect Selected## Circular Swipe");
+          doCircularSwipe();
+          break;
+        case 10:
+          Serial.println("##New Effect Selected## Random Bri");
+          doRandomBri();
+          break;
+        case 11:
+          Serial.println("##New Effect Selected## Random Bri Peehole");
+          doRandomBriPeehole();
+          break;
+        case 12:
+          Serial.println("##New Effect Selected## Random Push Extreme Values");
+          doRandomPushExtremeValues();
+          break;
+        default:
+            Serial.println("Effect ID not implemented");
+    }
+  }
 }
 
 void setup() {
@@ -22,11 +86,6 @@ void setup() {
   Serial.println("Starting the example effect");
 
   Serial.print("Init the dimmable light class... ");
-
-  lights=(DimmableLight**)malloc(sizeof(DimmableLight)*N_LIGHTS);
-  for(int i=0;i<N_LIGHTS;i++){
-    lights[i] = new DimmableLight(pins[i]);
-  }
 
   DimmableLight::setSyncPin(syncPin);
   DimmableLight::begin();
@@ -35,65 +94,26 @@ void setup() {
   Serial.println(String("Number of instantiated lights: ") + DimmableLight::getLightNumber());
 
   int c = 0;
-  serialCmd.addCommand("e1",[](){effectSelected = 0; doEqual();});
-  serialCmd.addCommand("e2",[](){effectSelected = 1; doEqualOnOff();});
-  serialCmd.addCommand("e3",[](){effectSelected = 2; doDimSpecificStep();});
-  serialCmd.addCommand("e4",[](){effectSelected = 3; doRangeLimit();});
-  serialCmd.addCommand("e5",[](){effectSelected = 4; doNearValues();});
-  serialCmd.addCommand("e6",[](){effectSelected = 5; doDimMixed();});
-  serialCmd.addCommand("e7",[](){effectSelected = 6; doDimSweepEqual();});
-  serialCmd.addCommand("e8",[](){effectSelected = 7; doOnOffSweep();});
-  serialCmd.addCommand("e9",[](){effectSelected = 8; doInvertedDim();});
-  serialCmd.addCommand("e10",[](){effectSelected = 9; doCircularSwipe();});
-  serialCmd.addCommand("e11",[](){effectSelected = 10; doRandomBri();});
-  serialCmd.addCommand("e12",[](){effectSelected = 11; doRandomBriPeehole();});
+  serialCmd.addCommand("e0",[](){selectEffect(0);});
+  serialCmd.addCommand("e1",[](){selectEffect(1);});
+  serialCmd.addCommand("e2",[](){selectEffect(2);});
+  serialCmd.addCommand("e3",[](){selectEffect(3);});
+  serialCmd.addCommand("e4",[](){selectEffect(4);});
+  serialCmd.addCommand("e5",[](){selectEffect(5);});
+  serialCmd.addCommand("e6",[](){selectEffect(6);});
+  serialCmd.addCommand("e7",[](){selectEffect(7);});
+  serialCmd.addCommand("e8",[](){selectEffect(8);});
+  serialCmd.addCommand("e9",[](){selectEffect(9);});
+  serialCmd.addCommand("e10",[](){selectEffect(10);});
+  serialCmd.addCommand("e11",[](){selectEffect(11);});
+  serialCmd.addCommand("e12",[](){selectEffect(12);});
 
   serialCmd.addDefaultHandler(unrecognized);
-
 }
 
 void loop(){
     serialCmd.readSerial();
-    switch(effectSelected){
-        case -1:
-            Serial.println("Off state");
-            delay(20);
-            break;
-        case 0:
-            //doEqual();
-            break;
-        case 1:
-            //doEqualOnOff();
-            break;
-        case 2:
-            //doDimSpecificStep();
-            break;
-        case 3:
-            //doRangeLimit();
-            break;
-        case 4:
-            //doNearValues();
-            break;
-        case 5:
-            //doDimMixed();
-            break;
-        case 6:
-            //doDimSweepEqual();
-            break;
-        case 7:
-            //doInvertedDim();
-            break;
-        case 8:
-            //doCircularSwipe();
-            break;
-        case 9:
-            //doCircularSwipe();
-            break;
-        case 10:
-            //doCircularSwipe();
-            break;
-        default:
-            Serial.println("Default switch case");
+    if(effectSelected == -1){
+      delay(20);
     }
-    //delay(50);
 }