Skip to content

use input framework to check for waiting input. #125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 26, 2017
Merged

use input framework to check for waiting input. #125

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 39 additions & 47 deletions esp32/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,13 @@
#include "uart.h"
#include "modmachine.h"
#include "mpthreadport.h"
#include "bpp_init.h"
#include "badge_portexp.h"
#include "badge_pins.h"
#include "bpp_init.h"
#include "driver/gpio.h"
#include "badge_base.h"
#include "badge_first_run.h"
#include <badge_input.h>
#include <badge.h>

// MicroPython runs as a task under FreeRTOS
#define MP_TASK_PRIORITY (ESP_TASK_PRIO_MIN + 1)
Expand Down Expand Up @@ -128,60 +129,51 @@ void mp_task(void *pvParameter) {
}

void do_bpp_bgnd() {
//Kick off bpp
bpp_init();
printf("Bpp inited.\n");
//immediately abort and reboot when touchpad detects something
while(gpio_get_level(PIN_NUM_MPR121_INT)==1) {
vTaskDelay(10);
}
printf("Touch detected. Exiting bpp, rebooting.\n");
// Kick off bpp
bpp_init();

printf("Bpp inited.\n");

// immediately abort and reboot when touchpad detects something
while (badge_input_get_event(1000) == 0) { }

printf("Touch detected. Exiting bpp, rebooting.\n");
esp_restart();
}

void app_main(void) {
badge_check_first_run();
badge_base_init();
badge_check_first_run();
badge_base_init();

uint8_t magic = esp_rtcmem_read(0);
uint8_t inv_magic = esp_rtcmem_read(1);
uint8_t magic = esp_rtcmem_read(0);
uint8_t inv_magic = esp_rtcmem_read(1);

#ifdef CONFIG_SHA_BPP_ENABLE
//Grab level of int pin of touchpad. If high, this was a
//scheduled wakeup because of a deep sleep timeout. If low,
//the user used the touchpad.
//yes, this is v1 specific. Please add v0.x support yourself.
gpio_config_t io_conf = {
.mode = GPIO_MODE_INPUT,
.pin_bit_mask = 1LL << PIN_NUM_MPR121_INT,
.pull_down_en = 0,
.pull_up_en = 1,
};
gpio_config(&io_conf);
#endif
if (magic == (uint8_t)~inv_magic) {
printf("Magic checked out!\n");
switch (magic) {
case 1:
printf("Starting OTA\n");
sha2017_ota_update();
break;

if (magic == (uint8_t)~inv_magic) {
printf("Magic checked out!\n");
switch (magic) {
case 1:
printf("Starting OTA\n");
sha2017_ota_update();
break;
#ifdef CONFIG_SHA_BPP_ENABLE
case 2:
if (gpio_get_level(PIN_NUM_MPR121_INT)==1) {
printf("Touch int is high. Starting bpp.\n");
do_bpp_bgnd();
}
break;
case 2:
badge_init();
if (badge_input_button_state == 0) {
printf("Starting bpp.\n");
do_bpp_bgnd();
}
break;
#endif
case 3:
badge_first_run();
}
} else {
xTaskCreateStaticPinnedToCore(mp_task, "mp_task", MP_TASK_STACK_LEN, NULL, MP_TASK_PRIORITY,
&mp_task_stack[0], &mp_task_tcb, 0);
}

case 3:
badge_first_run();
}

} else {
xTaskCreateStaticPinnedToCore(mp_task, "mp_task", MP_TASK_STACK_LEN, NULL, MP_TASK_PRIORITY,
&mp_task_stack[0], &mp_task_tcb, 0);
}
}

void nlr_jump_fail(void *val) {
Expand Down
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy