aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* resolves conflictsSteveAmor2022-01-02236-1542/+4106
|\
| * Ran clang-formatStephanie2021-12-303-9/+14
| * Renamed confusing variables and general cleanupStephanie2021-12-304-21/+18
| * Changed text to left padStephanie2021-12-301-7/+9
| * Moved trip meter update to MotionController and changed trip meter logicStephanie2021-12-303-15/+13
| * Changed lap counter to trip meterStephanie2021-12-303-33/+43
| * Added "lap" button to step counterStephanie2021-12-303-8/+57
| * Use CMake universal build commandJackson2021-12-301-6/+3
| * Switch CI/CD to build using ninja vs. makeJackson2021-12-301-4/+4
| * Add missing breakRiku Isokoski2021-12-301-0/+1
| * Improve gesture consistency across the firmwareRiku Isokoski2021-12-303-6/+24
| * Merge pull request #718 from kieranc/pts-settingsJF2021-12-3010-403/+334
| |\
| | * Merge remote-tracking branch 'upstream/develop' into pts-settingsKieran Cawthray2021-12-0946-241/+1960
| | |\
| | * | Include Colors.hKieran Cawthray2021-12-061-0/+1
| | * | Merge remote-tracking branch 'upstream/develop' into pts-settingsKieran Cawthray2021-12-05191-702/+576
| | |\ \
| | * | | Improve notification icon alignmentKieran Cawthray2021-11-161-1/+1
| | * | | Revert "Fix notification icon alignment"Kieran Cawthray2021-11-161-13/+8
| | * | | Fix notification icon alignmentKieran Cawthray2021-11-161-8/+13
| | * | | Merge remote-tracking branch 'upstream/develop' into pts-settingsKieran Cawthray2021-11-152-12/+6
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'upstream/develop' into pts-settingsKieran Cawthray2021-11-155-24/+68
| | |\ \ \ \
| | * \ \ \ \ Merge pull request #1 from Riksu9000/pts-settings-fixkieranc2021-11-155-41/+66
| | |\ \ \ \ \
| | | * | | | | clang-format and clang-tidy PineTimeStyleRiku Isokoski2021-11-132-25/+31
| | | * | | | | Close menu with buttonRiku Isokoski2021-11-135-16/+35
| | |/ / / / /
| | * | | | | Merge remote-tracking branch 'upstream/develop' into pts-settingsKieran Cawthray2021-11-0726-63/+516
| | |\ \ \ \ \
| | * | | | | | Revert "Update GetNext/GetPrevious"Kieran Cawthray2021-10-231-2/+11
| | * | | | | | Merge remote-tracking branch 'upstream/develop' into pts-settingsKieran Cawthray2021-10-2315-58/+371
| | |\ \ \ \ \ \
| | * | | | | | | Update GetNext/GetPreviousKieran Cawthray2021-10-201-11/+2
| | * | | | | | | Improve random color selection, disable longpress when settings are visibleKieran Cawthray2021-10-201-18/+17
| | * | | | | | | Restore settings orderKieran Cawthray2021-10-201-2/+2
| | * | | | | | | Merge branch 'pts-settings' of https://github.com/kieranc/InfiniTime into pts...Kieran Cawthray2021-10-200-0/+0
| | |\ \ \ \ \ \ \
| | | * | | | | | | Ensure needle color is visible one reset/randomizeKieran Cawthray2021-10-201-0/+6
| | * | | | | | | | Ensure needle color is visible on reset/randomizeKieran Cawthray2021-10-201-0/+6
| | |/ / / / / / /
| | * | | | | | | Change gauge needle color when background is whiteKieran Cawthray2021-10-191-1/+15
| | * | | | | | | Fix settings merge errorKieran Cawthray2021-10-181-2/+5
| | * | | | | | | Merge remote-tracking branch 'upstream/develop' into pts-settingsKieran Cawthray2021-10-1856-256/+1069
| | |\ \ \ \ \ \ \
| | * | | | | | | | Disable DoubleTap when settings buttons are displayedKieran Cawthray2021-10-181-0/+3
| | * | | | | | | | More duplicate color dodgingKieran Cawthray2021-10-181-3/+10
| | * | | | | | | | Remove old PineTimeStyle settings appKieran Cawthray2021-10-036-400/+4
| | * | | | | | | | Initial commitKieran Cawthray2021-10-032-17/+274
| * | | | | | | | | InfiniPaint: add missing include algorithm for std::fillReinhold Gschweicher2021-12-301-0/+2
| * | | | | | | | | Update .gitignoreEli Weiss2021-12-301-0/+4
| * | | | | | | | | Revised documentationEli Weiss2021-12-304-4/+4
| * | | | | | | | | Improved "Getting Started" readabilityEli Weiss2021-12-307-14/+14
| * | | | | | | | | Improved documentation readabilityEli Weiss2021-12-307-19/+19
| * | | | | | | | | Update MemoryAnalysis.mdEli Weiss2021-12-301-3/+3
| * | | | | | | | | Improved documentation readabilityEli Weiss2021-12-302-10/+10
| * | | | | | | | | Update buildAndProgram.mdEli Weiss2021-12-301-2/+2
| * | | | | | | | | Use Bluetooth brand color for BLE logo #0082FChubmartin2021-12-301-1/+1
| * | | | | | | | | Real white nowhubmartin2021-12-301-1/+1
| * | | | | | | | | WatchFaceDigital - BLE symbol changed to white colorhubmartin2021-12-301-1/+1