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

clear bbl manager when modal closes and fix video state management

Browse source
This commit is contained in:
Stewart Allen 2025-02-11 22:29:37 -05:00
commit 130c51f09f
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
mods/bambu/bambu.js
View file

@ -164,10 +164,11 @@ self.kiri.load(api => {
} }
function printer_video_toggle() { function printer_video_toggle() {
printer_video_set(video_on = !video_on); printer_video_set(!video_on);
} }
function printer_video_set(bool) { function printer_video_set(bool) {
video_on = bool;
set_frames(selected?.rec?.serial, bool); set_frames(selected?.rec?.serial, bool);
ui.setVisible($('bbl_rec'), !bool); ui.setVisible($('bbl_rec'), !bool);
ui.setVisible($('bbl_video'), bool); ui.setVisible($('bbl_video'), bool);
@ -239,6 +240,8 @@ self.kiri.load(api => {
h.option({ _: 'none', value: '255' }), h.option({ _: 'none', value: '255' }),
...options ...options
]); ]);
} else {
$('bbl_ams_tray').innerHTML = '';
} }
let state = (gcode_state || 'unknown').toLowerCase(); let state = (gcode_state || 'unknown').toLowerCase();
$('bbl_noz').value = nozzle_diameter || ''; $('bbl_noz').value = nozzle_diameter || '';
@ -258,7 +261,7 @@ self.kiri.load(api => {
$('bbl_fan_2_on').checked = big_fan2_speed > 0 ? true : false; $('bbl_fan_2_on').checked = big_fan2_speed > 0 ? true : false;
$('bbl_fan_heatbreak').value = heatbreak_fan_speed || 0; $('bbl_fan_heatbreak').value = heatbreak_fan_speed || 0;
$('bbl_file_active').value = gcode_file || ''; $('bbl_file_active').value = gcode_file || '';
if (files && filelist.selectedIndex === -1) { if (selected && files && filelist.selectedIndex === -1) {
h.bind(filelist, files.map(file => { h.bind(filelist, files.map(file => {
let name = file.name let name = file.name
.toLowerCase() .toLowerCase()
@ -271,6 +274,12 @@ self.kiri.load(api => {
})); }));
filelist.selectedIndex = 0; filelist.selectedIndex = 0;
filelist.onchange(); filelist.onchange();
} else if (files && files.length === 0) {
filelist.innerHTML = '';
$('bbl_file_size').value = '';
$('bbl_file_date').value = '';
$('bbl_file_delete').disabled =
$('bbl_file_print').disabled = true;
} }
(lights_report || []).forEach(rec => { (lights_report || []).forEach(rec => {
if (rec.node === 'chamber_light') { if (rec.node === 'chamber_light') {
@ -759,6 +768,8 @@ self.kiri.load(api => {
if (which !== 'bambu' || !device) { if (which !== 'bambu' || !device) {
return; return;
} }
printer_render({ files: [] });
printer_select();
socket.start(); socket.start();
render_list(); render_list();
get_ams_map(api.conf.get()); get_ams_map(api.conf.get());

2
mods/bambu/frames.js
View file

@ -47,7 +47,7 @@ class FrameStream extends EventEmitter {
}); });
remoteSocket.on('error', (error) => { remoteSocket.on('error', (error) => {
clientSocket.destroy(); remoteSocket.destroy();
this.emit('error', error); this.emit('error', error);
}); });