Jean-François Milants
5845fd98ba
Add submodule again...
2021-03-07 09:15:26 +01:00
Jean-François Milants
9f67e6f652
Merge branch 'develop' into recovery-firmware
...
# Conflicts:
# src/CMakeLists.txt
# src/displayapp/DisplayApp.h
# src/systemtask/SystemTask.cpp
# src/systemtask/SystemTask.h
2021-03-07 08:44:14 +01:00
JF002
54dcd77c61
Merge pull request #222 from nscooling/refactor-clock-private-statics
...
Moved private statics into unnamed namespace in cpp file
2021-03-06 17:34:57 +01:00
Niall Cooling
d34a510158
Moved private statics into unnamed namespace in cpp file to reduce coupling and uncessar in header
2021-03-03 17:07:05 +00:00
Niall Cooling
35aa4bb8d6
Refactored src/CMakelist to support C++14 and cleanup up redundant/incorrect -std= directives
2021-03-03 15:27:32 +00:00
JF002
8a48850afd
Merge pull request #211 from roblabla/fix-flashing
...
Flash correct file name
2021-02-24 20:05:47 +01:00
Jean-François Milants
094f98743d
Fix LVGL submodule (sorry!)
2021-02-23 21:53:50 +01:00
Jean-François Milants
b11b20b0ac
Remove LVGL folder (it's now a submodule)
2021-02-23 21:21:29 +01:00
Jean-François Milants
f864330d35
Merge branch 'LVGL7' of https://github.com/joaquimorg/Pinetime into 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-23 21:18:59 +01:00
Joaquim
3fe3f06299
Fix delay in button actions
2021-02-22 21:33:27 +00:00
roblabla
9f6d1c6948
Flash correct file name
2021-02-19 19:44:51 +01:00
Jean-François Milants
f81ff98c30
Merge branch 'develop' of github.com:JF002/Pinetime into develop
2021-02-14 14:42:42 +01:00
Jean-François Milants
01e194426d
Fix IRQ management in FreeRTOS to avoid crash and deadlock in BLE stack.
2021-02-14 14:42:30 +01:00
JF002
e62f8734be
Merge pull request #205 from nscooling/dirtyRefactor
...
refactored class DirtyValue
2021-02-14 14:37:26 +01:00
JF002
57ce58ff0d
Merge pull request #186 from petterhs/musicUI
...
music: Symbols for the buttons
2021-02-14 14:32:15 +01:00
Jean-François Milants
2922b26121
Remove debug variable.
2021-02-14 14:30:34 +01:00
JF002
0ad10a3817
Merge branch 'develop' into Hrs3300_SetGain_remove_warnings
2021-02-14 14:26:49 +01:00
JF002
97a1c4b3d7
Merge pull request #182 from petterhs/warnings
...
Fix build warnings coming from HR implementation
2021-02-14 14:25:38 +01:00
Jean-François Milants
5fdfb2112e
Fix merge conflict.
2021-02-14 14:19:30 +01:00
JF002
4c3803450e
Merge pull request #161 from petterhs/calls
...
Call functionality with changed UUID for notification event characteristic
2021-02-14 12:03:49 +01:00
Niall Cooling
6c03c97005
eliminated warnings in Hrs3300
2021-02-12 17:36:56 +00:00
Niall Cooling
751ffab497
refactored class DirtyValue
2021-02-12 17:13:02 +00:00
Jean-François Milants
4918524550
Fix memory leak in timer management in port layer of Nimble.
2021-02-07 18:09:19 +01:00
petter
1e2cc3ce91
add vibration toggle
2021-02-07 13:31:02 +01:00
petter
7ab153cd76
refactor MotorController
2021-02-05 17:12:46 +01:00
petter
1bd5457848
trigger vibration from systemtask
2021-02-05 15:43:20 +01:00
Jean-François Milants
5016e0143f
Increase FreeRTOS heap size and re-enable heart rate task. New Nimble probably uses more memory than before.
2021-02-03 20:28:41 +01:00
Jean-François Milants
d90b7274fa
Update to nimble 1.3 master branch commit 82153e744833821e20e9a8b0d61c38b2b0dbcfe1
...
WARNING : heartbeat task is disabled!
2021-02-02 22:09:00 +01:00
Jean-François Milants
740b3d7b58
Add new cmake option to disable the generation of DFU file (which needs adafruit-nrfutil on the build machine) : BUILD_DFU (disabled by default, enabled in docker build).
2021-02-01 21:07:53 +01:00
Joaquim
a4361de0cf
Cleanup
2021-02-01 12:14:49 +00:00
Joaquim
ccd423bcef
Merge branch 'develop' of https://github.com/JF002/Pinetime into LVGL7
2021-02-01 10:44:10 +00:00
JF002
97807edd9d
Merge pull request #193 from Avamander/patch-5
...
Updated CMakeLists.txt to be more consistent
2021-01-31 20:51:02 +01:00
Jean-François Milants
51ff9d5e7b
Normalize all the line endings
2021-01-31 20:50:04 +01:00
Jean-François Milants
d2bb209d7f
Remove BLE debug code
2021-01-31 19:51:36 +01:00
Avamander
4371b7fecc
Update CMakeLists.txt
2021-01-30 19:11:07 +02:00
Joaquim
a456887eff
LVGL v7.10.0
2021-01-28 17:13:28 +00:00
Joaquim
efa99da44d
LVGL V7 Upgrade
2021-01-28 17:07:28 +00:00
petter
d4c31bcbbe
add mute button and functionality for call notification + new button icons
2021-01-27 17:07:46 +01:00
petter
700af0b8a1
improve music UI with icons for play/pause/next/prev/ and volume
2021-01-27 13:49:56 +01:00
petter
7ea2cbff67
update font with icons for music, call and qr
2021-01-27 13:48:30 +01:00
petter
523398d24a
update font with icons for music, call and qr
2021-01-27 13:42:04 +01:00
Jean-François Milants
25f35c7d0e
Generate pinetime-recovery : a light version of InfiniTime design to be used 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-26 20:31:45 +01:00
jlukanc
da56ca5bfb
remove vibtimer from .h to fix nonstop vibration
2021-01-25 13:03:04 -05:00
petter
3dd88339f3
create motorcontroller in main and pass by reference
2021-01-25 12:45:04 -05:00
jlukanc
f27e632906
move app timer def
2021-01-25 12:44:58 -05:00
petter
169b861af1
fix build warnings in HR implementation
2021-01-25 14:53:44 +01:00
The King
8c3df5f021
Merge branch 'develop' into upstream-dev
2021-01-24 16:01:14 -05:00
Jean-François Milants
3d1881c5ab
Revert invalid changes in Navigation.h and add missing changes in Notifications.h.
2021-01-24 17:27:48 +01:00
Jean-François Milants
219bafb01a
Handle call notification the same way than other notifications.
...
Display the call notifications in the Notification app, with buttons to accept/reject the call.
2021-01-24 17:22:39 +01:00
jlukanc
51c8cadcb7
fix merge issue
2021-01-23 16:13:58 -05:00