Commit Graph

467 Commits

Author SHA1 Message Date
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
jlukanc
51c8cadcb7 fix merge issue 2021-01-23 16:13:58 -05:00
jlukanc
4cbcc99c8d fis merge conflict? 2021-01-23 16:12:06 -05:00
jlukanc
bf7d77bd34 remove unneeded defines 2021-01-23 15:15:42 -05:00
petter
6d76dbc911 change Notification Event base UUID 2021-01-21 23:36:17 +01:00
petter
2d90571f0d change Notification Event UUID 2021-01-21 23:15:34 +01:00
Rasmus Schenstrom
10ba20876f Add incoming call functionality
Add categories to AlertNotification

Add new alert notification screens bases

Add Incoming Call

Add Modal

Add event to AlertNotification

Co-authored-by: Robin Karlsson <robin.karlsson@protonmail.com>
2021-01-21 23:15:29 +01:00
Niall Cooling
66a296d0f3 changed command MemoryDataAccessControl from 036 to 0x36 in St7789 class 2021-01-21 07:51:43 +00:00
JF002
be48f5275a
Merge pull request #168 from Panky-codes/fix-erratic-battery
Fix erratic battery
2021-01-20 20:41:55 +00:00
Jean-François Milants
522a1eb0be Merge branch piggz/nav into develop:
- fix conflict
 - add a icon for the navigation app.
2021-01-20 21:34:09 +01:00
JF002
a0f2fa8469
Merge pull request #169 from JF002/heartRateSensor
Heart rate sensor
2021-01-20 20:11:56 +00:00
JF002
35d4f6d487
Merge pull request #171 from JF002/fix-lvgl-animation
Fix bug in animation management for lv_label
2021-01-20 20:09:59 +00:00
Jean-François Milants
ba03372f3b Music UUID must start with 00000000 instead of 00010000 (copy/paste error) 2021-01-19 21:38:53 +01:00
Jean-François Milants
ccbe2e8e1b Adapt the UUID of Music service according to new guidelines. 2021-01-19 21:27:44 +01:00
Jean-François Milants
39d9fc2053 Fix bug in animation management for lv_label 2021-01-17 18:25:22 +01:00
Jean-François Milants
68674cec53 Add heart rate BLE service. 2021-01-17 16:34:14 +01:00
Jean-François Milants
3a3a14115a Add License/copyright info in HR related files. 2021-01-17 16:33:45 +01:00
panky-codes
b31c0e7e45 Added more descriptive comments in doxygen format. 2021-01-17 11:06:24 +01:00
Jean-François Milants
04063cf0af HR Sensor : Add start/stop button to the HeartRate app (the HR sensors stays ON when the app is closed), display the HR value on the Clock app. 2021-01-17 10:39:46 +01:00
panky-codes
952021cdb6 Changed float to int in battery controller file. 2021-01-16 21:31:58 +01:00
panky-codes
8697a06642 Changed std accumulate to use int instead of a float. 2021-01-16 20:46:01 +01:00
panky-codes
271ca78be5 Converted all the other float usage to int. 2021-01-16 20:18:55 +01:00
panky-codes
e2d1f81915 Converted percent remaining calc to int. 2021-01-16 19:51:32 +01:00
panky-codes
11280d5f37 Adjusted the firmware to display percent instead of gfx. 2021-01-16 14:55:13 +01:00
jlukanc
b5992fd7ec add motor to notifs, fix tabs in motorcontroller.h 2021-01-15 22:49:37 -05:00
jlukanc
ce6c5d3bd3 add motorcontroller to cmake 2021-01-15 22:46:03 -05:00
jlukanc
fbb77baa3b add non-blocking motor controller 2021-01-15 22:11:53 -05:00
panky-codes
dece6c6bc8 Adapted the accumulate function to return float. 2021-01-14 22:11:17 +01:00
panky-codes
b8f943e73c Implemented a circular buffer and added an average alg for batter remaining percentage. 2021-01-14 21:22:36 +01:00
Jean-François Milants
c82c22650c HR Sensor : do not go to sleep when the HR app is running. 2021-01-10 22:02:21 +01:00
Jean-François Milants
1a582815ba First implementation of the HR sensor using 100% foss code (ported from waspos) 2021-01-10 17:57:26 +01:00
petter
10376cd81c fix MusicService UUID typo in comment 2021-01-08 15:35:43 +01:00
JF002
033a09db6d
Merge pull request #154 from jedmijares/twos-game
Adds 2048 clone game
2021-01-03 13:40:29 +00:00
Jean-François Milants
e0082f0ae3 Rename Pinetime in InfiniTime in sysinfo app. 2021-01-02 21:23:40 +01:00
Jed
12617ed1bf adds 2048 clone game
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
2021-01-02 14:15:12 -06:00
Michael
1a6de3326f Add source code license and link to github to system app 2020-12-28 02:45:24 -05:00
ZephyrLabs
cc04c2c1f8 Update Paddle.cpp
blankline removal
2020-12-20 11:53:39 +05:30
ZephyrLabs
61e78d338b Update Paddle.cpp
fix uppercase
2020-12-20 09:32:00 +05:30
ZephyrLabs
020840e04f Update Paddle.h
fix uppercase
2020-12-20 09:28:51 +05:30
ZephyrLabs
b098d27d08 Update Paddle.cpp
tranparent paddle bug fix.
2020-12-20 09:23:31 +05:30
ZephyrLabs
ea4d2560cf Update Paddle.cpp
added changes from PR
2020-12-08 10:06:30 +05:30
ZephyrLabs
6b2dbafd6c Update Paddle.h
add changes from PR
2020-12-08 09:50:44 +05:30
ZephyrLabs
a701ef23d8 Update Symbols.h
change symbol to correct vale
2020-12-04 14:09:12 +05:30
ZephyrLabs
418d857308 Update Paddle.cpp
bugfix: add missing class
2020-12-03 20:59:22 +05:30
ZephyrLabs
ad1a99acac Update Paddle.h
bugfix: add missing class
2020-12-03 20:57:54 +05:30
ZephyrLabs
09a94ee2b8 Update DisplayApp.cpp
fixed file typo
2020-12-03 20:17:22 +05:30
ZephyrLabs
91b37f8de0 Update DisplayApp.cpp
added Paddle header and paddle app screen
2020-12-03 20:04:37 +05:30
ZephyrLabs
253a86bb8c Update Apps.h
added Paddle app
2020-12-03 20:03:45 +05:30
ZephyrLabs
4f41d4d854 Update Paddle.cpp
create Paddle.cpp
2020-12-03 20:03:11 +05:30
ZephyrLabs
ed34096320 Update Paddle.h
created Paddle.h
2020-12-03 20:02:58 +05:30
ZephyrLabs
96346b9884 Update jetbrains_mono_bold_20.c
added paddle symbol in font
2020-12-03 20:02:35 +05:30
ZephyrLabs
29989b323e Update Readme.md
added range of paddle symbol
2020-12-03 20:02:08 +05:30
ZephyrLabs
251dddb0bf Update Symbols.h
added paddle symbol
2020-12-03 20:01:44 +05:30
ZephyrLabs
adfec51230 Update ApplicationList.cpp
added paddle app
2020-12-03 20:01:03 +05:30
ZephyrLabs
1d69c79942 Addition of new files in MakeList
added Paddle.cpp and Paddle.h
2020-12-03 19:46:36 +05:30
JF002
c6556bcdea
Merge pull request #136 from okaestne/include-cleanup
Includes cleanup
2020-12-01 21:44:44 +01:00
JF002
c87de415b2
Merge pull request #128 from AirHamster/cyrillic-font
Add Cyrillic symbols into jetbrains font
2020-12-01 21:39:44 +01:00
JF002
737a7e57ca
Merge pull request #124 from IoTPanic/patch-waketime-iotpanic
Reduced interval where the display shows the previous time on wake
2020-12-01 21:20:02 +01:00
Samuel Archibald
e180ec5f3a Jeez this is what I get for rushing 😬 2020-11-19 15:50:39 -05:00
Samuel Archibald
e18485c92b Whoops! Don't look at this XD 2020-11-19 15:47:27 -05:00
Samuel Archibald
681182d16a Readability and fix 2020-11-19 15:44:57 -05:00
JF002
fa4c0d5e3e
Merge pull request #125 from IoTPanic/patch-menubattery-iotpanic
Fixed battery percentage readout in the menu display
2020-11-19 19:49:05 +01:00
Samuel Archibald
3703611a60 Fixes #119! Improved based off suggested changes 2020-11-18 00:00:33 -05:00
okaestne
6e22509b5f
Delete Tab.cpp and Tab.h
as discussed with JF
2020-11-17 20:51:27 +01:00
JF002
b50e222e2e
Merge pull request #120 from ryanplusplus/transfert-typo
Fixed typo (Transfert -> Transfer)
2020-11-17 19:43:45 +01:00
Samuel Archibald
600dbb0280 Fix for comments on issue #125, bounds check removed 2020-11-16 09:43:32 -05:00
okaestne
f42b33ed6d
fix TWI includes 2020-11-16 01:35:51 +01:00
okaestne
cadc0c25d4
Include cleanup: displayapp + screens 2020-11-16 01:35:51 +01:00
okaestne
1516573df4
Include cleanup: components 2020-11-16 01:35:45 +01:00
okaestne
c3475b92fa
Include cleanup: drivers 2020-11-15 05:04:22 +01:00
Ryan Hartlage
a30282bdd5 Flash the correct file when running FLASH_pinetime-app with JLink 2020-11-14 19:23:16 -05:00
Ilia Zarubin
c25fd2e37f fonts: readme: add cyrillic symbols UTF-8 range 2020-11-07 23:44:22 +03:00
Ilia Zarubin
64408803be fonts: add cyrillic symbols in mono bold font
Just converted jetbrains and awesome fonts with additional cyrillic
symbols.
2020-11-07 23:43:20 +03:00
Samuel Archibald
c816d9b88e Fix to #119 2020-11-02 23:29:42 -05:00
Samuel Archibald
37c2768787 This is the actual fix, reducing the time between LCD is turned back on and the next task which will display the time is started. 2020-11-02 23:13:31 -05:00
Samuel Archibald
10c5260187 Fixed displaying last displayed time for ~100ms on wake 2020-11-02 21:14:28 -05:00
Ryan Hartlage
3ccfa1d924 Fixed typo (Transfert -> Transfer) 2020-11-01 15:44:06 -05:00
JF
29f8074fcb Refactoring of BLE service discovery : it is now implemented into the classes of the services. 2020-10-29 16:06:01 +01:00
JF
f90f2254f5 Reset BLE services on disconnect, do not start advertising if a connection is already established. 2020-10-28 18:23:09 +01:00
JF
7de43a1660 Fix conflicts 2020-10-27 21:55:18 +01:00
JF002
45e65b66b1
Merge pull request #111 from JF002/fix-twi-hang
Workaround for TWI driver freeze
2020-10-27 19:48:39 +01:00
JF
8a8c8aa863 Handle error code when calling TwiMaster::Read(). 2020-10-27 19:46:51 +01:00
JF
1bb2eb9dcd Disable sleep mode on the SPI NOR Flash when the version is unknown. This is 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.
2020-10-27 19:38:45 +01:00
JF
2f710d06f3 Workaround for bug https://github.com/JF002/Pinetime/issues/79 until a better fix is found.
When the driver is stuck in an infinite loop for more than ~2.5ms, the TWI device is re-init and the transaction is retried.

Read() and Write() return an error code.
2020-10-23 22:25:37 +02:00
Anton Fosselius
ab36c6cd24
Update main.cpp
changed "include Logging" to "include logging", now compiles with RTT ;)
2020-10-23 11:25:46 +02:00
JF
5983e33b8d Notifications : Replace the label "notificationNr/notificationNb" by a grey border on the bottom that is displayed when there are other notifications to available. 2020-10-22 15:39:20 +02:00
JF
07b6812f61 Notifications : Fix copy when the messages is spread across multiple os_mbuf. 2020-10-22 10:43:42 +02:00
JF
cabf1168d4 Notifications : Fix display of notification index/number. 2020-10-21 22:15:02 +02:00
JF
440ae412b9 Increase max size of notification message to 100 char.
Fix bug in message handling that would ignore the last character of the notification.
2020-10-21 17:31:56 +02:00
JF
ef5670c7e0 Integrate new notification UI with notifications coming from BLE 2020-10-20 20:57:39 +02:00
Enno Boland
8842259c7c fix build on linux
This commit fixes upper/lowercase issues in directory names that cause
the build to fail on case sensitive file systems like Linux uses.
2020-10-20 09:16:30 +02:00
JF
55427d83b8 [WIP] Add new notification UI that use HW scrolling effects. Both notification apps are available in the menu, we can compare them. 2020-10-19 21:46:41 +02:00
JF002
3c5fd5ca8b
Merge pull request #93 from robertecurtin/master
Fix typo in SystemInfo app.
2020-10-18 17:50:20 +02:00
JF002
c655ec71f0
Merge pull request #99 from rafacouto/patch-1
Update SystemInfo.cpp - Show MAC bytes with left-zeroes
2020-10-18 17:46:22 +02:00
JF
28bc434419 [WIP] New notification app that uses software scrolling effect. 2020-10-18 17:35:36 +02:00
Avamander
4b0a852053 Made sure to use right data type for a negative number 2020-10-15 22:52:53 +03:00
Avamander
174e5ccfe4 Removed weird parentheses from constexpr 2020-10-15 22:51:43 +03:00
Avamander
128a2ea226 Changed #define to constexpr in Music.cpp 2020-10-15 22:50:28 +03:00
Avamander
6f45c0f669 Unified MusicStatus enum constant capitalization with others 2020-10-15 22:45:53 +03:00
Avamander
d4531d7bf3 Reordered the functions in Music.cpp correctly 2020-10-15 22:16:08 +03:00
Avamander
82126edf88 Added lv_img_set_src_arr that does better type checking when drawing images from arrays 2020-10-15 22:16:08 +03:00
Avamander
2b9906184b Refactored and improved the Music watchapp 2020-10-15 22:16:08 +03:00
Robert Curtin
2d5ddb88a7 Noticed this typo when booting my PineTime 2020-10-12 08:45:41 -04:00
Rafa Couto
efb7a973a1
Update SystemInfo.cpp
Show MAC bytes with left-zeroes
2020-10-12 05:12:31 +02:00
Avamander
fd110dabe8 Reformatted InfiniPaint again 2020-10-09 11:36:16 +03:00