Skip to content

Commit 6d6b107

Browse files
luc-githubluc-github
committed
Update latest panels for Marlin
1 parent bda9b19 commit 6d6b107

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+664
-655
lines changed

‎config/server.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ const WebSocket = require("ws")
1515
let currentID = 0
1616
const app = express()
1717
const fileUpload = require("express-fileupload")
18-
let sensorInterval = -1
18+
let sensorInterval = 500
1919

2020
//const serverpath = path.normalize(__dirname + "/../server/public/");
2121

‎config/targets/Printer3D/Marlin/commands.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
{ "cmd": "M20", "description": "List SD card (short format)", "exampleResponse": "Begin file list\\n... End file list\\nok (via SendWS)" },
1616
{ "cmd": "M20 L", "description": "List SD card (long format with path)", "exampleResponse": "Begin file list\\n... End file list (via SendWS)" },
1717
{ "cmd": "M20 1:", "description": "List SD with subdirs (directory format)", "exampleResponse": "Begin file list\\n... End file list (via SendWS)" },
18-
{ "cmd": "M27", "description": "SD print status", "exampleResponse": "SD printing byte 990/1000 (via SendWS)" },
18+
{ "cmd": "M27", "description": "SD print status", "exampleResponse": "SD printing byte 90/1000 (via SendWS)" },
1919
{ "cmd": "M30", "description": "Delete file on SD (M30 filename)", "exampleResponse": "File deleted: ... (via SendWS)" },
2020
{ "cmd": "M31", "description": "Print time", "exampleResponse": "echo:Print time: ... (via SendWS)" },
2121
{ "cmd": "M115", "description": "Firmware info and capabilities", "exampleResponse": "FIRMWARE_NAME:... Cap:... (via SendWS)" },

‎config/targets/Printer3D/Marlin/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ const commandsQuery = (req, res, SendWS, context) => {
449449
}
450450

451451
if (url.indexOf("M27") != -1) {
452-
SendWS("SD printing byte 990/1000\n")
452+
SendWS("SD printing byte 90/1000\n")
453453
res.send("")
454454
return
455455
}

‎css_transition/preferences.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"settings":{"verbosefilters":[{"type":"contain","value":"T:"},{"type":"contain","value":"ok"}],"showsensorctrls":false}}

‎languages/lang-de.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -265,10 +265,9 @@
265265
"btnMoveZ": "Z bewegen",
266266
"btnMotorOff": "Motoren aus",
267267
"btnEStop": "Nothalt",
268-
"move_100": "Verfahrweg 100mm",
269-
"move_10": "Verfahrweg 10mm",
270-
"move_1": "Verfahrweg 1mm",
271-
"move_0_1": "Verfahrweg 0,1mm",
268+
"btnCycleX": "Schrittweite X wechseln",
269+
"btnCycleY": "Schrittweite Y wechseln",
270+
"btnCycleZ": "Schrittweite Z wechseln",
272271
"key": "Taste",
273272
"panels": "Panels",
274273
"processing": "Verarbeitung",
@@ -1120,7 +1119,7 @@
11201119
"P67": "Druckerstatus",
11211120
"P68": "Streaming-Status",
11221121
"P71": "t",
1123-
"P72": "℃",
1122+
"P72": "°C",
11241123
"P73": "Achse referenzieren",
11251124
"P74": "($) ist Achse",
11261125
"P76": "Aufwärts verfahren",

‎languages/lang-es.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -265,10 +265,9 @@
265265
"btnMoveZ": "Mover Z",
266266
"btnMotorOff": "Apagar motores",
267267
"btnEStop": "Parada rápida",
268-
"move_100": "Distancia de movimiento 100mm",
269-
"move_10": "Distancia de movimiento 10mm",
270-
"move_1": "Distancia de movimiento 1mm",
271-
"move_0_1": "Distancia de movimiento 0.1mm",
268+
"btnCycleX": "Cambiar paso X",
269+
"btnCycleY": "Cambiar paso Y",
270+
"btnCycleZ": "Cambiar paso Z",
272271
"key": "Tecla",
273272
"panels": "Paneles",
274273
"processing": "Procesando",
@@ -1120,7 +1119,7 @@
11201119
"P67": "Estado de la impresora",
11211120
"P68": "Estado de transmisión",
11221121
"P71": "t",
1123-
"P72": "℃",
1122+
"P72": "°C",
11241123
"P73": "Origen del eje",
11251124
"P74": "($) es eje",
11261125
"P76": "Mover arriba",

‎languages/lang-fr.json‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,10 +265,9 @@
265265
"btnMoveZ": "Déplacer Z",
266266
"btnMotorOff": "Moteurs éteints",
267267
"btnEStop": "Arrêt rapide",
268-
"move_100": "Distance de déplacement 100mm",
269-
"move_10": "Distance de déplacement 10mm",
270-
"move_1": "Distance de déplacement 1mm",
271-
"move_0_1": "Distance de déplacement 0.1mm",
268+
"btnCycleX": "Changer le pas X",
269+
"btnCycleY": "Changer le pas Y",
270+
"btnCycleZ": "Changer le pas Z",
272271
"key": "Touche",
273272
"panels": "Panneaux",
274273
"processing": "Traitement",

‎languages/lang-hu.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -265,10 +265,9 @@
265265
"btnMoveZ": "Z mozgatás",
266266
"btnMotorOff": "Motorok ki",
267267
"btnEStop": "Gyors megállítás",
268-
"move_100": "Léptetési távolság 100mm",
269-
"move_10": "Léptetési távolság 10mm",
270-
"move_1": "Léptetési távolság 1mm",
271-
"move_0_1": "Léptetési távolság 0.1mm",
268+
"btnCycleX": "X lépés váltás",
269+
"btnCycleY": "Y lépés váltás",
270+
"btnCycleZ": "Z lépés váltás",
272271
"key": "Billentyű",
273272
"panels": "Panelek",
274273
"processing": "Feldolgozás",
@@ -1120,7 +1119,7 @@
11201119
"P67": "Nyomtató állapot",
11211120
"P68": "Streamelés állapot",
11221121
"P71": "t",
1123-
"P72": "℃",
1122+
"P72": "°C",
11241123
"P73": "Tengely kezdőpontja",
11251124
"P74": "($) a tengely",
11261125
"P76": "Léptetés fel",

‎languages/lang-id.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -265,10 +265,9 @@
265265
"btnMoveZ": "Gerakkan Z",
266266
"btnMotorOff": "Matikan Motor",
267267
"btnEStop": "Berhenti Cepat",
268-
"move_100": "Jarak jog 100mm",
269-
"move_10": "Jarak jog 10mm",
270-
"move_1": "Jarak jog 1mm",
271-
"move_0_1": "Jarak jog 0.1mm",
268+
"btnCycleX": "Ganti langkah X",
269+
"btnCycleY": "Ganti langkah Y",
270+
"btnCycleZ": "Ganti langkah Z",
272271
"key": "Kunci",
273272
"panels": "Panel",
274273
"processing": "Memproses",
@@ -1120,7 +1119,7 @@
11201119
"P67": "Status printer",
11211120
"P68": "Status streaming",
11221121
"P71": "t",
1123-
"P72": "℃",
1122+
"P72": "°C",
11241123
"P73": "Home sumbu",
11251124
"P74": "($) adalah sumbu",
11261125
"P76": "Jog naik",

‎languages/lang-it.json‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -265,10 +265,9 @@
265265
"btnMoveZ": "Muovi Z",
266266
"btnMotorOff": "Motori Spenti",
267267
"btnEStop": "Arresto Rapido",
268-
"move_100": "Distanza jog 100mm",
269-
"move_10": "Distanza jog 10mm",
270-
"move_1": "Distanza jog 1mm",
271-
"move_0_1": "Distanza jog 0.1mm",
268+
"btnCycleX": "Cambia passo X",
269+
"btnCycleY": "Cambia passo Y",
270+
"btnCycleZ": "Cambia passo Z",
272271
"key": "Tasto",
273272
"panels": "Pannelli",
274273
"processing": "Elaborazione",
@@ -1120,7 +1119,7 @@
11201119
"P67": "Stato stampante",
11211120
"P68": "Stato streaming",
11221121
"P71": "t",
1123-
"P72": "℃",
1122+
"P72": "°C",
11241123
"P73": "Home asse",
11251124
"P74": "($) è l'asse",
11261125
"P76": "Jog su",

0 commit comments

Comments
 (0)