Riku Isokoski
085c9ab2e1
Merge branch 'develop' into timer_battery_reading
2021-08-28 16:54:40 +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
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
Colin Kinloch
b45d7c372d
Correct change test for wake up mode setting
2021-08-26 19:42:02 +01:00
hubmartin
51c5257548
Update startup SCL toggling pinmap definitions
2021-08-22 22:17:57 +02:00
hubmartin
2a299fe275
Merge branch 'develop' into pinmap
2021-08-22 22:11:57 +02: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
Tim Keller
4f6d7e2c63
Move Backup to the system task.
2021-08-19 00:51:12 +00:00
Tim Keller
2dd7b8ba2c
Add clearing of noinit segment on bad word
...
Code readability cleanup
2021-08-19 00:44:22 +00: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
780a811f05
Automatic error detection
2021-08-18 15:23:30 +03:00
Tim Keller
55f8908769
Make Clock Persistant.
2021-08-17 23:53:57 +00: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
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
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
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
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
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 275a84b3239fb3755088
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
Tim
3e9c30a18f
Merge branch 'JF002:develop' into set-datetime-manually
2021-08-08 14:37:48 +02: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
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
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
Jonathan Vander Mey
7cc73b7832
Move callback function into anonymous namespace
2021-07-24 13:02:43 -04: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
Jonathan Vander Mey
487ae478ad
Remove unnecessary C-style casts with BLE UUIDs
...
Instead of casting the UUID object to the ble_uuid_t* used throughout
the NimBLE API just pass the address of the ble_uuid_t member that's at
the start of each of the UUID structs.
2021-07-24 11:40:06 -04:00
Jonathan Vander Mey
1bdaf581a3
Update nav service UUID macro to constexpr functions
2021-07-24 11:18:17 -04:00
Jonathan Vander Mey
6b95fd841f
Set navigation service id is base UUID macro
...
Avoids the need to copy the same ID into every characteristic UUID
genereated from it.
2021-07-24 11:09:56 -04:00
Jonathan Vander Mey
54ccd2cc07
Update Navigation UUID documentation
...
Fixed mismatch between the service and characteristic IDs in the
navigation service comments and documentation. They had old values not
reflecting the current code and changes in doc/ble.md
2021-07-24 11:07:06 -04: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
Riku Isokoski
12b14176ec
Fix
2021-07-21 14:46:27 +03:00
Riku Isokoski
93893511f1
Fit more tasks in SystemInfo
2021-07-21 14:41:29 +03: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
Riku Isokoski
7ac6bdfe71
Merge branch 'develop' into update_touch_driver
2021-07-15 01:03:44 +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
5bc40c9287
Update touchpad driver
2021-07-14 17:11:16 +03: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
Tim Taenny
ffa51612fc
Code optimizations in SettingSetDate and SettingSetTime
...
Instead of calling lv_obj_align after each button click, the
labels have their auto_realign property set.
2021-07-09 20:35:48 +02:00
Tim Taenny
da36d4a5a1
Code optimizations in SettingSetTime
...
The positions of the labels are controlled by #define's, just
like in SettingSetDate.
2021-07-09 20:17:47 +02:00
Tim Taenny
0842a13339
Modified Settings menu as per suggestion
...
Moved "Set date" and "Set time" to the second page of the
Settings menu.
2021-07-09 17:49:35 +02:00
Tim Taenny
3e5ad49e3a
Code optimizations in SettingSetDate
...
Using static method of DateTimeController for retrieving month
texts instead of implementing it in SettingSetDate again.
2021-07-09 17:46:17 +02:00
Tim Taenny
899bee2cf5
Exposed Month and DayOfWeek texts in DateTimeController
...
Added static methods to return the text of a given month
or dayOfWeek.
2021-07-09 17:32:48 +02:00
Tim Taenny
06dfe14251
Code optimizations in SettingSetTime
2021-07-09 17:13:29 +02:00
Tim Taenny
f78c9bfcab
Code optimizations in SettingSetDate
2021-07-09 16:57:59 +02:00
timaios
5ae4192d8d
Added new menu entries to Settings page
2021-07-09 14:22:45 +02:00
timaios
f3f5eb5739
Added new screens to DisplayApp.cpp
2021-07-09 14:19:38 +02:00
timaios
6b3be0f5a1
Added new screens to the list of applications
2021-07-09 14:15:50 +02:00
timaios
07b3a507b4
Include new screens in CMakeLists.txt
2021-07-09 14:14:17 +02:00
timaios
c396925766
Added new screen: SettingSetDate
2021-07-09 14:12:26 +02:00
timaios
c77634ce32
Added new screen: SettingSetTime
2021-07-09 14:11:20 +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
