any2orca 0.5.0 → 0.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
# any2orca
|
|
2
2
|
|
|
3
|
+
## 0.6.0
|
|
4
|
+
|
|
5
|
+
### Output-affecting
|
|
6
|
+
|
|
7
|
+
- **Six more PrusaSlicer settings are carried.** A trace of every dropped PrusaSlicer key through Bambu Studio's, OrcaSlicer's and Snapmaker Orca's rename tables found no missed rename, and six settings with the same meaning under another name, confirmed on both slicers' descriptions: "keep fan always on", automatic infill combination and its maximum layer height, a solid layer every N layers ("insert solid layers"), clockwise wall direction, support layers synchronized with the object (Snapmaker Orca's independent support layer height, inverted), and a filament's ramping lift (its Z-hop type). Only PrusaSlicer conversions change; the report's list of settings with no counterpart is shorter by those six.
|
|
8
|
+
- **A PrusaSlicer project's printer settings are the U1's.** The converter listed every mapped setting as changed by the creator, printer settings included, so a PrusaSlicer printer's retraction and single-extruder purge moves reached the file (Snapmaker Orca replaced them with its printer preset's on load, as the re-save of five converted files showed). Only print settings are listed now, as for a Bambu Studio family project, whose own list never names printer settings; the printer's values in a converted file are the U1 profile's.
|
|
9
|
+
|
|
3
10
|
## 0.5.0
|
|
4
11
|
|
|
5
12
|
### Output-affecting
|
|
@@ -24,6 +24,7 @@ const PROJECT_STATE_VECTORS = {
|
|
|
24
24
|
flush_volumes_matrix: true,
|
|
25
25
|
filament_load_time: true,
|
|
26
26
|
filament_unload_time: true,
|
|
27
|
+
filament_z_hop_types: true,
|
|
27
28
|
};
|
|
28
29
|
/**
|
|
29
30
|
* Whether the key is written as a list: a filament or machine setting Snapmaker Orca keeps per filament or per
|
|
@@ -130,6 +131,7 @@ const TRANSFORMS = {
|
|
|
130
131
|
warnings.push(` note: ${fromExtruders} filament color(s) taken from the printer's extruder colors, which are what PrusaSlicer shows for this project.`);
|
|
131
132
|
return out;
|
|
132
133
|
},
|
|
134
|
+
filamentZHopTypes: ({ ini, key }) => entries(ini, key, "filament_z_hop_types").map((entry) => (entry === "nil" ? "nil" : entry === "1" ? "Slope Lift" : "Normal Lift")),
|
|
133
135
|
filamentType: ({ ini }) => entries(ini, "filament_type", "filament_type").map((type) => ({ PET: "PETG", NYLON: "PA" })[type] ?? type),
|
|
134
136
|
firstLayerHeight: ({ ini, value }) => {
|
|
135
137
|
const layer = ini.settings.get("layer_height");
|
|
@@ -137,7 +139,8 @@ const TRANSFORMS = {
|
|
|
137
139
|
return resolved === null ? null : [resolved];
|
|
138
140
|
},
|
|
139
141
|
gapFillTarget: ({ value }) => [value === "0" ? "nowhere" : "everywhere"],
|
|
140
|
-
infillCombination: ({
|
|
142
|
+
infillCombination: ({ ini }) => [ini.settings.get("automatic_infill_combination") === "1" || num(ini.settings.get("infill_every_layers") ?? "1") > 1 ? "1" : "0"],
|
|
143
|
+
invertBool: ({ value }) => [value === "1" ? "0" : "1"],
|
|
141
144
|
ironingType: ({ ini, value }) => [ini.settings.get("ironing") === "1" ? value : "no ironing"],
|
|
142
145
|
onlyOneWallTop: ({ value }) => [value === "none" ? "0" : "1"],
|
|
143
146
|
percentComplement: ({ ini, key }) => entries(ini, key, "filament_shrink").map((entry) => `${fmt(100 - num(entry))}%`),
|
|
@@ -153,6 +156,8 @@ const TRANSFORMS = {
|
|
|
153
156
|
return null;
|
|
154
157
|
},
|
|
155
158
|
printSequence: ({ value }) => [value === "1" ? "by object" : "by layer"],
|
|
159
|
+
// PrusaSlicer's "a solid layer every N layers" is Orca's "insert solid layers: N"; 0 is off, so nothing to carry.
|
|
160
|
+
solidEveryLayers: ({ value }) => (num(value) > 0 ? [String(Math.trunc(num(value)))] : null),
|
|
156
161
|
supportBottomZ: ({ ini, value }) => [value === "0" ? (ini.settings.get("support_material_contact_distance") ?? value) : value],
|
|
157
162
|
supportThreshold: ({ key, value, dropped }) => {
|
|
158
163
|
if (value !== "0")
|
|
@@ -174,6 +179,8 @@ const TRANSFORMS = {
|
|
|
174
179
|
}
|
|
175
180
|
return [fmt((num(value) / 100) * width)];
|
|
176
181
|
},
|
|
182
|
+
// Only the clockwise choice is a change from Orca's automatic direction.
|
|
183
|
+
wallDirection: ({ value }) => (value === "1" ? ["cw"] : null),
|
|
177
184
|
wallSequence: ({ value }) => [value === "1" ? "outer wall/inner wall" : "inner wall/outer wall"],
|
|
178
185
|
zHopTypes: ({ ini, key }) => entries(ini, key, "z_hop_types").map((entry) => (entry === "1" ? "Slope Lift" : "Normal Lift")),
|
|
179
186
|
};
|
|
@@ -306,11 +313,12 @@ export function convertPrusaSettings(ini) {
|
|
|
306
313
|
if (!Array.isArray(settings.flush_volumes_matrix))
|
|
307
314
|
settings.flush_volumes_matrix = Array.from({ length: filamentCount * filamentCount }, () => "0");
|
|
308
315
|
settings.flush_volumes_vector = Array.from({ length: filamentCount * 2 }, () => "140");
|
|
309
|
-
// Policy:
|
|
310
|
-
// filament entries (one per filament) and the printer entry stay empty
|
|
311
|
-
//
|
|
316
|
+
// Policy: every mapped print setting counts as changed by the creator, so the print entry lists them all. The
|
|
317
|
+
// filament entries (one per filament) and the printer entry stay empty: the pipeline overlays filament values whole,
|
|
318
|
+
// and the printer's settings (retraction, purge moves, limits) are the U1's own, as they are for a Bambu-family
|
|
319
|
+
// project, whose list never names them either. Snapmaker Orca itself takes them from its printer preset on load.
|
|
312
320
|
const printKeys = Object.keys(settings)
|
|
313
|
-
.filter((k) => SETTINGS_CATALOG[k]?.group
|
|
321
|
+
.filter((k) => SETTINGS_CATALOG[k]?.group === "print")
|
|
314
322
|
.sort();
|
|
315
323
|
settings.different_settings_to_system = [printKeys.join(";"), ...Array.from({ length: filamentCount }, () => ""), ""];
|
|
316
324
|
return { settings, dropped, unknown, warnings };
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
* - `handled`: read by another part of the reader (the color changes, the
|
|
28
28
|
* filament colors), not by the settings map.
|
|
29
29
|
*/
|
|
30
|
-
export type PrusaTransform = "arcFitting" | "filamentColour" | "filamentType" | "firstLayerHeight" | "gapFillTarget" | "infillCombination" | "ironingType" | "onlyOneWallTop" | "percentComplement" | "percentOfFirstLayerSpeed" | "percentOfInfillSpeed" | "percentOfPerimeterSpeed" | "percentOfSolidInfillSpeed" | "percentOfSupportSpeed" | "percentOnly" | "printSequence" | "supportBottomZ" | "supportThreshold" | "supportType" | "supportXySpacing" | "wallSequence" | "zHopTypes";
|
|
30
|
+
export type PrusaTransform = "arcFitting" | "filamentColour" | "filamentZHopTypes" | "filamentType" | "firstLayerHeight" | "gapFillTarget" | "infillCombination" | "invertBool" | "ironingType" | "onlyOneWallTop" | "percentComplement" | "percentOfFirstLayerSpeed" | "percentOfInfillSpeed" | "percentOfPerimeterSpeed" | "percentOfSolidInfillSpeed" | "percentOfSupportSpeed" | "percentOnly" | "printSequence" | "solidEveryLayers" | "supportBottomZ" | "supportThreshold" | "supportType" | "supportXySpacing" | "wallDirection" | "wallSequence" | "zHopTypes";
|
|
31
31
|
export type PrusaKeyRule = {
|
|
32
32
|
readonly kind: "same";
|
|
33
33
|
} | {
|
|
@@ -138,9 +138,10 @@ export const PRUSA_KEY_MAP = Object.freeze({
|
|
|
138
138
|
top_fill_pattern: choices("top_surface_pattern", SURFACE_PATTERNS),
|
|
139
139
|
bottom_fill_pattern: choices("bottom_surface_pattern", SURFACE_PATTERNS),
|
|
140
140
|
infill_every_layers: transform("infill_combination", "infillCombination"),
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
141
|
+
// Either PrusaSlicer switch (2.9's automatic one, or combining every N layers) turns Snapmaker Orca's combination on.
|
|
142
|
+
automatic_infill_combination: transform("infill_combination", "infillCombination"),
|
|
143
|
+
automatic_infill_combination_max_layer_height: rename("infill_combination_max_layer_height"),
|
|
144
|
+
solid_infill_every_layers: transform("extra_solid_infills", "solidEveryLayers"),
|
|
144
145
|
infill_only_where_needed: drop(NO_COUNTERPART),
|
|
145
146
|
infill_first: rename("is_infill_first"),
|
|
146
147
|
infill_overlap: transform("infill_wall_overlap", "percentOnly"),
|
|
@@ -229,7 +230,7 @@ export const PRUSA_KEY_MAP = Object.freeze({
|
|
|
229
230
|
support_material_interface_pattern: choices("support_interface_pattern", { auto: "auto", rectilinear: "rectilinear", concentric: "concentric" }),
|
|
230
231
|
support_material_interface_spacing: rename("support_interface_spacing"),
|
|
231
232
|
support_material_xy_spacing: transform("support_object_xy_distance", "supportXySpacing"),
|
|
232
|
-
support_material_synchronize_layers:
|
|
233
|
+
support_material_synchronize_layers: transform("independent_support_layer_height", "invertBool"),
|
|
233
234
|
support_tree_angle: rename("tree_support_branch_angle"),
|
|
234
235
|
support_tree_angle_slow: rename("tree_support_angle_slow"),
|
|
235
236
|
support_tree_branch_diameter: rename("tree_support_branch_diameter"),
|
|
@@ -284,7 +285,7 @@ export const PRUSA_KEY_MAP = Object.freeze({
|
|
|
284
285
|
notes: same,
|
|
285
286
|
gcode_substitutions: drop("PrusaSlicer's G-code substitutions"),
|
|
286
287
|
arc_fitting: transform("enable_arc_fitting", "arcFitting"),
|
|
287
|
-
prefer_clockwise_movements:
|
|
288
|
+
prefer_clockwise_movements: transform("wall_direction", "wallDirection"),
|
|
288
289
|
print_settings_id: same,
|
|
289
290
|
inherits_cummulative: machine,
|
|
290
291
|
compatible_printers_condition_cummulative: machine,
|
|
@@ -326,7 +327,7 @@ export const PRUSA_KEY_MAP = Object.freeze({
|
|
|
326
327
|
chamber_minimal_temperature: drop(NO_COUNTERPART),
|
|
327
328
|
idle_temperature: same,
|
|
328
329
|
cooling: rename("slow_down_for_layer_cooling"),
|
|
329
|
-
fan_always_on:
|
|
330
|
+
fan_always_on: rename("reduce_fan_stop_start_freq"),
|
|
330
331
|
min_fan_speed: rename("fan_min_speed"),
|
|
331
332
|
max_fan_speed: rename("fan_max_speed"),
|
|
332
333
|
bridge_fan_speed: rename("overhang_fan_speed"),
|
|
@@ -356,7 +357,7 @@ export const PRUSA_KEY_MAP = Object.freeze({
|
|
|
356
357
|
filament_retract_length_toolchange: same,
|
|
357
358
|
filament_retract_restart_extra_toolchange: same,
|
|
358
359
|
filament_seam_gap_distance: drop(NO_COUNTERPART),
|
|
359
|
-
filament_travel_ramping_lift:
|
|
360
|
+
filament_travel_ramping_lift: transform("filament_z_hop_types", "filamentZHopTypes"),
|
|
360
361
|
filament_travel_slope: drop(NO_COUNTERPART),
|
|
361
362
|
filament_travel_max_lift: drop(NO_COUNTERPART),
|
|
362
363
|
filament_travel_lift_before_obstacle: drop(NO_COUNTERPART),
|
package/dist/version.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare const VERSION = "0.
|
|
1
|
+
export declare const VERSION = "0.6.0";
|
package/dist/version.js
CHANGED
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "any2orca",
|
|
3
|
-
"version": "0.
|
|
4
|
-
"outputAffecting": "
|
|
3
|
+
"version": "0.6.0",
|
|
4
|
+
"outputAffecting": "six more PrusaSlicer settings are carried; converted PrusaSlicer files change, Bambu-family files don't",
|
|
5
5
|
"description": "Convert Bambu Studio, Creality Print, Anycubic Slicer Next, ElegooSlicer and Flash Studio 3MF projects for the Snapmaker U1 (Snapmaker Orca), entirely on your own machine. Library, CLI and Web Worker in one package.",
|
|
6
6
|
"keywords": [
|
|
7
7
|
"3mf",
|