merge upstream changes

Signed-off-by: SoftFever <103989404+SoftFever@users.noreply.github.com>
This commit is contained in:
SoftFever 2023-01-21 00:37:10 +08:00
parent 1bdedb1c47
commit 2492e5d39c
156 changed files with 33597 additions and 65667 deletions

View file

@ -0,0 +1,21 @@
-----BEGIN CERTIFICATE-----
MIIDZTCCAk2gAwIBAgIUV1FckwXElyek1onFnQ9kL7Bk4N8wDQYJKoZIhvcNAQEL
BQAwQjELMAkGA1UEBhMCQ04xIjAgBgNVBAoMGUJCTCBUZWNobm9sb2dpZXMgQ28u
LCBMdGQxDzANBgNVBAMMBkJCTCBDQTAeFw0yMjA0MDQwMzQyMTFaFw0zMjA0MDEw
MzQyMTFaMEIxCzAJBgNVBAYTAkNOMSIwIAYDVQQKDBlCQkwgVGVjaG5vbG9naWVz
IENvLiwgTHRkMQ8wDQYDVQQDDAZCQkwgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IB
DwAwggEKAoIBAQDL3pnDdxGOk5Z6vugiT4dpM0ju+3Xatxz09UY7mbj4tkIdby4H
oeEdiYSZjc5LJngJuCHwtEbBJt1BriRdSVrF6M9D2UaBDyamEo0dxwSaVxZiDVWC
eeCPdELpFZdEhSNTaT4O7zgvcnFsfHMa/0vMAkvE7i0qp3mjEzYLfz60axcDoJLk
p7n6xKXI+cJbA4IlToFjpSldPmC+ynOo7YAOsXt7AYKY6Glz0BwUVzSJxU+/+VFy
/QrmYGNwlrQtdREHeRi0SNK32x1+bOndfJP0sojuIrDjKsdCLye5CSZIvqnbowwW
1jRwZgTBR29Zp2nzCoxJYcU9TSQp/4KZuWNVAgMBAAGjUzBRMB0GA1UdDgQWBBSP
NEJo3GdOj8QinsV8SeWr3US+HjAfBgNVHSMEGDAWgBSPNEJo3GdOj8QinsV8SeWr
3US+HjAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQABlBIT5ZeG
fgcK1LOh1CN9sTzxMCLbtTPFF1NGGA13mApu6j1h5YELbSKcUqfXzMnVeAb06Htu
3CoCoe+wj7LONTFO++vBm2/if6Jt/DUw1CAEcNyqeh6ES0NX8LJRVSe0qdTxPJuA
BdOoo96iX89rRPoxeed1cpq5hZwbeka3+CJGV76itWp35Up5rmmUqrlyQOr/Wax6
itosIzG0MfhgUzU51A2P/hSnD3NDMXv+wUY/AvqgIL7u7fbDKnku1GzEKIkfH8hm
Rs6d8SCU89xyrwzQ0PR853irHas3WrHVqab3P+qNwR0YirL0Qk7Xt/q3O1griNg2
Blbjg3obpHo9
-----END CERTIFICATE-----

View file

@ -0,0 +1 @@
just a test file

View file

@ -17,8 +17,9 @@
"FUNC_PRINT_WITHOUT_SD": false,
"FUNC_ALTER_RESOLUTION": false,
"FUNC_AUTO_SWITCH_FILAMENT": false,
"FUNC_CHAMBER_FAN" : false,
"FUNC_SEND_TO_SDCARD": false
"FUNC_EXTRUSION_CALI": true,
"FUNC_PRINT_ALL" : false,
"FUNC_CHAMBER_FAN" : false
},
"camera_resolution":["720p"],
"bed_temperature_limit": 120,
@ -29,6 +30,7 @@
{
"display_name": "Bambu Lab X1",
"func": {
"FUNC_EXTRUSION_CALI": false,
"FUNC_LOCAL_TUNNEL": false
},
"camera_resolution":["720p","1080p"],
@ -40,6 +42,7 @@
{
"display_name": "Bambu Lab X1 Carbon",
"func": {
"FUNC_EXTRUSION_CALI": false,
"FUNC_LOCAL_TUNNEL": false
},
"model_id": "BL-P001",

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -1,11 +1,11 @@
<svg width="20" height="18" viewBox="0 0 20 18" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M9.08898 10.1857L9.30352 10.6374L9.58898 10.5018V10.1857H9.08898ZM12.3748 10.1857H11.8748V10.5018L12.1602 10.6374L12.3748 10.1857ZM9.58898 2.69759C9.58898 2.06638 10.1007 1.55469 10.7319 1.55469V0.554688C9.54839 0.554688 8.58898 1.5141 8.58898 2.69759H9.58898ZM9.58898 10.1857V2.69759H8.58898V10.1857H9.58898ZM7.39844 13.6503C7.39844 12.3213 8.17616 11.1729 9.30352 10.6374L8.87443 9.73412C7.41154 10.4291 6.39844 11.9209 6.39844 13.6503H7.39844ZM10.7319 16.9837C8.89087 16.9837 7.39844 15.4913 7.39844 13.6503H6.39844C6.39844 16.0436 8.33859 17.9837 10.7319 17.9837V16.9837ZM14.0653 13.6503C14.0653 15.4913 12.5729 16.9837 10.7319 16.9837V17.9837C13.1252 17.9837 15.0653 16.0436 15.0653 13.6503H14.0653ZM12.1602 10.6374C13.2876 11.1729 14.0653 12.3213 14.0653 13.6503H15.0653C15.0653 11.9209 14.0522 10.4291 12.5893 9.73412L12.1602 10.6374ZM11.8748 2.69759V10.1857H12.8748V2.69759H11.8748ZM10.7319 1.55469C11.3631 1.55469 11.8748 2.06638 11.8748 2.69759H12.8748C12.8748 1.5141 11.9154 0.554688 10.7319 0.554688V1.55469Z" fill="#898989"/>
<path d="M1 9.0855C1 7.8533 2.76767 3.91794 3.28007 3.91797C3.79246 3.918 5.48331 8.02917 5.48331 9.0855C5.48331 10.1418 4.81114 11.6037 3.28007 11.6037C1.74899 11.6037 1 10.3177 1 9.0855Z" stroke="#898989"/>
<path d="M2.46231 8.4579C2.3916 8.85061 2.43422 9.73572 3.17033 10.1345" stroke="#898989" stroke-linecap="round"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M11.2772 11.5284C12.222 11.7716 12.9201 12.6293 12.9201 13.65C12.9201 14.8598 11.9394 15.8405 10.7296 15.8405C9.5198 15.8405 8.53906 14.8598 8.53906 13.65C8.53906 12.6293 9.23717 11.7716 10.182 11.5284L10.182 3.2449C10.182 2.94245 10.4272 2.69727 10.7296 2.69727C11.0321 2.69727 11.2772 2.94245 11.2772 3.2449L11.2772 11.5284Z" fill="#FF6F00"/>
<path d="M19.1211 15.8398H16.4358" stroke="#898989" stroke-linecap="round"/>
<path d="M19.1211 12.5547H16.8833" stroke="#C2C2C2" stroke-linecap="round"/>
<path d="M19.1211 9.26953L15.9882 9.26953" stroke="#C2C2C2" stroke-linecap="round"/>
<path d="M19.1211 5.98242L15.9882 5.98242" stroke="#C2C2C2" stroke-linecap="round"/>
<path d="M19.1211 2.69727H15.9882" stroke="#C2C2C2" stroke-linecap="round"/>
<path d="M8.95446 9.80239L9.169 10.254L9.45446 10.1184V9.80239H8.95446ZM12.2403 9.80239H11.7403V10.1184L12.0257 10.254L12.2403 9.80239ZM9.45446 2.31423C9.45446 1.68302 9.96615 1.17133 10.5974 1.17133V0.171329C9.41387 0.171329 8.45446 1.13074 8.45446 2.31423H9.45446ZM9.45446 9.80239V2.31423H8.45446V9.80239H9.45446ZM7.26392 13.2669C7.26392 11.9379 8.04164 10.7896 9.169 10.254L8.73991 9.35076C7.27702 10.0457 6.26392 11.5375 6.26392 13.2669H7.26392ZM10.5974 16.6004C8.75635 16.6004 7.26392 15.1079 7.26392 13.2669H6.26392C6.26392 15.6602 8.20407 17.6004 10.5974 17.6004V16.6004ZM13.9308 13.2669C13.9308 15.1079 12.4384 16.6004 10.5974 16.6004V17.6004C12.9907 17.6004 14.9308 15.6602 14.9308 13.2669H13.9308ZM12.0257 10.254C13.1531 10.7896 13.9308 11.9379 13.9308 13.2669H14.9308C14.9308 11.5375 13.9177 10.0457 12.4548 9.35076L12.0257 10.254ZM11.7403 2.31423V9.80239H12.7403V2.31423H11.7403ZM10.5974 1.17133C11.2286 1.17133 11.7403 1.68302 11.7403 2.31423H12.7403C12.7403 1.13074 11.7809 0.171329 10.5974 0.171329V1.17133Z" fill="#898989"/>
<path d="M0.867188 8.70227C0.867188 7.47007 2.63486 3.53471 3.14725 3.53474C3.65965 3.53477 5.3505 7.64594 5.3505 8.70227C5.3505 9.7586 4.67833 11.2204 3.14725 11.2204C1.61618 11.2204 0.867188 9.93448 0.867188 8.70227Z" stroke="#898989"/>
<path d="M2.32962 8.0752C2.25892 8.46791 2.30153 9.35302 3.03765 9.75181" stroke="#898989" stroke-linecap="round"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M11.1434 11.1454C12.0882 11.3886 12.7863 12.2462 12.7863 13.267C12.7863 14.4768 11.8055 15.4575 10.5957 15.4575C9.38593 15.4575 8.4052 14.4768 8.4052 13.267C8.4052 12.2462 9.10331 11.3886 10.0481 11.1454L10.0481 2.86189C10.0481 2.55944 10.2933 2.31425 10.5957 2.31425C10.8982 2.31425 11.1434 2.55944 11.1434 2.86189L11.1434 11.1454Z" fill="#D01B1B"/>
<path d="M18.9883 15.4575H16.303" stroke="#898989" stroke-linecap="round"/>
<path d="M18.9883 12.1717H16.7506" stroke="#C2C2C2" stroke-linecap="round"/>
<path d="M18.9883 8.88588L15.8555 8.88588" stroke="#C2C2C2" stroke-linecap="round"/>
<path d="M18.9883 5.60007L15.8555 5.60007" stroke="#C2C2C2" stroke-linecap="round"/>
<path d="M18.9883 2.31426H15.8555" stroke="#C2C2C2" stroke-linecap="round"/>
</svg>

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.2 KiB

Before After
Before After

View file

@ -0,0 +1,16 @@
<svg width="128" height="149" viewBox="0 0 128 149" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M82.7793 43.5141L79.8925 40.6274L82.7793 37.7406L85.666 40.6274L82.7793 43.5141ZM127.994 92.228L125.107 95.1148L122.221 92.228L125.107 89.3413L127.994 92.228ZM82.2793 40.6274V36.1917H83.2793V40.6274H82.2793ZM85.7793 32.6917H112.531V33.6917H85.7793V32.6917ZM116.031 36.1917V89.228H115.031V36.1917H116.031ZM118.531 91.728H125.107V92.728H118.531V91.728ZM116.031 89.228C116.031 90.6087 117.15 91.728 118.531 91.728V92.728C116.598 92.728 115.031 91.161 115.031 89.228H116.031ZM112.531 32.6917C114.464 32.6917 116.031 34.2587 116.031 36.1917H115.031C115.031 34.811 113.912 33.6917 112.531 33.6917V32.6917ZM82.2793 36.1917C82.2793 34.2587 83.8463 32.6917 85.7793 32.6917V33.6917C84.3986 33.6917 83.2793 34.811 83.2793 36.1917H82.2793Z" fill="#828280"/>
<path d="M41.979 43.0337L39.0923 40.147L41.979 37.2602L44.8658 40.147L41.979 43.0337ZM127.994 3.65353L125.108 6.54028L122.221 3.65353L125.108 0.766776L127.994 3.65353ZM41.479 40.147V6.65353H42.479V40.147H41.479ZM44.979 3.15353H125.108V4.15353H44.979V3.15353ZM41.479 6.65353C41.479 4.72053 43.046 3.15353 44.979 3.15353V4.15353C43.5983 4.15353 42.479 5.27282 42.479 6.65353H41.479Z" fill="#828280"/>
<path d="M0.76416 54.0911L0.76416 45.126C0.76416 44.5737 1.21188 44.126 1.76416 44.126L69.2315 44.126C69.7838 44.126 70.2315 44.5737 70.2315 45.126L70.2315 55.3035" stroke="#00AE42" stroke-width="1.5" stroke-linecap="round"/>
<path d="M73.7192 55.3035L73.7192 45.126C73.7192 44.5737 74.167 44.126 74.7192 44.126L96.1852 44.126C96.7374 44.126 97.1852 44.5737 97.1852 45.126L97.1852 55.3035" stroke="#00AE42" stroke-width="1.5" stroke-linecap="round"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M53.8234 68.1978C50.7459 68.1978 48.2511 70.6926 48.2511 73.7701V111.82L46.8593 112.481C41.3628 115.092 37.571 120.691 37.571 127.17C37.571 136.146 44.8474 143.423 53.8234 143.423C62.7993 143.423 70.0757 136.146 70.0757 127.17C70.0757 120.691 66.2839 115.092 60.7874 112.481L59.3956 111.82V73.7701C59.3956 70.6926 56.9008 68.1978 53.8234 68.1978ZM43.3755 73.7701C43.3755 67.9999 48.0532 63.3223 53.8234 63.3223C59.5935 63.3223 64.2712 67.9999 64.2712 73.7701V108.803C70.6464 112.437 74.9513 119.299 74.9513 127.17C74.9513 138.839 65.492 148.298 53.8234 148.298C42.1547 148.298 32.6954 138.839 32.6954 127.17C32.6954 119.299 37.0003 112.437 43.3755 108.803V73.7701Z" fill="#898989"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M15.546 77.9488C15.9131 77.6886 16.5964 77.283 17.4922 77.283C18.4249 77.2831 19.1237 77.7247 19.4862 77.9963C19.8951 78.3027 20.2496 78.6782 20.5447 79.0328C21.1408 79.7491 21.7489 80.6916 22.339 81.7202C23.5319 83.7997 24.8404 86.5665 26.0477 89.4434C27.2588 92.3291 28.3955 95.3907 29.2342 98.0802C30.04 100.664 30.6719 103.211 30.6719 104.915C30.6719 107.942 29.7247 111.525 27.6384 114.413C25.4972 117.377 22.1188 119.63 17.4921 119.63C12.995 119.63 9.522 117.707 7.22741 114.825C4.98372 112.008 3.93772 108.377 3.93772 104.915C3.93772 103.001 4.58779 100.359 5.43962 97.7004C6.31841 94.9576 7.50745 91.9128 8.76947 89.0746C10.028 86.2443 11.3881 83.5543 12.6224 81.5392C13.2332 80.5421 13.8603 79.6319 14.4717 78.9412C14.7748 78.5987 15.1352 78.2399 15.546 77.9488ZM10.0827 99.188C9.2405 101.817 8.81327 103.826 8.81327 104.915C8.81327 107.461 9.59314 109.969 11.0415 111.788C12.439 113.543 14.5243 114.755 17.4921 114.755C20.3302 114.755 22.3227 113.445 23.6864 111.558C25.1049 109.594 25.7963 107.039 25.7963 104.915C25.7963 104.045 25.3977 102.155 24.5797 99.5317C23.7947 97.0144 22.7142 94.0994 21.5521 91.3302C20.3862 88.5523 19.1653 85.9861 18.1099 84.1463C17.8706 83.7291 17.6489 83.3655 17.4473 83.0554C17.2441 83.3491 17.021 83.6924 16.78 84.0859C15.6957 85.8561 14.4327 88.3383 13.2244 91.0556C12.0196 93.7652 10.8979 96.6436 10.0827 99.188Z" fill="#898989"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.9403 99.4588C15.2653 99.6973 16.146 100.965 15.9075 102.29C15.7929 102.926 15.7611 104.097 16.0986 105.249C16.4227 106.355 17.0363 107.301 18.1215 107.889C19.3053 108.53 19.745 110.01 19.1037 111.194C18.4624 112.377 16.9829 112.817 15.7991 112.176C13.2953 110.819 12.0105 108.636 11.4197 106.62C10.8423 104.649 10.8789 102.704 11.1091 101.426C11.3477 100.101 12.6152 99.2202 13.9403 99.4588Z" fill="#898989"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M56.4827 116.827C61.0891 118.012 64.4927 122.194 64.4927 127.17C64.4927 133.069 59.7111 137.851 53.8127 137.851C47.9142 137.851 43.1326 133.069 43.1326 127.17C43.1326 122.194 46.5362 118.012 51.1426 116.827L51.1426 76.4401C51.1426 74.9655 52.338 73.7701 53.8127 73.7701C55.2873 73.7701 56.4827 74.9655 56.4827 76.4401L56.4827 116.827Z" fill="#C2C2C2"/>
<path d="M64.4927 127.17C64.4927 133.069 59.7111 137.85 53.8127 137.85C47.9142 137.85 43.1326 133.069 43.1326 127.17C43.1326 121.272 47.9142 116.49 53.8127 116.49C59.7111 116.49 64.4927 121.272 64.4927 127.17Z" fill="#00AE42"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M97.1825 137.851C97.1825 136.504 96.0911 135.413 94.7447 135.413H81.6524C80.306 135.413 79.2146 136.504 79.2146 137.851C79.2146 139.197 80.306 140.289 81.6524 140.289H94.7447C96.0911 140.289 97.1825 139.197 97.1825 137.851Z" fill="#898989"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M97.1825 121.831C97.1825 120.485 96.0911 119.393 94.7447 119.393H83.8344C82.4881 119.393 81.3967 120.485 81.3967 121.831C81.3967 123.177 82.4881 124.269 83.8344 124.269H94.7447C96.0911 124.269 97.1825 123.177 97.1825 121.831Z" fill="#898989"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M97.1825 105.81C97.1825 107.157 96.0911 108.248 94.7447 108.248L79.4703 108.248C78.124 108.248 77.0326 107.157 77.0326 105.81C77.0326 104.464 78.124 103.373 79.4703 103.373L94.7447 103.373C96.0911 103.373 97.1825 104.464 97.1825 105.81Z" fill="#898989"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M97.1825 89.7905C97.1825 91.1368 96.0911 92.2283 94.7447 92.2283L79.4703 92.2283C78.124 92.2283 77.0326 91.1368 77.0326 89.7905C77.0326 88.4441 78.124 87.3527 79.4703 87.3527L94.7447 87.3527C96.0911 87.3527 97.1825 88.4441 97.1825 89.7905Z" fill="#898989"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M97.1825 73.7704C97.1825 72.424 96.0911 71.3326 94.7447 71.3326H79.4703C78.124 71.3326 77.0326 72.424 77.0326 73.7704C77.0326 75.1167 78.124 76.2081 79.4703 76.2081H94.7447C96.0911 76.2081 97.1825 75.1167 97.1825 73.7704Z" fill="#C2C2C2"/>
</svg>

After

Width:  |  Height:  |  Size: 6.3 KiB

View file

@ -0,0 +1,6 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M1.30078 2.00078C1.30078 1.61418 1.61418 1.30078 2.00078 1.30078H6.00078C6.38738 1.30078 6.70078 1.61418 6.70078 2.00078C6.70078 2.38738 6.38738 2.70078 6.00078 2.70078H2.70078V6.00078C2.70078 6.38738 2.38738 6.70078 2.00078 6.70078C1.61418 6.70078 1.30078 6.38738 1.30078 6.00078V2.00078Z" fill="white" fill-opacity="0.88"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M14.0008 9.30078C14.3874 9.30078 14.7008 9.61418 14.7008 10.0008V14.0008C14.7008 14.3874 14.3874 14.7008 14.0008 14.7008H10.0008C9.61418 14.7008 9.30078 14.3874 9.30078 14.0008C9.30078 13.6142 9.61418 13.3008 10.0008 13.3008H13.3008V10.0008C13.3008 9.61418 13.6142 9.30078 14.0008 9.30078Z" fill="white" fill-opacity="0.88"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M13.9982 1.30078H14.0008C14.3874 1.30078 14.7008 1.61418 14.7008 2.00078V6.00078C14.7008 6.38738 14.3874 6.70078 14.0008 6.70078C13.6142 6.70078 13.3008 6.38738 13.3008 6.00078V3.68813L10.1598 6.82909C9.88645 7.10246 9.44324 7.10246 9.16987 6.82909C8.8965 6.55572 8.8965 6.11251 9.16987 5.83914L12.3082 2.70078H10.0008C9.61418 2.70078 9.30078 2.38738 9.30078 2.00078C9.30078 1.61418 9.61418 1.30078 10.0008 1.30078H13.9982Z" fill="white" fill-opacity="0.88"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M6.82909 10.1618C7.10246 9.8884 7.10246 9.44519 6.82909 9.17182C6.55572 8.89846 6.11251 8.89846 5.83914 9.17182L2.70078 12.3102V10.0008C2.70078 9.61418 2.38738 9.30078 2.00078 9.30078C1.61418 9.30078 1.30078 9.61418 1.30078 10.0008V14.0001V14.0008C1.30078 14.3874 1.61418 14.7008 2.00078 14.7008H6.00078C6.38738 14.7008 6.70078 14.3874 6.70078 14.0008C6.70078 13.6142 6.38738 13.3008 6.00078 13.3008H3.69008L6.82909 10.1618Z" fill="white" fill-opacity="0.88"/>
</svg>

After

Width:  |  Height:  |  Size: 1.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 MiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.6 KiB

View file

@ -0,0 +1,3 @@
<svg width="6" height="6" viewBox="0 0 6 6" fill="none" xmlns="http://www.w3.org/2000/svg">
<circle cx="3" cy="3" r="3" fill="#00AE42"/>
</svg>

After

Width:  |  Height:  |  Size: 144 B

View file

@ -1,7 +1,7 @@
{
"name": "Bambulab",
"url": "http://www.bambulab.com/Parameters/vendor/BBL.json",
"version": "01.04.01.01",
"version": "01.04.01.04",
"force_update": "0",
"description": "the initial version of BBL configurations",
"machine_model_list": [
@ -201,6 +201,18 @@
"name": "Bambu PLA Basic @base",
"sub_path": "filament/Bambu PLA Basic @base.json"
},
{
"name": "Bambu PLA Tough @base",
"sub_path": "filament/Bambu PLA Tough @base.json"
},
{
"name": "Bambu PLA Marble @base",
"sub_path": "filament/Bambu PLA Marble @base.json"
},
{
"name": "Bambu PLA Sparkle @base",
"sub_path": "filament/Bambu PLA Sparkle @base.json"
},
{
"name": "Bambu PLA Impact @base",
"sub_path": "filament/Bambu PLA Impact @base.json"
@ -373,6 +385,34 @@
"name": "Bambu PLA Basic @BBL X1",
"sub_path": "filament/Bambu PLA Basic @BBL X1.json"
},
{
"name": "Bambu PLA Tough @BBL X1C",
"sub_path": "filament/Bambu PLA Tough @BBL X1C.json"
},
{
"name": "Bambu PLA Tough @BBL X1C 0.2 nozzle",
"sub_path": "filament/Bambu PLA Tough @BBL X1C 0.2 nozzle.json"
},
{
"name": "Bambu PLA Tough @BBL X1",
"sub_path": "filament/Bambu PLA Tough @BBL X1.json"
},
{
"name": "Bambu PLA Marble @BBL X1",
"sub_path": "filament/Bambu PLA Marble @BBL X1.json"
},
{
"name": "Bambu PLA Marble @BBL X1C",
"sub_path": "filament/Bambu PLA Marble @BBL X1C.json"
},
{
"name": "Bambu PLA Sparkle @BBL X1",
"sub_path": "filament/Bambu PLA Sparkle @BBL X1.json"
},
{
"name": "Bambu PLA Sparkle @BBL X1C",
"sub_path": "filament/Bambu PLA Sparkle @BBL X1C.json"
},
{
"name": "Bambu ABS @BBL X1C",
"sub_path": "filament/Bambu ABS @BBL X1C.json"
@ -469,11 +509,27 @@
"name":"Bambu PLA Basic @BBL P1P",
"sub_path":"filament/P1P/Bambu PLA Basic @BBL P1P.json"
},
{
"name":"Bambu PLA Tough @BBL P1P 0.2 nozzle",
"sub_path":"filament/P1P/Bambu PLA Tough @BBL P1P 0.2 nozzle.json"
},
{
"name":"Bambu PLA Tough @BBL P1P",
"sub_path":"filament/P1P/Bambu PLA Tough @BBL P1P.json"
},
{
"name":"Bambu PLA Marble @BBL P1P",
"sub_path":"filament/P1P/Bambu PLA Marble @BBL P1P.json"
},
{
"name":"Bambu PLA Sparkle @BBL P1P",
"sub_path":"filament/P1P/Bambu PLA Sparkle @BBL P1P.json"
},
{
"name": "Bambu ABS @BBL P1P",
"sub_path": "filament/P1P/Bambu ABS @BBL P1P.json"
},
{
{
"name": "Bambu PC @BBL P1P",
"sub_path": "filament/P1P/Bambu PC @BBL P1P.json"
},

View file

@ -0,0 +1,16 @@
{
"type": "filament",
"setting_id": "GFSA07_01",
"name": "Bambu PLA Marble @BBL X1",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Marble @base",
"slow_down_layer_time": [
"8"
],
"compatible_printers": [
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle"
]
}

View file

@ -0,0 +1,13 @@
{
"type": "filament",
"setting_id": "GFSA07_00",
"name": "Bambu PLA Marble @BBL X1C",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Marble @base",
"compatible_printers": [
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle"
]
}

View file

@ -0,0 +1,23 @@
{
"type": "filament",
"filament_id": "GFA07",
"name": "Bambu PLA Marble @base",
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_pla",
"filament_vendor": [
"Bambu Lab"
],
"filament_cost": [
"29.99"
],
"filament_density": [
"1.22"
],
"filament_flow_ratio": [
"0.98"
],
"filament_max_volumetric_speed": [
"12"
]
}

View file

@ -0,0 +1,16 @@
{
"type": "filament",
"setting_id": "GFSA08_01",
"name": "Bambu PLA Sparkle @BBL X1",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Sparkle @base",
"slow_down_layer_time": [
"8"
],
"compatible_printers": [
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle"
]
}

View file

@ -0,0 +1,13 @@
{
"type": "filament",
"setting_id": "GFSA08_00",
"name": "Bambu PLA Sparkle @BBL X1C",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Sparkle @base",
"compatible_printers": [
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle"
]
}

View file

@ -0,0 +1,23 @@
{
"type": "filament",
"filament_id": "GFA08",
"name": "Bambu PLA Sparkle @base",
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_pla",
"filament_vendor": [
"Bambu Lab"
],
"filament_cost": [
"29.99"
],
"filament_density": [
"1.26"
],
"filament_flow_ratio": [
"0.98"
],
"filament_max_volumetric_speed": [
"12"
]
}

View file

@ -0,0 +1,19 @@
{
"type": "filament",
"setting_id": "GFSA09_01",
"name": "Bambu PLA Tough @BBL X1",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Tough @base",
"filament_max_volumetric_speed": [
"21"
],
"slow_down_layer_time": [
"8"
],
"compatible_printers": [
"Bambu Lab X1 0.4 nozzle",
"Bambu Lab X1 0.6 nozzle",
"Bambu Lab X1 0.8 nozzle"
]
}

View file

@ -0,0 +1,15 @@
{
"type": "filament",
"setting_id": "GFSA09_00",
"name": "Bambu PLA Tough @BBL X1C 0.2 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Tough @base",
"filament_max_volumetric_speed": [
"2"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.2 nozzle",
"Bambu Lab X1 0.2 nozzle"
]
}

View file

@ -0,0 +1,16 @@
{
"type": "filament",
"setting_id": "GFSA09_02",
"name": "Bambu PLA Tough @BBL X1C",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Tough @base",
"filament_max_volumetric_speed": [
"21"
],
"compatible_printers": [
"Bambu Lab X1 Carbon 0.4 nozzle",
"Bambu Lab X1 Carbon 0.6 nozzle",
"Bambu Lab X1 Carbon 0.8 nozzle"
]
}

View file

@ -0,0 +1,20 @@
{
"type": "filament",
"filament_id": "GFA09",
"name": "Bambu PLA Tough @base",
"from": "system",
"instantiation": "false",
"inherits": "fdm_filament_pla",
"filament_vendor": [
"Bambu Lab"
],
"filament_cost": [
"28.99"
],
"filament_flow_ratio": [
"0.98"
],
"filament_density": [
"1.26"
]
}

View file

@ -0,0 +1,34 @@
{
"type": "filament",
"setting_id": "GFSA07_10",
"name": "Bambu PLA Marble @BBL P1P",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Marble @base",
"hot_plate_temp" : [
"65"
],
"hot_plate_temp_initial_layer" : [
"65"
],
"textured_plate_temp" : [
"65"
],
"textured_plate_temp_initial_layer" : [
"65"
],
"fan_min_speed": [
"50"
],
"fan_cooling_layer_time": [
"80"
],
"slow_down_layer_time": [
"8"
],
"compatible_printers": [
"Bambu Lab P1P 0.4 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle"
]
}

View file

@ -0,0 +1,34 @@
{
"type": "filament",
"setting_id": "GFSA08_10",
"name": "Bambu PLA Sparkle @BBL P1P",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Marble @base",
"hot_plate_temp" : [
"65"
],
"hot_plate_temp_initial_layer" : [
"65"
],
"textured_plate_temp" : [
"65"
],
"textured_plate_temp_initial_layer" : [
"65"
],
"fan_min_speed": [
"50"
],
"fan_cooling_layer_time": [
"80"
],
"slow_down_layer_time": [
"8"
],
"compatible_printers": [
"Bambu Lab P1P 0.4 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle"
]
}

View file

@ -0,0 +1,32 @@
{
"type": "filament",
"setting_id": "GFSA09_10",
"name": "Bambu PLA Tough @BBL P1P 0.2 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Tough @base",
"filament_max_volumetric_speed": [
"2"
],
"hot_plate_temp" : [
"65"
],
"hot_plate_temp_initial_layer" : [
"65"
],
"textured_plate_temp" : [
"65"
],
"textured_plate_temp_initial_layer" : [
"65"
],
"fan_min_speed": [
"50"
],
"fan_cooling_layer_time": [
"80"
],
"compatible_printers": [
"Bambu Lab P1P 0.2 nozzle"
]
}

View file

@ -0,0 +1,37 @@
{
"type": "filament",
"setting_id": "GFSA09_11",
"name": "Bambu PLA Tough @BBL P1P",
"from": "system",
"instantiation": "true",
"inherits": "Bambu PLA Tough @base",
"filament_max_volumetric_speed": [
"21"
],
"slow_down_layer_time": [
"8"
],
"hot_plate_temp" : [
"65"
],
"hot_plate_temp_initial_layer" : [
"65"
],
"textured_plate_temp" : [
"65"
],
"textured_plate_temp_initial_layer" : [
"65"
],
"fan_min_speed": [
"50"
],
"fan_cooling_layer_time": [
"80"
],
"compatible_printers": [
"Bambu Lab P1P 0.4 nozzle",
"Bambu Lab P1P 0.6 nozzle",
"Bambu Lab P1P 0.8 nozzle"
]
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -27,7 +27,6 @@
"deretraction_speed": [
"0"
],
"machine_end_gcode": "M400 ; wait for buffer to clear\nG92 E0 ; zero the extruder\nG1 E-4.0 F3600 ; retract \nG91\nG1 Z3;\nM104 S0 ; turn off hotend\nM140 S0 ; turn off bed\nM106 S0 ; turn off fan\nG90\nG0 X110 Y200 F3600",
"extruder_colour": [
"#018001"
],
@ -156,7 +155,8 @@
"silent_mode": "0",
"single_extruder_multi_material": "1",
"change_filament_gcode": "M620 S[next_extruder]A\nM204 S9000\n{if toolchange_count > 1}\nG17\nG2 Z{max_layer_z + 0.4} I0.86 J0.86 P1 F10000 ; spiral lift a little from second lift\n{endif}\nG1 Z{max_layer_z + 3.0} F1200\n\nG1 X70 F21000\nG1 Y245\nG1 Y265 F3000\nM400\nM106 P1 S0\nM106 P2 S0\n{if old_filament_temp > 142 && next_extruder < 255}M104 S[old_filament_temp]{endif}\nG1 X90 F3000\nG1 Y255 F4000\nG1 X100 F5000\nG1 X120 F15000\n\nG1 X20 Y50 F21000\nG1 Y-3\nM620.1 X F21000\nT[next_extruder]\nM620.1 E F{new_filament_e_feedrate}\n; always use highest temperature to flush\nM400\nM109 S[nozzle_temperature_range_high]\n\n{if next_extruder < 255}\nM400\n\nG92 E0\n{if flush_length_1 > 1}\n; FLUSH_START\n{if flush_length_1 > 23.7}\nG1 E23.7 F{old_filament_e_feedrate} ; do not need pulsatile flushing for start part\nG1 E{(flush_length_1 - 23.7) * 0.02} F50\nG1 E{(flush_length_1 - 23.7) * 0.23} F{old_filament_e_feedrate}\nG1 E{(flush_length_1 - 23.7) * 0.02} F50\nG1 E{(flush_length_1 - 23.7) * 0.23} F{new_filament_e_feedrate}\nG1 E{(flush_length_1 - 23.7) * 0.02} F50\nG1 E{(flush_length_1 - 23.7) * 0.23} F{new_filament_e_feedrate}\nG1 E{(flush_length_1 - 23.7) * 0.02} F50\nG1 E{(flush_length_1 - 23.7) * 0.23} F{new_filament_e_feedrate}\n{else}\nG1 E{flush_length_1} F{old_filament_e_feedrate}\n{endif}\n; FLUSH_END\nG1 E-[old_retract_length_toolchange] F1800\nG1 E[old_retract_length_toolchange] F300\n{endif}\n\n{if flush_length_2 > 1}\n; FLUSH_START\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\nG1 E{flush_length_2 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_2 * 0.02} F50\n; FLUSH_END\nG1 E-[new_retract_length_toolchange] F1800\nG1 E[new_retract_length_toolchange] F300\n{endif}\n\n{if flush_length_3 > 1}\n; FLUSH_START\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\nG1 E{flush_length_3 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_3 * 0.02} F50\n; FLUSH_END\nG1 E-[new_retract_length_toolchange] F1800\nG1 E[new_retract_length_toolchange] F300\n{endif}\n\n{if flush_length_4 > 1}\n; FLUSH_START\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\nG1 E{flush_length_4 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_4 * 0.02} F50\n; FLUSH_END\n{endif}\n; FLUSH_START\nM400\nM109 S[new_filament_temp]\nG1 E2 F{new_filament_e_feedrate} ;Compensate for filament spillage during waiting temperature\n; FLUSH_END\nM400\nG92 E0\nG1 E-[new_retract_length_toolchange] F1800\nM106 P1 S255\nM400 S3\nG1 X80 F15000\nG1 X60 F15000\nG1 X80 F15000\nG1 X60 F15000; shake to put down garbage\n\nG1 X70 F5000\nG1 X90 F3000\nG1 Y255 F4000\nG1 X100 F5000\nG1 Y265 F5000\nG1 X70 F10000\nG1 X100 F5000\nG1 X70 F10000\nG1 X100 F5000\nG1 X165 F15000; wipe and shake\nG1 Y256 ; move Y to aside, prevent collision\nM400\nG1 Z[z_after_toolchange] F3000\n{if layer_z <= (initial_layer_print_height + 0.001)}\nM204 S[initial_layer_acceleration]\n{else}\nM204 S[default_acceleration]\n{endif}\n{else}\nG1 X[x_after_toolchange] Y[y_after_toolchange] Z[z_after_toolchange] F12000\n{endif}\nM621 S[next_extruder]A",
"layer_change_gcode": "; layer num/total_layer_count: {layer_num+1}/[total_layer_count]\nM622.1 S1 ; for prev firware, default turned on\nM1002 judge_flag timelapse_record_flag\nM622 J1\n{if timelapse_type == 0} ; timelapse without wipe tower\nM971 S11 C10 O0\n{elsif timelapse_type == 1} ; timelapse with wipe tower\nG92 E0\nG1 E-[retraction_length] F1800\nG17\nG2 Z{layer_z + 0.4} I0.86 J0.86 P1 F10000 ; spiral lift a little\nG1 X65 Y245 F12000 ; move to safe pos\nG17\nG2 Z{layer_z} I0.86 J0.86 P1 F10000\nG1 Y265 F3000\nM400 P100\nM971 S11 C10 O0\nG92 E0\nG1 E[retraction_length] F300\nG1 X100 F5000\nG1 Y255\n{endif}\nM623",
"layer_change_gcode": "; layer num/total_layer_count: {layer_num+1}/[total_layer_count]\nM622.1 S1 ; for prev firware, default turned on\nM1002 judge_flag timelapse_record_flag\nM622 J1\n{if timelapse_type == 0} ; timelapse without wipe tower\nM971 S11 C10 O0\n{elsif timelapse_type == 1} ; timelapse with wipe tower\nG92 E0\nG1 E-[retraction_length] F1800\nG17\nG2 Z{layer_z + 0.4} I0.86 J0.86 P1 F10000 ; spiral lift a little\nG1 X65 Y245 F12000 ; move to safe pos\nG17\nG2 Z{layer_z} I0.86 J0.86 P1 F10000\nG1 Y265 F3000\nM400 P100\nM971 S11 C10 O0\nG92 E0\nG1 E[retraction_length] F300\nG1 X100 F5000\nG1 Y255\n{endif}\nM623\n; update layer progress\nM73 L{layer_num+1}\nM991 S0 P{layer_num} ;notify layer change",
"machine_end_gcode": ";===== date: 20230110 =====================\n{if timelapse_type == 0}\nM991 S0 P-1 ;end traditional timelapse immediately\n{endif}\nM400 ; wait for buffer to clear\nG92 E0 ; zero the extruder\nG1 E-0.8 F1800 ; retract\nG1 Z{max_layer_z + 0.5} F900 ; lower z a little\nG1 X65 Y245 F12000 ; move to safe pos \nG1 Y265 F3000\n{if timelapse_type == 1}\nM991 S0 P-1 ;end smooth timelapse at safe pos\nM400 S2 ;wait for last picture to be taken\n{endif}\n\nG1 X65 Y245 F12000\nG1 Y265 F3000\nM140 S0 ; turn off bed\nM106 S0 ; turn off fan\nM106 P2 S0 ; turn off remote part cooling fan\nM106 P3 S0 ; turn off chamber cooling fan\n\nG1 X100 F12000 ; wipe\n; pull back filament to AMS\nM620 S255\nG1 X20 Y50 F12000\nG1 Y-3\nT255\nG1 X65 F12000\nG1 Y265\nG1 X100 F12000 ; wipe\nM621 S255\nM104 S0 ; turn off hotend\n\nM400 ; wait all motion done\nM17 S\nM17 Z0.4 ; lower z motor current to reduce impact if there is something in the bottom\n{if (max_layer_z + 100.0) < 250}\n G1 Z{max_layer_z + 100.0} F600\n G1 Z{max_layer_z +98.0}\n{else}\n G1 Z250 F600\n G1 Z248\n{endif}\nM400 P100\nM17 R ; restore z current\n\nG90\nG1 X128 Y250 F3600\n\nM220 S100 ; Reset feedrate magnitude\nM201.2 K1.0 ; Reset acc magnitude\nM73.2 R1.0 ;Reset left time magnitude\nM1002 set_gcode_claim_speed_level : 0\n\nM17 X0.8 Y0.8 Z0.5 ; lower motor current to 45% power\n",
"machine_pause_gcode": "M400 U1\n",
"wipe": [
"1"