event: add pressure member
Addition of a pressure parameter called from main and displayed on lcd
This commit is contained in:
parent
dcfb475ca1
commit
1709c0520b
@ -8,11 +8,13 @@
|
|||||||
#ifndef EVENT_H_
|
#ifndef EVENT_H_
|
||||||
#define EVENT_H_
|
#define EVENT_H_
|
||||||
|
|
||||||
class Event {
|
class Event
|
||||||
public:
|
{
|
||||||
virtual ~Event(){};
|
public:
|
||||||
|
virtual ~Event (){};
|
||||||
|
|
||||||
enum eventType {
|
enum eventType
|
||||||
|
{
|
||||||
/** Start of the event */
|
/** Start of the event */
|
||||||
eEnter,
|
eEnter,
|
||||||
/** End of the event*/
|
/** End of the event*/
|
||||||
@ -23,10 +25,11 @@ class Event {
|
|||||||
/** Time event */
|
/** Time event */
|
||||||
eTick
|
eTick
|
||||||
};
|
};
|
||||||
Event(eventType e = eTick, uint8_t b = 0, int t = 0)
|
Event (eventType e = eTick, uint8_t b = 0) : type (e), button (b){};
|
||||||
: type(e), button(b), temp(t){};
|
Event (eventType e = eTick, int16_t pres = 0) : type (e), pressure (pres){};
|
||||||
eventType type;
|
eventType type;
|
||||||
uint8_t button;
|
uint8_t button;
|
||||||
|
int16_t pressure;
|
||||||
int temp;
|
int temp;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -124,6 +124,7 @@ StateHandler::stateManual (const Event &event)
|
|||||||
handleControlButtons (event.button);
|
handleControlButtons (event.button);
|
||||||
break;
|
break;
|
||||||
case Event::eTick:
|
case Event::eTick:
|
||||||
|
displaySet (getSetSpeed (), event.pressure);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -142,6 +143,7 @@ StateHandler::stateAuto (const Event &event)
|
|||||||
handleControlButtons (event.button);
|
handleControlButtons (event.button);
|
||||||
break;
|
break;
|
||||||
case Event::eTick:
|
case Event::eTick:
|
||||||
|
displaySet (getSetPressure (), event.pressure);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -48,6 +48,8 @@ main (void)
|
|||||||
|
|
||||||
StateHandler ventMachine;
|
StateHandler ventMachine;
|
||||||
|
|
||||||
|
int16_t pressure = 1;
|
||||||
|
|
||||||
while (1)
|
while (1)
|
||||||
{
|
{
|
||||||
if (b_up.read ())
|
if (b_up.read ())
|
||||||
@ -77,7 +79,7 @@ main (void)
|
|||||||
* TODO:
|
* TODO:
|
||||||
* - Update current pressure to eTick
|
* - Update current pressure to eTick
|
||||||
*/
|
*/
|
||||||
ventMachine.HandleState (Event (Event::eTick));
|
ventMachine.HandleState (Event (Event::eTick, pressure));
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user