diff --git a/src/kiri-dev/fdm/Creality.Ender.3 b/src/kiri-dev/fdm/Creality.Ender.3
index 42552576..878751c4 100644
--- a/src/kiri-dev/fdm/Creality.Ender.3
+++ b/src/kiri-dev/fdm/Creality.Ender.3
@@ -1,97 +1,158 @@
{
- "pre":[
- "M107 ; turn off filament cooling fan",
- "G90 ; set absolute positioning mode",
- "M82 ; set absolute positioning for extruder",
- "M104 S{temp} ; set extruder temperature",
- "M140 S{bed_temp} ; set bed temperature",
- "G28 ; home axes",
- "G92 E0 ; reset extruder position",
- "M109 S{temp} ; wait for extruder to reach target temp",
- "M190 S{bed_temp} ; wait for bed to reach target temp"
+ "deviceName": "Creality Ender 3",
+ "new": false,
+ "mode": "FDM",
+ "internal": 0,
+ "bedWidth": 220,
+ "bedDepth": 220,
+ "maxHeight": 300,
+ "bedRound": false,
+ "bedBelt": false,
+ "deviceZMax": 0,
+ "originCenter": false,
+ "extrudeAbs": true,
+ "spindleMax": 0,
+ "gcodeFan": [
+ "M106 S{fan_speed}"
],
- "post":[
- "M107 ; turn off filament cooling fan",
- "M104 S0 T{tool} ; turn off right extruder",
- "M140 S0 T{tool} ; turn off bed",
- "G1 X0 Y300 F1200 ; end move eject bed",
- "M84 ; disable stepper motors"
+ "gcodeTrack": [
+ "M73 P{progress}"
],
- "extruders":[
+ "gcodeLayer": [
+ ";; LAYER {layer} of {layers}",
+ "M117 Layer {layer} of {layers}"
+ ],
+ "gcodePre": [
+ "M104 S160 ; set extruder temp",
+ "M140 S{bed_temp} ; set bed temp",
+ "M190 S{bed_temp} ; wait for bed temp",
+ "G28 W ; home all without mesh bed level",
+ "G80 ; mesh bed leveling",
+ "G90 ; set absolute positioning mode",
+ "M83 ; set relative positioning for extruder",
+ "G1 F1000 ; set feedrate",
+ "G1 Y-3.0 Z0.5 ; park outside print area",
+ "M104 S{temp} ; set extruder actual required temp",
+ "M109 S{temp} ; wait for extruder actual required temp",
+ "G1 X60.0 E9.0 ; purge line",
+ "G1 X100.0 E12.5 ; purge line",
+ "M117 Printing"
+ ],
+ "gcodePost": [
+ "G0 E-1 F900 ; retract slightly",
+ "M104 S0 ; turn off nozzle heat",
+ "M140 S0 ; turn off bed heat",
+ "M107 ; turn off fan",
+ "G0 F3000 ; set feedrate",
+ "G0 Y210 Z210 ; serve up print",
+ "G4 ; wait",
+ "M84 ; disable steppers",
+ "M117 Print Done"
+ ],
+ "gcodeProc": "",
+ "gcodeDwell": [],
+ "gcodeSpindle": [],
+ "gcodeChange": [],
+ "gcodeFExt": "gcode",
+ "gcodeSpace": true,
+ "gcodeStrip": false,
+ "gcodeLaserOn": [],
+ "gcodeLaserOff": [],
+ "extruders": [
{
- "nozzle": 0.4,
- "filament": 1.75,
- "offset_x": 0,
- "offset_y": 0,
- "select": [ "T0" ]
+ "extFilament": 1.75,
+ "extNozzle": 0.4,
+ "extSelect": [
+ "T0"
+ ],
+ "extDeselect": [],
+ "extOffsetX": 0,
+ "extOffsetY": 0
}
],
- "cmd":{
- "fan_power": "M106 S{fan_speed}"
- },
- "settings":{
- "origin_center": false,
- "extrude_abs": true,
- "bed_width": 220,
- "bed_depth": 220,
- "build_height": 300
- },
- "profiles":[{
- "processName": "Ender3 PLA",
- "sliceHeight": 0.25,
- "sliceShells": 3,
- "sliceShellOrder": "in-out",
- "sliceLayerStart": "last",
- "sliceFillAngle": 45,
- "sliceFillWidth": 1,
- "sliceFillOverlap": 0.35,
- "sliceFillSparse": 0.2,
- "sliceFillType": "hex",
- "sliceAdaptive": false,
- "sliceMinHeight": 0,
- "sliceSupportDensity": 0.25,
- "sliceSupportOffset": 0.4,
- "sliceSupportGap": 1,
- "sliceSupportSize": 6,
- "sliceSupportArea": 0.25,
- "sliceSupportExtra": 0,
- "sliceSupportAngle": 50,
- "sliceSupportNozzle": 0,
- "sliceSolidMinArea": 1,
- "sliceSolidLayers": 3,
- "sliceBottomLayers": 3,
- "sliceTopLayers": 3,
- "firstLayerNozzleTemp": 0,
- "firstLayerBedTemp": 0,
- "firstLayerRate": 20,
- "firstLayerFillRate": 35,
- "firstLayerPrintMult": 1.10,
- "firstLayerLineMult": 1.0,
- "firstLayerFanSpeed": 0,
- "outputRaft": false,
- "outputRaftSpacing": 0.2,
- "outputTemp": 210,
- "outputFanMax": 255,
- "outputBedTemp": 70,
- "outputFanSpeed": 255,
- "outputFeedrate": 50,
- "outputFinishrate": 40,
- "outputSeekrate": 80,
- "outputShellMult": 1.2,
- "outputFillMult": 1.2,
- "outputSparseMult": 1.2,
- "outputBrimCount": 2,
- "outputBrimOffset": 2,
- "outputRetractDist": 5,
- "outputRetractSpeed": 40,
- "outputRetractWipe": 1,
- "outputRetractDwell": 20,
- "outputShortPoly": 50.0,
- "outputMinSpeed": 10.0,
- "outputCoastDist": 0.1,
- "outputLayerRetract": false,
- "detectThinWalls": false,
- "zHopDistance": 0,
- "antiBacklash": 0
- }]
+ "fwRetract": false,
+ "profiles": [
+ {
+ "processName": "Ender 3 PLA",
+ "sliceHeight": 0.2,
+ "sliceShells": 3,
+ "sliceShellOrder": "in-out",
+ "sliceLayerStart": "center",
+ "sliceFillAngle": 45,
+ "sliceFillOverlap": 0.35,
+ "sliceFillSparse": 0.1,
+ "sliceFillType": "hex",
+ "sliceAdaptive": false,
+ "sliceMinHeight": 0,
+ "sliceSupportDensity": 0.25,
+ "sliceSupportOffset": 0.4,
+ "sliceSupportGap": 0,
+ "sliceSupportSize": 6,
+ "sliceSupportArea": 0.25,
+ "sliceSupportExtra": 0,
+ "sliceSupportAngle": 1,
+ "sliceSupportNozzle": 0,
+ "sliceSolidMinArea": 5,
+ "sliceSolidLayers": 2,
+ "sliceBottomLayers": 2,
+ "sliceTopLayers": 3,
+ "firstLayerRate": 10,
+ "firstLayerPrintMult": 1,
+ "firstLayerYOffset": 0,
+ "firstLayerBrim": 0,
+ "firstLayerBeltLead": 200,
+ "firstLayerFanSpeed": 0,
+ "outputTemp": 205,
+ "outputBedTemp": 70,
+ "outputFanSpeed": 255,
+ "outputFeedrate": 80,
+ "outputFinishrate": 30,
+ "outputSeekrate": 150,
+ "outputShellMult": 1,
+ "outputFillMult": 1.1,
+ "outputSparseMult": 1.1,
+ "outputRetractDist": 4,
+ "outputRetractSpeed": 60,
+ "outputRetractWipe": 2,
+ "outputRetractDwell": 0,
+ "outputShortPoly": 50,
+ "outputMinSpeed": 1,
+ "outputCoastDist": 0.05,
+ "outputLayerRetract": false,
+ "zHopDistance": 0.1,
+ "antiBacklash": 0,
+ "outputOriginCenter": false,
+ "sliceFillWidth": 1,
+ "sliceFillRate": 0,
+ "sliceSupportEnable": false,
+ "firstSliceHeight": 0.2,
+ "firstLayerFillRate": 35,
+ "firstLayerLineMult": 1,
+ "firstLayerNozzleTemp": 0,
+ "firstLayerBedTemp": 0,
+ "firstLayerBrimTrig": 0,
+ "firstLayerBrimGap": 0,
+ "outputRaft": false,
+ "outputRaftSpacing": 0.2,
+ "outputBrimCount": 0,
+ "outputBrimOffset": 2,
+ "outputPurgeTower": 0,
+ "outputInvertX": false,
+ "outputInvertY": false,
+ "arcTolerance": 0,
+ "ranges": [],
+ "outputLoops": 0,
+ "firstLayerBrimIn": 0,
+ "firstLayerBeltBump": 0,
+ "outputBeltFirst": false,
+ "sliceFillRepeat": 4,
+ "sliceLineWidth": 0,
+ "sliceSupportSpan": 5,
+ "sliceSupportOutline": true,
+ "firstLayerFlatten": 0,
+ "outputDraftShield": false,
+ "outputAvoidGaps": true,
+ "sliceDetectThin": "off"
+ }
+ ]
}
diff --git a/src/kiri-dev/fdm/Prusa.i3.MK2S b/src/kiri-dev/fdm/Prusa.i3.MK2S
index 8eb99feb..1ebee6bf 100644
--- a/src/kiri-dev/fdm/Prusa.i3.MK2S
+++ b/src/kiri-dev/fdm/Prusa.i3.MK2S
@@ -1,36 +1,158 @@
{
- "pre":[
- "M83 ; extruder relative mode",
- "M104 S160 ; set extruder to a temporary high enough temp",
- "M140 S{bed_temp} ; set bed temp",
- "M190 S{bed_temp} ; wait for bed temp",
- "M109 S160 ; wait for extruder temporary high enough temp",
- "G28 W ; home all without mesh bed level",
- "G80 ; mesh bed leveling",
- "G90 ; set absolute positioning mode",
- "M83 ; set relative positioning for extruder",
- "G1 Y-3.0 F1000.0 ; go outside print area",
- "M104 S{temp} ; set extruder actual required temp",
- "M109 S{temp} ; wait for extruder actual required temp",
- "G1 X60.0 E9.0 F1000.0 ; intro line",
- "G1 X100.0 E12.5 F1000.0 ; intro line"
+ "deviceName": "Prusa i3 MK2S",
+ "new": false,
+ "mode": "FDM",
+ "internal": 0,
+ "bedWidth": 250,
+ "bedDepth": 210,
+ "maxHeight": 210,
+ "bedRound": false,
+ "bedBelt": false,
+ "deviceZMax": 0,
+ "originCenter": false,
+ "extrudeAbs": false,
+ "spindleMax": 0,
+ "gcodeFan": [
+ "M106 S{fan_speed}"
],
- "post":[
- "G4 ; wait",
- "M104 S0 ; turn off temperature",
- "M140 S0 ; turn off heatbed",
- "M107 ; turn off fan",
- "G1 X0 Y200; home X axis",
- "G1 E-1 F900",
- "M84 ; disable motors"
+ "gcodeTrack": [
+ "M73 P{progress}"
],
- "cmd":{
- "fan_power": "M106 S{fan_speed}"
- },
- "settings":{
- "origin_center": false,
- "bed_width": 250,
- "bed_depth": 210,
- "build_height": 210
- }
+ "gcodeLayer": [
+ ";; LAYER {layer} of {layers}",
+ "M117 Layer {layer} of {layers}"
+ ],
+ "gcodePre": [
+ "M104 S160 ; set extruder temp",
+ "M140 S{bed_temp} ; set bed temp",
+ "M190 S{bed_temp} ; wait for bed temp",
+ "G28 W ; home all without mesh bed level",
+ "G80 ; mesh bed leveling",
+ "G90 ; set absolute positioning mode",
+ "M83 ; set relative positioning for extruder",
+ "G1 F1000 ; set feedrate",
+ "G1 Y-3.0 Z0.5 ; park outside print area",
+ "M104 S{temp} ; set extruder actual required temp",
+ "M109 S{temp} ; wait for extruder actual required temp",
+ "G1 X60.0 E9.0 ; purge line",
+ "G1 X100.0 E12.5 ; purge line",
+ "M117 Printing"
+ ],
+ "gcodePost": [
+ "G0 E-1 F900 ; retract slightly",
+ "M104 S0 ; turn off nozzle heat",
+ "M140 S0 ; turn off bed heat",
+ "M107 ; turn off fan",
+ "G0 F3000 ; set feedrate",
+ "G0 Y210 Z210 ; serve up print",
+ "G4 ; wait",
+ "M84 ; disable steppers",
+ "M117 Print Done"
+ ],
+ "gcodeProc": "",
+ "gcodeDwell": [],
+ "gcodeSpindle": [],
+ "gcodeChange": [],
+ "gcodeFExt": "gcode",
+ "gcodeSpace": true,
+ "gcodeStrip": false,
+ "gcodeLaserOn": [],
+ "gcodeLaserOff": [],
+ "extruders": [
+ {
+ "extFilament": 1.75,
+ "extNozzle": 0.4,
+ "extSelect": [
+ "T0"
+ ],
+ "extDeselect": [],
+ "extOffsetX": 0,
+ "extOffsetY": 0
+ }
+ ],
+ "fwRetract": false,
+ "profiles": [
+ {
+ "processName": "MK2S PLA",
+ "sliceHeight": 0.2,
+ "sliceShells": 3,
+ "sliceShellOrder": "in-out",
+ "sliceLayerStart": "center",
+ "sliceFillAngle": 45,
+ "sliceFillOverlap": 0.35,
+ "sliceFillSparse": 0.1,
+ "sliceFillType": "hex",
+ "sliceAdaptive": false,
+ "sliceMinHeight": 0,
+ "sliceSupportDensity": 0.25,
+ "sliceSupportOffset": 0.4,
+ "sliceSupportGap": 0,
+ "sliceSupportSize": 6,
+ "sliceSupportArea": 0.25,
+ "sliceSupportExtra": 0,
+ "sliceSupportAngle": 1,
+ "sliceSupportNozzle": 0,
+ "sliceSolidMinArea": 5,
+ "sliceSolidLayers": 2,
+ "sliceBottomLayers": 2,
+ "sliceTopLayers": 3,
+ "firstLayerRate": 10,
+ "firstLayerPrintMult": 1,
+ "firstLayerYOffset": 0,
+ "firstLayerBrim": 0,
+ "firstLayerBeltLead": 200,
+ "firstLayerFanSpeed": 0,
+ "outputTemp": 205,
+ "outputBedTemp": 70,
+ "outputFanSpeed": 255,
+ "outputFeedrate": 80,
+ "outputFinishrate": 30,
+ "outputSeekrate": 150,
+ "outputShellMult": 1,
+ "outputFillMult": 1.1,
+ "outputSparseMult": 1.1,
+ "outputRetractDist": 4,
+ "outputRetractSpeed": 60,
+ "outputRetractWipe": 2,
+ "outputRetractDwell": 0,
+ "outputShortPoly": 50,
+ "outputMinSpeed": 1,
+ "outputCoastDist": 0.05,
+ "outputLayerRetract": false,
+ "zHopDistance": 0.1,
+ "antiBacklash": 0,
+ "outputOriginCenter": false,
+ "sliceFillWidth": 1,
+ "sliceFillRate": 0,
+ "sliceSupportEnable": false,
+ "firstSliceHeight": 0.2,
+ "firstLayerFillRate": 35,
+ "firstLayerLineMult": 1,
+ "firstLayerNozzleTemp": 0,
+ "firstLayerBedTemp": 0,
+ "firstLayerBrimTrig": 0,
+ "firstLayerBrimGap": 0,
+ "outputRaft": false,
+ "outputRaftSpacing": 0.2,
+ "outputBrimCount": 0,
+ "outputBrimOffset": 2,
+ "outputPurgeTower": 0,
+ "outputInvertX": false,
+ "outputInvertY": false,
+ "arcTolerance": 0,
+ "ranges": [],
+ "outputLoops": 0,
+ "firstLayerBrimIn": 0,
+ "firstLayerBeltBump": 0,
+ "outputBeltFirst": false,
+ "sliceFillRepeat": 4,
+ "sliceLineWidth": 0,
+ "sliceSupportSpan": 5,
+ "sliceSupportOutline": true,
+ "firstLayerFlatten": 0,
+ "outputDraftShield": false,
+ "outputAvoidGaps": true,
+ "sliceDetectThin": "off"
+ }
+ ]
}
diff --git a/src/kiri-dev/fdm/Prusa.i3.MK3S+ b/src/kiri-dev/fdm/Prusa.i3.MK3S+
index 57a3ce32..731fd7db 100644
--- a/src/kiri-dev/fdm/Prusa.i3.MK3S+
+++ b/src/kiri-dev/fdm/Prusa.i3.MK3S+
@@ -1,19 +1,14 @@
{
- "noclone": false,
+ "deviceName": "Prusa i3 MK3S+",
+ "new": false,
"mode": "FDM",
"internal": 0,
- "imageURL": "",
- "imageScale": 0.75,
- "imageAnchor": 0,
- "bedHeight": 2.5,
"bedWidth": 250,
"bedDepth": 210,
+ "maxHeight": 210,
"bedRound": false,
"bedBelt": false,
- "resolutionX": 1600,
- "resolutionY": 900,
"deviceZMax": 0,
- "maxHeight": 210,
"originCenter": false,
"extrudeAbs": false,
"spindleMax": 0,
@@ -76,21 +71,7 @@
"extOffsetY": 0
}
],
- "new": false,
- "deviceName": "Prusa i3 MK3S+",
"fwRetract": false,
- "extras": {
- "palette": {
- "printer": "3612e108c25c",
- "ping": null,
- "feed": null,
- "push": null,
- "offset": null,
- "heat": null,
- "cool": null,
- "press": null
- }
- },
"profiles": [
{
"processName": "MK3S+ PLA",
@@ -172,8 +153,7 @@
"firstLayerFlatten": 0,
"outputDraftShield": false,
"outputAvoidGaps": true,
- "sliceDetectThin": "off",
- "beltAnchor": 200
+ "sliceDetectThin": "off"
}
]
-}
\ No newline at end of file
+}
diff --git a/src/kiri/init.js b/src/kiri/init.js
index f068fec6..78544bc8 100644
--- a/src/kiri/init.js
+++ b/src/kiri/init.js
@@ -1320,7 +1320,7 @@ gapp.register("kiri.init", [], (root, exports) => {
function showDevices() {
// disable device filter and show devices
- ui.dev.search.onclick(true);
+ ui.dev.header.onclick(true);
api.modal.show('setup');
ui.deviceList.focus();
}
@@ -1543,6 +1543,7 @@ gapp.register("kiri.init", [], (root, exports) => {
export: $('acct-export')
},
dev: {
+ header: $('dev-header'),
search: $('dev-search'),
filter: $('dev-filter')
},
@@ -2108,7 +2109,7 @@ gapp.register("kiri.init", [], (root, exports) => {
if (!ev.buttons) api.event.emit('slider.unlabel');
};
- ui.dev.search.onclick = (hide) => {
+ ui.dev.header.onclick = (hide) => {
let style = ui.dev.filter.style;
if (style.display === 'flex' || hide === true) {
style.display = '';
diff --git a/web/kiri/index.html b/web/kiri/index.html
index bb479dd5..92025c50 100644
--- a/web/kiri/index.html
+++ b/web/kiri/index.html
@@ -309,7 +309,7 @@
|
-