diff --git a/README.md b/README.md index 09631dcf0..6d4ae8a5e 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,11 @@ Only compatible with [ESP3DLib 3.0](https://github.com/luc-github/ESP3DLib/tree/ [Latest development version ![Development Version](https://img.shields.io/badge/Devt-v3.0-yellow?style=plastic)](https://github.com/luc-github/ESP3D-WEBUI/tree/3.0) ![GitHub last commit (branch)](https://img.shields.io/github/last-commit/luc-github/ESP3D-WEBUI/3.0?style=plastic) [![github-ci](https://github.com/luc-github/ESP3D-WeBUI/workflows/build-ci/badge.svg)](https://github.com/luc-github/ESP3D-WEBUI/actions/workflows/build-ci.yml) [![Project Page ESP3D 3.0](https://img.shields.io/badge/Project%20page-ESP3D%203.0-blue?style=plastic)](https://github.com/users/luc-github/projects/1/views/1) +> [!WARNING] +>### Disclaimer +> The software is provided 'as is,' without any warranty of any kind, expressed or implied, including but not limited to the warranties of merchantability, fitness for a particular purpose, and non-infringement. In no event shall the authors or copyright holders be liable for any claim, damages, or other liability, whether in an action of contract, tort, or otherwise, arising from, out of, or in connection with the software or the use or other dealings in the software. +>It is essential that you carefully read and understand this disclaimer before using this software and its components. If you do not agree with any part of this disclaimer, please refrain from using the software. + ### Setup development tools 1 - Install current nodejs LTS (currently using v20.8.0) diff --git a/dist/CNC/GRBL/index.html.gz b/dist/CNC/GRBL/index.html.gz index ec9a2a33c..8b5d0d15b 100644 Binary files a/dist/CNC/GRBL/index.html.gz and b/dist/CNC/GRBL/index.html.gz differ diff --git a/dist/CNC/GRBLHal/index.html.gz b/dist/CNC/GRBLHal/index.html.gz index 0684b5b17..cd7b813ab 100644 Binary files a/dist/CNC/GRBLHal/index.html.gz and b/dist/CNC/GRBLHal/index.html.gz differ diff --git a/dist/Plotter/HP-GL/index.html.gz b/dist/Plotter/HP-GL/index.html.gz index 78d3e41b3..a1973c989 100644 Binary files a/dist/Plotter/HP-GL/index.html.gz and b/dist/Plotter/HP-GL/index.html.gz differ diff --git a/dist/Printer3D/Marlin-embedded/index.html.gz b/dist/Printer3D/Marlin-embedded/index.html.gz index 7ca5acdd4..0fb714f79 100644 Binary files a/dist/Printer3D/Marlin-embedded/index.html.gz and b/dist/Printer3D/Marlin-embedded/index.html.gz differ diff --git a/dist/Printer3D/Marlin/index.html.gz b/dist/Printer3D/Marlin/index.html.gz index 3f0c704c3..f0a5ceb62 100644 Binary files a/dist/Printer3D/Marlin/index.html.gz and b/dist/Printer3D/Marlin/index.html.gz differ diff --git a/dist/Printer3D/Repetier/index.html.gz b/dist/Printer3D/Repetier/index.html.gz index 3279267ff..a23443eb0 100644 Binary files a/dist/Printer3D/Repetier/index.html.gz and b/dist/Printer3D/Repetier/index.html.gz differ diff --git a/dist/Printer3D/Smoothieware/index.html.gz b/dist/Printer3D/Smoothieware/index.html.gz index f51785f85..c8bd97df2 100644 Binary files a/dist/Printer3D/Smoothieware/index.html.gz and b/dist/Printer3D/Smoothieware/index.html.gz differ diff --git a/dist/SandTable/GRBL/index.html.gz b/dist/SandTable/GRBL/index.html.gz index 1da3771f0..9c3b84365 100644 Binary files a/dist/SandTable/GRBL/index.html.gz and b/dist/SandTable/GRBL/index.html.gz differ diff --git a/languages/cncgrblhalpack/en.json b/languages/cncgrblhalpack/en.json index 85521e96e..34e5ebfa6 100644 --- a/languages/cncgrblhalpack/en.json +++ b/languages/cncgrblhalpack/en.json @@ -566,7 +566,7 @@ "$133": "A Max travel, mm", "$134": "B Max travel, mm", "$135": "C Max travel, mm", - "P15": "Emergency Stop", + "P15": "Quick Stop", "P65": "Move X to", "P66": "Move Y to", "P75": "Move Z to" diff --git a/languages/cncgrblpack/en.json b/languages/cncgrblpack/en.json index 85521e96e..34e5ebfa6 100644 --- a/languages/cncgrblpack/en.json +++ b/languages/cncgrblpack/en.json @@ -566,7 +566,7 @@ "$133": "A Max travel, mm", "$134": "B Max travel, mm", "$135": "C Max travel, mm", - "P15": "Emergency Stop", + "P15": "Quick Stop", "P65": "Move X to", "P66": "Move Y to", "P75": "Move Z to" diff --git a/languages/printerpack/en.json b/languages/printerpack/en.json index 14e7f0cca..63dc8ac27 100644 --- a/languages/printerpack/en.json +++ b/languages/printerpack/en.json @@ -356,7 +356,7 @@ "P12": "Speed", "P13": "Motors Off", "P14": "mm/min", - "P15": "Emergency Stop", + "P15": "Quick Stop", "P16": "mm", "P17": "Cannot get valid data", "P18": "Move to position", diff --git a/languages/sandtablepack/en.json b/languages/sandtablepack/en.json index 4586ec6e4..3e96d5b52 100644 --- a/languages/sandtablepack/en.json +++ b/languages/sandtablepack/en.json @@ -421,7 +421,7 @@ "CN31": "[4] Home selected axis,", "CN32": "[( )] Axis selector,", "CN33": "[+ -] Distance selector, [Home] Home all axis, [O] Zero all axis, [End] Disable, [Delete] Stop,", - "P15": "Emergency Stop", + "P15": "Quick Stop", "P65": "Move X to", "P66": "Move Y to", "P75": "Move Z to" diff --git a/src/components/App/version.js b/src/components/App/version.js index 10d9c68d2..36c01f229 100644 --- a/src/components/App/version.js +++ b/src/components/App/version.js @@ -17,7 +17,7 @@ */ import { h } from 'preact' import { webUIbuild } from '../../targets' -export const webUIversion = '3.0.0-a53' +export const webUIversion = '3.0.0-a54' export const Esp3dVersion = () => ( {webUIversion}.{webUIbuild} diff --git a/src/targets/CNC/Controls/EmergencyButton.js b/src/targets/CNC/Controls/QuickStopButton.js similarity index 95% rename from src/targets/CNC/Controls/EmergencyButton.js rename to src/targets/CNC/Controls/QuickStopButton.js index 14ac4f877..f54e30dfe 100644 --- a/src/targets/CNC/Controls/EmergencyButton.js +++ b/src/targets/CNC/Controls/QuickStopButton.js @@ -1,5 +1,5 @@ /* -EmergencyButton.js - ESP3D WebUI component file +QuickStopButton.js - ESP3D WebUI component file Copyright (c) 2021 Luc LEBOSSE. All rights reserved. @@ -25,7 +25,7 @@ import { T } from "../../../components/Translations" import { ButtonImg } from "../../../components/Controls" import { variablesList } from "../../../targets" -const EmergencyButton = () => { +const QuickStopButton = () => { const { toasts } = useUiContext() const { createNewRequest } = useHttpFn @@ -70,4 +70,4 @@ const EmergencyButton = () => { ) } -export { EmergencyButton } +export { QuickStopButton } diff --git a/src/targets/CNC/Controls/index.js b/src/targets/CNC/Controls/index.js index 9144e7e02..4f20b75c4 100644 --- a/src/targets/CNC/Controls/index.js +++ b/src/targets/CNC/Controls/index.js @@ -18,6 +18,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ import { h } from "preact" -import { EmergencyButton } from "./EmergencyButton" +import { QuickStopButton } from "./QuickStopButton" -export { EmergencyButton } +export { QuickStopButton } diff --git a/src/targets/CNC/GRBL/Controls/QuickButtonsBar.js b/src/targets/CNC/GRBL/Controls/QuickButtonsBar.js index d9112f0fa..ee1017112 100644 --- a/src/targets/CNC/GRBL/Controls/QuickButtonsBar.js +++ b/src/targets/CNC/GRBL/Controls/QuickButtonsBar.js @@ -18,12 +18,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ import { h } from "preact" -import { EmergencyButton } from "../../Controls" +import { QuickStopButton } from "../../Controls" const QuickButtonsBar = () => { return (
- +
) } diff --git a/src/targets/CNC/GRBL/translations/en.json b/src/targets/CNC/GRBL/translations/en.json index 6d455a470..f21b9368c 100644 --- a/src/targets/CNC/GRBL/translations/en.json +++ b/src/targets/CNC/GRBL/translations/en.json @@ -45,7 +45,7 @@ "$133": "A Max travel, mm", "$134": "B Max travel, mm", "$135": "C Max travel, mm", - "P15": "Emergency Stop", + "P15": "Quick Stop", "P65": "Move X to", "P66": "Move Y to", "P75": "Move Z to" diff --git a/src/targets/CNC/grblHAL/Controls/QuickButtonsBar.js b/src/targets/CNC/grblHAL/Controls/QuickButtonsBar.js index d9112f0fa..ee1017112 100644 --- a/src/targets/CNC/grblHAL/Controls/QuickButtonsBar.js +++ b/src/targets/CNC/grblHAL/Controls/QuickButtonsBar.js @@ -18,12 +18,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ import { h } from "preact" -import { EmergencyButton } from "../../Controls" +import { QuickStopButton } from "../../Controls" const QuickButtonsBar = () => { return (
- +
) } diff --git a/src/targets/CNC/grblHAL/translations/en.json b/src/targets/CNC/grblHAL/translations/en.json index 6d455a470..f21b9368c 100644 --- a/src/targets/CNC/grblHAL/translations/en.json +++ b/src/targets/CNC/grblHAL/translations/en.json @@ -45,7 +45,7 @@ "$133": "A Max travel, mm", "$134": "B Max travel, mm", "$135": "C Max travel, mm", - "P15": "Emergency Stop", + "P15": "Quick Stop", "P65": "Move X to", "P66": "Move Y to", "P75": "Move Z to" diff --git a/src/targets/Plotter/Controls/EmergencyButton.js b/src/targets/Plotter/Controls/QuickStopButton.js similarity index 95% rename from src/targets/Plotter/Controls/EmergencyButton.js rename to src/targets/Plotter/Controls/QuickStopButton.js index 282e7ce21..a218c2105 100644 --- a/src/targets/Plotter/Controls/EmergencyButton.js +++ b/src/targets/Plotter/Controls/QuickStopButton.js @@ -1,5 +1,5 @@ /* -EmergencyButton.js - ESP3D WebUI component file +QuickStopButton.js - ESP3D WebUI component file Copyright (c) 2021 Luc LEBOSSE. All rights reserved. @@ -25,7 +25,7 @@ import { T } from "../../../components/Translations" import { ButtonImg } from "../../../components/Controls" import { variablesList } from "../../../targets" -const EmergencyButton = () => { +const QuickStopButton = () => { const { toasts } = useUiContext() const { createNewRequest } = useHttpFn @@ -69,4 +69,4 @@ const EmergencyButton = () => { ) } -export { EmergencyButton } +export { QuickStopButton } diff --git a/src/targets/Plotter/Controls/index.js b/src/targets/Plotter/Controls/index.js index 87ca0e5b5..331cd76f0 100644 --- a/src/targets/Plotter/Controls/index.js +++ b/src/targets/Plotter/Controls/index.js @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ import { h } from "preact" -import { EmergencyButton } from "./EmergencyButton" +import { QuickStopButton } from "./QuickStopButton" import { BackgroundContainer } from "./BackgroundContainer" -export { EmergencyButton, BackgroundContainer } +export { QuickStopButton, BackgroundContainer } diff --git a/src/targets/Plotter/HP-GL/Controls/QuickButtonsBar.js b/src/targets/Plotter/HP-GL/Controls/QuickButtonsBar.js index d9112f0fa..ee1017112 100644 --- a/src/targets/Plotter/HP-GL/Controls/QuickButtonsBar.js +++ b/src/targets/Plotter/HP-GL/Controls/QuickButtonsBar.js @@ -18,12 +18,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ import { h } from "preact" -import { EmergencyButton } from "../../Controls" +import { QuickStopButton } from "../../Controls" const QuickButtonsBar = () => { return (
- +
) } diff --git a/src/targets/Plotter/HP-GL/translations/en.json b/src/targets/Plotter/HP-GL/translations/en.json index 36b8d8c0d..1debe7b2c 100644 --- a/src/targets/Plotter/HP-GL/translations/en.json +++ b/src/targets/Plotter/HP-GL/translations/en.json @@ -19,7 +19,7 @@ "btndistSel+": "Next jog distance", "btndistSel-": "Previous jog distance", "btnStop": "Stop", - "HP16": "Emergency Stop", + "HP16": "Quick Stop", "HP17": "Pen", "HP18": "If 0 use default max value", "HP19": "Park pen", diff --git a/src/targets/Printer3D/Controls/EmergencyButton.js b/src/targets/Printer3D/Controls/QuickStopButton.js similarity index 95% rename from src/targets/Printer3D/Controls/EmergencyButton.js rename to src/targets/Printer3D/Controls/QuickStopButton.js index c2b6d63fe..e02c29f2b 100644 --- a/src/targets/Printer3D/Controls/EmergencyButton.js +++ b/src/targets/Printer3D/Controls/QuickStopButton.js @@ -1,5 +1,5 @@ /* -EmergencyButton.js - ESP3D WebUI component file +QuickStopButton.js - ESP3D WebUI component file Copyright (c) 2021 Luc LEBOSSE. All rights reserved. @@ -24,7 +24,7 @@ import { useUiContext, useUiContextFn } from "../../../contexts" import { T } from "../../../components/Translations" import { ButtonImg } from "../../../components/Controls" -const EmergencyButton = () => { +const QuickStopButton = () => { const { toasts } = useUiContext() const { createNewRequest } = useHttpFn @@ -63,4 +63,4 @@ const EmergencyButton = () => { ) } -export { EmergencyButton } +export { QuickStopButton } diff --git a/src/targets/Printer3D/Controls/index.js b/src/targets/Printer3D/Controls/index.js index 0324526f3..d12a96ccf 100644 --- a/src/targets/Printer3D/Controls/index.js +++ b/src/targets/Printer3D/Controls/index.js @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ import { h } from "preact" -import { EmergencyButton } from "./EmergencyButton" +import { QuickStopButton } from "./QuickStopButton" import { BackgroundContainer } from ".//BackgroundContainer" -export { EmergencyButton, BackgroundContainer } +export { QuickStopButton, BackgroundContainer } diff --git a/src/targets/Printer3D/Marlin-embedded/Controls/QuickButtonsBar.js b/src/targets/Printer3D/Marlin-embedded/Controls/QuickButtonsBar.js index d9112f0fa..ee1017112 100644 --- a/src/targets/Printer3D/Marlin-embedded/Controls/QuickButtonsBar.js +++ b/src/targets/Printer3D/Marlin-embedded/Controls/QuickButtonsBar.js @@ -18,12 +18,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ import { h } from "preact" -import { EmergencyButton } from "../../Controls" +import { QuickStopButton } from "../../Controls" const QuickButtonsBar = () => { return (
- +
) } diff --git a/src/targets/Printer3D/Marlin/Controls/QuickButtonsBar.js b/src/targets/Printer3D/Marlin/Controls/QuickButtonsBar.js index d9112f0fa..ee1017112 100644 --- a/src/targets/Printer3D/Marlin/Controls/QuickButtonsBar.js +++ b/src/targets/Printer3D/Marlin/Controls/QuickButtonsBar.js @@ -18,12 +18,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ import { h } from "preact" -import { EmergencyButton } from "../../Controls" +import { QuickStopButton } from "../../Controls" const QuickButtonsBar = () => { return (
- +
) } diff --git a/src/targets/Printer3D/Repetier/Controls/QuickButtonsBar.js b/src/targets/Printer3D/Repetier/Controls/QuickButtonsBar.js index d9112f0fa..ee1017112 100644 --- a/src/targets/Printer3D/Repetier/Controls/QuickButtonsBar.js +++ b/src/targets/Printer3D/Repetier/Controls/QuickButtonsBar.js @@ -18,12 +18,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ import { h } from "preact" -import { EmergencyButton } from "../../Controls" +import { QuickStopButton } from "../../Controls" const QuickButtonsBar = () => { return (
- +
) } diff --git a/src/targets/Printer3D/Smoothieware/Controls/QuickButtonsBar.js b/src/targets/Printer3D/Smoothieware/Controls/QuickButtonsBar.js index d9112f0fa..ee1017112 100644 --- a/src/targets/Printer3D/Smoothieware/Controls/QuickButtonsBar.js +++ b/src/targets/Printer3D/Smoothieware/Controls/QuickButtonsBar.js @@ -18,12 +18,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ import { h } from "preact" -import { EmergencyButton } from "../../Controls" +import { QuickStopButton } from "../../Controls" const QuickButtonsBar = () => { return (
- +
) } diff --git a/src/targets/Printer3D/translations/en.json b/src/targets/Printer3D/translations/en.json index 97e7c98e6..5bbdaaef6 100644 --- a/src/targets/Printer3D/translations/en.json +++ b/src/targets/Printer3D/translations/en.json @@ -13,7 +13,7 @@ "P12": "Speed", "P13": "Motors Off", "P14": "mm/min", - "P15": "Emergency Stop", + "P15": "Quick Stop", "P16": "mm", "P17": "Cannot get valid data", "P18": "Move to position", diff --git a/src/targets/SandTable/Controls/EmergencyButton.js b/src/targets/SandTable/Controls/QuickStopButton.js similarity index 95% rename from src/targets/SandTable/Controls/EmergencyButton.js rename to src/targets/SandTable/Controls/QuickStopButton.js index 4bf55ac1d..2d8a3b8ad 100644 --- a/src/targets/SandTable/Controls/EmergencyButton.js +++ b/src/targets/SandTable/Controls/QuickStopButton.js @@ -1,5 +1,5 @@ /* -EmergencyButton.js - ESP3D WebUI component file +QuickStopButton.js - ESP3D WebUI component file Copyright (c) 2021 Luc LEBOSSE. All rights reserved. @@ -25,7 +25,7 @@ import { T } from "../../../components/Translations" import { ButtonImg } from "../../../components/Controls" import { variablesList } from "../../../targets" -const EmergencyButton = () => { +const QuickStopButton = () => { const { toasts } = useUiContext() const { createNewRequest } = useHttpFn @@ -69,4 +69,4 @@ const EmergencyButton = () => { ) } -export { EmergencyButton } +export { QuickStopButton } diff --git a/src/targets/SandTable/Controls/index.js b/src/targets/SandTable/Controls/index.js index 87ca0e5b5..331cd76f0 100644 --- a/src/targets/SandTable/Controls/index.js +++ b/src/targets/SandTable/Controls/index.js @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ import { h } from "preact" -import { EmergencyButton } from "./EmergencyButton" +import { QuickStopButton } from "./QuickStopButton" import { BackgroundContainer } from "./BackgroundContainer" -export { EmergencyButton, BackgroundContainer } +export { QuickStopButton, BackgroundContainer } diff --git a/src/targets/SandTable/GRBL/Controls/QuickButtonsBar.js b/src/targets/SandTable/GRBL/Controls/QuickButtonsBar.js index d9112f0fa..ee1017112 100644 --- a/src/targets/SandTable/GRBL/Controls/QuickButtonsBar.js +++ b/src/targets/SandTable/GRBL/Controls/QuickButtonsBar.js @@ -18,12 +18,12 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ import { h } from "preact" -import { EmergencyButton } from "../../Controls" +import { QuickStopButton } from "../../Controls" const QuickButtonsBar = () => { return (
- +
) } diff --git a/src/targets/SandTable/GRBL/translations/en.json b/src/targets/SandTable/GRBL/translations/en.json index 57cb95380..3574cb072 100644 --- a/src/targets/SandTable/GRBL/translations/en.json +++ b/src/targets/SandTable/GRBL/translations/en.json @@ -82,7 +82,7 @@ "btn+axis": "Current rotary axis +", "btn-axis": "Current rotary axis -", "btnHaxis": "Home current rotary axis", - "P15": "Emergency Stop", + "P15": "Quick Stop", "P65": "Move X to", "P66": "Move Y to", "P75": "Move Z to" diff --git a/src/targets/translations/en.json b/src/targets/translations/en.json index 490579de7..fafcf8921 100644 --- a/src/targets/translations/en.json +++ b/src/targets/translations/en.json @@ -239,7 +239,7 @@ "btnMoveXY": "Move X Y", "btnMoveZ": "Move Z", "btnMotorOff": "Motors Off", - "btnEStop": "Emergency Stop", + "btnEStop": "Quick Stop", "move_100": "Jog distance 100mm", "move_10": "Jog distance 10mm", "move_1": "Jog distance 1mm",