Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into middle-outer-inner-v2
Browse files Browse the repository at this point in the history
  • Loading branch information
@igiannakas
igiannakas committed Jun 28, 2024
2 parents 20aa35a + edf2aeb commit 6f31a53
Show file tree
Hide file tree
Showing 50 changed files with 3,675 additions and 1 deletion.
Binary file modified resources/images/OrcaSlicer.icns
View file
Binary file not shown.
Binary file modified resources/images/gcode.icns
View file
Binary file not shown.
Binary file modified resources/images/stl.icns
View file
Binary file not shown.
171 changes: 171 additions & 0 deletions resources/profiles/Chuanying.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
{
"name": "Chuanying",
"url": "",
"version": "02.01.00.01",
"force_update": "0",
"description": "Chuanying configurations",
"machine_model_list": [
{
"name": "Chuanying X1",
"sub_path": "machine/Chuanying X1.json"
}
],
"process_list": [
{
"name": "fdm_process_common",
"sub_path": "process/fdm_process_common.json"
},
{
"name": "fdm_process_chuanying_common",
"sub_path": "process/fdm_process_chuanying_common.json"
},
{
"name": "fdm_process_chuanying_0.20",
"sub_path": "process/fdm_process_chuanying_0.20.json"
},
{
"name": "fdm_process_chuanying_0.30",
"sub_path": "process/fdm_process_chuanying_0.30.json"
},
{
"name": "0.20mm Standard @Chuanying X1 0.4 Nozzle",
"sub_path": "process/0.20mm Standard @Chuanying X1 0.4 Nozzle.json"
},
{
"name": "0.30mm Standard @Chuanying X1 0.6 Nozzle",
"sub_path": "process/0.30mm Standard @Chuanying X1 0.6 Nozzle.json"
},
{
"name": "0.12mm Standard @Chuanying X1 0.25 Nozzle",
"sub_path": "process/0.12mm Standard @Chuanying X1 0.25 Nozzle.json"
},
{
"name": "0.40mm Standard @Chuanying X1 0.8 Nozzle",
"sub_path": "process/0.40mm Standard @Chuanying X1 0.8 Nozzle.json"
}
],
"filament_list": [
{
"name": "fdm_filament_common",
"sub_path": "filament/fdm_filament_common.json"
},
{
"name": "fdm_filament_abs",
"sub_path": "filament/fdm_filament_abs.json"
},
{
"name": "fdm_filament_pet",
"sub_path": "filament/fdm_filament_pet.json"
},
{
"name": "fdm_filament_pla",
"sub_path": "filament/fdm_filament_pla.json"
},
{
"name": "fdm_filament_asa",
"sub_path": "filament/fdm_filament_asa.json"
},
{
"name": "fdm_filament_tpu",
"sub_path": "filament/fdm_filament_tpu.json"
},
{
"name": "Chuanying Generic ABS",
"sub_path": "filament/Chuanying Generic ABS.json"
},
{
"name": "Chuanying ABS @Chuanying X1 0.25 Nozzle",
"sub_path": "filament/Chuanying ABS @Chuanying X1 0.25 Nozzle.json"
},
{
"name": "Chuanying Generic PETG",
"sub_path": "filament/Chuanying Generic PETG.json"
},
{
"name": "Chuanying PETG @Chuanying X1 0.25 Nozzle",
"sub_path": "filament/Chuanying PETG @Chuanying X1 0.25 Nozzle.json"
},
{
"name": "Chuanying Generic PLA",
"sub_path": "filament/Chuanying Generic PLA.json"
},
{
"name": "Chuanying PLA @Chuanying X1 0.25 Nozzle",
"sub_path": "filament/Chuanying PLA @Chuanying X1 0.25 Nozzle.json"
},
{
"name": "Chuanying Generic PLA-CF10",
"sub_path": "filament/Chuanying Generic PLA-CF10.json"
},
{
"name": "Chuanying Generic PLA-Silk",
"sub_path": "filament/Chuanying Generic PLA-Silk.json"
},
{
"name": "Chuanying PLA-SILK @Chuanying X1 0.25 Nozzle",
"sub_path": "filament/Chuanying PLA-SILK @Chuanying X1 0.25 Nozzle.json"
},
{
"name": "Chuanying Generic HS PLA",
"sub_path": "filament/Chuanying Generic HS PLA.json"
},
{
"name": "Chuanying HS PLA @Chuanying X1 0.25 Nozzle",
"sub_path": "filament/Chuanying HS PLA @Chuanying X1 0.25 Nozzle.json"
},
{
"name": "Chuanying Generic ASA",
"sub_path": "filament/Chuanying Generic ASA.json"
},
{
"name": "Chuanying ASA @Chuanying X1 0.25 Nozzle",
"sub_path": "filament/Chuanying ASA @Chuanying X1 0.25 Nozzle.json"
},
{
"name": "Chuanying Generic PETG-CF10",
"sub_path": "filament/Chuanying Generic PETG-CF10.json"
},
{
"name": "Chuanying Generic TPU",
"sub_path": "filament/Chuanying Generic TPU.json"
},
{
"name":"Chuanying Generic HIPS",
"sub_path":"filament/Chuanying Generic HIPS.json"
},
{
"name":"Chuanying Generic PVA",
"sub_path":"filament/Chuanying Generic PVA.json"
}
],
"machine_list": [
{
"name": "fdm_machine_common",
"sub_path": "machine/fdm_machine_common.json"
},
{
"name": "fdm_chuanying_common",
"sub_path": "machine/fdm_chuanying_common.json"
},
{
"name": "fdm_x1_common",
"sub_path": "machine/fdm_x1_common.json"
},
{
"name": "Chuanying X1 0.25 Nozzle",
"sub_path": "machine/Chuanying X1 0.25 Nozzle.json"
},
{
"name": "Chuanying X1 0.4 Nozzle",
"sub_path": "machine/Chuanying X1 0.4 Nozzle.json"
},
{
"name": "Chuanying X1 0.6 Nozzle",
"sub_path": "machine/Chuanying X1 0.6 Nozzle.json"
},
{
"name": "Chuanying X1 0.8 Nozzle",
"sub_path": "machine/Chuanying X1 0.8 Nozzle.json"
}
]
}
Binary file added resources/profiles/Chuanying/Chuanying X1_cover.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/profiles/Chuanying/chuanying_x1_buildplate_model.STL
View file
Binary file not shown.
Binary file added resources/profiles/Chuanying/chuanying_x1_buildplate_texture.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added resources/profiles/Chuanying/chuanying_x1_hotend.stl
View file
Binary file not shown.
31 changes: 31 additions & 0 deletions resources/profiles/Chuanying/filament/Chuanying ABS @Chuanying X1 0.25 Nozzle.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"type": "filament",
"name": "Chuanying ABS @Chuanying X1 0.25 Nozzle",
"inherits": "Chuanying Generic ABS",
"from": "system",
"setting_id": "GFSA04_02",
"instantiation": "true",
"compatible_printers": [
"Chuanying X1 0.25 Nozzle"
],
"filament_id": "GFB99",
"filament_settings_id": [
"Chuanying ABS @Chuanying X1 0.25 Nozzle"
],
"fan_max_speed": [
"50"
],
"filament_cost": [
"40"
],
"filament_flow_ratio": [
"1"
],
"filament_max_volumetric_speed": [
"2"
],
"pressure_advance": [
"0.1"
],
"version": "1.8.0.0"
}
34 changes: 34 additions & 0 deletions resources/profiles/Chuanying/filament/Chuanying ASA @Chuanying X1 0.25 Nozzle.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"type": "filament",
"name": "Chuanying ASA @Chuanying X1 0.25 Nozzle",
"inherits": "Chuanying Generic ASA",
"from": "system",
"setting_id": "GFSA04_05",
"instantiation": "true",
"compatible_printers": [
"Chuanying X1 0.25 Nozzle"
],
"filament_id": "GFL99",
"filament_settings_id": [
"Chuanying ASA @Chuanying X1 0.25 Nozzle"
],
"fan_max_speed": [
"50"
],
"filament_cost": [
"40"
],
"filament_flow_ratio": [
"1"
],
"filament_max_volumetric_speed": [
"2"
],
"filament_start_gcode": [
"; filament start gcode\n;right_extruder_material: ASA\n"
],
"pressure_advance": [
"0.1"
],
"version": "1.8.0.0"
}
56 changes: 56 additions & 0 deletions resources/profiles/Chuanying/filament/Chuanying Generic ABS.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"type": "filament",
"filament_id": "GFB99",
"setting_id": "GFSA04",
"name": "Chuanying Generic ABS",
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_abs",
"filament_flow_ratio": [
"0.98"
],
"filament_max_volumetric_speed": [
"15"
],
"slow_down_layer_time": [
"8"
],
"support_material_interface_fan_speed": [
"80"
],
"slow_down_min_speed": [
"20"
],
"filament_start_gcode": [
"; filament start gcode\n;right_extruder_material: ABS\n"
],
"filament_end_gcode": [
"; filament end gcode\n"
],
"filament_diameter": [
"1.75"
],
"enable_pressure_advance": [
"1"
],
"pressure_advance": [
"0.04"
],
"filament_density": [
"1.04"
],
"temperature_vitrification": [
"100"
],
"hot_plate_temp_initial_layer": [
"105"
],
"hot_plate_temp": [
"105"
],
"compatible_printers": [
"Chuanying X1 0.4 Nozzle",
"Chuanying X1 0.6 Nozzle",
"Chuanying X1 0.8 Nozzle"
]
}
Loading

0 comments on commit 6f31a53

Please sign in to comment.