diff --git a/CMakeLists.txt b/CMakeLists.txt
index f65a4397edc36a86738c5e1a5021b3f1a631523a..5346ccfb19d74ebc951fbbe9672f0a931415f4a4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@
set(NRF_TARGET "nrf52")
if (NOT ARM_NONE_EABI_TOOLCHAIN_PATH)
- message(FATAL_ERROR "The path to the toolchain (arm-non-eabi) must be specified on the command line (add -DARM_NONE_EABI_TOOLCHAIN_PATH=<path>")
+ message(FATAL_ERROR "The path to the toolchain (arm-none-eabi) must be specified on the command line (add -DARM_NONE_EABI_TOOLCHAIN_PATH=<path>")
endif ()
if (NOT NRF5_SDK_PATH)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index eee1d61ac2a6ecc1115c92a880607ce7cc89f9a7..1b5cdcbe554b511629f965ee710365014dd1bfb3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,20 +10,20 @@ # check if all the necessary tools paths have been provided.
if (NOT NRF5_SDK_PATH)
message(FATAL_ERROR "The path to the nRF5 SDK (NRF5_SDK_PATH) must be set.")
endif ()
-if(DEFINED ARM_NONE_EABI_TOOLCHAIN_PATH)
+if (DEFINED ARM_NONE_EABI_TOOLCHAIN_PATH)
set(ARM_NONE_EABI_TOOLCHAIN_BIN_PATH ${ARM_NONE_EABI_TOOLCHAIN_PATH}/bin)
-endif()
+endif ()
if (NOT NRF_TARGET MATCHES "nrf52")
message(FATAL_ERROR "Only rRF52 boards are supported right now")
-endif()
+endif ()
# Setup toolchain
include(${CMAKE_SOURCE_DIR}/cmake-nRF5x/arm-gcc-toolchain.cmake)
-if(NOT DEFINED ARM_GCC_TOOLCHAIN)
+if (NOT DEFINED ARM_GCC_TOOLCHAIN)
message(FATAL_ERROR "The toolchain must be set up before calling this macro")
-endif()
+endif ()
set(CMAKE_OSX_SYSROOT "/")
set(CMAKE_OSX_DEPLOYMENT_TARGET "")
@@ -84,399 +84,399 @@ "${NRF5_SDK_PATH}/modules/nrfx/drivers/src/nrfx_twi.c"
# GPIOTE
"${NRF5_SDK_PATH}/components/libraries/gpiote/app_gpiote.c"
-)
+ )
set(TINYCRYPT_SRC
- libs/mynewt-nimble/ext/tinycrypt/src/aes_encrypt.c
- libs/mynewt-nimble/ext/tinycrypt/src/utils.c
- )
+ libs/mynewt-nimble/ext/tinycrypt/src/aes_encrypt.c
+ libs/mynewt-nimble/ext/tinycrypt/src/utils.c
+ )
set(NIMBLE_SRC
- libs/mynewt-nimble/porting/npl/freertos/src/nimble_port_freertos.c
- libs/mynewt-nimble/porting/npl/freertos/src/npl_os_freertos.c
- libs/mynewt-nimble/nimble/host/src/ble_hs.c
- libs/mynewt-nimble/nimble/host/src/ble_hs_hci_evt.c
- libs/mynewt-nimble/nimble/host/src/ble_l2cap_sig_cmd.c
- libs/mynewt-nimble/nimble/host/src/ble_l2cap_sig.c
- libs/mynewt-nimble/nimble/host/src/ble_l2cap.c
- libs/mynewt-nimble/nimble/host/src/ble_hs_mbuf.c
- libs/mynewt-nimble/nimble/host/src/ble_sm.c
- libs/mynewt-nimble/nimble/host/src/ble_gap.c
- libs/mynewt-nimble/nimble/host/src/ble_gatts.c
- libs/mynewt-nimble/nimble/host/src/ble_gattc.c
- libs/mynewt-nimble/nimble/host/src/ble_hs_conn.c
- libs/mynewt-nimble/nimble/host/src/ble_att_svr.c
- libs/mynewt-nimble/nimble/host/src/ble_store.c
- libs/mynewt-nimble/nimble/host/src/ble_store_util.c
- libs/mynewt-nimble/nimble/host/src/ble_hs_pvcy.c
- libs/mynewt-nimble/nimble/host/src/ble_hs_hci.c
- libs/mynewt-nimble/nimble/host/src/ble_hs_log.c
- libs/mynewt-nimble/nimble/host/src/ble_hs_hci_util.c
- libs/mynewt-nimble/nimble/host/src/ble_hs_hci_cmd.c
- libs/mynewt-nimble/nimble/host/src/ble_hs_cfg.c
- libs/mynewt-nimble/nimble/host/src/ble_uuid.c
- libs/mynewt-nimble/nimble/host/src/ble_hs_id.c
- libs/mynewt-nimble/nimble/host/src/ble_hs_misc.c
- libs/mynewt-nimble/nimble/host/src/ble_att.c
- libs/mynewt-nimble/nimble/host/src/ble_att_clt.c
- libs/mynewt-nimble/nimble/host/src/ble_att_svr.c
- libs/mynewt-nimble/nimble/host/src/ble_att_cmd.c
- libs/mynewt-nimble/nimble/host/src/ble_hs_atomic.c
- libs/mynewt-nimble/nimble/host/src/ble_hs_adv.c
- libs/mynewt-nimble/nimble/host/src/ble_hs_flow.c
- libs/mynewt-nimble/nimble/host/src/ble_sm.c
- libs/mynewt-nimble/nimble/host/src/ble_sm_cmd.c
- libs/mynewt-nimble/nimble/host/src/ble_sm_lgcy.c
- libs/mynewt-nimble/nimble/host/src/ble_sm_alg.c
- libs/mynewt-nimble/nimble/host/src/ble_hs_mqueue.c
- libs/mynewt-nimble/nimble/host/src/ble_hs_stop.c
- libs/mynewt-nimble/nimble/host/src/ble_hs_startup.c
- libs/mynewt-nimble/nimble/host/store/ram/src/ble_store_ram.c
- libs/mynewt-nimble/nimble/host/src/ble_monitor.c
- libs/mynewt-nimble/nimble/transport/ram/src/ble_hci_ram.c
- libs/mynewt-nimble/nimble/controller/src/ble_ll.c
- libs/mynewt-nimble/nimble/controller/src/ble_ll_rand.c
- libs/mynewt-nimble/nimble/controller/src/ble_ll_conn.c
- libs/mynewt-nimble/nimble/controller/src/ble_ll_ctrl.c
- libs/mynewt-nimble/nimble/controller/src/ble_ll_hci.c
- libs/mynewt-nimble/nimble/controller/src/ble_ll_conn_hci.c
- libs/mynewt-nimble/nimble/controller/src/ble_ll_utils.c
- libs/mynewt-nimble/nimble/controller/src/ble_ll_scan.c
- libs/mynewt-nimble/nimble/controller/src/ble_ll_whitelist.c
- libs/mynewt-nimble/nimble/controller/src/ble_ll_adv.c
- libs/mynewt-nimble/nimble/controller/src/ble_ll_sched.c
- libs/mynewt-nimble/nimble/controller/src/ble_ll_supp_cmd.c
- libs/mynewt-nimble/nimble/controller/src/ble_ll_hci_ev.c
- libs/mynewt-nimble/nimble/controller/src/ble_ll_rfmgmt.c
- libs/mynewt-nimble/porting/nimble/src/os_cputime.c
- libs/mynewt-nimble/porting/nimble/src/os_cputime_pwr2.c
- libs/mynewt-nimble/porting/nimble/src/os_mbuf.c
- libs/mynewt-nimble/porting/nimble/src/os_mempool.c
- libs/mynewt-nimble/porting/nimble/src/hal_timer.c
- libs/mynewt-nimble/porting/nimble/src/mem.c
- libs/mynewt-nimble/porting/nimble/src/endian.c
- libs/mynewt-nimble/porting/nimble/src/os_msys_init.c
- libs/mynewt-nimble/nimble/drivers/nrf52/src/ble_hw.c
- libs/mynewt-nimble/nimble/drivers/nrf52/src/ble_phy.c
- libs/mynewt-nimble/nimble/host/services/gap/src/ble_svc_gap.c
- libs/mynewt-nimble/nimble/host/services/gatt/src/ble_svc_gatt.c
- libs/mynewt-nimble/nimble/host/util/src/addr.c
- )
+ libs/mynewt-nimble/porting/npl/freertos/src/nimble_port_freertos.c
+ libs/mynewt-nimble/porting/npl/freertos/src/npl_os_freertos.c
+ libs/mynewt-nimble/nimble/host/src/ble_hs.c
+ libs/mynewt-nimble/nimble/host/src/ble_hs_hci_evt.c
+ libs/mynewt-nimble/nimble/host/src/ble_l2cap_sig_cmd.c
+ libs/mynewt-nimble/nimble/host/src/ble_l2cap_sig.c
+ libs/mynewt-nimble/nimble/host/src/ble_l2cap.c
+ libs/mynewt-nimble/nimble/host/src/ble_hs_mbuf.c
+ libs/mynewt-nimble/nimble/host/src/ble_sm.c
+ libs/mynewt-nimble/nimble/host/src/ble_gap.c
+ libs/mynewt-nimble/nimble/host/src/ble_gatts.c
+ libs/mynewt-nimble/nimble/host/src/ble_gattc.c
+ libs/mynewt-nimble/nimble/host/src/ble_hs_conn.c
+ libs/mynewt-nimble/nimble/host/src/ble_att_svr.c
+ libs/mynewt-nimble/nimble/host/src/ble_store.c
+ libs/mynewt-nimble/nimble/host/src/ble_store_util.c
+ libs/mynewt-nimble/nimble/host/src/ble_hs_pvcy.c
+ libs/mynewt-nimble/nimble/host/src/ble_hs_hci.c
+ libs/mynewt-nimble/nimble/host/src/ble_hs_log.c
+ libs/mynewt-nimble/nimble/host/src/ble_hs_hci_util.c
+ libs/mynewt-nimble/nimble/host/src/ble_hs_hci_cmd.c
+ libs/mynewt-nimble/nimble/host/src/ble_hs_cfg.c
+ libs/mynewt-nimble/nimble/host/src/ble_uuid.c
+ libs/mynewt-nimble/nimble/host/src/ble_hs_id.c
+ libs/mynewt-nimble/nimble/host/src/ble_hs_misc.c
+ libs/mynewt-nimble/nimble/host/src/ble_att.c
+ libs/mynewt-nimble/nimble/host/src/ble_att_clt.c
+ libs/mynewt-nimble/nimble/host/src/ble_att_svr.c
+ libs/mynewt-nimble/nimble/host/src/ble_att_cmd.c
+ libs/mynewt-nimble/nimble/host/src/ble_hs_atomic.c
+ libs/mynewt-nimble/nimble/host/src/ble_hs_adv.c
+ libs/mynewt-nimble/nimble/host/src/ble_hs_flow.c
+ libs/mynewt-nimble/nimble/host/src/ble_sm.c
+ libs/mynewt-nimble/nimble/host/src/ble_sm_cmd.c
+ libs/mynewt-nimble/nimble/host/src/ble_sm_lgcy.c
+ libs/mynewt-nimble/nimble/host/src/ble_sm_alg.c
+ libs/mynewt-nimble/nimble/host/src/ble_hs_mqueue.c
+ libs/mynewt-nimble/nimble/host/src/ble_hs_stop.c
+ libs/mynewt-nimble/nimble/host/src/ble_hs_startup.c
+ libs/mynewt-nimble/nimble/host/store/ram/src/ble_store_ram.c
+ libs/mynewt-nimble/nimble/host/src/ble_monitor.c
+ libs/mynewt-nimble/nimble/transport/ram/src/ble_hci_ram.c
+ libs/mynewt-nimble/nimble/controller/src/ble_ll.c
+ libs/mynewt-nimble/nimble/controller/src/ble_ll_rand.c
+ libs/mynewt-nimble/nimble/controller/src/ble_ll_conn.c
+ libs/mynewt-nimble/nimble/controller/src/ble_ll_ctrl.c
+ libs/mynewt-nimble/nimble/controller/src/ble_ll_hci.c
+ libs/mynewt-nimble/nimble/controller/src/ble_ll_conn_hci.c
+ libs/mynewt-nimble/nimble/controller/src/ble_ll_utils.c
+ libs/mynewt-nimble/nimble/controller/src/ble_ll_scan.c
+ libs/mynewt-nimble/nimble/controller/src/ble_ll_whitelist.c
+ libs/mynewt-nimble/nimble/controller/src/ble_ll_adv.c
+ libs/mynewt-nimble/nimble/controller/src/ble_ll_sched.c
+ libs/mynewt-nimble/nimble/controller/src/ble_ll_supp_cmd.c
+ libs/mynewt-nimble/nimble/controller/src/ble_ll_hci_ev.c
+ libs/mynewt-nimble/nimble/controller/src/ble_ll_rfmgmt.c
+ libs/mynewt-nimble/porting/nimble/src/os_cputime.c
+ libs/mynewt-nimble/porting/nimble/src/os_cputime_pwr2.c
+ libs/mynewt-nimble/porting/nimble/src/os_mbuf.c
+ libs/mynewt-nimble/porting/nimble/src/os_mempool.c
+ libs/mynewt-nimble/porting/nimble/src/hal_timer.c
+ libs/mynewt-nimble/porting/nimble/src/mem.c
+ libs/mynewt-nimble/porting/nimble/src/endian.c
+ libs/mynewt-nimble/porting/nimble/src/os_msys_init.c
+ libs/mynewt-nimble/nimble/drivers/nrf52/src/ble_hw.c
+ libs/mynewt-nimble/nimble/drivers/nrf52/src/ble_phy.c
+ libs/mynewt-nimble/nimble/host/services/gap/src/ble_svc_gap.c
+ libs/mynewt-nimble/nimble/host/services/gatt/src/ble_svc_gatt.c
+ libs/mynewt-nimble/nimble/host/util/src/addr.c
+ )
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/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_indev.h
- libs/lvgl/src/lv_core/lv_refr.c
- 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_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_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_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_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_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_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_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_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_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_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/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/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_indev.h
+ libs/lvgl/src/lv_core/lv_refr.c
+ 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_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_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_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_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_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_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_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_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_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_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
+ )
list(APPEND IMAGE_FILES
- DisplayApp/Icons/battery/os_battery_error.c
- DisplayApp/Icons/battery/os_battery_100.c
- DisplayApp/Icons/battery/os_battery_090.c
- DisplayApp/Icons/battery/os_battery_080.c
- DisplayApp/Icons/battery/os_battery_070.c
- DisplayApp/Icons/battery/os_battery_060.c
- DisplayApp/Icons/battery/os_battery_050.c
- DisplayApp/Icons/battery/os_battery_040.c
- DisplayApp/Icons/battery/os_battery_030.c
- DisplayApp/Icons/battery/os_battery_020.c
- DisplayApp/Icons/battery/os_battery_010.c
- DisplayApp/Icons/battery/os_battery_005.c
+ DisplayApp/Icons/battery/os_battery_error.c
+ DisplayApp/Icons/battery/os_battery_100.c
+ DisplayApp/Icons/battery/os_battery_090.c
+ DisplayApp/Icons/battery/os_battery_080.c
+ DisplayApp/Icons/battery/os_battery_070.c
+ DisplayApp/Icons/battery/os_battery_060.c
+ DisplayApp/Icons/battery/os_battery_050.c
+ DisplayApp/Icons/battery/os_battery_040.c
+ DisplayApp/Icons/battery/os_battery_030.c
+ DisplayApp/Icons/battery/os_battery_020.c
+ DisplayApp/Icons/battery/os_battery_010.c
+ DisplayApp/Icons/battery/os_battery_005.c
- DisplayApp/Icons/battery/os_batterycharging_100.c
- DisplayApp/Icons/battery/os_batterycharging_090.c
- DisplayApp/Icons/battery/os_batterycharging_080.c
- DisplayApp/Icons/battery/os_batterycharging_070.c
- DisplayApp/Icons/battery/os_batterycharging_060.c
- DisplayApp/Icons/battery/os_batterycharging_050.c
- DisplayApp/Icons/battery/os_batterycharging_040.c
- DisplayApp/Icons/battery/os_batterycharging_030.c
- DisplayApp/Icons/battery/os_batterycharging_020.c
- DisplayApp/Icons/battery/os_batterycharging_010.c
- DisplayApp/Icons/battery/os_batterycharging_005.c
+ DisplayApp/Icons/battery/os_batterycharging_100.c
+ DisplayApp/Icons/battery/os_batterycharging_090.c
+ DisplayApp/Icons/battery/os_batterycharging_080.c
+ DisplayApp/Icons/battery/os_batterycharging_070.c
+ DisplayApp/Icons/battery/os_batterycharging_060.c
+ DisplayApp/Icons/battery/os_batterycharging_050.c
+ DisplayApp/Icons/battery/os_batterycharging_040.c
+ DisplayApp/Icons/battery/os_batterycharging_030.c
+ DisplayApp/Icons/battery/os_batterycharging_020.c
+ DisplayApp/Icons/battery/os_batterycharging_010.c
+ DisplayApp/Icons/battery/os_batterycharging_005.c
- DisplayApp/Icons/bluetooth/os_bt_connected.c
- DisplayApp/Icons/bluetooth/os_bt_disconnected.c
- )
+ DisplayApp/Icons/bluetooth/os_bt_connected.c
+ DisplayApp/Icons/bluetooth/os_bt_disconnected.c
+ )
list(APPEND SOURCE_FILES
- Logging/NrfLogger.cpp
- DisplayApp/DisplayApp.cpp
- DisplayApp/Screens/Screen.cpp
- DisplayApp/Screens/Clock.cpp
- DisplayApp/Screens/Tile.cpp
- DisplayApp/Screens/Meter.cpp
- DisplayApp/Screens/Gauge.cpp
- DisplayApp/Screens/InfiniPaint.cpp
- DisplayApp/Screens/DropDownDemo.cpp
- DisplayApp/Screens/Modal.cpp
- DisplayApp/Screens/BatteryIcon.cpp
- DisplayApp/Screens/BleIcon.cpp
- DisplayApp/Screens/Brightness.cpp
- DisplayApp/Screens/SystemInfo.cpp
- DisplayApp/Screens/Label.cpp
- DisplayApp/Screens/FirmwareUpdate.cpp
- DisplayApp/Screens/Music.cpp
- DisplayApp/Screens/FirmwareValidation.cpp
- DisplayApp/Screens/ApplicationList.cpp
- main.cpp
- drivers/St7789.cpp
- drivers/SpiNorFlash.cpp
- drivers/SpiMaster.cpp
- drivers/Spi.cpp
- drivers/Watchdog.cpp
- drivers/DebugPins.cpp
- drivers/InternalFlash.cpp
- Components/Battery/BatteryController.cpp
- Components/Ble/BleController.cpp
- Components/Ble/NotificationManager.cpp
- Components/DateTime/DateTimeController.cpp
- Components/Brightness/BrightnessController.cpp
- Components/Ble/NimbleController.cpp
- Components/Ble/DeviceInformationService.cpp
- Components/Ble/CurrentTimeClient.cpp
- Components/Ble/AlertNotificationClient.cpp
- Components/Ble/DfuService.cpp
- Components/Ble/CurrentTimeService.cpp
- Components/Ble/AlertNotificationService.cpp
- Components/Ble/MusicService.cpp
- Components/Ble/BatteryInformationService.cpp
- Components/Ble/ImmediateAlertService.cpp
- Components/FirmwareValidator/FirmwareValidator.cpp
- drivers/Cst816s.cpp
- FreeRTOS/port.c
- FreeRTOS/port_cmsis_systick.c
- FreeRTOS/port_cmsis.c
+ Logging/NrfLogger.cpp
+ DisplayApp/DisplayApp.cpp
+ DisplayApp/Screens/Screen.cpp
+ DisplayApp/Screens/Clock.cpp
+ DisplayApp/Screens/Tile.cpp
+ DisplayApp/Screens/Meter.cpp
+ DisplayApp/Screens/Gauge.cpp
+ DisplayApp/Screens/InfiniPaint.cpp
+ DisplayApp/Screens/DropDownDemo.cpp
+ DisplayApp/Screens/Modal.cpp
+ DisplayApp/Screens/BatteryIcon.cpp
+ DisplayApp/Screens/BleIcon.cpp
+ DisplayApp/Screens/Brightness.cpp
+ DisplayApp/Screens/SystemInfo.cpp
+ DisplayApp/Screens/Label.cpp
+ DisplayApp/Screens/FirmwareUpdate.cpp
+ DisplayApp/Screens/Music.cpp
+ DisplayApp/Screens/FirmwareValidation.cpp
+ DisplayApp/Screens/ApplicationList.cpp
+ main.cpp
+ drivers/St7789.cpp
+ drivers/SpiNorFlash.cpp
+ drivers/SpiMaster.cpp
+ drivers/Spi.cpp
+ drivers/Watchdog.cpp
+ drivers/DebugPins.cpp
+ drivers/InternalFlash.cpp
+ Components/Battery/BatteryController.cpp
+ Components/Ble/BleController.cpp
+ Components/Ble/NotificationManager.cpp
+ Components/DateTime/DateTimeController.cpp
+ Components/Brightness/BrightnessController.cpp
+ Components/Ble/NimbleController.cpp
+ Components/Ble/DeviceInformationService.cpp
+ Components/Ble/CurrentTimeClient.cpp
+ Components/Ble/AlertNotificationClient.cpp
+ Components/Ble/DfuService.cpp
+ Components/Ble/CurrentTimeService.cpp
+ Components/Ble/AlertNotificationService.cpp
+ Components/Ble/MusicService.cpp
+ Components/Ble/BatteryInformationService.cpp
+ Components/Ble/ImmediateAlertService.cpp
+ Components/FirmwareValidator/FirmwareValidator.cpp
+ drivers/Cst816s.cpp
+ FreeRTOS/port.c
+ FreeRTOS/port_cmsis_systick.c
+ FreeRTOS/port_cmsis.c
- DisplayApp/LittleVgl.cpp
- DisplayApp/Fonts/jetbrains_mono_extrabold_compressed.c
- DisplayApp/Fonts/jetbrains_mono_bold_20.c
+ DisplayApp/LittleVgl.cpp
+ DisplayApp/Fonts/jetbrains_mono_extrabold_compressed.c
+ DisplayApp/Fonts/jetbrains_mono_bold_20.c
- SystemTask/SystemTask.cpp
- drivers/TwiMaster.cpp
-)
+ SystemTask/SystemTask.cpp
+ drivers/TwiMaster.cpp
+ )
list(APPEND GRAPHICS_SOURCE_FILES
- # FreeRTOS
- FreeRTOS/port.c
- FreeRTOS/port_cmsis_systick.c
- FreeRTOS/port_cmsis.c
+ # FreeRTOS
+ FreeRTOS/port.c
+ FreeRTOS/port_cmsis_systick.c
+ FreeRTOS/port_cmsis.c
- drivers/SpiNorFlash.cpp
- drivers/SpiMaster.cpp
- drivers/Spi.cpp
- Logging/NrfLogger.cpp
+ drivers/SpiNorFlash.cpp
+ drivers/SpiMaster.cpp
+ drivers/Spi.cpp
+ Logging/NrfLogger.cpp
- Components/Gfx/Gfx.cpp
- drivers/St7789.cpp
- Components/Brightness/BrightnessController.cpp
+ Components/Gfx/Gfx.cpp
+ drivers/St7789.cpp
+ Components/Brightness/BrightnessController.cpp
- graphics.cpp
-)
+ graphics.cpp
+ )
set(INCLUDE_FILES
- Logging/Logger.h
- Logging/NrfLogger.h
- DisplayApp/DisplayApp.h
- DisplayApp/TouchEvents.h
- DisplayApp/Screens/Screen.h
- DisplayApp/Screens/Clock.h
- DisplayApp/Screens/Tile.h
- DisplayApp/Screens/Meter.h
- DisplayApp/Screens/Gauge.h
- DisplayApp/Screens/InfiniPaint.h
- DisplayApp/Screens/DropDownDemo.h
- DisplayApp/Screens/Modal.h
- DisplayApp/Screens/BatteryIcon.h
- DisplayApp/Screens/BleIcon.cpp
- DisplayApp/Screens/Brightness.h
- DisplayApp/Screens/SystemInfo.h
- DisplayApp/Screens/ScreenList.h
- DisplayApp/Screens/Label.h
- DisplayApp/Screens/FirmwareUpdate.h
- DisplayApp/Screens/FirmwareValidation.h
- DisplayApp/Screens/ApplicationList.h
- DisplayApp/Apps.h
- drivers/St7789.h
- drivers/SpiNorFlash.h
- drivers/SpiMaster.h
- drivers/Spi.h
- drivers/Watchdog.h
- drivers/DebugPins.h
- drivers/InternalFlash.h
- Components/Battery/BatteryController.h
- Components/Ble/BleController.h
- Components/Ble/NotificationManager.h
- Components/DateTime/DateTimeController.h
- Components/Brightness/BrightnessController.h
- Components/Ble/NimbleController.h
- Components/Ble/DeviceInformationService.h
- Components/Ble/CurrentTimeClient.h
- Components/Ble/AlertNotificationClient.h
- Components/Ble/DfuService.h
- Components/FirmwareValidator/FirmwareValidator.h
- Components/Ble/BatteryInformationService.h
- Components/Ble/ImmediateAlertService.h
- drivers/Cst816s.h
- FreeRTOS/portmacro.h
- FreeRTOS/portmacro_cmsis.h
- libs/date/includes/date/tz.h
- libs/date/includes/date/chrono_io.h
- libs/date/includes/date/date.h
- libs/date/includes/date/islamic.h
- libs/date/includes/date/iso_week.h
- libs/date/includes/date/julian.h
- libs/date/includes/date/ptz.h
- libs/date/includes/date/tz_private.h
- DisplayApp/LittleVgl.h
- SystemTask/SystemTask.h
- SystemTask/SystemMonitor.h
- DisplayApp/Screens/Symbols.h
- drivers/TwiMaster.h
-)
+ Logging/Logger.h
+ Logging/NrfLogger.h
+ DisplayApp/DisplayApp.h
+ DisplayApp/TouchEvents.h
+ DisplayApp/Screens/Screen.h
+ DisplayApp/Screens/Clock.h
+ DisplayApp/Screens/Tile.h
+ DisplayApp/Screens/Meter.h
+ DisplayApp/Screens/Gauge.h
+ DisplayApp/Screens/InfiniPaint.h
+ DisplayApp/Screens/DropDownDemo.h
+ DisplayApp/Screens/Modal.h
+ DisplayApp/Screens/BatteryIcon.h
+ DisplayApp/Screens/BleIcon.cpp
+ DisplayApp/Screens/Brightness.h
+ DisplayApp/Screens/SystemInfo.h
+ DisplayApp/Screens/ScreenList.h
+ DisplayApp/Screens/Label.h
+ DisplayApp/Screens/FirmwareUpdate.h
+ DisplayApp/Screens/FirmwareValidation.h
+ DisplayApp/Screens/ApplicationList.h
+ DisplayApp/Apps.h
+ drivers/St7789.h
+ drivers/SpiNorFlash.h
+ drivers/SpiMaster.h
+ drivers/Spi.h
+ drivers/Watchdog.h
+ drivers/DebugPins.h
+ drivers/InternalFlash.h
+ Components/Battery/BatteryController.h
+ Components/Ble/BleController.h
+ Components/Ble/NotificationManager.h
+ Components/DateTime/DateTimeController.h
+ Components/Brightness/BrightnessController.h
+ Components/Ble/NimbleController.h
+ Components/Ble/DeviceInformationService.h
+ Components/Ble/CurrentTimeClient.h
+ Components/Ble/AlertNotificationClient.h
+ Components/Ble/DfuService.h
+ Components/FirmwareValidator/FirmwareValidator.h
+ Components/Ble/BatteryInformationService.h
+ Components/Ble/ImmediateAlertService.h
+ drivers/Cst816s.h
+ FreeRTOS/portmacro.h
+ FreeRTOS/portmacro_cmsis.h
+ libs/date/includes/date/tz.h
+ libs/date/includes/date/chrono_io.h
+ libs/date/includes/date/date.h
+ libs/date/includes/date/islamic.h
+ libs/date/includes/date/iso_week.h
+ libs/date/includes/date/julian.h
+ libs/date/includes/date/ptz.h
+ libs/date/includes/date/tz_private.h
+ DisplayApp/LittleVgl.h
+ SystemTask/SystemTask.h
+ SystemTask/SystemMonitor.h
+ DisplayApp/Screens/Symbols.h
+ drivers/TwiMaster.h
+ )
include_directories(
- .
- ../
- libs/
- FreeRTOS/
- libs/date/includes
- libs/mynewt-nimble/porting/npl/freertos/include
- libs/mynewt-nimble/nimble/include
- libs/mynewt-nimble/porting/nimble/include
- libs/mynewt-nimble/nimble/host/include
- libs/mynewt-nimble/nimble/controller/include
- libs/mynewt-nimble/nimble/transport/ram/include
- libs/mynewt-nimble/nimble/drivers/nrf52/include
- libs/mynewt-nimble/ext/tinycrypt/include
- libs/mynewt-nimble/nimble/host/services/gap/include
- libs/mynewt-nimble/nimble/host/services/gatt/include
- libs/mynewt-nimble/nimble/host/util/include
- libs/mynewt-nimble/nimble/host/store/ram/include
+ .
+ ../
+ libs/
+ FreeRTOS/
+ libs/date/includes
+ libs/mynewt-nimble/porting/npl/freertos/include
+ libs/mynewt-nimble/nimble/include
+ libs/mynewt-nimble/porting/nimble/include
+ libs/mynewt-nimble/nimble/host/include
+ libs/mynewt-nimble/nimble/controller/include
+ libs/mynewt-nimble/nimble/transport/ram/include
+ libs/mynewt-nimble/nimble/drivers/nrf52/include
+ libs/mynewt-nimble/ext/tinycrypt/include
+ libs/mynewt-nimble/nimble/host/services/gap/include
+ libs/mynewt-nimble/nimble/host/services/gatt/include
+ libs/mynewt-nimble/nimble/host/util/include
+ libs/mynewt-nimble/nimble/host/store/ram/include
- "${NRF5_SDK_PATH}/components/drivers_nrf/nrf_soc_nosd"
+ "${NRF5_SDK_PATH}/components/drivers_nrf/nrf_soc_nosd"
"${NRF5_SDK_PATH}/components"
"${NRF5_SDK_PATH}/components/boards"
"${NRF5_SDK_PATH}/components/softdevice/common"
@@ -548,7 +548,7 @@
)
link_directories(
- ../
+ ../
)
@@ -563,52 +563,52 @@ add_definitions(-DDEBUG_NRF_USER)
add_definitions(-D__STACK_SIZE=8192)
add_definitions(-D__HEAP_SIZE=8192)
-if(NOT CMAKE_BUILD_TYPE)
- set(CMAKE_BUILD_TYPE "Release")
-endif()
+if (NOT CMAKE_BUILD_TYPE)
+ set(CMAKE_BUILD_TYPE "Release")
+endif ()
# NRF SDK
add_library(nrf-sdk STATIC ${SDK_SOURCE_FILES})
target_include_directories(nrf-sdk SYSTEM PUBLIC . ../)
target_include_directories(nrf-sdk SYSTEM PUBLIC ${INCLUDES_FROM_LIBS})
target_compile_options(nrf-sdk PRIVATE
- $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
- $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
- $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0>
- $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
- $<$<COMPILE_LANGUAGE:ASM>: -MP -MD -std=c99 -x assembler-with-cpp>
- )
+ $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
+ $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
+ $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0>
+ $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
+ $<$<COMPILE_LANGUAGE:ASM>: -MP -MD -std=c99 -x assembler-with-cpp>
+ )
# NimBLE
add_library(nimble STATIC ${NIMBLE_SRC} ${TINYCRYPT_SRC})
target_include_directories(nimble SYSTEM PUBLIC . ../)
target_include_directories(nimble SYSTEM PUBLIC ${INCLUDES_FROM_LIBS})
target_compile_options(nimble PRIVATE
- $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3 -Wno-unused-but-set-variable -Wno-maybe-uninitialized>
- $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3 -Wno-unused-but-set-variable -Wno-maybe-uninitialized>
- $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3 -Wno-unused-but-set-variable -Wno-maybe-uninitialized>
- $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3 -Wno-unused-but-set-variable -Wno-maybe-uninitialized>
- $<$<COMPILE_LANGUAGE:ASM>: -MP -MD -std=c99 -x assembler-with-cpp>
- )
+ $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3 -Wno-unused-but-set-variable -Wno-maybe-uninitialized>
+ $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3 -Wno-unused-but-set-variable -Wno-maybe-uninitialized>
+ $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3 -Wno-unused-but-set-variable -Wno-maybe-uninitialized>
+ $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3 -Wno-unused-but-set-variable -Wno-maybe-uninitialized>
+ $<$<COMPILE_LANGUAGE:ASM>: -MP -MD -std=c99 -x assembler-with-cpp>
+ )
# lvgl
add_library(lvgl STATIC ${LVGL_SRC})
target_include_directories(lvgl SYSTEM PUBLIC . ../)
target_include_directories(lvgl SYSTEM PUBLIC ${INCLUDES_FROM_LIBS})
target_compile_options(lvgl PRIVATE
- $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
- $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
- $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
- $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
- $<$<COMPILE_LANGUAGE:ASM>: -MP -MD -std=c99 -x assembler-with-cpp>
- )
+ $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
+ $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
+ $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
+ $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
+ $<$<COMPILE_LANGUAGE:ASM>: -MP -MD -std=c99 -x assembler-with-cpp>
+ )
# Build autonomous binary (without support for bootloader)
set(EXECUTABLE_NAME "pinetime-app")
set(EXECUTABLE_FILE_NAME ${EXECUTABLE_NAME}-${pinetime_VERSION_MAJOR}.${pinetime_VERSION_MINOR}.${pinetime_VERSION_PATCH})
set(NRF5_LINKER_SCRIPT "${CMAKE_SOURCE_DIR}/gcc_nrf52.ld")
add_executable(${EXECUTABLE_NAME} ${SOURCE_FILES})
-set_target_properties(${EXECUTABLE_NAME} PROPERTIES OUTPUT_NAME ${EXECUTABLE_FILE_NAME})
+set_target_properties(${EXECUTABLE_NAME} PROPERTIES OUTPUT_NAME ${EXECUTABLE_FILE_NAME})
target_link_libraries(${EXECUTABLE_NAME} nimble nrf-sdk lvgl)
target_compile_options(${EXECUTABLE_NAME} PUBLIC
$<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
@@ -616,7 +616,7 @@ $<$,$>: ${COMMON_FLAGS} -O3>
$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
$<$<COMPILE_LANGUAGE:ASM>: -MP -MD -std=c99 -x assembler-with-cpp>
-)
+ )
set_target_properties(${EXECUTABLE_NAME} PROPERTIES
SUFFIX ".out"
@@ -641,7 +641,7 @@ set(DFU_FILE_NAME dfu-${pinetime_VERSION_MAJOR}.${pinetime_VERSION_MINOR}.${pinetime_VERSION_PATCH}.zip)
set(NRF5_LINKER_SCRIPT_MCUBOOT "${CMAKE_SOURCE_DIR}/gcc_nrf52-mcuboot.ld")
add_executable(${EXECUTABLE_MCUBOOT_NAME} ${SOURCE_FILES})
target_link_libraries(${EXECUTABLE_MCUBOOT_NAME} nimble nrf-sdk lvgl)
-set_target_properties(${EXECUTABLE_MCUBOOT_NAME} PROPERTIES OUTPUT_NAME ${EXECUTABLE_MCUBOOT_FILE_NAME})
+set_target_properties(${EXECUTABLE_MCUBOOT_NAME} PROPERTIES OUTPUT_NAME ${EXECUTABLE_MCUBOOT_FILE_NAME})
target_compile_options(${EXECUTABLE_MCUBOOT_NAME} PUBLIC
$<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
$<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
@@ -663,39 +663,39 @@ COMMAND ${CMAKE_SIZE_UTIL} ${EXECUTABLE_MCUBOOT_FILE_NAME}.out
COMMAND ${CMAKE_OBJCOPY} -O binary ${EXECUTABLE_MCUBOOT_FILE_NAME}.out "${EXECUTABLE_MCUBOOT_FILE_NAME}.bin"
COMMAND ${CMAKE_OBJCOPY} -O ihex ${EXECUTABLE_MCUBOOT_FILE_NAME}.out "${EXECUTABLE_MCUBOOT_FILE_NAME}.hex"
COMMENT "post build steps for ${EXECUTABLE_MCUBOOT_FILE_NAME}"
-)
+ )
# Build binary that writes the graphic assets for the bootloader
set(EXECUTABLE_GRAPHICS_NAME "pinetime-graphics")
set(EXECUTABLE_GRAPHICS_FILE_NAME ${EXECUTABLE_GRAPHICS_NAME}-${pinetime_VERSION_MAJOR}.${pinetime_VERSION_MINOR}.${pinetime_VERSION_PATCH})
add_executable(${EXECUTABLE_GRAPHICS_NAME} ${GRAPHICS_SOURCE_FILES})
target_link_libraries(${EXECUTABLE_GRAPHICS_NAME} nrf-sdk)
-set_target_properties(${EXECUTABLE_GRAPHICS_NAME} PROPERTIES OUTPUT_NAME ${EXECUTABLE_GRAPHICS_FILE_NAME})
+set_target_properties(${EXECUTABLE_GRAPHICS_NAME} PROPERTIES OUTPUT_NAME ${EXECUTABLE_GRAPHICS_FILE_NAME})
target_compile_options(${EXECUTABLE_GRAPHICS_NAME} PUBLIC
- $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
- $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
- $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
- $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
- $<$<COMPILE_LANGUAGE:ASM>: -MP -MD -std=c99 -x assembler-with-cpp>
- )
+ $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
+ $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
+ $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
+ $<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
+ $<$<COMPILE_LANGUAGE:ASM>: -MP -MD -std=c99 -x assembler-with-cpp>
+ )
set_target_properties(${EXECUTABLE_GRAPHICS_NAME} PROPERTIES
- SUFFIX ".out"
- LINK_FLAGS "-mthumb -mabi=aapcs -std=gnu++98 -std=c99 -L ${NRF5_SDK_PATH}/modules/nrfx/mdk -T${NRF5_LINKER_SCRIPT} -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wl,--gc-sections --specs=nano.specs -lc -lnosys -lm -Wl,-Map=${EXECUTABLE_GRAPHICS_FILE_NAME}.map"
- CXX_STANDARD 11
- C_STANDARD 99
- )
+ SUFFIX ".out"
+ LINK_FLAGS "-mthumb -mabi=aapcs -std=gnu++98 -std=c99 -L ${NRF5_SDK_PATH}/modules/nrfx/mdk -T${NRF5_LINKER_SCRIPT} -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -Wl,--gc-sections --specs=nano.specs -lc -lnosys -lm -Wl,-Map=${EXECUTABLE_GRAPHICS_FILE_NAME}.map"
+ CXX_STANDARD 11
+ C_STANDARD 99
+ )
add_custom_command(TARGET ${EXECUTABLE_GRAPHICS_NAME}
- POST_BUILD
- COMMAND ${CMAKE_SIZE_UTIL} ${EXECUTABLE_GRAPHICS_FILE_NAME}.out
- COMMAND ${CMAKE_OBJCOPY} -O binary ${EXECUTABLE_GRAPHICS_FILE_NAME}.out "${EXECUTABLE_GRAPHICS_FILE_NAME}.bin"
- COMMAND ${CMAKE_OBJCOPY} -O ihex ${EXECUTABLE_GRAPHICS_FILE_NAME}.out "${EXECUTABLE_GRAPHICS_FILE_NAME}.hex"
- COMMENT "post build steps for ${EXECUTABLE_GRAPHICS_FILE_NAME}"
- )
+ POST_BUILD
+ COMMAND ${CMAKE_SIZE_UTIL} ${EXECUTABLE_GRAPHICS_FILE_NAME}.out
+ COMMAND ${CMAKE_OBJCOPY} -O binary ${EXECUTABLE_GRAPHICS_FILE_NAME}.out "${EXECUTABLE_GRAPHICS_FILE_NAME}.bin"
+ COMMAND ${CMAKE_OBJCOPY} -O ihex ${EXECUTABLE_GRAPHICS_FILE_NAME}.out "${EXECUTABLE_GRAPHICS_FILE_NAME}.hex"
+ COMMENT "post build steps for ${EXECUTABLE_GRAPHICS_FILE_NAME}"
+ )
# FLASH
-if(USE_JLINK)
+if (USE_JLINK)
add_custom_target(FLASH_ERASE
COMMAND ${NRFJPROG} --eraseall -f ${NRF_TARGET}
COMMENT "erasing flashing"
@@ -708,26 +708,54 @@ COMMAND ${NRFJPROG} --reset -f ${NRF_TARGET}
COMMENT "flashing ${EXECUTABLE_NAME}.hex"
)
-elseif(USE_GDB_CLIENT)
+elseif (USE_GDB_CLIENT)
add_custom_target(FLASH_ERASE
COMMAND ${GDB_CLIENT_BIN_PATH} -nx --batch -ex 'target extended-remote ${GDB_CLIENT_TARGET_REMOTE}' -ex 'monitor swdp_scan' -ex 'attach 1' -ex 'mon erase_mass'
COMMENT "erasing flashing"
)
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"
- )
-elseif(USE_OPENOCD)
- add_custom_target(FLASH_ERASE
- COMMAND ${OPENOCD_BIN_PATH} -f interface/stlink.cfg -c 'transport select hla_swd' -f target/nrf52.cfg -c init -c halt -c 'nrf5 mass_erase' -c reset -c shutdown
- COMMENT "erasing flashing"
- )
- 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
+ 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"
)
-
-endif()
-
+elseif (USE_OPENOCD)
+ if (USE_CMSIS_DAP)
+ add_custom_target(FLASH_ERASE
+ COMMAND ${OPENOCD_BIN_PATH} -c 'source [find interface/cmsis-dap.cfg]' -c 'transport select swd'
+ -c 'source [find target/nrf52.cfg]'
+ -c 'init'
+ -c 'halt'
+ -c 'nrf5 mass_erase'
+ -c 'halt'
+ -c 'reset'
+ -c 'exit'
+ COMMENT "erasing flashing"
+ )
+ 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'
+ -c 'source [find interface/cmsis-dap.cfg]'
+ -c 'transport select swd'
+ -c 'source [find target/nrf52.cfg]'
+ -c 'halt'
+ -c "program \"${EXECUTABLE_NAME}.hex\""
+ -c 'reset'
+ -c 'shutdown'
+ COMMENT "flashing ${EXECUTABLE_NAME}.hex"
+ )
+ else ()
+ message()
+ add_custom_target(FLASH_ERASE
+ COMMAND ${OPENOCD_BIN_PATH} -f interface/stlink.cfg -c 'transport select hla_swd' -f target/nrf52.cfg -c init -c halt -c 'nrf5 mass_erase' -c reset -c shutdown
+ COMMENT "erasing flashing"
+ )
+ 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"
+ )
+ endif ()
+endif ()