From c270b94ec16d0b53ca56580e72ae81e3d1d1f558 Mon Sep 17 00:00:00 2001 From: Aleksei Kvitinskii Date: Tue, 5 Feb 2019 19:57:19 +0300 Subject: [PATCH 1/4] added Z-Bolt printers --- resources/definitions/z-bolt_classic.def.json | 61 ++++++++++++++++++ resources/definitions/z-bolt_plus.def.json | 61 ++++++++++++++++++ .../z-bolt_classic_extruder_0.def.json | 16 +++++ .../extruders/z-bolt_plus_extruder_0.def.json | 16 +++++ resources/meshes/z-bolt_classic_platform.stl | Bin 0 -> 61884 bytes resources/meshes/z-bolt_plus_platform.stl | Bin 0 -> 56784 bytes 6 files changed, 154 insertions(+) create mode 100644 resources/definitions/z-bolt_classic.def.json create mode 100644 resources/definitions/z-bolt_plus.def.json create mode 100644 resources/extruders/z-bolt_classic_extruder_0.def.json create mode 100644 resources/extruders/z-bolt_plus_extruder_0.def.json create mode 100644 resources/meshes/z-bolt_classic_platform.stl create mode 100644 resources/meshes/z-bolt_plus_platform.stl diff --git a/resources/definitions/z-bolt_classic.def.json b/resources/definitions/z-bolt_classic.def.json new file mode 100644 index 0000000000..c2fa57a565 --- /dev/null +++ b/resources/definitions/z-bolt_classic.def.json @@ -0,0 +1,61 @@ +{ + "version": 2, + "name": "Z-Bolt Classic", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Z-Bolt", + "manufacturer": "Z-Bolt Co.", + "file_formats": "text/x-gcode", + "platform": "z-bolt_classic_platform.stl", + "has_materials": true, + "has_machine_quality": true, + "machine_extruder_trains": + { + "0": "z-bolt_classic_extruder_0" + } + }, + + "overrides": { + "machine_name": { "default_value": "Z-Bolt Classic" }, + "machine_heated_bed": { + "default_value": true + }, + "machine_width": { + "default_value": 200 + }, + "machine_height": { + "default_value": 240 + }, + "machine_depth": { + "default_value": 200 + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [ -75, 35 ], + [ -75, -18 ], + [ 18, 35 ], + [ 18, -18 ] + ] + }, + "gantry_height": { + "default_value": 55 + }, + "machine_use_extruder_offset_to_offset_coords": { + "default_value": true + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_start_gcode": { + "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." + }, + "machine_end_gcode": { + "value": "'M104 S0 ;extruder heater off' + ('\\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\\nG91 ;relative positioning\\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\\nG28 X0 Y0 Z0 ;move X/Y to min endstops, so the head is out of the way\\nM84 ;steppers off\\nG90 ;absolute positioning'" + } + } +} \ No newline at end of file diff --git a/resources/definitions/z-bolt_plus.def.json b/resources/definitions/z-bolt_plus.def.json new file mode 100644 index 0000000000..70aeacd73e --- /dev/null +++ b/resources/definitions/z-bolt_plus.def.json @@ -0,0 +1,61 @@ +{ + "version": 2, + "name": "Z-Bolt Plus", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Z-Bolt", + "manufacturer": "Z-Bolt Co.", + "file_formats": "text/x-gcode", + "platform": "z-bolt_plus_platform.stl", + "has_materials": true, + "has_machine_quality": true, + "machine_extruder_trains": + { + "0": "z-bolt_plus_extruder_0" + } + }, + + "overrides": { + "machine_name": { "default_value": "Z-Bolt Plus" }, + "machine_heated_bed": { + "default_value": true + }, + "machine_width": { + "default_value": 300 + }, + "machine_height": { + "default_value": 335 + }, + "machine_depth": { + "default_value": 200 + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [ -75, 35 ], + [ -75, -18 ], + [ 18, 35 ], + [ 18, -18 ] + ] + }, + "gantry_height": { + "default_value": 55 + }, + "machine_use_extruder_offset_to_offset_coords": { + "default_value": true + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_start_gcode": { + "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." + }, + "machine_end_gcode": { + "value": "'M104 S0 ;extruder heater off' + ('\\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\\nG91 ;relative positioning\\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\\nG28 X0 Y0 Z0 ;move X/Y to min endstops, so the head is out of the way\\nM84 ;steppers off\\nG90 ;absolute positioning'" + } + } +} \ No newline at end of file diff --git a/resources/extruders/z-bolt_classic_extruder_0.def.json b/resources/extruders/z-bolt_classic_extruder_0.def.json new file mode 100644 index 0000000000..439a634924 --- /dev/null +++ b/resources/extruders/z-bolt_classic_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "z-bolt_classic_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "z-bolt_classic", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/z-bolt_plus_extruder_0.def.json b/resources/extruders/z-bolt_plus_extruder_0.def.json new file mode 100644 index 0000000000..e6bd4e4b7c --- /dev/null +++ b/resources/extruders/z-bolt_plus_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "z-bolt_plus_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "z-bolt_plus", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/meshes/z-bolt_classic_platform.stl b/resources/meshes/z-bolt_classic_platform.stl new file mode 100644 index 0000000000000000000000000000000000000000..6e1e2f2d586843eb50bf1a0f8862e69e373da99e GIT binary patch literal 61884 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[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

LHy1qmEQ8T$6dJ2z9z2Y%wJh6GySn8?tJ zjV)Z2i1c+oY(@n~HTa~QLxlv6S8^s~-cT8n*GhY3oYAc3<~DuD_TI1{E4s33tedMbem5;)JO5~v`7v!5z~3KBRcs}j$wqLwq$ z)9A7G32{UCy6doZ39T>ib<-*Bqw)h4B>rm8#EHZDeF(HF+>nXcd7}wbHdbLPM}@Zk zF;qx=T9)YxRodJqRA_ak5EI{*ZWTqK^6`UgmGD=K{}?JHE>Y~;0i|lW} z-3CzvDoC^_9EwL<_k9Soy7V{`zW7E_1S-cuZ@;m6!vyrLmMc_{_$!p>S4O&`d?0~V z3!dXp<^RB`5?)#Q3O(vf_;DIrE!Z5FkR#zh1&O}zF@3&!Wc{4`C?wDdL#xIda}cd$ zJGSxD=o*DecEq0a=sZV4UXztr?Jd1S&}E`GScTib2`6 z5opErCg`Dh6E3?JfeI397O;=jNzp!J>QX6@=~jGMn{eJJCDHOB!%hkkG7W#7*fuIu zNT8KW!wfg{A2uIoCF4|lIMhLlKm`ez>I*MN`#=J%WExU0ntke$B2)D7-0c(aNh-m$ zmTQr`ruu;?q7YtGvLm<-UioLJwKh@roygh*DfZSU=wV{;mYMN$(o6a4_mc!GNXU3_ zN&LNDGxs24jk99Ci6$yYV2f(#UHc7k&p)%ych56kA<#;u8<)hM!&bQUewCaluNWpO zNMJi}=^$3|wTTK6*b^E0%~DQnHBmtV`&~nS^V;)T`RO0}+LSJ$5NO5q@rZ}p#G=o3))p_j<{Z`|zljPG zI2thY7q0Zvc3nE)yXL+aKmx6}l{gY=sm%w5Xm?J1;rzYO;Q%T~;CRK*Py8}QJO9uy ze@y;26auZd9XsOT{-f@bB`@01PE1X^KjHgswkhW2l>fm#Ms zkia&E+V;pwwY`*NTB9(`e}zy+OOmE>n8;@4@_Z>OvyHPAzoB2f* ze}T;@A%YboWO<{J0he80{m-cEDg;`|Qpp6B#1Cffj}^7njS3R7ywQlm(22+tWjC5Y zD_JU;cuADR6j651x-Ys>K|+={9+wc2F3N5+fmX6qGVzWmiT@L2w{htr8Y)Q0^2Q?> zBB&%r6KEw%B@=l{JBjcfJylCX1qoT+cqBu_o_@VHL=$KwOC=L=qU=67u;PX{Z@1A< zK|+>Y9{UhMp&|kmJCW&O;-S)IwefMwoJGEE6(U$c0%s5mo#IjbpcT$i z82XE%Ty5-l%6CSTL{yN#QfcTt8x7U!$6RwJH{GugXod3{hJH-ck3lov_E!)!3Kb-< zb{YEekH%{~a=qZ{zqFS^pcU46LvJs}SCr>Hiw#loT#jU-$G(QXqx&cBffe>R$2~Mm zlVdm<6(fPOR6I^hSU#D?i3)*Ma>U6a{lN0p?y9a0&gU;p&`?1F-`fqH#=HOYE#z;| zFIgeb3dh=p-fhna8dG~ed|U3bDnqwSKeaEIa=;Jz>L%->vIfrROB@eeqR+xNqoXzHg{aXi(61^0XvaL88HFqJy3$ zPtFlU)hordUq5@u`R%lJ8Y)PX`r@|bZ|R}=f=CM%*BZRss{XL0DuGt{Eh6YKEaHD3 z9dpNh*?L#8l7lo z_d{QPm#R+~uMlW;qt{)_$A`C<3gTG(epan5JbAo^ik-;xF!9A)hm{|LdUiLLwEx5M zemBo+p*#@ZO^7_;`#}%gH*`C}3g)JogS+z$4~TN*z54e!lS7s1x$)(jq332=&y}I2 z`-UDO91$XDBh*ld$D8DX{*yi^hVq)8D}8XxLxcbv4pg!uI8>HtXr&sxV;PfAvJb3|w=OKr1XgDuJQGJV1XI;gzw+XGwpNbmLSH`>;w1<}>@_9K_nC5~v`-{|d^P(h+^ zVQxz{O_?8&8YOlMh#G}YGITo; zw4Q|}AM1^wZ@V|cn%TZQFxlLFnOmHpuJ0OmZ%X5xOwYW3zHiL;gC4psc3Jpm#!tTT zh_AGm*+vD4@*0np@)!I;5Q~Cs+_{Stc9uIn!9)d#C0n=^olyU}ApV)5yWc%g+E*Z5 zCD7`L^*rj^q7!lCjg9WQMIUqils3{t1&KE+{AIVOc7X{0XWzQ3UQCI*;^}Lmg2d<)9`C;0HkYVTD+^q+YVEdXR06H|I_P1d!95Sv zL2sY)mCQ2j^H_b~;2vcX+-JBS>=7)Q!1se5x^L*YE_lp60J4(Qai;)1T`|+~ztBO;nJW)QSBaFI`X&n>*Ar*PgkZ`t&%JK&ufQ*~j*K4+&!A zrIP0Ent#N-TU0kuLBe$)mleM+2IdjOyrm`0S+CAd9oIr7(CV9gL?39MU6F&U|GpcTH_pH7WDAu*t1T80^!&b(h(?JSfpRyu*Z;oL z5EB(7`n~>u6{?TE`c)8Bnq~wh1m?$;?>odq1&ME_5|Qbtx{rtf_1+2OE50c8kxru( z0#C5AZ$wUQ-7h>4Q&M8FPdvi$oyrk`^Z@-(Y5NL%hhS(il zW>7kfFoN^dw!}_khFYH!a~<6K_w26S(YTC0rBw>miA<|b@cp2N?u*q78^H?JF11Dt zy2d-nGsjHSGB0tPxPEo%1oX%EgC4qX=yrk?B-Bui-rJbo)g1kXPSoUBox+R$__s= z>Lx07f=i4tLiS=#VaZTaS0t=gj*wA70$W$bhXV<;!nRT+P{Gy?pQI9~Ac5_eLU@rt zE6iDiaG-(&_Ky}3PAgQ9z_wELfdpD%Kd<^g1qo~`RUb&86}EgTfh`%1YH}t}K>~fN zJ}`B$u3$c?1S&{iEy$TbE47}B(k}k^O&D7>_9tf2L_3HrYS@R>I-r6CjyNpBD}A7X z1dbn60u>~1G@ufwAb~x#8V^*Ez_v^EfdpFNm{IkCZ7t^qw^8U%^??c!*xIQ+kU%R8 zp-NypFzh(uP(y_Z5;!7PeIS8WIO0%!pn?RBA5%6`vCxKk)pnAjF?lqe49n&+j48z5$P~lvz%zMxlblr;~ZSTYW#xx2JZV zUYUFZAN#U05@?mwpU0vZhiEQ*Z%%SV01P8~SVM#{$zDPK%2zK1f3a z35=hif0c18u;)F0T-Tz5G*pnl{1+qrPm7y>xALX_xT2jxpcUqmq3^#_+`Qwc;ha0B zorVe$SSk&D>bDKeln?9r)}5`P5NL&^$I#2=Z)D~7Sbq%-6+6MJC)SDy5nftj!8$1W zD=LZjq%h%#5WMDv1eQue-<5B;^+r!CCTJz|pX$WF5xkCrge+IGMsYveePb`B)=DB$ z2P5?(nqVb6g3Im?N!ELm_vOLe&E$`Hv_0XxJ0bVxTh<&2%`@@+poi`odWdjD2v(5b zYo2p5^w#;BT4{B!$wX83IICjngr1veJ(uqXJ#;@if)xy*8mi)ViclT&uIZg4%R6{kL)5@`AaCc3{mS#-RpNu)rq}mCd7ezu1 zRp-5hK*I@u(mneV4m6NcdR#agyd8S=hOv?%{Y;kZ2l8h3186<%eSa*qaafN@mS>BY{?G zehfCP)b%bazrc-(o#0g`rT_3Efw_jh6~ciE5^A}k{FeP75@@BCb|hq|sFX;W@;PS$ z6(lg9)Oa9)R+8o%426oyua^m|+nH9~#*_~Guu42CSO>ALIyr$|%|+I(QS!qBQd zP(cFgibZ%uq%9vvpp^_2?0hiXo6Cg z{v;hHtPon|$`rDfY(nt>0`oi)kFbyI2ti{ALpdlctvcc;+Sw;OXL^P=t&$L!vd6lP z{jf?xqs4rG#-6HH*`?4hfeI2|=V5yPfa>=l(5miX_VLQRXaW@^t{*k65PF`d8RY{B zv?_9geeB#GO`w8A%k}J|OA&5MA~8n-t@f7pTcPUr+%r+3LIsJ1ud|QoP8yMs2bsD^ zpw*ODm?%G`ZWMtz_;eAD?Z&E=mE2T)V6GuiuE-}=JRZ0j%Ram^RHz{Fs`!YPO3x!1 zF;SsH0)qkHw#L9O+ zibVy9eJ}9tJzwe#vBt7}^@|&bNF83d3KD3w$n~q`JE{*#E-S5&K&!z$XXij*`fNJC z)w25Jixjw-uIpjF1bEtbE|EvhgP&T~{6nQTR^Gd?NjP$BW% zOs3yn6y5IPv(V~teM#i?#+%MD|z4DjCOwl;XnnS`%wc9RrzNo-iJV|0Rx!$@_4dJcu{FGi>(UY z_Ws9EAt7_~?#0Qf4<#OG)&C#%_wcGID&a+?WeYB^zf_<4A47#izROIfWldFmD4{|t zS<`I!;g#(mDeIHD<-E3gc|wka0~I8O?Bh1E*Wp!asJuv^6_$mZO9>KLWkPLYx3y6| z@L6b;uj?ACp4(%N3KBEUEmR4wY~heVD|xM)Tu(L1`^7l!w|jp*HDQ8_drJxlrn(w) zRFL?p9rv8It1MAt?mz;qFmF^J_*@L(jhZ}W`0!+?T!mwf3KFA=@;K;XRU-V4J#5X; zKQKJADiUZla66A)yVWM5QHy*Q;psemBPvL24~?7`te_g@KKP|I0=QW0+$JQ@>TVU_dHlTup9BXqu-?6sNddl;cdKTP*1X>L&$UZ(CMJ+?SCo5Ph4ZDUv zSQ!;0W`{=McYgB<;zExJ*4St8(Unz^K&zb>cr0peB7(}3EQzQfF)uUh(SwtSwvI!wHQ>8SXqI` z?Zt~x+rDjJK8tv<>VzstpjErc?Bli7;{|~+M+J%9W0@E~g3j4S0u?0E<2h8eUd@37 zTFLwS2GCqzc0Nc!VoEZHN`H*b7exXUBu*@5qS3d#qX<-x7?r_9sRv$;B2YmhwJ?|6 zxih*)5vU;X*Ddx@@u?S>pr}}51|-m`Y+LqGreDV>A83U>KHSDW&g<=?2vm@e*Y=T2 zb_7}F^0JSt{BX{M6%SPKxrh2Q(IL5IRLoI9;-#KUbh*$hia;eh;#N~;7Y?ka+whUPXSZPt=$}#3vF%wE8kPuXArd9yOA2pwf0d zTjl?B`F{)*5<}d)A9i9r>d#MZ@LBy}#~r1sV5rdQfx}GHcxHhhIyiz>kF)1ep-rf? zXvJTNBxKC}kD)@MU>eh|+_R$c14D&YBg*EpN=f(c-w;IE!xyYjRd4d(CR7#;W2>6e zr$mKn?revMu~$2Bvw#wFBnGB1J?U%e4VM2j&GOMGZMOJ-BnQz-Kf^?|HuS~Fv&UCd zCLiwx7F0&%^zUpnZCdZBP>G@;{B!+SBSj1X@LW z^IUj#p<1;EiNsLMeFd}}eXQDpR(C_G`}AAUvucVmJd{>1Rfe>>U#JWq-hQ0vlk*ZmIutnj+?ZmC0w-+H*6eZNgBY zRr^qHkd&4dl~$<8{=@Z-KPpt1y66LmszbT&`pqBh0|~Usc{U0aBwqQAzvjrQLovrt zA%Rvn6Q&Y4%ZW3aiRNe4JEwi_6%`~NYQ%dRTJL-?s_Y_xR{I}4or4clkeJ+s*Uuks zOmz@rjs#j&Z+bNcAE+R)bKwn(SUobjWk3S0`u=v^B97FHn(Ol-fmZVVt6QU28c;#v z)6wi>>X7I*5ec;Vqcjtn{|ueD=#~8kD(AoX#R_|6vsD5F z=X2Sudz!{R6r@mEc~M#3iEGjJn==#eNlMJa@u2V`A#0j#{>p(05}(I$%h1R_S4~|n z5@;n`47(3hkZ9O|S7nC9&{!05(2E3G;hd8~I8Z?X=d#q)#o4;QC-Vx%-d^hx>Ivim><33(lkc{o(r5o9HO+kK#d&&3o`a?l}Xo#|P! z98(V^XO|=O9Ddoy5ebBSyHHAHAA2O{d2jw;S zkonKGwpgogt+8n0D_I+HHVS8;3iajLs1obDiuS5z&kwBe?)GnMY(fQzOFNhtT%eO6 z9v{10jB~wOwXym}B+%;0J|?C%@1nMe4pfl%b3V_vkI8r`ijX5q$|>1O(6ziD&W~^o zqJo5IOT<1P+94GEu7(6!MOvRILimb2D|;WI_9|RIBE)qi9+I}VyV((B6$usiFv(H> z2WX8Y=y|nyOahOugVv4&UKio(aE&4&v|_>v5@j1vuO@zF>^Qs++6c7zZY-^siQf#% zdpYuMU=jFS3}K6bl;=TDYR%Bz4~l|Cpn}9xDICAe)$T{2)nge{62&j!z7Hd0%Lgh* zl&DARIAZ_)ruz|SwPpwtdDev1&%^ORA82*1Ifv@g&tRvM6)IGa;MJ3$N7)-?Bhc!Q z$)S3*1gyB*2()_lBF)wYJ*}tKh}1!gKn00<7um;%9rq*9D(GV$BT79Tl z9rT1}w!@_a6(o3;JLpm7^sP`KfmZUqGT*Kcq##jeAjf?5=P;*l5vU-scS@*~v}zj_ zb5xMXx1EWXUT7ahpn`9IMiHnWA={O=272#9pw(k%*hkeF(F7_;$o4U=0qm2pVvYn_4Xn()!9CnrV-ctz zA=`OnFOH2sE7_Mc9!YQXn7Zf#tq#A%p&I;CG=T~dvQNA}fmY4(@(5t~*3d4CaJfPS z3E5NMpFpeQ^Vr8jPr&{wE3HsLLXJ4@PoNdQw~OzM#OO>-T~v^eBeMGwXeGy5C0#Jj zV8sI!B;<(f?={P#LWK$vygMnocp!mRyw?Z_uWT7mL854<6steCr!Ep`)nNuOi1wHoqfdpFdPB-z*pRLxSvTYGRms$gSQqG}5qRCjM z?d=sl3$4yHVZz>uqLQl;TTy$CPs%w|Nbp|8pvTtNhW0>mX+SIKBmAxwuIH#AA+POY zpX>;0KSL-^wh@_EhMg3d3N)I;CuJXV3NI2erS0Qgd=^^C+_a6ty{O0%6WLpv-Mbq4 zKth&E`}+qHXeCR&?H$L9imYAqwuMj1IjxY8HJIK-b0*MAwi4k|VrxrCK`YrR+21)) zK|;26b|3ky73rX7yQ`IW!={yLF{Tph+5EO0^oSzsP~(9L67oqC3igSLITC0UxgYgL zFMQIfK6$^MfW)3tw2CZ#b-L6mIr_MsfL2d!V&ax>LKJ~Yje%?xe_ifQVBa~#{CWZs znI)L6?VcXx1LJ{Kg?7=ZbS$wJ=g&pIk5~xHGO(^E_t46Ae z@(VQU%Q;Iyf@jrWT#_w;R`NPLBOE61xy~W9#uD^Uu1Uf^hC>AjSAjn*no5isb0pA; z=a93D2P#O6-$i@RgC2X?MFOpO&N@3Es30MG1AEL-K|;32_Bx0oWE{!z%yxF6LIsJ= zeQ9+uyS4-gwBnic?0let1g~0VN1%eli8Zt`8uWzQM6WEnNT5}$g9&Pb)l!0rmPBi` zVm?W<=lCRr2(6`Zc(WtIrQH@PQjjS01pBl1IMO>2Xf^dRt+?7QY zqJo61D|HSPjq-s6TFKgM_kju$vX!u{W`x%0d9;mIxMrc060dB@Xv`^FxYb!F8_Sl@ z7OL=D5h+OU%3pRPeN>Q;?R@My*xhE85+u-yR}{1H;Y9@rUJJ{HaG-*O?BPD1xIb#; z2MM&2J?e5V>?5<{fr=bI6gZaF7@wr(2P#O2u|#Oh5It^30cn|u)Pc`JEBQ`E?Yx?UsL1y=>ND_3Ifn`f`EF?Mqwra1CEq{oJtyzj2znxWae|)6 zUK75r#)J2J*a_Z6B2McPyCIZ#c#%LWd0*L)V)eDCAR+seoP9+0t#C+W{A@l#dy2#< zN#UI?Okhu>#3QsrhzYck*Y+{B3~yw26Q^6w1S&G@lsEF)9uFMp%WFy>`OaW(6H!4z z_C)s7MFOp4Ph|5E?xRS_j%Xm;8U})7Gl=(q1l-KlJ znd)I5qJHyRsfk?UYQ@*pUcqzl`(lOb5MTu;s}*QKHr1OSf=%sg5{0k5hj$9m>t2T zec_CHF;?USiB??tR3AAJ{8ofSblDAuD!luXo+XLwN_&`a;IpzLu*NZxdV-9-gQWXoYLV zq7J662yFX)nm@6RVWNTrel0J)sCqsvP_xQ}m% zs33t~%ZuNx`KGX$b$F8N>A@Wo02gUeg{Qe3I4USUw^|(0W#O1n&?UsdK2_+pr)Wt?(;+ z>4S-SBIf&V6?Ts9wLC=dZX+accaou3{AH~9)oV}rvhpOmQ9%N~;WzZ(Q^%U6FP_`AUOgH7>hRK?3(>8G7M8eawLy&ik4l`Ob|B5_nF4ICHsE zbF=XL!_G&(uAm`-RyfuYzklAkvAMBj2mi^tl{Hk5z@6EKJ~OSH`EX_(SE>3tLet#GVm=!@Su7D!F2@4r}X zkcJ8pxR+b}ruX4xfui%OxjO7H6auYqbSBPw9n~i=s`{g8E0>JdP(ec77d~WCed}cI z8&@YP1X`)1zN4iQEFxjxL=zPxaKvfoN$Fz((^fgt_Kq57qJjkOTo>O*4cidtHt-2o zzMn=a1X|%Z*wFhgxfYoC&(r>yh5MSQAb~sZ4gKq*w*%X2R&ag$aZiOnD;&=odgc5T z%pNNm`s?IwVWNTrogj|WgeLbk`Ptv#v!^MlL{!$0s% zi#r-_+etwJ&$ux3v-!rG`z{k<~q|4&rU}It8RL=Opo008yO)p!HT@5y~p^ZNdG}2MO3mQ zc;~XupJeqouEU4pB@uaUrnSEr_dpwZop+MVzt->YH7|ZD9u@SVp2^Xq@Mv@Q*;kz_ z9-HSz0jz`$ouPWE?dKVCxx2|VFb{DxcX-t&N6Q;LnUW4X%;Ci$|I8e!s zu*U4WNo zywCMx!V62+aZJ47v?4{GOz>X_u7gP6y1G&l!{-{H587XlBjG?r`aptrC!Be(fkyFY z@K+rZt?ynTCA5-th3ezK5j;nR1Yh%gwOsMaI@dd%q33J4 z;x20x=O48`s33v!`&NEf^<&saZDQ?K;@4+H+5Ii9_R1(pO zSKl(NRZ{sRg&-(I@CqLia_x=@%Tm~9K7F*Z-HPM%Z-nZD)&wQN>w}{<#)ap?r4LeM zoc;^J>zqi)n6r=lr&`2|XgF?tkgV|@hD;Cbbg-X`6twOe`mHtX;%6q$bEa>R1S?43 zJ_qspwf#!CcTS$|YvD}PP(cDuYZ7yo&C0kd$DMZ8en=(I3U@;o`Ug!WxHqo(%D1G^ zI1Lpf@C+$K|KV}3`}K~Ooh8qVRS2}g{S#tF_pD zt9{t{Pl8II74E(;^dGODb>A%hnQ!#X{u(Ms;CWkO++O~?d)CSY&Nl|B1X|%94e`tG zJMw5paxL-Q`Js!33KDnO%B#&eS<6``Q6 zH9*_juY|wj=F@Iekic{G#0>pgBeXS7mT;A=zg;2F3U|O5`Zvu-YAKl|{8K7yaVrX( z*QcEPr|-x$PP_a-S=Z8Ii3)*MxM#-DS9!;2J%3_6IIUBoUwy52 zjtQWG1fIAlP9)7ePFvaVLD%OQi3)*Mvb^#4I45e2)K*-|?_alkO8^xl@ElM>e`e+g zEq9gNt|7IyD+F4}dc!-(^DG>oYv1E?T@CzXm>=db%~Gl!gYzR@yEA<#*6QE$`sBeDQ_b zny4UwC+iye8-w#|51yXp95ShkLZFrGgZYb*?}p^j=5#seD_ydyi3$>U_OBQ-R5|iE#=H0bb2C- z{MpwR(g;~0&`RzX=I^{ZZs$>Wu@93?RO|$uoY83ZC7DPcrl# zi`%7NIycX`UxW%3B;>wlj`{xXB?1SsX8Yzl6HQc*z|-XnJ-u<6z_$lZJ9~@NMFOql z4s*`I<*o^V<+V=us>hErQ9%OFyc53*P{td0`Q~NkKv7DNKr6Y|ol9cFpHc#AieL79 zeqe-&3KDpZpP{eV_kLhb+F@rSk4m7G+=0(E>eiLBfsfz&%=f{~{w69&;ID^>aY^~} zf%&->I(v&+iv(K9Zx6U-D77<>*>va<-=H75n5ZD3{?f+A!FkQRakZVDMC*eDTFLJz zxP|NddTF!nW~cAYnKmXWNT{bFjvP|aT(kaC!-WN#DFj-{FFUwxzjCO$S+HOMUynL?5^L@I!^1*Pg7V5NL&GLK=FR3(d@L9=_D@n?X-11X{^2RJd3Bpt5dO zx_-(xaDPb?6(sO%OYvS?s;ikcG1GZ)U>=1)EBU1j_s$z`cQuRj%Im*!E0>815_n#x zc&|O%-~9RGT&|M|Spg)_N`5iKql{ht0p|2$CH(%yrvs=UfhUKGRpePC%=B3$TsJCj zR|vF{UqSI`DXry5^GNlQ{^3Qo1W-W&&oedjN_obaReP0n6-ZB12(*&lWAUi(`6=Vf z>V5C|E?gZQKm`drmsQlL(ut-RxVuVyP+B3-N`58Aqt_|VC7MGouJBDiRxE%D5_npy zSXWC)HWOQIbbdOnZ8{QYg!KrfEDAtk_S}mE-nN zB2K>|+;7X61vU47hb=bhc96#}hf zKJhmV+URlSKh1CXuKC8eQ9%OFEjIMmbB{Bp%qrkIaUfA4&`Op!{!*`It&!%khWY)S zR&Q~mf&`wXZ0OTwjxhH>pUbtj=5~cZD_L*&`;TAe4=`^o$mK6s|7$lYNZ_f^;?3(! ze{;x~ubt^FvJ?WXWNqfJQsNGEHJzi*`3@xH)=)tL&#E@`He!5OCiy+*0x@1h0#CuG z1pdCF7%i1MA6V3Bzw@M+xkCc2qJ5ek7;a!kbEk~Qs?5-2z{xBr(5BQ#WyP*0Wr>@ja3W_o^CqL@iV0iAXh_5rP(~RWFG<<^D!)rX|m|GS66I#cZs33vA6KLqZ-(NJx_xjvfA#Xv2Kr4Ah z4xemPux?Ltd5cQ^)&9Q%s33vAWGMFBRTyqg|6q-)@QpNuKr4B251)k;|AArl|7o{> z-^pbGRFJ^mR5bL_J0_arMEizkz+&EB?G@YI#@AG*}GE^-dZy%2e z5;A^#-qO)KN#@e>&C^QO+ZB%r68OuTVwFs!?t$`4UE9vN+(@96%qKqk^TO|jndjbK z{|iqob)$j={x+zg=N6^p>5}VRxo@N?1X{`R#%DVHVe~ZjSE%ftc;ZhtDoEh3l#1R! zl=kN9zjT(!TTnv+tz^C7Q=mRS;4vR65bGaOK1M?Y30b@Nyw|g#T3dI1HHAPczLqD% zRx4l5Dp%8AXsMxs1fB>b#thR-nf>cj^lx6&Rzn2|{5@Dh-__u5pjD-V&OeiTC~j-SM;@0DhEDp@s{hgDU%cet?-;GLw_r{KK<#x8>KxQldPeF1fM#^E7)RH zrgbBlFLCVls{~r%IaSII2o0_H1S@{-zY)CRj)Z#tl?YY52$YvXg$fe#)IvVT>)5Aj z;~y(uFYR)TWDON0@Rzj32w+NOcd>nQTvJ8rB7s)&^hG|``Py$Y+(XCj^ylt7MneS& z{6%m>zp;IjJMP=%Rw+ROt>h_^eCFAuW*6Ptnmq1bcB!9+3KIA$=T>QV|6K5pRoan2 zD|s3wpTzdrOQp1rXIA!~O>3*6f&`z@nHf6QS=3ruV{uTeMFOqlsh-?2eD`-e5#CCo zWk3Z9d2%SXKCx>&+BVUjcWoV`p@Ibdvb`v~zrUy*5dHagc?v27TFDboxfQKhx2JYm z^ye}Dzuc%Gfxm2T=oKmq*OEkkKH_?sLZFpA$(4J97e6qxYN9`{a&nm)6(sOi|HKOK zj)~gO4d%O6WVsXqt>lTc+^a3VnWRl{>S=}h`QlMQg3rn2epk$kim@Bz;IcC96#}i~ z$-44vL*9`R*s^?s-HOKv|3>f`(UPWdf+Tp%AVW33O#5_HkdX1?k<9TsN!qX{ny2l5 zW>-2YNZ>Ds8oF1c?r_ncugY=-kU%S$Pdp;K{kx&%7yY@f;?e*rNZ@a$8hSZVN=AzQ ze8TlKg+MD=-gsnLY*bIJ<&%~DB~SbrKm`f>)mSmtCrbM{(VzdCr=W=hTFH9DBjjTT zJlaappZ6^vW1@nDtX+IssOZnFQu2%#g(HDhd@auxZ4_!5Cce_{P0n^yh0g_cKvJ0)M|) zyyLvT$$dfe=MPOEsSs!-TW~(_^{)jp-Lpi0eyZ{q6BQ)zcbE*EJ4rW_jFzg2{+v=53AB>qF3!P% zzt0Fv5ⅈea4umAc4Q>Zk3XNNA%}ZN{~P+Iez4lSg85MK&t4^=U(b(qJjke>bzCj z1J^}=PNf|Qw36dsu2JV+DrIgK{rTr Date: Wed, 6 Feb 2019 17:29:43 +0300 Subject: [PATCH 2/4] update position var type --- resources/definitions/z-bolt_classic.def.json | 2 -- resources/definitions/z-bolt_plus.def.json | 2 -- resources/extruders/z-bolt_classic_extruder_0.def.json | 2 +- resources/extruders/z-bolt_plus_extruder_0.def.json | 2 +- 4 files changed, 2 insertions(+), 6 deletions(-) diff --git a/resources/definitions/z-bolt_classic.def.json b/resources/definitions/z-bolt_classic.def.json index c2fa57a565..09818df836 100644 --- a/resources/definitions/z-bolt_classic.def.json +++ b/resources/definitions/z-bolt_classic.def.json @@ -8,8 +8,6 @@ "manufacturer": "Z-Bolt Co.", "file_formats": "text/x-gcode", "platform": "z-bolt_classic_platform.stl", - "has_materials": true, - "has_machine_quality": true, "machine_extruder_trains": { "0": "z-bolt_classic_extruder_0" diff --git a/resources/definitions/z-bolt_plus.def.json b/resources/definitions/z-bolt_plus.def.json index 70aeacd73e..4fb989742f 100644 --- a/resources/definitions/z-bolt_plus.def.json +++ b/resources/definitions/z-bolt_plus.def.json @@ -8,8 +8,6 @@ "manufacturer": "Z-Bolt Co.", "file_formats": "text/x-gcode", "platform": "z-bolt_plus_platform.stl", - "has_materials": true, - "has_machine_quality": true, "machine_extruder_trains": { "0": "z-bolt_plus_extruder_0" diff --git a/resources/extruders/z-bolt_classic_extruder_0.def.json b/resources/extruders/z-bolt_classic_extruder_0.def.json index 439a634924..c3d4a8c08c 100644 --- a/resources/extruders/z-bolt_classic_extruder_0.def.json +++ b/resources/extruders/z-bolt_classic_extruder_0.def.json @@ -5,7 +5,7 @@ "inherits": "fdmextruder", "metadata": { "machine": "z-bolt_classic", - "position": "0" + "position": 0 }, "overrides": { diff --git a/resources/extruders/z-bolt_plus_extruder_0.def.json b/resources/extruders/z-bolt_plus_extruder_0.def.json index e6bd4e4b7c..78aa32b105 100644 --- a/resources/extruders/z-bolt_plus_extruder_0.def.json +++ b/resources/extruders/z-bolt_plus_extruder_0.def.json @@ -5,7 +5,7 @@ "inherits": "fdmextruder", "metadata": { "machine": "z-bolt_plus", - "position": "0" + "position": 0 }, "overrides": { From 22f7d30197ce077f23776d4a0d2f0e2e1b84f4cb Mon Sep 17 00:00:00 2001 From: Aleksei Kvitinskii Date: Tue, 12 Feb 2019 21:13:53 +0300 Subject: [PATCH 3/4] merged extruders and replace value with default_value --- resources/definitions/z-bolt_classic.def.json | 4 ++-- resources/definitions/z-bolt_plus.def.json | 4 ++-- .../z-bolt_classic_extruder_0.def.json | 16 ---------------- resources/extruders/z-bolt_extruder_0.def.json | Bin 0 -> 900 bytes .../extruders/z-bolt_plus_extruder_0.def.json | 16 ---------------- 5 files changed, 4 insertions(+), 36 deletions(-) delete mode 100644 resources/extruders/z-bolt_classic_extruder_0.def.json create mode 100644 resources/extruders/z-bolt_extruder_0.def.json delete mode 100644 resources/extruders/z-bolt_plus_extruder_0.def.json diff --git a/resources/definitions/z-bolt_classic.def.json b/resources/definitions/z-bolt_classic.def.json index 09818df836..d294de473a 100644 --- a/resources/definitions/z-bolt_classic.def.json +++ b/resources/definitions/z-bolt_classic.def.json @@ -10,7 +10,7 @@ "platform": "z-bolt_classic_platform.stl", "machine_extruder_trains": { - "0": "z-bolt_classic_extruder_0" + "0": "z-bolt_extruder_0" } }, @@ -53,7 +53,7 @@ "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, "machine_end_gcode": { - "value": "'M104 S0 ;extruder heater off' + ('\\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\\nG91 ;relative positioning\\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\\nG28 X0 Y0 Z0 ;move X/Y to min endstops, so the head is out of the way\\nM84 ;steppers off\\nG90 ;absolute positioning'" + "default_value": "'M104 S0 ;extruder heater off' + ('\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 Z0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning'" } } } \ No newline at end of file diff --git a/resources/definitions/z-bolt_plus.def.json b/resources/definitions/z-bolt_plus.def.json index 4fb989742f..57331df4c6 100644 --- a/resources/definitions/z-bolt_plus.def.json +++ b/resources/definitions/z-bolt_plus.def.json @@ -10,7 +10,7 @@ "platform": "z-bolt_plus_platform.stl", "machine_extruder_trains": { - "0": "z-bolt_plus_extruder_0" + "0": "z-bolt_extruder_0" } }, @@ -53,7 +53,7 @@ "default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z15.0 F9000 ;move the platform down 15mm\nG92 E0 ;zero the extruded length\nG1 F200 E6 ;extrude 6 mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 F9000\n;Put printing message on LCD screen\nM117 Printing..." }, "machine_end_gcode": { - "value": "'M104 S0 ;extruder heater off' + ('\\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\\nG91 ;relative positioning\\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\\nG28 X0 Y0 Z0 ;move X/Y to min endstops, so the head is out of the way\\nM84 ;steppers off\\nG90 ;absolute positioning'" + "default_value": "'M104 S0 ;extruder heater off' + ('\nM140 S0 ;heated bed heater off' if machine_heated_bed else '') + '\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 X-20 Y-20 F9000 ;move Z up a bit and retract filament even more\nG28 X0 Y0 Z0 ;move X/Y to min endstops, so the head is out of the way\nM84 ;steppers off\nG90 ;absolute positioning'" } } } \ No newline at end of file diff --git a/resources/extruders/z-bolt_classic_extruder_0.def.json b/resources/extruders/z-bolt_classic_extruder_0.def.json deleted file mode 100644 index c3d4a8c08c..0000000000 --- a/resources/extruders/z-bolt_classic_extruder_0.def.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "id": "z-bolt_classic_extruder_0", - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "z-bolt_classic", - "position": 0 - }, - - "overrides": { - "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } - } -} diff --git a/resources/extruders/z-bolt_extruder_0.def.json b/resources/extruders/z-bolt_extruder_0.def.json new file mode 100644 index 0000000000000000000000000000000000000000..aa9b0f1db23fc73e35eb163b240788c5a3c06a69 GIT binary patch literal 900 zcmZva&r2Io5XWaVkw$t*W2quSg9xS2O*Wb)K?F^95f2Jd=vg+&imS36p8DG3gIGoP9FBQx{1?7Bw;tD9cv3t-mv zBxfUW{$=Za{@(o*>lT@Zr$ns@tb!+bAK)>Zq7W4ujhbCC1KV}{gvh!fR_2vB8uaE5$o)f=mUejKejC@Hgtr&SVo6~b@ z!N_IQ{BlXpEbE)vidK|$z2h^`U}n^Fj_*ptXPHrV)v?RKyIz>3q2RL c;vNm$7J22zJ;%Yam)Yz8-x Date: Thu, 14 Feb 2019 11:24:00 +0100 Subject: [PATCH 4/4] Add extruder file for Z-Bolt printers. Contributes to CURA-6193. --- resources/extruders/z-bolt_extruder_0.def.json | Bin 900 -> 344 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/resources/extruders/z-bolt_extruder_0.def.json b/resources/extruders/z-bolt_extruder_0.def.json index aa9b0f1db23fc73e35eb163b240788c5a3c06a69..70e9f6177cadb41a1372007a5b4c691ba72285cd 100644 GIT binary patch literal 344 zcmZus%?g7s48HpmC1)o(HU_)zIZC%i4D@HzDns$zms*7}%qisi&0Gi`APsi`)9L9= zl=z8Z&=_P5Wrjx#J$c8R^LBB{Vv;;Iu4r~Hxef!xKB29)yV(v~j7qDh7@k-2HUI5< zia7ylSno?&WE?!l2hx}A(ZbRhu(G`4Es{-ZKODpw2kNcL&Ks#ix2rSsEdQ1&z> d&XKIT{0SpJq>R+WPxF2(YpUB-EV+8Id;xPpVV(d0 literal 900 zcmZva&r2Io5XWaVkw$t*W2quSg9xS2O*Wb)K?F^95f2Jd=vg+&imS36p8DG3gIGoP9FBQx{1?7Bw;tD9cv3t-mv zBxfUW{$=Za{@(o*>lT@Zr$ns@tb!+bAK)>Zq7W4ujhbCC1KV}{gvh!fR_2vB8uaE5$o)f=mUejKejC@Hgtr&SVo6~b@ z!N_IQ{BlXpEbE)vidK|$z2h^`U}n^Fj_*ptXPHrV)v?RKyIz>3q2RL c;vNm$7J22zJ;%Yam)Yz8-x