JF002
5b2472c4bc
Merge pull request #347 from jedi2light/feature-show-git-commit-hash-short
...
Feature: Store and show git short ref on PineTime alongside other firmware information
2021-05-16 11:37:39 +02:00
Florian Kraupa
9e8dd9a1e6
NotificationItem now also redefines the start of the timeout
2021-05-16 00:42:31 +02:00
Florian Kraupa
56af4a0b83
cleaned up the code and reduced the size of the diff by removing things like additional whitespaces
2021-05-16 00:42:31 +02:00
Florian Kraupa
5da65494b3
only activate the timeout on call notification previews after they have been interacted with
2021-05-16 00:42:31 +02:00
Florian Kraupa
d13dd6dee3
implemented continuous vibration pattern for incoming calls
2021-05-16 00:42:31 +02:00
Florian Kraupa
2627ef760e
better handling of long notification titles
2021-05-16 00:16:33 +02:00
Jean-François Milants
d7fa000b85
DisplayApp : returnApp was renamed ReturnApp() (manual fix after multiple merges).
2021-05-15 22:38:49 +02:00
JF002
09977c28c0
Merge pull request #298 from joaquimorg/StepsApp
...
New Steps app
2021-05-15 22:32:40 +02:00
JF002
204d63697c
Merge pull request #349 from Avamander/patch-2
...
Switched to booleans for infinite while loops
2021-05-15 09:57:22 +02:00
JF002
48018fc1d8
Merge pull request #350 from Avamander/patch-3
...
Added braces to a few if statements
2021-05-15 09:56:48 +02:00
Avamander
d29d513244
Fixed a naming inconsistency of DisplayApp::ReturnApp and a few formatting errors
2021-05-14 12:46:51 +03:00
Avamander
e54163b7c2
Added braces to a few if statements
2021-05-14 12:43:29 +03:00
Avamander
33f965f326
Switched to booleans for infinite while loops
2021-05-14 12:40:46 +03:00
Stoian Minaiev
a4de61e1f5
git: show git short ref hash on SystemInfo(first screen) and FirmwareValidation screen alongside other information
2021-05-14 01:09:40 +03:00
Stoian Minaiev
e04c8ee95e
git: store git short ref hash on build stage to Version.h
2021-05-14 01:08:37 +03:00
Stoian Minaiev
9a8824c35a
SystemInfo app screen
...
First screen. Let the build date and build time string be centered as well as the others
2021-05-10 15:13:33 +03:00
Martin Ashby
3a938236d4
Fix a possible double free in StopWatch::Refresh.
...
The lv_obj_del is called on btnStopLap when transitioning to the
initial state, however the variable isn't then set to null. A subsequent
call to Refresh would attempt to delete the already freed object. This
could be triggered by stopping the stop watch, then pressing the
physical button on the watch.
Fixes https://github.com/JF002/InfiniTime/issues/315
2021-05-03 08:11:58 +01:00
JF002
e3ead332b9
Merge pull request #319 from DavidVentura/use-byte-for-ppg
...
Use int8_t for PPG data array
2021-05-02 14:55:43 +02:00
JF002
65e4fe0310
Merge pull request #314 from eivindm/improved_heartbeat_in_watchface
...
Improve design of heartbeat data in digital watchface
2021-05-02 14:41:19 +02:00
Eivind Mork
3355afbbd1
Show heartbeat icon in watchface in gray if data is missing
2021-05-02 12:30:33 +02:00
JF002
9f15fd1820
Merge pull request #301 from petterhs/vib
...
Short vibration when enabling it in quick settings menu
2021-05-02 11:58:48 +02:00
petter
6e1726d1d0
short vibration when enabling it
2021-05-02 11:48:05 +02:00
JF002
d141888b82
Merge pull request #275 from panos/navigation-text
...
Changed text in Navigation
2021-05-02 11:45:08 +02:00
JF002
9af0eb04c2
Merge pull request #318 from Kozova1/TypoFix
...
Fix typo in src/displayapp/fonts/README.md
2021-05-02 11:43:35 +02:00
JF002
cd902e3670
Merge pull request #308 from joaquimorg/LVGL-Update
...
Update LVGL
2021-05-02 11:41:45 +02:00
david
a62b81da3d
Fix #209 . Use int8_t for PPG data array
2021-05-01 12:10:44 +02:00
Kozova1
d9bbda2010
Fix typo in src/displayapp/fonts/README.md
...
Signed-off-by: Kozova1 <mug66kk@gmail.com>
2021-04-30 01:02:30 +03:00
Joaquim
cd0d85dff9
Merge branch 'develop' of
...
https://github.com/JF002/InfiniTime into StepsApp
2021-04-26 21:29:48 +01:00
Avamander
6989854519
Changed access modified indentation
2021-04-24 12:00:45 +03:00
Avamander
40d45d923b
Reformatted all the files according to clang-format style
2021-04-24 11:39:53 +03:00
Joaquim
552f880a23
Update LVGL
...
fixes from upstream
2021-04-21 15:48:41 +01:00
Jean-François Milants
fefb429fb4
Fix formatting issue on the lap counter in Stopwatch (display lap counter on 2 characters).
2021-04-20 21:01:38 +02:00
Joaquim
5fc07a8df7
Fix button size and default step goal
2021-04-20 16:21:01 +01:00
Jean-François Milants
410cc821f4
Fix formatting issue on the lap counter in Stopwatch.
2021-04-19 20:30:51 +02:00
Joaquim
cd4a3e1dfe
New Steps app
...
Settings to set the steps goal
More detail in Motion app
New 42px Font
2021-04-19 15:28:38 +01:00
Jean-François Milants
bbc24e88b0
Fix a display glitch when an OTA is initiated while an app (other than Clock) was open and while the device was in sleep mode.
2021-04-18 17:44:40 +02:00
Jean-François Milants
a7114f21b7
Fix display consistency with the HR measurement when measurements are already running when the app is open.
2021-04-18 13:50:38 +02:00
JF002
6eaa395e7d
Merge pull request #285 from Peetz0r/fix-stopwatch-formatting
...
Fix stopwatch formatting
2021-04-18 10:47:46 +02:00
JF002
4152306bc3
Merge pull request #269 from petterhs/musicBtnTheme
...
Apply theme to Music buttons
2021-04-18 10:40:15 +02:00
Peetz0r
b221cc1731
Stopwatch: improve variable naming
...
msec => hundredths
2021-04-17 23:47:53 +02:00
Peetz0r
7caeecc09b
Stopwatch: improve number formatting
2021-04-17 23:47:02 +02:00
Panagiotis Vasilopoulos
a26f64996a
Changed text in Navigation
2021-04-17 05:40:05 +03:00
Jean-François Milants
63635381b0
Disable the reading of the motion values in sleep mode when the wake up mode is not 'wrist rotation'.
2021-04-16 20:05:46 +02:00
Joaquim
3c413bdd52
In order to stabilize the battery reading,
...
I modified the process to make 5 consecutive readings,
as the process is asynchronous,
there is no interference in the main process.
2021-04-16 16:15:38 +01:00
petter
2f1ddad403
fix style formatting in 2048 game
2021-04-16 01:18:32 +02:00
Joaquim José Almeida Pereira
969bb8e721
Change animation direction in menus
2021-04-15 15:55:01 +01:00
petter
d2f9ea893a
apply button theme to Music UI
2021-04-14 23:43:06 +02:00
Joaquim
f5e43a1668
Move Task info to about menu
...
fix build error in WatchFaceDigital
2021-04-11 17:20:15 +01:00
Joaquim
012c246e40
0.16.0 TWI problems fix
...
More memory for freertos heap and timer stack
Fix warning in watchface
Fix number of bytes read by cst816
Debug app to show freertos tasks
Increased the number of bytes of the twi write buffer
2021-04-10 19:09:33 +01:00
Jean-François Milants
15b3b8e282
Merge branch 'develop' into motion-sensor
...
# 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
2021-04-09 21:16:21 +02:00
Jean-François Milants
57b4c3f0ed
Fix display of empty notification.
2021-04-09 20:50:09 +02:00
Jean-François Milants
63584b6561
Merge branch 'develop' into notification-title
...
# Conflicts:
# src/displayapp/screens/Notifications.cpp
2021-04-09 20:47:24 +02:00
JF002
9096d1db4c
Merge pull request #259 from JF002/fix-music-app2
...
Fix music app
2021-04-09 20:44:02 +02:00
Joaquim
3685095da0
add more memory to displayapp task
2021-04-09 09:29:29 +01:00
Jean-François Milants
9ac4be8b75
TwiMaster is now based on the NRFX TWI driver, as it handles more edge cases 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.
2021-04-08 20:07:24 +02:00
Joaquim
3cf4df905a
restore battery buffer
2021-04-08 16:15:57 +01:00
Joaquim
365e68e6cc
Fix wake up lock in twi
...
optimize battery code
2021-04-05 15:22:10 +01:00
Joaquim José Almeida Pereira
96961709f3
array in SettingWakeUp wrong size
2021-04-05 11:01:44 +01:00
Joaquim
7e2db806c3
font creation
2021-04-04 22:03:53 +01:00
Jean-François Milants
f8b9a7c060
Fix music app :
...
- Enable LVGL animation (and disable groups, which were not used), and set the speed.
- Fix disc animation and progress display by initializing lastIncrement at 0 (a random value will be used otherwise, in release build)
2021-04-04 17:19:41 +02:00
Jean-François Milants
1d7576de64
Reset the step count every day at midnight.
2021-04-04 15:56:40 +02:00
Jean-François Milants
52a90288fd
Handle return code from BMA driver, and set a flag is the initialization fails. This allows to boot InfiniTime even if the device cannot initialize.
2021-04-04 15:56:11 +02:00
Jean-François Milants
c7cc47ae30
Code cleaning in BMA421 driver. Do the axis inversion in the driver and not in the application.
...
NOTE: Axis remapping from the SDK do not apply to the "raw" X/Y/Z values returned to the sensor. According to the doc, the remapping is only applied to features, but I cannot check if it has any effect on step counting (I'm not sure I use it correctly, doc is not complete enough about this feature).
2021-04-04 15:56:11 +02:00
Jean-François Milants
68bdaee1cc
First integration of the motion sensor (bma 421) : step counting + wake on wrist rotation + app to see the value of the 3 axis in "real time".
2021-04-04 15:56:04 +02:00
Jean-François Milants
3934e9bef2
Ignore notification with empty message.
2021-04-04 15:19:37 +02:00
Joaquim
bb7531e208
double tap wakeup error fix
...
battery nonblocking read
2021-04-04 13:51:22 +01:00
Jean-François Milants
1b71a10beb
Notification app : disable swipe when the app is in 'preview' mode. In this mode, only the new notification should be displayed, there is no point to allow navigating to past notifications.
...
Works as a workaround for the crash that occurs when you swipe the notification app in preview mode (https://github.com/JF002/InfiniTime/issues/250 ).
2021-04-04 13:42:22 +02:00
Jean-François Milants
03de1c6739
Add support for notification title. The notification buffer must contain the title and the message separated by a '\0' character.
...
If the buffer does not contain any \0, the whole buffer is considered to be the message of the notification. A default title will be displayed in the notification app.
2021-04-04 12:10:47 +02:00
Joaquim
1d3742e14f
Big UI and navigation Rewrite
...
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...
2021-04-04 03:08:51 +01:00
Niall Cooling
8eb947a223
replaced all unique_ptr.reset calls with std::make_unique
2021-03-22 17:56:26 +00:00
Niall Cooling
e5e3fc02b8
Updated to include WatchFaceAnalog and fixed clashes
2021-03-22 17:23:49 +00:00
JF002
0c8b371a4c
Merge pull request #245 from petterhs/fixDisplayErrors
...
fix display driver issues in recovery
2021-03-21 16:35:21 +01:00
JF002
84798329dc
Merge pull request #244 from joaquimorg/LVGL7.11.0
...
Update to LVGL 7.11.0 Final
2021-03-21 16:35:00 +01:00
petter
3b51b4367d
fix display driver issues in recovery
2021-03-21 12:29:57 +01:00
panky-codes
dd9d6cd23e
Reverted the paddle app in displayapp.cpp
2021-03-21 11:15:31 +01:00
panky-codes
bb12ae9d65
Updated lvgl submodule to match with develop branch
2021-03-21 10:43:14 +01:00
panky-codes
5345650880
Merged upstream
2021-03-20 22:45:29 +01:00
panky-codes
754ac23304
Reworked based on PR comments.
2021-03-20 22:42:13 +01:00
Joaquim
d257ad21be
Update to LVGL 7.11.0 Final
2021-03-20 18:12:44 +00:00
JF002
a3ff2e46ca
Merge pull request #240 from joaquimorg/ScreenCorruptionFIX
...
FIX screen corruption (Issue #213 )
2021-03-20 18:10:13 +01:00
JF002
463e60eb4e
Merge pull request #237 from muesli/systeminfo-url
...
Update project URL in SystemInfo
2021-03-20 17:55:32 +01:00
Jean-François Milants
405c85c160
Merge branch 'develop' of github.com:JF002/Pinetime into develop
...
# Conflicts:
# src/main.cpp
# src/systemtask/SystemTask.h
2021-03-20 11:41:49 +01:00
Joaquim
dba7e47ac0
FIX screen corruption #213
2021-03-18 19:38:19 +00:00
Niall Cooling
14bd790701
Resolved C++14 Cmake build issues so correctly building to C99/C++14 standards
2021-03-16 12:43:50 +00:00
Christian Muehlhaeuser
509ac066d4
Update project URL in SystemInfo
...
Pinetime -> InfiniTime
2021-03-16 04:01:22 +01:00
panky-codes
abc30028a2
Removed unused variables. Tested.
2021-03-15 21:35:36 +01:00
panky-codes
bc6d447a5f
Increased the size of the button and realigned the layout a bit. Tested.
2021-03-13 22:29:07 +01:00
panky-codes
d409643b8e
Added some comments for clarity. Ready for review. Tested.
2021-03-13 14:53:37 +01:00
panky-codes
02824d0671
Stopwatch completed. Ready for PR
2021-03-13 14:38:18 +01:00
panky-codes
5d57b9054a
Adding laps completed.
2021-03-13 13:59:54 +01:00
panky-codes
00f2a053bf
Laps introduced. Tested. Need to change the icon.
2021-03-12 20:24:53 +01:00
panky-codes
a090664a4c
Added a button for stop lap. Logic works. Need to implement symbol and buffer for lap
2021-03-12 09:43:13 +01:00
panky-codes
70373e7345
Added play/pause button.
2021-03-11 23:41:24 +01:00
panky-codes
ce91e1a7a6
Changed the clock source. Stopwatch works. Need to add butttons.
2021-03-11 11:56:58 +01:00
panky-codes
1f8f527f9f
Merge branch 'develop' of github.com:JF002/Pinetime into feature/add-stop-watch
2021-03-11 10:54:58 +01:00
panky-codes
cc58b635a3
Basic logic done. Need to change the timer source to get ms. Also need to replace with paddle app in displayApp.cpp and ApplicationList.cpp later.
2021-03-11 10:54:14 +01:00
Joaquim José Almeida Pereira
282e34dca1
fix AM/PM
2021-03-08 12:23:32 +00:00
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
Joaquim
97deb43fb7
Update from JF comments to PR
2021-03-06 19:55:53 +00:00
Joaquim
3d6e8c3beb
Merge from upstream
2021-03-06 19:55:36 +00: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
Joaquim
ee6ce64571
Merge branch 'develop' of https://github.com/JF002/Pinetime into MultiFaceClock
2021-02-25 09:28:25 +00:00
Joaquim
8c53d0b70b
Multi face support, analog clock, 12/24 config
2021-02-24 19:40:24 +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