Fix (#20)

Author: J040M

package.json

@@ -1,7 +1,7 @@
 {
   "name": "xcontroller-app",
   "private": true,
-  "version": "0.2.0",
+  "version": "0.2.1",
   "type": "module",
   "scripts": {
     "dev": "vite",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "xcontroller-app"
-version = "0.2.0"
+version = "0.2.1"
 description = "3D printer controller program written in Rust and Typescript."
 authors = ["J040M"]
 edition = "2021"

src-tauri/tauri.conf.json

@@ -18,7 +18,7 @@
   },
   "productName": "xcontroller-app",
   "mainBinaryName": "xcontroller-app",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "identifier": "io.j040m.xcontrollerapp",
   "plugins": {},
   "app": {

src/components/main/control.vue

@@ -95,10 +95,10 @@ export default defineComponent({
         sendMovementCommand(command: Axis | string): void {
             switch (command) {
                 case 'extrude':
-                    printer.moveAxis('e', '+', this.extruderValue);
+                    printer.moveAxis('e0', '+', this.extruderValue);
                     break;
                 case 'retract':
-                    printer.moveAxis('e', '-', this.extruderValue);
+                    printer.moveAxis('e0', '-', this.extruderValue);
                     break;
                 case 'x+':
                 case 'y+':

src/init/client.ts

@@ -19,6 +19,7 @@ export const wsClient = new WebSocketConnector()
  * @TODO Not the way I like to have this, but it's a start
  */
 const newPrinter = new Printer({
+    uuid: '',
     status: false,
     name: '',
     url: '',
@@ -27,7 +28,8 @@ const newPrinter = new Printer({
         x: 0,
         y: 0,
         z: 0,
-        e: 0
+        e0: 0,
+        e1: 0
     },
     //Default dimensions
     dimensions: {

src/init/test/storage.test.ts

@@ -15,7 +15,7 @@ interface PrinterCommands {
     setFanSpeed(speed: number): void
 }
 
-type Axis = 'x' | 'y' | 'z' | 'e'
+type Axis = 'x' | 'y' | 'z' | 'e0' | 'e1'
 type State = 'idle' | 'printing' | 'paused' | 'stopped' | 'error'
 
 interface PrintStatus {
@@ -35,7 +35,8 @@ interface AxisPositions {
     x: number
     y: number
     z: number
-    e: number
+    e0: number
+    e1: number
 }
 
 interface PrinterProfile {

src/types/printer.ts

@@ -1,12 +1,14 @@
-import { wsClient } from "../init/client";
-import { Axis, AxisPositions, PrinterProfile, PrinterCommands } from "../types/printer";
-import { eventBus } from "./eventbus";
-
 /**
+ * @file Printer.ts
  * Class representing a 3D printer instance
  * Handles printer control commands and state management
  * Using the verifyConnection() decorator to verify the connection
  */
+
+import { wsClient } from "../init/client";
+import { Axis, AxisPositions, PrinterProfile, PrinterCommands } from "../types/printer";
+import { eventBus } from "./eventbus";
+
 export default class Printer implements PrinterCommands {
     /** Stores current printer configuration and state */
     printerInfo: PrinterProfile
@@ -87,9 +89,6 @@ export default class Printer implements PrinterCommands {
             message_type: 'GCommand',
             message: 'G29'
         })
-
-        // TODO: This is not really necessary, is it!?
-        this.autoHome()
     }
 
     /**
@@ -112,19 +111,27 @@ export default class Printer implements PrinterCommands {
         const current_position = this.axisPositions[axis]
         let new_position = direction === '+' ? current_position + distance : current_position - distance
 
-        // Check for printer limits to avoid crusing things
-        if (new_position < 0) new_position = 0
-        else if (axis !== 'e' && new_position > this.printerInfo.dimensions[axis]) {
-            new_position = this.printerInfo.dimensions[axis]
+        // Check for printer limits to avoid crusing things (only for X, Y, Z)
+        if (axis !== 'e0' && axis !== 'e1') {
+            if (new_position < 0) new_position = 0
+            else if (new_position > this.printerInfo.dimensions[axis]) {
+                new_position = this.printerInfo.dimensions[axis]
+            }
         }
 
         // Check for hotend temperature before moving
-        if (axis === 'e' && (Math.abs(this.printerInfo.temperatures.e0 - this.printerInfo.temperatures.e0_set) > 3
+        if (axis === 'e0' && (Math.abs(this.printerInfo.temperatures.e0 - this.printerInfo.temperatures.e0_set) > 3
             || this.printerInfo.temperatures.e0 < this.hotendMinTemp)) {
             console.error('Extruder temp very different from target temp')
             return
         }
 
+        if (axis === 'e1' && (Math.abs(this.printerInfo.temperatures.e1 - this.printerInfo.temperatures.e1_set) > 3
+            || this.printerInfo.temperatures.e1 < this.hotendMinTemp)) {
+            console.error('Extruder temp very different from target temp')
+            return
+        }
+
         wsClient.sendCommand({
             message_type: 'GCommand',
             message: `G1 ${axis}${new_position}`.toUpperCase()

src/utils/printer.ts

@@ -6,7 +6,7 @@ import type { StorageTypes } from '../types/storage'
  */
 export default class PrinterStorage {
 
-    private storageItemsList: StorageTypes[] = ['PrinterProfiles', 'HeatingProfiles', 'Locale', 'Theme']
+    public storageItemsList: StorageTypes[] = ['PrinterProfiles', 'HeatingProfiles', 'Locale', 'Theme']
 
     constructor() {
         this.initStorage()

src/utils/storage.ts

@@ -0,0 +1,30 @@
+import { describe, it, expect, beforeEach } from 'vitest';
+import PrinterStorage from '../storage';
+
+describe('initStorage', () => {
+    beforeEach(() => {
+        localStorage.clear();
+    });
+
+    it('should create default storage items if they do not exist', () => {
+        const storage = new PrinterStorage();
+
+        storage.storageItemsList.forEach((item: string) => {
+            expect(localStorage.getItem(item)).toBe('[]');
+        });
+    });
+
+    it('should not overwrite existing storage items', () => {
+        const storage = new PrinterStorage();
+        
+        localStorage.setItem('PrinterProfiles', '[{"name":"Profile1"}]');
+        
+        storage.storageItemsList.forEach((item: string) => {
+            if (item !== 'PrinterProfiles') {
+                expect(localStorage.getItem(item)).toBe('[]');
+            } else {
+                expect(localStorage.getItem(item)).toBe('[{"name":"Profile1"}]');
+            }
+        });
+    });
+});