Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Big overhaul of the UI framework #1749

Merged
merged 89 commits into from
Feb 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
cd51e2a
Starting GUI render refactor to be more immediate mode
Ralim Jul 10, 2023
cc08140
Update TemperatureAdjust.cpp
Ralim Jul 11, 2023
e329b09
Roughing some transition work
Ralim Jul 17, 2023
a89bccc
Fixup! Hook in the init starter helper
Ralim Jul 17, 2023
9650a1a
Better home screen button handler
Ralim Jul 17, 2023
28bfca2
FIXUP! Fix typo's
Ralim Jul 18, 2023
f524618
Update SettingsMenu.cpp
Ralim Jul 18, 2023
d1b5aaf
More settings rework
Ralim Jul 19, 2023
7ea36b2
More settings rendering
Ralim Jul 20, 2023
385f816
Fixup
Ralim Jul 20, 2023
12b7957
Transitions
Ralim Jul 20, 2023
d78162f
Update TemperatureAdjust.cpp
Ralim Jul 20, 2023
3e2a438
Update push.yml
Ralim Jul 20, 2023
ea38061
Add auto-repeat to settings menu
Ralim Jul 20, 2023
e2f893c
Miniware: Use IT for I2C writes
Ralim Jul 21, 2023
8c5fe11
Update USBPDDebug_HUSB238.cpp
Ralim Jul 21, 2023
7cec1dc
Force write screen on side animation cancel
Ralim Jul 21, 2023
37011c0
Refactor moving down the settings list
Ralim Jul 21, 2023
5e79a48
Update settingsGUI.cpp
Ralim Jul 21, 2023
b4a2575
Update I2C_Wrapper.cpp
Ralim Jul 21, 2023
9e5943e
Update OLED.cpp
Ralim Jul 21, 2023
1acc6fa
Rework button handling
Ralim Jul 21, 2023
d9efc79
Fix PD debug at boot
Ralim Jul 21, 2023
3bbeb93
Fixup not showing right menu options
Ralim Jul 21, 2023
6cac8fa
silence some warnings
Ralim Jul 21, 2023
b33f57c
Style cleanup
Ralim Jul 21, 2023
b45f90b
Fkit use bit-bang I2C for Miniware
Ralim Jul 21, 2023
4ed4d34
Update GUIRendering.md
Ralim Jul 21, 2023
9c39454
Fixup transition on enter soldering mode
Ralim Jul 22, 2023
e802373
Save Settings
Ralim Jul 22, 2023
7bf02cc
Fixes for some animations not running
Ralim Jul 22, 2023
0abb958
Fixup settings acceleration
Ralim Jul 22, 2023
c147422
OLED Up animation
Ralim Jul 22, 2023
300e19e
Link up/down on debug meny
Ralim Jul 22, 2023
9b9d50b
Make all accelerometers I2C bus aware
Ralim Jul 22, 2023
07fa671
Make I2C mag optional
Ralim Jul 22, 2023
c71b694
Miniware -> Only Bit-Bang I2C
Ralim Jul 22, 2023
f329fea
Fixup for scrollbar
Ralim Jul 23, 2023
1ce2ab4
Settings menu -> Both buttons return a menu layer
Ralim Jul 23, 2023
f768a02
Merge fixup
Ralim Nov 23, 2023
39dd941
Update BMA223.cpp
Ralim Nov 23, 2023
3d0c981
Re-Enable OLED sleep
Ralim Nov 23, 2023
4efad50
Save Setting on temp adjust exit
Ralim Nov 23, 2023
4cd74ae
WiP on startup mode
Ralim Nov 24, 2023
ab42ace
Some autostart working
Ralim Nov 24, 2023
010f6de
Add hibernation mode & more autostart fixes
Ralim Nov 24, 2023
cb4fb3d
If cant CJC; go to startup
Ralim Nov 24, 2023
940e060
Hibernate in sleep
Ralim Nov 25, 2023
afea604
Cleanup scroll indicator
Ralim Nov 26, 2023
d3fee24
FIXUP! Ensure startup warnings are linked in
Ralim Nov 26, 2023
fd78fbf
FIXUP! Ensure we render out temp change before timing out
Ralim Nov 26, 2023
7be2f48
Ensure 100ms delay between CJC samples
Ralim Dec 24, 2023
fa6db20
Fix not re-calculating menu length on entering menu
Ralim Dec 24, 2023
9c713c0
Implement NegotiationinProgress for USB-PD
Ralim Dec 24, 2023
4addc80
Mask heating until PD finishes negotiation
Ralim Dec 24, 2023
fab395b
Fixup staying in hibernate correctly
Ralim Dec 24, 2023
ed52118
Warning timeout
Ralim Dec 24, 2023
869758a
Show reset settings warning
Ralim Dec 24, 2023
9088379
Correctly compensate help text start time
Ralim Dec 24, 2023
5eda503
Update GUIThread.cpp
Ralim Dec 26, 2023
673034b
Update USBPD.cpp
Ralim Jan 12, 2024
c1cb92d
.
Ralim Jan 12, 2024
93111ad
Fixup sleep time
Ralim Jan 12, 2024
fe83c01
Update printSleepCountdown.cpp
Ralim Jan 12, 2024
9b514cd
replacing countdown with big plus while in boost mode
discip Jan 13, 2024
39716fa
bringing back the + 1 since it was missing when not in boost mode
discip Jan 13, 2024
4e2bca3
Bail on USB-PD check after 3 seconds incase of DC source
Ralim Jan 17, 2024
47b4d15
Fix hibernate
Ralim Jan 17, 2024
17b716e
Update PIDThread.cpp
Ralim Jan 17, 2024
51d9f3d
did center plus symbol (boost mode)
discip Jan 18, 2024
6b696fd
Big refactor to not make settings increment handler handle the "is la…
Ralim Jan 19, 2024
4a6d82f
Fixup boot logo
Ralim Jan 19, 2024
dfdc806
Fix flashing
Ralim Jan 20, 2024
24476f5
Fixup recalculate the menu length on long hold
Ralim Jan 20, 2024
e0060f1
Fixup missing menu entries
Ralim Jan 20, 2024
abcf861
Fix junk left on screen after user confirmation
Ralim Jan 20, 2024
16a4423
Merge branch 'dev' into gui-dispatches
Ralim Jan 22, 2024
2c1cb6a
Re-order button handler to use custom, then default order to allow se…
Ralim Jan 22, 2024
f44d913
Attach setting for settings using custom handler
Ralim Jan 22, 2024
8988fa0
Fix swap +/- keys
Ralim Jan 22, 2024
1b12923
Fix boost temp
Ralim Jan 22, 2024
d6ebe2c
Implement last menu option for Language selector
Ralim Jan 22, 2024
44e4b6b
Wait for init before CJC runs
Ralim Feb 14, 2024
1ff1e13
Check last setting via increment value
Ralim Feb 14, 2024
52dee32
Update BSP.cpp
Ralim Feb 14, 2024
05ae1a5
removed = from >=
discip Feb 14, 2024
7def9cc
Merge branch 'dev' into gui-dispatches
Ralim Feb 17, 2024
07ddd47
(Hacky) Fix for Settings reset
Ralim Feb 17, 2024
58ff3a9
Merge branch 'dev' into gui-dispatches
Ralim Feb 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion .github/workflows/push.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
name: CI

on: [push, pull_request]
on:
push:
branches:
- master
- dev
- main
pull_request:
branches:
- master
- dev
- main

jobs:
build:
Expand Down
7 changes: 0 additions & 7 deletions source/Core/BSP/Miniware/BSP.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -360,14 +360,7 @@ uint8_t preStartChecks() {
}

#endif
#ifdef POW_PD
// If we are in the middle of negotiating PD, wait until timeout
// Before turning on the heater
if (!USBPowerDelivery::negotiationComplete()) {
return 0;
}

#endif
return 1;
}
uint64_t getDeviceID() {
Expand Down
Loading