scott/InfiniTime
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 1 Wiki Activity
628 commits 2 branches 1 tag 45 MiB
Commit graph

628 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
JF002 91ddc666e3
Merge pull request #235 from MFAshby/doc_correction 
Small correction to git URL in documentation files
 2021-03-20 17:54:07 +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
JF002 9e9bb2085e
Merge pull request #217 from joaquimorg/MultiFaceClock 
Multi face support, analog clock, 12/24 config
 2021-03-20 11:27:16 +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
Martin Ashby bca7ba4eed
Small correction to git URL in documentation files 2021-03-15 23:13:46 +00: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 e63596b291 Set version to 0.14.1 2021-03-07 21:29:02 +01:00
JF c5dc4c55a7 Merge branch 'recovery-firmware' of JF/PineTime into develop 2021-03-07 18:45:35 +01:00
Jean-François Milants 5845fd98ba Add submodule again... 2021-03-07 09:15:26 +01:00
Jean-François Milants c083916f33 Revert "Add submodule again..." 
This reverts commit 15484d0b34.
 2021-03-07 09:08:45 +01:00
Jean-François Milants 15484d0b34 Add submodule again... 2021-03-07 08:50:35 +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.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