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

checkpoint ams tray selection updates

Browse source
This commit is contained in:
Stewart Allen 2025-02-15 14:05:02 -05:00
commit 771ffc0b01
8 changed files with 155 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

191
mods/bambu/bambu.js
View file

@ -8,13 +8,16 @@ self.kiri.load(api => {
const defams = ";; DEFINE BAMBU-AMS "; const defams = ";; DEFINE BAMBU-AMS ";
const readonly = true; const readonly = true;
let sequence_id = (Math.random() * 0xfff) | 0;
let user_id = ((Math.random() * 0xfffffff) | 0).toString();
let init = false; let init = false;
let status = {}; let status = {};
let monitors = []; let monitors = [];
let showing = false; let showing = false;
let video_on = false; let video_on = false;
let video_auto = false; let video_auto = false;
let bound, device, printers, select, selected, conn_alert, export_select, tray_info; let tray_hover, tray_info;
let bound, device, printers, select, selected, conn_alert, export_select;
let btn_del, in_host, in_code, in_serial, filelist, print_ams_select = 'auto'; let btn_del, in_host, in_code, in_serial, filelist, print_ams_select = 'auto';
let ptype, host, password, serial, amsmap, socket = { let ptype, host, password, serial, amsmap, socket = {
open: false, open: false,
@ -107,6 +110,10 @@ self.kiri.load(api => {
} }
}; };
function next_sid() {
return (sequence_id = (sequence_id + 1) % 65534).toString();
}
function range(length, start = 0) { function range(length, start = 0) {
return Array.from({ length }, (_, i) => i + start); return Array.from({ length }, (_, i) => i + start);
} }
@ -139,7 +146,57 @@ self.kiri.load(api => {
}, {}); }, {});
} }
return obj; return obj;
} }
function ams_tray_show(bool) {
ui.setVisible(tray_info, bool);
if (!bool) {
tray_hover = undefined;
// clearTimeout(tray_hover?.__timer);
}
}
function ams_tray_update() {
let type_select = $('bbl_tray_type').value;
let type_desc = bblapi.filament.map[type_select];
let type_short = type_desc.split(' ')[1];
let { nozzle_diameter } = selected.status.print;
let { id, unit, tray_color, nozzle_temp_min, nozzle_temp_max } = tray_hover.bambu;
// console.log({ type_select, type_short, type_desc, tray_hover, nozzle_diameter });
let custom = $('bbl_tray_rgba').value;
if (parseInt(custom,16) >= 0) {
tray_color = custom;
}
// set AMS attention on a tray
cmd_gcode(`M620 P${id}`);
cmd_direct({
print: {
ams_id: unit,
command: 'ams_filament_setting',
nozzle_temp_max: parseInt(nozzle_temp_max),
nozzle_temp_min: parseInt(nozzle_temp_min),
sequence_id: next_sid(),
setting_id: 'GFSL01_02',
tray_color,
tray_id: parseInt(id),
tray_info_idx: type_select,
tray_type: type_short,
}
});
cmd_direct({
print: {
cali_idx: -1,
command: 'extrusion_cali_sel',
filament_id: type_select,
nozzle_diameter,
sequence_id: next_sid(),
tray_id: unit
}
});
}
function printer_add() { function printer_add() {
ui.prompt('printer name', "new printer").then(name => printer_add_named(name)); ui.prompt('printer name', "new printer").then(name => printer_add_named(name));
@ -275,13 +332,14 @@ self.kiri.load(api => {
print_ams_select = ev.target.value; print_ams_select = ev.target.value;
}; };
}); });
// update AMS buttons based on current reported state
range(16).map(id => { range(16).map(id => {
let btn = $(`bbl_tray_${id}`); let btn = $(`bbl_tray_${id}`);
ui.setVisible(btn, id < trays.length); ui.setVisible(btn, id < trays.length);
$('bbl_ams_trays').style.gridTemplateRows = `repeat(${trays.length / 4},auto)`; $('bbl_ams_trays').style.gridTemplateRows = `repeat(${trays.length / 4},auto)`;
if (id < trays.length) { if (id < trays.length) {
let { style } = btn; let { style } = btn;
let { tray_color, tray_type } = trays[id]; let { tray_color, tray_type } = btn.bambu = trays[id];
if (tray_color) { if (tray_color) {
style.color = `#${calcFG(tray_color)}`; style.color = `#${calcFG(tray_color)}`;
style.backgroundColor = `#${tray_color}`; style.backgroundColor = `#${tray_color}`;
@ -302,6 +360,8 @@ self.kiri.load(api => {
style.borderColor = ''; style.borderColor = '';
style.borderStyle = ''; style.borderStyle = '';
} }
} else {
btn.bambu = undefined;
} }
}); });
} else { } else {
@ -455,7 +515,9 @@ self.kiri.load(api => {
function cmd_gcode(code) { function cmd_gcode(code) {
cmd_direct({ print: { cmd_direct({ print: {
command: "gcode_line", command: "gcode_line",
param: `${code} \n` param: `${code} \n`,
sequence_id: next_sid(),
user_id
} }); } });
} }
@ -770,6 +832,7 @@ self.kiri.load(api => {
}); });
} }), } }),
]), ]),
h.div({ class: "pop-sep" }),
h.div({ h.div({
id: "bbl_ams_trays", id: "bbl_ams_trays",
"style": [ "style": [
@ -781,68 +844,89 @@ self.kiri.load(api => {
}, range(16).map(id => h.button({ }, range(16).map(id => h.button({
_: id, _: id,
id: `bbl_tray_${id}`, id: `bbl_tray_${id}`,
class:`a-center hide`, class:`a-center hide f-col`,
style: [ style: [
`min-height:10px`, `min-height:10px`,
`aspect-ratio:1`, `padding: 5px`,
`position:relative` `position:relative`
].join(';'), ].join(';'),
onclick(ev) { onclick(ev) {
let { target } = ev; let { target } = ev;
if (target.nodeName === 'BUTTON') { if (target.id === `bbl_tray_${id}`) {
target.appendChild(tray_info); if (tray_hover === target) {
ui.setVisible(tray_info, true); ams_tray_show(false);
} else {
target.appendChild(tray_info);
ams_tray_show(true);
tray_hover = target;
let { bambu } = target;
$('bbl_tray_type').value = bambu.tray_info_idx;
$('bbl_tray_rgba').value = bambu.tray_color;
}
} }
}, },
onmouseleave() { onmouseenter(ev) {
ui.setVisible(tray_info, false); clearTimeout(ev.target.__timer);
},
onmouseleave(ev) {
ev.target.__timer = setTimeout(() => {
if (ev.target === tray_hover) {
// ams_tray_show(false);
}
}, 5000);
} }
}))) })))
]), ]),
h.div({ id: "bbl_tray_info", h.div({ id: "bbl_tray_info",
class: "t-body f-col gap3 pad5 hide", class: "t-body f-col gap3 pad5 hide",
style: [ style: [
"position:absolute", "z-index:1000",
"top:100%", "position:absolute",
"right:0", "top:calc(100% + 4px)",
"transform:translateX(30%)", "right:0",
"padding:10px !important", "transform:translateX(30%)",
"z-index:1000", "padding:10px !important",
].join(';') "opacity:0.95 !important",
}, [ "border-width: 4px !important"
].join(';')
}, [
h.div({ class: "var-row" }, [ h.div({ class: "var-row" }, [
// h.label('filament'), h.select({ id: "bbl_tray_type" },
h.select({ id: "bbl_tray_type", onchange() { bblapi.filament.list.map(row => h.option({
cmd_direct({ _: row[1],
print: { value: row[0]
command: 'ams_change_filament',
curr_temp: 220,
tar_temp: 220,
target: parseInt(new_tray)
}
});
}}, api.bambu.filament.map(row => h.option({
_: row[1],
value: row[0]
}))),
]),
h.div({ class: "var-row" }, [
// home_flag bit 11 (0x400)
h.label(''),
h.span('#'),
h.input({ value: "001122", size: 6 }),
h.select({ id: "bbl_tray_color", onchange() {
cmd_direct({
print: {
auto_switch_filament: $('bbl_ams_spool').checked,
command: 'print_option',
sequence_id: '123',
option: $('bbl_ams_spool').checked ? 1 : 0
}
}) })
}}) )),
]), ]),
h.div({ class: "pop-sep" }),
h.div({ class: "var-row" }, [
h.label('use ams color'),
h.select({ id: "bbl_tray_acolor" })
]),
h.div({ class: "var-row" }, [
h.label('use quick color'),
h.select({ id: "bbl_tray_color" })
]),
h.div({ class: "var-row" }, [
h.label('use rgb color'),
h.input({ id: "bbl_tray_rgba", class: "mono", value: "00112233", size: 8 }),
]),
h.div({ class: "pop-sep" }),
h.div({ class: "j-center", }, [
h.button({
_: 'save tray settings',
onclick() {
ams_tray_update();
ams_tray_show(false);
}
}),
h.button({
_: 'cancel',
onclick() {
ams_tray_show(false);
}
})
])
]), ]),
h.div({ class: "t-body t-inset f-col gap3 pad4 grow" }, [ h.div({ class: "t-body t-inset f-col gap3 pad4 grow" }, [
@ -867,6 +951,7 @@ self.kiri.load(api => {
h.select({ id: "bbl_file_spool" }) h.select({ id: "bbl_file_spool" })
]), ]),
h.div({ class: "grow" }), h.div({ class: "grow" }),
h.div({ class: "pop-sep" }),
h.div({ class: "f-row gap3 f-grow" }, [ h.div({ class: "f-row gap3 f-grow" }, [
h.button({ h.button({
_: 'delete', _: 'delete',
@ -927,6 +1012,7 @@ self.kiri.load(api => {
h.label('active'), h.label('active'),
h.input({ id: "bbl_file_active", class: "t-left", readonly }) h.input({ id: "bbl_file_active", class: "t-left", readonly })
]), ]),
h.div({ class: "pop-sep" }),
h.div({ class: "f-row gap3 f-grow" }, [ h.div({ class: "f-row gap3 f-grow" }, [
h.button({ _: "pause", id: "bbl_pause", class: "f-col t-center a-center", onclick() { cmd_if("pause") } }), h.button({ _: "pause", id: "bbl_pause", class: "f-col t-center a-center", onclick() { cmd_if("pause") } }),
h.button({ _: "resume", id: "bbl_resume", class: "f-col t-center a-center", onclick() { cmd_if("resume") } }), h.button({ _: "resume", id: "bbl_resume", class: "f-col t-center a-center", onclick() { cmd_if("resume") } }),
@ -990,6 +1076,7 @@ self.kiri.load(api => {
if (showing) { if (showing) {
video_auto = video_on; video_auto = video_on;
printer_video_set(false); printer_video_set(false);
ams_tray_show(false);
selected = undefined; selected = undefined;
showing = false; showing = false;
status = {}; status = {};
@ -1093,5 +1180,5 @@ self.kiri.load(api => {
setInterval(monitor_keepalive, 5000); setInterval(monitor_keepalive, 5000);
api.bambu = { send, prep_export }; let bblapi = api.bambu = { send, prep_export };
}); });

0
mods/bambu/certificates.js → mods/bambu/certs.js
View file

2
mods/bambu/cli.js
View file

@ -2,7 +2,7 @@ const [ host, pass, sn ] = process.argv.slice(2);
const util = require('util'); const util = require('util');
const mqtt = require("mqtt"); const mqtt = require("mqtt");
const readline = require('readline'); const readline = require('readline');
const { bblCA } = require("./certificates"); const { bblCA } = require("./certs");
const reportTopic = `device/${sn}/report`; const reportTopic = `device/${sn}/report`;
const requestTopic = `device/${sn}/request`; const requestTopic = `device/${sn}/request`;

12
mods/bambu/filament.js
View file

@ -1,6 +1,6 @@
self.kiri.load(api => { self.kiri.load(api => {
api.bambu.filament = [ let list = [
["GFB00", "Bambu ABS"], ["GFB00", "Bambu ABS"],
["GFB50", "Bambu ABS-GF"], ["GFB50", "Bambu ABS-GF"],
["GFB01", "Bambu ASA"], ["GFB01", "Bambu ASA"],
@ -89,4 +89,14 @@ api.bambu.filament = [
["GFL03", "eSUN PLA+"] ["GFL03", "eSUN PLA+"]
]; ];
let map = {};
for (let row of list) {
map[row[0]] = row[1];
}
api.bambu.filament = {
list, map
};
}); });

2
mods/bambu/frames.js
View file

@ -3,7 +3,7 @@
* and stores the resulting jpeg stream into frame files * and stores the resulting jpeg stream into frame files
*/ */
const { bblCA } = require('./certificates'); const { bblCA } = require('./certs');
const EventEmitter = require('events'); const EventEmitter = require('events');
const tls = require('tls'); const tls = require('tls');
const debug = false; const debug = false;

2
mods/bambu/init.js
View file

@ -1,7 +1,7 @@
const { Client } = require('@gridspace/basic-ftp'); const { Client } = require('@gridspace/basic-ftp');
const { Readable } = require('stream'); const { Readable } = require('stream');
const { FrameStream } = require('./frames'); const { FrameStream } = require('./frames');
const { bblCA } = require('./certificates'); const { bblCA } = require('./certs');
module.exports = async (server) => { module.exports = async (server) => {

2
mods/bambu/proxy.js
View file

@ -14,7 +14,7 @@
*/ */
let util = require('util'); let util = require('util');
const { bblCA } = require('./certificates'); const { bblCA } = require('./certs');
let args = process.argv.slice(2); let args = process.argv.slice(2);
if (args.length !== 5) { if (args.length !== 5) {

3
web/kiri/index.css
View file

@ -186,6 +186,7 @@ th, tr, td, span, div, label, button {
} }
th, tr, td, label { th, tr, td, label {
white-space: nowrap; white-space: nowrap;
display: flex;
} }
details summary { details summary {
list-style: none; list-style: none;
@ -1996,7 +1997,7 @@ details[open] summary::after {
color: white; color: white;
} }
.t-body { .t-body {
background-color: rgba(255,255,255,0.5); background-color: rgba(255,255,255,1);
border: 1px solid #bbb; border: 1px solid #bbb;
border-radius: 3px; border-radius: 3px;
} }