will/InfiniTime
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,849 Commits 10 Branches 2 Tags 78 MiB
668820ef5a
Commit Graph

602 Commits

Author SHA1 Message Date
Eli Weiss
5be2f57a78 Consolidated time conversion logic 
Consolidated 24 hour to 12 hour time conversion logic into function, addressed formatting issues, cleaned up code.
 2022-01-31 20:42:18 +01:00
Eli Weiss
1813399959 Removed redundant brackets 
Also corrected orphaned bracket
 2022-01-31 20:42:18 +01:00
Eli Weiss
2bc338ceed Cleaned up redundant if statements, spacing 
Removed redundant if statements in hour button logic. Spacing is now in line with repo guidelines.
 2022-01-31 20:42:18 +01:00
Eli Weiss
698288d822 Added 12 hour set time 2022-01-31 20:42:18 +01:00
JF
f38c559089
Merge pull request #954 from NeroBurner/music_initialize_lastLength 
Music: initialize totalLength to have non-random data from the start
 2022-01-26 22:01:07 +01:00
JF
b12603448c
Merge pull request #959 from NeroBurner/stopwatch_include_cleanup 
StopWatch: cleanup unused includes and use relative to src includes
 2022-01-26 22:00:33 +01:00
JF
458f5b8eb8
Merge pull request #903 from Riksu9000/improved_notif_timeout 
Improved notification timeout
 2022-01-26 21:38:07 +01:00
Reinhold Gschweicher
67f546fa33 StopWatch: cleanup unused includes and use relative to src includes 2022-01-26 08:31:14 +01:00
Reinhold Gschweicher
314c02194a Music: initialize totalLength to have non-random data from the start 
In the first `Music::Refresh` call the lastLength and totalLength are
not initialized. The `lastLength` value is read first from the
musicService. Naturally in the first itereation that is changed and
`UpdateLength()` is called. There the variable `totalLength` is used as
well, but that variable isn't initialed to a sensible value yet. This
leads to sometimes the `Music.h` screen segfaulting (depending on the
random uninitialized data in the `lastLength` variable)
 2022-01-23 23:39:38 +01:00
Riku Isokoski
6bf6bb7e2a PTS and digital watchface code cleanups 2022-01-20 16:04:26 +02:00
Riku Isokoski
97cbe34963 Update shakewake menu option 2022-01-06 15:44:39 +02:00
JF
e8fc46ba20
Merge pull request #912 from SteveAmor/chimesradio 
Updates radio button style for Chimes Option
 2022-01-05 10:42:25 +01:00
SteveAmor
b1b9937ff7 Updates radio button style 2022-01-04 21:28:37 +00:00
Jean-François Milants
bef3e708f6 Merge branch 'ShakeWake' of https://github.com/geekbozu/InfiniTime into geekbozu-ShakeWake 
# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/Apps.h
#	src/displayapp/DisplayApp.cpp
#	src/displayapp/screens/settings/Settings.cpp
 2022-01-04 21:48:08 +01:00
SteveAmor
15c3807a76 Adds enum class for chimes option 2022-01-04 19:32:29 +00:00
Tim Keller
e82469bffa Fix setting removing it self from wake settings when opening calibration window twice. 2022-01-04 02:06:16 +00:00
Tim Keller
f86c71b2bb Made calibration window enable Accel wakeups for setting and calibration even when wake mode is inactive. 2022-01-04 02:02:01 +00:00
Tim Keller
92b1e83e3e Remove "fancy" settings display and always show ShakeWakeThresholdSetting 2022-01-04 02:01:31 +00:00
Tim Keller
98ac447bdb Fixed button color changing 2022-01-04 02:00:03 +00:00
Tim Keller
b9c40100f6 Added visual aide for shake strength 
Added delay to starting calibration
 2022-01-04 02:00:03 +00:00
Tim Keller
8f38bd911b Raise calibration timeout to 7.5 seconds 
Added button toggle state for cleaner user interaction
 2022-01-04 02:00:03 +00:00
Tim Keller
5c13200238 Fix crash upon leaving app. 
Code formatting
 2022-01-04 02:00:03 +00:00
Tim Keller
d6b22645e3 Make arc moveable, and clear previous setting on calibrate 2022-01-04 02:00:02 +00:00
Tim Keller
f780ac999a Actually save the threshold 
Prevent a few crashes due to an LV task being active when it shouldnt be.
 2022-01-04 02:00:02 +00:00
Tim Keller
d2510d7926 Better Sensitivity UI, Calibration button added 2022-01-04 02:00:02 +00:00
Tim Keller
3ebf002f9d Add start of settings app for senstivity. 
really just debugging. I want to make it more configurable then high med low.
Position of setting needs a new location...dynamicly adding it currently at the end. Which honestly im fine with.
 2022-01-04 01:59:01 +00:00
Tim Keller
d270275bd2 Added Shake to wake 2022-01-04 01:57:18 +00:00
SteveAmor
cc259b6a4a resolves conflicts 2022-01-02 22:27:43 +00:00
SteveAmor
94561b2331 resolves conflicts 2022-01-02 21:49:18 +00:00
Riku Isokoski
5e6868d9eb Improved notification timeout 2022-01-01 16:22:35 +02:00
Stephanie
e0013e7304 Ran clang-format 2021-12-30 21:51:43 +01:00
Stephanie
a65f173e3c Renamed confusing variables and general cleanup 2021-12-30 21:51:43 +01:00
Stephanie
7eff1dbcc6 Changed text to left pad 2021-12-30 21:51:43 +01:00
Stephanie
f7d1b3f368 Moved trip meter update to MotionController and changed trip meter logic 2021-12-30 21:51:43 +01:00
Stephanie
fb87fdb2d9 Changed lap counter to trip meter 2021-12-30 21:51:43 +01:00
Stephanie
d034bd131e Added "lap" button to step counter 2021-12-30 21:51:43 +01:00
Riku Isokoski
54f588ce63 Add missing break 2021-12-30 21:41:17 +01:00
Riku Isokoski
86d180a855 Improve gesture consistency across the firmware 2021-12-30 21:41:17 +01:00
JF
395590d2d8
Merge pull request #718 from kieranc/pts-settings 
Integrate color picker into PineTimeStyle watchface
 2021-12-30 21:36:43 +01:00
Reinhold Gschweicher
5b7915b5c9 InfiniPaint: add missing include algorithm for std::fill 2021-12-30 20:58:00 +01:00
hubmartin
204fc56672 Use Bluetooth brand color for BLE logo #0082FC 2021-12-30 20:50:05 +01:00
hubmartin
f52d6bfa67 Real white now 2021-12-30 20:50:05 +01:00
hubmartin
86ee7a70b7 WatchFaceDigital - BLE symbol changed to white color 2021-12-30 20:50:05 +01:00
James A. Jerkins
319030d9e1 Add airplane mode feature 
Implements 'Airplane mode' feature to disable and enable bluetooth/ble
Adds airplaneMode as a non-persisted setting
Adds a setting menu for switching airplane mode on and off
Displays an airplane symbol on the Digital watch face and the
    PineTimeStyle watch face when airplane mode is enabled
Always enables bluetooth/ble on boot (disable airplane mode)
Alphabetizes the settings menu options
Style cleanups

Closes #632
 2021-12-23 20:30:14 -06:00
Kieran Cawthray
6cf4a933b6 Merge remote-tracking branch 'upstream/develop' into pts-settings 2021-12-09 22:41:29 +01:00
Riku Isokoski
32ea01b2e9 Organize includes 2021-12-09 21:32:07 +01:00
Riku Isokoski
ec9b5a0bd2 Move radio button styling to a single place 2021-12-09 21:32:07 +01:00
Riku Isokoski
736ae08fcd Optimize arrays 2021-12-09 21:32:07 +01:00
Riku Isokoski
494448b7cc Fix too small array 2021-12-09 21:32:07 +01:00
Riku Isokoski
9ffd28f735 Style checkboxes as radio buttons 2021-12-09 21:32:07 +01:00
Avamander
6a442b90a1 Improved format specifiers, bracing, removed C-style casts, whitespace fixes and removed Tiles shadowing 2021-12-09 21:30:04 +01:00
Kieran Cawthray
645f6f43dc Remove commented code 2021-12-09 21:29:31 +01:00
Kieran Cawthray
f4daf63679 Adjust icon alignment only on IsUpdated() 2021-12-09 21:29:31 +01:00
Kieran Cawthray
8539db0884 Alignment fixes 2021-12-09 21:29:31 +01:00
Avamander
e8c1302cd6
Merge branch 'develop' into patch-weather 2021-12-09 22:20:29 +02:00
James A. Jerkins
1e4130a9cf Fix for passkey screen scramble 
When a passkey is displayed, screen on or off, and another
passkey is displayed the screen may become scrambled. Fix
the issue by insuring the whole screen is drawn every time.
 2021-12-09 21:14:16 +01:00
James A. Jerkins
62dbcbfc95 Connect and bond with a passkey 
This commit adds the following:
    Passkey pairing - passkey is displayed on watch
    Swipe down to clear passkey screen
    Connection encryption
    Connection bonding
    Automatic reconnects to a bonded peripheral
    Trusted device on Android

Note that persisting the bond between reboots is NOT included in
this commit. Therefore, rebooting the watch will cause reconnect failures.
You must delete the bond from the phone to reconnect/pair.
 2021-12-09 21:14:16 +01:00
Kieran Cawthray
ae4b9e0f2e Include Colors.h 2021-12-06 10:29:14 +01:00
Kieran Cawthray
c00ad4af35 Merge remote-tracking branch 'upstream/develop' into pts-settings 2021-12-05 20:32:29 +01:00
Avamander
5f50f0e538 Fixed air quality amounts being off by a few orders of magnitude 2021-12-04 22:03:40 +02:00
Avamander
0df49bd43d Removed float usage from display 2021-12-04 22:03:40 +02:00
Avamander
62bb6b5163 Better cleanup, bugfixes and improvements in weather parsing. UI improvements 2021-12-04 22:03:40 +02:00
Avamander
cccec6e1ab Improved debug UI. 2021-12-04 22:03:40 +02:00
Avamander
06b022fc4d Improved UI and fixed a bug 2021-12-04 22:03:40 +02:00
Avamander
c870f8ed30 Bunch of bugs fixed, improved error handling, debug UI addition 2021-12-04 22:03:40 +02:00
Avamander
ffb17357e7 Fixed a few compilation errors, fixed UUID. 2021-12-04 22:03:40 +02:00
Avamander
ed6f0aade4 Implemented a few functions. 2021-12-04 22:03:40 +02:00
Avamander
19c9667a3d Started initial work on the UI 2021-12-04 22:03:40 +02:00
Avamander
2736fa57bb Added autodetection for clang-format version 2021-12-04 22:03:40 +02:00
Avamander
3a09b3614c Brace style and whitespace fixes 2021-12-04 22:03:40 +02:00
Avamander
bda96dc595 Initial Weather service skeleton 2021-12-04 22:03:40 +02:00
Reinhold Gschweicher
85a25302bf Clock: add missing Settings include 
Add missing include in `Clock.cpp` for `Settings.h`. The Settings class
is forward declared in the header file, but it needs to be included in
the cpp file.
 2021-12-02 21:58:31 +01:00
Steveis
b8dfad40bb WatchFaceAnalog : move notification icon 
Standardise notification icon to display in top left.
 2021-12-02 21:47:08 +01:00
Reinhold Gschweicher
054a99cf6c Paddle: add a little randomization in the dy speed 
To make the game a bit more challenging an less predictable add a little
bit of randomness to the `dy` value. When hitting the right wall add a random
number (one of [-1, 0, 1]) to the `dy` value.

To keep the difficulty level managable limit the dy value to be in the
range from -5 to 5.
 2021-12-02 21:46:36 +01:00
Jean-François Milants
1404d0186c Merge branch 'paint-colorchange-vibration' of git://github.com/clemensvonmolo/InfiniTime into clemensvonmolo-paint-colorchange-vibration 
# Conflicts:
#	src/displayapp/screens/InfiniPaint.h
 2021-12-02 21:42:56 +01:00
Reinhold Gschweicher
a17d8bd566 Metronome: add missing include for Screen.h 2021-12-02 21:21:05 +01:00
Reinhold Gschweicher
fe6e4bea8c WatchFaceDigital: remove unused include for ScreenList.h 2021-12-02 21:18:39 +01:00
Reinhold Gschweicher
0705b74656 WatchFaceDigital: add missing include to Settings.h 2021-12-02 21:18:39 +01:00
Reinhold Gschweicher
e8db73e0e7 WatchFaceAnalog: remove unused ScreenList, add needed includes 
Remove unused `ScreenList.h` include.

For `std::abs()` add needed include `<cmath>`.

For the forward declared Settings-Controller add the `Settings.h`
include to the cpp file.
 2021-12-02 21:17:53 +01:00
Reinhold Gschweicher
4b7f2546bd PineTimeStyle: remove include and add forward declare 
Remove unused `ScreenList.h` include and add a forward declaration for
the `MotionController` class.
 2021-12-02 21:16:49 +01:00
Reinhold Gschweicher
ec437b1c66 QuickSettings: remove unused imports 2021-12-02 21:14:47 +01:00
Steveis
34511a66ee About : Remove misleading info 
Removed Steps which is hard coded to display 0.
Could be misleading and is using up memory.
 2021-11-28 14:05:52 +01:00
Jean-François Milants
298f0f4335 Merge branch 'restructure_includes' of https://github.com/NeroBurner/InfiniTime into NeroBurner-restructure_includes 
# Conflicts:
#	doc/contribute.md
#	src/displayapp/screens/BatteryInfo.h
 2021-11-28 13:53:03 +01:00
Kieran Cawthray
1b2a8a5a04 Improve notification icon alignment 2021-11-16 18:18:56 +01:00
Kieran Cawthray
bea5c60a11 Revert "Fix notification icon alignment" 
This reverts commit 29bb359e90.
 2021-11-16 18:10:34 +01:00
Kieran Cawthray
29bb359e90 Fix notification icon alignment 2021-11-16 00:06:13 +01:00
Reinhold Gschweicher
241d36471d Move up file header include to top 2021-11-15 22:02:49 +01:00
Reinhold Gschweicher
1b937a77b9 remove unused libs/ prefix from lvgl includes as not needed 2021-11-15 22:02:49 +01:00
Reinhold Gschweicher
f2918709d9 Add missing standard includes 2021-11-15 22:02:49 +01:00
Reinhold Gschweicher
ac7b2da611 Update includes to to be relative to src directory 
Don't use relative imports like `../foo.h` as those depend on the
relative position of both files. Rather than that use imports relative
to the `src` directory, which explicitly is part of the include
directories.
 2021-11-15 22:02:49 +01:00
Reinhold Gschweicher
c4f2fb2fa4 BatteryInfo: remove unused FreeRTOS.h and timer.h includes 2021-11-15 21:56:02 +01:00
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
Mark Russell
947ece0bc9 Status bar displays time in 12 or 24 hour format based on settings 2021-11-10 20:11:09 -05: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
SteveAmor
5932391c8b Chimes option 2021-11-07 10:50:33 +00:00
Clemens von Molo
75f0bbb7ca change paint vibration to 35ms 2021-11-01 12:10:06 +01:00
Clemens von Molo
2d98530976 color rotation using modulo, ran clang-format for InfiniPaint 2021-11-01 11:46:27 +01:00
Clemens von Molo
5e1f4839da InfiniPaint vibrate on colorchange, fix color rotation 2021-10-31 21:23:43 +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
Riku Isokoski
3ee4876214 Toggle notifications only, keep vibrations. 2021-09-12 11:08:25 +03:00
Mark Russell
1fb5757655 Created basic alarm app 2021-09-10 18:40:13 -04:00
Riku Isokoski
b31b2425f8 Use percentage instead of IsFull 2021-09-03 16:57:00 +03:00
Riku Isokoski
ac2ccaeff6 Auto realign battery icon in Analog watch face 2021-09-03 14:57:07 +03:00
Riku Isokoski
fd52ca8fe6 Detect full charge and improve watchface display 2021-09-03 14:35:38 +03:00
Itai Nelken
bd1a571399
Update Settings.cpp 2021-09-02 23:20:25 +03:00
Jean-François Milants
1635bfafb3 Fix notifications that wouldn't auto close when the timeout elapsed (in preview mode). 2021-08-31 21:56:21 +02:00
Riku Isokoski
21d37d1e23 Merge remote-tracking branch 'upstream/develop' into timer_battery_reading 2021-08-30 10:15:19 +03:00
Jean-François Milants
31bc47d1cb Settings : use enums instead of ints to store colors. Group all PTS settings into a struct. 
PTS/SettingsPTS : Convert to/from LVGL color and Settings::Color, add functions to reduce code duplication.
Adapt SettingPineTimeStyle with the last Screen Interface
 2021-08-28 21:02:11 +02: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
c78177eedf Merge branch 'develop' into fit_more_tasks 2021-08-28 17:10:01 +03:00
Riku Isokoski
085c9ab2e1 Merge branch 'develop' into timer_battery_reading 2021-08-28 16:54:40 +03:00
Kieran Cawthray
8ac1ae70cc Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker 2021-08-19 15:14:04 +02: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
b91100573e Fix music app buttons 2021-08-18 20:19:02 +02:00
Riku Isokoski
780a811f05 Automatic error detection 2021-08-18 15:23:30 +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
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
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
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
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
f1346f098e Merge branch 'develop' into new_touch_handler 2021-08-10 20:58:42 +03:00
Riku Isokoski
d307c6bd9e Merge branch 'develop' into refresh_rework 2021-08-10 14:13:58 +03:00
Jean-François Milants
81a143173f Merge branch 'improve-battery-percentage-to-battery-icon-mapping' of https://github.com/hassless/InfiniTime into hassless-improve-battery-percentage-to-battery-icon-mapping 
# Conflicts:
#	src/displayapp/screens/BatteryIcon.cpp
 2021-08-10 12:30:42 +02:00
Jean-François Milants
c086520c97 Code cleaning in Clock, WatchFaceAnalog, WatchFaceDigital and PineTimeStyle, inspired by PR #232 by nscooling. 2021-08-10 11:39:25 +02: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
Kieran Cawthray
e6bc485679 Increment settings value, remove old hacky fix 2021-07-25 22:18:39 +02:00
Jean-François Milants
514481ef7f Tile event handler : read the event data only if the event is a "value changed event". LVGL sends many other event and some of them do not set the event data (global static variable) to a valid address, which may cause an invalid read. I noticed that when porting this class on RISC-V platform (BL602). 2021-07-25 19:55:21 +02:00
Riku Isokoski
a1ba187c47 Merge branch 'develop' into new_touch_handler 2021-07-25 20:01:09 +03:00
Riku Isokoski
2e8bc634dc Merge branch 'develop' into fit_more_tasks 2021-07-25 19:30:27 +03:00
Jonathan Vander Mey
7b75ca591d Fix compile warnings 2021-07-25 18:01:13 +02:00