refactor
This commit is contained in:
@@ -23,10 +23,6 @@ static lv_display_t *sh_display = NULL;
|
||||
static lv_obj_t *label = NULL;
|
||||
bmp280_t dev_bmp_280;
|
||||
|
||||
static void lvgl_tick_cb(void *arg) {
|
||||
lv_tick_inc(10);
|
||||
}
|
||||
|
||||
void lvgl_task(void *pvParameters) {
|
||||
while (1) {
|
||||
lv_timer_handler();
|
||||
@@ -42,7 +38,7 @@ void sensor_task(void *pvParameters) {
|
||||
// Najpierw OLED, potem (blokujący) HTTP — żeby ekran
|
||||
// odświeżył się nawet gdy serwer nie odpowiada.
|
||||
char buf[256];
|
||||
snprintf(buf, sizeof(buf), "Temp: %.2f C\nHumid: %.2f %%\nPress: %.2f hPa",
|
||||
snprintf(buf, sizeof(buf), "Temp: %.1f C\nHumid: %.1f %%\nPress: %.1f hPa",
|
||||
CURR_READOUT.temperature,
|
||||
CURR_READOUT.humidity,
|
||||
CURR_READOUT.pressure / 100.);
|
||||
@@ -81,24 +77,14 @@ void app_main()
|
||||
httpd_register_uri_handler(server, &ygg_press_uri);
|
||||
httpd_register_uri_handler(server, &ygg_hum_uri);
|
||||
|
||||
ESP_ERROR_CHECK(i2cdev_init());
|
||||
|
||||
sh_display = ygg_sh1106_init();
|
||||
// LVGL potrzebuje regularnego ticka, inaczej redraw nigdy się nie wykona
|
||||
// (to był powód, dla którego wisiało "FIRST").
|
||||
const esp_timer_create_args_t lvgl_tick_args = {
|
||||
.callback = lvgl_tick_cb,
|
||||
.name = "lvgl_tick",
|
||||
};
|
||||
esp_timer_handle_t lvgl_tick_handle = NULL;
|
||||
ESP_ERROR_CHECK(esp_timer_create(&lvgl_tick_args, &lvgl_tick_handle));
|
||||
ESP_ERROR_CHECK(esp_timer_start_periodic(lvgl_tick_handle, 10 * 1000));
|
||||
|
||||
lv_obj_t *scr = lv_display_get_screen_active(sh_display);
|
||||
label = lv_label_create(scr);
|
||||
ygg_set_display_label(sh_display, label, "FIRST");
|
||||
ygg_set_display_label(sh_display, label, "PLEASE WAIT...");
|
||||
|
||||
ygg_bmp280_init(&dev_bmp_280);
|
||||
|
||||
xTaskCreatePinnedToCore(lvgl_task, "lvgl", 4096, NULL, 4, NULL, APP_CPU_NUM);
|
||||
xTaskCreatePinnedToCore(sensor_task, "bmp280_test", 8192, NULL, 5, NULL, APP_CPU_NUM);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user