fix renamings

s-light · May 11, 2019 · ecff2d6 · ecff2d6
1 parent e0ec428
commit ecff2d6
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 33 deletions.
diff --git a/examples/slight_ButtonInput__minimal/slight_ButtonInput__minimal.ino b/examples/slight_ButtonInput__minimal/slight_ButtonInput__minimal.ino
@@ -73,17 +73,17 @@ void mybutton_event(slight_ButtonInput *instance, byte event) {
             (*instance).printState(Serial);
             Serial.println();
         } break;
-        case slight_ButtonInput::event_Down : {
+        case slight_ButtonInput::event_down : {
             Serial.print(F("the button is pressed down! do something.."));
         } break;
         case slight_ButtonInput::event_holddown : {
             Serial.print(F("duration active: "));
             Serial.println((*instance).getDurationActive());
         } break;
-        case slight_ButtonInput::event_Up : {
+        case slight_ButtonInput::event_up : {
             Serial.print(F("up"));
         } break;
-        case slight_ButtonInput::event_Click : {
+        case slight_ButtonInput::event_click : {
             Serial.print(F("click"));
         } break;
         case slight_ButtonInput::event_click_long : {
@@ -92,10 +92,10 @@ void mybutton_event(slight_ButtonInput *instance, byte event) {
         case slight_ButtonInput::event_click_double : {
             Serial.print(F("click double"));
         } break;
-        case slight_ButtonInput::event_ClickTriple : {
+        case slight_ButtonInput::event_click_triple : {
             Serial.print(F("click triple"));
         } break;
-        case slight_ButtonInput::event_ClickMulti : {
+        case slight_ButtonInput::event_click_multi : {
             Serial.print(F("click count: "));
             Serial.println((*instance).getClickCount());
         } break;

diff --git a/examples/slight_ButtonInput__test/slight_ButtonInput__test.ino b/examples/slight_ButtonInput__test/slight_ButtonInput__test.ino
@@ -24,7 +24,7 @@
         12.11.2013 17:33 created.
         13.11.2013 17:41 add object ID
         15.03.2014 20:24 changed to use new instance technique
-        15.03.2014 22:52 added demo for new events (event_ClickTriple, event_ClickMulti, event_holddown)
+        15.03.2014 22:52 added demo for new events (event_click_triple, event_click_multi, event_holddown)
 
 
     TO DO:
@@ -734,17 +734,17 @@ void myCallback_onEvent(slight_ButtonInput *instance, byte event) {
             Serial.println();
         } break;
         // click
-        /*case slight_ButtonInput::event_Down : {
+        /*case slight_ButtonInput::event_down : {
             Serial.print(F("the button is pressed down! do something.."));
         } break;*/
         case slight_ButtonInput::event_holddown : {
             Serial.print(F("duration active: "));
             Serial.println((*instance).getDurationActive());
         } break;
-        /*case slight_ButtonInput::event_Up : {
+        /*case slight_ButtonInput::event_up : {
             Serial.print(F("up"));
         } break;
-        case slight_ButtonInput::event_Click : {
+        case slight_ButtonInput::event_click : {
             Serial.print(F("click"));
         } break;
         case slight_ButtonInput::event_click_long : {
@@ -753,10 +753,10 @@ void myCallback_onEvent(slight_ButtonInput *instance, byte event) {
         case slight_ButtonInput::event_click_double : {
             Serial.print(F("click double"));
         } break;
-        case slight_ButtonInput::event_ClickTriple : {
+        case slight_ButtonInput::event_click_triple : {
             Serial.print(F("click triple"));
         } break;*/
-        case slight_ButtonInput::event_ClickMulti : {
+        case slight_ButtonInput::event_click_multi : {
             Serial.print(F("click count: "));
             Serial.println((*instance).getClickCount());
         } break;

diff --git a/keywords.txt b/keywords.txt
@@ -39,11 +39,11 @@ state_NotValid	LITERAL1
 state_Standby	LITERAL1
 state_Active	LITERAL1
 state_Debouncing	LITERAL1
-event_Down	LITERAL1
-event_Up	LITERAL1
+event_down	LITERAL1
+event_up	LITERAL1
 event_holddown	LITERAL1
-event_Click	LITERAL1
+event_click	LITERAL1
 event_click_long	LITERAL1
 event_click_double	LITERAL1
-event_ClickTriple	LITERAL1
-event_ClickMulti	LITERAL1
+event_click_triple	LITERAL1
+event_click_multi	LITERAL1
diff --git a/src/slight_ButtonInput.cpp b/src/slight_ButtonInput.cpp
@@ -14,8 +14,8 @@
         10.01.2014 20:51 added Double Click detection
         11.01.2014 00:59 added printState(Print &out) function
         15.03.2014 15:55 changed to event system with Instance callback
-        15.03.2014 22:48 redesigned events: click events are generated after a event_Up.
-        15.03.2014 22:48 added event_ClickTriple, event_ClickMulti, event_holddown
+        15.03.2014 22:48 redesigned events: click events are generated after a event_up.
+        15.03.2014 22:48 added event_click_triple, event_click_multi, event_holddown
 *******************************************/
 
 /******************************************
@@ -198,7 +198,7 @@ byte slight_ButtonInput::update() {
                         timestamp_last_activity = millis();
                         timestamp_last_holddown_event = millis();
                         state_temp = state_Active;
-                        generateEvent(event_Down);
+                        generateEvent(event_down);
                     } else if (state == state_Active) {
                         // check for HoldingDown event
                         duration_Active = ulLastDuration;
@@ -213,7 +213,7 @@ byte slight_ButtonInput::update() {
                 // Button Released
                 duration_Active = ( millis() - timestamp_last_activity );
                 //state_temp = state_Released;
-                generateEvent(event_Up);
+                generateEvent(event_up);
                 state_temp = state_Standby;
 
                 ////////////////////////////////////////////////////////////////////////////////
@@ -229,9 +229,9 @@ byte slight_ButtonInput::update() {
                     if (click_count == 2) {
                         generateEvent(event_click_double);
                     } else if (click_count == 3) {
-                        generateEvent(event_ClickTriple);
+                        generateEvent(event_click_triple);
                     } else if (click_count > 3) {
-                        generateEvent(event_ClickMulti);
+                        generateEvent(event_click_multi);
                     }
                 } else {
                     // reset ClickMulti
@@ -240,7 +240,7 @@ byte slight_ButtonInput::update() {
                     if (duration_Active > duration_click_long) {
                         generateEvent(event_click_long);
                     } else {
-                        generateEvent(event_Click);
+                        generateEvent(event_click);
                     }
                 }
                 ////////////////////////////////////////////////////////////////////////////////
@@ -330,16 +330,16 @@ byte slight_ButtonInput::printEvent(Print &out, byte eventTemp) {
         } break;
 
         // click
-        case slight_ButtonInput::event_Down : {
+        case slight_ButtonInput::event_down : {
             out.print(F("down"));
         } break;
         case slight_ButtonInput::event_holddown : {
             out.print(F("holding down"));
         } break;
-        case slight_ButtonInput::event_Up : {
+        case slight_ButtonInput::event_up : {
             out.print(F("up"));
         } break;
-        case slight_ButtonInput::event_Click : {
+        case slight_ButtonInput::event_click : {
             out.print(F("click"));
         } break;
         case slight_ButtonInput::event_click_long : {
@@ -348,10 +348,10 @@ byte slight_ButtonInput::printEvent(Print &out, byte eventTemp) {
         case slight_ButtonInput::event_click_double : {
             out.print(F("click double"));
         } break;
-        case slight_ButtonInput::event_ClickTriple : {
+        case slight_ButtonInput::event_click_triple : {
             out.print(F("click triple"));
         } break;
-        case slight_ButtonInput::event_ClickMulti : {
+        case slight_ButtonInput::event_click_multi : {
             out.print(F("click multi"));
         } break;
         default: {

diff --git a/src/slight_ButtonInput.h b/src/slight_ButtonInput.h
@@ -87,14 +87,14 @@ class slight_ButtonInput {
             static const byte state_Debouncing = 14;
 
             // Click
-            static const byte event_Down = 20;
-            static const byte event_Up = 21;
+            static const byte event_down = 20;
+            static const byte event_up = 21;
             static const byte event_holddown = 22;
-            static const byte event_Click = 30;
+            static const byte event_click = 30;
             static const byte event_click_long = 31;
             static const byte event_click_double = 32;
-            static const byte event_ClickTriple = 33;
-            static const byte event_ClickMulti = 34;
+            static const byte event_click_triple = 33;
+            static const byte event_click_multi = 34;