Riku Isokoski
21d37d1e23
Merge remote-tracking branch 'upstream/develop' into timer_battery_reading
2021-08-30 10:15:19 +03:00
James A. Jerkins
be31f417db
WIP Refactor ble advertising
...
Refactor ble advertising based on ble standards and conventions.
Changes are based on the bleprph example code, bluetooth docs, and nimble docs.
2021-08-29 15:50:04 -05:00
hubmartin
8390d0ef72
Merge branch 'develop' into pinmap
2021-08-29 11:43:50 +02:00
Jean-François Milants
6c023785e5
Fix wake on tap/double tap.
2021-08-28 21:30:31 +02: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
JF002
2870d3ae6c
Merge pull request #497 from Riksu9000/refresh_rework
...
Rework Refresh
2021-08-28 16:39:48 +02:00
Riku Isokoski
c2fae47391
Merge branch 'develop' into refresh_rework
2021-08-28 17:25:50 +03:00
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
f895da8634
Merge branch 'Riksu9000-twimaster_rework' into develop
2021-08-28 15:09:16 +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
JF002
969de9a8bc
Merge pull request #492 from Riksu9000/new_touch_handler
...
New touch handler
2021-08-28 15:06:03 +02:00
Colin Kinloch
b45d7c372d
Correct change test for wake up mode setting
2021-08-26 19:42:02 +01:00
Fabien Benetou
d7293a44df
Infini-iOS
2021-08-26 15:11:20 +02:00
Tim Keller
110c82c225
Move noinit to after BSS segment,
...
Now dynamically allocates noinit area size
stores it after the bss before the heap and stack.
2021-08-23 20:13:26 +00: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
c9dedfd402
Add some VSCODE stuff to gitignore...
...
Allow settings to stop naggin me that it has added assosiation types
2021-08-19 00:51:42 +00: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
Tim Keller
16502b788f
Add MCUBOOT linker changes
...
use better linker constant names
2021-08-19 00:14:42 +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
Tim Keller
55f8908769
Make Clock Persistant.
2021-08-17 23:53:57 +00: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
fc6458a35c
Add image with example layouts
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
df8d396472
Merge branch 'Riksu9000-call-improvements' into develop
2021-08-14 21:54:15 +02: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
Martin Hub
dec4bab334
Add VSCode ST-link debug config ( #567 )
2021-08-14 21:24:26 +02:00
Riku Isokoski
6192775161
Improve metronome
2021-08-14 21:08:42 +02:00
