aboutsummaryrefslogtreecommitdiffstats
path: root/src/CMakeLists.txt
Commit message (Expand)AuthorAgeFilesLines
* resolve conflict in src/systemtask/Messages.hMark Russell2021-09-161-4/+8
|\
| * Merge branch 'refactor_adv' of https://github.com/evergreen22/InfiniTime into...Jean-François Milants2021-09-131-4/+7
| |\
| | * WIP Refactor ble advertisingJames A. Jerkins2021-08-291-4/+7
| * | Merge branch 'develop' into pinmaphubmartin2021-08-291-0/+7
| |\ \
| * \ \ Merge branch 'develop' into pinmaphubmartin2021-08-221-6/+6
| |\ \ \ | | | |/ | | |/|
| * | | DRAFT: Put gpio pins to separate filehubmartin2021-08-021-0/+1
* | | | Revert "Merge upstream"Mark Russell2021-09-161-8/+4
* | | | Merge upstreamMark Russell2021-09-161-4/+8
* | | | Created basic alarm appMark Russell2021-09-101-0/+5
| |_|/ |/| |
* | | Settings : use enums instead of ints to store colors. Group all PTS settings ...Jean-François Milants2021-08-281-0/+2
* | | Merge pull request #458 from kieranc/pinetimestyle-colorpickerJF0022021-08-281-0/+1
|\ \ \
| * \ \ Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-08-191-6/+6
| |\ \ \ | | | |/ | | |/|
| * | | Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpickerKieran Cawthray2021-07-121-4/+25
| |\ \ \ | | | |/ | | |/|
| * | | PineTimeStyle color picker initial commitKieran Cawthray2021-06-241-0/+1
| * | | Add step count gauge - replaces heartrate in sidebarKieran Cawthray2021-06-201-0/+2
| * | | Merge remote-tracking branch 'upstream/develop' into pinetimestyleKieran Cawthray2021-06-161-4/+4
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/develop' into pinetimestyleKieran Cawthray2021-06-041-39/+41
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'upstream/develop' into pinetimestyleKieran Cawthray2021-05-211-0/+5
| |\ \ \ \ \
| * | | | | | Fix it again..Kieran Cawthray2021-05-181-0/+2
| * | | | | | Revert "Reset"Kieran Cawthray2021-05-181-2/+3
| * | | | | | ResetKieran Cawthray2021-05-181-3/+2
* | | | | | | Merge branch 'develop' into new_touch_handlerRiku Isokoski2021-08-181-6/+6
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Add memory print usagehubmartin2021-08-181-6/+6
| | |_|_|_|/ | |/| | | |
* / | | | | New touch handler, with issuesRiku Isokoski2021-07-151-0/+4
|/ / / / /
* | | | | Using littlefs (#438)joaquim.org2021-07-111-4/+25
* | | | | Add PineTimeStyle watchface (#334)kieranc2021-06-291-0/+4
| |_|_|/ |/| | |
* | | | Remove infinitime-nb.c from source listJonathan Vander Mey2021-06-121-2/+0
* | | | add basic metronome app (#409)Bryton Hall2021-06-121-0/+2
* | | | Initialize SystemTask, DisplayApp and HeartRateTask as global static variable...Jean-François Milants2021-06-061-2/+2
| |_|/ |/| |
* | | Enable various compilation flags to reduce the binary size (#401)JF0022021-06-011-37/+37
* | | Remove debug defines (DEBUG & DEBUG_NRF_USER) from the build. These debug can...JF0022021-06-011-2/+4
| |/ |/|
* | Timer App (#355)Florian2021-05-201-0/+5
|/
* New Steps appJoaquim2021-04-191-0/+3
* Merge branch 'develop' into motion-sensorJean-François Milants2021-04-091-92/+18
|\
| * Big UI and navigation RewriteJoaquim2021-04-041-92/+17
* | TwiMaster is now based on the NRFX TWI driver, as it handles more edge cases ...Jean-François Milants2021-04-081-1/+1
* | First integration of the motion sensor (bma 421) : step counting + wake on wr...Jean-François Milants2021-04-041-0/+14
|/
* Updated to include WatchFaceAnalog and fixed clashesNiall Cooling2021-03-221-18/+213
|\
| * Merged upstreampanky-codes2021-03-201-19/+218
| |\
| | * Merge branch 'develop' of github.com:JF002/Pinetime into developJean-François Milants2021-03-201-1/+13
| | |\
| | | * Merge from upstreamJoaquim2021-03-061-9/+20
| | | * Merge branch 'develop' of https://github.com/JF002/Pinetime into MultiFaceClockJoaquim2021-02-251-7/+7
| | | |\
| | | * | Multi face support, analog clock, 12/24 configJoaquim2021-02-241-1/+12
| | * | | Merge branch 'develop' into recovery-firmwareJean-François Milants2021-03-071-122/+183
| | |\ \ \
| | * | | | Add new cmake option to disable the generation of DFU file (which needs adafr...Jean-François Milants2021-02-011-3/+24
| | * | | | Generate pinetime-recovery : a light version of InfiniTime design to be used ...Jean-François Milants2021-01-261-19/+184
| * | | | | Merge branch 'develop' of github.com:JF002/Pinetime into feature/add-stop-watchpanky-codes2021-03-111-9/+20
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Basic logic done. Need to change the timer source to get ms. Also need to rep...panky-codes2021-03-111-0/+2
| | |_|_|/ | |/| | |
* | | | | Resolved C++14 Cmake build issues so correctly building to C99/C++14 standardsNiall Cooling2021-03-161-16/+0
| |/ / / |/| | |
* | | | Refactored src/CMakelist to support C++14 and cleanup up redundant/incorrect ...Niall Cooling2021-03-031-9/+20
|/ / /