Merge branch 'SoftFever:main' into profile-fixes

This commit is contained in:
cochcoder
2024-04-25 17:36:08 +00:00
committed by GitHub
45 changed files with 1244 additions and 38 deletions

View File

@@ -8,6 +8,10 @@
"name": "MK4IS",
"sub_path": "machine/Prusa MK4.json"
},
{
"name": "MINIIS",
"sub_path": "machine/Prusa MINIIS.json"
},
{
"name": "MK3S",
"sub_path": "machine/Prusa MK3S.json"
@@ -26,6 +30,18 @@
"name": "process_common_mk4",
"sub_path": "process/process_common_mk4.json"
},
{
"name": "process_common_miniis",
"sub_path": "process/process_common_miniis.json"
},
{
"name": "process_speed_miniis",
"sub_path": "process/process_speed_miniis.json"
},
{
"name": "process_detail_miniis",
"sub_path": "process/process_detail_miniis.json"
},
{
"name": "process_common_mk3",
"sub_path": "process/process_common_mk3.json"
@@ -144,6 +160,76 @@
"name": "0.20mm Standard @MK4",
"sub_path": "process/0.20mm Standard @MK4.json"
},
{
"name": "0.05mm Detail @MINIIS",
"sub_path": "process/0.05mm Detail @MINIIS.json"
},
{
"name": "0.07mm Detail @MINIIS",
"sub_path": "process/0.07mm Detail @MINIIS.json"
},
{
"name": "0.10mm Speed @MINIIS",
"sub_path": "process/0.10mm Speed @MINIIS.json"
},
{
"name": "0.12mm Speed @MINIIS",
"sub_path": "process/0.12mm Speed @MINIIS.json"
},
{
"name": "0.12mm Standard @MINIIS",
"sub_path": "process/0.12mm Standard @MINIIS.json"
},
{
"name": "0.15mm Standard @MINIIS",
"sub_path": "process/0.15mm Standard @MINIIS.json"
},
{
"name": "0.15mm Speed @MINIIS",
"sub_path": "process/0.15mm Speed @MINIIS.json"
},
{
"name": "0.20mm Standard @MINIIS",
"sub_path": "process/0.20mm Standard @MINIIS.json"
},
{
"name": "0.20mm Speed @MINIIS",
"sub_path": "process/0.20mm Speed @MINIIS.json"
},
{
"name": "0.25mm Standard @MINIIS",
"sub_path": "process/0.25mm Standard @MINIIS.json"
},
{
"name": "0.25mm Speed @MINIIS",
"sub_path": "process/0.25mm Speed @MINIIS.json"
},
{
"name": "0.30mm Detail @MINIIS",
"sub_path": "process/0.30mm Detail @MINIIS.json"
},
{
"name": "0.35mm Standard @MINIIS",
"sub_path": "process/0.35mm Standard @MINIIS.json"
},
{
"name": "0.40mm Standard @MINIIS",
"sub_path": "process/0.40mm Standard @MINIIS.json"
},
{
"name": "0.24mm Standard @MK4",
@@ -215,6 +301,10 @@
"name": "Prusa Generic PLA @MK4",
"sub_path": "filament/Prusa Generic PLA @MK4.json"
},
{
"name": "Prusa Generic PLA @MINIIS",
"sub_path": "filament/Prusa Generic PLA @MINIIS.json"
},
{
"name": "Prusa Generic PLA-CF",
"sub_path": "filament/Prusa Generic PLA-CF.json"
@@ -227,6 +317,10 @@
"name": "Prusa Generic PETG @MK4",
"sub_path": "filament/Prusa Generic PETG @MK4.json"
},
{
"name": "Prusa Generic PETG @MINIIS",
"sub_path": "filament/Prusa Generic PETG @MINIIS.json"
},
{
"name": "Prusa Generic ABS",
"sub_path": "filament/Prusa Generic ABS.json"
@@ -235,6 +329,10 @@
"name": "Prusa Generic ABS @MK4",
"sub_path": "filament/Prusa Generic ABS @MK4.json"
},
{
"name": "Prusa Generic ABS @MINIIS",
"sub_path": "filament/Prusa Generic ABS @MINIIS.json"
},
{
"name": "Prusa Generic TPU",
"sub_path": "filament/Prusa Generic TPU.json"
@@ -243,6 +341,10 @@
"name": "Prusa Generic TPU @MK4",
"sub_path": "filament/Prusa Generic TPU @MK4.json"
},
{
"name": "Prusa Generic TPU @MINIIS",
"sub_path": "filament/Prusa Generic TPU @MINIIS.json"
},
{
"name": "Prusa Generic ASA",
"sub_path": "filament/Prusa Generic ASA.json"
@@ -251,6 +353,10 @@
"name": "Prusa Generic ASA @MK4",
"sub_path": "filament/Prusa Generic ASA @MK4.json"
},
{
"name": "Prusa Generic ASA @MINIIS",
"sub_path": "filament/Prusa Generic ASA @MINIIS.json"
},
{
"name": "Prusa Generic PC",
"sub_path": "filament/Prusa Generic PC.json"
@@ -297,6 +403,22 @@
"name": "Prusa MK4 0.4 nozzle",
"sub_path": "machine/Prusa MK4 0.4 nozzle.json"
},
{
"name": "Prusa MINIIS 0.4 nozzle",
"sub_path": "machine/Prusa MINIIS 0.4 nozzle.json"
},
{
"name": "Prusa MINIIS 0.25 nozzle",
"sub_path": "machine/Prusa MINIIS 0.25 nozzle.json"
},
{
"name": "Prusa MINIIS 0.6 nozzle",
"sub_path": "machine/Prusa MINIIS 0.6 nozzle.json"
},
{
"name": "Prusa MINIIS 0.8 nozzle",
"sub_path": "machine/Prusa MINIIS 0.8 nozzle.json"
},
{
"name": "Prusa MK4 0.6 nozzle",
"sub_path": "machine/Prusa MK4 0.6 nozzle.json"

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

View File

@@ -0,0 +1,24 @@
{
"type": "filament",
"filament_id": "GFB99_2",
"setting_id": "GFSA04",
"name": "Prusa Generic ABS @MINIIS",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_abs",
"filament_flow_ratio": [
"0.926"
],
"filament_max_volumetric_speed": [
"10"
],
"filament_start_gcode": [
"M572 S{if nozzle_diameter[0]==0.6}0.1{elsif nozzle_diameter[0]==0.8}0.07{elsif nozzle_diameter[0]==0.4}0.19{elsif nozzle_diameter[0]==0.25}0.55{else}0{endif}"
],
"compatible_printers": [
"Prusa MINIIS 0.4 nozzle",
"Prusa MINIIS 0.25 nozzle",
"Prusa MINIIS 0.6 nozzle",
"Prusa MINIIS 0.8 nozzle"
]
}

View File

@@ -16,9 +16,9 @@
"; Filament gcode\nM900 K{if nozzle_diameter[0]==0.4}0.03{elsif nozzle_diameter[0]==0.25}0.1{elsif nozzle_diameter[0]==0.3}0.06{elsif nozzle_diameter[0]==0.35}0.05{elsif nozzle_diameter[0]==0.5}0.03{elsif nozzle_diameter[0]==0.6}0.02{elsif nozzle_diameter[0]==0.8}0.01{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*PRINTER_MODEL_MK4IS.*/}\nM572 S{if nozzle_diameter[0]==0.4}0.02{elsif nozzle_diameter[0]==0.5}0.018{elsif nozzle_diameter[0]==0.6}0.012{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.25}0.09{elsif nozzle_diameter[0]==0.3}0.065{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S40 ; set heatbreak target temp"
],
"compatible_printers": [
"Prusa MK4 0.25 nozzle",
"Prusa MK4 0.4 nozzle",
"Prusa MK4 0.6 nozzle",
"Prusa MK4 0.8 nozzle"
]
"Prusa MK4 0.25 nozzle",
"Prusa MK4 0.4 nozzle",
"Prusa MK4 0.6 nozzle",
"Prusa MK4 0.8 nozzle"
]
}

View File

@@ -0,0 +1,24 @@
{
"type": "filament",
"filament_id": "GFB98_2",
"setting_id": "GFSA04",
"name": "Prusa Generic ASA @MINIIS",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_asa",
"filament_flow_ratio": [
"0.93"
],
"filament_max_volumetric_speed": [
"10"
],
"filament_start_gcode": [
"M572 S{if nozzle_diameter[0]==0.6}0.1{elsif nozzle_diameter[0]==0.8}0.07{elsif nozzle_diameter[0]==0.4}0.19{elsif nozzle_diameter[0]==0.25}0.55{else}0{endif}"
],
"compatible_printers": [
"Prusa MINIIS 0.4 nozzle",
"Prusa MINIIS 0.25 nozzle",
"Prusa MINIIS 0.6 nozzle",
"Prusa MINIIS 0.8 nozzle"
]
}

View File

@@ -16,9 +16,9 @@
"; Filament gcode\nM900 K{if nozzle_diameter[0]==0.4}0.03{elsif nozzle_diameter[0]==0.25}0.1{elsif nozzle_diameter[0]==0.3}0.06{elsif nozzle_diameter[0]==0.35}0.05{elsif nozzle_diameter[0]==0.5}0.03{elsif nozzle_diameter[0]==0.6}0.02{elsif nozzle_diameter[0]==0.8}0.01{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*PRINTER_MODEL_MK4IS.*/}\nM572 S{if nozzle_diameter[0]==0.4}0.02{elsif nozzle_diameter[0]==0.5}0.018{elsif nozzle_diameter[0]==0.6}0.012{elsif nozzle_diameter[0]==0.8}0.01{elsif nozzle_diameter[0]==0.25}0.09{elsif nozzle_diameter[0]==0.3}0.065{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S40 ; set heatbreak target temp"
],
"compatible_printers": [
"Prusa MK4 0.25 nozzle",
"Prusa MK4 0.4 nozzle",
"Prusa MK4 0.6 nozzle",
"Prusa MK4 0.8 nozzle"
]
"Prusa MK4 0.25 nozzle",
"Prusa MK4 0.4 nozzle",
"Prusa MK4 0.6 nozzle",
"Prusa MK4 0.8 nozzle"
]
}

View File

@@ -30,6 +30,10 @@
"Prusa MK4 0.25 nozzle",
"Prusa MK4 0.4 nozzle",
"Prusa MK4 0.6 nozzle",
"Prusa MK4 0.8 nozzle"
"Prusa MK4 0.8 nozzle",
"Prusa MINIIS 0.4 nozzle",
"Prusa MINIIS 0.25 nozzle",
"Prusa MINIIS 0.6 nozzle",
"Prusa MINIIS 0.8 nozzle"
]
}

View File

@@ -27,6 +27,10 @@
"Prusa MK4 0.25 nozzle",
"Prusa MK4 0.4 nozzle",
"Prusa MK4 0.6 nozzle",
"Prusa MK4 0.8 nozzle"
"Prusa MK4 0.8 nozzle",
"Prusa MINIIS 0.4 nozzle",
"Prusa MINIIS 0.25 nozzle",
"Prusa MINIIS 0.6 nozzle",
"Prusa MINIIS 0.8 nozzle"
]
}

View File

@@ -24,6 +24,10 @@
"Prusa MK4 0.25 nozzle",
"Prusa MK4 0.4 nozzle",
"Prusa MK4 0.6 nozzle",
"Prusa MK4 0.8 nozzle"
"Prusa MK4 0.8 nozzle",
"Prusa MINIIS 0.4 nozzle",
"Prusa MINIIS 0.25 nozzle",
"Prusa MINIIS 0.6 nozzle",
"Prusa MINIIS 0.8 nozzle"
]
}

View File

@@ -0,0 +1,63 @@
{
"type": "filament",
"filament_id": "GFG99_1",
"setting_id": "GFSA04",
"name": "Prusa Generic PETG @MINIIS",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pet",
"reduce_fan_stop_start_freq": [
"1"
],
"slow_down_for_layer_cooling": [
"1"
],
"fan_cooling_layer_time": [
"30"
],
"overhang_fan_speed": [
"90"
],
"overhang_fan_threshold": [
"25%"
],
"fan_max_speed": [
"90"
],
"fan_min_speed": [
"40"
],
"slow_down_min_speed": [
"10"
],
"slow_down_layer_time": [
"8"
],
"filament_flow_ratio": [
"0.95"
],
"nozzle_temperature": [
"240"
],
"nozzle_temperature_initial_layer": [
"230"
],
"hot_plate_temp": [
"85"
],
"hot_plate_temp_initial_layer": [
"85"
],
"filament_max_volumetric_speed": [
"9"
],
"filament_start_gcode": [
"M572 S{if nozzle_diameter[0]==0.6}0.22{elsif nozzle_diameter[0]==0.8}0.15{elsif nozzle_diameter[0]==0.4}0.36{elsif nozzle_diameter[0]==0.25}1.02{else}0{endif}"
],
"compatible_printers": [
"Prusa MINIIS 0.4 nozzle",
"Prusa MINIIS 0.25 nozzle",
"Prusa MINIIS 0.6 nozzle",
"Prusa MINIIS 0.8 nozzle"
]
}

View File

@@ -43,9 +43,9 @@
"; filament start gcode\nM900 K{if nozzle_diameter[0]==0.4}0.035{elsif nozzle_diameter[0]==0.25}0.12{elsif nozzle_diameter[0]==0.3}0.09{elsif nozzle_diameter[0]==0.35}0.08{elsif nozzle_diameter[0]==0.6}0.04{elsif nozzle_diameter[0]==0.5}0.05{elsif nozzle_diameter[0]==0.8}0.02{else}0{endif} ; Filament gcode\n\n{if printer_notes=~/.*PRINTER_MODEL_MK4IS.*/}\nM572 S{if nozzle_diameter[0]==0.4}0.055{elsif nozzle_diameter[0]==0.5}0.042{elsif nozzle_diameter[0]==0.6}0.025{elsif nozzle_diameter[0]==0.8}0.018{elsif nozzle_diameter[0]==0.25}0.18{elsif nozzle_diameter[0]==0.3}0.1{else}0{endif} ; Filament gcode\n{endif}\n\nM142 S36 ; set heatbreak target temp"
],
"compatible_printers": [
"Prusa MK4 0.25 nozzle",
"Prusa MK4 0.4 nozzle",
"Prusa MK4 0.6 nozzle",
"Prusa MK4 0.8 nozzle"
]
"Prusa MK4 0.25 nozzle",
"Prusa MK4 0.4 nozzle",
"Prusa MK4 0.6 nozzle",
"Prusa MK4 0.8 nozzle"
]
}

View File

@@ -0,0 +1,27 @@
{
"type": "filament",
"filament_id": "GFL99_2",
"setting_id": "GFSA04",
"name": "Prusa Generic PLA @MINIIS",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pla",
"filament_flow_ratio": [
"0.98"
],
"filament_max_volumetric_speed": [
"14"
],
"slow_down_layer_time": [
"8"
],
"filament_start_gcode": [
"M572 S{if nozzle_diameter[0]==0.6}0.17{elsif nozzle_diameter[0]==0.8}0.12{elsif nozzle_diameter[0]==0.4}0.27{elsif nozzle_diameter[0]==0.25}0.85{else}0{endif}"
],
"compatible_printers": [
"Prusa MINIIS 0.4 nozzle",
"Prusa MINIIS 0.25 nozzle",
"Prusa MINIIS 0.6 nozzle",
"Prusa MINIIS 0.8 nozzle"
]
}

View File

@@ -30,6 +30,10 @@
"Prusa MK4 0.25 nozzle",
"Prusa MK4 0.4 nozzle",
"Prusa MK4 0.6 nozzle",
"Prusa MK4 0.8 nozzle"
"Prusa MK4 0.8 nozzle",
"Prusa MINIIS 0.4 nozzle",
"Prusa MINIIS 0.25 nozzle",
"Prusa MINIIS 0.6 nozzle",
"Prusa MINIIS 0.8 nozzle"
]
}

View File

@@ -30,6 +30,10 @@
"Prusa MK4 0.25 nozzle",
"Prusa MK4 0.4 nozzle",
"Prusa MK4 0.6 nozzle",
"Prusa MK4 0.8 nozzle"
"Prusa MK4 0.8 nozzle",
"Prusa MINIIS 0.4 nozzle",
"Prusa MINIIS 0.25 nozzle",
"Prusa MINIIS 0.6 nozzle",
"Prusa MINIIS 0.8 nozzle"
]
}

View File

@@ -0,0 +1,93 @@
{
"type": "filament",
"filament_id": "GFU99_2",
"setting_id": "GFSA04",
"name": "Prusa Generic TPU @MINIIS",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_tpu",
"filament_max_volumetric_speed": [
"1.35"
],
"filament_flow_ratio": [
"1.15"
],
"filament_start_gcode": [
"M900 K0 ; Filament gcode"
],
"hot_plate_temp" : [
"50"
],
"hot_plate_temp_initial_layer" : [
"50"
],
"filament_type": [
"FLEX"
],
"nozzle_temperature_initial_layer": [
"220"
],
"nozzle_temperature": [
"210"
],
"filament_retraction_length": [
"3"
],
"filament_retraction_speed": [
"40"
],
"filament_deretraction_speed": [
"16"
],
"filament_retraction_minimum_travel": [
"6"
],
"filament_wipe": [
"1"
],
"close_fan_the_first_x_layers": [
"3"
],
"full_fan_speed_layer": [
"3"
],
"fan_min_speed": [
"30"
],
"fan_cooling_layer_time": [
"100"
],
"fan_max_speed": [
"80"
],
"slow_down_layer_time": [
"4"
],
"reduce_fan_stop_start_freq": [
"1"
],
"slow_down_for_layer_cooling": [
"1"
],
"slow_down_min_speed": [
"10"
],
"enable_overhang_bridge_fan": [
"1"
],
"overhang_fan_threshold": [
"50%"
],
"overhang_fan_speed": [
"50"
],
"support_material_interface_fan_speed": [
"-1"
],
"compatible_printers": [
"Prusa MINIIS 0.4 nozzle",
"Prusa MINIIS 0.25 nozzle",
"Prusa MINIIS 0.6 nozzle",
"Prusa MINIIS 0.8 nozzle"
]
}

View File

@@ -15,6 +15,12 @@
"nozzle_diameter": [
"0.25"
],
"max_layer_height": [
"0.15"
],
"min_layer_height": [
"0.05"
],
"bed_exclude_area": [
"0x0"
],

View File

@@ -0,0 +1,30 @@
{
"type": "machine",
"setting_id": "GM004",
"name": "Prusa MINIIS 0.25 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Prusa MINIIS 0.4 nozzle",
"gcode_flavor": "marlin2",
"printer_model": "MINIIS",
"printer_variant": "0.25",
"default_filament_profile": [
"Prusa Generic PLA @MINIIS"
],
"default_print_profile": "0.12mm Standard @MINIIS",
"nozzle_diameter": [
"0.25"
],
"max_layer_height": [
"0.15"
],
"min_layer_height": [
"0.05"
],
"retraction_length": [
"2.5"
],
"retraction_minimum_travel": [
"1.0"
]
}

View File

@@ -0,0 +1,117 @@
{
"type": "machine",
"setting_id": "GM003",
"name": "Prusa MINIIS 0.4 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "fdm_machine_common",
"gcode_flavor": "marlin2",
"printer_model": "MINIIS",
"printer_variant": "0.4",
"default_filament_profile": [
"Prusa Generic PLA @MINIIS"
],
"default_print_profile": "0.20mm Standard @MINIIS",
"nozzle_diameter": [
"0.4"
],
"bed_exclude_area": [
"0x0"
],
"printable_area": [
"0x0",
"180x0",
"180x180",
"0x180"
],
"machine_max_acceleration_e": [
"5000",
"5000"
],
"machine_max_acceleration_extruding": [
"4000",
"4000"
],
"machine_max_acceleration_retracting": [
"1250",
"1250"
],
"machine_max_acceleration_x": [
"4000",
"4000"
],
"machine_max_acceleration_y": [
"4000",
"4000"
],
"machine_max_acceleration_z": [
"400",
"400"
],
"machine_max_acceleration_travel": [
"4000",
"4000"
],
"machine_max_jerk_e": [
"10",
"2.5"
],
"machine_max_jerk_x": [
"8",
"8"
],
"machine_max_jerk_y": [
"8",
"8"
],
"machine_max_jerk_z": [
"2",
"2"
],
"machine_max_speed_e": [
"80",
"25"
],
"machine_max_speed_x": [
"400",
"400"
],
"machine_max_speed_y": [
"400",
"400"
],
"retraction_length": [
"2.5"
],
"retraction_minimum_travel": [
"1.5"
],
"retraction_speed": [
"70"
],
"deretraction_speed": [
"40"
],
"z_hop": [
"0.2"
],
"host_type": "prusalink",
"printable_height": "180",
"machine_end_gcode": "{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+2, max_print_height)} F720 ; Move print head up{endif}\nG1 X170 Y170 F4200 ; park print head\n{if max_layer_z < max_print_height}G1 Z{z_offset+min(max_layer_z+50, max_print_height)} F720 ; Move print head further up{endif}\nG4 ; wait\nM104 S0 ; turn off temperature\nM140 S0 ; turn off heatbed\nM107 ; turn off fan\nM221 S100 ; reset flow\nM572 S0 ; reset PA\nM569 S1 X Y ; reset to stealthchop for X Y\nM84 ; disable motors\n; max_layer_z = [max_layer_z]",
"machine_pause_gcode": "M601",
"machine_start_gcode": "M862.3 P \"MINI\" ; printer model check\nM862.1 P[nozzle_diameter] ; nozzle diameter check\nM862.5 P2 ; g-code level check\nM862.6 P\"Input shaper\" ; FW feature check\nM115 U5.1.2+13478\nG90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S170 ; set extruder temp for bed leveling\nM140 S[first_layer_bed_temperature] ; set bed temp\nM109 R170 ; wait for bed leveling temp\nM190 S[first_layer_bed_temperature] ; wait for bed temp\nM569 S1 X Y ; set stealthchop for X Y\nM204 T1250 ; set travel acceleration\nG28 ; home all without mesh bed level\nG29 ; mesh bed leveling \nM104 S[first_layer_temperature] ; set extruder temp\nG92 E0\n\nG1 X0 Y-2 Z3 F2400\n\nM109 S[first_layer_temperature] ; wait for extruder temp\n\n; intro line\nG1 X10 Z0.2 F1000\nG1 X70 E8 F900\nG1 X140 E10 F700\nG92 E0\n\nM569 S0 X Y ; set spreadcycle for X Y\nM204 T[machine_max_acceleration_travel] ; restore travel acceleration\nM572 W0.06 ; set smooth time\nM221 S95 ; set flow",
"before_layer_change_gcode": ";BEFORE_LAYER_CHANGE\nG92 E0.0\n;[layer_z]\nM201 X{interpolate_table(extruded_weight_total, (0,4000), (1000,1700), (10000,1700))} Y{interpolate_table(extruded_weight_total, (0,4000), (1000,1700), (10000,1700))}\n{if ! spiral_mode}M74 W[extruded_weight_total]{endif}\n",
"change_filament_gcode": "M600\nG1 E0.4 F1500 ; prime after color change",
"layer_change_gcode": ";AFTER_LAYER_CHANGE\n;[layer_z]",
"printer_notes": "Don't remove the following keywords! These keywords are used in the \"compatible printer\" condition of the print and filament profiles to link the particular print and filament profiles to this printer profile.\nPRINTER_VENDOR_PRUSA3D\nPRINTER_MODEL_MINIIS\nNO_TEMPLATES",
"scan_first_layer": "0",
"machine_load_filament_time": "17",
"machine_unload_filament_time": "16",
"nozzle_type": "brass",
"auxiliary_fan": "0",
"thumbnails": [
"16x16",
"313x173",
"440x240"
]
}

View File

@@ -0,0 +1,30 @@
{
"type": "machine",
"setting_id": "GM002",
"name": "Prusa MINIIS 0.6 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Prusa MINIIS 0.4 nozzle",
"gcode_flavor": "marlin2",
"printer_model": "MINIIS",
"printer_variant": "0.6",
"default_filament_profile": [
"Prusa Generic PLA @MINIIS"
],
"default_print_profile": "0.25mm Standard @MINIIS",
"nozzle_diameter": [
"0.6"
],
"max_layer_height": [
"0.4"
],
"min_layer_height": [
"0.15"
],
"retraction_length": [
"2.8"
],
"retraction_speed": [
"70"
]
}

View File

@@ -0,0 +1,33 @@
{
"type": "machine",
"setting_id": "GM001",
"name": "Prusa MINIIS 0.8 nozzle",
"from": "system",
"instantiation": "true",
"inherits": "Prusa MINIIS 0.4 nozzle",
"gcode_flavor": "marlin2",
"printer_model": "MINIIS",
"printer_variant": "0.8",
"default_filament_profile": [
"Prusa Generic PLA @MINIIS"
],
"default_print_profile": "0.40mm Standard @MINIIS",
"nozzle_diameter": [
"0.8"
],
"max_layer_height": [
"0.55"
],
"min_layer_height": [
"0.2"
] ,
"retraction_length": [
"2.8"
],
"retraction_speed": [
"45"
],
"deretraction_speed": [
"20"
]
}

View File

@@ -0,0 +1,12 @@
{
"type": "machine_model",
"name": "Prusa MINI",
"model_id": "MINI",
"nozzle_diameter": "0.25;0.4;0.6;0.8",
"machine_tech": "FFF",
"family": "Prusa",
"bed_model": "miniis_bed.stl",
"bed_texture": "miniis.svg",
"hotend_model": "",
"default_materials": "Prusa Generic PLA-CF;Prusa Generic PC;Prusa Generic PVA;Prusa Generic PA;Prusa Generic PA-CF;Prusa Generic ABS @MINIIS;Prusa Generic PLA @MINIIS;Prusa Generic PETG @MINIIS;Prusa Generic TPU @MINIIS;Prusa Generic ASA @MINIIS;"
}

View File

@@ -0,0 +1,32 @@
<svg id="Layer_1" data-name="Layer 1" xmlns="http://www.w3.org/2000/svg" width="180.5mm" height="180.6mm" viewBox="0 0 511.7 512">
<title>MINI_bed_texture</title>
<path d="M510.6,510.9" transform="translate(0.4 0.4)" style="fill: none;stroke: #fff;stroke-linecap: round;stroke-linejoin: round;stroke-width: 1.5px"/>
<path d="M.4,510.9" transform="translate(0.4 0.4)" style="fill: none;stroke: #fff;stroke-linecap: round;stroke-linejoin: round;stroke-width: 1.5px"/>
<line x1="511" y1="511.3" x2="511" y2="0.8" style="fill: none;stroke: #fff;stroke-linecap: round;stroke-linejoin: round;stroke-width: 1.5px"/>
<path d="M.4.4" transform="translate(0.4 0.4)" style="fill: none;stroke: #fff;stroke-linecap: round;stroke-linejoin: round;stroke-width: 1.5px"/>
<path d="M510.6.4" transform="translate(0.4 0.4)" style="fill: none;stroke: #fff;stroke-linecap: round;stroke-linejoin: round;stroke-width: 1.5px"/>
<line x1="0.8" y1="0.8" x2="0.8" y2="511.3" style="fill: none;stroke: #fff;stroke-linecap: round;stroke-linejoin: round;stroke-width: 1.5px"/>
<line x1="0.8" y1="511.3" x2="0.8" y2="0.8" style="fill: none;stroke: #fff;stroke-linecap: round;stroke-linejoin: round;stroke-width: 1.5px"/>
<line x1="511" y1="0.8" x2="511" y2="511.3" style="fill: none;stroke: #fff;stroke-linecap: round;stroke-linejoin: round;stroke-width: 1.5px"/>
<line x1="0.8" y1="511.3" x2="511" y2="511.3" style="fill: none;stroke: #fff;stroke-linecap: round;stroke-linejoin: round;stroke-width: 1.5px"/>
<line x1="0.8" y1="0.8" x2="511" y2="0.8" style="fill: none;stroke: #fff;stroke-linecap: round;stroke-linejoin: round;stroke-width: 1.5px"/>
<g>
<path d="M277.3,489.1c4.6,0,7.4,2.8,7.4,8.1s-2.9,8.1-7.4,8.1-7.4-2.9-7.4-8.1S272.9,489.1,277.3,489.1Zm3.7,8.1c0-3.8-1.5-5.7-3.7-5.7s-3.8,1.9-3.8,5.7,1.3,5.6,3.8,5.6S281,500.9,281,497.2Z" transform="translate(0.4 0.4)" style="fill: #fff"/>
<path d="M293.1,499h-2.5v6h-3.3V489.3h6.1a7.3,7.3,0,0,1,3.2.6,4.1,4.1,0,0,1,2.6,4,4.4,4.4,0,0,1-3.1,4.3h0l3.5,6.8H296Zm-.1-2.4c1.5,0,2.7-.7,2.7-2.5a2.4,2.4,0,0,0-2.7-2.5h-2.4v5Z" transform="translate(0.4 0.4)" style="fill: #fff"/>
<path d="M302,489.3h3.4V505H302Z" transform="translate(0.4 0.4)" style="fill: #fff"/>
<path d="M311.6,497.2c0,4,1.4,5.6,3.8,5.6s3.4-1.3,3.6-3.5V499h-3.7v-2.4h6.8V505h-2.6v-2.2h-.1a5,5,0,0,1-4.6,2.5c-4.4,0-6.8-3.1-6.8-7.9s3-8.3,7.4-8.3,6.1,1.7,6.4,4.9h-3.4a2.8,2.8,0,0,0-3-2.5C313,491.5,311.6,493.5,311.6,497.2Z" transform="translate(0.4 0.4)" style="fill: #fff"/>
<path d="M325.1,489.3h3.4V505h-3.4Z" transform="translate(0.4 0.4)" style="fill: #fff"/>
<path d="M331.7,489.3h3.7l5,8.5a16.8,16.8,0,0,1,1.2,2.3h0V489.3h3.1V505h-3.5l-5.3-8.7a12.8,12.8,0,0,1-1.1-2.4h-.1V505h-3Z" transform="translate(0.4 0.4)" style="fill: #fff"/>
<path d="M356.8,501.5H351l-1.1,3.5h-3.2l5.4-15.7h3.8l5.6,15.7h-3.6Zm-3.5-7.1-1.5,4.6H356l-1.5-4.5c-.4-1.4-.6-2.3-.6-2.3h0A15.3,15.3,0,0,1,353.3,494.4Z" transform="translate(0.4 0.4)" style="fill: #fff"/>
<path d="M363.4,489.3h3.4v13h6.8V505H363.4Z" transform="translate(0.4 0.4)" style="fill: #fff"/>
<path d="M384,499.6V505h-3.4V489.3h5.5c3.4,0,6,1.4,6,5s-2.8,5.3-6.3,5.3Zm2-2.5a2.5,2.5,0,0,0,2.8-2.7c0-1.9-1.1-2.7-2.8-2.7h-2v5.4Z" transform="translate(0.4 0.4)" style="fill: #fff"/>
<path d="M400.1,499h-2.4v6h-3.4V489.3h6.1a7.3,7.3,0,0,1,3.2.6,3.9,3.9,0,0,1,2.6,4,4.5,4.5,0,0,1-3,4.3h0l3.5,6.8H403Zm-.1-2.4c1.5,0,2.8-.7,2.8-2.5a2.4,2.4,0,0,0-2.7-2.5h-2.4v5Z" transform="translate(0.4 0.4)" style="fill: #fff"/>
<path d="M408.7,489.3H412v9.1a5.6,5.6,0,0,0,.6,3.2,3.6,3.6,0,0,0,5,0c.6-.8.5-2.1.5-3.2v-9.1h3.3v10.2c0,3.9-2.5,5.8-6.4,5.8s-6.3-1.8-6.3-5.8Z" transform="translate(0.4 0.4)" style="fill: #fff"/>
<path d="M432.4,493.5a2,2,0,0,0-2.3-2c-1.5,0-2.4.8-2.4,1.9s.6,1.7,2.1,1.9l2.4.5c2.8.5,4.1,2,4.1,4.3s-2.3,5.2-6.3,5.2-6.1-1.9-6.2-4.8h3.5a2.5,2.5,0,0,0,2.8,2.3c1.9,0,2.7-.9,2.7-2.1s-.5-1.7-2.2-2l-2.3-.4c-2.4-.5-4.1-1.9-4.1-4.4s2.2-4.8,5.9-4.8,5.7,2,5.8,4.4Z" transform="translate(0.4 0.4)" style="fill: #fff"/>
<path d="M447.4,501.5h-5.7l-1.2,3.5h-3.2l5.5-15.7h3.7l5.6,15.7h-3.5Zm-3.5-7.1-1.4,4.6h4.1l-1.4-4.5a11.3,11.3,0,0,1-.6-2.3h-.1A15.3,15.3,0,0,1,443.9,494.4Z" transform="translate(0.4 0.4)" style="fill: #fff"/>
<path d="M458.7,489.3h4.9l2.8,8.4a15.7,15.7,0,0,1,.7,2.3h0l.7-2.3,2.8-8.4h4.9V505h-3.3V492.7h-.1a26.9,26.9,0,0,1-1,3.3l-2.9,9h-2.5l-2.9-9a26.9,26.9,0,0,1-1-3.3h0V505h-3.1Z" transform="translate(0.4 0.4)" style="fill: #fff"/>
<path d="M478.6,489.3H482V505h-3.4Z" transform="translate(0.4 0.4)" style="fill: #fff"/>
<path d="M485.2,489.3h3.7l5,8.5a16.8,16.8,0,0,1,1.2,2.3h0V489.3h3.1V505h-3.5l-5.3-8.7a12.8,12.8,0,0,1-1.1-2.4h-.1V505h-3Z" transform="translate(0.4 0.4)" style="fill: #fff"/>
<path d="M501.3,489.3h3.4V505h-3.4Z" transform="translate(0.4 0.4)" style="fill: #fff"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

View File

@@ -0,0 +1,17 @@
{
"type": "process",
"setting_id": "GP004",
"name": "0.05mm Detail @MINIIS",
"from": "system",
"instantiation": "true",
"inherits": "process_detail_miniis",
"layer_height": "0.05",
"initial_layer_print_height": "0.2",
"top_shell_thickness": "0.7",
"top_shell_layers": "13",
"bottom_shell_thickness": "0.5",
"bottom_shell_layers": "10",
"compatible_printers": [
"Prusa MINIIS 0.25 nozzle"
]
}

View File

@@ -0,0 +1,19 @@
{
"type": "process",
"setting_id": "GP004",
"name": "0.07mm Detail @MINIIS",
"from": "system",
"instantiation": "true",
"inherits": "process_detail_miniis",
"layer_height": "0.07",
"initial_layer_print_height": "0.2",
"top_shell_thickness": "0.7",
"top_shell_layers": "10",
"bottom_shell_thickness": "0.5",
"bottom_shell_layers": "8",
"bridge_speed": "30",
"internal_solid_infill_speed": "140",
"compatible_printers": [
"Prusa MINIIS 0.25 nozzle"
]
}

View File

@@ -0,0 +1,22 @@
{
"type": "process",
"setting_id": "GP004",
"name": "0.10mm Speed @MINIIS",
"from": "system",
"instantiation": "true",
"inherits": "process_speed_miniis",
"bridge_speed": "35",
"layer_height": "0.10",
"initial_layer_print_height": "0.2",
"top_shell_thickness": "0.7",
"top_shell_layers": "7",
"bottom_shell_thickness": "0.5",
"bottom_shell_layers": "5",
"sparse_infill_acceleration": "3000",
"internal_solid_infill_acceleration": "3000",
"inner_wall_acceleration": "2000",
"outer_wall_acceleration": "1500",
"compatible_printers": [
"Prusa MINIIS 0.4 nozzle"
]
}

View File

@@ -0,0 +1,29 @@
{
"type": "process",
"setting_id": "GP004",
"name": "0.12mm Speed @MINIIS",
"from": "system",
"instantiation": "true",
"inherits": "process_detail_miniis",
"layer_height": "0.12",
"initial_layer_print_height": "0.2",
"top_shell_thickness": "0.7",
"top_shell_layers": "9",
"bottom_shell_thickness": "0.5",
"bottom_shell_layers": "6",
"outer_wall_speed": "120",
"inner_wall_speed": "120",
"small_perimeter_speed": "120",
"sparse_infill_speed": "100",
"internal_solid_infill_speed": "140",
"top_surface_speed": "60",
"gap_infill_speed": "50",
"bridge_speed": "25",
"support_speed": "70",
"overhang_1_4_speed": "60",
"internal_solid_infill_acceleration": "2500",
"sparse_infill_acceleration": "2500",
"compatible_printers": [
"Prusa MINIIS 0.25 nozzle"
]
}

View File

@@ -0,0 +1,34 @@
{
"type": "process",
"setting_id": "GP004",
"name": "0.12mm Standard @MINIIS",
"from": "system",
"instantiation": "true",
"inherits": "process_detail_miniis",
"layer_height": "0.12",
"initial_layer_print_height": "0.2",
"top_shell_thickness": "0.7",
"top_shell_layers": "9",
"bottom_shell_thickness": "0.5",
"bottom_shell_layers": "6",
"outer_wall_speed": "70",
"inner_wall_speed": "40",
"small_perimeter_speed": "40",
"sparse_infill_speed": "100",
"internal_solid_infill_speed": "140",
"top_surface_speed": "60",
"gap_infill_speed": "50",
"support_speed": "70",
"bridge_speed": "25",
"initial_layer_acceleration": "500",
"top_surface_acceleration": "1000",
"inner_wall_acceleration": "2000",
"outer_wall_acceleration": "1000",
"bridge_acceleration": "1500",
"internal_solid_infill_acceleration": "2500",
"sparse_infill_acceleration": "2500",
"travel_acceleration": "3000",
"compatible_printers": [
"Prusa MINIIS 0.25 nozzle"
]
}

View File

@@ -0,0 +1,28 @@
{
"type": "process",
"setting_id": "GP004",
"name": "0.15mm Speed @MINIIS",
"from": "system",
"instantiation": "true",
"inherits": "process_detail_miniis",
"layer_height": "0.12",
"initial_layer_print_height": "0.15",
"top_shell_thickness": "0.7",
"top_shell_layers": "5",
"bottom_shell_thickness": "0.5",
"bottom_shell_layers": "4",
"outer_wall_speed": "120",
"inner_wall_speed": "120",
"top_surface_speed": "120",
"sparse_infill_speed": "100",
"bridge_speed": "25",
"internal_solid_infill_speed": "140",
"sparse_infill_acceleration": "2500",
"internal_solid_infill_acceleration": "2500",
"inner_wall_acceleration": "2000",
"outer_wall_acceleration": "1500",
"compatible_printers": [
"Prusa MINIIS 0.4 nozzle",
"Prusa MINIIS 0.25 nozzle"
]
}

View File

@@ -0,0 +1,29 @@
{
"type": "process",
"setting_id": "GP004",
"name": "0.15mm Standard @MINIIS",
"from": "system",
"instantiation": "true",
"inherits": "process_detail_miniis",
"layer_height": "0.12",
"initial_layer_print_height": "0.15",
"top_shell_thickness": "0.7",
"top_shell_layers": "5",
"bottom_shell_thickness": "0.5",
"bottom_shell_layers": "4",
"outer_wall_speed": "40",
"inner_wall_speed": "70",
"top_surface_speed": "40",
"sparse_infill_speed": "100",
"bridge_speed": "25",
"internal_solid_infill_speed": "140",
"sparse_infill_acceleration": "2500",
"internal_solid_infill_acceleration": "2500",
"inner_wall_acceleration": "2000",
"outer_wall_acceleration": "1500",
"compatible_printers": [
"Prusa MINIIS 0.4 nozzle",
"Prusa MINIIS 0.6 nozzle",
"Prusa MINIIS 0.25 nozzle"
]
}

View File

@@ -0,0 +1,11 @@
{
"type": "process",
"setting_id": "GP004",
"name": "0.20mm Speed @MINIIS",
"from": "system",
"instantiation": "true",
"inherits": "process_speed_miniis",
"compatible_printers": [
"Prusa MINIIS 0.4 nozzle"
]
}

View File

@@ -0,0 +1,12 @@
{
"type": "process",
"setting_id": "GP004",
"name": "0.20mm Standard @MINIIS",
"from": "system",
"instantiation": "true",
"inherits": "process_common_miniis",
"compatible_printers": [
"Prusa MINIIS 0.4 nozzle",
"Prusa MINIIS 0.6 nozzle"
]
}

View File

@@ -0,0 +1,25 @@
{
"type": "process",
"setting_id": "GP004",
"name": "0.25mm Speed @MINIIS",
"from": "system",
"instantiation": "true",
"inherits": "process_speed_miniis",
"layer_height": "0.25",
"initial_layer_print_height": "0.2",
"top_shell_thickness": "0.9",
"top_shell_layers": "4",
"bottom_shell_thickness": "0.6",
"outer_wall_speed": "70",
"inner_wall_speed": "80",
"small_perimeter_speed": "70",
"sparse_infill_speed": "90",
"internal_solid_infill_speed": "80",
"top_surface_speed": "60",
"gap_infill_speed": "60",
"support_speed": "80",
"overhang_1_4_speed": "45",
"compatible_printers": [
"Prusa MINIIS 0.6 nozzle"
]
}

View File

@@ -0,0 +1,25 @@
{
"type": "process",
"setting_id": "GP004",
"name": "0.25mm Standard @MINIIS",
"from": "system",
"instantiation": "true",
"inherits": "process_common_miniis",
"layer_height": "0.25",
"initial_layer_print_height": "0.2",
"top_shell_thickness": "0.9",
"top_shell_layers": "4",
"bottom_shell_thickness": "0.6",
"bottom_shell_layers": "3",
"outer_wall_speed": "45",
"inner_wall_speed": "80",
"small_perimeter_speed": "45",
"sparse_infill_speed": "90",
"internal_solid_infill_speed": "80",
"top_surface_speed": "60",
"gap_infill_speed": "60",
"support_speed": "80",
"compatible_printers": [
"Prusa MINIIS 0.6 nozzle"
]
}

View File

@@ -0,0 +1,17 @@
{
"type": "process",
"setting_id": "GP004",
"name": "0.30mm Detail @MINIIS",
"from": "system",
"instantiation": "true",
"inherits": "process_detail_miniis",
"layer_height": "0.3",
"initial_layer_print_height": "0.2",
"top_shell_thickness": "0.7",
"top_shell_layers": "3",
"bottom_shell_thickness": "0.5",
"bottom_shell_layers": "2",
"compatible_printers": [
"Prusa MINIIS 0.8 nozzle"
]
}

View File

@@ -0,0 +1,25 @@
{
"type": "process",
"setting_id": "GP004",
"name": "0.35mm Standard @MINIIS",
"from": "system",
"instantiation": "true",
"inherits": "process_common_miniis",
"initial_layer_print_height": "0.2",
"top_shell_thickness": "0.9",
"top_shell_layers": "4",
"bottom_shell_thickness": "0.6",
"bottom_shell_layers": "3",
"outer_wall_speed": "45",
"inner_wall_speed": "60",
"bridge_speed": "30",
"support_speed": "60",
"small_perimeter_speed": "45",
"sparse_infill_speed": "70",
"internal_solid_infill_speed": "60",
"top_surface_speed": "55",
"gap_infill_speed": "45",
"compatible_printers": [
"Prusa MINIIS 0.6 nozzle"
]
}

View File

@@ -0,0 +1,27 @@
{
"type": "process",
"setting_id": "GP004",
"name": "0.40mm Standard @MINIIS",
"from": "system",
"instantiation": "true",
"inherits": "process_detail_miniis",
"layer_height": "0.4",
"initial_layer_print_height": "0.2",
"top_shell_thickness": "1.2",
"top_shell_layers": "4",
"bottom_shell_thickness": "0.8",
"bottom_shell_layers": "3",
"initial_layer_speed": "30",
"outer_wall_speed": "40",
"inner_wall_speed": "40",
"bridge_speed": "22",
"support_speed": "40",
"small_perimeter_speed": "40",
"sparse_infill_speed": "50",
"internal_solid_infill_speed": "40",
"top_surface_speed": "35",
"gap_infill_speed": "35",
"compatible_printers": [
"Prusa MINIIS 0.8 nozzle"
]
}

View File

@@ -39,6 +39,7 @@
"reduce_infill_retraction": "1",
"filename_format": "{input_filename_base}_{layer_height}mm_{filament_type[initial_tool]}_{printer_model}_{print_time}.gcode",
"detect_overhang_wall": "1",
"slowdown_for_curled_perimeters": "1",
"overhang_1_4_speed": "0",
"overhang_2_4_speed": "50",
"overhang_3_4_speed": "30",
@@ -102,6 +103,5 @@
"internal_solid_infill_speed": "150",
"top_surface_speed": "50",
"gap_infill_speed": "30",
"travel_speed": "200",
"prime_tower_width": "60"
}
"travel_speed": "200"
}

View File

@@ -0,0 +1,54 @@
{
"type": "process",
"name": "process_common_miniis",
"from": "system",
"instantiation": "false",
"inherits": "fdm_process_common",
"initial_layer_speed": "30",
"initial_layer_infill_speed": "80",
"outer_wall_speed": "45",
"inner_wall_speed": "80",
"sparse_infill_speed": "115",
"internal_solid_infill_speed": "140",
"top_surface_speed": "80",
"gap_infill_speed": "60",
"travel_speed": "400",
"bridge_speed": "35",
"internal_bridge_speed": "50",
"small_perimeter_speed": "45",
"travel_jerk": "8",
"outer_wall_jerk": "7",
"inner_wall_jerk": "8",
"default_jerk": "8",
"infill_jerk": "8",
"top_surface_jerk": "7",
"initial_layer_jerk": "7",
"default_acceleration": "2000",
"initial_layer_acceleration": "500",
"top_surface_acceleration": "1000",
"travel_acceleration": "4000",
"sparse_infill_acceleration": "4000",
"internal_solid_infill_acceleration": "3000",
"inner_wall_acceleration": "2000",
"outer_wall_acceleration": "1500",
"bridge_acceleration": "1500",
"exclude_object": "1",
"overhang_1_4_speed": "80%",
"overhang_2_4_speed": "25",
"overhang_3_4_speed": "20",
"overhang_4_4_speed": "15",
"sparse_infill_pattern": "cubic",
"top_shell_thickness": "0.7",
"top_shell_layers": "5",
"bottom_shell_thickness": "0.5",
"bottom_shell_layers": "4",
"elefant_foot_compensation": "0.2",
"slowdown_for_curled_perimeters": "1",
"infill_anchor_max": "12",
"sparse_infill_anchor": "2,5",
"infill_wall_overlap": "10%",
"enable_arc_fitting": "1",
"support_speed": "100",
"precise_outer_wall": "1",
"overhang_reverse": "1"
}

View File

@@ -0,0 +1,27 @@
{
"type": "process",
"name": "process_detail_miniis",
"from": "system",
"instantiation": "false",
"inherits": "process_common_miniis",
"travel_speed": "300",
"initial_layer_speed": "20",
"outer_wall_speed": "40",
"inner_wall_speed": "60",
"bridge_speed": "25",
"support_speed": "60",
"small_perimeter_speed": "40",
"sparse_infill_speed": "100",
"internal_solid_infill_speed": "100",
"top_surface_speed": "60",
"gap_infill_speed": "40",
"default_acceleration": "1500",
"initial_layer_acceleration": "500",
"top_surface_acceleration": "1000",
"inner_wall_acceleration": "1200",
"outer_wall_acceleration": "1000",
"bridge_acceleration": "1000",
"internal_solid_infill_acceleration": "2000",
"sparse_infill_acceleration": "2000",
"travel_acceleration": "3000"
}

View File

@@ -0,0 +1,21 @@
{
"type": "process",
"name": "process_speed_miniis",
"from": "system",
"instantiation": "false",
"inherits": "process_common_miniis",
"outer_wall_speed": "140",
"inner_wall_speed": "140",
"small_perimeter_speed": "140",
"sparse_infill_speed": "140",
"internal_solid_infill_speed": "140",
"top_surface_speed": "80",
"gap_infill_speed": "80",
"initial_layer_acceleration": "500",
"top_surface_acceleration": "1000",
"inner_wall_acceleration": "2500",
"outer_wall_acceleration": "2000",
"bridge_acceleration": "1500",
"internal_solid_infill_acceleration": "4000",
"overhang_1_4_speed": "60"
}

View File

@@ -959,7 +959,7 @@ void GUI_App::post_init()
if (app_config->get("stealth_mode") == "false")
hms_query = new HMSQuery();
m_show_gcode_window = app_config->get_bool("show_gcode_window");
if (m_networking_need_update) {
//updating networking
@@ -2807,7 +2807,7 @@ void GUI_App::init_label_colours()
m_color_label_modified = is_dark_mode ? wxColour("#F1754E") : wxColour("#F1754E");
m_color_label_sys = is_dark_mode ? wxColour("#B2B3B5") : wxColour("#363636");
#ifdef _WIN32
#if defined(_WIN32) || defined(__linux__) || defined(__APPLE__)
m_color_label_default = is_dark_mode ? wxColour(250, 250, 250) : m_color_label_sys; // wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT);
m_color_highlight_label_default = is_dark_mode ? wxColour(230, 230, 230): wxSystemSettings::GetColour(/*wxSYS_COLOUR_HIGHLIGHTTEXT*/wxSYS_COLOUR_WINDOWTEXT);
m_color_highlight_default = is_dark_mode ? wxColour(78, 78, 78) : wxSystemSettings::GetColour(wxSYS_COLOUR_3DLIGHT);
@@ -2920,22 +2920,38 @@ void GUI_App::UpdateDarkUI(wxWindow* window, bool highlited/* = false*/, bool ju
/*if (m_is_dark_mode != dark_mode() )
m_is_dark_mode = dark_mode();*/
if (m_is_dark_mode) {
auto original_col = window->GetBackgroundColour();
auto bg_col = StateColor::darkModeColorFor(original_col);
if (bg_col != original_col) {
auto orig_col = window->GetBackgroundColour();
auto bg_col = StateColor::darkModeColorFor(orig_col);
// there are cases where the background color of an item is bright, specifically:
// * the background color of a button: #009688 -- 73
if (bg_col != orig_col) {
window->SetBackgroundColour(bg_col);
}
original_col = window->GetForegroundColour();
auto fg_col = StateColor::darkModeColorFor(original_col);
orig_col = window->GetForegroundColour();
auto fg_col = StateColor::darkModeColorFor(orig_col);
auto fg_l = StateColor::GetLightness(fg_col);
if (fg_col != original_col) {
window->SetForegroundColour(fg_col);
auto color_difference = StateColor::GetColorDifference(bg_col, fg_col);
// fallback and sanity check with LAB
// color difference of less than 2 or 3 is not normally visible, and even less than 30-40 doesn't stand out
if (color_difference < 10) {
fg_col = StateColor::SetLightness(fg_col, 90);
}
// some of the stock colors have a lightness of ~49
if (fg_l < 45) {
fg_col = StateColor::SetLightness(fg_col, 70);
}
// at this point it shouldn't be possible that fg_col is the same as bg_col, but let's be safe
if (fg_col == bg_col) {
fg_col = StateColor::SetLightness(fg_col, 70);
}
window->SetForegroundColour(fg_col);
}
else {
auto original_col = window->GetBackgroundColour();
@@ -3891,7 +3907,7 @@ void GUI_App::on_http_error(wxCommandEvent &evt)
MessageDialog msg_dlg(nullptr, _L("The version of Orca Slicer is too low and needs to be updated to the latest version before it can be used normally"), "", wxAPPLY | wxOK);
if (msg_dlg.ShowModal() == wxOK) {
}
}
// request login

View File

@@ -1533,7 +1533,6 @@ void UnsavedChangesDialog::update_list()
text_left->SetFont(::Label::Head_13);
text_left->Wrap(-1);
text_left->SetForegroundColour(GREY700);
text_left->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOTEXT));
sizer_left_v->Add(text_left, 0, wxLEFT, 37);
@@ -1562,7 +1561,6 @@ void UnsavedChangesDialog::update_list()
text_left->SetFont(::Label::Body_13);
text_left->Wrap(-1);
text_left->SetForegroundColour(GREY700);
text_left->SetForegroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_INFOTEXT));
sizer_left_v->Add(text_left, 0, wxLEFT, 51 );

View File

@@ -1,4 +1,5 @@
#include "StateColor.hpp"
#include <cmath>
static bool gDarkMode = false;
@@ -41,7 +42,136 @@ static std::map<wxColour, wxColour> gDarkColors{
//{"#F0F0F0", "#4C4C54"},
};
std::map<wxColour, wxColour> const & StateColor::GetDarkMap()
std::tuple<double, double, double> StateColor::GetLAB(const wxColour& color) {
// Convert color to RGB color space
double r = color.Red() / 255.0;
double g = color.Green() / 255.0;
double b = color.Blue() / 255.0;
// Convert to XYZ color space
double x = 0.412453*r + 0.357580*g + 0.180423*b;
double y = 0.212671*r + 0.715160*g + 0.072169*b;
double z = 0.019334*r + 0.119193*g + 0.950227*b;
// Normalize XYZ values
double x_n = x / 0.950456;
double y_n = y / 1.0;
double z_n = z / 1.088754;
// Convert to LAB color space
double epsilon = 0.008856;
double kappa = 903.3;
double fx = (x_n > epsilon) ? cbrt(x_n) : (kappa*x_n + 16.0) / 116.0;
double fy = (y_n > epsilon) ? cbrt(y_n) : (kappa*y_n + 16.0) / 116.0;
double fz = (z_n > epsilon) ? cbrt(z_n) : (kappa*z_n + 16.0) / 116.0;
double l = 116.0 * fy - 16.0;
double a = 500.0 * (fx - fy);
double b_lab = 200.0 * (fy - fz);
return std::tuple<double, double, double>(l, a, b_lab);
}
double StateColor::LAB_Delta_E(const wxColour& color1, const wxColour& color2) {
auto [l1, a1, b1] = GetLAB(color1);
auto [l2, a2, b2] = GetLAB(color2);
return sqrt((l1 - l2) * (l1 - l2) + (a1 - a2) * (a1 - a2) + (b1 - b2) * (b1 - b2));
}
double StateColor::GetColorDifference(const wxColour& color1, const wxColour& color2) {
return LAB_Delta_E(color1, color2);
}
double StateColor::GetLightness(const wxColour& color) {
auto [l, a, b_lab] = GetLAB(color);
return l;
}
// Function to lighten or darken a wxColour using LAB color space
wxColour StateColor::SetLightness(const wxColour& color, double lightness) {
auto [l, a, b_lab] = GetLAB(color);
// Clamp lightness value
l = std::max(0.0, std::min(100.0, lightness));
// Convert back to XYZ color space
double fy_3 = (l + 16.0) / 116.0;
double fx_3 = a / 500.0 + fy_3;
double fz_3 = fy_3 - b_lab / 200.0;
double epsilon = 0.008856;
double kappa = 903.3;
double x_3 = (fx_3 > epsilon) ? fx_3 * fx_3 * fx_3 : (116.0 * fx_3 - 16.0) / kappa;
double y_3 = (l > kappa*epsilon) ? fy_3 * fy_3 * fy_3 : l / kappa;
double z_3 = (fz_3 > epsilon) ? fz_3 * fz_3 * fz_3 : (116.0 * fz_3 - 16.0) / kappa;
// Denormalize XYZ values
double x = x_3 * 0.950456;
double y = y_3 * 1.0;
double z = z_3 * 1.088754;
// Convert XYZ to RGB
double r_new = 3.240479*x - 1.537150*y - 0.498535*z;
double g_new = -0.969256*x + 1.875992*y + 0.041556*z;
double b_new = 0.055648*x - 0.204043*y + 1.057311*z;
// Clamp RGB values
r_new = std::max(0.0, std::min(1.0, r_new));
g_new = std::max(0.0, std::min(1.0, g_new));
b_new = std::max(0.0, std::min(1.0, b_new));
// Convert back to wxColour
int r_int = static_cast<int>(r_new * 255);
int g_int = static_cast<int>(g_new * 255);
int b_int = static_cast<int>(b_new * 255);
return wxColour(r_int, g_int, b_int);
}
wxColour StateColor::LightenDarkenColor(const wxColour& color, int amount) {
auto [l, a, b_lab] = GetLAB(color);
// Modify lightness
l += amount;
// Clamp lightness value
l = std::max(0.0, std::min(100.0, l));
// Convert back to XYZ color space
double fy_3 = (l + 16.0) / 116.0;
double fx_3 = a / 500.0 + fy_3;
double fz_3 = fy_3 - b_lab / 200.0;
double epsilon = 0.008856;
double kappa = 903.3;
double x_3 = (fx_3 > epsilon) ? fx_3 * fx_3 * fx_3 : (116.0 * fx_3 - 16.0) / kappa;
double y_3 = (l > kappa*epsilon) ? fy_3 * fy_3 * fy_3 : l / kappa;
double z_3 = (fz_3 > epsilon) ? fz_3 * fz_3 * fz_3 : (116.0 * fz_3 - 16.0) / kappa;
// Denormalize XYZ values
double x = x_3 * 0.950456;
double y = y_3 * 1.0;
double z = z_3 * 1.088754;
// Convert XYZ to RGB
double r_new = 3.240479*x - 1.537150*y - 0.498535*z;
double g_new = -0.969256*x + 1.875992*y + 0.041556*z;
double b_new = 0.055648*x - 0.204043*y + 1.057311*z;
// Clamp RGB values
r_new = std::max(0.0, std::min(1.0, r_new));
g_new = std::max(0.0, std::min(1.0, g_new));
b_new = std::max(0.0, std::min(1.0, b_new));
// Convert back to wxColour
int r_int = static_cast<int>(r_new * 255);
int g_int = static_cast<int>(g_new * 255);
int b_int = static_cast<int>(b_new * 255);
return wxColour(r_int, g_int, b_int);
}
std::map<wxColour, wxColour> const & StateColor::GetDarkMap()
{
return gDarkColors;
}

View File

@@ -9,7 +9,7 @@ class StateColor
{
public:
enum State {
Normal = 0,
Normal = 0,
Enabled = 1,
Checked = 2,
Focused = 4,
@@ -23,6 +23,13 @@ public:
};
public:
static std::tuple<double, double, double> GetLAB(const wxColour& color);
static double GetLightness(const wxColour& color);
static wxColour SetLightness(const wxColour& color, double lightness);
static wxColour LightenDarkenColor(const wxColour& color, int amount);
static double GetColorDifference(const wxColour& c1, const wxColour& c2);
static double LAB_Delta_E(const wxColour& c1, const wxColour& c2);
static void SetDarkMode(bool dark);
static std::map<wxColour, wxColour> const & GetDarkMap();