From d5d94f3f12f6634909669ce712aadca605addab3 Mon Sep 17 00:00:00 2001
From: Joseph Coffland <joseph@cauldrondevelopment.com>
Date: Sun, 26 Jan 2020 20:19:27 -0800
Subject: [PATCH] Confirmed OMRON MX2 VFD settings

---
 CHANGELOG.md                       |  2 +-
 src/avr/src/vfd_spindle.c          | 18 +++++++++---------
 src/pug/templates/tool-view.pug    |  2 +-
 src/resources/config-template.json |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b18574..ac9005d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,7 @@ Buildbotics CNC Controller Firmware Changelog
 =============================================
 
 ## v0.4.13
- - Beta support for OMRON MX2 VFD.
+ - Support for OMRON MX2 VFD.
 
 ## v0.4.12
  - Segments straddle arc in linearization.
diff --git a/src/avr/src/vfd_spindle.c b/src/avr/src/vfd_spindle.c
index d7234bb..21d46f6 100644
--- a/src/avr/src/vfd_spindle.c
+++ b/src/avr/src/vfd_spindle.c
@@ -155,15 +155,15 @@ const vfd_reg_t sunfar_e300_regs[] PROGMEM = {
 
 
 const vfd_reg_t omron_mx2_regs[] PROGMEM = {
-  {REG_CONNECT_WRITE, 0x1201,   3}, // A001 Frequency reference modbus
-  {REG_CONNECT_WRITE, 0x1202,   3}, // A002 Run command modbus
-  {REG_MAX_FREQ_READ, 0x1204,   0}, // A004 Max frequency
-  {REG_FREQ_SET,      0x0001,   0}, // F001 Frequency
-  {REG_STOP_WRITE,    0x1e01,   0}, // Stop drive
-  {REG_FWD_WRITE,     0x1e01,   2}, // Forward
-  {REG_REV_WRITE,     0x1e01,   6}, // Reverse
-  {REG_FREQ_READ,     0x1001,   0}, // D001 Output freq
-  {REG_STATUS_READ,   0x0005,   0}, // Status A
+  {REG_CONNECT_WRITE,  0x1200,     3}, // A001 Frequency reference modbus
+  {REG_CONNECT_WRITE,  0x1201,     3}, // A002 Run command modbus
+  {REG_MAX_FREQ_FIXED,      0, 40000}, // TODO Want to use A004 max frequency
+  {REG_FREQ_SET,       0x0001,     0}, // F001 Frequency
+  {REG_STOP_WRITE,     0x1f00,     0}, // Stop drive
+  {REG_FWD_WRITE,      0x1f00,     2}, // Forward
+  {REG_REV_WRITE,      0x1f00,     6}, // Reverse
+  {REG_FREQ_READ,      0x1001,     0}, // D001 Output freq
+  {REG_STATUS_READ,    0x0004,     0}, // Status A
   {REG_DISABLED},
 };
 
diff --git a/src/pug/templates/tool-view.pug b/src/pug/templates/tool-view.pug
index a3ef3a1..4f331a4 100644
--- a/src/pug/templates/tool-view.pug
+++ b/src/pug/templates/tool-view.pug
@@ -374,7 +374,7 @@ script#tool-view-template(type="text/x-template")
             td 0.5 seconds
             td Communication error timeout
           tr
-            td.reg-addr C077
+            td.reg-addr C078
             td.reg-value 1
             td 1 milisecond
             td Communication wait time
diff --git a/src/resources/config-template.json b/src/resources/config-template.json
index 9e4d808..bc2ea45 100644
--- a/src/resources/config-template.json
+++ b/src/resources/config-template.json
@@ -205,7 +205,7 @@
       "values": ["Disabled", "PWM Spindle", "Huanyang VFD", "Custom Modbus VFD",
                  "AC-Tech VFD", "Nowforever VFD", "Delta VFD015M21A (Beta)",
                  "YL600, YL620, YL620-A VFD (Beta)", "FR-D700 (Beta)",
-                 "Sunfar E300 (Beta)", "OMRON MX2 (Beta)"],
+                 "Sunfar E300 (Beta)", "OMRON MX2"],
       "default": "Disabled",
       "code": "st"
     },
-- 
2.27.0