JF002
|
04fc33e2d4
|
Merge pull request #239 from muesli/badge-link
Fix README build-badge link
|
2021-04-04 15:37:56 +02:00 |
|
|
JF002
|
58a2d000c4
|
Merge pull request #238 from nscooling/make_unique
Resolved C++14 Cmake build issues so correctly building to C99/C++14
|
2021-03-31 20:33:37 +02:00 |
|
|
JF002
|
136d4bb85e
|
Merge pull request #249 from alexr4535/develop
add siglo as a companion app
|
2021-03-24 17:51:21 +01:00 |
|
|
Alex Robinson
|
181fb35b29
|
add siglo as a companion app
|
2021-03-23 18:19:56 -05:00 |
|
|
Niall Cooling
|
8eb947a223
|
replaced all unique_ptr.reset calls with std::make_unique
|
2021-03-22 17:56:26 +00:00 |
|
|
Niall Cooling
|
e5e3fc02b8
|
Updated to include WatchFaceAnalog and fixed clashes
|
2021-03-22 17:23:49 +00:00 |
|
|
Jean-François Milants
|
9f9d0eb5df
|
Set version to 0.15.0
|
2021-03-21 17:12:29 +01:00 |
|
|
Jean-François Milants
|
adefa1e660
|
Update buildAndProgram.md with info about Debug/Release builds.
|
2021-03-21 17:12:19 +01:00 |
|
|
JF002
|
0c8b371a4c
|
Merge pull request #245 from petterhs/fixDisplayErrors
fix display driver issues in recovery
|
2021-03-21 16:35:21 +01:00 |
|
|
JF002
|
84798329dc
|
Merge pull request #244 from joaquimorg/LVGL7.11.0
Update to LVGL 7.11.0 Final
|
2021-03-21 16:35:00 +01:00 |
|
|
JF002
|
7b39130f88
|
Merge pull request #231 from Panky-codes/feature/add-stop-watch
Added stopwatch
|
2021-03-21 16:33:27 +01:00 |
|
|
panky-codes
|
49f30189ef
|
Added stopwatch app to readme
|
2021-03-21 13:59:18 +01:00 |
|
|
petter
|
3b51b4367d
|
fix display driver issues in recovery
|
2021-03-21 12:29:57 +01:00 |
|
|
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 |
|
|
Christian Muehlhaeuser
|
161b36ab75
|
Fix README build-badge link
|
2021-03-21 03:11:32 +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 |
|
|
Joaquim
|
d257ad21be
|
Update to LVGL 7.11.0 Final
|
2021-03-20 18:12:44 +00: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 |
|
|
Niall Cooling
|
14bd790701
|
Resolved C++14 Cmake build issues so correctly building to C99/C++14 standards
|
2021-03-16 12:43:50 +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 |
|