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
pick 0dcfb2ed Fix erratum 58 workaround
pick 1162fdbf initial commit, with already alarm added. TODO : add possibility to disable alarm status, and make it work on 12hrs format
Next commands to do (30 remaining commands):
pick ab901b89 added option to show or hide alarm status
pick 1af813a2 fixed alarm status reappearing when alarm changed, even if not set to be displayed. TODO : clean comments related to this, and add am/pm format for alarm
You are currently rebasing branch 'testcalendar' on '577dfd5b'.
* Only use one Dockerfile and build.sh script for both docker and devcontainer
* Remove all now unneccessary tasks and scripts
* Update to clang-format-14
* Move devcontainer.json into root folder
* Fix conditional statements in Dockerfile
* Move .devcontainer/README into doc/usingDevcontainers
* Remove obsolete VSCode Task
* Change standard compiler path to the correct compiler
* Set GDB Path for debugging
* Hide broken buttons from CMake Extension
* Refactor .devcontainer
* Remove unneccessary postBuildCommand
* Add devcontainer dependencies to all docker images
* Add Devcontainer Debug launch config
* Add an additional c_cpp_properties config as a fallback for devcontainer
* Remove obsolete Docker Argument
* Fix wrong C/Cpp versions
* Fix silent fail of gdb, add libncurses5
This fixes an issue where the BLE connected logo would disappear when opening and closing the BLE setting (without changing it) while InfiniTime was already connected to a companion app.
Co-authored-by: JustScott <development@justscott.me>
