Merge branch 'develop' of JF/PineTime into master

1 files changed, 151 insertions, 104 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 78f7ceb..7d21a80 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -168,132 +168,180 @@ set(NIMBLE_SRC
 set(LVGL_SRC
         libs/lv_conf.h
         libs/lvgl/lvgl.h
-        libs/lvgl/src/lv_core/lv_obj.c
-        libs/lvgl/src/lv_core/lv_obj.h
-        libs/lvgl/src/lv_core/lv_group.c
-        libs/lvgl/src/lv_core/lv_group.h
-        libs/lvgl/src/lv_core/lv_disp.c
+
+        libs/lvgl/src/lvgl.h
+        libs/lvgl/src/lv_api_map.h
+        libs/lvgl/src/lv_conf_internal.h
         libs/lvgl/src/lv_core/lv_disp.h
-        libs/lvgl/src/lv_core/lv_debug.h
-        libs/lvgl/src/lv_core/lv_debug.c
-        libs/lvgl/src/lv_core/lv_indev.c
+        libs/lvgl/src/lv_core/lv_group.h
         libs/lvgl/src/lv_core/lv_indev.h
-        libs/lvgl/src/lv_core/lv_refr.c
+        libs/lvgl/src/lv_core/lv_obj.h
+        libs/lvgl/src/lv_core/lv_obj_style_dec.h
         libs/lvgl/src/lv_core/lv_refr.h
-        libs/lvgl/src/lv_core/lv_style.c
         libs/lvgl/src/lv_core/lv_style.h
-        libs/lvgl/src/lv_misc/lv_anim.c
+        libs/lvgl/src/lv_draw/lv_draw.h
+        libs/lvgl/src/lv_draw/lv_draw_arc.h
+        libs/lvgl/src/lv_draw/lv_draw_blend.h
+        libs/lvgl/src/lv_draw/lv_draw_img.h
+        libs/lvgl/src/lv_draw/lv_draw_label.h
+        libs/lvgl/src/lv_draw/lv_draw_line.h
+        libs/lvgl/src/lv_draw/lv_draw_mask.h
+        libs/lvgl/src/lv_draw/lv_draw_rect.h
+        libs/lvgl/src/lv_draw/lv_draw_triangle.h
+        libs/lvgl/src/lv_draw/lv_img_buf.h
+        libs/lvgl/src/lv_draw/lv_img_cache.h
+        libs/lvgl/src/lv_draw/lv_img_decoder.h
+        libs/lvgl/src/lv_font/lv_font.h
+        libs/lvgl/src/lv_font/lv_font_fmt_txt.h
+        libs/lvgl/src/lv_font/lv_font_loader.h
+        libs/lvgl/src/lv_font/lv_symbol_def.h
+        libs/lvgl/src/lv_hal/lv_hal.h
+        libs/lvgl/src/lv_hal/lv_hal_disp.h
+        libs/lvgl/src/lv_hal/lv_hal_indev.h
+        libs/lvgl/src/lv_hal/lv_hal_tick.h
         libs/lvgl/src/lv_misc/lv_anim.h
-        libs/lvgl/src/lv_misc/lv_async.h
-        libs/lvgl/src/lv_misc/lv_async.c
-        libs/lvgl/src/lv_misc/lv_fs.c
-        libs/lvgl/src/lv_misc/lv_fs.h
-        libs/lvgl/src/lv_misc/lv_task.c
-        libs/lvgl/src/lv_misc/lv_task.h
-        libs/lvgl/src/lv_misc/lv_area.c
         libs/lvgl/src/lv_misc/lv_area.h
-        libs/lvgl/src/lv_misc/lv_bidi.c
+        libs/lvgl/src/lv_misc/lv_async.h
         libs/lvgl/src/lv_misc/lv_bidi.h
-        libs/lvgl/src/lv_misc/lv_circ.c
-        libs/lvgl/src/lv_misc/lv_circ.h
-        libs/lvgl/src/lv_misc/lv_color.c
         libs/lvgl/src/lv_misc/lv_color.h
-        libs/lvgl/src/lv_misc/lv_fs.c
+        libs/lvgl/src/lv_misc/lv_debug.h
         libs/lvgl/src/lv_misc/lv_fs.h
-        libs/lvgl/src/lv_misc/lv_gc.c
         libs/lvgl/src/lv_misc/lv_gc.h
-        libs/lvgl/src/lv_misc/lv_ll.c
         libs/lvgl/src/lv_misc/lv_ll.h
-        libs/lvgl/src/lv_misc/lv_log.c
         libs/lvgl/src/lv_misc/lv_log.h
-        libs/lvgl/src/lv_misc/lv_math.c
         libs/lvgl/src/lv_misc/lv_math.h
-        libs/lvgl/src/lv_misc/lv_mem.c
         libs/lvgl/src/lv_misc/lv_mem.h
-        libs/lvgl/src/lv_misc/lv_printf.c
         libs/lvgl/src/lv_misc/lv_printf.h
-        libs/lvgl/src/lv_misc/lv_task.c
         libs/lvgl/src/lv_misc/lv_task.h
-        libs/lvgl/src/lv_misc/lv_templ.c
         libs/lvgl/src/lv_misc/lv_templ.h
-        libs/lvgl/src/lv_misc/lv_txt.c
         libs/lvgl/src/lv_misc/lv_txt.h
+        libs/lvgl/src/lv_misc/lv_txt_ap.h
         libs/lvgl/src/lv_misc/lv_types.h
-        libs/lvgl/src/lv_misc/lv_utils.c
         libs/lvgl/src/lv_misc/lv_utils.h
-        libs/lvgl/src/lv_draw/lv_draw.c
-        libs/lvgl/src/lv_draw/lv_draw.h
+        libs/lvgl/src/lv_themes/lv_theme.h
+        libs/lvgl/src/lv_themes/lv_theme_empty.h
+        libs/lvgl/src/lv_themes/lv_theme_material.h
+        #libs/lvgl/src/lv_themes/lv_theme_mono.h
+        #libs/lvgl/src/lv_themes/lv_theme_template.h
+        libs/lvgl/src/lv_widgets/lv_arc.h
+        libs/lvgl/src/lv_widgets/lv_bar.h
+        libs/lvgl/src/lv_widgets/lv_btn.h
+        libs/lvgl/src/lv_widgets/lv_btnmatrix.h
+        libs/lvgl/src/lv_widgets/lv_calendar.h
+        libs/lvgl/src/lv_widgets/lv_canvas.h
+        libs/lvgl/src/lv_widgets/lv_chart.h
+        libs/lvgl/src/lv_widgets/lv_checkbox.h
+        libs/lvgl/src/lv_widgets/lv_cont.h
+        libs/lvgl/src/lv_widgets/lv_cpicker.h
+        libs/lvgl/src/lv_widgets/lv_dropdown.h
+        libs/lvgl/src/lv_widgets/lv_img.h
+        libs/lvgl/src/lv_widgets/lv_imgbtn.h
+        libs/lvgl/src/lv_widgets/lv_keyboard.h
+        libs/lvgl/src/lv_widgets/lv_label.h
+        libs/lvgl/src/lv_widgets/lv_led.h
+        libs/lvgl/src/lv_widgets/lv_line.h
+        libs/lvgl/src/lv_widgets/lv_linemeter.h
+        libs/lvgl/src/lv_widgets/lv_list.h
+        libs/lvgl/src/lv_widgets/lv_msgbox.h
+        libs/lvgl/src/lv_widgets/lv_objmask.h
+        libs/lvgl/src/lv_widgets/lv_objx_templ.h
+        libs/lvgl/src/lv_widgets/lv_page.h
+        libs/lvgl/src/lv_widgets/lv_roller.h
+        libs/lvgl/src/lv_widgets/lv_slider.h
+        libs/lvgl/src/lv_widgets/lv_spinbox.h
+        libs/lvgl/src/lv_widgets/lv_spinner.h
+        libs/lvgl/src/lv_widgets/lv_switch.h
+        libs/lvgl/src/lv_widgets/lv_table.h
+        libs/lvgl/src/lv_widgets/lv_tabview.h
+        libs/lvgl/src/lv_widgets/lv_textarea.h
+        libs/lvgl/src/lv_widgets/lv_tileview.h
+        libs/lvgl/src/lv_widgets/lv_win.h
+        libs/lvgl/src/lv_core/lv_disp.c
+        libs/lvgl/src/lv_core/lv_group.c
+        libs/lvgl/src/lv_core/lv_indev.c
+        libs/lvgl/src/lv_core/lv_obj.c
+        libs/lvgl/src/lv_core/lv_refr.c
+        libs/lvgl/src/lv_core/lv_style.c
         libs/lvgl/src/lv_draw/lv_draw_arc.c
-        libs/lvgl/src/lv_draw/lv_draw_arc.h
-        libs/lvgl/src/lv_draw/lv_draw_basic.c
-        libs/lvgl/src/lv_draw/lv_draw_basic.h
+        libs/lvgl/src/lv_draw/lv_draw_blend.c
         libs/lvgl/src/lv_draw/lv_draw_img.c
-        libs/lvgl/src/lv_draw/lv_draw_img.h
         libs/lvgl/src/lv_draw/lv_draw_label.c
-        libs/lvgl/src/lv_draw/lv_draw_label.h
         libs/lvgl/src/lv_draw/lv_draw_line.c
-        libs/lvgl/src/lv_draw/lv_draw_line.h
+        libs/lvgl/src/lv_draw/lv_draw_mask.c
         libs/lvgl/src/lv_draw/lv_draw_rect.c
-        libs/lvgl/src/lv_draw/lv_draw_rect.h
         libs/lvgl/src/lv_draw/lv_draw_triangle.c
-        libs/lvgl/src/lv_draw/lv_draw_triangle.h
+        libs/lvgl/src/lv_draw/lv_img_buf.c
         libs/lvgl/src/lv_draw/lv_img_cache.c
-        libs/lvgl/src/lv_draw/lv_img_cache.h
         libs/lvgl/src/lv_draw/lv_img_decoder.c
-        libs/lvgl/src/lv_draw/lv_img_decoder.h
-        libs/lvgl/src/lv_hal/lv_hal.h
+        libs/lvgl/src/lv_font/lv_font.c
+        #libs/lvgl/src/lv_font/lv_font_dejavu_16_persian_hebrew.c
+        libs/lvgl/src/lv_font/lv_font_fmt_txt.c
+        libs/lvgl/src/lv_font/lv_font_loader.c
+        # LVGL Fonts
+        libs/lvgl/src/lv_font/lv_font_montserrat_14.c
+        libs/lvgl/src/lv_font/lv_font_montserrat_18.c
+        libs/lvgl/src/lv_font/lv_font_montserrat_22.c
+        libs/lvgl/src/lv_font/lv_font_montserrat_28.c
+        #
         libs/lvgl/src/lv_hal/lv_hal_disp.c
-        libs/lvgl/src/lv_hal/lv_hal_disp.h
         libs/lvgl/src/lv_hal/lv_hal_indev.c
-        libs/lvgl/src/lv_hal/lv_hal_indev.h
         libs/lvgl/src/lv_hal/lv_hal_tick.c
-        libs/lvgl/src/lv_hal/lv_hal_tick.h
-        libs/lvgl/src/lv_font/lv_font.c
-        libs/lvgl/src/lv_font/lv_font.h
-        libs/lvgl/src/lv_font/lv_font_fmt_txt.c
-        libs/lvgl/src/lv_font/lv_font_fmt_txt.h
-        libs/lvgl/src/lv_font/lv_symbol_def.h
-        libs/lvgl/src/lv_themes/lv_theme.c
-        libs/lvgl/src/lv_themes/lv_theme.h
-        libs/lvgl/src/lv_objx/lv_btn.h
-        libs/lvgl/src/lv_objx/lv_btn.c
-        libs/lvgl/src/lv_objx/lv_cont.h
-        libs/lvgl/src/lv_objx/lv_cont.c
-        libs/lvgl/src/lv_objx/lv_label.h
-        libs/lvgl/src/lv_objx/lv_label.c
-        libs/lvgl/src/lv_objx/lv_table.c
+        libs/lvgl/src/lv_misc/lv_anim.c
+        libs/lvgl/src/lv_misc/lv_area.c
+        libs/lvgl/src/lv_misc/lv_async.c
+        libs/lvgl/src/lv_misc/lv_bidi.c
+        libs/lvgl/src/lv_misc/lv_color.c
+        libs/lvgl/src/lv_misc/lv_debug.c
+        libs/lvgl/src/lv_misc/lv_fs.c
+        libs/lvgl/src/lv_misc/lv_gc.c
+        libs/lvgl/src/lv_misc/lv_ll.c
+        libs/lvgl/src/lv_misc/lv_log.c
+        libs/lvgl/src/lv_misc/lv_math.c
+        libs/lvgl/src/lv_misc/lv_mem.c
+        libs/lvgl/src/lv_misc/lv_printf.c
+        libs/lvgl/src/lv_misc/lv_task.c
+        libs/lvgl/src/lv_misc/lv_templ.c
+        libs/lvgl/src/lv_misc/lv_txt.c
+        libs/lvgl/src/lv_misc/lv_txt_ap.c
+        libs/lvgl/src/lv_misc/lv_utils.c
         libs/lvgl/src/lv_themes/lv_theme.c
-        libs/lvgl/src/lv_themes/lv_theme.h
-        libs/lvgl/src/lv_themes/lv_theme_night.h
-        libs/lvgl/src/lv_themes/lv_theme_night.c
-        libs/lvgl/src/lv_objx/lv_list.c
-        libs/lvgl/src/lv_objx/lv_list.h
-        libs/lvgl/src/lv_objx/lv_tileview.c
-        libs/lvgl/src/lv_objx/lv_tileview.h
-        libs/lvgl/src/lv_objx/lv_tabview.c
-        libs/lvgl/src/lv_objx/lv_tabview.h
-        libs/lvgl/src/lv_objx/lv_btnm.c
-        libs/lvgl/src/lv_objx/lv_btnm.h
-        libs/lvgl/src/lv_objx/lv_page.c
-        libs/lvgl/src/lv_objx/lv_page.h
-        libs/lvgl/src/lv_objx/lv_img.c
-        libs/lvgl/src/lv_objx/lv_img.h
-        libs/lvgl/src/lv_objx/lv_lmeter.c
-        libs/lvgl/src/lv_objx/lv_lmeter.h
-        libs/lvgl/src/lv_objx/lv_arc.c
-        libs/lvgl/src/lv_objx/lv_arc.h
-        libs/lvgl/src/lv_objx/lv_gauge.c
-        libs/lvgl/src/lv_objx/lv_gauge.h
-        libs/lvgl/src/lv_objx/lv_mbox.c
-        libs/lvgl/src/lv_objx/lv_mbox.h
-        libs/lvgl/src/lv_objx/lv_bar.c
-        libs/lvgl/src/lv_objx/lv_bar.h
-        libs/lvgl/src/lv_objx/lv_slider.h
-        libs/lvgl/src/lv_objx/lv_slider.c
-        libs/lvgl/src/lv_objx/lv_ddlist.c
-        libs/lvgl/src/lv_objx/lv_ddlist.h
-        libs/lvgl/src/lv_objx/lv_line.c
-        libs/lvgl/src/lv_objx/lv_line.h
+        libs/lvgl/src/lv_themes/lv_theme_empty.c
+        libs/lvgl/src/lv_themes/lv_theme_material.c
+        #libs/lvgl/src/lv_themes/lv_theme_mono.c
+        #libs/lvgl/src/lv_themes/lv_theme_template.c
+        libs/lvgl/src/lv_widgets/lv_arc.c
+        libs/lvgl/src/lv_widgets/lv_bar.c
+        libs/lvgl/src/lv_widgets/lv_btn.c
+        libs/lvgl/src/lv_widgets/lv_btnmatrix.c
+        libs/lvgl/src/lv_widgets/lv_calendar.c
+        libs/lvgl/src/lv_widgets/lv_canvas.c
+        libs/lvgl/src/lv_widgets/lv_chart.c
+        libs/lvgl/src/lv_widgets/lv_checkbox.c
+        libs/lvgl/src/lv_widgets/lv_cont.c
+        libs/lvgl/src/lv_widgets/lv_cpicker.c
+        libs/lvgl/src/lv_widgets/lv_dropdown.c
+        libs/lvgl/src/lv_widgets/lv_img.c
+        libs/lvgl/src/lv_widgets/lv_imgbtn.c
+        libs/lvgl/src/lv_widgets/lv_keyboard.c
+        libs/lvgl/src/lv_widgets/lv_label.c
+        libs/lvgl/src/lv_widgets/lv_led.c
+        libs/lvgl/src/lv_widgets/lv_line.c
+        libs/lvgl/src/lv_widgets/lv_linemeter.c
+        libs/lvgl/src/lv_widgets/lv_list.c
+        libs/lvgl/src/lv_widgets/lv_msgbox.c
+        libs/lvgl/src/lv_widgets/lv_objmask.c
+        libs/lvgl/src/lv_widgets/lv_objx_templ.c
+        libs/lvgl/src/lv_widgets/lv_page.c
+        libs/lvgl/src/lv_widgets/lv_roller.c
+        libs/lvgl/src/lv_widgets/lv_slider.c
+        libs/lvgl/src/lv_widgets/lv_spinbox.c
+        libs/lvgl/src/lv_widgets/lv_spinner.c
+        libs/lvgl/src/lv_widgets/lv_switch.c
+        libs/lvgl/src/lv_widgets/lv_table.c
+        libs/lvgl/src/lv_widgets/lv_tabview.c
+        libs/lvgl/src/lv_widgets/lv_textarea.c
+        libs/lvgl/src/lv_widgets/lv_tileview.c
+        libs/lvgl/src/lv_widgets/lv_win.c
         )
 
 list(APPEND IMAGE_FILES
@@ -424,10 +472,8 @@ list(APPEND SOURCE_FILES
         displayapp/screens/Clock.cpp
         displayapp/screens/Tile.cpp
         displayapp/screens/Meter.cpp
-        displayapp/screens/Gauge.cpp
         displayapp/screens/InfiniPaint.cpp
         displayapp/screens/Paddle.cpp
-        displayapp/screens/DropDownDemo.cpp
         displayapp/screens/BatteryIcon.cpp
         displayapp/screens/BleIcon.cpp
         displayapp/screens/NotificationIcon.cpp
@@ -479,6 +525,7 @@ list(APPEND SOURCE_FILES
         displayapp/LittleVgl.cpp
         displayapp/fonts/jetbrains_mono_extrabold_compressed.c
         displayapp/fonts/jetbrains_mono_bold_20.c
+        displayapp/lv_pinetime_theme.c
 
         systemtask/SystemTask.cpp
         drivers/TwiMaster.cpp
@@ -518,7 +565,6 @@ set(INCLUDE_FILES
         displayapp/screens/Clock.h
         displayapp/screens/Tile.h
         displayapp/screens/Meter.h
-        displayapp/screens/Gauge.h
         displayapp/screens/InfiniPaint.h
         displayapp/screens/Paddle.h
         displayapp/screens/DropDownDemo.h
@@ -571,6 +617,7 @@ set(INCLUDE_FILES
         libs/date/includes/date/ptz.h
         libs/date/includes/date/tz_private.h
         displayapp/LittleVgl.h
+        displayapp/lv_pinetime_theme.h
         systemtask/SystemTask.h
         systemtask/SystemMonitor.h
         displayapp/screens/Symbols.h
@@ -831,7 +878,7 @@ if (USE_JLINK)
             COMMAND ${NRFJPROG} --program ${EXECUTABLE_FILE_NAME}.hex -f ${NRF_TARGET} --sectorerase
             COMMAND sleep 0.5s
             COMMAND ${NRFJPROG} --reset -f ${NRF_TARGET}
-            COMMENT "flashing ${EXECUTABLE_NAME}.hex"
+            COMMENT "flashing ${EXECUTABLE_FILE_NAME}.hex"
             )
 
 elseif (USE_GDB_CLIENT)
@@ -841,8 +888,8 @@ elseif (USE_GDB_CLIENT)
             )
     add_custom_target("FLASH_${EXECUTABLE_NAME}"
             DEPENDS ${EXECUTABLE_NAME}
-            COMMAND ${GDB_CLIENT_BIN_PATH} -nx --batch -ex 'target extended-remote ${GDB_CLIENT_TARGET_REMOTE}' -ex 'monitor swdp_scan' -ex 'attach 1' -ex 'load' -ex 'kill' ${EXECUTABLE_NAME}.hex
-            COMMENT "flashing ${EXECUTABLE_NAME}.hex"
+            COMMAND ${GDB_CLIENT_BIN_PATH} -nx --batch -ex 'target extended-remote ${GDB_CLIENT_TARGET_REMOTE}' -ex 'monitor swdp_scan' -ex 'attach 1' -ex 'load' -ex 'kill' ${EXECUTABLE_FILE_NAME}.hex
+            COMMENT "flashing ${EXECUTABLE_FILE_NAME}.hex"
             )
 elseif (USE_OPENOCD)
     if (USE_CMSIS_DAP)
@@ -867,10 +914,10 @@ elseif (USE_OPENOCD)
                 -c 'transport select swd'
                 -c 'source [find target/nrf52.cfg]'
                 -c 'halt'
-                -c "program \"${EXECUTABLE_NAME}.hex\""
+                -c "program \"${EXECUTABLE_FILE_NAME}.hex\""
                 -c 'reset'
                 -c 'shutdown'
-                COMMENT "flashing ${EXECUTABLE_NAME}.hex"
+                COMMENT "flashing ${EXECUTABLE_BIN_NAME}.hex"
                 )
     else ()
         add_custom_target(FLASH_ERASE
@@ -879,8 +926,8 @@ elseif (USE_OPENOCD)
                 )
         add_custom_target("FLASH_${EXECUTABLE_NAME}"
                 DEPENDS ${EXECUTABLE_NAME}
-                COMMAND ${OPENOCD_BIN_PATH} -c "tcl_port disabled" -c "gdb_port 3333" -c "telnet_port 4444" -f interface/stlink.cfg -c 'transport select hla_swd' -f target/nrf52.cfg -c "program \"${EXECUTABLE_NAME}.hex\"" -c reset -c shutdown
-                COMMENT "flashing ${EXECUTABLE_NAME}.hex"
+                COMMAND ${OPENOCD_BIN_PATH} -c "tcl_port disabled" -c "gdb_port 3333" -c "telnet_port 4444" -f interface/stlink.cfg -c 'transport select hla_swd' -f target/nrf52.cfg -c "program \"${EXECUTABLE_FILE_NAME}.hex\"" -c reset -c shutdown
+                COMMENT "flashing ${EXECUTABLE_FILE_NAME}.hex"
                 )
     endif ()
 endif ()