Skip to content

Commit 21add65

Browse files
stewartoallenstewartoallen
committed
Merge branch 'rel-4.5'
2 parents 5efd7f2 + a04b5c5 commit 21add65

12 files changed

Lines changed: 274 additions & 239 deletions

File tree

‎mods/bambu/init.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ module.exports = async (server) => {
150150
}
151151

152152
async function ftp_open(args = {}) {
153-
const client = new Client();
153+
const client = new Client(300000); // 5 minute timeout for large files
154154
const port = parseInt(args.port || 990);
155155
const host = args.host || "localhost";
156156
const user = args.user || "bblp";

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,14 +55,14 @@
5555
"hexer": "^1.5.0",
5656
"i": "^0.3.7",
5757
"jszip": "^3.7.1",
58-
"manifold-3d": "^3.2.1",
58+
"manifold-3d": "^3.3.2",
5959
"moment": "^2.29.4",
6060
"mqtt": "^5.10.3",
6161
"npm": "^11.4.2",
6262
"prettier": "^3.5.3",
6363
"react-responsive-carousel": "^3.2.23",
6464
"serve-static": "^2.2.0",
65-
"three": "^0.178.0",
65+
"three": "^0.182.0",
6666
"three-mesh-bvh": "^0.7.6",
6767
"uglify-js": "3.14.5",
6868
"validator": ">=13.15.23",

‎src/geo/point.js‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,18 @@ class Point {
126126
return this;
127127
}
128128

129+
/**
130+
* Swap X and Y coordinates in place
131+
* @returns {Point} This point (for chaining)
132+
*/
133+
swapXY() {
134+
let p = this,
135+
t = p.x;
136+
p.x = p.y;
137+
p.y = t;
138+
return this;
139+
}
140+
129141
/**
130142
* Swap X and Z coordinates in place
131143
* @returns {Point} This point (for chaining)

‎src/kiri/core/conf.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ function device_from_code(code,mode) {
7676
// presence of internal field indicates already converted
7777
if (code.internal >= 0) return code;
7878

79+
// presence of nested code field indicates newer encoding
80+
if (code.code) return code.code;
81+
7982
// if (self.navigator) console.log({mode, convert: code});
8083
let cmd = code.cmd || {},
8184
set = code.settings || {},

‎src/kiri/core/devices.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ function setDeviceCode(code, devicename) {
117117
api.event.emit('device.select', devicename);
118118
try {
119119
if (typeof(code) === 'string') code = js2o(code) || {};
120+
if (code.code) code = code.code;
120121

121122
let mode = api.mode.get(),
122123
lmode = mode.toLowerCase(),

‎src/kiri/core/init.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1772,6 +1772,7 @@ function init_two() {
17721772
};
17731773
$('context-contents').onclick = () => { api.SPACE.view.fit() };
17741774
$('view-fit').onclick = () => { api.SPACE.view.fit() };
1775+
$('wassup').onmouseover = () => { $('suppopp').classList.remove('hide') };
17751776

17761777
// ui.modal.onclick = api.modal.hide;
17771778
ui.modalBox.onclick = (ev) => { ev.stopPropagation() };

‎src/kiri/dev/fdm/Flashforge.Adventurer.5M.json‎

Lines changed: 186 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
1+
{
2+
"mode": "FDM",
3+
"internal": 0,
4+
"bedHeight": 2.5,
5+
"bedWidth": 220,
6+
"bedDepth": 220,
7+
"bedRound": false,
8+
"bedBelt": false,
9+
"deviceZMax": 0,
10+
"gcodeTime": 1,
11+
"maxHeight": 220,
12+
"originCenter": true,
13+
"gcodeFan": [
14+
"M106 S{fan_speed}"
15+
],
16+
"gcodeFeature": [],
17+
"gcodeTrack": [],
18+
"gcodeLayer": [
19+
";LAYER_CHANGE {layer} of {layers}",
20+
";; IF { layer === 0 }",
21+
"SET_VELOCITY_LIMIT ACCEL=500",
22+
";; ELSE",
23+
"SET_VELOCITY_LIMIT ACCEL=10000",
24+
";; END"
25+
],
26+
"gcodePre": [
27+
"; HEADER_BLOCK_START",
28+
"; total layer number: {layers}",
29+
"; max_z_height: {z_max}",
30+
"; HEADER_BLOCK_END",
31+
"; EXECUTABLE_BLOCK_START",
32+
"M73 P0 R5",
33+
"M106 S0",
34+
"M106 P2 S0",
35+
"M190 S55",
36+
"M104 S220",
37+
"G90",
38+
"M83",
39+
"G1 Z5 F6000",
40+
"G1 E-0.2 F800",
41+
"G1 X110 Y-110 F6000",
42+
"G1 E2 F800",
43+
"G1 Y-110 X55 Z0.25 F4800",
44+
"G1 X-55 E8 F2400",
45+
"M73 P1 R5",
46+
"G1 Y-109.6 F2400",
47+
"M73 P1 R5",
48+
"G1 X55 E5 F2400",
49+
"M73 P2 R5",
50+
"G1 Y-110 X55 Z0.45 F4800",
51+
"M73 P2 R5",
52+
"G1 X-55 E8 F2400",
53+
"M73 P3 R5",
54+
"G1 Y-109.6 F2400",
55+
"M73 P3 R5",
56+
"G1 X55 E5 F2400",
57+
"G92 E0",
58+
"G90",
59+
"G21",
60+
"M83 ; use relative distances for extrusion",
61+
"SET_PRESSURE_ADVANCE ADVANCE=0.025; Override pressure advance value",
62+
"M106 S0",
63+
"M106 P2 S0"
64+
],
65+
"gcodePost": [
66+
"M107",
67+
"M104 S0",
68+
"M140 S0",
69+
"M106 S0",
70+
"M106 P2 S0",
71+
"G1 E-3 F3600",
72+
"G0 X50 Y50 F30000",
73+
"; EXECUTABLE_BLOCK_END"
74+
],
75+
"gcodeProc": "",
76+
"gcodeChange": [],
77+
"gcodeFExt": "gcode",
78+
"extruders": [
79+
{
80+
"extFilament": 1.75,
81+
"extNozzle": 0.4,
82+
"extOffsetX": 0,
83+
"extOffsetY": 0
84+
}
85+
],
86+
"new": false,
87+
"deviceName": "Flashforge Adventurer 5M",
88+
"imageURL": "",
89+
"fwRetract": false,
90+
"filamentSource": "direct",
91+
"profiles": [
92+
{
93+
"processName": "Standard PLA",
94+
"sliceHeight": 0.25,
95+
"sliceShells": 3,
96+
"sliceShellOrder": "out-in",
97+
"sliceLayerStart": "last",
98+
"sliceFillAngle": 45,
99+
"sliceFillOverlap": 0.4,
100+
"sliceFillSparse": 0.1,
101+
"sliceFillType": "linear",
102+
"sliceAdaptive": false,
103+
"sliceMinHeight": 0,
104+
"sliceSupportDensity": 0.2,
105+
"sliceSupportOffset": 0.4,
106+
"sliceSupportGap": 1,
107+
"sliceSupportSize": 5,
108+
"sliceSupportArea": 0.25,
109+
"sliceSupportExtra": 0,
110+
"sliceSupportAngle": 60,
111+
"sliceSupportNozzle": 0,
112+
"sliceSolidMinArea": 0,
113+
"sliceBottomLayers": 2,
114+
"sliceTopLayers": 2,
115+
"firstLayerRate": 20,
116+
"firstLayerYOffset": 0,
117+
"firstLayerBrim": 0,
118+
"firstLayerBeltLead": 0,
119+
"firstLayerFanSpeed": 0,
120+
"outputTemp": 220,
121+
"outputBedTemp": 65,
122+
"outputFanSpeed": 255,
123+
"outputFeedrate": 120,
124+
"outputFinishrate": 70,
125+
"outputSeekrate": 200,
126+
"outputShellMult": 1.21,
127+
"outputFillMult": 1.18,
128+
"outputSparseMult": 1.25,
129+
"outputRetractDist": 1.3,
130+
"outputRetractSpeed": 30,
131+
"outputRetractWipe": 0,
132+
"outputRetractDwell": 5,
133+
"outputShortPoly": 0,
134+
"outputMinSpeed": 1,
135+
"outputCoastDist": 0,
136+
"outputLayerRetract": false,
137+
"zHopDistance": 0,
138+
"antiBacklash": 0.1,
139+
"sliceFillWidth": 1,
140+
"sliceSupportEnable": false,
141+
"firstSliceHeight": 0.3,
142+
"firstLayerFillRate": 40,
143+
"firstLayerNozzleTemp": 220,
144+
"firstLayerBedTemp": 65,
145+
"firstLayerBrimTrig": 0,
146+
"firstLayerBrimGap": 0,
147+
"outputRaft": false,
148+
"outputRaftSpacing": 0.2,
149+
"outputBrimCount": 2,
150+
"outputBrimOffset": 2,
151+
"outputPurgeTower": 0,
152+
"outputInvertX": false,
153+
"outputInvertY": false,
154+
"arcTolerance": 0.2,
155+
"ranges": [],
156+
"sliceLineWidth": 0,
157+
"sliceFillRepeat": 2,
158+
"firstLayerBrimIn": 0,
159+
"firstLayerBeltBump": 0,
160+
"outputBeltFirst": false,
161+
"outputLoops": 0,
162+
"sliceFillGrow": 0,
163+
"sliceSupportSpan": 5,
164+
"sliceSupportOutline": false,
165+
"firstLayerFlatten": 0,
166+
"outputDraftShield": false,
167+
"outputAvoidGaps": true,
168+
"sliceDetectThin": "basic",
169+
"outputAlternating": false,
170+
"sliceLayerStartX": 0,
171+
"sliceLayerStartY": 0,
172+
"sliceSupportGrow": 0,
173+
"outputFanLayer": 1,
174+
"sliceAngle": 45,
175+
"sliceZInterleave": false,
176+
"outputScarfLength": 9,
177+
"outputMinLayerTime": 9,
178+
"sliceCompInner": 0,
179+
"sliceCompOuter": 0,
180+
"outputMaxFlowrate": 15,
181+
"firstLayerBeltFact": 1,
182+
"sliceSolidify": false
183+
}
184+
],
185+
"extras": {}
186+
}

0 commit comments

Comments
 (0)