Merge branch 'main' into dev/bbl-network-upd

resources/images/radio_disabled.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18">
+<circle cx="8.5" cy="8.5" r="7" style="fill:none;stroke:#DBDBDB;stroke-miterlimit:10"/>
+<circle cx="8.5" cy="8.5" r="5.5" style="fill:#F0F0F1"/></svg>

resources/images/radio_off_hover.svg

@@ -0,0 +1,2 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18">
+<circle cx="8.5" cy="8.5" r="7" style="fill:none;stroke:#009688;stroke-miterlimit:10"/></svg>

resources/images/radio_on_hover.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18">
+<circle cx="8.5" cy="8.5" r="7" style="fill:none;stroke:#009688;stroke-miterlimit:10"/>
+<circle cx="8.5" cy="8.5" r="5.5" style="fill:#009688"/></svg>

resources/profiles/Flashforge/machine/fdm_adventurer3_common.json

@@ -36,7 +36,7 @@
   "change_filament_gcode": "M600",
   "machine_pause_gcode": "M25",
   "default_filament_profile": ["Flashforge PLA"],
-  "machine_start_gcode": "M140 S[bed_temperature_initial_layer] T0\nM104 S[nozzle_temperature_initial_layer] T0\nM104 S0 T1\nM107\nM900 K[pressure_advance] T0\nG90\nG28\nM132 X Y Z A B\nG1 Z50.000 F420\nG161 X Y F3300\nM7 T0\nM6 T0\nM651 S255\n;pre-extrude\nM108 T0\nG1 X-37.50 Y-75.00 F6000\nM106\nG1 Z0.200 F420\nG1 X-37.50 Y-74.50 F6000\nG1 X37.50 Y-74.50 E9.5 F1200\n",
+  "machine_start_gcode": "M140 S[bed_temperature_initial_layer] T0\nM104 S[nozzle_temperature_initial_layer] T0\nM104 S0 T1\nM107\nM900 K[pressure_advance] T0\nG90\nG28\nM132 X Y Z A B\nG1 Z50.000 F420\nG161 X Y F3300\nM7 T0\nM6 T0\nM651 S255\n;pre-extrude\nM108 T0\nG1 X-37.50 Y-75.00 F6000\nM106\nG1 Z0.200 F420\nG1 X-37.50 Y-74.00 F6000\nG1 X37.50 Y-74.00 E9.5 F1200\n",
   "machine_end_gcode": "G1 E-3 F3600\nG0 X50 Y50 F9000\nM104 S0 T0\nM140 S0 T0\nG162 Z F1800\nG28 X Y\nM132 X Y A B\nM652\nG91\nM18",
   "before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\n;[layer_z]",
   "layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",

resources/profiles/Prusa.json

@@ -4,34 +4,18 @@
     "force_update": "0",
     "description": "Prusa configurations",
     "machine_model_list": [
+        {
+            "name": "Prusa CORE One",
+            "sub_path": "machine/Prusa CORE One.json"
+        },
+        {
+            "name": "Prusa CORE One HF",
+            "sub_path": "machine/Prusa CORE One HF.json"
+        },
         {
             "name": "MK4IS",
             "sub_path": "machine/Prusa MK4.json"
         },
-        {
-            "name": "MINIIS",
-            "sub_path": "machine/Prusa MINIIS.json"
-        },
-        {
-            "name": "MK3S",
-            "sub_path": "machine/Prusa MK3S.json"
-        },
-        {
-            "name": "MINI",
-            "sub_path": "machine/Prusa MINI.json"
-        },
-        {
-            "name": "MK3.5",
-            "sub_path": "machine/Prusa MK3.5.json"
-        },
-        {
-            "name": "Prusa XL",
-            "sub_path": "machine/Prusa XL.json"
-        },
-        {
-            "name": "Prusa XL 5T",
-            "sub_path": "machine/Prusa XL 5T.json"
-        },
         {
             "name": "MK4S",
             "sub_path": "machine/Prusa MK4S.json"
@@ -41,12 +25,28 @@
             "sub_path": "machine/Prusa MK4S HF.json"
         },
         {
-            "name": "Prusa CORE One",
-            "sub_path": "machine/Prusa CORE One.json"
+            "name": "Prusa XL",
+            "sub_path": "machine/Prusa XL.json"
         },
         {
-            "name": "Prusa CORE One HF",
-            "sub_path": "machine/Prusa CORE One HF.json"
+            "name": "Prusa XL 5T",
+            "sub_path": "machine/Prusa XL 5T.json"
+        },
+        {
+            "name": "MK3.5",
+            "sub_path": "machine/Prusa MK3.5.json"
+        },
+        {
+            "name": "MK3S",
+            "sub_path": "machine/Prusa MK3S.json"
+        },
+        {
+            "name": "MINI",
+            "sub_path": "machine/Prusa MINI.json"
+        },
+        {
+            "name": "MINIIS",
+            "sub_path": "machine/Prusa MINIIS.json"
         }
     ],
     "process_list": [

resources/profiles/Prusa/machine/Prusa MINIIS.json

@@ -1,6 +1,6 @@
 {
     "type": "machine_model",
-    "name": "Prusa MINI",
+    "name": "Prusa MINI IS",
     "model_id": "MINI",
     "nozzle_diameter": "0.25;0.4;0.6;0.8",
     "machine_tech": "FFF",

resources/profiles/Tiertime.json

@@ -0,0 +1,528 @@
+{
+    "name": "Tiertime",
+    "version": "02.03.00.03",
+    "force_update": "0",
+    "description": "Tiertime configurations",
+    "machine_model_list": [
+        {
+            "name": "Tiertime UP400 Pro",
+            "sub_path": "machine/Tiertime UP400 Pro.json"
+        },
+        {
+            "name": "Tiertime UP310 Pro",
+            "sub_path": "machine/Tiertime UP310 Pro.json"
+        },
+        {
+            "name": "Tiertime UP300 HS",
+            "sub_path": "machine/Tiertime UP300 HS.json"
+        },
+        {
+            "name": "Tiertime UP600 HS",
+            "sub_path": "machine/Tiertime UP600 HS.json"
+        }
+    ],
+    "process_list": [
+        {
+            "name": "fdm_process_common",
+            "sub_path": "process/fdm_process_common.json"
+        },
+        {
+            "name": "fdm_process_tiertime_common",
+            "sub_path": "process/fdm_process_tiertime_common.json"
+        },
+        {
+            "name": "fdm_process_tiertime_HS_common",
+            "sub_path": "process/fdm_process_tiertime_HS_common.json"
+        },
+        {
+            "name": "0.12mm Fine @Tiertime UP400 Pro",
+            "sub_path": "process/0.12mm Fine @Tiertime UP400 Pro.json"
+        },
+        {
+            "name": "0.16mm Optimal @Tiertime UP400 Pro",
+            "sub_path": "process/0.16mm Optimal @Tiertime UP400 Pro.json"
+        },
+        {
+            "name": "0.20mm Standard @Tiertime UP400 Pro",
+            "sub_path": "process/0.20mm Standard @Tiertime UP400 Pro.json"
+        },
+        {
+            "name": "0.24mm Draft @Tiertime UP400 Pro",
+            "sub_path": "process/0.24mm Draft @Tiertime UP400 Pro.json"
+        },
+        {
+            "name": "0.28mm Extra Draft @Tiertime UP400 Pro",
+            "sub_path": "process/0.28mm Extra Draft @Tiertime UP400 Pro.json"
+        },
+        {
+            "name": "0.12mm Fine @Tiertime UP310 Pro",
+            "sub_path": "process/0.12mm Fine @Tiertime UP310 Pro.json"
+        },
+        {
+            "name": "0.16mm Optimal @Tiertime UP310 Pro",
+            "sub_path": "process/0.16mm Optimal @Tiertime UP310 Pro.json"
+        },
+        {
+            "name": "0.20mm Standard @Tiertime UP310 Pro",
+            "sub_path": "process/0.20mm Standard @Tiertime UP310 Pro.json"
+        },
+        {
+            "name": "0.24mm Draft @Tiertime UP310 Pro",
+            "sub_path": "process/0.24mm Draft @Tiertime UP310 Pro.json"
+        },
+        {
+            "name": "0.28mm Extra Draft @Tiertime UP310 Pro",
+            "sub_path": "process/0.28mm Extra Draft @Tiertime UP310 Pro.json"
+        },
+        {
+            "name": "0.12mm Fine @Tiertime UP300 HS",
+            "sub_path": "process/0.12mm Fine @Tiertime UP300 HS.json"
+        },
+        {
+            "name": "0.16mm Optimal @Tiertime UP300 HS",
+            "sub_path": "process/0.16mm Optimal @Tiertime UP300 HS.json"
+        },
+        {
+            "name": "0.20mm Standard @Tiertime UP300 HS",
+            "sub_path": "process/0.20mm Standard @Tiertime UP300 HS.json"
+        },
+        {
+            "name": "0.24mm Draft @Tiertime UP300 HS",
+            "sub_path": "process/0.24mm Draft @Tiertime UP300 HS.json"
+        },
+        {
+            "name": "0.28mm Extra Draft @Tiertime UP300 HS",
+            "sub_path": "process/0.28mm Extra Draft @Tiertime UP300 HS.json"
+        },
+        {
+            "name": "0.12mm Fine @Tiertime UP600 HS",
+            "sub_path": "process/0.12mm Fine @Tiertime UP600 HS.json"
+        },
+        {
+            "name": "0.16mm Optimal @Tiertime UP600 HS",
+            "sub_path": "process/0.16mm Optimal @Tiertime UP600 HS.json"
+        },
+        {
+            "name": "0.20mm Standard @Tiertime UP600 HS",
+            "sub_path": "process/0.20mm Standard @Tiertime UP600 HS.json"
+        },
+        {
+            "name": "0.24mm Draft @Tiertime UP600 HS",
+            "sub_path": "process/0.24mm Draft @Tiertime UP600 HS.json"
+        },
+        {
+            "name": "0.28mm Extra Draft @Tiertime UP600 HS",
+            "sub_path": "process/0.28mm Extra Draft @Tiertime UP600 HS.json"
+        }
+    ],
+    "filament_list": [
+        {
+            "name": "fdm_filament_common",
+            "sub_path": "filament/fdm_filament_common.json"
+        },
+        {
+            "name": "fdm_filament_pla",
+            "sub_path": "filament/fdm_filament_pla.json"
+        },
+        {
+            "name": "fdm_filament_abs",
+            "sub_path": "filament/fdm_filament_abs.json"
+        },
+        {
+            "name": "fdm_filament_tpu",
+            "sub_path": "filament/fdm_filament_tpu.json"
+        },
+        {
+            "name": "fdm_filament_pet",
+            "sub_path": "filament/fdm_filament_pet.json"
+        },
+        {
+            "name": "fdm_filament_pc",
+            "sub_path": "filament/fdm_filament_pc.json"
+        },
+        {
+            "name": "fdm_filament_pctg",
+            "sub_path": "filament/fdm_filament_pctg.json"
+        },
+        {
+            "name": "fdm_filament_asa",
+            "sub_path": "filament/fdm_filament_asa.json"
+        },
+        {
+            "name": "fdm_filament_pva",
+            "sub_path": "filament/fdm_filament_pva.json"
+        },
+        {
+            "name": "fdm_filament_pa",
+            "sub_path": "filament/fdm_filament_pa.json"
+        },
+        {
+            "name": "fdm_filament_hips",
+            "sub_path": "filament/fdm_filament_hips.json"
+        },
+        {
+            "name": "fdm_filament_pps",
+            "sub_path": "filament/fdm_filament_pps.json"
+        },
+        {
+            "name": "fdm_filament_ppa",
+            "sub_path": "filament/fdm_filament_ppa.json"
+        },
+        {
+            "name": "fdm_filament_pe",
+            "sub_path": "filament/fdm_filament_pe.json"
+        },
+        {
+            "name": "fdm_filament_pp",
+            "sub_path": "filament/fdm_filament_pp.json"
+        },
+        {
+            "name": "fdm_filament_eva",
+            "sub_path": "filament/fdm_filament_eva.json"
+        },
+        {
+            "name": "fdm_filament_pha",
+            "sub_path": "filament/fdm_filament_pha.json"
+        },
+        {
+            "name": "fdm_filament_bvoh",
+            "sub_path": "filament/fdm_filament_bvoh.json"
+        },
+        {
+          "name": "fdm_filament_sbs",
+          "sub_path": "filament/fdm_filament_sbs.json"
+        },
+        {
+            "name": "Tiertime PLA",
+            "sub_path": "filament/Tiertime PLA.json"
+        },
+        {
+            "name": "Tiertime ABS",
+            "sub_path": "filament/Tiertime ABS.json"
+        },
+        {
+            "name": "Tiertime ASA",
+            "sub_path": "filament/Tiertime ASA.json"
+        },
+        {
+            "name": "Tiertime PA6-CF",
+            "sub_path": "filament/Tiertime PA6-CF.json"
+        },
+        {
+            "name": "Tiertime PC",
+            "sub_path": "filament/Tiertime PC.json"
+        },
+        {
+            "name": "Tiertime PET-CF",
+            "sub_path": "filament/Tiertime PET-CF.json"
+        },
+        {
+            "name": "Tiertime PETG",
+            "sub_path": "filament/Tiertime PETG.json"
+        },
+        {
+            "name": "Tiertime PLA-CF",
+            "sub_path": "filament/Tiertime PLA-CF.json"
+        },
+        {
+            "name": "Tiertime PVA",
+            "sub_path": "filament/Tiertime PVA.json"
+        },
+        {
+            "name": "Tiertime TPU 95A",
+            "sub_path": "filament/Tiertime TPU 95A.json"
+        },
+        {
+            "name": "Tiertime PLA@300HS",
+            "sub_path": "filament/Tiertime PLA@300HS.json"
+        },
+        {
+            "name": "Tiertime ABS@300HS",
+            "sub_path": "filament/Tiertime ABS@300HS.json"
+        },
+        {
+            "name": "Tiertime ASA@300HS",
+            "sub_path": "filament/Tiertime ASA@300HS.json"
+        },
+        {
+            "name": "Tiertime PA6-CF@300HS",
+            "sub_path": "filament/Tiertime PA6-CF@300HS.json"
+        },
+        {
+            "name": "Tiertime PC@300HS",
+            "sub_path": "filament/Tiertime PC@300HS.json"
+        },
+        {
+            "name": "Tiertime PET-CF@300HS",
+            "sub_path": "filament/Tiertime PET-CF@300HS.json"
+        },
+        {
+            "name": "Tiertime PETG@300HS",
+            "sub_path": "filament/Tiertime PETG@300HS.json"
+        },
+        {
+            "name": "Tiertime PLA-CF@300HS",
+            "sub_path": "filament/Tiertime PLA-CF@300HS.json"
+        },
+        {
+            "name": "Tiertime PVA@300HS",
+            "sub_path": "filament/Tiertime PVA@300HS.json"
+        },
+        {
+            "name": "Tiertime TPU 95A@300HS",
+            "sub_path": "filament/Tiertime TPU 95A@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic ABS",
+            "sub_path": "filament/Tiertime Generic ABS.json"
+        },
+        {
+            "name": "Tiertime Generic ASA",
+            "sub_path": "filament/Tiertime Generic ASA.json"
+        },
+        {
+            "name": "Tiertime Generic BVOH",
+            "sub_path": "filament/Tiertime Generic BVOH.json"
+        },
+        {
+            "name": "Tiertime Generic EVA",
+            "sub_path": "filament/Tiertime Generic EVA.json"
+        },
+        {
+            "name": "Tiertime Generic HIPS",
+            "sub_path": "filament/Tiertime Generic HIPS.json"
+        },
+        {
+            "name": "Tiertime Generic PA-CF",
+            "sub_path": "filament/Tiertime Generic PA-CF.json"
+        },
+        {
+            "name": "Tiertime Generic PA",
+            "sub_path": "filament/Tiertime Generic PA.json"
+        },
+        {
+            "name": "Tiertime Generic PC",
+            "sub_path": "filament/Tiertime Generic PC.json"
+        },
+        {
+            "name": "Tiertime Generic PCTG",
+            "sub_path": "filament/Tiertime Generic PCTG.json"
+        },
+        {
+            "name": "Tiertime Generic PE-CF",
+            "sub_path": "filament/Tiertime Generic PE-CF.json"
+        },
+        {
+            "name": "Tiertime Generic PE",
+            "sub_path": "filament/Tiertime Generic PE.json"
+        },
+        {
+            "name": "Tiertime Generic PETG",
+            "sub_path": "filament/Tiertime Generic PETG.json"
+        },
+        {
+            "name": "Tiertime Generic PETG-CF",
+            "sub_path": "filament/Tiertime Generic PETG-CF.json"
+        },
+        {
+            "name": "Tiertime Generic PHA",
+            "sub_path": "filament/Tiertime Generic PHA.json"
+        },
+        {
+            "name": "Tiertime Generic PLA High Speed",
+            "sub_path": "filament/Tiertime Generic PLA High Speed.json"
+        },
+        {
+            "name": "Tiertime Generic PLA Silk",
+            "sub_path": "filament/Tiertime Generic PLA Silk.json"
+        },
+        {
+            "name": "Tiertime Generic PLA-CF",
+            "sub_path": "filament/Tiertime Generic PLA-CF.json"
+        },
+        {
+            "name": "Tiertime Generic PLA",
+            "sub_path": "filament/Tiertime Generic PLA.json"
+        },
+        {
+            "name": "Tiertime Generic PP-CF",
+            "sub_path": "filament/Tiertime Generic PP-CF.json"
+        },
+        {
+            "name": "Tiertime Generic PP-GF",
+            "sub_path": "filament/Tiertime Generic PP-GF.json"
+        },
+        {
+            "name": "Tiertime Generic PP",
+            "sub_path": "filament/Tiertime Generic PP.json"
+        },
+        {
+            "name": "Tiertime Generic PPA-CF",
+            "sub_path": "filament/Tiertime Generic PPA-CF.json"
+        },
+        {
+            "name": "Tiertime Generic PPA-GF",
+            "sub_path": "filament/Tiertime Generic PPA-GF.json"
+        },
+        {
+            "name": "Tiertime Generic PPS-CF",
+            "sub_path": "filament/Tiertime Generic PPS-CF.json"
+        },
+        {
+            "name": "Tiertime Generic PPS",
+            "sub_path": "filament/Tiertime Generic PPS.json"
+        },
+        {
+            "name": "Tiertime Generic PVA",
+            "sub_path": "filament/Tiertime Generic PVA.json"
+        },
+        {
+            "name": "Tiertime Generic SBS",
+            "sub_path": "filament/Tiertime Generic SBS.json"
+        }
+        ,
+        {
+            "name": "Tiertime Generic TPU",
+            "sub_path": "filament/Tiertime Generic TPU.json"
+        },
+        {
+            "name": "Tiertime Generic ABS@300HS",
+            "sub_path": "filament/Tiertime Generic ABS@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic ASA@300HS",
+            "sub_path": "filament/Tiertime Generic ASA@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic BVOH@300HS",
+            "sub_path": "filament/Tiertime Generic BVOH@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic EVA@300HS",
+            "sub_path": "filament/Tiertime Generic EVA@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic HIPS@300HS",
+            "sub_path": "filament/Tiertime Generic HIPS@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PA-CF@300HS",
+            "sub_path": "filament/Tiertime Generic PA-CF@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PA@300HS",
+            "sub_path": "filament/Tiertime Generic PA@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PC@300HS",
+            "sub_path": "filament/Tiertime Generic PC@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PCTG@300HS",
+            "sub_path": "filament/Tiertime Generic PCTG@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PE-CF@300HS",
+            "sub_path": "filament/Tiertime Generic PE-CF@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PE@300HS",
+            "sub_path": "filament/Tiertime Generic PE@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PETG@300HS",
+            "sub_path": "filament/Tiertime Generic PETG@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PETG-CF@300HS",
+            "sub_path": "filament/Tiertime Generic PETG-CF@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PHA@300HS",
+            "sub_path": "filament/Tiertime Generic PHA@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PLA High Speed@300HS",
+            "sub_path": "filament/Tiertime Generic PLA High Speed@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PLA Silk@300HS",
+            "sub_path": "filament/Tiertime Generic PLA Silk@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PLA-CF@300HS",
+            "sub_path": "filament/Tiertime Generic PLA-CF@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PLA@300HS",
+            "sub_path": "filament/Tiertime Generic PLA@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PP-CF@300HS",
+            "sub_path": "filament/Tiertime Generic PP-CF@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PP-GF@300HS",
+            "sub_path": "filament/Tiertime Generic PP-GF@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PP@300HS",
+            "sub_path": "filament/Tiertime Generic PP@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PPA-CF@300HS",
+            "sub_path": "filament/Tiertime Generic PPA-CF@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PPA-GF@300HS",
+            "sub_path": "filament/Tiertime Generic PPA-GF@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PPS-CF@300HS",
+            "sub_path": "filament/Tiertime Generic PPS-CF@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PPS@300HS",
+            "sub_path": "filament/Tiertime Generic PPS@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic PVA@300HS",
+            "sub_path": "filament/Tiertime Generic PVA@300HS.json"
+        },
+        {
+            "name": "Tiertime Generic SBS@300HS",
+            "sub_path": "filament/Tiertime Generic SBS@300HS.json"
+        }
+        ,
+        {
+            "name": "Tiertime Generic TPU@300HS",
+            "sub_path": "filament/Tiertime Generic TPU@300HS.json"
+        }
+    ],
+    "machine_list": [
+        {
+            "name": "fdm_machine_common",
+            "sub_path": "machine/fdm_machine_common.json"
+        },
+        {
+            "name": "fdm_tiertime_common",
+            "sub_path": "machine/fdm_tiertime_common.json"
+        },
+        {
+            "name": "Tiertime UP400 Pro 0.4 nozzle",
+            "sub_path": "machine/Tiertime UP400 Pro 0.4 nozzle.json"
+        },
+        {
+            "name": "Tiertime UP310 Pro 0.4 nozzle",
+            "sub_path": "machine/Tiertime UP310 Pro 0.4 nozzle.json"
+        },
+        {
+            "name": "Tiertime UP300 HS 0.4 nozzle",
+            "sub_path": "machine/Tiertime UP300 HS 0.4 nozzle.json"
+        },
+        {
+            "name": "Tiertime UP600 HS 0.4 nozzle",
+            "sub_path": "machine/Tiertime UP600 HS 0.4 nozzle.json"
+        }
+    ]
+}

resources/profiles/Tiertime/filament/Tiertime ABS.json

@@ -0,0 +1,31 @@
+{
+    "type": "filament",
+    "filament_id": "GFB00",
+    "setting_id": "GFSB00",
+    "name": "Tiertime ABS",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_abs",
+    "filament_flow_ratio": [
+        "0.95"
+    ],
+    "filament_cost": [
+        "24.99"
+    ],
+    "filament_vendor": [
+        "Tiertime Lab"
+    ],
+    "fan_max_speed": [
+        "60"
+    ],
+    "filament_max_volumetric_speed": [
+        "16"
+    ],
+    "slow_down_layer_time": [
+        "12"
+    ],
+    "compatible_printers": [
+        "Tiertime UP400 Pro 0.4 nozzle",
+        "Tiertime UP310 Pro 0.4 nozzle"
+    ]
+}

resources/profiles/Tiertime/filament/Tiertime ABS@300HS.json

@@ -0,0 +1,31 @@
+{
+    "type": "filament",
+    "filament_id": "GFB00_01",
+    "setting_id": "GFSB00",
+    "name": "Tiertime ABS@300HS",
+    "from": "system",
+    "instantiation": "true",
+    "inherits": "fdm_filament_abs",
+    "filament_flow_ratio": [
+        "0.95"
+    ],
+    "filament_cost": [
+        "24.99"
+    ],
+    "filament_vendor": [
+        "Tiertime Lab"
+    ],
+    "fan_max_speed": [
+        "60"
+    ],
+    "filament_max_volumetric_speed": [
+        "16"
+    ],
+    "slow_down_layer_time": [
+        "12"
+    ],
+    "compatible_printers": [
+        "Tiertime UP300 HS 0.4 nozzle",
+        "Tiertime UP600 HS 0.4 nozzle"
+    ]
+}

resources/profiles/Tiertime/filament/Tiertime ASA.json

@@ -0,0 +1,42 @@
+{
+    "type": "filament",
+    "name": "Tiertime ASA",
+    "inherits": "fdm_filament_asa",
+    "from": "system",
+    "filament_id": "GFB01",
+    "instantiation": "true",
+    "fan_max_speed": [
+        "35"
+    ],
+    "filament_cost": [
+        "31.99"
+    ],
+    "filament_density": [
+        "1.05"
+    ],
+    "filament_flow_ratio": [
+        "0.95"
+    ],
+    "filament_max_volumetric_speed": [
+        "18"
+    ],
+    "filament_vendor": [
+        "Tiertime Lab"
+    ],
+    "nozzle_temperature": [
+        "270"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "270"
+    ],
+    "slow_down_layer_time": [
+        "12"
+    ],
+    "fan_min_speed": [
+        "25"
+    ],
+    "compatible_printers": [
+        "Tiertime UP400 Pro 0.4 nozzle",
+        "Tiertime UP310 Pro 0.4 nozzle"
+    ]
+}

resources/profiles/Tiertime/filament/Tiertime ASA@300HS.json

@@ -0,0 +1,42 @@
+{
+    "type": "filament",
+    "name": "Tiertime ASA@300HS",
+    "inherits": "fdm_filament_asa",
+    "from": "system",
+    "filament_id": "GFB01_01",
+    "instantiation": "true",
+    "fan_max_speed": [
+        "35"
+    ],
+    "filament_cost": [
+        "31.99"
+    ],
+    "filament_density": [
+        "1.05"
+    ],
+    "filament_flow_ratio": [
+        "0.95"
+    ],
+    "filament_max_volumetric_speed": [
+        "18"
+    ],
+    "filament_vendor": [
+        "Tiertime Lab"
+    ],
+    "nozzle_temperature": [
+        "270"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "270"
+    ],
+    "slow_down_layer_time": [
+        "12"
+    ],
+    "fan_min_speed": [
+        "25"
+    ],
+    "compatible_printers": [
+        "Tiertime UP300 HS 0.4 nozzle",
+        "Tiertime UP600 HS 0.4 nozzle"
+    ]
+}

resources/profiles/Tiertime/filament/Tiertime Generic ABS.json

@@ -0,0 +1,36 @@
+{
+    "type": "filament",
+    "name": "Tiertime Generic ABS",
+    "inherits": "fdm_filament_abs",
+    "from": "system",
+    "filament_id": "GFB99",
+    "instantiation": "true",
+    "filament_flow_ratio": [
+        "0.95"
+    ],
+    "fan_max_speed": [
+        "20"
+    ],
+    "filament_max_volumetric_speed": [
+        "15"
+    ],
+    "hot_plate_temp": [
+        "100"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "100"
+    ],
+    "reduce_fan_stop_start_freq": [
+        "0"
+    ],
+    "textured_plate_temp": [
+        "100"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "100"
+    ],
+    "compatible_printers": [
+        "Tiertime UP400 Pro 0.4 nozzle",
+        "Tiertime UP310 Pro 0.4 nozzle"
+    ]
+}

resources/profiles/Tiertime/filament/Tiertime Generic ABS@300HS.json

@@ -0,0 +1,36 @@
+{
+    "type": "filament",
+    "name": "Tiertime Generic ABS@300HS",
+    "inherits": "fdm_filament_abs",
+    "from": "system",
+    "filament_id": "GFB99_01",
+    "instantiation": "true",
+    "filament_flow_ratio": [
+        "0.95"
+    ],
+    "fan_max_speed": [
+        "20"
+    ],
+    "filament_max_volumetric_speed": [
+        "15"
+    ],
+    "hot_plate_temp": [
+        "100"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "100"
+    ],
+    "reduce_fan_stop_start_freq": [
+        "0"
+    ],
+    "textured_plate_temp": [
+        "100"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "100"
+    ],
+    "compatible_printers": [
+        "Tiertime UP300 HS 0.4 nozzle",
+        "Tiertime UP600 HS 0.4 nozzle"
+    ]
+}

resources/profiles/Tiertime/filament/Tiertime Generic ASA.json

@@ -0,0 +1,30 @@
+{
+    "type": "filament",
+    "name": "Tiertime Generic ASA",
+    "inherits": "fdm_filament_asa",
+    "from": "system",
+    "filament_id": "GFB98",
+    "instantiation": "true",
+    "filament_flow_ratio": [
+        "0.95"
+    ],
+    "filament_max_volumetric_speed": [
+        "12"
+    ],
+    "hot_plate_temp": [
+        "100"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "100"
+    ],
+    "textured_plate_temp": [
+        "100"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "100"
+    ],
+    "compatible_printers": [
+        "Tiertime UP400 Pro 0.4 nozzle",
+        "Tiertime UP310 Pro 0.4 nozzle"
+    ]
+}

resources/profiles/Tiertime/filament/Tiertime Generic ASA@300HS.json

@@ -0,0 +1,30 @@
+{
+    "type": "filament",
+    "name": "Tiertime Generic ASA@300HS",
+    "inherits": "fdm_filament_asa",
+    "from": "system",
+    "filament_id": "GFB98_01",
+    "instantiation": "true",
+    "filament_flow_ratio": [
+        "0.95"
+    ],
+    "filament_max_volumetric_speed": [
+        "12"
+    ],
+    "hot_plate_temp": [
+        "100"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "100"
+    ],
+    "textured_plate_temp": [
+        "100"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "100"
+    ],
+    "compatible_printers": [
+        "Tiertime UP300 HS 0.4 nozzle",
+        "Tiertime UP600 HS 0.4 nozzle"
+    ]
+}

resources/profiles/Tiertime/filament/Tiertime Generic BVOH.json

@@ -0,0 +1,12 @@
+{
+    "type": "filament",
+    "name": "Tiertime Generic BVOH",
+    "inherits": "fdm_filament_bvoh",
+    "from": "system",
+    "filament_id": "GFS97",
+    "instantiation": "true",
+    "compatible_printers": [
+        "Tiertime UP400 Pro 0.4 nozzle",
+        "Tiertime UP310 Pro 0.4 nozzle"
+    ]
+}

resources/profiles/Tiertime/filament/Tiertime Generic BVOH@300HS.json

@@ -0,0 +1,12 @@
+{
+    "type": "filament",
+    "name": "Tiertime Generic BVOH@300HS",
+    "inherits": "fdm_filament_bvoh",
+    "from": "system",
+    "filament_id": "GFS97_01",
+    "instantiation": "true",
+    "compatible_printers": [
+        "Tiertime UP300 HS 0.4 nozzle",
+        "Tiertime UP600 HS 0.4 nozzle"
+    ]
+}

resources/profiles/Tiertime/filament/Tiertime Generic EVA.json

@@ -0,0 +1,90 @@
+{
+    "type": "filament",
+    "name": "Tiertime Generic EVA",
+    "inherits": "fdm_filament_eva",
+    "from": "system",
+    "filament_id": "GFR99",
+    "instantiation": "true",
+    "additional_cooling_fan_speed": [
+        "70"
+    ],
+    "close_fan_the_first_x_layers": [
+        "1"
+    ],
+    "cool_plate_temp": [
+        "35"
+    ],
+    "cool_plate_temp_initial_layer": [
+        "35"
+    ],
+    "eng_plate_temp": [
+        "0"
+    ],
+    "eng_plate_temp_initial_layer": [
+        "0"
+    ],
+    "fan_cooling_layer_time": [
+        "100"
+    ],
+    "fan_min_speed": [
+        "100"
+    ],
+    "filament_cost": [
+        "21.99"
+    ],
+    "filament_density": [
+        "0.94"
+    ],
+    "filament_max_volumetric_speed": [
+        "12"
+    ],
+    "filament_type": [
+        "EVA"
+    ],
+    "hot_plate_temp": [
+        "55"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "55"
+    ],
+    "nozzle_temperature": [
+        "210"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "210"
+    ],
+    "nozzle_temperature_range_high": [
+        "220"
+    ],
+    "nozzle_temperature_range_low": [
+        "175"
+    ],
+    "overhang_fan_threshold": [
+        "50%"
+    ],
+    "reduce_fan_stop_start_freq": [
+        "1"
+    ],
+    "slow_down_layer_time": [
+        "4"
+    ],
+    "slow_down_min_speed": [
+        "20"
+    ],
+    "temperature_vitrification": [
+        "70"
+    ],
+    "textured_plate_temp": [
+        "55"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "55"
+    ],
+    "filament_start_gcode": [
+        "; filament start gcode\n{if  (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
+    ],
+    "compatible_printers": [
+        "Tiertime UP400 Pro 0.4 nozzle",
+        "Tiertime UP310 Pro 0.4 nozzle"
+    ]
+}

resources/profiles/Tiertime/filament/Tiertime Generic EVA@300HS.json

@@ -0,0 +1,90 @@
+{
+    "type": "filament",
+    "name": "Tiertime Generic EVA@300HS",
+    "inherits": "fdm_filament_eva",
+    "from": "system",
+    "filament_id": "GFR99_01",
+    "instantiation": "true",
+    "additional_cooling_fan_speed": [
+        "70"
+    ],
+    "close_fan_the_first_x_layers": [
+        "1"
+    ],
+    "cool_plate_temp": [
+        "35"
+    ],
+    "cool_plate_temp_initial_layer": [
+        "35"
+    ],
+    "eng_plate_temp": [
+        "0"
+    ],
+    "eng_plate_temp_initial_layer": [
+        "0"
+    ],
+    "fan_cooling_layer_time": [
+        "100"
+    ],
+    "fan_min_speed": [
+        "100"
+    ],
+    "filament_cost": [
+        "21.99"
+    ],
+    "filament_density": [
+        "0.94"
+    ],
+    "filament_max_volumetric_speed": [
+        "12"
+    ],
+    "filament_type": [
+        "EVA"
+    ],
+    "hot_plate_temp": [
+        "55"
+    ],
+    "hot_plate_temp_initial_layer": [
+        "55"
+    ],
+    "nozzle_temperature": [
+        "210"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "210"
+    ],
+    "nozzle_temperature_range_high": [
+        "220"
+    ],
+    "nozzle_temperature_range_low": [
+        "175"
+    ],
+    "overhang_fan_threshold": [
+        "50%"
+    ],
+    "reduce_fan_stop_start_freq": [
+        "1"
+    ],
+    "slow_down_layer_time": [
+        "4"
+    ],
+    "slow_down_min_speed": [
+        "20"
+    ],
+    "temperature_vitrification": [
+        "70"
+    ],
+    "textured_plate_temp": [
+        "55"
+    ],
+    "textured_plate_temp_initial_layer": [
+        "55"
+    ],
+    "filament_start_gcode": [
+        "; filament start gcode\n{if  (bed_temperature[current_extruder] >55)||(bed_temperature_initial_layer[current_extruder] >55)}M106 P3 S200\n{elsif(bed_temperature[current_extruder] >50)||(bed_temperature_initial_layer[current_extruder] >50)}M106 P3 S150\n{elsif(bed_temperature[current_extruder] >45)||(bed_temperature_initial_layer[current_extruder] >45)}M106 P3 S50\n{endif}\n\n{if activate_air_filtration[current_extruder] && support_air_filtration}\nM106 P3 S{during_print_exhaust_fan_speed_num[current_extruder]} \n{endif}"
+    ],
+    "compatible_printers": [
+        "Tiertime UP300 HS 0.4 nozzle",
+        "Tiertime UP600 HS 0.4 nozzle"
+    ]
+}

resources/profiles/Tiertime/filament/Tiertime Generic HIPS.json

@@ -0,0 +1,15 @@
+{
+    "type": "filament",
+    "name": "Tiertime Generic HIPS",
+    "inherits": "fdm_filament_hips",
+    "from": "system",
+    "filament_id": "GFS98",
+    "instantiation": "true",
+    "filament_is_support": [
+        "1"
+    ],
+    "compatible_printers": [
+        "Tiertime UP400 Pro 0.4 nozzle",
+        "Tiertime UP310 Pro 0.4 nozzle"
+    ]
+}

resources/profiles/Tiertime/filament/Tiertime Generic HIPS@300HS.json

@@ -0,0 +1,15 @@
+{
+    "type": "filament",
+    "name": "Tiertime Generic HIPS@300HS",
+    "inherits": "fdm_filament_hips",
+    "from": "system",
+    "filament_id": "GFS98_01",
+    "instantiation": "true",
+    "filament_is_support": [
+        "1"
+    ],
+    "compatible_printers": [
+        "Tiertime UP300 HS 0.4 nozzle",
+        "Tiertime UP600 HS 0.4 nozzle"
+    ]
+}

resources/profiles/Tiertime/filament/Tiertime Generic PA-CF.json

@@ -0,0 +1,37 @@
+{
+    "type": "filament",
+    "name": "Tiertime Generic PA-CF",
+    "inherits": "fdm_filament_pa",
+    "from": "system",
+    "filament_id": "GFN98",
+    "setting_id": "GFSN99",
+    "instantiation": "true",
+    "fan_cooling_layer_time": [
+        "5"
+    ],
+    "fan_max_speed": [
+        "30"
+    ],
+    "fan_min_speed": [
+        "10"
+    ],
+    "filament_type": [
+        "PA-CF"
+    ],
+    "full_fan_speed_layer": [
+        "2"
+    ],
+    "overhang_fan_speed": [
+        "40"
+    ],
+    "overhang_fan_threshold": [
+        "0%"
+    ],
+    "temperature_vitrification": [
+        "170"
+    ],
+    "compatible_printers": [
+        "Tiertime UP400 Pro 0.4 nozzle",
+        "Tiertime UP310 Pro 0.4 nozzle"
+    ]
+}

resources/profiles/Tiertime/filament/Tiertime Generic PA-CF@300HS.json

@@ -0,0 +1,37 @@
+{
+    "type": "filament",
+    "name": "Tiertime Generic PA-CF@300HS",
+    "inherits": "fdm_filament_pa",
+    "from": "system",
+    "filament_id": "GFN98_02",
+    "setting_id": "GFSN99",
+    "instantiation": "true",
+    "fan_cooling_layer_time": [
+        "5"
+    ],
+    "fan_max_speed": [
+        "30"
+    ],
+    "fan_min_speed": [
+        "10"
+    ],
+    "filament_type": [
+        "PA-CF"
+    ],
+    "full_fan_speed_layer": [
+        "2"
+    ],
+    "overhang_fan_speed": [
+        "40"
+    ],
+    "overhang_fan_threshold": [
+        "0%"
+    ],
+    "temperature_vitrification": [
+        "170"
+    ],
+    "compatible_printers": [
+        "Tiertime UP300 HS 0.4 nozzle",
+        "Tiertime UP600 HS 0.4 nozzle"
+    ]
+}

resources/profiles/Tiertime/filament/Tiertime Generic PA.json

@@ -0,0 +1,55 @@
+{
+    "type": "filament",
+    "name": "Tiertime Generic PA",
+    "inherits": "fdm_filament_pa",
+    "from": "system",
+    "filament_id": "GFN99",
+    "setting_id": "GFSN98",
+    "instantiation": "true",
+    "chamber_temperatures": [
+        "60"
+    ],
+    "fan_cooling_layer_time": [
+        "65"
+    ],
+    "fan_max_speed": [
+        "85"
+    ],
+    "fan_min_speed": [
+        "40"
+    ],
+    "filament_max_volumetric_speed": [
+        "12"
+    ],
+    "nozzle_temperature": [
+        "260"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "260"
+    ],
+    "nozzle_temperature_range_high": [
+        "280"
+    ],
+    "nozzle_temperature_range_low": [
+        "240"
+    ],
+    "overhang_fan_speed": [
+        "95"
+    ],
+    "overhang_fan_threshold": [
+        "10%"
+    ],
+    "required_nozzle_HRC": [
+        "3"
+    ],
+    "slow_down_layer_time": [
+        "8"
+    ],
+    "slow_down_min_speed": [
+        "10"
+    ],
+    "compatible_printers": [
+        "Tiertime UP400 Pro 0.4 nozzle",
+        "Tiertime UP310 Pro 0.4 nozzle"
+    ]
+}

resources/profiles/Tiertime/filament/Tiertime Generic PA@300HS.json

@@ -0,0 +1,55 @@
+{
+    "type": "filament",
+    "name": "Tiertime Generic PA@300HS",
+    "inherits": "fdm_filament_pa",
+    "from": "system",
+    "filament_id": "GFN99_01",
+    "setting_id": "GFSN98",
+    "instantiation": "true",
+    "chamber_temperatures": [
+        "60"
+    ],
+    "fan_cooling_layer_time": [
+        "65"
+    ],
+    "fan_max_speed": [
+        "85"
+    ],
+    "fan_min_speed": [
+        "40"
+    ],
+    "filament_max_volumetric_speed": [
+        "12"
+    ],
+    "nozzle_temperature": [
+        "260"
+    ],
+    "nozzle_temperature_initial_layer": [
+        "260"
+    ],
+    "nozzle_temperature_range_high": [
+        "280"
+    ],
+    "nozzle_temperature_range_low": [
+        "240"
+    ],
+    "overhang_fan_speed": [
+        "95"
+    ],
+    "overhang_fan_threshold": [
+        "10%"
+    ],
+    "required_nozzle_HRC": [
+        "3"
+    ],
+    "slow_down_layer_time": [
+        "8"
+    ],
+    "slow_down_min_speed": [
+        "10"
+    ],
+    "compatible_printers": [
+        "Tiertime UP300 HS 0.4 nozzle",
+        "Tiertime UP600 HS 0.4 nozzle"
+    ]
+}

resources/profiles/Tiertime/filament/Tiertime Generic PC.json

@@ -0,0 +1,18 @@
+{
+    "type": "filament",
+    "name": "Tiertime Generic PC",
+    "inherits": "fdm_filament_pc",
+    "from": "system",
+    "filament_id": "GFC99",
+    "instantiation": "true",
+    "filament_max_volumetric_speed": [
+        "16"
+    ],
+    "filament_flow_ratio": [
+        "0.94"
+    ],
+    "compatible_printers": [
+        "Tiertime UP400 Pro 0.4 nozzle",
+        "Tiertime UP310 Pro 0.4 nozzle"
+    ]
+}

resources/profiles/Tiertime/filament/Tiertime Generic PC@300HS.json

@@ -0,0 +1,18 @@
+{
+    "type": "filament",
+    "name": "Tiertime Generic PC@300HS",
+    "inherits": "fdm_filament_pc",
+    "from": "system",
+    "filament_id": "GFC99_01",
+    "instantiation": "true",
+    "filament_max_volumetric_speed": [
+        "16"
+    ],
+    "filament_flow_ratio": [
+        "0.94"
+    ],
+    "compatible_printers": [
+        "Tiertime UP300 HS 0.4 nozzle", 
+        "Tiertime UP600 HS 0.4 nozzle"
+    ]
+}