diff --git a/src/kiri/dev/fdm/GridBot.One.json b/src/kiri/dev/fdm/GridBot.One.json deleted file mode 100644 index 21ccb365..00000000 --- a/src/kiri/dev/fdm/GridBot.One.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "pre":[ - "M117 Heating ; announce heating", - "M107 ; turn off filament cooling fan", - "M104 S{temp} T0 ; set extruder temperature", - "M140 S{bed_temp} T0 ; set bed temperature", - "G90 ; set absolute positioning mode", - "M83 ; set relative positioning for extruder", - "G28 ; home axes", - "G1 F3000 ; set default move speed", - "M190 S{bed_temp} T0 ; wait for bed to reach target temp", - "M109 S{temp} T0 ; wait for extruder to reach target temp", - "M117 Purge ; announce purge", - "G92 E0 ; set extruder position to 0", - "G1 E20 F250 ; purge 20mm from extruder", - "G1 X0 Y0 Z0 E1 F3000 ; move to origin / wipe", - "M117 Start Print ; announce start of print" - ], - "post":[ - "M117 Done ; announce done", - "M107 ; turn off filament cooling fan", - "M104 S0 T0 ; turn off extruder", - "M140 S0 T0 ; turn off bed", - "G91 ; relative movement", - "G1 Z10 F1200 ; drop bed 10mm", - "G90 ; absolute positioning", - "G28 X0 Y0 ; home XY axes", - "M84 ; disable stepper motors" - ], - "cmd":{ - "fan_power": "M106 S{fan_speed}", - "progress": "M117 {progress}% layer {layer} / {layers}" - }, - "settings":{ - "image_url": "/decal/gridbot.png", - "image_anchor": 0, - "image_scale": 1, - "origin_center": false, - "bed_width": 300, - "bed_depth": 300, - "build_height": 300 - } -} diff --git a/src/kiri/dev/fdm/GridBot.Two.json b/src/kiri/dev/fdm/GridBot.Two.json deleted file mode 100644 index 21ccb365..00000000 --- a/src/kiri/dev/fdm/GridBot.Two.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "pre":[ - "M117 Heating ; announce heating", - "M107 ; turn off filament cooling fan", - "M104 S{temp} T0 ; set extruder temperature", - "M140 S{bed_temp} T0 ; set bed temperature", - "G90 ; set absolute positioning mode", - "M83 ; set relative positioning for extruder", - "G28 ; home axes", - "G1 F3000 ; set default move speed", - "M190 S{bed_temp} T0 ; wait for bed to reach target temp", - "M109 S{temp} T0 ; wait for extruder to reach target temp", - "M117 Purge ; announce purge", - "G92 E0 ; set extruder position to 0", - "G1 E20 F250 ; purge 20mm from extruder", - "G1 X0 Y0 Z0 E1 F3000 ; move to origin / wipe", - "M117 Start Print ; announce start of print" - ], - "post":[ - "M117 Done ; announce done", - "M107 ; turn off filament cooling fan", - "M104 S0 T0 ; turn off extruder", - "M140 S0 T0 ; turn off bed", - "G91 ; relative movement", - "G1 Z10 F1200 ; drop bed 10mm", - "G90 ; absolute positioning", - "G28 X0 Y0 ; home XY axes", - "M84 ; disable stepper motors" - ], - "cmd":{ - "fan_power": "M106 S{fan_speed}", - "progress": "M117 {progress}% layer {layer} / {layers}" - }, - "settings":{ - "image_url": "/decal/gridbot.png", - "image_anchor": 0, - "image_scale": 1, - "origin_center": false, - "bed_width": 300, - "bed_depth": 300, - "build_height": 300 - } -} diff --git a/src/kiri/mode/fdm/app/init-ui.js b/src/kiri/mode/fdm/app/init-ui.js index d74c7c74..00837bd5 100644 --- a/src/kiri/mode/fdm/app/init-ui.js +++ b/src/kiri/mode/fdm/app/init-ui.js @@ -305,7 +305,7 @@ function supportStart({ remove } = { remove: false }) { // Get belt configuration for paint constraint const settings = api.conf.get(); const isBelt = settings.device.bedBelt; - const beltAngle = isBelt ? (settings.process.sliceAngle || 45) : 0; + const beltAngle = isBelt ? (settings.process.sliceAngle || 45) * Math.PI / 180 : 0; const supportAngle = settings.process.sliceSupportAngle || 45; api.widgets.each(w => { @@ -326,8 +326,8 @@ function supportStart({ remove } = { remove: false }) { } addPaintOverlayTexture(mat, w.anno.paint, new THREE.Color(paintColor), { beltMode: isBelt, - beltAngle: beltAngle * Math.PI / 180, // Convert to radians - supportAngle: settings.process.sliceSupportAngle || 45 + beltAngle, + supportAngle }); }) api.space.update();