Jean-François Milants
ce26ef8a67
Add PineTimeStyle in the list of watchface in README.md
2021-07-24 20:23:44 +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
a25ce5d8fc
Merge branch 'develop' of github.com:JF002/Pinetime into develop
2021-07-24 18:47:54 +02:00
Jean-François Milants
057de4e6b5
Merge branch 'Riksu9000-fix_touchevent_tap' into develop
2021-07-24 18:47:06 +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
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
Avamander
1ba99d2427
Made the pre-commit hook fail explicitly when the executable doesn't exist
2021-07-24 15:55:52 +02:00
Avamander
10ef3a749e
Added autodetection for clang-format version
2021-07-24 15:55:52 +02:00
Avamander
a1a6eae43f
Added a pre-commit hook that should simplify commiting pre-formatted code
2021-07-24 15:55:52 +02:00
Alexandros Feuerstein
bb26c68f2c
minor changes regarding building ( #356 )
...
* don't enforce any flashing through debug ports
2021-07-24 15:39:24 +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
547b5a8699
Restore .gitignore
2021-07-23 15:06:08 +02:00
Kieran Cawthray
1ddb1f0832
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
2021-07-23 15:03:28 +02:00
Jean-François Milants
d6cccc2dcd
Set version to 1.3.0
2021-07-23 11:46:37 +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
5e4d3c87e9
Remove .gitignore
2021-07-22 15:37:34 +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
d15509f14e
Merge branch 'Riksu9000-lvgl_use_system_tick' into develop
2021-07-13 20:54:01 +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
af10747c94
Merge branch 'notify-battery-level' into develop
2021-07-13 20:31:44 +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
5c183bef85
Merge branch 'pinetimestyle-colorpicker' of github.com:kieranc/InfiniTime into pinetimestyle-colorpicker
2021-07-12 13:01:48 +02:00
Kieran Cawthray
db99ac88d9
Merge remote-tracking branch 'upstream/develop' into pinetimestyle-colorpicker
2021-07-12 13:01:11 +02:00