Skip to content

Rationalize ESP700 path syntax across targets #455

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

Open
rixnco wants to merge 2 commits into
base: 3.1
Choose a base branch
from
Open

Rationalize ESP700 path syntax across targets #455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c1ca08
Rationalize ESP700 path syntax across targets
EBOSTM Jun 18, 2026
6229a5e
Align Marlin streaming controls to native ESP701
EBOSTM Jun 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/components/Panels/Macros.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import {
files,
variablesList,
} from "../../targets"
import { buildEsp700Command } from "../../targets/helpers"

/*
* Local const
Expand Down Expand Up @@ -85,9 +86,7 @@ const MacrosPanel = () => {
const processMacro = (action, type) => {
switch (type) {
case "FS":
//[ESP700] //ESP700 should send status to telnet / websocket
//Todo: handle response from ESP700
sendCommand("[ESP700]" + action)
sendCommand(buildEsp700Command(action))
break
case "SD":
//get command accoring target FW
Expand Down
141 changes: 100 additions & 41 deletions src/components/Panels/Status.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,13 @@
import { Fragment, h } from "preact"
import { useRef } from "preact/hooks"
import { T } from "../Translations"
import { Layers, PlayCircle, PauseCircle, StopCircle } from "preact-feather"
import {
Layers,
PlayCircle,
PauseCircle,
StopCircle,
CheckCircle,
} from "preact-feather"
import { useUiContext, useUiContextFn } from "../../contexts"
import { useTargetContext } from "../../targets"
import { ButtonImg, FullScreenButton, CloseButton, ContainerHelper } from "../Controls"
Expand Down Expand Up @@ -64,52 +70,103 @@ const TimeControl = ({ label, time }) => {
)
}

const toTimeObject = (seconds) => {
const value = parseInt(seconds || 0)
if (!value || value < 0) return null
return {
year: null,
day: Math.floor((value % (86400 * 30)) / 86400),
hour: Math.floor((value % 86400) / 3600),
min: Math.floor((value % 3600) / 60),
sec: Math.floor(value % 60),
}
}

const getStreamView = (streamStatus) => {
if (!streamStatus || !streamStatus.status) return null
const progress =
typeof streamStatus.m73_progress !== "undefined"
? parseFloat(streamStatus.m73_progress).toFixed(2)
: streamStatus.processed && streamStatus.total
? Math.round(
(streamStatus.processed / streamStatus.total) * 100
).toFixed(2)
: null

const printTime =
typeof streamStatus.m73_elapsed !== "undefined"
? toTimeObject(streamStatus.m73_elapsed)
: toTimeObject(
streamStatus.elapsed
? Math.floor(streamStatus.elapsed / 1000)
: 0
)

let printLeftTime = null
if (typeof streamStatus.m73_remaining !== "undefined") {
printLeftTime = toTimeObject(streamStatus.m73_remaining)
} else if (
streamStatus.elapsed &&
progress &&
parseFloat(progress) > 0 &&
parseFloat(progress) < 100
) {
const timeLeft =
((100 - parseFloat(progress)) / parseFloat(progress)) *
streamStatus.elapsed
printLeftTime = toTimeObject(Math.floor(timeLeft / 1000))
}

return {
...streamStatus,
progress,
printTime,
printLeftTime,
}
}

/*
* Local const
*
*/

const StatusControls = () => {
const { streamStatus, status } = useTargetContext()
const streamView = getStreamView(streamStatus)
if (!useUiContextFn.getValue("showstatuspanel")) return null
//console.log("streamStatus")
//console.log(streamStatus)
//console.log("status")
//console.log(status)
return (
<Fragment>
{streamStatus &&
streamStatus.status &&
streamStatus.status != "no stream" && (
{streamView && streamView.status && streamView.status != "no stream" && (
<div class="status-ctrls">
<div
class="extra-control mt-1 tooltip tooltip-bottom"
data-tooltip={T("P97")}
>
<div class="extra-control-header">
{T(streamStatus.status)}
{T(streamView.status)}
</div>
{streamStatus.name &&
streamStatus.name.length > 0 && (
{streamView.name && streamView.name.length > 0 && (
<div class="extra-control-value m-1">
{streamStatus.name}
{streamView.name}
</div>
)}
{streamStatus &&
streamStatus.status &&
streamStatus.status != "no stream" && (
{streamView.status && streamView.status != "no stream" && (
<Fragment>
<div class="extra-control-value">
{streamStatus.progress}%
{streamView.progress}%
</div>

<TimeControl
label="P105"
time={streamStatus.printTime}
time={streamView.printTime}
/>
<TimeControl
label="P112"
time={streamStatus.printLeftTime}
time={streamView.printLeftTime}
/>
</Fragment>
)}
Expand Down Expand Up @@ -178,37 +235,28 @@ const StatusPanel = () => {
depend: ["sd"],
buttons: [
{
cmd: () => {
if (status.printState && status.printState.printing) {
return "sdresumecmd"
}
return "[ESP701]RESUME"
},
cmd: () => "[ESP701]action=RESUME",
depend: { streamStatus: ["pause"], status: [] },
icon: <PlayCircle />,
desc: T("P99"),
},
{
cmd: () => {
if (status.printState && status.printState.printing) {
return "sdpausecmd"
}
return "[ESP701]PAUSE"
},
cmd: () => "[ESP701]action=PAUSE",
depend: { streamStatus: ["processing"], status: [] },
icon: <PauseCircle />,
desc: T("P98"),
},
{
cmd: () => {
if (status.printState && status.printState.printing) {
return "sdstopcmd"
}
return "[ESP701]ABORT"
},
cmd: () => "[ESP701]action=ABORT",
icon: <StopCircle />,
desc: T("P100"),
},
{
cmd: () => "[ESP701]action=CLEAR_ERROR",
depend: { hasCode: true, status: [] },
icon: <CheckCircle />,
desc: T("S206"),
},
],
},
{
Expand Down Expand Up @@ -283,6 +331,9 @@ const StatusPanel = () => {
}
const isVisible = (button) => {
if (button.depend) {
if (button.depend.hasCode && !(streamStatus && streamStatus.code)) {
return false
}
if (
streamStatus &&
streamStatus.status &&
Expand Down Expand Up @@ -319,8 +370,7 @@ const StatusPanel = () => {
{((status.printState && status.printState.printing) ||
(streamStatus &&
streamStatus.status &&
streamStatus.status != "no stream" &&
streamStatus.name != "")) &&
streamStatus.status != "no stream")) &&
deviceList.map((device) => {
if (
!device.depend.every((d) =>
Expand Down Expand Up @@ -350,14 +400,23 @@ const StatusPanel = () => {
console.log(
button.cmd()
)
const buttonCommand =
button.cmd()
const cmd =
status.printState &&
status.printState
.printing
? useUiContextFn.getValue(
button.cmd()
)
: button.cmd()
buttonCommand &&
buttonCommand.startsWith(
"[ESP"
)
? buttonCommand
: status.printState &&
status
.printState
.printing
? useUiContextFn.getValue(
buttonCommand
)
: buttonCommand
if (!cmd) return
const cmds =
cmd.split("\n")
cmds.forEach((cmd) => {
Expand Down
9 changes: 2 additions & 7 deletions src/targets/CNC/GRBL/DIRECTSD-source.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*/
import { h } from "preact"
import { sortedFilesList, formatStatus } from "../../../components/Helpers"
import { canProcessFile } from "../../helpers"
import { canProcessFile, buildEsp700CommandFromParts } from "../../helpers"
import { useUiContextFn } from "../../../contexts"

const capabilities = {
Expand Down Expand Up @@ -106,12 +106,7 @@ const commands = {
play: (path, filename) => {
return {
type: "cmd",
cmd:
"[ESP700]/SD" +
path +
(path == "/" ? "" : "/") +
filename +
"\n",
cmd: buildEsp700CommandFromParts("/SD", path, filename) + "\n",
}
},
}
Expand Down
11 changes: 2 additions & 9 deletions src/targets/Printer3D/Marlin/DIRECTSD-source.js
View file
Open in desktop
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 { canProcessFile } from "../../helpers"
import { canProcessFile, buildEsp700CommandFromParts } from "../../helpers"
import { sortedFilesList, formatStatus } from "../../../components/Helpers"
import { useUiContextFn, useSettingsContextFn } from "../../../contexts"

Expand Down Expand Up @@ -129,16 +129,9 @@ const commands = {
useSettingsContextFn.getValue("Streaming") == "Enabled" &&
useSettingsContextFn.getValue("SDConnection") == "direct"
) {
const fullpath = (
"/sd" +
path +
(path.endsWith("/") ? "" : "/") +
filename
).replaceAll("//", "/")
const cmd = "[ESP700]stream=" + fullpath
return {
type: "cmd",
cmd,
cmd: buildEsp700CommandFromParts("/SD", path, filename),
}
} else {
const spath = (
Expand Down
6 changes: 2 additions & 4 deletions src/targets/Printer3D/Marlin/FLASH-source.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*/
import { h } from "preact"
import { sortedFilesList, formatStatus } from "../../../components/Helpers"
import { canProcessFile } from "../../helpers"
import { canProcessFile, buildEsp700CommandFromParts } from "../../helpers"
import { useUiContextFn, useSettingsContextFn } from "../../../contexts"
const capabilities = {
Process: (path, filename) => {
Expand Down Expand Up @@ -120,11 +120,9 @@ const commands = {
useSettingsContextFn.getValue("Streaming") == "Enabled" &&
useSettingsContextFn.getValue("SDConnection") == "direct"
) {
let fullpath =
"/fs" + path + (path.endsWith("/") ? "" : "/") + filename
return {
type: "cmd",
cmd: "[ESP700]stream=" + fullpath.replaceAll(" ", " "),
cmd: buildEsp700CommandFromParts("/FS", path, filename),
}
} else {
return {
Expand Down
39 changes: 1 addition & 38 deletions src/targets/Printer3D/Marlin/TargetContext.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,45 +261,8 @@ const TargetContextProvider = ({ children }) => {
console.log("response", data)
if (isStreamingStatus(data)) {
const preStatus = getStreamingStatus(data)
const name = preStatus.name
const status = preStatus.status
const progress =
preStatus.processed && preStatus.total
? Math.round(
(preStatus.processed / preStatus.total) * 100
).toFixed(2)
: null
const printTime = {}

let time_elapsed = preStatus.elapsed
printTime.sec = Math.floor(time_elapsed / 1000)
printTime.min = Math.floor(printTime.sec / 60)
printTime.sec = printTime.sec % 60
printTime.hour = Math.floor(printTime.min / 60)
printTime.min = printTime.min % 60
printTime.day = Math.floor(printTime.hour / 24)
printTime.hour = printTime.hour % 24
const printLeftTime = {}
if (preStatus.elapsed && progress && progress < 100) {
const timeLeft =
((100 - progress) / progress) * preStatus.elapsed

printLeftTime.sec = Math.floor(timeLeft / 1000)
printLeftTime.min = Math.floor(printLeftTime.sec / 60)
printLeftTime.sec = printLeftTime.sec % 60
printLeftTime.hour = Math.floor(printLeftTime.min / 60)
printLeftTime.min = printLeftTime.min % 60
printLeftTime.day = Math.floor(printLeftTime.hour / 24)
printLeftTime.hour = printLeftTime.hour % 24
}
const fullstatus = {
status,
progress,
name,
printTime,
printLeftTime,
}
setStreamStatus(fullstatus)
setStreamStatus(preStatus)
if (status != "no stream") {
setStatus({ printState: null })
}
Expand Down
2 changes: 1 addition & 1 deletion src/targets/Printer3D/Marlin/preferences.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
{
"id": "samplepolling",
"name": "3s",
"cmds": "M105",
"cmds": "M105;[ESP701]json",
"refreshtime": "3000"
}
]
Expand Down
9 changes: 2 additions & 7 deletions src/targets/SandTable/GRBL/DIRECTSD-source.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
*/
import { h } from "preact"
import { sortedFilesList, formatStatus } from "../../../components/Helpers"
import { canProcessFile } from "../../helpers"
import { canProcessFile, buildEsp700CommandFromParts } from "../../helpers"

const capabilities = {
Process: (path, filename) => {
Expand Down Expand Up @@ -103,12 +103,7 @@ const commands = {
play: (path, filename) => {
return {
type: "cmd",
cmd:
"[ESP700]/SD" +
path +
(path == "/" ? "" : "/") +
filename +
"\n",
cmd: buildEsp700CommandFromParts("/SD", path, filename) + "\n",
}
},
}
Expand Down
Loading