aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #240 from joaquimorg/ScreenCorruptionFIXJF0022021-03-204-77/+37
|\ | | | | FIX screen corruption (Issue #213)
| * FIX screen corruption #213Joaquim2021-03-184-77/+37
| |
* | Merge pull request #237 from muesli/systeminfo-urlJF0022021-03-201-1/+1
|\ \ | | | | | | Update project URL in SystemInfo
| * | Update project URL in SystemInfoChristian Muehlhaeuser2021-03-161-1/+1
| |/ | | | | | | Pinetime -> InfiniTime
* | Merge branch 'develop' of github.com:JF002/Pinetime into developJean-François Milants2021-03-2026-317/+1320
|\ \ | | | | | | | | | | | | | | | # Conflicts: # src/main.cpp # src/systemtask/SystemTask.h
| * | fix AM/PMJoaquim José Almeida Pereira2021-03-081-5/+15
| | |
| * | Update from JF comments to PRJoaquim2021-03-065-33/+6
| | |
| * | Merge from upstreamJoaquim2021-03-062-10/+22
| | |
| * | Merge branch 'develop' of https://github.com/JF002/Pinetime into MultiFaceClockJoaquim2021-02-251-7/+7
| |\ \
| * | | Multi face support, analog clock, 12/24 configJoaquim2021-02-2424-311/+1327
| | | |
* | | | Add submodule again...Jean-François Milants2021-03-071-0/+0
| | | |
* | | | Merge branch 'develop' into recovery-firmwareJean-François Milants2021-03-07545-100309/+33411
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/CMakeLists.txt # src/displayapp/DisplayApp.h # src/systemtask/SystemTask.cpp # src/systemtask/SystemTask.h
| * | | Merge pull request #222 from nscooling/refactor-clock-private-staticsJF0022021-03-062-39/+39
| |\ \ \ | | | | | | | | | | Moved private statics into unnamed namespace in cpp file
| | * | | Moved private statics into unnamed namespace in cpp file to reduce coupling ↵Niall Cooling2021-03-032-39/+39
| | | |/ | | |/| | | | | | | | | and uncessar in header
| * / | Refactored src/CMakelist to support C++14 and cleanup up redundant/incorrect ↵Niall Cooling2021-03-031-9/+20
| |/ / | | | | | | | | | -std= directives
| * | Merge pull request #211 from roblabla/fix-flashingJF0022021-02-241-7/+7
| |\ \ | | |/ | |/| Flash correct file name
| | * Flash correct file nameroblabla2021-02-191-7/+7
| | |
| * | Fix LVGL submodule (sorry!)Jean-François Milants2021-02-23294-241414/+0
| | |
| * | 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 ↵Jean-François Milants2021-02-2331-1334/+1159
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | joaquimorg-LVGL7 # Conflicts: # src/CMakeLists.txt # src/displayapp/DisplayApp.cpp # src/displayapp/screens/Modal.cpp # src/displayapp/screens/Modal.h # src/displayapp/screens/Notifications.cpp # src/displayapp/screens/Tile.h
| | * 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-013-4/+4
| | |\
| | * | LVGL v7.10.0Joaquim2021-01-2826-1116/+1228
| | | |
| | * | LVGL V7 UpgradeJoaquim2021-01-28206-89256/+0
| | | |
| * | | Merge branch 'develop' of github.com:JF002/Pinetime into developJean-François Milants2021-02-1429-501/+931
| |\ \ \
| | * \ \ Merge pull request #205 from nscooling/dirtyRefactorJF0022021-02-141-13/+13
| | |\ \ \ | | | | | | | | | | | | refactored class DirtyValue
| | | * | | refactored class DirtyValueNiall Cooling2021-02-121-13/+13
| | | | | |
| | * | | | Merge pull request #186 from petterhs/musicUIJF0022021-02-141-7/+8
| | |\ \ \ \ | | | | | | | | | | | | | | music: Symbols for the buttons
| | | * | | | 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 branch 'develop' into Hrs3300_SetGain_remove_warningsJF0022021-02-1426-476/+904
| | |\ \ \ \
| | | * \ \ \ Merge pull request #182 from petterhs/warningsJF0022021-02-144-8/+6
| | | |\ \ \ \ | | | | | | | | | | | | | | | | Fix build warnings coming from HR implementation
| | | | * | | | fix build warnings in HR implementationpetter2021-01-254-8/+6
| | | | |/ / /
| | | * | | | Fix merge conflict.Jean-François Milants2021-02-149-7/+79
| | | |\ \ \ \
| | | | * | | | 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-24312-465/+11979
| | | | |\| | |
| | | | * | | | fix merge issuejlukanc2021-01-231-0/+5
| | | | | | | |
| | | | * | | | fis merge conflict?jlukanc2021-01-231-1/+1
| | | | | | | |
| | | | * | | | remove unneeded definesjlukanc2021-01-232-39/+1
| | | | | | | |
| | | | * | | | add motor to notifs, fix tabs in motorcontroller.hjlukanc2021-01-153-34/+40
| | | | | | | |
| | | | * | | | add motorcontroller to cmakejlukanc2021-01-151-0/+2
| | | | | | | |
| | | | * | | | add non-blocking motor controllerjlukanc2021-01-153-0/+99
| | | | | | | |
| | | * | | | | Merge pull request #161 from petterhs/callsJF0022021-02-1419-467/+825
| | | |\ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | Call functionality with changed UUID for notification event characteristic
generated by cgit v1.2.3-70-g09d2 (git 2.51.2) at 2026-01-16 14:40:21 +0000