will/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
631 Commits 10 Branches 2 Tags 78 MiB
7b39130f88
Commit Graph

395 Commits

Author SHA1 Message Date
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
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
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