aboutsummaryrefslogtreecommitdiffstats
path: root/src/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
...
* New Steps appJoaquim2021-04-191-0/+3
| | | | | | Settings to set the steps goal More detail in Motion app New 42px Font
* Merge branch 'develop' into motion-sensorJean-François Milants2021-04-091-92/+18
|\ | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/CMakeLists.txt # src/displayapp/Apps.h # src/displayapp/DisplayApp.cpp # src/displayapp/DisplayApp.h # src/displayapp/lv_pinetime_theme.c # src/displayapp/screens/ApplicationList.cpp # src/drivers/TwiMaster.cpp # src/systemtask/SystemTask.h
| * Big UI and navigation RewriteJoaquim2021-04-041-92/+17
| | | | | | | | | | | | | | | | | | | | | | new navigation add some color to the apps redesign menus new settings menu new quick settings code clean up size reduction by converting navigation images to font and more...
* | TwiMaster is now based on the NRFX TWI driver, as it handles more edge cases ↵Jean-François Milants2021-04-081-1/+1
| | | | | | | | | | | | and workarounds for errors on the bus. Reset the TWI bus after the soft-reset of the motion sensor to workaround issues on the TWI bus.
* | First integration of the motion sensor (bma 421) : step counting + wake on ↵Jean-François Milants2021-04-041-0/+14
|/ | | | wrist rotation + app to see the value of the 3 axis in "real time".
* 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
| | |\ | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/main.cpp # src/systemtask/SystemTask.h
| | | * 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
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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).
| | * | | | Generate pinetime-recovery : a light version of InfiniTime design to be used ↵Jean-François Milants2021-01-261-19/+184
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | 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 ↵panky-codes2021-03-111-0/+2
| | |_|_|/ | |/| | | | | | | | | | | | | 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-161-16/+0
| |/ / / |/| | |
* | | | 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
| | |
* | | Merge branch 'LVGL7' of https://github.com/joaquimorg/Pinetime into ↵Jean-François Milants2021-02-231-97/+144
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | CleanupJoaquim2021-02-011-6/+0
| | |
| * | Merge branch 'develop' of https://github.com/JF002/Pinetime into LVGL7Joaquim2021-02-011-1/+1
| |\ \
| * | | LVGL v7.10.0Joaquim2021-01-281-96/+148
| | |/ | |/|
* | | Fix merge conflict.Jean-François Milants2021-02-141-0/+4
|\ \ \
| * | | Merge branch 'develop' into upstream-devThe King2021-01-241-0/+104
| |\| |
| * | | fix merge issuejlukanc2021-01-231-0/+5
| | | |
| * | | fis merge conflict?jlukanc2021-01-231-1/+1
| | | |
| * | | add motorcontroller to cmakejlukanc2021-01-151-0/+2
| | | |
| * | | add non-blocking motor controllerjlukanc2021-01-151-0/+2
| | | |
* | | | Merge pull request #161 from petterhs/callsJF0022021-02-141-2/+0
|\ \ \ \ | |_|_|/ |/| | | Call functionality with changed UUID for notification event characteristic
| * | | Handle call notification the same way than other notifications.Jean-François Milants2021-01-241-2/+0
| | |/ | |/| | | | | | | Display the call notifications in the Notification app, with buttons to accept/reject the call.
* / | Update CMakeLists.txtAvamander2021-01-301-1/+1
|/ /
* | Merge branch piggz/nav into develop:Jean-François Milants2021-01-201-0/+92
| | | | | | | | | | - fix conflict - add a icon for the navigation app.
* | Add heart rate BLE service.Jean-François Milants2021-01-171-0/+2
| |
* | First implementation of the HR sensor using 100% foss code (ported from waspos)Jean-François Milants2021-01-101-0/+15
|/
* adds 2048 clone gameJed2021-01-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | styles table reads touch events allows moving tiles allows merging tiles improves tile movement allows merging tiles adds score display implements color edit comments adjust game logic disallows double merges
* Addition of new files in MakeListZephyrLabs2020-12-031-0/+2
| | | | added Paddle.cpp and Paddle.h
* Flash the correct file when running FLASH_pinetime-app with JLinkRyan Hartlage2020-11-141-1/+1
|
* Refactoring of BLE service discovery : it is now implemented into the ↵JF2020-10-291-0/+3
| | | | classes of the services.
* Fix conflictsJF2020-10-271-1/+3
|\
| * Disable sleep mode on the SPI NOR Flash when the version is unknown. This is ↵JF2020-10-271-0/+2
| | | | | | | | | | | | because the current bootloader (which does not exposes its version) cannot initialize the chip when it's in sleep mode. This feature will be re-enabled when the bootloader expses it's version.
| * Minor formatting, diagnostic and documentation changesAvamander2020-10-091-1/+1
| |
| * Removed an incomplete message() call from CMakeLists.txtAvamander2020-10-041-1/+0
| |
* | Integrate new notification UI with notifications coming from BLEJF2020-10-201-4/+6
| |
* | [WIP] Add new notification UI that use HW scrolling effects. Both ↵JF2020-10-191-2/+3
| | | | | | | | notification apps are available in the menu, we can compare them.
* | [WIP] New notification app that uses software scrolling effect.JF2020-10-181-0/+2
|/
* Fixed all the includes that were broken due to the renamesAvamander2020-10-021-58/+58
|
* Renamed displayapp/Screens to displayapp/screensAvamander2020-10-021-35/+35
|
* Renamed DisplayApp/ to displayapp/Avamander2020-10-021-68/+68
|