refactor: Klipper typings for extra axes

Signed-off-by: Pedro Lamas <pedrolamas@gmail.com>

Author: pedrolamas

src/components/widgets/toolhead/ToolheadPosition.vue

@@ -136,16 +136,16 @@ const axisIndexMap: Record<Axis, number> = {
 
 @Component({})
 export default class ToolheadPosition extends Mixins(StateMixin, ToolheadMixin) {
-  get gcodePosition (): [number, number, number, number] {
+  get gcodePosition (): [number, number, number, ...number[]] {
     return this.$typedState.printer.printer.gcode_move.gcode_position
   }
 
-  get toolheadPosition (): [number, number, number, number] {
+  get toolheadPosition (): [number, number, number, ...number[]] {
     return this.$typedState.printer.printer.toolhead.position
   }
 
-  get livePosition (): [number, number, number, number] {
-    return this.$typedState.printer.printer.motion_report?.live_position ?? [0, 0, 0, 0]
+  get livePosition (): [number, number, number, ...number[]] {
+    return this.$typedState.printer.printer.motion_report?.live_position ?? [0, 0, 0]
   }
 
   get useGcodeCoords (): boolean {

src/store/printer/state.ts

@@ -31,22 +31,22 @@ export const defaultState = (): PrinterState => {
         max_accel_to_decel: null,
         minimum_cruise_ratio: null,
         max_velocity: 0,
-        position: [0, 0, 0, 0],
-        axis_minimum: [0, 0, 0, 0],
-        axis_maximum: [0, 0, 0, 0],
+        position: [0, 0, 0],
+        axis_minimum: [0, 0, 0],
+        axis_maximum: [0, 0, 0],
         print_time: 0,
         square_corner_velocity: 0,
         extruder: '',
         stalls: 0
       },
       gcode_move: {
-        gcode_position: [0, 0, 0, 0],
-        homing_origin: [0, 0, 0, 0],
+        gcode_position: [0, 0, 0],
+        homing_origin: [0, 0, 0],
         speed: 0,
         absolute_coordinates: false,
         absolute_extrude: false,
         extrude_factor: 1,
-        position: [0, 0, 0, 0],
+        position: [0, 0, 0],
         speed_factor: 1
       },
       webhooks: {

src/typings/klipper.d.ts

@@ -197,9 +197,10 @@ declare namespace Klipper {
     extrude_factor: number;
     absolute_coordinates: boolean;
     absolute_extrude: boolean;
-    homing_origin: [number, number, number, number];
-    position: [number, number, number, number];
-    gcode_position: [number, number, number, number];
+    homing_origin: [number, number, number];
+    position: [number, number, number, ...number[]];
+    gcode_position: [number, number, number, ...number[]];
+    axis_map?: Record<string, number>;
   }
 
   export interface IdleTimeoutState {
@@ -215,19 +216,20 @@ declare namespace Klipper {
 
   export interface ToolheadState {
     homed_axes: string;
-    axis_minimum: [number, number, number, number];
-    axis_maximum: [number, number, number, number];
+    axis_minimum: [number, number, number];
+    axis_maximum: [number, number, number];
     print_time: number;
     stalls: number;
     estimated_print_time: number;
     extruder: '' | ExtruderKey;
-    position: [number, number, number, number];
+    position: [number, number, number, ...number[]];
     max_velocity: number;
     max_accel: number;
     max_accel_to_decel?: number | null;
     minimum_cruise_ratio?: number | null;
     square_corner_velocity: number;
     cone_start_z?: number;
+    extra_axes?: Record<string, number>;
   }
 
   export interface WebhookState {
@@ -405,7 +407,7 @@ declare namespace Klipper {
   }
 
   export interface MotionReportState {
-    live_position: [number, number, number, number];
+    live_position: [number, number, number, ...number[]];
     live_velocity: number;
     live_extruder_velocity: number;
     steppers?: (`extruder_stepper ${string}` | `stepper_${string}` | ExtruderKey)[];