mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-09-21 16:02:37 +00:00
Compare commits
8
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
02b8e26a4f | ||
|
|
64cad00569 | ||
|
|
45940a573d | ||
|
|
8b63628cf9 | ||
|
|
c8bfd2ad3e | ||
|
|
3eae4c6997 | ||
|
|
83eaf3bcfc | ||
|
|
454ef1571b |
@@ -529,7 +529,7 @@ jobs:
|
|||||||
&& github.event_name == 'pull_request_target'
|
&& github.event_name == 'pull_request_target'
|
||||||
permissions:
|
permissions:
|
||||||
contents: read
|
contents: read
|
||||||
pull-requests: read
|
pull-requests: write
|
||||||
issues: write
|
issues: write
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
timeout-minutes: 5
|
timeout-minutes: 5
|
||||||
@@ -636,7 +636,7 @@ jobs:
|
|||||||
&& github.event_name == 'pull_request_target'
|
&& github.event_name == 'pull_request_target'
|
||||||
permissions:
|
permissions:
|
||||||
contents: read # delegatable subtree, for file modes
|
contents: read # delegatable subtree, for file modes
|
||||||
pull-requests: read
|
pull-requests: write
|
||||||
issues: write # label + comment
|
issues: write # label + comment
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
timeout-minutes: 10
|
timeout-minutes: 10
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "Creality",
|
"name": "Creality",
|
||||||
"version": "02.03.02.82",
|
"version": "02.03.02.84",
|
||||||
"force_update": "0",
|
"force_update": "0",
|
||||||
"description": "Creality configurations",
|
"description": "Creality configurations",
|
||||||
"machine_model_list": [
|
"machine_model_list": [
|
||||||
|
|||||||
@@ -55,7 +55,7 @@
|
|||||||
"0"
|
"0"
|
||||||
],
|
],
|
||||||
"filament_max_volumetric_speed": [
|
"filament_max_volumetric_speed": [
|
||||||
"12"
|
"8"
|
||||||
],
|
],
|
||||||
"filament_retract_before_wipe": [
|
"filament_retract_before_wipe": [
|
||||||
"100"
|
"100"
|
||||||
|
|||||||
@@ -43,19 +43,19 @@
|
|||||||
"1.75"
|
"1.75"
|
||||||
],
|
],
|
||||||
"filament_flow_ratio": [
|
"filament_flow_ratio": [
|
||||||
"0.98"
|
"0.95"
|
||||||
],
|
],
|
||||||
"filament_is_support": [
|
"filament_is_support": [
|
||||||
"0"
|
"0"
|
||||||
],
|
],
|
||||||
"filament_max_volumetric_speed": [
|
"filament_max_volumetric_speed": [
|
||||||
"16"
|
"14"
|
||||||
],
|
],
|
||||||
"filament_minimal_purge_on_wipe_tower": [
|
"filament_minimal_purge_on_wipe_tower": [
|
||||||
"15"
|
"15"
|
||||||
],
|
],
|
||||||
"filament_retract_before_wipe": [
|
"filament_retract_before_wipe": [
|
||||||
"nil"
|
"100%"
|
||||||
],
|
],
|
||||||
"filament_retract_restart_extra": [
|
"filament_retract_restart_extra": [
|
||||||
"nil"
|
"nil"
|
||||||
@@ -67,7 +67,7 @@
|
|||||||
"nil"
|
"nil"
|
||||||
],
|
],
|
||||||
"filament_retraction_minimum_travel": [
|
"filament_retraction_minimum_travel": [
|
||||||
"nil"
|
"2"
|
||||||
],
|
],
|
||||||
"filament_retraction_speed": [
|
"filament_retraction_speed": [
|
||||||
"nil"
|
"nil"
|
||||||
@@ -106,7 +106,10 @@
|
|||||||
"0"
|
"0"
|
||||||
],
|
],
|
||||||
"slow_down_layer_time": [
|
"slow_down_layer_time": [
|
||||||
"8"
|
"14"
|
||||||
|
],
|
||||||
|
"slow_down_min_speed": [
|
||||||
|
"20"
|
||||||
],
|
],
|
||||||
"temperature_vitrification": [
|
"temperature_vitrification": [
|
||||||
"110"
|
"110"
|
||||||
@@ -118,7 +121,7 @@
|
|||||||
"55"
|
"55"
|
||||||
],
|
],
|
||||||
"filament_start_gcode": [
|
"filament_start_gcode": [
|
||||||
"; Filament gcode\n"
|
";filament start gcode\n"
|
||||||
],
|
],
|
||||||
"filament_end_gcode": [
|
"filament_end_gcode": [
|
||||||
"; filament end gcode \n"
|
"; filament end gcode \n"
|
||||||
@@ -153,7 +156,7 @@
|
|||||||
"filament_unloading_speed_start": "100",
|
"filament_unloading_speed_start": "100",
|
||||||
"material_flow_dependent_temperature": "0",
|
"material_flow_dependent_temperature": "0",
|
||||||
"material_flow_temp_graph": "[[0.2,210],[0.6,220]]",
|
"material_flow_temp_graph": "[[0.2,210],[0.6,220]]",
|
||||||
"pressure_advance": "0.12",
|
"pressure_advance": "0.032",
|
||||||
"support_material_interface_fan_speed": "-1",
|
"support_material_interface_fan_speed": "-1",
|
||||||
"compatible_printers": [
|
"compatible_printers": [
|
||||||
"Creality SPARKX i7 0.2 nozzle",
|
"Creality SPARKX i7 0.2 nozzle",
|
||||||
|
|||||||
@@ -54,7 +54,7 @@
|
|||||||
"machine_min_travel_rate": "0,0",
|
"machine_min_travel_rate": "0,0",
|
||||||
"machine_pause_gcode": "PAUSE",
|
"machine_pause_gcode": "PAUSE",
|
||||||
"machine_platform_motion_enable": "0",
|
"machine_platform_motion_enable": "0",
|
||||||
"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM104 S[nozzle_temperature_initial_layer]\nM204 S2000\nG1 Z3 F600\nM83\nG1 X20 Y-1 F30000\nG1 Z0.3 F1200\nG1 X100 E10 F{filament_max_volumetric_speed[initial_extruder]/0.3*60}\nG1 X105 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X110 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X115 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X120 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X125 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG91\nG1 X1 Z-0.300\nG1 X4\nG92 E0\nG1 Z1 F1200",
|
"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM109 S[nozzle_temperature_initial_layer]\nM204 S2000\nG1 Z3 F600\nM83\nG1 X20 Y-1 F30000\nG1 Z0.3 F1200\nG1 X100 E10 F{filament_max_volumetric_speed[initial_extruder]/0.3*60}\nG1 X105 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X110 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X115 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X120 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X125 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG91\nG1 X1 Z-0.300\nG1 X4\nG92 E0\nG1 Z1 F1200",
|
||||||
"machine_unload_filament_time": "0",
|
"machine_unload_filament_time": "0",
|
||||||
"manual_filament_change": "0",
|
"manual_filament_change": "0",
|
||||||
"nozzle_hrc": "0",
|
"nozzle_hrc": "0",
|
||||||
|
|||||||
@@ -123,7 +123,7 @@
|
|||||||
"default_filament_profile": [
|
"default_filament_profile": [
|
||||||
"Generic PLA HF @Creality"
|
"Generic PLA HF @Creality"
|
||||||
],
|
],
|
||||||
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
||||||
"machine_end_gcode": "END_PRINT",
|
"machine_end_gcode": "END_PRINT",
|
||||||
"scan_first_layer": "0",
|
"scan_first_layer": "0",
|
||||||
"thumbnails": [
|
"thumbnails": [
|
||||||
|
|||||||
@@ -123,7 +123,7 @@
|
|||||||
"default_filament_profile": [
|
"default_filament_profile": [
|
||||||
"Generic PLA HF @Creality"
|
"Generic PLA HF @Creality"
|
||||||
],
|
],
|
||||||
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
||||||
"machine_end_gcode": "END_PRINT",
|
"machine_end_gcode": "END_PRINT",
|
||||||
"scan_first_layer": "0",
|
"scan_first_layer": "0",
|
||||||
"thumbnails": [
|
"thumbnails": [
|
||||||
|
|||||||
@@ -123,7 +123,7 @@
|
|||||||
"default_filament_profile": [
|
"default_filament_profile": [
|
||||||
"Generic PLA HF @Creality"
|
"Generic PLA HF @Creality"
|
||||||
],
|
],
|
||||||
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
||||||
"machine_end_gcode": "END_PRINT",
|
"machine_end_gcode": "END_PRINT",
|
||||||
"scan_first_layer": "0",
|
"scan_first_layer": "0",
|
||||||
"thumbnails": [
|
"thumbnails": [
|
||||||
|
|||||||
@@ -124,7 +124,7 @@
|
|||||||
"default_filament_profile": [
|
"default_filament_profile": [
|
||||||
"Generic PLA HF @Creality"
|
"Generic PLA HF @Creality"
|
||||||
],
|
],
|
||||||
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
||||||
"machine_end_gcode": "END_PRINT",
|
"machine_end_gcode": "END_PRINT",
|
||||||
"scan_first_layer": "0",
|
"scan_first_layer": "0",
|
||||||
"thumbnails": [
|
"thumbnails": [
|
||||||
|
|||||||
@@ -124,7 +124,7 @@
|
|||||||
"default_filament_profile": [
|
"default_filament_profile": [
|
||||||
"Generic PLA HF @Creality"
|
"Generic PLA HF @Creality"
|
||||||
],
|
],
|
||||||
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
||||||
"machine_end_gcode": "END_PRINT",
|
"machine_end_gcode": "END_PRINT",
|
||||||
"scan_first_layer": "0",
|
"scan_first_layer": "0",
|
||||||
"thumbnails": [
|
"thumbnails": [
|
||||||
|
|||||||
@@ -124,7 +124,7 @@
|
|||||||
"default_filament_profile": [
|
"default_filament_profile": [
|
||||||
"Generic PLA HF @Creality"
|
"Generic PLA HF @Creality"
|
||||||
],
|
],
|
||||||
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
||||||
"machine_end_gcode": "END_PRINT",
|
"machine_end_gcode": "END_PRINT",
|
||||||
"scan_first_layer": "0",
|
"scan_first_layer": "0",
|
||||||
"thumbnails": [
|
"thumbnails": [
|
||||||
|
|||||||
@@ -56,7 +56,7 @@
|
|||||||
"machine_pause_gcode": "PAUSE",
|
"machine_pause_gcode": "PAUSE",
|
||||||
"machine_platform_motion_enable": "1",
|
"machine_platform_motion_enable": "1",
|
||||||
"machine_ptc_exist": "1",
|
"machine_ptc_exist": "1",
|
||||||
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
||||||
"machine_unload_filament_time": "0",
|
"machine_unload_filament_time": "0",
|
||||||
"manual_filament_change": "0",
|
"manual_filament_change": "0",
|
||||||
"nozzle_hrc": "0",
|
"nozzle_hrc": "0",
|
||||||
|
|||||||
@@ -123,7 +123,7 @@
|
|||||||
"default_filament_profile": [
|
"default_filament_profile": [
|
||||||
"Generic PLA @Creality K1-all"
|
"Generic PLA @Creality K1-all"
|
||||||
],
|
],
|
||||||
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
||||||
"machine_end_gcode": "END_PRINT",
|
"machine_end_gcode": "END_PRINT",
|
||||||
"scan_first_layer": "0",
|
"scan_first_layer": "0",
|
||||||
"thumbnails_format": "PNG",
|
"thumbnails_format": "PNG",
|
||||||
|
|||||||
@@ -57,7 +57,7 @@
|
|||||||
"machine_min_travel_rate": "0,0",
|
"machine_min_travel_rate": "0,0",
|
||||||
"machine_pause_gcode": "PAUSE",
|
"machine_pause_gcode": "PAUSE",
|
||||||
"machine_platform_motion_enable": "1",
|
"machine_platform_motion_enable": "1",
|
||||||
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
||||||
"machine_unload_filament_time": "0",
|
"machine_unload_filament_time": "0",
|
||||||
"manual_filament_change": "0",
|
"manual_filament_change": "0",
|
||||||
"nozzle_hrc": "0",
|
"nozzle_hrc": "0",
|
||||||
|
|||||||
@@ -57,7 +57,7 @@
|
|||||||
"machine_min_travel_rate": "0,0",
|
"machine_min_travel_rate": "0,0",
|
||||||
"machine_pause_gcode": "PAUSE",
|
"machine_pause_gcode": "PAUSE",
|
||||||
"machine_platform_motion_enable": "1",
|
"machine_platform_motion_enable": "1",
|
||||||
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
||||||
"machine_unload_filament_time": "0",
|
"machine_unload_filament_time": "0",
|
||||||
"manual_filament_change": "0",
|
"manual_filament_change": "0",
|
||||||
"nozzle_hrc": "0",
|
"nozzle_hrc": "0",
|
||||||
|
|||||||
@@ -55,7 +55,7 @@
|
|||||||
"machine_min_travel_rate": "0,0",
|
"machine_min_travel_rate": "0,0",
|
||||||
"machine_pause_gcode": "PAUSE",
|
"machine_pause_gcode": "PAUSE",
|
||||||
"machine_platform_motion_enable": "1",
|
"machine_platform_motion_enable": "1",
|
||||||
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
||||||
"machine_unload_filament_time": "0",
|
"machine_unload_filament_time": "0",
|
||||||
"manual_filament_change": "0",
|
"manual_filament_change": "0",
|
||||||
"nozzle_hrc": "0",
|
"nozzle_hrc": "0",
|
||||||
|
|||||||
@@ -124,7 +124,7 @@
|
|||||||
"default_filament_profile": [
|
"default_filament_profile": [
|
||||||
"Generic PLA @Creality K1-all"
|
"Generic PLA @Creality K1-all"
|
||||||
],
|
],
|
||||||
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
||||||
"machine_end_gcode": "END_PRINT",
|
"machine_end_gcode": "END_PRINT",
|
||||||
"scan_first_layer": "0",
|
"scan_first_layer": "0",
|
||||||
"thumbnails": [
|
"thumbnails": [
|
||||||
|
|||||||
@@ -124,7 +124,7 @@
|
|||||||
"default_filament_profile": [
|
"default_filament_profile": [
|
||||||
"Generic PLA @Creality K1-all"
|
"Generic PLA @Creality K1-all"
|
||||||
],
|
],
|
||||||
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
||||||
"machine_end_gcode": "END_PRINT",
|
"machine_end_gcode": "END_PRINT",
|
||||||
"scan_first_layer": "0",
|
"scan_first_layer": "0",
|
||||||
"thumbnails": [
|
"thumbnails": [
|
||||||
|
|||||||
@@ -124,7 +124,7 @@
|
|||||||
"default_filament_profile": [
|
"default_filament_profile": [
|
||||||
"Generic PLA @Creality K1-all"
|
"Generic PLA @Creality K1-all"
|
||||||
],
|
],
|
||||||
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
||||||
"machine_end_gcode": "END_PRINT",
|
"machine_end_gcode": "END_PRINT",
|
||||||
"scan_first_layer": "0",
|
"scan_first_layer": "0",
|
||||||
"thumbnails": [
|
"thumbnails": [
|
||||||
|
|||||||
@@ -56,7 +56,7 @@
|
|||||||
"machine_pause_gcode": "PAUSE",
|
"machine_pause_gcode": "PAUSE",
|
||||||
"machine_platform_motion_enable": "1",
|
"machine_platform_motion_enable": "1",
|
||||||
"machine_ptc_exist": "1",
|
"machine_ptc_exist": "1",
|
||||||
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
||||||
"machine_unload_filament_time": "0",
|
"machine_unload_filament_time": "0",
|
||||||
"manual_filament_change": "0",
|
"manual_filament_change": "0",
|
||||||
"nozzle_hrc": "0",
|
"nozzle_hrc": "0",
|
||||||
|
|||||||
@@ -57,7 +57,7 @@
|
|||||||
"machine_pause_gcode": "PAUSE",
|
"machine_pause_gcode": "PAUSE",
|
||||||
"machine_platform_motion_enable": "1",
|
"machine_platform_motion_enable": "1",
|
||||||
"machine_ptc_exist": "1",
|
"machine_ptc_exist": "1",
|
||||||
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM104 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
"machine_start_gcode": "START_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nT[initial_no_support_extruder]\nM204 S2000\nM109 S[nozzle_temperature_initial_layer]\nG1 Z3 F600\nM83\nG92 E0\nG1 Z1 F600",
|
||||||
"machine_unload_filament_time": "0",
|
"machine_unload_filament_time": "0",
|
||||||
"manual_filament_change": "0",
|
"manual_filament_change": "0",
|
||||||
"nozzle_hrc": "0",
|
"nozzle_hrc": "0",
|
||||||
|
|||||||
@@ -59,7 +59,7 @@
|
|||||||
"machine_pause_gcode": "PAUSE",
|
"machine_pause_gcode": "PAUSE",
|
||||||
"machine_platform_motion_enable": "0",
|
"machine_platform_motion_enable": "0",
|
||||||
"machine_ptc_exist": "0",
|
"machine_ptc_exist": "0",
|
||||||
"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nM83 \nM8200 P S[initial_no_support_extruder]\nM220 S100\n\nSET_VELOCITY_LIMIT ACCEL=5000 ACCEL_TO_DECEL=5000\nG0 X267 F18000 \nG0 X278 F2400\nM104 S[nozzle_temperature_initial_layer]\nM106 S0\nT[initial_no_support_extruder]\n\nM8200 O\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y0 F12000\nG1 X150 F30000\nG1 Z0.2 F600\nG1 X120 Y0 E15 F{filament_max_volumetric_speed[initial_extruder]/0.3*60*0.1}\nG1 X115 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X110 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X105 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X100 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X95 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG91\nG1 X-1 Z-0.3\nG1 X-4\nG92 E0",
|
"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nM83 \nM8200 P S[initial_no_support_extruder]\nM220 S100\n\nSET_VELOCITY_LIMIT ACCEL=5000 ACCEL_TO_DECEL=5000\nG0 X267 F18000 \nG0 X278 F2400\nM109 S[nozzle_temperature_initial_layer]\nM106 S0\nT[initial_no_support_extruder]\n\nM8200 O\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y0 F12000\nG1 X150 F30000\nG1 Z0.2 F600\nG1 X120 Y0 E15 F{filament_max_volumetric_speed[initial_extruder]/0.3*60*0.1}\nG1 X115 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X110 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X105 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X100 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X95 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG91\nG1 X-1 Z-0.3\nG1 X-4\nG92 E0",
|
||||||
"machine_tool_change_time": "0",
|
"machine_tool_change_time": "0",
|
||||||
"machine_unload_filament_time": "30",
|
"machine_unload_filament_time": "30",
|
||||||
"manual_filament_change": "0",
|
"manual_filament_change": "0",
|
||||||
|
|||||||
@@ -59,7 +59,7 @@
|
|||||||
"machine_pause_gcode": "PAUSE",
|
"machine_pause_gcode": "PAUSE",
|
||||||
"machine_platform_motion_enable": "0",
|
"machine_platform_motion_enable": "0",
|
||||||
"machine_ptc_exist": "0",
|
"machine_ptc_exist": "0",
|
||||||
"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nM83 \nM8200 P S[initial_no_support_extruder]\nM220 S100\n\nSET_VELOCITY_LIMIT ACCEL=5000 ACCEL_TO_DECEL=5000\nG0 X267 F18000 \nG0 X278 F2400\nM104 S[nozzle_temperature_initial_layer]\nM106 S0\nT[initial_no_support_extruder]\n\nM8200 O\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y0 F12000\nG1 X150 F30000\nG1 Z0.2 F600\nG1 X120 Y0 E15 F{filament_max_volumetric_speed[initial_extruder]/0.3*60*0.1}\nG1 X115 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X110 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X105 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X100 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X95 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG91\nG1 X-1 Z-0.3\nG1 X-4\nG92 E0",
|
"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nM83 \nM8200 P S[initial_no_support_extruder]\nM220 S100\n\nSET_VELOCITY_LIMIT ACCEL=5000 ACCEL_TO_DECEL=5000\nG0 X267 F18000 \nG0 X278 F2400\nM109 S[nozzle_temperature_initial_layer]\nM106 S0\nT[initial_no_support_extruder]\n\nM8200 O\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y0 F12000\nG1 X150 F30000\nG1 Z0.2 F600\nG1 X120 Y0 E15 F{filament_max_volumetric_speed[initial_extruder]/0.3*60*0.1}\nG1 X115 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X110 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X105 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X100 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X95 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG91\nG1 X-1 Z-0.3\nG1 X-4\nG92 E0",
|
||||||
"machine_tool_change_time": "0",
|
"machine_tool_change_time": "0",
|
||||||
"machine_unload_filament_time": "30",
|
"machine_unload_filament_time": "30",
|
||||||
"manual_filament_change": "0",
|
"manual_filament_change": "0",
|
||||||
|
|||||||
@@ -59,7 +59,7 @@
|
|||||||
"machine_pause_gcode": "PAUSE",
|
"machine_pause_gcode": "PAUSE",
|
||||||
"machine_platform_motion_enable": "0",
|
"machine_platform_motion_enable": "0",
|
||||||
"machine_ptc_exist": "0",
|
"machine_ptc_exist": "0",
|
||||||
"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nM83 \nM8200 P S[initial_no_support_extruder]\nM220 S100\n\nSET_VELOCITY_LIMIT ACCEL=5000 ACCEL_TO_DECEL=5000\nG0 X267 F18000 \nG0 X278 F2400\nM104 S[nozzle_temperature_initial_layer]\nM106 S0\nT[initial_no_support_extruder]\n\nM8200 O\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y0 F12000\nG1 X150 F30000\nG1 Z0.2 F600\nG1 X120 Y0 E15 F{filament_max_volumetric_speed[initial_extruder]/0.3*60*0.1}\nG1 X115 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X110 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X105 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X100 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X95 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG91\nG1 X-1 Z-0.3\nG1 X-4\nG92 E0",
|
"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nM83 \nM8200 P S[initial_no_support_extruder]\nM220 S100\n\nSET_VELOCITY_LIMIT ACCEL=5000 ACCEL_TO_DECEL=5000\nG0 X267 F18000 \nG0 X278 F2400\nM109 S[nozzle_temperature_initial_layer]\nM106 S0\nT[initial_no_support_extruder]\n\nM8200 O\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y0 F12000\nG1 X150 F30000\nG1 Z0.2 F600\nG1 X120 Y0 E15 F{filament_max_volumetric_speed[initial_extruder]/0.3*60*0.1}\nG1 X115 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X110 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X105 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X100 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X95 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG91\nG1 X-1 Z-0.3\nG1 X-4\nG92 E0",
|
||||||
"machine_tool_change_time": "0",
|
"machine_tool_change_time": "0",
|
||||||
"machine_unload_filament_time": "30",
|
"machine_unload_filament_time": "30",
|
||||||
"manual_filament_change": "0",
|
"manual_filament_change": "0",
|
||||||
|
|||||||
@@ -59,7 +59,7 @@
|
|||||||
"machine_pause_gcode": "PAUSE",
|
"machine_pause_gcode": "PAUSE",
|
||||||
"machine_platform_motion_enable": "0",
|
"machine_platform_motion_enable": "0",
|
||||||
"machine_ptc_exist": "0",
|
"machine_ptc_exist": "0",
|
||||||
"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nM83 \nM8200 P S[initial_no_support_extruder]\nM220 S100\n\nSET_VELOCITY_LIMIT ACCEL=5000 ACCEL_TO_DECEL=5000\nG0 X267 F18000 \nG0 X278 F2400\nM104 S[nozzle_temperature_initial_layer]\nM106 S0\nT[initial_no_support_extruder]\n\nM8200 O\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y0 F12000\nG1 X150 F30000\nG1 Z0.2 F600\nG1 X120 Y0 E15 F{filament_max_volumetric_speed[initial_extruder]/0.3*60*0.1}\nG1 X115 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X110 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X105 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X100 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X95 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG91\nG1 X-1 Z-0.3\nG1 X-4\nG92 E0",
|
"machine_start_gcode": "M140 S0\nM104 S0 \nSTART_PRINT EXTRUDER_TEMP=[nozzle_temperature_initial_layer] BED_TEMP=[bed_temperature_initial_layer_single]\nM83 \nM8200 P S[initial_no_support_extruder]\nM220 S100\n\nSET_VELOCITY_LIMIT ACCEL=5000 ACCEL_TO_DECEL=5000\nG0 X267 F18000 \nG0 X278 F2400\nM109 S[nozzle_temperature_initial_layer]\nM106 S0\nT[initial_no_support_extruder]\n\nM8200 O\nM204 S2000\nG1 Z3 F600\nM83\nG1 Y0 F12000\nG1 X150 F30000\nG1 Z0.2 F600\nG1 X120 Y0 E15 F{filament_max_volumetric_speed[initial_extruder]/0.3*60*0.1}\nG1 X115 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X110 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X105 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG1 X100 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)*60}\nG1 X95 E.3742 F{outer_wall_volumetric_speed/(0.3*0.5)/4*60}\nG91\nG1 X-1 Z-0.3\nG1 X-4\nG92 E0",
|
||||||
"machine_tool_change_time": "0",
|
"machine_tool_change_time": "0",
|
||||||
"machine_unload_filament_time": "30",
|
"machine_unload_filament_time": "30",
|
||||||
"manual_filament_change": "0",
|
"manual_filament_change": "0",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "Orca Arena Printer",
|
"name": "Orca Arena Printer",
|
||||||
"url": "",
|
"url": "",
|
||||||
"version": "02.04.00.05",
|
"version": "02.04.00.06",
|
||||||
"force_update": "0",
|
"force_update": "0",
|
||||||
"description": "Orca Arena configuration files",
|
"description": "Orca Arena configuration files",
|
||||||
"machine_model_list": [
|
"machine_model_list": [
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
"type": "machine_model",
|
"type": "machine_model",
|
||||||
"name": "Orca Arena X1 Carbon",
|
"name": "Orca Arena X1 Carbon",
|
||||||
"model_id": "orca_arena_x1c",
|
"model_id": "orca_arena_x1c",
|
||||||
"url": "",
|
"url": "https://www.orcaslicer.com",
|
||||||
"nozzle_diameter": "0.4;0.2;0.6;0.8",
|
"nozzle_diameter": "0.4;0.2;0.6;0.8",
|
||||||
"machine_tech": "FFF",
|
"machine_tech": "FFF",
|
||||||
"family": "ARENA-3DP",
|
"family": "ARENA-3DP",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "OrcaFilamentLibrary",
|
"name": "OrcaFilamentLibrary",
|
||||||
"version": "02.04.00.08",
|
"version": "02.04.00.09",
|
||||||
"force_update": "0",
|
"force_update": "0",
|
||||||
"description": "Orca Filament Library",
|
"description": "Orca Filament Library",
|
||||||
"filament_list": [
|
"filament_list": [
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
"name": "DREMC ABS @System",
|
"name": "DREMC ABS @System",
|
||||||
"inherits": "DREMC ABS @base",
|
"inherits": "DREMC ABS @base",
|
||||||
"from": "system",
|
"from": "system",
|
||||||
"instantiation": "false",
|
"setting_id": "gNjISMxTLwQzDrV9",
|
||||||
|
"instantiation": "true",
|
||||||
"compatible_printers": []
|
"compatible_printers": []
|
||||||
}
|
}
|
||||||
@@ -3,6 +3,7 @@
|
|||||||
"name": "DREMC ABS+ @System",
|
"name": "DREMC ABS+ @System",
|
||||||
"inherits": "DREMC ABS+ @base",
|
"inherits": "DREMC ABS+ @base",
|
||||||
"from": "system",
|
"from": "system",
|
||||||
"instantiation": "false",
|
"setting_id": "M73sIwcpWv6zpFrb",
|
||||||
|
"instantiation": "true",
|
||||||
"compatible_printers": []
|
"compatible_printers": []
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
"name": "DREMC ASA @System",
|
"name": "DREMC ASA @System",
|
||||||
"inherits": "DREMC ASA @base",
|
"inherits": "DREMC ASA @base",
|
||||||
"from": "system",
|
"from": "system",
|
||||||
"instantiation": "false",
|
"setting_id": "PMulSQ0tYbNyvOYw",
|
||||||
|
"instantiation": "true",
|
||||||
"compatible_printers": []
|
"compatible_printers": []
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
"name": "DREMC ASA CF @System",
|
"name": "DREMC ASA CF @System",
|
||||||
"inherits": "DREMC ASA CF @base",
|
"inherits": "DREMC ASA CF @base",
|
||||||
"from": "system",
|
"from": "system",
|
||||||
"instantiation": "false",
|
"setting_id": "ZcipEKAqtBcAm6vR",
|
||||||
|
"instantiation": "true",
|
||||||
"compatible_printers": []
|
"compatible_printers": []
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
"name": "DREMC ASA GF @System",
|
"name": "DREMC ASA GF @System",
|
||||||
"inherits": "DREMC ASA GF @base",
|
"inherits": "DREMC ASA GF @base",
|
||||||
"from": "system",
|
"from": "system",
|
||||||
"instantiation": "false",
|
"setting_id": "8J3lt7KlQWcx0VUS",
|
||||||
|
"instantiation": "true",
|
||||||
"compatible_printers": []
|
"compatible_printers": []
|
||||||
}
|
}
|
||||||
@@ -3,6 +3,7 @@
|
|||||||
"name": "DREMC PA12-CF @System",
|
"name": "DREMC PA12-CF @System",
|
||||||
"inherits": "DREMC PA12-CF @base",
|
"inherits": "DREMC PA12-CF @base",
|
||||||
"from": "system",
|
"from": "system",
|
||||||
"instantiation": "false",
|
"setting_id": "jVlZ1KPsA5i8RIED",
|
||||||
|
"instantiation": "true",
|
||||||
"compatible_printers": []
|
"compatible_printers": []
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,6 +3,7 @@
|
|||||||
"name": "DREMC PET-CF @System",
|
"name": "DREMC PET-CF @System",
|
||||||
"inherits": "DREMC PET-CF @base",
|
"inherits": "DREMC PET-CF @base",
|
||||||
"from": "system",
|
"from": "system",
|
||||||
"instantiation": "false",
|
"setting_id": "hal1nPyBF13UL9qB",
|
||||||
|
"instantiation": "true",
|
||||||
"compatible_printers": []
|
"compatible_printers": []
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,7 +3,8 @@
|
|||||||
"name": "DREMC PETG @System",
|
"name": "DREMC PETG @System",
|
||||||
"inherits": "DREMC PETG @base",
|
"inherits": "DREMC PETG @base",
|
||||||
"from": "system",
|
"from": "system",
|
||||||
"instantiation": "false",
|
"setting_id": "gTGiaBYfymmtlyfG",
|
||||||
|
"instantiation": "true",
|
||||||
"filament_max_volumetric_speed": [
|
"filament_max_volumetric_speed": [
|
||||||
"20"
|
"20"
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
{
|
{
|
||||||
"type": "filament",
|
"type": "filament",
|
||||||
"name": "DREMC PLA+ HS @System",
|
"name": "DREMC PLA+ HS @System",
|
||||||
"inherits": "DREMC PLA+ @base",
|
"inherits": "DREMC PLA+ HS @base",
|
||||||
"from": "system",
|
"from": "system",
|
||||||
"instantiation": "false",
|
"setting_id": "I0HWhYAZ3ppq91Gx",
|
||||||
|
"instantiation": "true",
|
||||||
"filament_max_volumetric_speed": [
|
"filament_max_volumetric_speed": [
|
||||||
"22"
|
"22"
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -3,7 +3,8 @@
|
|||||||
"name": "DREMC PLA+ @System",
|
"name": "DREMC PLA+ @System",
|
||||||
"inherits": "DREMC PLA+ @base",
|
"inherits": "DREMC PLA+ @base",
|
||||||
"from": "system",
|
"from": "system",
|
||||||
"instantiation": "false",
|
"setting_id": "fIjHIsFmdDWIM1bf",
|
||||||
|
"instantiation": "true",
|
||||||
"filament_max_volumetric_speed": [
|
"filament_max_volumetric_speed": [
|
||||||
"18"
|
"18"
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -3,7 +3,8 @@
|
|||||||
"name": "DREMC TPU 95A @System",
|
"name": "DREMC TPU 95A @System",
|
||||||
"inherits": "DREMC TPU 95A @base",
|
"inherits": "DREMC TPU 95A @base",
|
||||||
"from": "system",
|
"from": "system",
|
||||||
"instantiation": "false",
|
"setting_id": "AfnFh14wKZsNEaZ1",
|
||||||
|
"instantiation": "true",
|
||||||
"filament_max_volumetric_speed": [
|
"filament_max_volumetric_speed": [
|
||||||
"6"
|
"6"
|
||||||
],
|
],
|
||||||
|
|||||||
@@ -33,15 +33,15 @@
|
|||||||
"210"
|
"210"
|
||||||
],
|
],
|
||||||
"hot_plate_temp": [
|
"hot_plate_temp": [
|
||||||
"60"
|
"50"
|
||||||
],
|
],
|
||||||
"hot_plate_temp_initial_layer": [
|
"hot_plate_temp_initial_layer": [
|
||||||
"60"
|
"50"
|
||||||
],
|
],
|
||||||
"textured_plate_temp": [
|
"textured_plate_temp": [
|
||||||
"60"
|
"50"
|
||||||
],
|
],
|
||||||
"textured_plate_temp_initial_layer": [
|
"textured_plate_temp_initial_layer": [
|
||||||
"60"
|
"50"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -122,17 +122,19 @@ Vec2d printable_area_center(const DynamicPrintConfig &cfg)
|
|||||||
|
|
||||||
// Put the prime tower where the GUI and CLI would before slicing. The config default (x 15, y 220)
|
// Put the prime tower where the GUI and CLI would before slicing. The config default (x 15, y 220)
|
||||||
// lies off any bed shallower than the tower, and generation rejects an off-plate tower instead of
|
// lies off any bed shallower than the tower, and generation rejects an off-plate tower instead of
|
||||||
// exporting it. Beside the centred cube, clear of the edge exclusion strips some beds carry, then
|
// exporting it. Beside the cube at the bed centre, clear of the edge exclusion strips some beds
|
||||||
// pulled inside the printable outline by the tower's own estimated footprint, with a few mm of
|
// carry, with a few mm of clearance so the conflict checker never sees the two touch. The cube and
|
||||||
// clearance so the conflict checker never sees the two touch.
|
// the tower's estimated footprint are then pulled inside the printable outline as one rigid pair:
|
||||||
void place_wipe_tower(DynamicPrintConfig &cfg, const Vec2d ¢er)
|
// moving the tower alone would push it back onto the cube on a narrow bed. Returns that move for
|
||||||
|
// the cube.
|
||||||
|
Vec2d place_wipe_tower(DynamicPrintConfig &cfg, const Vec2d ¢er)
|
||||||
{
|
{
|
||||||
const auto *area = cfg.option<ConfigOptionPoints>("printable_area");
|
const auto *area = cfg.option<ConfigOptionPoints>("printable_area");
|
||||||
if (area == nullptr || area->values.size() < 3)
|
if (area == nullptr || area->values.size() < 3)
|
||||||
return;
|
return Vec2d::Zero();
|
||||||
const WipeTowerFootprint footprint = estimate_wipe_tower_footprint(cfg, resolve_wipe_tower_type(cfg), {0, 1}, cfg.opt_float("layer_height"), 10.);
|
const WipeTowerFootprint footprint = estimate_wipe_tower_footprint(cfg, resolve_wipe_tower_type(cfg), {0, 1}, cfg.opt_float("layer_height"), 10.);
|
||||||
if (footprint.depth < EPSILON)
|
if (footprint.depth < EPSILON)
|
||||||
return;
|
return Vec2d::Zero();
|
||||||
const double margin = WIPE_TOWER_MARGIN + footprint.brim_width;
|
const double margin = WIPE_TOWER_MARGIN + footprint.brim_width;
|
||||||
// The position is the tower's own origin; a rotated tower extends from it in another
|
// The position is the tower's own origin; a rotated tower extends from it in another
|
||||||
// direction, so place the rotated box's extents rather than the origin.
|
// direction, so place the rotated box's extents rather than the origin.
|
||||||
@@ -143,13 +145,22 @@ void place_wipe_tower(DynamicPrintConfig &cfg, const Vec2d ¢er)
|
|||||||
const Vec2d size = unscale(local.max) - lo;
|
const Vec2d size = unscale(local.max) - lo;
|
||||||
Vec2d pos(center.x() + 5. + margin + 5. - lo.x(), center.y() - size.y() / 2. - lo.y());
|
Vec2d pos(center.x() + 5. + margin + 5. - lo.x(), center.y() - size.y() / 2. - lo.y());
|
||||||
box.translate(Point::new_scale(pos.x(), pos.y()));
|
box.translate(Point::new_scale(pos.x(), pos.y()));
|
||||||
const Vec2f move = WipeTower::move_box_inside_polygon(get_extents(box), Polygons{Polygon::new_scale(area->values)}, scaled<coord_t>(margin));
|
// A bed too small for the pair keeps the cube at its centre and places the tower alone.
|
||||||
pos += move.cast<double>();
|
const Polygons bed{Polygon::new_scale(area->values)};
|
||||||
|
const BoundingBox tower = get_extents(box);
|
||||||
|
BoundingBox pair = tower;
|
||||||
|
pair.merge(Point::new_scale(center.x() - 5., center.y() - 5.));
|
||||||
|
pair.merge(Point::new_scale(center.x() + 5., center.y() + 5.));
|
||||||
|
const Point room = get_extents(bed).size() - Point::new_scale(2. * margin, 2. * margin);
|
||||||
|
const bool rigid = pair.size().x() < room.x() && pair.size().y() < room.y();
|
||||||
|
const Vec2d move = WipeTower::move_box_inside_polygon(rigid ? pair : tower, bed, scaled<coord_t>(margin)).cast<double>();
|
||||||
|
pos += move;
|
||||||
cfg.option<ConfigOptionFloats>("wipe_tower_x", true)->values = {pos.x()};
|
cfg.option<ConfigOptionFloats>("wipe_tower_x", true)->values = {pos.x()};
|
||||||
cfg.option<ConfigOptionFloats>("wipe_tower_y", true)->values = {pos.y()};
|
cfg.option<ConfigOptionFloats>("wipe_tower_y", true)->values = {pos.y()};
|
||||||
|
return rigid ? move : Vec2d::Zero();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Slice one centered cube that switches from filament 1 to filament 2 partway up, so exactly one
|
// Slice one cube that switches from filament 1 to filament 2 partway up, so exactly one
|
||||||
// filament change fires, then export. The change drives the printer's own change_filament_gcode: on a
|
// filament change fires, then export. The change drives the printer's own change_filament_gcode: on a
|
||||||
// single-nozzle machine it rides the AMS prime tower (append_tcr), on a multi-nozzle machine it routes
|
// single-nozzle machine it rides the AMS prime tower (append_tcr), on a multi-nozzle machine it routes
|
||||||
// through the nozzle swap (set_extruder / append_tcr2) - the engine picks the path from the printer's
|
// through the nozzle swap (set_extruder / append_tcr2) - the engine picks the path from the printer's
|
||||||
@@ -157,10 +168,10 @@ void place_wipe_tower(DynamicPrintConfig &cfg, const Vec2d ¢er)
|
|||||||
// Slic3r::PlaceholderParserError from export.
|
// Slic3r::PlaceholderParserError from export.
|
||||||
std::string slice_two_color_cube_and_export(DynamicPrintConfig cfg, bool is_bbl)
|
std::string slice_two_color_cube_and_export(DynamicPrintConfig cfg, bool is_bbl)
|
||||||
{
|
{
|
||||||
const Vec2d center = printable_area_center(cfg);
|
const Vec2d center = printable_area_center(cfg);
|
||||||
place_wipe_tower(cfg, center);
|
const Vec2d cube_min = center - Vec2d(5., 5.) + place_wipe_tower(cfg, center);
|
||||||
TriangleMesh m = make_cube(10, 10, 10);
|
TriangleMesh m = make_cube(10, 10, 10);
|
||||||
m.translate(float(center.x() - 5.), float(center.y() - 5.), 0.f);
|
m.translate(static_cast<float>(cube_min.x()), static_cast<float>(cube_min.y()), 0.f);
|
||||||
|
|
||||||
Model model;
|
Model model;
|
||||||
Print print;
|
Print print;
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
#include <boost/filesystem.hpp>
|
#include <boost/filesystem.hpp>
|
||||||
|
|
||||||
#include <wx/event.h>
|
#include <wx/event.h>
|
||||||
|
#include <wx/uri.h>
|
||||||
|
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
|
||||||
@@ -55,6 +56,14 @@ wxString web_base_url()
|
|||||||
return wxString("file://") + from_u8(dir) + "/";
|
return wxString("file://") + from_u8(dir) + "/";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Whether a loaded document is the plugin HTML's own base URL. The web view reports the URL it
|
||||||
|
// parsed, so any fragment the page navigated to is ignored and the escaping it applies to what the
|
||||||
|
// resources path holds (a space, a non-ASCII character) is undone first.
|
||||||
|
bool is_content_url(const wxString& url)
|
||||||
|
{
|
||||||
|
return wxURI::Unescape(url.BeforeFirst('#')) == web_base_url();
|
||||||
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
PluginWebDialog::PluginWebDialog(wxWindow* parent,
|
PluginWebDialog::PluginWebDialog(wxWindow* parent,
|
||||||
@@ -89,6 +98,7 @@ PluginWebDialog::PluginWebDialog(wxWindow* parent,
|
|||||||
// missing/blocked bootstrap resource (e.g. a packaged build) still triggers it.
|
// missing/blocked bootstrap resource (e.g. a packaged build) still triggers it.
|
||||||
Bind(wxEVT_WEBVIEW_LOADED, &PluginWebDialog::on_bootstrap_event, this, wv->GetId());
|
Bind(wxEVT_WEBVIEW_LOADED, &PluginWebDialog::on_bootstrap_event, this, wv->GetId());
|
||||||
Bind(wxEVT_WEBVIEW_ERROR, &PluginWebDialog::on_bootstrap_event, this, wv->GetId());
|
Bind(wxEVT_WEBVIEW_ERROR, &PluginWebDialog::on_bootstrap_event, this, wv->GetId());
|
||||||
|
Bind(wxEVT_WEBVIEW_NAVIGATED, &PluginWebDialog::on_navigated, this, wv->GetId());
|
||||||
}
|
}
|
||||||
Bind(wxEVT_CLOSE_WINDOW, &PluginWebDialog::on_close_window, this);
|
Bind(wxEVT_CLOSE_WINDOW, &PluginWebDialog::on_close_window, this);
|
||||||
}
|
}
|
||||||
@@ -139,19 +149,37 @@ void PluginWebDialog::destroy_for_plugin(PluginWebDialog* dialog)
|
|||||||
|
|
||||||
void PluginWebDialog::on_bootstrap_event(wxWebViewEvent& event)
|
void PluginWebDialog::on_bootstrap_event(wxWebViewEvent& event)
|
||||||
{
|
{
|
||||||
// The first bootstrap load (or its error) triggers the swap to plugin HTML;
|
const bool loaded = event.GetEventType() == wxEVT_WEBVIEW_LOADED;
|
||||||
// the resulting plugin-page load is ignored (guarded by m_content_loaded).
|
// The first bootstrap load (or its error) triggers the swap to plugin HTML.
|
||||||
load_plugin_content();
|
if (!m_content_loaded)
|
||||||
|
load_plugin_content();
|
||||||
|
// WebKit reloads the SetPage base URL, so a committed load of it that we did not start is a reload.
|
||||||
|
// A failed navigation is reported against the page that stayed but never commits. Edge ignores the
|
||||||
|
// base URL and restores SetPage content itself, so nothing matches there.
|
||||||
|
else if (is_content_url(event.GetURL())) {
|
||||||
|
if (m_own_page_load)
|
||||||
|
m_own_page_load = false;
|
||||||
|
else if (loaded && m_content_navigated)
|
||||||
|
load_plugin_content();
|
||||||
|
}
|
||||||
|
if (loaded)
|
||||||
|
m_content_navigated = false;
|
||||||
|
event.Skip();
|
||||||
|
}
|
||||||
|
|
||||||
|
void PluginWebDialog::on_navigated(wxWebViewEvent& event)
|
||||||
|
{
|
||||||
|
m_content_navigated = is_content_url(event.GetURL());
|
||||||
event.Skip();
|
event.Skip();
|
||||||
}
|
}
|
||||||
|
|
||||||
void PluginWebDialog::load_plugin_content()
|
void PluginWebDialog::load_plugin_content()
|
||||||
{
|
{
|
||||||
if (m_content_loaded)
|
|
||||||
return;
|
|
||||||
m_content_loaded = true;
|
m_content_loaded = true;
|
||||||
if (wxWebView* wv = browser())
|
if (wxWebView* wv = browser()) {
|
||||||
|
m_own_page_load = true;
|
||||||
wv->SetPage(wxString::FromUTF8(m_html), web_base_url());
|
wv->SetPage(wxString::FromUTF8(m_html), web_base_url());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void PluginWebDialog::on_script_message(const nlohmann::json& payload)
|
void PluginWebDialog::on_script_message(const nlohmann::json& payload)
|
||||||
|
|||||||
@@ -64,6 +64,7 @@ protected:
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
void on_bootstrap_event(wxWebViewEvent& event);
|
void on_bootstrap_event(wxWebViewEvent& event);
|
||||||
|
void on_navigated(wxWebViewEvent& event);
|
||||||
void load_plugin_content();
|
void load_plugin_content();
|
||||||
void on_close_window(wxCloseEvent& event);
|
void on_close_window(wxCloseEvent& event);
|
||||||
void fire_submit(const nlohmann::json& data);
|
void fire_submit(const nlohmann::json& data);
|
||||||
@@ -72,6 +73,8 @@ private:
|
|||||||
|
|
||||||
std::string m_html;
|
std::string m_html;
|
||||||
bool m_content_loaded{false};
|
bool m_content_loaded{false};
|
||||||
|
bool m_own_page_load{false}; // a SetPage of the plugin HTML is in flight
|
||||||
|
bool m_content_navigated{false}; // a navigation to the base URL has committed
|
||||||
bool m_open{true};
|
bool m_open{true};
|
||||||
bool m_close_fired{false};
|
bool m_close_fired{false};
|
||||||
std::optional<nlohmann::json> m_result;
|
std::optional<nlohmann::json> m_result;
|
||||||
|
|||||||
Reference in New Issue
Block a user