will/InfiniSim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
02f2cc5a05
InfiniSim/CMakeLists.txt

377 lines
16 KiB
CMake
Raw Normal View History

Initial InfiniSim project
2022-02-16 20:42:29 +00:00
message(STATUS "Using CMake version ${CMAKE_VERSION}")
cmake_minimum_required(VERSION 3.10...${CMAKE_VERSION})
cmake: improve InfiniTime_DIR default With the old default of just "InfiniTime" you have to have the working directory in the `InfiniSim` directory. The new default makes the default independent of the current working directory.
2022-02-20 21:24:28 +00:00
SET(InfiniTime_DIR "${CMAKE_SOURCE_DIR}/InfiniTime" CACHE PATH "Path to InfiniTime source path to use for simulator")
Initial InfiniSim project
2022-02-16 20:42:29 +00:00
if(NOT EXISTS ${InfiniTime_DIR})
message(FATAL_ERROR "Can't access folder '${InfiniTime_DIR}'. Try `git submodule update --init --recursive` to initialize the git submodule of InfiniTime")
endif()
if(NOT EXISTS ${InfiniTime_DIR}/src/libs/lvgl)
message(FATAL_ERROR "Can't access folder '${InfiniTime_DIR}/src/libs/lvgl'. Try `git submodule update --init --recursive` to initialize the git submodule of lvgl inside InfiniTime")
endif()
# try to extract the PineTime project version
file(READ "${InfiniTime_DIR}/CMakeLists.txt" main_cmake)
string(REGEX MATCH "project\\(pinetime VERSION ([0-9]*\.[0-9]*\.[0-9]*)" _ ${main_cmake})
set(PROJECT_VERSION ${CMAKE_MATCH_1})
message(STATUS "InfiniTime PROJECT_VERSION extracted: ${PROJECT_VERSION}")
project(InfiniSim VERSION ${PROJECT_VERSION} LANGUAGES C CXX)
# https://cmake.org/cmake/help/latest/prop_tgt/CXX_STANDARD.html
string(COMPARE EQUAL "${CMAKE_CXX_STANDARD}" "" no_cmake_cxx_standard_set)
if(no_cmake_cxx_standard_set)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
message(STATUS "Using default C++ standard ${CMAKE_CXX_STANDARD}")
else()
message(STATUS "Using user specified C++ standard ${CMAKE_CXX_STANDARD}")
endif()
set(CMAKE_C_STANDARD 11)#C11
cmake: use main lv_conf.h, use file globs for fonts and icons To make the simulator work without modification for more PRs use the original `lv_conf.h` file and modify the needed parts for the simulator. Furthermore use globbing expressions to add all available fonts and icons in case a PR adds new fonts or icons.
2022-03-09 21:14:26 +00:00
# copy lv_conf.h from InfiniTime project and do little modifications
file(READ "${InfiniTime_DIR}/src/libs/lv_conf.h" lv_conf_main)
# set '#define LV_TICK_CUSTOM 0'
string(REGEX REPLACE "#define[ ]+LV_TICK_CUSTOM[ ]+1" "#define LV_TICK_CUSTOM 0" lv_conf_main "${lv_conf_main}")
# allow more memory in debug mode for the simulator
#define LV_MEM_SIZE (14U * 1024U)
string(REGEX REPLACE "#define[ ]+LV_MEM_SIZE[ ]+\\([^\)]*\\)"
"#ifdef NDEBUG
#define LV_MEM_SIZE (14U * 1024U)
#else // debug mode -> allow more memory
#define LV_MEM_SIZE (28U * 1024U)
#endif"
lv_conf_main "${lv_conf_main}")
# write to temporary file and overwrite file to use only if lv_conf changed to keep useless recompiles
# at a minimum
file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/lv_conf_modified.h" "${lv_conf_main}")
configure_file(
"${CMAKE_CURRENT_BINARY_DIR}/lv_conf_modified.h"
"${CMAKE_CURRENT_BINARY_DIR}/lv_conf.h"
COPYONLY)
littlefs-do binary to work with spi raw file (#52) Add helper to modify spi raw file, to make experimenting with it easier. ```sh $ ./littlefs-do --help Usage: ./littlefs-do <command> [options] Commands: -h, --help show this help message for the selected command and exit -v, --verbose print status messages to the console stat show information of specified file or directory ls list available files in 'spiNorFlash.raw' file mkdir create directory rmdir remove directory rm remove directory or file cp copy files into or out of flash file settings list settings from 'settings.h' ``` In the process restructure the CMake file for less duplicate includes/defines for both executables (`infinisim` and `littlefs-do`). Upload the `littlefs-do` binary built by the CI additionally to the `infinisim` binary. Use the updated upload-artifact@v3 template to do that.
2022-08-29 10:05:21 +00:00
file(GLOB_RECURSE LVGL_INCLUDES "lv_drivers/*.h" "${InfiniTime_DIR}/src/libs/lvgl/src/*.h" "./*.h" )
file(GLOB_RECURSE LVGL_SOURCES "lv_drivers/*.c" "${InfiniTime_DIR}/src/libs/lvgl/src/*.c" )
add_library(sim-base STATIC
# LVGL sources
${LVGL_SOURCES} ${LVGL_INCLUDES}
# FreeRTOS
sim/FreeRTOS.h
sim/FreeRTOS.cpp
sim/task.h
sim/task.cpp
sim/timers.h
sim/timers.cpp
sim/queue.h
sim/queue.cpp
# src/FreeRTOS
sim/portmacro_cmsis.h
sim/portmacro_cmsis.cpp
# nrf
sim/libraries/log/nrf_log.h
sim/libraries/delay/nrf_delay.h
sim/libraries/delay/nrf_delay.cpp
sim/nrfx/nrfx_log.h
sim/nrfx/drivers/include/nrfx_twi.h
sim/nrfx/hal/nrf_gpio.h
sim/nrfx/hal/nrf_gpio.cpp
sim/nrfx/hal/nrfx_gpiote.h # includes hal/nrf_gpio.h
sim/nrfx/hal/nrf_rtc.h
sim/nrfx/hal/nrf_rtc.cpp
Use InfiniTime Watchdog.h by providing mdk/nrf.h and others
2023-05-03 18:58:31 +00:00
sim/nrfx/mdk/nrf.h
sim/nrfx/mdk/nrf52.h
sim/nrfx/mdk/nrf52.cpp
sim/nrfx/mdk/nrf52_bitfields.h
littlefs-do binary to work with spi raw file (#52) Add helper to modify spi raw file, to make experimenting with it easier. ```sh $ ./littlefs-do --help Usage: ./littlefs-do <command> [options] Commands: -h, --help show this help message for the selected command and exit -v, --verbose print status messages to the console stat show information of specified file or directory ls list available files in 'spiNorFlash.raw' file mkdir create directory rmdir remove directory rm remove directory or file cp copy files into or out of flash file settings list settings from 'settings.h' ``` In the process restructure the CMake file for less duplicate includes/defines for both executables (`infinisim` and `littlefs-do`). Upload the `littlefs-do` binary built by the CI additionally to the `infinisim` binary. Use the updated upload-artifact@v3 template to do that.
2022-08-29 10:05:21 +00:00
# nrf/components/libraries/timer
sim/libraries/gpiote/app_gpiote.h # includes hal/nrf_gpio.h
)
# include the generated lv_conf.h file before anything else
target_include_directories(sim-base PUBLIC "${CMAKE_CURRENT_BINARY_DIR}") # lv_conf.h
target_include_directories(sim-base PUBLIC "sim")
target_include_directories(sim-base PUBLIC "sim/libraries/log") # for nrf_log.h
target_include_directories(sim-base PUBLIC "sim/nrfx") # for nrfx_log.h and others
target_include_directories(sim-base PUBLIC "sim/nrfx/hal") # for nrfx_log.h
Use InfiniTime Watchdog.h by providing mdk/nrf.h and others
2023-05-03 18:58:31 +00:00
target_include_directories(sim-base PUBLIC "sim/nrfx/mdk") # for nrf52_bitfields.h
littlefs-do binary to work with spi raw file (#52) Add helper to modify spi raw file, to make experimenting with it easier. ```sh $ ./littlefs-do --help Usage: ./littlefs-do <command> [options] Commands: -h, --help show this help message for the selected command and exit -v, --verbose print status messages to the console stat show information of specified file or directory ls list available files in 'spiNorFlash.raw' file mkdir create directory rmdir remove directory rm remove directory or file cp copy files into or out of flash file settings list settings from 'settings.h' ``` In the process restructure the CMake file for less duplicate includes/defines for both executables (`infinisim` and `littlefs-do`). Upload the `littlefs-do` binary built by the CI additionally to the `infinisim` binary. Use the updated upload-artifact@v3 template to do that.
2022-08-29 10:05:21 +00:00
target_include_directories(sim-base PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") # lv_drv_conf.h
target_include_directories(sim-base PUBLIC "${InfiniTime_DIR}/src/libs")
target_include_directories(sim-base PUBLIC "lv_drivers")
target_include_directories(sim-base PUBLIC "${InfiniTime_DIR}/src") # InfiniTime drivers, components and all
Initial InfiniSim project
2022-02-16 20:42:29 +00:00
Cst816s: scale down SDL mouse coordinates according to MONITOR_ZOOM The lv_drivers provided monitor driver supports a `MONITOR_ZOOM`-factor which scales the window by the set factor. This is 'useful when simulating small screens'. The zoom can be set as cmake configuration setting `-DMONITOR_ZOOM=1`. Probably even more usefull for high-dpi screens where 240 pixels is really tiny.
2022-03-30 17:49:17 +00:00
set(MONITOR_ZOOM 1 CACHE STRING "Scale simulator window by this factor")
if(MONITOR_ZOOM MATCHES "^[0-9]\.?[0-9]*")
cmake: add a status message which MONITOR_ZOOM is used
2022-03-30 20:15:02 +00:00
message(STATUS "Using MONITOR_ZOOM=${MONITOR_ZOOM}")
littlefs-do binary to work with spi raw file (#52) Add helper to modify spi raw file, to make experimenting with it easier. ```sh $ ./littlefs-do --help Usage: ./littlefs-do <command> [options] Commands: -h, --help show this help message for the selected command and exit -v, --verbose print status messages to the console stat show information of specified file or directory ls list available files in 'spiNorFlash.raw' file mkdir create directory rmdir remove directory rm remove directory or file cp copy files into or out of flash file settings list settings from 'settings.h' ``` In the process restructure the CMake file for less duplicate includes/defines for both executables (`infinisim` and `littlefs-do`). Upload the `littlefs-do` binary built by the CI additionally to the `infinisim` binary. Use the updated upload-artifact@v3 template to do that.
2022-08-29 10:05:21 +00:00
target_compile_definitions(sim-base PUBLIC MONITOR_ZOOM=${MONITOR_ZOOM})
Cst816s: scale down SDL mouse coordinates according to MONITOR_ZOOM The lv_drivers provided monitor driver supports a `MONITOR_ZOOM`-factor which scales the window by the set factor. This is 'useful when simulating small screens'. The zoom can be set as cmake configuration setting `-DMONITOR_ZOOM=1`. Probably even more usefull for high-dpi screens where 240 pixels is really tiny.
2022-03-30 17:49:17 +00:00
else()
message(FATAL_ERROR "variable MONITOR_ZOOM=${MONITOR_ZOOM} must be a positive number")
endif()
littlefs-do binary to work with spi raw file (#52) Add helper to modify spi raw file, to make experimenting with it easier. ```sh $ ./littlefs-do --help Usage: ./littlefs-do <command> [options] Commands: -h, --help show this help message for the selected command and exit -v, --verbose print status messages to the console stat show information of specified file or directory ls list available files in 'spiNorFlash.raw' file mkdir create directory rmdir remove directory rm remove directory or file cp copy files into or out of flash file settings list settings from 'settings.h' ``` In the process restructure the CMake file for less duplicate includes/defines for both executables (`infinisim` and `littlefs-do`). Upload the `littlefs-do` binary built by the CI additionally to the `infinisim` binary. Use the updated upload-artifact@v3 template to do that.
2022-08-29 10:05:21 +00:00
add_executable(infinisim main.cpp)
Initial InfiniSim project
2022-02-16 20:42:29 +00:00
# add simulator files
target_sources(infinisim PUBLIC
sim/displayapp/LittleVgl.h
sim/displayapp/LittleVgl.cpp
sim/components/battery/BatteryController.h
sim/components/battery/BatteryController.cpp
sim/components/ble/AlertNotificationService.h
sim/components/ble/AlertNotificationService.cpp
sim/components/ble/MusicService.h
sim/components/ble/MusicService.cpp
sim/components/ble/NavigationService.h
sim/components/ble/NavigationService.cpp
sim/components/ble/NimbleController.h
sim/components/ble/NimbleController.cpp
sim/components/ble/weather/WeatherService.h
sim/components/ble/weather/WeatherService.cpp
sim/components/brightness/BrightnessController.h
sim/components/brightness/BrightnessController.cpp
sim/components/firmwarevalidator/FirmwareValidator.h
sim/components/firmwarevalidator/FirmwareValidator.cpp
sim/components/heartrate/HeartRateController.h
sim/components/heartrate/HeartRateController.cpp
sim/components/motion/MotionController.h
sim/components/motion/MotionController.cpp
sim/drivers/Bma421.h
sim/drivers/Bma421.cpp
sim/drivers/Cst816s.h
sim/drivers/Cst816s.cpp
sim/drivers/SpiMaster.h
sim/drivers/SpiMaster.cpp
sim/drivers/TwiMaster.h
sim/drivers/TwiMaster.cpp
sim/drivers/SpiNorFlash.h
sim/drivers/SpiNorFlash.cpp
sim/heartratetask/HeartRateTask.h
sim/heartratetask/HeartRateTask.cpp
littlefs-do binary to work with spi raw file (#52) Add helper to modify spi raw file, to make experimenting with it easier. ```sh $ ./littlefs-do --help Usage: ./littlefs-do <command> [options] Commands: -h, --help show this help message for the selected command and exit -v, --verbose print status messages to the console stat show information of specified file or directory ls list available files in 'spiNorFlash.raw' file mkdir create directory rmdir remove directory rm remove directory or file cp copy files into or out of flash file settings list settings from 'settings.h' ``` In the process restructure the CMake file for less duplicate includes/defines for both executables (`infinisim` and `littlefs-do`). Upload the `littlefs-do` binary built by the CI additionally to the `infinisim` binary. Use the updated upload-artifact@v3 template to do that.
2022-08-29 10:05:21 +00:00
)
target_link_libraries(infinisim PUBLIC sim-base)
Initial InfiniSim project
2022-02-16 20:42:29 +00:00
cmake: use main lv_conf.h, use file globs for fonts and icons To make the simulator work without modification for more PRs use the original `lv_conf.h` file and modify the needed parts for the simulator. Furthermore use globbing expressions to add all available fonts and icons in case a PR adds new fonts or icons.
2022-03-09 21:14:26 +00:00
# add Screens, fonts and icons with a globbing expression,
# to enable easier CI test-runs for PRs adding new Screens/Fonts/Icons
Initial InfiniSim project
2022-02-16 20:42:29 +00:00
file(GLOB InfiniTime_SCREENS
"${InfiniTime_DIR}/src/displayapp/screens/*.h"
"${InfiniTime_DIR}/src/displayapp/screens/*.cpp"
"${InfiniTime_DIR}/src/displayapp/screens/settings/*.h"
"${InfiniTime_DIR}/src/displayapp/screens/settings/*.cpp"
)
cmake: use main lv_conf.h, use file globs for fonts and icons To make the simulator work without modification for more PRs use the original `lv_conf.h` file and modify the needed parts for the simulator. Furthermore use globbing expressions to add all available fonts and icons in case a PR adds new fonts or icons.
2022-03-09 21:14:26 +00:00
file(GLOB InfiniTime_FONTS
"${InfiniTime_DIR}/src/displayapp/fonts/*.c"
)
file(GLOB InfiniTime_ICONS
"${InfiniTime_DIR}/src/displayapp/icons/*.c"
)
Build widgets in widgets folder (#31) https://github.com/InfiniTimeOrg/InfiniTime/pull/1136 adds a new folder `widgets` for source files.If it gets merged, this folder needs to be added to the build. Add the source files to InfiniSim if the new folder exists
2022-05-15 19:13:24 +00:00
file(GLOB InfiniTime_WIDGETS
"${InfiniTime_DIR}/src/displayapp/widgets/*.cpp"
"${InfiniTime_DIR}/src/displayapp/widgets/*.h"
)
Initial InfiniSim project
2022-02-16 20:42:29 +00:00
target_sources(infinisim PUBLIC ${InfiniTime_SCREENS})
cmake: use main lv_conf.h, use file globs for fonts and icons To make the simulator work without modification for more PRs use the original `lv_conf.h` file and modify the needed parts for the simulator. Furthermore use globbing expressions to add all available fonts and icons in case a PR adds new fonts or icons.
2022-03-09 21:14:26 +00:00
target_sources(infinisim PUBLIC ${InfiniTime_FONTS})
target_sources(infinisim PUBLIC ${InfiniTime_ICONS})
Build widgets in widgets folder (#31) https://github.com/InfiniTimeOrg/InfiniTime/pull/1136 adds a new folder `widgets` for source files.If it gets merged, this folder needs to be added to the build. Add the source files to InfiniSim if the new folder exists
2022-05-15 19:13:24 +00:00
target_sources(infinisim PUBLIC ${InfiniTime_WIDGETS})
Initial InfiniSim project
2022-02-16 20:42:29 +00:00
# add files directly from InfiniTime sources
target_sources(infinisim PUBLIC
${InfiniTime_DIR}/src/BootloaderVersion.h
${InfiniTime_DIR}/src/BootloaderVersion.cpp
${InfiniTime_DIR}/src/displayapp/Colors.h
${InfiniTime_DIR}/src/displayapp/Colors.cpp
${InfiniTime_DIR}/src/displayapp/DisplayApp.h
${InfiniTime_DIR}/src/displayapp/DisplayApp.cpp
${InfiniTime_DIR}/src/buttonhandler/ButtonHandler.h
${InfiniTime_DIR}/src/buttonhandler/ButtonHandler.cpp
${InfiniTime_DIR}/src/components/alarm/AlarmController.h
${InfiniTime_DIR}/src/components/alarm/AlarmController.cpp
${InfiniTime_DIR}/src/components/ble/BleController.h
${InfiniTime_DIR}/src/components/ble/BleController.cpp
${InfiniTime_DIR}/src/components/datetime/DateTimeController.h
${InfiniTime_DIR}/src/components/datetime/DateTimeController.cpp
${InfiniTime_DIR}/src/components/settings/Settings.h
${InfiniTime_DIR}/src/components/settings/Settings.cpp
${InfiniTime_DIR}/src/components/ble/NotificationManager.h
${InfiniTime_DIR}/src/components/ble/NotificationManager.cpp
Add support for SpiNorFlash and FS (#30) The external SPI flash is implemented as a 4MB on the local filesystem. This allows the FS (littleFS) and settings to work properly. Remove the simulated `FS.h` and `FS.cpp`, because we can now use the files from InfiniTime directly as the heavy lifting is done in the simulated `SpiNorFlash.h` and cpp files. `SpiNorFlash.h` provides read and write functions with `uint8_t` buffer, but `fs::fstream` expects `char` buffer. Use `reinterpret_cast` and check if by any chance the `char` type on a platform is implemented with more than one byte. Then the `reinterpret_cast<char *>(buffer)` would change the meaning of the `size` parameter, which could lead to garbage data. Co-authored-by: Reinhold Gschweicher <pyro4hell@gmail.com>
2022-05-15 20:15:19 +00:00
${InfiniTime_DIR}/src/components/fs/FS.h
${InfiniTime_DIR}/src/components/fs/FS.cpp
Remove MotorController, use nrf_gpio Motor pin, apptimer repeat (#34) Remove the custom MotorController class and use the upstream MotorController instead. To enable this move add custom code in nrf_gpio to handle the Motor pin instead of the custom motor_is_running member variable. Also implement the repeating app_timer type used in the upstream MotorController.
2022-06-05 20:03:53 +00:00
${InfiniTime_DIR}/src/components/motor/MotorController.h
${InfiniTime_DIR}/src/components/motor/MotorController.cpp
use drivers/Hrs3300.h from InfiniTime The Hrs3300.h driver can now be used directly from InfiniTime. Some other improvement made that possible. One less simulator file, one less file to keep updated. Win-Win (for me at least).
2023-05-03 19:06:17 +00:00
${InfiniTime_DIR}/src/drivers/Hrs3300.h
${InfiniTime_DIR}/src/drivers/Hrs3300.cpp
Initial InfiniSim project
2022-02-16 20:42:29 +00:00
${InfiniTime_DIR}/src/drivers/PinMap.h
${InfiniTime_DIR}/src/drivers/Spi.h
${InfiniTime_DIR}/src/drivers/Spi.cpp
${InfiniTime_DIR}/src/drivers/St7789.h
${InfiniTime_DIR}/src/drivers/St7789.cpp
Use InfiniTime Watchdog.h by providing mdk/nrf.h and others
2023-05-03 18:58:31 +00:00
${InfiniTime_DIR}/src/drivers/Watchdog.h
${InfiniTime_DIR}/src/drivers/Watchdog.cpp
Initial InfiniSim project
2022-02-16 20:42:29 +00:00
${InfiniTime_DIR}/src/touchhandler/TouchHandler.h
${InfiniTime_DIR}/src/touchhandler/TouchHandler.cpp
${InfiniTime_DIR}/src/systemtask/SystemTask.h
${InfiniTime_DIR}/src/systemtask/SystemTask.cpp
cmake: add SystemMonitor.cpp https://github.com/InfiniTimeOrg/InfiniTime/pull/967 splits SystemMonitor.h into a h and cpp file. Add the cpp file to the infinisim target.
2022-02-20 14:51:54 +00:00
${InfiniTime_DIR}/src/systemtask/SystemMonitor.h
${InfiniTime_DIR}/src/systemtask/SystemMonitor.cpp
raisewake: Fix for new raise to wake impl
2023-08-20 16:29:41 +00:00
${InfiniTime_DIR}/src/utility/Math.h
${InfiniTime_DIR}/src/utility/Math.cpp
Initial InfiniSim project
2022-02-16 20:42:29 +00:00
)
sim: LittleVgl: update s.t. LVGL-FS driver is initialized by LittleVgl InfiniTime moved the LVGL-FS driver initialization to the LittleVgl constructor and passed the FS member to do that. Update the simulator copy of LittleVgl to do just that. Fixes: https://github.com/InfiniTimeOrg/InfiniSim/issues/89
2023-02-26 22:42:03 +00:00
target_sources(infinisim PUBLIC
${InfiniTime_DIR}/src/displayapp/InfiniTimeTheme.cpp
${InfiniTime_DIR}/src/displayapp/InfiniTimeTheme.h
Support "Centralize most color definitions" (#50) Support changes in InfiniTimeOrg/InfiniTime#1258 The file `lv_pinetime_theme.c` is renamed to `InfiniTimeTheme.cpp`. Need to pick up that change in the simulator to compile with the new cpp file if it exists. Furthermore use the new `InfiniTimeTheme.h` header in simulator files. Fixes: https://github.com/InfiniTimeOrg/InfiniSim/issues/49
2022-08-15 11:46:42 +00:00
)
Initial InfiniSim project
2022-02-16 20:42:29 +00:00
Support TimerController rename to Timer Improvement done in https://github.com/InfiniTimeOrg/InfiniTime/pull/1650
2023-05-01 18:56:56 +00:00
if(EXISTS ${InfiniTime_DIR}/src/components/timer/Timer.h)
Support rename of TimerController to FreeRTOS::Timer
2023-02-27 21:03:01 +00:00
target_sources(infinisim PUBLIC
Support TimerController rename to Timer Improvement done in https://github.com/InfiniTimeOrg/InfiniTime/pull/1650
2023-05-01 18:56:56 +00:00
${InfiniTime_DIR}/src/components/timer/Timer.h
${InfiniTime_DIR}/src/components/timer/Timer.cpp
Support rename of TimerController to FreeRTOS::Timer
2023-02-27 21:03:01 +00:00
)
else()
target_compile_definitions(infinisim PUBLIC INFINITIME_TIMERCONTROLLER)
target_sources(infinisim PUBLIC
${InfiniTime_DIR}/src/components/timer/TimerController.h
${InfiniTime_DIR}/src/components/timer/TimerController.cpp
)
endif()
littlefs-do binary to work with spi raw file (#52) Add helper to modify spi raw file, to make experimenting with it easier. ```sh $ ./littlefs-do --help Usage: ./littlefs-do <command> [options] Commands: -h, --help show this help message for the selected command and exit -v, --verbose print status messages to the console stat show information of specified file or directory ls list available files in 'spiNorFlash.raw' file mkdir create directory rmdir remove directory rm remove directory or file cp copy files into or out of flash file settings list settings from 'settings.h' ``` In the process restructure the CMake file for less duplicate includes/defines for both executables (`infinisim` and `littlefs-do`). Upload the `littlefs-do` binary built by the CI additionally to the `infinisim` binary. Use the updated upload-artifact@v3 template to do that.
2022-08-29 10:05:21 +00:00
# littlefs
add_library(littlefs STATIC
${InfiniTime_DIR}/src/libs/littlefs/lfs_util.h
${InfiniTime_DIR}/src/libs/littlefs/lfs.h
${InfiniTime_DIR}/src/libs/littlefs/lfs_util.c
${InfiniTime_DIR}/src/libs/littlefs/lfs.c
)
target_include_directories(littlefs PUBLIC "${InfiniTime_DIR}/src/libs/littlefs")
target_link_libraries(infinisim PRIVATE littlefs)
cmake: create QCBOR target and link to InfiniSim
2022-04-04 19:33:11 +00:00
# QCBOR
add_library(QCBOR STATIC
${InfiniTime_DIR}/src/libs/QCBOR/src/ieee754.c
${InfiniTime_DIR}/src/libs/QCBOR/src/qcbor_decode.c
${InfiniTime_DIR}/src/libs/QCBOR/src/qcbor_encode.c
${InfiniTime_DIR}/src/libs/QCBOR/src/qcbor_err_to_str.c
${InfiniTime_DIR}/src/libs/QCBOR/src/UsefulBuf.c)
target_include_directories(QCBOR SYSTEM PUBLIC ${InfiniTime_DIR}/src/libs/QCBOR/inc)
# This is required with the current configuration
target_compile_definitions(QCBOR PUBLIC QCBOR_DISABLE_FLOAT_HW_USE)
# These are for space-saving
target_compile_definitions(QCBOR PUBLIC QCBOR_DISABLE_PREFERRED_FLOAT)
target_compile_definitions(QCBOR PUBLIC QCBOR_DISABLE_EXP_AND_MANTISSA)
target_compile_definitions(QCBOR PUBLIC QCBOR_DISABLE_INDEFINITE_LENGTH_STRINGS)
#target_compile_definitions(QCBOR PUBLIC QCBOR_DISABLE_INDEFINITE_LENGTH_ARRAYS)
target_compile_definitions(QCBOR PUBLIC QCBOR_DISABLE_UNCOMMON_TAGS)
target_compile_definitions(QCBOR PUBLIC USEFULBUF_CONFIG_LITTLE_ENDIAN)
set_target_properties(QCBOR PROPERTIES LINKER_LANGUAGE C)
#target_compile_options(QCBOR PRIVATE
# $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:DEBUG>>: ${COMMON_FLAGS} -O0 -g3>
# $<$<AND:$<COMPILE_LANGUAGE:C>,$<CONFIG:RELEASE>>: ${COMMON_FLAGS} -O3>
# $<$<COMPILE_LANGUAGE:ASM>: -MP -MD -x assembler-with-cpp>
# )
target_link_libraries(infinisim PRIVATE QCBOR)
Node v14 required for lv_font_conv (#122) * Update miminum node version to v14+ as lv_font_conv minimum The current readme of the `lv_font_conv` the minimum node.js version is v14+. Update our readme to mention that minimum version as well. https://github.com/lvgl/lv_font_conv#install-the-script --- In Check node version and issue a warning if less than v14.0.0. Fixes: https://github.com/InfiniTimeOrg/InfiniSim/issues/109
2023-09-17 18:54:59 +00:00
# check version number of installed node package for minimum required
find_program(NODE_EXE "node" NO_CACHE QUIET)
if(NODE_EXE)
exec_program("${NODE_EXE}" ARGS "--version" OUTPUT_VARIABLE NODE_VERSION)
string(REPLACE "v" "" NODE_VERSION "${NODE_VERSION}")
if(NODE_VERSION VERSION_LESS 14.0.0)
message(WARNING "Node version v${NODE_VERSION} is less than required 14+, you will probably encounter build errors")
else()
message(STATUS "Founde node version v${NODE_VERSION}")
endif()
else()
message(STATUS "Didn't find executable 'node' in path to check its version number")
endif()
Use infinitime_fonts target if fonts/CMakeLists.txt exists Since https://github.com/InfiniTimeOrg/InfiniTime/pull/1097 the fonts are generated. Support this new way of using fonts. When InfiniTime isn't a subdirectory of InfiniSim we need to provide the binary dir when using `add_subdirectory()`. Use `fonts`. Update README with instructions to install `lv_font_conv`.
2022-05-10 21:56:45 +00:00
if(EXISTS ${InfiniTime_DIR}/src/displayapp/fonts/CMakeLists.txt)
# available since https://github.com/InfiniTimeOrg/InfiniTime/pull/1097
message(STATUS "add subdirectory ${InfiniTime_DIR}/src/displayapp/fonts for 'infinitime_fonts' target")
add_subdirectory(${InfiniTime_DIR}/src/displayapp/fonts fonts)
target_link_libraries(infinisim PRIVATE infinitime_fonts)
endif()
Add option BUILD_RESOURCES=ON to build resources.zip file The `BUILD_RESOURCES` option is also available in `InfiniTime`, but we don't want to require building the firmware to test `resource.zip` file generation.
2022-10-11 19:54:01 +00:00
option(BUILD_RESOURCES "Generate a resource.zip file to install to spi.raw file" ON)
if(BUILD_RESOURCES)
if(EXISTS ${InfiniTime_DIR}/src/resources/CMakeLists.txt)
# set verison variables as used in resources/CMakeLists.txt
set(pinetime_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
set(pinetime_VERSION_MINOR ${PROJECT_VERSION_MINOR})
set(pinetime_VERSION_PATCH ${PROJECT_VERSION_PATCH})
# available since https://github.com/InfiniTimeOrg/InfiniTime/pull/1097
message(STATUS "add subdirectory ${InfiniTime_DIR}/src/resources for 'GenerateResources' target")
add_subdirectory(${InfiniTime_DIR}/src/resources resources)
add_dependencies(infinisim GenerateResources)
else()
message(FATAL_ERROR "BUILD_RESOURCES is enabled, but InfiniTime subdirectory has no resources/CMakeLists.txt file")
endif()
endif()
Initial InfiniSim project
2022-02-16 20:42:29 +00:00
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
# Special case for SDL2 dependency, goal is to find a config that exports SDL2::SDL2 target
# libsdl2-dev has a `sdl2-config.cmake` that doesn't export this, but vcpkg does..
find_package(SDL2 CONFIG QUIET)
if(NOT TARGET SDL2::SDL2)
find_package(SDL2 MODULE REQUIRED)
endif()
target_link_libraries(infinisim PRIVATE SDL2::SDL2)
cmake: add explicit std::filesystem linking Fix: https://github.com/InfiniTimeOrg/InfiniSim/issues/57 Supersede: https://github.com/InfiniTimeOrg/InfiniSim/pull/58
2023-01-18 16:26:00 +00:00
# Some toolchains (e.g. g++-8) require to explicitly link with the standard filesystem library
# See https://github.com/InfiniTimeOrg/InfiniSim/issues/57#issuecomment-1386889378
find_package(Filesystem REQUIRED)
target_link_libraries(infinisim PRIVATE std::filesystem)
Initial InfiniSim project
2022-02-16 20:42:29 +00:00
# Get the latest abbreviated commit hash of the working branch
execute_process(
COMMAND ${GIT_EXECUTABLE} log -1 --format=%h
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
OUTPUT_VARIABLE PROJECT_GIT_COMMIT_HASH
OUTPUT_STRIP_TRAILING_WHITESPACE
)
set(VERSION_EDIT_WARNING "// Do not edit this file, it is automatically generated by CMAKE!")
configure_file("${InfiniTime_DIR}/src/Version.h.in" "${CMAKE_CURRENT_BINARY_DIR}/Version.h")
main: implement saveScreenshot() writing bmp/png from SDL window buffer When pressing `i` create a screenshot of the current InfiniTime screen by dumping it to a timestamped png or bmp file like `InfiniSim_2022-03-08_203421.png`. Add a new configure option `WITH_PNG` with default `ON`. When switched to `OFF` the screenshots will be created in `bmp` format. Fixes: https://github.com/InfiniTimeOrg/InfiniSim/issues/5
2022-03-02 21:05:28 +00:00
option(WITH_PNG "Compile with libpng support to dump current screen as png" ON)
if(WITH_PNG)
Remove libpng submodule and require system lib On rolling distros the usage of `libpng` submodule makes problems as the `zlib` system dependency of said module gets updated. Then the submodule regularly is too old to handle the updates `zlib` dependency. Fix this maintenance churn by requiring `libpng` as system library as well. Then the distros package manager keeps those versions in sync. This unfortunately requires users to install a new runtime/build dependency, but it still can be disabled with `-DWITH_PNG=OFF`.
2023-09-05 20:52:09 +00:00
find_package(PNG REQUIRED)
main: implement saveScreenshot() writing bmp/png from SDL window buffer When pressing `i` create a screenshot of the current InfiniTime screen by dumping it to a timestamped png or bmp file like `InfiniSim_2022-03-08_203421.png`. Add a new configure option `WITH_PNG` with default `ON`. When switched to `OFF` the screenshots will be created in `bmp` format. Fixes: https://github.com/InfiniTimeOrg/InfiniSim/issues/5
2022-03-02 21:05:28 +00:00
target_compile_definitions(infinisim PRIVATE WITH_PNG)
Remove libpng submodule and require system lib On rolling distros the usage of `libpng` submodule makes problems as the `zlib` system dependency of said module gets updated. Then the submodule regularly is too old to handle the updates `zlib` dependency. Fix this maintenance churn by requiring `libpng` as system library as well. Then the distros package manager keeps those versions in sync. This unfortunately requires users to install a new runtime/build dependency, but it still can be disabled with `-DWITH_PNG=OFF`.
2023-09-05 20:52:09 +00:00
target_link_libraries(infinisim PRIVATE PNG::PNG)
main: implement saveScreenshot() writing bmp/png from SDL window buffer When pressing `i` create a screenshot of the current InfiniTime screen by dumping it to a timestamped png or bmp file like `InfiniSim_2022-03-08_203421.png`. Add a new configure option `WITH_PNG` with default `ON`. When switched to `OFF` the screenshots will be created in `bmp` format. Fixes: https://github.com/InfiniTimeOrg/InfiniSim/issues/5
2022-03-02 21:05:28 +00:00
endif()
Add install target to create system packages
2022-03-18 23:57:18 +00:00
Add gif-h helper to create screen capture Press key `I` (shift+`i`) to start a screen capture creating a gif with the captured screen. Hit `I` again to stop the screen recording. --- Add gif-h helper header only library Copied from https://github.com/charlietangora/gif-h https://github.com/charlietangora/gif-h/commit/3d2657b9ad40aac9fd6f75ad079335856e94d664
2022-06-19 10:29:26 +00:00
target_include_directories(infinisim PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/gif-h")
sim: embedd background bmp and load from memory Loading the file from disk introduces a slight dependency on the working directory for the simulator. Prevent that by loading the bmp from memory. Use a python script to convert the backround bmp image to a C header file. Include this header in `main.cpp` and load the bmp from memory.
2023-05-08 16:30:13 +00:00
# embedd background image for the status window to use
add_subdirectory(img)
add_dependencies(infinisim infinisim_img_background)
Add install target to create system packages
2022-03-18 23:57:18 +00:00
install(TARGETS infinisim DESTINATION bin)
littlefs-do binary to work with spi raw file (#52) Add helper to modify spi raw file, to make experimenting with it easier. ```sh $ ./littlefs-do --help Usage: ./littlefs-do <command> [options] Commands: -h, --help show this help message for the selected command and exit -v, --verbose print status messages to the console stat show information of specified file or directory ls list available files in 'spiNorFlash.raw' file mkdir create directory rmdir remove directory rm remove directory or file cp copy files into or out of flash file settings list settings from 'settings.h' ``` In the process restructure the CMake file for less duplicate includes/defines for both executables (`infinisim` and `littlefs-do`). Upload the `littlefs-do` binary built by the CI additionally to the `infinisim` binary. Use the updated upload-artifact@v3 template to do that.
2022-08-29 10:05:21 +00:00
# helper library to manipulate littlefs raw image
add_executable(littlefs-do
littlefs-do-main.cpp
# want to use FS.h
${InfiniTime_DIR}/src/components/fs/FS.h
${InfiniTime_DIR}/src/components/fs/FS.cpp
# dependencies for FS.h
sim/drivers/SpiNorFlash.h
sim/drivers/SpiNorFlash.cpp
# dependencies for SpiNorFlash.h
${InfiniTime_DIR}/src/drivers/Spi.h
${InfiniTime_DIR}/src/drivers/Spi.cpp
sim/drivers/SpiMaster.h
sim/drivers/SpiMaster.cpp
${InfiniTime_DIR}/src/components/settings/Settings.h
${InfiniTime_DIR}/src/components/settings/Settings.cpp
)
target_link_libraries(littlefs-do PUBLIC sim-base)
target_link_libraries(littlefs-do PUBLIC littlefs)
target_link_libraries(littlefs-do PRIVATE SDL2::SDL2)
target_link_libraries(littlefs-do PRIVATE infinitime_fonts)
littlefs-do: unzip in memory and copy listed resources to SPI raw file Add a new command `littlefs-do res load resource.zip` which loads resources from a zip file to the SPI raw file. Below an example `resource.zip` is loaded: ```sh $ ./littlefs-do res load infinitime-resources-1.10.0.zip --verbose Calling FS::Init() running 'res' running 'res load' loading resource file: "infinitime-resources-1.10.0.zip" zip: num of files in zip: 8 copy file teko.bin from zip to SPI path '/teko.bin' copy file lv_font_dots_40.bin from zip to SPI path '/lv_font_dots_40.bin' copy file 7segments_40.bin from zip to SPI path '/7segments_40.bin' copy file bebas.bin from zip to SPI path '/bebas.bin' copy file 7segments_115.bin from zip to SPI path '/7segments_115.bin' copy file matrix.bin from zip to SPI path '/matrix.bin' copy file infineat-1.bin from zip to SPI path '/infineat-1.bin' finished: zip file fully loaded into SPI memory: infinitime-resources-1.10.0.zip ``` Afterwards the files are listed in the SPI raw file: ```sh $ ./littlefs-do ls type: DIR name: / type: DIR name: . type: DIR name: .. type: REG size: 4928 name: 7segments\_115.bin type: REG size: 760 name: 7segments\_40.bin type: REG size: 4420 name: bebas.bin type: REG size: 1430 name: infineat-1.bin type: REG size: 1840 name: lv\_font\_dots\_40.bin type: REG size: 115204 name: matrix.bin type: REG size: 440 name: teko.bin ``` Fixes: https://github.com/InfiniTimeOrg/InfiniSim/issues/55
2022-08-22 20:23:07 +00:00
add_subdirectory(external/miniz)
add_subdirectory(external/nlohmann_json)
target_link_libraries(littlefs-do PRIVATE miniz)
target_link_libraries(littlefs-do PRIVATE nlohmann_json::nlohmann_json)
cmake: add explicit std::filesystem linking Fix: https://github.com/InfiniTimeOrg/InfiniSim/issues/57 Supersede: https://github.com/InfiniTimeOrg/InfiniSim/pull/58
2023-01-18 16:26:00 +00:00
target_link_libraries(littlefs-do PRIVATE std::filesystem)
Reference in New Issue Copy Permalink