Skip to content

Commit 7eb891d

Browse files
committed
Various changes towards v3.3
Updated WHATS_NEW and object model to match DSF 3.3 Added PT-BR translations (thanks phcella) Removed ripple effect from file list items Changed plugin interfaces to match DSF 3.3 Bug fixe: Auto-indentation used spaces regardless of last line indentation type Bug fix: Fixed reset prompt for 0:/sys/board.txt (for STM and LPC users only) Bug fix: Upload errors for dwc-settings and dwc-cache are no longer displayed Bug fix: Spindle RPM inputs didn't wait for code to finish Bug fix: Failed uploads for DWC system files are no longer shown
1 parent 5a6235c commit 7eb891d

16 files changed

Lines changed: 933 additions & 35 deletions

File tree

WHATS_NEW.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
11
Summary of important changes in recent versions
22
===============================================
33

4+
Version 3.3.0-b1
5+
================
6+
7+
Compatible versions:
8+
- DuetSoftwareFramework 3.2.0
9+
- RepRapFirmware 2 or newer (1.2x may work but untested)
10+
11+
Bug fixes:
12+
- Auto-indentation used spaces regardless of last line indentation type
13+
- Fixed reset prompt for 0:/sys/board.txt (for STM and LPC users only)
14+
- Upload errors for dwc-settings and dwc-cache are no longer displayed
15+
416
Version 3.2.0
517
=============
618

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "duetwebcontrol",
3-
"version": "3.2.0",
3+
"version": "3.3-b1",
44
"repository": "github:chrishamm/DuetWebControl",
55
"homepage": "https://forum.duet3d.com/category/27/duet-web-control",
66
"license": "GPL-3.0",

src/components/dialogs/FileEditDialog/FileEditDialog.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ export default {
118118
return {
119119
mode: 'application/x-gcode',
120120
theme: this.darkTheme ? 'blackboard' : 'default',
121+
indentWithTabs: true,
121122
lineNumbers: true,
122123
styleActiveLine: true
123124
}

src/components/inputs/ToolInput.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ export default {
106106
if (this.spindle) {
107107
// Set Spindle RPM
108108
if (this.inputValue >= 0) {
109-
this.sendCode(`M3 P${this.spindleIndex} S${this.inputValue}`);
109+
await this.sendCode(`M3 P${this.spindleIndex} S${this.inputValue}`);
110110
} else {
111-
this.sendCode(`M4 P${this.spindleIndex} S${-this.inputValue}`);
111+
await this.sendCode(`M4 P${this.spindleIndex} S${-this.inputValue}`);
112112
}
113113
} else if (this.inputValue >= -273.15 && this.inputValue <= 1999) {
114114
if (this.tool) {

src/components/lists/BaseFileList.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ td {
4141
</template>
4242

4343
<template #item="props">
44-
<tr v-ripple :active="props.isSelected" @keydown.space.prevent="props.select(!props.isSelected)"
44+
<tr :active="props.isSelected" @keydown.space.prevent="props.select(!props.isSelected)"
4545
@touchstart="onItemTouchStart(props, $event)" @touchend="onItemTouchEnd"
4646
@click="onItemClick(props)" @keydown.enter.prevent="onItemClick(props)"
4747
@contextmenu.stop.prevent="onItemContextmenu(props, $event)" @keydown.escape.prevent="contextMenu.shown = false"

src/components/lists/JobFileList.vue

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -267,12 +267,11 @@ export default {
267267
},
268268
contextMenuAction(menuItem){
269269
let path = Path.combine(this.directory, this.selection[0].name);
270-
if(menuItem.path !== ''){
271-
this.$router.push(menuItem.path).then(() => {
272-
this.$root.$emit(menuItem.action, path);
273-
})
274-
}
275-
else{
270+
if (menuItem.path !== '') {
271+
this.$router.push(menuItem.path).then(() => {
272+
this.$root.$emit(menuItem.action, path);
273+
})
274+
} else {
276275
this.$root.$emit(menuItem.action, path);
277276
}
278277

src/components/lists/SystemFileList.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ export default {
106106
fileEdited(filename) {
107107
const fullName = Path.combine(this.directory, filename);
108108
const configFile = Path.combine(this.systemDirectory, Path.configFile);
109-
if (!isPrinting(this.status) && (fullName === Path.configFile || fullName === configFile || fullName === Path.boardsFile)) {
109+
if (!isPrinting(this.status) && (fullName === Path.configFile || fullName === configFile || fullName === Path.boardFile)) {
110110
// Ask for firmware reset when config.g or 0:/sys/board.txt (RRF on LPC) has been edited
111111
this.showResetPrompt = true;
112112
}

src/i18n/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import en from './en.js'
77
import de from './de.js'
88
import es from './es.js'
99
import fr from './fr.js'
10+
import pt_br from './pt_br.js'
1011
import ru from './ru.js'
1112
import tr from './tr.js'
1213
import zh_cn from './zh_cn.js'
@@ -18,6 +19,7 @@ const messages = {
1819
de,
1920
es,
2021
fr,
22+
pt_br,
2123
ru,
2224
tr,
2325
zh_cn

0 commit comments

Comments
 (0)