fix Button bug

Author: i3water

examples/Blinker_Button/Button_BLE/Button_BLE.ino

@@ -30,9 +30,6 @@ void loop()
 	}
 
 	if (Blinker.button(BUTTON_1)) {
-		digitalWrite(LED_BUILTIN, HIGH);
-	}
-	else {
-		digitalWrite(LED_BUILTIN, LOW);
+		digitalWrite(LED_BUILTIN, !digitalRead(LED_BUILTIN));
 	}
 }

examples/Blinker_Button/Button_WiFi/Button_WiFi.ino

@@ -33,9 +33,6 @@ void loop()
 	}
 
 	if (Blinker.button(BUTTON_1)) {
-		digitalWrite(LED_BUILTIN, HIGH);
-	}
-	else {
-		digitalWrite(LED_BUILTIN, LOW);
+		digitalWrite(LED_BUILTIN, !digitalRead(LED_BUILTIN));
 	}
 }

src/Blinker/BlinkerApi.h

@@ -84,11 +84,12 @@ class BlinkerApi
                 _fresh = false;
 
                 for (uint8_t bNum = 0; bNum < _bCount; bNum++) {
-                    button(_Button[bNum]->getName());
+                    buttonParse(_Button[bNum]->getName());
                 }
                 for (uint8_t sNum = 0; sNum < _sCount; sNum++) {
                     slider(_Slider[sNum]->getName());
                 }
+
                 joystick(J_Xaxis);
                 ahrs(Yaw);
 
@@ -145,7 +146,10 @@ class BlinkerApi
                     return false;
                 }
 
-                return _Button[num]->getState();;
+                bool _state = _Button[num]->getState();
+                _Button[num]->freshState(false);
+
+                return _state;
             }
         }
 
@@ -294,6 +298,57 @@ class BlinkerApi
         uint8_t joyValue[2];
         int16_t ahrsValue[3];
         bool    _fresh = false;
+
+        bool buttonParse(const String & _bName)
+        {
+            int8_t num = checkNum(_bName, _Button, _bCount);
+            String state = STRING_find_string_value(static_cast<Proto*>(this)->dataParse(), _bName);
+
+            if (state == BLINKER_CMD_BUTTON_PRESSED) {
+                if( num == BLINKER_OBJECT_NOT_AVAIL ) {
+                    if ( _bCount < BLINKER_MAX_WIDGET_SIZE ) {
+                        _Button[_bCount] = new BlinkerButton();
+                        _Button[_bCount]->name(_bName);
+                        _Button[_bCount]->freshState(true);
+                        _bCount++;
+                    }
+                }
+                else {
+                    _Button[num]->freshState(true);
+                }
+
+                _fresh = true;
+                return true;
+            }
+            else if (state == BLINKER_CMD_BUTTON_RELEASED) {
+                if( num == BLINKER_OBJECT_NOT_AVAIL ) {
+                    if ( _bCount < BLINKER_MAX_WIDGET_SIZE ) {
+                        _Button[_bCount] = new BlinkerButton();
+                        _Button[_bCount]->name(_bName);
+                        _Button[_bCount]->freshState(false);
+                        _bCount++;
+                    }
+                }
+                else {
+                    _Button[num]->freshState(false);
+                }
+
+                _fresh = true;
+                return false;
+            }
+            else {
+                if( num == BLINKER_OBJECT_NOT_AVAIL ) {
+                    if ( _bCount < BLINKER_MAX_WIDGET_SIZE ) {
+                        _Button[_bCount] = new BlinkerButton();
+                        _Button[_bCount]->name(_bName);
+                        _bCount++;
+                    }
+                    return false;
+                }
+
+                return _Button[num]->getState();;
+            }
+        }
 };
 
 #endif

src/Blinker/BlinkerProtocol.h

@@ -101,6 +101,10 @@ class BlinkerProtocol
         void println(const char str[], unsigned long n)     { print(str, n); }
         void println(const char str[], double n)            { print(str, n); }
 
+        void flush() {
+            isFresh = false;
+        }
+
     private :
         bool checkAvail()
         {
@@ -165,11 +169,9 @@ void BlinkerProtocol<Transp>::run()
     switch (state)
     {
         case CONNECTING :
-            // while (state == CONNECTING) {
-                if (conn.connect()) {
-                    state = CONNECTED;
-                }
-            // }
+            if (conn.connect()) {
+                state = CONNECTED;
+            }
             break;
         case CONNECTED :
             if (conState) {

src/modules/Ultrasonic.cpp

@@ -12,7 +12,7 @@ Ultrasonic::Ultrasonic(uint8_t TP, uint8_t EP, uint32_t TO)
     pinMode(EP,INPUT);
     Trig_pin = TP;
     Echo_pin = EP;
-    Time_out = TO;
+    Time_out = TO;  // 3000 µs = 50cm // 30000 µs = 5 m 
 }
 
 uint32_t Ultrasonic::cm()

src/modules/Ultrasonic.h

@@ -11,7 +11,6 @@ class Ultrasonic
 {
     public:
         Ultrasonic(uint8_t TP, uint8_t EP, uint32_t TO = 30000);
-        // 3000 µs = 50cm // 30000 µs = 5 m 
         uint32_t cm();
         uint32_t inch();