From f632293aca9af1486ce9f2cb0a00d32b162176e2 Mon Sep 17 00:00:00 2001
From: saifullah-N <n.mmsaifi16331@gmail.com>
Date: Fri, 13 Jan 2023 22:48:37 +0530
Subject: [PATCH] EM-60 changes 2

---
 src/avr/src/vfd_spindle.c |   8 +-
 src/js/tool-view.js       | 154 +++++++++++++++++++-------------------
 2 files changed, 84 insertions(+), 78 deletions(-)

diff --git a/src/avr/src/vfd_spindle.c b/src/avr/src/vfd_spindle.c
index 2c6d310..381c604 100644
--- a/src/avr/src/vfd_spindle.c
+++ b/src/avr/src/vfd_spindle.c
@@ -227,6 +227,12 @@ static bool _next_state() {
     else vfd.state = REG_FREQ_SET;
     break;
 
+  case REG_FREQ_SCALED_SET:
+    if (vfd.power < 0) vfd.state = REG_REV_WRITE;
+    else if (0 < vfd.power) vfd.state = REG_FWD_WRITE;
+    else vfd.state = REG_STOP_WRITE;
+    break;
+
   case REG_FREQ_SIGN_SET:
     if (vfd.power < 0) vfd.state = REG_REV_WRITE;
     else if (0 < vfd.power) vfd.state = REG_FWD_WRITE;
@@ -358,7 +364,7 @@ static bool _exec_command() {
 
   case REG_FREQ_SCALED_SET:
     write = true;
-    reg.value = vfd.power * reg.value;
+    reg.value = fabs(vfd.power) * reg.value;
     break;
 
   case REG_CONNECT_WRITE:
diff --git a/src/js/tool-view.js b/src/js/tool-view.js
index e9c6255..c7d653b 100644
--- a/src/js/tool-view.js
+++ b/src/js/tool-view.js
@@ -10,83 +10,83 @@ module.exports = {
 
     data: function() {
         return {
-          address: 0,
-          value: 0,
-          toolList: [
-            {
-              id: "disabled",
-              name: "Disabled",
-            },
-            {
-              id: "router",
-              type: "PWM Spindle",
-              name: "Router (Makita, etc)",
-            },
-            {
-              id: "laser",
-              type: "PWM Spindle",
-              name: "Laser (J Tech, etc)",
-            },
-            {
-              id: "pwm",
-              name: "PWM Spindle",
-            },
-            {
-              id: "unsupported-separator",
-              name: "Unsupported Tools",
-              disabled: true,
-              unsupported: true,
-            },
-            {
-              id: "huanyang-vfd",
-              name: "Huanyang VFD",
-              unsupported: true,
-            },
-            {
-              id: "custom-modbus-vfd",
-              name: "Custom Modbus VFD",
-              unsupported: true,
-            },
-            {
-              id: "ac-tech-vfd",
-              name: "AC-Tech VFD",
-              unsupported: true,
-            },
-            {
-              id: "nowforever-vfd",
-              name: "Nowforever VFD",
-              unsupported: true,
-            },
-            {
-              id: "delta-vfd",
-              name: "Delta VFD015M21A (Beta)",
-              unsupported: true,
-            },
-            {
-              id: "yl600-vfd",
-              name: "YL600, YL620, YL620-A VFD (Beta)",
-              unsupported: true,
-            },
-            {
-              id: "fr-d700-vfd",
-              name: "FR-D700 (Beta)",
-              unsupported: true,
-            },
-            {
-              id: "sunfar-e300-vfd",
-              name: "Sunfar E300 (Beta)",
-              unsupported: true,
-            },
-            {
-              id: "omron-mx2-vfd",
-              name: "OMRON MX2",
-              unsupported: true,
-            },
-            {
-              id: "EM60",
-              name: "EM60",
-            },
-          ],
+            address: 0,
+            value: 0,
+            toolList: [
+              {
+                id: "disabled",
+                name: "Disabled",
+              },
+              {
+                id: "router",
+                type: "PWM Spindle",
+                name: "Router (Makita, etc)",
+              },
+              {
+                id: "laser",
+                type: "PWM Spindle",
+                name: "Laser (J Tech, etc)",
+              },
+              {
+                id: "pwm",
+                name: "PWM Spindle",
+              },
+              {
+                id: "unsupported-separator",
+                name: "Unsupported Tools",
+                disabled: true,
+                unsupported: true,
+              },
+              {
+                id: "huanyang-vfd",
+                name: "Huanyang VFD",
+                unsupported: true,
+              },
+              {
+                id: "custom-modbus-vfd",
+                name: "Custom Modbus VFD",
+                unsupported: true,
+              },
+              {
+                id: "ac-tech-vfd",
+                name: "AC-Tech VFD",
+                unsupported: true,
+              },
+              {
+                id: "nowforever-vfd",
+                name: "Nowforever VFD",
+                unsupported: true,
+              },
+              {
+                id: "delta-vfd",
+                name: "Delta VFD015M21A (Beta)",
+                unsupported: true,
+              },
+              {
+                id: "yl600-vfd",
+                name: "YL600, YL620, YL620-A VFD (Beta)",
+                unsupported: true,
+              },
+              {
+                id: "fr-d700-vfd",
+                name: "FR-D700 (Beta)",
+                unsupported: true,
+              },
+              {
+                id: "sunfar-e300-vfd",
+                name: "Sunfar E300 (Beta)",
+                unsupported: true,
+              },
+              {
+                id: "omron-mx2-vfd",
+                name: "OMRON MX2",
+                unsupported: true,
+              },
+              {
+                id: "EM60",
+                name: "EM60",
+              },
+            ],
         };
     },