Skip to content

Commit

Permalink
Downgrade CuraEngine to 4.12.1
Browse files Browse the repository at this point in the history
- In 4.13.0 and 4.13.1 enabling support causes an error
  • Loading branch information
Marcio T committed Mar 18, 2022
1 parent 5eeecca commit e0e3aba
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 41 deletions.
1 change: 1 addition & 0 deletions build-cura-engine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#

#BUILD_OPT='-DCMAKE_BUILD_TYPE=MinSizeRel'
#BUILD_OPT="-DCMAKE_BUILD_TYPE=Debug"
BUILD_DIR=src-cura/CuraEngine/build
INSTALL_DIR=src-app/lib/slicing-engines/CuraEngine

Expand Down
2 changes: 1 addition & 1 deletion src-app/change_log.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ SynDaver Symple Slicer v1.1.0
* '''Slicing UI:''' "Print Sequence" under "Special Modes" is now usable (no collision prevention, use with care!)
* '''Slicing UI:''' Added ability to pause print at certain layers or insert custom G-code
* '''Slicing UI:''' Added ability to cancel a slice.
* '''Slicer''' Upgraded CuraEngine to 4.13.0
* '''Slicer''' Upgraded CuraEngine to 4.12.1
* '''Firmware:''' Added Level and LeveL UP
* '''Firmware:''' Update wireless to v1.1.0
## Added video stream for SynDaver LeveL UP
Expand Down
67 changes: 30 additions & 37 deletions src-app/config/cura_defaults/fdmprinter.def.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"metadata":
{
"type": "machine",
"author": "Unknown",
"author": "Ultimaker",
"manufacturer": "Unknown",
"setting_version": 19,
"file_formats": "text/x-gcode;model/stl;application/x-wavefront-obj;application/x3g",
Expand Down Expand Up @@ -159,16 +159,6 @@
"settable_per_extruder": false,
"settable_per_meshgroup": false
},
"machine_height":
{
"label": "Machine Height",
"description": "The height (Z-direction) of the printable area.",
"default_value": 100,
"type": "float",
"settable_per_mesh": false,
"settable_per_extruder": false,
"settable_per_meshgroup": false
},
"machine_shape":
{
"label": "Build Plate Shape",
Expand Down Expand Up @@ -199,6 +189,16 @@
"settable_per_extruder": false,
"settable_per_meshgroup": false
},
"machine_height":
{
"label": "Machine Height",
"description": "The height (Z-direction) of the printable area.",
"default_value": 100,
"type": "float",
"settable_per_mesh": false,
"settable_per_extruder": false,
"settable_per_meshgroup": false
},
"machine_heated_bed":
{
"label": "Has Heated Build Plate",
Expand Down Expand Up @@ -571,7 +571,7 @@
},
"machine_max_feedrate_e":
{
"label": "Maximum Speed E",
"label": "Maximum Feedrate",
"description": "The maximum speed of the filament.",
"unit": "mm/s",
"type": "float",
Expand Down Expand Up @@ -1056,7 +1056,6 @@
"minimum_value": "0",
"minimum_value_warning": "line_width",
"maximum_value_warning": "10 * line_width",
"maximum_value": "999999 * line_width",
"type": "float",
"limit_to_extruder": "wall_x_extruder_nr",
"settable_per_mesh": true,
Expand All @@ -1070,7 +1069,6 @@
"minimum_value": "0",
"minimum_value_warning": "1",
"maximum_value_warning": "10",
"maximum_value": "999999",
"type": "int",
"value": "1 if magic_spiralize else max(1, round((wall_thickness - wall_line_width_0) / wall_line_width_x) + 1) if wall_thickness != 0 else 0",
"limit_to_extruder": "wall_x_extruder_nr",
Expand Down Expand Up @@ -1559,7 +1557,6 @@
"default_value": 1,
"minimum_value": "0",
"maximum_value_warning": "10",
"maximum_value": "999999",
"type": "int",
"enabled": "(top_layers > 0 or bottom_layers > 0) and (top_bottom_pattern != 'concentric' or top_bottom_pattern_0 != 'concentric' or (roofing_layer_count > 0 and roofing_pattern != 'concentric'))",
"limit_to_extruder": "top_bottom_extruder_nr",
Expand Down Expand Up @@ -1893,7 +1890,7 @@
"infill_pattern":
{
"label": "Infill Pattern",
"description": "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Gyroid, cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction. Lightning infill tries to minimize the infill, by only supporting the ceiling of the object.",
"description": "The pattern of the infill material of the print. The line and zig zag infill swap direction on alternate layers, reducing material cost. The grid, triangle, tri-hexagon, cubic, octet, quarter cubic, cross and concentric patterns are fully printed every layer. Gyroid, cubic, quarter cubic and octet infill change with every layer to provide a more equal distribution of strength over each direction. Lightning infill tries to minimize the infill, by only supporting the (internal) roofs of the object. As such, the infill percentage is only 'valid' one layer below whatever it needs to support of the model.",
"type": "enum",
"options":
{
Expand Down Expand Up @@ -1946,7 +1943,7 @@
"description": "A list of integer line directions to use. Elements from the list are used sequentially as the layers progress and when the end of the list is reached, it starts at the beginning again. The list items are separated by commas and the whole list is contained in square brackets. Default is an empty list which means use the traditional default angles (45 and 135 degrees for the lines and zig zag patterns and 45 degrees for all other patterns).",
"type": "[int]",
"default_value": "[ ]",
"enabled": "infill_pattern not in ('concentric', 'cross', 'cross_3d', 'gyroid', 'lightning') and infill_sparse_density > 0",
"enabled": "infill_pattern != 'lightning' and infill_pattern != 'concentric' and infill_sparse_density > 0",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
},
Expand Down Expand Up @@ -2002,7 +1999,6 @@
"default_value": 0,
"type": "int",
"minimum_value": "0",
"maximum_value": "999999",
"enabled": "infill_sparse_density > 0",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
Expand Down Expand Up @@ -2087,9 +2083,9 @@
"default_value": 0,
"type": "int",
"minimum_value": "0",
"maximum_value_warning": "1 if (infill_pattern == 'cross' or infill_pattern == 'cross_3d' or infill_pattern == 'concentric') else 5",
"maximum_value_warning": "1 if (infill_pattern == 'cross' or infill_pattern == 'cross_3d' or support_pattern == 'concentric') else 5",
"maximum_value": "999999 if infill_line_distance == 0 else (20 - math.log(infill_line_distance) / math.log(2))",
"enabled": "infill_sparse_density > 0 and infill_pattern not in ['cubicsubdiv', 'cross', 'cross_3d', 'lightning']",
"enabled": "infill_pattern != 'lightning' and infill_sparse_density > 0 and infill_pattern != 'cubicsubdiv'",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
},
Expand All @@ -2102,7 +2098,7 @@
"default_value": 1.5,
"minimum_value": "0.0001",
"minimum_value_warning": "3 * resolveOrValue('layer_height')",
"enabled": "infill_sparse_density > 0 and gradual_infill_steps > 0 and infill_pattern not in ['cubicsubdiv', 'cross', 'cross_3d', 'lightning']",
"enabled": "infill_pattern != 'lightning' and infill_sparse_density > 0 and gradual_infill_steps > 0 and infill_pattern != 'cubicsubdiv'",
"limit_to_extruder": "infill_extruder_nr",
"settable_per_mesh": true
},
Expand Down Expand Up @@ -2216,7 +2212,7 @@
"lightning_infill_prune_angle":
{
"label": "Lightning Infill Prune Angle",
"description": "The endpoints of infill lines are shortened to save on material. This setting is the angle of overhang of the endpoints of these lines.",
"description": "The difference a lightning infill layer can have with the one immediately above w.r.t the pruning of the outer extremities of trees. Measured in the angle given the thickness.",
"unit": "°",
"type": "float",
"minimum_value": "0",
Expand All @@ -2232,7 +2228,7 @@
"lightning_infill_straightening_angle":
{
"label": "Lightning Infill Straightening Angle",
"description": "The infill lines are straightened out to save on printing time. This is the maximum angle of overhang allowed across the length of the infill line.",
"description": "The difference a lightning infill layer can have with the one immediately above w.r.t the smoothing of trees. Measured in the angle given the thickness.",
"unit": "°",
"type": "float",
"minimum_value": "0",
Expand Down Expand Up @@ -3883,7 +3879,6 @@
"default_value": 90,
"minimum_value": "0",
"maximum_value_warning": "100",
"maximum_value": 999999999,
"type": "int",
"enabled": "retraction_enable",
"settable_per_mesh": false,
Expand Down Expand Up @@ -4451,7 +4446,6 @@
"minimum_value": "0",
"minimum_value_warning": "1 if support_pattern == 'concentric' else 0",
"maximum_value_warning": "0 if (support_skip_some_zags and support_pattern == 'zigzag') else 3",
"maximum_value": "999999",
"type": "int",
"value": "1 if support_enable and support_structure == 'tree' else (1 if (support_pattern == 'grid' or support_pattern == 'triangles' or support_pattern == 'concentric') else 0)",
"enabled": "support_enable or support_meshes_present",
Expand Down Expand Up @@ -4562,7 +4556,6 @@
"default_value": 8.0,
"minimum_value": "0.0",
"maximum_value_warning": "50.0",
"maximum_value": "0.5 * min(machine_width, machine_depth)",
"enabled": "(support_enable or support_meshes_present) and support_brim_enable",
"settable_per_mesh": false,
"settable_per_extruder": true,
Expand All @@ -4577,7 +4570,6 @@
"default_value": 20,
"minimum_value": "0",
"maximum_value_warning": "50 / skirt_brim_line_width",
"maximum_value": "0.5 * min(machine_width, machine_depth) / skirt_brim_line_width",
"value": "math.ceil(support_brim_width / (skirt_brim_line_width * initial_layer_line_width_factor / 100.0))",
"enabled": "(support_enable or support_meshes_present) and support_brim_enable",
"settable_per_mesh": false,
Expand Down Expand Up @@ -4610,7 +4602,7 @@
"default_value": 0.1,
"type": "float",
"enabled": "support_enable or support_meshes_present",
"value": "extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance') + (layer_height if support_structure == 'tree' else 0)",
"value": "extruderValue(support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr, 'support_z_distance')",
"limit_to_extruder": "support_roof_extruder_nr if support_roof_enable else support_infill_extruder_nr",
"settable_per_mesh": true
},
Expand Down Expand Up @@ -5341,7 +5333,6 @@
"default_value": 1,
"minimum_value": "0",
"maximum_value_warning": "10",
"maximum_value": "0.5 * min(machine_width, machine_depth) / skirt_brim_line_width",
"enabled": "resolveOrValue('adhesion_type') == 'skirt'",
"settable_per_mesh": false,
"settable_per_extruder": true,
Expand Down Expand Up @@ -7430,9 +7421,9 @@
"unit": "%",
"default_value": 100,
"type": "float",
"minimum_value": "0.001",
"minimum_value": "5",
"maximum_value": "100",
"minimum_value_warning": "20",
"maximum_value_warning": "100",
"enabled": "bridge_settings_enabled",
"settable_per_mesh": true
},
Expand Down Expand Up @@ -7478,7 +7469,8 @@
"unit": "%",
"default_value": 100,
"type": "float",
"minimum_value": "0.0001",
"minimum_value": "5",
"maximum_value": "500",
"minimum_value_warning": "50",
"maximum_value_warning": "150",
"enabled": "bridge_settings_enabled and bridge_enable_more_layers",
Expand All @@ -7491,9 +7483,9 @@
"unit": "%",
"default_value": 75,
"type": "float",
"minimum_value": "0",
"minimum_value": "5",
"maximum_value": "100",
"minimum_value_warning": "20",
"maximum_value_warning": "100",
"enabled": "bridge_settings_enabled and bridge_enable_more_layers",
"settable_per_mesh": true
},
Expand Down Expand Up @@ -7530,7 +7522,8 @@
"unit": "%",
"default_value": 110,
"type": "float",
"minimum_value": "0.001",
"minimum_value": "5",
"maximum_value": "500",
"minimum_value_warning": "50",
"maximum_value_warning": "150",
"enabled": "bridge_settings_enabled and bridge_enable_more_layers",
Expand All @@ -7543,9 +7536,9 @@
"unit": "%",
"default_value": 80,
"type": "float",
"minimum_value": "0",
"minimum_value": "5",
"maximum_value": "100",
"minimum_value_warning": "20",
"maximum_value_warning": "100",
"enabled": "bridge_settings_enabled and bridge_enable_more_layers",
"settable_per_mesh": true
},
Expand Down
2 changes: 1 addition & 1 deletion src-app/lib/slicing-engines/CuraEngine/CuraEngine.js

Large diffs are not rendered by default.

Binary file modified src-app/lib/slicing-engines/CuraEngine/CuraEngine.wasm
Binary file not shown.
2 changes: 1 addition & 1 deletion src-app/service-worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ importScripts('lib/util/misc/Wikify.js');
// Based on https://deanhume.com/displaying-a-new-version-available-progressive-web-app/

const info = {
cacheVersion: 204
cacheVersion: 206
};

const cacheName = 'v' + info.cacheVersion;
Expand Down
2 changes: 1 addition & 1 deletion src-cura/CuraEngine

0 comments on commit e0e3aba

Please sign in to comment.