Kieran Cawthray
5a0cf8e348
Merge remote-tracking branch 'upstream/develop' into pts-settings
2021-11-15 19:38:29 +01:00
Riku Isokoski
2e7b51c8e1
clang-format and clang-tidy PineTimeStyle
2021-11-13 13:11:32 +02:00
Riku Isokoski
39157f2f19
Close menu with button
2021-11-13 13:02:00 +02:00
Riku Isokoski
1d6455c289
Fix Alarm app crashing on buttonpress
2021-11-09 11:38:19 +02:00
Kieran Cawthray
18e3cc7038
Merge remote-tracking branch 'upstream/develop' into pts-settings
2021-11-07 17:49:54 +01:00
Riku Isokoski
30520d262b
Memory savings by replacing strings
2021-10-29 13:22:14 +03:00
Kieran Cawthray
85d494a987
Revert "Update GetNext/GetPrevious"
...
This reverts commit 411c10ec31
.
2021-10-23 18:12:41 +02:00
Kieran Cawthray
da97a94a0f
Merge remote-tracking branch 'upstream/develop' into pts-settings
2021-10-23 18:00:47 +02:00
JF
6c3f56bb59
Merge pull request #740 from Riksu9000/flashlight_brightness
...
Flashlight brightness control
2021-10-23 10:14:14 +02:00
Kieran Cawthray
411c10ec31
Update GetNext/GetPrevious
2021-10-20 18:07:08 +02:00
Kieran Cawthray
3ed01b33e7
Improve random color selection, disable longpress when settings are visible
2021-10-20 17:44:10 +02:00
Kieran Cawthray
32978b6a06
Restore settings order
2021-10-20 15:36:28 +02:00
Kieran Cawthray
074d3420c8
Ensure needle color is visible on reset/randomize
2021-10-20 11:30:06 +02:00
Kieran Cawthray
994f373a14
Change gauge needle color when background is white
2021-10-19 00:22:45 +02:00
Kieran Cawthray
1c3372b319
Fix settings merge error
2021-10-18 23:29:41 +02:00
Kieran Cawthray
ff1fce18d6
Merge remote-tracking branch 'upstream/develop' into pts-settings
2021-10-18 23:14:39 +02:00
Kieran Cawthray
c4ab17f587
Disable DoubleTap when settings buttons are displayed
2021-10-18 23:04:12 +02:00
Kieran Cawthray
1c86796eac
More duplicate color dodging
2021-10-18 22:52:53 +02:00
JF
77e73fea32
Merge pull request #507 from Riksu9000/fit_more_tasks
...
Fit more tasks in SystemInfo
2021-10-16 14:10:09 +02:00
JF
fafb998b8c
Merge pull request #655 from NeroBurner/paddle_hor_fix
...
Paddle: compare ballX coordinate with horizontal resolution
2021-10-16 14:09:05 +02:00
mabuch
1d76d9170e
Replaced "JF002" in github URLs with "InfiniTimeOrg"
2021-10-15 18:03:10 +02:00
Riku Isokoski
fd4fbfddb9
Flashlight brightness control
2021-10-13 13:04:40 +03:00
Reinhold Gschweicher
7cd4929bfd
Paddle: compare ballX coordinate with horizontal resolution
...
Fix the comment as the comparison checks if the ball is at the right
side of the screen.
Compare the x coordinate of the ball with the horizontal resolution of
the screen, instead of the vertical resolution. On the PinePhone this
does make no difference as we have square 240x240 screen. Change it
anyways to be completely correct.
2021-10-11 21:46:19 +02: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
f2357b36e5
Setting SetDate/SetTime : replace #defines by constexpr variables, NULL by nullptr and other small cleanings.
2021-10-10 16:18:14 +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
JF
4118f97812
Merge pull request #701 from maksalees/close-info-popup-with-back-button-in-alarm
...
Alarm: Close the popup with information about the time until alarm with the back button
2021-10-09 19:50:36 +02:00
Riku Isokoski
f61e88b842
Merge branch 'develop' into update_touch_driver
2021-10-05 12:45:03 +03:00
Kieran Cawthray
7d1da9f1f9
Remove old PineTimeStyle settings app
2021-10-03 21:49:57 +02:00
Kieran Cawthray
3320eae95c
Initial commit
2021-10-03 21:49:57 +02:00
JF
fa6c291d3e
Merge pull request #638 from Riksu9000/detect_full_charge
...
Detect full charge and improve watchface battery display
2021-10-03 16:13:39 +02:00
Maxim Leshchenko
05f8850acf
Fixes based on code reviews
2021-09-29 19:15:48 +03:00
Maxim Leshchenko
d86ae69961
Alarm: Close the popup with information about the time until alarm with the back button
...
Previously, pressing the back button would close the alarm app anyway. Now if you press on it and the popup with information is open, it will first close and the second press will close the application
2021-09-28 22:50:09 +03:00
JF002
8a2b86dc83
Merge pull request #664 from Riksu9000/disable_notif_only
...
Toggle notifications only, keep vibrations.
2021-09-23 20:13:42 +02:00
Riku Isokoski
980ac17388
Show plug icon while plugged in
2021-09-22 13:58:45 +03:00
Riku Isokoski
b210090837
Merge branch 'develop' into detect_full_charge
2021-09-22 12:03:41 +03:00
JF002
52eb94cfc4
Merge pull request #669 from NeroBurner/fix_unsigned_comparison_warning_metronome
...
Fix unsigned/signed comparison warning in Metronome.cpp
2021-09-18 20:33:45 +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
Mark Russell
f857a757a7
Fixes per Riksu9000's feedback
2021-09-16 15:38:31 -04:00
Reinhold Gschweicher
63477fc096
Fix unsigned/signed comparison warning in Metronome.cpp
...
`xTaskGetTickCount()` returns a `TickType_t`, which is defined as an
`uint32_t`. This is compared to the `bpm` variable, which is a `int16_t`
in the range of 40 to 220 as defined in the constructor.
```cpp
lv_arc_set_range(bpmArc, 40, 220);
```
Just assume that `bpm` is greater than 0, as this
would result in a divison by zero or negative values, which would
unintentionally underflow to a very large number.
2021-09-16 10:47:09 +02:00
Riku Isokoski
8f0771183c
Fix Error screen and optimize GetTouchInfo
2021-09-15 12:25:41 +03:00
Riku Isokoski
f221f5d744
Merge branch 'develop' into update_touch_driver
2021-09-14 15:34:09 +03:00
Mark Russell
2bf339a3f8
License header fix, add missing braces
2021-09-13 16:05:35 -04:00
Mark Russell
bfe13d9d68
Fixes based on code reviews (formatting, UI code)
2021-09-13 15:26:28 -04:00
Riku Isokoski
40765f1173
Merge branch 'develop' into disable_notif_only
2021-09-13 21:22:53 +03:00
JF002
8728ac2f6a
Merge pull request #602 from Riksu9000/del_unused
...
Remove unused variables
2021-09-12 18:34:11 +02:00
JF002
f0329298ac
Merge pull request #580 from Riksu9000/timer_battery_reading
...
Make battery reading periodic
2021-09-12 18:22:04 +02:00