j/cable-length-cutter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EvalSwitch: Add func as source, remove dupl code

Browse Source 
evaluatedSwitch component:
- remove duplicate code for inverted and non-inverted mode
- add new constructor for instance with a function to obtain current
  input state instead of gpio pin (e.g. needed for 4switches on analog input)
This commit is contained in:
jonny_ji7 2022-09-12 09:47:06 +02:00
parent 09ee67f583
commit a932460924
2 changed files with 97 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
components/gpio/gpio_evaluateSwitch.cpp
View File

@ -9,12 +9,12 @@ gpio_evaluatedSwitch::gpio_evaluatedSwitch( //minimal (use default values)
gpio_num = gpio_num_declare;
pullup = true;
inverted = false;
inputSource = inputSource_t::GPIO;
init();
initGpio();
};
gpio_evaluatedSwitch::gpio_evaluatedSwitch( //optional parameters given
gpio_num_t gpio_num_declare,
bool pullup_declare,
@ -23,13 +23,25 @@ gpio_evaluatedSwitch::gpio_evaluatedSwitch( //optional parameters given
gpio_num = gpio_num_declare;
pullup = pullup_declare;
inverted = inverted_declare;
inputSource = inputSource_t::GPIO;
init();
initGpio();
};
gpio_evaluatedSwitch::gpio_evaluatedSwitch( //with function as input source
bool (*getInputStatePtr_f)(void),
bool inverted_f){
//gpio_num = NULL;
//pullup = NULL;
inverted = inverted_f;
getInputStatePtr = getInputStatePtr_f;
inputSource = inputSource_t::FUNCTION;
};
void gpio_evaluatedSwitch::init(){
void gpio_evaluatedSwitch::initGpio(){
ESP_LOGI(TAG, "initializing gpio pin %d", (int)gpio_num);
//define gpio pin as input
@ -48,11 +60,33 @@ void gpio_evaluatedSwitch::init(){
};
void gpio_evaluatedSwitch::handle(){ //Statemachine for debouncing and edge detection
//--- get pin state with required method ---
switch (inputSource){
case inputSource_t::GPIO: //from gpio pin
if (gpio_get_level(gpio_num) == 0){ //pin low
inputState = true;
} else { //pin high
inputState = false;
}
break;
case inputSource_t::FUNCTION: //from funtion
inputState = (*getInputStatePtr)();
break;
}
//--- invert state ---
//not inverted: switch switches to GND when active
//inverted: switch switched to VCC when active
if (inverted == true){
inputState = !inputState;
}
//=========================================================
//=========== Statemachine for inverted switch ============
//=================== (switch to VCC) =====================
//========= Statemachine for evaluateing switch ===========
//=========================================================
switch (p_state){
default:
@ -61,7 +95,7 @@ void gpio_evaluatedSwitch::handle(){ //Statemachine for debouncing and edge det
case switchState::FALSE: //input confirmed high (released)
fallingEdge = false; //reset edge event
if (gpio_get_level(gpio_num) == 1){ //pin high (on)
if (inputState == true){ //pin high (on)
p_state = switchState::HIGH;
timestampHigh = esp_log_timestamp(); //save timestamp switched from low to high
} else {
@ -70,7 +104,7 @@ void gpio_evaluatedSwitch::handle(){ //Statemachine for debouncing and edge det
break;
case switchState::HIGH: //input recently switched to high (pressed)
if (gpio_get_level(gpio_num) == 1){ //pin still high (on)
if (inputState == true){ //pin still high (on)
if (esp_log_timestamp() - timestampHigh > minOnMs){ //pin in same state long enough
p_state = switchState::TRUE;
state = true;
@ -84,7 +118,7 @@ void gpio_evaluatedSwitch::handle(){ //Statemachine for debouncing and edge det
case switchState::TRUE: //input confirmed high (pressed)
risingEdge = false; //reset edge event
if (gpio_get_level(gpio_num) == 0){ //pin low (off)
if (inputState == false){ //pin low (off)
timestampLow = esp_log_timestamp();
p_state = switchState::LOW;
} else {
@ -94,7 +128,7 @@ void gpio_evaluatedSwitch::handle(){ //Statemachine for debouncing and edge det
break;
case switchState::LOW: //input recently switched to low (released)
if (gpio_get_level(gpio_num) == 0){ //pin still low (off)
if (inputState == false){ //pin still low (off)
if (esp_log_timestamp() - timestampLow > minOffMs){ //pin in same state long enough
p_state = switchState::FALSE;
msPressed = timestampLow - timestampHigh; //calculate duration the button was pressed
@ -107,65 +141,6 @@ void gpio_evaluatedSwitch::handle(){ //Statemachine for debouncing and edge det
break;
}
}else{
//=========================================================
//========= Statemachine for not inverted switch ==========
//=================== (switch to GND) =====================
//=========================================================
switch (p_state){
default:
p_state = switchState::FALSE;
break;
case switchState::FALSE: //input confirmed high (released)
fallingEdge = false; //reset edge event
if (gpio_get_level(gpio_num) == 0){ //pin low (on)
p_state = switchState::LOW;
timestampLow = esp_log_timestamp(); //save timestamp switched from high to low
} else {
msReleased = esp_log_timestamp() - timestampHigh; //update duration released
}
break;
case switchState::LOW: //input recently switched to low (pressed)
if (gpio_get_level(gpio_num) == 0){ //pin still low (on)
if (esp_log_timestamp() - timestampLow > minOnMs){ //pin in same state long enough
p_state = switchState::TRUE;
state = true;
risingEdge = true;
msReleased = timestampLow - timestampHigh; //calculate duration the button was released
}
}else{
p_state = switchState::FALSE;
}
break;
case switchState::TRUE: //input confirmed low (pressed)
risingEdge = false; //reset edge event
if (gpio_get_level(gpio_num) == 1){ //pin high (off)
timestampHigh = esp_log_timestamp();
p_state = switchState::HIGH;
} else {
msPressed = esp_log_timestamp() - timestampLow; //update duration pressed
}
break;
case switchState::HIGH: //input recently switched to high (released)
if (gpio_get_level(gpio_num) == 1){ //pin still high (off)
if (esp_log_timestamp() - timestampHigh > minOffMs){ //pin in same state long enough
p_state = switchState::FALSE;
msPressed = timestampHigh - timestampLow; //calculate duration the button was pressed
state=false;
fallingEdge=true;
}
}else{
p_state = switchState::TRUE;
}
break;
}
}
}

18
components/gpio/gpio_evaluateSwitch.hpp
View File

@ -18,21 +18,30 @@ extern "C"
//switch to VCC (inverted) and dont use internal pullup:
//gpio_evaluatedSwitch s3(GPIO_NUM_14 false, true);
enum class inputSource_t {GPIO, FUNCTION};
class gpio_evaluatedSwitch {
public:
//--- input ---
uint32_t minOnMs = 30;
uint32_t minOffMs = 30;
gpio_evaluatedSwitch( //constructor minimal (default parameters pullup=true, inverted=false)
//constructor minimal (default parameters pullup=true, inverted=false)
gpio_evaluatedSwitch(
gpio_num_t gpio_num_declare
);
gpio_evaluatedSwitch( //constructor with optional parameters
//constructor with optional parameters
gpio_evaluatedSwitch(
gpio_num_t gpio_num_declare,
bool pullup_declare,
bool inverted_declare=false
);
//constructor with a function as source for input state instead of a gpio pin
gpio_evaluatedSwitch(bool (*getInputStatePtr_f)(void), bool inverted_f=false);
//--- output --- TODO make readonly? (e.g. public section: const int& x = m_x;)
bool state = false;
bool risingEdge = false;
@ -47,12 +56,15 @@ class gpio_evaluatedSwitch {
gpio_num_t gpio_num;
bool pullup;
bool inverted;
bool (*getInputStatePtr)(void); //pointer to function for getting current input state
inputSource_t inputSource = inputSource_t::GPIO;
enum class switchState {TRUE, FALSE, LOW, HIGH};
switchState p_state = switchState::FALSE;
bool inputState = false;
uint32_t timestampLow = 0;
uint32_t timestampHigh = 0;
void init();
void initGpio();
};