Clemens von Molo
5e1f4839da
InfiniPaint vibrate on colorchange, fix color rotation
2021-10-31 21:23:43 +01:00
JF
6c3f56bb59
Merge pull request #740 from Riksu9000/flashlight_brightness
...
Flashlight brightness control
2021-10-23 10:14:14 +02:00
Riku Isokoski
fd4fbfddb9
Flashlight brightness control
2021-10-13 13:04:40 +03:00
Jean-François Milants
6d0e68d626
Merge branch 'update_touch_driver' of git://github.com/Riksu9000/InfiniTime into Riksu9000-update_touch_driver
...
# Conflicts:
# src/displayapp/Apps.h
2021-10-10 16:48:45 +02:00
Jean-François Milants
cf9e149b33
Merge with develop and fix conflicts from timaios:set-datetime-manually.
2021-10-10 16:01:43 +02:00
Riku Isokoski
f61e88b842
Merge branch 'develop' into update_touch_driver
2021-10-05 12:45:03 +03:00
JF
b84a546920
Merge pull request #623 from Riksu9000/lvgl_queuetimeout
...
Let LVGL control queueTimeout
2021-10-03 16:20:20 +02:00
Riku Isokoski
e468acc99e
Merge branch 'develop' into update_touch_driver
2021-09-18 19:22:59 +03:00
Mark Russell
b9e56843a2
resolve conflict in src/systemtask/Messages.h
2021-09-16 16:20:39 -04:00
Mark Russell
cdf99b08f4
Revert "Merge upstream"
...
This reverts commit 1d43adcdfa
2021-09-16 16:12:20 -04:00
Mark Russell
1d43adcdfa
Merge upstream
2021-09-16 16:01:25 -04:00
Riku Isokoski
f221f5d744
Merge branch 'develop' into update_touch_driver
2021-09-14 15:34:09 +03:00
JF002
8728ac2f6a
Merge pull request #602 from Riksu9000/del_unused
...
Remove unused variables
2021-09-12 18:34:11 +02:00
Mark Russell
1fb5757655
Created basic alarm app
2021-09-10 18:40:13 -04:00
Riku Isokoski
21d37d1e23
Merge remote-tracking branch 'upstream/develop' into timer_battery_reading
2021-08-30 10:15:19 +03:00
Riku Isokoski
e57ff28231
Let lvgl control queueTimeout
2021-08-29 12:40:48 +03:00
JF002
ef9f809e14
Merge pull request #458 from kieranc/pinetimestyle-colorpicker
...
Add color picker for PineTimeStyle watchface
2021-08-28 20:56:34 +02:00
Riku Isokoski
c2fae47391
Merge branch 'develop' into refresh_rework
2021-08-28 17:25:50 +03:00
Riku Isokoski
d2d97319e0
Merge branch 'develop' into update_touch_driver
2021-08-28 17:19:49 +03:00
Riku Isokoski
085c9ab2e1
Merge branch 'develop' into timer_battery_reading
2021-08-28 16:54:40 +03:00
Riku Isokoski
2b30ff4fc6
Remove unused variables
2021-08-19 11:12:34 +03:00
Riku Isokoski
85c99797da
Merge branch 'develop' into new_touch_handler
2021-08-18 22:07:02 +03:00
Riku Isokoski
780a811f05
Automatic error detection
2021-08-18 15:23:30 +03:00
Riku Isokoski
9c175e2f0c
Fix after merge
2021-08-17 16:01:18 +03:00
Riku Isokoski
5b969ccfa9
Merge branch 'develop' into update_touch_driver
2021-08-17 15:35:29 +03:00
Kieran Cawthray
30b32e4c8a
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
2021-08-15 17:50:56 +02:00
Riku Isokoski
3cef05b745
Merge branch 'develop' into refresh_rework
2021-08-15 13:35:15 +03:00
Riku Isokoski
044036e884
Merge branch 'develop' into timer_battery_reading
2021-08-14 23:02:23 +03: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
Riku Isokoski
6192775161
Improve metronome
2021-08-14 21:08:42 +02:00
Riku Isokoski
23bde0d18e
Make battery reading periodic. Add events. Disable pullup
2021-08-14 21:18:11 +03:00
Riku Isokoski
6776776421
Make diff smaller and revert some changes in DisplayApp
2021-08-10 22:18:21 +03:00
Tim
3e9c30a18f
Merge branch 'JF002:develop' into set-datetime-manually
2021-08-08 14:37:48 +02:00
Riku Isokoski
10b5d30ec3
Merge branch 'develop' into refresh_rework
2021-08-03 12:16:40 +03:00
Riku Isokoski
a618f43b4d
Fixes
2021-08-01 14:13:32 +03:00
Riku Isokoski
e6dcb3009f
Improvements
2021-08-01 13:05:48 +03:00
Riku Isokoski
5bdef365f2
Merge branch 'develop' into HEAD
2021-08-01 11:47:26 +03:00
Kieran Cawthray
12aeb46889
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
2021-07-28 16:07:43 +02:00
Riku Isokoski
a1ba187c47
Merge branch 'develop' into new_touch_handler
2021-07-25 20:01:09 +03:00
Riku Isokoski
ec2469a6c1
Code cleanup ( #466 )
...
* Code cleanup
* Remove override again
2021-07-25 16:54:05 +02:00
Riku Isokoski
34949a47c5
Dim screen before sleep ( #464 )
...
* Implement dimming
2021-07-24 20:29:10 +02:00
Jean-François Milants
926553d043
Merge branch 'fix_touchevent_tap' of git://github.com/Riksu9000/InfiniTime into Riksu9000-fix_touchevent_tap
...
# Conflicts:
# src/displayapp/DisplayApp.cpp
2021-07-24 18:46:52 +02:00
Riku Isokoski
fc93bdbbba
Merge branch 'develop' into refresh_rework
2021-07-23 22:56:00 +03:00
Riku Isokoski
d666c5004f
Merge branch 'develop' into new_touch_handler
2021-07-23 22:52:08 +03:00
Kieran Cawthray
1ddb1f0832
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
2021-07-23 15:03:28 +02:00
Riku Isokoski
0a0f28fff4
Make firmware updating more foolproof ( #469 )
...
* Make firmware updating more foolproof and fix bugs
* No need to manually handle overflow
* Make startTime TickType_t
* Don't process TouchEvents::None
* Fix sleep getting re-enabled issue more directly
2021-07-22 21:57:45 +02:00
Kieran Cawthray
db784fc2fb
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
2021-07-20 15:30:07 +02:00
Riku Isokoski
97c761a5c7
Refresh rework
2021-07-19 16:26:12 +03:00
Riku Isokoski
329482f873
Fix remaining known issues
2021-07-16 11:55:29 +03:00
