allow .debug module to load for shared electron/debug modules. filter defines from macros. add bambu check before attempted file send
This commit is contained in:
parent
0cd9ec0f39
commit
fa116bf277
5 changed files with 8 additions and 3 deletions
|
|
@ -230,7 +230,9 @@ FDM.export = function(print, online, ondone, ondebug) {
|
|||
// with logic flow IF / ELIF / ELSE / END
|
||||
// IF / IF is valid but will not nest
|
||||
function appendSub(line, pad) {
|
||||
if (line.indexOf(';; IF ') === 0) {
|
||||
if (line.indexOf(';; DEFINE ') === 0) {
|
||||
// ignore var declarations
|
||||
} else if (line.indexOf(';; IF ') === 0) {
|
||||
line = line.substring(6).trim();
|
||||
let evil = print.constReplace(line, subst, 0, 666);
|
||||
subon = evil;
|
||||
|
|
|
|||
|
|
@ -635,7 +635,7 @@ function exportGCodeDialog(gcode, sections, info, names) {
|
|||
api.show.progress(progress.percent/100, "generating 3mf");
|
||||
}, output => {
|
||||
api.show.progress(0);
|
||||
if (api.bambu) {
|
||||
if (api.bambu && api.bambu.sendok({ gcode, info, settings })) {
|
||||
api.bambu.send(`${$('print-filename').value}.3mf`, output);
|
||||
} else {
|
||||
api.util.download(output, `${$('print-filename').value}.3mf`);
|
||||
|
|
|
|||
Loading…
Reference in a new issue