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
hubmartin
0d083a2bea
Merge branch 'develop' into pinmap
2021-08-11 22:00:55 +02: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 275a84b323
, reversing
changes made to 9fb3755088
.
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
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
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
Riku Isokoski
90ea1071d1
Explicitly disable pullup
2021-08-10 11:52:20 +03:00
Riku Isokoski
2194a339cf
Only enable the bus when needed
2021-08-10 11:26:43 +03:00
Riku Isokoski
5eb56d9a06
Set pin before loop
2021-08-09 22:11:35 +03:00
Riku Isokoski
ff81a72533
Better pin configuration
2021-08-09 22:07:06 +03:00
Riku Isokoski
d35a54c060
Try to fix bootloop
2021-08-09 21:49:35 +03:00
Riku Isokoski
baa7e1bf12
Optimize twiMaster
2021-08-09 17:45:24 +03:00
hubmartin
abd8f343e4
Rename backlight level pins
2021-08-04 14:43:04 +02:00
hubmartin
b3e6da7514
Cleanup, set Pinetime as default
2021-08-03 20:40:27 +02:00
hubmartin
b7aa04e1f5
PinMap with namespace and constexpr
2021-08-03 20:32:23 +02:00
Riku Isokoski
10b5d30ec3
Merge branch 'develop' into refresh_rework
2021-08-03 12:16:40 +03:00
hubmartin
28abeae21b
DRAFT: Put gpio pins to separate file
2021-08-02 21:37:48 +02:00
Riku Isokoski
f9319dfb91
Remove leftover
2021-08-01 21:19:33 +03:00
Riku Isokoski
09aaa58710
Remove floating point calculation
2021-08-01 16:19:09 +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
79ee65bfd5
Increase ADC precision
2021-07-27 22:41:48 +03:00
Riku Isokoski
a0a05553cf
Merge branch 'develop' into fix_adc
2021-07-27 21:57:21 +03: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
Jonathan Vander Mey
7b75ca591d
Fix compile warnings
2021-07-25 18:01:13 +02:00
Riku Isokoski
574434550a
Fix slow scroll
2021-07-25 17:59:58 +02:00
Riku Isokoski
1ae22f45f9
Fix cases where Get() isn't used
2021-07-25 17:56:07 +02:00
Riku Isokoski
f2f22184b0
Add new unique icons for some apps
2021-07-25 17:55:08 +02:00
Riku Isokoski
a69be1520a
Add task state info to SystemInfo
2021-07-25 17:52:19 +02: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
Riku Isokoski
e4d9636e82
Merge branch 'develop' into new_touch_handler
2021-07-24 20:26:10 +03: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
Kieran Cawthray
b3e3d75d0f
Add extra screen in settings to show scrollbar correctly
2021-07-24 14:25:27 +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
331fc2be69
Set remaining default periods to LV_DISP_DEF_REFR_PERIOD
2021-07-19 17:06:20 +03:00
Riku Isokoski
97c761a5c7
Refresh rework
2021-07-19 16:26:12 +03:00
Riku Isokoski
dc2b5f0c6b
Restore Tile.cpp changes
2021-07-19 10:21:42 +03:00
Riku Isokoski
3e42297bd8
Update
2021-07-18 12:32:46 +03:00
Riku Isokoski
329482f873
Fix remaining known issues
2021-07-16 11:55:29 +03:00
Riku Isokoski
baffa1594f
Fix gestures
2021-07-16 02:17:17 +03:00
Riku Isokoski
93ccbf38e8
Fix touch wakeup and code cleanup
2021-07-16 01:49:20 +03:00
Riku Isokoski
2a3e126390
Fix most issues
2021-07-16 00:07:55 +03:00
Riku Isokoski
0d24d2b81e
Quick fix
2021-07-15 23:18:05 +03:00
Riku Isokoski
fe64176e7b
New touch handler, with issues
2021-07-15 14:11:27 +03:00
Kozova1
57b3397078
Multiple wakeup sources ( #290 )
...
* Allow multiple wakeup modes at the same time.
This commit adds multiple wakeup modes support.
It does so by storing them as a uint8_t bitfield enum.
It changes the following functions:
Since multiple modes can be on now, older version would not cut it:
WakeUpMode getWakeupMode() -> std::bitset<3> getWakeUpModes()
Where each bit corresponds to a WakeUpMode
We still need a way to check whether a specific wakeup mode is on, so:
bool isWakeUpModeOn(const WakeUpMode mode)
This function was changed to work correctly with the new implementation.
setWakeUpMode(WakeupMode mode, bool enable)
Previously, systemtask would exit SystemTask::OnTouchEvent() if the wake
up mode was None or RaiseWrist, to prevent waking up when a touch was
received. However, after enabling using multiple WakeUpModes, this
caused a bug where when RaiseWrist was checked with SingleTap or
DoubleTap, the tap detection wouldn't work.
This commit fixes that bug.
Next commit will update the settings WakeUpMode select UI to reflect these changes.
Signed-off-by: Kozova1 <mug66kk@gmail.com>
* Updated UI to reflect multiple WakeUp sources being available.
Signed-off-by: Kozova1 <mug66kk@gmail.com>
2021-07-14 20:51:51 +02:00
Riku Isokoski
7133287b76
Set correct refresh times for lvgl ( #488 )
2021-07-14 20:35:21 +02:00
Riku Isokoski
95b8a56dd4
Merge branch 'develop' into fix_touchevent_tap
2021-07-14 09:59:56 +03:00
Riku Isokoski
b5eabf6604
Merge branch 'develop' into fix_adc
2021-07-13 22:11:46 +03:00
Jean-François Milants
a07b6382ae
Merge branch 'develop' of github.com:JF002/Pinetime into develop
2021-07-13 20:54:49 +02:00
Jean-François Milants
e2efb193c4
Merge branch 'lvgl_use_system_tick' of https://github.com/Riksu9000/InfiniTime into Riksu9000-lvgl_use_system_tick
...
# Conflicts:
# src/displayapp/screens/BatteryInfo.cpp
# src/displayapp/screens/BatteryInfo.h
2021-07-13 20:53:40 +02:00
Riku Isokoski
a5616b0bc8
Adjust displayapp delay to compensate time spent ( #482 )
2021-07-13 20:42:59 +02:00
Jean-François Milants
3e70554844
Merge branch 'develop' into notify-battery-level
...
# Conflicts:
# src/displayapp/screens/BatteryInfo.cpp
2021-07-13 20:31:26 +02:00
Riku Isokoski
7efe2b7c51
Fix misconfigured ADC and remove now unnecessary filtering
2021-07-12 23:07:05 +03:00
Kieran Cawthray
db99ac88d9
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
2021-07-12 13:01:11 +02:00
Jonathan Vander Mey
4f378e8726
Refactor trig functions into LUT ( #476 )
...
Replaced the use of the standard library trig functions with a LUT-based
implementation instead. The standard library implementations produce
more accurate results but the usage here doesn't need that. This ends up
saving nearly 7kB of binary size.
2021-07-11 20:18:07 +02:00
kieranc
748e31421d
Modify status text in BatteryInfo so it fits on screen ( #437 )
...
* Modify status text in BatteryInfo so it fits on screen
2021-07-11 17:48:16 +02:00
Jean-François Milants
e21f6a7f41
Notify battery level every 10 minutes when connected to a BLE host.
...
Refactor battery percent : only use uint8_t to store the battery % remaining.
2021-07-11 16:55:06 +02:00
kieranc
6a91b83b12
Change step gauge range to 100 and calculate progress as percantage ( #468 )
2021-07-11 15:08:23 +02:00
joaquim.org
084123b752
Using littlefs ( #438 )
...
* add submodule littlefs
* base fs
* Save settings using littlefs
* Small fixes and suggestions from PR
* More small fixes from PR suggestions
* Code clean up
* Change SpiNorFlash functions to be private in FS
2021-07-11 15:06:06 +02:00
Riku Isokoski
99e26bdd4c
LVGL use system tick
2021-07-07 15:47:47 +03:00
Riku Isokoski
61a4642221
Improve stopwatch ( #432 )
...
* Improve stopwatch more
* Make sure sleep gets reenabled
* Cleanup and clang-format
2021-07-04 20:23:03 +02:00
Avamander
ab59b9b830
Whitespace and brace fixes ( #456 )
...
* Brace style and whitespace fixes
* Additional whitespace fixes
2021-07-04 20:06:50 +02:00
Riku Isokoski
3b0fcc2a73
clang-format
2021-07-04 20:05:39 +02:00
Riku Isokoski
94aefed98f
Condense firmware validation code
2021-07-04 20:05:39 +02:00
Riku Isokoski
217f16d189
Improve paddle game
2021-07-03 10:40:30 +02:00
Jonathan Vander Mey
8031cd1b40
Inititialize members in class declaration
...
Also added initializers for previously unintialized members.
2021-07-02 17:47:14 +02:00
Jonathan Vander Mey
d13b0a7ec5
Move local-only function into anonymous namespace
2021-07-02 17:47:14 +02:00
Jonathan Vander Mey
4217a8cb65
Make MusicService UUID objects static constexpr
2021-07-02 17:47:14 +02:00
Jonathan Vander Mey
e28516002b
Eliminate reinterpret_casting
2021-07-02 17:47:14 +02:00
Bryton Hall
4e435e93e0
and metronome icon ( #439 )
...
* add drum icon for metronome app
2021-07-02 17:34:32 +02:00
Riku Isokoski
38f40034b0
Float voltage to int ( #444 )
...
* Change voltage float to millivolt integer
* Explain the ADC to milliVolts conversion
2021-07-02 17:30:32 +02:00
Riku Isokoski
7075b7f264
Fix call notification button alignment
2021-07-02 17:20:58 +02:00
Avamander
bdb5965f1a
static_cast cleanup
2021-07-02 16:27:41 +02:00
Avamander
2f479e5fc7
Fixed a bunch of format specifiers
2021-07-02 16:27:16 +02:00
Kieran Cawthray
2edf41be8e
Fix bad merge
2021-06-29 21:15:39 +02:00
Kieran Cawthray
9bd180896e
Replace font file
2021-06-29 21:12:39 +02:00
Kieran Cawthray
4f21748aa2
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
2021-06-29 21:10:36 +02:00
kieranc
f317d54218
Add PineTimeStyle watchface ( #334 )
...
* PineTimeStyle
* Move GPL license header
* Add step count gauge - replaces heartrate in sidebar
* Enable 12/24h functionality
* Set step gauge outer to be white when step goal is reached
* Add font source file
* Move static needle_colors array to member variable
* Add documentation on generating a font
* Replace .ttf with Google version, add link to font page
Co-authored-by: JF002 <JF002@users.noreply.github.com>
2021-06-29 20:20:27 +02:00
Kieran Cawthray
660a8597f6
Add reset button, reduce button opacity
2021-06-27 15:24:17 +02:00
Neil O'Fix
0045fb16b6
SPI flash sleep if bootloader >= 1.0.0 ( #322 )
...
* Retrieve and display bootloader version
- Display bootloader version on System Info screen
- Enable SPI flash sleep mode if bootloader version >= 1.0.0
* Wait for SPI flash to wakeup before starting OTA DFU
2021-06-26 20:53:32 +02:00
Kieran Cawthray
6889cf1ed8
Fix the fix, whoops
2021-06-25 21:55:51 +02:00
Kieran Cawthray
800daecf90
Add a check to set default colors if all colors are white
2021-06-25 21:36:55 +02:00