Skip to content

Commit

Permalink
More fixes for #81:
Browse files Browse the repository at this point in the history 
Update default acceleration and jerk values of 3D20, 3D40, and 3D45
Remove acceleration overrides from quality definitions
  • Loading branch information
tim-schoenmackers committed Aug 24, 2021
1 parent 7c13acb commit ebe1590
Show file tree
Hide file tree
Showing 37 changed files with 70 additions and 116 deletions.
27 changes: 24 additions & 3 deletions resources/definitions/Dremel3D20.def.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,20 +148,41 @@
"name": "Dremel3D20",
"overrides": {
"acceleration_enabled": {
"default_value": false
"value": false
},
"acceleration_print": {
"value": 200
},
"acceleration_travel": {
"value": 1000
},
"acceleration_travel_layer_0": {
"value": "acceleration_travel"
},
"adhesion_type": {
"default_value": "skirt"
"value": "skirt"
},
"gantry_height": {
"default_value": 30
"value": 30
},
"infill_sparse_density": {
"default_value": 20
},
"infill_sparse_thickness": {
"maximum_value_warning": 0.32
},
"jerk_enabled": {
"value": false
},
"jerk_print": {
"value": 5.0
},
"jerk_travel": {
"value": "jerk_print"
},
"jerk_travel_layer_0": {
"value": "jerk_travel"
},
"layer_height": {
"default_value": 0.2
},
Expand Down
23 changes: 22 additions & 1 deletion resources/definitions/Dremel3D40.def.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,16 @@
"name": "Dremel3D40",
"overrides": {
"acceleration_enabled": {
"default_value": false
"value": false
},
"acceleration_print": {
"value": 200
},
"acceleration_travel": {
"value": 1000
},
"acceleration_travel_layer_0": {
"value": "acceleration_travel"
},
"adhesion_type": {
"default_value": "none"
Expand All @@ -171,6 +180,18 @@
"infill_sparse_thickness": {
"maximum_value_warning": 0.34
},
"jerk_enabled": {
"value": false
},
"jerk_print": {
"value": 5.0
},
"jerk_travel": {
"value": "jerk_print"
},
"jerk_travel_layer_0": {
"value": "jerk_travel"
},
"layer_height": {
"default_value": 0.2,
"maximum_value_warning": 0.34
Expand Down
24 changes: 24 additions & 0 deletions resources/definitions/Dremel3D45.def.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,18 @@
},
"name": "Dremel3D45",
"overrides": {
"acceleration_enabled": {
"value": true
},
"acceleration_print": {
"value": 800
},
"acceleration_travel": {
"value": 1200
},
"acceleration_travel_layer_0": {
"value": "acceleration_travel"
},
"adhesion_type": {
"default_value": "none"
},
Expand All @@ -39,6 +51,18 @@
"infill_sparse_thickness": {
"maximum_value_warning": 0.34
},
"jerk_enabled": {
"value": true
},
"jerk_print": {
"value": 8.0
},
"jerk_travel": {
"value": "jerk_print"
},
"jerk_travel_layer_0": {
"value": "jerk_travel"
},
"layer_height": {
"default_value": 0.2,
"maximum_value_warning": 0.34
Expand Down
4 changes: 0 additions & 4 deletions resources/quality/Dremel3D40/Dremel3D40_dremel_pla_0.5kg_fast.inst.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ type = quality
weight = -3

[values]
acceleration_enabled = True
acceleration_print = 2000
acceleration_travel = 2000
acceleration_travel_layer_0 = 2000
adhesion_type = skirt
bottom_layers = 3
cool_fan_enabled = True
Expand Down
4 changes: 0 additions & 4 deletions resources/quality/Dremel3D40/Dremel3D40_dremel_pla_0.5kg_high.inst.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ type = quality
weight = 1

[values]
acceleration_enabled = True
acceleration_print = 2000
acceleration_travel = 2000
acceleration_travel_layer_0 = 2000
adhesion_type = skirt
bottom_layers = 10
cool_fan_enabled = True
Expand Down
4 changes: 0 additions & 4 deletions resources/quality/Dremel3D40/Dremel3D40_dremel_pla_draft.inst.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ type = quality
weight = -2

[values]
acceleration_enabled = True
acceleration_print = 2000
acceleration_travel = 2000
acceleration_travel_layer_0 = 2000
adhesion_type = skirt
bottom_layers = 3
cool_fan_enabled = True
Expand Down
4 changes: 0 additions & 4 deletions resources/quality/Dremel3D40/Dremel3D40_dremel_pla_fast.inst.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ type = quality
weight = -3

[values]
acceleration_enabled = True
acceleration_print = 2000
acceleration_travel = 2000
acceleration_travel_layer_0 = 2000
adhesion_type = skirt
bottom_layers = 3
cool_fan_enabled = True
Expand Down
4 changes: 0 additions & 4 deletions resources/quality/Dremel3D40/Dremel3D40_dremel_pla_high.inst.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ type = quality
weight = 1

[values]
acceleration_enabled = True
acceleration_print = 2000
acceleration_travel = 2000
acceleration_travel_layer_0 = 2000
adhesion_type = skirt
bottom_layers = 10
cool_fan_enabled = True
Expand Down
4 changes: 0 additions & 4 deletions resources/quality/Dremel3D40/Dremel3D40_dremel_pla_low.inst.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ type = quality
weight = -1

[values]
acceleration_enabled = True
acceleration_print = 2000
acceleration_travel = 2000
acceleration_travel_layer_0 = 2000
adhesion_type = skirt
bottom_layers = 4
cool_fan_enabled = True
Expand Down
4 changes: 0 additions & 4 deletions resources/quality/Dremel3D40/Dremel3D40_dremel_pla_normal.inst.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ type = quality
weight = 0

[values]
acceleration_enabled = True
acceleration_print = 2000
acceleration_travel = 2000
acceleration_travel_layer_0 = 2000
adhesion_type = skirt
bottom_layers = 10
cool_fan_enabled = True
Expand Down
4 changes: 0 additions & 4 deletions resources/quality/Dremel3D40/Dremel_3D40_dremel_pla_0.5kg_draft.inst.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ type = quality
weight = -2

[values]
acceleration_enabled = True
acceleration_print = 2000
acceleration_travel = 2000
acceleration_travel_layer_0 = 2000
adhesion_type = skirt
bottom_layers = 3
cool_fan_enabled = True
Expand Down
4 changes: 0 additions & 4 deletions resources/quality/Dremel3D40/Dremel_3D40_dremel_pla_0.5kg_low.inst.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ type = quality
weight = -1

[values]
acceleration_enabled = True
acceleration_print = 2000
acceleration_travel = 2000
acceleration_travel_layer_0 = 2000
adhesion_type = skirt
bottom_layers = 4
cool_fan_enabled = True
Expand Down
4 changes: 0 additions & 4 deletions resources/quality/Dremel3D40/Dremel_3D40_dremel_pla_0.5kg_normal.inst.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ type = quality
weight = 0

[values]
acceleration_enabled = True
acceleration_print = 2000
acceleration_travel = 2000
acceleration_travel_layer_0 = 2000
adhesion_type = skirt
bottom_layers = 10
cool_fan_enabled = True
Expand Down
3 changes: 0 additions & 3 deletions resources/quality/Dremel3D45/Dremel_3D45_dremel_eco_abs_draft.inst.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ type = quality
weight = -2

[values]
acceleration_enabled = True
acceleration_print = 2000
acceleration_travel_layer_0 = 2000
adhesion_type = skirt
bottom_layers = 3
cool_lift_head = False
Expand Down
3 changes: 0 additions & 3 deletions resources/quality/Dremel3D45/Dremel_3D45_dremel_eco_abs_fast.inst.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ type = quality
weight = -3

[values]
acceleration_enabled = True
acceleration_print = 2000
acceleration_travel_layer_0 = 2000
bottom_layers = 3
cool_lift_head = False
cool_fan_speed = 100
Expand Down
3 changes: 0 additions & 3 deletions resources/quality/Dremel3D45/Dremel_3D45_dremel_eco_abs_high.inst.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ type = quality
weight = 1

[values]
acceleration_enabled = True
acceleration_print = 2000
acceleration_travel_layer_0 = 2000
adhesion_type = skirt
bottom_layers = 20
cool_lift_head = False
Expand Down
3 changes: 0 additions & 3 deletions resources/quality/Dremel3D45/Dremel_3D45_dremel_eco_abs_low.inst.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ type = quality
weight = -1

[values]
acceleration_enabled = True
acceleration_print = 2000
acceleration_travel_layer_0 = 2000
adhesion_type = skirt
bottom_layers = 4
cool_lift_head = False
Expand Down
3 changes: 0 additions & 3 deletions resources/quality/Dremel3D45/Dremel_3D45_dremel_eco_abs_normal.inst.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ type = quality
weight = 0

[values]
acceleration_enabled = True
acceleration_print = 2000
acceleration_travel_layer_0 = 2000
adhesion_type = skirt
bottom_layers = 10
cool_lift_head = False
Expand Down
3 changes: 0 additions & 3 deletions resources/quality/Dremel3D45/Dremel_3D45_dremel_nylon_draft.inst.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ type = quality
weight = -2

[values]
acceleration_enabled = True
acceleration_print = 2000
acceleration_travel_layer_0 = 2000
adhesion_type = skirt
bottom_layers = 3
cool_fan_enabled = True
Expand Down
3 changes: 0 additions & 3 deletions resources/quality/Dremel3D45/Dremel_3D45_dremel_nylon_fast.inst.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ type = quality
weight = -3

[values]
acceleration_enabled = True
acceleration_print = 2000
acceleration_travel_layer_0 = 2000
bottom_layers = 3
cool_fan_enabled = True
cool_fan_speed = 50
Expand Down
3 changes: 0 additions & 3 deletions resources/quality/Dremel3D45/Dremel_3D45_dremel_nylon_high.inst.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ type = quality
weight = 1

[values]
acceleration_enabled = True
acceleration_print = 2000
acceleration_travel_layer_0 = 2000
adhesion_type = skirt
bottom_layers = 20
cool_fan_enabled = True
Expand Down
3 changes: 0 additions & 3 deletions resources/quality/Dremel3D45/Dremel_3D45_dremel_nylon_low.inst.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ type = quality
weight = -1

[values]
acceleration_enabled = True
acceleration_print = 2000
acceleration_travel_layer_0 = 2000
adhesion_type = skirt
bottom_layers = 4
cool_fan_enabled = True
Expand Down
3 changes: 0 additions & 3 deletions resources/quality/Dremel3D45/Dremel_3D45_dremel_nylon_normal.inst.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ type = quality
weight = 0

[values]
acceleration_enabled = True
acceleration_print = 2000
acceleration_travel_layer_0 = 2000
adhesion_type = skirt
bottom_layers = 10
cool_fan_enabled = True
Expand Down
3 changes: 0 additions & 3 deletions resources/quality/Dremel3D45/Dremel_3D45_dremel_petg_draft.inst.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ type = quality
weight = -2

[values]
acceleration_enabled = True
acceleration_print = 2000
acceleration_travel_layer_0 = 2000
adhesion_type = skirt
bottom_layers = 3
cool_fan_enabled = True
Expand Down
3 changes: 0 additions & 3 deletions resources/quality/Dremel3D45/Dremel_3D45_dremel_petg_fast.inst.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ type = quality
weight = -3

[values]
acceleration_enabled = True
acceleration_print = 2000
acceleration_travel_layer_0 = 2000
bottom_layers = 3
cool_fan_enabled = True
cool_fan_speed = 100
Expand Down
3 changes: 0 additions & 3 deletions resources/quality/Dremel3D45/Dremel_3D45_dremel_petg_low.inst.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ type = quality
weight = -1

[values]
acceleration_enabled = True
acceleration_print = 2000
acceleration_travel_layer_0 = 2000
adhesion_type = skirt
bottom_layers = 4
cool_fan_enabled = True
Expand Down
3 changes: 0 additions & 3 deletions resources/quality/Dremel3D45/Dremel_3D45_dremel_petg_normal.inst.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ type = quality
weight = 0

[values]
acceleration_enabled = True
acceleration_print = 1000
acceleration_travel_layer_0 = 1000
adhesion_type = skirt
bottom_layers = 10
cool_fan_enabled = True
Expand Down
3 changes: 0 additions & 3 deletions resources/quality/Dremel3D45/Dremel_3D45_dremel_pla_draft.inst.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ type = quality
weight = -2

[values]
acceleration_enabled = True
acceleration_print = 2000
acceleration_travel_layer_0 = 2000
adhesion_type = skirt
bottom_layers = 3
cool_fan_enabled = True
Expand Down
3 changes: 0 additions & 3 deletions resources/quality/Dremel3D45/Dremel_3D45_dremel_pla_draft_0.5kg.inst.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ type = quality
weight = -2

[values]
acceleration_enabled = True
acceleration_print = 2000
acceleration_travel_layer_0 = 2000
adhesion_type = skirt
bottom_layers = 3
cool_fan_enabled = True
Expand Down
3 changes: 0 additions & 3 deletions resources/quality/Dremel3D45/Dremel_3D45_dremel_pla_fast.inst.cfg
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,6 @@ type = quality
weight = -3

[values]
acceleration_enabled = True
acceleration_print = 2000
acceleration_travel_layer_0 = 2000
bottom_layers = 3
cool_fan_enabled = True
cool_fan_speed = 80
Expand Down
Loading

0 comments on commit ebe1590

Please sign in to comment.