tylen/ESP-Ventilation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge event: fix ambigouis constructor issue from vas-dav/state-machine

Browse Source 
event: fix ambigouis constructor issue
This commit is contained in:
Vasily Davydov 2022-10-16 11:23:54 +03:00 committed by GitHub
commit eec05297a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
StateHandler/inc/Event.h
View File

@ -25,12 +25,9 @@ public:
/** Time event */ /** Time event */
eTick eTick
}; };
Event (eventType e = eTick, uint8_t b = 0) : type (e), button (b){}; Event (eventType e = eTick, int val = 0) : type (e), value (val){};
Event (eventType e = eTick, int16_t pres = 0) : type (e), pressure (pres){};
eventType type; eventType type;
uint8_t button; int value;
int16_t pressure;
int temp;
}; };
#endif /* EVENT_H_ */ #endif /* EVENT_H_ */

10
StateHandler/src/StateHandler.cpp
View File

@ -81,7 +81,7 @@ StateHandler::stateInit (const Event &event)
_lcd->clear (); _lcd->clear ();
break; break;
case Event::eKey: case Event::eKey:
handleControlButtons (event.button); handleControlButtons (event.value);
break; break;
case Event::eTick: case Event::eTick:
if (current_mode == MANUAL) if (current_mode == MANUAL)
@ -107,10 +107,10 @@ StateHandler::stateManual (const Event &event)
_lcd->clear (); _lcd->clear ();
break; break;
case Event::eKey: case Event::eKey:
handleControlButtons (event.button); handleControlButtons (event.value);
break; break;
case Event::eTick: case Event::eTick:
displaySet (getSetSpeed (), event.pressure); displaySet (getSetSpeed (), event.value);
break; break;
} }
} }
@ -126,10 +126,10 @@ StateHandler::stateAuto (const Event &event)
_lcd->clear (); _lcd->clear ();
break; break;
case Event::eKey: case Event::eKey:
handleControlButtons (event.button); handleControlButtons (event.value);
break; break;
case Event::eTick: case Event::eTick:
displaySet (getSetPressure (), event.pressure); displaySet (getSetPressure (), event.value);
break; break;
} }
} }