Skip to content

Commit 84bbfe1

Browse files
kglovernkglovern
authored
Merge pull request #944 from coolboysalam/voron-cascade-defaults
Add Voron Cascade grblHAL default settings
2 parents 6bb4467 + 7acedd4 commit 84bbfe1

4 files changed

Lines changed: 224 additions & 16 deletions

File tree

‎src/app/src/features/Config/assets/MachineDefaults/defaultMachineProfiles.ts‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import * as longMillGrblEEPROM from './grbl/longmill';
2525
import * as longMillGrblHALEEPROM from './grblHAL/longmill';
2626
import * as millOneGrblEEPROM from './grbl/millone';
2727
import * as altmillSettings from './grblHAL/Altmill';
28-
28+
import * as voronCascadeSettings from './grblHAL/voronCascade';
2929
export default [
3030
{
3131
id: 0,
@@ -407,16 +407,18 @@ export default [
407407
height: 465,
408408
},
409409
},
410-
{
411-
id: 60,
412-
company: '',
413-
name: 'Voron Cascade',
414-
type: '',
415-
version: '',
416-
mm: {
417-
width: 260,
418-
depth: 220,
419-
height: 100,
420-
},
410+
{
411+
id: 60,
412+
company: '',
413+
name: 'Voron Cascade',
414+
type: 'BTT Scylla',
415+
version: 'V1.0',
416+
mm: {
417+
width: 260,
418+
depth: 220,
419+
height: 100,
421420
},
421+
grblHALeepromSettings: voronCascadeSettings.DEFAULT,
422+
orderedSettings: voronCascadeSettings.ORDERED,
423+
},
422424
];

‎src/app/src/features/Config/assets/MachineDefaults/grblHAL/voronCascade.js‎

Lines changed: 203 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,203 @@
1+
export const DEFAULT = {
2+
// Core
3+
$0: '5.0',
4+
$1: '255',
5+
$2: '0',
6+
$3: '3',
7+
$4: '7',
8+
$5: '7',
9+
$6: '1',
10+
$10: '511',
11+
$11: '0.010',
12+
$12: '0.002',
13+
$13: '0',
14+
$14: '0',
15+
$15: '0',
16+
$17: '0',
17+
$18: '0',
18+
$19: '0',
19+
20+
// Limits / Homing
21+
$20: '0',
22+
$21: '1',
23+
$22: '1029',
24+
$23: '2',
25+
$24: '100',
26+
$25: '1000',
27+
$26: '250',
28+
$27: '5',
29+
$28: '0.100',
30+
$29: '0',
31+
32+
// Spindle
33+
$30: '24000',
34+
$31: '600',
35+
$32: '0',
36+
37+
// General machine behaviour
38+
$37: '7',
39+
$39: '1',
40+
$40: '1',
41+
$41: '1',
42+
$42: '2',
43+
44+
// Homing cycles
45+
$43: '2',
46+
$44: '4',
47+
$45: '3',
48+
$46: '0',
49+
50+
// Parking
51+
$56: '5',
52+
$57: '100',
53+
$58: '-5',
54+
$59: '250',
55+
56+
$60: '1',
57+
$62: '0',
58+
$63: '2',
59+
$64: '1',
60+
$65: '0',
61+
62+
// Axis calibration
63+
$100: '853.33294',
64+
$101: '853.33294',
65+
$102: '853.33294',
66+
67+
// Maximum rates
68+
$110: '6000',
69+
$111: '6000',
70+
$112: '3000',
71+
72+
// Acceleration
73+
$120: '500',
74+
$121: '400',
75+
$122: '250',
76+
77+
// Machine travel
78+
$130: '260',
79+
$131: '220',
80+
$132: '100',
81+
82+
// TMC currents
83+
$140: '3500',
84+
$141: '3500',
85+
$142: '3500',
86+
87+
// Microsteps
88+
$150: '16',
89+
$151: '16',
90+
$152: '16',
91+
92+
// Driver settings
93+
$200: '22',
94+
$201: '22',
95+
$202: '22',
96+
97+
$210: '50',
98+
$211: '50',
99+
$212: '60',
100+
101+
$220: '22',
102+
$221: '22',
103+
$222: '22',
104+
105+
// Individual homing pull-off
106+
$290: '5',
107+
$291: '5',
108+
$292: '5',
109+
110+
// Trinamic / machine settings
111+
$338: '7',
112+
$339: '0',
113+
$340: '0',
114+
$341: '0',
115+
$342: '30',
116+
$343: '25',
117+
$344: '200',
118+
$345: '200',
119+
$346: '1',
120+
121+
// Modbus
122+
$370: '0',
123+
$372: '1024',
124+
$374: '3',
125+
$375: '50',
126+
127+
$384: '0',
128+
$386: '5',
129+
130+
$392: '3',
131+
$393: '1',
132+
$394: '11',
133+
$398: '100',
134+
135+
// MODVFD - INVT
136+
$460: '1',
137+
$462: '8192',
138+
$463: '8193',
139+
$464: '12288',
140+
$465: '1',
141+
$466: '2',
142+
$467: '5',
143+
$468: '100',
144+
$469: '60',
145+
$470: '60',
146+
$471: '100',
147+
148+
$480: '1',
149+
$481: '0',
150+
$483: '0',
151+
$484: '1',
152+
$485: '1',
153+
$486: '0',
154+
155+
// Misc / plugins
156+
$539: '0',
157+
158+
$650: '5',
159+
$651: '5',
160+
$652: '1',
161+
$654: '3',
162+
$655: '5',
163+
$657: '0',
164+
$659: '5',
165+
$660: '0',
166+
$661: '2',
167+
$662: '1',
168+
$663: '0',
169+
170+
$673: '0',
171+
$676: '15',
172+
173+
// Modbus serial
174+
$680: '0',
175+
$681: '1',
176+
177+
$700: '0',
178+
179+
// Event outputs
180+
$750: '1',
181+
$751: '8',
182+
$760: '0',
183+
$761: '0',
184+
};
185+
186+
export const ORDERED = new Map();
187+
188+
// VFD register configuration first
189+
ORDERED.set('$462', '8192');
190+
ORDERED.set('$463', '8193');
191+
ORDERED.set('$464', '12288');
192+
ORDERED.set('$465', '1');
193+
ORDERED.set('$466', '2');
194+
ORDERED.set('$467', '5');
195+
ORDERED.set('$468', '100');
196+
ORDERED.set('$469', '60');
197+
ORDERED.set('$470', '60');
198+
ORDERED.set('$471', '100');
199+
200+
// Enable limits / homing only after the machine parameters are loaded
201+
ORDERED.set('$23', '2');
202+
ORDERED.set('$21', '1');
203+
ORDERED.set('$22', '1029');

‎src/app/src/features/Config/components/ProfileBar.tsx‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,10 @@ export function ProfileBar() {
3737
(state: RootState) => state.connection.isConnected,
3838
);
3939

40-
const isSienciMachine = machineProfile.company === 'Sienci Labs';
40+
const canRestoreDefaults =
41+
machineProfile.company === 'Sienci Labs' ||
42+
!!machineProfile.grblHALeepromSettings ||
43+
!!machineProfile.eepromSettings;
4144

4245
function updateSettingsHandler() {
4346
updateAllSettings(settingsValues, EEPROM);
@@ -128,7 +131,7 @@ export function ProfileBar() {
128131
</div>
129132

130133
<div className="grid grid-cols-4 h-full max-w-lg font-medium divide-x max-sm:divide-x-0 max-sm:hidden">
131-
<RestoreDefaultDialog isSienciMachine={isSienciMachine} />
134+
<RestoreDefaultDialog canRestoreDefaults={canRestoreDefaults} />
132135
<ActionButton
133136
icon={<PiLightning />}
134137
label="Flash"

‎src/app/src/features/Config/components/RestoreDefaultDialog.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ function restoreEEPROMDefaults(
8686
});
8787
}
8888

89-
export function RestoreDefaultDialog({ isSienciMachine = false }: { isSienciMachine?: boolean }) {
89+
export function RestoreDefaultDialog({ canRestoreDefaults = false }: { canRestoreDefaults?: boolean }) {
9090
const isConnected = useSelector(
9191
(state: RootState) => state.connection.isConnected,
9292
);
@@ -120,7 +120,7 @@ export function RestoreDefaultDialog({ isSienciMachine = false }: { isSienciMach
120120
<ActionButton
121121
icon={<GrRevert />}
122122
label="Defaults"
123-
disabled={!isConnected || !isSienciMachine}
123+
disabled={!isConnected || !canRestoreDefaults}
124124
/>
125125
</AlertDialogTrigger>
126126
<AlertDialogContent className="bg-white">

0 commit comments

Comments
 (0)