diff --git a/APP_Framework/Applications/lv_app/Makefile b/APP_Framework/Applications/lv_app/Makefile index 7439fbdf2..14e833cfa 100644 --- a/APP_Framework/Applications/lv_app/Makefile +++ b/APP_Framework/Applications/lv_app/Makefile @@ -1,4 +1,4 @@ SRC_FILES := lv_init.c lv_demo.c lv_demo_calendar.c -SRC_FILES += lv_sensor_info.c lv_sensor_update_info.c +SRC_FILES += lv_sensor_info.c lv_sensor_update_info.c lv_sensor_info_update_demo.c include $(KERNEL_ROOT)/compiler.mk diff --git a/APP_Framework/Applications/lv_app/lv_sensor_info.c b/APP_Framework/Applications/lv_app/lv_sensor_info.c index 2b33415c6..fae473d55 100644 --- a/APP_Framework/Applications/lv_app/lv_sensor_info.c +++ b/APP_Framework/Applications/lv_app/lv_sensor_info.c @@ -67,6 +67,7 @@ void lv_sensor_info(void) { } lv_obj_set_style_text_font(lv_ssr_tb, &lvgl_font_chinese, 0); + // set width of cells in table for (uint32_t i = 0; i < 2 * NR_VAL_PERLINE; ++i) { if (i % 2 == 0) { lv_table_set_col_width(lv_ssr_tb, i, 75); diff --git a/APP_Framework/Applications/lv_app/lv_sensor_info.h b/APP_Framework/Applications/lv_app/lv_sensor_info.h index f8bd4fc4f..963adc703 100644 --- a/APP_Framework/Applications/lv_app/lv_sensor_info.h +++ b/APP_Framework/Applications/lv_app/lv_sensor_info.h @@ -8,6 +8,7 @@ extern lv_obj_t* lv_ssr_tb; pthread_mutex_t ssr_val_lock; +// number of sensor values showed in one line #define NR_VAL_PERLINE 3 static char* sensor_names[nr_sensors] = { @@ -20,7 +21,8 @@ static char* sensor_names[nr_sensors] = { static char* seneor_denominations[nr_sensors] = { "ppb", "ppm", "ppb", "ppb", "ppm", "ppm", "ppm", "ppm", "%VOL", "%VOL", "ug/m³", "ug/m³", - "°C", "%RH", "m/s", "m/s", "mbar", "dB(A)" + "°C", "%RH", + "m/s", "m/s", "mbar", "dB(A)" }; static double lv_sensor_vals[nr_sensors]; diff --git a/APP_Framework/Applications/main.c b/APP_Framework/Applications/main.c index 404432da5..e61e62a35 100644 --- a/APP_Framework/Applications/main.c +++ b/APP_Framework/Applications/main.c @@ -26,11 +26,6 @@ int main(void) #ifdef APPLICATION_OTA ApplicationOtaTaskInit(); #endif - // while (1) { - // ShowTask(); - // ShowMemory(); - // PrivTaskDelay(1500); - // } return 0; } // int cppmain(void); diff --git a/APP_Framework/lib/lvgl/porting/lv_port_indev_template.c b/APP_Framework/lib/lvgl/porting/lv_port_indev_template.c index 7d4e99949..72652530f 100644 --- a/APP_Framework/lib/lvgl/porting/lv_port_indev_template.c +++ b/APP_Framework/lib/lvgl/porting/lv_port_indev_template.c @@ -230,7 +230,7 @@ static void touchpad_init(void) { touch_fd = PrivOpen(PRIV_TOUCH_DEV,O_RDWR); if(touch_fd >= 0) { - printf("touch fd = %d\n",touch_fd); + // printf("touch fd = %d\n",touch_fd); } else { printf("open %s touch fd = %d failed.\n",PRIV_TOUCH_DEV,touch_fd); }