Eve C f42ef49a40 Merge branch 'testcalendar' into my-custom-infinitime ... Conflicts: src/displayapp/apps/CMakeLists.txt src/displayapp/fonts/fonts.json src/displayapp/screens/Symbols.h On branch my-custom-infinitime All conflicts fixed but you are still merging. Changes to be committed: modified: src/CMakeLists.txt modified: src/displayapp/DisplayApp.cpp modified: src/displayapp/InfiniTimeTheme.h modified: src/displayapp/apps/Apps.h.in modified: src/displayapp/apps/CMakeLists.txt modified: src/displayapp/fonts/fonts.json new file: src/displayapp/screens/Calendar.cpp new file: src/displayapp/screens/Calendar.h modified: src/displayapp/screens/Symbols.h merge conflicts were mainly symbols, so I gathered the most complete list of symbols from the merge conflict		2024-07-08 17:05:53 +02:00
..
buttonhandler	ButtonHandler: includes relative to src dir	2022-01-16 20:59:49 +01:00
components	fixing mess again after merge mess	2024-05-30 15:54:40 +02:00
displayapp	Merge branch 'testcalendar' into my-custom-infinitime	2024-07-08 17:05:53 +02:00
drivers	Fix erratum 58 workaround	2024-05-30 15:45:33 +02:00
FreeRTOS	Refactor pvPortRealloc() to improve readability.	2023-05-18 19:58:09 +02:00
heartratetask	Simplify ISR task wake checks	2024-03-12 19:09:01 +01:00
libs	weather: Colorize forecast temperatures	2024-02-18 12:57:48 +01:00
logging	Format header files	2023-01-09 21:41:21 +01:00
resources	cat as battery icon : modified the lines of infineat and position of picture	2024-05-30 15:54:40 +02:00
systemtask	Simplify ISR task wake checks	2024-03-12 19:09:01 +01:00
touchhandler	TouchHandler: Do not store touch panel reference	2023-02-24 00:05:21 +02:00
utility	motioncontroller: Add functions for analysis	2023-08-17 21:21:22 +02:00
BootErrors.h	Automatic error detection	2021-08-18 15:23:30 +03:00
BootloaderVersion.cpp	Fix InfiniTime compiler warnings	2022-06-19 13:41:33 +03:00
BootloaderVersion.h	Fix InfiniTime compiler warnings	2022-06-19 13:41:33 +03:00
CMakeLists.txt	fixing mess again after merge mess	2024-05-30 15:54:40 +02:00
FreeRTOSConfig.h	Remove task to notify	2024-05-30 15:45:33 +02:00
main.cpp	Use functional abstraction for hooks	2024-05-30 15:45:33 +02:00
main.h	Enable malloc error and stack overflow error detection in FreeRTOS. Count them and display them in the SystemInfo app.	2023-05-18 19:58:09 +02:00
recoveryLoader.cpp	Use functional abstraction for hooks	2024-05-30 15:45:33 +02:00
sdk_config.h	Switch to freertos timers (#1095)	2022-06-06 17:47:43 +02:00
stdlib.c	Unify all heaps (stdlib + LVGL + FreeRTOS) into a single heap managed by FreeRTOS and heap_4_infinitime.c.	2023-05-18 19:58:09 +02:00
Version.h.in	InfiniTime firmware for pinetime with a new watchface. Note that some other watchfaces are disabled from compilation to save memory space, in case. The WatchFaceMeow, named Meow in the interface, displays the status of the alarm on the screen	2024-05-30 15:51:20 +02:00