Skip to content

Commit

Permalink
Add disclaimer and change Emergency Stop to Quick Stop
Browse files Browse the repository at this point in the history
  • Loading branch information
luc-github committed Mar 23, 2024
1 parent 4afcf88 commit 215d342
Show file tree
Hide file tree
Showing 36 changed files with 52 additions and 47 deletions.
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Binary file modified dist/CNC/GRBL/index.html.gz
Binary file not shown.
Binary file modified dist/CNC/GRBLHal/index.html.gz
Binary file not shown.
Binary file modified dist/Plotter/HP-GL/index.html.gz
Binary file not shown.
Binary file modified dist/Printer3D/Marlin-embedded/index.html.gz
Binary file not shown.
Binary file modified dist/Printer3D/Marlin/index.html.gz
Binary file not shown.
Binary file modified dist/Printer3D/Repetier/index.html.gz
Binary file not shown.
Binary file modified dist/Printer3D/Smoothieware/index.html.gz
Binary file not shown.
Binary file modified dist/SandTable/GRBL/index.html.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion languages/cncgrblhalpack/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion languages/cncgrblpack/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion languages/printerpack/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion languages/sandtablepack/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/components/App/version.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 = () => (
<span>
{webUIversion}.{webUIbuild}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
EmergencyButton.js - ESP3D WebUI component file
QuickStopButton.js - ESP3D WebUI component file
Copyright (c) 2021 Luc LEBOSSE. All rights reserved.
Expand All @@ -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
Expand Down Expand Up @@ -70,4 +70,4 @@ const EmergencyButton = () => {
)
}

export { EmergencyButton }
export { QuickStopButton }
4 changes: 2 additions & 2 deletions src/targets/CNC/Controls/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
4 changes: 2 additions & 2 deletions src/targets/CNC/GRBL/Controls/QuickButtonsBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<div class="quick-buttons-bar">
<EmergencyButton />
<QuickStopButton />
</div>
)
}
Expand Down
2 changes: 1 addition & 1 deletion src/targets/CNC/GRBL/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions src/targets/CNC/grblHAL/Controls/QuickButtonsBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<div class="quick-buttons-bar">
<EmergencyButton />
<QuickStopButton />
</div>
)
}
Expand Down
2 changes: 1 addition & 1 deletion src/targets/CNC/grblHAL/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
EmergencyButton.js - ESP3D WebUI component file
QuickStopButton.js - ESP3D WebUI component file
Copyright (c) 2021 Luc LEBOSSE. All rights reserved.
Expand All @@ -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
Expand Down Expand Up @@ -69,4 +69,4 @@ const EmergencyButton = () => {
)
}

export { EmergencyButton }
export { QuickStopButton }
4 changes: 2 additions & 2 deletions src/targets/Plotter/Controls/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
4 changes: 2 additions & 2 deletions src/targets/Plotter/HP-GL/Controls/QuickButtonsBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<div class="quick-buttons-bar">
<EmergencyButton />
<QuickStopButton />
</div>
)
}
Expand Down
2 changes: 1 addition & 1 deletion src/targets/Plotter/HP-GL/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
EmergencyButton.js - ESP3D WebUI component file
QuickStopButton.js - ESP3D WebUI component file
Copyright (c) 2021 Luc LEBOSSE. All rights reserved.
Expand All @@ -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
Expand Down Expand Up @@ -63,4 +63,4 @@ const EmergencyButton = () => {
)
}

export { EmergencyButton }
export { QuickStopButton }
4 changes: 2 additions & 2 deletions src/targets/Printer3D/Controls/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<div class="quick-buttons-bar">
<EmergencyButton />
<QuickStopButton />
</div>
)
}
Expand Down
4 changes: 2 additions & 2 deletions src/targets/Printer3D/Marlin/Controls/QuickButtonsBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<div class="quick-buttons-bar">
<EmergencyButton />
<QuickStopButton />
</div>
)
}
Expand Down
4 changes: 2 additions & 2 deletions src/targets/Printer3D/Repetier/Controls/QuickButtonsBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<div class="quick-buttons-bar">
<EmergencyButton />
<QuickStopButton />
</div>
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<div class="quick-buttons-bar">
<EmergencyButton />
<QuickStopButton />
</div>
)
}
Expand Down
2 changes: 1 addition & 1 deletion src/targets/Printer3D/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
EmergencyButton.js - ESP3D WebUI component file
QuickStopButton.js - ESP3D WebUI component file
Copyright (c) 2021 Luc LEBOSSE. All rights reserved.
Expand All @@ -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
Expand Down Expand Up @@ -69,4 +69,4 @@ const EmergencyButton = () => {
)
}

export { EmergencyButton }
export { QuickStopButton }
4 changes: 2 additions & 2 deletions src/targets/SandTable/Controls/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
4 changes: 2 additions & 2 deletions src/targets/SandTable/GRBL/Controls/QuickButtonsBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
<div class="quick-buttons-bar">
<EmergencyButton />
<QuickStopButton />
</div>
)
}
Expand Down
2 changes: 1 addition & 1 deletion src/targets/SandTable/GRBL/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src/targets/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 215d342

Please sign in to comment.