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 |
|
|
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
|
f0e9d13329
|
Update contribute.md (#475)
* Update contribute.md
* Add newlines and remove spaces
* Replace CONTRIBUTING.md with doc/contribute.md
|
2021-08-14 20:58:38 +02:00 |
|
|
mabuch
|
40afae3833
|
Github Action - update mcuboot version
|
2021-08-14 20:46:29 +02:00 |
|
|
Riku Isokoski
|
23bde0d18e
|
Make battery reading periodic. Add events. Disable pullup
|
2021-08-14 21:18:11 +03:00 |
|
|
mabuch
|
fbb4e8c6ae
|
fix Github Action build Firmware
|
2021-08-14 14:47:00 +02: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 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 |
|
|
JF002
|
643077341b
|
Merge pull request #505 from geekbozu/devcon
VSCode Devcontainer
|
2021-08-10 16:54:13 +02: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
|
707446ed52
|
Merge branch 'hassless-improve-battery-percentage-to-battery-icon-mapping' into develop
|
2021-08-10 12:31:03 +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 |
|