Skip to content
Snippets Groups Projects
Commit 9a7ef393 authored by moon2's avatar moon2 :speech_balloon:
Browse files

faster boot into payload

parent 5a75cee6
Branches
Tags
No related merge requests found
...@@ -52,6 +52,7 @@ static esp_err_t i2c_master_init(void) ...@@ -52,6 +52,7 @@ static esp_err_t i2c_master_init(void)
} }
#define CAPTOUCH_POLLING_PERIOD 10 #define CAPTOUCH_POLLING_PERIOD 10
static uint8_t hw_init_done = 0;
void os_app_main(void) void os_app_main(void)
{ {
...@@ -65,10 +66,11 @@ void os_app_main(void) ...@@ -65,10 +66,11 @@ void os_app_main(void)
init_buttons(); init_buttons();
captouch_init(); captouch_init();
vTaskDelay(2000 / portTICK_PERIOD_MS); //vTaskDelay(2000 / portTICK_PERIOD_MS);
set_global_vol_dB(0); set_global_vol_dB(0);
display_init(); display_init();
hw_init_done = 1;
while(1) { while(1) {
manual_captouch_readout(1); manual_captouch_readout(1);
vTaskDelay((CAPTOUCH_POLLING_PERIOD) / portTICK_PERIOD_MS); vTaskDelay((CAPTOUCH_POLLING_PERIOD) / portTICK_PERIOD_MS);
...@@ -82,3 +84,8 @@ void os_app_main(void) ...@@ -82,3 +84,8 @@ void os_app_main(void)
ESP_ERROR_CHECK(i2c_driver_delete(I2C_MASTER_NUM)); ESP_ERROR_CHECK(i2c_driver_delete(I2C_MASTER_NUM));
ESP_LOGI(TAG, "I2C de-initialized successfully"); ESP_LOGI(TAG, "I2C de-initialized successfully");
} }
uint8_t hardware_is_initialized(){
return hw_init_done;
}
#pragma once #pragma once
#include <stdint.h>
void os_app_main(void); void os_app_main(void);
uint8_t hardware_is_initialized(void);
...@@ -73,7 +73,9 @@ def set_rel_volume(vol): ...@@ -73,7 +73,9 @@ def set_rel_volume(vol):
def main(): def main():
global CURRENT_APP_RUN global CURRENT_APP_RUN
time.sleep_ms(5000) while not init_done():
pass
captouch_autocalib() captouch_autocalib()
for module in MODULES: for module in MODULES:
......
...@@ -16,8 +16,14 @@ ...@@ -16,8 +16,14 @@
#include "badge23/captouch.h" #include "badge23/captouch.h"
#include "badge23/display.h" #include "badge23/display.h"
#include "badge23/spio.h" #include "badge23/spio.h"
#include "badge23/espan.h"
#include "badge23_hwconfig.h" #include "badge23_hwconfig.h"
STATIC mp_obj_t mp_init_done(size_t n_args, const mp_obj_t *args) {
return mp_obj_new_int(hardware_is_initialized());
}
STATIC MP_DEFINE_CONST_FUN_OBJ_VAR_BETWEEN(mp_init_done_obj, 0, 1, mp_init_done);
STATIC mp_obj_t mp_display_update(size_t n_args, const mp_obj_t *args) { STATIC mp_obj_t mp_display_update(size_t n_args, const mp_obj_t *args) {
display_update(); display_update();
return mp_const_none; return mp_const_none;
...@@ -128,6 +134,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_version_obj, mp_version); ...@@ -128,6 +134,7 @@ STATIC MP_DEFINE_CONST_FUN_OBJ_0(mp_version_obj, mp_version);
STATIC const mp_rom_map_elem_t mp_module_hardware_globals_table[] = { STATIC const mp_rom_map_elem_t mp_module_hardware_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_badge_audio) }, { MP_ROM_QSTR(MP_QSTR___name__), MP_ROM_QSTR(MP_QSTR_badge_audio) },
{ MP_ROM_QSTR(MP_QSTR_init_done), MP_ROM_PTR(&mp_init_done_obj) },
{ MP_ROM_QSTR(MP_QSTR_get_captouch), MP_ROM_PTR(&mp_get_captouch_obj) }, { MP_ROM_QSTR(MP_QSTR_get_captouch), MP_ROM_PTR(&mp_get_captouch_obj) },
{ MP_ROM_QSTR(MP_QSTR_captouch_autocalib), MP_ROM_PTR(&mp_captouch_autocalib_obj) }, { MP_ROM_QSTR(MP_QSTR_captouch_autocalib), MP_ROM_PTR(&mp_captouch_autocalib_obj) },
{ MP_ROM_QSTR(MP_QSTR_get_button), MP_ROM_PTR(&mp_get_button_obj) }, { MP_ROM_QSTR(MP_QSTR_get_button), MP_ROM_PTR(&mp_get_button_obj) },
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment