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

state-handler: fix merge conflicts

Browse Source
This commit is contained in:
Vasily Davydov 2022-10-10 11:09:29 +03:00
parent f8d1462113
commit c82d4c75e8
2 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
StateHandler/inc/StateHandler.h
View File

@ -15,11 +15,6 @@
#ifndef STATE_HANDLER_H_ #ifndef STATE_HANDLER_H_
#define STATE_HANDLER_H_ #define STATE_HANDLER_H_
<<<<<<< HEAD
=======
#include "DigitalIoPin.h"
#include "LiquidCrystal.h"
>>>>>>> a6b953c51fc0a0204b4a5f881a975ec5e9842c6f
#include "Counter.h" #include "Counter.h"
#include "DigitalIoPin.h" #include "DigitalIoPin.h"
#include "Event.h" #include "Event.h"
@ -33,7 +28,8 @@
* of the particular button. * of the particular button.
* */ * */
enum _buttons { enum _buttons
{
/** Raises the bar up */ /** Raises the bar up */
BUTTON_CONTROL_UP, BUTTON_CONTROL_UP,
/** Raises the bar down */ /** Raises the bar down */
@ -44,7 +40,8 @@
/** Optional button to toggle the /** Optional button to toggle the
* activation of the current setting. * activation of the current setting.
* Not compulsory to be used. */ * Not compulsory to be used. */
BUTTON_CONTROL_TOG_ACTIVE }; BUTTON_CONTROL_TOG_ACTIVE
};
enum _bars enum _bars
{ {

18
StateHandler/src/StateHandler.cpp
View File

@ -48,24 +48,6 @@ StateHandler::getSetSpeed ()
return (unsigned int)this->set[FAN_SPEED].getCurrent (); return (unsigned int)this->set[FAN_SPEED].getCurrent ();
} }
void
StateHandler::displaySet (unsigned int value1, unsigned int value2)
{
// TODO
/**
* MANUAL MODE:
* ----------------
* SPEED: 20%
* PRESSURE: XXPa
* ----------------
* AUTO MODE:
* ----------------
* PRESSURE SET: 35Pa
* PRESSURE CUR: XXPa
* ----------------
*/
}
void void
StateHandler::HandleState (const Event &event) StateHandler::HandleState (const Event &event)
{ {