1
0
Fork 0
Commit graph

580 commits

Author SHA1 Message Date
Joaquim
8c53d0b70b Multi face support, analog clock, 12/24 config 2021-02-24 19:40:24 +00:00
Jean-François Milants
c18f4e5811 Update doc : init git submodule before build. 2021-02-23 22:37:21 +01:00
Jean-François Milants
094f98743d Fix LVGL submodule (sorry!) 2021-02-23 21:53:50 +01:00
Jean-François Milants
67c545b1fb Merge branch 'joaquimorg-LVGL7' into develop 2021-02-23 21:25:43 +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
Jean-François Milants
324c7dab32 Set version to 0.13.0 2021-02-14 14:46:22 +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
3a1ccdb43e
Merge pull request #206 from nscooling/Hrs3300_SetGain_remove_warnings
Eliminated warnings in Hrs3300
2021-02-14 14:27:14 +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
07a0d7cf2d Merge branch 'jlukanc1-upstream-dev' into develop 2021-02-14 14:19:46 +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
6420885abb Set version to 0.12.1 2021-02-07 18:09:53 +01: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
ee430fe5a9 Merge branch 'update-nimble-1_3-master' into develop 2021-02-04 17:55:35 +01:00
JF002
6259b81628
Merge pull request #198 from JF002/update-nimble-1_3-master
Update to nimble 1.3 master branch
2021-02-04 17:34:28 +01:00
Jean-François Milants
16ce5bbb75 Set version to 0.12..0 2021-02-04 17:33:22 +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
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
9c35b6fe5d
Merge pull request #197 from Avamander/patch-9
Enabled clang-format in Clion
2021-01-31 21:06:06 +01:00
JF002
1ea4c7d744
Merge pull request #196 from Avamander/patch-8
Added clang-tidy configuration
2021-01-31 21:05:50 +01:00
JF002
9810f58a71
Merge pull request #194 from Avamander/patch-6
Added Clang formatting rules
2021-01-31 21:05:25 +01:00
JF002
2b45df3390
Merge pull request #195 from Avamander/patch-7
Improve CLion's formatting rules
2021-01-31 20:52:44 +01: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
JF002
ec0deb66b7
Merge pull request #192 from Avamander/patch-4
Create .gitattributes
2021-01-31 20:32:12 +01:00
JF002
79a33bce63
Merge pull request #191 from Avamander/patch-3
Create .gitconfig
2021-01-31 20:31:53 +01:00
JF002
5010255193
Merge pull request #190 from Avamander/patch-1
Create CONTRIBUTING.md
2021-01-31 20:27:22 +01:00
Avamander
a9e79468d0 Re-enabled use-after-move warning 2021-01-31 00:05:23 +02:00
Avamander
187fe5d7b8 Enabled clang-format in Clion 2021-01-31 00:01:22 +02:00
Avamander
10767d5e0a Added clang-tidy configuration 2021-01-30 23:55:35 +02:00
Avamander
9be9ddca45 Improve CLion's formatting rules 2021-01-30 23:50:40 +02:00
Avamander
f907fcbe61 Added Clang Format rules 2021-01-30 23:46:12 +02:00
Avamander
4371b7fecc
Update CMakeLists.txt 2021-01-30 19:11:07 +02:00
Avamander
f692754841
Create .gitattributes 2021-01-30 18:52:14 +02:00
Avamander
04fd4a7d03
Create .gitconfig 2021-01-30 18:48:06 +02:00