GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-12 04:59:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix overriding of prime tower position

Browse Source 
We had changed it for all printers back when we changed the prime tower position to a formula, but since then we've been getting new printer definitions that were made from templates floating around with the old structure.
We should really have an automated test for this.

Discovered during review of #6518.
This commit is contained in:
Ghostkeeper 2019-10-14 11:02:43 +02:00
parent bba43fafcc
commit 4cb59b5454
No known key found for this signature in database
GPG Key ID: 86BEF881AE2CF276
11 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
resources/definitions/Mark2_for_Ultimaker2.def.json
View File

@ -209,10 +209,10 @@
"enabled": false
},
"prime_tower_position_x": {
"default_value": 185
"value": "185"
},
"prime_tower_position_y": {
"default_value": 160
"value": "160"
},
"machine_disallowed_areas": {
"default_value": [

4
resources/definitions/builder_premium_large.def.json
View File

@ -50,8 +50,8 @@
"speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 25)" },
"speed_wall_x": { "value": "speed_wall" },
"prime_tower_position_x": { "default_value": 175 },
"prime_tower_position_y": { "default_value": 178 },
"prime_tower_position_x": { "value": "175" },
"prime_tower_position_y": { "value": "178" },
"prime_tower_wipe_enabled": { "default_value": false },
"prime_tower_min_volume": { "default_value": 50 },

4
resources/definitions/builder_premium_medium.def.json
View File

@ -50,8 +50,8 @@
"speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 25)" },
"speed_wall_x": { "value": "speed_wall" },
"prime_tower_position_x": { "default_value": 175 },
"prime_tower_position_y": { "default_value": 178 },
"prime_tower_position_x": { "value": "175" },
"prime_tower_position_y": { "value": "178" },
"prime_tower_wipe_enabled": { "default_value": false },
"prime_tower_min_volume": { "default_value": 50 },

4
resources/definitions/builder_premium_small.def.json
View File

@ -49,8 +49,8 @@
"speed_wall_0": { "value": "math.ceil(speed_wall * 20 / 25)" },
"speed_wall_x": { "value": "speed_wall" },
"prime_tower_position_x": { "default_value": 175 },
"prime_tower_position_y": { "default_value": 178 },
"prime_tower_position_x": { "value": "175" },
"prime_tower_position_y": { "value": "178" },
"prime_tower_wipe_enabled": { "default_value": false },
"prime_tower_min_volume": { "default_value": 50 },

4
resources/definitions/cartesio.def.json
View File

@ -44,8 +44,8 @@
"prime_tower_enable": { "default_value": false },
"prime_tower_min_volume": { "value": "0.7" },
"prime_tower_size": { "value": 24.0 },
"prime_tower_position_x": { "value": 125 },
"prime_tower_position_y": { "value": 70 },
"prime_tower_position_x": { "value": "125" },
"prime_tower_position_y": { "value": "70" },
"prime_blob_enable": { "default_value": false },
"machine_max_feedrate_z": { "default_value": 20 },
"machine_disallowed_areas": { "default_value": [

4
resources/definitions/raise3D_N2_dual.def.json
View File

@ -76,10 +76,10 @@
"default_value": 2
},
"prime_tower_position_x": {
"default_value": 195
"value": "195"
},
"prime_tower_position_y": {
"default_value": 149
"value": "149"
}
}
}

4
resources/definitions/raise3D_N2_plus_dual.def.json
View File

@ -76,10 +76,10 @@
"default_value": 2
},
"prime_tower_position_x": {
"default_value": 195
"value": "195"
},
"prime_tower_position_y": {
"default_value": 149
"value": "149"
}
}
}

4
resources/definitions/raise3D_N2_plus_single.def.json
View File

@ -72,10 +72,10 @@
"default_value": "M107\nM1002\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117 Print Complete.\nG28 X0 Y0\nG91\nG1 Z10\nG90\nM84"
},
"prime_tower_position_x": {
"default_value": 195
"value": "195"
},
"prime_tower_position_y": {
"default_value": 149
"value": "149"
}
}
}

4
resources/definitions/raise3D_N2_single.def.json
View File

@ -72,10 +72,10 @@
"default_value": "M107\nM1002\nM104 S0 T1\nM104 S0 T0\nM140 S0\nM117 Print Complete.\nG28 X0 Y0\nG91\nG1 Z10\nG90\nM84"
},
"prime_tower_position_x": {
"default_value": 195
"value": "195"
},
"prime_tower_position_y": {
"default_value": 149
"value": "149"
}
}
}

4
resources/definitions/ultimaker_s3.def.json
View File

@ -68,8 +68,8 @@
"extruder_prime_pos_abs": { "default_value": true },
"machine_start_gcode": { "default_value": "" },
"machine_end_gcode": { "default_value": "" },
"prime_tower_position_x": { "default_value": 345 },
"prime_tower_position_y": { "default_value": 222.5 },
"prime_tower_position_x": { "value": "345" },
"prime_tower_position_y": { "value": "222.5" },
"prime_blob_enable": { "enabled": true, "default_value": false },
"speed_travel":

4
resources/definitions/ultimaker_s5.def.json
View File

@ -70,8 +70,8 @@
"extruder_prime_pos_abs": { "default_value": true },
"machine_start_gcode": { "default_value": "" },
"machine_end_gcode": { "default_value": "" },
"prime_tower_position_x": { "default_value": 345 },
"prime_tower_position_y": { "default_value": 222.5 },
"prime_tower_position_x": { "value": "345" },
"prime_tower_position_y": { "value": "222.5" },
"prime_blob_enable": { "enabled": true, "default_value": false },
"speed_travel":