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.

Sign up for GitHub

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

Jump to bottom

feat: toolhead control panel #712

Merged
merged 116 commits into from
Apr 24, 2022
Merged

feat: toolhead control panel #712

merged 116 commits into from
Apr 24, 2022

Conversation

dw-0
Copy link
Member

@dw-0 dw-0 commented Mar 12, 2022 •
edited
Loading

Depends on #711 (needs to be merged first)

Will cover:
#538
#532
#218
#377
#729

Will dismiss:
#659

Signed-off-by: Dominik Willner [email protected]

dw-0 added 30 commits February 13, 2022 20:13
@dw-0
fix: add toString casting to fix weak IDE warnings
8f63536 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
refactor: format code
7c4cee4 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
fix: add toString casting to fix weak IDE warnings
1145ad1 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
feat: initial rough implementation of an extruder control panel
c022b8a 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
fix: whitespaces
7cc5426 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
fix: whitespaces
4c7c779 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
feat: add extruder interface and getter
7206a5f 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
feat: add key to extruder interface and getter
95c6a56 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
merge: develop
20a2f75 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
chore: npm run format
30f4bc0 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
refactor: make defaultValue for NumberInput optional
0dc90b8 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
merge: develop
e7a3f5d 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
fix: NumberInput.vue remove unnecessary code
55fc4da 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
refactor: kebab-case to camelCase
b5bca97 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
locale(en): english locales for ExtruderControlPanel.vue
28661b5 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
locale(de): german locales for ExtruderControlPanel.vue
b5cb2a9 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
locale(de): update german locales
ba536d5 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
locale(en): update english locales
796ced0 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
merge: develop
1a3cebd 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
fix: select input on focus
7090e6b 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
locales: rename "Hotend" to "Extruder"
0f7ee79 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
feat: make estimated extrusion info optional (enabled by default)
1d9c4ce 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
feat: commit progress on ExtruderControlPanel
bd4da70 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
fix: add extruder-control-panel to index.ts and helpers.ts
7221b39 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
refactor: make input section responsive
d8fc77d 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
fix: prevent invalid input on toolchange
a6eb7a8 
If, while switching from extruder A to extruder B, the feedamount from extruder A exceeds the maxExtrudeOnlyDistance of extruder B, set the feedamount to maxExtrudeOnlyDistance of extruder B

Signed-off-by: Dominik Willner <[email protected]>
@dw-0
refactor: improve subpanel visuals
69386fb 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
refactor: improve PressureAdvanceSettings responsive behaviour
08def00 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
feat: move PressureAdvanceSettings from MachineSettingsPanel to Extru…
a653956 
…derControlPanel

Signed-off-by: Dominik Willner <[email protected]>
@dw-0
refactor: move extrusion factor slider above pressure advance settings
70b266b 
Signed-off-by: Dominik Willner <[email protected]>
dw-0 added 13 commits April 5, 2022 18:17
@dw-0
fix(responsive.ts): issue with wrong indication of height leading to …
e87feb6 
…glitches during some animations

credits for this bugfix go to:
@pataar (https://github.com/pataar)

Signed-off-by: Dominik Willner <[email protected]>
@dw-0
refactor(SubPanel.vue): chevron-down as default icon
8263072 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
Merge branch 'develop' into feat/extruder-control-panel
1de125b
@dw-0
Merge branch 'feat/extruder-control-panel' into feat/toolhead-control…
1023469 
…-panel

# Conflicts:
#	src/pages/Dashboard.vue
@dw-0
refactor(BarsControl): replace v-btn-toggle with v-item-group
e6f64fb 
those buttons should not have a toggle behavior

Signed-off-by: Dominik Willner <[email protected]>
@dw-0
refactor(ZoffsetControl): replace v-btn-toggle with v-item-group
7752731 
those buttons should not have a toggle behavior

Signed-off-by: Dominik Willner <[email protected]>
@dw-0
feat(CrossControl): better responsiveness
4538ca4 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
wip(ToolheadControlPanel): cross + bars control responsiveness
f1dda70 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
wip
a5446ed 
Signed-off-by: Dominik Willner <[email protected]>
@dw-0
Merge branch 'develop' into feat/extruder-control-panel
36dcab2
@dw-0
Merge branch 'feat/extruder-control-panel' into feat/toolhead-control…
449e067 
…-panel
@dw-0
fix(ToolheadControlPanel.vue): fixed height for zoffset control in x-…
0fb3f22 
…large layout for bars and cross

Signed-off-by: Dominik Willner <[email protected]>
@dw-0
refactor(ToolheadControlPanel.vue): full responsiveness of circle con…
3dbd399 
…trols

Signed-off-by: Dominik Willner <[email protected]>
This was linked to issues Apr 7, 2022
[FR] Z offset UI #659
Closed
[feature request] Home XY button #729
Closed
cross movement controls remain locked #747
Closed
[FR] Customizable Z-Offset values #532
Closed
@dw-0 dw-0 marked this pull request as ready for review April 11, 2022 20:12
meteyou added 4 commits April 24, 2022 22:22
@meteyou
fix: some small issues (#4)
faa7329 
* fix: display error messages with a icon and tooltip to have a fixed height

Signed-off-by: Stefan Dej <[email protected]>

* refactor: remove debug output

Signed-off-by: Stefan Dej <[email protected]>

* locale: add error message to i18n

Signed-off-by: Stefan Dej <[email protected]>

* feat: add toggle buttons to switch between absolute and relative mode

Signed-off-by: Stefan Dej <[email protected]>
@meteyou
Merge branch 'develop' into feat/toolhead-control-panel
13704b3 
# Conflicts:
#	src/components/panels/ControlPanel.vue
#	src/components/panels/PrintsettingsPanel.vue
#	src/components/settings/SettingsControlTab.vue
#	src/components/settings/SettingsUiSettingsTab.vue
#	src/locales/da.json
#	src/locales/de.json
#	src/locales/en.json
#	src/locales/es.json
#	src/locales/fr.json
#	src/locales/hu.json
#	src/locales/it.json
#	src/locales/nl.json
#	src/locales/pl.json
#	src/locales/ru.json
#	src/locales/zh-tw.json
#	src/locales/zh.json
#	src/pages/Dashboard.vue
#	src/store/gui/index.ts
#	src/store/printer/types.ts
#	src/store/variables.ts
@meteyou
fix: fix some merge issues
6951bdc 
Signed-off-by: Stefan Dej <[email protected]>
@meteyou
Merge remote-tracking branch 'th33xitus/feat/toolhead-control-panel' …
92a4d2a 
…into feat/toolhead-control-panel

# Conflicts:
#	src/locales/de.json
#	src/locales/en.json
@meteyou meteyou merged commit 41ba619 into mainsail-crew:develop Apr 24, 2022
@dw-0 dw-0 deleted the feat/toolhead-control-panel branch April 25, 2022 19:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@meteyou meteyou meteyou approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@dw-0 @meteyou