Skip to content

Commit 9cb9da4

Browse files
authored
feat: adds basic support for smart_effector and probe_eddy_current (#1605)
Signed-off-by: Pedro Lamas <[email protected]>
1 parent 804995e commit 9cb9da4

File tree

2 files changed

+70
-2
lines changed

2 files changed

+70
-2
lines changed

src/components/widgets/toolhead/ToolheadCard.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,10 @@ export default class ToolheadCard extends Mixins(StateMixin, ToolheadMixin) {
200200
get printerSupportsProbeCalibrate (): boolean {
201201
return (
202202
'probe' in this.printerSettings ||
203-
'bltouch' in this.printerSettings
203+
'bltouch' in this.printerSettings ||
204+
'smart_effector' in this.printerSettings ||
205+
Object.keys(this.printerSettings)
206+
.some(x => x.startsWith('probe_eddy_current '))
204207
)
205208
}
206209

src/store/printer/types.ts

Lines changed: 66 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,10 @@ export interface KlipperPrinterState extends KlipperPrinterStateBaseType {
119119

120120
bltouch?: KlipperPrinterProbeState;
121121

122+
smart_effector?: KlipperPrinterProbeState;
123+
124+
[key: `probe_eddy_current ${string}`]: KlipperPrinterProbeState;
125+
122126
[key: `pwm_cycle_time ${string}`]: KlipperPrinterPwmCycleTimeState;
123127

124128
quad_gantry_level?: KlipperPrinterQuadGantryLevelState;
@@ -631,7 +635,11 @@ export interface KlipperPrinterSettings extends KlipperPrinterSettingsBaseType {
631635

632636
probe?: KlipperPrinterProbeSettings;
633637

634-
bltouch?: KlipperPrinterProbeSettings;
638+
bltouch?: KlipperPrinterBltouchSettings;
639+
640+
smart_effector?: KlipperPrinterSmartEffectorSettings;
641+
642+
[key: `probe_eddy_current ${Lowercase<string>}`]: KlipperPrinterProbeEddyCurrentSettings;
635643

636644
input_shaper?: KlipperPrinterInputShaperSettings;
637645

@@ -900,13 +908,70 @@ export interface KlipperPrinterVerifyHeaterSettings {
900908
}
901909

902910
export interface KlipperPrinterProbeSettings {
911+
deactivate_on_each_sample: boolean;
912+
activate_gcode: string;
913+
deactivate_gcode: string;
914+
pin: string;
915+
x_offset: number;
916+
y_offset: number;
917+
z_offset: number;
918+
speed: number;
919+
lift_speed: number;
920+
samples: number;
921+
sample_retract_dist: number;
922+
samples_result: string;
923+
samples_tolerance: number;
924+
samples_tolerance_retries: number;
925+
}
926+
927+
export interface KlipperPrinterBltouchSettings {
928+
stow_on_each_sample: boolean;
929+
probe_with_touch_mode: boolean;
930+
control_pin: string;
931+
sensor_pin: string;
932+
pin_up_reports_not_triggered: boolean;
933+
pin_up_touch_mode_reports_triggered: boolean;
934+
pin_move_time: number;
935+
x_offset: number;
936+
y_offset: number;
903937
z_offset: number;
938+
speed: number;
939+
lift_speed: number;
940+
samples: number;
941+
sample_retract_dist: number;
942+
samples_result: string;
943+
samples_tolerance: number;
944+
samples_tolerance_retries: number;
945+
}
946+
947+
export interface KlipperPrinterSmartEffectorSettings {
948+
probe_accel: number;
949+
recovery_time: number;
904950
deactivate_on_each_sample: boolean;
905951
activate_gcode: string;
906952
deactivate_gcode: string;
907953
pin: string;
908954
x_offset: number;
909955
y_offset: number;
956+
z_offset: number;
957+
speed: number;
958+
lift_speed: number;
959+
samples: number;
960+
sample_retract_dist: number;
961+
samples_result: string;
962+
samples_tolerance: number;
963+
samples_tolerance_retries: number;
964+
}
965+
966+
export interface KlipperPrinterProbeEddyCurrentSettings {
967+
sensor_type: string;
968+
reg_drive_current: number;
969+
i2c_mcu: string;
970+
i2c_speed: number;
971+
i2c_address: number;
972+
x_offset: number;
973+
y_offset: number;
974+
z_offset: number;
910975
speed: number;
911976
lift_speed: number;
912977
samples: number;

0 commit comments

Comments
 (0)