Added extruder offsets

eugr · Feb 15, 2020 · c5105a8 · c5105a8
1 parent 207e462
commit c5105a8
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/resources/definitions/creator_pro.def.json b/resources/definitions/creator_pro.def.json
@@ -11,6 +11,7 @@
         "machine_x3g_variant": "fcp",
         "file_formats": "application/x3g",
         "platform_offset": [ 0, 0, 0],
+        "nozzle_offsetting_for_disallowed_areas": false,
         "machine_extruder_trains":
         {
             "0": "creatorpro_extruder_1",
@@ -68,11 +69,15 @@
         "machine_steps_per_mm_e": { "default_value": 96.275201870333662468889989185642 },
         "retraction_amount": {"default_value": 1.3 },
         "retraction_speed": { "default_value": 30 },
-        "raft_margin": { "default_value": 3 },
         "speed_layer_0":{ "value": 15.0 },
-        "prime_tower_position_x": {"value": "machine_width/2 - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' or (prime_tower_brim_enable and adhesion_type != 'raft') else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0) - max(map(abs, extruderValues('machine_nozzle_offset_x'))) - 1"},
-        "prime_tower_position_y": {"value": "machine_depth/2 - prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' or (prime_tower_brim_enable and adhesion_type != 'raft') else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0) - max(map(abs, extruderValues('machine_nozzle_offset_y'))) - 1"},
-        "ooze_shield_angle": {"value": 30 },
+        "prime_tower_position_x": {"value": "machine_width/2 - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' or (prime_tower_brim_enable and adhesion_type != 'raft') else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0) - 1"},
+        "prime_tower_position_y": {"value": "machine_depth/2 - prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' or (prime_tower_brim_enable and adhesion_type != 'raft') else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0) - 1"},
+        "ooze_shield_angle": { "default_value": 30 },
+        "ooze_shield_dist": { "default_value": 7 },
+        "skirt_line_count": { "default_value": 2 },
+        "skirt_gap": { "default_value": 10 },
+        "raft_margin": { "default_value": 3 },
+        "machine_use_extruder_offset_to_offset_coords": { "default_value": false },
         "machine_start_gcode": {"value": "dual_gcode if len(extruderValues('extruder_nr')) > 1 else single_gcode" },
         "machine_end_gcode": {"default_value": "; **** FlashForge Creator Pro end.gcode ****\nM73 P100 ; end build progress\nG1 Z150 F1000 ; send Z axis to bottom of machine\nM140 S0 T0 ; cool down HBP\nM104 S0 T0 ; cool down right extruder\nM104 S0 T1 ; cool down left extruder\nM127 ; stop blower fan\nG162 X Y F3000 ; home XY maximum\nM18 ; disable stepper\nM70 P3 ; We <3 Making Things!\nM72 P1 ; play Ta-Da song\n; **** end of end.gcode ****"}      
     }

diff --git a/resources/extruders/creatorpro_extruder_1.def.json b/resources/extruders/creatorpro_extruder_1.def.json
@@ -14,6 +14,8 @@
         },
         "machine_nozzle_size": { "default_value": 0.4 },
         "material_diameter": { "default_value": 1.75 },
+        "machine_nozzle_offset_x": { "default_value": 0.0 },
+        "machine_nozzle_offset_y": { "default_value": 0.0 },
         "machine_extruder_start_pos_abs": { "default_value": true },
         "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
         "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" },

diff --git a/resources/extruders/creatorpro_extruder_2.def.json b/resources/extruders/creatorpro_extruder_2.def.json
@@ -14,6 +14,8 @@
         },
         "machine_nozzle_size": { "default_value": 0.4 },
         "material_diameter": { "default_value": 1.75 },
+        "machine_nozzle_offset_x": { "default_value": -33.0 },
+        "machine_nozzle_offset_y": { "default_value": 0.0 },
         "machine_extruder_start_pos_abs": { "default_value": true },
         "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" },
         "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" },