will/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,849 Commits 10 Branches 2 Tags 78 MiB
668820ef5a
Commit Graph

1849 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
joaquim.org
524e204ed1
Merge branch 'develop' into MultiFaceClock 2021-03-06 20:08:55 +00:00
Joaquim
adc38d5c93 clean up vsc settings 2021-03-06 19:57:41 +00: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
ada9425357
Merge pull request #223 from hubmartin/patch-1 
Add link to README.md to WebBLEWatch to update time from web browser
 2021-03-06 17:36:40 +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
JF002
d22e8a47e8
Merge pull request #221 from nscooling/C++14 
Refactored src/CMakelist to support C++14
 2021-03-06 17:33:41 +01:00
Martin Hub
66e2092357
Add WebBLEWatch option to update time 2021-03-04 17:11:06 +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
Jean-François Milants
a44260aab0 Update pictures in the main README.md file. 2021-02-25 21:18:22 +01:00
Joaquim
6a5aea2919 Merge branch 'develop' of https://github.com/JF002/Pinetime into MultiFaceClock 2021-02-25 20:01:30 +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
Jean-François Milants
e8a8a8417f Set version to 0.14.0 2021-02-24 20:28:26 +01: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
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
roblabla
9f6d1c6948 Flash correct file name 2021-02-19 19:44:51 +01: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
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