main: state-handler: cleanup
This commit is contained in:
parent
857e50a62b
commit
3d9ea14c76
@ -58,7 +58,6 @@ StateHandler::displaySet (size_t mode)
|
|||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
_lcd->clear ();
|
_lcd->clear ();
|
||||||
_lcd->printOnLineOne (line_up);
|
_lcd->printOnLineOne (line_up);
|
||||||
_lcd->printOnLineTwo (line_down);
|
_lcd->printOnLineTwo (line_down);
|
||||||
@ -234,7 +233,6 @@ StateHandler::handleTickValue (int value)
|
|||||||
if (sensor_timer > TIMER_SENSORS_TIMEOUT)
|
if (sensor_timer > TIMER_SENSORS_TIMEOUT)
|
||||||
{
|
{
|
||||||
updateSensorValues ();
|
updateSensorValues ();
|
||||||
//displaySet (SENSORS);
|
|
||||||
sensor_timer = 0;
|
sensor_timer = 0;
|
||||||
}
|
}
|
||||||
if (value > TIMER_PRESSURE_TIMEOUT)
|
if (value > TIMER_PRESSURE_TIMEOUT)
|
||||||
@ -305,7 +303,6 @@ StateHandler::pid ()
|
|||||||
void
|
void
|
||||||
StateHandler::updateSensorValues ()
|
StateHandler::updateSensorValues ()
|
||||||
{
|
{
|
||||||
|
|
||||||
sensors_data[TEMPERATURE] = humidity.readT ();
|
sensors_data[TEMPERATURE] = humidity.readT ();
|
||||||
sensors_data[PRESSUREDAT] = _pressure->getPressure ();
|
sensors_data[PRESSUREDAT] = _pressure->getPressure ();
|
||||||
sensors_data[CO2] = co2.read ();
|
sensors_data[CO2] = co2.read ();
|
||||||
|
|||||||
@ -70,35 +70,14 @@ main (void)
|
|||||||
BUTTON_CONTROL_TOG_MODE);
|
BUTTON_CONTROL_TOG_MODE);
|
||||||
/* Other declarations */
|
/* Other declarations */
|
||||||
int getcounterValue;
|
int getcounterValue;
|
||||||
|
|
||||||
uint32_t sleep_Arr[100] = {0};
|
|
||||||
|
|
||||||
CoreDebug->DEMCR |= 1 << 24;
|
|
||||||
DWT->CTRL |= 1;
|
|
||||||
|
|
||||||
volatile static int i1 = 0 ;
|
|
||||||
volatile static int i2 = 0 ;
|
|
||||||
volatile static int i = 0 ;
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
while (1)
|
while (1)
|
||||||
{
|
{
|
||||||
i1 = DWT->CYCCNT;
|
|
||||||
|
|
||||||
getcounterValue = glob_time.getCounter ();
|
getcounterValue = glob_time.getCounter ();
|
||||||
sw_up.listen ();
|
sw_up.listen ();
|
||||||
sw_down.listen ();
|
sw_down.listen ();
|
||||||
sw_toggle.listen ();
|
sw_toggle.listen ();
|
||||||
ventMachine.HandleState (Event (Event::eTick, getcounterValue));
|
ventMachine.HandleState (Event (Event::eTick, getcounterValue));
|
||||||
glob_time.tickCounter (1);
|
glob_time.tickCounter (1);
|
||||||
|
|
||||||
// i2 = DWT->CYCCNT;
|
|
||||||
// sleep_Arr[i] = (i2 - i1) / 72;
|
|
||||||
// ++i;
|
|
||||||
// if (i == 100)
|
|
||||||
// while(1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user