Diff: DeviceISACS.h

Revision:

173:7f938afb0447

Parent:

167:bedc0a9d559a

Child:

177:672ef279c8e0

diff -r ef7bf1663645 -r 7f938afb0447 DeviceISACS.h
--- a/DeviceISACS.h	Fri Jun 17 13:54:50 2016 +0000
+++ b/DeviceISACS.h	Sun Jun 19 03:54:35 2016 +0000
@@ -16,9 +16,6 @@
 } DeviceISACSInputTransferFunction;
 
 typedef struct _DeviceISACSInputSettings {
-  int32_t voltage;
-  int32_t sum;
-  int32_t average;
   DeviceISACSInputTransferFunction transfer;
 } DeviceISACSInputSettings;
 
@@ -35,17 +32,17 @@
 
 //Information signal amplitude control system output ( = DAC + amplifier + control unit + hfo) typedefs
 typedef struct _DeviceISACSOutputTransferFunction {
-  uint32_t points;      //Number of actual control points (up to 16)
+  uint32_t points;     //Number of actual control points (up to 16)
   int32_t voltage[16]; //Output voltage control points in signed 16.16 fixed point format
   int32_t code[16];    //DAC code control points
 } DeviceISACSOutputTransferFunction;
 
 typedef struct _DeviceISACSOutputStart {
-  uint32_t voltage;     //Output voltage
+  uint32_t voltage;    //Output voltage
 } DeviceISACSOutputStart;
 
 typedef struct _DeviceISACSOutputReset {
-  uint32_t voltage;     //Output voltage
+  uint32_t voltage;    //Output voltage
 } DeviceISACSOutputReset;
 
 typedef struct _DeviceISACSOutputSettings {
@@ -55,7 +52,7 @@
 } DeviceISACSOutputSettings;
 
 typedef struct _DeviceISACSOutputState {
-  int32_t voltage;  //Output value - constant for measurement cycle
+  int32_t voltage;     //Output value - constant for measurement cycle
 } DeviceISACSOutputState;
 
 typedef struct _DeviceISACSOutput {
@@ -66,8 +63,8 @@
 //Information signal amplitude control system regulator typedefs
 typedef struct _DeviceISACSRegulatorConditionSettings {
   uint8_t enabled;
-  uint32_t reference; //signed 16.16 format reference voltage
-  uint32_t scale;     //signed 16.16 format regulator scale factor
+  uint32_t reference;  //signed 16.16 format reference voltage
+  uint32_t scale;      //signed 16.16 format regulator scale factor
 } DeviceISACSRegulatorConditionSettings;
 
 typedef struct _DeviceISACSRegulatorSettings {