AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix pause/resume button state, mqtt end timeout

Browse source
This commit is contained in:
Stewart Allen 2025-02-02 01:12:58 -05:00
commit fcacc68d6e
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
mods/bambu/bambu.js
View file

@ -183,8 +183,7 @@ self.kiri.load(api => {
$('bbl_bed_temp').value = bed_temper?.toFixed(1) ?? ''; $('bbl_bed_temp').value = bed_temper?.toFixed(1) ?? '';
$('bbl_bed_target').value = bed_target_temper?.toFixed(1) ?? ''; $('bbl_bed_target').value = bed_target_temper?.toFixed(1) ?? '';
$('bbl_pause').disabled = (gcode_state !== 'RUNNING'); $('bbl_pause').disabled = (gcode_state !== 'RUNNING');
$('bbl_resume').disabled = (gcode_state !== 'PAUSE'); $('bbl_resume').disabled = (gcode_state !== 'PAUSE' || gcode_state === 'FAILED');
$('bbl_resume').disabled = (gcode_state !== 'FAILED');
$('bbl_fan_part').value = cooling_fan_speed || 0; $('bbl_fan_part').value = cooling_fan_speed || 0;
$('bbl_fan_1').value = big_fan1_speed || 0; $('bbl_fan_1').value = big_fan1_speed || 0;
$('bbl_fan_2').value = big_fan2_speed || 0; $('bbl_fan_2').value = big_fan2_speed || 0;
@ -464,7 +463,7 @@ self.kiri.load(api => {
h.a('active file') h.a('active file')
]), ]),
h.div({ class: "var-row" }, [ h.div({ class: "var-row" }, [
h.input({ id: "bbl_file_active", disabled: true }) h.input({ id: "bbl_file_active", class: "t-left", disabled: true })
]), ]),
]) ])
]) ])

9
mods/bambu/init.js
View file

@ -63,11 +63,12 @@ module.exports = async (server) => {
keepconn() { keepconn() {
clearTimeout(this.#timer2); clearTimeout(this.#timer2);
this.#timer2 = setTimeout(() => { this.end() }, 60000); this.#timer2 = setTimeout(() => { this.keepconn() }, 120000);
if_mqtt(this.#serial, { if_mqtt(this.#serial, {
pushing: { print: {
sequence_id: "0", sequence_id: "0",
command: "push_status" command: "push_status",
msg: 1
} }
}); });
} }
@ -188,7 +189,7 @@ module.exports = async (server) => {
function file_print(opts = {}) { function file_print(opts = {}) {
const { host, code, serial, filename, amsmap } = opts; const { host, code, serial, filename, amsmap } = opts;
console.log({ file_print: opts }); util.log({ file_print: opts });
const cmd = { const cmd = {
print: { print: {
command: "project_file", command: "project_file",