From: Joseph Coffland <joseph@cauldrondevelopment.com>
Date: Tue, 7 Jun 2016 15:39:53 +0000 (-0700)
Subject: Huanyang reports
X-Git-Url: https://git.buildbotics.com/?a=commitdiff_plain;h=6bb2042bf4d934a85834cc94cf8f4243149dc038;p=bbctrl-firmware

Huanyang reports
---

diff --git a/src/config.h b/src/config.h
index 70dc03b..2d5c3b1 100644
--- a/src/config.h
+++ b/src/config.h
@@ -191,7 +191,7 @@ typedef enum {
 
 
 // Spindle settings
-#define SPINDLE_TYPE             SPINDLE_TYPE_PWM
+#define SPINDLE_TYPE             SPINDLE_TYPE_HUANYANG
 #define SPINDLE_PWM_FREQUENCY    100    // in Hz
 #define SPINDLE_MIN_RPM          1000
 #define SPINDLE_MAX_RPM          24000
diff --git a/src/huanyang.c b/src/huanyang.c
index 0523185..50ef3fa 100644
--- a/src/huanyang.c
+++ b/src/huanyang.c
@@ -28,6 +28,7 @@
 #include "huanyang.h"
 #include "config.h"
 #include "rtc.h"
+#include "report.h"
 
 #include <avr/io.h>
 #include <avr/interrupt.h>
@@ -267,7 +268,9 @@ static bool _update(int index) {
     return true;
   }
 
-  default: return false;
+  default:
+    report_request();
+    return false;
   }
 
   _set_command3(HUANYANG_FUNC_READ, var, 0, 0);
@@ -297,7 +300,9 @@ static bool _query_status(int index) {
   case 3: var = HUANYANG_DC_VOLTAGE; break;
   case 4: var = HUANYANG_AC_VOLTAGE; break;
   case 5: var = HUANYANG_TEMPERATURE; break;
-  default: return false;
+  default:
+    report_request();
+    return false;
   }
 
   _set_command1(HUANYANG_CTRL_READ, var);
@@ -555,22 +560,22 @@ float get_huanyang_current(int index) {
 }
 
 
-float get_huanyang_rpm(int index) {
+uint16_t get_huanyang_rpm(int index) {
   return ha.actual_rpm;
 }
 
 
-float get_huanyang_dcv(int index) {
+uint16_t get_huanyang_dcv(int index) {
   return ha.dc_voltage;
 }
 
 
-float get_huanyang_acv(int index) {
+uint16_t get_huanyang_acv(int index) {
   return ha.ac_voltage;
 }
 
 
-float get_huanyang_temp(int index) {
+uint16_t get_huanyang_temp(int index) {
   return ha.temperature;
 }
 
diff --git a/src/vars.def b/src/vars.def
index 70f10d8..4207380 100644
--- a/src/vars.def
+++ b/src/vars.def
@@ -80,8 +80,8 @@ VAR(huanyang_id,        "hi", uint8_t,  0,  1, 0, "Huanyang ID")
 VAR(huanyang_freq,      "hz", float,    0,  0, 0, "Huanyang actual freq")
 VAR(huanyang_current,   "hc", float,    0,  0, 0, "Huanyang actual current")
 VAR(huanyang_rpm,       "hr", uint16_t, 0,  0, 0, "Huanyang actual RPM")
-VAR(huanyang_dcv,       "hd", uint16_t, 0,  0, 0, "Huanyang DC voltage")
-VAR(huanyang_acv,       "ha", uint16_t, 0,  0, 0, "Huanyang AC voltage")
+//VAR(huanyang_dcv,       "hd", uint16_t, 0,  0, 0, "Huanyang DC voltage")
+//VAR(huanyang_acv,       "ha", uint16_t, 0,  0, 0, "Huanyang AC voltage")
 VAR(huanyang_temp,      "ht", uint16_t, 0,  0, 0, "Huanyang temperature")
 VAR(huanyang_max_freq,  "hx", float,    0,  0, 0, "Huanyang max freq")
 VAR(huanyang_min_freq,  "hm", float,    0,  0, 0, "Huanyang min freq")