diff --git a/resources/flush/flush_data_dual_highflow.txt b/resources/flush/flush_data_dual_highflow.txt
index c535521..dd33be3 100644
--- a/resources/flush/flush_data_dual_highflow.txt
+++ b/resources/flush/flush_data_dual_highflow.txt
@@ -1,94 +1,329 @@
colors
-#000000 #FFFFFF #545454 #8E9089 #C12E1F #F4EE2A #0A2989 #FF6A13 #0086D6 #F7E6DE #00AE42
+#000000 #FFFFFF #545454 #8E9089 #C12E1F #F4EE2A #0086D6 #F7E6DE #00AE42 #5E43B7 #482960 #0056B8 #FEC600 #EC008C #F5547C #6F5034 #FF9016 #00B1B7 #BECF00
src dst flush
#000000 #FFFFFF 900
-#000000 #545454 330
-#000000 #8E9089 570
-#000000 #C12E1F 660
+#000000 #545454 270
+#000000 #C12E1F 900
#000000 #F4EE2A 900
-#000000 #0A2989 480
-#000000 #FF6A13 900
-#000000 #0086D6 630
+#000000 #0086D6 900
#000000 #F7E6DE 900
-#000000 #00AE42 660
-#FFFFFF #000000 90
-#FFFFFF #545454 120
-#FFFFFF #F4EE2A 120
-#FFFFFF #0A2989 150
-#FFFFFF #FF6A13 120
+#000000 #00AE42 900
+#000000 #5E43B7 900
+#000000 #482960 360
+#000000 #0056B8 660
+#000000 #FEC600 900
+#000000 #EC008C 900
+#000000 #F5547C 900
+#000000 #6F5034 510
+#000000 #FF9016 900
+#000000 #BECF00 900
+#FFFFFF #000000 120
+#FFFFFF #545454 150
+#FFFFFF #8E9089 120
+#FFFFFF #C12E1F 120
+#FFFFFF #F4EE2A 150
+#FFFFFF #0086D6 90
+#FFFFFF #F7E6DE 120
#FFFFFF #00AE42 120
-#545454 #000000 90
-#545454 #FFFFFF 780
+#FFFFFF #5E43B7 150
+#FFFFFF #482960 120
+#FFFFFF #0056B8 150
+#FFFFFF #FEC600 120
+#FFFFFF #EC008C 150
+#FFFFFF #F5547C 120
+#FFFFFF #6F5034 150
+#FFFFFF #FF9016 120
+#FFFFFF #00B1B7 90
+#FFFFFF #BECF00 120
+#545454 #000000 150
+#545454 #FFFFFF 480
#545454 #8E9089 210
#545454 #C12E1F 270
#545454 #F4EE2A 390
-#545454 #0A2989 120
-#545454 #FF6A13 360
-#545454 #0086D6 300
-#545454 #F7E6DE 780
+#545454 #0086D6 240
+#545454 #F7E6DE 360
#545454 #00AE42 330
-#8E9089 #000000 210
-#8E9089 #FFFFFF 450
+#545454 #5E43B7 180
+#545454 #482960 150
+#545454 #0056B8 180
+#545454 #FEC600 300
+#545454 #EC008C 240
+#545454 #F5547C 330
+#545454 #6F5034 120
+#545454 #FF9016 330
+#545454 #00B1B7 270
+#545454 #BECF00 330
+#8E9089 #000000 180
+#8E9089 #FFFFFF 330
#8E9089 #545454 180
+#8E9089 #C12E1F 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
+#8E9089 #0086D6 180
+#8E9089 #F7E6DE 360
+#8E9089 #00AE42 120
+#8E9089 #5E43B7 240
+#8E9089 #482960 240
+#8E9089 #0056B8 150
+#8E9089 #FEC600 330
+#8E9089 #EC008C 270
+#8E9089 #F5547C 240
+#8E9089 #6F5034 300
+#8E9089 #FF9016 300
+#8E9089 #00B1B7 180
+#8E9089 #BECF00 300
+#C12E1F #000000 150
+#C12E1F #FFFFFF 600
+#C12E1F #545454 570
+#C12E1F #8E9089 390
+#C12E1F #F4EE2A 900
+#C12E1F #0086D6 900
+#C12E1F #F7E6DE 900
+#C12E1F #00AE42 540
+#C12E1F #5E43B7 570
+#C12E1F #482960 210
+#C12E1F #0056B8 630
+#C12E1F #FEC600 420
+#C12E1F #EC008C 270
+#C12E1F #F5547C 300
+#C12E1F #6F5034 300
+#C12E1F #FF9016 390
+#C12E1F #00B1B7 600
+#C12E1F #BECF00 660
#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
+#F4EE2A #FFFFFF 660
+#F4EE2A #545454 420
+#F4EE2A #8E9089 300
+#F4EE2A #C12E1F 180
+#F4EE2A #0086D6 900
+#F4EE2A #F7E6DE 900
+#F4EE2A #00AE42 180
+#F4EE2A #5E43B7 690
+#F4EE2A #0056B8 360
+#F4EE2A #FEC600 120
+#F4EE2A #EC008C 600
+#F4EE2A #F5547C 240
+#F4EE2A #6F5034 270
+#F4EE2A #FF9016 120
+#F4EE2A #00B1B7 630
+#F4EE2A #BECF00 120
#0086D6 #000000 120
-#0086D6 #FFFFFF 600
+#0086D6 #FFFFFF 510
#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
+#0086D6 #8E9089 180
+#0086D6 #C12E1F 300
+#0086D6 #F4EE2A 360
+#0086D6 #F7E6DE 480
+#0086D6 #00AE42 120
+#0086D6 #5E43B7 210
+#0086D6 #482960 120
+#0086D6 #0056B8 150
+#0086D6 #FEC600 330
+#0086D6 #EC008C 330
+#0086D6 #F5547C 330
+#0086D6 #6F5034 150
+#0086D6 #FF9016 300
+#0086D6 #00B1B7 120
+#0086D6 #BECF00 360
+#F7E6DE #000000 150
+#F7E6DE #FFFFFF 150
#F7E6DE #545454 120
+#F7E6DE #8E9089 150
+#F7E6DE #C12E1F 150
#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
+#F7E6DE #0086D6 180
+#F7E6DE #00AE42 150
+#F7E6DE #5E43B7 210
+#F7E6DE #482960 150
+#F7E6DE #0056B8 150
+#F7E6DE #FEC600 120
+#F7E6DE #EC008C 150
+#F7E6DE #F5547C 150
+#F7E6DE #6F5034 150
+#F7E6DE #FF9016 120
+#F7E6DE #00B1B7 120
+#F7E6DE #BECF00 120
+#00AE42 #000000 120
+#00AE42 #FFFFFF 690
+#00AE42 #545454 330
+#00AE42 #8E9089 330
+#00AE42 #C12E1F 270
+#00AE42 #F4EE2A 480
+#00AE42 #0086D6 750
+#00AE42 #F7E6DE 900
+#00AE42 #5E43B7 450
+#00AE42 #482960 210
+#00AE42 #0056B8 240
+#00AE42 #FEC600 420
+#00AE42 #F5547C 390
+#00AE42 #6F5034 210
+#00AE42 #FF9016 420
+#00AE42 #00B1B7 390
+#00AE42 #BECF00 300
+#5E43B7 #000000 150
+#5E43B7 #FFFFFF 360
+#5E43B7 #545454 150
+#5E43B7 #8E9089 180
+#5E43B7 #C12E1F 270
+#5E43B7 #F4EE2A 570
+#5E43B7 #0086D6 240
+#5E43B7 #F7E6DE 660
+#5E43B7 #00AE42 240
+#5E43B7 #482960 240
+#5E43B7 #0056B8 150
+#5E43B7 #FEC600 390
+#5E43B7 #EC008C 330
+#5E43B7 #F5547C 270
+#5E43B7 #6F5034 150
+#5E43B7 #FF9016 300
+#5E43B7 #00B1B7 270
+#5E43B7 #BECF00 390
+#482960 #000000 120
+#482960 #FFFFFF 570
+#482960 #545454 240
+#482960 #8E9089 330
+#482960 #C12E1F 480
+#482960 #F4EE2A 780
+#482960 #0086D6 420
+#482960 #F7E6DE 900
+#482960 #00AE42 510
+#482960 #5E43B7 270
+#482960 #0056B8 420
+#482960 #FEC600 540
+#482960 #EC008C 480
+#482960 #F5547C 390
+#482960 #6F5034 270
+#482960 #FF9016 510
+#482960 #00B1B7 480
+#482960 #BECF00 540
+#0056B8 #000000 120
+#0056B8 #FFFFFF 900
+#0056B8 #545454 240
+#0056B8 #8E9089 330
+#0056B8 #C12E1F 570
+#0056B8 #F4EE2A 900
+#0056B8 #0086D6 210
+#0056B8 #F7E6DE 780
+#0056B8 #00AE42 300
+#0056B8 #5E43B7 210
+#0056B8 #482960 270
+#0056B8 #FEC600 630
+#0056B8 #EC008C 540
+#0056B8 #F5547C 660
+#0056B8 #6F5034 300
+#0056B8 #FF9016 690
+#0056B8 #00B1B7 240
+#0056B8 #BECF00 540
+#FEC600 #000000 120
+#FEC600 #FFFFFF 630
+#FEC600 #545454 540
+#FEC600 #8E9089 480
+#FEC600 #C12E1F 180
+#FEC600 #F4EE2A 180
+#FEC600 #0086D6 900
+#FEC600 #F7E6DE 720
+#FEC600 #00AE42 210
+#FEC600 #5E43B7 900
+#FEC600 #482960 330
+#FEC600 #0056B8 900
+#FEC600 #EC008C 660
+#FEC600 #F5547C 390
+#FEC600 #6F5034 330
+#FEC600 #FF9016 270
+#FEC600 #00B1B7 630
+#FEC600 #BECF00 210
+#EC008C #000000 120
+#EC008C #FFFFFF 540
+#EC008C #545454 270
+#EC008C #8E9089 330
+#EC008C #C12E1F 120
+#EC008C #F4EE2A 900
+#EC008C #0086D6 330
+#EC008C #00AE42 450
+#EC008C #5E43B7 210
+#EC008C #482960 180
+#EC008C #0056B8 300
+#EC008C #FEC600 360
+#EC008C #F5547C 210
+#EC008C #6F5034 240
+#EC008C #FF9016 240
+#EC008C #00B1B7 450
+#EC008C #BECF00 510
+#F5547C #000000 120
+#F5547C #FFFFFF 570
+#F5547C #545454 210
+#F5547C #8E9089 240
+#F5547C #C12E1F 150
+#F5547C #F4EE2A 750
+#F5547C #0086D6 270
+#F5547C #F7E6DE 900
+#F5547C #00AE42 540
+#F5547C #5E43B7 150
+#F5547C #482960 180
+#F5547C #0056B8 150
+#F5547C #FEC600 330
+#F5547C #EC008C 150
+#F5547C #6F5034 180
+#F5547C #FF9016 270
+#F5547C #00B1B7 390
+#F5547C #BECF00 360
+#6F5034 #000000 150
+#6F5034 #FFFFFF 600
+#6F5034 #545454 150
+#6F5034 #8E9089 270
+#6F5034 #C12E1F 180
+#6F5034 #F4EE2A 360
+#6F5034 #0086D6 360
+#6F5034 #F7E6DE 390
+#6F5034 #00AE42 330
+#6F5034 #5E43B7 240
+#6F5034 #482960 180
+#6F5034 #0056B8 300
+#6F5034 #FEC600 300
+#6F5034 #EC008C 270
+#6F5034 #F5547C 240
+#6F5034 #FF9016 270
+#6F5034 #00B1B7 270
+#6F5034 #BECF00 390
+#FF9016 #000000 120
+#FF9016 #FFFFFF 450
+#FF9016 #545454 240
+#FF9016 #8E9089 300
+#FF9016 #C12E1F 150
+#FF9016 #F4EE2A 480
+#FF9016 #0086D6 660
+#FF9016 #F7E6DE 690
+#FF9016 #00AE42 360
+#FF9016 #5E43B7 360
+#FF9016 #482960 210
+#FF9016 #0056B8 330
+#FF9016 #FEC600 210
+#FF9016 #EC008C 240
+#FF9016 #F5547C 210
+#FF9016 #6F5034 270
+#FF9016 #00B1B7 390
+#FF9016 #BECF00 330
+#00B1B7 #FFFFFF 630
+#00B1B7 #8E9089 240
+#00B1B7 #F4EE2A 390
+#00B1B7 #EC008C 240
+#00B1B7 #6F5034 360
+#00B1B7 #FF9016 300
+#00B1B7 #00B1B7 390
+#00B1B7 #BECF00 300
+#BECF00 #000000 150
+#BECF00 #FFFFFF 630
+#BECF00 #8E9089 300
+#BECF00 #C12E1F 150
+#BECF00 #F4EE2A 150
+#BECF00 #0086D6 270
+#BECF00 #F7E6DE 540
+#BECF00 #00AE42 150
+#BECF00 #5E43B7 270
+#BECF00 #482960 210
+#BECF00 #0056B8 240
+#BECF00 #FEC600 120
+#BECF00 #EC008C 270
+#BECF00 #F5547C 270
+#BECF00 #6F5034 150
+#BECF00 #FF9016 120
+#BECF00 #00B1B7 330
\ No newline at end of file
diff --git a/resources/flush/flush_data_dual_standard.txt b/resources/flush/flush_data_dual_standard.txt
index f773934..4e00ff3 100644
--- a/resources/flush/flush_data_dual_standard.txt
+++ b/resources/flush/flush_data_dual_standard.txt
@@ -1,99 +1,338 @@
colors
-#000000 #FFFFFF #545454 #8E9089 #C12E1F #F4EE2A #0A2989 #FF6A13 #0086D6 #F7E6DE #00AE42
+#000000 #FFFFFF #545454 #8E9089 #C12E1F #F4EE2A #0086D6 #F7E6DE #00AE42 #5E43B7 #482960 #0056B8 #FEC600 #EC008C #F5547C #6F5034 #FF9016 #00B1B7 #BECF00
src dst flush
#000000 #FFFFFF 900
-#000000 #545454 270
-#000000 #8E9089 510
-#000000 #C12E1F 900
+#000000 #545454 450
+#000000 #8E9089 540
+#000000 #C12E1F 600
#000000 #F4EE2A 900
-#000000 #0A2989 360
-#000000 #FF6A13 900
-#000000 #0086D6 630
+#000000 #0086D6 570
#000000 #F7E6DE 900
-#000000 #00AE42 780
+#000000 #00AE42 810
+#000000 #5E43B7 480
+#000000 #482960 270
+#000000 #0056B8 540
+#000000 #FEC600 900
+#000000 #EC008C 900
+#000000 #F5547C 900
+#000000 #FF9016 900
+#000000 #00B1B7 630
+#000000 #BECF00 900
#FFFFFF #000000 90
-#FFFFFF #545454 90
-#FFFFFF #8E9089 180
-#FFFFFF #F4EE2A 150
-#FFFFFF #0A2989 60
-#FFFFFF #FF6A13 150
-#FFFFFF #00AE42 150
+#FFFFFF #545454 240
+#FFFFFF #8E9089 120
+#FFFFFF #C12E1F 90
+#FFFFFF #F4EE2A 90
+#FFFFFF #0086D6 90
+#FFFFFF #F7E6DE 90
+#FFFFFF #00AE42 120
+#FFFFFF #5E43B7 90
+#FFFFFF #0056B8 90
+#FFFFFF #FEC600 150
+#FFFFFF #EC008C 150
+#FFFFFF #F5547C 120
+#FFFFFF #6F5034 120
+#FFFFFF #FF9016 120
+#FFFFFF #00B1B7 120
+#FFFFFF #BECF00 90
#545454 #000000 90
-#545454 #8E9089 240
-#545454 #C12E1F 360
-#545454 #F4EE2A 390
-#545454 #0A2989 180
-#545454 #FF6A13 300
+#545454 #FFFFFF 360
+#545454 #8E9089 120
+#545454 #C12E1F 270
+#545454 #F4EE2A 330
#545454 #0086D6 270
-#545454 #F7E6DE 330
-#545454 #00AE42 390
-#8E9089 #000000 210
-#8E9089 #FFFFFF 390
-#8E9089 #545454 150
-#8E9089 #F4EE2A 330
-#8E9089 #0A2989 330
+#545454 #F7E6DE 390
+#545454 #00AE42 270
+#545454 #5E43B7 120
+#545454 #482960 150
+#545454 #0056B8 180
+#545454 #FEC600 300
+#545454 #EC008C 240
+#545454 #F5547C 300
+#545454 #6F5034 120
+#545454 #FF9016 240
+#545454 #00B1B7 270
+#545454 #BECF00 300
+#8E9089 #000000 270
+#8E9089 #FFFFFF 330
+#8E9089 #545454 300
+#8E9089 #C12E1F 240
+#8E9089 #F4EE2A 240
+#8E9089 #0086D6 240
#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
+#8E9089 #00AE42 210
+#8E9089 #5E43B7 270
+#8E9089 #482960 300
+#8E9089 #0056B8 180
+#8E9089 #FEC600 240
+#8E9089 #EC008C 240
+#8E9089 #F5547C 240
+#8E9089 #6F5034 210
+#8E9089 #FF9016 240
+#8E9089 #00B1B7 210
+#8E9089 #BECF00 270
+#C12E1F #000000 150
+#C12E1F #FFFFFF 900
+#C12E1F #545454 300
+#C12E1F #8E9089 570
+#C12E1F #F4EE2A 450
+#C12E1F #0086D6 390
+#C12E1F #F7E6DE 630
+#C12E1F #00AE42 420
+#C12E1F #5E43B7 330
+#C12E1F #482960 210
+#C12E1F #0056B8 300
+#C12E1F #FEC600 660
+#C12E1F #EC008C 240
+#C12E1F #F5547C 180
+#C12E1F #6F5034 210
+#C12E1F #FF9016 270
+#C12E1F #00B1B7 540
+#C12E1F #BECF00 360
+#F4EE2A #000000 150
+#F4EE2A #FFFFFF 900
#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
+#F4EE2A #8E9089 450
+#F4EE2A #C12E1F 180
+#F4EE2A #0086D6 270
+#F4EE2A #F7E6DE 570
+#F4EE2A #00AE42 120
+#F4EE2A #5E43B7 330
+#F4EE2A #482960 330
+#F4EE2A #0056B8 240
+#F4EE2A #FEC600 90
+#F4EE2A #EC008C 330
+#F4EE2A #F5547C 420
+#F4EE2A #6F5034 240
+#F4EE2A #FF9016 150
+#F4EE2A #00B1B7 360
+#F4EE2A #BECF00 240
+#0086D6 #000000 150
+#0086D6 #FFFFFF 420
+#0086D6 #545454 120
+#0086D6 #8E9089 480
+#0086D6 #C12E1F 240
+#0086D6 #F4EE2A 360
+#0086D6 #F7E6DE 390
+#0086D6 #00AE42 120
+#0086D6 #5E43B7 150
+#0086D6 #482960 150
+#0086D6 #0056B8 120
+#0086D6 #EC008C 330
+#0086D6 #F5547C 330
+#0086D6 #6F5034 150
+#0086D6 #FF9016 300
+#0086D6 #00B1B7 150
+#0086D6 #BECF00 270
#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
+#F7E6DE #FFFFFF 90
+#F7E6DE #545454 120
+#F7E6DE #8E9089 120
+#F7E6DE #C12E1F 90
+#F7E6DE #F4EE2A 60
+#F7E6DE #0086D6 90
+#F7E6DE #00AE42 90
+#F7E6DE #5E43B7 90
+#F7E6DE #482960 120
+#F7E6DE #0056B8 120
+#F7E6DE #FEC600 120
+#F7E6DE #EC008C 150
+#F7E6DE #F5547C 120
+#F7E6DE #6F5034 150
+#F7E6DE #FF9016 120
+#F7E6DE #00B1B7 90
+#F7E6DE #BECF00 120
+#00AE42 #000000 150
+#00AE42 #FFFFFF 900
+#00AE42 #545454 240
+#00AE42 #8E9089 330
+#00AE42 #C12E1F 210
+#00AE42 #F4EE2A 270
+#00AE42 #F7E6DE 360
+#00AE42 #5E43B7 180
+#00AE42 #482960 180
+#00AE42 #0056B8 240
+#00AE42 #FEC600 300
+#00AE42 #EC008C 300
+#00AE42 #F5547C 390
+#00AE42 #6F5034 180
+#00AE42 #FF9016 300
+#00AE42 #00B1B7 360
+#00AE42 #BECF00 270
+#5E43B7 #000000 90
+#5E43B7 #FFFFFF 630
+#5E43B7 #545454 150
+#5E43B7 #8E9089 210
+#5E43B7 #C12E1F 210
+#5E43B7 #F4EE2A 330
+#5E43B7 #0086D6 180
+#5E43B7 #F7E6DE 510
+#5E43B7 #00AE42 240
+#5E43B7 #482960 150
+#5E43B7 #0056B8 120
+#5E43B7 #FEC600 540
+#5E43B7 #EC008C 270
+#5E43B7 #F5547C 420
+#5E43B7 #6F5034 150
+#5E43B7 #FF9016 330
+#5E43B7 #00B1B7 270
+#5E43B7 #BECF00 330
+#482960 #000000 90
+#482960 #FFFFFF 900
+#482960 #545454 240
+#482960 #8E9089 510
+#482960 #C12E1F 360
+#482960 #F4EE2A 420
+#482960 #0086D6 330
+#482960 #F7E6DE 510
+#482960 #00AE42 390
+#482960 #5E43B7 270
+#482960 #0056B8 300
+#482960 #FEC600 660
+#482960 #EC008C 360
+#482960 #F5547C 510
+#482960 #6F5034 180
+#482960 #FF9016 540
+#482960 #00B1B7 450
+#482960 #BECF00 600
+#0056B8 #000000 90
+#0056B8 #FFFFFF 780
+#0056B8 #545454 270
+#0056B8 #8E9089 270
+#0056B8 #C12E1F 330
+#0056B8 #F4EE2A 630
+#0056B8 #0086D6 180
+#0056B8 #F7E6DE 840
+#0056B8 #00AE42 270
+#0056B8 #5E43B7 270
+#0056B8 #482960 150
+#0056B8 #FEC600 630
+#0056B8 #EC008C 450
+#0056B8 #6F5034 240
+#0056B8 #FF9016 510
+#0056B8 #00B1B7 240
+#0056B8 #BECF00 510
+#FEC600 #000000 90
+#FEC600 #FFFFFF 900
+#FEC600 #545454 390
+#FEC600 #8E9089 600
+#FEC600 #C12E1F 180
+#FEC600 #F4EE2A 150
+#FEC600 #0086D6 330
+#FEC600 #F7E6DE 600
+#FEC600 #00AE42 180
+#FEC600 #5E43B7 270
+#FEC600 #482960 330
+#FEC600 #0056B8 300
+#FEC600 #EC008C 390
+#FEC600 #F5547C 570
+#FEC600 #6F5034 240
+#FEC600 #FF9016 150
+#FEC600 #00B1B7 510
+#FEC600 #BECF00 300
+#EC008C #000000 90
+#EC008C #FFFFFF 900
+#EC008C #545454 240
+#EC008C #8E9089 270
+#EC008C #C12E1F 120
+#EC008C #F4EE2A 360
+#EC008C #0086D6 270
+#EC008C #F7E6DE 660
+#EC008C #00AE42 330
+#EC008C #5E43B7 270
+#EC008C #482960 270
+#EC008C #0056B8 210
+#EC008C #FEC600 510
+#EC008C #F5547C 120
+#EC008C #6F5034 180
+#EC008C #00B1B7 360
+#EC008C #BECF00 570
+#F5547C #000000 90
+#F5547C #FFFFFF 900
+#F5547C #545454 180
+#F5547C #8E9089 180
+#F5547C #C12E1F 150
+#F5547C #F4EE2A 270
+#F5547C #0086D6 270
+#F5547C #F7E6DE 540
+#F5547C #00AE42 300
+#F5547C #5E43B7 210
+#F5547C #482960 240
+#F5547C #0056B8 210
+#F5547C #FEC600 330
+#F5547C #EC008C 120
+#F5547C #6F5034 180
+#F5547C #FF9016 150
+#F5547C #00B1B7 300
+#F5547C #BECF00 330
+#6F5034 #000000 180
+#6F5034 #FFFFFF 660
+#6F5034 #545454 180
+#6F5034 #8E9089 240
+#6F5034 #C12E1F 240
+#6F5034 #F4EE2A 390
+#6F5034 #0086D6 330
+#6F5034 #F7E6DE 420
+#6F5034 #00AE42 300
+#6F5034 #5E43B7 300
+#6F5034 #482960 180
+#6F5034 #0056B8 300
+#6F5034 #FEC600 270
+#6F5034 #EC008C 210
+#6F5034 #F5547C 240
+#6F5034 #FF9016 240
+#6F5034 #00B1B7 270
+#6F5034 #BECF00 360
+#FF9016 #FFFFFF 900
+#FF9016 #545454 240
+#FF9016 #8E9089 270
+#FF9016 #C12E1F 150
+#FF9016 #F4EE2A 330
+#FF9016 #0086D6 240
+#FF9016 #F7E6DE 390
+#FF9016 #00AE42 240
+#FF9016 #5E43B7 270
+#FF9016 #482960 180
+#FF9016 #0056B8 240
+#FF9016 #FEC600 210
+#FF9016 #EC008C 210
+#FF9016 #F5547C 210
+#FF9016 #6F5034 180
+#FF9016 #00B1B7 300
+#FF9016 #BECF00 270
+#00B1B7 #000000 210
+#00B1B7 #FFFFFF 480
+#00B1B7 #545454 300
+#00B1B7 #8E9089 180
+#00B1B7 #C12E1F 300
+#00B1B7 #F4EE2A 300
+#00B1B7 #0086D6 150
+#00B1B7 #F7E6DE 390
+#00B1B7 #00AE42 120
+#00B1B7 #5E43B7 270
+#00B1B7 #482960 270
+#00B1B7 #0056B8 150
+#00B1B7 #FEC600 330
+#00B1B7 #EC008C 270
+#00B1B7 #F5547C 270
+#00B1B7 #6F5034 210
+#00B1B7 #FF9016 270
+#00B1B7 #BECF00 240
+#BECF00 #000000 270
+#BECF00 #FFFFFF 450
+#BECF00 #545454 270
+#BECF00 #8E9089 270
+#BECF00 #C12E1F 150
+#BECF00 #F4EE2A 90
+#BECF00 #0086D6 300
+#BECF00 #F7E6DE 300
+#BECF00 #00AE42 180
+#BECF00 #5E43B7 270
+#BECF00 #482960 210
+#BECF00 #0056B8 240
+#BECF00 #FEC600 210
+#BECF00 #EC008C 240
+#BECF00 #F5547C 150
+#BECF00 #6F5034 150
+#BECF00 #FF9016 150
+#BECF00 #00B1B7 270
\ No newline at end of file
diff --git a/resources/images/ams_rfid_0.svg b/resources/images/ams_rfid_0.svg
new file mode 100644
index 0000000..653d0ed
--- /dev/null
+++ b/resources/images/ams_rfid_0.svg
@@ -0,0 +1,14 @@
+
\ No newline at end of file
diff --git a/resources/images/ams_rfid_1.svg b/resources/images/ams_rfid_1.svg
new file mode 100644
index 0000000..001274d
--- /dev/null
+++ b/resources/images/ams_rfid_1.svg
@@ -0,0 +1,14 @@
+
\ No newline at end of file
diff --git a/resources/images/ams_rfid_2.svg b/resources/images/ams_rfid_2.svg
new file mode 100644
index 0000000..12076b7
--- /dev/null
+++ b/resources/images/ams_rfid_2.svg
@@ -0,0 +1,14 @@
+
\ No newline at end of file
diff --git a/resources/images/ams_rfid_3.svg b/resources/images/ams_rfid_3.svg
new file mode 100644
index 0000000..fb7eedd
--- /dev/null
+++ b/resources/images/ams_rfid_3.svg
@@ -0,0 +1,14 @@
+
\ No newline at end of file
diff --git a/resources/images/ams_rfid_4.svg b/resources/images/ams_rfid_4.svg
new file mode 100644
index 0000000..cf4e1ba
--- /dev/null
+++ b/resources/images/ams_rfid_4.svg
@@ -0,0 +1,14 @@
+
\ No newline at end of file
diff --git a/resources/images/ams_rfid_5.svg b/resources/images/ams_rfid_5.svg
new file mode 100644
index 0000000..8cf963c
--- /dev/null
+++ b/resources/images/ams_rfid_5.svg
@@ -0,0 +1,14 @@
+
\ No newline at end of file
diff --git a/resources/images/ams_rfid_6.svg b/resources/images/ams_rfid_6.svg
new file mode 100644
index 0000000..422fc62
--- /dev/null
+++ b/resources/images/ams_rfid_6.svg
@@ -0,0 +1,14 @@
+
\ No newline at end of file
diff --git a/resources/images/ams_rfid_7.svg b/resources/images/ams_rfid_7.svg
new file mode 100644
index 0000000..16a872c
--- /dev/null
+++ b/resources/images/ams_rfid_7.svg
@@ -0,0 +1,14 @@
+
\ No newline at end of file
diff --git a/resources/images/collapse.svg b/resources/images/collapse.svg
new file mode 100644
index 0000000..456c71e
--- /dev/null
+++ b/resources/images/collapse.svg
@@ -0,0 +1,5 @@
+
diff --git a/resources/images/icon_qusetion.svg b/resources/images/icon_qusetion.svg
new file mode 100644
index 0000000..deef62b
--- /dev/null
+++ b/resources/images/icon_qusetion.svg
@@ -0,0 +1,3 @@
+
diff --git a/resources/images/param_lockedzag.svg b/resources/images/param_lockedzag.svg
new file mode 100644
index 0000000..a2b6aaa
--- /dev/null
+++ b/resources/images/param_lockedzag.svg
@@ -0,0 +1,29 @@
+
diff --git a/resources/images/print-time.svg b/resources/images/print-time.svg
index b93f7c8..ac79859 100644
--- a/resources/images/print-time.svg
+++ b/resources/images/print-time.svg
@@ -1,12 +1,12 @@
-
\ No newline at end of file
+
diff --git a/resources/images/print-weight.svg b/resources/images/print-weight.svg
index 69bdb70..63b6eb3 100644
--- a/resources/images/print-weight.svg
+++ b/resources/images/print-weight.svg
@@ -1,17 +1,9 @@
-
\ No newline at end of file
+
diff --git a/resources/images/print_options_bg.svg b/resources/images/print_options_bg.svg
new file mode 100644
index 0000000..d7015da
--- /dev/null
+++ b/resources/images/print_options_bg.svg
@@ -0,0 +1,16 @@
+
diff --git a/resources/images/print_options_bg_dark.svg b/resources/images/print_options_bg_dark.svg
new file mode 100644
index 0000000..d7015da
--- /dev/null
+++ b/resources/images/print_options_bg_dark.svg
@@ -0,0 +1,16 @@
+
diff --git a/resources/images/print_options_bg_disabled.svg b/resources/images/print_options_bg_disabled.svg
new file mode 100644
index 0000000..1704c3f
--- /dev/null
+++ b/resources/images/print_options_bg_disabled.svg
@@ -0,0 +1,21 @@
+
diff --git a/resources/images/print_options_bg_disabled_dark.png b/resources/images/print_options_bg_disabled_dark.png
new file mode 100644
index 0000000..def651c
Binary files /dev/null and b/resources/images/print_options_bg_disabled_dark.png differ
diff --git a/resources/images/switch_send_mode_on.svg b/resources/images/switch_send_mode_on.svg
index b535b25..42185ca 100644
--- a/resources/images/switch_send_mode_on.svg
+++ b/resources/images/switch_send_mode_on.svg
@@ -1,4 +1,4 @@
diff --git a/resources/images/switch_send_mode_tag_on.svg b/resources/images/switch_send_mode_tag_on.svg
index 39726be..02777c1 100644
--- a/resources/images/switch_send_mode_tag_on.svg
+++ b/resources/images/switch_send_mode_tag_on.svg
@@ -1,4 +1,4 @@
diff --git a/resources/info/nozzle_info.json b/resources/info/nozzle_info.json
index e5e6631..409bdc6 100644
--- a/resources/info/nozzle_info.json
+++ b/resources/info/nozzle_info.json
@@ -3,6 +3,7 @@
"nozzle_hrc": {
"hardened_steel": 55,
"stainless_steel": 20,
+ "tungsten_carbide": 85,
"brass": 2,
"undefine": 0
}
diff --git a/resources/profiles/Q Series/filament/QIDI Support For PAHT.json b/resources/profiles/Q Series/filament/QIDI Support For PAHT.json
index 98f03e0..ad5db95 100644
--- a/resources/profiles/Q Series/filament/QIDI Support For PAHT.json
+++ b/resources/profiles/Q Series/filament/QIDI Support For PAHT.json
@@ -18,7 +18,7 @@
"filament_flow_ratio": ["0.94"],
"filament_is_support": ["1"],
"filament_max_volumetric_speed": ["8"],
- "filament_type": ["Support For PAHT"],
+ "filament_type": ["PAHT-S"],
"impact_strength_z":["4.5"],
"nozzle_temperature_initial_layer": ["280"],
"nozzle_temperature_range_high": ["280"],
diff --git a/resources/profiles/Q Series/filament/QIDI Support For PET-PA.json b/resources/profiles/Q Series/filament/QIDI Support For PET-PA.json
index 28678b2..5b661c1 100644
--- a/resources/profiles/Q Series/filament/QIDI Support For PET-PA.json
+++ b/resources/profiles/Q Series/filament/QIDI Support For PET-PA.json
@@ -18,7 +18,7 @@
"filament_flow_ratio": ["0.91"],
"filament_is_support": ["1"],
"filament_max_volumetric_speed": ["8"],
- "filament_type": ["Support For PET/PA"],
+ "filament_type": ["PA-S"],
"impact_strength_z":["4.5"],
"nozzle_temperature_initial_layer": ["280"],
"nozzle_temperature_range_high": ["280"],
diff --git a/resources/profiles/Q Series/filament/fdm_filament_common.json b/resources/profiles/Q Series/filament/fdm_filament_common.json
index 4086298..0dff94c 100644
--- a/resources/profiles/Q Series/filament/fdm_filament_common.json
+++ b/resources/profiles/Q Series/filament/fdm_filament_common.json
@@ -29,11 +29,15 @@
"filament_diameter": ["1.75"],
"filament_end_gcode": ["; Filament-specific end gcode \n;END gcode for filament"],
"filament_flow_ratio": ["0.98"],
+ "filament_flush_temp": ["0"],
+ "filament_flush_volumetric_speed": ["0"],
+ "filament_long_retractions_when_ec": ["nil"],
"filament_max_volumetric_speed": ["24.5"],
"filament_minimal_purge_on_wipe_tower": ["15"],
"filament_retract_before_wipe": ["nil"],
"filament_retract_restart_extra": ["nil"],
"filament_retract_when_changing_layer": ["nil"],
+ "filament_retraction_distances_when_ec": ["nil"],
"filament_retraction_length": ["nil"],
"filament_retraction_minimum_travel": ["nil"],
"filament_retraction_speed": ["nil"],
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 f7c55e8..3ab50c4 100644
--- a/resources/profiles/X 3 Series/filament/fdm_filament_common.json
+++ b/resources/profiles/X 3 Series/filament/fdm_filament_common.json
@@ -29,11 +29,15 @@
"filament_diameter": ["1.75"],
"filament_end_gcode": ["; Filament-specific end gcode \n;END gcode for filament"],
"filament_flow_ratio": ["0.98"],
+ "filament_flush_temp": ["0"],
+ "filament_flush_volumetric_speed": ["0"],
+ "filament_long_retractions_when_ec": ["nil"],
"filament_max_volumetric_speed": ["20"],
"filament_minimal_purge_on_wipe_tower": ["15"],
"filament_retract_before_wipe": ["nil"],
"filament_retract_restart_extra": ["nil"],
"filament_retract_when_changing_layer": ["nil"],
+ "filament_retraction_distances_when_ec": ["nil"],
"filament_retraction_length": ["nil"],
"filament_retraction_minimum_travel": ["nil"],
"filament_retraction_speed": ["nil"],
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 31d2f2f..0f33361 100644
--- a/resources/profiles/X 4 Series/filament/QIDI ABS Odorless.json
+++ b/resources/profiles/X 4 Series/filament/QIDI ABS Odorless.json
@@ -1,6 +1,6 @@
{
"type": "filament",
- "filament_id": "PL401",
+ "filament_id": "QD_0_1_14",
"setting_id": "GFSA04",
"name": "QIDI ABS Odorless@X4",
"from": "system",
diff --git a/resources/profiles/X 4 Series/filament/QIDI Support For PAHT.json b/resources/profiles/X 4 Series/filament/QIDI Support For PAHT.json
index 356a458..9ea797a 100644
--- a/resources/profiles/X 4 Series/filament/QIDI Support For PAHT.json
+++ b/resources/profiles/X 4 Series/filament/QIDI Support For PAHT.json
@@ -1,6 +1,6 @@
{
"type": "filament",
- "filament_id": "GFN95",
+ "filament_id": "QD_0_1_32",
"setting_id": "GFSN95",
"name": "QIDI Support For PAHT@X4",
"from": "system",
@@ -18,7 +18,7 @@
"filament_flow_ratio": ["0.94"],
"filament_is_support": ["1"],
"filament_max_volumetric_speed": ["8"],
- "filament_type": ["Support For PAHT"],
+ "filament_type": ["PAHT-S"],
"impact_strength_z":["4.5"],
"nozzle_temperature_initial_layer": ["280"],
"nozzle_temperature_range_high": ["280"],
diff --git a/resources/profiles/X 4 Series/filament/QIDI Support For PET-PA.json b/resources/profiles/X 4 Series/filament/QIDI Support For PET-PA.json
index a31d7ff..c629e21 100644
--- a/resources/profiles/X 4 Series/filament/QIDI Support For PET-PA.json
+++ b/resources/profiles/X 4 Series/filament/QIDI Support For PET-PA.json
@@ -1,6 +1,6 @@
{
"type": "filament",
- "filament_id": "GFN96",
+ "filament_id": "QD_0_1_33",
"setting_id": "GFSN96",
"name": "QIDI Support For PET/PA@X4",
"from": "system",
@@ -18,7 +18,7 @@
"filament_flow_ratio": ["0.91"],
"filament_is_support": ["1"],
"filament_max_volumetric_speed": ["8"],
- "filament_type": ["Support For PET/PA"],
+ "filament_type": ["PA-S"],
"impact_strength_z":["4.5"],
"nozzle_temperature_initial_layer": ["280"],
"nozzle_temperature_range_high": ["280"],
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 913fb54..039a76e 100644
--- a/resources/profiles/X 4 Series/filament/QIDI UltraPA-CF25.json
+++ b/resources/profiles/X 4 Series/filament/QIDI UltraPA-CF25.json
@@ -1,6 +1,6 @@
{
"type": "filament",
- "filament_id": "PL422",
+ "filament_id": "QD_0_1_26",
"setting_id": "GFSN99",
"name": "QIDI UltraPA-CF25@X4",
"from": "system",
diff --git a/resources/profiles/X 4 Series/filament/QIDI UltraPA.json b/resources/profiles/X 4 Series/filament/QIDI UltraPA.json
index 3d897d2..2371d33 100644
--- a/resources/profiles/X 4 Series/filament/QIDI UltraPA.json
+++ b/resources/profiles/X 4 Series/filament/QIDI UltraPA.json
@@ -1,6 +1,6 @@
{
"type": "filament",
- "filament_id": "PL421",
+ "filament_id": "QD_0_1_24",
"setting_id": "GFSN98",
"name": "QIDI UltraPA@X4",
"from": "system",
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 3bd6fae..fdf7a4d 100644
--- a/resources/profiles/X 4 Series/filament/fdm_filament_common.json
+++ b/resources/profiles/X 4 Series/filament/fdm_filament_common.json
@@ -29,6 +29,9 @@
"filament_diameter": ["1.75"],
"filament_end_gcode": ["; Filament-specific end gcode \n;END gcode for filament"],
"filament_flow_ratio": ["0.98"],
+ "filament_flush_temp": ["0"],
+ "filament_flush_volumetric_speed": ["0"],
+ "filament_long_retractions_when_ec": ["nil"],
"filament_max_volumetric_speed": ["24.5"],
"filament_minimal_purge_on_wipe_tower": ["15"],
"filament_retract_before_wipe": ["nil"],
@@ -49,6 +52,7 @@
"filament_ramming_travel_time" : ["0"],
"filament_pre_cooling_temperature" : ["0"],
"filament_ramming_volumetric_speed" : ["-1"],
+ "filament_retraction_distances_when_ec": ["nil"],
"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 2c7df29..5eafd70 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
@@ -11,13 +11,14 @@
"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_retractions_when_cut[previous_extruder]}\nDISABLE_ALL_SENSOR\nG1 E-{retraction_distances_when_cut[previous_extruder]} F{old_filament_e_feedrate}\nM400\n{else}\nG1 E-5 F{old_filament_e_feedrate}\n{endif}\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\nM83\n; FLUSH_START\nG1 E1 F50\nG1 E17 F{old_filament_e_feedrate}\n; FLUSH_END\nT[next_extruder]\nG1 E1 F50\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_retractions_when_cut[previous_extruder]}\nG1 E{retraction_distances_when_cut[previous_extruder]} F{old_filament_e_feedrate}\nM400\n{endif}\n{if filament_type[next_extruder] == \"PETG\"}\nM109 S260\n{else}\nM109 S[nozzle_temperature_range_high]\n{endif}\n; FLUSH_START\nG1 E{48.5 * 0.58} F{old_filament_e_feedrate}\nG1 E{48.5 * 0.02} F50\nG1 E{48.5 * 0.18} F{old_filament_e_feedrate}\nG1 E{48.5 * 0.02} F50\nG1 E{48.5 * 0.18} F{old_filament_e_feedrate}\nG1 E{48.5 * 0.02} F50\n; FLUSH_END\n{if flush_length_1 > 1}\nG1 E-[old_retract_length_toolchange] F1800\nG1 E[old_retract_length_toolchange] F300\nM106 S255\nM400\nG91\nG1 X-3 F60\nG1 X3 F60\nG90\nCLEAR_FLUSH\nM106 S60\n; FLUSH_START\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; FLUSH_END\n{endif}\n{if flush_length_2 > 1}\nG1 E-[old_retract_length_toolchange] F1800\nG1 E[old_retract_length_toolchange] F300\nM106 S255\nM400\nG91\nG1 X-3 F60\nG1 X3 F60\nG90\nCLEAR_FLUSH\nM106 S60\n; FLUSH_START\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; FLUSH_END\n{endif}\n{if flush_length_3 > 1}\nG1 E-[new_retract_length_toolchange] F1800\nG1 E[new_retract_length_toolchange] F300\nM106 S255\nM400\nG91\nG1 X-3 F60\nG1 X3 F60\nG90\nCLEAR_FLUSH\nM106 S60\n; FLUSH_START\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; FLUSH_END\n{endif}\n{if flush_length_4 > 1}\nG1 E-[new_retract_length_toolchange] F1800\nG1 E[new_retract_length_toolchange] F300\nM106 S255\nM400\nG91\nG1 X-3 F60\nG1 X3 F60\nG90\nCLEAR_FLUSH\nM106 S60\n; FLUSH_START\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; FLUSH_END\n{endif}\nG1 E-[new_retract_length_toolchange] F1800\nM104 S[new_filament_temp]\nM106 S255\nM400\nG91\nG1 X-3 F60\nG1 X3 F60\nG90\nM109 S[new_filament_temp]\nG92 E0\nM400\nCLEAR_FLUSH\nCLEAR_OOZE\nM106 S0\nG1 Y300 F9000\nTOOL_CHANGE_END\nENABLE_ALL_SENSOR\n{endif}",
+ "change_filament_gcode": "G1 Z{max_layer_z + 3.0} F1200\nTOOL_CHANGE_START F=[current_extruder] T=[next_extruder]\nDISABLE_ALL_SENSOR\n{if long_retractions_when_cut[previous_extruder]}\nMOVE_TO_TRASH\nG1 E-{retraction_distances_when_cut[previous_extruder]} F{old_filament_e_feedrate}\nM400\n{else}\nG1 E-5 F{old_filament_e_feedrate}\n{endif}\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\nUNLOAD_T[current_extruder]\nG92 E0\nM83\n; FLUSH_START\nG1 E1 F50\nG1 E17 F{old_filament_e_feedrate}\n; FLUSH_END\nT[next_extruder]\nG1 E1 F50\n{if nozzle_temperature_range_high[current_extruder] >= nozzle_temperature_range_high[next_extruder]}\n{if filament_type[current_extruder] == \"PETG\"}\nSET_HEATER_TEMPERATURE HEATER=extruder TARGET=260 WAIT=1\n{else}\nSET_HEATER_TEMPERATURE HEATER=extruder TARGET={nozzle_temperature_range_high[current_extruder]} WAIT=1\n{endif}\n{else}\n{if filament_type[next_extruder] == \"PETG\"}\nSET_HEATER_TEMPERATURE HEATER=extruder TARGET=260 WAIT=1\n{else}\nSET_HEATER_TEMPERATURE HEATER=extruder TARGET={nozzle_temperature_range_high[next_extruder]} WAIT=1\n{endif}\n{endif}\n{if long_retractions_when_cut[previous_extruder]}\nG1 E{retraction_distances_when_cut[previous_extruder]} F{old_filament_e_feedrate}\nM400\n{endif}\n; FLUSH_START\nG1 E{48.5 * 0.58} F{old_filament_e_feedrate}\nG1 E{48.5 * 0.02} F50\nG1 E{48.5 * 0.18} F{old_filament_e_feedrate}\nG1 E{48.5 * 0.02} F50\nG1 E{48.5 * 0.18} F{old_filament_e_feedrate}\nG1 E{48.5 * 0.02} F50\nG1 E-[old_retract_length_toolchange] F1800\n; FLUSH_END\n{if flush_length_1 > 1}\nM106 S255\nM400\nG91\nG1 X-5 F60\nG1 X5 F60\nG90\nCLEAR_FLUSH\nM106 S60\n; FLUSH_START\nG1 E[old_retract_length_toolchange] F300\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\nG1 E-[old_retract_length_toolchange] F1800\n; FLUSH_END\n{endif}\n{if flush_length_2 > 1}\nM106 S255\nM400\nG91\nG1 X-5 F60\nG1 X5 F60\nG90\nCLEAR_FLUSH\nM106 S60\n; FLUSH_START\nG1 E[old_retract_length_toolchange] F300\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\nG1 E-[new_retract_length_toolchange] F1800\n; FLUSH_END\n{endif}\n{if flush_length_3 > 1}\nM106 S255\nM400\nG91\nG1 X-5 F60\nG1 X5 F60\nG90\nCLEAR_FLUSH\nM106 S60\n; FLUSH_START\nG1 E[new_retract_length_toolchange] F300\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\nG1 E-[new_retract_length_toolchange] F1800\n; FLUSH_END\n{endif}\n{if flush_length_4 > 1}\nM106 S255\nM400\nG91\nG1 X-5 F60\nG1 X5 F60\nG90\nCLEAR_FLUSH\nM106 S60\n; FLUSH_START\nG1 E[new_retract_length_toolchange] F300\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\nG1 E-[new_retract_length_toolchange] F1800\n; FLUSH_END\n{endif}\nM104 S[new_filament_temp]\nM106 S255\nM400\nG91\nG1 X-5 F60\nG1 X5 F60\nG90\nM109 S[new_filament_temp]\nG92 E0\nM400\nCLEAR_FLUSH\nCLEAR_OOZE\nM106 S0\nG1 Y300 F9000\nTOOL_CHANGE_END\nENABLE_ALL_SENSOR",
"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",
"is_support_timelapse": "1",
+ "is_support_multi_box": "1",
"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",
diff --git a/resources/web/filament/index.html b/resources/web/filament/index.html
index 08bdc84..26a7f34 100644
--- a/resources/web/filament/index.html
+++ b/resources/web/filament/index.html
@@ -10,6 +10,8 @@
font-family: Arial, sans-serif;
margin: 20px;
overflow: hidden;
+ background-color: white !important;
+ margin: 0 ;
}
.table-container {
width: 100%;