aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ | |/ |/|
* | 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
* | | 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
| * | Merge branch 'develop' of https://github.com/JF002/Pinetime into LVGL7Joaquim2021-02-0110-6/+244
| |\ \
| * | | LVGL v7.10.0Joaquim2021-01-2827-1117/+1229
| * | | LVGL V7 UpgradeJoaquim2021-01-28207-89256/+3
* | | | Set version to 0.13.0Jean-François Milants2021-02-141-1/+1
* | | | Merge branch 'develop' of github.com:JF002/Pinetime into developJean-François Milants2021-02-1430-501/+932
|\ \ \ \
| * \ \ \ Merge pull request #205 from nscooling/dirtyRefactorJF0022021-02-141-13/+13
| |\ \ \ \
| | * | | | refactored class DirtyValueNiall Cooling2021-02-121-13/+13
| * | | | | Merge pull request #186 from petterhs/musicUIJF0022021-02-141-7/+8
| |\ \ \ \ \
| | * | | | | improve music UI with icons for play/pause/next/prev/ and volumepetter2021-01-271-7/+8
| | * | | | | update font with icons for music, call and qrpetter2021-01-273-396/+498
| | | |/ / / | | |/| | |
| * | | | | Remove debug variable.Jean-François Milants2021-02-141-1/+1
| * | | | | Merge pull request #206 from nscooling/Hrs3300_SetGain_remove_warningsJF0022021-02-141-4/+5
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'develop' into Hrs3300_SetGain_remove_warningsJF0022021-02-1427-476/+905
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #182 from petterhs/warningsJF0022021-02-144-8/+6
| |\ \ \ \ \ \
| | * | | | | | fix build warnings in HR implementationpetter2021-01-254-8/+6
| | | |/ / / / | | |/| | | |
| * | | | | | Merge branch 'jlukanc1-upstream-dev' into developJean-François Milants2021-02-1410-7/+80
| |\ \ \ \ \ \
| | * | | | | | Fix merge conflict.Jean-François Milants2021-02-1410-7/+80
| |/| | | | | |
| | * | | | | | add vibration togglepetter2021-02-074-1/+16
| | * | | | | | refactor MotorControllerpetter2021-02-052-24/+10
| | * | | | | | trigger vibration from systemtaskpetter2021-02-055-21/+9
| | * | | | | | remove vibtimer from .h to fix nonstop vibrationjlukanc2021-01-251-1/+0
| | * | | | | | create motorcontroller in main and pass by referencepetter2021-01-257-10/+31
| | * | | | | | move app timer defjlukanc2021-01-252-5/+5
| | * | | | | | Merge branch 'develop' into upstream-devThe King2021-01-24321-478/+12197
| | |\| | | | |
| | * | | | | | fix merge issuejlukanc2021-01-231-0/+5
| | * | | | | | fis merge conflict?jlukanc2021-01-231-1/+1
| | * | | | | | remove unneeded definesjlukanc2021-01-232-39/+1