From 7caa0eb117142fa3da11a7efac63a84fc40ce2e5 Mon Sep 17 00:00:00 2001
From: Icedsoda <29167146+1cedsoda@users.noreply.github.com>
Date: Thu, 15 May 2025 20:44:15 +0200
Subject: [PATCH] Fix Spool Speed

---
 electron/src/machines/winder/Spool.tsx        | 23 ++++++++-----------
 .../winder/winder2/Winder2Settings.tsx        | 10 ++++----
 server/src/machines/winder2/new.rs            | 10 ++++----
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/electron/src/machines/winder/Spool.tsx b/electron/src/machines/winder/Spool.tsx
index a8f46c31..fc16e9da 100644
--- a/electron/src/machines/winder/Spool.tsx
+++ b/electron/src/machines/winder/Spool.tsx
@@ -6,7 +6,7 @@ type Props = {
 
 export function Spool({ rpm }: Props) {
   const [rotationState, setRotationState] = React.useState({
-    rotation: 0,
+    rotations: 0,
     lastRpm: undefined as number | undefined,
     lastRpmTime: undefined as number | undefined,
   });
@@ -14,28 +14,25 @@ export function Spool({ rpm }: Props) {
   useEffect(() => {
     if (rpm !== undefined) {
       const now = Date.now();
-      setRotationState((prev) => {
-        const newState = { ...prev, lastRpm: rpm, lastRpmTime: now };
-
-        if (prev.lastRpmTime !== undefined && prev.lastRpm !== undefined) {
-          const deltaTime = now - prev.lastRpmTime;
-          const deltaRotation = (-rpm * deltaTime) / 360;
-          newState.rotation = prev.rotation + deltaRotation;
-        }
-
-        return newState;
+      // Calculate the new rotation based on the RPM and time elapsed
+      const dt = (now - (rotationState.lastRpmTime || now)) / 1000; // Convert ms to seconds
+      const newRotations = ((rpm / 60) * dt) % 1; // Convert RPM to rotations per second
+      setRotationState({
+        rotations: (rotationState.rotations + newRotations) % 1, // Keep it within 0-1
+        lastRpm: rpm,
+        lastRpmTime: now,
       });
     }
   }, [rpm]);
 
-  const { rotation } = rotationState;
+  const { rotations } = rotationState;
 
   return (
     <div className="flex w-full justify-center">
       <div
         className="aspect-square h-32"
         style={{
-          transform: `rotate(${rotation}deg)`,
+          transform: `rotate(${rotations * 360}deg)`,
         }}
       >
         <svg
diff --git a/electron/src/machines/winder/winder2/Winder2Settings.tsx b/electron/src/machines/winder/winder2/Winder2Settings.tsx
index 3766d320..854db58b 100644
--- a/electron/src/machines/winder/winder2/Winder2Settings.tsx
+++ b/electron/src/machines/winder/winder2/Winder2Settings.tsx
@@ -20,8 +20,8 @@ export function Winder1SettingPage() {
               unit="rpm"
               step={100}
               min={10}
-              max={Math.min(spoolState?.data.speed_max || 1250, 1250)}
-              defaultValue={100}
+              max={Math.min(spoolState?.data.speed_max || 600, 600)}
+              defaultValue={10}
               renderValue={(value) => roundToDecimals(value, 0)}
               onChange={(value) => spoolSetSpeedMin(value)}
             />
@@ -31,10 +31,10 @@ export function Winder1SettingPage() {
               value={spoolState?.data.speed_max}
               title={"Max Speed"}
               unit="rpm"
-              min={Math.max(spoolState?.data.speed_min || 0, 100)}
+              min={Math.max(spoolState?.data.speed_min || 0, 10)}
               step={100}
-              max={1250}
-              defaultValue={1250}
+              max={600}
+              defaultValue={1500}
               renderValue={(value) => roundToDecimals(value, 0)}
               onChange={(value) => spoolSetSpeedMax(value)}
             />
diff --git a/server/src/machines/winder2/new.rs b/server/src/machines/winder2/new.rs
index cc803f54..5250f468 100644
--- a/server/src/machines/winder2/new.rs
+++ b/server/src/machines/winder2/new.rs
@@ -301,7 +301,7 @@ impl MachineNewTrait for Winder2 {
                 (el7031_0030, el7031_0030_config)
             };
 
-            let spool_step_converter = StepConverter::new(200);
+            let spool_step_converter = StepConverter::new(600);
 
             let mut new = Self {
                 traverse: StepperDriverEL70x1::new(
@@ -325,10 +325,10 @@ impl MachineNewTrait for Winder2 {
                 mode: Winder2Mode::Standby,
                 spool_step_converter,
                 spool_speed_controller: SpoolSpeedController::new(
-                    AngularVelocity::new::<revolution_per_minute>(50.0),
-                    AngularVelocity::new::<revolution_per_minute>(1000.0),
-                    AngularAcceleration::new::<revolutions_per_minute_per_second>(200.0),
-                    AngularAcceleration::new::<revolutions_per_minute_per_second>(-200.0),
+                    AngularVelocity::new::<revolution_per_minute>(10.0),
+                    AngularVelocity::new::<revolution_per_minute>(600.0),
+                    AngularAcceleration::new::<revolutions_per_minute_per_second>(100.0),
+                    AngularAcceleration::new::<revolutions_per_minute_per_second>(-100.0),
                 ),
                 last_measurement_emit: Instant::now(),
             };