aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* First integration of the motion sensor (bma 421) : step counting + wake on ↵Jean-François Milants2021-04-0426-25/+12343
| | | | wrist rotation + app to see the value of the 3 axis in "real time".
* replaced all unique_ptr.reset calls with std::make_uniqueNiall Cooling2021-03-227-39/+45
|
* Updated to include WatchFaceAnalog and fixed clashesNiall Cooling2021-03-2244-503/+2444
|\
| * Merge pull request #245 from petterhs/fixDisplayErrorsJF0022021-03-212-8/+4
| |\ | | | | | | fix display driver issues in recovery
| | * fix display driver issues in recoverypetter2021-03-212-8/+4
| | |
| * | Merge pull request #244 from joaquimorg/LVGL7.11.0JF0022021-03-211-0/+0
| |\ \ | | | | | | | | Update to LVGL 7.11.0 Final
| | * | Update to LVGL 7.11.0 FinalJoaquim2021-03-201-0/+0
| | |/
| * | Reverted the paddle app in displayapp.cpppanky-codes2021-03-211-2/+2
| | |
| * | Updated lvgl submodule to match with develop branchpanky-codes2021-03-211-0/+0
| | |
| * | Merged upstreampanky-codes2021-03-2037-459/+2078
| |\|
| | * 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
| | * | | | Add new cmake option to disable the generation of DFU file (which needs ↵Jean-François Milants2021-02-011-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | adafruit-nrfutil on the build machine) : BUILD_DFU (disabled by default, enabled in docker build).
| | * | | | 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-2616-72/+707
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as a recovery firmware : it only provides basic UI and BLE connectivity for OTA. This new FW is build on the same codebasse than the actual InfiniTime. Only the display task is different (this allows to remove lvgl from the recovery fw, which is very heavy). CMake builds and docker have been modified accordingly. Note than the fw is converted into an image and then into a DFU in the cmake build (previously, it was only done in the
| * | | | | Reworked based on PR comments.panky-codes2021-03-203-38/+37
| | | | | |
| * | | | | 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 ↵panky-codes2021-03-122-9/+58
| | | | | | | | | | | | | | | | | | | | | | | | buffer for lap
| * | | | | 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-113-48/+59
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Basic logic done. Need to change the timer source to get ms. Also need to ↵panky-codes2021-03-116-3/+114
| | |_|_|/ | |/| | | | | | | | | | | | | replace with paddle app in displayApp.cpp and ApplicationList.cpp later.
* | | | | Resolved C++14 Cmake build issues so correctly building to C99/C++14 standardsNiall Cooling2021-03-162-18/+4
| |/ / / |/| | |
* | | | 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
| | | |