| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'develop' of github.com:JF002/Pinetime into develop | Jean-François Milants | 2021-03-20 | 1 | -1/+13 |
| |\ | | | | | | | | | | | # Conflicts: # src/main.cpp # src/systemtask/SystemTask.h | ||||
| | * | Merge from upstream | Joaquim | 2021-03-06 | 1 | -9/+20 |
| | | | |||||
| | * | Merge branch 'develop' of https://github.com/JF002/Pinetime into MultiFaceClock | Joaquim | 2021-02-25 | 1 | -7/+7 |
| | |\ | |||||
| | * | | Multi face support, analog clock, 12/24 config | Joaquim | 2021-02-24 | 1 | -1/+12 |
| | | | | |||||
| * | | | Merge branch 'develop' into recovery-firmware | Jean-François Milants | 2021-03-07 | 1 | -122/+183 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # src/CMakeLists.txt # src/displayapp/DisplayApp.h # src/systemtask/SystemTask.cpp # src/systemtask/SystemTask.h | ||||
| | * | | | Refactored src/CMakelist to support C++14 and cleanup up redundant/incorrect ↵ | Niall Cooling | 2021-03-03 | 1 | -9/+20 |
| | | |/ | |/| | | | | | | | -std= directives | ||||
| | * | | Merge pull request #211 from roblabla/fix-flashing | JF002 | 2021-02-24 | 1 | -7/+7 |
| | |\ \ | | |/ | |/| | Flash correct file name | ||||
| | | * | Flash correct file name | roblabla | 2021-02-19 | 1 | -7/+7 |
| | | | | |||||
| | * | | Merge branch 'LVGL7' of https://github.com/joaquimorg/Pinetime into ↵ | Jean-François Milants | 2021-02-23 | 1 | -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 | ||||
| | | * | Cleanup | Joaquim | 2021-02-01 | 1 | -6/+0 |
| | | | | |||||
| | | * | Merge branch 'develop' of https://github.com/JF002/Pinetime into LVGL7 | Joaquim | 2021-02-01 | 1 | -1/+1 |
| | | |\ | |||||
| | | * | | LVGL v7.10.0 | Joaquim | 2021-01-28 | 1 | -96/+148 |
| | | | | | |||||
| | * | | | Fix merge conflict. | Jean-François Milants | 2021-02-14 | 1 | -0/+4 |
| | |\ \ \ | |||||
| | | * | | | Merge branch 'develop' into upstream-dev | The King | 2021-01-24 | 1 | -0/+104 |
| | | |\| | | |||||
| | | * | | | fix merge issue | jlukanc | 2021-01-23 | 1 | -0/+5 |
| | | | | | | |||||
| | | * | | | fis merge conflict? | jlukanc | 2021-01-23 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | add motorcontroller to cmake | jlukanc | 2021-01-15 | 1 | -0/+2 |
| | | | | | | |||||
| | | * | | | add non-blocking motor controller | jlukanc | 2021-01-15 | 1 | -0/+2 |
| | | | | | | |||||
| | * | | | | Merge pull request #161 from petterhs/calls | JF002 | 2021-02-14 | 1 | -2/+0 |
| | |\ \ \ \ | | |_|_|/ | |/| | | | Call functionality with changed UUID for notification event characteristic | ||||
| | | * | | | Handle call notification the same way than other notifications. | Jean-François Milants | 2021-01-24 | 1 | -2/+0 |
| | | | |/ | | |/| | | | | | | | | | Display the call notifications in the Notification app, with buttons to accept/reject the call. | ||||
| | * / | | Update CMakeLists.txt | Avamander | 2021-01-30 | 1 | -1/+1 |
| | |/ / | |||||
| * | | | Add new cmake option to disable the generation of DFU file (which needs ↵ | Jean-François Milants | 2021-02-01 | 1 | -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 Milants | 2021-01-26 | 1 | -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 piggz/nav into develop: | Jean-François Milants | 2021-01-20 | 1 | -0/+92 |
| | | | | | | | | | | | - fix conflict - add a icon for the navigation app. | ||||
| * | | Add heart rate BLE service. | Jean-François Milants | 2021-01-17 | 1 | -0/+2 |
| | | | |||||
| * | | First implementation of the HR sensor using 100% foss code (ported from waspos) | Jean-François Milants | 2021-01-10 | 1 | -0/+15 |
| |/ | |||||
| * | adds 2048 clone game | Jed | 2021-01-02 | 1 | -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 MakeList | ZephyrLabs | 2020-12-03 | 1 | -0/+2 |
| | | | | | added Paddle.cpp and Paddle.h | ||||
| * | Flash the correct file when running FLASH_pinetime-app with JLink | Ryan Hartlage | 2020-11-14 | 1 | -1/+1 |
| | | |||||
| * | Refactoring of BLE service discovery : it is now implemented into the ↵ | JF | 2020-10-29 | 1 | -0/+3 |
| | | | | | classes of the services. | ||||
| * | Fix conflicts | JF | 2020-10-27 | 1 | -1/+3 |
| |\ | |||||
| | * | Disable sleep mode on the SPI NOR Flash when the version is unknown. This is ↵ | JF | 2020-10-27 | 1 | -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 changes | Avamander | 2020-10-09 | 1 | -1/+1 |
| | | | |||||
| | * | Removed an incomplete message() call from CMakeLists.txt | Avamander | 2020-10-04 | 1 | -1/+0 |
| | | | |||||
| * | | Integrate new notification UI with notifications coming from BLE | JF | 2020-10-20 | 1 | -4/+6 |
| | | | |||||
| * | | [WIP] Add new notification UI that use HW scrolling effects. Both ↵ | JF | 2020-10-19 | 1 | -2/+3 |
| | | | | | | | | | notification apps are available in the menu, we can compare them. | ||||
| * | | [WIP] New notification app that uses software scrolling effect. | JF | 2020-10-18 | 1 | -0/+2 |
| |/ | |||||
| * | Fixed all the includes that were broken due to the renames | Avamander | 2020-10-02 | 1 | -58/+58 |
| | | |||||
| * | Renamed displayapp/Screens to displayapp/screens | Avamander | 2020-10-02 | 1 | -35/+35 |
| | | |||||
| * | Renamed DisplayApp/ to displayapp/ | Avamander | 2020-10-02 | 1 | -68/+68 |
| | | |||||
| * | Renamed Logging/ to logging/ | Avamander | 2020-10-02 | 1 | -4/+4 |
| | | |||||
| * | Renamed SystemTask/ to systemtask/ | Avamander | 2020-10-02 | 1 | -3/+3 |
| | | |||||
| * | Renamed Components/ to components/ | Avamander | 2020-10-02 | 1 | -31/+31 |
| | | |||||
| * | Reformatted the CMakeLists for consistency | Avamander | 2020-10-02 | 1 | -434/+462 |
| | | |||||
| * | Add Immediate Alert Service, needed by the "Find Me" profile from BLE spec. | JF | 2020-09-27 | 1 | -0/+2 |
| | | |||||
| * | Add BatteryInformationService to expose the battery level to BLE host. | JF | 2020-09-27 | 1 | -0/+2 |
| | | |||||
| * | Docker post build : generate post build script with versions from the CMake ↵ | JF | 2020-09-08 | 1 | -1/+0 |
| | | | | | project. | ||||
| * | Add paint application. | JF | 2020-08-21 | 1 | -0/+2 |
| | | |||||
| * | Add TouchModes : in Gestures mode, only 1 event is processed for each ↵ | JF | 2020-08-20 | 1 | -0/+4 |
| | | | | | | | touchevent. This allows to recognize gesture and handle them in Screens or in DisplayApp. In Polling mode, X/Y positions are sent continuously to lvgl, allowing to scroll inside a dropdown menu for example. | ||||
| * | Docker build : split build.sh into 2 scripts : build.sh that always exists ↵ | JF | 2020-08-20 | 1 | -1/+1 |
| | | | | | and post_build.sh that is generated by cmake build.sh | ||||
 |
index : InfiniTime | |
| My branch of InfiniTime | git daemon user |
| aboutsummaryrefslogtreecommitdiffstats |