From fcacc68d6e006f4c28ba33591c74bc58d0f0ef35 Mon Sep 17 00:00:00 2001
From: Stewart Allen <stewart.allen@gmail.com>
Date: Sun, 2 Feb 2025 01:12:58 -0500
Subject: [PATCH] fix pause/resume button state, mqtt end timeout

---
 mods/bambu/bambu.js | 5 ++---
 mods/bambu/init.js  | 9 +++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/mods/bambu/bambu.js b/mods/bambu/bambu.js
index 0efe1306..027a8082 100644
--- a/mods/bambu/bambu.js
+++ b/mods/bambu/bambu.js
@@ -183,8 +183,7 @@ self.kiri.load(api => {
         $('bbl_bed_temp').value = bed_temper?.toFixed(1) ?? '';
         $('bbl_bed_target').value = bed_target_temper?.toFixed(1) ?? '';
         $('bbl_pause').disabled = (gcode_state !== 'RUNNING');
-        $('bbl_resume').disabled = (gcode_state !== 'PAUSE');
-        $('bbl_resume').disabled = (gcode_state !== 'FAILED');
+        $('bbl_resume').disabled = (gcode_state !== 'PAUSE' || gcode_state === 'FAILED');
         $('bbl_fan_part').value = cooling_fan_speed || 0;
         $('bbl_fan_1').value = big_fan1_speed || 0;
         $('bbl_fan_2').value = big_fan2_speed || 0;
@@ -464,7 +463,7 @@ self.kiri.load(api => {
                             h.a('active file')
                         ]),
                         h.div({ class: "var-row" }, [
-                            h.input({ id: "bbl_file_active", disabled: true })
+                            h.input({ id: "bbl_file_active", class: "t-left", disabled: true })
                         ]),
                     ])
                 ])
diff --git a/mods/bambu/init.js b/mods/bambu/init.js
index b49d9049..0ee9c232 100644
--- a/mods/bambu/init.js
+++ b/mods/bambu/init.js
@@ -63,11 +63,12 @@ module.exports = async (server) => {
 
         keepconn() {
             clearTimeout(this.#timer2);
-            this.#timer2 = setTimeout(() => { this.end() }, 60000);
+            this.#timer2 = setTimeout(() => { this.keepconn() }, 120000);
             if_mqtt(this.#serial, {
-                pushing: {
+                print: {
                     sequence_id: "0",
-                    command: "push_status"
+                    command: "push_status",
+                    msg: 1
                 }
             });
         }
@@ -188,7 +189,7 @@ module.exports = async (server) => {
 
     function file_print(opts = {}) {
         const { host, code, serial, filename, amsmap } = opts;
-        console.log({ file_print: opts });
+        util.log({ file_print: opts });
         const cmd = {
             print: {
                 command: "project_file",