modified: src/displayapp/screens/Calendar.cpp
modified: src/libs/lv_conf.h
week start on monday with LV_CALENDAR_WEEK_STARTS_MONDAY
Changes not staged for commit:
modified: src/libs/lvgl (modified content)
modified: package-lock.json : ???
modified: package.json : ???
modified: src/displayapp/screens/AlarmIcon.cpp : put bell /
not bell in this file to keep infineat as in the PR I submit
modified: src/displayapp/screens/WatchFaceMeow.cpp : don't
refer to alarmIcon.cpp to change the icon, instead do it in this file
directly to have different icons
modified: src/libs/QCBOR : reverted to match original repo's
version (git submodule status : compare commit id in this repo and a
freshly cloned repo)
modified: src/libs/arduinoFFT : reverted
modified: src/libs/littlefs : reverted
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
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
Add TODO.md in src/components/datetime. This file give detailed information about a refactoring of the DateTimeController that would be nice to do in the future.
interactive rebase in progress; onto b7a353cf
Last commands done (3 commands done):
pick 9d04c32f recovering manually changes to original Infineat
pick 70f9025f now I have the Meow Watchface AND the Infineat Watchface with alarm display
No commands remaining.
You are currently rebasing branch 'my-custom-infinitime' on 'b7a353cf'.
Changes to be committed:
modified: src/components/settings/Settings.h
interactive rebase in progress; onto b7a353cf
Last command done (1 command done):
pick 504f5774 copy :( files from gitlab repo
Next commands to do (2 remaining commands):
pick 9d04c32f recovering manually changes to original Infineat
pick 70f9025f now I have the Meow Watchface AND the Infineat Watchface with alarm display
You are currently rebasing branch 'my-custom-infinitime' on 'b7a353cf'.
Changes to be committed:
modified: src/CMakeLists.txt
modified: src/displayapp/apps/Apps.h.in
modified: src/displayapp/apps/CMakeLists.txt
modified: src/displayapp/screens/Symbols.h