diff --git a/resources/flush/flush_data_dual_highflow.txt b/resources/flush/flush_data_dual_highflow.txt new file mode 100644 index 0000000..c535521 --- /dev/null +++ b/resources/flush/flush_data_dual_highflow.txt @@ -0,0 +1,94 @@ +colors +#000000 #FFFFFF #545454 #8E9089 #C12E1F #F4EE2A #0A2989 #FF6A13 #0086D6 #F7E6DE #00AE42 +src dst flush +#000000 #FFFFFF 900 +#000000 #545454 330 +#000000 #8E9089 570 +#000000 #C12E1F 660 +#000000 #F4EE2A 900 +#000000 #0A2989 480 +#000000 #FF6A13 900 +#000000 #0086D6 630 +#000000 #F7E6DE 900 +#000000 #00AE42 660 +#FFFFFF #000000 90 +#FFFFFF #545454 120 +#FFFFFF #F4EE2A 120 +#FFFFFF #0A2989 150 +#FFFFFF #FF6A13 120 +#FFFFFF #00AE42 120 +#545454 #000000 90 +#545454 #FFFFFF 780 +#545454 #8E9089 210 +#545454 #C12E1F 270 +#545454 #F4EE2A 390 +#545454 #0A2989 120 +#545454 #FF6A13 360 +#545454 #0086D6 300 +#545454 #F7E6DE 780 +#545454 #00AE42 330 +#8E9089 #000000 210 +#8E9089 #FFFFFF 450 +#8E9089 #545454 180 +#8E9089 #F4EE2A 360 +#8E9089 #0A2989 210 +#8E9089 #FF6A13 300 +#8E9089 #F7E6DE 450 +#8E9089 #00AE42 210 +#C12E1F #000000 120 +#C12E1F #FFFFFF 720 +#C12E1F #545454 270 +#C12E1F #8E9089 480 +#C12E1F #F4EE2A 540 +#C12E1F #0A2989 300 +#C12E1F #FF6A13 330 +#C12E1F #F7E6DE 690 +#C12E1F #00AE42 600 +#F4EE2A #000000 150 +#F4EE2A #FFFFFF 870 +#F4EE2A #545454 330 +#F4EE2A #0A2989 330 +#F4EE2A #FF6A13 150 +#F4EE2A #0086D6 420 +#F4EE2A #F7E6DE 870 +#0A2989 #000000 90 +#0A2989 #FFFFFF 630 +#0A2989 #545454 150 +#0A2989 #8E9089 390 +#0A2989 #C12E1F 450 +#0A2989 #F4EE2A 510 +#0A2989 #FF6A13 480 +#0A2989 #0086D6 300 +#0A2989 #F7E6DE 630 +#0A2989 #00AE42 660 +#FF6A13 #000000 90 +#FF6A13 #FFFFFF 570 +#FF6A13 #545454 180 +#FF6A13 #F4EE2A 390 +#FF6A13 #0A2989 270 +#FF6A13 #0086D6 360 +#FF6A13 #F7E6DE 330 +#FF6A13 #00AE42 300 +#0086D6 #000000 120 +#0086D6 #FFFFFF 600 +#0086D6 #545454 150 +#0086D6 #8E9089 390 +#0086D6 #C12E1F 420 +#0086D6 #F4EE2A 480 +#0086D6 #0A2989 120 +#0086D6 #FF6A13 330 +#0086D6 #F7E6DE 450 +#0086D6 #00AE42 180 +#F7E6DE #000000 90 +#F7E6DE #545454 120 +#F7E6DE #F4EE2A 120 +#F7E6DE #0A2989 150 +#F7E6DE #FF6A13 120 +#F7E6DE #00AE42 120 +#00AE42 #000000 90 +#00AE42 #FFFFFF 630 +#00AE42 #545454 210 +#00AE42 #F4EE2A 360 +#00AE42 #0A2989 210 +#00AE42 #0086D6 360 +#00AE42 #F7E6DE 630 \ No newline at end of file diff --git a/resources/flush/flush_data_dual_standard.txt b/resources/flush/flush_data_dual_standard.txt new file mode 100644 index 0000000..f773934 --- /dev/null +++ b/resources/flush/flush_data_dual_standard.txt @@ -0,0 +1,99 @@ +colors +#000000 #FFFFFF #545454 #8E9089 #C12E1F #F4EE2A #0A2989 #FF6A13 #0086D6 #F7E6DE #00AE42 +src dst flush +#000000 #FFFFFF 900 +#000000 #545454 270 +#000000 #8E9089 510 +#000000 #C12E1F 900 +#000000 #F4EE2A 900 +#000000 #0A2989 360 +#000000 #FF6A13 900 +#000000 #0086D6 630 +#000000 #F7E6DE 900 +#000000 #00AE42 780 +#FFFFFF #000000 90 +#FFFFFF #545454 90 +#FFFFFF #8E9089 180 +#FFFFFF #F4EE2A 150 +#FFFFFF #0A2989 60 +#FFFFFF #FF6A13 150 +#FFFFFF #00AE42 150 +#545454 #000000 90 +#545454 #8E9089 240 +#545454 #C12E1F 360 +#545454 #F4EE2A 390 +#545454 #0A2989 180 +#545454 #FF6A13 300 +#545454 #0086D6 270 +#545454 #F7E6DE 330 +#545454 #00AE42 390 +#8E9089 #000000 210 +#8E9089 #FFFFFF 390 +#8E9089 #545454 150 +#8E9089 #F4EE2A 330 +#8E9089 #0A2989 330 +#8E9089 #F7E6DE 390 +#8E9089 #00AE42 240 +#C12E1F #000000 90 +#C12E1F #FFFFFF 780 +#C12E1F #545454 360 +#C12E1F #8E9089 510 +#C12E1F #F4EE2A 600 +#C12E1F #0A2989 420 +#C12E1F #FF6A13 390 +#C12E1F #0086D6 450 +#C12E1F #F7E6DE 600 +#C12E1F #00AE42 510 +#F4EE2A #000000 90 +#F4EE2A #FFFFFF 690 +#F4EE2A #545454 390 +#F4EE2A #8E9089 480 +#F4EE2A #0A2989 390 +#F4EE2A #FF6A13 180 +#F4EE2A #0086D6 450 +#F4EE2A #F7E6DE 690 +#0A2989 #000000 90 +#0A2989 #FFFFFF 630 +#0A2989 #545454 300 +#0A2989 #8E9089 450 +#0A2989 #C12E1F 450 +#0A2989 #F4EE2A 510 +#0A2989 #FF6A13 420 +#0A2989 #0086D6 330 +#0A2989 #F7E6DE 630 +#0A2989 #00AE42 390 +#FF6A13 #000000 90 +#FF6A13 #FFFFFF 420 +#FF6A13 #545454 90 +#FF6A13 #8E9089 360 +#FF6A13 #C12E1F 180 +#FF6A13 #F4EE2A 180 +#FF6A13 #0A2989 210 +#FF6A13 #0086D6 360 +#FF6A13 #F7E6DE 420 +#FF6A13 #00AE42 240 +#0086D6 #000000 90 +#0086D6 #FFFFFF 510 +#0086D6 #545454 150 +#0086D6 #8E9089 420 +#0086D6 #C12E1F 420 +#0086D6 #F4EE2A 420 +#0086D6 #0A2989 120 +#0086D6 #FF6A13 390 +#0086D6 #F7E6DE 510 +#0086D6 #00AE42 300 +#F7E6DE #000000 90 +#F7E6DE #545454 90 +#F7E6DE #8E9089 180 +#F7E6DE #F4EE2A 150 +#F7E6DE #0A2989 60 +#F7E6DE #FF6A13 150 +#F7E6DE #00AE42 150 +#00AE42 #FFFFFF 570 +#00AE42 #545454 270 +#00AE42 #8E9089 480 +#00AE42 #F4EE2A 450 +#00AE42 #0A2989 270 +#00AE42 #FF6A13 300 +#00AE42 #0086D6 390 +#00AE42 #F7E6DE 570 \ No newline at end of file diff --git a/resources/flush/flush_data.txt b/resources/flush/flush_data_standard.txt similarity index 100% rename from resources/flush/flush_data.txt rename to resources/flush/flush_data_standard.txt diff --git a/resources/images/L.svg b/resources/images/L.svg new file mode 100644 index 0000000..74e8ce2 --- /dev/null +++ b/resources/images/L.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/QIDIStudioBlack.svg b/resources/images/QIDIStudioBlack.svg new file mode 100644 index 0000000..153d971 --- /dev/null +++ b/resources/images/QIDIStudioBlack.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/images/R.svg b/resources/images/R.svg new file mode 100644 index 0000000..98e2a29 --- /dev/null +++ b/resources/images/R.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/advanced_option1.svg b/resources/images/advanced_option1.svg new file mode 100644 index 0000000..02d317a --- /dev/null +++ b/resources/images/advanced_option1.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/advanced_option1_disable.svg b/resources/images/advanced_option1_disable.svg new file mode 100644 index 0000000..bcc2ce4 --- /dev/null +++ b/resources/images/advanced_option1_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/advanced_option2.svg b/resources/images/advanced_option2.svg new file mode 100644 index 0000000..ac6de9c --- /dev/null +++ b/resources/images/advanced_option2.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/advanced_option3.svg b/resources/images/advanced_option3.svg new file mode 100644 index 0000000..068f3b0 --- /dev/null +++ b/resources/images/advanced_option3.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/advanced_option4.svg b/resources/images/advanced_option4.svg new file mode 100644 index 0000000..8e50aa2 --- /dev/null +++ b/resources/images/advanced_option4.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/ams_arrow.svg b/resources/images/ams_arrow.svg index 2184cf7..88f9a64 100644 --- a/resources/images/ams_arrow.svg +++ b/resources/images/ams_arrow.svg @@ -1,3 +1,3 @@ - + diff --git a/resources/images/ams_editable_light.svg b/resources/images/ams_editable_light.svg deleted file mode 100644 index ca0d376..0000000 --- a/resources/images/ams_editable_light.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/resources/images/ams_item_examples.svg b/resources/images/ams_item_examples.svg index 588290c..0f46436 100644 --- a/resources/images/ams_item_examples.svg +++ b/resources/images/ams_item_examples.svg @@ -1,6 +1,21 @@ - - - - - + + + + + + + + + + + diff --git a/resources/images/ams_mapping_container.svg b/resources/images/ams_mapping_container.svg deleted file mode 100644 index 588290c..0000000 --- a/resources/images/ams_mapping_container.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/resources/images/ams_mapping_container_1.svg b/resources/images/ams_mapping_container_1.svg new file mode 100644 index 0000000..6e19281 --- /dev/null +++ b/resources/images/ams_mapping_container_1.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/ams_mapping_container_4.svg b/resources/images/ams_mapping_container_4.svg new file mode 100644 index 0000000..c31d7f3 --- /dev/null +++ b/resources/images/ams_mapping_container_4.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/ams_mapping_examples.svg b/resources/images/ams_mapping_examples.svg index e017313..011c448 100644 --- a/resources/images/ams_mapping_examples.svg +++ b/resources/images/ams_mapping_examples.svg @@ -1,41 +1,112 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - diff --git a/resources/images/ams_wheel_narrow.svg b/resources/images/ams_wheel_narrow.svg new file mode 100644 index 0000000..347430c --- /dev/null +++ b/resources/images/ams_wheel_narrow.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/resources/images/badge.svg b/resources/images/badge.svg new file mode 100644 index 0000000..49c78aa --- /dev/null +++ b/resources/images/badge.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/images/bed_cool.png b/resources/images/bed_cool.png new file mode 100644 index 0000000..09c6c46 Binary files /dev/null and b/resources/images/bed_cool.png differ diff --git a/resources/images/bed_cool_Q1 Pro.png b/resources/images/bed_cool_Q1 Pro.png new file mode 100644 index 0000000..09c6c46 Binary files /dev/null and b/resources/images/bed_cool_Q1 Pro.png differ diff --git a/resources/images/bed_cool_X-Max 3.png b/resources/images/bed_cool_X-Max 3.png new file mode 100644 index 0000000..6d4d8b4 Binary files /dev/null and b/resources/images/bed_cool_X-Max 3.png differ diff --git a/resources/images/bed_cool_X-Plus 3.png b/resources/images/bed_cool_X-Plus 3.png new file mode 100644 index 0000000..df9ffa5 Binary files /dev/null and b/resources/images/bed_cool_X-Plus 3.png differ diff --git a/resources/images/bed_cool_X-Plus 4.png b/resources/images/bed_cool_X-Plus 4.png new file mode 100644 index 0000000..c844ce6 Binary files /dev/null and b/resources/images/bed_cool_X-Plus 4.png differ diff --git a/resources/images/bed_cool_X-Smart 3.png b/resources/images/bed_cool_X-Smart 3.png new file mode 100644 index 0000000..4a079bc Binary files /dev/null and b/resources/images/bed_cool_X-Smart 3.png differ diff --git a/resources/images/bed_cool_supertack.png b/resources/images/bed_cool_supertack.png new file mode 100644 index 0000000..08e3b45 Binary files /dev/null and b/resources/images/bed_cool_supertack.png differ diff --git a/resources/images/bed_cool_supertack_Q1 Pro.png b/resources/images/bed_cool_supertack_Q1 Pro.png new file mode 100644 index 0000000..08e3b45 Binary files /dev/null and b/resources/images/bed_cool_supertack_Q1 Pro.png differ diff --git a/resources/images/bed_cool_supertack_X-Max 3.png b/resources/images/bed_cool_supertack_X-Max 3.png new file mode 100644 index 0000000..bfaf490 Binary files /dev/null and b/resources/images/bed_cool_supertack_X-Max 3.png differ diff --git a/resources/images/bed_cool_supertack_X-Plus 3.png b/resources/images/bed_cool_supertack_X-Plus 3.png new file mode 100644 index 0000000..294add5 Binary files /dev/null and b/resources/images/bed_cool_supertack_X-Plus 3.png differ diff --git a/resources/images/bed_cool_supertack_X-Smart 3.png b/resources/images/bed_cool_supertack_X-Smart 3.png new file mode 100644 index 0000000..255b077 Binary files /dev/null and b/resources/images/bed_cool_supertack_X-Smart 3.png differ diff --git a/resources/images/bed_cool_supertack__X-Plus 4.png b/resources/images/bed_cool_supertack__X-Plus 4.png new file mode 100644 index 0000000..c179299 Binary files /dev/null and b/resources/images/bed_cool_supertack__X-Plus 4.png differ diff --git a/resources/images/bed_engineering.png b/resources/images/bed_engineering.png new file mode 100644 index 0000000..34e180d Binary files /dev/null and b/resources/images/bed_engineering.png differ diff --git a/resources/images/bed_engineering_Q1 Pro.png b/resources/images/bed_engineering_Q1 Pro.png new file mode 100644 index 0000000..34e180d Binary files /dev/null and b/resources/images/bed_engineering_Q1 Pro.png differ diff --git a/resources/images/bed_engineering_X-Max 3.png b/resources/images/bed_engineering_X-Max 3.png new file mode 100644 index 0000000..add7123 Binary files /dev/null and b/resources/images/bed_engineering_X-Max 3.png differ diff --git a/resources/images/bed_engineering_X-Plus 3.png b/resources/images/bed_engineering_X-Plus 3.png new file mode 100644 index 0000000..5924a80 Binary files /dev/null and b/resources/images/bed_engineering_X-Plus 3.png differ diff --git a/resources/images/bed_engineering_X-Plus 4.png b/resources/images/bed_engineering_X-Plus 4.png new file mode 100644 index 0000000..3dc22d0 Binary files /dev/null and b/resources/images/bed_engineering_X-Plus 4.png differ diff --git a/resources/images/bed_engineering_X-Smart 3.png b/resources/images/bed_engineering_X-Smart 3.png new file mode 100644 index 0000000..fb95348 Binary files /dev/null and b/resources/images/bed_engineering_X-Smart 3.png differ diff --git a/resources/images/bed_high_templ.png b/resources/images/bed_high_templ.png new file mode 100644 index 0000000..5a7fe59 Binary files /dev/null and b/resources/images/bed_high_templ.png differ diff --git a/resources/images/bed_high_templ_Q1 Pro.png b/resources/images/bed_high_templ_Q1 Pro.png new file mode 100644 index 0000000..5a7fe59 Binary files /dev/null and b/resources/images/bed_high_templ_Q1 Pro.png differ diff --git a/resources/images/bed_high_templ_X-Max 3.png b/resources/images/bed_high_templ_X-Max 3.png new file mode 100644 index 0000000..fe8e9c0 Binary files /dev/null and b/resources/images/bed_high_templ_X-Max 3.png differ diff --git a/resources/images/bed_high_templ_X-Plus 3.png b/resources/images/bed_high_templ_X-Plus 3.png new file mode 100644 index 0000000..1a86117 Binary files /dev/null and b/resources/images/bed_high_templ_X-Plus 3.png differ diff --git a/resources/images/bed_high_templ_X-Plus 4.png b/resources/images/bed_high_templ_X-Plus 4.png new file mode 100644 index 0000000..bc3d6c8 Binary files /dev/null and b/resources/images/bed_high_templ_X-Plus 4.png differ diff --git a/resources/images/bed_high_templ_X-Smart 3.png b/resources/images/bed_high_templ_X-Smart 3.png new file mode 100644 index 0000000..2ae8c0a Binary files /dev/null and b/resources/images/bed_high_templ_X-Smart 3.png differ diff --git a/resources/images/bed_pei.png b/resources/images/bed_pei.png new file mode 100644 index 0000000..7a4ac01 Binary files /dev/null and b/resources/images/bed_pei.png differ diff --git a/resources/images/bed_pei_Q1 Pro.png b/resources/images/bed_pei_Q1 Pro.png new file mode 100644 index 0000000..4952887 Binary files /dev/null and b/resources/images/bed_pei_Q1 Pro.png differ diff --git a/resources/images/bed_pei_X-Max 3.png b/resources/images/bed_pei_X-Max 3.png new file mode 100644 index 0000000..2292cac Binary files /dev/null and b/resources/images/bed_pei_X-Max 3.png differ diff --git a/resources/images/bed_pei_X-Plus 3.png b/resources/images/bed_pei_X-Plus 3.png new file mode 100644 index 0000000..ea008ac Binary files /dev/null and b/resources/images/bed_pei_X-Plus 3.png differ diff --git a/resources/images/bed_pei_X-Plus 4.png b/resources/images/bed_pei_X-Plus 4.png new file mode 100644 index 0000000..8ed85de Binary files /dev/null and b/resources/images/bed_pei_X-Plus 4.png differ diff --git a/resources/images/bed_pei_X-Smart 3.png b/resources/images/bed_pei_X-Smart 3.png new file mode 100644 index 0000000..7a4ac01 Binary files /dev/null and b/resources/images/bed_pei_X-Smart 3.png differ diff --git a/resources/images/big_bed_cool.png b/resources/images/big_bed_cool.png new file mode 100644 index 0000000..4c3e93a Binary files /dev/null and b/resources/images/big_bed_cool.png differ diff --git a/resources/images/big_bed_cool_Q1 Pro.png b/resources/images/big_bed_cool_Q1 Pro.png new file mode 100644 index 0000000..4c3e93a Binary files /dev/null and b/resources/images/big_bed_cool_Q1 Pro.png differ diff --git a/resources/images/big_bed_cool_X-Max 3.png b/resources/images/big_bed_cool_X-Max 3.png new file mode 100644 index 0000000..f4c794d Binary files /dev/null and b/resources/images/big_bed_cool_X-Max 3.png differ diff --git a/resources/images/big_bed_cool_X-Plus 3.png b/resources/images/big_bed_cool_X-Plus 3.png new file mode 100644 index 0000000..dc8f29b Binary files /dev/null and b/resources/images/big_bed_cool_X-Plus 3.png differ diff --git a/resources/images/big_bed_cool_X-Plus 4.png b/resources/images/big_bed_cool_X-Plus 4.png new file mode 100644 index 0000000..7bdb3fb Binary files /dev/null and b/resources/images/big_bed_cool_X-Plus 4.png differ diff --git a/resources/images/big_bed_cool_X-Smart 3.png b/resources/images/big_bed_cool_X-Smart 3.png new file mode 100644 index 0000000..b0eea70 Binary files /dev/null and b/resources/images/big_bed_cool_X-Smart 3.png differ diff --git a/resources/images/big_bed_cool_supertack.png b/resources/images/big_bed_cool_supertack.png new file mode 100644 index 0000000..762707f Binary files /dev/null and b/resources/images/big_bed_cool_supertack.png differ diff --git a/resources/images/big_bed_cool_supertack_Q1 Pro.png b/resources/images/big_bed_cool_supertack_Q1 Pro.png new file mode 100644 index 0000000..762707f Binary files /dev/null and b/resources/images/big_bed_cool_supertack_Q1 Pro.png differ diff --git a/resources/images/big_bed_cool_supertack_X-Max 3.png b/resources/images/big_bed_cool_supertack_X-Max 3.png new file mode 100644 index 0000000..561a2d3 Binary files /dev/null and b/resources/images/big_bed_cool_supertack_X-Max 3.png differ diff --git a/resources/images/big_bed_cool_supertack_X-Plus 3.png b/resources/images/big_bed_cool_supertack_X-Plus 3.png new file mode 100644 index 0000000..9b4a57e Binary files /dev/null and b/resources/images/big_bed_cool_supertack_X-Plus 3.png differ diff --git a/resources/images/big_bed_cool_supertack_X-Plus 4.png b/resources/images/big_bed_cool_supertack_X-Plus 4.png new file mode 100644 index 0000000..e8b9b55 Binary files /dev/null and b/resources/images/big_bed_cool_supertack_X-Plus 4.png differ diff --git a/resources/images/big_bed_cool_supertack_X-Smart 3.png b/resources/images/big_bed_cool_supertack_X-Smart 3.png new file mode 100644 index 0000000..aa182e1 Binary files /dev/null and b/resources/images/big_bed_cool_supertack_X-Smart 3.png differ diff --git a/resources/images/big_bed_engineering.png b/resources/images/big_bed_engineering.png new file mode 100644 index 0000000..aa20c8c Binary files /dev/null and b/resources/images/big_bed_engineering.png differ diff --git a/resources/images/big_bed_engineering_Q1 Pro.png b/resources/images/big_bed_engineering_Q1 Pro.png new file mode 100644 index 0000000..aa20c8c Binary files /dev/null and b/resources/images/big_bed_engineering_Q1 Pro.png differ diff --git a/resources/images/big_bed_engineering_X-Max 3.png b/resources/images/big_bed_engineering_X-Max 3.png new file mode 100644 index 0000000..a7739e3 Binary files /dev/null and b/resources/images/big_bed_engineering_X-Max 3.png differ diff --git a/resources/images/big_bed_engineering_X-Plus 3.png b/resources/images/big_bed_engineering_X-Plus 3.png new file mode 100644 index 0000000..be20613 Binary files /dev/null and b/resources/images/big_bed_engineering_X-Plus 3.png differ diff --git a/resources/images/big_bed_engineering_X-Plus 4.png b/resources/images/big_bed_engineering_X-Plus 4.png new file mode 100644 index 0000000..3dd7289 Binary files /dev/null and b/resources/images/big_bed_engineering_X-Plus 4.png differ diff --git a/resources/images/big_bed_engineering_X-Smart 3.png b/resources/images/big_bed_engineering_X-Smart 3.png new file mode 100644 index 0000000..14dae93 Binary files /dev/null and b/resources/images/big_bed_engineering_X-Smart 3.png differ diff --git a/resources/images/big_bed_high_templ.png b/resources/images/big_bed_high_templ.png new file mode 100644 index 0000000..adb10f6 Binary files /dev/null and b/resources/images/big_bed_high_templ.png differ diff --git a/resources/images/big_bed_high_templ_Q1 Pro.png b/resources/images/big_bed_high_templ_Q1 Pro.png new file mode 100644 index 0000000..adb10f6 Binary files /dev/null and b/resources/images/big_bed_high_templ_Q1 Pro.png differ diff --git a/resources/images/big_bed_high_templ_X-Max 3.png b/resources/images/big_bed_high_templ_X-Max 3.png new file mode 100644 index 0000000..eaebc03 Binary files /dev/null and b/resources/images/big_bed_high_templ_X-Max 3.png differ diff --git a/resources/images/big_bed_high_templ_X-Plus 3.png b/resources/images/big_bed_high_templ_X-Plus 3.png new file mode 100644 index 0000000..124d507 Binary files /dev/null and b/resources/images/big_bed_high_templ_X-Plus 3.png differ diff --git a/resources/images/big_bed_high_templ_X-Plus 4.png b/resources/images/big_bed_high_templ_X-Plus 4.png new file mode 100644 index 0000000..5961255 Binary files /dev/null and b/resources/images/big_bed_high_templ_X-Plus 4.png differ diff --git a/resources/images/big_bed_high_templ_X-Smart 3.png b/resources/images/big_bed_high_templ_X-Smart 3.png new file mode 100644 index 0000000..cab1546 Binary files /dev/null and b/resources/images/big_bed_high_templ_X-Smart 3.png differ diff --git a/resources/images/big_bed_pei.png b/resources/images/big_bed_pei.png new file mode 100644 index 0000000..711bf78 Binary files /dev/null and b/resources/images/big_bed_pei.png differ diff --git a/resources/images/big_bed_pei_Q1 Pro.png b/resources/images/big_bed_pei_Q1 Pro.png new file mode 100644 index 0000000..711bf78 Binary files /dev/null and b/resources/images/big_bed_pei_Q1 Pro.png differ diff --git a/resources/images/big_bed_pei_X-Max 3.png b/resources/images/big_bed_pei_X-Max 3.png new file mode 100644 index 0000000..2cc37a1 Binary files /dev/null and b/resources/images/big_bed_pei_X-Max 3.png differ diff --git a/resources/images/big_bed_pei_X-Plus 3.png b/resources/images/big_bed_pei_X-Plus 3.png new file mode 100644 index 0000000..dd67139 Binary files /dev/null and b/resources/images/big_bed_pei_X-Plus 3.png differ diff --git a/resources/images/big_bed_pei_X-Plus 4.png b/resources/images/big_bed_pei_X-Plus 4.png new file mode 100644 index 0000000..5a00013 Binary files /dev/null and b/resources/images/big_bed_pei_X-Plus 4.png differ diff --git a/resources/images/big_bed_pei_X-Smart 3.png b/resources/images/big_bed_pei_X-Smart 3.png new file mode 100644 index 0000000..6577476 Binary files /dev/null and b/resources/images/big_bed_pei_X-Smart 3.png differ diff --git a/resources/images/capsule_tag_off.svg b/resources/images/capsule_tag_off.svg new file mode 100644 index 0000000..2127760 --- /dev/null +++ b/resources/images/capsule_tag_off.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/capsule_tag_on.svg b/resources/images/capsule_tag_on.svg new file mode 100644 index 0000000..cdbf98c --- /dev/null +++ b/resources/images/capsule_tag_on.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/images/checked.svg b/resources/images/checked.svg index 88747cb..dcd4340 100644 --- a/resources/images/checked.svg +++ b/resources/images/checked.svg @@ -1,4 +1,4 @@ - - + + diff --git a/resources/images/compare.svg b/resources/images/compare.svg index 837506b..a29a814 100644 --- a/resources/images/compare.svg +++ b/resources/images/compare.svg @@ -1,6 +1,12 @@ - - - - - + + + + + + + + + + + diff --git a/resources/images/drop_down2.svg b/resources/images/drop_down2.svg new file mode 100644 index 0000000..e4d22e9 --- /dev/null +++ b/resources/images/drop_down2.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/erase.svg b/resources/images/erase.svg new file mode 100644 index 0000000..1b39cae --- /dev/null +++ b/resources/images/erase.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/images/extra_ams_tray_mid.svg b/resources/images/extra_ams_tray_mid.svg new file mode 100644 index 0000000..77e2e56 --- /dev/null +++ b/resources/images/extra_ams_tray_mid.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/images/extra_ams_tray_mid_hover.svg b/resources/images/extra_ams_tray_mid_hover.svg new file mode 100644 index 0000000..1d836ac --- /dev/null +++ b/resources/images/extra_ams_tray_mid_hover.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/images/extra_ams_tray_mid_selected.svg b/resources/images/extra_ams_tray_mid_selected.svg new file mode 100644 index 0000000..9002cb5 --- /dev/null +++ b/resources/images/extra_ams_tray_mid_selected.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/images/extruder_sync.svg b/resources/images/extruder_sync.svg new file mode 100644 index 0000000..4e18766 --- /dev/null +++ b/resources/images/extruder_sync.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/fan_control_decrease.svg b/resources/images/fan_control_decrease.svg index 7a68c36..524b7ed 100644 --- a/resources/images/fan_control_decrease.svg +++ b/resources/images/fan_control_decrease.svg @@ -1,3 +1,3 @@ - - + + diff --git a/resources/images/fan_poppingup_refresh.svg b/resources/images/fan_poppingup_refresh.svg new file mode 100644 index 0000000..014144a --- /dev/null +++ b/resources/images/fan_poppingup_refresh.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/filament_dark_transparent.svg b/resources/images/filament_dark_transparent.svg new file mode 100644 index 0000000..c0c6091 --- /dev/null +++ b/resources/images/filament_dark_transparent.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/filament_green.svg b/resources/images/filament_green.svg new file mode 100644 index 0000000..1ce85cb --- /dev/null +++ b/resources/images/filament_green.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/resources/images/filament_load_expand.svg b/resources/images/filament_load_expand.svg new file mode 100644 index 0000000..f4a051a --- /dev/null +++ b/resources/images/filament_load_expand.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/filament_load_fold.svg b/resources/images/filament_load_fold.svg new file mode 100644 index 0000000..12681c0 --- /dev/null +++ b/resources/images/filament_load_fold.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/filament_not_mactch.svg b/resources/images/filament_not_mactch.svg new file mode 100644 index 0000000..3556792 --- /dev/null +++ b/resources/images/filament_not_mactch.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/images/filament_transparent.svg b/resources/images/filament_transparent.svg new file mode 100644 index 0000000..783cf8e --- /dev/null +++ b/resources/images/filament_transparent.svg @@ -0,0 +1 @@ +12312 \ No newline at end of file diff --git a/resources/images/filament_transparent2.svg b/resources/images/filament_transparent2.svg new file mode 100644 index 0000000..07bf35a --- /dev/null +++ b/resources/images/filament_transparent2.svg @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/fit_camera.svg b/resources/images/fit_camera.svg new file mode 100644 index 0000000..bac816f --- /dev/null +++ b/resources/images/fit_camera.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/resources/images/fit_camera_dark.svg b/resources/images/fit_camera_dark.svg new file mode 100644 index 0000000..0904169 --- /dev/null +++ b/resources/images/fit_camera_dark.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/resources/images/fit_camera_dark_hover.svg b/resources/images/fit_camera_dark_hover.svg new file mode 100644 index 0000000..7c4621c --- /dev/null +++ b/resources/images/fit_camera_dark_hover.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/resources/images/fit_camera_hover.svg b/resources/images/fit_camera_hover.svg new file mode 100644 index 0000000..1799582 --- /dev/null +++ b/resources/images/fit_camera_hover.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/flush_mode_panel_icon.svg b/resources/images/flush_mode_panel_icon.svg new file mode 100644 index 0000000..2e9cfc7 --- /dev/null +++ b/resources/images/flush_mode_panel_icon.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/images/flush_mode_panel_icon_disabled.svg b/resources/images/flush_mode_panel_icon_disabled.svg new file mode 100644 index 0000000..2e9cfc7 --- /dev/null +++ b/resources/images/flush_mode_panel_icon_disabled.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/resources/images/four_slot_ams_item.svg b/resources/images/four_slot_ams_item.svg new file mode 100644 index 0000000..b42e94a --- /dev/null +++ b/resources/images/four_slot_ams_item.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/resources/images/four_slot_ams_item_dark.svg b/resources/images/four_slot_ams_item_dark.svg new file mode 100644 index 0000000..1d78826 --- /dev/null +++ b/resources/images/four_slot_ams_item_dark.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/resources/images/global_map_mode_tag.svg b/resources/images/global_map_mode_tag.svg new file mode 100644 index 0000000..d185c35 --- /dev/null +++ b/resources/images/global_map_mode_tag.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/images/help.svg b/resources/images/help.svg new file mode 100644 index 0000000..f201af1 --- /dev/null +++ b/resources/images/help.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/hum_level1_no_num_dark.svg b/resources/images/hum_level1_no_num_dark.svg new file mode 100644 index 0000000..865a6c4 --- /dev/null +++ b/resources/images/hum_level1_no_num_dark.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/images/hum_level1_no_num_light.svg b/resources/images/hum_level1_no_num_light.svg new file mode 100644 index 0000000..be7c282 --- /dev/null +++ b/resources/images/hum_level1_no_num_light.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/images/hum_level2_no_num_dark.svg b/resources/images/hum_level2_no_num_dark.svg new file mode 100644 index 0000000..9b47bee --- /dev/null +++ b/resources/images/hum_level2_no_num_dark.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/images/hum_level2_no_num_light.svg b/resources/images/hum_level2_no_num_light.svg new file mode 100644 index 0000000..b84791d --- /dev/null +++ b/resources/images/hum_level2_no_num_light.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/images/hum_level3_no_num_dark.svg b/resources/images/hum_level3_no_num_dark.svg new file mode 100644 index 0000000..b5b08a1 --- /dev/null +++ b/resources/images/hum_level3_no_num_dark.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/images/hum_level3_no_num_light.svg b/resources/images/hum_level3_no_num_light.svg new file mode 100644 index 0000000..e1fbd56 --- /dev/null +++ b/resources/images/hum_level3_no_num_light.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/images/hum_level4_no_num_dark.svg b/resources/images/hum_level4_no_num_dark.svg new file mode 100644 index 0000000..980ada0 --- /dev/null +++ b/resources/images/hum_level4_no_num_dark.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/images/hum_level4_no_num_light.svg b/resources/images/hum_level4_no_num_light.svg new file mode 100644 index 0000000..4fb5bc7 --- /dev/null +++ b/resources/images/hum_level4_no_num_light.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/images/hum_level5_no_num_dark.svg b/resources/images/hum_level5_no_num_dark.svg new file mode 100644 index 0000000..ab55eff --- /dev/null +++ b/resources/images/hum_level5_no_num_dark.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/images/hum_level5_no_num_light.svg b/resources/images/hum_level5_no_num_light.svg new file mode 100644 index 0000000..c96f344 --- /dev/null +++ b/resources/images/hum_level5_no_num_light.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/images/im_all_plates_stats_transparent.svg b/resources/images/im_all_plates_stats_transparent.svg index 80e9113..f3ba5fc 100644 --- a/resources/images/im_all_plates_stats_transparent.svg +++ b/resources/images/im_all_plates_stats_transparent.svg @@ -1,8 +1,8 @@ - - - - - + + + + + diff --git a/resources/images/info.svg b/resources/images/info.svg index 276b260..7a655b5 100644 --- a/resources/images/info.svg +++ b/resources/images/info.svg @@ -1,71 +1,3 @@ - -image/svg+xml - - - - - - - - - + + diff --git a/resources/images/loading.gif b/resources/images/loading.gif new file mode 100644 index 0000000..085ccae Binary files /dev/null and b/resources/images/loading.gif differ diff --git a/resources/images/map_mode_disabled.svg b/resources/images/map_mode_disabled.svg new file mode 100644 index 0000000..8a0c30a --- /dev/null +++ b/resources/images/map_mode_disabled.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/map_mode_off.svg b/resources/images/map_mode_off.svg new file mode 100644 index 0000000..5400ff6 --- /dev/null +++ b/resources/images/map_mode_off.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/map_mode_off_hovered.svg b/resources/images/map_mode_off_hovered.svg new file mode 100644 index 0000000..78e2beb --- /dev/null +++ b/resources/images/map_mode_off_hovered.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/map_mode_on.svg b/resources/images/map_mode_on.svg new file mode 100644 index 0000000..df1c78b --- /dev/null +++ b/resources/images/map_mode_on.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/images/map_mode_on_hovered.svg b/resources/images/map_mode_on_hovered.svg new file mode 100644 index 0000000..eb5bf9c --- /dev/null +++ b/resources/images/map_mode_on_hovered.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/images/mapping_item_checked.svg b/resources/images/mapping_item_checked.svg new file mode 100644 index 0000000..d41ee84 --- /dev/null +++ b/resources/images/mapping_item_checked.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/images/match_mode_panel_icon.svg b/resources/images/match_mode_panel_icon.svg new file mode 100644 index 0000000..01fc724 --- /dev/null +++ b/resources/images/match_mode_panel_icon.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/match_mode_panel_icon_disabled.svg b/resources/images/match_mode_panel_icon_disabled.svg new file mode 100644 index 0000000..09a66f9 --- /dev/null +++ b/resources/images/match_mode_panel_icon_disabled.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/menu_filament.svg b/resources/images/menu_filament.svg new file mode 100644 index 0000000..1a4a0ed --- /dev/null +++ b/resources/images/menu_filament.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/resources/images/monitor_upgrade_ams.svg b/resources/images/monitor_upgrade_ams.svg index 92db05d..a25a26c 100644 --- a/resources/images/monitor_upgrade_ams.svg +++ b/resources/images/monitor_upgrade_ams.svg @@ -1,994 +1,870 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/multi_extruder.svg b/resources/images/multi_extruder.svg new file mode 100644 index 0000000..24bb6ee --- /dev/null +++ b/resources/images/multi_extruder.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/resources/images/next_item.svg b/resources/images/next_item.svg new file mode 100644 index 0000000..4454256 --- /dev/null +++ b/resources/images/next_item.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/next_item_dark_disable.svg b/resources/images/next_item_dark_disable.svg new file mode 100644 index 0000000..4612e64 --- /dev/null +++ b/resources/images/next_item_dark_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/next_item_disable.svg b/resources/images/next_item_disable.svg new file mode 100644 index 0000000..2f257c5 --- /dev/null +++ b/resources/images/next_item_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/next_item_hover.svg b/resources/images/next_item_hover.svg new file mode 100644 index 0000000..f986dcc --- /dev/null +++ b/resources/images/next_item_hover.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/outlined_rect.svg b/resources/images/outlined_rect.svg new file mode 100644 index 0000000..d9288b4 --- /dev/null +++ b/resources/images/outlined_rect.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/outlined_rect_transparent.svg b/resources/images/outlined_rect_transparent.svg new file mode 100644 index 0000000..cb86cc4 --- /dev/null +++ b/resources/images/outlined_rect_transparent.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/resources/images/page_down.svg b/resources/images/page_down.svg new file mode 100644 index 0000000..077526b --- /dev/null +++ b/resources/images/page_down.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/page_up.svg b/resources/images/page_up.svg new file mode 100644 index 0000000..3a80124 --- /dev/null +++ b/resources/images/page_up.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/param_crosszag.svg b/resources/images/param_crosszag.svg new file mode 100644 index 0000000..0a21257 --- /dev/null +++ b/resources/images/param_crosszag.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/param_zigzag.svg b/resources/images/param_zigzag.svg new file mode 100644 index 0000000..4294e7a --- /dev/null +++ b/resources/images/param_zigzag.svg @@ -0,0 +1,158 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/placeholder_excel.svg b/resources/images/placeholder_excel.svg deleted file mode 100644 index 15b84b4..0000000 --- a/resources/images/placeholder_excel.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/resources/images/plate_set_filament_map.svg b/resources/images/plate_set_filament_map.svg new file mode 100644 index 0000000..bb5fbfe --- /dev/null +++ b/resources/images/plate_set_filament_map.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/resources/images/plate_set_filament_map_dark.svg b/resources/images/plate_set_filament_map_dark.svg new file mode 100644 index 0000000..1611427 --- /dev/null +++ b/resources/images/plate_set_filament_map_dark.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/resources/images/plate_set_filament_map_hover.svg b/resources/images/plate_set_filament_map_hover.svg new file mode 100644 index 0000000..9b957b9 --- /dev/null +++ b/resources/images/plate_set_filament_map_hover.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/resources/images/plate_set_filament_map_hover_dark.svg b/resources/images/plate_set_filament_map_hover_dark.svg new file mode 100644 index 0000000..8aa6fe1 --- /dev/null +++ b/resources/images/plate_set_filament_map_hover_dark.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/resources/images/previous_item.svg b/resources/images/previous_item.svg new file mode 100644 index 0000000..51d89fa --- /dev/null +++ b/resources/images/previous_item.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/previous_item_dark_disable.svg b/resources/images/previous_item_dark_disable.svg new file mode 100644 index 0000000..6a92757 --- /dev/null +++ b/resources/images/previous_item_dark_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/previous_item_disable.svg b/resources/images/previous_item_disable.svg new file mode 100644 index 0000000..fea1aae --- /dev/null +++ b/resources/images/previous_item_disable.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/previous_item_hover.svg b/resources/images/previous_item_hover.svg new file mode 100644 index 0000000..3178860 --- /dev/null +++ b/resources/images/previous_item_hover.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/printer_sync.svg b/resources/images/printer_sync.svg new file mode 100644 index 0000000..2c6db08 --- /dev/null +++ b/resources/images/printer_sync.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/resources/images/refresh_printer.svg b/resources/images/refresh_printer.svg new file mode 100644 index 0000000..25f7097 --- /dev/null +++ b/resources/images/refresh_printer.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/rename_edit.svg b/resources/images/rename_edit.svg new file mode 100644 index 0000000..03e40f4 --- /dev/null +++ b/resources/images/rename_edit.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/resources/images/reset_gray.svg b/resources/images/reset_gray.svg new file mode 100644 index 0000000..9e55789 --- /dev/null +++ b/resources/images/reset_gray.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/round.svg b/resources/images/round.svg new file mode 100644 index 0000000..74e8ce2 --- /dev/null +++ b/resources/images/round.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/settings.svg b/resources/images/settings.svg index d2a2a2e..b22a919 100644 --- a/resources/images/settings.svg +++ b/resources/images/settings.svg @@ -1,3 +1,15 @@ - - + + + + + + + + + + + + + + diff --git a/resources/images/single_slot_ams_item.svg b/resources/images/single_slot_ams_item.svg new file mode 100644 index 0000000..a1f94f8 --- /dev/null +++ b/resources/images/single_slot_ams_item.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/resources/images/single_slot_ams_item_dark.svg b/resources/images/single_slot_ams_item_dark.svg new file mode 100644 index 0000000..b259df0 --- /dev/null +++ b/resources/images/single_slot_ams_item_dark.svg @@ -0,0 +1,15 @@ + + + + + + + + 第 1 层 + + + + + + + \ No newline at end of file diff --git a/resources/images/switch_filament_maps.svg b/resources/images/switch_filament_maps.svg new file mode 100644 index 0000000..39205d5 --- /dev/null +++ b/resources/images/switch_filament_maps.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/resources/images/switch_send_mode_off.svg b/resources/images/switch_send_mode_off.svg new file mode 100644 index 0000000..525b831 --- /dev/null +++ b/resources/images/switch_send_mode_off.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/switch_send_mode_on.svg b/resources/images/switch_send_mode_on.svg new file mode 100644 index 0000000..b535b25 --- /dev/null +++ b/resources/images/switch_send_mode_on.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/images/switch_send_mode_tag_off.svg b/resources/images/switch_send_mode_tag_off.svg new file mode 100644 index 0000000..2127760 --- /dev/null +++ b/resources/images/switch_send_mode_tag_off.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/images/switch_send_mode_tag_on.svg b/resources/images/switch_send_mode_tag_on.svg new file mode 100644 index 0000000..39726be --- /dev/null +++ b/resources/images/switch_send_mode_tag_on.svg @@ -0,0 +1,4 @@ + + + + diff --git a/resources/images/table.svg b/resources/images/table.svg index d1b059b..2c5ff61 100644 --- a/resources/images/table.svg +++ b/resources/images/table.svg @@ -1,9 +1,3 @@ - - - - - - - - + + diff --git a/resources/images/tool_bar_svg.svg b/resources/images/tool_bar_svg.svg new file mode 100644 index 0000000..2515f78 --- /dev/null +++ b/resources/images/tool_bar_svg.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/resources/images/topbar_save_inactive.svg b/resources/images/topbar_save_inactive.svg new file mode 100644 index 0000000..98773de --- /dev/null +++ b/resources/images/topbar_save_inactive.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/resources/images/transparent_ams_lib.svg b/resources/images/transparent_ams_lib.svg index 404028e..a01f42e 100644 --- a/resources/images/transparent_ams_lib.svg +++ b/resources/images/transparent_ams_lib.svg @@ -1,4 +1,4 @@ - + diff --git a/resources/images/transparent_material_up.svg b/resources/images/transparent_material_up.svg new file mode 100644 index 0000000..bda02ce --- /dev/null +++ b/resources/images/transparent_material_up.svg @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/images/ts_bitmap_cube_dark.svg b/resources/images/ts_bitmap_cube_dark.svg new file mode 100644 index 0000000..64e02ac --- /dev/null +++ b/resources/images/ts_bitmap_cube_dark.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/resources/images/warning.svg b/resources/images/warning.svg new file mode 100644 index 0000000..2cc3422 --- /dev/null +++ b/resources/images/warning.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/profiles/Q Series/filament/Bambu ABS.json b/resources/profiles/Q Series/filament/Bambu ABS.json index e987ac5..44e7ffe 100644 --- a/resources/profiles/Q Series/filament/Bambu ABS.json +++ b/resources/profiles/Q Series/filament/Bambu ABS.json @@ -10,9 +10,9 @@ "additional_cooling_fan_speed": ["0"], "chamber_temperatures": ["55"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_max_speed": ["80"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.05"], "filament_flow_ratio": ["0.95"], "filament_max_volumetric_speed": ["24.5"], @@ -29,5 +29,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["90"], "textured_plate_temp" : ["90"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/Q Series/filament/Bambu PETG.json b/resources/profiles/Q Series/filament/Bambu PETG.json index 1d35e07..4a242e5 100644 --- a/resources/profiles/Q Series/filament/Bambu PETG.json +++ b/resources/profiles/Q Series/filament/Bambu PETG.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFG99", + "filament_id": "GFG99", "setting_id": "GFSG99", "name": "Bambu PETG@Q-Series", "from": "system", @@ -9,10 +9,10 @@ "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["30"], "fan_max_speed": ["40"], "fan_min_speed": ["10"], + "filament_adhesiveness_category": ["300"], "filament_flow_ratio": ["0.95"], "filament_max_volumetric_speed": ["13"], "filament_type": ["PETG"], @@ -28,5 +28,5 @@ "temperature_vitrification": ["70"], "textured_plate_temp_initial_layer" : ["80"], "textured_plate_temp" : ["80"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/Q Series/filament/Bambu PLA.json b/resources/profiles/Q Series/filament/Bambu PLA.json index 22a980d..f897a13 100644 --- a/resources/profiles/Q Series/filament/Bambu PLA.json +++ b/resources/profiles/Q Series/filament/Bambu PLA.json @@ -1,16 +1,18 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "GFL99", "setting_id": "GFSL99", "name": "Bambu PLA@Q-Series", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "filament_adhesiveness_category": ["100"], "filament_type": ["PLA"], "filament_vendor": ["Bambu Lab"], "additional_cooling_fan_speed": ["100"], "nozzle_temperature_range_high": ["240"], "nozzle_temperature_range_low": ["190"], + "overhang_fan_threshold": ["50%"], "temperature_vitrification": ["45"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/Q Series/filament/Generic ABS.json b/resources/profiles/Q Series/filament/Generic ABS.json index a0d7af7..9bdae32 100644 --- a/resources/profiles/Q Series/filament/Generic ABS.json +++ b/resources/profiles/Q Series/filament/Generic ABS.json @@ -9,10 +9,10 @@ "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["30"], "fan_max_speed": ["80"], "fan_min_speed": ["10"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.04"], "filament_flow_ratio": ["0.95"], "filament_max_volumetric_speed": ["17"], @@ -29,5 +29,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["90"], "textured_plate_temp" : ["90"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/Q Series/filament/Generic PC.json b/resources/profiles/Q Series/filament/Generic PC.json index 794bf27..9129d85 100644 --- a/resources/profiles/Q Series/filament/Generic PC.json +++ b/resources/profiles/Q Series/filament/Generic PC.json @@ -9,10 +9,10 @@ "chamber_temperatures": ["60"], "close_fan_the_first_x_layers": ["3"], "during_print_exhaust_fan_speed": ["0"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["30"], "fan_max_speed": ["60"], "fan_min_speed": ["10"], + "filament_adhesiveness_category": ["500"], "filament_density": ["1.04"], "filament_max_volumetric_speed": ["10"], "filament_type": ["PC"], diff --git a/resources/profiles/Q Series/filament/Generic PETG.json b/resources/profiles/Q Series/filament/Generic PETG.json index b294c8f..f37d64d 100644 --- a/resources/profiles/Q Series/filament/Generic PETG.json +++ b/resources/profiles/Q Series/filament/Generic PETG.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFG99", + "filament_id": "GFG99", "setting_id": "GFSG99", "name": "Generic PETG@Q-Series", "from": "system", @@ -9,10 +9,10 @@ "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["30"], "fan_max_speed": ["90"], "fan_min_speed": ["40"], + "filament_adhesiveness_category": ["300"], "filament_density": ["1.27"], "filament_flow_ratio": ["0.95"], "filament_max_volumetric_speed": ["12"], @@ -29,5 +29,5 @@ "temperature_vitrification": ["70"], "textured_plate_temp_initial_layer" : ["80"], "textured_plate_temp" : ["80"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/Q Series/filament/Generic PLA Silk.json b/resources/profiles/Q Series/filament/Generic PLA Silk.json index 0d010b8..d59cf8a 100644 --- a/resources/profiles/Q Series/filament/Generic PLA Silk.json +++ b/resources/profiles/Q Series/filament/Generic PLA Silk.json @@ -1,12 +1,13 @@ { - "type": "filament", - "filament_id": "GFA05", - "setting_id": "GFSL99_01", - "name": "Generic PLA Silk@Q-Series", - "from": "system", - "instantiation": "false", - "inherits": "fdm_filament_common", + "type": "filament", + "filament_id": "GFA05", + "setting_id": "GFSL99_01", + "name": "Generic PLA Silk@Q-Series", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", "additional_cooling_fan_speed": ["0"], + "filament_adhesiveness_category": ["100"], "filament_density": ["1.2"], "filament_max_volumetric_speed": ["7.5"], "filament_retraction_length": ["0.5"], @@ -16,10 +17,11 @@ "nozzle_temperature_range_high": ["240"], "nozzle_temperature_range_low": ["190"], "nozzle_temperature": ["220"], + "overhang_fan_threshold": ["50%"], "pressure_advance": ["0.032"], "slow_down_layer_time": ["8"], "temperature_vitrification": ["45"], "textured_plate_temp_initial_layer" : ["55"], "textured_plate_temp" : ["55"], - "compatible_printers": [] + "compatible_printers": [] } \ No newline at end of file diff --git a/resources/profiles/Q Series/filament/Generic PLA+.json b/resources/profiles/Q Series/filament/Generic PLA+.json index 4a3af70..12dfb50 100644 --- a/resources/profiles/Q Series/filament/Generic PLA+.json +++ b/resources/profiles/Q Series/filament/Generic PLA+.json @@ -7,6 +7,7 @@ "instantiation": "false", "inherits": "fdm_filament_common", "additional_cooling_fan_speed": ["0"], + "filament_adhesiveness_category": ["100"], "filament_density": ["1.2"], "filament_max_volumetric_speed": ["12"], "filament_type": ["PLA"], @@ -15,6 +16,7 @@ "nozzle_temperature_range_high": ["240"], "nozzle_temperature_range_low": ["190"], "nozzle_temperature": ["220"], + "overhang_fan_threshold": ["50%"], "slow_down_layer_time": ["8"], "temperature_vitrification": ["45"], "compatible_printers": [] diff --git a/resources/profiles/Q Series/filament/Generic PLA.json b/resources/profiles/Q Series/filament/Generic PLA.json index 56f381e..7e21643 100644 --- a/resources/profiles/Q Series/filament/Generic PLA.json +++ b/resources/profiles/Q Series/filament/Generic PLA.json @@ -7,12 +7,16 @@ "instantiation": "false", "inherits": "fdm_filament_common", "additional_cooling_fan_speed": ["0"], + "cool_plate_temp_initial_layer": ["45"], + "cool_plate_temp": ["45"], + "filament_adhesiveness_category": ["100"], "filament_density": ["1.2"], "filament_max_volumetric_speed": ["14"], "filament_type": ["PLA"], "filament_vendor": ["Generic"], "nozzle_temperature_range_high": ["240"], "nozzle_temperature_range_low": ["190"], + "overhang_fan_threshold": ["50%"], "slow_down_layer_time": ["8"], "temperature_vitrification": ["45"], "compatible_printers": [] diff --git a/resources/profiles/Q Series/filament/Generic TPU 95A.json b/resources/profiles/Q Series/filament/Generic TPU 95A.json index 9b1b5d1..4e01588 100644 --- a/resources/profiles/Q Series/filament/Generic TPU 95A.json +++ b/resources/profiles/Q Series/filament/Generic TPU 95A.json @@ -8,6 +8,7 @@ "inherits": "fdm_filament_common", "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], + "filament_adhesiveness_category": ["600"], "filament_density": ["1.21"], "filament_flow_ratio": ["1"], "filament_max_volumetric_speed": ["4"], @@ -20,5 +21,5 @@ "pressure_advance": ["0.1"], "slow_down_layer_time": ["8"], "temperature_vitrification": ["30"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/Q Series/filament/HATCHBOX ABS.json b/resources/profiles/Q Series/filament/HATCHBOX ABS.json index 2cedf22..49442ab 100644 --- a/resources/profiles/Q Series/filament/HATCHBOX ABS.json +++ b/resources/profiles/Q Series/filament/HATCHBOX ABS.json @@ -10,9 +10,9 @@ "additional_cooling_fan_speed": ["0"], "chamber_temperatures": ["55"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_max_speed": ["80"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.05"], "filament_flow_ratio": ["0.95"], "filament_max_volumetric_speed": ["24.5"], @@ -29,5 +29,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["90"], "textured_plate_temp" : ["90"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/Q Series/filament/HATCHBOX PETG.json b/resources/profiles/Q Series/filament/HATCHBOX PETG.json index aeb2b76..96ebb2f 100644 --- a/resources/profiles/Q Series/filament/HATCHBOX PETG.json +++ b/resources/profiles/Q Series/filament/HATCHBOX PETG.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFG99", + "filament_id": "GFG99", "setting_id": "GFSG99", "name": "HATCHBOX PETG@Q-Series", "from": "system", @@ -9,10 +9,10 @@ "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["30"], "fan_max_speed": ["40"], "fan_min_speed": ["10"], + "filament_adhesiveness_category": ["300"], "filament_flow_ratio": ["0.95"], "filament_max_volumetric_speed": ["13"], "filament_type": ["PETG"], @@ -28,5 +28,5 @@ "temperature_vitrification": ["70"], "textured_plate_temp_initial_layer" : ["80"], "textured_plate_temp" : ["80"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/Q Series/filament/HATCHBOX PLA.json b/resources/profiles/Q Series/filament/HATCHBOX PLA.json index 50feb5e..9651e33 100644 --- a/resources/profiles/Q Series/filament/HATCHBOX PLA.json +++ b/resources/profiles/Q Series/filament/HATCHBOX PLA.json @@ -1,16 +1,18 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "GFL99", "setting_id": "GFSL99", "name": "HATCHBOX PLA@Q-Series", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "filament_adhesiveness_category": ["100"], "filament_type": ["PLA"], "filament_vendor": ["HATCHBOX"], "additional_cooling_fan_speed": ["100"], "nozzle_temperature_range_high": ["240"], "nozzle_temperature_range_low": ["190"], + "overhang_fan_threshold": ["50%"], "temperature_vitrification": ["45"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/Q Series/filament/Overture ABS.json b/resources/profiles/Q Series/filament/Overture ABS.json index 7899bc9..576ca46 100644 --- a/resources/profiles/Q Series/filament/Overture ABS.json +++ b/resources/profiles/Q Series/filament/Overture ABS.json @@ -10,9 +10,9 @@ "additional_cooling_fan_speed": ["0"], "chamber_temperatures": ["55"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_max_speed": ["80"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.12"], "filament_flow_ratio": ["0.95"], "filament_max_volumetric_speed": ["17"], @@ -29,5 +29,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["90"], "textured_plate_temp" : ["90"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/Q Series/filament/Overture PLA.json b/resources/profiles/Q Series/filament/Overture PLA.json index 54f1079..3c6738a 100644 --- a/resources/profiles/Q Series/filament/Overture PLA.json +++ b/resources/profiles/Q Series/filament/Overture PLA.json @@ -1,11 +1,12 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "GFL99", "setting_id": "GFSL99", "name": "Overture PLA@Q-Series", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "filament_adhesiveness_category": ["100"], "filament_type": ["PLA"], "additional_cooling_fan_speed": ["100"], "filament_density": ["1.2"], @@ -14,7 +15,8 @@ "filament_vendor": ["Overture"], "nozzle_temperature_range_high": ["240"], "nozzle_temperature_range_low": ["190"], + "overhang_fan_threshold": ["50%"], "slow_down_layer_time": ["10"], "temperature_vitrification": ["45"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/Q Series/filament/PolyLite ABS.json b/resources/profiles/Q Series/filament/PolyLite ABS.json index 1e282ec..8c64214 100644 --- a/resources/profiles/Q Series/filament/PolyLite ABS.json +++ b/resources/profiles/Q Series/filament/PolyLite ABS.json @@ -10,9 +10,9 @@ "additional_cooling_fan_speed": ["0"], "chamber_temperatures": ["60"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_max_speed": ["80"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.12"], "filament_flow_ratio": ["0.95"], "filament_max_volumetric_speed": ["17"], @@ -29,5 +29,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["90"], "textured_plate_temp" : ["90"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/Q Series/filament/PolyLite PLA.json b/resources/profiles/Q Series/filament/PolyLite PLA.json index a353a9e..684cf37 100644 --- a/resources/profiles/Q Series/filament/PolyLite PLA.json +++ b/resources/profiles/Q Series/filament/PolyLite PLA.json @@ -1,11 +1,12 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "GFL99", "setting_id": "GFSL99", "name": "PolyLite PLA@Q-Series", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "filament_adhesiveness_category": ["100"], "filament_type": ["PLA"], "additional_cooling_fan_speed": ["100"], "additional_cooling_fan_speed_unseal": ["100"], @@ -15,7 +16,8 @@ "filament_vendor": ["Polymaker"], "nozzle_temperature_range_high": ["240"], "nozzle_temperature_range_low": ["190"], + "overhang_fan_threshold": ["50%"], "slow_down_layer_time": ["10"], "temperature_vitrification": ["45"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/Q Series/filament/QIDI ABS Odorless.json b/resources/profiles/Q Series/filament/QIDI ABS Odorless.json index 91ac9e6..1fd622e 100644 --- a/resources/profiles/Q Series/filament/QIDI ABS Odorless.json +++ b/resources/profiles/Q Series/filament/QIDI ABS Odorless.json @@ -10,13 +10,14 @@ "additional_cooling_fan_speed": ["0"], "chamber_temperatures": ["55"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_max_speed": ["80"], "fan_min_speed": ["10"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.02"], "filament_flow_ratio": ["0.92"], "filament_max_volumetric_speed": ["22"], "filament_type": ["ABS"], + "impact_strength_z":["7.4"], "nozzle_temperature_initial_layer": ["250"], "nozzle_temperature_range_high": ["280"], "nozzle_temperature_range_low": ["240"], @@ -28,5 +29,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["90"], "textured_plate_temp" : ["90"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/Q Series/filament/QIDI ABS Rapido Metal.json b/resources/profiles/Q Series/filament/QIDI ABS Rapido Metal.json index 700d6a5..5bc2b04 100644 --- a/resources/profiles/Q Series/filament/QIDI ABS Rapido Metal.json +++ b/resources/profiles/Q Series/filament/QIDI ABS Rapido Metal.json @@ -10,13 +10,14 @@ "additional_cooling_fan_speed": ["0"], "chamber_temperatures": ["55"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_max_speed": ["80"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.06"], "filament_flow_ratio": ["0.95"], "filament_max_volumetric_speed": ["24.5"], "filament_type": ["ABS"], + "impact_strength_z":["7.4"], "nozzle_temperature_initial_layer": ["250"], "nozzle_temperature_range_high": ["280"], "nozzle_temperature_range_low": ["240"], @@ -28,5 +29,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["90"], "textured_plate_temp" : ["90"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/Q Series/filament/QIDI ABS Rapido.json b/resources/profiles/Q Series/filament/QIDI ABS Rapido.json index 9068379..057d83a 100644 --- a/resources/profiles/Q Series/filament/QIDI ABS Rapido.json +++ b/resources/profiles/Q Series/filament/QIDI ABS Rapido.json @@ -10,13 +10,14 @@ "additional_cooling_fan_speed": ["0"], "chamber_temperatures": ["55"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_max_speed": ["80"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.05"], "filament_flow_ratio": ["0.95"], "filament_max_volumetric_speed": ["24.5"], "filament_type": ["ABS"], + "impact_strength_z":["7.4"], "nozzle_temperature_initial_layer": ["250"], "nozzle_temperature_range_high": ["280"], "nozzle_temperature_range_low": ["240"], @@ -28,5 +29,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["90"], "textured_plate_temp" : ["90"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/Q Series/filament/QIDI ABS-GF.json b/resources/profiles/Q Series/filament/QIDI ABS-GF.json index 67723c3..dadea4b 100644 --- a/resources/profiles/Q Series/filament/QIDI ABS-GF.json +++ b/resources/profiles/Q Series/filament/QIDI ABS-GF.json @@ -8,24 +8,25 @@ "inherits": "fdm_filament_common", "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], - "chamber_temperatures": ["55"], + "chamber_temperatures": ["0"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_max_speed": ["20"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.15"], "filament_flow_ratio": ["0.95"], - "filament_max_volumetric_speed": ["22"], + "filament_max_volumetric_speed": ["12"], "filament_type": ["ABS-GF"], + "impact_strength_z":["5.3"], "nozzle_temperature_initial_layer": ["260"], "nozzle_temperature_range_high": ["280"], "nozzle_temperature_range_low": ["240"], - "nozzle_temperature": ["260"], + "nozzle_temperature": ["270"], "overhang_fan_speed": ["80"], "overhang_fan_threshold": ["25%"], "pressure_advance": ["0.035"], "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["100"], "textured_plate_temp" : ["100"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/Q Series/filament/QIDI ASA-Aero.json b/resources/profiles/Q Series/filament/QIDI ASA-Aero.json index 2012586..41add0f 100644 --- a/resources/profiles/Q Series/filament/QIDI ASA-Aero.json +++ b/resources/profiles/Q Series/filament/QIDI ASA-Aero.json @@ -10,19 +10,20 @@ "additional_cooling_fan_speed": ["0"], "chamber_temperatures": ["60"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["40"], "fan_max_speed": ["50"], "fan_min_speed": ["10"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.03"], "filament_flow_ratio": ["0.7"], - "filament_max_volumetric_speed": ["16"], + "filament_max_volumetric_speed": ["12"], "filament_retract_when_changing_layer": ["0"], "filament_retraction_length": ["0.01"], "filament_retraction_minimum_travel": ["0"], "filament_type": ["ASA-Aero"], "filament_wipe": ["0"], "filament_z_hop": ["0"], + "impact_strength_z":["3.4"], "nozzle_temperature_initial_layer": ["250"], "nozzle_temperature_range_high": ["280"], "nozzle_temperature_range_low": ["240"], @@ -34,5 +35,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["90"], "textured_plate_temp" : ["90"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/Q Series/filament/QIDI ASA.json b/resources/profiles/Q Series/filament/QIDI ASA.json index 8183432..9337db4 100644 --- a/resources/profiles/Q Series/filament/QIDI ASA.json +++ b/resources/profiles/Q Series/filament/QIDI ASA.json @@ -10,14 +10,15 @@ "additional_cooling_fan_speed": ["0"], "chamber_temperatures": ["55"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["40"], "fan_max_speed": ["50"], "fan_min_speed": ["10"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.07"], "filament_flow_ratio": ["0.92"], "filament_max_volumetric_speed": ["16"], "filament_type": ["ASA"], + "impact_strength_z":["4.9"], "nozzle_temperature_initial_layer": ["250"], "nozzle_temperature_range_high": ["280"], "nozzle_temperature_range_low": ["240"], @@ -29,5 +30,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["90"], "textured_plate_temp" : ["90"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/Q Series/filament/QIDI PA12-CF.json b/resources/profiles/Q Series/filament/QIDI PA12-CF.json index ab10019..6fab8e2 100644 --- a/resources/profiles/Q Series/filament/QIDI PA12-CF.json +++ b/resources/profiles/Q Series/filament/QIDI PA12-CF.json @@ -9,14 +9,15 @@ "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["10"], "fan_max_speed": ["40"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["400"], "filament_density": ["1.09"], "filament_flow_ratio": ["0.96"], - "filament_max_volumetric_speed": ["13"], + "filament_max_volumetric_speed": ["8"], "filament_type": ["PA12-CF"], + "impact_strength_z":["5.7"], "nozzle_temperature_initial_layer": ["280"], "nozzle_temperature_range_high": ["300"], "nozzle_temperature_range_low": ["280"], diff --git a/resources/profiles/Q Series/filament/QIDI PAHT-CF.json b/resources/profiles/Q Series/filament/QIDI PAHT-CF.json index 1ea9b63..f82ea0c 100644 --- a/resources/profiles/Q Series/filament/QIDI PAHT-CF.json +++ b/resources/profiles/Q Series/filament/QIDI PAHT-CF.json @@ -9,14 +9,15 @@ "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["10"], "fan_max_speed": ["40"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["400"], "filament_density": ["1.2"], "filament_flow_ratio": ["0.96"], - "filament_max_volumetric_speed": ["14"], + "filament_max_volumetric_speed": ["8"], "filament_type": ["PAHT-CF"], + "impact_strength_z":["13.3"], "nozzle_temperature_initial_layer": ["300"], "nozzle_temperature_range_high": ["320"], "nozzle_temperature_range_low": ["300"], diff --git a/resources/profiles/Q Series/filament/QIDI PAHT-GF.json b/resources/profiles/Q Series/filament/QIDI PAHT-GF.json index 856717a..fe0f07f 100644 --- a/resources/profiles/Q Series/filament/QIDI PAHT-GF.json +++ b/resources/profiles/Q Series/filament/QIDI PAHT-GF.json @@ -9,14 +9,15 @@ "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["10"], "fan_max_speed": ["20"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["400"], "filament_density": ["1.27"], "filament_flow_ratio": ["0.96"], - "filament_max_volumetric_speed": ["14"], + "filament_max_volumetric_speed": ["10"], "filament_type": ["PAHT-GF"], + "impact_strength_z":["13.3"], "nozzle_temperature_initial_layer": ["300"], "nozzle_temperature_range_high": ["320"], "nozzle_temperature_range_low": ["300"], diff --git a/resources/profiles/Q Series/filament/QIDI PC-ABS-FR.json b/resources/profiles/Q Series/filament/QIDI PC-ABS-FR.json index 736b130..b729132 100644 --- a/resources/profiles/Q Series/filament/QIDI PC-ABS-FR.json +++ b/resources/profiles/Q Series/filament/QIDI PC-ABS-FR.json @@ -10,14 +10,15 @@ "additional_cooling_fan_speed": ["0"], "chamber_temperatures": ["55"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["30"], "fan_max_speed": ["40"], "fan_min_speed": ["10"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.19"], "filament_flow_ratio": ["0.92"], "filament_max_volumetric_speed": ["8"], "filament_type": ["PC-ABS-FR"], + "impact_strength_z":["8"], "nozzle_temperature_initial_layer": ["250"], "nozzle_temperature_range_high": ["280"], "nozzle_temperature_range_low": ["240"], @@ -29,5 +30,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["100"], "textured_plate_temp" : ["100"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/Q Series/filament/QIDI PET-CF.json b/resources/profiles/Q Series/filament/QIDI PET-CF.json index d554689..3c510f8 100644 --- a/resources/profiles/Q Series/filament/QIDI PET-CF.json +++ b/resources/profiles/Q Series/filament/QIDI PET-CF.json @@ -9,14 +9,15 @@ "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["10"], "fan_max_speed": ["40"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["800"], "filament_density": ["1.3"], "filament_flow_ratio": ["1"], - "filament_max_volumetric_speed": ["15"], + "filament_max_volumetric_speed": ["8"], "filament_type": ["PET-CF"], + "impact_strength_z":["4.5"], "nozzle_temperature_initial_layer": ["280"], "nozzle_temperature_range_high": ["320"], "nozzle_temperature_range_low": ["280"], diff --git a/resources/profiles/Q Series/filament/QIDI PET-GF.json b/resources/profiles/Q Series/filament/QIDI PET-GF.json index fa6621d..6019c9a 100644 --- a/resources/profiles/Q Series/filament/QIDI PET-GF.json +++ b/resources/profiles/Q Series/filament/QIDI PET-GF.json @@ -9,14 +9,15 @@ "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["10"], "fan_max_speed": ["20"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["800"], "filament_density": ["1.38"], "filament_flow_ratio": ["0.97"], - "filament_max_volumetric_speed": ["15"], + "filament_max_volumetric_speed": ["10"], "filament_type": ["PET-GF"], + "impact_strength_z":["4.5"], "nozzle_temperature_initial_layer": ["300"], "nozzle_temperature_range_high": ["320"], "nozzle_temperature_range_low": ["280"], diff --git a/resources/profiles/Q Series/filament/QIDI PETG Tough.json b/resources/profiles/Q Series/filament/QIDI PETG Tough.json index 3433cb3..4aa575d 100644 --- a/resources/profiles/Q Series/filament/QIDI PETG Tough.json +++ b/resources/profiles/Q Series/filament/QIDI PETG Tough.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFG99", + "filament_id": "GFG99", "setting_id": "GFSG99", "name": "QIDI PETG Tough@Q-Series", "from": "system", @@ -9,13 +9,14 @@ "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["30"], "fan_max_speed": ["40"], "fan_min_speed": ["10"], + "filament_adhesiveness_category": ["300"], "filament_flow_ratio": ["0.95"], "filament_max_volumetric_speed": ["13"], "filament_type": ["PETG"], + "impact_strength_z":["10.6"], "nozzle_temperature_initial_layer": ["240"], "nozzle_temperature_range_high": ["270"], "nozzle_temperature_range_low": ["220"], @@ -27,5 +28,5 @@ "temperature_vitrification": ["70"], "textured_plate_temp_initial_layer" : ["80"], "textured_plate_temp" : ["80"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/Q Series/filament/QIDI PLA Rapido Matte.json b/resources/profiles/Q Series/filament/QIDI PLA Rapido Matte.json index f00eef0..fe0063d 100644 --- a/resources/profiles/Q Series/filament/QIDI PLA Rapido Matte.json +++ b/resources/profiles/Q Series/filament/QIDI PLA Rapido Matte.json @@ -1,16 +1,19 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "GFL99", "setting_id": "GFSL99", "name": "QIDI PLA Rapido Matte@Q-Series", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", "additional_cooling_fan_speed": ["100"], + "filament_adhesiveness_category": ["100"], "filament_density": ["1.42"], "filament_type": ["PLA"], + "impact_strength_z":["6.6"], "nozzle_temperature_range_high": ["240"], "nozzle_temperature_range_low": ["190"], + "overhang_fan_threshold": ["50%"], "temperature_vitrification": ["45"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/Q Series/filament/QIDI PLA Rapido Metal.json b/resources/profiles/Q Series/filament/QIDI PLA Rapido Metal.json index f7a5a92..0f8957d 100644 --- a/resources/profiles/Q Series/filament/QIDI PLA Rapido Metal.json +++ b/resources/profiles/Q Series/filament/QIDI PLA Rapido Metal.json @@ -1,16 +1,19 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "GFL99", "setting_id": "GFSL99", "name": "QIDI PLA Rapido Metal@Q-Series", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "filament_adhesiveness_category": ["100"], "filament_type": ["PLA"], "additional_cooling_fan_speed": ["100"], "filament_density": ["1.20"], + "impact_strength_z":["16.8"], "nozzle_temperature_range_high": ["240"], "nozzle_temperature_range_low": ["190"], + "overhang_fan_threshold": ["50%"], "temperature_vitrification": ["45"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/Q Series/filament/QIDI PLA Rapido Silk.json b/resources/profiles/Q Series/filament/QIDI PLA Rapido Silk.json index ed72dcd..6825178 100644 --- a/resources/profiles/Q Series/filament/QIDI PLA Rapido Silk.json +++ b/resources/profiles/Q Series/filament/QIDI PLA Rapido Silk.json @@ -1,21 +1,24 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "GFL99", "setting_id": "GFSL99", "name": "QIDI PLA Rapido Silk@Q-Series", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", "additional_cooling_fan_speed": ["0"], + "filament_adhesiveness_category": ["100"], "filament_density": ["1.24"], "filament_max_volumetric_speed": ["7.5"], "filament_type": ["PLA"], + "impact_strength_z":["4.6"], "nozzle_temperature_range_high": ["240"], "nozzle_temperature_range_low": ["190"], "nozzle_temperature_initial_layer": ["220"], "nozzle_temperature": ["220"], + "overhang_fan_threshold": ["50%"], "textured_plate_temp_initial_layer" : ["55"], "textured_plate_temp" : ["55"], "temperature_vitrification": ["45"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/Q Series/filament/QIDI PLA Rapido.json b/resources/profiles/Q Series/filament/QIDI PLA Rapido.json index ddc42d7..4411d17 100644 --- a/resources/profiles/Q Series/filament/QIDI PLA Rapido.json +++ b/resources/profiles/Q Series/filament/QIDI PLA Rapido.json @@ -1,15 +1,20 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "GFL99", "setting_id": "GFSL99", "name": "QIDI PLA Rapido@Q-Series", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "cool_plate_temp_initial_layer": ["45"], + "cool_plate_temp": ["45"], + "filament_adhesiveness_category": ["100"], "filament_type": ["PLA"], + "impact_strength_z":["13.8"], "additional_cooling_fan_speed": ["100"], "nozzle_temperature_range_high": ["240"], "nozzle_temperature_range_low": ["190"], + "overhang_fan_threshold": ["50%"], "temperature_vitrification": ["45"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/Q Series/filament/QIDI PLA-CF.json b/resources/profiles/Q Series/filament/QIDI PLA-CF.json index 32d3012..fc99081 100644 --- a/resources/profiles/Q Series/filament/QIDI PLA-CF.json +++ b/resources/profiles/Q Series/filament/QIDI PLA-CF.json @@ -1,24 +1,25 @@ { - "type": "filament", - "filament_id": "GFL98", - "setting_id": "GFSL98", - "name": "QIDI PLA-CF@Q-Series", - "from": "system", - "instantiation": "false", - "inherits": "fdm_filament_common", - "additional_cooling_fan_speed": ["0"], - "enable_overhang_bridge_fan": ["1"], + "type": "filament", + "filament_id": "GFL98", + "setting_id": "GFSL98", + "name": "QIDI PLA-CF@Q-Series", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", + "additional_cooling_fan_speed": ["0"], + "filament_adhesiveness_category": ["100"], "filament_density": ["1.25"], "filament_flow_ratio": ["0.93"], "filament_max_volumetric_speed": ["15"], - "filament_type": ["PLA-CF"], + "filament_type": ["PLA-CF"], + "impact_strength_z":["7.8"], "nozzle_temperature_initial_layer": ["220"], - "nozzle_temperature_range_high": ["250"], + "nozzle_temperature_range_high": ["250"], "nozzle_temperature_range_low": ["210"], "nozzle_temperature": ["220"], "overhang_fan_speed": ["100"], "overhang_fan_threshold": ["50%"], "pressure_advance": ["0.034"], - "temperature_vitrification": ["45"], - "compatible_printers": [] + "temperature_vitrification": ["45"], + "compatible_printers": [] } \ No newline at end of file diff --git a/resources/profiles/Q Series/filament/QIDI PPS-CF.json b/resources/profiles/Q Series/filament/QIDI PPS-CF.json index 189c24f..c9ddbb9 100644 --- a/resources/profiles/Q Series/filament/QIDI PPS-CF.json +++ b/resources/profiles/Q Series/filament/QIDI PPS-CF.json @@ -10,14 +10,15 @@ "additional_cooling_fan_speed": ["0"], "chamber_temperatures": ["60"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["5"], "fan_max_speed": ["30"], "fan_min_speed": ["0"], + "filament_adhesiveness_category": ["801"], "filament_density": ["1.3"], "filament_flow_ratio": ["0.97"], "filament_max_volumetric_speed": ["6"], "filament_type": ["PPS-CF"], + "impact_strength_z":["2.8"], "nozzle_temperature_initial_layer": ["320"], "nozzle_temperature_range_high": ["350"], "nozzle_temperature_range_low": ["300"], diff --git a/resources/profiles/Q Series/filament/QIDI TPU 95A-HF.json b/resources/profiles/Q Series/filament/QIDI TPU 95A-HF.json index 9a41573..0a9e296 100644 --- a/resources/profiles/Q Series/filament/QIDI TPU 95A-HF.json +++ b/resources/profiles/Q Series/filament/QIDI TPU 95A-HF.json @@ -8,11 +8,13 @@ "inherits": "fdm_filament_common", "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], + "filament_adhesiveness_category": ["600"], "filament_density": ["1.15"], "filament_flow_ratio": ["1"], "filament_max_volumetric_speed": ["4"], "filament_type": ["TPU"], "filament_vendor": ["QIDI"], + "impact_strength_z":["88.7"], "nozzle_temperature_initial_layer": ["230"], "nozzle_temperature_range_high": ["250"], "nozzle_temperature_range_low": ["200"], @@ -20,5 +22,5 @@ "pressure_advance": ["0.1"], "slow_down_layer_time": ["8"], "temperature_vitrification": ["30"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/Q Series/filament/QIDI UltraPA-CF25.json b/resources/profiles/Q Series/filament/QIDI UltraPA-CF25.json index ef460ee..7d36298 100644 --- a/resources/profiles/Q Series/filament/QIDI UltraPA-CF25.json +++ b/resources/profiles/Q Series/filament/QIDI UltraPA-CF25.json @@ -9,14 +9,15 @@ "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["5"], "fan_max_speed": ["40"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["400"], "filament_density": ["1.23"], "filament_flow_ratio": ["0.94"], "filament_max_volumetric_speed": ["8"], "filament_type": ["UltraPA-CF25"], + "impact_strength_z":["15.5"], "nozzle_temperature_initial_layer": ["300"], "nozzle_temperature_range_high": ["320"], "nozzle_temperature_range_low": ["300"], diff --git a/resources/profiles/Q Series/filament/QIDI UltraPA.json b/resources/profiles/Q Series/filament/QIDI UltraPA.json index 16b5a39..18648a5 100644 --- a/resources/profiles/Q Series/filament/QIDI UltraPA.json +++ b/resources/profiles/Q Series/filament/QIDI UltraPA.json @@ -10,10 +10,12 @@ "additional_cooling_fan_speed": ["0"], "fan_max_speed": ["40"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["400"], "filament_density": ["1.21"], "filament_flow_ratio": ["0.96"], "filament_max_volumetric_speed": ["4"], "filament_type": ["UltraPA"], + "impact_strength_z":["15.5"], "nozzle_temperature_initial_layer": ["280"], "nozzle_temperature_range_high": ["290"], "nozzle_temperature_range_low": ["250"], @@ -23,5 +25,5 @@ "temperature_vitrification": ["170"], "textured_plate_temp_initial_layer" : ["80"], "textured_plate_temp" : ["80"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/Q Series/filament/QIDI WOOD Rapido.json b/resources/profiles/Q Series/filament/QIDI WOOD Rapido.json index 59b2867..9365917 100644 --- a/resources/profiles/Q Series/filament/QIDI WOOD Rapido.json +++ b/resources/profiles/Q Series/filament/QIDI WOOD Rapido.json @@ -1,19 +1,22 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "GFL99", "setting_id": "GFSL99", "name": "QIDI WOOD Rapido@Q-Series", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", "additional_cooling_fan_speed": ["100"], + "filament_adhesiveness_category": ["100"], "filament_density": ["1.23"], "filament_flow_ratio": ["0.95"], "filament_max_volumetric_speed": ["18"], "filament_type": ["PLA"], + "impact_strength_z":["5.6"], "nozzle_temperature_range_high": ["220"], "nozzle_temperature_range_low": ["190"], + "overhang_fan_threshold": ["50%"], "pressure_advance": ["0.04"], "temperature_vitrification": ["45"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/Q Series/filament/fdm_filament_common.json b/resources/profiles/Q Series/filament/fdm_filament_common.json index f6e0bed..cd1881b 100644 --- a/resources/profiles/Q Series/filament/fdm_filament_common.json +++ b/resources/profiles/Q Series/filament/fdm_filament_common.json @@ -7,6 +7,9 @@ "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], "bed_type": ["Cool Plate"], + "box_temperature_range_high": ["35"], + "box_temperature_range_low": ["0"], + "box_temperature": ["0"], "chamber_temperatures": ["0"], "close_fan_the_first_x_layers": ["1"], "complete_print_exhaust_fan_speed" : ["0"], @@ -14,8 +17,6 @@ "cool_plate_temp" : ["60"], "dont_slow_down_outer_wall" : ["0"], "during_print_exhaust_fan_speed": ["100"], - "enable_overhang_bridge_fan": ["0"], - "enable_pressure_advance": ["1"], "eng_plate_temp_initial_layer" : ["60"], "eng_plate_temp" : ["60"], "fan_cooling_layer_time": ["60"], @@ -44,6 +45,9 @@ "filament_wipe": ["nil"], "filament_z_hop_types": ["nil"], "filament_z_hop": ["nil"], + "filament_ramming_travel_time" : ["0"], + "filament_pre_cooling_temperature" : ["0"], + "filament_ramming_volumetric_speed" : ["-1"], "full_fan_speed_layer": ["0"], "nozzle_temperature_initial_layer": ["210"], "nozzle_temperature": ["210"], diff --git a/resources/profiles/Q Series/machine/Qidi Q1 Pro 0.4 nozzle.json b/resources/profiles/Q Series/machine/Qidi Q1 Pro 0.4 nozzle.json index dc5e471..97551e8 100644 --- a/resources/profiles/Q Series/machine/Qidi Q1 Pro 0.4 nozzle.json +++ b/resources/profiles/Q Series/machine/Qidi Q1 Pro 0.4 nozzle.json @@ -1,35 +1,27 @@ { - "type": "machine", - "setting_id": "GM001", - "name": "Q1 Pro 0.4 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_q_common", - "printer_model": "Q1 Pro", - "gcode_flavor": "klipper", - "default_print_profile": "0.20mm Standard @Q1 Pro", - "printer_settings_id": "Qidi", + "type": "machine", + "setting_id": "GM001", + "name": "Q1 Pro 0.4 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_q_common", + "printer_model": "Q1 Pro", + "gcode_flavor": "klipper", + "default_print_profile": "0.20mm Standard @Q1 Pro", + "printer_settings_id": "Qidi", "bed_exclude_area": ["25x245","25x240","115x240","115x245","25x245","25x245","25x245","25x245","208x245","208x240","245x240","245x245"], - "change_filament_gcode": "G1 E{retraction_distances_when_cut[previous_extruder]} F[old_filament_e_feedrate]", - "default_filament_profile": ["QIDI PLA Rapido"], - "deretraction_speed": ["0"], - "extruder_clearance_height_to_lid": "120", + "change_filament_gcode": "G1 E{retraction_distances_when_cut[previous_extruder]} F[old_filament_e_feedrate]", + "default_filament_profile": ["QIDI PLA Rapido"], + "extruder_clearance_height_to_lid": "120", "extruder_clearance_height_to_rod": "40", "extruder_clearance_max_radius": "70", - "machine_end_gcode": "M141 S0\nM104 S0\nM140 S0\nG1 E-3 F1800\nG0 Z{max_layer_z + 3} F600\nG0 X0 Y0 F12000\n{if max_layer_z < max_print_height / 2}G1 Z{max_print_height / 2 + 10} F600{else}G1 Z{min(max_print_height, max_layer_z + 3)}{endif}", - "machine_pause_gcode": "M0", + "machine_end_gcode": "M141 S0\nM104 S0\nM140 S0\nG1 E-3 F1800\nG0 Z{max_layer_z + 3} F600\nG0 X0 Y0 F12000\n{if max_layer_z < max_print_height / 2}G1 Z{max_print_height / 2 + 10} F600{else}G1 Z{min(max_print_height, max_layer_z + 3)}{endif}", + "machine_pause_gcode": "M0", "machine_start_gcode": "PRINT_START BED=[bed_temperature_initial_layer_single] HOTEND=[nozzle_temperature_initial_layer] CHAMBER=[chamber_temperatures]\nM83\nM140 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nM141 S[chamber_temperatures]\nG4 P3000\nT[initial_tool]\nG0 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0)} Z5 F6000\nG0 Z[initial_layer_print_height] F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0], first_layer_print_min[0] + 80))} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1]-5, first_layer_print_min[1] + 80) - 85),0) + 85} E{83 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 3} E{82 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 3} Z0\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 6}\nG1 Z1 F600", - "max_layer_height": ["0.28"], - "min_layer_height": ["0.08"], - "nozzle_diameter": ["0.4"], - "printable_area": ["0x0","245x0","245x245","0x245"], - "printable_height": "240", - "retract_before_wipe": ["0%"], - "retract_length_toolchange": ["2"], - "retract_lift_below":["239"], - "retraction_length": ["0.8"], - "retraction_minimum_travel": ["1"], + "nozzle_diameter": ["0.4"], + "printable_area": ["0x0","245x0","245x245","0x245"], + "printable_height": "240", + "retract_lift_below": ["239"], "thumbnail_size": ["160x160/PNG","112x112/PNG"], - "layer_change_gcode": "{if timelapse_type == 1} ; timelapse with wipe tower\nG92 E0\nG1 E-[retraction_length] F1800\nG2 Z{layer_z + 0.4} I0.86 J0.86 P1 F20000 ; spiral lift a little\nG1 Y235 F20000\nG1 X97 F20000\n{if layer_z <=25}\nG1 Z25\n{endif}\nG1 Y254 F2000\nG92 E0\nM400\nTIMELAPSE_TAKE_FRAME\nG1 E[retraction_length] F300\nG1 X85 F2000\nG1 X97 F2000\nG1 Y220 F2000\n{if layer_z <=25}\nG1 Z[layer_z]\n{endif}\n{elsif timelapse_type == 0} ; timelapse without wipe tower\nTIMELAPSE_TAKE_FRAME\n{endif}\nG92 E0", - "wipe_distance": ["2"] + "layer_change_gcode": "{if timelapse_type == 1} ; timelapse with wipe tower\nG92 E0\nG1 E-[retraction_length] F1800\nG2 Z{layer_z + 0.4} I0.86 J0.86 P1 F20000 ; spiral lift a little\nG1 Y235 F20000\nG1 X97 F20000\n{if layer_z <=25}\nG1 Z25\n{endif}\nG1 Y254 F2000\nG92 E0\nM400\nTIMELAPSE_TAKE_FRAME\nG1 E[retraction_length] F300\nG1 X85 F2000\nG1 X97 F2000\nG1 Y220 F2000\n{if layer_z <=25}\nG1 Z[layer_z]\n{endif}\n{elsif timelapse_type == 0} ; timelapse without wipe tower\nTIMELAPSE_TAKE_FRAME\n{endif}\nG92 E0" } \ No newline at end of file diff --git a/resources/profiles/Q Series/machine/Qidi Q1 Pro 0.8 nozzle.json b/resources/profiles/Q Series/machine/Qidi Q1 Pro 0.8 nozzle.json index 5b9afad..7b01fbb 100644 --- a/resources/profiles/Q Series/machine/Qidi Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Q Series/machine/Qidi Q1 Pro 0.8 nozzle.json @@ -12,6 +12,6 @@ "nozzle_diameter": ["0.8"], "printer_model": "Q1 Pro", "printer_variant": "0.8", - "retract_length_toolchange": ["2"], + "retract_length_toolchange": ["3"], "retraction_length": ["3"] } \ No newline at end of file diff --git a/resources/profiles/Q Series/machine/fdm_q_common.json b/resources/profiles/Q Series/machine/fdm_q_common.json index 7adf471..64cad00 100644 --- a/resources/profiles/Q Series/machine/fdm_q_common.json +++ b/resources/profiles/Q Series/machine/fdm_q_common.json @@ -8,18 +8,19 @@ "before_layer_change_gcode": "", "change_filament_gcode": "", "default_print_profile": "0.20mm Standard @Q1 Pro", - "deretraction_speed": ["40"], + "deretraction_speed": ["30"], "extruder_clearance_height_to_lid": "140", "extruder_clearance_height_to_rod": "36", "extruder_clearance_radius": "65", "extruder_colour": ["#FCE94F"], "extruder_offset": ["0x0"], - "gcode_flavor": "klipper", + "gcode_flavor": "klipper", "layer_change_gcode": "", - "machine_end_gcode": "M141 S0\nM104 S0\nM140 S0\nG1 E-3 F1800\nG0 Z{max_layer_z + 3} F600\nG0 X0 Y0 F12000\n{if max_layer_z < max_print_height / 2}G1 Z{max_print_height / 2 + 10} F600{else}G1 Z{min(max_print_height, max_layer_z + 3)}{endif}", + "machine_end_gcode": "M141 S0\nM104 S0\nM140 S0\nG1 E-3 F1800\nG0 Z{max_layer_z + 3} F600\nG0 X0 Y0 F12000\n{if max_layer_z < max_print_height / 2}G1 Z{max_print_height / 2 + 10} F600{else}G1 Z{min(max_print_height, max_layer_z + 3)}{endif}", "machine_max_acceleration_e": ["5000"], - "machine_max_acceleration_extruding": ["20000"], - "machine_max_acceleration_retracting": ["5000"], + "machine_max_acceleration_extruding": ["20000", "20000"], + "machine_max_acceleration_retracting": ["5000", "5000"], + "machine_max_acceleration_travel": ["9000", "9000"], "machine_max_acceleration_x": ["20000"], "machine_max_acceleration_y": ["20000"], "machine_max_acceleration_z": ["500"], @@ -31,14 +32,15 @@ "machine_max_speed_x": ["600"], "machine_max_speed_y": ["600"], "machine_max_speed_z": ["10"], - "machine_min_extruding_rate": ["0"], - "machine_min_travel_rate": ["0"], - "machine_pause_gcode": "M0", + "machine_min_extruding_rate": ["0", "0"], + "machine_min_travel_rate": ["0", "0"], + "machine_pause_gcode": "M0", "machine_start_gcode": "PRINT_START\nG28\nM141 S0\nG0 Z50 F600\nM190 S[bed_temperature_initial_layer_single]\nG28 Z\nG29; mesh bed leveling ,comment this code to close it\nG0 X0 Y0 Z50 F6000\nM109 S[nozzle_temperature_initial_layer]\nM106 P3 S255\nM83\nG4 P3000\nG0 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0)} Z5 F6000\nG0 Z[initial_layer_print_height] F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0], first_layer_print_min[0] + 80))} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 85} E{83 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 3} E{82 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 12} E{-10 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 E{10 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\n", - "max_layer_height": ["0.32"], + "machine_switch_extruder_time": "0", + "max_layer_height": ["0.28"], "min_layer_height": ["0.08"], "nozzle_diameter": ["0.4"], - "nozzle_type": "hardened_steel", + "nozzle_type": ["stainless_steel"], "printable_height": "250", "printer_settings_id": "", "printer_structure": "corexy", @@ -48,13 +50,14 @@ "retract_restart_extra_toolchange": ["0"], "retract_restart_extra": ["0"], "retract_when_changing_layer": ["1"], - "retraction_length": ["1"], - "retraction_minimum_travel": ["2"], + "retraction_length": ["0.8"], + "retraction_minimum_travel": ["1"], "retraction_speed": ["30"], - "scan_first_layer": "0", + "scan_first_layer": "0", "silent_mode": "0", "single_extruder_multi_material": "1", "support_air_filtration": ["1"], + "support_box_temp_control": "0", "support_chamber_temp_control": "1", "thumbnail_size": ["380x380","210x210","110x110"], "wipe": ["1"], diff --git a/resources/profiles/Q Series/process/0.06mm High Quality @Q1 Pro 0.2 nozzle.json b/resources/profiles/Q Series/process/0.06mm High Quality @Q1 Pro 0.2 nozzle.json index c6a8d83..93b1cce 100644 --- a/resources/profiles/Q Series/process/0.06mm High Quality @Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Q Series/process/0.06mm High Quality @Q1 Pro 0.2 nozzle.json @@ -5,30 +5,32 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", - "default_acceleration": "4000", + "default_acceleration": ["4000"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.06", "line_width": "0.22", - "outer_wall_acceleration": "2000", + "outer_wall_acceleration": ["2000"], "outer_wall_line_width": "0.22", - "outer_wall_speed": "60", + "outer_wall_speed": ["60"], "sparse_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.06", "support_line_width": "0.22", "support_top_z_distance": "0.06", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["Q1 Pro 0.2 nozzle"] } diff --git a/resources/profiles/Q Series/process/0.06mm Standard @Q1 Pro 0.2 nozzle.json b/resources/profiles/Q Series/process/0.06mm Standard @Q1 Pro 0.2 nozzle.json index cef7857..4f902d5 100644 --- a/resources/profiles/Q Series/process/0.06mm Standard @Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Q Series/process/0.06mm Standard @Q1 Pro 0.2 nozzle.json @@ -5,26 +5,28 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.06", "line_width": "0.22", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.06", "support_line_width": "0.22", "support_top_z_distance": "0.06", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["Q1 Pro 0.2 nozzle"] } diff --git a/resources/profiles/Q Series/process/0.08mm Extra Fine @Q1 Pro.json b/resources/profiles/Q Series/process/0.08mm Extra Fine @Q1 Pro.json index 6db21b2..b801701 100644 --- a/resources/profiles/Q Series/process/0.08mm Extra Fine @Q1 Pro.json +++ b/resources/profiles/Q Series/process/0.08mm Extra Fine @Q1 Pro.json @@ -1,28 +1,28 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.08mm Extra Fine @Q1 Pro", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_common", + "type": "process", + "setting_id": "GP004", + "name": "0.08mm Extra Fine @Q1 Pro", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "7", "bottom_shell_layers": "7", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "gap_infill_speed": "350", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "350", - "internal_solid_infill_speed": "350", + "gap_infill_speed": ["350"], + "inner_wall_speed": ["350"], + "internal_solid_infill_speed": ["350"], "ironing_flow": "8%", - "layer_height": "0.08", - "outer_wall_speed": "200", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "10", - "sparse_infill_speed": "450", + "layer_height": "0.08", + "outer_wall_speed": ["200"], + "overhang_1_4_speed": ["60"], + "overhang_2_4_speed": ["30"], + "overhang_3_4_speed": ["10"], + "sparse_infill_speed": ["450"], "support_bottom_z_distance": "0.08", "support_threshold_angle": "15", "support_top_z_distance": "0.08", + "top_color_penetration_layers": "9", "top_shell_layers": "9", "compatible_printers": ["Q1 Pro 0.4 nozzle"] } diff --git a/resources/profiles/Q Series/process/0.08mm High Quality @Q1 Pro 0.2 nozzle.json b/resources/profiles/Q Series/process/0.08mm High Quality @Q1 Pro 0.2 nozzle.json index a6c2aa6..58a3d8d 100644 --- a/resources/profiles/Q Series/process/0.08mm High Quality @Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Q Series/process/0.08mm High Quality @Q1 Pro 0.2 nozzle.json @@ -5,30 +5,32 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", - "default_acceleration": "4000", + "default_acceleration": ["4000"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.08", "line_width": "0.22", - "outer_wall_acceleration": "2000", + "outer_wall_acceleration": ["2000"], "outer_wall_line_width": "0.22", - "outer_wall_speed": "60", + "outer_wall_speed": ["60"], "sparse_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.08", "support_line_width": "0.22", "support_top_z_distance": "0.08", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["Q1 Pro 0.2 nozzle"] } diff --git a/resources/profiles/Q Series/process/0.08mm High Quality @Q1 Pro.json b/resources/profiles/Q Series/process/0.08mm High Quality @Q1 Pro.json index 227584e..2ed3f49 100644 --- a/resources/profiles/Q Series/process/0.08mm High Quality @Q1 Pro.json +++ b/resources/profiles/Q Series/process/0.08mm High Quality @Q1 Pro.json @@ -5,28 +5,27 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "7", "bottom_shell_layers": "7", "bridge_flow": "1", - "default_acceleration": "4000", + "default_acceleration": ["4000"], "elefant_foot_compensation": "0.15", - "gap_infill_speed": "210", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "120", - "internal_solid_infill_speed": "150", + "gap_infill_speed": ["210"], + "inner_wall_speed": ["120"], "ironing_flow": "8%", "layer_height": "0.08", - "outer_wall_acceleration": "2000", - "outer_wall_speed": "60", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "10", + "outer_wall_acceleration": ["2000"], + "outer_wall_speed": ["60"], + "overhang_1_4_speed": ["60"], + "overhang_2_4_speed": ["30"], + "overhang_3_4_speed": ["10"], "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "150", + "sparse_infill_speed": ["150"], "support_bottom_z_distance": "0.08", "support_threshold_angle": "15", "support_top_z_distance": "0.08", + "top_color_penetration_layers": "9", "top_shell_layers": "9", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["Q1 Pro 0.4 nozzle"] } diff --git a/resources/profiles/Q Series/process/0.08mm Standard @Q1 Pro 0.2 nozzle.json b/resources/profiles/Q Series/process/0.08mm Standard @Q1 Pro 0.2 nozzle.json index 605c122..30dee24 100644 --- a/resources/profiles/Q Series/process/0.08mm Standard @Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Q Series/process/0.08mm Standard @Q1 Pro 0.2 nozzle.json @@ -5,26 +5,28 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.08", "line_width": "0.22", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.08", "support_line_width": "0.22", "support_top_z_distance": "0.08", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["Q1 Pro 0.2 nozzle"] } diff --git a/resources/profiles/Q Series/process/0.10mm High Quality @Q1 Pro 0.2 nozzle.json b/resources/profiles/Q Series/process/0.10mm High Quality @Q1 Pro 0.2 nozzle.json index 8849444..09c5aa0 100644 --- a/resources/profiles/Q Series/process/0.10mm High Quality @Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Q Series/process/0.10mm High Quality @Q1 Pro 0.2 nozzle.json @@ -5,30 +5,32 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", - "default_acceleration": "4000", + "default_acceleration": ["4000"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.1", "line_width": "0.22", - "outer_wall_acceleration": "2000", + "outer_wall_acceleration": ["2000"], "outer_wall_line_width": "0.22", - "outer_wall_speed": "60", + "outer_wall_speed": ["60"], "sparse_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.1", "support_line_width": "0.22", "support_top_z_distance": "0.1", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["Q1 Pro 0.2 nozzle"] } diff --git a/resources/profiles/Q Series/process/0.10mm Standard @Q1 Pro 0.2 nozzle.json b/resources/profiles/Q Series/process/0.10mm Standard @Q1 Pro 0.2 nozzle.json index 242f3f0..06df36b 100644 --- a/resources/profiles/Q Series/process/0.10mm Standard @Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Q Series/process/0.10mm Standard @Q1 Pro 0.2 nozzle.json @@ -5,26 +5,28 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.1", "line_width": "0.22", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.1", "support_line_width": "0.22", "support_top_z_distance": "0.1", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["Q1 Pro 0.2 nozzle"] } diff --git a/resources/profiles/Q Series/process/0.12mm Fine @Q1 Pro.json b/resources/profiles/Q Series/process/0.12mm Fine @Q1 Pro.json index 6aa8b5b..8e28411 100644 --- a/resources/profiles/Q Series/process/0.12mm Fine @Q1 Pro.json +++ b/resources/profiles/Q Series/process/0.12mm Fine @Q1 Pro.json @@ -5,23 +5,23 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "gap_infill_speed": "350", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "350", - "internal_solid_infill_speed": "350", + "gap_infill_speed": ["350"], + "inner_wall_speed": ["350"], + "internal_solid_infill_speed": ["350"], "layer_height": "0.12", - "outer_wall_speed": "200", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "10", - "sparse_infill_speed": "430", + "outer_wall_speed": ["200"], + "overhang_1_4_speed": ["60"], + "overhang_2_4_speed": ["30"], + "overhang_3_4_speed": ["10"], + "sparse_infill_speed": ["430"], "support_bottom_z_distance": "0.12", "support_threshold_angle": "20", "support_top_z_distance": "0.12", + "top_color_penetration_layers": "5", "top_shell_layers": "5", "top_shell_thickness": "0.6", "compatible_printers": ["Q1 Pro 0.4 nozzle"] diff --git a/resources/profiles/Q Series/process/0.12mm High Quality @Q1 Pro.json b/resources/profiles/Q Series/process/0.12mm High Quality @Q1 Pro.json index 258a229..55cf32b 100644 --- a/resources/profiles/Q Series/process/0.12mm High Quality @Q1 Pro.json +++ b/resources/profiles/Q Series/process/0.12mm High Quality @Q1 Pro.json @@ -5,28 +5,27 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", - "default_acceleration": "4000", + "default_acceleration": ["4000"], "elefant_foot_compensation": "0.15", - "gap_infill_speed": "230", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "150", - "internal_solid_infill_speed": "180", + "gap_infill_speed": ["230"], + "internal_solid_infill_speed": ["180"], "layer_height": "0.12", - "outer_wall_acceleration": "2000", - "outer_wall_speed": "60", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "10", + "outer_wall_acceleration": ["2000"], + "outer_wall_speed": ["60"], + "overhang_1_4_speed": ["60"], + "overhang_2_4_speed": ["30"], + "overhang_3_4_speed": ["10"], "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "180", + "sparse_infill_speed": ["180"], "support_bottom_z_distance": "0.12", "support_threshold_angle": "20", "support_top_z_distance": "0.12", + "top_color_penetration_layers": "5", "top_shell_layers": "5", "top_shell_thickness": "0.6", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["Q1 Pro 0.4 nozzle"] } diff --git a/resources/profiles/Q Series/process/0.12mm Standard @Q1 Pro 0.2 nozzle.json b/resources/profiles/Q Series/process/0.12mm Standard @Q1 Pro 0.2 nozzle.json index e8d5577..aca7ff0 100644 --- a/resources/profiles/Q Series/process/0.12mm Standard @Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Q Series/process/0.12mm Standard @Q1 Pro 0.2 nozzle.json @@ -5,26 +5,28 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.12", "line_width": "0.22", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.12", "support_line_width": "0.22", "support_top_z_distance": "0.12", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["Q1 Pro 0.2 nozzle"] } diff --git a/resources/profiles/Q Series/process/0.14mm Standard @Q1 Pro 0.2 nozzle.json b/resources/profiles/Q Series/process/0.14mm Standard @Q1 Pro 0.2 nozzle.json index 6c140bf..b92d062 100644 --- a/resources/profiles/Q Series/process/0.14mm Standard @Q1 Pro 0.2 nozzle.json +++ b/resources/profiles/Q Series/process/0.14mm Standard @Q1 Pro 0.2 nozzle.json @@ -5,26 +5,28 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.14", "line_width": "0.22", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.14", "support_line_width": "0.22", "support_top_z_distance": "0.14", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["Q1 Pro 0.2 nozzle"] } diff --git a/resources/profiles/Q Series/process/0.16mm High Quality @Q1 Pro.json b/resources/profiles/Q Series/process/0.16mm High Quality @Q1 Pro.json index c304384..200014d 100644 --- a/resources/profiles/Q Series/process/0.16mm High Quality @Q1 Pro.json +++ b/resources/profiles/Q Series/process/0.16mm High Quality @Q1 Pro.json @@ -2,31 +2,30 @@ "type": "process", "setting_id": "GP004", "name": "0.16mm High Quality @Q1 Pro", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_common", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "4", "bottom_shell_layers": "4", "bridge_flow": "1", - "default_acceleration": "4000", + "default_acceleration": ["4000"], "elefant_foot_compensation": "0.15", - "gap_infill_speed": "250", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "150", - "internal_solid_infill_speed": "200", + "gap_infill_speed": ["250"], + "internal_solid_infill_speed": ["200"], "layer_height": "0.16", - "outer_wall_acceleration": "2000", - "outer_wall_speed": "60", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "10", + "outer_wall_acceleration": ["2000"], + "outer_wall_speed": ["60"], + "overhang_1_4_speed": ["60"], + "overhang_2_4_speed": ["30"], + "overhang_3_4_speed": ["10"], "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "200", + "sparse_infill_speed": ["200"], "support_bottom_z_distance": "0.16", "support_threshold_angle": "25", "support_top_z_distance": "0.16", + "top_color_penetration_layers": "6", "top_shell_layers": "6", "top_shell_thickness": "1.0", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["Q1 Pro 0.4 nozzle"] } diff --git a/resources/profiles/Q Series/process/0.16mm Optimal @Q1 Pro.json b/resources/profiles/Q Series/process/0.16mm Optimal @Q1 Pro.json index 669af6d..5419a4e 100644 --- a/resources/profiles/Q Series/process/0.16mm Optimal @Q1 Pro.json +++ b/resources/profiles/Q Series/process/0.16mm Optimal @Q1 Pro.json @@ -2,26 +2,26 @@ "type": "process", "setting_id": "GP004", "name": "0.16mm Optimal @Q1 Pro", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_common", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "4", "bottom_shell_layers": "4", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "gap_infill_speed": "300", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "300", - "internal_solid_infill_speed": "300", + "gap_infill_speed": ["300"], + "inner_wall_speed": ["300"], + "internal_solid_infill_speed": ["300"], "layer_height": "0.16", - "outer_wall_speed": "200", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "10", - "sparse_infill_speed": "330", + "outer_wall_speed": ["200"], + "overhang_1_4_speed": ["60"], + "overhang_2_4_speed": ["30"], + "overhang_3_4_speed": ["10"], + "sparse_infill_speed": ["330"], "support_bottom_z_distance": "0.16", "support_threshold_angle": "25", "support_top_z_distance": "0.16", + "top_color_penetration_layers": "6", "top_shell_layers": "6", "top_shell_thickness": "1.0", "compatible_printers": ["Q1 Pro 0.4 nozzle"] diff --git a/resources/profiles/Q Series/process/0.18mm Standard @Q1 Pro 0.6 nozzle.json b/resources/profiles/Q Series/process/0.18mm Standard @Q1 Pro 0.6 nozzle.json index 4fb0fae..d733159 100644 --- a/resources/profiles/Q Series/process/0.18mm Standard @Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Q Series/process/0.18mm Standard @Q1 Pro 0.6 nozzle.json @@ -6,24 +6,24 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.62", "internal_solid_infill_line_width": "0.62", "layer_height": "0.18", "line_width": "0.62", "outer_wall_line_width": "0.62", - "overhang_3_4_speed": "15", + "overhang_3_4_speed": ["15"], "sparse_infill_line_width": "0.62", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.18", "support_line_width": "0.62", "support_top_z_distance": "0.18", "top_surface_line_width": "0.62", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["Q1 Pro 0.6 nozzle"] } diff --git a/resources/profiles/Q Series/process/0.20mm Standard @Q1 Pro.json b/resources/profiles/Q Series/process/0.20mm Standard @Q1 Pro.json index dc23c71..1e72cd9 100644 --- a/resources/profiles/Q Series/process/0.20mm Standard @Q1 Pro.json +++ b/resources/profiles/Q Series/process/0.20mm Standard @Q1 Pro.json @@ -1,20 +1,18 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.20mm Standard @Q1 Pro", - "from": "system", - "inherits": "fdm_process_common", - "instantiation": "true", + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Standard @Q1 Pro", + "from": "system", + "inherits": "fdm_process_common", + "instantiation": "true", "bridge_flow": "1", - "elefant_foot_compensation": "0.15", - "gap_infill_speed": "250", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "300", - "internal_solid_infill_speed": "250", - "outer_wall_speed": "200", - "sparse_infill_speed": "270", + "elefant_foot_compensation": "0.15", + "gap_infill_speed": ["250"], + "inner_wall_speed": ["300"], + "internal_solid_infill_speed": ["250"], + "outer_wall_speed": ["200"], + "top_color_penetration_layers": "5", "top_shell_layers": "5", "top_shell_thickness": "1.0", - "compatible_printers": ["Q1 Pro 0.4 nozzle"] + "compatible_printers": ["Q1 Pro 0.4 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/Q Series/process/0.20mm Strength @Q1 Pro.json b/resources/profiles/Q Series/process/0.20mm Strength @Q1 Pro.json index ff3963a..7d48ba0 100644 --- a/resources/profiles/Q Series/process/0.20mm Strength @Q1 Pro.json +++ b/resources/profiles/Q Series/process/0.20mm Strength @Q1 Pro.json @@ -1,22 +1,20 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.20mm Strength @Q1 Pro", - "from": "system", - "inherits": "fdm_process_common", - "instantiation": "true", + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Strength @Q1 Pro", + "from": "system", + "inherits": "fdm_process_common", + "instantiation": "true", "bridge_flow": "1", - "elefant_foot_compensation": "0.15", - "gap_infill_speed": "250", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "300", - "internal_solid_infill_speed": "250", - "outer_wall_speed": "60", + "elefant_foot_compensation": "0.15", + "gap_infill_speed": ["250"], + "inner_wall_speed": ["300"], + "internal_solid_infill_speed": ["250"], + "outer_wall_speed": ["60"], "sparse_infill_density": "25%", - "sparse_infill_speed": "270", + "top_color_penetration_layers": "5", "top_shell_layers": "5", "top_shell_thickness": "1.0", "wall_loops": "6", - "compatible_printers": ["Q1 Pro 0.4 nozzle"] + "compatible_printers": ["Q1 Pro 0.4 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/Q Series/process/0.24mm Draft @Q1 Pro.json b/resources/profiles/Q Series/process/0.24mm Draft @Q1 Pro.json index f1fcffb..a651ce9 100644 --- a/resources/profiles/Q Series/process/0.24mm Draft @Q1 Pro.json +++ b/resources/profiles/Q Series/process/0.24mm Draft @Q1 Pro.json @@ -1,23 +1,22 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.24mm Draft @Q1 Pro", - "from": "system", - "inherits": "fdm_process_common", - "instantiation": "true", + "type": "process", + "setting_id": "GP004", + "name": "0.24mm Draft @Q1 Pro", + "from": "system", + "inherits": "fdm_process_common", + "instantiation": "true", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "gap_infill_speed": "230", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "230", - "internal_solid_infill_speed": "230", - "layer_height": "0.24", - "outer_wall_speed": "200", - "sparse_infill_speed": "230", + "gap_infill_speed": ["230"], + "inner_wall_speed": ["230"], + "internal_solid_infill_speed": ["230"], + "layer_height": "0.24", + "outer_wall_speed": ["200"], + "sparse_infill_speed": ["230"], "support_threshold_angle": "35", + "top_color_penetration_layers": "4", "top_shell_layers": "4", "top_shell_thickness": "1.0", "top_surface_line_width": "0.45", - "compatible_printers": ["Q1 Pro 0.4 nozzle"] + "compatible_printers": ["Q1 Pro 0.4 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/Q Series/process/0.24mm Standard @Q1 Pro 0.6 nozzle.json b/resources/profiles/Q Series/process/0.24mm Standard @Q1 Pro 0.6 nozzle.json index 9a4464b..79098f9 100644 --- a/resources/profiles/Q Series/process/0.24mm Standard @Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Q Series/process/0.24mm Standard @Q1 Pro 0.6 nozzle.json @@ -6,22 +6,22 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.62", "internal_solid_infill_line_width": "0.62", "layer_height": "0.24", "line_width": "0.62", "outer_wall_line_width": "0.62", - "overhang_3_4_speed": "15", + "overhang_3_4_speed": ["15"], "sparse_infill_line_width": "0.62", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.62", "top_surface_line_width": "0.62", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["Q1 Pro 0.6 nozzle"] } diff --git a/resources/profiles/Q Series/process/0.24mm Standard @Q1 Pro 0.8 nozzle.json b/resources/profiles/Q Series/process/0.24mm Standard @Q1 Pro 0.8 nozzle.json index 6356154..095a9fa 100644 --- a/resources/profiles/Q Series/process/0.24mm Standard @Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Q Series/process/0.24mm Standard @Q1 Pro 0.8 nozzle.json @@ -6,24 +6,24 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.82", "internal_solid_infill_line_width": "0.82", "layer_height": "0.24", "line_width": "0.82", "outer_wall_line_width": "0.82", - "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5", + "overhang_3_4_speed": ["25"], + "overhang_4_4_speed": ["5"], "sparse_infill_line_width": "0.82", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.82", "top_surface_line_width": "0.82", "top_surface_pattern": "monotonic", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["Q1 Pro 0.8 nozzle"] } diff --git a/resources/profiles/Q Series/process/0.28mm Extra Draft @Q1 Pro.json b/resources/profiles/Q Series/process/0.28mm Extra Draft @Q1 Pro.json index 9be7984..6b9b3d4 100644 --- a/resources/profiles/Q Series/process/0.28mm Extra Draft @Q1 Pro.json +++ b/resources/profiles/Q Series/process/0.28mm Extra Draft @Q1 Pro.json @@ -1,23 +1,22 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.28mm Extra Draft @Q1 Pro", - "from": "system", - "inherits": "fdm_process_common", - "instantiation": "true", + "type": "process", + "setting_id": "GP004", + "name": "0.28mm Extra Draft @Q1 Pro", + "from": "system", + "inherits": "fdm_process_common", + "instantiation": "true", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "gap_infill_speed": "200", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "200", - "internal_solid_infill_speed": "200", - "layer_height": "0.28", - "outer_wall_speed": "200", - "sparse_infill_speed": "200", + "gap_infill_speed": ["200"], + "inner_wall_speed": ["200"], + "internal_solid_infill_speed": ["200"], + "layer_height": "0.28", + "outer_wall_speed": ["200"], + "sparse_infill_speed": ["200"], "support_threshold_angle": "40", + "top_color_penetration_layers": "4", "top_shell_layers": "4", "top_shell_thickness": "1.0", "top_surface_line_width": "0.45", - "compatible_printers": ["Q1 Pro 0.4 nozzle"] + "compatible_printers": ["Q1 Pro 0.4 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/Q Series/process/0.30mm Standard @Q1 Pro 0.6 nozzle.json b/resources/profiles/Q Series/process/0.30mm Standard @Q1 Pro 0.6 nozzle.json index 8f18703..9647386 100644 --- a/resources/profiles/Q Series/process/0.30mm Standard @Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Q Series/process/0.30mm Standard @Q1 Pro 0.6 nozzle.json @@ -6,22 +6,22 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.62", "internal_solid_infill_line_width": "0.62", "layer_height": "0.3", "line_width": "0.62", "outer_wall_line_width": "0.62", - "overhang_3_4_speed": "15", + "overhang_3_4_speed": ["15"], "sparse_infill_line_width": "0.62", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.62", "top_surface_line_width": "0.62", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["Q1 Pro 0.6 nozzle"] } diff --git a/resources/profiles/Q Series/process/0.30mm Strength @Q1 Pro 0.6 nozzle.json b/resources/profiles/Q Series/process/0.30mm Strength @Q1 Pro 0.6 nozzle.json index 6445c4d..491059f 100644 --- a/resources/profiles/Q Series/process/0.30mm Strength @Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Q Series/process/0.30mm Strength @Q1 Pro 0.6 nozzle.json @@ -6,24 +6,24 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.62", "internal_solid_infill_line_width": "0.62", "layer_height": "0.3", "line_width": "0.62", "outer_wall_line_width": "0.62", - "overhang_3_4_speed": "15", + "overhang_3_4_speed": ["15"], "sparse_infill_density": "25%", "sparse_infill_line_width": "0.62", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.62", "top_surface_line_width": "0.62", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["Q1 Pro 0.6 nozzle"] } diff --git a/resources/profiles/Q Series/process/0.32mm Standard @Q1 Pro 0.8 nozzle.json b/resources/profiles/Q Series/process/0.32mm Standard @Q1 Pro 0.8 nozzle.json index 47ced17..44ad38a 100644 --- a/resources/profiles/Q Series/process/0.32mm Standard @Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Q Series/process/0.32mm Standard @Q1 Pro 0.8 nozzle.json @@ -1,29 +1,29 @@ { - "type": "process", - "setting_id": "GP033", - "name": "0.32mm Standard @Q1 Pro 0.8 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_common", - "bridge_flow": "1", - "bridge_speed": "30", - "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", - "initial_layer_line_width": "0.82", - "initial_layer_print_height": "0.4", - "initial_layer_speed": "35", - "inner_wall_line_width": "0.82", - "internal_solid_infill_line_width": "0.82", - "layer_height": "0.32", - "line_width": "0.82", - "outer_wall_line_width": "0.82", - "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5", - "sparse_infill_line_width": "0.82", - "sparse_infill_speed": "100", - "support_line_width": "0.82", - "top_surface_line_width": "0.82", - "top_surface_pattern": "monotonic", - "top_surface_speed": "150", - "compatible_printers": ["Q1 Pro 0.8 nozzle"] + "type": "process", + "setting_id": "GP033", + "name": "0.32mm Standard @Q1 Pro 0.8 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "bridge_flow": "1", + "bridge_speed": ["30"], + "elefant_foot_compensation": "0.15", + "initial_layer_infill_speed": ["55"], + "initial_layer_line_width": "0.82", + "initial_layer_print_height": "0.4", + "initial_layer_speed": ["35"], + "inner_wall_line_width": "0.82", + "internal_solid_infill_line_width": "0.82", + "layer_height": "0.32", + "line_width": "0.82", + "outer_wall_line_width": "0.82", + "overhang_3_4_speed": ["25"], + "overhang_4_4_speed": ["5"], + "sparse_infill_line_width": "0.82", + "sparse_infill_speed": ["100"], + "support_line_width": "0.82", + "top_surface_line_width": "0.82", + "top_surface_pattern": "monotonic", + "top_surface_speed": ["150"], + "compatible_printers": ["Q1 Pro 0.8 nozzle"] } diff --git a/resources/profiles/Q Series/process/0.36mm Standard @Q1 Pro 0.6 nozzle.json b/resources/profiles/Q Series/process/0.36mm Standard @Q1 Pro 0.6 nozzle.json index 7bf4732..2afc627 100644 --- a/resources/profiles/Q Series/process/0.36mm Standard @Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Q Series/process/0.36mm Standard @Q1 Pro 0.6 nozzle.json @@ -6,22 +6,22 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.62", "internal_solid_infill_line_width": "0.62", "layer_height": "0.36", "line_width": "0.62", "outer_wall_line_width": "0.62", - "overhang_3_4_speed": "15", + "overhang_3_4_speed": ["15"], "sparse_infill_line_width": "0.62", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.62", "top_surface_line_width": "0.62", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["Q1 Pro 0.6 nozzle"] } diff --git a/resources/profiles/Q Series/process/0.40mm Standard @Q1 Pro 0.8 nozzle.json b/resources/profiles/Q Series/process/0.40mm Standard @Q1 Pro 0.8 nozzle.json index 52a91ba..46ec4fc 100644 --- a/resources/profiles/Q Series/process/0.40mm Standard @Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Q Series/process/0.40mm Standard @Q1 Pro 0.8 nozzle.json @@ -6,24 +6,24 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.82", "internal_solid_infill_line_width": "0.82", "layer_height": "0.4", "line_width": "0.82", "outer_wall_line_width": "0.82", - "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5", + "overhang_3_4_speed": ["25"], + "overhang_4_4_speed": ["5"], "sparse_infill_line_width": "0.82", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.82", "top_surface_line_width": "0.82", "top_surface_pattern": "monotonic", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["Q1 Pro 0.8 nozzle"] } diff --git a/resources/profiles/Q Series/process/0.42mm Standard @Q1 Pro 0.6 nozzle.json b/resources/profiles/Q Series/process/0.42mm Standard @Q1 Pro 0.6 nozzle.json index d7dcad1..e9415a4 100644 --- a/resources/profiles/Q Series/process/0.42mm Standard @Q1 Pro 0.6 nozzle.json +++ b/resources/profiles/Q Series/process/0.42mm Standard @Q1 Pro 0.6 nozzle.json @@ -6,22 +6,22 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.62", "internal_solid_infill_line_width": "0.62", "layer_height": "0.42", "line_width": "0.62", "outer_wall_line_width": "0.62", - "overhang_3_4_speed": "15", + "overhang_3_4_speed": ["15"], "sparse_infill_line_width": "0.62", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.62", "top_surface_line_width": "0.62", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["Q1 Pro 0.6 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/Q Series/process/0.48mm Standard @Q1 Pro 0.8 nozzle.json b/resources/profiles/Q Series/process/0.48mm Standard @Q1 Pro 0.8 nozzle.json index 2d7963c..359c029 100644 --- a/resources/profiles/Q Series/process/0.48mm Standard @Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Q Series/process/0.48mm Standard @Q1 Pro 0.8 nozzle.json @@ -6,24 +6,24 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.82", "internal_solid_infill_line_width": "0.82", "layer_height": "0.48", "line_width": "0.82", "outer_wall_line_width": "0.82", - "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5", + "overhang_3_4_speed": ["25"], + "overhang_4_4_speed": ["5"], "sparse_infill_line_width": "0.82", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.82", "top_surface_line_width": "0.82", "top_surface_pattern": "monotonic", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["Q1 Pro 0.8 nozzle"] } diff --git a/resources/profiles/Q Series/process/0.56mm Standard @Q1 Pro 0.8 nozzle.json b/resources/profiles/Q Series/process/0.56mm Standard @Q1 Pro 0.8 nozzle.json index 0f80cb7..1277503 100644 --- a/resources/profiles/Q Series/process/0.56mm Standard @Q1 Pro 0.8 nozzle.json +++ b/resources/profiles/Q Series/process/0.56mm Standard @Q1 Pro 0.8 nozzle.json @@ -6,24 +6,24 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.82", "internal_solid_infill_line_width": "0.82", "layer_height": "0.56", "line_width": "0.82", "outer_wall_line_width": "0.82", - "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5", + "overhang_3_4_speed": ["25"], + "overhang_4_4_speed": ["5"], "sparse_infill_line_width": "0.82", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.82", "top_surface_line_width": "0.82", "top_surface_pattern": "monotonic", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["Q1 Pro 0.8 nozzle"] } diff --git a/resources/profiles/Q Series/process/fdm_process_common.json b/resources/profiles/Q Series/process/fdm_process_common.json index b354e88..9867436 100644 --- a/resources/profiles/Q Series/process/fdm_process_common.json +++ b/resources/profiles/Q Series/process/fdm_process_common.json @@ -4,40 +4,44 @@ "from": "system", "instantiation": "false", "adaptive_layer_height": "0", + "bottom_color_penetration_layers": "3", "bottom_shell_layers": "3", "bottom_shell_thickness": "0", "bottom_surface_pattern": "monotonic", "bridge_flow": "0.95", "bridge_no_support": "0", - "bridge_speed": "50", + "bridge_speed": ["50"], "brim_object_gap": "0.1", "brim_width": "5", "compatible_printers_condition": "", - "default_acceleration": "10000", + "default_acceleration": ["10000"], + "detect_floating_vertical_shell": "1", "detect_overhang_wall": "1", "detect_thin_wall": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0", "enable_arc_fitting": "0", + "enable_overhang_speed": ["1"], "enable_prime_tower": "1", "enable_support": "0", "filename_format": "{input_filename_base}.gcode", - "gap_infill_speed": "50", + "gap_infill_speed": ["50"], "infill_combination": "0", "infill_direction": "45", "infill_wall_overlap": "15%", - "initial_layer_acceleration": "500", - "initial_layer_infill_speed": "60", + "initial_layer_acceleration": ["500"], + "initial_layer_infill_speed": ["105"], "initial_layer_line_width": "0.5", "initial_layer_print_height": "0.2", - "initial_layer_speed": "30", - "inner_wall_acceleration": "5000", + "initial_layer_speed": ["50"], + "initial_layer_travel_acceleration": ["6000"], + "inner_wall_acceleration": ["5000"], "inner_wall_line_width": "0.45", - "inner_wall_speed": "150", + "inner_wall_speed": ["150"], "interface_shells": "0", "internal_bridge_support_thickness": "0.8", "internal_solid_infill_line_width": "0.42", - "internal_solid_infill_speed": "150", + "internal_solid_infill_speed": ["150"], "ironing_flow": "10%", "ironing_spacing": "0.15", "ironing_speed": "30", @@ -47,14 +51,14 @@ "max_travel_detour_distance": "0", "minimum_sparse_infill_area": "15", "only_one_wall_top": "1", - "outer_wall_acceleration": "3000", + "outer_wall_acceleration": ["3000"], "outer_wall_line_width": "0.42", - "outer_wall_speed": "120", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "50", - "overhang_3_4_speed": "30", - "overhang_4_4_speed": "10", - "overhang_totally_speed": "24", + "outer_wall_speed": ["120"], + "overhang_1_4_speed": ["0"], + "overhang_2_4_speed": ["50"], + "overhang_3_4_speed": ["30"], + "overhang_4_4_speed": ["10"], + "overhang_totally_speed": ["10"], "prime_tower_width": "35", "print_sequence": "by layer", "print_settings_id": "", @@ -66,13 +70,14 @@ "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", - "small_perimeter_threshold": "4", + "small_perimeter_speed": ["50%"], + "small_perimeter_threshold": ["4"], "smooth_coefficient": "90", "smooth_speed_discontinuity_area": "1", "sparse_infill_density": "15%", "sparse_infill_line_width": "0.45", "sparse_infill_pattern": "grid", - "sparse_infill_speed": "250", + "sparse_infill_speed": ["270"], "spiral_mode": "0", "standby_temperature_delta": "-5", "support_base_pattern_spacing": "2.5", @@ -85,26 +90,29 @@ "support_interface_loop_pattern": "0", "support_interface_pattern": "auto", "support_interface_spacing": "0.5", - "support_interface_speed": "80", + "support_interface_speed": ["80"], "support_interface_top_layers": "2", "support_line_width": "0.42", "support_object_xy_distance": "0.35", "support_on_build_plate_only": "0", - "support_speed": "150", + "support_speed": ["150"], "support_style": "default", "support_threshold_angle": "30", "support_top_z_distance": "0.2", - "support_type": "normal(auto)", + "support_type": "tree(auto)", + "top_color_penetration_layers": "3", "top_shell_layers": "3", "top_shell_thickness": "0.8", - "top_surface_acceleration": "2000", + "top_surface_acceleration": ["2000"], "top_surface_line_width": "0.42", "top_surface_pattern": "monotonicline", - "top_surface_speed": "200", - "travel_speed": "500", + "top_surface_speed": ["200"], + "travel_acceleration": ["10000"], + "travel_speed": ["500"], "tree_support_branch_angle": "45", "tree_support_branch_diameter": "2", "tree_support_wall_count": "0", + "vertical_shell_speed": ["80%"], "wall_generator": "classic", "wall_infill_order": "inner wall/outer wall/infill", "wall_loops": "2", diff --git a/resources/profiles/X 3 Series.json b/resources/profiles/X 3 Series.json index 7dc472f..49e4093 100644 --- a/resources/profiles/X 3 Series.json +++ b/resources/profiles/X 3 Series.json @@ -1,6 +1,6 @@ { "name": "X-3-Series", - "version": "01.10.02.76", + "version": "02.00.03.54", "force_update": "0", "description": "X-3-Series configurations", "machine_model_list": [ @@ -400,7 +400,7 @@ "name": "Generic PLA+@X3", "sub_path": "filament/Generic PLA+.json" }, - { + { "name": "QIDI PLA-CF@X3", "sub_path": "filament/QIDI PLA-CF.json" }, diff --git a/resources/profiles/X 3 Series/filament/Bambu ABS.json b/resources/profiles/X 3 Series/filament/Bambu ABS.json index 5683f1d..01167ca 100644 --- a/resources/profiles/X 3 Series/filament/Bambu ABS.json +++ b/resources/profiles/X 3 Series/filament/Bambu ABS.json @@ -10,9 +10,9 @@ "additional_cooling_fan_speed": ["0"], "chamber_temperatures": ["55"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_max_speed": ["80"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.05"], "filament_flow_ratio": ["0.95"], "filament_max_volumetric_speed": ["22"], @@ -29,5 +29,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["90"], "textured_plate_temp" : ["90"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 3 Series/filament/Bambu PETG.json b/resources/profiles/X 3 Series/filament/Bambu PETG.json index 86c9d64..6578bc5 100644 --- a/resources/profiles/X 3 Series/filament/Bambu PETG.json +++ b/resources/profiles/X 3 Series/filament/Bambu PETG.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFG99", + "filament_id": "GFG99", "setting_id": "GFSG99", "name": "Bambu PETG@X3", "from": "system", @@ -9,10 +9,10 @@ "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["30"], "fan_max_speed": ["40"], "fan_min_speed": ["10"], + "filament_adhesiveness_category": ["300"], "filament_flow_ratio": ["0.95"], "filament_max_volumetric_speed": ["16"], "filament_type": ["PETG"], @@ -28,5 +28,5 @@ "temperature_vitrification": ["70"], "textured_plate_temp_initial_layer" : ["80"], "textured_plate_temp" : ["80"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 3 Series/filament/Bambu PLA.json b/resources/profiles/X 3 Series/filament/Bambu PLA.json index 97a47b8..8c4c527 100644 --- a/resources/profiles/X 3 Series/filament/Bambu PLA.json +++ b/resources/profiles/X 3 Series/filament/Bambu PLA.json @@ -1,16 +1,18 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "GFL99", "setting_id": "GFSL99", "name": "Bambu PLA@X3", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "filament_adhesiveness_category": ["100"], "filament_type": ["PLA"], "filament_vendor": ["Bambu Lab"], "additional_cooling_fan_speed": ["100"], "nozzle_temperature_range_high": ["240"], "nozzle_temperature_range_low": ["190"], + "overhang_fan_threshold": ["50%"], "temperature_vitrification": ["45"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 3 Series/filament/Generic ABS.json b/resources/profiles/X 3 Series/filament/Generic ABS.json index 58b6b18..15d7b1f 100644 --- a/resources/profiles/X 3 Series/filament/Generic ABS.json +++ b/resources/profiles/X 3 Series/filament/Generic ABS.json @@ -9,10 +9,10 @@ "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["30"], "fan_max_speed": ["80"], "fan_min_speed": ["10"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.04"], "filament_flow_ratio": ["0.95"], "filament_max_volumetric_speed": ["17"], @@ -29,5 +29,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["90"], "textured_plate_temp" : ["90"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 3 Series/filament/Generic PC.json b/resources/profiles/X 3 Series/filament/Generic PC.json index fe674ef..4173cf5 100644 --- a/resources/profiles/X 3 Series/filament/Generic PC.json +++ b/resources/profiles/X 3 Series/filament/Generic PC.json @@ -9,10 +9,10 @@ "chamber_temperatures": ["60"], "close_fan_the_first_x_layers": ["3"], "during_print_exhaust_fan_speed": ["0"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["30"], "fan_max_speed": ["60"], "fan_min_speed": ["10"], + "filament_adhesiveness_category": ["500"], "filament_density": ["1.04"], "filament_max_volumetric_speed": ["8"], "filament_type": ["PC"], @@ -28,5 +28,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["110"], "textured_plate_temp" : ["110"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 3 Series/filament/Generic PETG.json b/resources/profiles/X 3 Series/filament/Generic PETG.json index 5f8486e..386c51d 100644 --- a/resources/profiles/X 3 Series/filament/Generic PETG.json +++ b/resources/profiles/X 3 Series/filament/Generic PETG.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFG99", + "filament_id": "GFG99", "setting_id": "GFSG99", "name": "Generic PETG@X3", "from": "system", @@ -9,10 +9,10 @@ "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["30"], "fan_max_speed": ["90"], "fan_min_speed": ["40"], + "filament_adhesiveness_category": ["300"], "filament_density": ["1.27"], "filament_flow_ratio": ["0.95"], "filament_max_volumetric_speed": ["12"], @@ -29,5 +29,5 @@ "temperature_vitrification": ["70"], "textured_plate_temp_initial_layer" : ["80"], "textured_plate_temp" : ["80"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 3 Series/filament/Generic PLA Silk.json b/resources/profiles/X 3 Series/filament/Generic PLA Silk.json index e47ef41..45ecd1a 100644 --- a/resources/profiles/X 3 Series/filament/Generic PLA Silk.json +++ b/resources/profiles/X 3 Series/filament/Generic PLA Silk.json @@ -1,12 +1,13 @@ { - "type": "filament", - "filament_id": "GFA05", - "setting_id": "GFSL99_01", - "name": "Generic PLA Silk@X3", - "from": "system", - "instantiation": "false", - "inherits": "fdm_filament_common", + "type": "filament", + "filament_id": "GFA05", + "setting_id": "GFSL99_01", + "name": "Generic PLA Silk@X3", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", "additional_cooling_fan_speed": ["0"], + "filament_adhesiveness_category": ["100"], "filament_density": ["1.2"], "filament_max_volumetric_speed": ["12"], "filament_type": ["PLA"], @@ -14,10 +15,11 @@ "nozzle_temperature_initial_layer": ["220"], "nozzle_temperature_range_high": ["240"], "nozzle_temperature_range_low": ["190"], + "overhang_fan_threshold": ["50%"], "pressure_advance": ["0.024"], "slow_down_layer_time": ["8"], "temperature_vitrification": ["45"], "textured_plate_temp_initial_layer" : ["55"], "textured_plate_temp" : ["55"], - "compatible_printers": [] + "compatible_printers": [] } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/filament/Generic PLA+.json b/resources/profiles/X 3 Series/filament/Generic PLA+.json index 35d753d..33ab1af 100644 --- a/resources/profiles/X 3 Series/filament/Generic PLA+.json +++ b/resources/profiles/X 3 Series/filament/Generic PLA+.json @@ -7,6 +7,7 @@ "instantiation": "false", "inherits": "fdm_filament_common", "additional_cooling_fan_speed": ["0"], + "filament_adhesiveness_category": ["100"], "filament_density": ["1.2"], "filament_max_volumetric_speed": ["12"], "filament_type": ["PLA"], @@ -15,6 +16,7 @@ "nozzle_temperature_range_high": ["240"], "nozzle_temperature_range_low": ["190"], "nozzle_temperature": ["230"], + "overhang_fan_threshold": ["50%"], "slow_down_layer_time": ["8"], "temperature_vitrification": ["45"], "compatible_printers": [] diff --git a/resources/profiles/X 3 Series/filament/Generic PLA.json b/resources/profiles/X 3 Series/filament/Generic PLA.json index 618e319..aed958d 100644 --- a/resources/profiles/X 3 Series/filament/Generic PLA.json +++ b/resources/profiles/X 3 Series/filament/Generic PLA.json @@ -7,12 +7,16 @@ "instantiation": "false", "inherits": "fdm_filament_common", "additional_cooling_fan_speed": ["0"], + "cool_plate_temp_initial_layer": ["45"], + "cool_plate_temp": ["45"], + "filament_adhesiveness_category": ["100"], "filament_density": ["1.2"], "filament_max_volumetric_speed": ["14"], "filament_type": ["PLA"], "filament_vendor": ["Generic"], "nozzle_temperature_range_high": ["240"], "nozzle_temperature_range_low": ["190"], + "overhang_fan_threshold": ["50%"], "slow_down_layer_time": ["8"], "temperature_vitrification": ["45"], "compatible_printers": [] diff --git a/resources/profiles/X 3 Series/filament/Generic TPU 95A.json b/resources/profiles/X 3 Series/filament/Generic TPU 95A.json index 29af736..e03c2f6 100644 --- a/resources/profiles/X 3 Series/filament/Generic TPU 95A.json +++ b/resources/profiles/X 3 Series/filament/Generic TPU 95A.json @@ -8,6 +8,7 @@ "inherits": "fdm_filament_common", "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], + "filament_adhesiveness_category": ["600"], "filament_density": ["1.21"], "filament_flow_ratio": ["1"], "filament_max_volumetric_speed": ["4"], @@ -20,5 +21,5 @@ "pressure_advance": ["0.1"], "slow_down_layer_time": ["8"], "temperature_vitrification": ["30"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 3 Series/filament/HATCHBOX ABS.json b/resources/profiles/X 3 Series/filament/HATCHBOX ABS.json index bdb481f..1c17ec1 100644 --- a/resources/profiles/X 3 Series/filament/HATCHBOX ABS.json +++ b/resources/profiles/X 3 Series/filament/HATCHBOX ABS.json @@ -10,9 +10,9 @@ "additional_cooling_fan_speed": ["0"], "chamber_temperatures": ["55"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_max_speed": ["80"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.05"], "filament_flow_ratio": ["0.95"], "filament_max_volumetric_speed": ["22"], @@ -29,5 +29,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["90"], "textured_plate_temp" : ["90"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 3 Series/filament/HATCHBOX PETG.json b/resources/profiles/X 3 Series/filament/HATCHBOX PETG.json index e10c142..48caedf 100644 --- a/resources/profiles/X 3 Series/filament/HATCHBOX PETG.json +++ b/resources/profiles/X 3 Series/filament/HATCHBOX PETG.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFG99", + "filament_id": "GFG99", "setting_id": "GFSG99", "name": "HATCHBOX PETG@X3", "from": "system", @@ -9,10 +9,10 @@ "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["30"], "fan_max_speed": ["40"], "fan_min_speed": ["10"], + "filament_adhesiveness_category": ["300"], "filament_flow_ratio": ["0.95"], "filament_max_volumetric_speed": ["16"], "filament_type": ["PETG"], @@ -28,5 +28,5 @@ "temperature_vitrification": ["70"], "textured_plate_temp_initial_layer" : ["80"], "textured_plate_temp" : ["80"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 3 Series/filament/HATCHBOX PLA.json b/resources/profiles/X 3 Series/filament/HATCHBOX PLA.json index 32ab208..c88174c 100644 --- a/resources/profiles/X 3 Series/filament/HATCHBOX PLA.json +++ b/resources/profiles/X 3 Series/filament/HATCHBOX PLA.json @@ -1,16 +1,18 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "GFL99", "setting_id": "GFSL99", "name": "HATCHBOX PLA@X3", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "filament_adhesiveness_category": ["100"], "filament_type": ["PLA"], "filament_vendor": ["HATCHBOX"], "additional_cooling_fan_speed": ["100"], "nozzle_temperature_range_high": ["240"], "nozzle_temperature_range_low": ["190"], + "overhang_fan_threshold": ["50%"], "temperature_vitrification": ["45"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 3 Series/filament/Overture ABS.json b/resources/profiles/X 3 Series/filament/Overture ABS.json index fc78fd4..d951d8e 100644 --- a/resources/profiles/X 3 Series/filament/Overture ABS.json +++ b/resources/profiles/X 3 Series/filament/Overture ABS.json @@ -6,12 +6,12 @@ "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "filament_adhesiveness_category": ["200"], "filament_vendor": ["Overture"], "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], "chamber_temperatures": ["55"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_max_speed": ["80"], "fan_min_speed": ["20"], "filament_density": ["1.12"], @@ -29,5 +29,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["90"], "textured_plate_temp" : ["90"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 3 Series/filament/Overture PLA.json b/resources/profiles/X 3 Series/filament/Overture PLA.json index 2e90d4e..2972ef5 100644 --- a/resources/profiles/X 3 Series/filament/Overture PLA.json +++ b/resources/profiles/X 3 Series/filament/Overture PLA.json @@ -1,11 +1,12 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "GFL99", "setting_id": "GFSL99", "name": "Overture PLA@X3", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "filament_adhesiveness_category": ["100"], "filament_density": ["1.2"], "filament_flow_ratio": ["0.99"], "filament_max_volumetric_speed": ["11"], @@ -14,7 +15,8 @@ "additional_cooling_fan_speed": ["100"], "nozzle_temperature_range_high": ["240"], "nozzle_temperature_range_low": ["190"], + "overhang_fan_threshold": ["50%"], "slow_down_layer_time": ["10"], "temperature_vitrification": ["45"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 3 Series/filament/PolyLite ABS.json b/resources/profiles/X 3 Series/filament/PolyLite ABS.json index 44648ae..61d190b 100644 --- a/resources/profiles/X 3 Series/filament/PolyLite ABS.json +++ b/resources/profiles/X 3 Series/filament/PolyLite ABS.json @@ -11,9 +11,9 @@ "additional_cooling_fan_speed": ["0"], "chamber_temperatures": ["60"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_max_speed": ["80"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.12"], "filament_flow_ratio": ["0.96"], "filament_max_volumetric_speed": ["17"], @@ -29,5 +29,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["90"], "textured_plate_temp" : ["90"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 3 Series/filament/PolyLite PLA.json b/resources/profiles/X 3 Series/filament/PolyLite PLA.json index 2a85a78..b1e2bee 100644 --- a/resources/profiles/X 3 Series/filament/PolyLite PLA.json +++ b/resources/profiles/X 3 Series/filament/PolyLite PLA.json @@ -1,11 +1,12 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "GFL99", "setting_id": "GFSL99", "name": "PolyLite PLA@X3", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "filament_adhesiveness_category": ["100"], "filament_density": ["1.2"], "filament_flow_ratio": ["0.99"], "filament_max_volumetric_speed": ["11"], @@ -15,7 +16,8 @@ "additional_cooling_fan_speed_unseal": ["100"], "nozzle_temperature_range_high": ["240"], "nozzle_temperature_range_low": ["190"], + "overhang_fan_threshold": ["50%"], "slow_down_layer_time": ["10"], "temperature_vitrification": ["45"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 3 Series/filament/QIDI ABS Odorless.json b/resources/profiles/X 3 Series/filament/QIDI ABS Odorless.json index bfa7546..8a47d2c 100644 --- a/resources/profiles/X 3 Series/filament/QIDI ABS Odorless.json +++ b/resources/profiles/X 3 Series/filament/QIDI ABS Odorless.json @@ -10,13 +10,14 @@ "additional_cooling_fan_speed": ["0"], "chamber_temperatures": ["55"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_max_speed": ["80"], "fan_min_speed": ["10"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.02"], "filament_flow_ratio": ["0.92"], "filament_max_volumetric_speed": ["22"], "filament_type": ["ABS"], + "impact_strength_z":["7.4"], "nozzle_temperature_initial_layer": ["250"], "nozzle_temperature_range_high": ["280"], "nozzle_temperature_range_low": ["240"], @@ -28,5 +29,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["90"], "textured_plate_temp" : ["90"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 3 Series/filament/QIDI ABS Rapido Metal.json b/resources/profiles/X 3 Series/filament/QIDI ABS Rapido Metal.json index cb129d0..fe72f1c 100644 --- a/resources/profiles/X 3 Series/filament/QIDI ABS Rapido Metal.json +++ b/resources/profiles/X 3 Series/filament/QIDI ABS Rapido Metal.json @@ -9,12 +9,13 @@ "chamber_temperatures": ["55"], "close_fan_the_first_x_layers": ["3"], "during_print_exhaust_fan_speed": ["0"], - "enable_overhang_bridge_fan": ["1"], "fan_max_speed": ["80"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.06"], "filament_flow_ratio": ["0.95"], "filament_type": ["ABS"], + "impact_strength_z":["7.4"], "nozzle_temperature_initial_layer": ["250"], "nozzle_temperature_range_high": ["280"], "nozzle_temperature_range_low": ["240"], @@ -26,5 +27,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["90"], "textured_plate_temp" : ["90"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 3 Series/filament/QIDI ABS Rapido.json b/resources/profiles/X 3 Series/filament/QIDI ABS Rapido.json index 9dc8d6f..e02ce81 100644 --- a/resources/profiles/X 3 Series/filament/QIDI ABS Rapido.json +++ b/resources/profiles/X 3 Series/filament/QIDI ABS Rapido.json @@ -10,13 +10,14 @@ "additional_cooling_fan_speed": ["0"], "chamber_temperatures": ["55"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_max_speed": ["80"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.05"], "filament_flow_ratio": ["0.95"], "filament_max_volumetric_speed": ["22"], "filament_type": ["ABS"], + "impact_strength_z":["7.4"], "nozzle_temperature_initial_layer": ["250"], "nozzle_temperature_range_high": ["280"], "nozzle_temperature_range_low": ["240"], @@ -28,5 +29,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["90"], "textured_plate_temp" : ["90"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 3 Series/filament/QIDI ABS-GF.json b/resources/profiles/X 3 Series/filament/QIDI ABS-GF.json index 9bc38ba..6eb6d78 100644 --- a/resources/profiles/X 3 Series/filament/QIDI ABS-GF.json +++ b/resources/profiles/X 3 Series/filament/QIDI ABS-GF.json @@ -8,15 +8,16 @@ "inherits": "fdm_filament_common", "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], - "chamber_temperatures": ["55"], + "chamber_temperatures": ["0"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_max_speed": ["20"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.15"], "filament_flow_ratio": ["0.95"], - "filament_max_volumetric_speed": ["17"], + "filament_max_volumetric_speed": ["12"], "filament_type": ["ABS-GF"], + "impact_strength_z":["5.3"], "nozzle_temperature_initial_layer": ["270"], "nozzle_temperature_range_high": ["280"], "nozzle_temperature_range_low": ["240"], @@ -27,5 +28,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["100"], "textured_plate_temp" : ["100"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 3 Series/filament/QIDI ASA-Aero.json b/resources/profiles/X 3 Series/filament/QIDI ASA-Aero.json index 8819355..a7bcf62 100644 --- a/resources/profiles/X 3 Series/filament/QIDI ASA-Aero.json +++ b/resources/profiles/X 3 Series/filament/QIDI ASA-Aero.json @@ -10,19 +10,20 @@ "additional_cooling_fan_speed": ["0"], "chamber_temperatures": ["60"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["40"], "fan_max_speed": ["50"], "fan_min_speed": ["10"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.03"], "filament_flow_ratio": ["0.7"], - "filament_max_volumetric_speed": ["16"], + "filament_max_volumetric_speed": ["12"], "filament_retract_when_changing_layer": ["0"], "filament_retraction_length": ["0.01"], "filament_retraction_minimum_travel": ["0"], "filament_type": ["ASA-Aero"], "filament_wipe": ["0"], "filament_z_hop": ["0"], + "impact_strength_z":["3.4"], "nozzle_temperature_initial_layer": ["250"], "nozzle_temperature_range_high": ["280"], "nozzle_temperature_range_low": ["240"], @@ -34,5 +35,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["90"], "textured_plate_temp" : ["90"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 3 Series/filament/QIDI ASA.json b/resources/profiles/X 3 Series/filament/QIDI ASA.json index 7d977a2..6b1d22e 100644 --- a/resources/profiles/X 3 Series/filament/QIDI ASA.json +++ b/resources/profiles/X 3 Series/filament/QIDI ASA.json @@ -10,14 +10,15 @@ "additional_cooling_fan_speed": ["0"], "chamber_temperatures": ["55"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["40"], "fan_max_speed": ["50"], "fan_min_speed": ["10"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.07"], "filament_flow_ratio": ["0.92"], "filament_max_volumetric_speed": ["16"], "filament_type": ["ASA"], + "impact_strength_z":["4.9"], "nozzle_temperature_initial_layer": ["250"], "nozzle_temperature_range_high": ["280"], "nozzle_temperature_range_low": ["240"], @@ -29,5 +30,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["90"], "textured_plate_temp" : ["90"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 3 Series/filament/QIDI PA12-CF.json b/resources/profiles/X 3 Series/filament/QIDI PA12-CF.json index 3f83240..39830ce 100644 --- a/resources/profiles/X 3 Series/filament/QIDI PA12-CF.json +++ b/resources/profiles/X 3 Series/filament/QIDI PA12-CF.json @@ -9,14 +9,15 @@ "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["10"], "fan_max_speed": ["40"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["400"], "filament_density": ["1.09"], "filament_flow_ratio": ["0.96"], - "filament_max_volumetric_speed": ["10"], + "filament_max_volumetric_speed": ["8"], "filament_type": ["PA12-CF"], + "impact_strength_z":["5.7"], "nozzle_temperature_initial_layer": ["290"], "nozzle_temperature_range_high": ["300"], "nozzle_temperature_range_low": ["280"], diff --git a/resources/profiles/X 3 Series/filament/QIDI PAHT-CF.json b/resources/profiles/X 3 Series/filament/QIDI PAHT-CF.json index e0e950d..4a64e1d 100644 --- a/resources/profiles/X 3 Series/filament/QIDI PAHT-CF.json +++ b/resources/profiles/X 3 Series/filament/QIDI PAHT-CF.json @@ -9,14 +9,15 @@ "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["10"], "fan_max_speed": ["40"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["400"], "filament_density": ["1.2"], "filament_flow_ratio": ["0.96"], - "filament_max_volumetric_speed": ["14"], + "filament_max_volumetric_speed": ["8"], "filament_type": ["PAHT-CF"], + "impact_strength_z":["13.3"], "nozzle_temperature_initial_layer": ["310"], "nozzle_temperature_range_high": ["320"], "nozzle_temperature_range_low": ["300"], diff --git a/resources/profiles/X 3 Series/filament/QIDI PAHT-GF.json b/resources/profiles/X 3 Series/filament/QIDI PAHT-GF.json index 7204e13..c0c3ff7 100644 --- a/resources/profiles/X 3 Series/filament/QIDI PAHT-GF.json +++ b/resources/profiles/X 3 Series/filament/QIDI PAHT-GF.json @@ -9,14 +9,15 @@ "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["10"], "fan_max_speed": ["20"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["400"], "filament_density": ["1.27"], "filament_flow_ratio": ["0.96"], - "filament_max_volumetric_speed": ["14"], + "filament_max_volumetric_speed": ["10"], "filament_type": ["PAHT-GF"], + "impact_strength_z":["13.3"], "nozzle_temperature_initial_layer": ["310"], "nozzle_temperature_range_high": ["320"], "nozzle_temperature_range_low": ["300"], diff --git a/resources/profiles/X 3 Series/filament/QIDI PC-ABS-FR.json b/resources/profiles/X 3 Series/filament/QIDI PC-ABS-FR.json index c65a2ed..6e56abd 100644 --- a/resources/profiles/X 3 Series/filament/QIDI PC-ABS-FR.json +++ b/resources/profiles/X 3 Series/filament/QIDI PC-ABS-FR.json @@ -10,14 +10,15 @@ "additional_cooling_fan_speed": ["0"], "chamber_temperatures": ["55"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["30"], "fan_max_speed": ["40"], "fan_min_speed": ["10"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.19"], "filament_flow_ratio": ["0.92"], "filament_max_volumetric_speed": ["8"], "filament_type": ["PC-ABS-FR"], + "impact_strength_z":["8"], "nozzle_temperature_initial_layer": ["250"], "nozzle_temperature_range_high": ["280"], "nozzle_temperature_range_low": ["240"], @@ -29,5 +30,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["100"], "textured_plate_temp" : ["100"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 3 Series/filament/QIDI PET-CF.json b/resources/profiles/X 3 Series/filament/QIDI PET-CF.json index 8f9efb4..6a5edfe 100644 --- a/resources/profiles/X 3 Series/filament/QIDI PET-CF.json +++ b/resources/profiles/X 3 Series/filament/QIDI PET-CF.json @@ -9,14 +9,15 @@ "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["10"], "fan_max_speed": ["40"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["800"], "filament_density": ["1.3"], "filament_flow_ratio": ["1"], - "filament_max_volumetric_speed": ["12"], + "filament_max_volumetric_speed": ["8"], "filament_type": ["PET-CF"], + "impact_strength_z":["4.5"], "nozzle_temperature_initial_layer": ["320"], "nozzle_temperature_range_high": ["320"], "nozzle_temperature_range_low": ["280"], diff --git a/resources/profiles/X 3 Series/filament/QIDI PET-GF.json b/resources/profiles/X 3 Series/filament/QIDI PET-GF.json index 396a216..8f98036 100644 --- a/resources/profiles/X 3 Series/filament/QIDI PET-GF.json +++ b/resources/profiles/X 3 Series/filament/QIDI PET-GF.json @@ -9,14 +9,15 @@ "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["10"], "fan_max_speed": ["20"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["800"], "filament_density": ["1.38"], "filament_flow_ratio": ["0.97"], - "filament_max_volumetric_speed": ["12"], + "filament_max_volumetric_speed": ["10"], "filament_type": ["PET-GF"], + "impact_strength_z":["4.5"], "nozzle_temperature_initial_layer": ["310"], "nozzle_temperature_range_high": ["320"], "nozzle_temperature_range_low": ["280"], diff --git a/resources/profiles/X 3 Series/filament/QIDI PETG Tough.json b/resources/profiles/X 3 Series/filament/QIDI PETG Tough.json index 22ec595..02a3f68 100644 --- a/resources/profiles/X 3 Series/filament/QIDI PETG Tough.json +++ b/resources/profiles/X 3 Series/filament/QIDI PETG Tough.json @@ -1,6 +1,6 @@ { "type": "filament", - "filament_id": "GFG99", + "filament_id": "GFG99", "setting_id": "GFSG99", "name": "QIDI PETG Tough@X3", "from": "system", @@ -9,13 +9,14 @@ "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["30"], "fan_max_speed": ["40"], "fan_min_speed": ["10"], + "filament_adhesiveness_category": ["300"], "filament_flow_ratio": ["0.95"], "filament_max_volumetric_speed": ["16"], "filament_type": ["PETG"], + "impact_strength_z":["10.6"], "nozzle_temperature_initial_layer": ["240"], "nozzle_temperature_range_high": ["270"], "nozzle_temperature_range_low": ["220"], @@ -27,5 +28,5 @@ "temperature_vitrification": ["70"], "textured_plate_temp_initial_layer" : ["80"], "textured_plate_temp" : ["80"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 3 Series/filament/QIDI PLA Rapido Matte.json b/resources/profiles/X 3 Series/filament/QIDI PLA Rapido Matte.json index 78b2096..efc59d9 100644 --- a/resources/profiles/X 3 Series/filament/QIDI PLA Rapido Matte.json +++ b/resources/profiles/X 3 Series/filament/QIDI PLA Rapido Matte.json @@ -1,17 +1,20 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "GFL99", "setting_id": "GFSL99", "name": "QIDI PLA Rapido Matte@X3", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", "additional_cooling_fan_speed": ["100"], + "filament_adhesiveness_category": ["100"], "filament_density": ["1.42"], "filament_max_volumetric_speed": ["21"], "filament_type": ["PLA"], + "impact_strength_z":["6.6"], "nozzle_temperature_range_high": ["240"], "nozzle_temperature_range_low": ["190"], + "overhang_fan_threshold": ["50%"], "temperature_vitrification": ["45"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 3 Series/filament/QIDI PLA Rapido Metal.json b/resources/profiles/X 3 Series/filament/QIDI PLA Rapido Metal.json index f235481..1429d4f 100644 --- a/resources/profiles/X 3 Series/filament/QIDI PLA Rapido Metal.json +++ b/resources/profiles/X 3 Series/filament/QIDI PLA Rapido Metal.json @@ -1,16 +1,19 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "GFL99", "setting_id": "GFSL99", "name": "QIDI PLA Rapido Metal@X3", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "filament_adhesiveness_category": ["100"], "filament_type": ["PLA"], + "impact_strength_z":["16.8"], "additional_cooling_fan_speed": ["100"], "filament_density": ["1.20"], "nozzle_temperature_range_high": ["240"], "nozzle_temperature_range_low": ["190"], + "overhang_fan_threshold": ["50%"], "temperature_vitrification": ["45"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 3 Series/filament/QIDI PLA Rapido Silk.json b/resources/profiles/X 3 Series/filament/QIDI PLA Rapido Silk.json index 6a83a40..3c3cd67 100644 --- a/resources/profiles/X 3 Series/filament/QIDI PLA Rapido Silk.json +++ b/resources/profiles/X 3 Series/filament/QIDI PLA Rapido Silk.json @@ -1,23 +1,26 @@ { - "type": "filament", - "filament_id": "GFA05", - "setting_id": "GFSL99_01", - "name": "QIDI PLA Rapido Silk@X3", - "from": "system", - "instantiation": "false", - "inherits": "fdm_filament_common", + "type": "filament", + "filament_id": "GFA05", + "setting_id": "GFSL99_01", + "name": "QIDI PLA Rapido Silk@X3", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", "additional_cooling_fan_speed": ["0"], + "filament_adhesiveness_category": ["100"], "filament_density": ["1.24"], "filament_max_volumetric_speed": ["7.5"], "filament_type": ["PLA"], "filament_vendor": ["QIDI"], + "impact_strength_z":["4.6"], "nozzle_temperature_range_high": ["240"], "nozzle_temperature_range_low": ["190"], "nozzle_temperature_initial_layer": ["230"], "nozzle_temperature": ["230"], + "overhang_fan_threshold": ["50%"], "textured_plate_temp_initial_layer" : ["55"], "textured_plate_temp" : ["55"], "slow_down_layer_time": ["8"], "temperature_vitrification": ["45"], - "compatible_printers": [] + "compatible_printers": [] } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/filament/QIDI PLA Rapido.json b/resources/profiles/X 3 Series/filament/QIDI PLA Rapido.json index 5a70425..93c1175 100644 --- a/resources/profiles/X 3 Series/filament/QIDI PLA Rapido.json +++ b/resources/profiles/X 3 Series/filament/QIDI PLA Rapido.json @@ -1,15 +1,20 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "GFL99", "setting_id": "GFSL99", "name": "QIDI PLA Rapido@X3", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "cool_plate_temp_initial_layer": ["45"], + "cool_plate_temp": ["45"], + "filament_adhesiveness_category": ["100"], "filament_type": ["PLA"], + "impact_strength_z":["13.8"], "additional_cooling_fan_speed": ["100"], "nozzle_temperature_range_high": ["240"], "nozzle_temperature_range_low": ["190"], + "overhang_fan_threshold": ["50%"], "temperature_vitrification": ["45"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 3 Series/filament/QIDI PLA-CF.json b/resources/profiles/X 3 Series/filament/QIDI PLA-CF.json index 1021c31..d6536d7 100644 --- a/resources/profiles/X 3 Series/filament/QIDI PLA-CF.json +++ b/resources/profiles/X 3 Series/filament/QIDI PLA-CF.json @@ -1,24 +1,25 @@ { - "type": "filament", - "filament_id": "GFL98", - "setting_id": "GFSL98", - "name": "QIDI PLA-CF@X3", - "from": "system", - "instantiation": "false", - "inherits": "fdm_filament_common", - "additional_cooling_fan_speed": ["0"], - "enable_overhang_bridge_fan": ["1"], + "type": "filament", + "filament_id": "GFL98", + "setting_id": "GFSL98", + "name": "QIDI PLA-CF@X3", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", + "additional_cooling_fan_speed": ["0"], + "filament_adhesiveness_category": ["100"], "filament_density": ["1.25"], "filament_flow_ratio": ["0.96"], "filament_max_volumetric_speed": ["9"], - "filament_type": ["PLA-CF"], + "filament_type": ["PLA-CF"], + "impact_strength_z":["7.8"], "nozzle_temperature_initial_layer": ["230"], - "nozzle_temperature_range_high": ["250"], + "nozzle_temperature_range_high": ["250"], "nozzle_temperature_range_low": ["210"], "nozzle_temperature": ["230"], "overhang_fan_speed": ["100"], "overhang_fan_threshold": ["50%"], "pressure_advance": ["0.02"], - "temperature_vitrification": ["45"], - "compatible_printers": [] + "temperature_vitrification": ["45"], + "compatible_printers": [] } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/filament/QIDI PPS-CF.json b/resources/profiles/X 3 Series/filament/QIDI PPS-CF.json index 77075c2..1a7057e 100644 --- a/resources/profiles/X 3 Series/filament/QIDI PPS-CF.json +++ b/resources/profiles/X 3 Series/filament/QIDI PPS-CF.json @@ -8,14 +8,15 @@ "inherits": "fdm_filament_common", "chamber_temperatures": ["60"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["5"], "fan_max_speed": ["30"], "fan_min_speed": ["0"], + "filament_adhesiveness_category": ["801"], "filament_density": ["1.3"], "filament_flow_ratio": ["0.97"], "filament_max_volumetric_speed": ["6"], "filament_type": ["PPS-CF"], + "impact_strength_z":["2.8"], "nozzle_temperature_initial_layer": ["320"], "nozzle_temperature_range_high": ["350"], "nozzle_temperature_range_low": ["300"], diff --git a/resources/profiles/X 3 Series/filament/QIDI TPU 95A-HF.json b/resources/profiles/X 3 Series/filament/QIDI TPU 95A-HF.json index a92ed1c..591caf2 100644 --- a/resources/profiles/X 3 Series/filament/QIDI TPU 95A-HF.json +++ b/resources/profiles/X 3 Series/filament/QIDI TPU 95A-HF.json @@ -8,11 +8,13 @@ "inherits": "fdm_filament_common", "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], + "filament_adhesiveness_category": ["600"], "filament_density": ["1.15"], "filament_flow_ratio": ["1"], "filament_max_volumetric_speed": ["4"], "filament_type": ["TPU"], "filament_vendor": ["QIDI"], + "impact_strength_z":["88.7"], "nozzle_temperature_initial_layer": ["230"], "nozzle_temperature_range_high": ["250"], "nozzle_temperature_range_low": ["200"], @@ -20,5 +22,5 @@ "pressure_advance": ["0.1"], "slow_down_layer_time": ["8"], "temperature_vitrification": ["30"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 3 Series/filament/QIDI UltraPA-CF25.json b/resources/profiles/X 3 Series/filament/QIDI UltraPA-CF25.json index 25b46fb..bdfb469 100644 --- a/resources/profiles/X 3 Series/filament/QIDI UltraPA-CF25.json +++ b/resources/profiles/X 3 Series/filament/QIDI UltraPA-CF25.json @@ -9,14 +9,15 @@ "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["5"], "fan_max_speed": ["40"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["400"], "filament_density": ["1.23"], "filament_flow_ratio": ["0.94"], "filament_max_volumetric_speed": ["8"], "filament_type": ["UltraPA-CF25"], + "impact_strength_z":["5.7"], "nozzle_temperature_initial_layer": ["300"], "nozzle_temperature_range_high": ["320"], "nozzle_temperature_range_low": ["300"], diff --git a/resources/profiles/X 3 Series/filament/QIDI UltraPA.json b/resources/profiles/X 3 Series/filament/QIDI UltraPA.json index dd7cf9d..a7e22e7 100644 --- a/resources/profiles/X 3 Series/filament/QIDI UltraPA.json +++ b/resources/profiles/X 3 Series/filament/QIDI UltraPA.json @@ -10,10 +10,12 @@ "additional_cooling_fan_speed": ["0"], "fan_max_speed": ["40"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["400"], "filament_density": ["1.21"], "filament_flow_ratio": ["0.96"], "filament_max_volumetric_speed": ["3"], "filament_type": ["UltraPA"], + "impact_strength_z":["5.7"], "nozzle_temperature_initial_layer": ["280"], "nozzle_temperature_range_high": ["290"], "nozzle_temperature_range_low": ["250"], @@ -23,5 +25,5 @@ "temperature_vitrification": ["170"], "textured_plate_temp_initial_layer" : ["80"], "textured_plate_temp" : ["80"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 3 Series/filament/QIDI WOOD Rapido.json b/resources/profiles/X 3 Series/filament/QIDI WOOD Rapido.json index a21cd24..edbf74f 100644 --- a/resources/profiles/X 3 Series/filament/QIDI WOOD Rapido.json +++ b/resources/profiles/X 3 Series/filament/QIDI WOOD Rapido.json @@ -1,19 +1,22 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "GFL99", "setting_id": "GFSL99", "name": "QIDI WOOD Rapido@X3", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", "additional_cooling_fan_speed": ["100"], + "filament_adhesiveness_category": ["100"], "filament_density": ["1.23"], "filament_flow_ratio": ["0.95"], "filament_max_volumetric_speed": ["16"], "filament_type": ["PLA"], + "impact_strength_z":["5.6"], "nozzle_temperature_range_high": ["220"], "nozzle_temperature_range_low": ["190"], + "overhang_fan_threshold": ["50%"], "pressure_advance": ["0.03"], "temperature_vitrification": ["45"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 3 Series/filament/fdm_filament_common.json b/resources/profiles/X 3 Series/filament/fdm_filament_common.json index dcc8887..f7c55e8 100644 --- a/resources/profiles/X 3 Series/filament/fdm_filament_common.json +++ b/resources/profiles/X 3 Series/filament/fdm_filament_common.json @@ -7,6 +7,9 @@ "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], "bed_type": ["Cool Plate"], + "box_temperature_range_high": ["35"], + "box_temperature_range_low": ["0"], + "box_temperature": ["0"], "chamber_temperatures": ["0"], "close_fan_the_first_x_layers": ["1"], "complete_print_exhaust_fan_speed" : ["0"], @@ -14,7 +17,6 @@ "cool_plate_temp" : ["60"], "dont_slow_down_outer_wall" : ["0"], "during_print_exhaust_fan_speed": ["100"], - "enable_overhang_bridge_fan": ["0"], "enable_pressure_advance": ["1"], "eng_plate_temp_initial_layer" : ["60"], "eng_plate_temp" : ["60"], @@ -44,6 +46,9 @@ "filament_wipe": ["nil"], "filament_z_hop_types": ["nil"], "filament_z_hop": ["nil"], + "filament_ramming_travel_time" : ["0"], + "filament_pre_cooling_temperature" : ["0"], + "filament_ramming_volumetric_speed" : ["-1"], "full_fan_speed_layer": ["0"], "nozzle_temperature_initial_layer": ["210"], "nozzle_temperature": ["220"], diff --git a/resources/profiles/X 3 Series/machine/Qidi X-Max 3 0.4 nozzle.json b/resources/profiles/X 3 Series/machine/Qidi X-Max 3 0.4 nozzle.json index b13e52d..9a321de 100644 --- a/resources/profiles/X 3 Series/machine/Qidi X-Max 3 0.4 nozzle.json +++ b/resources/profiles/X 3 Series/machine/Qidi X-Max 3 0.4 nozzle.json @@ -1,29 +1,23 @@ { - "type": "machine", - "setting_id": "GM001", - "name": "X-Max 3 0.4 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_machine_x_common", - "printer_model": "X-Max 3", - "gcode_flavor": "klipper", - "default_print_profile": "0.20mm Standard @XMax3", - "default_filament_profile": ["QIDI PLA Rapido @Qidi X-Max 3 0.4 nozzle"], - "printer_settings_id": "Qidi", - "auxiliary_fan": "1", - "change_filament_gcode": "", - "deretraction_speed": ["0"], - "machine_pause_gcode": "M0", - "max_layer_height": ["0.28"], - "min_layer_height": ["0.08"], - "nozzle_diameter": ["0.4"], - "printable_area": ["0x0","325x0","325x325","0x325"], - "printable_height": "315", - "retract_length_toolchange": ["2"], - "retract_lift_below":["314"], - "retraction_length": ["1"], - "retraction_minimum_travel": ["1"], - "extruder_clearance_height_to_lid": "118", + "type": "machine", + "setting_id": "GM001", + "name": "X-Max 3 0.4 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_machine_x_common", + "printer_model": "X-Max 3", + "gcode_flavor": "klipper", + "default_print_profile": "0.20mm Standard @XMax3", + "default_filament_profile": ["QIDI PLA Rapido @Qidi X-Max 3 0.4 nozzle"], + "printer_settings_id": "Qidi", + "auxiliary_fan": "1", + "change_filament_gcode": "", + "machine_pause_gcode": "M0", + "nozzle_diameter": ["0.4"], + "printable_area": ["0x0","325x0","325x325","0x325"], + "printable_height": "315", + "retract_lift_below": ["314"], + "extruder_clearance_height_to_lid": "118", "extruder_clearance_height_to_rod": "30", "extruder_clearance_max_radius": "70" } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/machine/Qidi X-Max 3 0.8 nozzle.json b/resources/profiles/X 3 Series/machine/Qidi X-Max 3 0.8 nozzle.json index 8531d16..75f0c52 100644 --- a/resources/profiles/X 3 Series/machine/Qidi X-Max 3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/machine/Qidi X-Max 3 0.8 nozzle.json @@ -12,6 +12,6 @@ "max_layer_height": ["0.56"], "min_layer_height": ["0.16"], "nozzle_diameter": ["0.8"], - "retract_length_toolchange": ["2"], + "retract_length_toolchange": ["3"], "retraction_length": ["3"] } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/machine/Qidi X-Plus 3 0.4 nozzle.json b/resources/profiles/X 3 Series/machine/Qidi X-Plus 3 0.4 nozzle.json index c56f912..fa502e9 100644 --- a/resources/profiles/X 3 Series/machine/Qidi X-Plus 3 0.4 nozzle.json +++ b/resources/profiles/X 3 Series/machine/Qidi X-Plus 3 0.4 nozzle.json @@ -1,28 +1,22 @@ { - "type": "machine", - "setting_id": "GM001", - "name": "X-Plus 3 0.4 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_machine_x_common", - "printer_model": "X-Plus 3", - "gcode_flavor": "klipper", - "default_print_profile": "0.20mm Standard @XPlus3", - "printer_settings_id": "Qidi", - "default_filament_profile": ["QIDI PLA Rapido @Qidi X-Plus 3 0.4 nozzle"], - "change_filament_gcode": "", - "deretraction_speed": ["0"], - "machine_pause_gcode": "M0", - "max_layer_height": ["0.28"], - "min_layer_height": ["0.08"], - "nozzle_diameter": ["0.4"], - "printable_area": ["0x0","280x0","280x280","0x280"], - "printable_height": "270", - "retract_length_toolchange": ["2"], - "retract_lift_below":["269"], - "retraction_length": ["1"], - "retraction_minimum_travel": ["1"], - "extruder_clearance_height_to_lid": "110", + "type": "machine", + "setting_id": "GM001", + "name": "X-Plus 3 0.4 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_machine_x_common", + "printer_model": "X-Plus 3", + "gcode_flavor": "klipper", + "default_print_profile": "0.20mm Standard @XPlus3", + "printer_settings_id": "Qidi", + "default_filament_profile": ["QIDI PLA Rapido @Qidi X-Plus 3 0.4 nozzle"], + "change_filament_gcode": "", + "machine_pause_gcode": "M0", + "nozzle_diameter": ["0.4"], + "printable_area": ["0x0","280x0","280x280","0x280"], + "printable_height": "270", + "retract_lift_below": ["269"], + "extruder_clearance_height_to_lid": "110", "extruder_clearance_height_to_rod": "38", "extruder_clearance_max_radius": "60" } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/machine/Qidi X-Plus 3 0.8 nozzle.json b/resources/profiles/X 3 Series/machine/Qidi X-Plus 3 0.8 nozzle.json index b016fc8..9a3e405 100644 --- a/resources/profiles/X 3 Series/machine/Qidi X-Plus 3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/machine/Qidi X-Plus 3 0.8 nozzle.json @@ -12,6 +12,6 @@ "max_layer_height": ["0.56"], "min_layer_height": ["0.16"], "nozzle_diameter": ["0.8"], - "retract_length_toolchange": ["2"], + "retract_length_toolchange": ["3"], "retraction_length": ["3"] } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/machine/Qidi X-Smart 3 0.4 nozzle.json b/resources/profiles/X 3 Series/machine/Qidi X-Smart 3 0.4 nozzle.json index eade807..a2dc6b9 100644 --- a/resources/profiles/X 3 Series/machine/Qidi X-Smart 3 0.4 nozzle.json +++ b/resources/profiles/X 3 Series/machine/Qidi X-Smart 3 0.4 nozzle.json @@ -1,29 +1,23 @@ { - "type": "machine", - "setting_id": "GM001", - "name": "X-Smart 3 0.4 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_machine_x_common", - "printer_model": "X-Smart 3", - "gcode_flavor": "klipper", - "default_print_profile": "0.20mm Standard @XSmart3", - "printer_settings_id": "Qidi", - "default_filament_profile": ["QIDI PLA Rapido @Qidi X-Smart 3 0.4 nozzle"], - "auxiliary_fan": "0", - "change_filament_gcode": "", - "deretraction_speed": ["0"], - "machine_pause_gcode": "M0", - "max_layer_height": ["0.28"], - "min_layer_height": ["0.08"], - "nozzle_diameter": ["0.4"], - "printable_area": ["0x0","175x0","175x180","0x180"], - "printable_height": "170", - "retract_length_toolchange": ["2"], - "retract_lift_below":["169"], - "retraction_length": ["1"], - "retraction_minimum_travel": ["1"], - "extruder_clearance_height_to_lid": "110", + "type": "machine", + "setting_id": "GM001", + "name": "X-Smart 3 0.4 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_machine_x_common", + "printer_model": "X-Smart 3", + "gcode_flavor": "klipper", + "default_print_profile": "0.20mm Standard @XSmart3", + "printer_settings_id": "Qidi", + "default_filament_profile": ["QIDI PLA Rapido @Qidi X-Smart 3 0.4 nozzle"], + "auxiliary_fan": "0", + "change_filament_gcode": "", + "machine_pause_gcode": "M0", + "nozzle_diameter": ["0.4"], + "printable_area": ["0x0","175x0","175x180","0x180"], + "printable_height": "170", + "retract_lift_below": ["169"], + "extruder_clearance_height_to_lid": "110", "extruder_clearance_height_to_rod": "33", "extruder_clearance_max_radius": "56" } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/machine/Qidi X-Smart 3 0.8 nozzle.json b/resources/profiles/X 3 Series/machine/Qidi X-Smart 3 0.8 nozzle.json index 6b7c56b..7763a88 100644 --- a/resources/profiles/X 3 Series/machine/Qidi X-Smart 3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/machine/Qidi X-Smart 3 0.8 nozzle.json @@ -13,6 +13,6 @@ "max_layer_height": ["0.56"], "min_layer_height": ["0.16"], "nozzle_diameter": ["0.8"], - "retract_length_toolchange": ["2"], + "retract_length_toolchange": ["3"], "retraction_length": ["3"] } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/machine/Qidi X-Smart 3.json b/resources/profiles/X 3 Series/machine/Qidi X-Smart 3.json index 4a00056..eb0e576 100644 --- a/resources/profiles/X 3 Series/machine/Qidi X-Smart 3.json +++ b/resources/profiles/X 3 Series/machine/Qidi X-Smart 3.json @@ -7,5 +7,5 @@ "family": "Qidi", "bed_model": "X-Smart 3_bed.stl", "hotend_model": "X-Series_gen3_hotend.stl", - "default_materials": "Generic ABS @Qidi X-Smart 3 0.4 nozzle;Generic PLA @Qidi X-Smart 3 0.4 nozzle;QIDI ABS Odorless @Qidi X-Smart 3 0.4 nozzle;QIDI ABS Rapido @Qidi X-Smart 3 0.4 nozzle;QIDI PLA Rapido @Qidi X-Smart 3 0.4 nozzle;QIDI PLA Rapido Matte @Qidi X-Smart 3 0.4 nozzle;QIDI PLA-CF @Qidi X-Smart 3 0.4 nozzle;QIDI PLA Rapido Silk @Qidi X-Smart 3 0.4 nozzle;Generic PLA Silk @Qidi X-Smart 3 0.4 nozzle" + "default_materials": "Generic ABS @Qidi X-Smart 3 0.4 nozzle;Generic PLA @Qidi X-Smart 3 0.4 nozzle;QIDI ABS Odorless @Qidi X-Smart 3 0.4 nozzle;QIDI ABS Rapido @Qidi X-Smart 3 0.4 nozzle;QIDI PLA Rapido @Qidi X-Smart 3 0.4 nozzle;QIDI PLA Rapido Matte @Qidi X-Smart 3 0.4 nozzle;QIDI PLA-CF @Qidi X-Smart 3 0.4 nozzle;QIDI PLA Rapido Silk @Qidi X-Smart 3 0.4 nozzle;Generic PLA Silk @Qidi X-Smart 3 0.4 nozzle" } diff --git a/resources/profiles/X 3 Series/machine/fdm_machine_x_common.json b/resources/profiles/X 3 Series/machine/fdm_machine_x_common.json index ab5b5dc..6e1553a 100644 --- a/resources/profiles/X 3 Series/machine/fdm_machine_x_common.json +++ b/resources/profiles/X 3 Series/machine/fdm_machine_x_common.json @@ -8,7 +8,7 @@ "before_layer_change_gcode": "", "change_filament_gcode": "", "default_print_profile": "0.20mm Standard @XMax3", - "deretraction_speed": ["40"], + "deretraction_speed": ["30"], "extruder_clearance_height_to_lid": "140", "extruder_clearance_height_to_rod": "36", "extruder_clearance_radius": "65", @@ -16,10 +16,11 @@ "extruder_offset": ["0x0"], "gcode_flavor": "klipper", "layer_change_gcode": "G92 E0", - "machine_end_gcode": "M141 S0\nM104 S0\nM140 S0\nG1 E-3 F1800\nG0 Z{max_layer_z + 3} F600\nG0 X0 Y0 F12000\n{if max_layer_z < max_print_height / 2}G1 Z{max_print_height / 2 + 10} F600{else}G1 Z{min(max_print_height, max_layer_z + 3)}{endif}", + "machine_end_gcode": "M141 S0\nM104 S0\nM140 S0\nG1 E-3 F1800\nG0 Z{max_layer_z + 3} F600\nG0 X0 Y0 F12000\n{if max_layer_z < max_print_height / 2}G1 Z{max_print_height / 2 + 10} F600{else}G1 Z{min(max_print_height, max_layer_z + 3)}{endif}", "machine_max_acceleration_e": ["5000"], - "machine_max_acceleration_extruding": ["20000"], - "machine_max_acceleration_retracting": ["5000"], + "machine_max_acceleration_extruding": ["20000", "20000"], + "machine_max_acceleration_retracting": ["5000", "5000"], + "machine_max_acceleration_travel": ["9000", "9000"], "machine_max_acceleration_x": ["20000"], "machine_max_acceleration_y": ["20000"], "machine_max_acceleration_z": ["500"], @@ -31,14 +32,15 @@ "machine_max_speed_x": ["600"], "machine_max_speed_y": ["600"], "machine_max_speed_z": ["10"], - "machine_min_extruding_rate": ["0"], - "machine_min_travel_rate": ["0"], - "machine_pause_gcode": "M0", + "machine_min_extruding_rate": ["0", "0"], + "machine_min_travel_rate": ["0", "0"], + "machine_pause_gcode": "M0", "machine_start_gcode": "PRINT_START\nG28\nM141 S0\nG0 Z50 F600\nM190 S[bed_temperature_initial_layer_single]\nG28 Z\nG29; mesh bed leveling ,comment this code to close it\nG0 X0 Y0 Z50 F6000\nM109 S[nozzle_temperature_initial_layer]\nM106 P3 S255\nM83\nG4 P3000\nT[initial_tool]\nG0 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0)} Z5 F6000\nG0 Z[initial_layer_print_height] F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0], first_layer_print_min[0] + 80))} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0)} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 85} E{83 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1], first_layer_print_min[1] + 80) - 85),0) + 3} E{82 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0], first_layer_print_min[0] + 80) - 85),0) + 12} E{-10 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 E{10 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\n", - "max_layer_height": ["0.32"], + "machine_switch_extruder_time": "0", + "max_layer_height": ["0.28"], "min_layer_height": ["0.08"], "nozzle_diameter": ["0.4"], - "nozzle_type": "brass", + "nozzle_type": ["brass"], "printable_height": "250", "printer_settings_id": "", "printer_structure": "corexy", @@ -49,12 +51,13 @@ "retract_restart_extra": ["0"], "retract_when_changing_layer": ["1"], "retraction_length": ["1"], - "retraction_minimum_travel": ["2"], + "retraction_minimum_travel": ["1"], "retraction_speed": ["30"], - "scan_first_layer": "0", + "scan_first_layer": "0", "silent_mode": "0", "single_extruder_multi_material": "1", "support_air_filtration": ["1"], + "support_box_temp_control": "0", "support_chamber_temp_control": "1", "thumbnail_size": ["380x380/QIDI","210x210/QIDI","110x110/PNG"], "thumbnails_format": "QIDI", diff --git a/resources/profiles/X 3 Series/process/0.06mm High Quality @XMax3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.06mm High Quality @XMax3 0.2 nozzle.json index f98624c..660f1d2 100644 --- a/resources/profiles/X 3 Series/process/0.06mm High Quality @XMax3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.06mm High Quality @XMax3 0.2 nozzle.json @@ -5,30 +5,32 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", - "default_acceleration": "4000", + "default_acceleration": ["4000"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.06", "line_width": "0.22", - "outer_wall_acceleration": "2000", + "outer_wall_acceleration": ["2000"], "outer_wall_line_width": "0.22", - "outer_wall_speed": "60", + "outer_wall_speed": ["60"], "sparse_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.06", "support_line_width": "0.22", "support_top_z_distance": "0.06", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Max 3 0.2 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.06mm High Quality @XPlus3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.06mm High Quality @XPlus3 0.2 nozzle.json index 7b72301..1337380 100644 --- a/resources/profiles/X 3 Series/process/0.06mm High Quality @XPlus3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.06mm High Quality @XPlus3 0.2 nozzle.json @@ -5,30 +5,32 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", - "default_acceleration": "4000", + "default_acceleration": ["4000"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.06", "line_width": "0.22", - "outer_wall_acceleration": "2000", + "outer_wall_acceleration": ["2000"], "outer_wall_line_width": "0.22", - "outer_wall_speed": "60", + "outer_wall_speed": ["60"], "sparse_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.06", "support_line_width": "0.22", "support_top_z_distance": "0.06", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Plus 3 0.2 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.06mm High Quality @XSmart3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.06mm High Quality @XSmart3 0.2 nozzle.json index e11ae9f..9996e31 100644 --- a/resources/profiles/X 3 Series/process/0.06mm High Quality @XSmart3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.06mm High Quality @XSmart3 0.2 nozzle.json @@ -5,30 +5,32 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", - "default_acceleration": "4000", + "default_acceleration": ["4000"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.06", "line_width": "0.22", - "outer_wall_acceleration": "2000", + "outer_wall_acceleration": ["2000"], "outer_wall_line_width": "0.22", - "outer_wall_speed": "60", + "outer_wall_speed": ["60"], "sparse_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.06", "support_line_width": "0.22", "support_top_z_distance": "0.06", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Smart 3 0.2 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.06mm Standard @XMax3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.06mm Standard @XMax3 0.2 nozzle.json index 30214c4..fcfe179 100644 --- a/resources/profiles/X 3 Series/process/0.06mm Standard @XMax3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.06mm Standard @XMax3 0.2 nozzle.json @@ -5,26 +5,28 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.06", "line_width": "0.22", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.06", "support_line_width": "0.22", "support_top_z_distance": "0.06", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Max 3 0.2 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.06mm Standard @XPlus3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.06mm Standard @XPlus3 0.2 nozzle.json index f066f55..2f2d26d 100644 --- a/resources/profiles/X 3 Series/process/0.06mm Standard @XPlus3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.06mm Standard @XPlus3 0.2 nozzle.json @@ -5,26 +5,28 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.06", "line_width": "0.22", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.06", "support_line_width": "0.22", "support_top_z_distance": "0.06", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Plus 3 0.2 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.06mm Standard @XSmart3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.06mm Standard @XSmart3 0.2 nozzle.json index 9c60c01..406bad6 100644 --- a/resources/profiles/X 3 Series/process/0.06mm Standard @XSmart3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.06mm Standard @XSmart3 0.2 nozzle.json @@ -5,26 +5,28 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.06", "line_width": "0.22", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.06", "support_line_width": "0.22", "support_top_z_distance": "0.06", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Smart 3 0.2 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.08mm Extra Fine @XMax3.json b/resources/profiles/X 3 Series/process/0.08mm Extra Fine @XMax3.json index ac75453..c5bfc20 100644 --- a/resources/profiles/X 3 Series/process/0.08mm Extra Fine @XMax3.json +++ b/resources/profiles/X 3 Series/process/0.08mm Extra Fine @XMax3.json @@ -1,28 +1,28 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.08mm Extra Fine @XMax3", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_common", + "type": "process", + "setting_id": "GP004", + "name": "0.08mm Extra Fine @XMax3", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "7", "bottom_shell_layers": "7", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "gap_infill_speed": "350", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "350", - "internal_solid_infill_speed": "350", + "gap_infill_speed": ["350"], + "inner_wall_speed": ["350"], + "internal_solid_infill_speed": ["350"], "ironing_flow": "8%", - "layer_height": "0.08", - "outer_wall_speed": "200", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "10", - "sparse_infill_speed": "450", + "layer_height": "0.08", + "outer_wall_speed": ["200"], + "overhang_1_4_speed": ["60"], + "overhang_2_4_speed": ["30"], + "overhang_3_4_speed": ["10"], + "sparse_infill_speed": ["450"], "support_bottom_z_distance": "0.08", "support_threshold_angle": "15", "support_top_z_distance": "0.08", + "top_color_penetration_layers": "9", "top_shell_layers": "9", "compatible_printers": ["X-Max 3 0.4 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.08mm Extra Fine @XPlus3.json b/resources/profiles/X 3 Series/process/0.08mm Extra Fine @XPlus3.json index 26f5999..78d0753 100644 --- a/resources/profiles/X 3 Series/process/0.08mm Extra Fine @XPlus3.json +++ b/resources/profiles/X 3 Series/process/0.08mm Extra Fine @XPlus3.json @@ -1,28 +1,28 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.08mm Extra Fine @XPlus3", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_common", + "type": "process", + "setting_id": "GP004", + "name": "0.08mm Extra Fine @XPlus3", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "7", "bottom_shell_layers": "7", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "gap_infill_speed": "350", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "350", - "internal_solid_infill_speed": "350", + "gap_infill_speed": ["350"], + "inner_wall_speed": ["350"], + "internal_solid_infill_speed": ["350"], "ironing_flow": "8%", - "layer_height": "0.08", - "outer_wall_speed": "200", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "10", - "sparse_infill_speed": "450", + "layer_height": "0.08", + "outer_wall_speed": ["200"], + "overhang_1_4_speed": ["60"], + "overhang_2_4_speed": ["30"], + "overhang_3_4_speed": ["10"], + "sparse_infill_speed": ["450"], "support_bottom_z_distance": "0.08", "support_threshold_angle": "15", "support_top_z_distance": "0.08", + "top_color_penetration_layers": "9", "top_shell_layers": "9", "compatible_printers": ["X-Plus 3 0.4 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.08mm Extra Fine @XSmart3.json b/resources/profiles/X 3 Series/process/0.08mm Extra Fine @XSmart3.json index bc7cca4..aa82690 100644 --- a/resources/profiles/X 3 Series/process/0.08mm Extra Fine @XSmart3.json +++ b/resources/profiles/X 3 Series/process/0.08mm Extra Fine @XSmart3.json @@ -1,28 +1,28 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.08mm Extra Fine @XSmart3", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_common", + "type": "process", + "setting_id": "GP004", + "name": "0.08mm Extra Fine @XSmart3", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "7", "bottom_shell_layers": "7", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "gap_infill_speed": "350", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "350", - "internal_solid_infill_speed": "350", + "gap_infill_speed": ["350"], + "inner_wall_speed": ["350"], + "internal_solid_infill_speed": ["350"], "ironing_flow": "8%", - "layer_height": "0.08", - "outer_wall_speed": "200", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "10", - "sparse_infill_speed": "450", + "layer_height": "0.08", + "outer_wall_speed": ["200"], + "overhang_1_4_speed": ["60"], + "overhang_2_4_speed": ["30"], + "overhang_3_4_speed": ["10"], + "sparse_infill_speed": ["450"], "support_bottom_z_distance": "0.08", "support_threshold_angle": "15", "support_top_z_distance": "0.08", + "top_color_penetration_layers": "9", "top_shell_layers": "9", "compatible_printers": ["X-Smart 3 0.4 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.08mm High Quality @XMax3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.08mm High Quality @XMax3 0.2 nozzle.json index 81ccde7..56752fa 100644 --- a/resources/profiles/X 3 Series/process/0.08mm High Quality @XMax3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.08mm High Quality @XMax3 0.2 nozzle.json @@ -5,30 +5,32 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", - "default_acceleration": "4000", + "default_acceleration": ["4000"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.08", "line_width": "0.22", - "outer_wall_acceleration": "2000", + "outer_wall_acceleration": ["2000"], "outer_wall_line_width": "0.22", - "outer_wall_speed": "60", + "outer_wall_speed": ["60"], "sparse_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.08", "support_line_width": "0.22", "support_top_z_distance": "0.08", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Max 3 0.2 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.08mm High Quality @XMax3.json b/resources/profiles/X 3 Series/process/0.08mm High Quality @XMax3.json index cf4448e..d48c73e 100644 --- a/resources/profiles/X 3 Series/process/0.08mm High Quality @XMax3.json +++ b/resources/profiles/X 3 Series/process/0.08mm High Quality @XMax3.json @@ -1,32 +1,31 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.08mm High Quality @XMax3", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_common", + "type": "process", + "setting_id": "GP004", + "name": "0.08mm High Quality @XMax3", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "7", "bottom_shell_layers": "7", "bridge_flow": "1", - "default_acceleration": "4000", + "default_acceleration": ["4000"], "elefant_foot_compensation": "0.15", - "gap_infill_speed": "210", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "120", - "internal_solid_infill_speed": "150", + "gap_infill_speed": ["210"], + "inner_wall_speed": ["120"], "ironing_flow": "8%", "layer_height": "0.08", - "outer_wall_acceleration": "2000", - "outer_wall_speed": "60", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "10", + "outer_wall_acceleration": ["2000"], + "outer_wall_speed": ["60"], + "overhang_1_4_speed": ["60"], + "overhang_2_4_speed": ["30"], + "overhang_3_4_speed": ["10"], "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "150", + "sparse_infill_speed": ["150"], "support_bottom_z_distance": "0.08", "support_threshold_angle": "15", "support_top_z_distance": "0.08", + "top_color_penetration_layers": "9", "top_shell_layers": "9", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Max 3 0.4 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.08mm High Quality @XPlus3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.08mm High Quality @XPlus3 0.2 nozzle.json index 89ba01e..1791f6b 100644 --- a/resources/profiles/X 3 Series/process/0.08mm High Quality @XPlus3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.08mm High Quality @XPlus3 0.2 nozzle.json @@ -5,30 +5,32 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", - "default_acceleration": "4000", + "default_acceleration": ["4000"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.08", "line_width": "0.22", - "outer_wall_acceleration": "2000", + "outer_wall_acceleration": ["2000"], "outer_wall_line_width": "0.22", - "outer_wall_speed": "60", + "outer_wall_speed": ["60"], "sparse_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.08", "support_line_width": "0.22", "support_top_z_distance": "0.08", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Plus 3 0.2 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.08mm High Quality @XPlus3.json b/resources/profiles/X 3 Series/process/0.08mm High Quality @XPlus3.json index 30ddaa3..c6f8b82 100644 --- a/resources/profiles/X 3 Series/process/0.08mm High Quality @XPlus3.json +++ b/resources/profiles/X 3 Series/process/0.08mm High Quality @XPlus3.json @@ -1,32 +1,31 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.08mm High Quality @XPlus3", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_common", + "type": "process", + "setting_id": "GP004", + "name": "0.08mm High Quality @XPlus3", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "7", "bottom_shell_layers": "7", "bridge_flow": "1", - "default_acceleration": "4000", + "default_acceleration": ["4000"], "elefant_foot_compensation": "0.15", - "gap_infill_speed": "210", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "120", - "internal_solid_infill_speed": "150", + "gap_infill_speed": ["210"], + "inner_wall_speed": ["120"], "ironing_flow": "8%", "layer_height": "0.08", - "outer_wall_acceleration": "2000", - "outer_wall_speed": "60", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "10", + "outer_wall_acceleration": ["2000"], + "outer_wall_speed": ["60"], + "overhang_1_4_speed": ["60"], + "overhang_2_4_speed": ["30"], + "overhang_3_4_speed": ["10"], "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "150", + "sparse_infill_speed": ["150"], "support_bottom_z_distance": "0.08", "support_threshold_angle": "15", "support_top_z_distance": "0.08", + "top_color_penetration_layers": "9", "top_shell_layers": "9", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Plus 3 0.4 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.08mm High Quality @XSmart3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.08mm High Quality @XSmart3 0.2 nozzle.json index d3d1776..075c7c5 100644 --- a/resources/profiles/X 3 Series/process/0.08mm High Quality @XSmart3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.08mm High Quality @XSmart3 0.2 nozzle.json @@ -5,30 +5,32 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", - "default_acceleration": "4000", + "default_acceleration": ["4000"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.08", "line_width": "0.22", - "outer_wall_acceleration": "2000", + "outer_wall_acceleration": ["2000"], "outer_wall_line_width": "0.22", - "outer_wall_speed": "60", + "outer_wall_speed": ["60"], "sparse_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.08", "support_line_width": "0.22", "support_top_z_distance": "0.08", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Smart 3 0.2 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.08mm High Quality @XSmart3.json b/resources/profiles/X 3 Series/process/0.08mm High Quality @XSmart3.json index 3614396..189a504 100644 --- a/resources/profiles/X 3 Series/process/0.08mm High Quality @XSmart3.json +++ b/resources/profiles/X 3 Series/process/0.08mm High Quality @XSmart3.json @@ -1,32 +1,31 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.08mm High Quality @XSmart3", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_common", + "type": "process", + "setting_id": "GP004", + "name": "0.08mm High Quality @XSmart3", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "7", "bottom_shell_layers": "7", "bridge_flow": "1", - "default_acceleration": "4000", + "default_acceleration": ["4000"], "elefant_foot_compensation": "0.15", - "gap_infill_speed": "210", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "120", - "internal_solid_infill_speed": "150", + "gap_infill_speed": ["210"], + "inner_wall_speed": ["120"], "ironing_flow": "8%", "layer_height": "0.08", - "outer_wall_acceleration": "2000", - "outer_wall_speed": "60", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "10", + "outer_wall_acceleration": ["2000"], + "outer_wall_speed": ["60"], + "overhang_1_4_speed": ["60"], + "overhang_2_4_speed": ["30"], + "overhang_3_4_speed": ["10"], "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "150", + "sparse_infill_speed": ["150"], "support_bottom_z_distance": "0.08", "support_threshold_angle": "15", "support_top_z_distance": "0.08", + "top_color_penetration_layers": "9", "top_shell_layers": "9", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Smart 3 0.4 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.08mm Standard @XMax3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.08mm Standard @XMax3 0.2 nozzle.json index af4d86b..90b6957 100644 --- a/resources/profiles/X 3 Series/process/0.08mm Standard @XMax3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.08mm Standard @XMax3 0.2 nozzle.json @@ -5,26 +5,28 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.08", "line_width": "0.22", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.08", "support_line_width": "0.22", "support_top_z_distance": "0.08", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Max 3 0.2 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.08mm Standard @XPlus3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.08mm Standard @XPlus3 0.2 nozzle.json index b9544d6..414e1d1 100644 --- a/resources/profiles/X 3 Series/process/0.08mm Standard @XPlus3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.08mm Standard @XPlus3 0.2 nozzle.json @@ -5,26 +5,28 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.08", "line_width": "0.22", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.08", "support_line_width": "0.22", "support_top_z_distance": "0.08", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Plus 3 0.2 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.08mm Standard @XSmart3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.08mm Standard @XSmart3 0.2 nozzle.json index 2aba042..af419c7 100644 --- a/resources/profiles/X 3 Series/process/0.08mm Standard @XSmart3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.08mm Standard @XSmart3 0.2 nozzle.json @@ -5,26 +5,28 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.08", "line_width": "0.22", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.08", "support_line_width": "0.22", "support_top_z_distance": "0.08", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Smart 3 0.2 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.10mm High Quality @XMax3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.10mm High Quality @XMax3 0.2 nozzle.json index a5af187..99dfc63 100644 --- a/resources/profiles/X 3 Series/process/0.10mm High Quality @XMax3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.10mm High Quality @XMax3 0.2 nozzle.json @@ -5,30 +5,32 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", - "default_acceleration": "4000", + "default_acceleration": ["4000"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.1", "line_width": "0.22", - "outer_wall_acceleration": "2000", + "outer_wall_acceleration": ["2000"], "outer_wall_line_width": "0.22", - "outer_wall_speed": "60", + "outer_wall_speed": ["60"], "sparse_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.1", "support_line_width": "0.22", "support_top_z_distance": "0.1", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Max 3 0.2 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.10mm High Quality @XPlus3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.10mm High Quality @XPlus3 0.2 nozzle.json index df062f9..abad901 100644 --- a/resources/profiles/X 3 Series/process/0.10mm High Quality @XPlus3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.10mm High Quality @XPlus3 0.2 nozzle.json @@ -5,30 +5,32 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", - "default_acceleration": "4000", + "default_acceleration": ["4000"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.1", "line_width": "0.22", - "outer_wall_acceleration": "2000", + "outer_wall_acceleration": ["2000"], "outer_wall_line_width": "0.22", - "outer_wall_speed": "60", + "outer_wall_speed": ["60"], "sparse_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.1", "support_line_width": "0.22", "support_top_z_distance": "0.1", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Plus 3 0.2 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.10mm High Quality @XSmart3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.10mm High Quality @XSmart3 0.2 nozzle.json index 1eda933..d734ec2 100644 --- a/resources/profiles/X 3 Series/process/0.10mm High Quality @XSmart3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.10mm High Quality @XSmart3 0.2 nozzle.json @@ -5,30 +5,32 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", - "default_acceleration": "4000", + "default_acceleration": ["4000"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.1", "line_width": "0.22", - "outer_wall_acceleration": "2000", + "outer_wall_acceleration": ["2000"], "outer_wall_line_width": "0.22", - "outer_wall_speed": "60", + "outer_wall_speed": ["60"], "sparse_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.1", "support_line_width": "0.22", "support_top_z_distance": "0.1", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Smart 3 0.2 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.10mm Standard @XMax3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.10mm Standard @XMax3 0.2 nozzle.json index a976c6a..3f7d937 100644 --- a/resources/profiles/X 3 Series/process/0.10mm Standard @XMax3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.10mm Standard @XMax3 0.2 nozzle.json @@ -5,26 +5,28 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.1", "line_width": "0.22", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.1", "support_line_width": "0.22", "support_top_z_distance": "0.1", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Max 3 0.2 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.10mm Standard @XPlus3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.10mm Standard @XPlus3 0.2 nozzle.json index f9bc490..e190329 100644 --- a/resources/profiles/X 3 Series/process/0.10mm Standard @XPlus3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.10mm Standard @XPlus3 0.2 nozzle.json @@ -5,26 +5,28 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.1", "line_width": "0.22", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.1", "support_line_width": "0.22", "support_top_z_distance": "0.1", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Plus 3 0.2 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.10mm Standard @XSmart3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.10mm Standard @XSmart3 0.2 nozzle.json index 95a6363..74b59fe 100644 --- a/resources/profiles/X 3 Series/process/0.10mm Standard @XSmart3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.10mm Standard @XSmart3 0.2 nozzle.json @@ -5,26 +5,28 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.1", "line_width": "0.22", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.1", "support_line_width": "0.22", "support_top_z_distance": "0.1", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Smart 3 0.2 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.12mm Fine @XMax3.json b/resources/profiles/X 3 Series/process/0.12mm Fine @XMax3.json index 555d7dd..c1699bf 100644 --- a/resources/profiles/X 3 Series/process/0.12mm Fine @XMax3.json +++ b/resources/profiles/X 3 Series/process/0.12mm Fine @XMax3.json @@ -1,28 +1,28 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.12mm Fine @XMax3", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_common", - "bottom_shell_layers": "5", - "bridge_flow": "1", - "elefant_foot_compensation": "0.15", - "gap_infill_speed": "350", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "350", - "internal_solid_infill_speed": "350", - "layer_height": "0.12", - "outer_wall_speed": "200", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "10", - "sparse_infill_speed": "430", - "support_bottom_z_distance": "0.12", - "support_threshold_angle": "20", - "support_top_z_distance": "0.12", - "top_shell_layers": "5", - "top_shell_thickness": "0.6", - "compatible_printers": ["X-Max 3 0.4 nozzle"] + "type": "process", + "setting_id": "GP004", + "name": "0.12mm Fine @XMax3", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", + "bottom_shell_layers": "5", + "bridge_flow": "1", + "elefant_foot_compensation": "0.15", + "gap_infill_speed": ["350"], + "inner_wall_speed": ["350"], + "internal_solid_infill_speed": ["350"], + "layer_height": "0.12", + "outer_wall_speed": ["200"], + "overhang_1_4_speed": ["60"], + "overhang_2_4_speed": ["30"], + "overhang_3_4_speed": ["10"], + "sparse_infill_speed": ["430"], + "support_bottom_z_distance": "0.12", + "support_threshold_angle": "20", + "support_top_z_distance": "0.12", + "top_color_penetration_layers": "5", + "top_shell_layers": "5", + "top_shell_thickness": "0.6", + "compatible_printers": ["X-Max 3 0.4 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/process/0.12mm Fine @XPlus3.json b/resources/profiles/X 3 Series/process/0.12mm Fine @XPlus3.json index 12c1a4e..9eef9d8 100644 --- a/resources/profiles/X 3 Series/process/0.12mm Fine @XPlus3.json +++ b/resources/profiles/X 3 Series/process/0.12mm Fine @XPlus3.json @@ -1,27 +1,27 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.12mm Fine @XPlus3", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_common", + "type": "process", + "setting_id": "GP004", + "name": "0.12mm Fine @XPlus3", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "gap_infill_speed": "350", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "350", - "internal_solid_infill_speed": "350", - "layer_height": "0.12", - "outer_wall_speed": "200", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "10", - "sparse_infill_speed": "430", + "gap_infill_speed": ["350"], + "inner_wall_speed": ["350"], + "internal_solid_infill_speed": ["350"], + "layer_height": "0.12", + "outer_wall_speed": ["200"], + "overhang_1_4_speed": ["60"], + "overhang_2_4_speed": ["30"], + "overhang_3_4_speed": ["10"], + "sparse_infill_speed": ["430"], "support_bottom_z_distance": "0.12", "support_threshold_angle": "20", "support_top_z_distance": "0.12", + "top_color_penetration_layers": "5", "top_shell_layers": "5", "top_shell_thickness": "0.6", "compatible_printers": ["X-Plus 3 0.4 nozzle"] diff --git a/resources/profiles/X 3 Series/process/0.12mm Fine @XSmart3.json b/resources/profiles/X 3 Series/process/0.12mm Fine @XSmart3.json index 24e271b..db1479e 100644 --- a/resources/profiles/X 3 Series/process/0.12mm Fine @XSmart3.json +++ b/resources/profiles/X 3 Series/process/0.12mm Fine @XSmart3.json @@ -1,28 +1,28 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.12mm Fine @XSmart3", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_common", + "type": "process", + "setting_id": "GP004", + "name": "0.12mm Fine @XSmart3", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "gap_infill_speed": "350", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "350", - "internal_solid_infill_speed": "350", - "layer_height": "0.12", - "outer_wall_speed": "200", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "10", - "sparse_infill_speed": "430", + "gap_infill_speed": ["350"], + "inner_wall_speed": ["350"], + "internal_solid_infill_speed": ["350"], + "layer_height": "0.12", + "outer_wall_speed": ["200"], + "overhang_1_4_speed": ["60"], + "overhang_2_4_speed": ["30"], + "overhang_3_4_speed": ["10"], + "sparse_infill_speed": ["430"], "support_bottom_z_distance": "0.12", "support_threshold_angle": "20", "support_top_z_distance": "0.12", + "top_color_penetration_layers": "5", "top_shell_layers": "5", "top_shell_thickness": "0.6", - "compatible_printers": ["X-Smart 3 0.4 nozzle"] + "compatible_printers": ["X-Smart 3 0.4 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/process/0.12mm High Quality @XMax3.json b/resources/profiles/X 3 Series/process/0.12mm High Quality @XMax3.json index 939d744..57fa757 100644 --- a/resources/profiles/X 3 Series/process/0.12mm High Quality @XMax3.json +++ b/resources/profiles/X 3 Series/process/0.12mm High Quality @XMax3.json @@ -1,32 +1,31 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.12mm High Quality @XMax3", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_common", - "bottom_shell_layers": "5", - "bridge_flow": "1", - "default_acceleration": "4000", - "elefant_foot_compensation": "0.15", - "gap_infill_speed": "230", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "150", - "internal_solid_infill_speed": "180", - "layer_height": "0.12", - "outer_wall_acceleration": "2000", - "outer_wall_speed": "60", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "10", - "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "180", - "support_bottom_z_distance": "0.12", - "support_threshold_angle": "20", - "support_top_z_distance": "0.12", - "top_shell_layers": "5", - "top_shell_thickness": "0.6", - "top_surface_speed": "150", - "compatible_printers": ["X-Max 3 0.4 nozzle"] + "type": "process", + "setting_id": "GP004", + "name": "0.12mm High Quality @XMax3", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", + "bottom_shell_layers": "5", + "bridge_flow": "1", + "default_acceleration": ["4000"], + "elefant_foot_compensation": "0.15", + "gap_infill_speed": ["230"], + "internal_solid_infill_speed": ["180"], + "layer_height": "0.12", + "outer_wall_acceleration": ["2000"], + "outer_wall_speed": ["60"], + "overhang_1_4_speed": ["60"], + "overhang_2_4_speed": ["30"], + "overhang_3_4_speed": ["10"], + "sparse_infill_pattern": "gyroid", + "sparse_infill_speed": ["180"], + "support_bottom_z_distance": "0.12", + "support_threshold_angle": "20", + "support_top_z_distance": "0.12", + "top_color_penetration_layers": "5", + "top_shell_layers": "5", + "top_shell_thickness": "0.6", + "top_surface_speed": ["150"], + "compatible_printers": ["X-Max 3 0.4 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/process/0.12mm High Quality @XPlus3.json b/resources/profiles/X 3 Series/process/0.12mm High Quality @XPlus3.json index 44604a9..7e14645 100644 --- a/resources/profiles/X 3 Series/process/0.12mm High Quality @XPlus3.json +++ b/resources/profiles/X 3 Series/process/0.12mm High Quality @XPlus3.json @@ -1,32 +1,31 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.12mm High Quality @XPlus3", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_common", + "type": "process", + "setting_id": "GP004", + "name": "0.12mm High Quality @XPlus3", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", - "default_acceleration": "4000", + "default_acceleration": ["4000"], "elefant_foot_compensation": "0.15", - "gap_infill_speed": "230", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "150", - "internal_solid_infill_speed": "180", + "gap_infill_speed": ["230"], + "internal_solid_infill_speed": ["180"], "layer_height": "0.12", - "outer_wall_acceleration": "2000", - "outer_wall_speed": "60", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "10", + "outer_wall_acceleration": ["2000"], + "outer_wall_speed": ["60"], + "overhang_1_4_speed": ["60"], + "overhang_2_4_speed": ["30"], + "overhang_3_4_speed": ["10"], "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "180", + "sparse_infill_speed": ["180"], "support_bottom_z_distance": "0.12", "support_threshold_angle": "20", "support_top_z_distance": "0.12", + "top_color_penetration_layers": "5", "top_shell_layers": "5", "top_shell_thickness": "0.6", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Plus 3 0.4 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.12mm High Quality @XSmart3.json b/resources/profiles/X 3 Series/process/0.12mm High Quality @XSmart3.json index a56b55e..0f6eac1 100644 --- a/resources/profiles/X 3 Series/process/0.12mm High Quality @XSmart3.json +++ b/resources/profiles/X 3 Series/process/0.12mm High Quality @XSmart3.json @@ -1,32 +1,31 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.12mm High Quality @XSmart3", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_common", + "type": "process", + "setting_id": "GP004", + "name": "0.12mm High Quality @XSmart3", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", - "default_acceleration": "4000", + "default_acceleration": ["4000"], "elefant_foot_compensation": "0.15", - "gap_infill_speed": "230", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "150", - "internal_solid_infill_speed": "180", - "layer_height": "0.12", - "outer_wall_acceleration": "2000", - "outer_wall_speed": "60", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "10", + "gap_infill_speed": ["230"], + "internal_solid_infill_speed": ["180"], + "layer_height": "0.12", + "outer_wall_acceleration": ["2000"], + "outer_wall_speed": ["60"], + "overhang_1_4_speed": ["60"], + "overhang_2_4_speed": ["30"], + "overhang_3_4_speed": ["10"], "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "180", + "sparse_infill_speed": ["180"], "support_bottom_z_distance": "0.12", "support_threshold_angle": "20", "support_top_z_distance": "0.12", + "top_color_penetration_layers": "5", "top_shell_layers": "5", "top_shell_thickness": "0.6", - "top_surface_speed": "150", - "compatible_printers": ["X-Smart 3 0.4 nozzle"] + "top_surface_speed": ["150"], + "compatible_printers": ["X-Smart 3 0.4 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/process/0.12mm Standard @XMax3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.12mm Standard @XMax3 0.2 nozzle.json index a9a9100..f0d3287 100644 --- a/resources/profiles/X 3 Series/process/0.12mm Standard @XMax3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.12mm Standard @XMax3 0.2 nozzle.json @@ -5,26 +5,28 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.12", "line_width": "0.22", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.12", "support_line_width": "0.22", "support_top_z_distance": "0.12", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Max 3 0.2 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.12mm Standard @XPlus3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.12mm Standard @XPlus3 0.2 nozzle.json index 3ab278e..661e249 100644 --- a/resources/profiles/X 3 Series/process/0.12mm Standard @XPlus3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.12mm Standard @XPlus3 0.2 nozzle.json @@ -5,26 +5,28 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.12", "line_width": "0.22", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.12", "support_line_width": "0.22", "support_top_z_distance": "0.12", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Plus 3 0.2 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.12mm Standard @XSmart3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.12mm Standard @XSmart3 0.2 nozzle.json index 34bc2a7..3f8c467 100644 --- a/resources/profiles/X 3 Series/process/0.12mm Standard @XSmart3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.12mm Standard @XSmart3 0.2 nozzle.json @@ -5,26 +5,28 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.12", "line_width": "0.22", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.12", "support_line_width": "0.22", "support_top_z_distance": "0.12", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Smart 3 0.2 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.14mm Standard @XMax3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.14mm Standard @XMax3 0.2 nozzle.json index b817817..879457e 100644 --- a/resources/profiles/X 3 Series/process/0.14mm Standard @XMax3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.14mm Standard @XMax3 0.2 nozzle.json @@ -5,26 +5,28 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.14", "line_width": "0.22", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.14", "support_line_width": "0.22", "support_top_z_distance": "0.14", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Max 3 0.2 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.14mm Standard @XPlus3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.14mm Standard @XPlus3 0.2 nozzle.json index 571fc19..32fb32d 100644 --- a/resources/profiles/X 3 Series/process/0.14mm Standard @XPlus3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.14mm Standard @XPlus3 0.2 nozzle.json @@ -5,26 +5,28 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.14", "line_width": "0.22", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.14", "support_line_width": "0.22", "support_top_z_distance": "0.14", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Plus 3 0.2 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.14mm Standard @XSmart3 0.2 nozzle.json b/resources/profiles/X 3 Series/process/0.14mm Standard @XSmart3 0.2 nozzle.json index d29a12f..2306018 100644 --- a/resources/profiles/X 3 Series/process/0.14mm Standard @XSmart3 0.2 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.14mm Standard @XSmart3 0.2 nozzle.json @@ -5,26 +5,28 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.14", "line_width": "0.22", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.14", "support_line_width": "0.22", "support_top_z_distance": "0.14", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Smart 3 0.2 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.16mm High Quality @XMax3.json b/resources/profiles/X 3 Series/process/0.16mm High Quality @XMax3.json index 34c274b..a93c5d7 100644 --- a/resources/profiles/X 3 Series/process/0.16mm High Quality @XMax3.json +++ b/resources/profiles/X 3 Series/process/0.16mm High Quality @XMax3.json @@ -1,32 +1,31 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.16mm High Quality @XMax3", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_common", + "type": "process", + "setting_id": "GP004", + "name": "0.16mm High Quality @XMax3", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "4", "bottom_shell_layers": "4", "bridge_flow": "1", - "default_acceleration": "4000", + "default_acceleration": ["4000"], "elefant_foot_compensation": "0.15", - "gap_infill_speed": "250", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "150", - "internal_solid_infill_speed": "200", - "layer_height": "0.16", - "outer_wall_acceleration": "2000", - "outer_wall_speed": "60", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "10", + "gap_infill_speed": ["250"], + "internal_solid_infill_speed": ["200"], + "layer_height": "0.16", + "outer_wall_acceleration": ["2000"], + "outer_wall_speed": ["60"], + "overhang_1_4_speed": ["60"], + "overhang_2_4_speed": ["30"], + "overhang_3_4_speed": ["10"], "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "200", + "sparse_infill_speed": ["200"], "support_bottom_z_distance": "0.16", "support_threshold_angle": "25", "support_top_z_distance": "0.16", + "top_color_penetration_layers": "6", "top_shell_layers": "6", "top_shell_thickness": "1.0", - "top_surface_speed": "150", - "compatible_printers": ["X-Max 3 0.4 nozzle"] + "top_surface_speed": ["150"], + "compatible_printers": ["X-Max 3 0.4 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/process/0.16mm High Quality @XPlus3.json b/resources/profiles/X 3 Series/process/0.16mm High Quality @XPlus3.json index 51bdf57..ca8b20d 100644 --- a/resources/profiles/X 3 Series/process/0.16mm High Quality @XPlus3.json +++ b/resources/profiles/X 3 Series/process/0.16mm High Quality @XPlus3.json @@ -2,31 +2,30 @@ "type": "process", "setting_id": "GP004", "name": "0.16mm High Quality @XPlus3", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_common", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "4", "bottom_shell_layers": "4", "bridge_flow": "1", - "default_acceleration": "4000", + "default_acceleration": ["4000"], "elefant_foot_compensation": "0.15", - "gap_infill_speed": "250", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "150", - "internal_solid_infill_speed": "200", + "gap_infill_speed": ["250"], + "internal_solid_infill_speed": ["200"], "layer_height": "0.16", - "outer_wall_acceleration": "2000", - "outer_wall_speed": "60", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "10", + "outer_wall_acceleration": ["2000"], + "outer_wall_speed": ["60"], + "overhang_1_4_speed": ["60"], + "overhang_2_4_speed": ["30"], + "overhang_3_4_speed": ["10"], "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "200", + "sparse_infill_speed": ["200"], "support_bottom_z_distance": "0.16", "support_threshold_angle": "25", "support_top_z_distance": "0.16", + "top_color_penetration_layers": "6", "top_shell_layers": "6", "top_shell_thickness": "1.0", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Plus 3 0.4 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.16mm High Quality @XSmart3.json b/resources/profiles/X 3 Series/process/0.16mm High Quality @XSmart3.json index 0311dd6..9e7579b 100644 --- a/resources/profiles/X 3 Series/process/0.16mm High Quality @XSmart3.json +++ b/resources/profiles/X 3 Series/process/0.16mm High Quality @XSmart3.json @@ -1,32 +1,31 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.16mm High Quality @XSmart3", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_common", + "type": "process", + "setting_id": "GP004", + "name": "0.16mm High Quality @XSmart3", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "4", "bottom_shell_layers": "4", "bridge_flow": "1", - "default_acceleration": "4000", + "default_acceleration": ["4000"], "elefant_foot_compensation": "0.15", - "gap_infill_speed": "250", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "150", - "internal_solid_infill_speed": "200", - "layer_height": "0.16", - "outer_wall_acceleration": "2000", - "outer_wall_speed": "60", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "10", + "gap_infill_speed": ["250"], + "internal_solid_infill_speed": ["200"], + "layer_height": "0.16", + "outer_wall_acceleration": ["2000"], + "outer_wall_speed": ["60"], + "overhang_1_4_speed": ["60"], + "overhang_2_4_speed": ["30"], + "overhang_3_4_speed": ["10"], "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "200", + "sparse_infill_speed": ["200"], "support_bottom_z_distance": "0.16", "support_threshold_angle": "25", "support_top_z_distance": "0.16", + "top_color_penetration_layers": "6", "top_shell_layers": "6", "top_shell_thickness": "1.0", - "top_surface_speed": "150", - "compatible_printers": ["X-Smart 3 0.4 nozzle"] + "top_surface_speed": ["150"], + "compatible_printers": ["X-Smart 3 0.4 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/process/0.16mm Optimal @XMax3.json b/resources/profiles/X 3 Series/process/0.16mm Optimal @XMax3.json index cdc77cf..4c079fb 100644 --- a/resources/profiles/X 3 Series/process/0.16mm Optimal @XMax3.json +++ b/resources/profiles/X 3 Series/process/0.16mm Optimal @XMax3.json @@ -1,28 +1,28 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.16mm Optimal @XMax3", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_common", + "type": "process", + "setting_id": "GP004", + "name": "0.16mm Optimal @XMax3", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "4", "bottom_shell_layers": "4", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "gap_infill_speed": "300", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "300", - "internal_solid_infill_speed": "300", - "layer_height": "0.16", - "outer_wall_speed": "200", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "10", - "sparse_infill_speed": "330", + "gap_infill_speed": ["300"], + "inner_wall_speed": ["300"], + "internal_solid_infill_speed": ["300"], + "layer_height": "0.16", + "outer_wall_speed": ["200"], + "overhang_1_4_speed": ["60"], + "overhang_2_4_speed": ["30"], + "overhang_3_4_speed": ["10"], + "sparse_infill_speed": ["330"], "support_bottom_z_distance": "0.16", "support_threshold_angle": "25", "support_top_z_distance": "0.16", + "top_color_penetration_layers": "6", "top_shell_layers": "6", "top_shell_thickness": "1.0", - "compatible_printers": ["X-Max 3 0.4 nozzle"] + "compatible_printers": ["X-Max 3 0.4 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/process/0.16mm Optimal @XPlus3.json b/resources/profiles/X 3 Series/process/0.16mm Optimal @XPlus3.json index 906dffa..ca16198 100644 --- a/resources/profiles/X 3 Series/process/0.16mm Optimal @XPlus3.json +++ b/resources/profiles/X 3 Series/process/0.16mm Optimal @XPlus3.json @@ -2,26 +2,26 @@ "type": "process", "setting_id": "GP004", "name": "0.16mm Optimal @XPlus3", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_common", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "4", "bottom_shell_layers": "4", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "gap_infill_speed": "300", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "300", - "internal_solid_infill_speed": "300", + "gap_infill_speed": ["300"], + "inner_wall_speed": ["300"], + "internal_solid_infill_speed": ["300"], "layer_height": "0.16", - "outer_wall_speed": "200", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "10", - "sparse_infill_speed": "330", + "outer_wall_speed": ["200"], + "overhang_1_4_speed": ["60"], + "overhang_2_4_speed": ["30"], + "overhang_3_4_speed": ["10"], + "sparse_infill_speed": ["330"], "support_bottom_z_distance": "0.16", "support_threshold_angle": "25", "support_top_z_distance": "0.16", + "top_color_penetration_layers": "6", "top_shell_layers": "6", "top_shell_thickness": "1.0", "compatible_printers": ["X-Plus 3 0.4 nozzle"] diff --git a/resources/profiles/X 3 Series/process/0.16mm Optimal @XSmart3.json b/resources/profiles/X 3 Series/process/0.16mm Optimal @XSmart3.json index 09171d4..95e5520 100644 --- a/resources/profiles/X 3 Series/process/0.16mm Optimal @XSmart3.json +++ b/resources/profiles/X 3 Series/process/0.16mm Optimal @XSmart3.json @@ -1,28 +1,28 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.16mm Optimal @XSmart3", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_common", + "type": "process", + "setting_id": "GP004", + "name": "0.16mm Optimal @XSmart3", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "4", "bottom_shell_layers": "4", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "gap_infill_speed": "300", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "300", - "internal_solid_infill_speed": "300", - "layer_height": "0.16", - "outer_wall_speed": "200", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "10", - "sparse_infill_speed": "330", + "gap_infill_speed": ["300"], + "inner_wall_speed": ["300"], + "internal_solid_infill_speed": ["300"], + "layer_height": "0.16", + "outer_wall_speed": ["200"], + "overhang_1_4_speed": ["60"], + "overhang_2_4_speed": ["30"], + "overhang_3_4_speed": ["10"], + "sparse_infill_speed": ["330"], "support_bottom_z_distance": "0.16", "support_threshold_angle": "25", "support_top_z_distance": "0.16", + "top_color_penetration_layers": "6", "top_shell_layers": "6", "top_shell_thickness": "1.0", - "compatible_printers": ["X-Smart 3 0.4 nozzle"] + "compatible_printers": ["X-Smart 3 0.4 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/process/0.18mm Standard @XMax3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.18mm Standard @XMax3 0.6 nozzle.json index 994e6aa..1216326 100644 --- a/resources/profiles/X 3 Series/process/0.18mm Standard @XMax3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.18mm Standard @XMax3 0.6 nozzle.json @@ -6,24 +6,24 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.62", "internal_solid_infill_line_width": "0.62", "layer_height": "0.18", "line_width": "0.62", "outer_wall_line_width": "0.62", - "overhang_3_4_speed": "15", + "overhang_3_4_speed": ["15"], "sparse_infill_line_width": "0.62", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.18", "support_line_width": "0.62", "support_top_z_distance": "0.18", "top_surface_line_width": "0.62", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Max 3 0.6 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.18mm Standard @XPlus3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.18mm Standard @XPlus3 0.6 nozzle.json index 1929033..cb65443 100644 --- a/resources/profiles/X 3 Series/process/0.18mm Standard @XPlus3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.18mm Standard @XPlus3 0.6 nozzle.json @@ -6,24 +6,24 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.62", "internal_solid_infill_line_width": "0.62", "layer_height": "0.18", "line_width": "0.62", "outer_wall_line_width": "0.62", - "overhang_3_4_speed": "15", + "overhang_3_4_speed": ["15"], "sparse_infill_line_width": "0.62", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.18", "support_line_width": "0.62", "support_top_z_distance": "0.18", "top_surface_line_width": "0.62", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Plus 3 0.6 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.18mm Standard @XSmart3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.18mm Standard @XSmart3 0.6 nozzle.json index 5191170..5810401 100644 --- a/resources/profiles/X 3 Series/process/0.18mm Standard @XSmart3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.18mm Standard @XSmart3 0.6 nozzle.json @@ -6,24 +6,24 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.62", "internal_solid_infill_line_width": "0.62", "layer_height": "0.18", "line_width": "0.62", "outer_wall_line_width": "0.62", - "overhang_3_4_speed": "15", + "overhang_3_4_speed": ["15"], "sparse_infill_line_width": "0.62", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.18", "support_line_width": "0.62", "support_top_z_distance": "0.18", "top_surface_line_width": "0.62", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Smart 3 0.6 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.20mm Standard @XMax3.json b/resources/profiles/X 3 Series/process/0.20mm Standard @XMax3.json index e66911b..458e535 100644 --- a/resources/profiles/X 3 Series/process/0.20mm Standard @XMax3.json +++ b/resources/profiles/X 3 Series/process/0.20mm Standard @XMax3.json @@ -1,20 +1,18 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.20mm Standard @XMax3", - "from": "system", - "inherits": "fdm_process_common", - "instantiation": "true", + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Standard @XMax3", + "from": "system", + "inherits": "fdm_process_common", + "instantiation": "true", "bridge_flow": "1", - "elefant_foot_compensation": "0.15", - "gap_infill_speed": "250", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "300", - "internal_solid_infill_speed": "250", - "outer_wall_speed": "200", - "sparse_infill_speed": "270", + "elefant_foot_compensation": "0.15", + "gap_infill_speed": ["250"], + "inner_wall_speed": ["300"], + "internal_solid_infill_speed": ["250"], + "outer_wall_speed": ["200"], + "top_color_penetration_layers": "5", "top_shell_layers": "5", "top_shell_thickness": "1.0", - "compatible_printers": ["X-Max 3 0.4 nozzle"] + "compatible_printers": ["X-Max 3 0.4 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/process/0.20mm Standard @XPlus3.json b/resources/profiles/X 3 Series/process/0.20mm Standard @XPlus3.json index 1bad865..8db75ba 100644 --- a/resources/profiles/X 3 Series/process/0.20mm Standard @XPlus3.json +++ b/resources/profiles/X 3 Series/process/0.20mm Standard @XPlus3.json @@ -1,20 +1,18 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.20mm Standard @XPlus3", - "from": "system", - "inherits": "fdm_process_common", - "instantiation": "true", + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Standard @XPlus3", + "from": "system", + "inherits": "fdm_process_common", + "instantiation": "true", "bridge_flow": "1", - "elefant_foot_compensation": "0.15", - "gap_infill_speed": "250", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "300", - "internal_solid_infill_speed": "250", - "outer_wall_speed": "200", - "sparse_infill_speed": "270", + "elefant_foot_compensation": "0.15", + "gap_infill_speed": ["250"], + "inner_wall_speed": ["300"], + "internal_solid_infill_speed": ["250"], + "outer_wall_speed": ["200"], + "top_color_penetration_layers": "5", "top_shell_layers": "5", "top_shell_thickness": "1.0", - "compatible_printers": ["X-Plus 3 0.4 nozzle"] + "compatible_printers": ["X-Plus 3 0.4 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/process/0.20mm Standard @XSmart3.json b/resources/profiles/X 3 Series/process/0.20mm Standard @XSmart3.json index b0e0784..ddb6cf8 100644 --- a/resources/profiles/X 3 Series/process/0.20mm Standard @XSmart3.json +++ b/resources/profiles/X 3 Series/process/0.20mm Standard @XSmart3.json @@ -1,20 +1,18 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.20mm Standard @XSmart3", - "from": "system", - "inherits": "fdm_process_common", - "instantiation": "true", + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Standard @XSmart3", + "from": "system", + "inherits": "fdm_process_common", + "instantiation": "true", "bridge_flow": "1", - "elefant_foot_compensation": "0.15", - "gap_infill_speed": "250", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "300", - "internal_solid_infill_speed": "250", - "outer_wall_speed": "200", - "sparse_infill_speed": "270", + "elefant_foot_compensation": "0.15", + "gap_infill_speed": ["250"], + "inner_wall_speed": ["300"], + "internal_solid_infill_speed": ["250"], + "outer_wall_speed": ["200"], + "top_color_penetration_layers": "5", "top_shell_layers": "5", "top_shell_thickness": "1.0", - "compatible_printers": ["X-Smart 3 0.4 nozzle"] + "compatible_printers": ["X-Smart 3 0.4 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/process/0.20mm Strength @XMax3.json b/resources/profiles/X 3 Series/process/0.20mm Strength @XMax3.json index 5ec81e1..92fa18c 100644 --- a/resources/profiles/X 3 Series/process/0.20mm Strength @XMax3.json +++ b/resources/profiles/X 3 Series/process/0.20mm Strength @XMax3.json @@ -1,22 +1,20 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.20mm Strength @XMax3", - "from": "system", - "inherits": "fdm_process_common", - "instantiation": "true", + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Strength @XMax3", + "from": "system", + "inherits": "fdm_process_common", + "instantiation": "true", "bridge_flow": "1", - "elefant_foot_compensation": "0.15", - "gap_infill_speed": "250", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "300", - "internal_solid_infill_speed": "250", - "outer_wall_speed": "60", + "elefant_foot_compensation": "0.15", + "gap_infill_speed": ["250"], + "inner_wall_speed": ["300"], + "internal_solid_infill_speed": ["250"], + "outer_wall_speed": ["60"], "sparse_infill_density": "25%", - "sparse_infill_speed": "270", + "top_color_penetration_layers": "5", "top_shell_layers": "5", "top_shell_thickness": "1.0", "wall_loops": "6", - "compatible_printers": ["X-Max 3 0.4 nozzle"] + "compatible_printers": ["X-Max 3 0.4 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/process/0.20mm Strength @XPlus3.json b/resources/profiles/X 3 Series/process/0.20mm Strength @XPlus3.json index a277528..3a55246 100644 --- a/resources/profiles/X 3 Series/process/0.20mm Strength @XPlus3.json +++ b/resources/profiles/X 3 Series/process/0.20mm Strength @XPlus3.json @@ -1,22 +1,20 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.20mm Strength @XPlus3", - "from": "system", - "inherits": "fdm_process_common", - "instantiation": "true", + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Strength @XPlus3", + "from": "system", + "inherits": "fdm_process_common", + "instantiation": "true", "bridge_flow": "1", - "elefant_foot_compensation": "0.15", - "gap_infill_speed": "250", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "300", - "internal_solid_infill_speed": "250", - "outer_wall_speed": "60", + "elefant_foot_compensation": "0.15", + "gap_infill_speed": ["250"], + "inner_wall_speed": ["300"], + "internal_solid_infill_speed": ["250"], + "outer_wall_speed": ["60"], "sparse_infill_density": "25%", - "sparse_infill_speed": "270", + "top_color_penetration_layers": "5", "top_shell_layers": "5", "top_shell_thickness": "1.0", "wall_loops": "6", - "compatible_printers": ["X-Plus 3 0.4 nozzle"] + "compatible_printers": ["X-Plus 3 0.4 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/process/0.20mm Strength @XSmart3.json b/resources/profiles/X 3 Series/process/0.20mm Strength @XSmart3.json index 57163d3..ddbd54c 100644 --- a/resources/profiles/X 3 Series/process/0.20mm Strength @XSmart3.json +++ b/resources/profiles/X 3 Series/process/0.20mm Strength @XSmart3.json @@ -1,22 +1,20 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.20mm Strength @XSmart3", - "from": "system", - "inherits": "fdm_process_common", - "instantiation": "true", + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Strength @XSmart3", + "from": "system", + "inherits": "fdm_process_common", + "instantiation": "true", "bridge_flow": "1", - "elefant_foot_compensation": "0.15", - "gap_infill_speed": "250", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "300", - "internal_solid_infill_speed": "250", - "outer_wall_speed": "60", + "elefant_foot_compensation": "0.15", + "gap_infill_speed": ["250"], + "inner_wall_speed": ["300"], + "internal_solid_infill_speed": ["250"], + "outer_wall_speed": ["60"], "sparse_infill_density": "25%", - "sparse_infill_speed": "270", + "top_color_penetration_layers": "5", "top_shell_layers": "5", "top_shell_thickness": "1.0", "wall_loops": "6", - "compatible_printers": ["X-Smart 3 0.4 nozzle"] + "compatible_printers": ["X-Smart 3 0.4 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/process/0.24mm Draft @XMax3.json b/resources/profiles/X 3 Series/process/0.24mm Draft @XMax3.json index 653927d..679a86f 100644 --- a/resources/profiles/X 3 Series/process/0.24mm Draft @XMax3.json +++ b/resources/profiles/X 3 Series/process/0.24mm Draft @XMax3.json @@ -1,23 +1,22 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.24mm Draft @XMax3", - "from": "system", - "inherits": "fdm_process_common", - "instantiation": "true", + "type": "process", + "setting_id": "GP004", + "name": "0.24mm Draft @XMax3", + "from": "system", + "inherits": "fdm_process_common", + "instantiation": "true", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "gap_infill_speed": "230", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "230", - "internal_solid_infill_speed": "230", - "layer_height": "0.24", - "outer_wall_speed": "200", - "sparse_infill_speed": "230", + "gap_infill_speed": ["230"], + "inner_wall_speed": ["230"], + "internal_solid_infill_speed": ["230"], + "layer_height": "0.24", + "outer_wall_speed": ["200"], + "sparse_infill_speed": ["230"], "support_threshold_angle": "35", + "top_color_penetration_layers": "4", "top_shell_layers": "4", "top_shell_thickness": "1.0", "top_surface_line_width": "0.45", - "compatible_printers": ["X-Max 3 0.4 nozzle"] + "compatible_printers": ["X-Max 3 0.4 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/process/0.24mm Draft @XPlus3.json b/resources/profiles/X 3 Series/process/0.24mm Draft @XPlus3.json index 4ec61fc..868f785 100644 --- a/resources/profiles/X 3 Series/process/0.24mm Draft @XPlus3.json +++ b/resources/profiles/X 3 Series/process/0.24mm Draft @XPlus3.json @@ -1,23 +1,22 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.24mm Draft @XPlus3", - "from": "system", - "inherits": "fdm_process_common", - "instantiation": "true", + "type": "process", + "setting_id": "GP004", + "name": "0.24mm Draft @XPlus3", + "from": "system", + "inherits": "fdm_process_common", + "instantiation": "true", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "gap_infill_speed": "230", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "230", - "internal_solid_infill_speed": "230", - "layer_height": "0.24", - "outer_wall_speed": "200", - "sparse_infill_speed": "230", + "gap_infill_speed": ["230"], + "inner_wall_speed": ["230"], + "internal_solid_infill_speed": ["230"], + "layer_height": "0.24", + "outer_wall_speed": ["200"], + "sparse_infill_speed": ["230"], "support_threshold_angle": "35", + "top_color_penetration_layers": "4", "top_shell_layers": "4", "top_shell_thickness": "1.0", "top_surface_line_width": "0.45", - "compatible_printers": ["X-Plus 3 0.4 nozzle"] + "compatible_printers": ["X-Plus 3 0.4 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/process/0.24mm Draft @XSmart3.json b/resources/profiles/X 3 Series/process/0.24mm Draft @XSmart3.json index e153d8b..0f24469 100644 --- a/resources/profiles/X 3 Series/process/0.24mm Draft @XSmart3.json +++ b/resources/profiles/X 3 Series/process/0.24mm Draft @XSmart3.json @@ -1,23 +1,22 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.24mm Draft @XSmart3", - "from": "system", - "inherits": "fdm_process_common", - "instantiation": "true", + "type": "process", + "setting_id": "GP004", + "name": "0.24mm Draft @XSmart3", + "from": "system", + "inherits": "fdm_process_common", + "instantiation": "true", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "gap_infill_speed": "230", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "230", - "internal_solid_infill_speed": "230", - "layer_height": "0.24", - "outer_wall_speed": "200", - "sparse_infill_speed": "230", + "gap_infill_speed": ["230"], + "inner_wall_speed": ["230"], + "internal_solid_infill_speed": ["230"], + "layer_height": "0.24", + "outer_wall_speed": ["200"], + "sparse_infill_speed": ["230"], "support_threshold_angle": "35", + "top_color_penetration_layers": "4", "top_shell_layers": "4", "top_shell_thickness": "1.0", "top_surface_line_width": "0.45", - "compatible_printers": ["X-Smart 3 0.4 nozzle"] + "compatible_printers": ["X-Smart 3 0.4 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/process/0.24mm Standard @XMax3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.24mm Standard @XMax3 0.6 nozzle.json index 965bb1e..55ee304 100644 --- a/resources/profiles/X 3 Series/process/0.24mm Standard @XMax3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.24mm Standard @XMax3 0.6 nozzle.json @@ -6,22 +6,22 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.62", "internal_solid_infill_line_width": "0.62", "layer_height": "0.24", "line_width": "0.62", "outer_wall_line_width": "0.62", - "overhang_3_4_speed": "15", + "overhang_3_4_speed": ["15"], "sparse_infill_line_width": "0.62", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.62", "top_surface_line_width": "0.62", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Max 3 0.6 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.24mm Standard @XMax3 0.8 nozzle.json b/resources/profiles/X 3 Series/process/0.24mm Standard @XMax3 0.8 nozzle.json index e69ff0c..d583d84 100644 --- a/resources/profiles/X 3 Series/process/0.24mm Standard @XMax3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.24mm Standard @XMax3 0.8 nozzle.json @@ -7,32 +7,26 @@ "inherits": "fdm_process_common", "bottom_shell_layers": "3", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "gap_infill_speed": "50", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.82", - "inner_wall_speed": "150", "internal_solid_infill_line_width": "0.82", - "internal_solid_infill_speed": "150", "layer_height": "0.24", "line_width": "0.82", "outer_wall_line_width": "0.82", - "outer_wall_speed": "120", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "50", - "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5", + "overhang_3_4_speed": ["25"], + "overhang_4_4_speed": ["5"], "sparse_infill_line_width": "0.82", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.82", "top_shell_layers": "3", "top_surface_line_width": "0.82", "top_surface_pattern": "monotonic", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "2", "compatible_printers": ["X-Max 3 0.8 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.24mm Standard @XPlus3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.24mm Standard @XPlus3 0.6 nozzle.json index c31322c..55a813e 100644 --- a/resources/profiles/X 3 Series/process/0.24mm Standard @XPlus3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.24mm Standard @XPlus3 0.6 nozzle.json @@ -6,22 +6,22 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.62", "internal_solid_infill_line_width": "0.62", "layer_height": "0.24", "line_width": "0.62", "outer_wall_line_width": "0.62", - "overhang_3_4_speed": "15", + "overhang_3_4_speed": ["15"], "sparse_infill_line_width": "0.62", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.62", "top_surface_line_width": "0.62", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Plus 3 0.6 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.24mm Standard @XPlus3 0.8 nozzle.json b/resources/profiles/X 3 Series/process/0.24mm Standard @XPlus3 0.8 nozzle.json index 39a1707..ca227c0 100644 --- a/resources/profiles/X 3 Series/process/0.24mm Standard @XPlus3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.24mm Standard @XPlus3 0.8 nozzle.json @@ -7,32 +7,26 @@ "inherits": "fdm_process_common", "bottom_shell_layers": "3", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "gap_infill_speed": "50", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.82", - "inner_wall_speed": "150", "internal_solid_infill_line_width": "0.82", - "internal_solid_infill_speed": "150", "layer_height": "0.24", "line_width": "0.82", "outer_wall_line_width": "0.82", - "outer_wall_speed": "120", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "50", - "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5", + "overhang_3_4_speed": ["25"], + "overhang_4_4_speed": ["5"], "sparse_infill_line_width": "0.82", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.82", "top_shell_layers": "3", "top_surface_line_width": "0.82", "top_surface_pattern": "monotonic", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "2", "compatible_printers": ["X-Plus 3 0.8 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.24mm Standard @XSmart3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.24mm Standard @XSmart3 0.6 nozzle.json index 5b4fcfd..5954a54 100644 --- a/resources/profiles/X 3 Series/process/0.24mm Standard @XSmart3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.24mm Standard @XSmart3 0.6 nozzle.json @@ -6,22 +6,22 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.62", "internal_solid_infill_line_width": "0.62", "layer_height": "0.24", "line_width": "0.62", "outer_wall_line_width": "0.62", - "overhang_3_4_speed": "15", + "overhang_3_4_speed": ["15"], "sparse_infill_line_width": "0.62", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.62", "top_surface_line_width": "0.62", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Smart 3 0.6 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.24mm Standard @XSmart3 0.8 nozzle.json b/resources/profiles/X 3 Series/process/0.24mm Standard @XSmart3 0.8 nozzle.json index 38303d5..a00d136 100644 --- a/resources/profiles/X 3 Series/process/0.24mm Standard @XSmart3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.24mm Standard @XSmart3 0.8 nozzle.json @@ -7,32 +7,26 @@ "inherits": "fdm_process_common", "bottom_shell_layers": "3", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "gap_infill_speed": "50", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.82", - "inner_wall_speed": "150", "internal_solid_infill_line_width": "0.82", - "internal_solid_infill_speed": "150", "layer_height": "0.24", "line_width": "0.82", "outer_wall_line_width": "0.82", - "outer_wall_speed": "120", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "50", - "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5", + "overhang_3_4_speed": ["25"], + "overhang_4_4_speed": ["5"], "sparse_infill_line_width": "0.82", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.82", "top_shell_layers": "3", "top_surface_line_width": "0.82", "top_surface_pattern": "monotonic", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "2", "compatible_printers": ["X-Smart 3 0.8 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.28mm Extra Draft @XMax3.json b/resources/profiles/X 3 Series/process/0.28mm Extra Draft @XMax3.json index 14fed31..9bf5037 100644 --- a/resources/profiles/X 3 Series/process/0.28mm Extra Draft @XMax3.json +++ b/resources/profiles/X 3 Series/process/0.28mm Extra Draft @XMax3.json @@ -1,23 +1,22 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.28mm Extra Draft @XMax3", - "from": "system", - "inherits": "fdm_process_common", - "instantiation": "true", + "type": "process", + "setting_id": "GP004", + "name": "0.28mm Extra Draft @XMax3", + "from": "system", + "inherits": "fdm_process_common", + "instantiation": "true", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "gap_infill_speed": "200", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "200", - "internal_solid_infill_speed": "200", - "layer_height": "0.28", - "outer_wall_speed": "200", - "sparse_infill_speed": "200", + "gap_infill_speed": ["200"], + "inner_wall_speed": ["200"], + "internal_solid_infill_speed": ["200"], + "layer_height": "0.28", + "outer_wall_speed": ["200"], + "sparse_infill_speed": ["200"], "support_threshold_angle": "40", + "top_color_penetration_layers": "4", "top_shell_layers": "4", "top_shell_thickness": "1.0", "top_surface_line_width": "0.45", - "compatible_printers": ["X-Max 3 0.4 nozzle"] + "compatible_printers": ["X-Max 3 0.4 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/process/0.28mm Extra Draft @XPlus3.json b/resources/profiles/X 3 Series/process/0.28mm Extra Draft @XPlus3.json index a94339d..4fad371 100644 --- a/resources/profiles/X 3 Series/process/0.28mm Extra Draft @XPlus3.json +++ b/resources/profiles/X 3 Series/process/0.28mm Extra Draft @XPlus3.json @@ -1,23 +1,23 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.28mm Extra Draft @XPlus3", - "from": "system", - "inherits": "fdm_process_common", - "instantiation": "true", + "type": "process", + "setting_id": "GP004", + "name": "0.28mm Extra Draft @XPlus3", + "from": "system", + "inherits": "fdm_process_common", + "instantiation": "true", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "gap_infill_speed": "200", - "initial_layer_infill_speed": "105", + "gap_infill_speed": ["200"], "initial_layer_speed": "50", - "inner_wall_speed": "200", - "internal_solid_infill_speed": "200", - "layer_height": "0.28", - "outer_wall_speed": "200", - "sparse_infill_speed": "200", + "inner_wall_speed": ["200"], + "internal_solid_infill_speed": ["200"], + "layer_height": "0.28", + "outer_wall_speed": ["200"], + "sparse_infill_speed": ["200"], "support_threshold_angle": "40", + "top_color_penetration_layers": "4", "top_shell_layers": "4", "top_shell_thickness": "1.0", "top_surface_line_width": "0.45", - "compatible_printers": ["X-Plus 3 0.4 nozzle"] + "compatible_printers": ["X-Plus 3 0.4 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/process/0.28mm Extra Draft @XSmart3.json b/resources/profiles/X 3 Series/process/0.28mm Extra Draft @XSmart3.json index c8aaa52..cc9fe7c 100644 --- a/resources/profiles/X 3 Series/process/0.28mm Extra Draft @XSmart3.json +++ b/resources/profiles/X 3 Series/process/0.28mm Extra Draft @XSmart3.json @@ -1,23 +1,23 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.28mm Extra Draft @XSmart3", - "from": "system", - "inherits": "fdm_process_common", - "instantiation": "true", + "type": "process", + "setting_id": "GP004", + "name": "0.28mm Extra Draft @XSmart3", + "from": "system", + "inherits": "fdm_process_common", + "instantiation": "true", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "gap_infill_speed": "200", + "gap_infill_speed": ["200"], "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "200", - "internal_solid_infill_speed": "200", - "layer_height": "0.28", - "outer_wall_speed": "200", - "sparse_infill_speed": "200", + "inner_wall_speed": ["200"], + "internal_solid_infill_speed": ["200"], + "layer_height": "0.28", + "outer_wall_speed": ["200"], + "sparse_infill_speed": ["200"], "support_threshold_angle": "40", + "top_color_penetration_layers": "4", "top_shell_layers": "4", "top_shell_thickness": "1.0", "top_surface_line_width": "0.45", - "compatible_printers": ["X-Smart 3 0.4 nozzle"] + "compatible_printers": ["X-Smart 3 0.4 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/process/0.30mm Standard @XMax3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.30mm Standard @XMax3 0.6 nozzle.json index 4878d53..6419f30 100644 --- a/resources/profiles/X 3 Series/process/0.30mm Standard @XMax3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.30mm Standard @XMax3 0.6 nozzle.json @@ -6,22 +6,22 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.62", "internal_solid_infill_line_width": "0.62", "layer_height": "0.3", "line_width": "0.62", "outer_wall_line_width": "0.62", - "overhang_3_4_speed": "15", + "overhang_3_4_speed": ["15"], "sparse_infill_line_width": "0.62", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.62", "top_surface_line_width": "0.62", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Max 3 0.6 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.30mm Standard @XPlus3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.30mm Standard @XPlus3 0.6 nozzle.json index e706f92..18fb201 100644 --- a/resources/profiles/X 3 Series/process/0.30mm Standard @XPlus3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.30mm Standard @XPlus3 0.6 nozzle.json @@ -6,22 +6,22 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.62", "internal_solid_infill_line_width": "0.62", "layer_height": "0.3", "line_width": "0.62", "outer_wall_line_width": "0.62", - "overhang_3_4_speed": "15", + "overhang_3_4_speed": ["15"], "sparse_infill_line_width": "0.62", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.62", "top_surface_line_width": "0.62", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Plus 3 0.6 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.30mm Standard @XSmart3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.30mm Standard @XSmart3 0.6 nozzle.json index 18fcd3c..b68bcfe 100644 --- a/resources/profiles/X 3 Series/process/0.30mm Standard @XSmart3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.30mm Standard @XSmart3 0.6 nozzle.json @@ -6,22 +6,22 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.62", "internal_solid_infill_line_width": "0.62", "layer_height": "0.3", "line_width": "0.62", "outer_wall_line_width": "0.62", - "overhang_3_4_speed": "15", + "overhang_3_4_speed": ["15"], "sparse_infill_line_width": "0.62", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.62", "top_surface_line_width": "0.62", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Smart 3 0.6 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.30mm Strength @XMax3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.30mm Strength @XMax3 0.6 nozzle.json index 4f2f010..19743ea 100644 --- a/resources/profiles/X 3 Series/process/0.30mm Strength @XMax3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.30mm Strength @XMax3 0.6 nozzle.json @@ -6,24 +6,24 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.62", "internal_solid_infill_line_width": "0.62", "layer_height": "0.3", "line_width": "0.62", "outer_wall_line_width": "0.62", - "overhang_3_4_speed": "15", + "overhang_3_4_speed": ["15"], "sparse_infill_density": "25%", "sparse_infill_line_width": "0.62", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.62", "top_surface_line_width": "0.62", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Max 3 0.6 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.30mm Strength @XPlus3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.30mm Strength @XPlus3 0.6 nozzle.json index 5004563..e5fb952 100644 --- a/resources/profiles/X 3 Series/process/0.30mm Strength @XPlus3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.30mm Strength @XPlus3 0.6 nozzle.json @@ -6,24 +6,24 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.62", "internal_solid_infill_line_width": "0.62", "layer_height": "0.3", "line_width": "0.62", "outer_wall_line_width": "0.62", - "overhang_3_4_speed": "15", + "overhang_3_4_speed": ["15"], "sparse_infill_density": "25%", "sparse_infill_line_width": "0.62", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.62", "top_surface_line_width": "0.62", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Plus 3 0.6 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.30mm Strength @XSmart3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.30mm Strength @XSmart3 0.6 nozzle.json index 36c94f6..0b2d99c 100644 --- a/resources/profiles/X 3 Series/process/0.30mm Strength @XSmart3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.30mm Strength @XSmart3 0.6 nozzle.json @@ -6,24 +6,24 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.62", "internal_solid_infill_line_width": "0.62", "layer_height": "0.3", "line_width": "0.62", "outer_wall_line_width": "0.62", - "overhang_3_4_speed": "15", + "overhang_3_4_speed": ["15"], "sparse_infill_density": "25%", "sparse_infill_line_width": "0.62", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.62", "top_surface_line_width": "0.62", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Smart 3 0.6 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.32mm Standard @XMax3 0.8 nozzle.json b/resources/profiles/X 3 Series/process/0.32mm Standard @XMax3 0.8 nozzle.json index c972a9a..9456411 100644 --- a/resources/profiles/X 3 Series/process/0.32mm Standard @XMax3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.32mm Standard @XMax3 0.8 nozzle.json @@ -6,24 +6,24 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.82", "internal_solid_infill_line_width": "0.82", "layer_height": "0.32", "line_width": "0.82", "outer_wall_line_width": "0.82", - "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5", + "overhang_3_4_speed": ["25"], + "overhang_4_4_speed": ["5"], "sparse_infill_line_width": "0.82", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.82", "top_surface_line_width": "0.82", "top_surface_pattern": "monotonic", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Max 3 0.8 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.32mm Standard @XPlus3 0.8 nozzle.json b/resources/profiles/X 3 Series/process/0.32mm Standard @XPlus3 0.8 nozzle.json index 80bc528..5f4db4a 100644 --- a/resources/profiles/X 3 Series/process/0.32mm Standard @XPlus3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.32mm Standard @XPlus3 0.8 nozzle.json @@ -6,24 +6,24 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.82", "internal_solid_infill_line_width": "0.82", "layer_height": "0.32", "line_width": "0.82", "outer_wall_line_width": "0.82", - "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5", + "overhang_3_4_speed": ["25"], + "overhang_4_4_speed": ["5"], "sparse_infill_line_width": "0.82", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.82", "top_surface_line_width": "0.82", "top_surface_pattern": "monotonic", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Plus 3 0.8 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.32mm Standard @XSmart3 0.8 nozzle.json b/resources/profiles/X 3 Series/process/0.32mm Standard @XSmart3 0.8 nozzle.json index 3edc7b2..0184518 100644 --- a/resources/profiles/X 3 Series/process/0.32mm Standard @XSmart3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.32mm Standard @XSmart3 0.8 nozzle.json @@ -6,24 +6,24 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.82", "internal_solid_infill_line_width": "0.82", "layer_height": "0.32", "line_width": "0.82", "outer_wall_line_width": "0.82", - "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5", + "overhang_3_4_speed": ["25"], + "overhang_4_4_speed": ["5"], "sparse_infill_line_width": "0.82", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.82", "top_surface_line_width": "0.82", "top_surface_pattern": "monotonic", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Smart 3 0.8 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.36mm Standard @XMax3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.36mm Standard @XMax3 0.6 nozzle.json index cba9052..a62fd88 100644 --- a/resources/profiles/X 3 Series/process/0.36mm Standard @XMax3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.36mm Standard @XMax3 0.6 nozzle.json @@ -6,22 +6,22 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.62", "internal_solid_infill_line_width": "0.62", "layer_height": "0.36", "line_width": "0.62", "outer_wall_line_width": "0.62", - "overhang_3_4_speed": "15", + "overhang_3_4_speed": ["15"], "sparse_infill_line_width": "0.62", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.62", "top_surface_line_width": "0.62", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Max 3 0.6 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.36mm Standard @XPlus3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.36mm Standard @XPlus3 0.6 nozzle.json index 0cb0b02..fbe4199 100644 --- a/resources/profiles/X 3 Series/process/0.36mm Standard @XPlus3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.36mm Standard @XPlus3 0.6 nozzle.json @@ -6,22 +6,22 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.62", "internal_solid_infill_line_width": "0.62", "layer_height": "0.36", "line_width": "0.62", "outer_wall_line_width": "0.62", - "overhang_3_4_speed": "15", + "overhang_3_4_speed": ["15"], "sparse_infill_line_width": "0.62", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.62", "top_surface_line_width": "0.62", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Plus 3 0.6 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.36mm Standard @XSmart3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.36mm Standard @XSmart3 0.6 nozzle.json index 977c5e4..0874d34 100644 --- a/resources/profiles/X 3 Series/process/0.36mm Standard @XSmart3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.36mm Standard @XSmart3 0.6 nozzle.json @@ -6,22 +6,22 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.62", "internal_solid_infill_line_width": "0.62", "layer_height": "0.36", "line_width": "0.62", "outer_wall_line_width": "0.62", - "overhang_3_4_speed": "15", + "overhang_3_4_speed": ["15"], "sparse_infill_line_width": "0.62", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.62", "top_surface_line_width": "0.62", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Smart 3 0.6 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/process/0.40mm Standard @XMax3 0.8 nozzle.json b/resources/profiles/X 3 Series/process/0.40mm Standard @XMax3 0.8 nozzle.json index 17e13eb..309a591 100644 --- a/resources/profiles/X 3 Series/process/0.40mm Standard @XMax3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.40mm Standard @XMax3 0.8 nozzle.json @@ -6,24 +6,24 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.82", "internal_solid_infill_line_width": "0.82", "layer_height": "0.4", "line_width": "0.82", "outer_wall_line_width": "0.82", - "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5", + "overhang_3_4_speed": ["25"], + "overhang_4_4_speed": ["5"], "sparse_infill_line_width": "0.82", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.82", "top_surface_line_width": "0.82", "top_surface_pattern": "monotonic", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Max 3 0.8 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.40mm Standard @XPlus3 0.8 nozzle.json b/resources/profiles/X 3 Series/process/0.40mm Standard @XPlus3 0.8 nozzle.json index 6701238..98edc23 100644 --- a/resources/profiles/X 3 Series/process/0.40mm Standard @XPlus3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.40mm Standard @XPlus3 0.8 nozzle.json @@ -6,24 +6,24 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.82", "internal_solid_infill_line_width": "0.82", "layer_height": "0.4", "line_width": "0.82", "outer_wall_line_width": "0.82", - "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5", + "overhang_3_4_speed": ["25"], + "overhang_4_4_speed": ["5"], "sparse_infill_line_width": "0.82", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.82", "top_surface_line_width": "0.82", "top_surface_pattern": "monotonic", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Plus 3 0.8 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.40mm Standard @XSmart3 0.8 nozzle.json b/resources/profiles/X 3 Series/process/0.40mm Standard @XSmart3 0.8 nozzle.json index b5f39a1..e1d1e49 100644 --- a/resources/profiles/X 3 Series/process/0.40mm Standard @XSmart3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.40mm Standard @XSmart3 0.8 nozzle.json @@ -6,24 +6,24 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.82", "internal_solid_infill_line_width": "0.82", "layer_height": "0.4", "line_width": "0.82", "outer_wall_line_width": "0.82", - "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5", + "overhang_3_4_speed": ["25"], + "overhang_4_4_speed": ["5"], "sparse_infill_line_width": "0.82", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.82", "top_surface_line_width": "0.82", "top_surface_pattern": "monotonic", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Smart 3 0.8 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.42mm Standard @XMax3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.42mm Standard @XMax3 0.6 nozzle.json index bd18f4f..2e13cc1 100644 --- a/resources/profiles/X 3 Series/process/0.42mm Standard @XMax3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.42mm Standard @XMax3 0.6 nozzle.json @@ -6,22 +6,22 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.62", "internal_solid_infill_line_width": "0.62", "layer_height": "0.42", "line_width": "0.62", "outer_wall_line_width": "0.62", - "overhang_3_4_speed": "15", + "overhang_3_4_speed": ["15"], "sparse_infill_line_width": "0.62", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.62", "top_surface_line_width": "0.62", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Max 3 0.6 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/process/0.42mm Standard @XPlus3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.42mm Standard @XPlus3 0.6 nozzle.json index 6226998..e516491 100644 --- a/resources/profiles/X 3 Series/process/0.42mm Standard @XPlus3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.42mm Standard @XPlus3 0.6 nozzle.json @@ -6,22 +6,22 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.62", "internal_solid_infill_line_width": "0.62", "layer_height": "0.42", "line_width": "0.62", "outer_wall_line_width": "0.62", - "overhang_3_4_speed": "15", + "overhang_3_4_speed": ["15"], "sparse_infill_line_width": "0.62", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.62", "top_surface_line_width": "0.62", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Plus 3 0.6 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/process/0.42mm Standard @XSmart3 0.6 nozzle.json b/resources/profiles/X 3 Series/process/0.42mm Standard @XSmart3 0.6 nozzle.json index 6fe9b42..91403b9 100644 --- a/resources/profiles/X 3 Series/process/0.42mm Standard @XSmart3 0.6 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.42mm Standard @XSmart3 0.6 nozzle.json @@ -6,22 +6,22 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.62", "internal_solid_infill_line_width": "0.62", "layer_height": "0.42", "line_width": "0.62", "outer_wall_line_width": "0.62", - "overhang_3_4_speed": "15", + "overhang_3_4_speed": ["15"], "sparse_infill_line_width": "0.62", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.62", "top_surface_line_width": "0.62", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Smart 3 0.6 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/X 3 Series/process/0.48mm Standard @XMax3 0.8 nozzle.json b/resources/profiles/X 3 Series/process/0.48mm Standard @XMax3 0.8 nozzle.json index 9562bbd..9aee96a 100644 --- a/resources/profiles/X 3 Series/process/0.48mm Standard @XMax3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.48mm Standard @XMax3 0.8 nozzle.json @@ -6,24 +6,24 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.82", "internal_solid_infill_line_width": "0.82", "layer_height": "0.48", "line_width": "0.82", "outer_wall_line_width": "0.82", - "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5", + "overhang_3_4_speed": ["25"], + "overhang_4_4_speed": ["5"], "sparse_infill_line_width": "0.82", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.82", "top_surface_line_width": "0.82", "top_surface_pattern": "monotonic", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Max 3 0.8 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.48mm Standard @XPlus3 0.8 nozzle.json b/resources/profiles/X 3 Series/process/0.48mm Standard @XPlus3 0.8 nozzle.json index 325657b..a152020 100644 --- a/resources/profiles/X 3 Series/process/0.48mm Standard @XPlus3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.48mm Standard @XPlus3 0.8 nozzle.json @@ -6,24 +6,24 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.82", "internal_solid_infill_line_width": "0.82", "layer_height": "0.48", "line_width": "0.82", "outer_wall_line_width": "0.82", - "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5", + "overhang_3_4_speed": ["25"], + "overhang_4_4_speed": ["5"], "sparse_infill_line_width": "0.82", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.82", "top_surface_line_width": "0.82", "top_surface_pattern": "monotonic", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Plus 3 0.8 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.48mm Standard @XSmart3 0.8 nozzle.json b/resources/profiles/X 3 Series/process/0.48mm Standard @XSmart3 0.8 nozzle.json index dcf1089..4d9a294 100644 --- a/resources/profiles/X 3 Series/process/0.48mm Standard @XSmart3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.48mm Standard @XSmart3 0.8 nozzle.json @@ -6,24 +6,24 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.82", "internal_solid_infill_line_width": "0.82", "layer_height": "0.48", "line_width": "0.82", "outer_wall_line_width": "0.82", - "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5", + "overhang_3_4_speed": ["25"], + "overhang_4_4_speed": ["5"], "sparse_infill_line_width": "0.82", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.82", "top_surface_line_width": "0.82", "top_surface_pattern": "monotonic", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Smart 3 0.8 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.56mm Standard @XMax3 0.8 nozzle.json b/resources/profiles/X 3 Series/process/0.56mm Standard @XMax3 0.8 nozzle.json index effc50f..04a8625 100644 --- a/resources/profiles/X 3 Series/process/0.56mm Standard @XMax3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.56mm Standard @XMax3 0.8 nozzle.json @@ -6,24 +6,24 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.82", "internal_solid_infill_line_width": "0.82", "layer_height": "0.56", "line_width": "0.82", "outer_wall_line_width": "0.82", - "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5", + "overhang_3_4_speed": ["25"], + "overhang_4_4_speed": ["5"], "sparse_infill_line_width": "0.82", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.82", "top_surface_line_width": "0.82", "top_surface_pattern": "monotonic", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Max 3 0.8 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.56mm Standard @XPlus3 0.8 nozzle.json b/resources/profiles/X 3 Series/process/0.56mm Standard @XPlus3 0.8 nozzle.json index d996a12..13ccab2 100644 --- a/resources/profiles/X 3 Series/process/0.56mm Standard @XPlus3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.56mm Standard @XPlus3 0.8 nozzle.json @@ -6,24 +6,24 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.82", "internal_solid_infill_line_width": "0.82", "layer_height": "0.56", "line_width": "0.82", "outer_wall_line_width": "0.82", - "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5", + "overhang_3_4_speed": ["25"], + "overhang_4_4_speed": ["5"], "sparse_infill_line_width": "0.82", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.82", "top_surface_line_width": "0.82", "top_surface_pattern": "monotonic", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Plus 3 0.8 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/0.56mm Standard @XSmart3 0.8 nozzle.json b/resources/profiles/X 3 Series/process/0.56mm Standard @XSmart3 0.8 nozzle.json index 6ae3a30..8313e08 100644 --- a/resources/profiles/X 3 Series/process/0.56mm Standard @XSmart3 0.8 nozzle.json +++ b/resources/profiles/X 3 Series/process/0.56mm Standard @XSmart3 0.8 nozzle.json @@ -6,24 +6,24 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.82", "internal_solid_infill_line_width": "0.82", "layer_height": "0.56", "line_width": "0.82", "outer_wall_line_width": "0.82", - "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5", + "overhang_3_4_speed": ["25"], + "overhang_4_4_speed": ["5"], "sparse_infill_line_width": "0.82", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.82", "top_surface_line_width": "0.82", "top_surface_pattern": "monotonic", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Smart 3 0.8 nozzle"] } diff --git a/resources/profiles/X 3 Series/process/fdm_process_common.json b/resources/profiles/X 3 Series/process/fdm_process_common.json index b354e88..9867436 100644 --- a/resources/profiles/X 3 Series/process/fdm_process_common.json +++ b/resources/profiles/X 3 Series/process/fdm_process_common.json @@ -4,40 +4,44 @@ "from": "system", "instantiation": "false", "adaptive_layer_height": "0", + "bottom_color_penetration_layers": "3", "bottom_shell_layers": "3", "bottom_shell_thickness": "0", "bottom_surface_pattern": "monotonic", "bridge_flow": "0.95", "bridge_no_support": "0", - "bridge_speed": "50", + "bridge_speed": ["50"], "brim_object_gap": "0.1", "brim_width": "5", "compatible_printers_condition": "", - "default_acceleration": "10000", + "default_acceleration": ["10000"], + "detect_floating_vertical_shell": "1", "detect_overhang_wall": "1", "detect_thin_wall": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0", "enable_arc_fitting": "0", + "enable_overhang_speed": ["1"], "enable_prime_tower": "1", "enable_support": "0", "filename_format": "{input_filename_base}.gcode", - "gap_infill_speed": "50", + "gap_infill_speed": ["50"], "infill_combination": "0", "infill_direction": "45", "infill_wall_overlap": "15%", - "initial_layer_acceleration": "500", - "initial_layer_infill_speed": "60", + "initial_layer_acceleration": ["500"], + "initial_layer_infill_speed": ["105"], "initial_layer_line_width": "0.5", "initial_layer_print_height": "0.2", - "initial_layer_speed": "30", - "inner_wall_acceleration": "5000", + "initial_layer_speed": ["50"], + "initial_layer_travel_acceleration": ["6000"], + "inner_wall_acceleration": ["5000"], "inner_wall_line_width": "0.45", - "inner_wall_speed": "150", + "inner_wall_speed": ["150"], "interface_shells": "0", "internal_bridge_support_thickness": "0.8", "internal_solid_infill_line_width": "0.42", - "internal_solid_infill_speed": "150", + "internal_solid_infill_speed": ["150"], "ironing_flow": "10%", "ironing_spacing": "0.15", "ironing_speed": "30", @@ -47,14 +51,14 @@ "max_travel_detour_distance": "0", "minimum_sparse_infill_area": "15", "only_one_wall_top": "1", - "outer_wall_acceleration": "3000", + "outer_wall_acceleration": ["3000"], "outer_wall_line_width": "0.42", - "outer_wall_speed": "120", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "50", - "overhang_3_4_speed": "30", - "overhang_4_4_speed": "10", - "overhang_totally_speed": "24", + "outer_wall_speed": ["120"], + "overhang_1_4_speed": ["0"], + "overhang_2_4_speed": ["50"], + "overhang_3_4_speed": ["30"], + "overhang_4_4_speed": ["10"], + "overhang_totally_speed": ["10"], "prime_tower_width": "35", "print_sequence": "by layer", "print_settings_id": "", @@ -66,13 +70,14 @@ "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", - "small_perimeter_threshold": "4", + "small_perimeter_speed": ["50%"], + "small_perimeter_threshold": ["4"], "smooth_coefficient": "90", "smooth_speed_discontinuity_area": "1", "sparse_infill_density": "15%", "sparse_infill_line_width": "0.45", "sparse_infill_pattern": "grid", - "sparse_infill_speed": "250", + "sparse_infill_speed": ["270"], "spiral_mode": "0", "standby_temperature_delta": "-5", "support_base_pattern_spacing": "2.5", @@ -85,26 +90,29 @@ "support_interface_loop_pattern": "0", "support_interface_pattern": "auto", "support_interface_spacing": "0.5", - "support_interface_speed": "80", + "support_interface_speed": ["80"], "support_interface_top_layers": "2", "support_line_width": "0.42", "support_object_xy_distance": "0.35", "support_on_build_plate_only": "0", - "support_speed": "150", + "support_speed": ["150"], "support_style": "default", "support_threshold_angle": "30", "support_top_z_distance": "0.2", - "support_type": "normal(auto)", + "support_type": "tree(auto)", + "top_color_penetration_layers": "3", "top_shell_layers": "3", "top_shell_thickness": "0.8", - "top_surface_acceleration": "2000", + "top_surface_acceleration": ["2000"], "top_surface_line_width": "0.42", "top_surface_pattern": "monotonicline", - "top_surface_speed": "200", - "travel_speed": "500", + "top_surface_speed": ["200"], + "travel_acceleration": ["10000"], + "travel_speed": ["500"], "tree_support_branch_angle": "45", "tree_support_branch_diameter": "2", "tree_support_wall_count": "0", + "vertical_shell_speed": ["80%"], "wall_generator": "classic", "wall_infill_order": "inner wall/outer wall/infill", "wall_loops": "2", diff --git a/resources/profiles/X 4 Series/X-Plus 4_bed.stl b/resources/profiles/X 4 Series/X-Plus 4_bed.stl index be0ce9b..706816a 100644 Binary files a/resources/profiles/X 4 Series/X-Plus 4_bed.stl and b/resources/profiles/X 4 Series/X-Plus 4_bed.stl differ diff --git a/resources/profiles/X 4 Series/X-Plus 4_bed.svg b/resources/profiles/X 4 Series/X-Plus 4_bed.svg new file mode 100644 index 0000000..b9e8285 --- /dev/null +++ b/resources/profiles/X 4 Series/X-Plus 4_bed.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/profiles/X 4 Series/filament/Bambu ABS.json b/resources/profiles/X 4 Series/filament/Bambu ABS.json index 607d8f1..5629c3f 100644 --- a/resources/profiles/X 4 Series/filament/Bambu ABS.json +++ b/resources/profiles/X 4 Series/filament/Bambu ABS.json @@ -6,12 +6,13 @@ "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "box_temperature_range_high": ["65"], "chamber_temperatures": ["55"], "close_fan_the_first_x_layers": ["3"], "during_print_exhaust_fan_speed": ["0"], - "enable_overhang_bridge_fan": ["1"], "fan_max_speed": ["80"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.05"], "filament_flow_ratio": ["0.95"], "filament_type": ["ABS"], @@ -27,5 +28,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["90"], "textured_plate_temp" : ["90"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 4 Series/filament/Bambu PETG.json b/resources/profiles/X 4 Series/filament/Bambu PETG.json index 712915d..78c3b0b 100644 --- a/resources/profiles/X 4 Series/filament/Bambu PETG.json +++ b/resources/profiles/X 4 Series/filament/Bambu PETG.json @@ -1,16 +1,17 @@ { "type": "filament", - "filament_id": "GFG99", + "filament_id": "GFG99", "setting_id": "GFSG99", "name": "Bambu PETG@X4", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "box_temperature_range_high": ["55"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["30"], "fan_max_speed": ["40"], "fan_min_speed": ["10"], + "filament_adhesiveness_category": ["300"], "filament_flow_ratio": ["0.95"], "filament_max_volumetric_speed": ["13"], "filament_type": ["PETG"], @@ -28,5 +29,5 @@ "temperature_vitrification": ["70"], "textured_plate_temp_initial_layer" : ["80"], "textured_plate_temp" : ["80"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 4 Series/filament/Bambu PLA.json b/resources/profiles/X 4 Series/filament/Bambu PLA.json index 5111e87..e2549e6 100644 --- a/resources/profiles/X 4 Series/filament/Bambu PLA.json +++ b/resources/profiles/X 4 Series/filament/Bambu PLA.json @@ -1,11 +1,12 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "GFL99", "setting_id": "GFSL99", "name": "Bambu PLA@X4", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "filament_adhesiveness_category": ["100"], "filament_type": ["PLA"], "filament_vendor": ["Bambu Lab"], "additional_cooling_fan_speed": ["100"], @@ -13,8 +14,9 @@ "nozzle_temperature_range_low": ["190"], "nozzle_temperature_initial_layer": ["210"], "nozzle_temperature": ["210"], + "overhang_fan_threshold": ["50%"], "supertack_plate_temp_initial_layer": ["45"], "supertack_plate_temp": ["45"], "temperature_vitrification": ["45"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 4 Series/filament/Generic ABS.json b/resources/profiles/X 4 Series/filament/Generic ABS.json index 7ff2194..9f1d8b1 100644 --- a/resources/profiles/X 4 Series/filament/Generic ABS.json +++ b/resources/profiles/X 4 Series/filament/Generic ABS.json @@ -1,17 +1,18 @@ { "type": "filament", - "filament_id": "GFB99", + "filament_id": "QD_0_0_11", "setting_id": "GFSA04", "name": "Generic ABS@X4", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "box_temperature_range_high": ["65"], "close_fan_the_first_x_layers": ["3"], "during_print_exhaust_fan_speed": ["0"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["30"], "fan_max_speed": ["80"], "fan_min_speed": ["10"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.04"], "filament_flow_ratio": ["0.95"], "filament_max_volumetric_speed": ["17"], @@ -28,5 +29,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["90"], "textured_plate_temp" : ["90"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 4 Series/filament/Generic PC.json b/resources/profiles/X 4 Series/filament/Generic PC.json index 8f9de71..569b14c 100644 --- a/resources/profiles/X 4 Series/filament/Generic PC.json +++ b/resources/profiles/X 4 Series/filament/Generic PC.json @@ -6,13 +6,14 @@ "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "box_temperature_range_high": ["65"], "chamber_temperatures": ["60"], "close_fan_the_first_x_layers": ["3"], "during_print_exhaust_fan_speed": ["0"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["30"], "fan_max_speed": ["60"], "fan_min_speed": ["10"], + "filament_adhesiveness_category": ["500"], "filament_density": ["1.04"], "filament_max_volumetric_speed": ["10"], "filament_type": ["PC"], @@ -28,5 +29,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["110"], "textured_plate_temp" : ["110"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 4 Series/filament/Generic PETG.json b/resources/profiles/X 4 Series/filament/Generic PETG.json index 8e7d723..eb4f70e 100644 --- a/resources/profiles/X 4 Series/filament/Generic PETG.json +++ b/resources/profiles/X 4 Series/filament/Generic PETG.json @@ -1,16 +1,17 @@ { "type": "filament", - "filament_id": "GFG99", + "filament_id": "QD_0_0_41", "setting_id": "GFSG99", "name": "Generic PETG@X4", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "box_temperature_range_high": ["55"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["30"], "fan_max_speed": ["90"], "fan_min_speed": ["40"], + "filament_adhesiveness_category": ["300"], "filament_density": ["1.27"], "filament_flow_ratio": ["0.95"], "filament_max_volumetric_speed": ["12"], @@ -29,5 +30,5 @@ "temperature_vitrification": ["70"], "textured_plate_temp_initial_layer" : ["80"], "textured_plate_temp" : ["80"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 4 Series/filament/Generic PLA Silk.json b/resources/profiles/X 4 Series/filament/Generic PLA Silk.json index 8dc7502..528d648 100644 --- a/resources/profiles/X 4 Series/filament/Generic PLA Silk.json +++ b/resources/profiles/X 4 Series/filament/Generic PLA Silk.json @@ -1,12 +1,13 @@ { - "type": "filament", - "filament_id": "GFA05", - "setting_id": "GFSL99_01", - "name": "Generic PLA Silk@X4", - "from": "system", - "instantiation": "false", - "inherits": "fdm_filament_common", + "type": "filament", + "filament_id": "QD_0_0_4", + "setting_id": "GFSL99_01", + "name": "Generic PLA Silk@X4", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", "additional_cooling_fan_speed": ["0"], + "filament_adhesiveness_category": ["100"], "filament_density": ["1.2"], "filament_max_volumetric_speed": ["7.5"], "filament_retraction_length": ["0.5"], @@ -16,11 +17,12 @@ "nozzle_temperature_range_high": ["240"], "nozzle_temperature_range_low": ["190"], "nozzle_temperature": ["220"], + "overhang_fan_threshold": ["50%"], "pressure_advance": ["0.032"], "supertack_plate_temp_initial_layer": ["35"], "supertack_plate_temp": ["35"], "temperature_vitrification": ["45"], "textured_plate_temp_initial_layer" : ["55"], "textured_plate_temp" : ["55"], - "compatible_printers": [] + "compatible_printers": [] } \ No newline at end of file diff --git a/resources/profiles/X 4 Series/filament/Generic PLA+.json b/resources/profiles/X 4 Series/filament/Generic PLA+.json index 9abe628..ee64d5a 100644 --- a/resources/profiles/X 4 Series/filament/Generic PLA+.json +++ b/resources/profiles/X 4 Series/filament/Generic PLA+.json @@ -7,6 +7,7 @@ "instantiation": "false", "inherits": "fdm_filament_common", "additional_cooling_fan_speed": ["0"], + "filament_adhesiveness_category": ["100"], "filament_density": ["1.2"], "filament_max_volumetric_speed": ["12"], "filament_type": ["PLA"], @@ -15,6 +16,7 @@ "nozzle_temperature_range_high": ["240"], "nozzle_temperature_range_low": ["190"], "nozzle_temperature": ["230"], + "overhang_fan_threshold": ["50%"], "supertack_plate_temp_initial_layer": ["45"], "supertack_plate_temp": ["45"], "temperature_vitrification": ["45"], diff --git a/resources/profiles/X 4 Series/filament/Generic PLA.json b/resources/profiles/X 4 Series/filament/Generic PLA.json index efd868f..13baac1 100644 --- a/resources/profiles/X 4 Series/filament/Generic PLA.json +++ b/resources/profiles/X 4 Series/filament/Generic PLA.json @@ -1,12 +1,15 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "QD_0_0_1", "setting_id": "GFSL99", "name": "Generic PLA@X4", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", "additional_cooling_fan_speed": ["0"], + "cool_plate_temp_initial_layer": ["45"], + "cool_plate_temp": ["45"], + "filament_adhesiveness_category": ["100"], "filament_density": ["1.2"], "filament_max_volumetric_speed": ["14"], "filament_type": ["PLA"], @@ -15,6 +18,7 @@ "nozzle_temperature_range_high": ["240"], "nozzle_temperature_range_low": ["190"], "nozzle_temperature": ["220"], + "overhang_fan_threshold": ["50%"], "supertack_plate_temp_initial_layer": ["45"], "supertack_plate_temp": ["45"], "temperature_vitrification": ["45"], diff --git a/resources/profiles/X 4 Series/filament/Generic TPU 95A.json b/resources/profiles/X 4 Series/filament/Generic TPU 95A.json index 8282dff..a02a76a 100644 --- a/resources/profiles/X 4 Series/filament/Generic TPU 95A.json +++ b/resources/profiles/X 4 Series/filament/Generic TPU 95A.json @@ -1,11 +1,12 @@ { "type": "filament", - "filament_id": "GFU99", + "filament_id": "QD_0_0_50", "setting_id": "GFSR99", "name": "Generic TPU 95A@X4", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "filament_adhesiveness_category": ["600"], "filament_density": ["1.21"], "filament_flow_ratio": ["1"], "filament_max_volumetric_speed": ["4"], @@ -17,5 +18,5 @@ "nozzle_temperature": ["230"], "pressure_advance": ["0.1"], "temperature_vitrification": ["30"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 4 Series/filament/HATCHBOX ABS.json b/resources/profiles/X 4 Series/filament/HATCHBOX ABS.json index 8210803..79e9561 100644 --- a/resources/profiles/X 4 Series/filament/HATCHBOX ABS.json +++ b/resources/profiles/X 4 Series/filament/HATCHBOX ABS.json @@ -6,12 +6,13 @@ "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "box_temperature_range_high": ["65"], "chamber_temperatures": ["55"], "close_fan_the_first_x_layers": ["3"], "during_print_exhaust_fan_speed": ["0"], - "enable_overhang_bridge_fan": ["1"], "fan_max_speed": ["80"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.05"], "filament_flow_ratio": ["0.95"], "filament_type": ["ABS"], @@ -27,5 +28,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["90"], "textured_plate_temp" : ["90"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 4 Series/filament/HATCHBOX PETG.json b/resources/profiles/X 4 Series/filament/HATCHBOX PETG.json index 9337d23..1ecab21 100644 --- a/resources/profiles/X 4 Series/filament/HATCHBOX PETG.json +++ b/resources/profiles/X 4 Series/filament/HATCHBOX PETG.json @@ -1,16 +1,17 @@ { "type": "filament", - "filament_id": "GFG99", + "filament_id": "GFG99", "setting_id": "GFSG99", "name": "HATCHBOX PETG@X4", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "box_temperature_range_high": ["55"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["30"], "fan_max_speed": ["40"], "fan_min_speed": ["10"], + "filament_adhesiveness_category": ["300"], "filament_flow_ratio": ["0.95"], "filament_max_volumetric_speed": ["13"], "filament_type": ["PETG"], @@ -28,5 +29,5 @@ "temperature_vitrification": ["70"], "textured_plate_temp_initial_layer" : ["80"], "textured_plate_temp" : ["80"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 4 Series/filament/HATCHBOX PLA.json b/resources/profiles/X 4 Series/filament/HATCHBOX PLA.json index 3e8171e..1854f91 100644 --- a/resources/profiles/X 4 Series/filament/HATCHBOX PLA.json +++ b/resources/profiles/X 4 Series/filament/HATCHBOX PLA.json @@ -1,11 +1,12 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "GFL99", "setting_id": "GFSL99", "name": "HATCHBOX PLA@X4", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "filament_adhesiveness_category": ["100"], "filament_type": ["PLA"], "filament_vendor": ["HATCHBOX"], "additional_cooling_fan_speed": ["100"], @@ -13,8 +14,9 @@ "nozzle_temperature_range_low": ["190"], "nozzle_temperature_initial_layer": ["210"], "nozzle_temperature": ["210"], + "overhang_fan_threshold": ["50%"], "supertack_plate_temp_initial_layer": ["45"], "supertack_plate_temp": ["45"], "temperature_vitrification": ["45"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 4 Series/filament/Overture ABS.json b/resources/profiles/X 4 Series/filament/Overture ABS.json index c1dd01e..7bd645c 100644 --- a/resources/profiles/X 4 Series/filament/Overture ABS.json +++ b/resources/profiles/X 4 Series/filament/Overture ABS.json @@ -6,12 +6,13 @@ "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "box_temperature_range_high": ["65"], "chamber_temperatures": ["60"], "close_fan_the_first_x_layers": ["3"], "during_print_exhaust_fan_speed": ["0"], - "enable_overhang_bridge_fan": ["1"], "fan_max_speed": ["80"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.12"], "filament_flow_ratio": ["0.96"], "filament_max_volumetric_speed": ["17"], @@ -28,5 +29,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["90"], "textured_plate_temp" : ["90"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 4 Series/filament/Overture PLA.json b/resources/profiles/X 4 Series/filament/Overture PLA.json index c25c324..37ee5d7 100644 --- a/resources/profiles/X 4 Series/filament/Overture PLA.json +++ b/resources/profiles/X 4 Series/filament/Overture PLA.json @@ -1,11 +1,12 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "GFL99", "setting_id": "GFSL99", "name": "Overture PLA@X4", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "filament_adhesiveness_category": ["100"], "filament_density": ["1.2"], "filament_flow_ratio": ["1"], "filament_max_volumetric_speed": ["11"], @@ -16,9 +17,10 @@ "nozzle_temperature_range_low": ["190"], "nozzle_temperature_initial_layer": ["210"], "nozzle_temperature": ["210"], + "overhang_fan_threshold": ["50%"], "slow_down_layer_time": ["10"], "supertack_plate_temp_initial_layer": ["45"], "supertack_plate_temp": ["45"], "temperature_vitrification": ["45"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 4 Series/filament/PolyLite ABS.json b/resources/profiles/X 4 Series/filament/PolyLite ABS.json index b5d8cec..d84a3e6 100644 --- a/resources/profiles/X 4 Series/filament/PolyLite ABS.json +++ b/resources/profiles/X 4 Series/filament/PolyLite ABS.json @@ -6,12 +6,13 @@ "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "box_temperature_range_high": ["65"], "chamber_temperatures": ["60"], "close_fan_the_first_x_layers": ["3"], "during_print_exhaust_fan_speed": ["0"], - "enable_overhang_bridge_fan": ["1"], "fan_max_speed": ["80"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.12"], "filament_flow_ratio": ["0.96"], "filament_max_volumetric_speed": ["17"], @@ -28,5 +29,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["90"], "textured_plate_temp" : ["90"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 4 Series/filament/PolyLite PLA.json b/resources/profiles/X 4 Series/filament/PolyLite PLA.json index 77ce465..b2a45e5 100644 --- a/resources/profiles/X 4 Series/filament/PolyLite PLA.json +++ b/resources/profiles/X 4 Series/filament/PolyLite PLA.json @@ -1,11 +1,12 @@ { "type": "filament", - "filament_id": "GFL99", + "filament_id": "GFL99", "setting_id": "GFSL99", "name": "PolyLite PLA@X4", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "filament_adhesiveness_category": ["100"], "filament_density": ["1.2"], "filament_flow_ratio": ["1"], "filament_max_volumetric_speed": ["11"], @@ -17,9 +18,10 @@ "nozzle_temperature_range_low": ["190"], "nozzle_temperature_initial_layer": ["210"], "nozzle_temperature": ["210"], + "overhang_fan_threshold": ["50%"], "slow_down_layer_time": ["10"], "supertack_plate_temp_initial_layer": ["45"], "supertack_plate_temp": ["45"], "temperature_vitrification": ["45"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 4 Series/filament/QIDI ABS Odorless.json b/resources/profiles/X 4 Series/filament/QIDI ABS Odorless.json index b2693c1..cc55dbd 100644 --- a/resources/profiles/X 4 Series/filament/QIDI ABS Odorless.json +++ b/resources/profiles/X 4 Series/filament/QIDI ABS Odorless.json @@ -6,16 +6,18 @@ "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "box_temperature_range_high": ["65"], "chamber_temperatures": ["55"], "close_fan_the_first_x_layers": ["3"], "during_print_exhaust_fan_speed": ["0"], - "enable_overhang_bridge_fan": ["1"], "fan_max_speed": ["80"], "fan_min_speed": ["10"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.02"], "filament_flow_ratio": ["0.92"], "filament_max_volumetric_speed": ["22"], "filament_type": ["ABS"], + "impact_strength_z":["7.4"], "nozzle_temperature_initial_layer": ["250"], "nozzle_temperature_range_high": ["280"], "nozzle_temperature_range_low": ["240"], @@ -27,5 +29,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["90"], "textured_plate_temp" : ["90"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 4 Series/filament/QIDI ABS Rapido Metal.json b/resources/profiles/X 4 Series/filament/QIDI ABS Rapido Metal.json index b4caea7..2af87ee 100644 --- a/resources/profiles/X 4 Series/filament/QIDI ABS Rapido Metal.json +++ b/resources/profiles/X 4 Series/filament/QIDI ABS Rapido Metal.json @@ -1,20 +1,22 @@ { "type": "filament", - "filament_id": "PL403", + "filament_id": "QD_0_1_13", "setting_id": "GFSA04", "name": "QIDI ABS Rapido Metal@X4", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "box_temperature_range_high": ["65"], "chamber_temperatures": ["55"], "close_fan_the_first_x_layers": ["3"], "during_print_exhaust_fan_speed": ["0"], - "enable_overhang_bridge_fan": ["1"], "fan_max_speed": ["80"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.06"], "filament_flow_ratio": ["0.95"], "filament_type": ["ABS"], + "impact_strength_z":["7.4"], "nozzle_temperature_initial_layer": ["250"], "nozzle_temperature_range_high": ["280"], "nozzle_temperature_range_low": ["240"], @@ -26,5 +28,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["90"], "textured_plate_temp" : ["90"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 4 Series/filament/QIDI ABS Rapido.json b/resources/profiles/X 4 Series/filament/QIDI ABS Rapido.json index 495e64d..9c7f1b4 100644 --- a/resources/profiles/X 4 Series/filament/QIDI ABS Rapido.json +++ b/resources/profiles/X 4 Series/filament/QIDI ABS Rapido.json @@ -1,20 +1,22 @@ { "type": "filament", - "filament_id": "PL402", + "filament_id": "QD_0_1_11", "setting_id": "GFSA04", "name": "QIDI ABS Rapido@X4", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "box_temperature_range_high": ["65"], "chamber_temperatures": ["55"], "close_fan_the_first_x_layers": ["3"], "during_print_exhaust_fan_speed": ["0"], - "enable_overhang_bridge_fan": ["1"], "fan_max_speed": ["80"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.05"], "filament_flow_ratio": ["0.95"], "filament_type": ["ABS"], + "impact_strength_z":["7.4"], "nozzle_temperature_initial_layer": ["250"], "nozzle_temperature_range_high": ["280"], "nozzle_temperature_range_low": ["240"], @@ -26,5 +28,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["90"], "textured_plate_temp" : ["90"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 4 Series/filament/QIDI ABS-GF.json b/resources/profiles/X 4 Series/filament/QIDI ABS-GF.json index f70bf18..ff1d558 100644 --- a/resources/profiles/X 4 Series/filament/QIDI ABS-GF.json +++ b/resources/profiles/X 4 Series/filament/QIDI ABS-GF.json @@ -1,25 +1,29 @@ { "type": "filament", - "filament_id": "PL404", + "filament_id": "QD_0_1_12", "setting_id": "GFSA04", "name": "QIDI ABS-GF@X4", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", - "chamber_temperatures": ["55"], + "box_temperature_range_high": ["65"], + "box_temperature_range_low": ["0"], + "box_temperature": ["55"], + "chamber_temperatures": ["0"], "close_fan_the_first_x_layers": ["3"], "during_print_exhaust_fan_speed": ["0"], - "enable_overhang_bridge_fan": ["1"], "fan_max_speed": ["20"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.15"], "filament_flow_ratio": ["0.95"], - "filament_max_volumetric_speed": ["22"], + "filament_max_volumetric_speed": ["12"], "filament_type": ["ABS-GF"], + "impact_strength_z":["5.3"], "nozzle_temperature_initial_layer": ["260"], "nozzle_temperature_range_high": ["280"], "nozzle_temperature_range_low": ["240"], - "nozzle_temperature": ["260"], + "nozzle_temperature": ["270"], "overhang_fan_speed": ["80"], "overhang_fan_threshold": ["25%"], "pressure_advance": ["0.035"], @@ -27,5 +31,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["100"], "textured_plate_temp" : ["100"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 4 Series/filament/QIDI ASA-Aero.json b/resources/profiles/X 4 Series/filament/QIDI ASA-Aero.json index 1415f83..b3b3b38 100644 --- a/resources/profiles/X 4 Series/filament/QIDI ASA-Aero.json +++ b/resources/profiles/X 4 Series/filament/QIDI ASA-Aero.json @@ -1,27 +1,29 @@ { "type": "filament", - "filament_id": "PL406", + "filament_id": "QD_0_1_19", "setting_id": "GFSA04", "name": "QIDI ASA-Aero@X4", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "box_temperature_range_high": ["65"], "chamber_temperatures": ["60"], "close_fan_the_first_x_layers": ["3"], "during_print_exhaust_fan_speed": ["0"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["40"], "fan_max_speed": ["50"], "fan_min_speed": ["10"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.03"], "filament_flow_ratio": ["0.7"], - "filament_max_volumetric_speed": ["16"], + "filament_max_volumetric_speed": ["12"], "filament_retract_when_changing_layer": ["0"], "filament_retraction_length": ["0.01"], "filament_retraction_minimum_travel": ["0"], "filament_type": ["ASA-Aero"], "filament_wipe": ["0"], "filament_z_hop": ["0"], + "impact_strength_z":["3.4"], "nozzle_temperature_initial_layer": ["250"], "nozzle_temperature_range_high": ["280"], "nozzle_temperature_range_low": ["240"], @@ -33,5 +35,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["90"], "textured_plate_temp" : ["90"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 4 Series/filament/QIDI ASA.json b/resources/profiles/X 4 Series/filament/QIDI ASA.json index 3eab46d..4cf52ae 100644 --- a/resources/profiles/X 4 Series/filament/QIDI ASA.json +++ b/resources/profiles/X 4 Series/filament/QIDI ASA.json @@ -1,22 +1,24 @@ { "type": "filament", - "filament_id": "PL405", + "filament_id": "QD_0_1_18", "setting_id": "GFSA04", "name": "QIDI ASA@X4", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "box_temperature_range_high": ["65"], "chamber_temperatures": ["55"], "close_fan_the_first_x_layers": ["3"], "during_print_exhaust_fan_speed": ["0"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["40"], "fan_max_speed": ["50"], "fan_min_speed": ["10"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.07"], "filament_flow_ratio": ["0.92"], "filament_max_volumetric_speed": ["16"], "filament_type": ["ASA"], + "impact_strength_z":["4.9"], "nozzle_temperature_initial_layer": ["250"], "nozzle_temperature_range_high": ["280"], "nozzle_temperature_range_low": ["240"], @@ -28,5 +30,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["90"], "textured_plate_temp" : ["90"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 4 Series/filament/QIDI PA12-CF.json b/resources/profiles/X 4 Series/filament/QIDI PA12-CF.json index 5e94afe..81b2d5e 100644 --- a/resources/profiles/X 4 Series/filament/QIDI PA12-CF.json +++ b/resources/profiles/X 4 Series/filament/QIDI PA12-CF.json @@ -1,20 +1,24 @@ { "type": "filament", - "filament_id": "PL407", + "filament_id": "QD_0_1_25", "setting_id": "GFSN99", "name": "QIDI PA12-CF@X4", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "box_temperature_range_high": ["65"], + "box_temperature_range_low": ["0"], + "box_temperature": ["65"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["10"], "fan_max_speed": ["40"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["400"], "filament_density": ["1.09"], "filament_flow_ratio": ["0.96"], - "filament_max_volumetric_speed": ["13"], + "filament_max_volumetric_speed": ["8"], "filament_type": ["PA12-CF"], + "impact_strength_z":["5.7"], "nozzle_temperature_initial_layer": ["280"], "nozzle_temperature_range_high": ["300"], "nozzle_temperature_range_low": ["280"], diff --git a/resources/profiles/X 4 Series/filament/QIDI PAHT-CF.json b/resources/profiles/X 4 Series/filament/QIDI PAHT-CF.json index cc2aed0..1c6dcce 100644 --- a/resources/profiles/X 4 Series/filament/QIDI PAHT-CF.json +++ b/resources/profiles/X 4 Series/filament/QIDI PAHT-CF.json @@ -1,20 +1,24 @@ { "type": "filament", - "filament_id": "PL408", + "filament_id": "QD_0_1_30", "setting_id": "GFSN99", "name": "QIDI PAHT-CF@X4", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "box_temperature_range_high": ["65"], + "box_temperature_range_low": ["0"], + "box_temperature": ["65"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["10"], "fan_max_speed": ["40"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["400"], "filament_density": ["1.2"], "filament_flow_ratio": ["0.96"], - "filament_max_volumetric_speed": ["14"], + "filament_max_volumetric_speed": ["8"], "filament_type": ["PAHT-CF"], + "impact_strength_z":["13.3"], "nozzle_temperature_initial_layer": ["300"], "nozzle_temperature_range_high": ["320"], "nozzle_temperature_range_low": ["300"], diff --git a/resources/profiles/X 4 Series/filament/QIDI PAHT-GF.json b/resources/profiles/X 4 Series/filament/QIDI PAHT-GF.json index daafd47..d34dc36 100644 --- a/resources/profiles/X 4 Series/filament/QIDI PAHT-GF.json +++ b/resources/profiles/X 4 Series/filament/QIDI PAHT-GF.json @@ -1,20 +1,24 @@ { "type": "filament", - "filament_id": "PL409", + "filament_id": "QD_0_1_31", "setting_id": "GFSN99", "name": "QIDI PAHT-GF@X4", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "box_temperature_range_high": ["65"], + "box_temperature_range_low": ["0"], + "box_temperature": ["65"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["10"], "fan_max_speed": ["20"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["400"], "filament_density": ["1.27"], "filament_flow_ratio": ["0.96"], - "filament_max_volumetric_speed": ["14"], + "filament_max_volumetric_speed": ["10"], "filament_type": ["PAHT-GF"], + "impact_strength_z":["13.3"], "nozzle_temperature_initial_layer": ["300"], "nozzle_temperature_range_high": ["320"], "nozzle_temperature_range_low": ["300"], diff --git a/resources/profiles/X 4 Series/filament/QIDI PC-ABS-FR.json b/resources/profiles/X 4 Series/filament/QIDI PC-ABS-FR.json index 47468e8..3b3cb14 100644 --- a/resources/profiles/X 4 Series/filament/QIDI PC-ABS-FR.json +++ b/resources/profiles/X 4 Series/filament/QIDI PC-ABS-FR.json @@ -1,22 +1,24 @@ { "type": "filament", - "filament_id": "PL410", + "filament_id": "QD_0_1_34", "setting_id": "GFSA04", "name": "QIDI PC-ABS-FR@X4", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "box_temperature_range_high": ["65"], "chamber_temperatures": ["55"], "close_fan_the_first_x_layers": ["3"], "during_print_exhaust_fan_speed": ["0"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["30"], "fan_max_speed": ["40"], "fan_min_speed": ["10"], + "filament_adhesiveness_category": ["200"], "filament_density": ["1.19"], "filament_flow_ratio": ["0.92"], "filament_max_volumetric_speed": ["8"], "filament_type": ["PC-ABS-FR"], + "impact_strength_z":["8"], "nozzle_temperature_initial_layer": ["250"], "nozzle_temperature_range_high": ["280"], "nozzle_temperature_range_low": ["240"], @@ -28,5 +30,5 @@ "temperature_vitrification": ["100"], "textured_plate_temp_initial_layer" : ["100"], "textured_plate_temp" : ["100"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 4 Series/filament/QIDI PET-CF.json b/resources/profiles/X 4 Series/filament/QIDI PET-CF.json index 6188394..cdb1a3d 100644 --- a/resources/profiles/X 4 Series/filament/QIDI PET-CF.json +++ b/resources/profiles/X 4 Series/filament/QIDI PET-CF.json @@ -1,20 +1,24 @@ { "type": "filament", - "filament_id": "PL411", + "filament_id": "QD_0_1_37", "setting_id": "GFSN99", "name": "QIDI PET-CF@X4", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "box_temperature_range_high": ["65"], + "box_temperature_range_low": ["0"], + "box_temperature": ["55"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["10"], "fan_max_speed": ["40"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["800"], "filament_density": ["1.3"], "filament_flow_ratio": ["1"], - "filament_max_volumetric_speed": ["15"], + "filament_max_volumetric_speed": ["8"], "filament_type": ["PET-CF"], + "impact_strength_z":["4.5"], "nozzle_temperature_initial_layer": ["280"], "nozzle_temperature_range_high": ["320"], "nozzle_temperature_range_low": ["280"], diff --git a/resources/profiles/X 4 Series/filament/QIDI PET-GF.json b/resources/profiles/X 4 Series/filament/QIDI PET-GF.json index 1436190..aa47b97 100644 --- a/resources/profiles/X 4 Series/filament/QIDI PET-GF.json +++ b/resources/profiles/X 4 Series/filament/QIDI PET-GF.json @@ -1,20 +1,24 @@ { "type": "filament", - "filament_id": "PL413", + "filament_id": "QD_0_1_38", "setting_id": "GFSN99", "name": "QIDI PET-GF@X4", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "box_temperature_range_high": ["65"], + "box_temperature_range_low": ["0"], + "box_temperature": ["55"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["10"], "fan_max_speed": ["20"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["800"], "filament_density": ["1.38"], "filament_flow_ratio": ["0.97"], - "filament_max_volumetric_speed": ["15"], + "filament_max_volumetric_speed": ["10"], "filament_type": ["PET-GF"], + "impact_strength_z":["4.5"], "nozzle_temperature_initial_layer": ["300"], "nozzle_temperature_range_high": ["320"], "nozzle_temperature_range_low": ["280"], diff --git a/resources/profiles/X 4 Series/filament/QIDI PETG Tough.json b/resources/profiles/X 4 Series/filament/QIDI PETG Tough.json index 4bb9d68..d37bac0 100644 --- a/resources/profiles/X 4 Series/filament/QIDI PETG Tough.json +++ b/resources/profiles/X 4 Series/filament/QIDI PETG Tough.json @@ -1,19 +1,21 @@ { "type": "filament", - "filament_id": "PL412", + "filament_id": "QD_0_1_41", "setting_id": "GFSG99", "name": "QIDI PETG Tough@X4", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "box_temperature_range_high": ["55"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["30"], "fan_max_speed": ["40"], "fan_min_speed": ["10"], + "filament_adhesiveness_category": ["300"], "filament_flow_ratio": ["0.95"], "filament_max_volumetric_speed": ["13"], "filament_type": ["PETG"], + "impact_strength_z":["10.6"], "nozzle_temperature_initial_layer": ["240"], "nozzle_temperature_range_high": ["270"], "nozzle_temperature_range_low": ["220"], @@ -27,5 +29,5 @@ "textured_plate_temp" : ["80"], "supertack_plate_temp_initial_layer": ["70"], "supertack_plate_temp": ["70"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 4 Series/filament/QIDI PLA Rapido Matte.json b/resources/profiles/X 4 Series/filament/QIDI PLA Rapido Matte.json index d3f5b31..61768ad 100644 --- a/resources/profiles/X 4 Series/filament/QIDI PLA Rapido Matte.json +++ b/resources/profiles/X 4 Series/filament/QIDI PLA Rapido Matte.json @@ -1,20 +1,23 @@ { "type": "filament", - "filament_id": "PL415", + "filament_id": "QD_0_1_2", "setting_id": "GFSL99", "name": "QIDI PLA Rapido Matte@X4", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", "additional_cooling_fan_speed": ["100"], + "filament_adhesiveness_category": ["100"], "filament_density": ["1.42"], "filament_type": ["PLA"], + "impact_strength_z":["6.6"], "nozzle_temperature_range_high": ["240"], "nozzle_temperature_range_low": ["190"], "nozzle_temperature_initial_layer": ["210"], "nozzle_temperature": ["210"], + "overhang_fan_threshold": ["50%"], "supertack_plate_temp_initial_layer": ["45"], "supertack_plate_temp": ["45"], "temperature_vitrification": ["45"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 4 Series/filament/QIDI PLA Rapido Metal.json b/resources/profiles/X 4 Series/filament/QIDI PLA Rapido Metal.json index b7ca80d..4100ca5 100644 --- a/resources/profiles/X 4 Series/filament/QIDI PLA Rapido Metal.json +++ b/resources/profiles/X 4 Series/filament/QIDI PLA Rapido Metal.json @@ -1,20 +1,23 @@ { "type": "filament", - "filament_id": "PL416", + "filament_id": "QD_0_1_3", "setting_id": "GFSL99", "name": "QIDI PLA Rapido Metal@X4", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "filament_adhesiveness_category": ["100"], "filament_type": ["PLA"], "additional_cooling_fan_speed": ["100"], "filament_density": ["1.20"], + "impact_strength_z":["16.8"], "nozzle_temperature_range_high": ["240"], "nozzle_temperature_range_low": ["190"], "nozzle_temperature_initial_layer": ["210"], "nozzle_temperature": ["210"], + "overhang_fan_threshold": ["50%"], "supertack_plate_temp_initial_layer": ["45"], "supertack_plate_temp": ["45"], "temperature_vitrification": ["45"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 4 Series/filament/QIDI PLA Rapido Silk.json b/resources/profiles/X 4 Series/filament/QIDI PLA Rapido Silk.json index f4a5ec3..80846b1 100644 --- a/resources/profiles/X 4 Series/filament/QIDI PLA Rapido Silk.json +++ b/resources/profiles/X 4 Series/filament/QIDI PLA Rapido Silk.json @@ -1,23 +1,26 @@ { "type": "filament", - "filament_id": "PL417", + "filament_id": "QD_0_1_4", "setting_id": "GFSL99", "name": "QIDI PLA Rapido Silk@X4", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", "additional_cooling_fan_speed": ["0"], + "filament_adhesiveness_category": ["100"], "filament_density": ["1.24"], "filament_max_volumetric_speed": ["7.5"], "filament_type": ["PLA"], + "impact_strength_z":["4.6"], "nozzle_temperature_range_high": ["240"], "nozzle_temperature_range_low": ["190"], "nozzle_temperature_initial_layer": ["220"], "nozzle_temperature": ["220"], + "overhang_fan_threshold": ["50%"], "supertack_plate_temp_initial_layer": ["0"], "supertack_plate_temp": ["0"], "textured_plate_temp_initial_layer" : ["55"], "textured_plate_temp" : ["55"], "temperature_vitrification": ["45"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 4 Series/filament/QIDI PLA Rapido.json b/resources/profiles/X 4 Series/filament/QIDI PLA Rapido.json index b59c4cc..83ecaba 100644 --- a/resources/profiles/X 4 Series/filament/QIDI PLA Rapido.json +++ b/resources/profiles/X 4 Series/filament/QIDI PLA Rapido.json @@ -1,19 +1,24 @@ { "type": "filament", - "filament_id": "PL414", + "filament_id": "QD_0_1_1", "setting_id": "GFSL99", "name": "QIDI PLA Rapido@X4", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "cool_plate_temp_initial_layer": ["45"], + "cool_plate_temp": ["45"], + "filament_adhesiveness_category": ["100"], "filament_type": ["PLA"], + "impact_strength_z":["13.8"], "additional_cooling_fan_speed": ["100"], "nozzle_temperature_range_high": ["240"], "nozzle_temperature_range_low": ["190"], "nozzle_temperature_initial_layer": ["210"], "nozzle_temperature": ["210"], + "overhang_fan_threshold": ["50%"], "supertack_plate_temp_initial_layer": ["45"], "supertack_plate_temp": ["45"], "temperature_vitrification": ["45"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 4 Series/filament/QIDI PLA-CF.json b/resources/profiles/X 4 Series/filament/QIDI PLA-CF.json index ba58159..4f9c6dd 100644 --- a/resources/profiles/X 4 Series/filament/QIDI PLA-CF.json +++ b/resources/profiles/X 4 Series/filament/QIDI PLA-CF.json @@ -1,26 +1,27 @@ { - "type": "filament", - "filament_id": "PL418", - "setting_id": "GFSL98", - "name": "QIDI PLA-CF@X4", - "from": "system", - "instantiation": "false", - "inherits": "fdm_filament_common", - "additional_cooling_fan_speed": ["0"], - "enable_overhang_bridge_fan": ["1"], - "filament_density": ["1.25"], - "filament_flow_ratio": ["0.93"], - "filament_max_volumetric_speed": ["15"], - "filament_type": ["PLA-CF"], - "nozzle_temperature_initial_layer": ["220"], - "nozzle_temperature_range_high": ["250"], + "type": "filament", + "filament_id": "QD_0_1_5", + "setting_id": "GFSL98", + "name": "QIDI PLA-CF@X4", + "from": "system", + "instantiation": "false", + "inherits": "fdm_filament_common", + "additional_cooling_fan_speed": ["0"], + "filament_adhesiveness_category": ["100"], + "filament_density": ["1.25"], + "filament_flow_ratio": ["0.93"], + "filament_max_volumetric_speed": ["15"], + "filament_type": ["PLA-CF"], + "impact_strength_z":["7.8"], + "nozzle_temperature_initial_layer": ["220"], + "nozzle_temperature_range_high": ["250"], "nozzle_temperature_range_low": ["210"], "nozzle_temperature": ["220"], "overhang_fan_speed": ["100"], "overhang_fan_threshold": ["50%"], - "pressure_advance": ["0.042"], - "supertack_plate_temp_initial_layer": ["50"], + "pressure_advance": ["0.042"], + "supertack_plate_temp_initial_layer": ["50"], "supertack_plate_temp": ["50"], - "temperature_vitrification": ["45"], - "compatible_printers": [] + "temperature_vitrification": ["45"], + "compatible_printers": [] } \ No newline at end of file diff --git a/resources/profiles/X 4 Series/filament/QIDI PPS-CF.json b/resources/profiles/X 4 Series/filament/QIDI PPS-CF.json index 7bc8478..ac90d2e 100644 --- a/resources/profiles/X 4 Series/filament/QIDI PPS-CF.json +++ b/resources/profiles/X 4 Series/filament/QIDI PPS-CF.json @@ -1,21 +1,25 @@ { "type": "filament", - "filament_id": "PL419", + "filament_id": "QD_0_1_44", "setting_id": "GFSN99", "name": "QIDI PPS-CF@X4", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "box_temperature_range_high": ["65"], + "box_temperature_range_low": ["0"], + "box_temperature": ["65"], "chamber_temperatures": ["60"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["5"], "fan_max_speed": ["30"], "fan_min_speed": ["0"], + "filament_adhesiveness_category": ["801"], "filament_density": ["1.3"], "filament_flow_ratio": ["0.97"], "filament_max_volumetric_speed": ["6"], "filament_type": ["PPS-CF"], + "impact_strength_z":["2.8"], "nozzle_temperature_initial_layer": ["320"], "nozzle_temperature_range_high": ["350"], "nozzle_temperature_range_low": ["300"], diff --git a/resources/profiles/X 4 Series/filament/QIDI TPU 95A-HF.json b/resources/profiles/X 4 Series/filament/QIDI TPU 95A-HF.json index 01e4938..4ebbac5 100644 --- a/resources/profiles/X 4 Series/filament/QIDI TPU 95A-HF.json +++ b/resources/profiles/X 4 Series/filament/QIDI TPU 95A-HF.json @@ -1,21 +1,23 @@ { "type": "filament", - "filament_id": "PL420", + "filament_id": "QD_0_1_50", "setting_id": "GFSR99", "name": "QIDI TPU 95A-HF@X4", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "filament_adhesiveness_category": ["600"], "filament_density": ["1.15"], "filament_flow_ratio": ["1"], "filament_max_volumetric_speed": ["4"], "filament_type": ["TPU"], "filament_vendor": ["QIDI"], + "impact_strength_z":["88.7"], "nozzle_temperature_initial_layer": ["230"], "nozzle_temperature_range_high": ["250"], "nozzle_temperature_range_low": ["200"], "nozzle_temperature": ["230"], "pressure_advance": ["0.1"], "temperature_vitrification": ["30"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 4 Series/filament/QIDI UltraPA-CF25.json b/resources/profiles/X 4 Series/filament/QIDI UltraPA-CF25.json index 633b772..913fb54 100644 --- a/resources/profiles/X 4 Series/filament/QIDI UltraPA-CF25.json +++ b/resources/profiles/X 4 Series/filament/QIDI UltraPA-CF25.json @@ -6,15 +6,19 @@ "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "box_temperature_range_high": ["65"], + "box_temperature_range_low": ["0"], + "box_temperature": ["65"], "close_fan_the_first_x_layers": ["3"], - "enable_overhang_bridge_fan": ["1"], "fan_cooling_layer_time": ["5"], "fan_max_speed": ["40"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["400"], "filament_density": ["1.23"], "filament_flow_ratio": ["0.94"], "filament_max_volumetric_speed": ["8"], "filament_type": ["UltraPA-CF25"], + "impact_strength_z":["5.7"], "nozzle_temperature_initial_layer": ["300"], "nozzle_temperature_range_high": ["320"], "nozzle_temperature_range_low": ["300"], diff --git a/resources/profiles/X 4 Series/filament/QIDI UltraPA.json b/resources/profiles/X 4 Series/filament/QIDI UltraPA.json index 8562586..3d897d2 100644 --- a/resources/profiles/X 4 Series/filament/QIDI UltraPA.json +++ b/resources/profiles/X 4 Series/filament/QIDI UltraPA.json @@ -6,12 +6,15 @@ "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", + "box_temperature_range_high": ["65"], "fan_max_speed": ["40"], "fan_min_speed": ["20"], + "filament_adhesiveness_category": ["400"], "filament_density": ["1.21"], "filament_flow_ratio": ["0.96"], "filament_max_volumetric_speed": ["4"], "filament_type": ["UltraPA"], + "impact_strength_z":["5.7"], "nozzle_temperature_initial_layer": ["280"], "nozzle_temperature_range_high": ["290"], "nozzle_temperature_range_low": ["250"], @@ -21,5 +24,5 @@ "temperature_vitrification": ["170"], "textured_plate_temp_initial_layer" : ["80"], "textured_plate_temp" : ["80"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 4 Series/filament/QIDI WOOD Rapido.json b/resources/profiles/X 4 Series/filament/QIDI WOOD Rapido.json index d8fa683..921a325 100644 --- a/resources/profiles/X 4 Series/filament/QIDI WOOD Rapido.json +++ b/resources/profiles/X 4 Series/filament/QIDI WOOD Rapido.json @@ -1,23 +1,27 @@ { "type": "filament", - "filament_id": "PL423", + "filament_id": "QD_0_1_6", "setting_id": "GFSL99", "name": "QIDI WOOD Rapido@X4", "from": "system", "instantiation": "false", "inherits": "fdm_filament_common", "additional_cooling_fan_speed": ["100"], + "box_temperature_range_high": ["50"], + "filament_adhesiveness_category": ["100"], "filament_density": ["1.23"], "filament_flow_ratio": ["0.95"], "filament_max_volumetric_speed": ["18"], "filament_type": ["PLA"], + "impact_strength_z":["5.6"], "nozzle_temperature_range_high": ["220"], "nozzle_temperature_range_low": ["190"], "nozzle_temperature_initial_layer": ["210"], "nozzle_temperature": ["210"], + "overhang_fan_threshold": ["50%"], "pressure_advance": ["0.044"], "supertack_plate_temp_initial_layer": ["45"], "supertack_plate_temp": ["45"], "temperature_vitrification": ["45"], - "compatible_printers": [] + "compatible_printers": [] } diff --git a/resources/profiles/X 4 Series/filament/fdm_filament_common.json b/resources/profiles/X 4 Series/filament/fdm_filament_common.json index 5e9a718..3bd6fae 100644 --- a/resources/profiles/X 4 Series/filament/fdm_filament_common.json +++ b/resources/profiles/X 4 Series/filament/fdm_filament_common.json @@ -7,6 +7,9 @@ "additional_cooling_fan_speed_unseal": ["0"], "additional_cooling_fan_speed": ["0"], "bed_type": ["Cool Plate"], + "box_temperature_range_high": ["35"], + "box_temperature_range_low": ["0"], + "box_temperature": ["0"], "chamber_temperatures": ["0"], "close_fan_the_first_x_layers": ["1"], "complete_print_exhaust_fan_speed" : ["0"], @@ -14,7 +17,6 @@ "cool_plate_temp" : ["60"], "dont_slow_down_outer_wall" : ["0"], "during_print_exhaust_fan_speed": ["100"], - "enable_overhang_bridge_fan": ["0"], "enable_pressure_advance": ["1"], "eng_plate_temp_initial_layer" : ["60"], "eng_plate_temp" : ["60"], @@ -44,6 +46,9 @@ "filament_wipe": ["nil"], "filament_z_hop_types": ["nil"], "filament_z_hop": ["nil"], + "filament_ramming_travel_time" : ["0"], + "filament_pre_cooling_temperature" : ["0"], + "filament_ramming_volumetric_speed" : ["-1"], "full_fan_speed_layer": ["0"], "nozzle_temperature_initial_layer": ["210"], "nozzle_temperature": ["210"], diff --git a/resources/profiles/X 4 Series/machine/Qidi X-Plus 4 0.4 nozzle.json b/resources/profiles/X 4 Series/machine/Qidi X-Plus 4 0.4 nozzle.json index da877d1..7f0f3c5 100644 --- a/resources/profiles/X 4 Series/machine/Qidi X-Plus 4 0.4 nozzle.json +++ b/resources/profiles/X 4 Series/machine/Qidi X-Plus 4 0.4 nozzle.json @@ -1,31 +1,27 @@ { - "type": "machine", - "setting_id": "GM001", - "name": "X-Plus 4 0.4 nozzle", - "from": "system", - "instantiation": "true", - "inherits": "fdm_machine_x_common", - "printer_model": "X-Plus 4", - "gcode_flavor": "klipper", - "default_print_profile": "0.20mm Standard @XPlus4", - "printer_settings_id": "Qidi", - "bed_exclude_area": ["0x305", "0x302", "35x302", "35x305", "305x305", "305x305", "305x305", "305x20", "293x20", "293x0", "305x0", "305x20", "305x305"], - "change_filament_gcode": "G1 E{retraction_distances_when_cut[previous_extruder]} F[old_filament_e_feedrate]", - "default_filament_profile": ["QIDI PLA Rapido @Qidi X-Plus 4 0.4 nozzle"], - "deretraction_speed": ["0"], - "extruder_clearance_height_to_lid": "135", + "type": "machine", + "setting_id": "GM001", + "name": "X-Plus 4 0.4 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_machine_x_common", + "printer_model": "X-Plus 4", + "gcode_flavor": "klipper", + "default_print_profile": "0.20mm Standard @XPlus4", + "printer_settings_id": "Qidi", + "bed_exclude_area": ["0x305", "0x302", "35x302", "35x305", "305x305", "305x305", "305x305", "305x20", "293x20", "293x0", "305x0", "305x20", "305x305"], + "change_filament_gcode": "{if current_extruder != next_extruder}\nG1 Z{max_layer_z + 3.0} F1200\nTOOL_CHANGE_START F=[current_extruder] T=[next_extruder]\n{if long_retraction_when_cut && retraction_distance_when_cut > 2}\nDISABLE_ALL_SENSOR\nMOVE_TO_TRASH\nG1 E-[retraction_distance_when_cut] F200\nM400\n{endif}\nMOVE_TO_TRASH\nCLEAR_OOZE\nCUT_FILAMENT T=[current_extruder]\nMOVE_TO_TRASH\n{if nozzle_temperature_range_high[current_extruder] >= nozzle_temperature_range_high[next_extruder]}\nM104 S{nozzle_temperature_range_high[current_extruder]}\n{else}\nM104 S{nozzle_temperature_range_high[next_extruder]}\n{endif}\nM106 S0\nM106 P2 S0\nDISABLE_ALL_SENSOR\nUNLOAD_T[current_extruder]\nG92 E0\nG1 E25 F300\nT[next_extruder]\n{if nozzle_temperature_range_high[current_extruder] >= nozzle_temperature_range_high[next_extruder]}\nSET_HEATER_TEMPERATURE HEATER=extruder TARGET={nozzle_temperature_range_high[current_extruder]} WAIT=1\n{else}\nSET_HEATER_TEMPERATURE HEATER=extruder TARGET={nozzle_temperature_range_high[next_extruder]} WAIT=1\n{endif}\n{if long_retraction_when_cut && retraction_distance_when_cut > 2}\nG1 E{retraction_distance_when_cut - 2} F200\nG1 E2 F20\nM400\n{else}\n{if flush_length_1 > 23.7}\nG1 E{83.7 * 0.43} F{old_filament_e_feedrate}\nG1 E{83.7 * 0.02} F50\nG1 E-[old_retract_length_toolchange] F1800\nM106 S255\nM400\nG4 P5000\nM106 S0\nCLEAR_FLUSH\nG1 E{83.7 * 0.23} F{old_filament_e_feedrate}\nG1 E{83.7 * 0.02} F50\nG1 E{83.7 * 0.23} F{old_filament_e_feedrate}\nG1 E{83.7 * 0.02} F50\nG1 E{83.7 * 0.23} F{old_filament_e_feedrate}\nG1 E{83.7 * 0.02} F50\nG1 E-[old_retract_length_toolchange] F1800\n{else}\nG1 E{60 * 0.46} F{old_filament_e_feedrate}\nG1 E{60 * 0.02} F50\nM106 S255\nM400\nG4 P5000\nM106 S0\nCLEAR_FLUSH\nG1 E{60 * 0.23} F{old_filament_e_feedrate}\nG1 E{60 * 0.02} F50\nG1 E{60 * 0.23} F{old_filament_e_feedrate}\nG1 E{60 * 0.02} F50\nG1 E{60 * 0.23} F{old_filament_e_feedrate}\nG1 E{60 * 0.02} F50\nG1 E-[old_retract_length_toolchange] F1800\n{endif}\n{endif}\nM106 S255\nM400\nG4 P5000\nM106 S0\nCLEAR_FLUSH\nCLEAR_FLUSH\nG92 E0\n{if flush_length_1 > 1}\nM83\nG1 E{flush_length_1 * 0.58} F{new_filament_e_feedrate}\nG1 E{flush_length_1 * 0.02} F50\nG1 E{flush_length_1 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_1 * 0.02} F50\nG1 E{flush_length_1 * 0.18} F{new_filament_e_feedrate}\nG1 E{flush_length_1 * 0.02} F50\n{endif}\n{if flush_length_2 > 1}\nG1 E-[new_retract_length_toolchange] F1800\nM106 S255\nM400\nG4 P5000\nM106 S0\nCLEAR_FLUSH\nM83\nG1 E{flush_length_2 * 0.58} 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{endif}\n{if flush_length_3 > 1}\nG1 E-[new_retract_length_toolchange] F1800\nM106 S255\nM400\nG4 P5000\nM106 S0\nCLEAR_FLUSH\nM83\nG1 E{flush_length_3 * 0.58} 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{endif}\n{if flush_length_4 > 1}\nG1 E-[new_retract_length_toolchange] F1800\nM106 S255\nM400\nG4 P5000\nM106 S0\nCLEAR_FLUSH\nM83\nG1 E{flush_length_4 * 0.58} 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{endif}\nG1 E-[new_retract_length_toolchange] F1800\nM106 S255\nM109 S[new_filament_temp]\nG92 E0\nM400\nM106 S0\nCLEAR_FLUSH\nCLEAR_OOZE\nG1 Y300 F9000\nTOOL_CHANGE_END\nENABLE_ALL_SENSOR\n{endif}", + "default_filament_profile": ["QIDI PLA Rapido @Qidi X-Plus 4 0.4 nozzle"], + "enable_long_retraction_when_cut": "2", + "extruder_clearance_height_to_lid": "135", "extruder_clearance_height_to_rod": "32", "extruder_clearance_max_radius": "72", - "layer_change_gcode": "{if timelapse_type == 1} ; timelapse with wipe tower\nG92 E0\nG1 E-[retraction_length] F1800\nG2 Z{layer_z + 0.4} I0.86 J0.86 P1 F20000 ; spiral lift a little\nG1 Y304 F20000\nG1 X95 F20000\nG92 E0\nM400\nTIMELAPSE_TAKE_FRAME\nG1 Y324 F5000\nG1 E[retraction_length] F300\nG1 X65 F5000\nG1 Y290 F20000\n{elsif timelapse_type == 0} ; timelapse without wipe tower\nTIMELAPSE_TAKE_FRAME\n{endif}\nG92 E0\nSET_PRINT_STATS_INFO CURRENT_LAYER={layer_num + 1}", - "machine_pause_gcode": "M0", - "max_layer_height": ["0.28"], - "min_layer_height": ["0.08"], - "nozzle_diameter": ["0.4"], - "printable_area": ["0x0","305x0","305x305","0x305"], - "printable_height": "280", - "retract_length_toolchange": ["2"], - "retract_lift_below":["279"], - "retraction_length": ["0.8"], - "retraction_minimum_travel": ["1"], - "enable_long_retraction_when_cut": "2" + "layer_change_gcode": "{if timelapse_type == 1} ; timelapse with wipe tower\nG92 E0\nG1 E-[retraction_length] F1800\nG2 Z{layer_z + 0.4} I0.86 J0.86 P1 F20000 ; spiral lift a little\nG1 Y304 F20000\nG1 X95 F20000\nG92 E0\nM400\nTIMELAPSE_TAKE_FRAME\nG1 Y324 F5000\nG1 E[retraction_length] F300\nG1 X65 F5000\nG1 Y290 F20000\n{elsif timelapse_type == 0} ; timelapse without wipe tower\nTIMELAPSE_TAKE_FRAME\n{endif}\nG92 E0\nSET_PRINT_STATS_INFO CURRENT_LAYER={layer_num + 1}", + "machine_pause_gcode": "M0", + "machine_start_gcode": "PRINT_START BED=[bed_temperature_initial_layer_single] HOTEND=[nozzle_temperature_initial_layer] CHAMBER=[chamber_temperatures] EXTRUDER=[initial_no_support_extruder]\nSET_PRINT_STATS_INFO TOTAL_LAYER=[total_layer_count]\nM83\nM140 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nM141 S[chamber_temperatures]\nG4 P3000\nT[initial_tool]\nG0 X{max((min(print_bed_max[0] - 12, first_layer_print_min[0] + 80) - 85), 0)} Y{max((min(print_bed_max[1] - 3, first_layer_print_min[1] + 80) - 85), 0)} Z5 F6000\nG0 Z[initial_layer_print_height] F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0] - 12, first_layer_print_min[0] + 80))} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1] - 3, first_layer_print_min[1] + 80) - 85), 0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0] - 12, first_layer_print_min[0] + 80) - 85), 0)} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1] - 3, first_layer_print_min[1] + 80) - 85), 0) + 85} E{83 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0] - 12, first_layer_print_min[0] + 80) - 85), 0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1] - 3, first_layer_print_min[1] + 80) - 85), 0) + 3} E{82 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0] - 12, first_layer_print_min[0] + 80) - 85), 0) + 3} Z0\nG1 X{max((min(print_bed_max[0] - 12, first_layer_print_min[0] + 80) - 85), 0) + 6}\nG1 Z1 F600\nSET_PRINT_STATS_INFO CURRENT_LAYER=1", + "nozzle_diameter": ["0.4"], + "printable_area": ["0x0","305x0","305x305","0x305"], + "printable_height": "280", + "retract_lift_below": ["279"], + "machine_end_gcode": "DISABLE_BOX_HEATER\nM141 S0\nM140 S0\nDISABLE_ALL_SENSOR\nG1 E-3 F1800\nG0 Z{max_layer_z + 3} F600\nUNLOAD_FILAMENT T=[current_extruder]\nG0 Y290 F12000\nG0 X90 Y290 F12000\n{if max_layer_z < max_print_height / 2}G1 Z{max_print_height / 2 + 10} F600{else}G1 Z{min(max_print_height, max_layer_z + 3)}{endif}" } \ No newline at end of file diff --git a/resources/profiles/X 4 Series/machine/Qidi X-Plus 4 0.8 nozzle.json b/resources/profiles/X 4 Series/machine/Qidi X-Plus 4 0.8 nozzle.json index b7ce942..d019ce1 100644 --- a/resources/profiles/X 4 Series/machine/Qidi X-Plus 4 0.8 nozzle.json +++ b/resources/profiles/X 4 Series/machine/Qidi X-Plus 4 0.8 nozzle.json @@ -12,5 +12,6 @@ "max_layer_height": ["0.56"], "min_layer_height": ["0.16"], "nozzle_diameter": ["0.8"], + "retract_length_toolchange": ["3"], "retraction_length": ["3"] } \ No newline at end of file diff --git a/resources/profiles/X 4 Series/machine/Qidi X-Plus 4.json b/resources/profiles/X 4 Series/machine/Qidi X-Plus 4.json index a62335d..4c22162 100644 --- a/resources/profiles/X 4 Series/machine/Qidi X-Plus 4.json +++ b/resources/profiles/X 4 Series/machine/Qidi X-Plus 4.json @@ -6,6 +6,7 @@ "machine_tech": "FFF", "family": "Qidi", "bed_model": "X-Plus 4_bed.stl", + "bed_texture": "X-Plus 4_bed.svg", "hotend_model": "X-Series_gen3_hotend.stl", - "default_materials": "Generic ABS @Qidi X-Plus 4 0.4 nozzle;Generic PLA @Qidi X-Plus 4 0.4 nozzle;QIDI ABS Odorless @Qidi X-Plus 4 0.4 nozzle;QIDI ABS Rapido @Qidi X-Plus 4 0.4 nozzle;QIDI PLA Rapido @Qidi X-Plus 4 0.4 nozzle;QIDI PLA Rapido Matte @Qidi X-Plus 4 0.4 nozzle;QIDI PLA-CF @Qidi X-Plus 4 0.4 nozzle;QIDI PLA Rapido Silk @Qidi X-Plus 4 0.4 nozzle;Generic PLA Silk @Qidi X-Plus 4 0.4 nozzle" + "default_materials": "Generic ABS @Qidi X-Plus 4 0.4 nozzle;Generic PLA @Qidi X-Plus 4 0.4 nozzle;QIDI ABS Odorless @Qidi X-Plus 4 0.4 nozzle;QIDI ABS Rapido @Qidi X-Plus 4 0.4 nozzle;QIDI PLA Rapido @Qidi X-Plus 4 0.4 nozzle;QIDI PLA Rapido Matte @Qidi X-Plus 4 0.4 nozzle;QIDI PLA-CF @Qidi X-Plus 4 0.4 nozzle;QIDI PLA Rapido Silk @Qidi X-Plus 4 0.4 nozzle;Generic PLA Silk @Qidi X-Plus 4 0.4 nozzle" } diff --git a/resources/profiles/X 4 Series/machine/fdm_machine_x_common.json b/resources/profiles/X 4 Series/machine/fdm_machine_x_common.json index 79b81de..5482d23 100644 --- a/resources/profiles/X 4 Series/machine/fdm_machine_x_common.json +++ b/resources/profiles/X 4 Series/machine/fdm_machine_x_common.json @@ -8,7 +8,7 @@ "before_layer_change_gcode": "", "change_filament_gcode": "", "default_print_profile": "0.20mm Standard @XPlus4", - "deretraction_speed": ["40"], + "deretraction_speed": ["30"], "extruder_clearance_height_to_lid": "140", "extruder_clearance_height_to_rod": "36", "extruder_clearance_radius": "65", @@ -16,10 +16,11 @@ "extruder_offset": ["0x0"], "gcode_flavor": "klipper", "layer_change_gcode": "G92 E0\nSET_PRINT_STATS_INFO CURRENT_LAYER={layer_num + 1}", - "machine_end_gcode": "M141 S0\nM104 S0\nM140 S0\nG1 E-3 F1800\nG0 Z{max_layer_z + 3} F600\nG0 Y290 F12000\nG0 X90 F12000\n{if max_layer_z < max_print_height / 2}G1 Z{max_print_height / 2 + 10} F600{else}G1 Z{min(max_print_height, max_layer_z + 3)}{endif}", + "machine_end_gcode": "M141 S0\nM104 S0\nM140 S0\nG1 E-3 F1800\nG0 Z{max_layer_z + 3} F600\nG0 Y290 F12000\nG0 X90 F12000\n{if max_layer_z < max_print_height / 2}G1 Z{max_print_height / 2 + 10} F600{else}G1 Z{min(max_print_height, max_layer_z + 3)}{endif}", "machine_max_acceleration_e": ["5000"], - "machine_max_acceleration_extruding": ["20000"], - "machine_max_acceleration_retracting": ["20000"], + "machine_max_acceleration_extruding": ["20000", "20000"], + "machine_max_acceleration_retracting": ["5000", "5000"], + "machine_max_acceleration_travel": ["9000", "9000"], "machine_max_acceleration_x": ["20000"], "machine_max_acceleration_y": ["20000"], "machine_max_acceleration_z": ["500"], @@ -31,31 +32,32 @@ "machine_max_speed_x": ["600"], "machine_max_speed_y": ["600"], "machine_max_speed_z": ["20"], - "machine_min_extruding_rate": ["0"], - "machine_min_travel_rate": ["0"], - "machine_pause_gcode": "M0", + "machine_min_extruding_rate": ["0", "0"], + "machine_min_travel_rate": ["0", "0"], + "machine_pause_gcode": "M0", "machine_start_gcode": "PRINT_START BED=[bed_temperature_initial_layer_single] HOTEND=[nozzle_temperature_initial_layer] CHAMBER=[chamber_temperatures]\nSET_PRINT_STATS_INFO TOTAL_LAYER=[total_layer_count]\nM83\nM140 S[bed_temperature_initial_layer_single]\nM104 S[nozzle_temperature_initial_layer]\nM141 S[chamber_temperatures]\nG4 P3000\nT[initial_tool]\nG0 X{max((min(print_bed_max[0] - 12, first_layer_print_min[0] + 80) - 85), 0)} Y{max((min(print_bed_max[1] - 3, first_layer_print_min[1] + 80) - 85), 0)} Z5 F6000\nG0 Z[initial_layer_print_height] F600\nG1 E3 F1800\nG1 X{(min(print_bed_max[0] - 12, first_layer_print_min[0] + 80))} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1] - 3, first_layer_print_min[1] + 80) - 85), 0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0] - 12, first_layer_print_min[0] + 80) - 85), 0)} E{85 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1] - 3, first_layer_print_min[1] + 80) - 85), 0) + 85} E{83 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0] - 12, first_layer_print_min[0] + 80) - 85), 0) + 2} E{2 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 Y{max((min(print_bed_max[1] - 3, first_layer_print_min[1] + 80) - 85), 0) + 3} E{82 * 0.5 * initial_layer_print_height * nozzle_diameter[0]} F3000\nG1 X{max((min(print_bed_max[0] - 12, first_layer_print_min[0] + 80) - 85), 0) + 3} Z0\nG1 X{max((min(print_bed_max[0] - 12, first_layer_print_min[0] + 80) - 85), 0) + 6}\nG1 Z1 F600\nSET_PRINT_STATS_INFO CURRENT_LAYER=1", - "max_layer_height": ["0.32"], + "machine_switch_extruder_time": "0", + "max_layer_height": ["0.28"], "min_layer_height": ["0.08"], "nozzle_diameter": ["0.4"], - "nozzle_type": "hardened_steel", + "nozzle_type": ["stainless_steel"], "printable_height": "280", "printer_settings_id": "", "printer_structure": "corexy", "printer_variant": "0.4", "retract_before_wipe": ["0%"], "retract_length_toolchange": ["2"], - "retract_lift_below": ["279"], "retract_restart_extra_toolchange": ["0"], "retract_restart_extra": ["0"], "retract_when_changing_layer": ["1"], "retraction_length": ["0.8"], - "retraction_minimum_travel": ["2"], + "retraction_minimum_travel": ["1"], "retraction_speed": ["30"], - "scan_first_layer": "0", + "scan_first_layer": "0", "silent_mode": "0", "single_extruder_multi_material": "1", "support_air_filtration": ["1"], + "support_box_temp_control": "1", "support_chamber_temp_control": "1", "thumbnail_size": ["272x272/PNG","96x96/PNG"], "wipe": ["1"], diff --git a/resources/profiles/X 4 Series/process/0.06mm High Quality @XPlus4 0.2 nozzle.json b/resources/profiles/X 4 Series/process/0.06mm High Quality @XPlus4 0.2 nozzle.json index f360c93..65292a7 100644 --- a/resources/profiles/X 4 Series/process/0.06mm High Quality @XPlus4 0.2 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.06mm High Quality @XPlus4 0.2 nozzle.json @@ -5,30 +5,32 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", - "default_acceleration": "4000", + "default_acceleration": ["4000"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.06", "line_width": "0.22", - "outer_wall_acceleration": "2000", + "outer_wall_acceleration": ["2000"], "outer_wall_line_width": "0.22", - "outer_wall_speed": "60", + "outer_wall_speed": ["60"], "sparse_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.06", "support_line_width": "0.22", "support_top_z_distance": "0.06", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Plus 4 0.2 nozzle"] } diff --git a/resources/profiles/X 4 Series/process/0.06mm Standard @XPlus4 0.2 nozzle.json b/resources/profiles/X 4 Series/process/0.06mm Standard @XPlus4 0.2 nozzle.json index 6698e94..2f34c8b 100644 --- a/resources/profiles/X 4 Series/process/0.06mm Standard @XPlus4 0.2 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.06mm Standard @XPlus4 0.2 nozzle.json @@ -5,26 +5,28 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.06", "line_width": "0.22", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.06", "support_line_width": "0.22", "support_top_z_distance": "0.06", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Plus 4 0.2 nozzle"] } diff --git a/resources/profiles/X 4 Series/process/0.08mm Extra Fine @XPlus4.json b/resources/profiles/X 4 Series/process/0.08mm Extra Fine @XPlus4.json index 69d5d73..71bc44c 100644 --- a/resources/profiles/X 4 Series/process/0.08mm Extra Fine @XPlus4.json +++ b/resources/profiles/X 4 Series/process/0.08mm Extra Fine @XPlus4.json @@ -1,28 +1,29 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.08mm Extra Fine @XPlus4", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_common", + "type": "process", + "setting_id": "GP004", + "name": "0.08mm Extra Fine @XPlus4", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "7", "bottom_shell_layers": "7", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "gap_infill_speed": "350", + "gap_infill_speed": ["350"], "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "350", - "internal_solid_infill_speed": "350", + "inner_wall_speed": ["350"], + "internal_solid_infill_speed": ["350"], "ironing_flow": "8%", - "layer_height": "0.08", - "outer_wall_speed": "200", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "10", - "sparse_infill_speed": "450", + "layer_height": "0.08", + "outer_wall_speed": ["200"], + "overhang_1_4_speed": ["60"], + "overhang_2_4_speed": ["30"], + "overhang_3_4_speed": ["10"], + "sparse_infill_speed": ["450"], "support_bottom_z_distance": "0.08", "support_threshold_angle": "15", "support_top_z_distance": "0.08", + "top_color_penetration_layers": "9", "top_shell_layers": "9", "compatible_printers": ["X-Plus 4 0.4 nozzle"] } diff --git a/resources/profiles/X 4 Series/process/0.08mm High Quality @XPlus4 0.2 nozzle.json b/resources/profiles/X 4 Series/process/0.08mm High Quality @XPlus4 0.2 nozzle.json index 0278dd5..6e3dd1c 100644 --- a/resources/profiles/X 4 Series/process/0.08mm High Quality @XPlus4 0.2 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.08mm High Quality @XPlus4 0.2 nozzle.json @@ -5,30 +5,32 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", - "default_acceleration": "4000", + "default_acceleration": ["4000"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.08", "line_width": "0.22", - "outer_wall_acceleration": "2000", + "outer_wall_acceleration": ["2000"], "outer_wall_line_width": "0.22", - "outer_wall_speed": "60", + "outer_wall_speed": ["60"], "sparse_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.08", "support_line_width": "0.22", "support_top_z_distance": "0.08", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Plus 4 0.2 nozzle"] } diff --git a/resources/profiles/X 4 Series/process/0.08mm High Quality @XPlus4.json b/resources/profiles/X 4 Series/process/0.08mm High Quality @XPlus4.json index 0d45381..8a7ad6f 100644 --- a/resources/profiles/X 4 Series/process/0.08mm High Quality @XPlus4.json +++ b/resources/profiles/X 4 Series/process/0.08mm High Quality @XPlus4.json @@ -1,32 +1,31 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.08mm High Quality @XPlus4", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_common", + "type": "process", + "setting_id": "GP004", + "name": "0.08mm High Quality @XPlus4", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "7", "bottom_shell_layers": "7", "bridge_flow": "1", - "default_acceleration": "4000", + "default_acceleration": ["4000"], "elefant_foot_compensation": "0.15", - "gap_infill_speed": "210", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "120", - "internal_solid_infill_speed": "150", + "gap_infill_speed": ["210"], + "inner_wall_speed": ["120"], "ironing_flow": "8%", "layer_height": "0.08", - "outer_wall_acceleration": "2000", - "outer_wall_speed": "60", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "10", + "outer_wall_acceleration": ["2000"], + "outer_wall_speed": ["60"], + "overhang_1_4_speed": ["60"], + "overhang_2_4_speed": ["30"], + "overhang_3_4_speed": ["10"], "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "150", + "sparse_infill_speed": ["150"], "support_bottom_z_distance": "0.08", "support_threshold_angle": "15", "support_top_z_distance": "0.08", + "top_color_penetration_layers": "9", "top_shell_layers": "9", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Plus 4 0.4 nozzle"] } diff --git a/resources/profiles/X 4 Series/process/0.08mm Standard @XPlus4 0.2 nozzle.json b/resources/profiles/X 4 Series/process/0.08mm Standard @XPlus4 0.2 nozzle.json index fbae3c2..fb8393f 100644 --- a/resources/profiles/X 4 Series/process/0.08mm Standard @XPlus4 0.2 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.08mm Standard @XPlus4 0.2 nozzle.json @@ -5,26 +5,28 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.08", "line_width": "0.22", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.08", "support_line_width": "0.22", "support_top_z_distance": "0.08", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Plus 4 0.2 nozzle"] } diff --git a/resources/profiles/X 4 Series/process/0.10mm High Quality @XPlus4 0.2 nozzle.json b/resources/profiles/X 4 Series/process/0.10mm High Quality @XPlus4 0.2 nozzle.json index 3f50931..7f60838 100644 --- a/resources/profiles/X 4 Series/process/0.10mm High Quality @XPlus4 0.2 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.10mm High Quality @XPlus4 0.2 nozzle.json @@ -5,30 +5,32 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", - "default_acceleration": "4000", + "default_acceleration": ["4000"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.1", "line_width": "0.22", - "outer_wall_acceleration": "2000", + "outer_wall_acceleration": ["2000"], "outer_wall_line_width": "0.22", - "outer_wall_speed": "60", + "outer_wall_speed": ["60"], "sparse_infill_line_width": "0.22", "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.1", "support_line_width": "0.22", "support_top_z_distance": "0.1", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Plus 4 0.2 nozzle"] } diff --git a/resources/profiles/X 4 Series/process/0.10mm Standard @XPlus4 0.2 nozzle.json b/resources/profiles/X 4 Series/process/0.10mm Standard @XPlus4 0.2 nozzle.json index cf3358f..5950818 100644 --- a/resources/profiles/X 4 Series/process/0.10mm Standard @XPlus4 0.2 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.10mm Standard @XPlus4 0.2 nozzle.json @@ -5,26 +5,28 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.1", "line_width": "0.22", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.1", "support_line_width": "0.22", "support_top_z_distance": "0.1", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Plus 4 0.2 nozzle"] } diff --git a/resources/profiles/X 4 Series/process/0.12mm Fine @XPlus4.json b/resources/profiles/X 4 Series/process/0.12mm Fine @XPlus4.json index ace9a0a..16e8276 100644 --- a/resources/profiles/X 4 Series/process/0.12mm Fine @XPlus4.json +++ b/resources/profiles/X 4 Series/process/0.12mm Fine @XPlus4.json @@ -1,27 +1,27 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.12mm Fine @XPlus4", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_common", + "type": "process", + "setting_id": "GP004", + "name": "0.12mm Fine @XPlus4", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "gap_infill_speed": "350", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "350", - "internal_solid_infill_speed": "350", - "layer_height": "0.12", - "outer_wall_speed": "200", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "10", - "sparse_infill_speed": "430", + "gap_infill_speed": ["350"], + "inner_wall_speed": ["350"], + "internal_solid_infill_speed": ["350"], + "layer_height": "0.12", + "outer_wall_speed": ["200"], + "overhang_1_4_speed": ["60"], + "overhang_2_4_speed": ["30"], + "overhang_3_4_speed": ["10"], + "sparse_infill_speed": ["430"], "support_bottom_z_distance": "0.12", "support_threshold_angle": "20", "support_top_z_distance": "0.12", + "top_color_penetration_layers": "5", "top_shell_layers": "5", "top_shell_thickness": "0.6", "compatible_printers": ["X-Plus 4 0.4 nozzle"] diff --git a/resources/profiles/X 4 Series/process/0.12mm High Quality @XPlus4.json b/resources/profiles/X 4 Series/process/0.12mm High Quality @XPlus4.json index 2cfc8e9..274d8dd 100644 --- a/resources/profiles/X 4 Series/process/0.12mm High Quality @XPlus4.json +++ b/resources/profiles/X 4 Series/process/0.12mm High Quality @XPlus4.json @@ -1,32 +1,31 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.12mm High Quality @XPlus4", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_common", + "type": "process", + "setting_id": "GP004", + "name": "0.12mm High Quality @XPlus4", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", - "default_acceleration": "4000", + "default_acceleration": ["4000"], "elefant_foot_compensation": "0.15", - "gap_infill_speed": "230", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "150", - "internal_solid_infill_speed": "180", + "gap_infill_speed": ["230"], + "internal_solid_infill_speed": ["180"], "layer_height": "0.12", - "outer_wall_acceleration": "2000", - "outer_wall_speed": "60", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "10", + "outer_wall_acceleration": ["2000"], + "outer_wall_speed": ["60"], + "overhang_1_4_speed": ["60"], + "overhang_2_4_speed": ["30"], + "overhang_3_4_speed": ["10"], "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "180", + "sparse_infill_speed": ["180"], "support_bottom_z_distance": "0.12", "support_threshold_angle": "20", "support_top_z_distance": "0.12", + "top_color_penetration_layers": "5", "top_shell_layers": "5", "top_shell_thickness": "0.6", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Plus 4 0.4 nozzle"] } diff --git a/resources/profiles/X 4 Series/process/0.12mm Standard @XPlus4 0.2 nozzle.json b/resources/profiles/X 4 Series/process/0.12mm Standard @XPlus4 0.2 nozzle.json index 2dc05f3..14e9ef3 100644 --- a/resources/profiles/X 4 Series/process/0.12mm Standard @XPlus4 0.2 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.12mm Standard @XPlus4 0.2 nozzle.json @@ -5,26 +5,28 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.12", "line_width": "0.22", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.12", "support_line_width": "0.22", "support_top_z_distance": "0.12", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Plus 4 0.2 nozzle"] } diff --git a/resources/profiles/X 4 Series/process/0.14mm Standard @XPlus4 0.2 nozzle.json b/resources/profiles/X 4 Series/process/0.14mm Standard @XPlus4 0.2 nozzle.json index 9c2d592..2608452 100644 --- a/resources/profiles/X 4 Series/process/0.14mm Standard @XPlus4 0.2 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.14mm Standard @XPlus4 0.2 nozzle.json @@ -5,26 +5,28 @@ "from": "system", "instantiation": "true", "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "5", "bottom_shell_layers": "5", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "70", + "initial_layer_infill_speed": ["70"], "initial_layer_line_width": "0.25", "initial_layer_print_height": "0.1", - "initial_layer_speed": "40", + "initial_layer_speed": ["40"], "inner_wall_line_width": "0.22", "internal_solid_infill_line_width": "0.22", "layer_height": "0.14", "line_width": "0.22", "outer_wall_line_width": "0.22", "sparse_infill_line_width": "0.22", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.14", "support_line_width": "0.22", "support_top_z_distance": "0.14", + "top_color_penetration_layers": "7", "top_shell_layers": "7", "top_surface_line_width": "0.22", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Plus 4 0.2 nozzle"] } diff --git a/resources/profiles/X 4 Series/process/0.16mm High Quality @XPlus4.json b/resources/profiles/X 4 Series/process/0.16mm High Quality @XPlus4.json index e28cdc3..0760197 100644 --- a/resources/profiles/X 4 Series/process/0.16mm High Quality @XPlus4.json +++ b/resources/profiles/X 4 Series/process/0.16mm High Quality @XPlus4.json @@ -2,31 +2,30 @@ "type": "process", "setting_id": "GP004", "name": "0.16mm High Quality @XPlus4", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_common", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "4", "bottom_shell_layers": "4", "bridge_flow": "1", - "default_acceleration": "4000", + "default_acceleration": ["4000"], "elefant_foot_compensation": "0.15", - "gap_infill_speed": "250", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "150", - "internal_solid_infill_speed": "200", + "gap_infill_speed": ["250"], + "internal_solid_infill_speed": ["200"], "layer_height": "0.16", - "outer_wall_acceleration": "2000", - "outer_wall_speed": "60", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "10", + "outer_wall_acceleration": ["2000"], + "outer_wall_speed": ["60"], + "overhang_1_4_speed": ["60"], + "overhang_2_4_speed": ["30"], + "overhang_3_4_speed": ["10"], "sparse_infill_pattern": "gyroid", - "sparse_infill_speed": "200", + "sparse_infill_speed": ["200"], "support_bottom_z_distance": "0.16", "support_threshold_angle": "25", "support_top_z_distance": "0.16", + "top_color_penetration_layers": "6", "top_shell_layers": "6", "top_shell_thickness": "1.0", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Plus 4 0.4 nozzle"] } diff --git a/resources/profiles/X 4 Series/process/0.16mm Optimal @XPlus4.json b/resources/profiles/X 4 Series/process/0.16mm Optimal @XPlus4.json index 3e26ebe..d721309 100644 --- a/resources/profiles/X 4 Series/process/0.16mm Optimal @XPlus4.json +++ b/resources/profiles/X 4 Series/process/0.16mm Optimal @XPlus4.json @@ -2,26 +2,26 @@ "type": "process", "setting_id": "GP004", "name": "0.16mm Optimal @XPlus4", - "from": "system", - "instantiation": "true", - "inherits": "fdm_process_common", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_common", + "bottom_color_penetration_layers": "4", "bottom_shell_layers": "4", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "gap_infill_speed": "300", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "300", - "internal_solid_infill_speed": "300", + "gap_infill_speed": ["300"], + "inner_wall_speed": ["300"], + "internal_solid_infill_speed": ["300"], "layer_height": "0.16", - "outer_wall_speed": "200", - "overhang_1_4_speed": "60", - "overhang_2_4_speed": "30", - "overhang_3_4_speed": "10", - "sparse_infill_speed": "330", + "outer_wall_speed": ["200"], + "overhang_1_4_speed": ["60"], + "overhang_2_4_speed": ["30"], + "overhang_3_4_speed": ["10"], + "sparse_infill_speed": ["330"], "support_bottom_z_distance": "0.16", "support_threshold_angle": "25", "support_top_z_distance": "0.16", + "top_color_penetration_layers": "6", "top_shell_layers": "6", "top_shell_thickness": "1.0", "compatible_printers": ["X-Plus 4 0.4 nozzle"] diff --git a/resources/profiles/X 4 Series/process/0.18mm Standard @XPlus4 0.6 nozzle.json b/resources/profiles/X 4 Series/process/0.18mm Standard @XPlus4 0.6 nozzle.json index b5cadc8..36d5e3c 100644 --- a/resources/profiles/X 4 Series/process/0.18mm Standard @XPlus4 0.6 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.18mm Standard @XPlus4 0.6 nozzle.json @@ -6,24 +6,24 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.62", "internal_solid_infill_line_width": "0.62", "layer_height": "0.18", "line_width": "0.62", "outer_wall_line_width": "0.62", - "overhang_3_4_speed": "15", + "overhang_3_4_speed": ["15"], "sparse_infill_line_width": "0.62", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_bottom_z_distance": "0.18", "support_line_width": "0.62", "support_top_z_distance": "0.18", "top_surface_line_width": "0.62", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Plus 4 0.6 nozzle"] } diff --git a/resources/profiles/X 4 Series/process/0.20mm Standard @XPlus4.json b/resources/profiles/X 4 Series/process/0.20mm Standard @XPlus4.json index 1dc2586..50c5bbd 100644 --- a/resources/profiles/X 4 Series/process/0.20mm Standard @XPlus4.json +++ b/resources/profiles/X 4 Series/process/0.20mm Standard @XPlus4.json @@ -1,20 +1,18 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.20mm Standard @XPlus4", - "from": "system", - "inherits": "fdm_process_common", - "instantiation": "true", + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Standard @XPlus4", + "from": "system", + "inherits": "fdm_process_common", + "instantiation": "true", "bridge_flow": "1", - "elefant_foot_compensation": "0.15", - "gap_infill_speed": "250", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "300", - "internal_solid_infill_speed": "250", - "outer_wall_speed": "200", - "sparse_infill_speed": "270", + "elefant_foot_compensation": "0.15", + "gap_infill_speed": ["250"], + "inner_wall_speed": ["300"], + "internal_solid_infill_speed": ["250"], + "outer_wall_speed": ["200"], + "top_color_penetration_layers": "5", "top_shell_layers": "5", "top_shell_thickness": "1.0", - "compatible_printers": ["X-Plus 4 0.4 nozzle"] + "compatible_printers": ["X-Plus 4 0.4 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/X 4 Series/process/0.20mm Strength @XPlus4.json b/resources/profiles/X 4 Series/process/0.20mm Strength @XPlus4.json index 2e27921..e3fd843 100644 --- a/resources/profiles/X 4 Series/process/0.20mm Strength @XPlus4.json +++ b/resources/profiles/X 4 Series/process/0.20mm Strength @XPlus4.json @@ -1,22 +1,20 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.20mm Strength @XPlus4", - "from": "system", - "inherits": "fdm_process_common", - "instantiation": "true", + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Strength @XPlus4", + "from": "system", + "inherits": "fdm_process_common", + "instantiation": "true", "bridge_flow": "1", - "elefant_foot_compensation": "0.15", - "gap_infill_speed": "250", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "300", - "internal_solid_infill_speed": "250", - "outer_wall_speed": "60", + "elefant_foot_compensation": "0.15", + "gap_infill_speed": ["250"], + "inner_wall_speed": ["300"], + "internal_solid_infill_speed": ["250"], + "outer_wall_speed": ["60"], "sparse_infill_density": "25%", - "sparse_infill_speed": "270", + "top_color_penetration_layers": "5", "top_shell_layers": "5", "top_shell_thickness": "1.0", "wall_loops": "6", - "compatible_printers": ["X-Plus 4 0.4 nozzle"] + "compatible_printers": ["X-Plus 4 0.4 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/X 4 Series/process/0.24mm Draft @XPlus4.json b/resources/profiles/X 4 Series/process/0.24mm Draft @XPlus4.json index 198e64c..afa6bb5 100644 --- a/resources/profiles/X 4 Series/process/0.24mm Draft @XPlus4.json +++ b/resources/profiles/X 4 Series/process/0.24mm Draft @XPlus4.json @@ -1,23 +1,22 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.24mm Draft @XPlus4", - "from": "system", - "inherits": "fdm_process_common", - "instantiation": "true", + "type": "process", + "setting_id": "GP004", + "name": "0.24mm Draft @XPlus4", + "from": "system", + "inherits": "fdm_process_common", + "instantiation": "true", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "gap_infill_speed": "230", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "230", - "internal_solid_infill_speed": "230", - "layer_height": "0.24", - "outer_wall_speed": "200", - "sparse_infill_speed": "230", + "gap_infill_speed": ["230"], + "inner_wall_speed": ["230"], + "internal_solid_infill_speed": ["230"], + "layer_height": "0.24", + "outer_wall_speed": ["200"], + "sparse_infill_speed": ["230"], "support_threshold_angle": "35", + "top_color_penetration_layers": "4", "top_shell_layers": "4", "top_shell_thickness": "1.0", "top_surface_line_width": "0.45", - "compatible_printers": ["X-Plus 4 0.4 nozzle"] + "compatible_printers": ["X-Plus 4 0.4 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/X 4 Series/process/0.24mm Standard @XPlus4 0.6 nozzle.json b/resources/profiles/X 4 Series/process/0.24mm Standard @XPlus4 0.6 nozzle.json index 83eeefa..d24d603 100644 --- a/resources/profiles/X 4 Series/process/0.24mm Standard @XPlus4 0.6 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.24mm Standard @XPlus4 0.6 nozzle.json @@ -6,22 +6,22 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.62", "internal_solid_infill_line_width": "0.62", "layer_height": "0.24", "line_width": "0.62", "outer_wall_line_width": "0.62", - "overhang_3_4_speed": "15", + "overhang_3_4_speed": ["15"], "sparse_infill_line_width": "0.62", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.62", "top_surface_line_width": "0.62", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Plus 4 0.6 nozzle"] } diff --git a/resources/profiles/X 4 Series/process/0.24mm Standard @XPlus4 0.8 nozzle.json b/resources/profiles/X 4 Series/process/0.24mm Standard @XPlus4 0.8 nozzle.json index 05ce214..f17966f 100644 --- a/resources/profiles/X 4 Series/process/0.24mm Standard @XPlus4 0.8 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.24mm Standard @XPlus4 0.8 nozzle.json @@ -7,32 +7,26 @@ "inherits": "fdm_process_common", "bottom_shell_layers": "3", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "gap_infill_speed": "50", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.82", - "inner_wall_speed": "150", "internal_solid_infill_line_width": "0.82", - "internal_solid_infill_speed": "150", "layer_height": "0.24", "line_width": "0.82", "outer_wall_line_width": "0.82", - "outer_wall_speed": "120", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "50", - "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5", + "overhang_3_4_speed": ["25"], + "overhang_4_4_speed": ["5"], "sparse_infill_line_width": "0.82", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.82", "top_shell_layers": "3", "top_surface_line_width": "0.82", "top_surface_pattern": "monotonic", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "2", "compatible_printers": ["X-Plus 4 0.8 nozzle"] } diff --git a/resources/profiles/X 4 Series/process/0.28mm Extra Draft @XPlus4.json b/resources/profiles/X 4 Series/process/0.28mm Extra Draft @XPlus4.json index e5ec9e2..18a1fea 100644 --- a/resources/profiles/X 4 Series/process/0.28mm Extra Draft @XPlus4.json +++ b/resources/profiles/X 4 Series/process/0.28mm Extra Draft @XPlus4.json @@ -1,23 +1,22 @@ { - "type": "process", - "setting_id": "GP004", - "name": "0.28mm Extra Draft @XPlus4", - "from": "system", - "inherits": "fdm_process_common", - "instantiation": "true", + "type": "process", + "setting_id": "GP004", + "name": "0.28mm Extra Draft @XPlus4", + "from": "system", + "inherits": "fdm_process_common", + "instantiation": "true", "bridge_flow": "1", "elefant_foot_compensation": "0.15", - "gap_infill_speed": "200", - "initial_layer_infill_speed": "105", - "initial_layer_speed": "50", - "inner_wall_speed": "200", - "internal_solid_infill_speed": "200", - "layer_height": "0.28", - "outer_wall_speed": "200", - "sparse_infill_speed": "200", + "gap_infill_speed": ["200"], + "inner_wall_speed": ["200"], + "internal_solid_infill_speed": ["200"], + "layer_height": "0.28", + "outer_wall_speed": ["200"], + "sparse_infill_speed": ["200"], "support_threshold_angle": "40", + "top_color_penetration_layers": "4", "top_shell_layers": "4", "top_shell_thickness": "1.0", "top_surface_line_width": "0.45", - "compatible_printers": ["X-Plus 4 0.4 nozzle"] + "compatible_printers": ["X-Plus 4 0.4 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/X 4 Series/process/0.30mm Standard @XPlus4 0.6 nozzle.json b/resources/profiles/X 4 Series/process/0.30mm Standard @XPlus4 0.6 nozzle.json index 8fe1f72..685d9b4 100644 --- a/resources/profiles/X 4 Series/process/0.30mm Standard @XPlus4 0.6 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.30mm Standard @XPlus4 0.6 nozzle.json @@ -6,22 +6,22 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.62", "internal_solid_infill_line_width": "0.62", "layer_height": "0.3", "line_width": "0.62", "outer_wall_line_width": "0.62", - "overhang_3_4_speed": "15", + "overhang_3_4_speed": ["15"], "sparse_infill_line_width": "0.62", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.62", "top_surface_line_width": "0.62", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Plus 4 0.6 nozzle"] } diff --git a/resources/profiles/X 4 Series/process/0.30mm Strength @XPlus4 0.6 nozzle.json b/resources/profiles/X 4 Series/process/0.30mm Strength @XPlus4 0.6 nozzle.json index 7d7659a..26c229b 100644 --- a/resources/profiles/X 4 Series/process/0.30mm Strength @XPlus4 0.6 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.30mm Strength @XPlus4 0.6 nozzle.json @@ -6,24 +6,24 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.62", "internal_solid_infill_line_width": "0.62", "layer_height": "0.3", "line_width": "0.62", "outer_wall_line_width": "0.62", - "overhang_3_4_speed": "15", + "overhang_3_4_speed": ["15"], "sparse_infill_density": "25%", "sparse_infill_line_width": "0.62", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.62", "top_surface_line_width": "0.62", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "wall_loops": "4", "compatible_printers": ["X-Plus 4 0.6 nozzle"] } diff --git a/resources/profiles/X 4 Series/process/0.32mm Standard @XPlus4 0.8 nozzle.json b/resources/profiles/X 4 Series/process/0.32mm Standard @XPlus4 0.8 nozzle.json index 5675106..dc66e19 100644 --- a/resources/profiles/X 4 Series/process/0.32mm Standard @XPlus4 0.8 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.32mm Standard @XPlus4 0.8 nozzle.json @@ -6,24 +6,24 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.82", "internal_solid_infill_line_width": "0.82", "layer_height": "0.32", "line_width": "0.82", "outer_wall_line_width": "0.82", - "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5", + "overhang_3_4_speed": ["25"], + "overhang_4_4_speed": ["5"], "sparse_infill_line_width": "0.82", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.82", "top_surface_line_width": "0.82", "top_surface_pattern": "monotonic", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Plus 4 0.8 nozzle"] } diff --git a/resources/profiles/X 4 Series/process/0.36mm Standard @XPlus4 0.6 nozzle.json b/resources/profiles/X 4 Series/process/0.36mm Standard @XPlus4 0.6 nozzle.json index 11880e3..8d5d448 100644 --- a/resources/profiles/X 4 Series/process/0.36mm Standard @XPlus4 0.6 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.36mm Standard @XPlus4 0.6 nozzle.json @@ -6,22 +6,22 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.62", "internal_solid_infill_line_width": "0.62", "layer_height": "0.36", "line_width": "0.62", "outer_wall_line_width": "0.62", - "overhang_3_4_speed": "15", + "overhang_3_4_speed": ["15"], "sparse_infill_line_width": "0.62", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.62", "top_surface_line_width": "0.62", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Plus 4 0.6 nozzle"] } diff --git a/resources/profiles/X 4 Series/process/0.40mm Standard @XPlus4 0.8 nozzle.json b/resources/profiles/X 4 Series/process/0.40mm Standard @XPlus4 0.8 nozzle.json index 62e1704..32a712d 100644 --- a/resources/profiles/X 4 Series/process/0.40mm Standard @XPlus4 0.8 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.40mm Standard @XPlus4 0.8 nozzle.json @@ -6,24 +6,24 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.82", "internal_solid_infill_line_width": "0.82", "layer_height": "0.4", "line_width": "0.82", "outer_wall_line_width": "0.82", - "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5", + "overhang_3_4_speed": ["25"], + "overhang_4_4_speed": ["5"], "sparse_infill_line_width": "0.82", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.82", "top_surface_line_width": "0.82", "top_surface_pattern": "monotonic", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Plus 4 0.8 nozzle"] } diff --git a/resources/profiles/X 4 Series/process/0.42mm Standard @XPlus4 0.6 nozzle.json b/resources/profiles/X 4 Series/process/0.42mm Standard @XPlus4 0.6 nozzle.json index 1da9e44..d7b57f6 100644 --- a/resources/profiles/X 4 Series/process/0.42mm Standard @XPlus4 0.6 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.42mm Standard @XPlus4 0.6 nozzle.json @@ -6,22 +6,22 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.62", "initial_layer_print_height": "0.3", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.62", "internal_solid_infill_line_width": "0.62", "layer_height": "0.42", "line_width": "0.62", "outer_wall_line_width": "0.62", - "overhang_3_4_speed": "15", + "overhang_3_4_speed": ["15"], "sparse_infill_line_width": "0.62", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.62", "top_surface_line_width": "0.62", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Plus 4 0.6 nozzle"] } \ No newline at end of file diff --git a/resources/profiles/X 4 Series/process/0.48mm Standard @XPlus4 0.8 nozzle.json b/resources/profiles/X 4 Series/process/0.48mm Standard @XPlus4 0.8 nozzle.json index 75e59da..fda4821 100644 --- a/resources/profiles/X 4 Series/process/0.48mm Standard @XPlus4 0.8 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.48mm Standard @XPlus4 0.8 nozzle.json @@ -6,24 +6,24 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.82", "internal_solid_infill_line_width": "0.82", "layer_height": "0.48", "line_width": "0.82", "outer_wall_line_width": "0.82", - "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5", + "overhang_3_4_speed": ["25"], + "overhang_4_4_speed": ["5"], "sparse_infill_line_width": "0.82", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.82", "top_surface_line_width": "0.82", "top_surface_pattern": "monotonic", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Plus 4 0.8 nozzle"] } diff --git a/resources/profiles/X 4 Series/process/0.56mm Standard @XPlus4 0.8 nozzle.json b/resources/profiles/X 4 Series/process/0.56mm Standard @XPlus4 0.8 nozzle.json index b0e518b..9ee307b 100644 --- a/resources/profiles/X 4 Series/process/0.56mm Standard @XPlus4 0.8 nozzle.json +++ b/resources/profiles/X 4 Series/process/0.56mm Standard @XPlus4 0.8 nozzle.json @@ -6,24 +6,24 @@ "instantiation": "true", "inherits": "fdm_process_common", "bridge_flow": "1", - "bridge_speed": "30", + "bridge_speed": ["30"], "elefant_foot_compensation": "0.15", - "initial_layer_infill_speed": "55", + "initial_layer_infill_speed": ["55"], "initial_layer_line_width": "0.82", "initial_layer_print_height": "0.4", - "initial_layer_speed": "35", + "initial_layer_speed": ["35"], "inner_wall_line_width": "0.82", "internal_solid_infill_line_width": "0.82", "layer_height": "0.56", "line_width": "0.82", "outer_wall_line_width": "0.82", - "overhang_3_4_speed": "25", - "overhang_4_4_speed": "5", + "overhang_3_4_speed": ["25"], + "overhang_4_4_speed": ["5"], "sparse_infill_line_width": "0.82", - "sparse_infill_speed": "100", + "sparse_infill_speed": ["100"], "support_line_width": "0.82", "top_surface_line_width": "0.82", "top_surface_pattern": "monotonic", - "top_surface_speed": "150", + "top_surface_speed": ["150"], "compatible_printers": ["X-Plus 4 0.8 nozzle"] } diff --git a/resources/profiles/X 4 Series/process/fdm_process_common.json b/resources/profiles/X 4 Series/process/fdm_process_common.json index 8ce096d..fec40dd 100644 --- a/resources/profiles/X 4 Series/process/fdm_process_common.json +++ b/resources/profiles/X 4 Series/process/fdm_process_common.json @@ -4,40 +4,44 @@ "from": "system", "instantiation": "false", "adaptive_layer_height": "0", + "bottom_color_penetration_layers": "3", "bottom_shell_layers": "3", "bottom_shell_thickness": "0", "bottom_surface_pattern": "monotonic", "bridge_flow": "0.95", "bridge_no_support": "0", - "bridge_speed": "50", + "bridge_speed": ["50"], "brim_object_gap": "0.1", "brim_width": "5", "compatible_printers_condition": "", - "default_acceleration": "10000", + "default_acceleration": ["10000"], + "detect_floating_vertical_shell": "1", "detect_overhang_wall": "1", "detect_thin_wall": "0", "draft_shield": "disabled", "elefant_foot_compensation": "0", "enable_arc_fitting": "1", + "enable_overhang_speed": ["1"], "enable_prime_tower": "1", "enable_support": "0", "filename_format": "{input_filename_base}.gcode", - "gap_infill_speed": "50", + "gap_infill_speed": ["50"], "infill_combination": "0", "infill_direction": "45", "infill_wall_overlap": "15%", - "initial_layer_acceleration": "500", - "initial_layer_infill_speed": "60", + "initial_layer_acceleration": ["500"], + "initial_layer_infill_speed": ["105"], "initial_layer_line_width": "0.5", "initial_layer_print_height": "0.2", - "initial_layer_speed": "30", - "inner_wall_acceleration": "5000", + "initial_layer_speed": ["50"], + "initial_layer_travel_acceleration": ["6000"], + "inner_wall_acceleration": ["5000"], "inner_wall_line_width": "0.45", - "inner_wall_speed": "150", + "inner_wall_speed": ["150"], "interface_shells": "0", "internal_bridge_support_thickness": "0.8", "internal_solid_infill_line_width": "0.42", - "internal_solid_infill_speed": "150", + "internal_solid_infill_speed": ["150"], "ironing_flow": "10%", "ironing_spacing": "0.15", "ironing_speed": "30", @@ -47,14 +51,14 @@ "max_travel_detour_distance": "0", "minimum_sparse_infill_area": "15", "only_one_wall_top": "1", - "outer_wall_acceleration": "3000", + "outer_wall_acceleration": ["3000"], "outer_wall_line_width": "0.42", - "outer_wall_speed": "120", - "overhang_1_4_speed": "0", - "overhang_2_4_speed": "50", - "overhang_3_4_speed": "30", - "overhang_4_4_speed": "10", - "overhang_totally_speed": "24", + "outer_wall_speed": ["120"], + "overhang_1_4_speed": ["0"], + "overhang_2_4_speed": ["50"], + "overhang_3_4_speed": ["30"], + "overhang_4_4_speed": ["10"], + "overhang_totally_speed": ["10"], "prime_tower_width": "35", "print_sequence": "by layer", "print_settings_id": "", @@ -66,13 +70,14 @@ "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", - "small_perimeter_threshold": "4", + "small_perimeter_speed": ["50%"], + "small_perimeter_threshold": ["4"], "smooth_coefficient": "90", "smooth_speed_discontinuity_area": "1", "sparse_infill_density": "15%", "sparse_infill_line_width": "0.45", "sparse_infill_pattern": "grid", - "sparse_infill_speed": "250", + "sparse_infill_speed": ["270"], "spiral_mode": "0", "standby_temperature_delta": "-5", "support_base_pattern_spacing": "2.5", @@ -85,26 +90,29 @@ "support_interface_loop_pattern": "0", "support_interface_pattern": "auto", "support_interface_spacing": "0.5", - "support_interface_speed": "80", + "support_interface_speed": ["80"], "support_interface_top_layers": "2", "support_line_width": "0.42", "support_object_xy_distance": "0.35", "support_on_build_plate_only": "0", - "support_speed": "150", + "support_speed": ["150"], "support_style": "default", "support_threshold_angle": "30", "support_top_z_distance": "0.2", - "support_type": "normal(auto)", + "support_type": "tree(auto)", + "top_color_penetration_layers": "3", "top_shell_layers": "3", "top_shell_thickness": "0.8", - "top_surface_acceleration": "2000", + "top_surface_acceleration": ["2000"], "top_surface_line_width": "0.42", "top_surface_pattern": "monotonicline", - "top_surface_speed": "200", - "travel_speed": "500", + "top_surface_speed": ["200"], + "travel_acceleration": ["10000"], + "travel_speed": ["500"], "tree_support_branch_angle": "45", "tree_support_branch_diameter": "2", "tree_support_wall_count": "0", + "vertical_shell_speed": ["80%"], "wall_generator": "classic", "wall_infill_order": "inner wall/outer wall/infill", "wall_loops": "2", diff --git a/resources/shaders/options_110.fs b/resources/shaders/110/background.fs similarity index 95% rename from resources/shaders/options_110.fs rename to resources/shaders/110/background.fs index ab65699..1f86a2b 100644 --- a/resources/shaders/options_110.fs +++ b/resources/shaders/110/background.fs @@ -1,8 +1,6 @@ #version 110 - uniform vec4 uniform_color; - void main() { gl_FragColor = uniform_color; -} +} \ No newline at end of file diff --git a/resources/shaders/110/background.vs b/resources/shaders/110/background.vs new file mode 100644 index 0000000..f30460d --- /dev/null +++ b/resources/shaders/110/background.vs @@ -0,0 +1,8 @@ +#version 110 + +attribute vec3 v_position; + +void main() +{ + gl_Position = vec4(v_position, 1.0); +} \ No newline at end of file diff --git a/resources/shaders/110/flat_instance.vs b/resources/shaders/110/flat_instance.vs index e0662e9..6655da5 100644 --- a/resources/shaders/110/flat_instance.vs +++ b/resources/shaders/110/flat_instance.vs @@ -4,9 +4,15 @@ uniform mat4 view_matrix; uniform mat4 projection_matrix; attribute vec3 v_position; -attribute vec2 v_undefine; -attribute mat4 instanceMatrix; +// per instance data +// in mat4 instanceMatrix; +attribute vec4 i_data0; +attribute vec4 i_data1; +attribute vec4 i_data2; +attribute vec4 i_data3; +// end per instance data void main() { - gl_Position = projection_matrix * view_matrix * instanceMatrix * vec4(v_position, 1.0); + mat4 model_matrix = mat4(i_data0, i_data1, i_data2, i_data3); + gl_Position = projection_matrix * view_matrix * model_matrix * vec4(v_position, 1.0); } diff --git a/resources/shaders/110/flat_texture.fs b/resources/shaders/110/flat_texture.fs new file mode 100644 index 0000000..d4676d7 --- /dev/null +++ b/resources/shaders/110/flat_texture.fs @@ -0,0 +1,10 @@ +#version 110 + +uniform sampler2D u_texture; + +varying vec2 v_texcoord; + +void main() +{ + gl_FragColor = texture2D(u_texture, v_texcoord); +} diff --git a/resources/shaders/110/flat_texture.vs b/resources/shaders/110/flat_texture.vs new file mode 100644 index 0000000..40b7c14 --- /dev/null +++ b/resources/shaders/110/flat_texture.vs @@ -0,0 +1,16 @@ +#version 110 + +attribute vec3 v_position; +attribute vec2 v_tex_coord; + +uniform mat4 view_model_matrix; +uniform mat4 projection_matrix; +uniform mat3 u_uvTransformMatrix; + +varying vec2 v_texcoord; + +void main() +{ + v_texcoord = (u_uvTransformMatrix * vec3(v_tex_coord, 1.0)).xy; + gl_Position = projection_matrix * view_model_matrix * vec4(v_position, 1.0); +} \ No newline at end of file diff --git a/resources/shaders/110/fxaa.fs b/resources/shaders/110/fxaa.fs new file mode 100644 index 0000000..f718f20 --- /dev/null +++ b/resources/shaders/110/fxaa.fs @@ -0,0 +1,78 @@ +#version 110 + +uniform vec4 u_viewport_size; +uniform sampler2D u_sampler; + +varying vec2 tex_coords; + +// thanks https://github.com/mattdesl/glsl-fxaa +#ifndef FXAA_REDUCE_MIN + #define FXAA_REDUCE_MIN (1.0/ 128.0) +#endif +#ifndef FXAA_REDUCE_MUL + #define FXAA_REDUCE_MUL (1.0 / 8.0) +#endif +#ifndef FXAA_SPAN_MAX + #define FXAA_SPAN_MAX 8.0 +#endif + +vec4 fxaa(sampler2D tex, vec2 fragCoord, vec2 inv_resolution, + vec2 v_rgbNW, vec2 v_rgbNE, + vec2 v_rgbSW, vec2 v_rgbSE, + vec2 v_rgbM) { + vec4 color; + vec2 inverseVP = inv_resolution; + vec3 rgbNW = texture2D(tex, v_rgbNW).xyz; + vec3 rgbNE = texture2D(tex, v_rgbNE).xyz; + vec3 rgbSW = texture2D(tex, v_rgbSW).xyz; + vec3 rgbSE = texture2D(tex, v_rgbSE).xyz; + vec4 texColor = texture2D(tex, v_rgbM); + vec3 rgbM = texColor.xyz; + vec3 luma = vec3(0.299, 0.587, 0.114); + float lumaNW = dot(rgbNW, luma); + float lumaNE = dot(rgbNE, luma); + float lumaSW = dot(rgbSW, luma); + float lumaSE = dot(rgbSE, luma); + float lumaM = dot(rgbM, luma); + float lumaMin = min(lumaM, min(min(lumaNW, lumaNE), min(lumaSW, lumaSE))); + float lumaMax = max(lumaM, max(max(lumaNW, lumaNE), max(lumaSW, lumaSE))); + + vec2 dir; + dir.x = -((lumaNW + lumaNE) - (lumaSW + lumaSE)); + dir.y = ((lumaNW + lumaSW) - (lumaNE + lumaSE)); + + float dirReduce = max((lumaNW + lumaNE + lumaSW + lumaSE) * + (0.25 * FXAA_REDUCE_MUL), FXAA_REDUCE_MIN); + + float rcpDirMin = 1.0 / (min(abs(dir.x), abs(dir.y)) + dirReduce); + dir = min(vec2(FXAA_SPAN_MAX, FXAA_SPAN_MAX), + max(vec2(-FXAA_SPAN_MAX, -FXAA_SPAN_MAX), + dir * rcpDirMin)) * inverseVP; + + vec3 rgbA = 0.5 * ( + texture2D(tex, fragCoord * inverseVP + dir * (1.0 / 3.0 - 0.5)).xyz + + texture2D(tex, fragCoord * inverseVP + dir * (2.0 / 3.0 - 0.5)).xyz); + vec3 rgbB = rgbA * 0.5 + 0.25 * ( + texture2D(tex, fragCoord * inverseVP + dir * -0.5).xyz + + texture2D(tex, fragCoord * inverseVP + dir * 0.5).xyz); + + float lumaB = dot(rgbB, luma); + if ((lumaB < lumaMin) || (lumaB > lumaMax)) + color = vec4(rgbA, texColor.a); + else + color = vec4(rgbB, texColor.a); + return color; +} + +void main() +{ + vec2 fragCoord = tex_coords * u_viewport_size.xy; + vec2 add = u_viewport_size.zw; + + vec2 rgbNW = tex_coords+vec2(-add.x, -add.y); + vec2 rgbNE = tex_coords+vec2( add.x, -add.y); + vec2 rgbSW = tex_coords+vec2(-add.x, add.y); + vec2 rgbSE = tex_coords+vec2( add.x, add.y); + vec2 rgbM = tex_coords; + gl_FragColor = fxaa(u_sampler, fragCoord, u_viewport_size.zw, rgbNW, rgbNE, rgbSW, rgbSE, rgbM); +} \ No newline at end of file diff --git a/resources/shaders/110/fxaa.vs b/resources/shaders/110/fxaa.vs new file mode 100644 index 0000000..7561fcc --- /dev/null +++ b/resources/shaders/110/fxaa.vs @@ -0,0 +1,12 @@ +#version 110 + +attribute vec3 v_position; +attribute vec2 v_tex_coord; + +varying vec2 tex_coords; + +void main() +{ + tex_coords = v_tex_coord; + gl_Position = vec4(v_position, 1.0); +} \ No newline at end of file diff --git a/resources/shaders/110/gaussian_blur33.fs b/resources/shaders/110/gaussian_blur33.fs new file mode 100644 index 0000000..d9c1157 --- /dev/null +++ b/resources/shaders/110/gaussian_blur33.fs @@ -0,0 +1,35 @@ +#version 110 +uniform sampler2D u_sampler; +uniform mat3 u_convolution_matrix; +uniform vec2 u_viewport_size; + +varying vec2 tex_coords; + +vec4 sample(float offsetX, float offsetY) +{ + return texture2D(u_sampler, vec2(tex_coords.x + offsetX, tex_coords.y + offsetY)); +} +void main() +{ + vec4 pixels[9]; + float deltaWidth = 1.0 / u_viewport_size.x; + float deltaHeight = 1.0 / u_viewport_size.y; + pixels[0] = sample(-deltaWidth, deltaHeight ); + pixels[1] = sample(0.0, deltaHeight ); + pixels[2] = sample(deltaWidth, deltaHeight ); + pixels[3] = sample(-deltaWidth, 0.0); + pixels[4] = sample(0.0, 0.0); + pixels[5] = sample(deltaWidth, 0.0); + pixels[6] = sample(-deltaWidth, -deltaHeight); + pixels[7] = sample(0.0, -deltaHeight); + pixels[8] = sample(deltaWidth, -deltaHeight); + vec4 accumulator = vec4(0.0); + for (int i = 0; i < 3; i++) + { + for (int j = 0; j < 3; ++j) + { + accumulator += pixels[3 * i + j] * u_convolution_matrix[i][j]; + } + } + gl_FragColor = accumulator; +} \ No newline at end of file diff --git a/resources/shaders/110/gaussian_blur33.vs b/resources/shaders/110/gaussian_blur33.vs new file mode 100644 index 0000000..7561fcc --- /dev/null +++ b/resources/shaders/110/gaussian_blur33.vs @@ -0,0 +1,12 @@ +#version 110 + +attribute vec3 v_position; +attribute vec2 v_tex_coord; + +varying vec2 tex_coords; + +void main() +{ + tex_coords = v_tex_coord; + gl_Position = vec4(v_position, 1.0); +} \ No newline at end of file diff --git a/resources/shaders/gouraud.fs b/resources/shaders/110/gouraud.fs similarity index 67% rename from resources/shaders/gouraud.fs rename to resources/shaders/110/gouraud.fs index 77d18b0..0ae3d7e 100644 --- a/resources/shaders/gouraud.fs +++ b/resources/shaders/110/gouraud.fs @@ -7,6 +7,7 @@ const vec3 ORANGE = vec3(0.8, 0.4, 0.0); const vec3 LightRed = vec3(0.78, 0.0, 0.0); const vec3 LightBlue = vec3(0.73, 1.0, 1.0); const float EPSILON = 0.0001; +const float ONE_OVER_EPSILON = 1e4; struct PrintVolumeDetection { @@ -47,8 +48,7 @@ varying vec3 clipping_planes_dots; varying vec2 intensity; uniform PrintVolumeDetection print_volume; - -varying vec4 model_pos; +uniform vec3 extruder_printable_heights; varying vec4 world_pos; varying float world_normal_z; varying vec3 eye_normal; @@ -73,22 +73,25 @@ void main() } } // if the fragment is outside the print volume -> use darker color - vec3 pv_check_min = ZERO; - vec3 pv_check_max = ZERO; - if (print_volume.type == 0) { - // rectangle - pv_check_min = world_pos.xyz - vec3(print_volume.xy_data.x, print_volume.xy_data.y, print_volume.z_data.x); - pv_check_max = world_pos.xyz - vec3(print_volume.xy_data.z, print_volume.xy_data.w, print_volume.z_data.y); - color = (any(lessThan(pv_check_min, ZERO)) || any(greaterThan(pv_check_max, ZERO))) ? mix(color, ZERO, 0.3333) : color; + vec3 pv_check_min = (world_pos.xyz - vec3(print_volume.xy_data.x, print_volume.xy_data.y, print_volume.z_data.x)) * ONE_OVER_EPSILON; + vec3 pv_check_max = (world_pos.xyz - vec3(print_volume.xy_data.z, print_volume.xy_data.w, print_volume.z_data.y)) * ONE_OVER_EPSILON; + bool is_out_print_limit =(any(lessThan(pv_check_min, vec3(1.0))) || any(greaterThan(pv_check_max, vec3(1.0)))); + if (print_volume.type == 0) {// rectangle + color = is_out_print_limit ? mix(color, ZERO, 0.3333) : color; } else if (print_volume.type == 1) { // circle float delta_radius = print_volume.xy_data.z - distance(world_pos.xy, print_volume.xy_data.xy); - pv_check_min = vec3(delta_radius, 0.0, world_pos.z - print_volume.z_data.x); - pv_check_max = vec3(0.0, 0.0, world_pos.z - print_volume.z_data.y); - color = (any(lessThan(pv_check_min, ZERO)) || any(greaterThan(pv_check_max, ZERO))) ? mix(color, ZERO, 0.3333) : color; + pv_check_min = vec3(delta_radius, 0.0, world_pos.z - print_volume.z_data.x) * ONE_OVER_EPSILON; + pv_check_max = vec3(0.0, 0.0, world_pos.z - print_volume.z_data.y) * ONE_OVER_EPSILON; + color = (any(lessThan(pv_check_min, vec3(1.0))) || any(greaterThan(pv_check_max, vec3(1.0)))) ? mix(color, ZERO, 0.3333) : color; + } + if(extruder_printable_heights.x >= 1.0 ){ + pv_check_min = (world_pos.xyz - vec3(print_volume.xy_data.x, print_volume.xy_data.y, extruder_printable_heights.y)) * ONE_OVER_EPSILON; + pv_check_max = (world_pos.xyz - vec3(print_volume.xy_data.z, print_volume.xy_data.w, extruder_printable_heights.z)) * ONE_OVER_EPSILON; + bool is_out_printable_height = (all(greaterThan(pv_check_min, vec3(1.0))) && all(lessThan(pv_check_max, vec3(1.0)))) ; + color = is_out_printable_height ? mix(color, ZERO, 0.7) : color; } - //QDS: add outline_color if (is_outline) gl_FragColor = uniform_color; @@ -98,7 +101,7 @@ void main() #endif else gl_FragColor = vec4(vec3(intensity.y) + color * intensity.x, alpha); - + // In the support painting gizmo and the seam painting gizmo are painted triangles rendered over the already // rendered object. To resolved z-fighting between previously rendered object and painted triangles, values // inside the depth buffer are offset by small epsilon for painted triangles inside those gizmos. diff --git a/resources/shaders/gouraud.vs b/resources/shaders/110/gouraud.vs similarity index 84% rename from resources/shaders/gouraud.vs rename to resources/shaders/110/gouraud.vs index dd70e61..cb9b918 100644 --- a/resources/shaders/gouraud.vs +++ b/resources/shaders/110/gouraud.vs @@ -1,5 +1,4 @@ #version 110 - #define INTENSITY_CORRECTION 0.6 // normalized values for (-0.6/1.31, 0.6/1.31, 1./1.31) @@ -28,6 +27,13 @@ struct SlopeDetection mat3 volume_world_normal_matrix; }; +attribute vec3 v_position; +attribute vec3 v_normal; + +uniform mat4 view_model_matrix; +uniform mat4 projection_matrix; +uniform mat3 normal_matrix; + uniform mat4 volume_world_matrix; uniform SlopeDetection slope; @@ -49,32 +55,31 @@ varying vec3 eye_normal; void main() { // First transform the normal into camera space and normalize the result. - eye_normal = normalize(gl_NormalMatrix * gl_Normal); + eye_normal = normalize(normal_matrix * v_normal); // Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex. // Since these two are normalized the cosine is the dot product. We also need to clamp the result to the [0,1] range. float NdotL = max(dot(eye_normal, LIGHT_TOP_DIR), 0.0); intensity.x = INTENSITY_AMBIENT + NdotL * LIGHT_TOP_DIFFUSE; - vec3 position = (gl_ModelViewMatrix * gl_Vertex).xyz; - intensity.y = LIGHT_TOP_SPECULAR * pow(max(dot(-normalize(position), reflect(-LIGHT_TOP_DIR, eye_normal)), 0.0), LIGHT_TOP_SHININESS); + vec4 position = (view_model_matrix * vec4(v_position, 1.0)); + intensity.y = LIGHT_TOP_SPECULAR * pow(max(dot(-normalize(position.xyz), reflect(-LIGHT_TOP_DIR, eye_normal)), 0.0), LIGHT_TOP_SHININESS); // Perform the same lighting calculation for the 2nd light source (no specular applied). NdotL = max(dot(eye_normal, LIGHT_FRONT_DIR), 0.0); intensity.x += NdotL * LIGHT_FRONT_DIFFUSE; - - if(is_text_shape){ + + if(!is_text_shape){ NdotL = max(dot(eye_normal, LIGHT_BACK_DIR), 0.0); intensity.x += NdotL * LIGHT_BACK_DIFFUSE; } - model_pos = gl_Vertex; // Point in homogenous coordinates. - world_pos = volume_world_matrix * gl_Vertex; + world_pos = volume_world_matrix * vec4(v_position, 1.0); // z component of normal vector in world coordinate used for slope shading - world_normal_z = slope.actived ? (normalize(slope.volume_world_normal_matrix * gl_Normal)).z : 0.0; + world_normal_z = slope.actived ? (normalize(slope.volume_world_normal_matrix * v_normal)).z : 0.0; - gl_Position = ftransform(); + gl_Position = projection_matrix * position; // Fill in the scalars for fragment shader clipping. Fragments with any of these components lower than zero are discarded. clipping_planes_dots = vec3(dot(world_pos, clipping_plane), world_pos.z - z_range.x, z_range.y - world_pos.z); } diff --git a/resources/shaders/gouraud_light.fs b/resources/shaders/110/gouraud_light.fs similarity index 100% rename from resources/shaders/gouraud_light.fs rename to resources/shaders/110/gouraud_light.fs diff --git a/resources/shaders/thumbnail.vs b/resources/shaders/110/gouraud_light.vs similarity index 77% rename from resources/shaders/thumbnail.vs rename to resources/shaders/110/gouraud_light.vs index a02248f..fffd1b3 100644 --- a/resources/shaders/thumbnail.vs +++ b/resources/shaders/110/gouraud_light.vs @@ -14,30 +14,32 @@ const vec3 LIGHT_FRONT_DIR = vec3(0.6985074, 0.1397015, 0.6985074); #define INTENSITY_AMBIENT 0.3 -uniform mat4 volume_world_matrix; +attribute vec3 v_position; +attribute vec3 v_normal; + +uniform mat4 view_model_matrix; +uniform mat4 projection_matrix; +uniform mat3 normal_matrix; + // x = tainted, y = specular; varying vec2 intensity; -varying vec4 world_pos; void main() { // First transform the normal into camera space and normalize the result. - vec3 normal = normalize(gl_NormalMatrix * gl_Normal); - + vec3 normal = normalize(normal_matrix * v_normal); + // Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex. // Since these two are normalized the cosine is the dot product. We also need to clamp the result to the [0,1] range. float NdotL = max(dot(normal, LIGHT_TOP_DIR), 0.0); intensity.x = INTENSITY_AMBIENT + NdotL * LIGHT_TOP_DIFFUSE; - vec3 position = (gl_ModelViewMatrix * gl_Vertex).xyz; - intensity.y = LIGHT_TOP_SPECULAR * pow(max(dot(-normalize(position), reflect(-LIGHT_TOP_DIR, normal)), 0.0), LIGHT_TOP_SHININESS); + vec4 position = view_model_matrix * vec4(v_position, 1.0); + intensity.y = LIGHT_TOP_SPECULAR * pow(max(dot(-normalize(position.xyz), reflect(-LIGHT_TOP_DIR, normal)), 0.0), LIGHT_TOP_SHININESS); // Perform the same lighting calculation for the 2nd light source (no specular applied). NdotL = max(dot(normal, LIGHT_FRONT_DIR), 0.0); intensity.x += NdotL * LIGHT_FRONT_DIFFUSE; - // Point in homogenous coordinates. - world_pos = volume_world_matrix * gl_Vertex; - - gl_Position = ftransform(); + gl_Position = projection_matrix * position; } diff --git a/resources/shaders/gouraud_light_instanced.vs b/resources/shaders/110/gouraud_light_instanced.vs similarity index 100% rename from resources/shaders/gouraud_light_instanced.vs rename to resources/shaders/110/gouraud_light_instanced.vs diff --git a/resources/shaders/110/hotbed.fs b/resources/shaders/110/hotbed.fs new file mode 100644 index 0000000..6d8bb69 --- /dev/null +++ b/resources/shaders/110/hotbed.fs @@ -0,0 +1,51 @@ +#version 110 + +const vec3 ZERO = vec3(0.0, 0.0, 0.0); +const vec3 WHITE = vec3(1.0, 1.0, 1.0); +const float ONE_OVER_EPSILON = 1e4; +struct PrintVolumeDetection +{ + // 0 = rectangle, 1 = circle, 2 = custom, 3 = invalid + int type; + // type = 0 (rectangle): + // x = min.x, y = min.y, z = max.x, w = max.y + // type = 1 (circle): + // x = center.x, y = center.y, z = radius + vec4 xy_data; + // x = min z, y = max z + vec2 z_data; +}; + +uniform vec4 uniform_color; +uniform float emission_factor; +uniform PrintVolumeDetection print_volume; +// x = diffuse, y = specular; +varying vec2 intensity; +varying vec4 world_pos; +void main() +{ + vec3 color = uniform_color.rgb; + float alpha = uniform_color.a; + // if the fragment is outside the print volume -> use darker color + vec3 pv_check_min = ZERO; + vec3 pv_check_max = ZERO; + if (print_volume.type == 0) {// rectangle + pv_check_min = world_pos.xyz - vec3(print_volume.xy_data.x, print_volume.xy_data.y, print_volume.z_data.x); + pv_check_max = world_pos.xyz - vec3(print_volume.xy_data.z, print_volume.xy_data.w, print_volume.z_data.y); + + pv_check_min = pv_check_min * ONE_OVER_EPSILON; + pv_check_max = pv_check_max * ONE_OVER_EPSILON; + color = (any(lessThan(pv_check_min, vec3(1.0))) || any(greaterThan(pv_check_max, vec3(1.0)))) ? mix(color, WHITE, 0.3333) : color; + } + else if (print_volume.type == 1) {// circle + float delta_radius = print_volume.xy_data.z - distance(world_pos.xy, print_volume.xy_data.xy); + pv_check_min = vec3(delta_radius, 0.0, world_pos.z - print_volume.z_data.x); + pv_check_max = vec3(0.0, 0.0, world_pos.z - print_volume.z_data.y); + + pv_check_min = pv_check_min * ONE_OVER_EPSILON; + pv_check_max = pv_check_max * ONE_OVER_EPSILON; + color = (any(lessThan(pv_check_min, vec3(1.0))) || any(greaterThan(pv_check_max, vec3(1.0)))) ? mix(color, WHITE, 0.3333) : color; + } + //gl_FragColor = vec4(vec3(intensity.y) + color * intensity.x, alpha); + gl_FragColor = vec4(vec3(intensity.y) + color * (intensity.x + emission_factor), alpha); +} \ No newline at end of file diff --git a/resources/shaders/110/hotbed.vs b/resources/shaders/110/hotbed.vs new file mode 100644 index 0000000..5409033 --- /dev/null +++ b/resources/shaders/110/hotbed.vs @@ -0,0 +1,47 @@ +#version 110 + +#define INTENSITY_CORRECTION 0.6 + +// normalized values for (-0.6/1.31, 0.6/1.31, 1./1.31) +const vec3 LIGHT_TOP_DIR = vec3(-0.4574957, 0.4574957, 0.7624929); +#define LIGHT_TOP_DIFFUSE (0.8 * INTENSITY_CORRECTION) +#define LIGHT_TOP_SPECULAR (0.125 * INTENSITY_CORRECTION) +#define LIGHT_TOP_SHININESS 20.0 + +// normalized values for (1./1.43, 0.2/1.43, 1./1.43) +const vec3 LIGHT_FRONT_DIR = vec3(0.6985074, 0.1397015, 0.6985074); +#define LIGHT_FRONT_DIFFUSE (0.3 * INTENSITY_CORRECTION) + +#define INTENSITY_AMBIENT 0.3 + +uniform mat4 view_model_matrix; +uniform mat4 projection_matrix; +uniform mat3 view_normal_matrix; +uniform mat4 volume_world_matrix; + +attribute vec3 v_position; +attribute vec3 v_normal; + +// x = tainted, y = specular; +varying vec2 intensity; +varying vec4 world_pos; +void main() +{ + // First transform the normal into camera space and normalize the result. + vec3 normal = normalize(view_normal_matrix * v_normal); + + // Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex. + // Since these two are normalized the cosine is the dot product. We also need to clamp the result to the [0,1] range. + float NdotL = max(dot(normal, LIGHT_TOP_DIR), 0.0); + + intensity.x = INTENSITY_AMBIENT + NdotL * LIGHT_TOP_DIFFUSE; + world_pos = volume_world_matrix * vec4(v_position, 1.0); + vec4 position = view_model_matrix * vec4(v_position, 1.0); + intensity.y = LIGHT_TOP_SPECULAR * pow(max(dot(-normalize(position.xyz), reflect(-LIGHT_TOP_DIR, normal)), 0.0), LIGHT_TOP_SHININESS); + + // Perform the same lighting calculation for the 2nd light source (no specular applied). + NdotL = max(dot(normal, LIGHT_FRONT_DIR), 0.0); + intensity.x += NdotL * LIGHT_FRONT_DIFFUSE; + + gl_Position = projection_matrix * position; +} diff --git a/resources/shaders/110/imgui.fs b/resources/shaders/110/imgui.fs new file mode 100644 index 0000000..e711b69 --- /dev/null +++ b/resources/shaders/110/imgui.fs @@ -0,0 +1,11 @@ +#version 110 + +uniform sampler2D Texture; + +varying vec2 Frag_UV; +varying vec4 color; + +void main() +{ + gl_FragColor = color * texture2D(Texture, Frag_UV.st); +} \ No newline at end of file diff --git a/resources/shaders/110/imgui.vs b/resources/shaders/110/imgui.vs new file mode 100644 index 0000000..66b005b --- /dev/null +++ b/resources/shaders/110/imgui.vs @@ -0,0 +1,17 @@ +#version 110 + +uniform mat4 ProjMtx; + +attribute vec2 Position; +attribute vec2 UV; +attribute vec4 Color; + +varying vec2 Frag_UV; +varying vec4 color; + +void main() +{ + Frag_UV = UV; + color = Color; + gl_Position = ProjMtx * vec4(Position.xy, 0.0, 1.0); +} \ No newline at end of file diff --git a/resources/shaders/110/mainframe_composite.fs b/resources/shaders/110/mainframe_composite.fs new file mode 100644 index 0000000..a3bba98 --- /dev/null +++ b/resources/shaders/110/mainframe_composite.fs @@ -0,0 +1,10 @@ +#version 110 + +uniform sampler2D u_sampler; + +varying vec2 tex_coords; + +void main() +{ + gl_FragColor = texture2D(u_sampler, tex_coords); +} \ No newline at end of file diff --git a/resources/shaders/110/mainframe_composite.vs b/resources/shaders/110/mainframe_composite.vs new file mode 100644 index 0000000..7561fcc --- /dev/null +++ b/resources/shaders/110/mainframe_composite.vs @@ -0,0 +1,12 @@ +#version 110 + +attribute vec3 v_position; +attribute vec2 v_tex_coord; + +varying vec2 tex_coords; + +void main() +{ + tex_coords = v_tex_coord; + gl_Position = vec4(v_position, 1.0); +} \ No newline at end of file diff --git a/resources/shaders/mm_contour.fs b/resources/shaders/110/mm_contour.fs similarity index 100% rename from resources/shaders/mm_contour.fs rename to resources/shaders/110/mm_contour.fs diff --git a/resources/shaders/110/mm_contour.vs b/resources/shaders/110/mm_contour.vs new file mode 100644 index 0000000..d9063f0 --- /dev/null +++ b/resources/shaders/110/mm_contour.vs @@ -0,0 +1,11 @@ +#version 110 + +uniform mat4 view_model_matrix; +uniform mat4 projection_matrix; + +attribute vec3 v_position; + +void main() +{ + gl_Position = projection_matrix * view_model_matrix * vec4(v_position, 1.0); +} diff --git a/resources/shaders/mm_gouraud_wireframe.fs b/resources/shaders/110/mm_gouraud_wireframe.fs similarity index 80% rename from resources/shaders/mm_gouraud_wireframe.fs rename to resources/shaders/110/mm_gouraud_wireframe.fs index 1c8c199..4c50d5b 100644 --- a/resources/shaders/mm_gouraud_wireframe.fs +++ b/resources/shaders/110/mm_gouraud_wireframe.fs @@ -21,10 +21,13 @@ const float EPSILON = 0.0001; const vec3 ORANGE = vec3(0.8, 0.4, 0.0); const vec3 LightRed = vec3(0.78, 0.0, 0.0); const vec3 LightBlue = vec3(0.73, 1.0, 1.0); +const float CHESS_WIDTH = 2.0; +const vec3 COLOR_A = vec3(1.0, 1.0, 0.0); +const vec3 COLOR_B = vec3(0.3, 0.3, 0.0); uniform vec4 uniform_color; varying vec3 clipping_planes_dots; -varying vec4 model_pos; +varying vec3 model_pos; varying vec4 world_pos; uniform bool volume_mirrored; @@ -57,6 +60,8 @@ vec3 getWireframeColor(vec3 fill) { return (brightness > 0.75) ? vec3(0.11, 0.165, 0.208) : vec3(0.988, 0.988, 0.988); } uniform bool show_wireframe; +uniform mat4 view_model_matrix; +uniform mat3 normal_matrix; void main() { @@ -73,20 +78,20 @@ void main() vec3 transformed_normal = normalize(slope.volume_world_normal_matrix * triangle_normal); if (slope.actived) { - if(world_pos.z<0.1&&world_pos.z>-0.1) - { - color = LightBlue; - alpha = 1.0; - } - else if( transformed_normal.z < slope.normal_z - EPSILON) - { - color = color * 0.7 + LightRed * 0.3; - alpha = 1.0; + alpha = 1.0; + if(abs(world_pos.z) < 0.1){ + color = LightBlue; + } + else if( transformed_normal.z < slope.normal_z - EPSILON){ + bool x_flag = mod(world_pos.x, CHESS_WIDTH) < (CHESS_WIDTH / 2.0); + bool y_flag = mod(world_pos.y, CHESS_WIDTH) < (CHESS_WIDTH / 2.0); + vec3 temp_color = (x_flag^^y_flag) ? COLOR_A : COLOR_B; + color = mix(color,temp_color,0.2); } } // First transform the normal into camera space and normalize the result. - vec3 eye_normal = normalize(gl_NormalMatrix * triangle_normal); + vec3 eye_normal = normalize(normal_matrix * triangle_normal); // Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex. // Since these two are normalized the cosine is the dot product. We also need to clamp the result to the [0,1] range. @@ -95,7 +100,7 @@ void main() // x = diffuse, y = specular; vec2 intensity = vec2(0.0, 0.0); intensity.x = INTENSITY_AMBIENT + NdotL * LIGHT_TOP_DIFFUSE; - vec3 position = (gl_ModelViewMatrix * model_pos).xyz; + vec3 position = (view_model_matrix * vec4(model_pos, 1.0)).xyz; intensity.y = LIGHT_TOP_SPECULAR * pow(max(dot(-normalize(position), reflect(-LIGHT_TOP_DIR, eye_normal)), 0.0), LIGHT_TOP_SHININESS); // Perform the same lighting calculation for the 2nd light source (no specular applied). @@ -103,7 +108,7 @@ void main() intensity.x += NdotL * LIGHT_FRONT_DIFFUSE; if (show_wireframe) { - vec3 wireframeColor = show_wireframe ? getWireframeColor(color) : color; + vec3 wireframeColor = getWireframeColor(color); vec3 triangleColor = wireframe(color, wireframeColor, 1.0); gl_FragColor = vec4(vec3(intensity.y) + triangleColor * intensity.x, alpha); } diff --git a/resources/shaders/mm_gouraud_wireframe.vs b/resources/shaders/110/mm_gouraud_wireframe.vs similarity index 76% rename from resources/shaders/mm_gouraud_wireframe.vs rename to resources/shaders/110/mm_gouraud_wireframe.vs index 51dfe1b..f31f3fd 100644 --- a/resources/shaders/mm_gouraud_wireframe.vs +++ b/resources/shaders/110/mm_gouraud_wireframe.vs @@ -2,17 +2,19 @@ const vec3 ZERO = vec3(0.0, 0.0, 0.0); -//attribute vec3 v_position; -//attribute vec3 v_barycentric; - +uniform mat4 view_model_matrix; +uniform mat4 projection_matrix; uniform mat4 volume_world_matrix; // Clipping plane, x = min z, y = max z. Used by the FFF and SLA previews to clip with a top / bottom plane. uniform vec2 z_range; // Clipping plane - general orientation. Used by the SLA gizmo. uniform vec4 clipping_plane; +attribute vec3 v_position; +attribute vec3 v_color; + varying vec3 clipping_planes_dots; -varying vec4 model_pos; +varying vec3 model_pos; varying vec4 world_pos; varying vec3 barycentric_coordinates; @@ -25,12 +27,12 @@ struct SlopeDetection uniform SlopeDetection slope; void main() { - model_pos = gl_Vertex; + model_pos = v_position; //model_pos = vec4(v_position, 1.0); // Point in homogenous coordinates. - world_pos = volume_world_matrix * model_pos; + world_pos = volume_world_matrix * vec4(model_pos, 1.0); - gl_Position = ftransform(); + gl_Position = projection_matrix * view_model_matrix * vec4(v_position, 1.0); //gl_Position = gl_ModelViewProjectionMatrix * vec4(v_position, 1.0); // Fill in the scalars for fragment shader clipping. Fragments with any of these components lower than zero are discarded. clipping_planes_dots = vec3(dot(world_pos, clipping_plane), world_pos.z - z_range.x, z_range.y - world_pos.z); @@ -38,5 +40,5 @@ void main() //compute the Barycentric Coordinates //int vertexMod3 = gl_VertexID % 3; //barycentric_coordinates = vec3(float(vertexMod3 == 0), float(vertexMod3 == 1), float(vertexMod3 == 2)); - barycentric_coordinates = gl_Color.xyz;//v_barycentric + barycentric_coordinates = v_color.xyz; } diff --git a/resources/shaders/110/printbed.fs b/resources/shaders/110/printbed.fs index 833dff0..cc272a8 100644 --- a/resources/shaders/110/printbed.fs +++ b/resources/shaders/110/printbed.fs @@ -3,32 +3,34 @@ const vec3 back_color_dark = vec3(0.235, 0.235, 0.235); const vec3 back_color_light = vec3(0.365, 0.365, 0.365); -uniform sampler2D texture; +uniform sampler2D u_sampler; uniform bool transparent_background; uniform bool svg_source; varying vec2 tex_coord; -vec4 svg_color() +vec4 svg_color(vec2 uv) { - // takes foreground from texture - vec4 fore_color = texture2D(texture, tex_coord); + // takes foreground from u_sampler + vec4 fore_color = texture2D(u_sampler, uv); // calculates radial gradient - vec3 back_color = vec3(mix(back_color_light, back_color_dark, smoothstep(0.0, 0.5, length(abs(tex_coord.xy) - vec2(0.5))))); + vec3 back_color = vec3(mix(back_color_light, back_color_dark, smoothstep(0.0, 0.5, length(abs(uv) - vec2(0.5))))); // blends foreground with background return vec4(mix(back_color, fore_color.rgb, fore_color.a), transparent_background ? fore_color.a : 1.0); } -vec4 non_svg_color() +vec4 non_svg_color(vec2 uv) { - // takes foreground from texture - vec4 color = texture2D(texture, tex_coord); + // takes foreground from u_sampler + vec4 color = texture2D(u_sampler, uv); return vec4(color.rgb, transparent_background ? color.a * 0.25 : color.a); } void main() { - gl_FragColor = svg_source ? svg_color() : non_svg_color(); + // flip uv + vec2 uv = vec2(tex_coord.x, 1.0 - tex_coord.y); + gl_FragColor = svg_source ? svg_color(uv) : non_svg_color(uv); } \ No newline at end of file diff --git a/resources/shaders/110/silhouette.fs b/resources/shaders/110/silhouette.fs new file mode 100644 index 0000000..919b7dc --- /dev/null +++ b/resources/shaders/110/silhouette.fs @@ -0,0 +1,6 @@ +#version 110 +uniform vec3 u_base_color; +void main() +{ + gl_FragColor = vec4(u_base_color, 1.0); +} \ No newline at end of file diff --git a/resources/shaders/110/silhouette.vs b/resources/shaders/110/silhouette.vs new file mode 100644 index 0000000..8a4d590 --- /dev/null +++ b/resources/shaders/110/silhouette.vs @@ -0,0 +1,11 @@ +#version 110 + +uniform mat4 u_model_matrix; +uniform mat4 u_view_projection_matrix; + +attribute vec3 v_position; + +void main() +{ + gl_Position = u_view_projection_matrix * u_model_matrix * vec4(v_position, 1.0); +} diff --git a/resources/shaders/110/silhouette_composite.fs b/resources/shaders/110/silhouette_composite.fs new file mode 100644 index 0000000..ea2d651 --- /dev/null +++ b/resources/shaders/110/silhouette_composite.fs @@ -0,0 +1,57 @@ +#version 110 +uniform sampler2D u_sampler; +uniform mat3 u_convolution_matrix; +uniform vec3 u_viewport_size_alpha; +uniform vec3 u_picking_color; +varying vec2 tex_coords; + +vec4 sample(float offsetX, float offsetY) +{ + return texture2D(u_sampler, vec2(tex_coords.x + offsetX, tex_coords.y + offsetY)); +} + +// see https://docs.gl/sl4/sign +// glsl 110 & 120 may not support the sign func +float sign_glsl_110(float value) +{ + if (value > 1e-6) { + return 1.0; + } + else if (value < -1e-6) { + return -1.0; + } + return 0.0; +} + +void main() +{ + vec4 pixels[9]; + float deltaWidth = 1.0 / u_viewport_size_alpha.x; + float deltaHeight = 1.0 / u_viewport_size_alpha.y; + float alpha = u_viewport_size_alpha.z; + float effect_width = 2.0; + deltaWidth = deltaWidth * effect_width; + deltaHeight = deltaHeight * effect_width; + pixels[0] = sample(-deltaWidth, deltaHeight ); + pixels[1] = sample(0.0, deltaHeight ); + pixels[2] = sample(deltaWidth, deltaHeight ); + pixels[3] = sample(-deltaWidth, 0.0); + pixels[4] = sample(0.0, 0.0); + pixels[5] = sample(deltaWidth, 0.0); + pixels[6] = sample(-deltaWidth, -deltaHeight); + pixels[7] = sample(0.0, -deltaHeight); + pixels[8] = sample(deltaWidth, -deltaHeight); + vec4 accumulator = vec4(0.0); + for (int i = 0; i < 3; i++) + { + for (int j = 0; j < 3; ++j) + { + accumulator += sign_glsl_110(pixels[3 * i + j].a) * vec4(u_picking_color, 1.0) * u_convolution_matrix[i][j]; + } + } + + if ((abs(accumulator.a) - alpha * pixels[4].a) * 1e6 > 1.0) { + accumulator = vec4(u_picking_color, abs(accumulator.a)); + } + gl_FragColor = accumulator; +} \ No newline at end of file diff --git a/resources/shaders/110/silhouette_composite.vs b/resources/shaders/110/silhouette_composite.vs new file mode 100644 index 0000000..7561fcc --- /dev/null +++ b/resources/shaders/110/silhouette_composite.vs @@ -0,0 +1,12 @@ +#version 110 + +attribute vec3 v_position; +attribute vec2 v_tex_coord; + +varying vec2 tex_coords; + +void main() +{ + tex_coords = v_tex_coord; + gl_Position = vec4(v_position, 1.0); +} \ No newline at end of file diff --git a/resources/shaders/thumbnail.fs b/resources/shaders/110/thumbnail.fs similarity index 100% rename from resources/shaders/thumbnail.fs rename to resources/shaders/110/thumbnail.fs diff --git a/resources/shaders/110/thumbnail.vs b/resources/shaders/110/thumbnail.vs new file mode 100644 index 0000000..682d4c4 --- /dev/null +++ b/resources/shaders/110/thumbnail.vs @@ -0,0 +1,50 @@ +#version 110 + +#define INTENSITY_CORRECTION 0.6 + +// normalized values for (-0.6/1.31, 0.6/1.31, 1./1.31) +const vec3 LIGHT_TOP_DIR = vec3(-0.4574957, 0.4574957, 0.7624929); +#define LIGHT_TOP_DIFFUSE (0.8 * INTENSITY_CORRECTION) +#define LIGHT_TOP_SPECULAR (0.125 * INTENSITY_CORRECTION) +#define LIGHT_TOP_SHININESS 20.0 + +// normalized values for (1./1.43, 0.2/1.43, 1./1.43) +const vec3 LIGHT_FRONT_DIR = vec3(0.6985074, 0.1397015, 0.6985074); +#define LIGHT_FRONT_DIFFUSE (0.3 * INTENSITY_CORRECTION) + +#define INTENSITY_AMBIENT 0.3 + +attribute vec3 v_position; +attribute vec3 v_normal; + +uniform mat4 view_model_matrix; +uniform mat4 projection_matrix; +uniform mat3 normal_matrix; + +uniform mat4 volume_world_matrix; +// x = tainted, y = specular; +varying vec2 intensity; +varying vec4 world_pos; + +void main() +{ + // First transform the normal into camera space and normalize the result. + vec3 normal = normalize(normal_matrix * v_normal); + + // Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex. + // Since these two are normalized the cosine is the dot product. We also need to clamp the result to the [0,1] range. + float NdotL = max(dot(normal, LIGHT_TOP_DIR), 0.0); + + intensity.x = INTENSITY_AMBIENT + NdotL * LIGHT_TOP_DIFFUSE; + vec4 position = (view_model_matrix * vec4(v_position, 1.0)); + intensity.y = LIGHT_TOP_SPECULAR * pow(max(dot(-normalize(position.xyz), reflect(-LIGHT_TOP_DIR, normal)), 0.0), LIGHT_TOP_SHININESS); + + // Perform the same lighting calculation for the 2nd light source (no specular applied). + NdotL = max(dot(normal, LIGHT_FRONT_DIR), 0.0); + intensity.x += NdotL * LIGHT_FRONT_DIFFUSE; + + // Point in homogenous coordinates. + world_pos = volume_world_matrix * vec4(v_position, 1.0); + + gl_Position = projection_matrix * position; +} diff --git a/resources/shaders/toolpaths_lines.fs b/resources/shaders/110/toolpaths_lines.fs similarity index 100% rename from resources/shaders/toolpaths_lines.fs rename to resources/shaders/110/toolpaths_lines.fs diff --git a/resources/shaders/110/toolpaths_lines.vs b/resources/shaders/110/toolpaths_lines.vs new file mode 100644 index 0000000..f4a6817 --- /dev/null +++ b/resources/shaders/110/toolpaths_lines.vs @@ -0,0 +1,16 @@ +#version 110 + +attribute vec3 v_position; +attribute vec3 v_normal; + +uniform mat4 view_model_matrix; +uniform mat4 projection_matrix; +uniform mat3 normal_matrix; + +varying vec3 eye_normal; + +void main() +{ + gl_Position = projection_matrix * view_model_matrix * vec4(v_position, 1.0); + eye_normal = normal_matrix * v_normal; +} diff --git a/resources/shaders/variable_layer_height.fs b/resources/shaders/110/variable_layer_height.fs similarity index 100% rename from resources/shaders/variable_layer_height.fs rename to resources/shaders/110/variable_layer_height.fs diff --git a/resources/shaders/variable_layer_height.vs b/resources/shaders/110/variable_layer_height.vs similarity index 74% rename from resources/shaders/variable_layer_height.vs rename to resources/shaders/110/variable_layer_height.vs index 0e966b0..3a25f9f 100644 --- a/resources/shaders/variable_layer_height.vs +++ b/resources/shaders/110/variable_layer_height.vs @@ -14,6 +14,14 @@ const vec3 LIGHT_FRONT_DIR = vec3(0.6985074, 0.1397015, 0.6985074); #define INTENSITY_AMBIENT 0.3 +attribute vec3 v_position; +attribute vec3 v_normal; +attribute vec2 v_tex_coord; + +uniform mat4 view_model_matrix; +uniform mat4 projection_matrix; +uniform mat3 normal_matrix; + uniform mat4 volume_world_matrix; uniform float object_max_z; @@ -25,28 +33,28 @@ varying float object_z; void main() { // First transform the normal into camera space and normalize the result. - vec3 normal = normalize(gl_NormalMatrix * gl_Normal); - + vec3 normal = normalize(normal_matrix * v_normal); + // Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex. // Since these two are normalized the cosine is the dot product. We also need to clamp the result to the [0,1] range. float NdotL = max(dot(normal, LIGHT_TOP_DIR), 0.0); intensity.x = INTENSITY_AMBIENT + NdotL * LIGHT_TOP_DIFFUSE; - vec3 position = (gl_ModelViewMatrix * gl_Vertex).xyz; - intensity.y = LIGHT_TOP_SPECULAR * pow(max(dot(-normalize(position), reflect(-LIGHT_TOP_DIR, normal)), 0.0), LIGHT_TOP_SHININESS); + vec4 position = view_model_matrix * vec4(v_position, 1.0); + intensity.y = LIGHT_TOP_SPECULAR * pow(max(dot(-normalize(position.xyz), reflect(-LIGHT_TOP_DIR, normal)), 0.0), LIGHT_TOP_SHININESS); // Perform the same lighting calculation for the 2nd light source (no specular) NdotL = max(dot(normal, LIGHT_FRONT_DIR), 0.0); - + intensity.x += NdotL * LIGHT_FRONT_DIFFUSE; // Scaled to widths of the Z texture. if (object_max_z > 0.0) // when rendering the overlay - object_z = object_max_z * gl_MultiTexCoord0.y; + object_z = object_max_z * v_tex_coord.y; else // when rendering the volumes - object_z = (volume_world_matrix * gl_Vertex).z; - - gl_Position = ftransform(); + object_z = (volume_world_matrix * vec4(v_position, 1.0)).z; + + gl_Position = projection_matrix * position; } diff --git a/resources/shaders/140/background.fs b/resources/shaders/140/background.fs new file mode 100644 index 0000000..d96035b --- /dev/null +++ b/resources/shaders/140/background.fs @@ -0,0 +1,8 @@ +#version 140 +uniform vec4 uniform_color; + +out vec4 frag_color; +void main() +{ + frag_color = uniform_color; +} \ No newline at end of file diff --git a/resources/shaders/140/background.vs b/resources/shaders/140/background.vs new file mode 100644 index 0000000..f505959 --- /dev/null +++ b/resources/shaders/140/background.vs @@ -0,0 +1,8 @@ +#version 140 + +in vec3 v_position; + +void main() +{ + gl_Position = vec4(v_position, 1.0); +} \ No newline at end of file diff --git a/resources/shaders/140/flat.fs b/resources/shaders/140/flat.fs new file mode 100644 index 0000000..806129e --- /dev/null +++ b/resources/shaders/140/flat.fs @@ -0,0 +1,9 @@ +#version 140 + +uniform vec4 uniform_color; + +out vec4 frag_color; +void main() +{ + frag_color = uniform_color; +} diff --git a/resources/shaders/140/flat.vs b/resources/shaders/140/flat.vs new file mode 100644 index 0000000..7042671 --- /dev/null +++ b/resources/shaders/140/flat.vs @@ -0,0 +1,11 @@ +#version 140 + +uniform mat4 view_model_matrix; +uniform mat4 projection_matrix; + +in vec3 v_position; + +void main() +{ + gl_Position = projection_matrix * view_model_matrix * vec4(v_position, 1.0); +} diff --git a/resources/shaders/140/flat_instance.vs b/resources/shaders/140/flat_instance.vs new file mode 100644 index 0000000..1b517d0 --- /dev/null +++ b/resources/shaders/140/flat_instance.vs @@ -0,0 +1,19 @@ +#version 140 + +uniform mat4 view_matrix; +uniform mat4 projection_matrix; + +in vec3 v_position; + +// per instance data +// in mat4 instanceMatrix; +in vec4 i_data0; +in vec4 i_data1; +in vec4 i_data2; +in vec4 i_data3; +// end per instance data +void main() +{ + mat4 model_matrix = mat4(i_data0, i_data1, i_data2, i_data3); + gl_Position = projection_matrix * view_matrix * model_matrix* vec4(v_position, 1.0); +} diff --git a/resources/shaders/140/flat_texture.fs b/resources/shaders/140/flat_texture.fs new file mode 100644 index 0000000..61fe5e6 --- /dev/null +++ b/resources/shaders/140/flat_texture.fs @@ -0,0 +1,12 @@ +#version 140 + +uniform sampler2D u_texture; + +in vec2 v_texcoord; + +out vec4 frag_color; + +void main() +{ + frag_color = texture(u_texture, v_texcoord); +} diff --git a/resources/shaders/140/flat_texture.vs b/resources/shaders/140/flat_texture.vs new file mode 100644 index 0000000..581b16b --- /dev/null +++ b/resources/shaders/140/flat_texture.vs @@ -0,0 +1,16 @@ +#version 140 + +in vec3 v_position; +in vec2 v_tex_coord; + +uniform mat4 view_model_matrix; +uniform mat4 projection_matrix; +uniform mat3 u_uvTransformMatrix; + +out vec2 v_texcoord; + +void main() +{ + v_texcoord = (u_uvTransformMatrix * vec3(v_tex_coord, 1.0)).xy; + gl_Position = projection_matrix * view_model_matrix * vec4(v_position, 1.0); +} \ No newline at end of file diff --git a/resources/shaders/140/fxaa.fs b/resources/shaders/140/fxaa.fs new file mode 100644 index 0000000..114558c --- /dev/null +++ b/resources/shaders/140/fxaa.fs @@ -0,0 +1,79 @@ +#version 140 + +uniform vec4 u_viewport_size; +uniform sampler2D u_sampler; + +in vec2 tex_coords; +out vec4 frag_color; + +// thanks https://github.com/mattdesl/glsl-fxaa +#ifndef FXAA_REDUCE_MIN + #define FXAA_REDUCE_MIN (1.0/ 128.0) +#endif +#ifndef FXAA_REDUCE_MUL + #define FXAA_REDUCE_MUL (1.0 / 8.0) +#endif +#ifndef FXAA_SPAN_MAX + #define FXAA_SPAN_MAX 8.0 +#endif + +vec4 fxaa(sampler2D tex, vec2 fragCoord, vec2 inv_resolution, + vec2 v_rgbNW, vec2 v_rgbNE, + vec2 v_rgbSW, vec2 v_rgbSE, + vec2 v_rgbM) { + vec4 color; + vec2 inverseVP = inv_resolution; + vec3 rgbNW = texture(tex, v_rgbNW).xyz; + vec3 rgbNE = texture(tex, v_rgbNE).xyz; + vec3 rgbSW = texture(tex, v_rgbSW).xyz; + vec3 rgbSE = texture(tex, v_rgbSE).xyz; + vec4 texColor = texture(tex, v_rgbM); + vec3 rgbM = texColor.xyz; + vec3 luma = vec3(0.299, 0.587, 0.114); + float lumaNW = dot(rgbNW, luma); + float lumaNE = dot(rgbNE, luma); + float lumaSW = dot(rgbSW, luma); + float lumaSE = dot(rgbSE, luma); + float lumaM = dot(rgbM, luma); + float lumaMin = min(lumaM, min(min(lumaNW, lumaNE), min(lumaSW, lumaSE))); + float lumaMax = max(lumaM, max(max(lumaNW, lumaNE), max(lumaSW, lumaSE))); + + vec2 dir; + dir.x = -((lumaNW + lumaNE) - (lumaSW + lumaSE)); + dir.y = ((lumaNW + lumaSW) - (lumaNE + lumaSE)); + + float dirReduce = max((lumaNW + lumaNE + lumaSW + lumaSE) * + (0.25 * FXAA_REDUCE_MUL), FXAA_REDUCE_MIN); + + float rcpDirMin = 1.0 / (min(abs(dir.x), abs(dir.y)) + dirReduce); + dir = min(vec2(FXAA_SPAN_MAX, FXAA_SPAN_MAX), + max(vec2(-FXAA_SPAN_MAX, -FXAA_SPAN_MAX), + dir * rcpDirMin)) * inverseVP; + + vec3 rgbA = 0.5 * ( + texture(tex, fragCoord * inverseVP + dir * (1.0 / 3.0 - 0.5)).xyz + + texture(tex, fragCoord * inverseVP + dir * (2.0 / 3.0 - 0.5)).xyz); + vec3 rgbB = rgbA * 0.5 + 0.25 * ( + texture(tex, fragCoord * inverseVP + dir * -0.5).xyz + + texture(tex, fragCoord * inverseVP + dir * 0.5).xyz); + + float lumaB = dot(rgbB, luma); + if ((lumaB < lumaMin) || (lumaB > lumaMax)) + color = vec4(rgbA, texColor.a); + else + color = vec4(rgbB, texColor.a); + return color; +} + +void main() +{ + vec2 fragCoord = tex_coords * u_viewport_size.xy; + vec2 add = u_viewport_size.zw; + + vec2 rgbNW = tex_coords+vec2(-add.x, -add.y); + vec2 rgbNE = tex_coords+vec2( add.x, -add.y); + vec2 rgbSW = tex_coords+vec2(-add.x, add.y); + vec2 rgbSE = tex_coords+vec2( add.x, add.y); + vec2 rgbM = tex_coords; + frag_color = fxaa(u_sampler, fragCoord, add, rgbNW, rgbNE, rgbSW, rgbSE, rgbM); +} \ No newline at end of file diff --git a/resources/shaders/140/fxaa.vs b/resources/shaders/140/fxaa.vs new file mode 100644 index 0000000..9c6a901 --- /dev/null +++ b/resources/shaders/140/fxaa.vs @@ -0,0 +1,12 @@ +#version 140 + +in vec3 v_position; +in vec2 v_tex_coord; + +out vec2 tex_coords; + +void main() +{ + tex_coords = v_tex_coord; + gl_Position = vec4(v_position, 1.0); +} \ No newline at end of file diff --git a/resources/shaders/140/gaussian_blur33.fs b/resources/shaders/140/gaussian_blur33.fs new file mode 100644 index 0000000..3148160 --- /dev/null +++ b/resources/shaders/140/gaussian_blur33.fs @@ -0,0 +1,34 @@ +#version 140 +uniform sampler2D u_sampler; +uniform mat3 u_convolution_matrix; +uniform vec2 u_viewport_size; + +in vec2 tex_coords; + +out vec4 frag_color; + +vec4 sample(float offsetX, float offsetY) +{ + return texture(u_sampler, vec2(tex_coords.x + offsetX, tex_coords.y + offsetY)); +} +void main() +{ + vec4 pixels[9]; + float deltaWidth = 1.0 / u_viewport_size.x; + float deltaHeight = 1.0 / u_viewport_size.y; + pixels[0] = sample(-deltaWidth, deltaHeight ); + pixels[1] = sample(0.0, deltaHeight ); + pixels[2] = sample(deltaWidth, deltaHeight ); + pixels[3] = sample(-deltaWidth, 0.0); + pixels[4] = sample(0.0, 0.0); + pixels[5] = sample(deltaWidth, 0.0); + pixels[6] = sample(-deltaWidth, -deltaHeight); + pixels[7] = sample(0.0, -deltaHeight); + pixels[8] = sample(deltaWidth, -deltaHeight); + vec4 accumulator = vec4(0.0); + for (int i = 0; i < 9; ++i) + { + accumulator += pixels[i] * u_convolution_matrix[i / 3][i % 3]; + } + frag_color = accumulator; +} \ No newline at end of file diff --git a/resources/shaders/140/gaussian_blur33.vs b/resources/shaders/140/gaussian_blur33.vs new file mode 100644 index 0000000..9c6a901 --- /dev/null +++ b/resources/shaders/140/gaussian_blur33.vs @@ -0,0 +1,12 @@ +#version 140 + +in vec3 v_position; +in vec2 v_tex_coord; + +out vec2 tex_coords; + +void main() +{ + tex_coords = v_tex_coord; + gl_Position = vec4(v_position, 1.0); +} \ No newline at end of file diff --git a/resources/shaders/140/gouraud.fs b/resources/shaders/140/gouraud.fs new file mode 100644 index 0000000..fbfb21f --- /dev/null +++ b/resources/shaders/140/gouraud.fs @@ -0,0 +1,111 @@ +#version 140 + +const vec3 ZERO = vec3(0.0, 0.0, 0.0); +//QDS: add grey and orange +//const vec3 GREY = vec3(0.9, 0.9, 0.9); +const vec3 ORANGE = vec3(0.8, 0.4, 0.0); +const vec3 LightRed = vec3(0.78, 0.0, 0.0); +const vec3 LightBlue = vec3(0.73, 1.0, 1.0); +const float EPSILON = 0.0001; +const float ONE_OVER_EPSILON = 1e4; + +struct PrintVolumeDetection +{ + // 0 = rectangle, 1 = circle, 2 = custom, 3 = invalid + int type; + // type = 0 (rectangle): + // x = min.x, y = min.y, z = max.x, w = max.y + // type = 1 (circle): + // x = center.x, y = center.y, z = radius + vec4 xy_data; + // x = min z, y = max z + vec2 z_data; +}; + +struct SlopeDetection +{ + bool actived; + float normal_z; + mat3 volume_world_normal_matrix; +}; + +uniform vec4 uniform_color; +uniform SlopeDetection slope; + +//QDS: add outline_color +uniform bool is_outline; + +uniform bool offset_depth_buffer; + +#ifdef ENABLE_ENVIRONMENT_MAP + uniform sampler2D environment_tex; + uniform bool use_environment_tex; +#endif // ENABLE_ENVIRONMENT_MAP + +in vec3 clipping_planes_dots; + +// x = diffuse, y = specular; +in vec2 intensity; + +uniform PrintVolumeDetection print_volume; +uniform vec3 extruder_printable_heights; +in vec4 world_pos; +in float world_normal_z; +in vec3 eye_normal; + +out vec4 frag_color; + +void main() +{ + if (any(lessThan(clipping_planes_dots, ZERO))) + discard; + vec3 color = uniform_color.rgb; + float alpha = uniform_color.a; + + if (slope.actived) { + if(world_pos.z<0.1&&world_pos.z>-0.1) + { + color = LightBlue; + alpha = 0.8; + } + else if( world_normal_z < slope.normal_z - EPSILON) + { + color = color * 0.5 + LightRed * 0.5; + alpha = 0.8; + } + } + // if the fragment is outside the print volume -> use darker color + vec3 pv_check_min = (world_pos.xyz - vec3(print_volume.xy_data.x, print_volume.xy_data.y, print_volume.z_data.x)) * ONE_OVER_EPSILON; + vec3 pv_check_max = (world_pos.xyz - vec3(print_volume.xy_data.z, print_volume.xy_data.w, print_volume.z_data.y)) * ONE_OVER_EPSILON; + bool is_out_print_limit =(any(lessThan(pv_check_min, vec3(1.0))) || any(greaterThan(pv_check_max, vec3(1.0)))); + if (print_volume.type == 0) {// rectangle + color = is_out_print_limit ? mix(color, ZERO, 0.3333) : color; + } + else if (print_volume.type == 1) { + // circle + float delta_radius = print_volume.xy_data.z - distance(world_pos.xy, print_volume.xy_data.xy); + pv_check_min = vec3(delta_radius, 0.0, world_pos.z - print_volume.z_data.x) * ONE_OVER_EPSILON; + pv_check_max = vec3(0.0, 0.0, world_pos.z - print_volume.z_data.y) * ONE_OVER_EPSILON; + color = (any(lessThan(pv_check_min, vec3(1.0))) || any(greaterThan(pv_check_max, vec3(1.0)))) ? mix(color, ZERO, 0.3333) : color; + } + if(extruder_printable_heights.x >= 1.0 ){ + pv_check_min = (world_pos.xyz - vec3(print_volume.xy_data.x, print_volume.xy_data.y, extruder_printable_heights.y)) * ONE_OVER_EPSILON; + pv_check_max = (world_pos.xyz - vec3(print_volume.xy_data.z, print_volume.xy_data.w, extruder_printable_heights.z)) * ONE_OVER_EPSILON; + bool is_out_printable_height = (all(greaterThan(pv_check_min, vec3(1.0))) && all(lessThan(pv_check_max, vec3(1.0)))) ; + color = is_out_printable_height ? mix(color, ZERO, 0.7) : color; + } + //QDS: add outline_color + if (is_outline) + frag_color = uniform_color; +#ifdef ENABLE_ENVIRONMENT_MAP + else if (use_environment_tex) + frag_color = vec4(0.45 * texture(environment_tex, normalize(eye_normal).xy * 0.5 + 0.5).xyz + 0.8 * color * intensity.x, alpha); +#endif + else + frag_color = vec4(vec3(intensity.y) + color * intensity.x, alpha); + + // In the support painting gizmo and the seam painting gizmo are painted triangles rendered over the already + // rendered object. To resolved z-fighting between previously rendered object and painted triangles, values + // inside the depth buffer are offset by small epsilon for painted triangles inside those gizmos. + gl_FragDepth = gl_FragCoord.z - (offset_depth_buffer ? EPSILON : 0.0); +} \ No newline at end of file diff --git a/resources/shaders/gouraud_130.vs b/resources/shaders/140/gouraud.vs similarity index 71% rename from resources/shaders/gouraud_130.vs rename to resources/shaders/140/gouraud.vs index 9d46b5c..2b0eecc 100644 --- a/resources/shaders/gouraud_130.vs +++ b/resources/shaders/140/gouraud.vs @@ -1,5 +1,4 @@ -#version 130 - +#version 140 #define INTENSITY_CORRECTION 0.6 // normalized values for (-0.6/1.31, 0.6/1.31, 1./1.31) @@ -14,6 +13,9 @@ const vec3 LIGHT_FRONT_DIR = vec3(0.6985074, 0.1397015, 0.6985074); //#define LIGHT_FRONT_SPECULAR (0.0 * INTENSITY_CORRECTION) //#define LIGHT_FRONT_SHININESS 5.0 +const vec3 LIGHT_BACK_DIR = vec3(0.1397015, 0.6985074,0.6985074); +#define LIGHT_BACK_DIFFUSE (0.3 * INTENSITY_CORRECTION) + #define INTENSITY_AMBIENT 0.3 const vec3 ZERO = vec3(0.0, 0.0, 0.0); @@ -25,6 +27,13 @@ struct SlopeDetection mat3 volume_world_normal_matrix; }; +in vec3 v_position; +in vec3 v_normal; + +uniform mat4 view_model_matrix; +uniform mat4 projection_matrix; +uniform mat3 normal_matrix; + uniform mat4 volume_world_matrix; uniform SlopeDetection slope; @@ -32,48 +41,45 @@ uniform SlopeDetection slope; uniform vec2 z_range; // Clipping plane - general orientation. Used by the SLA gizmo. uniform vec4 clipping_plane; - +uniform bool is_text_shape; // x = diffuse, y = specular; -varying vec2 intensity; +out vec2 intensity; -varying vec3 clipping_planes_dots; +out vec3 clipping_planes_dots; -varying vec4 model_pos; -varying vec4 world_pos; -varying float world_normal_z; -varying vec3 eye_normal; - -varying vec3 barycentric_coordinates; +out vec4 model_pos; +out vec4 world_pos; +out float world_normal_z; +out vec3 eye_normal; void main() { // First transform the normal into camera space and normalize the result. - eye_normal = normalize(gl_NormalMatrix * gl_Normal); + eye_normal = normalize(normal_matrix * v_normal); // Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex. // Since these two are normalized the cosine is the dot product. We also need to clamp the result to the [0,1] range. float NdotL = max(dot(eye_normal, LIGHT_TOP_DIR), 0.0); intensity.x = INTENSITY_AMBIENT + NdotL * LIGHT_TOP_DIFFUSE; - vec3 position = (gl_ModelViewMatrix * gl_Vertex).xyz; - intensity.y = LIGHT_TOP_SPECULAR * pow(max(dot(-normalize(position), reflect(-LIGHT_TOP_DIR, eye_normal)), 0.0), LIGHT_TOP_SHININESS); + vec4 position = (view_model_matrix * vec4(v_position, 1.0)); + intensity.y = LIGHT_TOP_SPECULAR * pow(max(dot(-normalize(position.xyz), reflect(-LIGHT_TOP_DIR, eye_normal)), 0.0), LIGHT_TOP_SHININESS); // Perform the same lighting calculation for the 2nd light source (no specular applied). NdotL = max(dot(eye_normal, LIGHT_FRONT_DIR), 0.0); intensity.x += NdotL * LIGHT_FRONT_DIFFUSE; - model_pos = gl_Vertex; + if(!is_text_shape){ + NdotL = max(dot(eye_normal, LIGHT_BACK_DIR), 0.0); + intensity.x += NdotL * LIGHT_BACK_DIFFUSE; + } // Point in homogenous coordinates. - world_pos = volume_world_matrix * gl_Vertex; + world_pos = volume_world_matrix * vec4(v_position, 1.0); // z component of normal vector in world coordinate used for slope shading - world_normal_z = slope.actived ? (normalize(slope.volume_world_normal_matrix * gl_Normal)).z : 0.0; + world_normal_z = slope.actived ? (normalize(slope.volume_world_normal_matrix * v_normal)).z : 0.0; - gl_Position = ftransform(); + gl_Position = projection_matrix * position; // Fill in the scalars for fragment shader clipping. Fragments with any of these components lower than zero are discarded. clipping_planes_dots = vec3(dot(world_pos, clipping_plane), world_pos.z - z_range.x, z_range.y - world_pos.z); - - //compute the Barycentric Coordinates - int vertexMod3 = gl_VertexID % 3; - barycentric_coordinates = vec3(float(vertexMod3 == 0), float(vertexMod3 == 1), float(vertexMod3 == 2)); } diff --git a/resources/shaders/140/gouraud_light.fs b/resources/shaders/140/gouraud_light.fs new file mode 100644 index 0000000..96eee3a --- /dev/null +++ b/resources/shaders/140/gouraud_light.fs @@ -0,0 +1,14 @@ +#version 140 + +uniform vec4 uniform_color; +uniform float emission_factor; + +// x = tainted, y = specular; +in vec2 intensity; + +out vec4 frag_color; + +void main() +{ + frag_color = vec4(vec3(intensity.y) + uniform_color.rgb * (intensity.x + emission_factor), uniform_color.a); +} diff --git a/resources/shaders/gouraud_light.vs b/resources/shaders/140/gouraud_light.vs similarity index 76% rename from resources/shaders/gouraud_light.vs rename to resources/shaders/140/gouraud_light.vs index d4f7193..9687ea9 100644 --- a/resources/shaders/gouraud_light.vs +++ b/resources/shaders/140/gouraud_light.vs @@ -1,4 +1,4 @@ -#version 110 +#version 140 #define INTENSITY_CORRECTION 0.6 @@ -14,25 +14,32 @@ const vec3 LIGHT_FRONT_DIR = vec3(0.6985074, 0.1397015, 0.6985074); #define INTENSITY_AMBIENT 0.3 +in vec3 v_position; +in vec3 v_normal; + +uniform mat4 view_model_matrix; +uniform mat4 projection_matrix; +uniform mat3 normal_matrix; + // x = tainted, y = specular; -varying vec2 intensity; +out vec2 intensity; void main() { // First transform the normal into camera space and normalize the result. - vec3 normal = normalize(gl_NormalMatrix * gl_Normal); - + vec3 normal = normalize(normal_matrix * v_normal); + // Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex. // Since these two are normalized the cosine is the dot product. We also need to clamp the result to the [0,1] range. float NdotL = max(dot(normal, LIGHT_TOP_DIR), 0.0); intensity.x = INTENSITY_AMBIENT + NdotL * LIGHT_TOP_DIFFUSE; - vec3 position = (gl_ModelViewMatrix * gl_Vertex).xyz; - intensity.y = LIGHT_TOP_SPECULAR * pow(max(dot(-normalize(position), reflect(-LIGHT_TOP_DIR, normal)), 0.0), LIGHT_TOP_SHININESS); + vec4 position = view_model_matrix * vec4(v_position, 1.0); + intensity.y = LIGHT_TOP_SPECULAR * pow(max(dot(-normalize(position.xyz), reflect(-LIGHT_TOP_DIR, normal)), 0.0), LIGHT_TOP_SHININESS); // Perform the same lighting calculation for the 2nd light source (no specular applied). NdotL = max(dot(normal, LIGHT_FRONT_DIR), 0.0); intensity.x += NdotL * LIGHT_FRONT_DIFFUSE; - gl_Position = ftransform(); + gl_Position = projection_matrix * position; } diff --git a/resources/shaders/140/gouraud_light_instanced.vs b/resources/shaders/140/gouraud_light_instanced.vs new file mode 100644 index 0000000..981df69 --- /dev/null +++ b/resources/shaders/140/gouraud_light_instanced.vs @@ -0,0 +1,67 @@ +#version 140 + +#define INTENSITY_CORRECTION 0.6 + +// normalized values for (-0.6/1.31, 0.6/1.31, 1./1.31) +const vec3 LIGHT_TOP_DIR = vec3(-0.4574957, 0.4574957, 0.7624929); +#define LIGHT_TOP_DIFFUSE (0.8 * INTENSITY_CORRECTION) +#define LIGHT_TOP_SPECULAR (0.125 * INTENSITY_CORRECTION) +#define LIGHT_TOP_SHININESS 20.0 + +// normalized values for (1./1.43, 0.2/1.43, 1./1.43) +const vec3 LIGHT_FRONT_DIR = vec3(0.6985074, 0.1397015, 0.6985074); +#define LIGHT_FRONT_DIFFUSE (0.3 * INTENSITY_CORRECTION) + +#define INTENSITY_AMBIENT 0.3 + +// vertex attributes +in vec3 v_position; +in vec3 v_normal; +// instance attributes +in vec3 i_offset; +in vec2 i_scales; + +in mat4 instanceMatrix; +uniform mat4 view_matrix; +uniform mat4 projection_matrix; + +// x = tainted, y = specular; +out vec2 intensity; + +mat3 inverse_mat3(mat3 m) { + float a00 = m[0][0], a01 = m[0][1], a02 = m[0][2]; + float a10 = m[1][0], a11 = m[1][1], a12 = m[1][2]; + float a20 = m[2][0], a21 = m[2][1], a22 = m[2][2]; + + float b01 = a22 * a11 - a12 * a21; + float b11 = -a22 * a10 + a12 * a20; + float b21 = a21 * a10 - a11 * a20; + + float det = a00 * b01 + a01 * b11 + a02 * b21; + + return mat3(b01, (-a22 * a01 + a02 * a21), (a12 * a01 - a02 * a11), + b11, (a22 * a00 - a02 * a20), (-a12 * a00 + a02 * a10), + b21, (-a21 * a00 + a01 * a20), (a11 * a00 - a01 * a10)) / det; +} + +void main() +{ + mat4 view_model_matrix = view_matrix * instanceMatrix; + + // First transform the normal into camera space and normalize the result. + vec3 normal = normalize(transpose(inverse_mat3(mat3(view_model_matrix))) * v_normal); + + // Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex. + // Since these two are normalized the cosine is the dot product. We also need to clamp the result to the [0,1] range. + float NdotL = max(dot(normal, LIGHT_TOP_DIR), 0.0); + + intensity.x = INTENSITY_AMBIENT + NdotL * LIGHT_TOP_DIFFUSE; + vec4 position = view_model_matrix * vec4(v_position, 1.0); + intensity.y = LIGHT_TOP_SPECULAR * pow(max(dot(-normalize(position.xyz), reflect(-LIGHT_TOP_DIR, normal)), 0.0), LIGHT_TOP_SHININESS); + + // Perform the same lighting calculation for the 2nd light source (no specular applied). + NdotL = max(dot(normal, LIGHT_FRONT_DIR), 0.0); + intensity.x += NdotL * LIGHT_FRONT_DIFFUSE; + + gl_Position = projection_matrix * position; +} diff --git a/resources/shaders/140/hotbed.fs b/resources/shaders/140/hotbed.fs new file mode 100644 index 0000000..4e932fe --- /dev/null +++ b/resources/shaders/140/hotbed.fs @@ -0,0 +1,52 @@ +#version 140 + +const vec3 ZERO = vec3(0.0, 0.0, 0.0); +const vec3 WHITE = vec3(1.0, 1.0, 1.0); +const float ONE_OVER_EPSILON = 1e4; +struct PrintVolumeDetection +{ + // 0 = rectangle, 1 = circle, 2 = custom, 3 = invalid + int type; + // type = 0 (rectangle): + // x = min.x, y = min.y, z = max.x, w = max.y + // type = 1 (circle): + // x = center.x, y = center.y, z = radius + vec4 xy_data; + // x = min z, y = max z + vec2 z_data; +}; + +uniform vec4 uniform_color; +uniform float emission_factor; +uniform PrintVolumeDetection print_volume; +// x = diffuse, y = specular; +in vec2 intensity; +in vec4 world_pos; + +out vec4 frag_color; +void main() +{ + vec3 color = uniform_color.rgb; + float alpha = uniform_color.a; + // if the fragment is outside the print volume -> use darker color + vec3 pv_check_min = ZERO; + vec3 pv_check_max = ZERO; + if (print_volume.type == 0) {// rectangle + pv_check_min = world_pos.xyz - vec3(print_volume.xy_data.x, print_volume.xy_data.y, print_volume.z_data.x); + pv_check_max = world_pos.xyz - vec3(print_volume.xy_data.z, print_volume.xy_data.w, print_volume.z_data.y); + + pv_check_min = pv_check_min * ONE_OVER_EPSILON; + pv_check_max = pv_check_max * ONE_OVER_EPSILON; + color = (any(lessThan(pv_check_min, vec3(1.0))) || any(greaterThan(pv_check_max, vec3(1.0)))) ? mix(color, WHITE, 0.3333) : color; + } + else if (print_volume.type == 1) {// circle + float delta_radius = print_volume.xy_data.z - distance(world_pos.xy, print_volume.xy_data.xy); + pv_check_min = vec3(delta_radius, 0.0, world_pos.z - print_volume.z_data.x); + pv_check_max = vec3(0.0, 0.0, world_pos.z - print_volume.z_data.y); + + pv_check_min = pv_check_min * ONE_OVER_EPSILON; + pv_check_max = pv_check_max * ONE_OVER_EPSILON; + color = (any(lessThan(pv_check_min, vec3(1.0))) || any(greaterThan(pv_check_max, vec3(1.0)))) ? mix(color, WHITE, 0.3333) : color; + } + frag_color = vec4(vec3(intensity.y) + color * (intensity.x + emission_factor), alpha); +} \ No newline at end of file diff --git a/resources/shaders/140/hotbed.vs b/resources/shaders/140/hotbed.vs new file mode 100644 index 0000000..fa2c438 --- /dev/null +++ b/resources/shaders/140/hotbed.vs @@ -0,0 +1,47 @@ +#version 140 + +#define INTENSITY_CORRECTION 0.6 + +// normalized values for (-0.6/1.31, 0.6/1.31, 1./1.31) +const vec3 LIGHT_TOP_DIR = vec3(-0.4574957, 0.4574957, 0.7624929); +#define LIGHT_TOP_DIFFUSE (0.8 * INTENSITY_CORRECTION) +#define LIGHT_TOP_SPECULAR (0.125 * INTENSITY_CORRECTION) +#define LIGHT_TOP_SHININESS 20.0 + +// normalized values for (1./1.43, 0.2/1.43, 1./1.43) +const vec3 LIGHT_FRONT_DIR = vec3(0.6985074, 0.1397015, 0.6985074); +#define LIGHT_FRONT_DIFFUSE (0.3 * INTENSITY_CORRECTION) + +#define INTENSITY_AMBIENT 0.3 + +uniform mat4 view_model_matrix; +uniform mat4 projection_matrix; +uniform mat3 view_normal_matrix; +uniform mat4 volume_world_matrix; + +in vec3 v_position; +in vec3 v_normal; + +// x = tainted, y = specular; +out vec2 intensity; +out vec4 world_pos; +void main() +{ + // First transform the normal into camera space and normalize the result. + vec3 normal = normalize(view_normal_matrix * v_normal); + + // Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex. + // Since these two are normalized the cosine is the dot product. We also need to clamp the result to the [0,1] range. + float NdotL = max(dot(normal, LIGHT_TOP_DIR), 0.0); + + intensity.x = INTENSITY_AMBIENT + NdotL * LIGHT_TOP_DIFFUSE; + world_pos = volume_world_matrix * vec4(v_position, 1.0); + vec4 position = view_model_matrix * vec4(v_position, 1.0); + intensity.y = LIGHT_TOP_SPECULAR * pow(max(dot(-normalize(position.xyz), reflect(-LIGHT_TOP_DIR, normal)), 0.0), LIGHT_TOP_SHININESS); + + // Perform the same lighting calculation for the 2nd light source (no specular applied). + NdotL = max(dot(normal, LIGHT_FRONT_DIR), 0.0); + intensity.x += NdotL * LIGHT_FRONT_DIFFUSE; + + gl_Position = projection_matrix * position; +} diff --git a/resources/shaders/140/imgui.fs b/resources/shaders/140/imgui.fs new file mode 100644 index 0000000..21641ac --- /dev/null +++ b/resources/shaders/140/imgui.fs @@ -0,0 +1,12 @@ +#version 140 + +uniform sampler2D Texture; + +in vec2 Frag_UV; +in vec4 color; + +out vec4 frag_color; +void main() +{ + frag_color = color * texture(Texture, Frag_UV.st); +} \ No newline at end of file diff --git a/resources/shaders/140/imgui.vs b/resources/shaders/140/imgui.vs new file mode 100644 index 0000000..9f7f9c0 --- /dev/null +++ b/resources/shaders/140/imgui.vs @@ -0,0 +1,17 @@ +#version 140 + +uniform mat4 ProjMtx; + +in vec2 Position; +in vec2 UV; +in vec4 Color; + +out vec2 Frag_UV; +out vec4 color; + +void main() +{ + Frag_UV = UV; + color = Color; + gl_Position = ProjMtx * vec4(Position.xy, 0.0, 1.0); +} \ No newline at end of file diff --git a/resources/shaders/140/mainframe_composite.fs b/resources/shaders/140/mainframe_composite.fs new file mode 100644 index 0000000..b75bd60 --- /dev/null +++ b/resources/shaders/140/mainframe_composite.fs @@ -0,0 +1,12 @@ +#version 140 + +uniform sampler2D u_sampler; + +in vec2 tex_coords; + +out vec4 frag_color; + +void main() +{ + frag_color = texture(u_sampler, tex_coords); +} \ No newline at end of file diff --git a/resources/shaders/140/mainframe_composite.vs b/resources/shaders/140/mainframe_composite.vs new file mode 100644 index 0000000..9c6a901 --- /dev/null +++ b/resources/shaders/140/mainframe_composite.vs @@ -0,0 +1,12 @@ +#version 140 + +in vec3 v_position; +in vec2 v_tex_coord; + +out vec2 tex_coords; + +void main() +{ + tex_coords = v_tex_coord; + gl_Position = vec4(v_position, 1.0); +} \ No newline at end of file diff --git a/resources/shaders/140/mm_contour.fs b/resources/shaders/140/mm_contour.fs new file mode 100644 index 0000000..54a78af --- /dev/null +++ b/resources/shaders/140/mm_contour.fs @@ -0,0 +1,12 @@ +#version 140 + +const float EPSILON = 0.0001; + +out vec4 frag_color; +void main() +{ + frag_color = vec4(1.0, 1.0, 1.0, 1.0); + // Values inside depth buffer for fragments of the contour of a selected area are offset + // by small epsilon to solve z-fighting between painted triangles and contour lines. + gl_FragDepth = gl_FragCoord.z - EPSILON; +} diff --git a/resources/shaders/140/mm_contour.vs b/resources/shaders/140/mm_contour.vs new file mode 100644 index 0000000..7042671 --- /dev/null +++ b/resources/shaders/140/mm_contour.vs @@ -0,0 +1,11 @@ +#version 140 + +uniform mat4 view_model_matrix; +uniform mat4 projection_matrix; + +in vec3 v_position; + +void main() +{ + gl_Position = projection_matrix * view_model_matrix * vec4(v_position, 1.0); +} diff --git a/resources/shaders/mm_gouraud.fs b/resources/shaders/140/mm_gouraud_wireframe.fs similarity index 54% rename from resources/shaders/mm_gouraud.fs rename to resources/shaders/140/mm_gouraud_wireframe.fs index f561cf2..61cd703 100644 --- a/resources/shaders/mm_gouraud.fs +++ b/resources/shaders/140/mm_gouraud_wireframe.fs @@ -1,4 +1,4 @@ -#version 110 +#version 140 #define INTENSITY_CORRECTION 0.6 @@ -21,11 +21,14 @@ const float EPSILON = 0.0001; const vec3 ORANGE = vec3(0.8, 0.4, 0.0); const vec3 LightRed = vec3(0.78, 0.0, 0.0); const vec3 LightBlue = vec3(0.73, 1.0, 1.0); +const float CHESS_WIDTH = 2.0; +const vec3 COLOR_A = vec3(1.0, 1.0, 0.0); +const vec3 COLOR_B = vec3(0.3, 0.3, 0.0); uniform vec4 uniform_color; -varying vec3 clipping_planes_dots; -varying vec4 model_pos; -varying vec4 world_pos; +in vec3 clipping_planes_dots; +in vec3 model_pos; +in vec4 world_pos; uniform bool volume_mirrored; struct SlopeDetection @@ -36,6 +39,32 @@ struct SlopeDetection }; uniform SlopeDetection slope; +//QDS: add wireframe logic +in vec3 barycentric_coordinates; +float edgeFactor(float lineWidth) { + vec3 d = fwidth(barycentric_coordinates); + vec3 a3 = smoothstep(vec3(0.0), d * lineWidth, barycentric_coordinates); + return min(min(a3.x, a3.y), a3.z); +} + +vec3 wireframe(vec3 fill, vec3 stroke, float lineWidth) { + return mix(stroke, fill, edgeFactor(lineWidth)); + //if (any(lessThan(barycentric_coordinates, vec3(0.005, 0.005, 0.005)))) + // return vec3(1.0, 0.0, 0.0); + //else + // return fill; +} + +vec3 getWireframeColor(vec3 fill) { + float brightness = 0.2126 * fill.r + 0.7152 * fill.g + 0.0722 * fill.b; + return (brightness > 0.75) ? vec3(0.11, 0.165, 0.208) : vec3(0.988, 0.988, 0.988); +} +uniform bool show_wireframe; +uniform mat4 view_model_matrix; +uniform mat3 normal_matrix; + +out vec4 frag_color; + void main() { if (any(lessThan(clipping_planes_dots, ZERO))) @@ -49,21 +78,22 @@ void main() triangle_normal = -triangle_normal; } vec3 transformed_normal = normalize(slope.volume_world_normal_matrix * triangle_normal); - + if (slope.actived) { - if(world_pos.z<0.1&&world_pos.z>-0.1) - { - color = LightBlue; - alpha = 1.0; - } - else if( transformed_normal.z < slope.normal_z - EPSILON) - { - color = color * 0.7 + LightRed * 0.3; - alpha = 1.0; + alpha = 1.0; + if(abs(world_pos.z) < 0.1){ + color = LightBlue; + } + else if( transformed_normal.z < slope.normal_z - EPSILON){ + bool x_flag = mod(world_pos.x, CHESS_WIDTH) < (CHESS_WIDTH / 2.0); + bool y_flag = mod(world_pos.y, CHESS_WIDTH) < (CHESS_WIDTH / 2.0); + vec3 temp_color = (x_flag^^y_flag) ? COLOR_A : COLOR_B; + color = mix(color,temp_color,0.2); } } + // First transform the normal into camera space and normalize the result. - vec3 eye_normal = normalize(gl_NormalMatrix * triangle_normal); + vec3 eye_normal = normalize(normal_matrix * triangle_normal); // Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex. // Since these two are normalized the cosine is the dot product. We also need to clamp the result to the [0,1] range. @@ -72,12 +102,19 @@ void main() // x = diffuse, y = specular; vec2 intensity = vec2(0.0, 0.0); intensity.x = INTENSITY_AMBIENT + NdotL * LIGHT_TOP_DIFFUSE; - vec3 position = (gl_ModelViewMatrix * model_pos).xyz; + vec3 position = (view_model_matrix * vec4(model_pos, 1.0)).xyz; intensity.y = LIGHT_TOP_SPECULAR * pow(max(dot(-normalize(position), reflect(-LIGHT_TOP_DIR, eye_normal)), 0.0), LIGHT_TOP_SHININESS); // Perform the same lighting calculation for the 2nd light source (no specular applied). NdotL = max(dot(eye_normal, LIGHT_FRONT_DIR), 0.0); intensity.x += NdotL * LIGHT_FRONT_DIFFUSE; - gl_FragColor = vec4(vec3(intensity.y) + color * intensity.x, alpha); + if (show_wireframe) { + vec3 wireframeColor = getWireframeColor(color); + vec3 triangleColor = wireframe(color, wireframeColor, 1.0); + frag_color = vec4(vec3(intensity.y) + triangleColor * intensity.x, alpha); + } + else { + frag_color = vec4(vec3(intensity.y) + color * intensity.x, alpha); + } } diff --git a/resources/shaders/140/mm_gouraud_wireframe.vs b/resources/shaders/140/mm_gouraud_wireframe.vs new file mode 100644 index 0000000..ffe2d0c --- /dev/null +++ b/resources/shaders/140/mm_gouraud_wireframe.vs @@ -0,0 +1,47 @@ +#version 140 + +const vec3 ZERO = vec3(0.0, 0.0, 0.0); + +//attribute vec3 v_position; +//attribute vec3 v_barycentric; + +uniform mat4 view_model_matrix; +uniform mat4 projection_matrix; +uniform mat4 volume_world_matrix; +// Clipping plane, x = min z, y = max z. Used by the FFF and SLA previews to clip with a top / bottom plane. +uniform vec2 z_range; +// Clipping plane - general orientation. Used by the SLA gizmo. +uniform vec4 clipping_plane; + +in vec3 v_position; +in vec3 v_color; + +out vec3 clipping_planes_dots; +out vec3 model_pos; +out vec4 world_pos; +out vec3 barycentric_coordinates; + +struct SlopeDetection +{ + bool actived; + float normal_z; + mat3 volume_world_normal_matrix; +}; +uniform SlopeDetection slope; +void main() +{ + model_pos = v_position; + //model_pos = vec4(v_position, 1.0); + // Point in homogenous coordinates. + world_pos = volume_world_matrix * vec4(model_pos, 1.0); + + gl_Position = projection_matrix * view_model_matrix * vec4(v_position, 1.0); + //gl_Position = gl_ModelViewProjectionMatrix * vec4(v_position, 1.0); + // Fill in the scalars for fragment shader clipping. Fragments with any of these components lower than zero are discarded. + clipping_planes_dots = vec3(dot(world_pos, clipping_plane), world_pos.z - z_range.x, z_range.y - world_pos.z); + + //compute the Barycentric Coordinates + //int vertexMod3 = gl_VertexID % 3; + //barycentric_coordinates = vec3(float(vertexMod3 == 0), float(vertexMod3 == 1), float(vertexMod3 == 2)); + barycentric_coordinates = v_color.xyz;//v_barycentric +} diff --git a/resources/shaders/140/printbed.fs b/resources/shaders/140/printbed.fs new file mode 100644 index 0000000..17f5c15 --- /dev/null +++ b/resources/shaders/140/printbed.fs @@ -0,0 +1,29 @@ +#version 140 +const vec3 back_color_dark = vec3(0.235, 0.235, 0.235); +const vec3 back_color_light = vec3(0.365, 0.365, 0.365); +uniform sampler2D u_sampler; +uniform bool transparent_background; +uniform bool svg_source; +in vec2 tex_coord; +out vec4 frag_color; +vec4 svg_color(vec2 uv) +{ + // takes foreground from u_sampler + vec4 fore_color = texture(u_sampler, uv); + // calculates radial gradient + vec3 back_color = vec3(mix(back_color_light, back_color_dark, smoothstep(0.0, 0.5, length(abs(uv) - vec2(0.5))))); + // blends foreground with background + return vec4(mix(back_color, fore_color.rgb, fore_color.a), transparent_background ? fore_color.a : 1.0); +} +vec4 non_svg_color(vec2 uv) +{ + // takes foreground from u_sampler + vec4 color = texture(u_sampler, uv); + return vec4(color.rgb, transparent_background ? color.a * 0.25 : color.a); +} +void main() +{ + // flip uv + vec2 uv = vec2(tex_coord.x, 1.0 - tex_coord.y); + frag_color = svg_source ? svg_color(uv) : non_svg_color(uv); +} \ No newline at end of file diff --git a/resources/shaders/140/printbed.vs b/resources/shaders/140/printbed.vs new file mode 100644 index 0000000..5ca1517 --- /dev/null +++ b/resources/shaders/140/printbed.vs @@ -0,0 +1,15 @@ +#version 140 + +uniform mat4 view_model_matrix; +uniform mat4 projection_matrix; + +in vec3 v_position; +in vec2 v_tex_coord; + +out vec2 tex_coord; + +void main() +{ + tex_coord = v_tex_coord; + gl_Position = projection_matrix * view_model_matrix * vec4(v_position, 1.0); +} diff --git a/resources/shaders/140/silhouette.fs b/resources/shaders/140/silhouette.fs new file mode 100644 index 0000000..1b09200 --- /dev/null +++ b/resources/shaders/140/silhouette.fs @@ -0,0 +1,8 @@ +#version 140 +uniform vec3 u_base_color; + +out vec4 frag_color; +void main() +{ + frag_color = vec4(u_base_color, 1.0); +} \ No newline at end of file diff --git a/resources/shaders/140/silhouette.vs b/resources/shaders/140/silhouette.vs new file mode 100644 index 0000000..325c207 --- /dev/null +++ b/resources/shaders/140/silhouette.vs @@ -0,0 +1,11 @@ +#version 140 + +uniform mat4 u_model_matrix; +uniform mat4 u_view_projection_matrix; + +in vec3 v_position; + +void main() +{ + gl_Position = u_view_projection_matrix * u_model_matrix * vec4(v_position, 1.0); +} diff --git a/resources/shaders/140/silhouette_composite.fs b/resources/shaders/140/silhouette_composite.fs new file mode 100644 index 0000000..b96ab9a --- /dev/null +++ b/resources/shaders/140/silhouette_composite.fs @@ -0,0 +1,46 @@ +#version 140 +uniform sampler2D u_sampler; +uniform mat3 u_convolution_matrix; +uniform vec3 u_viewport_size_alpha; +uniform vec3 u_picking_color; +in vec2 tex_coords; + +out vec4 frag_color; + +vec4 sample(float offsetX, float offsetY) +{ + return texture(u_sampler, vec2(tex_coords.x + offsetX, tex_coords.y + offsetY)); +} +void main() +{ + vec4 pixels[9]; + float deltaWidth = 1.0 / u_viewport_size_alpha.x; + float deltaHeight = 1.0 / u_viewport_size_alpha.y; + float alpha = u_viewport_size_alpha.z; + float effect_width = 2.0; + deltaWidth = deltaWidth * effect_width; + deltaHeight = deltaHeight * effect_width; + + pixels[0] = sample(-deltaWidth, deltaHeight ); + pixels[1] = sample(0.0, deltaHeight ); + pixels[2] = sample(deltaWidth, deltaHeight ); + pixels[3] = sample(-deltaWidth, 0.0); + pixels[4] = sample(0.0, 0.0); + pixels[5] = sample(deltaWidth, 0.0); + pixels[6] = sample(-deltaWidth, -deltaHeight); + pixels[7] = sample(0.0, -deltaHeight); + pixels[8] = sample(deltaWidth, -deltaHeight); + vec4 accumulator = vec4(0.0); + for (int i = 0; i < 3; i++) + { + for (int j = 0; j < 3; ++j) + { + accumulator += sign(pixels[3 * i + j].a) * vec4(u_picking_color, 1.0) * u_convolution_matrix[i][j]; + } + } + + if ((abs(accumulator.a) - alpha * pixels[4].a) * 1e6 > 1.0) { + accumulator = vec4(u_picking_color, abs(accumulator.a)); + } + frag_color = accumulator; +} \ No newline at end of file diff --git a/resources/shaders/140/silhouette_composite.vs b/resources/shaders/140/silhouette_composite.vs new file mode 100644 index 0000000..9c6a901 --- /dev/null +++ b/resources/shaders/140/silhouette_composite.vs @@ -0,0 +1,12 @@ +#version 140 + +in vec3 v_position; +in vec2 v_tex_coord; + +out vec2 tex_coords; + +void main() +{ + tex_coords = v_tex_coord; + gl_Position = vec4(v_position, 1.0); +} \ No newline at end of file diff --git a/resources/shaders/140/thumbnail.fs b/resources/shaders/140/thumbnail.fs new file mode 100644 index 0000000..1ba0edb --- /dev/null +++ b/resources/shaders/140/thumbnail.fs @@ -0,0 +1,23 @@ +#version 140 + +uniform bool ban_light; +uniform vec4 uniform_color; +uniform float emission_factor; + +// x = tainted, y = specular; +in vec2 intensity; +//varying float drop; +in vec4 world_pos; + +out vec4 frag_color; + +void main() +{ + if (world_pos.z < 0.0) + discard; + if(ban_light){ + frag_color = uniform_color; + } else{ + frag_color = vec4(vec3(intensity.y) + uniform_color.rgb * (intensity.x + emission_factor), uniform_color.a); + } +} diff --git a/resources/shaders/140/thumbnail.vs b/resources/shaders/140/thumbnail.vs new file mode 100644 index 0000000..9310375 --- /dev/null +++ b/resources/shaders/140/thumbnail.vs @@ -0,0 +1,50 @@ +#version 140 + +#define INTENSITY_CORRECTION 0.6 + +// normalized values for (-0.6/1.31, 0.6/1.31, 1./1.31) +const vec3 LIGHT_TOP_DIR = vec3(-0.4574957, 0.4574957, 0.7624929); +#define LIGHT_TOP_DIFFUSE (0.8 * INTENSITY_CORRECTION) +#define LIGHT_TOP_SPECULAR (0.125 * INTENSITY_CORRECTION) +#define LIGHT_TOP_SHININESS 20.0 + +// normalized values for (1./1.43, 0.2/1.43, 1./1.43) +const vec3 LIGHT_FRONT_DIR = vec3(0.6985074, 0.1397015, 0.6985074); +#define LIGHT_FRONT_DIFFUSE (0.3 * INTENSITY_CORRECTION) + +#define INTENSITY_AMBIENT 0.3 + +in vec3 v_position; +in vec3 v_normal; + +uniform mat4 view_model_matrix; +uniform mat4 projection_matrix; +uniform mat3 normal_matrix; + +uniform mat4 volume_world_matrix; +// x = tainted, y = specular; +out vec2 intensity; +out vec4 world_pos; + +void main() +{ + // First transform the normal into camera space and normalize the result. + vec3 normal = normalize(normal_matrix * v_normal); + + // Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex. + // Since these two are normalized the cosine is the dot product. We also need to clamp the result to the [0,1] range. + float NdotL = max(dot(normal, LIGHT_TOP_DIR), 0.0); + + intensity.x = INTENSITY_AMBIENT + NdotL * LIGHT_TOP_DIFFUSE; + vec4 position = (view_model_matrix * vec4(v_position, 1.0)); + intensity.y = LIGHT_TOP_SPECULAR * pow(max(dot(-normalize(position.xyz), reflect(-LIGHT_TOP_DIR, normal)), 0.0), LIGHT_TOP_SHININESS); + + // Perform the same lighting calculation for the 2nd light source (no specular applied). + NdotL = max(dot(normal, LIGHT_FRONT_DIR), 0.0); + intensity.x += NdotL * LIGHT_FRONT_DIFFUSE; + + // Point in homogenous coordinates. + world_pos = volume_world_matrix * vec4(v_position, 1.0); + + gl_Position = projection_matrix * position; +} diff --git a/resources/shaders/140/toolpaths_lines.fs b/resources/shaders/140/toolpaths_lines.fs new file mode 100644 index 0000000..e43bbf5 --- /dev/null +++ b/resources/shaders/140/toolpaths_lines.fs @@ -0,0 +1,30 @@ +#version 140 + +// normalized values for (-0.6/1.31, 0.6/1.31, 1./1.31) +const vec3 LIGHT_TOP_DIR = vec3(-0.4574957, 0.4574957, 0.7624929); +const vec3 LIGHT_FRONT_DIR = vec3(0.0, 0.0, 1.0); + +// x = ambient, y = top diffuse, z = front diffuse, w = global +uniform vec4 light_intensity; +uniform vec4 uniform_color; + +in vec3 eye_normal; + +out vec4 frag_color; + +void main() +{ + vec3 normal = normalize(eye_normal); + + // Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex. + // Since these two are normalized the cosine is the dot product. Take the abs value to light the lines no matter in which direction the normal points. + float NdotL = abs(dot(normal, LIGHT_TOP_DIR)); + + float intensity = light_intensity.x + NdotL * light_intensity.y; + + // Perform the same lighting calculation for the 2nd light source. + NdotL = abs(dot(normal, LIGHT_FRONT_DIR)); + intensity += NdotL * light_intensity.z; + + frag_color = vec4(uniform_color.rgb * light_intensity.w * intensity, uniform_color.a); +} diff --git a/resources/shaders/140/toolpaths_lines.vs b/resources/shaders/140/toolpaths_lines.vs new file mode 100644 index 0000000..97937c6 --- /dev/null +++ b/resources/shaders/140/toolpaths_lines.vs @@ -0,0 +1,16 @@ +#version 140 + +in vec3 v_position; +in vec3 v_normal; + +uniform mat4 view_model_matrix; +uniform mat4 projection_matrix; +uniform mat3 normal_matrix; + +out vec3 eye_normal; + +void main() +{ + gl_Position = projection_matrix * view_model_matrix * vec4(v_position, 1.0); + eye_normal = normal_matrix * v_normal; +} diff --git a/resources/shaders/140/variable_layer_height.fs b/resources/shaders/140/variable_layer_height.fs new file mode 100644 index 0000000..185f237 --- /dev/null +++ b/resources/shaders/140/variable_layer_height.fs @@ -0,0 +1,43 @@ +#version 140 + +#define M_PI 3.1415926535897932384626433832795 + +// 2D texture (1D texture split by the rows) of color along the object Z axis. +uniform sampler2D z_texture; +// Scaling from the Z texture rows coordinate to the normalized texture row coordinate. +uniform float z_to_texture_row; +uniform float z_texture_row_to_normalized; +uniform float z_cursor; +uniform float z_cursor_band_width; + +// x = tainted, y = specular; +in vec2 intensity; + +in float object_z; + +out vec4 frag_color; + +void main() +{ + float object_z_row = z_to_texture_row * object_z; + // Index of the row in the texture. + float z_texture_row = floor(object_z_row); + // Normalized coordinate from 0. to 1. + float z_texture_col = object_z_row - z_texture_row; + float z_blend = 0.25 * cos(min(M_PI, abs(M_PI * (object_z - z_cursor) * 1.8 / z_cursor_band_width))) + 0.25; + // Calculate level of detail from the object Z coordinate. + // This makes the slowly sloping surfaces to be shown with high detail (with stripes), + // and the vertical surfaces to be shown with low detail (no stripes) + float z_in_cells = object_z_row * 190.; + // Gradient of Z projected on the screen. + float dx_vtc = dFdx(z_in_cells); + float dy_vtc = dFdy(z_in_cells); + float lod = clamp(0.5 * log2(max(dx_vtc * dx_vtc, dy_vtc * dy_vtc)), 0., 1.); + // Sample the Z texture. Texture coordinates are normalized to <0, 1>. + vec4 color = vec4(0.25, 0.25, 0.25, 1.0); + if (z_texture_row >= 0.0) + color = mix(texture(z_texture, vec2(z_texture_col, z_texture_row_to_normalized * (z_texture_row + 0.5 )), -10000.), + texture(z_texture, vec2(z_texture_col, z_texture_row_to_normalized * (z_texture_row * 2. + 1.)), 10000.), lod); + // Mix the final color. + frag_color = vec4(vec3(intensity.y), 1.0) + intensity.x * mix(color, vec4(1.0, 1.0, 0.0, 1.0), z_blend); +} diff --git a/resources/shaders/140/variable_layer_height.vs b/resources/shaders/140/variable_layer_height.vs new file mode 100644 index 0000000..7396075 --- /dev/null +++ b/resources/shaders/140/variable_layer_height.vs @@ -0,0 +1,60 @@ +#version 140 + +#define INTENSITY_CORRECTION 0.6 + +const vec3 LIGHT_TOP_DIR = vec3(-0.4574957, 0.4574957, 0.7624929); +#define LIGHT_TOP_DIFFUSE (0.8 * INTENSITY_CORRECTION) +#define LIGHT_TOP_SPECULAR (0.125 * INTENSITY_CORRECTION) +#define LIGHT_TOP_SHININESS 20.0 + +const vec3 LIGHT_FRONT_DIR = vec3(0.6985074, 0.1397015, 0.6985074); +#define LIGHT_FRONT_DIFFUSE (0.3 * INTENSITY_CORRECTION) +//#define LIGHT_FRONT_SPECULAR (0.0 * INTENSITY_CORRECTION) +//#define LIGHT_FRONT_SHININESS 5.0 + +#define INTENSITY_AMBIENT 0.3 + +in vec3 v_position; +in vec3 v_normal; +in vec2 v_tex_coord; + +uniform mat4 view_model_matrix; +uniform mat4 projection_matrix; +uniform mat3 normal_matrix; + +uniform mat4 volume_world_matrix; +uniform float object_max_z; + +// x = tainted, y = specular; +out vec2 intensity; + +out float object_z; + +void main() +{ + // First transform the normal into camera space and normalize the result. + vec3 normal = normalize(normal_matrix * v_normal); + + // Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex. + // Since these two are normalized the cosine is the dot product. We also need to clamp the result to the [0,1] range. + float NdotL = max(dot(normal, LIGHT_TOP_DIR), 0.0); + + intensity.x = INTENSITY_AMBIENT + NdotL * LIGHT_TOP_DIFFUSE; + vec4 position = view_model_matrix * vec4(v_position, 1.0); + intensity.y = LIGHT_TOP_SPECULAR * pow(max(dot(-normalize(position.xyz), reflect(-LIGHT_TOP_DIR, normal)), 0.0), LIGHT_TOP_SHININESS); + + // Perform the same lighting calculation for the 2nd light source (no specular) + NdotL = max(dot(normal, LIGHT_FRONT_DIR), 0.0); + + intensity.x += NdotL * LIGHT_FRONT_DIFFUSE; + + // Scaled to widths of the Z texture. + if (object_max_z > 0.0) + // when rendering the overlay + object_z = object_max_z * v_tex_coord.y; + else + // when rendering the volumes + object_z = (volume_world_matrix * vec4(v_position, 1.0)).z; + + gl_Position = projection_matrix * position; +} diff --git a/resources/shaders/cali.fs b/resources/shaders/cali.fs deleted file mode 100644 index ab65699..0000000 --- a/resources/shaders/cali.fs +++ /dev/null @@ -1,8 +0,0 @@ -#version 110 - -uniform vec4 uniform_color; - -void main() -{ - gl_FragColor = uniform_color; -} diff --git a/resources/shaders/cali.vs b/resources/shaders/cali.vs deleted file mode 100644 index d0d3ee4..0000000 --- a/resources/shaders/cali.vs +++ /dev/null @@ -1,6 +0,0 @@ -#version 110 - -void main() -{ - gl_Position = ftransform(); -} diff --git a/resources/shaders/gouraud_130.fs b/resources/shaders/gouraud_130.fs deleted file mode 100644 index d97fb45..0000000 --- a/resources/shaders/gouraud_130.fs +++ /dev/null @@ -1,124 +0,0 @@ -#version 130 - -const vec3 ZERO = vec3(0.0, 0.0, 0.0); -//QDS: add grey and orange -//const vec3 GREY = vec3(0.9, 0.9, 0.9); -const vec3 ORANGE = vec3(0.8, 0.4, 0.0); -const float EPSILON = 0.0001; - -struct PrintVolumeDetection -{ - // 0 = rectangle, 1 = circle, 2 = custom, 3 = invalid - int type; - // type = 0 (rectangle): - // x = min.x, y = min.y, z = max.x, w = max.y - // type = 1 (circle): - // x = center.x, y = center.y, z = radius - vec4 xy_data; - // x = min z, y = max z - vec2 z_data; -}; - -struct SlopeDetection -{ - bool actived; - float normal_z; - mat3 volume_world_normal_matrix; -}; - -//QDS: add wireframe logic -varying vec3 barycentric_coordinates; -float edgeFactor(float lineWidth) { - vec3 d = fwidth(barycentric_coordinates); - vec3 a3 = smoothstep(vec3(0.0), d * lineWidth, barycentric_coordinates); - return min(min(a3.x, a3.y), a3.z); -} - -vec3 wireframe(vec3 fill, vec3 stroke, float lineWidth) { - return mix(stroke, fill, edgeFactor(lineWidth)); -} - -vec3 getWireframeColor(vec3 fill) { - float brightness = 0.2126 * fill.r + 0.7152 * fill.g + 0.0722 * fill.b; - return (brightness > 0.75) ? vec3(0.11, 0.165, 0.208) : vec3(0.988, 0.988, 0.988); -} - -uniform vec4 uniform_color; -uniform SlopeDetection slope; - -//QDS: add outline_color -uniform bool is_outline; -uniform bool show_wireframe; - -uniform bool offset_depth_buffer; - -#ifdef ENABLE_ENVIRONMENT_MAP - uniform sampler2D environment_tex; - uniform bool use_environment_tex; -#endif // ENABLE_ENVIRONMENT_MAP - -varying vec3 clipping_planes_dots; - -// x = diffuse, y = specular; -varying vec2 intensity; - -uniform PrintVolumeDetection print_volume; - -varying vec4 model_pos; -varying vec4 world_pos; -varying float world_normal_z; -varying vec3 eye_normal; - -void main() -{ - if (any(lessThan(clipping_planes_dots, ZERO))) - discard; - vec3 color = uniform_color.rgb; - float alpha = uniform_color.a; - - if (slope.actived && world_normal_z < slope.normal_z - EPSILON) { - //color = vec3(0.7, 0.7, 1.0); - color = ORANGE; - alpha = 1.0; - } - - // if the fragment is outside the print volume -> use darker color - vec3 pv_check_min = ZERO; - vec3 pv_check_max = ZERO; - if (print_volume.type == 0) { - // rectangle - pv_check_min = world_pos.xyz - vec3(print_volume.xy_data.x, print_volume.xy_data.y, print_volume.z_data.x); - pv_check_max = world_pos.xyz - vec3(print_volume.xy_data.z, print_volume.xy_data.w, print_volume.z_data.y); - color = (any(lessThan(pv_check_min, ZERO)) || any(greaterThan(pv_check_max, ZERO))) ? mix(color, ZERO, 0.3333) : color; - } - else if (print_volume.type == 1) { - // circle - float delta_radius = print_volume.xy_data.z - distance(world_pos.xy, print_volume.xy_data.xy); - pv_check_min = vec3(delta_radius, 0.0, world_pos.z - print_volume.z_data.x); - pv_check_max = vec3(0.0, 0.0, world_pos.z - print_volume.z_data.y); - color = (any(lessThan(pv_check_min, ZERO)) || any(greaterThan(pv_check_max, ZERO))) ? mix(color, ZERO, 0.3333) : color; - } - - //QDS: add outline_color - if (is_outline) - gl_FragColor = uniform_color; -#ifdef ENABLE_ENVIRONMENT_MAP - else if (use_environment_tex) - gl_FragColor = vec4(0.45 * texture2D(environment_tex, normalize(eye_normal).xy * 0.5 + 0.5).xyz + 0.8 * color * intensity.x, alpha); -#endif - else { - //gl_FragColor = vec4(vec3(intensity.y) + color * intensity.x, alpha); - if (show_wireframe) { - vec3 wireframeColor = show_wireframe ? getWireframeColor(color) : color; - vec3 triangleColor = wireframe(color, wireframeColor, 1.0); - gl_FragColor = vec4(vec3(intensity.y) + triangleColor * intensity.x, alpha); - } - else { - gl_FragColor = vec4(vec3(intensity.y) + color * intensity.x, alpha); - } - } - // In the support painting gizmo and the seam painting gizmo are painted triangles rendered over the already - // rendered object. To resolved z-fighting between previously rendered object and painted triangles, values - // inside the depth buffer are offset by small epsilon for painted triangles inside those gizmos. - gl_FragDepth = gl_FragCoord.z - (offset_depth_buffer ? EPSILON : 0.0); -} \ No newline at end of file diff --git a/resources/shaders/gouraud_light_instanced.fs b/resources/shaders/gouraud_light_instanced.fs deleted file mode 100644 index 970185a..0000000 --- a/resources/shaders/gouraud_light_instanced.fs +++ /dev/null @@ -1,12 +0,0 @@ -#version 110 - -uniform vec4 uniform_color; -uniform float emission_factor; - -// x = tainted, y = specular; -varying vec2 intensity; - -void main() -{ - gl_FragColor = vec4(vec3(intensity.y) + uniform_color.rgb * (intensity.x + emission_factor), uniform_color.a); -} diff --git a/resources/shaders/mm_contour.vs b/resources/shaders/mm_contour.vs deleted file mode 100644 index d0d3ee4..0000000 --- a/resources/shaders/mm_contour.vs +++ /dev/null @@ -1,6 +0,0 @@ -#version 110 - -void main() -{ - gl_Position = ftransform(); -} diff --git a/resources/shaders/mm_gouraud.vs b/resources/shaders/mm_gouraud.vs deleted file mode 100644 index 5929c88..0000000 --- a/resources/shaders/mm_gouraud.vs +++ /dev/null @@ -1,30 +0,0 @@ -#version 110 - -const vec3 ZERO = vec3(0.0, 0.0, 0.0); - -uniform mat4 volume_world_matrix; -// Clipping plane, x = min z, y = max z. Used by the FFF and SLA previews to clip with a top / bottom plane. -uniform vec2 z_range; -// Clipping plane - general orientation. Used by the SLA gizmo. -uniform vec4 clipping_plane; - -varying vec3 clipping_planes_dots; -varying vec4 model_pos; -varying vec4 world_pos; -struct SlopeDetection -{ - bool actived; - float normal_z; - mat3 volume_world_normal_matrix; -}; -uniform SlopeDetection slope; -void main() -{ - model_pos = gl_Vertex; - // Point in homogenous coordinates. - world_pos = volume_world_matrix * gl_Vertex; - - gl_Position = ftransform(); - // Fill in the scalars for fragment shader clipping. Fragments with any of these components lower than zero are discarded. - clipping_planes_dots = vec3(dot(world_pos, clipping_plane), world_pos.z - z_range.x, z_range.y - world_pos.z); -} diff --git a/resources/shaders/options_110.vs b/resources/shaders/options_110.vs deleted file mode 100644 index 5f2ab23..0000000 --- a/resources/shaders/options_110.vs +++ /dev/null @@ -1,22 +0,0 @@ -#version 110 - -uniform bool use_fixed_screen_size; -uniform float zoom; -uniform float point_size; -uniform float near_plane_height; - -float fixed_screen_size() -{ - return point_size; -} - -float fixed_world_size() -{ - return (gl_Position.w == 1.0) ? zoom * near_plane_height * point_size : near_plane_height * point_size / gl_Position.w; -} - -void main() -{ - gl_Position = ftransform(); - gl_PointSize = use_fixed_screen_size ? fixed_screen_size() : fixed_world_size(); -} diff --git a/resources/shaders/options_120.fs b/resources/shaders/options_120.fs deleted file mode 100644 index e9b6130..0000000 --- a/resources/shaders/options_120.fs +++ /dev/null @@ -1,22 +0,0 @@ -// version 120 is needed for gl_PointCoord -#version 120 - -uniform vec4 uniform_color; -uniform float percent_outline_radius; -uniform float percent_center_radius; - -vec4 calc_color(float radius, vec4 color) -{ - return ((radius < percent_center_radius) || (radius > 1.0 - percent_outline_radius)) ? - vec4(0.5 * color.rgb, color.a) : color; -} - -void main() -{ - vec2 pos = (gl_PointCoord - 0.5) * 2.0; - float radius = length(pos); - if (radius > 1.0) - discard; - - gl_FragColor = calc_color(radius, uniform_color); -} diff --git a/resources/shaders/options_120.vs b/resources/shaders/options_120.vs deleted file mode 100644 index edb503f..0000000 --- a/resources/shaders/options_120.vs +++ /dev/null @@ -1,22 +0,0 @@ -#version 120 - -uniform bool use_fixed_screen_size; -uniform float zoom; -uniform float point_size; -uniform float near_plane_height; - -float fixed_screen_size() -{ - return point_size; -} - -float fixed_world_size() -{ - return (gl_Position.w == 1.0) ? zoom * near_plane_height * point_size : near_plane_height * point_size / gl_Position.w; -} - -void main() -{ - gl_Position = ftransform(); - gl_PointSize = use_fixed_screen_size ? fixed_screen_size() : fixed_world_size(); -} diff --git a/resources/shaders/outline.fs b/resources/shaders/outline.fs deleted file mode 100644 index f8f1385..0000000 --- a/resources/shaders/outline.fs +++ /dev/null @@ -1,10 +0,0 @@ -#version 110 - -const vec3 ORANGE = vec3(0.8, 0.4, 0.0); -uniform vec4 uniform_color; - -void main() -{ - gl_FragColor = uniform_color; - //gl_FragColor = vec4(ORANGE, 1.0); -} \ No newline at end of file diff --git a/resources/shaders/outline.vs b/resources/shaders/outline.vs deleted file mode 100644 index fd6580b..0000000 --- a/resources/shaders/outline.vs +++ /dev/null @@ -1,12 +0,0 @@ -#version 110 - -attribute vec4 v_position; -attribute vec2 v_tex_coords; - -varying vec2 tex_coords; - -void main() -{ - gl_Position = ftransform(); - tex_coords = v_tex_coords; -} diff --git a/resources/shaders/toolpaths_lines.vs b/resources/shaders/toolpaths_lines.vs deleted file mode 100644 index c008aed..0000000 --- a/resources/shaders/toolpaths_lines.vs +++ /dev/null @@ -1,9 +0,0 @@ -#version 110 - -varying vec3 eye_normal; - -void main() -{ - gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; - eye_normal = gl_NormalMatrix * gl_Normal; -} diff --git a/resources/web/data/text.js b/resources/web/data/text.js index ecdd824..f49e3b1 100644 --- a/resources/web/data/text.js +++ b/resources/web/data/text.js @@ -1,89 +1,89 @@ var LangText={ - "en": { - "t1": "Welcome to QIDI Studio", - "t2": "QIDI Studio will be setup in several steps. Let's start!", - "t3": "User Agreement", - "t4": "Disagree", - "t5": "Agree", - "t6": "We kindly request your help to improve everyone's printing.
Come and Join our Customer Experience Improvement Program", - "t7": "Join our Customer Experience Improvement Program", - "t8": "Back", - "t9": "Next", - "t10": "Printer Selection", - "t11": "All", - "t12": "Clear all", - "t13": "mm nozzle", - "t14": "Filament Selection", - "t15": "Printer", - "t16": "Filament type", - "t17": "Vendor", - "t18": "error", - "t19": "At least one filament must be selected.", - "t20": "Do you want to use default filament ?", - "t21": "yes", - "t22": "no", - "t23": "Release note", - "t24": "Get Started", - "t25": "Finish", - "t26": "Login", - "t27": "Register", - "t28": "Models", - "t29": "Mall", - "t30": "Manual", - "t31": "New Project", - "t32": "Create new project", - "t33": "Open Project", - "t34": "hotspot", - "t35": "Recently Opened", - "t36": "ok", - "t37": "At least one printer must be selected.", - "t38": "Cancel", - "t39": "Confirm", - "t40": "Network disconnect, please check and try again later.", - "t47": "Please select your login region", - "t48": "Asia-Pacific", - "t49": "Chinese Mainland", - "t50": "Log out", - "t52": "Skip", - "t53": "Join", - "t54": "In the 3D Printing community, we learn from each other's successes and failures to adjust our own slicing parameters and settings. QIDI Studio follows the same principle and uses machine learning to improve its performance from the successes and failures of the vast number of prints by our users. We are training QIDI Studio to be smarter by feeding them the real-world data. If you are willing, this service will access information from your error logs and usage logs, which may include information described in ", - "t55": "Privacy Policy", - "t56": ". We will not collect any Personal Data by which an individual can be identified directly or indirectly, including without limitation names, addresses, payment information, or phone numbers. By enabling this service, you agree to these terms and the statement about Privacy Policy.", - "t57": "", - "t58": "", - "t59": ".", - "t60": "Europe", - "t61": "North America", - "t62": "Others", - "t63": "After changing the region, your account will be logged out. Please log in again later.", - "t64": "QIDI Network plug-in", - "t65": "Sending print job via WLAN", - "t66": "Full remote control", - "t67": "Liveview streaming", - "t68": "User data synchronization", - "t69": "Install QIDI Network plug-in", - "t70": "", - "t71": "Downloading", - "t72": "Downloading failed", - "t73": "Installation successful.", - "t74": "Restart", - "t75": "QIDI Network plug-in provides the following features:", - "t76": "QIDI Network plug-in not detected. Click ", - "t77": "here", - "t78": " to install it.", - "t79": "Failed to install plug-in. ", - "t80": "Try the following steps:", - "t81": "1, Click ", - "t82": " to open the plug-in directory", - "t83": "2, Close all open QIDI Studio", - "t84": "3, Delete all files under the plug-in directory", - "t85": "4, Reopen QIDI studio and install the plug-in again", - "t86": "Close", - "t87": "User Manual", - "t88": "Remove", - "t89": "Open Containing Folder", - "t90": "3D Model", - "t91": "Download 3D models", + "en": { + "t1": "Welcome to QIDI Studio", + "t2": "QIDI Studio will be setup in several steps. Let's start!", + "t3": "User Agreement", + "t4": "Disagree", + "t5": "Agree", + "t6": "We kindly request your help to improve everyone's printing.
Come and Join our Customer Experience Improvement Program", + "t7": "Join our Customer Experience Improvement Program", + "t8": "Back", + "t9": "Next", + "t10": "Printer Selection", + "t11": "All", + "t12": "Clear all", + "t13": "mm nozzle", + "t14": "Filament Selection", + "t15": "Printer", + "t16": "Filament type", + "t17": "Vendor", + "t18": "error", + "t19": "At least one filament must be selected.", + "t20": "Do you want to use default filament ?", + "t21": "yes", + "t22": "no", + "t23": "Release note", + "t24": "Get Started", + "t25": "Finish", + "t26": "Login", + "t27": "Register", + "t28": "Models", + "t29": "Mall", + "t30": "Manual", + "t31": "New Project", + "t32": "Create new project", + "t33": "Open Project", + "t34": "hotspot", + "t35": "Recently Opened", + "t36": "ok", + "t37": "At least one printer must be selected.", + "t38": "Cancel", + "t39": "Confirm", + "t40": "Network disconnect, please check and try again later.", + "t47": "Please select your login region", + "t48": "Asia-Pacific", + "t49": "Chinese Mainland", + "t50": "Log out", + "t52": "Skip", + "t53": "Join", + "t54": "In the 3D Printing community, we learn from each other's successes and failures to adjust our own slicing parameters and settings. QIDI Studio follows the same principle and uses machine learning to improve its performance from the successes and failures of the vast number of prints by our users. We are training QIDI Studio to be smarter by feeding them the real-world data. If you are willing, this service will access information from your error logs and usage logs, which may include information described in ", + "t55": "Privacy Policy", + "t56": ". We will not collect any Personal Data by which an individual can be identified directly or indirectly, including without limitation names, addresses, payment information, or phone numbers. By enabling this service, you agree to these terms and the statement about Privacy Policy.", + "t57": "", + "t58": "", + "t59": ".", + "t60": "Europe", + "t61": "North America", + "t62": "Others", + "t63": "After changing the region, your account will be logged out. Please log in again later.", + "t64": "QIDI Network plug-in", + "t65": "Sending print job via WLAN or cloud service", + "t66": "Full remote control", + "t67": "Liveview streaming and printer status monitor", + "t68": "Cloud synchronization for slicing configuration", + "t69": "Install QIDI Network plug-in", + "t70": "", + "t71": "Downloading", + "t72": "Downloading failed", + "t73": "Installation successful.", + "t74": "Restart", + "t75": "QIDI Network plug-in provides the following features:", + "t76": "QIDI Network plug-in not detected. Click ", + "t77": "here", + "t78": " to install it.", + "t79": "Failed to install plug-in. ", + "t80": "Try the following steps:", + "t81": "1, Click ", + "t82": " to open the plug-in directory", + "t83": "2, Close all open QIDI Studio", + "t84": "3, Delete all files under the plug-in directory", + "t85": "4, Reopen QIDI studio and install the plug-in again", + "t86": "Close", + "t87": "User Manual", + "t88": "Remove", + "t89": "Open Containing Folder", + "t90": "3D Model", + "t91": "Download 3D models", "t92": "Create by", "t93": "Remixed by", "t94": "Shared by", @@ -91,22 +91,22 @@ var LangText={ "t96": "Accessories", "t97": "Profile Information", "t98": "Model name", - "t100":"Model description", - "t101":"BOM", - "t102":"Assembly Guide", - "t103":"Other", - "t104":"Profile name", - "t105":"Profile Author", - "t106":"Profile description", - "t107":"Online Models", - "t108":"MORE", - "t109":"System Filaments", - "t110":"Custom Filaments", - "t111":"Create New", - "t112":"Join the Program", - "t113":"You may change your choice in preference anytime.", - "t114":"Home", - "t115":"Batch", + "t100": "Model description", + "t101": "BOM", + "t102": "Assembly Guide", + "t103": "Other", + "t104": "Profile name", + "t105": "Profile Author", + "t106": "Profile description", + "t107": "Online Models", + "t108": "MORE", + "t109": "System Filaments", + "t110": "Custom Filaments", + "t111": "Create New", + "t112": "Join the Program", + "t113": "You may change your choice in preference anytime.", + "t114": "Home", + "t115": "Batch", "t116": "Retry", "t117": "Print History", "t118": "Printing", @@ -121,115 +121,115 @@ var LangText={ "t201":"Connect Device", "t202":"Please set up your printer connection to view the device.", "t203":"Please use the QIDI Link APP to connect to your printer. Once the link is completed, the online device will be synced to the \"Link\" page." - }, - "zh_CN": { - "t1": "欢迎使用QIDI Studio", - "t2": "QIDI Studio需要几步安装步骤,让我们开始吧!", - "t3": "用户使用协议", - "t4": "拒绝", - "t5": "同意", - "t6": "帮助提升QIDI Studio性能
欢迎加入我们的客户体验改善计划", - "t7": "允许发送匿名数据", - "t8": "上一步", - "t9": "下一步", - "t10": "选择打印机", - "t11": "全部", - "t12": "清空", - "t13": "mm 喷嘴", - "t14": "选择材料", - "t15": "打印机", - "t16": "材料类型", - "t17": "供应商", - "t18": "错误", - "t19": "至少要选择一款材料。", - "t20": "你希望使用默认的材料列表吗?", - "t21": "是", - "t22": "否", - "t23": "发布说明", - "t24": "开始", - "t25": "结束", - "t26": "登录", - "t27": "注册", - "t28": "模型", - "t29": "商城", - "t30": "使用手册", - "t31": "新建项目", - "t32": "创建一个新项目", - "t33": "打开项目", - "t34": "热点", - "t35": "近期打开文件", - "t36": "确定", - "t37": "至少需要选择一款打印机。", - "t38": "取消", - "t39": "确定", - "t40": "网络不通,请检查并稍后重试。", - "t47": "请选择登录区域", - "t48": "亚太", - "t49": "中国内地(大陆)", - "t50": "退出登录", - "t52": "忽略", - "t53": "同意", - "t54": "在3D打印社区,我们从彼此的成功和失败中学习调整自己的切片参数和设置。QIDI Studio遵循同样的原则,通过机器学习的方式从大量用户打印的成功和失败中获取经验,从而改善打印性能。我们正在通过向QIDI Studio提供真实世界的数据来训练他们变得更聪明。如果您愿意,此服务将访问您的错误日志和使用日志中的信息,其中可能包括", - "t55": "隐私政策", - "t56": "中描述的信息。我们不会收集任何可以直接或间接识别个人的个人数据,包括但不限于姓名、地址、支付信息或电话号码。启用此服务即表示您同意这些条款和有关隐私政策的声明。", - "t57": "", - "t58": "", - "t59": "。", - "t60": "欧洲", - "t61": "北美", - "t62": "其他", - "t63": "切换区域后,你的账号会被登出。稍后请重新登录。", - "t64": "QIDI网络插件", - "t65": "通过WLAN发送打印任务", - "t66": "强大的远程控制功能", - "t67": "实时视频流", - "t68": "用户数据同步", - "t69": "安装QIDI网络插件", - "t70": "", - "t71": "正在下载", - "t72": "下载失败", - "t73": "安装成功。", - "t74": "重启", - "t75": "QIDI网络插件提供以下功能:", - "t76": "没有发现QIDI网络插件,请", - "t77": "下载", - "t78": "并安装。", - "t79": "安装插件失败。", - "t80": "请尝试如下步骤:", - "t81": "1, 点击", - "t82": "打开插件所在目录", - "t83": "2, 关闭所有QIDI Studio", - "t84": "3, 删除插件所在目录下的所有文件", - "t85": "4, 重新启动QIDI Studio并尝试安装插件", - "t86": "关闭", - "t87": "使用引导", - "t88": "移除", - "t89": "打开所在的文件夹", - "t90": "3D 模型", - "t91": "下载3D模型", + }, + "zh_CN": { + "t1": "欢迎使用QIDI Studio", + "t2": "QIDI Studio需要几步安装步骤,让我们开始吧!", + "t3": "用户使用协议", + "t4": "拒绝", + "t5": "同意", + "t6": "帮助提升QIDI Studio性能
欢迎加入我们的客户体验改善计划", + "t7": "允许发送匿名数据", + "t8": "上一步", + "t9": "下一步", + "t10": "选择打印机", + "t11": "全部", + "t12": "清空", + "t13": "mm 喷嘴", + "t14": "选择材料", + "t15": "打印机", + "t16": "材料类型", + "t17": "供应商", + "t18": "错误", + "t19": "至少要选择一款材料。", + "t20": "你希望使用默认的材料列表吗?", + "t21": "是", + "t22": "否", + "t23": "发布说明", + "t24": "开始", + "t25": "结束", + "t26": "登录", + "t27": "注册", + "t28": "模型", + "t29": "商城", + "t30": "使用手册", + "t31": "新建项目", + "t32": "创建一个新项目", + "t33": "打开项目", + "t34": "热点", + "t35": "近期打开文件", + "t36": "确定", + "t37": "至少需要选择一款打印机。", + "t38": "取消", + "t39": "确定", + "t40": "网络不通,请检查并稍后重试。", + "t47": "请选择登录区域", + "t48": "亚太", + "t49": "中国内地(大陆)", + "t50": "退出登录", + "t52": "忽略", + "t53": "同意", + "t54": "在3D打印社区,我们从彼此的成功和失败中学习调整自己的切片参数和设置。QIDI Studio遵循同样的原则,通过机器学习的方式从大量用户打印的成功和失败中获取经验,从而改善打印性能。我们正在通过向QIDI Studio提供真实世界的数据来训练他们变得更聪明。如果您愿意,此服务将访问您的错误日志和使用日志中的信息,其中可能包括", + "t55": "隐私政策", + "t56": "中描述的信息。我们不会收集任何可以直接或间接识别个人的个人数据,包括但不限于姓名、地址、支付信息或电话号码。启用此服务即表示您同意这些条款和有关隐私政策的声明。", + "t57": "", + "t58": "", + "t59": "。", + "t60": "欧洲", + "t61": "北美", + "t62": "其他", + "t63": "切换区域后,你的账号会被登出。稍后请重新登录。", + "t64": "QIDI网络插件", + "t65": "通过局域网或云服务发送打印任务", + "t66": "强大的远程控制功能", + "t67": "实时视频流和打印机状态管理", + "t68": "通过云端同步切片设置", + "t69": "安装QIDI网络插件", + "t70": "", + "t71": "正在下载", + "t72": "下载失败", + "t73": "安装成功。", + "t74": "重启", + "t75": "QIDI网络插件提供以下功能:", + "t76": "没有发现QIDI网络插件,请", + "t77": "下载", + "t78": "并安装。", + "t79": "安装插件失败。", + "t80": "请尝试如下步骤:", + "t81": "1, 点击", + "t82": "打开插件所在目录", + "t83": "2, 关闭所有QIDI Studio", + "t84": "3, 删除插件所在目录下的所有文件", + "t85": "4, 重新启动QIDI Studio并尝试安装插件", + "t86": "关闭", + "t87": "使用引导", + "t88": "移除", + "t89": "打开所在的文件夹", + "t90": "3D 模型", + "t91": "下载3D模型", "t92": "创作", "t93": "修改", "t94": "分享", "t95": "模型信息", "t96": "附件", - "t97": "配置信息", + "t97": "配置信息", "t98": "模型名称", - "t100":"模型介绍", - "t101":"物料清单", - "t102":"装备指导", - "t103":"其他", - "t104":"配置名称", - "t105":"配置作者", - "t106":"配置介绍", - "t107":"在线模型", - "t108":"更多", - "t109":"系统材料", - "t110":"自建材料", - "t111":"新建", - "t112":"加入该计划", - "t113":"您可以随时更改您的偏好。", - "t114":"首页", - "t115":"批量处理", + "t100": "模型介绍", + "t101": "物料清单", + "t102": "装备指导", + "t103": "其他", + "t104": "配置名称", + "t105": "配置作者", + "t106": "配置介绍", + "t107": "在线模型", + "t108": "更多", + "t109": "系统材料", + "t110": "自建材料", + "t111": "新建", + "t112": "加入该计划", + "t113": "您可以随时更改您的偏好。", + "t114": "首页", + "t115": "批量处理", "t116": "重试", "t117": "打印历史", "t118": "正在打印", @@ -244,131 +244,131 @@ var LangText={ "t201": "设备连接", "t202":"请设置您的打印机连接以查看设备。", "t203":"请使用 QIDI Link APP 连接您的打印机。链接完成后,在线设备将同步到 “Link” 页面。", - "wk1": "快速入门指南", - "wk2": "本文介绍了QIDI Studio的最基本用法。它指导用户配置软件,创建项目,并逐步完成第一个打印任务。", - "wk3": "基于项目的工作流", - "wk4": "QIDI Studio提出了领先的工作流程,真正实现了“一体化”项目。基于主流的3MF项目格式,它提供了一系列革命性的新功能,如支持多盘、项目资源管理器和装配/零件视图。它可以大幅提高模型创作者及普通用户的使用效率。", - "wk5": "质量卓越的高速打印", - "wk6": "在保持高质量的前提下进行高速打印是非常具有挑战性的。QIDI Studio让这一切发生。支持“圆弧移动”特性使工具头移动更加顺滑,有效减少机器振动。基于不同材料类型的精细标定过的冷却控制参数,使得冷却过程可以自动开展。在悬垂区域进行“自动减速”,可防止高速打印时在此区域的外观瑕疵。", - "wk7": "多色打印", - "wk8": "QIDI Studio提供了多种着色工具来制作彩色模型。您可以在项目中自由添加/移除打印材料,并使用不同的笔刷为模型着色。开始打印时,打印任务中的各个材料将自动映射到匹配的AMS槽位,无需手动调整AMS中的料卷位置。", - "wk9": "切片参数设置指南", - "wk10": "QIDI Studio中的参数管理功能为切片过程提供了非常灵活和强大的控制。本文介绍了切片参数的组织分类和设置方法,并提供了一些使用技巧。", - "wk11": "远程控制和监控", - "wk12": "QIDI Studio支持通过WAN/LAN网络向打印机发送打印任务,控制和查看3D打印机和打印任务的各个方面。如果您有多台打印机,还可以在设备列表中轻松切换。", - "wk13": "STEP格式", - "wk14": "与STL相比,STEP带来了更多有效的信息。由于STEP的高精度,切片时可以生成更多的圆弧路径。STEP还包括模型每个零件的装配关系,可分割模型后恢复装配视图。", - "wk15": "3D文本", - "wk16": "使用3D文本工具,用户可以轻松地在项目中创建各种3D文本形状,使模型更加个性化。QIDI Studio提供了数十种字体,并支持粗体和斜体样式,使文本具有更大的灵活性。" - }, - "ja_JP": { - "t1": "QIDI Studioへようこそ", - "t2": "セットアップ", - "t3": "利用規約", - "t4": "同意しない", - "t5": "同意", - "t6": "ユーザ体験向上プログラム
デルのカスタマーエクスペリエンス改善プログラムへようこそ", - "t7": "匿名で送信することを許容", - "t8": "戻る", - "t9": "次へ", - "t10": "プリンター選択", - "t11": "全て", - "t12": "全てを解除", - "t13": "mm ノズル", - "t14": "フィラメント選択", - "t15": "プリンター", - "t16": "フィラメントタイプ", - "t17": "メーカー", - "t18": "エラー", - "t19": "最低限一つのフィラメントを選択する必要があります", - "t20": "デフォルトのフィラメントにしますか?", - "t21": "はい", - "t22": "いいえ", - "t23": "リリースノート", - "t24": "利用開始", - "t25": "完了", - "t26": "サインイン", - "t27": "登録", - "t28": "モデル", - "t29": "モール", - "t30": "マニュアル", - "t31": "新規プロジェクト", - "t32": "プロジェクトを作成", - "t33": "プロジェクトを開く", - "t34": "ホットスポット", - "t35": "最近開いた項目", - "t36": "OK", - "t37": "最低限一つのプリンターを選択する必要があります", - "t38": "取消し", - "t39": "確認", - "t40": "ネットワークが切断されたのようです、もう一度も試しください", - "t47": "地域を選択してください", - "t48": "アジア-太平洋", - "t49": "中国本土", - "t50": "サインアウト", - "t52": "スキップ", - "t53": "参加する", - "t54": "3Dプリンティングのコミュニティで、私たちはお互いの成功例と失敗例から色々勉強してきています。QIDI Techもそうと考えています、AIでユーザの実世界の経験から勉強し、造型の性能を向上しにいきたいと思います。あなたの経験は私たちにとって大切なので、私たちの「ユーザ体験向上プログラム」を参加してみませんか?「参加」する場合、エラーログや使用ログから情報をQIDI Techと共有します、具体的な項目は", - "t55": "プライバシーポリシー", - "t56": "をご参照ください。個人情報は一切共有しませんのでご安心ください。", - "t57": "", - "t58": "", - "t59": ".", - "t60": "欧州", - "t61": "北米", - "t62": "その他", - "t63": "地域を変更したら、一回サインアウトされます。もう一度サインインしてください", - "t64": "QIDI ネットワークプラグイン", - "t65": "WiFi経由で造形タスクを送信します", - "t66": "リモートコントロール", - "t67": "ライブビュー", - "t68": "ユーザデータ同期", - "t69": "QIDI ネットワークプラグインをインストール", - "t70": "", - "t71": "ダウンロード中", - "t72": "ダウンロード失敗", - "t73": "インストールは成功しました", - "t74": "再起動", - "t75": "QIDI ネットワークプラグインは以下の機能を提供します:", - "t76": "QIDI ネットワークプラグインは検出されません。", - "t77": "こちら", - "t78": "をクリックし、インストールしてください。", - "t79": "インストールは失敗しました", - "t80": "下記の方法もお試しください", - "t81": "1. クリックして ", - "t82": "プラグイン フォルダを開く", - "t83": "2. 全て開いたQIDI Studioを閉じる", - "t84": "3. プラグイン フォルダのファイルを全て削除", - "t85": "4. QIDI Studioを開く、再度プラグインをインストールしてください", - "t86": "閉じる", - "t87": "ユーザ マニュアル", - "t88": "削除", - "t89": "フォルダを開く", - "t90": "3Dモデル", - "t91": "モデルをダウンロード", + "wk1": "快速入门指南", + "wk2": "本文介绍了QIDI Studio的最基本用法。它指导用户配置软件,创建项目,并逐步完成第一个打印任务。", + "wk3": "基于项目的工作流", + "wk4": "QIDI Studio提出了领先的工作流程,真正实现了“一体化”项目。基于主流的3MF项目格式,它提供了一系列革命性的新功能,如支持多盘、项目资源管理器和装配/零件视图。它可以大幅提高模型创作者及普通用户的使用效率。", + "wk5": "质量卓越的高速打印", + "wk6": "在保持高质量的前提下进行高速打印是非常具有挑战性的。QIDI Studio让这一切发生。支持“圆弧移动”特性使工具头移动更加顺滑,有效减少机器振动。基于不同材料类型的精细标定过的冷却控制参数,使得冷却过程可以自动开展。在悬垂区域进行“自动减速”,可防止高速打印时在此区域的外观瑕疵。", + "wk7": "多色打印", + "wk8": "QIDI Studio提供了多种着色工具来制作彩色模型。您可以在项目中自由添加/移除打印材料,并使用不同的笔刷为模型着色。开始打印时,打印任务中的各个材料将自动映射到匹配的AMS槽位,无需手动调整AMS中的料卷位置。", + "wk9": "切片参数设置指南", + "wk10": "QIDI Studio中的参数管理功能为切片过程提供了非常灵活和强大的控制。本文介绍了切片参数的组织分类和设置方法,并提供了一些使用技巧。", + "wk11": "远程控制和监控", + "wk12": "QIDI Studio支持通过WAN/LAN网络向打印机发送打印任务,控制和查看3D打印机和打印任务的各个方面。如果您有多台打印机,还可以在设备列表中轻松切换。", + "wk13": "STEP格式", + "wk14": "与STL相比,STEP带来了更多有效的信息。由于STEP的高精度,切片时可以生成更多的圆弧路径。STEP还包括模型每个零件的装配关系,可分割模型后恢复装配视图。", + "wk15": "3D文本", + "wk16": "使用3D文本工具,用户可以轻松地在项目中创建各种3D文本形状,使模型更加个性化。QIDI Studio提供了数十种字体,并支持粗体和斜体样式,使文本具有更大的灵活性。" + }, + "ja_JP": { + "t1": "QIDI Studioへようこそ", + "t2": "セットアップ", + "t3": "利用規約", + "t4": "同意しない", + "t5": "同意", + "t6": "ユーザ体験向上プログラム
デルのカスタマーエクスペリエンス改善プログラムへようこそ", + "t7": "匿名で送信することを許容", + "t8": "戻る", + "t9": "次へ", + "t10": "プリンター選択", + "t11": "全て", + "t12": "全てを解除", + "t13": "mm ノズル", + "t14": "フィラメント選択", + "t15": "プリンター", + "t16": "フィラメントタイプ", + "t17": "メーカー", + "t18": "エラー", + "t19": "最低限一つのフィラメントを選択する必要があります", + "t20": "デフォルトのフィラメントにしますか?", + "t21": "はい", + "t22": "いいえ", + "t23": "リリースノート", + "t24": "利用開始", + "t25": "完了", + "t26": "サインイン", + "t27": "登録", + "t28": "モデル", + "t29": "モール", + "t30": "マニュアル", + "t31": "新規プロジェクト", + "t32": "プロジェクトを作成", + "t33": "プロジェクトを開く", + "t34": "ホットスポット", + "t35": "最近開いた項目", + "t36": "OK", + "t37": "最低限一つのプリンターを選択する必要があります", + "t38": "取消し", + "t39": "確認", + "t40": "ネットワークが切断されたのようです、もう一度も試しください", + "t47": "地域を選択してください", + "t48": "アジア-太平洋", + "t49": "中国本土", + "t50": "サインアウト", + "t52": "スキップ", + "t53": "参加する", + "t54": "3Dプリンティングのコミュニティで、私たちはお互いの成功例と失敗例から色々勉強してきています。QIDI Labもそうと考えています、AIでユーザの実世界の経験から勉強し、造型の性能を向上しにいきたいと思います。あなたの経験は私たちにとって大切なので、私たちの「ユーザ体験向上プログラム」を参加してみませんか?「参加」する場合、エラーログや使用ログから情報をQIDI Labと共有します、具体的な項目は", + "t55": "プライバシーポリシー", + "t56": "をご参照ください。個人情報は一切共有しませんのでご安心ください。", + "t57": "", + "t58": "", + "t59": ".", + "t60": "欧州", + "t61": "北米", + "t62": "その他", + "t63": "地域を変更したら、一回サインアウトされます。もう一度サインインしてください", + "t64": "QIDI ネットワークプラグイン", + "t65": "印刷ジョブをWLANまたはクラウドサービスで送信する", + "t66": "リモートコントロール", + "t67": "ライブビューストリーミングとプリンター状態モニタリング", + "t68": "スライシング設定のクラウド同期", + "t69": "QIDI ネットワークプラグインをインストール", + "t70": "", + "t71": "ダウンロード中", + "t72": "ダウンロード失敗", + "t73": "インストールは成功しました", + "t74": "再起動", + "t75": "QIDI ネットワークプラグインは以下の機能を提供します:", + "t76": "QIDI ネットワークプラグインは検出されません。", + "t77": "こちら", + "t78": "をクリックし、インストールしてください。", + "t79": "インストールは失敗しました", + "t80": "下記の方法もお試しください", + "t81": "1. クリックして ", + "t82": "プラグイン フォルダを開く", + "t83": "2. 全て開いたQIDI Studioを閉じる", + "t84": "3. プラグイン フォルダのファイルを全て削除", + "t85": "4. QIDI Studioを開く、再度プラグインをインストールしてください", + "t86": "閉じる", + "t87": "ユーザ マニュアル", + "t88": "削除", + "t89": "フォルダを開く", + "t90": "3Dモデル", + "t91": "モデルをダウンロード", "t92": "創作", "t93": "修正", "t94": "共有", "t95": "モデル情報", "t96": "添付ファイル", - "t97": "構成情報", + "t97": "構成情報", "t98": "モデル名", - "t100":"モデルの紹介", - "t101":"BOM", - "t102":"装備指導", - "t103":"その他", - "t104":"構成名", - "t105":"構成著者", - "t106":"構成の概要", - "t107":"オンラインモデル", - "t108":"もっと", - "t109":"システムフィラメント", - "t110":"カスタムフィラメント", - "t111":"新規作成", - "t112":"この計画に参加する", - "t113":"好みはいつでも変更できます.", - "t114":"トップページ", - "t115":"バッチ", + "t100": "モデルの紹介", + "t101": "BOM", + "t102": "装備指導", + "t103": "その他", + "t104": "構成名", + "t105": "構成著者", + "t106": "構成の概要", + "t107": "オンラインモデル", + "t108": "もっと", + "t109": "システムフィラメント", + "t110": "カスタムフィラメント", + "t111": "新規作成", + "t112": "この計画に参加する", + "t113": "好みはいつでも変更できます.", + "t114": "トップページ", + "t115": "バッチ", "t116": "[再試行]", "t117": "印刷履歴", "t118": "印刷中", @@ -441,10 +441,10 @@ var LangText={ "t62": "Altri", "t63": "Dopo aver cambiato la regione, il tuo account verrà disconnesso. Effettua nuovamente il login più tardi.", "t64": "Plug-in di QIDI Network", - "t65": "Invio di lavori di stampa tramite WLAN", + "t65": "Invio del lavoro di stampa tramite WLAN o servizio cloud", "t66": "Controllo remoto completo", - "t67": "Streaming Liveview", - "t68": "Sincronizzazione dei dati dell'utente", + "t67": "Streaming Liveview e monitoraggio dello stato della stampante", + "t68": "Sincronizzazione cloud per la configurazione del taglio", "t69": "Installa il plug-in di QIDI Network", "t70": "", "t71": "Download in corso", @@ -484,13 +484,13 @@ var LangText={ "t106": "Descrizione del profilo", "t107": "Modelli online", "t108": "più", - "t109":"Filamenti di Sistema", - "t110":"Filamenti Personalizzati", - "t111":"Crea Nuovo", - "t112":"Partecipa al programma", - "t113":"Puoi cambiare la tua scelta in qualsiasi momento.", - "t114":"Home", - "t115":"Lotto", + "t109": "Filamenti di Sistema", + "t110": "Filamenti Personalizzati", + "t111": "Crea Nuovo", + "t112": "Partecipa al programma", + "t113": "Puoi cambiare la tua scelta in qualsiasi momento.", + "t114": "Home", + "t115": "Lotto", "t116": "Riprova", "t117": "Storico di stampa", "t118": "Stampa in corso", @@ -563,10 +563,10 @@ var LangText={ "t62": "Autres", "t63": "Après avoir modifié la région, votre compte sera déconnecté. Veuillez vous reconnecter plus tard.", "t64": "Plug-in Réseau QIDI", - "t65": "Envoi de travaux d'impression via WLAN", + "t65": "Envoi de tâches d'impression via WLAN ou service cloud", "t66": "Contrôle complet à distance", - "t67": "Diffusion en direct", - "t68": "Synchronisation des données utilisateur", + "t67": "Streaming Liveview et surveillance de l'état de l'imprimante", + "t68": "Synchronisation cloud pour la configuration de tranchage", "t69": "Installer le plug-in Réseau QIDI", "t70": "", "t71": "Téléchargement en cours", @@ -606,13 +606,13 @@ var LangText={ "t106": "Description du profil", "t107": "Modèles en ligne", "t108": "plus", - "t109":"Filaments Système", - "t110":"Filaments Personnalisés", - "t111":"Créer Nouveau", - "t112":"Rejoignez le programme", - "t113":"Vous pouvez modifier vos préférences à tout moment.", - "t114":"Accueil", - "t115":"Un lot de", + "t109": "Filaments Système", + "t110": "Filaments Personnalisés", + "t111": "Créer Nouveau", + "t112": "Rejoignez le programme", + "t113": "Vous pouvez modifier vos préférences à tout moment.", + "t114": "Accueil", + "t115": "Un lot de", "t116": "Retenter", "t117": "Historique d'impression", "t118": "Impression en cours", @@ -685,10 +685,10 @@ var LangText={ "t62": "Andere", "t63": "Nach Änderung der Region wird Ihr Konto abgemeldet. Bitte melden Sie sich später wieder an.", "t64": "QIDI Network-Plug-In", - "t65": "Senden von Druckaufträgen über WLAN", + "t65": "Senden von Druckaufgaben über WLAN oder Cloud Service", "t66": "Vollständige Fernsteuerung", - "t67": "Liveview-Streaming", - "t68": "Synchronisation von Benutzerdaten", + "t67": "Liveview-Streaming und Druckerstatusüberwachung", + "t68": "Cloud-Synchronisierung für die Schneidkonfiguration", "t69": "Installieren Sie das QIDI Network-Plug-In", "t70": "", "t71": "Herunterladen", @@ -728,13 +728,13 @@ var LangText={ "t106": "Profilbeschreibung", "t107": "Online-Modelle", "t108": "mehr", - "t109":"System-Filamente", - "t110":"Benutzerdefinierte Filamente", - "t111":"Neu erstellen", - "t112":"Teilnahme am Programm", - "t113":"Sie können Ihre Wahl jederzeit ändern.", - "t114":"Startseite", - "t115":"Charge", + "t109": "System-Filamente", + "t110": "Benutzerdefinierte Filamente", + "t111": "Neu erstellen", + "t112": "Teilnahme am Programm", + "t113": "Sie können Ihre Wahl jederzeit ändern.", + "t114": "Startseite", + "t115": "Charge", "t116": "Erneut versuchen", "t117": "Druckverlauf", "t118": "Wird gedruckt", @@ -807,10 +807,10 @@ var LangText={ "t62": "Egyéb", "t63": "A régió megváltoztatása után ki lesz jelentkezve a fiókodból. Kérjük, jelentkezzen be újra később.", "t64": "QIDI Network plug-in", - "t65": "Nyomtatási munka küldése WLAN keresztül", + "t65": "Nyomtatási feladat küldése WLAN vagy felhőszolgáltatáson keresztül", "t66": "Teljes távvezérlés", - "t67": "Élőkép közvetítés", - "t68": "Felhasználói adatszinkronizáció", + "t67": "Liveview-közvetítés és nyomtató állapotmonitorozás", + "t68": "Félezési konfiguráció felhőszinkronizációja", "t69": "QIDI Network plug-in telepítése", "t70": "", "t71": "Letöltés", @@ -850,13 +850,13 @@ var LangText={ "t106": "Profil leírás", "t107": "Online modellek", "t108": "több", - "t109":"Rendszer Filamentek", - "t110":"Egyedi Filamentek", - "t111":"Új Létrehozása", - "t112":"Csatlakozás a programhoz", - "t113":"Bármikor megváltoztathatja a preferenciáját.", - "t114":"honlap", - "t115":"Tétel", + "t109": "Rendszer Filamentek", + "t110": "Egyedi Filamentek", + "t111": "Új Létrehozása", + "t112": "Csatlakozás a programhoz", + "t113": "Bármikor megváltoztathatja a preferenciáját.", + "t114": "honlap", + "t115": "Tétel", "t116": "Újrapróbálkozás", "t117": "Nyomtatási előzmények", "t118": "Nyomtatás folyamatban", @@ -929,10 +929,10 @@ var LangText={ "t62": "Otros", "t63": "Después de cambiar la región, se cerrará la sesión de su cuenta. Por favor, vuelva a iniciar sesión más tarde.", "t64": "Complemento de red de QIDI", - "t65": "Envío de trabajos de impresión a través de WLAN", + "t65": "Envío de trabajo de impresión a través de WLAN o servicio en la nube", "t66": "Control remoto completo", - "t67": "Transmisión en vivo", - "t68": "Sincronización de datos de usuario", + "t67": "Streaming de Liveview y monitorización del estado de la impresora", + "t68": "Sincronización en la nube para la configuración de rebanado", "t69": "Instalar complemento de red de QIDI", "t70": "", "t71": "Descargando", @@ -972,13 +972,13 @@ var LangText={ "t106": "Descripción del perfil", "t107": "Modelos en línea", "t108": "más", - "t109":"Filamenti di Sistema", - "t110":"Filamenti Personalizzati", - "t111":"Crea Nuovo", - "t112":"Unirse al programa", - "t113":"Puede cambiar sus preferencias en cualquier momento.", - "t114":"Página de inicio", - "t115":"Un lote", + "t109": "Filamenti di Sistema", + "t110": "Filamenti Personalizzati", + "t111": "Crea Nuovo", + "t112": "Unirse al programa", + "t113": "Puede cambiar sus preferencias en cualquier momento.", + "t114": "Página de inicio", + "t115": "Un lote", "t116": "Reintentar", "t117": "Historial de impresión", "t118": "Imprimiendo", @@ -1051,10 +1051,10 @@ var LangText={ "t62": "Andra", "t63": "Efter att ha ändrat regionen kommer ditt konto att loggas ut. Logga in igen senare.", "t64": "QIDI Network plug-in", - "t65": "Skicka utskriftsjobb via WLAN", + "t65": "Skicka utskriftsjobb via WLAN eller molntjänst", "t66": "Fullständig fjärrstyrning", - "t67": "Liveview streaming", - "t68": "Synchronisering av användardata", + "t67": "Liveview-strömning och statusövervakning av skrivaren", + "t68": "Molnsynkronisering för skärkonfiguration", "t69": "Installera QIDI Network plug-in", "t70": "", "t71": "Laddar ner", @@ -1094,13 +1094,13 @@ var LangText={ "t106": "Profilsbeskrivning", "t107": "Online-modeller", "t108": "mer", - "t109":"Systemfilament", - "t110":"Anpassade filament", - "t111":"Skapa ny", - "t112":"Gå med i programmet", - "t113":"Du kan ändra ditt val när som helst.", - "t114":"startsida", - "t115":"Batch", + "t109": "Systemfilament", + "t110": "Anpassade filament", + "t111": "Skapa ny", + "t112": "Gå med i programmet", + "t113": "Du kan ändra ditt val när som helst.", + "t114": "startsida", + "t115": "Batch", "t116": "Försök igen", "t117": "Utskriftshistorik", "t118": "Skrivs ut", @@ -1116,90 +1116,90 @@ var LangText={ "t203": "Använd QIDI Link-appen för att ansluta till din skrivare. När länken är klar kommer den online-enheten att synkroniseras till \"Länk\"-sidan." }, "cs_CZ": { - "t1": "Vítejte v QIDI Studio", - "t2": "QIDI Studio bude nastaveno několika kroky. Začněme!", - "t3": "Uživatelská dohoda", - "t4": "Nesouhlasím", - "t5": "Souhlasím", - "t6": "Vřele žádáme o vaši pomoc pro zlepšení tisku pro všechny. Přijďte a připojte se k našemu programu zlepšování zkušeností zákazníků", - "t7": "Zapojte se do našeho programu pro zlepšení zákaznického zážitku", - "t8": "Zpět", - "t9": "Dále", - "t10": "Výběr tiskárny", - "t11": "Všechny", - "t12": "Zrušit výběr", - "t13": "mm tryska", - "t14": "Výběr filamentu", - "t15": "Tiskárna", - "t16": "Typ filamentu", - "t17": "Výrobce", - "t18": "chyba", - "t19": "Je nutné vybrat minimálně jeden filament.", - "t20": "Chcete použít výchozí filament?", - "t21": "ano", - "t22": "ne", - "t23": "Poznámka k vydání", - "t24": "Začít", - "t25": "Dokončit", - "t26": "Přihlásit se", - "t27": "Registrovat", - "t28": "Nedávno", - "t29": "Obchod", - "t30": "Nápověda", - "t31": "Nový projekt", - "t32": "Vytvořit nový projekt", - "t33": "Otevřít projekt", - "t34": "Hotspot", - "t35": "Nedávno otevřené", - "t36": "OK", - "t37": "Je nutné vybrat minimálně jednu tiskárnu.", - "t38": "Zrušit", - "t39": "Potvrdit", - "t40": "Odpojení od sítě, prosím zkontrolujte a zkuste to později znovu.", - "t47": "Vyberte prosím svou přihlašovací oblast", - "t48": "Asie-Pacifik", - "t49": "Čínská pevninská", - "t50": "Odhlásit se", - "t52": "Přeskočit", - "t53": "Připojit", - "t54": "Ve společenství 3D tisku se učíme ze zkušeností druhých a z jejich neúspěchů, abychom upravili naše vlastní parametry a nastavení tisku. QIDI Studio následuje stejný princip a pomocí strojového učení zlepšuje svou výkonnost na základě úspěchů a selhání velkého množství tisků našich uživatelů. Trénujeme QIDI Studio, aby bylo chytřejší tím, že jim předáváme reálná data. Pokud jste ochotní, tato služba bude mít přístup k informacím z vašich chybových protokolů a protokolů o používání, které mohou obsahovat informace popsané v ", - "t55": "Zásady ochrany osobních údajů", - "t56": ". Nezískáváme žádné osobní údaje, pomocí kterých by bylo možné identifikovat osobu přímo nebo nepřímo, včetně, ale neomezeně na jména, adresy, platební údaje nebo telefonní čísla. Aktivací této služby souhlasíte s těmito podmínkami a prohlášením o zásadách ochrany osobních údajů.", - "t57": "", - "t58": "", - "t59": ".", - "t60": "Evropa", - "t61": "Severní Amerika", - "t62": "Ostatní", - "t63": "Po změně regionu bude váš účet odhlášen. Prosím přihlašte se znovu později.", - "t64": "Zásuvný modul QIDI Network", - "t65": "Odesílání tiskových úloh přes WLAN", - "t66": "Plná vzdálená kontrola", - "t67": "Živé zobrazení ve streamu", - "t68": "Synchronizace uživatelských dat", - "t69": "Instalovat zásuvný modul QIDI Network", - "t70": "", - "t71": "Stahování", - "t72": "Stahování selhalo", - "t73": "Instalace úspěšná.", - "t74": "Restart", - "t75": "Zásuvný modul QIDI Network poskytuje následující funkce:", - "t76": "Zásuvný modul QIDI Network nenalezen. Klikněte ", - "t77": "sem", - "t78": " pro instalaci.", - "t79": "Instalace zásuvného modulu selhala. ", - "t80": "Zkuste následující kroky:", - "t81": "1, Klikněte ", - "t82": " pro otevření adresáře s zásuvnými moduly", - "t83": "2, Zavřete všechny otevřené instance QIDI Studio", - "t84": "3, Smažte všechny soubory ve složce se zásuvnými moduly", - "t85": "4, Znovu spusťte QIDI Studio a zásuvný modul znovu nainstalujte", - "t86": "Zavřít", - "t87": "Uživatelský manuál", - "t88": "Odebrat", - "t89": "Otevřít složku obsahující soubory", - "t90": "3D Model", - "t91": "Stáhnout 3D modely", + "t1": "Vítejte v QIDI Studio", + "t2": "QIDI Studio bude nastaveno několika kroky. Začněme!", + "t3": "Uživatelská dohoda", + "t4": "Nesouhlasím", + "t5": "Souhlasím", + "t6": "Vřele žádáme o vaši pomoc pro zlepšení tisku pro všechny. Přijďte a připojte se k našemu programu zlepšování zkušeností zákazníků", + "t7": "Zapojte se do našeho programu pro zlepšení zákaznického zážitku", + "t8": "Zpět", + "t9": "Dále", + "t10": "Výběr tiskárny", + "t11": "Všechny", + "t12": "Zrušit výběr", + "t13": "mm tryska", + "t14": "Výběr filamentu", + "t15": "Tiskárna", + "t16": "Typ filamentu", + "t17": "Výrobce", + "t18": "chyba", + "t19": "Je nutné vybrat minimálně jeden filament.", + "t20": "Chcete použít výchozí filament?", + "t21": "ano", + "t22": "ne", + "t23": "Poznámka k vydání", + "t24": "Začít", + "t25": "Dokončit", + "t26": "Přihlásit se", + "t27": "Registrovat", + "t28": "Nedávno", + "t29": "Obchod", + "t30": "Nápověda", + "t31": "Nový projekt", + "t32": "Vytvořit nový projekt", + "t33": "Otevřít projekt", + "t34": "Hotspot", + "t35": "Nedávno otevřené", + "t36": "OK", + "t37": "Je nutné vybrat minimálně jednu tiskárnu.", + "t38": "Zrušit", + "t39": "Potvrdit", + "t40": "Odpojení od sítě, prosím zkontrolujte a zkuste to později znovu.", + "t47": "Vyberte prosím svou přihlašovací oblast", + "t48": "Asie-Pacifik", + "t49": "Čínská pevninská", + "t50": "Odhlásit se", + "t52": "Přeskočit", + "t53": "Připojit", + "t54": "Ve společenství 3D tisku se učíme ze zkušeností druhých a z jejich neúspěchů, abychom upravili naše vlastní parametry a nastavení tisku. QIDI Studio následuje stejný princip a pomocí strojového učení zlepšuje svou výkonnost na základě úspěchů a selhání velkého množství tisků našich uživatelů. Trénujeme QIDI Studio, aby bylo chytřejší tím, že jim předáváme reálná data. Pokud jste ochotní, tato služba bude mít přístup k informacím z vašich chybových protokolů a protokolů o používání, které mohou obsahovat informace popsané v ", + "t55": "Zásady ochrany osobních údajů", + "t56": ". Nezískáváme žádné osobní údaje, pomocí kterých by bylo možné identifikovat osobu přímo nebo nepřímo, včetně, ale neomezeně na jména, adresy, platební údaje nebo telefonní čísla. Aktivací této služby souhlasíte s těmito podmínkami a prohlášením o zásadách ochrany osobních údajů.", + "t57": "", + "t58": "", + "t59": ".", + "t60": "Evropa", + "t61": "Severní Amerika", + "t62": "Ostatní", + "t63": "Po změně regionu bude váš účet odhlášen. Prosím přihlašte se znovu později.", + "t64": "Zásuvný modul QIDI Network", + "t65": "Odesílání tiskové úlohy přes WLAN nebo cloudovou službu", + "t66": "Plná vzdálená kontrola", + "t67": "Streamování Liveview a sledování stavu tiskárny", + "t68": "Cloudová synchronizace konfigurace řezání", + "t69": "Instalovat zásuvný modul QIDI Network", + "t70": "", + "t71": "Stahování", + "t72": "Stahování selhalo", + "t73": "Instalace úspěšná.", + "t74": "Restart", + "t75": "Zásuvný modul QIDI Network poskytuje následující funkce:", + "t76": "Zásuvný modul QIDI Network nenalezen. Klikněte ", + "t77": "sem", + "t78": " pro instalaci.", + "t79": "Instalace zásuvného modulu selhala. ", + "t80": "Zkuste následující kroky:", + "t81": "1, Klikněte ", + "t82": " pro otevření adresáře s zásuvnými moduly", + "t83": "2, Zavřete všechny otevřené instance QIDI Studio", + "t84": "3, Smažte všechny soubory ve složce se zásuvnými moduly", + "t85": "4, Znovu spusťte QIDI Studio a zásuvný modul znovu nainstalujte", + "t86": "Zavřít", + "t87": "Uživatelský manuál", + "t88": "Odebrat", + "t89": "Otevřít složku obsahující soubory", + "t90": "3D Model", + "t91": "Stáhnout 3D modely", "t92": "Vytvořil", "t93": "Přepracováno", "t94": "Sdíleno", @@ -1207,22 +1207,22 @@ var LangText={ "t96": "Příslušenství", "t97": "Informace o profilu", "t98": "Název modelu", - "t100":"Popis modelu", - "t101":"Seznam součástek (BOM)", - "t102":"Průvodce sestavením", - "t103":"Jiné", - "t104":"Název profilu", - "t105":"Autor profilu", - "t106":"Popis profilu", - "t107":"Online modely", - "t108":"více", - "t109":"Systémové materiály", - "t110":"Samostatné materiály", - "t111":"Nové", - "t112":"Připojte se k programu", - "t113":"Své preference můžete kdykoliv změnit.", - "t114":"domovská stránka", - "t115":"Šarže", + "t100": "Popis modelu", + "t101": "Seznam součástek (BOM)", + "t102": "Průvodce sestavením", + "t103": "Jiné", + "t104": "Název profilu", + "t105": "Autor profilu", + "t106": "Popis profilu", + "t107": "Online modely", + "t108": "více", + "t109": "Systémové materiály", + "t110": "Samostatné materiály", + "t111": "Nové", + "t112": "Připojte se k programu", + "t113": "Své preference můžete kdykoliv změnit.", + "t114": "domovská stránka", + "t115": "Šarže", "t116": "Zkuste to znovu", "t117": "Historie tisku", "t118": "Tisk probíhá", @@ -1338,13 +1338,13 @@ var LangText={ "t106": "Profielbeschrijving", "t107": "Online modellen", "t108": "meer", - "t109":"Systeemfilamenten", - "t110":"Aangepaste filamenten", - "t111":"Nieuw maken", - "t112":"Deelnemen aan het programma", - "t113":"U kunt uw keuze op elk gewenst moment wijzigen.", - "t114":"startpagina", - "t115":"Batch", + "t109": "Systeemfilamenten", + "t110": "Aangepaste filamenten", + "t111": "Nieuw maken", + "t112": "Deelnemen aan het programma", + "t113": "U kunt uw keuze op elk gewenst moment wijzigen.", + "t114": "startpagina", + "t115": "Batch", "t116": "Probeer het opnieuw", "t117": "Afdrukhistoriek", "t118": "Aan het printen", @@ -1360,108 +1360,108 @@ var LangText={ "t203": "Gebruik de QIDI Link-app om verbinding te maken met uw printer. Zodra de koppeling is voltooid, wordt het online apparaat gesynchroniseerd op de pagina \"Link\"." }, "uk_UA": { - "t1": "Вітаємо в QIDI Studio!", - "t2": "Для налаштування QIDI Studio необхідно пройти кілька етапів. Почнімо!", - "t3": "Угода користувача", - "t4": "Відмовитися", - "t5": "Прийняти", - "t6": "Ми просимо вашої допомоги, щоб покращити друк. Ласкаво просимо до нашої програми підвищення якості обслуговування клієнтів", - "t7": "Дозволити відправку анонімних даних для удосконалення програми", - "t8": "Назад", - "t9": "Далі", - "t10": "Вибір принтера", - "t11": "Всі", - "t12": "Очистити", - "t13": "мм сопло", - "t14": "Вибір пластикової нитки", - "t15": "Принтер", - "t16": "Тип стрижня", - "t17": "Виробник", - "t18": "помилка", - "t19": "Має бути вибрана принаймні одна пластикова нитка.", - "t20": "Вибрати пластикові нитки за замовчуванням?", - "t21": "так", - "t22": "ні", - "t23": "Інформація про версію", - "t24": "Почати", - "t25": "Закінчити", - "t26": "Увійти", - "t27": "Реєстрація", - "t28": "Моделі", - "t29": "Mall", - "t30": "Інструкції", - "t31": "Новий проєкт", - "t32": "Створити новий проєкт", - "t33": "Відкрити проєкт", - "t34": "точка доступу", - "t35": "Нещодавно відкриті", - "t36": "ОК", - "t37": "Має бути вибраний принаймні один принтер.", - "t38": "Скасувати", - "t39": "Прийняти", - "t40": "Мережа відключена. Будь ласка, перевірте з'єднання та спробуйте знову.", - "t47": "Будь ласка, виберіть регіон входу", - "t48": "Азійсько-Тихоокеанський регіон", - "t49": "Материковый Китай", - "t50": "Вийти", - "t52": "Пропустити", - "t53": "Увійти", - "t54": "У спільноті 3D-друкарів для виявлення найкращих параметрів нарізки та покращення друку ми вчимося на успіхах та невдачах один одного. QIDI Studio слідує тому ж принципу і використовує машинне навчання для покращення своєї роботи на основі успішних та невдалих друків наших користувачів. Ми навчаємо QIDI Studio бути розумнішим на основі реальних даних. За вашою згодою ця служба отримає доступ до ваших журналів помилок та журналів використання, в яких містяться дані, описані в ", - "t55": "політиці конфіденційності", - "t56": ". Ми не збираємо жодних особистих даних, які можуть безпосередньо або побічно ідентифікувати окрему особу, включно, серед іншого, з іменами, адресами, платіжною інформацією або телефонними номерами. Погоджуючись на включення даної служби, ви погоджуєтеся з цими умовами та заявою про політику конфіденційності.", - "t57": "", - "t58": "", - "t59": ".", - "t60": "Європа", - "t61": "Північна Америка", - "t62": "Інший", - "t63": "Після зміни регіону відбудеться вихід з акаунта. Будь ласка, увійдіть пізніше.", - "t64": "Мережевий плагін QIDI", - "t65": "Відправлення завдання на друк через WLAN", - "t66": "Повне дистанційне керування", - "t67": "Перегляд прямої трансляції з камери", - "t68": "Синхронізація даних користувача", - "t69": "Встановити мережевий плагін QIDI", - "t70": "", - "t71": "Завантаження", - "t72": "Завантаження не вдалося", - "t73": "Встановлення виконано успішно.", - "t74": "Перезавантаження", - "t75": "Мережевий плагін QIDI надає наступні можливості:", - "t76": "Мережевий плагін QIDI не виявлено. Натисніть ", - "t77": "тут", - "t78": " щоб встановити його.", - "t79": "Помилка встановлення плагіна. ", - "t80": "Спробуйте виконати наступні дії:", - "t81": "1, Натисніть ", - "t82": " щоб відкрити папку плагінів", - "t83": "2, Закрийте всі відкриті QIDI Studio", - "t84": "3, Видаліть всі файли у папці плагіна", - "t85": "4, Відкрийте QIDI studio та знову встановіть підключуваний модуль.", - "t86": "Закрити", - "t87": "Інструкції", - "t88": "Видалити", - "t89": "Відкрити папку з вмістом", - "t90": "3D-модель", - "t91": "Завантажити 3D-моделі", - "t92": "Автор", - "t93": "Модифіковано", - "t94": "Поділитися", - "t95": "Інформація про модель", - "t96": "Прикріплені файли", - "t97": "Інформація про профіль", - "t98": "Ім'я моделі", - "t100": "Опис моделі", - "t101": "Список матеріалів", - "t102": "Пам'ятка зі збірки", - "t103": "Інше", - "t104": "Ім'я профілю", - "t105": "Профіль автора", - "t106": "Опис профілю", - "t107": "Моделі в мережі", + "t1": "Вітаємо в QIDI Studio!", + "t2": "Для налаштування QIDI Studio необхідно пройти кілька етапів. Почнімо!", + "t3": "Угода користувача", + "t4": "Відмовитися", + "t5": "Прийняти", + "t6": "Ми просимо вашої допомоги, щоб покращити друк. Ласкаво просимо до нашої програми підвищення якості обслуговування клієнтів", + "t7": "Дозволити відправку анонімних даних для удосконалення програми", + "t8": "Назад", + "t9": "Далі", + "t10": "Вибір принтера", + "t11": "Всі", + "t12": "Очистити", + "t13": "мм сопло", + "t14": "Вибір пластикової нитки", + "t15": "Принтер", + "t16": "Тип стрижня", + "t17": "Виробник", + "t18": "помилка", + "t19": "Має бути вибрана принаймні одна пластикова нитка.", + "t20": "Вибрати пластикові нитки за замовчуванням?", + "t21": "так", + "t22": "ні", + "t23": "Інформація про версію", + "t24": "Почати", + "t25": "Закінчити", + "t26": "Увійти", + "t27": "Реєстрація", + "t28": "Моделі", + "t29": "Mall", + "t30": "Інструкції", + "t31": "Новий проєкт", + "t32": "Створити новий проєкт", + "t33": "Відкрити проєкт", + "t34": "точка доступу", + "t35": "Нещодавно відкриті", + "t36": "ОК", + "t37": "Має бути вибраний принаймні один принтер.", + "t38": "Скасувати", + "t39": "Прийняти", + "t40": "Мережа відключена. Будь ласка, перевірте з'єднання та спробуйте знову.", + "t47": "Будь ласка, виберіть регіон входу", + "t48": "Азійсько-Тихоокеанський регіон", + "t49": "Материковый Китай", + "t50": "Вийти", + "t52": "Пропустити", + "t53": "Увійти", + "t54": "У спільноті 3D-друкарів для виявлення найкращих параметрів нарізки та покращення друку ми вчимося на успіхах та невдачах один одного. QIDI Studio слідує тому ж принципу і використовує машинне навчання для покращення своєї роботи на основі успішних та невдалих друків наших користувачів. Ми навчаємо QIDI Studio бути розумнішим на основі реальних даних. За вашою згодою ця служба отримає доступ до ваших журналів помилок та журналів використання, в яких містяться дані, описані в ", + "t55": "політиці конфіденційності", + "t56": ". Ми не збираємо жодних особистих даних, які можуть безпосередньо або побічно ідентифікувати окрему особу, включно, серед іншого, з іменами, адресами, платіжною інформацією або телефонними номерами. Погоджуючись на включення даної служби, ви погоджуєтеся з цими умовами та заявою про політику конфіденційності.", + "t57": "", + "t58": "", + "t59": ".", + "t60": "Європа", + "t61": "Північна Америка", + "t62": "Інший", + "t63": "Після зміни регіону відбудеться вихід з акаунта. Будь ласка, увійдіть пізніше.", + "t64": "Мережевий плагін QIDI", + "t65": "Відправка завдань друку через WLAN або хмарну службу", + "t66": "Повне дистанційне керування", + "t67": "Стрімінг Liveview та моніторинг стану принтера", + "t68": "Хмарна синхронізація конфігурації різання", + "t69": "Встановити мережевий плагін QIDI", + "t70": "", + "t71": "Завантаження", + "t72": "Завантаження не вдалося", + "t73": "Встановлення виконано успішно.", + "t74": "Перезавантаження", + "t75": "Мережевий плагін QIDI надає наступні можливості:", + "t76": "Мережевий плагін QIDI не виявлено. Натисніть ", + "t77": "тут", + "t78": " щоб встановити його.", + "t79": "Помилка встановлення плагіна. ", + "t80": "Спробуйте виконати наступні дії:", + "t81": "1, Натисніть ", + "t82": " щоб відкрити папку плагінів", + "t83": "2, Закрийте всі відкриті QIDI Studio", + "t84": "3, Видаліть всі файли у папці плагіна", + "t85": "4, Відкрийте QIDI studio та знову встановіть підключуваний модуль.", + "t86": "Закрити", + "t87": "Інструкції", + "t88": "Видалити", + "t89": "Відкрити папку з вмістом", + "t90": "3D-модель", + "t91": "Завантажити 3D-моделі", + "t92": "Автор", + "t93": "Модифіковано", + "t94": "Поділитися", + "t95": "Інформація про модель", + "t96": "Прикріплені файли", + "t97": "Інформація про профіль", + "t98": "Ім'я моделі", + "t100": "Опис моделі", + "t101": "Список матеріалів", + "t102": "Пам'ятка зі збірки", + "t103": "Інше", + "t104": "Ім'я профілю", + "t105": "Профіль автора", + "t106": "Опис профілю", + "t107": "Моделі в мережі", "t108": "Більше", "t109": "Системні філаменти", - "t110":"Користувацькі філаменти", + "t110": "Користувацькі філаменти", "t111": "Створити новий", "t112": "Приєднуйтеся до програми", "t113": "Ви можете змінити свої переваги в будь-який час.", @@ -1481,114 +1481,114 @@ var LangText={ "t202": "Будь ласка, налаштуйте підключення принтера, щоб переглянути пристрій.", "t203": "Будь ласка, використовуйте додаток QIDI Link для підключення до вашого принтера. Після завершення підключення онлайн-пристрій буде синхронізовано на сторінці \"Посилання\"." }, - "ru_RU": { - "t1": "Приветствуем в QIDI Studio!", - "t2": "Для настройка QIDI Studio необходимо пройти несколько этапов. Давайте начнём!", - "t3": "Пользовательское соглашение", - "t4": "Отказаться", - "t5": "Принять", - "t6": "Мы просим вашей помощи, чтобы улучшить печать. Добро пожаловать в нашу программу улучшения качества обслуживания клиентов", - "t7": "Разрешить отправку анонимных данных для совершенствования программы", - "t8": "Назад", - "t9": "Далее", - "t10": "Выбор принтера", - "t11": "Все", - "t12": "Очистить всё", - "t13": "мм сопло", - "t14": "Выбор пластиковой нити", - "t15": "Принтер", - "t16": "Тип прутка", - "t17": "Производитель", - "t18": "ошибка", - "t19": "Должна быть выбрана хотя бы одна пластиковая нить.", - "t20": "Выбрать пластиковые нити по умолчанию?", - "t21": "да", - "t22": "нет", - "t23": "Информация о версии", - "t24": "Начать", - "t25": "Закончить", - "t26": "Войти", - "t27": "Регистрация", - "t28": "Модели", - "t29": "Mall", - "t30": "Инструкции", - "t31": "Новый проект", - "t32": "Создать новый проект", - "t33": "Открыть проект", - "t34": "точка доступа", - "t35": "Недавно открытые", - "t36": "OK", - "t37": "Должен быть выбран хотя бы один принтер.", - "t38": "Отмена", - "t39": "Принять", - "t40": "Сеть отключена. Пожалуйста, проверьте подключение и попробуйте снова.", - "t47": "Пожалуйста, выберите регион входа", - "t48": "Азиатско-Тихоокеанский регион", - "t49": "Материковый Китай", - "t50": "Выйти", - "t52": "Пропустить", - "t53": "Войти", - "t54": "В сообществе 3D-печатников для выявления наилучших параметров нарезки и улучшения печати мы учимся на успехах и неудачах друг друга. QIDI Studio следует тому же принципу и использует машинное обучение для улучшения своей работы на основе успешных и неудачных печатей наших пользователей. Мы обучаем QIDI Studio быть умнее на основе реальных данных. По вашему согласию эта служба получит доступ к вашим журналам ошибок и журналам использования, в которых содержатся сведения, описанные в ", - "t55": "политике конфиденциальности", - "t56": ". Мы не собираем никаких личных данных, которые могут прямо или косвенно идентифицировать отдельного человека, включая, помимо прочего, имена, адреса, платежную информацию или номера телефонов. Соглашаясь с включением данной службы, вы соглашаетесь с этими условиями и заявлением о политике конфиденциальности.", - "t57": "", - "t58": "", - "t59": ".", - "t60": "Европа", - "t61": "Северная Америка", - "t62": "Другой", - "t63": "После смены региона произойдёт выход из аккаунта. Пожалуйста, войдите позже.", - "t64": "Сетевой плагин QIDI", - "t65": "Отправка задания на печать через WLAN", - "t66": "Полное дистанционное управление", - "t67": "Просмотр прямой трансляции с камеры", - "t68": "Синхронизация данных пользователя", - "t69": "Установить сетевой плагин QIDI", - "t70": "", - "t71": "Загрузка", - "t72": "Загрузка не удалась", - "t73": "Установка выполнена успешно.", - "t74": "Перезагрузка", - "t75": "Сетевой плагин QIDI предоставляет следующие возможности:", - "t76": "Сетевой плагин QIDI не обнаружен. Нажмите ", - "t77": "здесь", - "t78": " чтобы установить его.", - "t79": "Ошибка установки плагина. ", - "t80": "Попробуйте выполнить следующие действия:", - "t81": "1, Нажмите ", - "t82": " чтобы открыть папку плагинов", - "t83": "2, Закрыть все открытые QIDI Studio", - "t84": "3, Удалить все файлы в папке плагина", - "t85": "4, Откройте QIDI studio и снова установите подключаемый модуль.", - "t86": "Закрыть", - "t87": "Инструкции", - "t88": "Удалить", - "t89": "Открыть папку с содержимым", - "t90": "3D-модель", - "t91": "Скачать 3D-модели", - "t92": "Автор", - "t93": "Модифицировано", - "t94": "Поделиться", - "t95": "Информация о модели", - "t96": "Прикреплённые файлы", - "t97": "Информация о профиле", - "t98": "Имя модели", - "t100":"Описание модели", - "t101":"Список материалов", - "t102":"Памятка по сборке", - "t103":"Прочее", - "t104":"Имя профиля", - "t105":"Профиль автора", - "t106":"Описание профиля", - "t107":"Модели в сети", - "t108":"Больше", - "t109":"Системные прутки", - "t110":"Пользовательские прутки", - "t111":"Создать новый", - "t112":"Присоединяйтесь к программе", - "t113":"Вы можете изменить свои предпочтения в любое время.", - "t114":"Главная страница", - "t115":"Одна партия", + "ru_RU": { + "t1": "Приветствуем в QIDI Studio!", + "t2": "Для настройка QIDI Studio необходимо пройти несколько этапов. Давайте начнём!", + "t3": "Пользовательское соглашение", + "t4": "Отказаться", + "t5": "Принять", + "t6": "Мы просим вашей помощи, чтобы улучшить печать. Добро пожаловать в нашу программу улучшения качества обслуживания клиентов", + "t7": "Разрешить отправку анонимных данных для совершенствования программы", + "t8": "Назад", + "t9": "Далее", + "t10": "Выбор принтера", + "t11": "Все", + "t12": "Очистить всё", + "t13": "мм сопло", + "t14": "Выбор пластиковой нити", + "t15": "Принтер", + "t16": "Тип прутка", + "t17": "Производитель", + "t18": "ошибка", + "t19": "Должна быть выбрана хотя бы одна пластиковая нить.", + "t20": "Выбрать пластиковые нити по умолчанию?", + "t21": "да", + "t22": "нет", + "t23": "Информация о версии", + "t24": "Начать", + "t25": "Закончить", + "t26": "Войти", + "t27": "Регистрация", + "t28": "Модели", + "t29": "Mall", + "t30": "Инструкции", + "t31": "Новый проект", + "t32": "Создать новый проект", + "t33": "Открыть проект", + "t34": "точка доступа", + "t35": "Недавно открытые", + "t36": "OK", + "t37": "Должен быть выбран хотя бы один принтер.", + "t38": "Отмена", + "t39": "Принять", + "t40": "Сеть отключена. Пожалуйста, проверьте подключение и попробуйте снова.", + "t47": "Пожалуйста, выберите регион входа", + "t48": "Азиатско-Тихоокеанский регион", + "t49": "Материковый Китай", + "t50": "Выйти", + "t52": "Пропустить", + "t53": "Войти", + "t54": "В сообществе 3D-печатников для выявления наилучших параметров нарезки и улучшения печати мы учимся на успехах и неудачах друг друга. QIDI Studio следует тому же принципу и использует машинное обучение для улучшения своей работы на основе успешных и неудачных печатей наших пользователей. Мы обучаем QIDI Studio быть умнее на основе реальных данных. По вашему согласию эта служба получит доступ к вашим журналам ошибок и журналам использования, в которых содержатся сведения, описанные в ", + "t55": "политике конфиденциальности", + "t56": ". Мы не собираем никаких личных данных, которые могут прямо или косвенно идентифицировать отдельного человека, включая, помимо прочего, имена, адреса, платежную информацию или номера телефонов. Соглашаясь с включением данной службы, вы соглашаетесь с этими условиями и заявлением о политике конфиденциальности.", + "t57": "", + "t58": "", + "t59": ".", + "t60": "Европа", + "t61": "Северная Америка", + "t62": "Другой", + "t63": "После смены региона произойдёт выход из аккаунта. Пожалуйста, войдите позже.", + "t64": "Сетевой плагин QIDI", + "t65": "Отправка задания на печать через WLAN или облаконную службу", + "t66": "Полное дистанционное управление", + "t67": "Стриминг Liveview и мониторинг состояния принтера", + "t68": "Облачная синхронизация конфигурации среза", + "t69": "Установить сетевой плагин QIDI", + "t70": "", + "t71": "Загрузка", + "t72": "Загрузка не удалась", + "t73": "Установка выполнена успешно.", + "t74": "Перезагрузка", + "t75": "Сетевой плагин QIDI предоставляет следующие возможности:", + "t76": "Сетевой плагин QIDI не обнаружен. Нажмите ", + "t77": "здесь", + "t78": " чтобы установить его.", + "t79": "Ошибка установки плагина. ", + "t80": "Попробуйте выполнить следующие действия:", + "t81": "1, Нажмите ", + "t82": " чтобы открыть папку плагинов", + "t83": "2, Закрыть все открытые QIDI Studio", + "t84": "3, Удалить все файлы в папке плагина", + "t85": "4, Откройте QIDI studio и снова установите подключаемый модуль.", + "t86": "Закрыть", + "t87": "Инструкции", + "t88": "Удалить", + "t89": "Открыть папку с содержимым", + "t90": "3D-модель", + "t91": "Скачать 3D-модели", + "t92": "Автор", + "t93": "Модифицировано", + "t94": "Поделиться", + "t95": "Информация о модели", + "t96": "Прикреплённые файлы", + "t97": "Информация о профиле", + "t98": "Имя модели", + "t100": "Описание модели", + "t101": "Список материалов", + "t102": "Памятка по сборке", + "t103": "Прочее", + "t104": "Имя профиля", + "t105": "Профиль автора", + "t106": "Описание профиля", + "t107": "Модели в сети", + "t108": "Больше", + "t109": "Системные прутки", + "t110": "Пользовательские прутки", + "t111": "Создать новый", + "t112": "Присоединяйтесь к программе", + "t113": "Вы можете изменить свои предпочтения в любое время.", + "t114": "Главная страница", + "t115": "Одна партия", "t116": "Повторить попытку", "t117": "История печати", "t118": "Печатается", @@ -1603,91 +1603,91 @@ var LangText={ "t202": "Пожалуйста, настройте подключение принтера, чтобы просмотреть устройство.", "t203": "Пожалуйста, используйте приложение QIDI Link для подключения к вашему принтеру. После завершения подключения онлайн-устройство будет синхронизировано на странице \"Ссылка\"." }, - "tr_TR": { - "t1": "QIDI Stüdyo'ya Hoş Geldiniz", - "t2": "QIDI Studio birkaç adımda kurulacaktır. Hadi başlayalım!", - "t3": "Kullanıcı Sözleşmesi", - "t4": "Reddet", - "t5": "Onayla", - "t6": "Herkesin baskısını iyileştirmek için yardımınızı rica ediyoruz.
Gelin ve Müşteri Deneyimi İyileştirme Programımıza Katılın", - "t7": "Anonim verilerin gönderilmesine izin ver", - "t8": "Geri", - "t9": "İleri", - "t10": "Yazıcı Seçimi", - "t11": "Hepsi", - "t12": "Hepsini temizle", - "t13": "mm nozul", - "t14": "Filament Seçimi", - "t15": "Yazıcı", - "t16": "Filament türü", - "t17": "Üretici", - "t18": "hata", - "t19": "En az bir filament seçilmelidir.", - "t20": "Varsayılan filamenti kullanmak ister misiniz ?", - "t21": "Evet", - "t22": "Hayır", - "t23": "Sürüm notu", - "t24": "Başla", - "t25": "Bitir", - "t26": "Giriş Yap", - "t27": "Kayıt Ol", - "t28": "Modeller", - "t29": "Mağaza", - "t30": "Kılavuz", - "t31": "Yeni proje", - "t32": "Yeni proje oluştur", - "t33": "Projeyi Aç", - "t34": "Erişim noktası", - "t35": "Yakın zamanda açıldı", - "t36": "Tamam", - "t37": "En az bir yazıcı seçilmelidir.", - "t38": "İptal Et", - "t39": "Onayla", - "t40": "Ağ bağlantısı kesildi, lütfen kontrol edin ve daha sonra tekrar deneyin.", - "t47": "Lütfen giriş bölgenizi seçin", - "t48": "Asya-Pasifik", - "t49": "Çin Mainland", - "t50": "Çıkış Yap", - "t52": "Atla", - "t53": "Katıl", - "t54": "3D Baskı topluluğunda, kendi dilimleme parametrelerimizi ve ayarlarımızı ayarlamak için birbirimizin başarılarından ve başarısızlıklarından öğreniyoruz. QIDI Studio da aynı prensibi izliyor ve kullanıcılarımız tarafından yapılan çok sayıda baskının başarı ve başarısızlıklarından performansını artırmak için makine öğrenimini kullanıyor. QIDI Studio'yu gerçek dünya verileriyle besleyerek daha akıllı olması için eğitiyoruz. İsterseniz, bu hizmet hata günlüklerinizden ve kullanım günlüklerinizden aşağıdaki bilgileri içerebilecek bilgilere erişecektir ", - "t55": "Privacy Policy", - "t56": ". Kişinin doğrudan veya dolaylı olarak tanımlanabileceği hiçbir Kişisel Veri toplamayacağız, bunlar arasında isimler, adresler, ödeme bilgileri veya telefon numaraları dahil olmamak üzere sınırlama olmaksızın bulunmaktadır. Bu hizmeti etkinleştirerek, bu şartları ve Gizlilik Politikası hakkındaki beyanı kabul etmiş olursunuz.", - "t57": "", - "t58": "", - "t59": ".", - "t60": "Avrupa", - "t61": "North America", - "t62": "Others", - "t63": "Bölgeyi değiştirdikten sonra hesabınızdan çıkış yapılacaktır. Lütfen daha sonra tekrar giriş yapın.", - "t64": "QIDI Ağı eklentisi", - "t65": "Yazdırma işi WLAN aracılığıyla gönderiliyor", - "t66": "Tam uzaktan kontrol", - "t67": "Canlı görüntü akışı", - "t68": "Kullanıcı veri senkronizasyonu", - "t69": "QIDI Ağı eklentisini yükleyin", - "t70": "", - "t71": "İndiriliyor", - "t72": "İndirme başarısız oldu", - "t73": "Kurulum başarılı oldu.", - "t74": "Tekrar başlat", - "t75": "QIDI Network eklentisi aşağıdaki özellikleri sağlar:", - "t76": "QIDI Network eklentisi algılanmadı. Tıklayın.", - "t77": "here", - "t78": " burayı tıklayın.", - "t79": "Eklenti yüklenemedi. ", - "t80": "Aşağıdaki adımları deneyin:", - "t81": "1, Eklenti ", - "t82": " eklenti dizinini açmak için tıklayın.", - "t83": "2, Tüm açık QIDI Studioyu kapatın ", - "t84": "3, Eklenti dizini altındaki tüm dosyaları silin", - "t85": "4, QIDI studioyu yeniden açın ve eklentiyi tekrar yükleyin", - "t86": "Kapat", - "t87": "Kullanım kılavuzu", - "t88": "Kaldır", - "t89": "Dosyayı içeren klasörü açınız", - "t90": "3D Model", - "t91": "3D modelleri İndirin", + "tr_TR": { + "t1": "QIDI Stüdyo'ya Hoş Geldiniz", + "t2": "QIDI Studio birkaç adımda kurulacaktır. Hadi başlayalım!", + "t3": "Kullanıcı Sözleşmesi", + "t4": "Reddet", + "t5": "Onayla", + "t6": "Herkesin baskısını iyileştirmek için yardımınızı rica ediyoruz.
Gelin ve Müşteri Deneyimi İyileştirme Programımıza Katılın", + "t7": "Anonim verilerin gönderilmesine izin ver", + "t8": "Geri", + "t9": "İleri", + "t10": "Yazıcı Seçimi", + "t11": "Hepsi", + "t12": "Hepsini temizle", + "t13": "mm nozul", + "t14": "Filament Seçimi", + "t15": "Yazıcı", + "t16": "Filament türü", + "t17": "Üretici", + "t18": "hata", + "t19": "En az bir filament seçilmelidir.", + "t20": "Varsayılan filamenti kullanmak ister misiniz ?", + "t21": "Evet", + "t22": "Hayır", + "t23": "Sürüm notu", + "t24": "Başla", + "t25": "Bitir", + "t26": "Giriş Yap", + "t27": "Kayıt Ol", + "t28": "Modeller", + "t29": "Mağaza", + "t30": "Kılavuz", + "t31": "Yeni proje", + "t32": "Yeni proje oluştur", + "t33": "Projeyi Aç", + "t34": "Erişim noktası", + "t35": "Yakın zamanda açıldı", + "t36": "Tamam", + "t37": "En az bir yazıcı seçilmelidir.", + "t38": "İptal Et", + "t39": "Onayla", + "t40": "Ağ bağlantısı kesildi, lütfen kontrol edin ve daha sonra tekrar deneyin.", + "t47": "Lütfen giriş bölgenizi seçin", + "t48": "Asya-Pasifik", + "t49": "Çin Mainland", + "t50": "Çıkış Yap", + "t52": "Atla", + "t53": "Katıl", + "t54": "3D Baskı topluluğunda, kendi dilimleme parametrelerimizi ve ayarlarımızı ayarlamak için birbirimizin başarılarından ve başarısızlıklarından öğreniyoruz. QIDI Studio da aynı prensibi izliyor ve kullanıcılarımız tarafından yapılan çok sayıda baskının başarı ve başarısızlıklarından performansını artırmak için makine öğrenimini kullanıyor. QIDI Studio'yu gerçek dünya verileriyle besleyerek daha akıllı olması için eğitiyoruz. İsterseniz, bu hizmet hata günlüklerinizden ve kullanım günlüklerinizden aşağıdaki bilgileri içerebilecek bilgilere erişecektir ", + "t55": "Privacy Policy", + "t56": ". Kişinin doğrudan veya dolaylı olarak tanımlanabileceği hiçbir Kişisel Veri toplamayacağız, bunlar arasında isimler, adresler, ödeme bilgileri veya telefon numaraları dahil olmamak üzere sınırlama olmaksızın bulunmaktadır. Bu hizmeti etkinleştirerek, bu şartları ve Gizlilik Politikası hakkındaki beyanı kabul etmiş olursunuz.", + "t57": "", + "t58": "", + "t59": ".", + "t60": "Avrupa", + "t61": "North America", + "t62": "Others", + "t63": "Bölgeyi değiştirdikten sonra hesabınızdan çıkış yapılacaktır. Lütfen daha sonra tekrar giriş yapın.", + "t64": "QIDI Ağı eklentisi", + "t65": "WLAN veya bulut hizmeti üzerinden yazdırma işi gönderme", + "t66": "Tam uzaktan kontrol", + "t67": "Liveview akışı ve yazıcı durumu izlemesi", + "t68": "Dilimleme yapılandırması için bulut eşitleme", + "t69": "QIDI Ağı eklentisini yükleyin", + "t70": "", + "t71": "İndiriliyor", + "t72": "İndirme başarısız oldu", + "t73": "Kurulum başarılı oldu.", + "t74": "Tekrar başlat", + "t75": "QIDI Network eklentisi aşağıdaki özellikleri sağlar:", + "t76": "QIDI Network eklentisi algılanmadı. Tıklayın.", + "t77": "here", + "t78": " burayı tıklayın.", + "t79": "Eklenti yüklenemedi. ", + "t80": "Aşağıdaki adımları deneyin:", + "t81": "1, Eklenti ", + "t82": " eklenti dizinini açmak için tıklayın.", + "t83": "2, Tüm açık QIDI Studioyu kapatın ", + "t84": "3, Eklenti dizini altındaki tüm dosyaları silin", + "t85": "4, QIDI studioyu yeniden açın ve eklentiyi tekrar yükleyin", + "t86": "Kapat", + "t87": "Kullanım kılavuzu", + "t88": "Kaldır", + "t89": "Dosyayı içeren klasörü açınız", + "t90": "3D Model", + "t91": "3D modelleri İndirin", "t92": "Tarafından oluşturulmuştur", "t93": "Tarafından yeniden düzenlendi", "t94": "Tarafından paylaşıldı", @@ -1695,22 +1695,22 @@ var LangText={ "t96": "Aksesuarlar", "t97": "Profil Bilgisi", "t98": "Model adı", - "t100":"Model açıklaması", - "t101":"Parça Listesi", - "t102":"Montaj Kılavuzu", - "t103":"Diğer", - "t104":"Profil adı", - "t105":"Profil Yazarı", - "t106":"Profil açıklaması", - "t107":"Çevrimiçi Modeller", - "t108":"DAHA FAZLA", - "t109":"Sistem Filamentleri", - "t110":"Özel Filamentler", - "t111":"Yeni Oluştur", - "t112":"Programa Katıl", - "t113":"ercihlerinizde istediğiniz zaman seçiminizi değiştirebilirsiniz.", - "t114":"Ana Sayfa", - "t115":"Toplu", + "t100": "Model açıklaması", + "t101": "Parça Listesi", + "t102": "Montaj Kılavuzu", + "t103": "Diğer", + "t104": "Profil adı", + "t105": "Profil Yazarı", + "t106": "Profil açıklaması", + "t107": "Çevrimiçi Modeller", + "t108": "DAHA FAZLA", + "t109": "Sistem Filamentleri", + "t110": "Özel Filamentler", + "t111": "Yeni Oluştur", + "t112": "Programa Katıl", + "t113": "ercihlerinizde istediğiniz zaman seçiminizi değiştirebilirsiniz.", + "t114": "Ana Sayfa", + "t115": "Toplu", "t116": "Yeniden Dene", "t117": "Yazdırma geçmişi", "t118": "Yazdırılıyor", @@ -1730,86 +1730,86 @@ var LangText={ "t2": "QIDI Studio será configurado em algumas etapas. Vamos começar!", "t3": "Termos de Uso", "t4": "Discordo", - "t5": "Concordo", + "t5": "Concordo", "t6": "Nós pedimos gentilmente sua ajuda para melhorar a impressão de todos.
Venha e junte-se ao nosso Programa de Melhoria de Experiência do Usuário", "t7": "Junte-se ao nosso Programa de Melhoria de Experiência do Usuário", "t8": "Voltar", - "t9": "Próximo", - "t10": "Seleção de Impressora", - "t11": "Tudo", - "t12": "Limpar tudo", - "t13": "mm bico", + "t9": "Próximo", + "t10": "Seleção de Impressora", + "t11": "Tudo", + "t12": "Limpar tudo", + "t13": "mm bico", "t14": "Seleção de Filamento", - "t15": "Impressora", + "t15": "Impressora", "t16": "Tipo de Filamento", - "t17": "Fabricante", - "t18": "Erro", - "t19": "Pelo menos um filamento deve ser selecionado.", - "t20": "Você deseja usar o filamento padrão?", - "t21": "Sim", - "t22": "Não", - "t23": "Notas de Atualização", - "t24": "Vamos Começar", - "t25": "Terminar", - "t26": "Entrar", - "t27": "Registrar", - "t28": "Modelos", - "t29": "Loja", - "t30": "Manual", + "t17": "Fabricante", + "t18": "Erro", + "t19": "Pelo menos um filamento deve ser selecionado.", + "t20": "Você deseja usar o filamento padrão?", + "t21": "Sim", + "t22": "Não", + "t23": "Notas de Atualização", + "t24": "Vamos Começar", + "t25": "Terminar", + "t26": "Entrar", + "t27": "Registrar", + "t28": "Modelos", + "t29": "Loja", + "t30": "Manual", "t31": "Novo Projeto", - "t32": "Criar Novo Projeto", - "t33": "Abrir Projeto", - "t34": "hotspot", - "t35": "Aberto Recentemente", - "t36": "Ok", - "t37": "Pelo menos uma impressora deve ser selecionada.", - "t38": "Cancelar", - "t39": "Confirmar", - "t40": "Conexão desconectada, por favor cheque e tente novamente.", - "t47": "Por favor, selecione sua região de login", - "t48": "Asia-Pacifico", - "t49": "China Continental", - "t50": "Desconectar", - "t52": "Pular", - "t53": "Juntar-se", + "t32": "Criar Novo Projeto", + "t33": "Abrir Projeto", + "t34": "hotspot", + "t35": "Aberto Recentemente", + "t36": "Ok", + "t37": "Pelo menos uma impressora deve ser selecionada.", + "t38": "Cancelar", + "t39": "Confirmar", + "t40": "Conexão desconectada, por favor cheque e tente novamente.", + "t47": "Por favor, selecione sua região de login", + "t48": "Asia-Pacifico", + "t49": "China Continental", + "t50": "Desconectar", + "t52": "Pular", + "t53": "Juntar-se", "t54": "Na comunidade de Impressão 3D, aprendemos com os sucessos e falhas uns dos outros para ajustar nossos próprios parâmetros e configurações de fatiamento. O QIDI Studio segue o mesmo princípio e utiliza aprendizado de máquina para melhorar seu desempenho com base nos sucessos e falhas de um grande número de impressões realizadas por nossos usuários. Estamos treinando o QIDI Studio para ser mais inteligente, alimentando-o com dados do mundo real. Se você concordar, este serviço acessará informações de seus registros de erros e registros de uso, que podem incluir informações descritas em ", "t55": "Política de Privacidade", "t56": ". Nós não coletaremos nenhum dado pessoal pelo qual um indivíduo possa ser identificado diretamente ou indiretamente, incluindo, sem limitação, nomes, endereços, informações de pagamento ou números de telefone. Ao habilitar este serviço, você concorda com estes termos e com a declaração sobre a Política de Privacidade.", - "t57": "", - "t58": "", - "t59": ".", + "t57": "", + "t58": "", + "t59": ".", "t60": "Europa", - "t61": "America do Norte", - "t62": "Outras", - "t63": "Após alterar sua região, sua conta será desconectada. Por favor conecte-se novamente mais tarde.", - "t64": "QIDI Network plug-in", - "t65": "Enviando trabalho de impressão via WLAN", - "t66": "Controle remoto total", - "t67": "Transmissão Ao Vivo", - "t68": "Sincronização de Dados do Usuário", - "t69": "Instalar QIDI Network plug-in", - "t70": "", + "t61": "America do Norte", + "t62": "Outras", + "t63": "Após alterar sua região, sua conta será desconectada. Por favor conecte-se novamente mais tarde.", + "t64": "QIDI Network plug-in", + "t65": "Enviando trabalho de impressão via WLAN ou serviço de nuvem", + "t66": "Controle remoto total", + "t67": "Streaming do Liveview e monitoramento do status da impressora", + "t68": "Sincronização em nuvem para configuração de fatiamento", + "t69": "Instalar QIDI Network plug-in", + "t70": "", "t71": "Baixando", - "t72": "Baixando falhou", - "t73": "Instalação concluida.", - "t74": "Reiniciar", - "t75": "QIDI Network plug-in fornece os seguintes recursos:", - "t76": "QIDI Network plug-in não detectado. Clique ", - "t77": "Aqui", - "t78": " para instalar.", - "t79": "Instalação do plug-in falhou. ", - "t80": "Tente os seguintes passos:", + "t72": "Baixando falhou", + "t73": "Instalação concluida.", + "t74": "Reiniciar", + "t75": "QIDI Network plug-in fornece os seguintes recursos:", + "t76": "QIDI Network plug-in não detectado. Clique ", + "t77": "Aqui", + "t78": " para instalar.", + "t79": "Instalação do plug-in falhou. ", + "t80": "Tente os seguintes passos:", "t81": "1, Clique ", - "t82": " para abrir a pasta do plug-in", - "t83": "2, Feche totalmente o QIDI Studio", - "t84": "3, Delete todos os arquivos na pasta do plug-in", - "t85": "4, Reabra o QIDI Studio e instale o plug-in novamente", - "t86": "Fechar", - "t87": "Manual de Usuário", - "t88": "Remover", - "t89": "Abrir pasta de Conteúdo", - "t90": "Modelo 3D", - "t91": "Baixar Modelos 3D", + "t82": " para abrir a pasta do plug-in", + "t83": "2, Feche totalmente o QIDI Studio", + "t84": "3, Delete todos os arquivos na pasta do plug-in", + "t85": "4, Reabra o QIDI Studio e instale o plug-in novamente", + "t86": "Fechar", + "t87": "Manual de Usuário", + "t88": "Remover", + "t89": "Abrir pasta de Conteúdo", + "t90": "Modelo 3D", + "t91": "Baixar Modelos 3D", "t92": "Criado por", "t93": "Remixado por", "t94": "Compartilhado por", @@ -1817,22 +1817,22 @@ var LangText={ "t96": "Acessórios", "t97": "Informações do Perfil", "t98": "Nome do Modelo", - "t100":"Descrição do Modelo", - "t101":"BOM", - "t102":"Guia de Montagem", - "t103":"Outro", - "t104":"Nome do Perfil", - "t105":"Autor do Perfil", - "t106":"Descrição do Perfil", - "t107":"Modelos Online", - "t108":"MAIS", - "t109":"Filamentos do Sistema", - "t110":"Filamentos Personalizados", - "t111":"Criar Novo", - "t112":"Junte-se ao Programa", - "t113":"Você pode alterar sua escolha nas Preferências a qualquer momento", - "t114":"Inicio", - "t115":"Lote", + "t100": "Descrição do Modelo", + "t101": "BOM", + "t102": "Guia de Montagem", + "t103": "Outro", + "t104": "Nome do Perfil", + "t105": "Autor do Perfil", + "t106": "Descrição do Perfil", + "t107": "Modelos Online", + "t108": "MAIS", + "t109": "Filamentos do Sistema", + "t110": "Filamentos Personalizados", + "t111": "Criar Novo", + "t112": "Junte-se ao Programa", + "t113": "Você pode alterar sua escolha nas Preferências a qualquer momento", + "t114": "Inicio", + "t115": "Lote", "t116": "Retentar", "t117": "Histórico de impressão", "t118": "Imprimindo", @@ -1863,7 +1863,7 @@ var LangText={ "t13": "mm 노즐", "t14": "필라멘트 선택", "t15": "프린터", - "t16": "필라멘트 종류", + "t16": "필라멘트 유형", "t17": "공급업체", "t18": "오류", "t19": "최소한 하나의 필라멘트를 선택해야 합니다.", @@ -1905,10 +1905,10 @@ var LangText={ "t62": "기타", "t63": "지역을 변경한 후, 귀하의 계정은 로그아웃됩니다. 나중에 다시 로그인해 주세요.", "t64": "QIDI Network 플러그인", - "t65": "WLAN을 통한 프린팅 작업 보내기", + "t65": "WLAN 또는 클라우드 서비스를 통해 인쇄 작업 보내기", "t66": "완전한 원격 제어", - "t67": "라이브뷰 스트리밍", - "t68": "사용자 데이터 동기화", + "t67": "라이브뷰 스트리밍 및 프린터 상태 모니터링", + "t68": "슬라이싱 설정의 클라우드 동기화", "t69": "QIDI Network 플러그인 설치", "t70": "", "t71": "다운로드 중", @@ -2027,10 +2027,10 @@ var LangText={ "t62": "Inne", "t63": "Po zmianie regionu Twoje konto zostanie wylogowane. Zaloguj się ponownie później.", "t64": "Wtyczka QIDI Network", - "t65": "Wysyłanie zadania drukowania przez WLAN", + "t65": "Wysyłanie zadania drukowania przez WLAN lub usługę cloud", "t66": "Pełne zdalne sterowanie", - "t67": "Transmisja strumieniowa Liveview", - "t68": "Synchronizacja danych użytkownika", + "t67": "Strumieniowe przesyłanie Liveview i monitorowanie stanu drukarki", + "t68": "Synchronizacja chmurowa konfiguracji krojenia", "t69": "Zainstaluj wtyczkę QIDI Network", "t70": "", "t71": "Pobieranie", @@ -2164,4 +2164,4 @@ function GetCurrentTextByKey( key ) } return strText; -} \ No newline at end of file +} diff --git a/resources/web/flush/WipingDialog.html b/resources/web/flush/WipingDialog.html new file mode 100644 index 0000000..145ce71 --- /dev/null +++ b/resources/web/flush/WipingDialog.html @@ -0,0 +1,672 @@ + + + + + + + + +
+
+ Studio would re-calculate your flushing volumes every time the filament + color changed or filaments changed. You could disable the auto-calculate + in QIDI Studio > Preferences. +
+ +
+ + +
+ +
+ + + + + + + +
+
+ +
+
+ Flushing volume (mm³) for each filament pair. +
+
+ Suggestion: Flushing Volume in range [50, 999] +
+
+ + +
+
+ The multiplier should be in range [0.50, 3.00]. +
+
+
+ + +
+
+ + + + diff --git a/resources/web/guide/0/index.html b/resources/web/guide/0/index.html index efa703f..b20c1f8 100644 --- a/resources/web/guide/0/index.html +++ b/resources/web/guide/0/index.html @@ -17,7 +17,7 @@
-
Loading……
+
Loading……
\ No newline at end of file diff --git a/resources/web/guide/0/load.css b/resources/web/guide/0/load.css index d5618cc..a5ff255 100644 --- a/resources/web/guide/0/load.css +++ b/resources/web/guide/0/load.css @@ -32,5 +32,4 @@ body { font-size: 15px; font-weight: 700; - color: #262E30; } \ No newline at end of file diff --git a/resources/web/guide/0/loading.svg b/resources/web/guide/0/loading.svg index 7566bb0..4015c11 100644 --- a/resources/web/guide/0/loading.svg +++ b/resources/web/guide/0/loading.svg @@ -2,8 +2,8 @@ - - + + diff --git a/resources/web/guide/21/21.css b/resources/web/guide/21/21.css index fb5669e..1171e3d 100644 --- a/resources/web/guide/21/21.css +++ b/resources/web/guide/21/21.css @@ -9,13 +9,13 @@ padding: 0px; border-bottom:#4479FB 1px solid; width: 100%; + display: flex; + justify-content:space-between; + align-items: center; } - .BannerBtns { - float: right; - height: 40px; text-align: center; margin-right: 10px; } @@ -49,10 +49,35 @@ padding: 8px; } -.PrinterBlock img +.PImg { + position:relative; + background-color: #EEEEEE; width:160px; - height: 160px; + height: 160px; +} + +.ModelCheckBox +{ + position: absolute; + width: 20px; + height: 20px; + right: 10px; + top: 10px; + cursor: pointer; + background-image: url("../img/emptycheck.svg"); + background-size: cover; +} + +.ModelCheckBox.ModelCheckBoxSelected +{ + background-image: url("../img/bluecheck.svg"); +} + +img.ModelThumbnail +{ + width: 100%; + height: 100%; } .PName @@ -63,7 +88,7 @@ .pNozzel { - display: flex; + display: none; align-items: center; justify-content:flex-start; color: #5A5A5A; diff --git a/resources/web/guide/21/21.js b/resources/web/guide/21/21.js index 49fa0cc..a581c2d 100644 --- a/resources/web/guide/21/21.js +++ b/resources/web/guide/21/21.js @@ -1,7 +1,7 @@ function OnInit() { //let strInput=JSON.stringify(cData); - //HandleStudio(strInput); + //HandleModelList(cData); TranslatePage(); @@ -47,6 +47,19 @@ function ShowPrinterThumb(pItem, strImg) $(pItem).attr('onerror',null); } +function ChooseModel( ModelName ) +{ + let ChooseItem=$(".ModelCheckBox[model='"+ModelName+"']"); + + if(ChooseItem!=null) + { + if( $(ChooseItem).hasClass('ModelCheckBoxSelected') ) + $(ChooseItem).removeClass('ModelCheckBoxSelected'); + else + $(ChooseItem).addClass('ModelCheckBoxSelected'); + } +} + function HandleModelList( pVal ) { if( !pVal.hasOwnProperty("model") ) @@ -78,11 +91,11 @@ function HandleModelList( pVal ) let HtmlNewVendor='
'+ '
'+ +' '+sVV+''+ '
'+ '
all
'+ '
none
'+ '
'+ -' '+sVV+''+ '
'+ '
'+ '
'+ @@ -100,22 +113,18 @@ function HandleModelList( pVal ) if( !ModelHtml.hasOwnProperty(strVendor)) ModelHtml[strVendor]=''; - let NozzleArray=OneModel['nozzle_diameter'].split(';'); - let HtmlNozzel=''; - for(let m=0;m'+nNozzel+'mm nozzle
'; - } - let CoverImage="../../image/printer/"+OneModel['model']+"_cover.png"; let CoverImage2="../../../profiles/"+strVendor+"/"+OneModel['model']+"_cover.png"; let CoverImage3=pVal['configpath']+"/system/"+strVendor+"/"+OneModel['model']+"_cover.png"; //alert( 'FinalCover: '+FinalCover ); ModelHtml[strVendor]+='
'+ - '
'+ - '
'+OneModel['model']+'
'+ HtmlNozzel +'
'; + '
'+ + ''+ + '
'+ + '
'+ + '
'+OneModel['model']+'
'+ + ''; } @@ -127,7 +136,6 @@ function HandleModelList( pVal ) //Update Checkbox - $('input').prop("checked", false); for(let m=0;m
+ QDT-3DP
所有
- - QDT-3DP +
-
+
+ +
+
QDT-3DP-V4NORMAL
0.4mm nozzle
-
0.1mm nozzle
+
0.1mm nozzle
-
+
+ +
+
QDT-3DP-V4NORMAL
0.4mm nozzle
0.22mm nozzle
0.1mm nozzle
-
+
+ +
+
QDT-3DP-V4NORMAL
0.4mm nozzle
0.11mm nozzle
-
+
+ +
+
QDT-3DP-V4NORMAL
0.4mm nozzle
0.22mm nozzle
@@ -66,24 +78,30 @@
+ QIDI-3DP
- - +
所有
+
- - QDT-3DP +
-
+
+ +
+
QDT-3DP-V4NORMAL
0.4mm nozzle
0.1mm nozzle
-
+
+ +
+
QDT-3DP-V4NORMAL
0.4mm nozzle
0.2mm nozzle
diff --git a/resources/web/guide/21/test.js b/resources/web/guide/21/test.js deleted file mode 100644 index 3574a5d..0000000 --- a/resources/web/guide/21/test.js +++ /dev/null @@ -1,472 +0,0 @@ -var cData={ - "filament": { - "QDT PA-CF @QDT": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "QDT PA-CF @QDT", - "selected": 1, - "sub_path": "filament/QDT PA-CF @QDT.json", - "type": "PA6+CF", - "vendor": "QDT" - }, - "Generic ABS": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "Generic ABS", - "selected": 1, - "sub_path": "filament/Generic ABS.json", - "type": "ABS", - "vendor": "Unknow" - }, - "Generic PETG": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "Generic PETG", - "selected": 1, - "sub_path": "filament/Generic PETG.json", - "type": "PET", - "vendor": "Unknow" - }, - "Generic PLA": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "Generic PLA", - "selected": 1, - "sub_path": "filament/Generic PLA.json", - "type": "PLA", - "vendor": "Unknow" - }, - "Generic TPU": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "Generic TPU", - "selected": 1, - "sub_path": "filament/Generic TPU.json", - "type": "TPU", - "vendor": "Unknow" - }, - "Generic TPU83": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "Generic TPU83", - "selected": 1, - "sub_path": "filament/Generic TPU83.json", - "type": "TPU", - "vendor": "Unknow" - }, - "Generic TPU87": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "Generic TPU87", - "selected": 1, - "sub_path": "filament/Generic TPU87.json", - "type": "TPU", - "vendor": "Unknow" - }, - "Generic TPU90": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "Generic TPU90", - "selected": 1, - "sub_path": "filament/Generic TPU90.json", - "type": "TPU", - "vendor": "Unknow" - }, - "Generic TPU95": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "Generic TPU95", - "selected": 1, - "sub_path": "filament/Generic TPU95.json", - "type": "TPU", - "vendor": "Unknow" - }, - "K5 ABS @Kexcelled": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "K5 ABS @Kexcelled", - "selected": 1, - "sub_path": "filament/K5 ABS @Kexcelled.json", - "type": "ABS", - "vendor": "Kexcelled" - }, - "K5 ASA @Kexcelled": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "K5 ASA @Kexcelled", - "selected": 1, - "sub_path": "filament/K5 ASA @Kexcelled.json", - "type": "ABS", - "vendor": "Kexcelled" - }, - "K5 PETG @Kexcelled": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "K5 PETG @Kexcelled", - "selected": 1, - "sub_path": "filament/K5 PETG @Kexcelled.json", - "type": "PET", - "vendor": "Kexcelled" - }, - "K5 PLA~ @Kexcelled": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "K5 PLA~ @Kexcelled", - "selected": 1, - "sub_path": "filament/K5 PLA~ @Kexcelled.json", - "type": "PLA", - "vendor": "Kexcelled" - }, - "K5 Silk PLA~ @Kexcelled": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "K5 Silk PLA~ @Kexcelled", - "selected": 1, - "sub_path": "filament/K5 Silk PLA~ @Kexcelled.json", - "type": "PLA", - "vendor": "Kexcelled" - }, - "K5 Sparkle PLA @Kexcelled": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "K5 Sparkle PLA @Kexcelled", - "selected": 1, - "sub_path": "filament/K5 Sparkle PLA @Kexcelled.json", - "type": "PLA", - "vendor": "Kexcelled" - }, - "K5M PLA~ @Kexcelled": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "K5M PLA~ @Kexcelled", - "selected": 1, - "sub_path": "filament/K5M PLA~ @Kexcelled.json", - "type": "PLA", - "vendor": "Kexcelled" - }, - "K5P PLA~ @Kexcelled": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "K5P PLA~ @Kexcelled", - "selected": 1, - "sub_path": "filament/K5P PLA~ @Kexcelled.json", - "type": "PLA", - "vendor": "Kexcelled" - }, - "K5T ABS @Kexcelled": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "K5T ABS @Kexcelled", - "selected": 1, - "sub_path": "filament/K5T ABS @Kexcelled.json", - "type": "ABS", - "vendor": "Kexcelled" - }, - "K6 PETG @Kexcelled": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "K6 PETG @Kexcelled", - "selected": 1, - "sub_path": "filament/K6 PETG @Kexcelled.json", - "type": "PET", - "vendor": "Kexcelled" - }, - "K6 PLA~ @Kexcelled": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "K6 PLA~ @Kexcelled", - "selected": 1, - "sub_path": "filament/K6 PLA~ @Kexcelled.json", - "type": "PLA", - "vendor": "Kexcelled" - }, - "K6CF PLA~ @Kexcelled ": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "K6CF PLA~ @Kexcelled ", - "selected": 0, - "sub_path": "filament/K6CF PLA~ @Kexcelled.json", - "type": "PLA", - "vendor": "Kexcelled" - }, - "K7 PC @Kexcelled ": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "K7 PC @Kexcelled ", - "selected": 0, - "sub_path": "filament/K7 PC @Kexcelled.json", - "type": "PA6+CF", - "vendor": "Kexcelled" - }, - "K7CF PETG @Kexcelled": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "K7CF PETG @Kexcelled", - "selected": 1, - "sub_path": "filament/K7CF PETG @Kexcelled.json", - "type": "PET", - "vendor": "Kexcelled" - }, - "K7CFLM PAHT @Kexcelled": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "K7CFLM PAHT @Kexcelled", - "selected": 1, - "sub_path": "filament/K7CFLM PAHT @Kexcelled.json", - "type": "PA6+CF", - "vendor": "Kexcelled" - }, - "PLA Silk with Glue @ALL": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "PLA Silk with Glue @ALL", - "selected": 1, - "sub_path": "filament/PLA Silk with Glue @ALL.json", - "type": "PLA", - "vendor": "ALL" - }, - "PLA with Glue except Silk @ALL": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "PLA with Glue except Silk @ALL", - "selected": 1, - "sub_path": "filament/PLA with Glue except Silk @ALL.json", - "type": "PLA", - "vendor": "ALL" - }, - "PolyDissolve @Polymaker": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "PolyDissolve @Polymaker", - "selected": 1, - "sub_path": "filament/PolyDissolve @Polymaker.json", - "type": "PLA", - "vendor": "Polymaker" - }, - "PolyFlex TPU95HF @Polymaker": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "PolyFlex TPU95HF @Polymaker", - "selected": 1, - "sub_path": "filament/PolyFlex TPU95HF @Polymaker.json", - "type": "TPU", - "vendor": "Polymaker" - }, - "PolyLite ABS @Polymaker": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "PolyLite ABS @Polymaker", - "selected": 1, - "sub_path": "filament/PolyLite ABS @Polymaker.json", - "type": "ABS", - "vendor": "Polymaker" - }, - "PolyLite ASA @Polymaker": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "PolyLite ASA @Polymaker", - "selected": 1, - "sub_path": "filament/PolyLite ASA @Polymaker.json", - "type": "ABS", - "vendor": "Polymaker" - }, - "PolyLite PC @Polymaker": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "PolyLite PC @Polymaker", - "selected": 1, - "sub_path": "filament/PolyLite PC @Polymaker.json", - "type": "PA6+CF", - "vendor": "Polymaker" - }, - "PolyLite PETG @Polymaker": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "PolyLite PETG @Polymaker", - "selected": 1, - "sub_path": "filament/PolyLite PETG @Polymaker.json", - "type": "PET", - "vendor": "Polymaker" - }, - "PolyLite PLA Pro~ @Polymaker": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "PolyLite PLA Pro~ @Polymaker", - "selected": 1, - "sub_path": "filament/PolyLite PLA Pro~ @Polymaker.json", - "type": "PLA", - "vendor": "Polymaker" - }, - "PolyLite PLA Silk~ @Polymaker": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "PolyLite PLA Silk~ @Polymaker", - "selected": 1, - "sub_path": "filament/PolyLite PLA Silk~ @Polymaker.json", - "type": "PLA", - "vendor": "Polymaker" - }, - "PolyLite PLA~ @Polymaker": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "PolyLite PLA~ @Polymaker", - "selected": 1, - "sub_path": "filament/PolyLite PLA~ @Polymaker.json", - "type": "PLA", - "vendor": "Polymaker" - }, - "PolyMax PC @Polymaker": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "PolyMax PC @Polymaker", - "selected": 1, - "sub_path": "filament/PolyMax PC @Polymaker.json", - "type": "PA6+CF", - "vendor": "Polymaker" - }, - "PolyMax PETG @Polymaker": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "PolyMax PETG @Polymaker", - "selected": 1, - "sub_path": "filament/PolyMax PETG @Polymaker.json", - "type": "PET", - "vendor": "Polymaker" - }, - "PolyMax PLA~ @Polymaker": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "PolyMax PLA~ @Polymaker", - "selected": 1, - "sub_path": "filament/PolyMax PLA~ @Polymaker.json", - "type": "PLA", - "vendor": "Polymaker" - }, - "PolyMide CoPA @Polymaker": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "PolyMide CoPA @Polymaker", - "selected": 1, - "sub_path": "filament/PolyMide CoPA @Polymaker.json", - "type": "PA6+CF", - "vendor": "Polymaker" - }, - "PolyMide PA12-CF @Polymaker": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "PolyMide PA12-CF @Polymaker", - "selected": 1, - "sub_path": "filament/PolyMide PA12-CF @Polymaker.json", - "type": "PA6+CF", - "vendor": "Polymaker" - }, - "PolyMide PA6-CF @Polymaker": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "PolyMide PA6-CF @Polymaker", - "selected": 1, - "sub_path": "filament/PolyMide PA6-CF @Polymaker.json", - "type": "PA6+CF", - "vendor": "Polymaker" - }, - "PolyMide PA6-GF @Polymaker": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "PolyMide PA6-GF @Polymaker", - "selected": 1, - "sub_path": "filament/PolyMide PA6-GF @Polymaker.json", - "type": "PA6+CF", - "vendor": "Polymaker" - }, - "PolySupport @Polymaker": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "PolySupport @Polymaker", - "selected": 1, - "sub_path": "filament/PolySupport @Polymaker.json", - "type": "PLA", - "vendor": "Polymaker" - }, - "PolyTerra PLA~ @Polymaker": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "PolyTerra PLA~ @Polymaker", - "selected": 1, - "sub_path": "filament/PolyTerra PLA~ @Polymaker.json", - "type": "PLA", - "vendor": "Polymaker" - }, - "PolyWood PLA~ @Polymaker": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "PolyWood PLA~ @Polymaker", - "selected": 1, - "sub_path": "filament/PolyWood PLA~ @Polymaker.json", - "type": "PLA", - "vendor": "Polymaker" - }, - "eSUN ABS @eSUN": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "eSUN ABS @eSUN", - "selected": 1, - "sub_path": "filament/eSUN ABS @eSUN.json", - "type": "ABS", - "vendor": "eSUN" - }, - "eSUN ABS+ @eSUN": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "eSUN ABS+ @eSUN", - "selected": 1, - "sub_path": "filament/eSUN ABS+ @eSUN.json", - "type": "ABS", - "vendor": "eSUN" - }, - "eSUN PETG @eSUN": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "eSUN PETG @eSUN", - "selected": 1, - "sub_path": "filament/eSUN PETG @eSUN.json", - "type": "PET", - "vendor": "eSUN" - }, - "eSUN PLA @eSUN": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "eSUN PLA @eSUN", - "selected": 1, - "sub_path": "filament/eSUN PLA @eSUN.json", - "type": "PLA", - "vendor": "eSUN" - }, - "eSUN PLA Matte~ @eSUN": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "eSUN PLA Matte~ @eSUN", - "selected": 1, - "sub_path": "filament/eSUN PLA Matte~ @eSUN.json", - "type": "PLA", - "vendor": "eSUN" - }, - "eSUN PLA ST @eSUN": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "eSUN PLA ST @eSUN", - "selected": 1, - "sub_path": "filament/eSUN PLA ST @eSUN.json", - "type": "PLA", - "vendor": "eSUN" - }, - "eSUN PLA Silk~ @eSUN": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "eSUN PLA Silk~ @eSUN", - "selected": 1, - "sub_path": "filament/eSUN PLA Silk~ @eSUN.json", - "type": "PLA", - "vendor": "eSUN" - }, - "eSUN PLA+~ @eSUN": { - "models": "[QDT-3DP-V4NORMAL][QDT-3DP-V5NORMAL]", - "name": "eSUN PLA+~ @eSUN", - "selected": 1, - "sub_path": "filament/eSUN PLA+~ @eSUN.json", - "type": "PLA", - "vendor": "eSUN" - } - }, - "machine": [{ - "model": "QDT-3DP-V4NORMAL", - "name": "QIDITech QDT-3DP-001-V4-normal", - "sub_path": "machine/QIDITech QDT-3DP-001-V4-normal.json" - }, - { - "model": "QDT-3DP-V5NORMAL", - "name": "QIDITech QDT-3DP-001-V5-normal", - "sub_path": "machine/QIDITech QDT-3DP-001-V5-normal.json" - } - ], - "model": [{ - "cover": "D:\\Document\\QIDI\\DevCode\\Slicer\\qidi_slicer\\build\\src\\Debug\\resources\\profiles\\QDT\\QDT-3DP-V4NORMAL_cover.png", - "materials": "Generic PLA;PolyDissolve @Polymaker;PolyFlex TPU95HF @Polymaker;K5 Sparkle PLA @Kexcelled;Rock PLA @Polymaker;Generic TPU95;Generic TPU90;Generic TPU87;Generic TPU83;PolyMide CoPA @Polymaker;PolyMide PA6-GF @Polymaker;PolyMide PA12-CF @Polymaker;PolyMide PA6-CF @Polymaker;PolyLite ASA @Polymaker;K5 ASA @Kexcelled;K5T ABS @Kexcelled;PLA with Glue except Silk @ALL;PLA Silk with Glue @ALL;PolyTerra PLA~ @Polymaker; PolyLite PLA~ @Polymaker; PolyLite PLA Pro~ @Polymaker; PolyLite PLA Silk~ @Polymaker; PolyMax PLA~ @Polymaker; PolyWood PLA~ @Polymaker;K5 Silk PLA~ @Kexcelled;K5 PLA~ @Kexcelled;K6 PLA~ @Kexcelled;K6CF PLA~ @Kexcelled;K5M PLA~ @Kexcelled;K5P PLA~ @Kexcelled;eSUN PLA @eSUN; eSUN PLA+~ @eSUN; eSUN PLA Matte~ @eSUN; eSUN PLA Silk~ @eSUN; eSUN PLA ST @eSUN; PolyLite ABS @Polymaker; K5 ABS @Kexcelled; eSUN ABS @eSUN; eSUN ABS+ @eSUN; K5 PETG @Kexcelled; K6 PETG @Kexcelled; PolyMax PETG @Polymaker; PolyLite PETG @Polymaker; eSUN PETG @eSUN; PolySupport @Polymaker;K7CF PETG @Kexcelled;K7CFLM PAHT @Kexcelled; K7LM PAHT @Kexcelled; QDT PA-CF @QDT;K7 PC @Kexcelled; PolyLite PC @Polymaker; PolyMax PC @Polymaker;", - "model": "QDT-3DP-V4NORMAL", - "nozzle_diameter": "0.4;0.2", - "nozzle_selected": "0.4", - "sub_path": "machine/QDT-3DP-V4NORMAL.json", - "vendor": "QDT" - }, - { - "cover": "D:\\Document\\QIDI\\DevCode\\Slicer\\qidi_slicer\\build\\src\\Debug\\resources\\profiles\\QDT\\QDT-3DP-V5NORMAL_cover.png", - "materials": "Generic PLA;PolyDissolve @Polymaker;PolyFlex TPU95HF @Polymaker;K5 Sparkle PLA @Kexcelled;Rock PLA @Polymaker;Generic TPU95;Generic TPU90;Generic TPU87;Generic TPU83;PolyMide CoPA @Polymaker;PolyMide PA6-GF @Polymaker;PolyMide PA12-CF @Polymaker;PolyMide PA6-CF @Polymaker;PolyLite ASA @Polymaker;K5 ASA @Kexcelled;K5T ABS @Kexcelled;PLA with Glue except Silk @ALL;PLA Silk with Glue @ALL;PolyTerra PLA~ @Polymaker; PolyLite PLA~ @Polymaker; PolyLite PLA Pro~ @Polymaker; PolyLite PLA Silk~ @Polymaker; PolyMax PLA~ @Polymaker; PolyWood PLA~ @Polymaker;K5 Silk PLA~ @Kexcelled;K5 PLA~ @Kexcelled;K6 PLA~ @Kexcelled;K6CF PLA~ @Kexcelled;K5M PLA~ @Kexcelled;K5P PLA~ @Kexcelled;eSUN PLA @eSUN; eSUN PLA+~ @eSUN; eSUN PLA Matte~ @eSUN; eSUN PLA Silk~ @eSUN; eSUN PLA ST @eSUN; PolyLite ABS @Polymaker; K5 ABS @Kexcelled; eSUN ABS @eSUN; eSUN ABS+ @eSUN; K5 PETG @Kexcelled; K6 PETG @Kexcelled; PolyMax PETG @Polymaker; PolyLite PETG @Polymaker; eSUN PETG @eSUN; PolySupport @Polymaker;K7CF PETG @Kexcelled;K7CFLM PAHT @Kexcelled; K7LM PAHT @Kexcelled; QDT PA-CF @QDT;K7 PC @Kexcelled; PolyLite PC @Polymaker; PolyMax PC @Polymaker;", - "model": "QDT-3DP-V5NORMAL", - "nozzle_diameter": "0.4;0.2;0.1", - "nozzle_selected": "0.4", - "sub_path": "machine/QDT-3DP-V5NORMAL.json", - "vendor": "QDT" - } - ] -}; - - -var MData={ - "QDT-3DP-V4NORMAL": { - "model": "QDT-3DP-V4NORMAL", - "nozzle_diameter": "0.4", - "vendor": "QDT" - }, - "QDT-3DP-V5NORMAL": { - "model": "QDT-3DP-V5NORMAL", - "nozzle_diameter": "0.4;0.2", - "vendor": "QDT" - } -}; \ No newline at end of file diff --git a/resources/web/guide/24/24.css b/resources/web/guide/24/24.css index 1ebd4df..d552055 100644 --- a/resources/web/guide/24/24.css +++ b/resources/web/guide/24/24.css @@ -8,13 +8,13 @@ padding: 0px; border-bottom:#4479FB 1px solid; /* y96 */ width: 100%; + display: flex; + justify-content:space-between; + align-items: center; } - .BannerBtns { - float: right; - height: 40px; text-align: center; margin-right: 10px; } @@ -48,21 +48,46 @@ padding: 8px; } -.PrinterBlock img +.PImg { + position:relative; + background-color: #EEEEEE; width:160px; - height: 160px; + height: 160px; +} + +.ModelCheckBox +{ + position: absolute; + width: 20px; + height: 20px; + right: 10px; + top: 10px; + cursor: pointer; + background-image: url("../img/emptycheck.svg"); + background-size: cover; +} + +.ModelCheckBox.ModelCheckBoxSelected +{ + background-image: url("../img/bluecheck.svg"); +} + +img.ModelThumbnail +{ + width: 100%; + height: 100%; } .PName { font-weight: 700; - text-align:left; + text-align: left; } .pNozzel { - display: flex; + display: none; align-items: center; justify-content:flex-start; color: #5A5A5A; diff --git a/resources/web/guide/24/24.js b/resources/web/guide/24/24.js index af56f71..18b2556 100644 --- a/resources/web/guide/24/24.js +++ b/resources/web/guide/24/24.js @@ -46,6 +46,19 @@ function ShowPrinterThumb(pItem, strImg) $(pItem).attr('onerror',null); } +function ChooseModel( ModelName ) +{ + let ChooseItem=$(".ModelCheckBox[model='"+ModelName+"']"); + + if(ChooseItem!=null) + { + if( $(ChooseItem).hasClass('ModelCheckBoxSelected') ) + $(ChooseItem).removeClass('ModelCheckBoxSelected'); + else + $(ChooseItem).addClass('ModelCheckBoxSelected'); + } +} + function HandleModelList( pVal ) { if( !pVal.hasOwnProperty("model") ) @@ -77,11 +90,11 @@ function HandleModelList( pVal ) let HtmlNewVendor='
'+ '
'+ +' '+sVV+''+ '
'+ '
all
'+ '
none
'+ '
'+ -' '+sVV+''+ '
'+ '
'+ '
'+ @@ -98,14 +111,6 @@ function HandleModelList( pVal ) //Collect Html Node Nozzel Html if( !ModelHtml.hasOwnProperty(strVendor)) ModelHtml[strVendor]=''; - - let NozzleArray=OneModel['nozzle_diameter'].split(';'); - let HtmlNozzel=''; - for(let m=0;m'+nNozzel+'mm nozzle
'; - } let CoverImage="../../image/printer/"+OneModel['model']+"_cover.png"; let CoverImage2="../../../profiles/"+strVendor+"/"+OneModel['model']+"_cover.png"; @@ -113,8 +118,13 @@ function HandleModelList( pVal ) //alert( 'FinalCover: '+FinalCover ); ModelHtml[strVendor]+='
'+ - '
'+ - '
'+OneModel['model']+'
'+ HtmlNozzel +'
'; + '
'+ + ''+ + '
'+ + '
'+ + '
'+OneModel['model']+'
'+ + '
'; + } //Update Nozzel Html Append @@ -125,7 +135,6 @@ function HandleModelList( pVal ) //Update Checkbox - $('input').prop("checked", false); for(let m=0;m + + + + + + diff --git a/resources/web/guide/img/emptycheck.svg b/resources/web/guide/img/emptycheck.svg new file mode 100644 index 0000000..259a060 --- /dev/null +++ b/resources/web/guide/img/emptycheck.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/resources/web/homepage3/css/home.css b/resources/web/homepage3/css/home.css index 070543b..3e39466 100644 --- a/resources/web/homepage3/css/home.css +++ b/resources/web/homepage3/css/home.css @@ -222,7 +222,7 @@ body .PH_Status_Success { - color: #00AE42; + color: #4479fb; } .PH_Gcode_Icon diff --git a/resources/web/homepage3/css/left.css b/resources/web/homepage3/css/left.css index 248ea1e..32c18bf 100644 --- a/resources/web/homepage3/css/left.css +++ b/resources/web/homepage3/css/left.css @@ -269,7 +269,7 @@ body position: absolute; height: 60px; width: 12px; - right: 1px; + right: 0px; top: calc(50% - 30px); cursor: pointer; background-repeat: no-repeat; @@ -279,6 +279,7 @@ body border-top: 1px solid rgba(238, 238, 238, 1); border-bottom: 1px solid rgba(238, 238, 238, 1); border-radius: 4px 0px 0px 4px; + z-index: 99; } #HideBtn:hover diff --git a/resources/web/homepage3/css/left_mini.css b/resources/web/homepage3/css/left_mini.css index 745ca15..9e6292f 100644 --- a/resources/web/homepage3/css/left_mini.css +++ b/resources/web/homepage3/css/left_mini.css @@ -63,5 +63,7 @@ #HideBtn { transform: scaleX(-1); - border-radius: 0px 4px 4px 0px; + border-radius: 0px 4px 4px 0px; + border-left: 0px solid rgba(238, 238, 238, 1); + border-right: 1px solid rgba(238, 238, 238, 1); } \ No newline at end of file diff --git a/resources/web/homepage3/js/home.js b/resources/web/homepage3/js/home.js index 1f3acfe..15c5436 100644 --- a/resources/web/homepage3/js/home.js +++ b/resources/web/homepage3/js/home.js @@ -431,18 +431,26 @@ function OnClickOpenProject() SendWXMessage( JSON.stringify(tSend) ); } +let RecentClick=true; function OnOpenRecentFile( strPath ) { if( RecentPage_Mode!=Recent_Normal ) return; - - var tSend={}; - tSend['sequence_id']=Math.round(new Date() / 1000); - tSend['command']="homepage_open_recentfile"; - tSend['data']={}; - tSend['data']['path']=decodeURI(strPath); - - SendWXMessage( JSON.stringify(tSend) ); + + if(RecentClick) + { + RecentClick = false; + setTimeout(() => { + RecentClick = true; + }, 1000); + + var tSend={}; + tSend['sequence_id']=Math.round(new Date() / 1000); + tSend['command']="homepage_open_recentfile"; + tSend['data']={}; + tSend['data']['path']=decodeURI(strPath); + SendWXMessage( JSON.stringify(tSend) ); + } } function OnDeleteRecentFile( ) diff --git a/resources/web/homepage3/js/left.js b/resources/web/homepage3/js/left.js index f7cf675..b87d2d0 100644 --- a/resources/web/homepage3/js/left.js +++ b/resources/web/homepage3/js/left.js @@ -253,6 +253,7 @@ function ShowLeftMenuTip( bShow ) $("div[menu='recent'] div.BtnIcon").prop('title',GetCurrentTextByKey('t35')); $("div[menu='online'] div.BtnIcon").prop('title',GetCurrentTextByKey('t107')); $("div[menu='makerlab'] div.BtnIcon").prop('title','MakerLab'); + $("div[menu='makersupply'] div.BtnIcon").prop('title',GetCurrentTextByKey('t125')); $("div[menu='printhistory'] div.BtnIcon").prop('title',GetCurrentTextByKey('t117')); $("div[menu='manual'] div.BtnIcon").prop('title',GetCurrentTextByKey('t87')); } @@ -262,8 +263,9 @@ function ShowLeftMenuTip( bShow ) $("div[menu='recent'] div.BtnIcon").removeAttr('title'); $("div[menu='online'] div.BtnIcon").removeAttr('title'); $("div[menu='makerlab'] div.BtnIcon").removeAttr('title'); + $("div[menu='makersupply'] div.BtnIcon").removeAttr('title'); $("div[menu='printhistory'] div.BtnIcon").removeAttr('title'); - $("div[menu='manual'] div.BtnIcon").removeAttr('title'); + $("div[menu='manual'] div.BtnIcon").removeAttr('title'); } } diff --git a/resources/web/homepage3/left.html b/resources/web/homepage3/left.html index fc021bf..c969a23 100644 --- a/resources/web/homepage3/left.html +++ b/resources/web/homepage3/left.html @@ -77,17 +77,4 @@
- - - - - - - - - - - - - - + \ No newline at end of file