Eve C 8ed1d22a48 Merge branch 'main' into my-custom-infinitime ... Conflicts: .gitignore README.md somehow when I compile it adds a nodemodules folder, that is not in the original (from Infinitime) .gitignore file. So I added it. I also modified the readme to list the branches in this project and my modifications. These are the changes from main that I didn't have yet in this branch Changes to be committed: modified: README.md new file: doc/ui/infineat_settings.png modified: src/components/ble/SimpleWeatherService.cpp modified: src/components/ble/SimpleWeatherService.h modified: src/components/datetime/DateTimeController.cpp modified: src/components/datetime/DateTimeController.h new file: src/components/datetime/TODO.md modified: src/displayapp/DisplayApp.cpp modified: src/displayapp/screens/WatchFaceAnalog.h modified: src/drivers/Bma421.cpp modified: src/drivers/St7789.cpp modified: src/drivers/St7789.h modified: src/systemtask/SystemTask.cpp		2024-07-08 17:12:29 +02:00
..
example.png	Add image with example layouts	2021-08-15 11:19:47 +02:00
infineat_settings.png	update doc of main branch	2024-05-29 16:19:59 +02:00
meow_alarmnotset.png	Add pictures in readme	2024-05-29 13:00:23 +02:00
meow_alarmset.png	update doc of main branch	2024-05-29 16:19:59 +02:00