summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2021-03-07Merge branch 'develop' into recovery-firmwareJean-François Milants545-100324/+33426
# Conflicts: # src/CMakeLists.txt # src/displayapp/DisplayApp.h # src/systemtask/SystemTask.cpp # src/systemtask/SystemTask.h
2021-03-06Merge pull request #222 from nscooling/refactor-clock-private-staticsJF0022-39/+39
Moved private statics into unnamed namespace in cpp file
2021-03-03Moved private statics into unnamed namespace in cpp file to reduce coupling ↵Niall Cooling2-39/+39
and uncessar in header
2021-03-03Refactored src/CMakelist to support C++14 and cleanup up redundant/incorrect ↵Niall Cooling1-9/+20
-std= directives
2021-02-24Merge pull request #211 from roblabla/fix-flashingJF0021-7/+7
Flash correct file name
2021-02-23Fix LVGL submodule (sorry!)Jean-François Milants294-241414/+0
2021-02-23Remove LVGL folder (it's now a submodule)Jean-François Milants340-50932/+203090
2021-02-23Merge branch 'LVGL7' of https://github.com/joaquimorg/Pinetime into ↵Jean-François Milants31-1341/+1166
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
2021-02-22Fix delay in button actionsJoaquim2-30/+1
2021-02-19Flash correct file nameroblabla1-7/+7
2021-02-14Merge branch 'develop' of github.com:JF002/Pinetime into developJean-François Milants29-503/+933
2021-02-14Fix IRQ management in FreeRTOS to avoid crash and deadlock in BLE stack.Jean-François Milants2-2/+24
2021-02-14Merge pull request #205 from nscooling/dirtyRefactorJF0021-13/+13
refactored class DirtyValue
2021-02-14Merge pull request #186 from petterhs/musicUIJF0021-7/+8
music: Symbols for the buttons
2021-02-14Remove debug variable.Jean-François Milants1-1/+1
2021-02-14Merge branch 'develop' into Hrs3300_SetGain_remove_warningsJF00226-478/+906
2021-02-14Merge pull request #182 from petterhs/warningsJF0024-8/+6
Fix build warnings coming from HR implementation
2021-02-14Fix merge conflict.Jean-François Milants9-7/+79
2021-02-14Merge pull request #161 from petterhs/callsJF00219-469/+827
Call functionality with changed UUID for notification event characteristic
2021-02-12eliminated warnings in Hrs3300Niall Cooling1-4/+5
2021-02-12refactored class DirtyValueNiall Cooling1-13/+13
2021-02-07Fix memory leak in timer management in port layer of Nimble.Jean-François Milants1-0/+2
2021-02-07add vibration togglepetter4-1/+16
2021-02-05refactor MotorControllerpetter2-24/+10
2021-02-05trigger vibration from systemtaskpetter5-21/+9
2021-02-03Increase FreeRTOS heap size and re-enable heart rate task. New Nimble ↵Jean-François Milants2-3/+3
probably uses more memory than before.
2021-02-02Update to nimble 1.3 master branch commit ↵Jean-François Milants286-9261/+31329
82153e744833821e20e9a8b0d61c38b2b0dbcfe1 WARNING : heartbeat task is disabled!
2021-02-01Add new cmake option to disable the generation of DFU file (which needs ↵Jean-François Milants1-3/+24
adafruit-nrfutil on the build machine) : BUILD_DFU (disabled by default, enabled in docker build).
2021-02-01CleanupJoaquim12-241/+13
2021-02-01Merge branch 'develop' of https://github.com/JF002/Pinetime into LVGL7Joaquim3-4/+4
2021-01-31Merge pull request #193 from Avamander/patch-5JF0021-1/+1
Updated CMakeLists.txt to be more consistent
2021-01-31Normalize all the line endingsJean-François Milants2-3/+3
2021-01-31Remove BLE debug codeJean-François Milants1-2/+2
2021-01-30Update CMakeLists.txtAvamander1-1/+1
2021-01-28LVGL v7.10.0Joaquim26-1123/+1235
2021-01-28LVGL V7 UpgradeJoaquim206-89256/+0
2021-01-27add mute button and functionality for call notification + new button iconspetter4-6/+47
2021-01-27improve music UI with icons for play/pause/next/prev/ and volumepetter1-7/+8
2021-01-27update font with icons for music, call and qrpetter3-396/+498
2021-01-27update font with icons for music, call and qrpetter3-396/+498
2021-01-26Generate pinetime-recovery : a light version of InfiniTime design to be used ↵Jean-François Milants16-73/+708
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
2021-01-25remove vibtimer from .h to fix nonstop vibrationjlukanc1-1/+0
2021-01-25create motorcontroller in main and pass by referencepetter7-10/+31
2021-01-25move app timer defjlukanc2-5/+5
2021-01-25fix build warnings in HR implementationpetter4-8/+6
2021-01-24Merge branch 'develop' into upstream-devThe King312-465/+11979
2021-01-24Revert invalid changes in Navigation.h and add missing changes in ↵Jean-François Milants2-3/+8
Notifications.h.
2021-01-24Handle call notification the same way than other notifications.Jean-François Milants13-90/+198
Display the call notifications in the Notification app, with buttons to accept/reject the call.
2021-01-23fix merge issuejlukanc1-0/+5
2021-01-23fis merge conflict?jlukanc1-1/+1