Merge pull request #85 from mongonta0716/master

TinyuZhao · web-flow · commit aed682480bd5 · 2022-01-17T08:44:18.000+08:00
fix pressedFor not working
diff --git a/src/utility/M5Button.cpp b/src/utility/M5Button.cpp
@@ -126,6 +126,7 @@ void Button::fingerDown(Point pos /* = Point() */,
     _state = true;
     _changed = true;
     _pressTime = _time;
+    _lastChange = _time;
     draw();
   }
   BUTTONS->fireEvent(finger, E_TOUCH, pos, pos, 0, this, nullptr);
@@ -140,6 +141,7 @@ void Button::fingerUp(uint8_t finger /* = 0  */) {
     // other finger not here
     _state = false;
     _changed = true;
+    _lastChange = _time;
     draw();
   }
   BUTTONS->fireEvent(finger, E_RELEASE, _fromPt[finger], _toPt[finger],
@@ -235,7 +237,7 @@ bool Button::wasReleasefor(uint32_t ms) {
 }
 
 bool Button::pressedFor(uint32_t ms) {
-  return (_state && _time - _lastChange >= ms);
+  return (_state && _time - _lastChange >= ms) ? 1 : 0;
 }
 
 bool Button::pressedFor(uint32_t ms, uint32_t continuous_time) {

Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,7 @@ void Button::fingerDown(Point pos /* = Point() */,`
`126`	`126`	`_state = true;`
`127`	`127`	`_changed = true;`
`128`	`128`	`_pressTime = _time;`
	`129`	`+ _lastChange = _time;`
`129`	`130`	`draw();`
`130`	`131`	`}`
`131`	`132`	`BUTTONS->fireEvent(finger, E_TOUCH, pos, pos, 0, this, nullptr);`
`@@ -140,6 +141,7 @@ void Button::fingerUp(uint8_t finger /* = 0 */) {`
`140`	`141`	`// other finger not here`
`141`	`142`	`_state = false;`
`142`	`143`	`_changed = true;`
	`144`	`+ _lastChange = _time;`
`143`	`145`	`draw();`
`144`	`146`	`}`
`145`	`147`	`BUTTONS->fireEvent(finger, E_RELEASE, _fromPt[finger], _toPt[finger],`
`@@ -235,7 +237,7 @@ bool Button::wasReleasefor(uint32_t ms) {`
`235`	`237`	`}`
`236`	`238`
`237`	`239`	`bool Button::pressedFor(uint32_t ms) {`
`238`		`- return (_state && _time - _lastChange >= ms);`
	`240`	`+ return (_state && _time - _lastChange >= ms) ? 1 : 0;`
`239`	`241`	`}`
`240`	`242`
`241`	`243`	`bool Button::pressedFor(uint32_t ms, uint32_t continuous_time) {`