diff --git a/firmware/esp32-s3-dashboard/dashboard_config.h b/firmware/esp32-s3-dashboard/dashboard_config.h index 0e6ca0a..41b7959 100644 --- a/firmware/esp32-s3-dashboard/dashboard_config.h +++ b/firmware/esp32-s3-dashboard/dashboard_config.h @@ -1,6 +1,6 @@ #pragma once -static const char *DASHBOARD_VERSION = "0.1.52-vehicle-image-icons"; +static const char *DASHBOARD_VERSION = "0.1.53-vehicle-icon-zoom"; // Update these if your Cargo ESP AP credentials are different. static const char *CARGO_WIFI_SSID = "OverlandController"; diff --git a/firmware/esp32-s3-dashboard/esp32-s3-dashboard.ino b/firmware/esp32-s3-dashboard/esp32-s3-dashboard.ino index 7987b12..0435db1 100644 --- a/firmware/esp32-s3-dashboard/esp32-s3-dashboard.ino +++ b/firmware/esp32-s3-dashboard/esp32-s3-dashboard.ino @@ -1252,10 +1252,12 @@ static void create_overland_overview_screen() lv_obj_t *coolant_icon = lv_img_create(vehicle_card); lv_img_set_src(coolant_icon, &water_coolant); - lv_img_set_zoom(coolant_icon, 12); + lv_img_set_zoom(coolant_icon, 18); + lv_obj_set_size(coolant_icon, 60, 60); + lv_obj_clear_flag(coolant_icon, LV_OBJ_FLAG_SCROLLABLE); lv_obj_set_style_img_recolor(coolant_icon, lv_color_hex(0x84CAFF), 0); lv_obj_set_style_img_recolor_opa(coolant_icon, LV_OPA_COVER, 0); - lv_obj_align(coolant_icon, LV_ALIGN_TOP_LEFT, 12, 8); + lv_obj_align(coolant_icon, LV_ALIGN_TOP_LEFT, 6, 6); #if LV_USE_METER vehicle_coolant_meter = lv_meter_create(vehicle_card); @@ -1292,15 +1294,17 @@ static void create_overland_overview_screen() lv_obj_t *fuel_icon = lv_img_create(vehicle_card); lv_img_set_src(fuel_icon, &gas_pump); - lv_img_set_zoom(fuel_icon, 10); + lv_img_set_zoom(fuel_icon, 16); + lv_obj_set_size(fuel_icon, 54, 54); + lv_obj_clear_flag(fuel_icon, LV_OBJ_FLAG_SCROLLABLE); lv_obj_set_style_img_recolor(fuel_icon, lv_color_hex(0xDDE3EA), 0); lv_obj_set_style_img_recolor_opa(fuel_icon, LV_OPA_COVER, 0); - lv_obj_align(fuel_icon, LV_ALIGN_BOTTOM_LEFT, 10, -14); + lv_obj_align(fuel_icon, LV_ALIGN_BOTTOM_LEFT, 4, -8); vehicle_fuel_bar = lv_bar_create(vehicle_card); lv_obj_add_event_cb(vehicle_fuel_bar, fuel_bar_draw_value_cb, LV_EVENT_DRAW_PART_END, NULL); lv_obj_set_size(vehicle_fuel_bar, 206, 22); - lv_obj_align(vehicle_fuel_bar, LV_ALIGN_BOTTOM_LEFT, 54, -20); + lv_obj_align(vehicle_fuel_bar, LV_ALIGN_BOTTOM_LEFT, 62, -20); lv_bar_set_range(vehicle_fuel_bar, 0, 100); lv_bar_set_value(vehicle_fuel_bar, 72, LV_ANIM_OFF); lv_obj_set_style_radius(vehicle_fuel_bar, 3, 0); @@ -1318,7 +1322,7 @@ static void create_overland_overview_screen() lv_obj_set_style_bg_color(tick, lv_color_hex(0x7D8996), 0); lv_obj_set_style_border_width(tick, 0, 0); lv_obj_set_style_radius(tick, 0, 0); - lv_obj_align(tick, LV_ALIGN_BOTTOM_LEFT, 54 + (i * 51), -17); + lv_obj_align(tick, LV_ALIGN_BOTTOM_LEFT, 62 + (i * 48), -17); } vehicle_fuel_value_label = lv_label_create(vehicle_card);