JF002
|
ef9f809e14
|
Merge pull request #458 from kieranc/pinetimestyle-colorpicker
Add color picker for PineTimeStyle watchface
|
2021-08-28 20:56:34 +02:00 |
|
JF002
|
2870d3ae6c
|
Merge pull request #497 from Riksu9000/refresh_rework
Rework Refresh
|
2021-08-28 16:39:48 +02:00 |
|
Riku Isokoski
|
c2fae47391
|
Merge branch 'develop' into refresh_rework
|
2021-08-28 17:25:50 +03:00 |
|
Jean-François Milants
|
fab49f8557
|
Fix recovery firmware since last changes in DisplayApp.
|
2021-08-28 15:23:13 +02:00 |
|
Jean-François Milants
|
0313277ae6
|
Fix touchinfo typo in SystemTask.
|
2021-08-28 15:10:14 +02:00 |
|
Jean-François Milants
|
f895da8634
|
Merge branch 'Riksu9000-twimaster_rework' into develop
|
2021-08-28 15:09:16 +02:00 |
|
Jean-François Milants
|
45e7638fc2
|
Merge branch 'twimaster_rework' of https://github.com/Riksu9000/InfiniTime into Riksu9000-twimaster_rework
# Conflicts:
# src/systemtask/SystemTask.cpp
|
2021-08-28 15:08:50 +02:00 |
|
JF002
|
969de9a8bc
|
Merge pull request #492 from Riksu9000/new_touch_handler
New touch handler
|
2021-08-28 15:06:03 +02:00 |
|
Kieran Cawthray
|
8ac1ae70cc
|
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
|
2021-08-19 15:14:04 +02:00 |
|
Riku Isokoski
|
85c99797da
|
Merge branch 'develop' into new_touch_handler
|
2021-08-18 22:07:02 +03:00 |
|
Riku Isokoski
|
40392d7b91
|
Use highest frequency and move mutex creation to Init
|
2021-08-18 21:40:27 +03:00 |
|
hubmartin
|
df8ea7fe52
|
Add memory print usage
|
2021-08-18 20:21:10 +02:00 |
|
Riku Isokoski
|
b91100573e
|
Fix music app buttons
|
2021-08-18 20:19:02 +02:00 |
|
Riku Isokoski
|
81a36dc31e
|
Simplify parameters and cleanup
|
2021-08-16 18:26:10 +03:00 |
|
Kieran Cawthray
|
30b32e4c8a
|
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
|
2021-08-15 17:50:56 +02:00 |
|
Kieran Cawthray
|
9851ed33d8
|
Fix potential edge case of sidebar being set black
|
2021-08-15 15:28:40 +02:00 |
|
Kieran Cawthray
|
639fd3a9bd
|
More tidying following review
|
2021-08-15 15:00:54 +02:00 |
|
Kieran Cawthray
|
5789f1527c
|
Avoid setting the sidebar black
|
2021-08-15 14:42:30 +02:00 |
|
Kieran Cawthray
|
16ea069d55
|
Remove duplicate code, minor fixes
|
2021-08-15 14:05:21 +02:00 |
|
Riku Isokoski
|
3cef05b745
|
Merge branch 'develop' into refresh_rework
|
2021-08-15 13:35:15 +03:00 |
|
Kieran Cawthray
|
c0bb88799c
|
Add check for randomise button in case colors clash
|
2021-08-15 12:33:32 +02:00 |
|
Riku Isokoski
|
ee44b6ff49
|
Adjust inner padding in applist
|
2021-08-15 11:19:47 +02:00 |
|
Riku Isokoski
|
bc82905371
|
Clean up using variables
|
2021-08-15 11:19:47 +02:00 |
|
Riku Isokoski
|
637ed8033b
|
Adjust previously missed scrollbar and firmware validation buttons
|
2021-08-15 11:19:47 +02:00 |
|
Riku Isokoski
|
fc6458a35c
|
Add image with example layouts
|
2021-08-15 11:19:47 +02:00 |
|
Riku Isokoski
|
e0d01411d7
|
Ui update
|
2021-08-15 11:19:47 +02:00 |
|
Kieran Cawthray
|
477ff32edc
|
Add randomise button to color picker
|
2021-08-15 10:41:00 +02:00 |
|
Jean-François Milants
|
df8d396472
|
Merge branch 'Riksu9000-call-improvements' into develop
|
2021-08-14 21:54:15 +02:00 |
|
Jean-François Milants
|
0eeed5ac33
|
Merge branch 'call-improvements' of https://github.com/Riksu9000/InfiniTime into Riksu9000-call-improvements
# Conflicts:
# src/displayapp/screens/Metronome.cpp
|
2021-08-14 21:54:00 +02:00 |
|
Riku Isokoski
|
c3d8ee14fe
|
Merge branch 'develop' into refresh_rework
|
2021-08-14 22:53:35 +03:00 |
|
Martin Hub
|
dec4bab334
|
Add VSCode ST-link debug config (#567)
|
2021-08-14 21:24:26 +02:00 |
|
Riku Isokoski
|
6192775161
|
Improve metronome
|
2021-08-14 21:08:42 +02:00 |
|
Riku Isokoski
|
7c28de0b6f
|
Set pin before loop
|
2021-08-14 21:00:33 +02:00 |
|
Riku Isokoski
|
10f610b219
|
Better pin configuration
|
2021-08-14 21:00:33 +02:00 |
|
Riku Isokoski
|
e51c3eee4e
|
Try to fix bootloop
|
2021-08-14 21:00:33 +02:00 |
|
Riku Isokoski
|
f0e9d13329
|
Update contribute.md (#475)
* Update contribute.md
* Add newlines and remove spaces
* Replace CONTRIBUTING.md with doc/contribute.md
|
2021-08-14 20:58:38 +02:00 |
|
Kieran Cawthray
|
6bffc7d528
|
Tidying
|
2021-08-12 21:28:41 +02:00 |
|
Kieran Cawthray
|
52ee25e551
|
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
|
2021-08-12 21:26:51 +02:00 |
|
Riku Isokoski
|
1d341a7aeb
|
Don't reconfigure pins
|
2021-08-12 14:06:58 +03:00 |
|
Riku Isokoski
|
fe33c756b7
|
Fix longpress gesture
|
2021-08-11 18:31:40 +03:00 |
|
Riku Isokoski
|
cd7ca458fa
|
Remove leftover
|
2021-08-10 22:37:41 +03:00 |
|
Riku Isokoski
|
6776776421
|
Make diff smaller and revert some changes in DisplayApp
|
2021-08-10 22:18:21 +03:00 |
|
Riku Isokoski
|
8a694adb09
|
Rework TouchHandler into not a task
|
2021-08-10 22:03:34 +03:00 |
|
Riku Isokoski
|
7e92577c14
|
Revert "Merge branch 'unblock_i2c' into develop"
This reverts commit 275a84b3238874d213271f4287e6c1c5bfcb4353, reversing
changes made to 9fb37550886f09f6510e99a5b452262c53c3987c.
|
2021-08-10 21:02:51 +03:00 |
|
Riku Isokoski
|
f1346f098e
|
Merge branch 'develop' into new_touch_handler
|
2021-08-10 20:58:42 +03:00 |
|
JF002
|
643077341b
|
Merge pull request #505 from geekbozu/devcon
VSCode Devcontainer
|
2021-08-10 16:54:13 +02:00 |
|
Riku Isokoski
|
275a84b323
|
Merge branch 'unblock_i2c' into develop
|
2021-08-10 14:15:42 +03:00 |
|
Riku Isokoski
|
d307c6bd9e
|
Merge branch 'develop' into refresh_rework
|
2021-08-10 14:13:58 +03:00 |
|
JF002
|
9fb3755088
|
Merge pull request #483 from Riksu9000/fix_adc
Fix misconfigured ADC and remove now unnecessary filtering
|
2021-08-10 12:32:09 +02:00 |
|
Jean-François Milants
|
707446ed52
|
Merge branch 'hassless-improve-battery-percentage-to-battery-icon-mapping' into develop
|
2021-08-10 12:31:03 +02:00 |
|