mirror of
https://github.com/InfiniTimeOrg/InfiniTime.git
synced 2024-10-22 15:11:51 +02:00
8ed1d22a48
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 |
||
---|---|---|
.. | ||
alarmStatusOnInfineat | ||
ble | ||
bootloader | ||
code | ||
gettingStarted | ||
logo | ||
memoryAnalysis | ||
openOCD | ||
ui | ||
ble.md | ||
BLEFS.md | ||
branches.md | ||
buildAndProgram.md | ||
buildWithDocker.md | ||
buildWithVScode.md | ||
coding-convention.md | ||
ExternalResources.md | ||
files-needed-by-factory.md | ||
filesInReleaseNotes.md | ||
gdb.md | ||
InfiniTimeVision.md | ||
jlink.md | ||
maintainer-guide.md | ||
MemoryAnalysis.md | ||
MotionService.md | ||
NavigationService.md | ||
openOCD.md | ||
palettes.xcf | ||
PinetimeStubWithNrf52DK.md | ||
SimpleWeatherService.md | ||
SPI-LCD-driver.md | ||
SWD.md | ||
ui_guidelines.md | ||
usingDevcontainers.md | ||
versioning.md |