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

state-handler: format and prepare for timer

Browse Source
This commit is contained in:
Vasily Davydov
2022-10-21 20:55:15 +03:00
parent 995773577e
commit 6cfaca32c8
4 changed files with 77 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
StateHandler/inc/StateHandler.h
View File

@@ -18,11 +18,11 @@
#include "Counter.h"
#include "DigitalIoPin.h"
#include "Event.h"
#include "GMP252.h"
#include "HMP60.h"
#include "LiquidCrystal.h"
#include "ModbusMaster.h"
#include "ModbusRegister.h"
#include "GMP252.h"
#include "HMP60.h"
#include "PressureWrapper.h"
/** Buttons enumeration
@@ -76,7 +76,8 @@ typedef void (StateHandler::*state_pointer) (const Event &);
class StateHandler
{
public:
StateHandler (LiquidCrystal *lcd, ModbusRegister *A01, PressureWrapper *pressure);
StateHandler (LiquidCrystal *lcd, ModbusRegister *A01,
PressureWrapper *pressure);
virtual ~StateHandler ();
/** Get currently set pressure
@@ -120,16 +121,16 @@ private:
* weigh of fan, so voltage within range of 0-89 is not
* sufficient to start motor.
* TODO: Value 89 should be scaled to 0 at some point */
Counter fan_speed = {20, 1000};
Counter fan_speed = { 20, 1000 };
/*integral controller for PID. should be global, since it
* accumulates error signals encountered since startup*/
int integral = 0;
int saved_set_value[2] = { 0, 0 };
int saved_curr_value[2] = { 0, 0 };
int sensors_data[4] = {0};
int sensors_data[4] = { 0 };
LiquidCrystal *_lcd;
ModbusRegister *A01;
PressureWrapper * pressure;
PressureWrapper *pressure;
/* CO2 sensor object */
GMP252 co2;