Commit graph

560 commits

Author SHA1 Message Date
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
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
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
Avamander d6557c93f2
Create CONTRIBUTING.md 2021-01-30 18:15:38 +02:00
petter d4c31bcbbe add mute button and functionality for call notification + new button icons 2021-01-27 17:07:46 +01:00
petter 523398d24a update font with icons for music, call and qr 2021-01-27 13:42:04 +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
JF002 80838d1e42
Merge pull request #178 from petterhs/docker
check for cmake build-success before running post-build.sh
2021-01-23 21:33:11 +01:00
JF002 0a237a7c3a
Merge pull request #175 from nscooling/fix_octal_error_in_St7789_list
changed command MemoryDataAccessControl from 036 to 0x36 in St7789 class
2021-01-23 21:24:01 +01:00
JF002 d517b1109c
Merge pull request #172 from Avamander/patch-1
Create FUNDING.yml
2021-01-23 21:21:04 +01:00
jlukanc bf7d77bd34 remove unneeded defines 2021-01-23 15:15:42 -05:00