DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

main.cpp: bug fixed in button handling

Browse Source
This commit is contained in:
Klaus K Wilting 2018-03-25 23:38:54 +02:00
parent fce9c305a6
commit 4ec57e067d
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main.cpp
View File

@ -155,7 +155,7 @@ void lorawan_loop(void * pvParameters) {
void antenna_select(const int8_t _ant); void antenna_select(const int8_t _ant);
#endif #endif
#if defined BLECOUNTER #ifdef BLECOUNTER
void BLECount(void); void BLECount(void);
#else #else
btStop(); btStop();
@ -171,10 +171,10 @@ void set_onboard_led(int st){
}; };
#ifdef HAS_BUTTON #ifdef HAS_BUTTON
// Button Handling, board dependent -> perhaps to be moved to new hal.cpp // Button Handling, board dependent -> perhaps to be moved to hal/<$board.h>
// IRAM_ATTR necessary here, see https://github.com/espressif/arduino-esp32/issues/855 // IRAM_ATTR necessary here, see https://github.com/espressif/arduino-esp32/issues/855
void IRAM_ATTR isr_button_pressed(void) { void IRAM_ATTR isr_button_pressed(void) {
ButtonTriggered++; } ButtonTriggered = true; }
#endif #endif
/* end hardware specific parts -------------------------------------------------------- */ /* end hardware specific parts -------------------------------------------------------- */
@ -349,7 +349,7 @@ void setup() {
chip_info.revision, spi_flash_get_chip_size() / (1024 * 1024), chip_info.revision, spi_flash_get_chip_size() / (1024 * 1024),
(chip_info.features & CHIP_FEATURE_EMB_FLASH) ? "embedded" : "external"); (chip_info.features & CHIP_FEATURE_EMB_FLASH) ? "embedded" : "external");
ESP_LOGI(TAG, "ESP32 SDK: %s", ESP.getSdkVersion()); ESP_LOGI(TAG, "ESP32 SDK: %s", ESP.getSdkVersion());
#endif // VERBOSE #endif
// Read settings from NVRAM // Read settings from NVRAM
loadConfig(); // includes initialize if necessary loadConfig(); // includes initialize if necessary
@ -361,8 +361,8 @@ void setup() {
digitalWrite(HAS_LED, LOW); digitalWrite(HAS_LED, LOW);
#endif #endif
#ifdef HAS_BUTTON
// install button interrupt // install button interrupt
#ifdef HAS_BUTTON
pinMode(HAS_BUTTON, INPUT_PULLDOWN); pinMode(HAS_BUTTON, INPUT_PULLDOWN);
attachInterrupt(digitalPinToInterrupt(HAS_BUTTON), isr_button_pressed, FALLING); attachInterrupt(digitalPinToInterrupt(HAS_BUTTON), isr_button_pressed, FALLING);
#endif #endif
@ -416,15 +416,16 @@ void setup() {
// https://techtutorialsx.com/2017/05/09/esp32-get-task-execution-core/ // https://techtutorialsx.com/2017/05/09/esp32-get-task-execution-core/
void loop() { void loop() {
while(1) { while(1) {
#ifdef HAS_BUTTON
if (ButtonTriggered) { if (ButtonTriggered) {
ButtonTriggered = false; ButtonTriggered = false;
ESP_LOGI(TAG, "Button pressed, resetting device to factory defaults"); ESP_LOGI(TAG, "Button pressed, resetting device to factory defaults");
eraseConfig(); eraseConfig();
esp_restart(); esp_restart();
} }
else { else
vTaskDelay(1000/portTICK_PERIOD_MS); #endif
{ vTaskDelay(1000/portTICK_PERIOD_MS);
uptimecounter = uptime() / 1000; // count uptime seconds uptimecounter = uptime() / 1000; // count uptime seconds
} }
} }