aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #235 from MFAshby/doc_correctionJF0022021-03-206-11/+11
|\ \ \
| * | | Small correction to git URL in documentation filesMartin Ashby2021-03-156-11/+11
| |/ /
* | | Merge branch 'develop' of github.com:JF002/Pinetime into developJean-François Milants2021-03-2027-317/+1325
|\ \ \
| * \ \ Merge pull request #217 from joaquimorg/MultiFaceClockJF0022021-03-2025-313/+1318
| |\ \ \ | | |/ / | |/| |
| | * | fix AM/PMJoaquim José Almeida Pereira2021-03-081-5/+15
| | * | Merge branch 'develop' into MultiFaceClockjoaquim.org2021-03-060-0/+0
| | |\ \ | | |/ / | |/| |
| | * | clean up vsc settingsJoaquim2021-03-061-1/+0
| | * | Update from JF comments to PRJoaquim2021-03-065-33/+6
| | * | Merge from upstreamJoaquim2021-03-066-11/+25
| | * | Merge branch 'develop' of https://github.com/JF002/Pinetime into MultiFaceClockJoaquim2021-02-251-1/+1
| | |\ \
| | * \ \ Merge branch 'develop' of https://github.com/JF002/Pinetime into MultiFaceClockJoaquim2021-02-251-7/+7
| | |\ \ \
| | * | | | Multi face support, analog clock, 12/24 configJoaquim2021-02-2425-311/+1333
* | | | | | Set version to 0.14.1Jean-François Milants2021-03-071-1/+1
* | | | | | Merge branch 'recovery-firmware' of JF/PineTime into developJF2021-03-0749-107/+3623
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add submodule again...Jean-François Milants2021-03-072-0/+3
| * | | | | Revert "Add submodule again..."Jean-François Milants2021-03-073-27/+1
| * | | | | Add submodule again...Jean-François Milants2021-03-073-1/+27
| * | | | | Merge branch 'develop' into recovery-firmwareJean-François Milants2021-03-07559-100313/+33634
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add new cmake option to disable the generation of DFU file (which needs adafr...Jean-François Milants2021-02-014-10/+50
| * | | | | Remove BLE debug codeJean-François Milants2021-01-311-2/+2
| * | | | | Generate pinetime-recovery : a light version of InfiniTime design to be used ...Jean-François Milants2021-01-2645-80/+3579
| | | | | * Reworked based on PR comments.panky-codes2021-03-204-38/+56
| | | | | * Removed unused variables. Tested.panky-codes2021-03-153-9/+8
| | | | | * Increased the size of the button and realigned the layout a bit. Tested.panky-codes2021-03-131-5/+7
| | | | | * Added some comments for clarity. Ready for review. Tested.panky-codes2021-03-132-3/+15
| | | | | * Stopwatch completed. Ready for PRpanky-codes2021-03-135-55/+75
| | | | | * Adding laps completed.panky-codes2021-03-132-6/+17
| | | | | * Laps introduced. Tested. Need to change the icon.panky-codes2021-03-122-6/+70
| | | | | * Added a button for stop lap. Logic works. Need to implement symbol and buffer...panky-codes2021-03-122-9/+58
| | | | | * Added play/pause button.panky-codes2021-03-112-9/+55
| | | | | * Changed the clock source. Stopwatch works. Need to add butttons.panky-codes2021-03-112-12/+29
| | | | | * Merge branch 'develop' of github.com:JF002/Pinetime into feature/add-stop-watchpanky-codes2021-03-114-48/+60
| | | | | |\ | |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #223 from hubmartin/patch-1JF0022021-03-061-0/+1
|\ \ \ \ \ \
| * | | | | | Add WebBLEWatch option to update timeMartin Hub2021-03-041-0/+1
* | | | | | | Merge pull request #222 from nscooling/refactor-clock-private-staticsJF0022021-03-062-39/+39
|\ \ \ \ \ \ \
| * | | | | | | Moved private statics into unnamed namespace in cpp file to reduce coupling a...Niall Cooling2021-03-032-39/+39
| |/ / / / / /
* | | | | | | Merge pull request #221 from nscooling/C++14JF0022021-03-061-9/+20
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Refactored src/CMakelist to support C++14 and cleanup up redundant/incorrect ...Niall Cooling2021-03-031-9/+20
| | |_|/ / / | |/| | | |
| | | | | * Basic logic done. Need to change the timer source to get ms. Also need to rep...panky-codes2021-03-116-3/+114
| |_|_|_|/ |/| | | |
* | | | | Update pictures in the main README.md file.Jean-François Milants2021-02-254-1/+2
| |_|_|/ |/| | |
* | | | Set version to 0.14.0Jean-François Milants2021-02-241-1/+1
|/ / /
* | | Merge pull request #211 from roblabla/fix-flashingJF0022021-02-241-7/+7
|\ \ \ | |_|/ |/| |
| * | Flash correct file nameroblabla2021-02-191-7/+7
* | | Update doc : init git submodule before build.Jean-François Milants2021-02-231-0/+1
* | | Fix LVGL submodule (sorry!)Jean-François Milants2021-02-23294-241414/+0
* | | Merge branch 'joaquimorg-LVGL7' into developJean-François Milants2021-02-23373-51933/+203919
|\ \ \ | |/ / |/| |
| * | Remove LVGL folder (it's now a submodule)Jean-François Milants2021-02-23340-50598/+202756
| * | Merge branch 'LVGL7' of https://github.com/joaquimorg/Pinetime into joaquimor...Jean-François Milants2021-02-2333-1335/+1163
|/| |
| * | Fix delay in button actionsJoaquim2021-02-222-30/+1
| * | CleanupJoaquim2021-02-0112-241/+13