Index: firmware/App/Services/FpgaDD.c
===================================================================
diff -u -rfdd5d0dadcc46352e41a899bf2eb133f3d4c321b -r62b2fbf5fe54af2e7d62fb6d51c6f18818260ab1
--- firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision fdd5d0dadcc46352e41a899bf2eb133f3d4c321b)
+++ firmware/App/Services/FpgaDD.c	(.../FpgaDD.c)	(revision 62b2fbf5fe54af2e7d62fb6d51c6f18818260ab1)
@@ -41,9 +41,12 @@
 /// Macro to retrieve the FPGA sensor field based on HW type
 #define GET_FPGA_SENSOR_FIELD(field) (getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ? fpgaBeta2SensorReadings.field : fpgaSensorReadings.field)
 
-/// Macro to retrieve the FPGA actuator field based on HW type
+/// Macro to retrieve the FPGA sensor field based on HW type
 #define GET_FPGA_ACTUATOR_FIELD(field) (getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ? fpgaBeta2ActuatorSetPoints.field : fpgaActuatorSetPoints.field)
 
+/// Macro to set the FPGA actuator field value based on HW type
+#define SET_FPGA_ACTUATOR_FIELD(field, value) (getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ? fpgaBeta2ActuatorSetPoints.field = value: fpgaActuatorSetPoints.field = value)
+
 #define FPGA_EXPECTED_ID                0x04                    ///< FPGA expected ID.
 
 #define MAX_COMM_ERROR_RETRIES          5                       ///< Maximum number of communication error retries
@@ -772,13 +775,13 @@
  *      13 - M4Valve.\n
  *      14..15 - reserved or unused.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaValveControl
+ * @details \b Outputs: fpgaValveControl
  * @param valveStates bit mask for the various valve states
  * @return none
  *************************************************************************/
 void setFPGADDValveStates( U16 valveStates )
 {
-    fpgaActuatorSetPoints.fpgaValveControl = valveStates;
+    SET_FPGA_ACTUATOR_FIELD( fpgaValveControl, valveStates );
 }
 
 /*********************************************************************//**
@@ -795,13 +798,13 @@
  *      6 - D26.\n
  *      7 - D22.\n
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaBCValveControl
+ * @details \b Outputs: fpgaBCValveControl
  * @param valveStates bit mask for the balancing chamber valve states
  * @return none
  *************************************************************************/
 void setFPGABCValveStates( U08 valveStates )
 {
-    fpgaActuatorSetPoints.fpgaBCValveControl = valveStates;
+    SET_FPGA_ACTUATOR_FIELD( fpgaBCValveControl, valveStates );
 }
 
 /*********************************************************************//**
@@ -815,13 +818,13 @@
  *      3 - Not used.\n
  *      4..7 - Unused or reserved.\n
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaDDSpareValveControl
+ * @details \b Outputs: fpgaDDSpareValveControl
  * @param valveStates bit mask for the spare valve states
  * @return none
  *************************************************************************/
 void setFPGASpareValveStates( U08 valveStates )
 {
-    fpgaActuatorSetPoints.fpgaDDSpareValveControl = valveStates;
+    SET_FPGA_ACTUATOR_FIELD( fpgaDDSpareValveControl, valveStates );
 }
 
 /*********************************************************************//**
@@ -830,13 +833,13 @@
  * * an 8-bit mask representing the set of states with a 1 meaning "enabled"
  * and a 0 meaning "disabled"
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaValvePWMEnable
+ * @details \b Outputs: fpgaValvePWMEnable
  * @param valvePWMStates bit mask for requested valve states.
  * @return none
  *************************************************************************/
 void setFPGAValveDDPWMEnable( U16 valvePWMStates )
 {
-    fpgaActuatorSetPoints.fpgaValvePWMEnable = valvePWMStates;
+    SET_FPGA_ACTUATOR_FIELD( fpgaValvePWMEnable, valvePWMStates );
 }
 
 /*********************************************************************//**
@@ -850,49 +853,49 @@
  *************************************************************************/
 U16 getFPGAValveDDPWMEnable( void )
 {
-    return fpgaSensorReadings.fpgaValvePWMEnableStates;
+    return GET_FPGA_SENSOR_FIELD( fpgaValvePWMEnableStates );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAValveDDPWMPullIn function sets the DD valves Pull-in "strike"
  * period where PWM is at 100% in 1ms resolution.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaDDValvePWMPullin
+ * @details \b Outputs: fpgaDDValvePWMPullin
  * @param valvePWMPullIn Pull-in period in 1ms resolution.
  * @return none
  *************************************************************************/
 void setFPGAValveDDPWMPullIn( U16 valvePWMPullIn )
 {
-    fpgaActuatorSetPoints.fpgaDDValvePWMPullin = valvePWMPullIn;
+    SET_FPGA_ACTUATOR_FIELD( fpgaDDValvePWMPullin, valvePWMPullIn );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAValveDDPWMLow function sets the DD valves "low"
  * period where PWM is at 0% in 0.1us resolution.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaDDValvePWMLow
+ * @details \b Outputs: fpgaDDValvePWMLow
  * @param valvePWMLow low period in 0.1us resolution.
  * @return none
  *************************************************************************/
 void setFPGAValveDDPWMLow( U16 valvePWMLow )
 {
-    fpgaActuatorSetPoints.fpgaDDValvePWMLow = valvePWMLow;
+    SET_FPGA_ACTUATOR_FIELD( fpgaDDValvePWMLow, valvePWMLow );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAValveDDPWMPeriod function sets the DD valves pwm
  * period in 0.1us resolution.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaDDValvePWMPeriod
+ * @details \b Outputs: fpgaDDValvePWMPeriod
  * @param valvePWMPeriod period in 0.1us resolution.
  * @return none
  *************************************************************************/
 void setFPGAValveDDPWMPeriod( U16 valvePWMPeriod )
 {
-    fpgaActuatorSetPoints.fpgaDDValvePWMPeriod = valvePWMPeriod;
+    SET_FPGA_ACTUATOR_FIELD( fpgaDDValvePWMPeriod, valvePWMPeriod );
 }
 
 /*********************************************************************//**
@@ -901,13 +904,13 @@
  * * an 8-bit mask representing the set of states with a 1 meaning "enabled"
  * and a 0 meaning "disabled"
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaBCValvePWMControl
+ * @details \b Outputs: fpgaBCValvePWMControl
  * @param valvePWMStates bit mask for requested valve states.
  * @return none
  *************************************************************************/
 void setFPGAValveBCPWMEnable( U08 valvePWMStates )
 {
-    fpgaActuatorSetPoints.fpgaBCValvePWMControl = valvePWMStates;
+    SET_FPGA_ACTUATOR_FIELD( fpgaBCValvePWMControl, valvePWMStates );
 }
 
 /*********************************************************************//**
@@ -921,49 +924,49 @@
  *************************************************************************/
 U08 getFPGAValveBCPWMEnable( void )
 {
-    return fpgaSensorReadings.fpgaValveBCPWMStates;
+    return GET_FPGA_SENSOR_FIELD( fpgaValveBCPWMStates );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAValveBCPWMPullIn function sets the BC valves Pull-in "strike"
  * period where PWM is at 100% in 1ms resolution.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaVBCPWMPullin
+ * @details \b Outputs: fpgaVBCPWMPullin
  * @param valvePWMPullIn Pull-in period in 1ms resolution.
  * @return none
  *************************************************************************/
 void setFPGAValveBCPWMPullIn( U16 valvePWMPullIn )
 {
-    fpgaActuatorSetPoints.fpgaVBCPWMPullIn = valvePWMPullIn;
+    SET_FPGA_ACTUATOR_FIELD( fpgaVBCPWMPullIn, valvePWMPullIn );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAValveBCPWMLow function sets the BC valves "low"
  * period where PWM is at 0% in 0.1us resolution.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaVBCPWMLow
+ * @details \b Outputs: fpgaVBCPWMLow
  * @param valvePWMLow low period in 0.1us resolution.
  * @return none
  *************************************************************************/
 void setFPGAValveBCPWMLow( U16 valvePWMLow )
 {
-    fpgaActuatorSetPoints.fpgaVBCPWMLow = valvePWMLow;
+    SET_FPGA_ACTUATOR_FIELD( fpgaVBCPWMLow, valvePWMLow );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAValveBCPWMPeriod function sets the BC valves pwm
  * period in 0.1us resolution.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaVBCPWMPeriod
+ * @details \b Outputs: fpgaVBCPWMPeriod
  * @param valvePWMPeriod period in 0.1us resolution.
  * @return none
  *************************************************************************/
 void setFPGAValveBCPWMPeriod( U16 valvePWMPeriod )
 {
-    fpgaActuatorSetPoints.fpgaVBCPWMPeriod = valvePWMPeriod;
+    SET_FPGA_ACTUATOR_FIELD( fpgaVBCPWMPeriod, valvePWMPeriod );
 }
 
 /*********************************************************************//**
@@ -972,13 +975,13 @@
  * * an 8-bit mask representing the set of states with a 1 meaning "enabled"
  * and a 0 meaning "disabled"
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaDDSpareValvePWMControl
+ * @details \b Outputs: fpgaDDSpareValvePWMControl
  * @param valvePWMStates bit mask for requested valve states.
  * @return none
  *************************************************************************/
 void setFPGAValveSPPWMEnable( U08 valvePWMStates )
 {
-    fpgaActuatorSetPoints.fpgaDDSpareValvePWMControl = valvePWMStates;
+    SET_FPGA_ACTUATOR_FIELD( fpgaDDSpareValvePWMControl, valvePWMStates );
 }
 
 /*********************************************************************//**
@@ -992,57 +995,57 @@
  *************************************************************************/
 U08 getFPGAValveSPPWMEnable( void )
 {
-    return fpgaSensorReadings.fpgaValveSpPWMStates;
+    return GET_FPGA_SENSOR_FIELD( fpgaValveSpPWMStates );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAValveSPPWMPullIn function sets the Spare valves Pull-in "strike"
  * period where PWM is at 100% in 1ms resolution.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaVSPPWMPullIn
+ * @details \b Outputs: fpgaVSPPWMPullIn
  * @param valvePWMPullIn Pull-in period in 1ms resolution.
  * @return none
  *************************************************************************/
 void setFPGAValveSPPWMPullIn( U16 valvePWMPullIn )
 {
-    fpgaActuatorSetPoints.fpgaVSPPWMPullIn = valvePWMPullIn;
+    SET_FPGA_ACTUATOR_FIELD( fpgaVSPPWMPullIn, valvePWMPullIn );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAValveSPPWMLow function sets the Spare valves "low"
  * period where PWM is at 0% in 0.1us resolution.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaVSPPWMLow
+ * @details \b Outputs: fpgaVSPPWMLow
  * @param valvePWMLow low period in 0.1us resolution.
  * @return none
  *************************************************************************/
 void setFPGAValveSPPWMLow( U16 valvePWMLow )
 {
-    fpgaActuatorSetPoints.fpgaVSPPWMLow = valvePWMLow;
+    SET_FPGA_ACTUATOR_FIELD( fpgaVSPPWMLow, valvePWMLow );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAValveSPPWMPeriod function sets the Spare valves pwm
  * period in 0.1us resolution.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaVSPPWMPeriod
+ * @details \b Outputs: fpgaVSPPWMPeriod
  * @param valvePWMPeriod period in 0.1us resolution.
  * @return none
  *************************************************************************/
 void setFPGAValveSPPWMPeriod( U16 valvePWMPeriod )
 {
-    fpgaActuatorSetPoints.fpgaVSPPWMPeriod = valvePWMPeriod;
+    SET_FPGA_ACTUATOR_FIELD( fpgaVSPPWMPeriod, valvePWMPeriod );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD48PumpSpeed function sets the speed for the
  * spent dialysate pump (SDP).
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaD48PumpSpeed
+ * @details \b Outputs: fpgaD48PumpSpeed
  * @param speed The spent dialysate pump speed
  * @return none
  *************************************************************************/
@@ -1051,11 +1054,11 @@
 #ifdef __MAXON_SPEED_UPDATE__
     {
         U16 currentSpeed =(U16)( ( ( speed + PUMP_SPEED_OFFSET  ) / PUMP_SPEED_FULL_SCALE ) *  MAX_PUMP_SPEED );
-        fpgaActuatorSetPoints.fpgaD48PumpSpeed = currentSpeed;
+        SET_FPGA_ACTUATOR_FIELD( fpgaD48PumpSpeed, currentSpeed );
     }
 #else
     {
-        fpgaActuatorSetPoints.fpgaD48PumpSpeed = speed;
+        SET_FPGA_ACTUATOR_FIELD( fpgaD48PumpSpeed, speed );
     }
 #endif
 }
@@ -1065,7 +1068,7 @@
  * The setFPGAD12PumpSpeed function sets the speed for the
  * fresh dialysate pump (DGP).
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaD12PumpSpeed
+ * @details \b Outputs: fpgaD12PumpSpeed
  * @param speed The fresh dialysate pump speed
  * @return none
  *************************************************************************/
@@ -1074,11 +1077,11 @@
 #ifdef __MAXON_SPEED_UPDATE__
     {
         U16 currentSpeed =(U16)( ( ( speed + PUMP_SPEED_OFFSET  ) / PUMP_SPEED_FULL_SCALE ) *  MAX_PUMP_SPEED );
-        fpgaActuatorSetPoints.fpgaD12PumpSpeed = currentSpeed;
+        SET_FPGA_ACTUATOR_FIELD( fpgaD12PumpSpeed, currentSpeed );
     }
 #else
     {
-        fpgaActuatorSetPoints.fpgaD12PumpSpeed = speed;
+        SET_FPGA_ACTUATOR_FIELD( fpgaD12PumpSpeed, speed );
     }
 #endif
 }
@@ -1095,13 +1098,13 @@
  *      bit 1-2: Reserved
  *      bit 0: Run (1), stop (0)
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaD48PumpControl
+ * @details \b Outputs: fpgaD48PumpControl
  * @param control The dialysate out pump controls
  * @return none
  *************************************************************************/
 void setFPGAD48PumpControl( U08 control )
 {
-    fpgaActuatorSetPoints.fpgaD48PumpControl = control;
+    SET_FPGA_ACTUATOR_FIELD( fpgaD48PumpControl, control );
 }
 
 /*********************************************************************//**
@@ -1116,55 +1119,55 @@
  *      bit 1-2: Reserved
  *      bit 0: Run (1), stop (0)
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaD12PumpControl
+ * @details \b Outputs: fpgaD12PumpControl
  * @param control The dialysate In pump controls
  * @return none
  *************************************************************************/
 void setFPGAD12PumpControl( U08 control )
 {
-    fpgaActuatorSetPoints.fpgaD12PumpControl = control;
+    SET_FPGA_ACTUATOR_FIELD( fpgaD12PumpControl, control );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD11PumpSetStepSpeed function sets the step speed period for
  * concentrate pump D11_Pump.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaD11PumpSpeed
+ * @details \b Outputs: fpgaD11PumpSpeed
  * @param stepSpeed The concentrate pump step speed period
  * @return none
  *************************************************************************/
 void setFPGAD11PumpSetStepSpeed( U16 stepSpeed )
 {
-    fpgaActuatorSetPoints.fpgaD11PumpSpeed = stepSpeed;
+    SET_FPGA_ACTUATOR_FIELD( fpgaD11PumpSpeed, stepSpeed );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD10PumpSetStepSpeed function sets the step speed period for
  * concentrate pump D10_Pump.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaD10PumpSpeed
+ * @details \b Outputs: fpgaD10PumpSpeed
  * @param stepSpeed The concentrate pump step speed period
  * @return none
  *************************************************************************/
 void setFPGAD10PumpSetStepSpeed( U16 stepSpeed )
 {
-    fpgaActuatorSetPoints.fpgaD10PumpSpeed = stepSpeed;
+    SET_FPGA_ACTUATOR_FIELD( fpgaD10PumpSpeed, stepSpeed );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD76PumpSetStepSpeed function sets the step speed period for
  * UF D76_Pump.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaD76PumpSpeed
+ * @details \b Outputs: fpgaD76PumpSpeed
  * @param stepSpeed The concentrate pump step speed period
  * @return none
  *************************************************************************/
 void setFPGAD76PumpSetStepSpeed( U16 stepSpeed )
 {
-    fpgaActuatorSetPoints.fpgaD76PumpSpeed = stepSpeed;
+    SET_FPGA_ACTUATOR_FIELD( fpgaD76PumpSpeed, stepSpeed );
 }
 
 /*********************************************************************//**
@@ -1178,14 +1181,14 @@
  *      bit 3: Direction (1=Fwd, 0=Rev)
  *      bit 0-2: Microstepping resolution
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaD11PumpControl
+ * @details \b Outputs: fpgaD11PumpControl
  * @param control Concentrate pump control set
  * @return none
  *************************************************************************/
 void setFPGAD11PumpControl( U08 control )
 {
-    fpgaActuatorSetPoints.fpgaD11PumpControl &= FPGA_CONC_PUMP_PARK_COMMAND;  // preserve msb (park command bit)
-    fpgaActuatorSetPoints.fpgaD11PumpControl |= control;
+    SET_FPGA_ACTUATOR_FIELD( fpgaD11PumpControl ) &= FPGA_CONC_PUMP_PARK_COMMAND;  // preserve msb (park command bit)
+    SET_FPGA_ACTUATOR_FIELD( fpgaD11PumpControl ) |= control;
 }
 
 /*********************************************************************//**
@@ -1199,14 +1202,14 @@
  *      bit 3: Direction (1=Fwd, 0=Rev)
  *      bit 0-2: Microstepping resolution
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaD10PumpControl
+ * @details \b Outputs: fpgaD10PumpControl
  * @param control Concentrate pump control set
  * @return none
  *************************************************************************/
 void setFPGAD10PumpControl( U08 control )
 {
-    fpgaActuatorSetPoints.fpgaD10PumpControl &= FPGA_CONC_PUMP_PARK_COMMAND;  // preserve msb (park command bit)
-    fpgaActuatorSetPoints.fpgaD10PumpControl |= control;
+    SET_FPGA_ACTUATOR_FIELD( fpgaD10PumpControl ) &= FPGA_CONC_PUMP_PARK_COMMAND;  // preserve msb (park command bit)
+    SET_FPGA_ACTUATOR_FIELD( fpgaD10PumpControl ) |= control;
 }
 
 /*********************************************************************//**
@@ -1220,14 +1223,14 @@
  *      bit 3: Direction (1=Fwd, 0=Rev)
  *      bit 0-2: Microstepping resolution
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaD76PumpControl
+ * @details \b Outputs: fpgaD76PumpControl
  * @param control UF pump control set
  * @return none
  *************************************************************************/
 void setFPGAD76PumpControl( U08 control )
 {
-    fpgaActuatorSetPoints.fpgaD76PumpControl &= FPGA_CONC_PUMP_PARK_COMMAND;  // preserve msb (park command bit)
-    fpgaActuatorSetPoints.fpgaD76PumpControl |= control;
+    SET_FPGA_ACTUATOR_FIELD( fpgaD76PumpControl ) &= FPGA_CONC_PUMP_PARK_COMMAND;  // preserve msb (park command bit)
+    SET_FPGA_ACTUATOR_FIELD( fpgaD76PumpControl ) |= control;
 }
 
 /*********************************************************************//**
@@ -1237,13 +1240,13 @@
  *      bit 7: Park command bit
  *      bit 0-6: Other pump control bits (set in different function)
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaD11PumpControl
+ * @details \b Outputs: fpgaD11PumpControl
  * @param Park command bit set
  * @return none
  *************************************************************************/
 void setFPGAD11PumpParkCmd( void )
 {
-    fpgaActuatorSetPoints.fpgaD11PumpControl |= FPGA_CONC_PUMP_PARK_COMMAND;  // this bit must be cleared after next transmit to prevent continuous park commands
+    SET_FPGA_ACTUATOR_FIELD( fpgaD11PumpControl ) |= FPGA_CONC_PUMP_PARK_COMMAND;  // this bit must be cleared after next transmit to prevent continuous park commands
 }
 
 /*********************************************************************//**
@@ -1253,13 +1256,13 @@
  *      bit 7: Park command bit
  *      bit 0-6: Other pump control bits (set in different function)
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaD10PumpControl
+ * @details \b Outputs: fpgaD10PumpControl
  * @param Park command bit set
  * @return none
  *************************************************************************/
 void setFPGAD10PumpParkCmd( void )
 {
-    fpgaActuatorSetPoints.fpgaD10PumpControl |= FPGA_CONC_PUMP_PARK_COMMAND;  // this bit must be cleared after next transmit to prevent continuous park commands
+    SET_FPGA_ACTUATOR_FIELD( fpgaD10PumpControl ) |= FPGA_CONC_PUMP_PARK_COMMAND;  // this bit must be cleared after next transmit to prevent continuous park commands
 }
 
 /*********************************************************************//**
@@ -1269,77 +1272,77 @@
  *      bit 7: Park command bit
  *      bit 0-6: Other pump control bits (set in different function)
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaD76PumpControl
+ * @details \b Outputs: fpgaD76PumpControl
  * @param Park command bit set
  * @return none
  *************************************************************************/
 void setFPGAD76PumpParkCmd( void )
 {
-    fpgaActuatorSetPoints.fpgaD76PumpControl |= FPGA_CONC_PUMP_PARK_COMMAND;  // this bit must be cleared after next transmit to prevent continuous park commands
+    SET_FPGA_ACTUATOR_FIELD( fpgaD76PumpControl ) |= FPGA_CONC_PUMP_PARK_COMMAND;  // this bit must be cleared after next transmit to prevent continuous park commands
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD17CondReset function resets the FPGA Conductivity
  * Sensor D17.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control
+ * @details \b Outputs: fpgaConSensD17D74Control
  * @param none
  * @return none
  *************************************************************************/
 void setFPGAD17CondReset( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD17D74Control |= FPGA_D17_RESET_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD17D74Control ) |= FPGA_D17_RESET_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The clearFPGAD17CondReset function clears the reset of FPGA Conductivity
  * Sensor D17.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control
+ * @details \b Outputs: fpgaConSensD17D74Control
  * @param none
  * @return none
  *************************************************************************/
 void clearFPGAD17CondReset( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD17D74Control &= ~FPGA_D17_RESET_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD17D74Control ) &= ~FPGA_D17_RESET_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD17CondInitEnable function enables the FPGA Conductivity
  * Sensor D17 initialzation procedure.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control
+ * @details \b Outputs: fpgaConSensD17D74Control
  * @param none
  * @return none
  *************************************************************************/
 void setFPGAD17CondInitEnable( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD17D74Control |= FPGA_D17_INIT_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD17D74Control ) |= FPGA_D17_INIT_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The clearFPGAD17CondInitEnable function clears the init process of FPGA Conductivity
  * Sensor D17.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control
+ * @details \b Outputs: fpgaConSensD17D74Control
  * @param none
  * @return none
  *************************************************************************/
 void clearFPGAD17CondInitEnable( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD17D74Control &= ~FPGA_D17_INIT_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD17D74Control ) &= ~FPGA_D17_INIT_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD17CondWriteEnable function enables the FPGA Conductivity
  * Sensor D17 write transaction.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control
+ * @details \b Outputs: fpgaConSensD17D74Control
  * @param none
  * @warning: The address (setFPGAD17D74Address) and data (setFPGACD12Data) register
  * must be populated before invoking this write enable function to initiate
@@ -1348,29 +1351,29 @@
  *************************************************************************/
 void setFPGAD17CondWriteEnable( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD17D74Control |= FPGA_D17_WR_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD17D74Control ) |= FPGA_D17_WR_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The clearFPGAD17CondWriteEnable function clears the write enable of FPGA Conductivity
  * Sensor D17.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control
+ * @details \b Outputs: fpgaConSensD17D74Control
  * @param none
  * @return none
  *************************************************************************/
 void clearFPGAD17CondWriteEnable( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD17D74Control &= ~FPGA_D17_WR_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD17D74Control ) &= ~FPGA_D17_WR_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD17CondReadEnable function enables the FPGA Conductivity
  * Sensor D17 read transaction.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control
+ * @details \b Outputs: fpgaConSensD17D74Control
  * @param none
  * @warning: The address (setFPGAD17D74Address) register must be populated
  * before invoking this read enable function to initiate read transaction
@@ -1379,85 +1382,85 @@
  *************************************************************************/
 void setFPGAD17CondReadEnable( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD17D74Control |= FPGA_D17_RD_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD17D74Control ) |= FPGA_D17_RD_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The clearFPGAD17CondReadEnable function clears the read enable of FPGA Conductivity
  * Sensor D17.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control
+ * @details \b Outputs: fpgaConSensD17D74Control
  * @param none
  * @return none
  *************************************************************************/
 void clearFPGAD17CondReadEnable( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD17D74Control &= ~FPGA_D17_RD_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD17D74Control ) &= ~FPGA_D17_RD_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD27CondReset function resets the FPGA Conductivity
  * Sensor D27.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control
+ * @details \b Outputs: fpgaConSensD27D29Control
  * @param none
  * @return none
  *************************************************************************/
 void setFPGAD27CondReset( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD27D29Control |= FPGA_D27_RESET_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD27D29Control ) |= FPGA_D27_RESET_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The clearFPGAD27CondReset function clears the reset of FPGA Conductivity
  * Sensor D27.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control
+ * @details \b Outputs: fpgaConSensD27D29Control
  * @param none
  * @return none
  *************************************************************************/
 void clearFPGAD27CondReset( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD27D29Control &= ~FPGA_D27_RESET_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD27D29Control ) &= ~FPGA_D27_RESET_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD27CondInitEnable function enables the FPGA Conductivity
  * Sensor D27 initialzation procedure.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control
+ * @details \b Outputs: fpgaConSensD27D29Control
  * @param none
  * @return none
  *************************************************************************/
 void setFPGAD27CondInitEnable( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD27D29Control |= FPGA_D27_INIT_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD27D29Control ) |= FPGA_D27_INIT_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The clearFPGAD27CondInitEnable function clears the init process of FPGA Conductivity
  * Sensor D27.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control
+ * @details \b Outputs: fpgaConSensD27D29Control
  * @param none
  * @return none
  *************************************************************************/
 void clearFPGAD27CondInitEnable( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD27D29Control &= ~FPGA_D27_INIT_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD27D29Control ) &= ~FPGA_D27_INIT_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD27CondWriteEnable function enables the FPGA Conductivity
  * Sensor D27 write transaction.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control
+ * @details \b Outputs: fpgaConSensD27D29Control
  * @param none
  * @warning: The address (setFPGACD12Address) and data (setFPGACD12Data) register
  * must be populated before invoking this write enable function to initiate
@@ -1466,29 +1469,29 @@
  *************************************************************************/
 void setFPGAD27CondWriteEnable( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD27D29Control |= FPGA_D27_WR_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD27D29Control ) |= FPGA_D27_WR_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The clearFPGAD27CondWriteEnable function clears the write enable of FPGA Conductivity
  * Sensor D27.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control
+ * @details \b Outputs: fpgaConSensD27D29Control
  * @param none
  * @return none
  *************************************************************************/
 void clearFPGAD27CondWriteEnable( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD27D29Control &= ~FPGA_D27_WR_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD27D29Control ) &= ~FPGA_D27_WR_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD27CondReadEnable function enables the FPGA Conductivity
  * Sensor D27 read transaction.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control
+ * @details \b Outputs: fpgaConSensD27D29Control
  * @param none
  * @warning: The address (setFPGACD12Address) register must be populated
  * before invoking this read enable function to initiate read transaction
@@ -1497,85 +1500,85 @@
  *************************************************************************/
 void setFPGAD27CondReadEnable( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD27D29Control |= FPGA_D27_RD_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD27D29Control ) |= FPGA_D27_RD_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The clearFPGAD27CondReadEnable function clears the read enable of FPGA Conductivity
  * Sensor D27.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control
+ * @details \b Outputs: fpgaConSensD27D29Control
  * @param none
  * @return none
  *************************************************************************/
 void clearFPGAD27CondReadEnable( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD27D29Control &= ~FPGA_D27_RD_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD27D29Control ) &= ~FPGA_D27_RD_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGD29CondReset function resets the FPGA Conductivity
  * Sensor D29.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control
+ * @details \b Outputs: fpgaConSensD27D29Control
  * @param none
  * @return none
  *************************************************************************/
 void setFPGAD29CondReset( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD27D29Control |= FPGA_D29_RESET_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD27D29Control ) |= FPGA_D29_RESET_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The clearFPGAD29CondReset function clears the reset of FPGA Conductivity
  * Sensor D29.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control
+ * @details \b Outputs: fpgaConSensD27D29Control
  * @param none
  * @return none
  *************************************************************************/
 void clearFPGAD29CondReset( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD27D29Control &= ~FPGA_D29_RESET_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD27D29Control ) &= ~FPGA_D29_RESET_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD29CondInitEnable function enables the FPGA Conductivity
  * Sensor D29 initialzation procedure.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control
+ * @details \b Outputs: fpgaConSensD27D29Control
  * @param none
  * @return none
  *************************************************************************/
 void setFPGAD29CondInitEnable( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD27D29Control |= FPGA_D29_INIT_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD27D29Control ) |= FPGA_D29_INIT_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The clearFPGAD29CondInitEnable function clears the init process of FPGA Conductivity
  * Sensor D29.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control
+ * @details \b Outputs: fpgaConSensD27D29Control
  * @param none
  * @return none
  *************************************************************************/
 void clearFPGAD29CondInitEnable( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD27D29Control &= ~FPGA_D29_INIT_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD27D29Control ) &= ~FPGA_D29_INIT_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD29CondWriteEnable function enables the FPGA Conductivity
  * Sensor D29 write transaction.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control
+ * @details \b Outputs: fpgaConSensD27D29Control
  * @param none
  * @warning: The address (setFPGACD12Address) and data (setFPGACD12Data) register
  * must be populated before invoking this write enable function to initiate
@@ -1584,29 +1587,29 @@
  *************************************************************************/
 void setFPGAD29CondWriteEnable( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD27D29Control |= FPGA_D29_WR_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD27D29Control ) |= FPGA_D29_WR_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The clearFPGAD29CondWriteEnable function clears the write enable of FPGA Conductivity
  * Sensor D29.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control
+ * @details \b Outputs: fpgaConSensD27D29Control
  * @param none
  * @return none
  *************************************************************************/
 void clearFPGAD29CondWriteEnable( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD27D29Control &= ~FPGA_D29_WR_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD27D29Control ) &= ~FPGA_D29_WR_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD29CondReadEnable function enables the FPGA Conductivity
  * Sensor D29 read transaction.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control
+ * @details \b Outputs: fpgaConSensD27D29Control
  * @param none
  * @warning: The address (setFPGACD12Address) register must be populated
  * before invoking this read enable function to initiate read transaction
@@ -1615,85 +1618,85 @@
  *************************************************************************/
 void setFPGAD29CondReadEnable( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD27D29Control |= FPGA_D29_RD_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD27D29Control ) |= FPGA_D29_RD_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The clearFPGAD29CondReadEnable function clears the read enable of FPGA Conductivity
  * Sensor D29.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control
+ * @details \b Outputs: fpgaConSensD27D29Control
  * @param none
  * @return none
  *************************************************************************/
 void clearFPGAD29CondReadEnable( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD27D29Control &= ~FPGA_D29_RD_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD27D29Control ) &= ~FPGA_D29_RD_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD43CondReset function resets the FPGA Conductivity
  * Sensor D43.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD43Control
+ * @details \b Outputs: fpgaConSensD43Control
  * @param none
  * @return none
  *************************************************************************/
 void setFPGAD43CondReset( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD43Control |= FPGA_D43_RESET_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD43Control ) |= FPGA_D43_RESET_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The clearFPGAD43CondReset function clears the reset of FPGA Conductivity
  * Sensor D43.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD43Control
+ * @details \b Outputs: fpgaConSensD43Control
  * @param none
  * @return none
  *************************************************************************/
 void clearFPGAD43CondReset( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD43Control &= ~FPGA_D43_RESET_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD43Control ) &= ~FPGA_D43_RESET_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD43CondInitEnable function enables the FPGA Conductivity
  * Sensor D43 initialzation procedure.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD43Control
+ * @details \b Outputs: fpgaConSensD43Control
  * @param none
  * @return none
  *************************************************************************/
 void setFPGAD43CondInitEnable( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD43Control |= FPGA_D43_INIT_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD43Control ) |= FPGA_D43_INIT_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The clearFPGAD43CondInitEnable function clears the init process of FPGA Conductivity
  * Sensor D43.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD43Control
+ * @details \b Outputs: fpgaConSensD43Control
  * @param none
  * @return none
  *************************************************************************/
 void clearFPGAD43CondInitEnable( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD43Control &= ~FPGA_D43_INIT_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD43Control ) &= ~FPGA_D43_INIT_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD43CondWriteEnable function enables the FPGA Conductivity
  * Sensor D43 write transaction.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD43Control
+ * @details \b Outputs: fpgaConSensD43Control
  * @param none
  * @warning: The address (setFPGACD12Address) and data (setFPGACD12Data) register
  * must be populated before invoking this write enable function to initiate
@@ -1702,29 +1705,29 @@
  *************************************************************************/
 void setFPGAD43CondWriteEnable( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD43Control |= FPGA_D43_WR_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD43Control ) |= FPGA_D43_WR_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The clearFPGAD43CondWriteEnable function clears the write enable of FPGA Conductivity
  * Sensor D43.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD43Control
+ * @details \b Outputs: fpgaConSensD43Control
  * @param none
  * @return none
  *************************************************************************/
 void clearFPGAD43CondWriteEnable( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD43Control &= ~FPGA_D43_WR_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD43Control ) &= ~FPGA_D43_WR_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD43CondReadEnable function enables the FPGA Conductivity
  * Sensor D43 read transaction.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD43Control
+ * @details \b Outputs: fpgaConSensD43Control
  * @param none
  * @warning: The address (setFPGACD12Address) register must be populated
  * before invoking this read enable function to initiate read transaction
@@ -1733,85 +1736,85 @@
  *************************************************************************/
 void setFPGAD43CondReadEnable( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD43Control |= FPGA_D43_RD_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD43Control ) |= FPGA_D43_RD_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The clearFPGAD43CondReadEnable function clears the read enable of FPGA Conductivity
  * Sensor D43.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD43Control
+ * @details \b Outputs: fpgaConSensD43Control
  * @param none
  * @return none
  *************************************************************************/
 void clearFPGAD43CondReadEnable( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD43Control &= ~FPGA_D43_RD_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD43Control ) &= ~FPGA_D43_RD_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD74CondReset function resets the FPGA Conductivity
  * Sensor D74.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control
+ * @details \b Outputs: fpgaConSensD17D74Control
  * @param none
  * @return none
  *************************************************************************/
 void setFPGAD74CondReset( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD17D74Control |= FPGA_D74_RESET_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD17D74Control ) |= FPGA_D74_RESET_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The clearFPGAD74CondReset function clears the reset of FPGA Conductivity
  * Sensor D74.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control
+ * @details \b Outputs: fpgaConSensD17D74Control
  * @param none
  * @return none
  *************************************************************************/
 void clearFPGAD74CondReset( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD17D74Control &= ~FPGA_D74_RESET_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD17D74Control ) &= ~FPGA_D74_RESET_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD74CondInitEnable function enables the FPGA Conductivity
  * Sensor D74 initialzation procedure.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control
+ * @details \b Outputs: fpgaConSensD17D74Control
  * @param none
  * @return none
  *************************************************************************/
 void setFPGAD74CondInitEnable( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD17D74Control |= FPGA_D74_INIT_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD17D74Control ) |= FPGA_D74_INIT_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The clearFPGAD74CondInitEnable function clears the init process of FPGA Conductivity
  * Sensor D74.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control
+ * @details \b Outputs: fpgaConSensD17D74Control
  * @param none
  * @return none
  *************************************************************************/
 void clearFPGAD74CondInitEnable( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD17D74Control &= ~FPGA_D74_INIT_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD17D74Control ) &= ~FPGA_D74_INIT_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD74CondWriteEnable function enables the FPGA Conductivity
  * Sensor D74 write transaction.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control
+ * @details \b Outputs: fpgaConSensD17D74Control
  * @param none
  * @warning: The address (setFPGACD74Address) and data (setFPGACD74Data) register
  * must be populated before invoking this write enable function to initiate
@@ -1820,29 +1823,29 @@
  *************************************************************************/
 void setFPGAD74CondWriteEnable( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD17D74Control |= FPGA_D74_WR_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD17D74Control ) |= FPGA_D74_WR_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The clearFPGAD74CondWriteEnable function clears the write enable of FPGA Conductivity
  * Sensor D74.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control
+ * @details \b Outputs: fpgaConSensD17D74Control
  * @param none
  * @return none
  *************************************************************************/
 void clearFPGAD74CondWriteEnable( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD17D74Control &= ~FPGA_D74_WR_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD17D74Control ) &= ~FPGA_D74_WR_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD74CondReadEnable function enables the FPGA Conductivity
  * Sensor D74 read transaction.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control
+ * @details \b Outputs: fpgaConSensD17D74Control
  * @param none
  * @warning: The address (setFPGACD74Address) register must be populated
  * before invoking this read enable function to initiate read transaction
@@ -1851,21 +1854,21 @@
  *************************************************************************/
 void setFPGAD74CondReadEnable( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD17D74Control |= FPGA_D74_RD_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD17D74Control ) |= FPGA_D74_RD_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The clearFPGAD74CondReadEnable function clears the read enable of FPGA Conductivity
  * Sensor D74.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control
+ * @details \b Outputs: fpgaConSensD17D74Control
  * @param none
  * @return none
  *************************************************************************/
 void clearFPGAD74CondReadEnable( void )
 {
-    fpgaActuatorSetPoints.fpgaConSensD17D74Control &= ~FPGA_D74_RD_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD17D74Control ) &= ~FPGA_D74_RD_ENABLE_BIT;
 }
 
 
@@ -1882,13 +1885,13 @@
  *      bit 1: Enable D17 Init procedure (1)
  *      bit 0: reset D17 Conduct sensor (1)
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control
+ * @details \b Outputs: fpgaConSensD17D74Control
  * @param control Conductivity Sensor control set
  * @return none
  *************************************************************************/
 void setFPGAD17D74Control( U08 control )
 {
-    fpgaActuatorSetPoints.fpgaConSensD17D74Control = control;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD17D74Control, control );
 }
 
 /*********************************************************************//**
@@ -1904,13 +1907,13 @@
  *      bit 1: Enable D27 Init procedure (1)
  *      bit 0: reset D27 Conduct sensor (1)
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control
+ * @details \b Outputs: fpgaConSensTD34Control
  * @param control Conductivity sensor control set
  * @return none
  *************************************************************************/
 void setFPGAD27D29Control( U08 control )
 {
-    fpgaActuatorSetPoints.fpgaConSensD27D29Control = control;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD27D29Control, control );
 }
 
 /*********************************************************************//**
@@ -1923,97 +1926,97 @@
  *      bit 1: Enable D43 Init procedure (1)
  *      bit 0: reset D43 Conduct sensor (1)
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD74Control
+ * @details \b Outputs: fpgaConSensD74Control
  * @param control Conductivity sensor control set
  * @return none
  *************************************************************************/
 void setFPGAD43Control( U08 control )
 {
-    fpgaActuatorSetPoints.fpgaConSensD43Control = control;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD43Control, control );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD17D74Address function sets the conductivity sensor
  * CD12 address register to perform read and write operations.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74_Addrs
+ * @details \b Outputs: fpgaConSensD17D74_Addrs
  * @param address The conductivity sensor D17 and D74 address
  * @return none
  *************************************************************************/
 void setFPGAD17D74Address( U16 address )
 {
-    fpgaActuatorSetPoints.fpgaConSensD17D74_Addrs = address;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD17D74_Addrs, address );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD27D29Address function sets the conductivity sensor
  * CD34 address register to perform read and write operations.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29_Addrs
+ * @details \b Outputs: fpgaConSensD27D29_Addrs
  * @param address The conductivity sensor CD34 address
  * @return none
  *************************************************************************/
 void setFPGAD27D29Address( U16 address )
 {
-    fpgaActuatorSetPoints.fpgaConSensD27D29_Addrs = address;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD27D29_Addrs, address );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD43Address function sets the conductivity sensor
  * D74 address register to perform read and write operations.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD43_Addrs
+ * @details \b Outputs: fpgaConSensD43_Addrs
  * @param address The conductivity sensor D43 address
  * @return none
  *************************************************************************/
 void setFPGAD43Address( U16 address )
 {
-    fpgaActuatorSetPoints.fpgaConSensD43_Addrs = address;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD43_Addrs, address );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD17D74Data function sets the conductivity sensor
  * CD12 data outputfor write operations.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74_Data_In
+ * @details \b Outputs: fpgaConSensD17D74_Data_In
  * @param data The conductivity sensor D17 and D74 Data
  * @return none
  *************************************************************************/
 void setFPGAD17D74Data( U32 data )
 {
-    fpgaActuatorSetPoints.fpgaConSensD17D74_Data_In = data;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD17D74_Data_In, data );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD27D29Data function sets the conductivity sensor
  * CD34 data outputfor write operations.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29_Data_In
+ * @details \b Outputs: fpgaConSensD27D29_Data_In
  * @param data The conductivity sensor D27 and D29 Data
  * @return none
  *************************************************************************/
 void setFPGAD27D29Data( U32 data )
 {
-    fpgaActuatorSetPoints.fpgaConSensD27D29_Data_In = data;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD27D29_Data_In, data );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD43Data function sets the conductivity sensor
  * D43 data output for write operations.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD43_Data_In
+ * @details \b Outputs: fpgaConSensD43_Data_In
  * @param data The conductivity sensor D43 Data
  * @return none
  *************************************************************************/
 void setFPGAD43Data( U32 data )
 {
-    fpgaActuatorSetPoints.fpgaConSensD43_Data_In = data;
+    SET_FPGA_ACTUATOR_FIELD( fpgaConSensD43_Data_In, data );
 }
 
 /*********************************************************************//**
@@ -2027,7 +2030,7 @@
  *************************************************************************/
 void setFPGAD5HeaterPWMControl( U08 control )
 {
-    fpgaActuatorSetPoints.fpgaD5HeaterPWMControl = control;
+    SET_FPGA_ACTUATOR_FIELD( fpgaD5HeaterPWMControl, control );
 }
 
 /*********************************************************************//**
@@ -2041,7 +2044,7 @@
  *************************************************************************/
 void setFPGAD45HeaterPWMControl( U08 control )
 {
-    fpgaActuatorSetPoints.fpgaD45HeaterPWMControl = control;
+    SET_FPGA_ACTUATOR_FIELD( fpgaD45HeaterPWMControl, control );
 }
 
 /*********************************************************************//**
@@ -2055,7 +2058,7 @@
  *************************************************************************/
 void setFPGAD11PumpRevolutionCount( U16 count )
 {
-    fpgaActuatorSetPoints.fpgaD11PumpRevCount = count;
+    SET_FPGA_ACTUATOR_FIELD( fpgaD11PumpRevCount, count );
 }
 
 /*********************************************************************//**
@@ -2069,7 +2072,7 @@
  *************************************************************************/
 void setFPGAD10PumpRevolutionCount( U16 count )
 {
-    fpgaActuatorSetPoints.fpgaD10PumpRevCount = count;
+    SET_FPGA_ACTUATOR_FIELD( fpgaD10PumpRevCount, count );
 }
 
 /*********************************************************************//**
@@ -2083,7 +2086,7 @@
  *************************************************************************/
 void setFPGAD76PumpRevolutionCount( U16 count )
 {
-    fpgaActuatorSetPoints.fpgaD76PumpRevCount = count;
+    SET_FPGA_ACTUATOR_FIELD( fpgaD76PumpRevCount, count );
 }
 
 /*********************************************************************//**
@@ -2099,11 +2102,11 @@
 {
     if ( TRUE == flag)
     {
-        fpgaActuatorSetPoints.fpgaGPIOControl |= FPGA_D5_HEATER_CNTRL_BIT;
+        SET_FPGA_ACTUATOR_FIELD( fpgaGPIOControl ) |= FPGA_D5_HEATER_CNTRL_BIT;
     }
     else
     {
-        fpgaActuatorSetPoints.fpgaGPIOControl &= ~FPGA_D5_HEATER_CNTRL_BIT;
+        SET_FPGA_ACTUATOR_FIELD( fpgaGPIOControl ) &= ~FPGA_D5_HEATER_CNTRL_BIT;
     }
 }
 
@@ -2120,11 +2123,11 @@
 {
     if ( TRUE == enable)
     {
-        fpgaActuatorSetPoints.fpgaGPIOControl |= FPGA_D5_HEATER_PWM_ENABLE_BIT;
+        SET_FPGA_ACTUATOR_FIELD( fpgaGPIOControl ) |= FPGA_D5_HEATER_PWM_ENABLE_BIT;
     }
     else
     {
-        fpgaActuatorSetPoints.fpgaGPIOControl &= ~FPGA_D5_HEATER_PWM_ENABLE_BIT;
+        SET_FPGA_ACTUATOR_FIELD( fpgaGPIOControl ) &= ~FPGA_D5_HEATER_PWM_ENABLE_BIT;
     }
 }
 
@@ -2139,7 +2142,7 @@
  *************************************************************************/
 void setFPGAD5HeaterPWMLowState( U16 count )
 {
-    fpgaActuatorSetPoints.fpgaACRelayPWMLow = count;
+    SET_FPGA_ACTUATOR_FIELD( fpgaACRelayPWMLow, count );
 }
 
 /*********************************************************************//**
@@ -2153,7 +2156,7 @@
  *************************************************************************/
 void setFPGAD5HeaterPWMPeriod( U16 period )
 {
-    fpgaActuatorSetPoints.fpgaACRelayPWMPeriod = period;
+    SET_FPGA_ACTUATOR_FIELD( fpgaACRelayPWMPeriod, period );
 }
 
 /*********************************************************************//**
@@ -2183,12 +2186,12 @@
  *      bit 1-2: TBD
  *      bit 0: Run (1), stop (0)
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaD48PumpControl
+ * @details \b Outputs: fpgaD48PumpControl
  * @return Dialysate Out pump control status bit
  *************************************************************************/
 U08 getFPGAD48PumpControl( void )
 {
-    return fpgaActuatorSetPoints.fpgaD48PumpControl;
+    return GET_FPGA_ACTUATOR_FIELD( fpgaD48PumpControl );
 }
 
 /*********************************************************************//**
@@ -2203,12 +2206,12 @@
  *      bit 1-2: TBD
  *      bit 0: Run (1), stop (0)
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaD12PumpControl
+ * @details \b Outputs: fpgaD12PumpControl
  * @return Dialysate Inlet pump control status bit
  *************************************************************************/
 U08 getFPGAD12PumpControl( void )
 {
-    return fpgaActuatorSetPoints.fpgaD12PumpControl;
+    return GET_FPGA_ACTUATOR_FIELD( fpgaD12PumpControl );
 }
 
 /*********************************************************************//**
@@ -2221,7 +2224,7 @@
  *************************************************************************/
 U16 getFPGAD48PumpSpeed( void )
 {
-    return fpgaSensorReadings.fpgaD48MeasuredSpeed;
+    return GET_FPGA_SENSOR_FIELD( fpgaD48MeasuredSpeed );
 }
 
 /*********************************************************************//**
@@ -2234,7 +2237,7 @@
  *************************************************************************/
 U16 getFPGAD12PumpSpeed( void )
 {
-    return fpgaSensorReadings.fpgaD12MeasuredSpeed;
+    return GET_FPGA_SENSOR_FIELD( fpgaD12MeasuredSpeed );
 }
 
 /*********************************************************************//**
@@ -2285,7 +2288,7 @@
  *************************************************************************/
 U16 getFPGAD12PumpCurrentFeedback( void )
 {
-    return fpgaSensorReadings.fpgaD12CurrentFeedback;
+    return GET_FPGA_SENSOR_FIELD( fpgaD12CurrentFeedback );
 }
 
 /*********************************************************************//**
@@ -2298,7 +2301,7 @@
  *************************************************************************/
 U16 getFPGAD48PumpCurrentFeedback( void )
 {
-    return fpgaSensorReadings.fpgaD48CurrentFeedback;
+    return GET_FPGA_SENSOR_FIELD( fpgaD48CurrentFeedback );
 }
 
 /*********************************************************************//**
@@ -2311,7 +2314,7 @@
  *************************************************************************/
 U08 getFPGAD12PumpHallDirectionStatus( void )
 {
-    return fpgaSensorReadings.fpgaD12HallStatus;
+    return GET_FPGA_SENSOR_FIELD( fpgaD12HallStatus );
 }
 
 /*********************************************************************//**
@@ -2324,7 +2327,7 @@
  *************************************************************************/
 U08 getFPGAD48PumpHallDirectionStatus( void )
 {
-    return fpgaSensorReadings.fpgaD48HallStatus;
+    return GET_FPGA_SENSOR_FIELD( fpgaD48HallStatus );
 }
 
 /*********************************************************************//**
@@ -2338,12 +2341,12 @@
  *      bit 3: Direction (1=Fwd, 0=Rev)
  *      bit 0-2: Microstepping resolution
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaD11PumpControl
+ * @details \b Outputs: fpgaD11PumpControl
  * @return Acid pump control status bit
  *************************************************************************/
 U08 getFPGAD11PumpControlStatus( void )
 {
-    return fpgaActuatorSetPoints.fpgaD11PumpControl;
+    return GET_FPGA_ACTUATOR_FIELD( fpgaD11PumpControl );
 }
 
 /*********************************************************************//**
@@ -2357,12 +2360,12 @@
  *      bit 3: Direction (1=Fwd, 0=Rev)
  *      bit 0-2: Microstepping resolution
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaD10PumpControl
+ * @details \b Outputs: fpgaD10PumpControl
  * @return Bicarb pump control status bit
  *************************************************************************/
 U08 getFPGAD10PumpControlStatus( void )
 {
-    return fpgaActuatorSetPoints.fpgaD10PumpControl;
+    return GET_FPGA_ACTUATOR_FIELD( fpgaD10PumpControl );
 }
 
 /*********************************************************************//**
@@ -2376,12 +2379,12 @@
  *      bit 3: Direction (1=Fwd, 0=Rev)
  *      bit 0-2: Microstepping resolution
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaD76PumpControl
+ * @details \b Outputs: fpgaD76PumpControl
  * @return UF pump control status bit
  *************************************************************************/
 U08 getFPGAD76PumpControlStatus( void )
 {
-    return fpgaActuatorSetPoints.fpgaD76PumpControl;
+    return GET_FPGA_ACTUATOR_FIELD( fpgaD76PumpControl );
 }
 
 /*********************************************************************//**
@@ -2439,7 +2442,7 @@
  *************************************************************************/
 U08 getFPGAConcentratePumpsFault( void )
 {
-    return fpgaSensorReadings.fpgaD11_D10_PumpFault & FPGA_CONC_PUMP_FAULT_BITS;
+    return ( GET_FPGA_SENSOR_FIELD( fpgaD11_D10_PumpFault ) & FPGA_CONC_PUMP_FAULT_BITS );
 }
 
 /*********************************************************************//**
@@ -2516,7 +2519,7 @@
  *************************************************************************/
 U16 getFPGAD11PumpHallSensePulseWidth( void )
 {
-    return fpgaSensorReadings.fpgaD11PumpHallSense;
+    return GET_FPGA_SENSOR_FIELD( fpgaD11PumpHallSense );
 }
 
 /*********************************************************************//**
@@ -2529,7 +2532,7 @@
  *************************************************************************/
 U16 getFPGAD10PumpHallSensePulseWidth( void )
 {
-    return fpgaSensorReadings.fpgaD10PumpHallSense;
+    return GET_FPGA_SENSOR_FIELD( fpgaD10PumpHallSense );
 }
 
 /*********************************************************************//**
@@ -2542,7 +2545,7 @@
  *************************************************************************/
 U16 getFPGAD76PumpHallSensePulseWidth( void )
 {
-    return fpgaSensorReadings.fpgaD76PumpHallSense;
+    return GET_FPGA_SENSOR_FIELD( fpgaD76PumpHallSense );
 }
 
 /*********************************************************************//**
@@ -2555,7 +2558,7 @@
  *************************************************************************/
 U16 getFPGADDValveStates( void )
 {
-    return fpgaSensorReadings.fpgaValveStates;
+    return GET_FPGA_SENSOR_FIELD( fpgaValveStates );
 }
 
 /*********************************************************************//**
@@ -2569,7 +2572,7 @@
  *************************************************************************/
 U08 getFPGAValveBCStates( void )
 {
-    return fpgaSensorReadings.fpgaValveBCStates;
+    return GET_FPGA_SENSOR_FIELD( fpgaValveBCStates );
 }
 
 /*********************************************************************//**
@@ -2583,7 +2586,7 @@
  *************************************************************************/
 U08 getFPGAValveSpStates( void )
 {
-    return fpgaSensorReadings.fpgaValveSpStates;
+    return GET_FPGA_SENSOR_FIELD( fpgaValveSpStates );
 }
 
 /*********************************************************************//**
@@ -2596,7 +2599,7 @@
  *************************************************************************/
 U16 getFPGAD9PresRawPressure( void )
 {
-    return fpgaSensorReadings.fpgaD9PresPressure;
+    return GET_FPGA_SENSOR_FIELD( fpgaD9PresPressure );
 }
 
 /*********************************************************************//**
@@ -2609,7 +2612,7 @@
  *************************************************************************/
 U16 getFPGAD9PresRawTemperature( void )
 {
-    return fpgaSensorReadings.fpgaD9PresTemp;
+    return GET_FPGA_SENSOR_FIELD( fpgaD9PresTemp );
 }
 
 /*********************************************************************//**
@@ -2622,7 +2625,7 @@
  *************************************************************************/
 U16 getFPGAD66PresRawPressure( void )
 {
-    return fpgaSensorReadings.fpgaD66PresPressure;
+    return GET_FPGA_SENSOR_FIELD( fpgaD66PresPressure );
 }
 
 /*********************************************************************//**
@@ -2635,7 +2638,7 @@
  *************************************************************************/
 U16 getFPGAD66PresRawTemperature( void )
 {
-    return fpgaSensorReadings.fpgaD66PresTemp;
+    return GET_FPGA_SENSOR_FIELD( fpgaD66PresTemp );
 }
 
 /*********************************************************************//**
@@ -2648,7 +2651,7 @@
  *************************************************************************/
 U16 getFPGAD51PresRawPressure( void )
 {
-    return fpgaSensorReadings.fpgaD51PresPressure;
+    return GET_FPGA_SENSOR_FIELD( fpgaD51PresPressure );
 }
 
 /*********************************************************************//**
@@ -2661,7 +2664,7 @@
  *************************************************************************/
 U16 getFPGAD51PresRawTemperature( void )
 {
-    return fpgaSensorReadings.fpgaD51PresTemp;
+    return GET_FPGA_SENSOR_FIELD( fpgaD51PresTemp );
 }
 
 /*********************************************************************//**
@@ -2674,7 +2677,7 @@
  *************************************************************************/
 U16 getFPGAD18PresRawPressure( void )
 {
-    return fpgaSensorReadings.fpgaD18PresPressure;
+    return GET_FPGA_SENSOR_FIELD( fpgaD18PresPressure );
 }
 
 /*********************************************************************//**
@@ -2687,7 +2690,7 @@
  *************************************************************************/
 U16 getFPGAD18PresRawTemperature( void )
 {
-    return fpgaSensorReadings.fpgaD18PresTemp;
+    return GET_FPGA_SENSOR_FIELD( fpgaD18PresTemp );
 }
 
 /*********************************************************************//**
@@ -2700,7 +2703,7 @@
  *************************************************************************/
 U16 getFPGAD41PresRawPressure( void )
 {
-    return fpgaSensorReadings.fpgaD41PresPressure;
+    return GET_FPGA_SENSOR_FIELD( fpgaD41PresPressure );
 }
 
 /*********************************************************************//**
@@ -2713,7 +2716,7 @@
  *************************************************************************/
 U16 getFPGAD41PresRawTemperature( void )
 {
-    return fpgaSensorReadings.fpgaD41PresTemp;
+    return GET_FPGA_SENSOR_FIELD( fpgaD41PresTemp );
 }
 
 /*********************************************************************//**
@@ -2726,7 +2729,7 @@
  *************************************************************************/
 U16 getFPGAD87PresRawPressure( void )
 {
-    return fpgaSensorReadings.fpgaD87PresPressure;
+    return GET_FPGA_SENSOR_FIELD( fpgaD87PresPressure );
 }
 
 /*********************************************************************//**
@@ -2739,7 +2742,7 @@
  *************************************************************************/
 U16 getFPGAD87PresRawTemperature( void )
 {
-    return fpgaSensorReadings.fpgaD87PresTemp;
+    return GET_FPGA_SENSOR_FIELD( fpgaD87PresTemp );
 }
 
 /*********************************************************************//**
@@ -2751,7 +2754,7 @@
  *************************************************************************/
 U08 getFPGAD17CondReadCount( void )
 {
-    return fpgaSensorReadings.fpgaD17CondReadCnt;
+    return GET_FPGA_SENSOR_FIELD( fpgaD17CondReadCnt );
 }
 
 /*********************************************************************//**
@@ -2763,7 +2766,7 @@
  *************************************************************************/
 U08 getFPGAD17CondErrorCount( void )
 {
-    return fpgaSensorReadings.fpgaD17CondErrorCnt;
+    return GET_FPGA_SENSOR_FIELD( fpgaD17CondErrorCnt );
 }
 
 /*********************************************************************//**
@@ -2775,7 +2778,7 @@
  *************************************************************************/
 U16 getFPGAD17Cond( void )
 {
-    return fpgaSensorReadings.fpgaD17CondCond;
+    return GET_FPGA_SENSOR_FIELD( fpgaD17CondCond );
 }
 
 /*********************************************************************//**
@@ -2787,7 +2790,7 @@
  *************************************************************************/
 U16 getFPGAD17CondTemp( void )
 {
-    return fpgaSensorReadings.fpgaD17CondTemp;
+    return GET_FPGA_SENSOR_FIELD( fpgaD17CondTemp );
 }
 
 /*********************************************************************//**
@@ -2799,7 +2802,7 @@
  *************************************************************************/
 U32 getFPGAD17CondData( void )
 {
-    return fpgaSensorReadings.fpgaD17CondCond;
+    return GET_FPGA_SENSOR_FIELD( fpgaD17CondCond );
 }
 
 /*********************************************************************//**
@@ -2811,7 +2814,7 @@
  *************************************************************************/
 U08 getFPGAD27CondReadCount( void )
 {
-    return fpgaSensorReadings.fpgaD27CondReadCnt;
+    return GET_FPGA_SENSOR_FIELD( fpgaD27CondReadCnt );
 }
 
 /*********************************************************************//**
@@ -2823,7 +2826,7 @@
  *************************************************************************/
 U08 getFPGAD27CondErrorCount( void )
 {
-    return fpgaSensorReadings.fpgaD27CondErrorCnt;
+    return GET_FPGA_SENSOR_FIELD( fpgaD27CondErrorCnt );
 }
 
 /*********************************************************************//**
@@ -2835,7 +2838,7 @@
  *************************************************************************/
 U16 getFPGAD27Cond( void )
 {
-    return fpgaSensorReadings.fpgaD27CondCond;
+    return GET_FPGA_SENSOR_FIELD( fpgaD27CondCond );
 }
 
 /*********************************************************************//**
@@ -2847,7 +2850,7 @@
  *************************************************************************/
 U16 getFPGAD27CondTemp( void )
 {
-    return fpgaSensorReadings.fpgaD27CondTemp;
+    return GET_FPGA_SENSOR_FIELD( fpgaD27CondTemp );
 }
 
 /*********************************************************************//**
@@ -2859,7 +2862,7 @@
  *************************************************************************/
 U32 getFPGAD27CondData( void )
 {
-    return fpgaSensorReadings.fpgaD27CondCond;
+    return GET_FPGA_SENSOR_FIELD( fpgaD27CondCond );
 }
 
 /*********************************************************************//**
@@ -2871,7 +2874,7 @@
  *************************************************************************/
 U08 getFPGAD29CondReadCount( void )
 {
-    return fpgaSensorReadings.fpgaD29CondReadCnt;
+    return GET_FPGA_SENSOR_FIELD( fpgaD29CondReadCnt );
 }
 
 /*********************************************************************//**
@@ -2883,7 +2886,7 @@
  *************************************************************************/
 U08 getFPGAD29CondErrorCount( void )
 {
-    return fpgaSensorReadings.fpgaD29CondErrorCnt;
+    return GET_FPGA_SENSOR_FIELD( fpgaD29CondErrorCnt );
 }
 
 /*********************************************************************//**
@@ -2895,7 +2898,7 @@
  *************************************************************************/
 U16 getFPGAD29Cond( void )
 {
-    return fpgaSensorReadings.fpgaD29CondCond;
+    return GET_FPGA_SENSOR_FIELD( fpgaD29CondCond );
 }
 
 /*********************************************************************//**
@@ -2907,7 +2910,7 @@
  *************************************************************************/
 U16 getFPGAD29CondTemp( void )
 {
-    return fpgaSensorReadings.fpgaD29CondTemp;
+    return GET_FPGA_SENSOR_FIELD( fpgaD29CondTemp );
 }
 
 /*********************************************************************//**
@@ -2919,7 +2922,7 @@
  *************************************************************************/
 U32 getFPGAD29CondData( void )
 {
-    return fpgaSensorReadings.fpgaD29CondCond;
+    return GET_FPGA_SENSOR_FIELD( fpgaD29CondCond );
 }
 
 /*********************************************************************//**
@@ -2931,7 +2934,7 @@
  *************************************************************************/
 U08 getFPGAD43CondReadCount( void )
 {
-    return fpgaSensorReadings.fpgaD43CondReadCnt;
+    return GET_FPGA_SENSOR_FIELD( fpgaD43CondReadCnt );
 }
 
 /*********************************************************************//**
@@ -2943,7 +2946,7 @@
  *************************************************************************/
 U08 getFPGAD43CondErrorCount( void )
 {
-    return fpgaSensorReadings.fpgaD43CondErrorCnt;
+    return GET_FPGA_SENSOR_FIELD( fpgaD43CondErrorCnt );
 }
 
 /*********************************************************************//**
@@ -2955,7 +2958,7 @@
  *************************************************************************/
 U16 getFPGAD43Cond( void )
 {
-    return fpgaSensorReadings.fpgaD43CondCond;
+    return GET_FPGA_SENSOR_FIELD( fpgaD43CondCond );
 }
 
 /*********************************************************************//**
@@ -2967,7 +2970,7 @@
  *************************************************************************/
 U16 getFPGAD43CondTemp( void )
 {
-    return fpgaSensorReadings.fpgaD43CondTemp;
+    return GET_FPGA_SENSOR_FIELD( fpgaD43CondTemp );
 }
 
 /*********************************************************************//**
@@ -2979,7 +2982,7 @@
  *************************************************************************/
 U32 getFPGAD43CondData( void )
 {
-    return fpgaSensorReadings.fpgaD43CondCond;
+    return GET_FPGA_SENSOR_FIELD( fpgaD43CondCond );
 }
 
 /*********************************************************************//**
@@ -2991,7 +2994,7 @@
  *************************************************************************/
 U08 getFPGAD74CondReadCount( void )
 {
-    return fpgaSensorReadings.fpgaD74CondReadCnt;
+    return GET_FPGA_SENSOR_FIELD( fpgaD74CondReadCnt );
 }
 
 /*********************************************************************//**
@@ -3003,7 +3006,7 @@
  *************************************************************************/
 U08 getFPGAD74CondErrorCount( void )
 {
-    return fpgaSensorReadings.fpgaD74CondErrorCnt;
+    return GET_FPGA_SENSOR_FIELD( fpgaD74CondErrorCnt );
 }
 
 /*********************************************************************//**
@@ -3015,7 +3018,7 @@
  *************************************************************************/
 U16 getFPGAD74Cond( void )
 {
-    return fpgaSensorReadings.fpgaD74CondCond;
+    return GET_FPGA_SENSOR_FIELD( fpgaD74CondCond );
 }
 
 /*********************************************************************//**
@@ -3027,7 +3030,7 @@
  *************************************************************************/
 U16 getFPGAD74CondTemp( void )
 {
-    return fpgaSensorReadings.fpgaD74CondTemp;
+    return GET_FPGA_SENSOR_FIELD( fpgaD74CondTemp );
 }
 
 /*********************************************************************//**
@@ -3039,7 +3042,7 @@
  *************************************************************************/
 U32 getFPGAD74CondData( void )
 {
-    return fpgaSensorReadings.fpgaD74CondCond;
+    return GET_FPGA_SENSOR_FIELD( fpgaD74CondCond );
 }
 
 /*********************************************************************//**
@@ -3113,7 +3116,7 @@
  *************************************************************************/
 U08 getFPGAD6LevelStatus( void )
 {
-    return ( fpgaSensorReadings.fpgaD6FloaterStatus & FPGA_FLOATER_LEVEL_BIT );
+    return ( GET_FPGA_SENSOR_FIELD( fpgaD6FloaterStatus ) & FPGA_FLOATER_LEVEL_BIT );
 }
 
 /*********************************************************************//**
@@ -3146,7 +3149,7 @@
  *************************************************************************/
 static U16 getFPGATimerCount( void )
 {
-    return fpgaSensorReadings.fpgaTimerCountMS;
+    return GET_FPGA_SENSOR_FIELD( fpgaTimerCountMS );
 }
 
 /*********************************************************************//**
@@ -3159,7 +3162,7 @@
  *************************************************************************/
 U32 getFPGAD1Temp( void )
 {
-    return fpgaSensorReadings.fpgaD1Temp;
+    return GET_FPGA_SENSOR_FIELD( fpgaD1Temp );
 }
 
 /*********************************************************************//**
@@ -3172,7 +3175,7 @@
  *************************************************************************/
 U32 getFPGAD78Temp( void )
 {
-    return fpgaSensorReadings.fpgaD78Temp;
+    return GET_FPGA_SENSOR_FIELD( fpgaD78Temp );
 }
 
 /*********************************************************************//**
@@ -3185,7 +3188,7 @@
  *************************************************************************/
 U32 getFPGAD4Temp( void )
 {
-    return fpgaSensorReadings.fpgaD4Temp;
+    return GET_FPGA_SENSOR_FIELD( fpgaD4Temp );
 }
 
 /*********************************************************************//**
@@ -3197,7 +3200,7 @@
  *************************************************************************/
 U32 getFPGAD50Temp( void )
 {
-    return fpgaSensorReadings.fpgaD50Temp;
+    return GET_FPGA_SENSOR_FIELD( fpgaD50Temp );
 }
 
 /*********************************************************************//**
@@ -3209,7 +3212,7 @@
  *************************************************************************/
 U32 getFPGAD99Temp( void )
 {
-    return fpgaSensorReadings.fpgaD99Temp;
+    return GET_FPGA_SENSOR_FIELD( fpgaD99Temp );
 }
 
 /*********************************************************************//**
@@ -3221,7 +3224,7 @@
  *************************************************************************/
 U08 getFPGARTDReadCount( void )
 {
-    return fpgaSensorReadings.fpgaRTDReadCnt;
+    return GET_FPGA_SENSOR_FIELD( fpgaRTDReadCnt );
 }
 
 /*********************************************************************//**
@@ -3234,7 +3237,7 @@
  *************************************************************************/
 U08 getFPGARTDCountErrorCycles( void )
 {
-    return fpgaSensorReadings.fpgaRTDCountErrorCycles;
+    return GET_FPGA_SENSOR_FIELD( fpgaRTDCountErrorCycles );
 }
 
 /*********************************************************************//**
@@ -3268,7 +3271,7 @@
  *************************************************************************/
 U16 getFPGAD11PumpRevolutionCountStatus( void )
 {
-    return fpgaSensorReadings.fpgaD11PumpStepCountStatus;
+    return GET_FPGA_SENSOR_FIELD( fpgaD11PumpStepCountStatus );
 }
 
 /*********************************************************************//**
@@ -3281,7 +3284,7 @@
  *************************************************************************/
 U16 getFPGAD10PumpRevolutionCountStatus( void )
 {
-    return fpgaSensorReadings.fpgaD10PumpStepCountStatus;
+    return GET_FPGA_SENSOR_FIELD( fpgaD10PumpStepCountStatus );
 }
 
 /*********************************************************************//**
@@ -3294,7 +3297,7 @@
  *************************************************************************/
 U16 getFPGAD76PumpRevolutionCountStatus( void )
 {
-    return fpgaSensorReadings.fpgaD76PumpStepCountStatus;
+    return GET_FPGA_SENSOR_FIELD( fpgaD76PumpStepCountStatus );
 }
 
 /*********************************************************************//**
@@ -3356,7 +3359,7 @@
  *************************************************************************/
 void setFPGABloodLeakUARTControl( U08 value )
 {
-    fpgaActuatorSetPoints.fpgaD42UARTControl = value;
+    SET_FPGA_ACTUATOR_FIELD( fpgaD42UARTControl, value );
 }
 
 /*********************************************************************//**
@@ -3369,7 +3372,7 @@
  *************************************************************************/
 void setFPGABloodLeakUARTTransmit( U08 value )
 {
-    fpgaActuatorSetPoints.fpgaD42FIFOTx = value;
+    SET_FPGA_ACTUATOR_FIELD( fpgaD42FIFOTx, value );
 }
 
 /*********************************************************************//**
@@ -3378,11 +3381,11 @@
  * FIFO count.
  * @details \b Inputs: fpgaSensorReadings
  * @details \b Outputs: none
- * @return fpgaSensorReadings.fpgaD42TxFIFOCnt
+ * @return fpgaD42TxFIFOCnt
  *************************************************************************/
 U08 getFPGABloodLeakTxFIFOCount( void )
 {
-    return fpgaSensorReadings.fpgaD42TxFIFOCnt;
+    return GET_FPGA_SENSOR_FIELD( fpgaD42TxFIFOCnt );
 }
 
 /*********************************************************************//**
@@ -3391,11 +3394,11 @@
  * FIFO count.
  * @details \b Inputs: fpgaSensorReadings
  * @details \b Outputs: none
- * @return fpgaSensorReadings.fpgaD42RxFIFOCnt
+ * @return fpgaD42RxFIFOCnt
  *************************************************************************/
 U16 getFPGABloodLeakRxFIFOCount( void )
 {
-    return fpgaSensorReadings.fpgaD42RxFIFOCnt;
+    return GET_FPGA_SENSOR_FIELD( fpgaD42RxFIFOCnt );
 }
 
 /*********************************************************************//**
@@ -3404,11 +3407,11 @@
  * error count.
  * @details \b Inputs: fpgaSensorReadings
  * @details \b Outputs: none
- * @return fpgaSensorReadings.fpgaD42RxErrorCnt
+ * @return fpgaD42RxErrorCnt
  *************************************************************************/
 U08 getFPGABloodLeakRxErrorCount( void )
 {
-    return fpgaSensorReadings.fpgaD42RxErrorCnt;
+    return GET_FPGA_SENSOR_FIELD( fpgaD42RxErrorCnt );
 }
 
 /*********************************************************************//**
@@ -3417,37 +3420,37 @@
  * FIFO data out.
  * @details \b Inputs: fpgaSensorReadings
  * @details \b Outputs: none
- * @return fpgaSensorReadings.fpgaD42RxFIFODataOut
+ * @return fpgaD42RxFIFODataOut
  *************************************************************************/
 U08 getFPGABloodLeakRxFIFODataOut( void )
 {
-    return fpgaSensorReadings.fpgaD42RxFIFODataOut;
+    return GET_FPGA_SENSOR_FIELD( fpgaD42RxFIFODataOut );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD79RinsePumpControl function sets the control bit of the rinse
  * pump to turn it on or off.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaDDSpareValveControl
+ * @details \b Outputs: fpgaDDSpareValveControl
  * @return none
  *************************************************************************/
 void setFPGAD79RinsePumpControl( U08 value )
 {
-    fpgaActuatorSetPoints.fpgaDDSpareValveControl &= value;
+    SET_FPGA_ACTUATOR_FIELD( fpgaDDSpareValveControl ) &= value;
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAD79RinsePumpPWMControl function sets the PWM value of the rinse
  * pump to turn it on or off.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.fpgaD79PWMPumpCtl
+ * @details \b Outputs: fpgaD79PWMPumpCtl
  * @return none
  *************************************************************************/
 void setFPGAD79RinsePumpPWMControl( U08 value )
 {
-    fpgaActuatorSetPoints.fpgaD79PWMPumpCtl = value;
+    SET_FPGA_ACTUATOR_FIELD( fpgaD79PWMPumpCtl, value );
 }
 
 /*********************************************************************//**
@@ -3456,11 +3459,11 @@
  * pulse width.
  * @details \b Inputs: d79SpeedPulseWidth
  * @details \b Outputs: none
- * @return fpgaSensorReadings.d79SpeedPulseWidth
+ * @return d79SpeedPulseWidth
  *************************************************************************/
 U16 getFPGAD79RinsePumpPulseWidth( void )
 {
-    return fpgaSensorReadings.d79SpeedPulseWidth;
+    return GET_FPGA_SENSOR_FIELD( d79SpeedPulseWidth );
 }
 
 /*********************************************************************//**
@@ -3476,13 +3479,13 @@
  *      5 - P6.\n
  *      6:8 - Not used. \n
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.valveFPControl
+ * @details \b Outputs: valveFPControl
  * @param valveStates bit mask for requested valve states
  * @return none
  *************************************************************************/
 void setFPGAFPValveStates( U08 valveStates )
 {
-    fpgaActuatorSetPoints.valveFPControl = valveStates;
+    SET_FPGA_ACTUATOR_FIELD( valveFPControl, valveStates );
 }
 
 /*********************************************************************//**
@@ -3496,7 +3499,7 @@
  *************************************************************************/
 U08 getFPGAFPValveStates( void )
 {
-    return fpgaSensorReadings.valveFPControlReadback;
+    return GET_FPGA_SENSOR_FIELD( valveFPControlReadback );
 }
 
 /*********************************************************************//**
@@ -3508,13 +3511,13 @@
  *      1 - M12_VALV.\n
  *      2:8 - Not used. \n
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.valveIOControl
+ * @details \b Outputs: valveIOControl
  * @param valveStates bit mask for requested valve states
  * @return none
  *************************************************************************/
 void setFPGAIOValveStates( U08 valveStates )
 {
-    fpgaActuatorSetPoints.valveIOControl = valveStates;
+    SET_FPGA_ACTUATOR_FIELD( valveIOControl, valveStates );
 }
 
 /*********************************************************************//**
@@ -3528,7 +3531,7 @@
  *************************************************************************/
 U08 getFPGAIOValveStates( void )
 {
-    return fpgaSensorReadings.valveIOControlReadback;
+    return GET_FPGA_SENSOR_FIELD( valveIOControlReadback );
 }
 
 /*********************************************************************//**
@@ -3537,13 +3540,13 @@
  * * an 8-bit mask representing the set of states with a 1 meaning "enabled"
  * and a 0 meaning "disabled"
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.valveIOPWMEnable
+ * @details \b Outputs: valveIOPWMEnable
  * @param valvePWMStates bit mask for requested valve states.
  * @return none
  *************************************************************************/
 void setFPGAValveIOPWMEnable( U08 valvePWMStates )
 {
-    fpgaActuatorSetPoints.valveIOPWMEnable = valvePWMStates;
+    SET_FPGA_ACTUATOR_FIELD( valveIOPWMEnable, valvePWMStates );
 }
 
 /*********************************************************************//**
@@ -3557,7 +3560,7 @@
  *************************************************************************/
 U08 getFPGAValveIOPWMEnable( void )
 {
-    return fpgaSensorReadings.valveIOPWMEnableReadback;
+    return GET_FPGA_SENSOR_FIELD( valveIOPWMEnableReadback );
 }
 
 /*********************************************************************//**
@@ -3566,13 +3569,13 @@
  * * an 8-bit mask representing the set of states with a 1 meaning "enabled"
  * and a 0 meaning "disabled"
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.valveFPPWMEnable
+ * @details \b Outputs: valveFPPWMEnable
  * @param valvePWMStates bit mask for requested valve states.
  * @return none
  *************************************************************************/
 void setFPGAValveFPPWMEnable( U08 valvePWMStates )
 {
-    fpgaActuatorSetPoints.valveFPPWMEnable = valvePWMStates;
+    SET_FPGA_ACTUATOR_FIELD( valveFPPWMEnable, valvePWMStates );
 }
 
 /*********************************************************************//**
@@ -3586,62 +3589,62 @@
  *************************************************************************/
 U08 getFPGAValveFPPWMEnable( void )
 {
-    return fpgaSensorReadings.valveFPPWMEnableReadback;
+    return GET_FPGA_SENSOR_FIELD( valveFPPWMEnableReadback );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAValveIOFPPWMPullIn function sets the IO & FP valves Pull-in "strike"
  * period where PWM is at 100% in 1ms resolution.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.valveIOFPPWMPullIn
+ * @details \b Outputs: valveIOFPPWMPullIn
  * @param valvePWMPullIn Pull-in period in 1ms resolution.
  * @return none
  *************************************************************************/
 void setFPGAValveIOFPPWMPullIn( U16 valvePWMPullIn )
 {
-    fpgaActuatorSetPoints.valveIOFPPWMPullIn = valvePWMPullIn;
+    SET_FPGA_ACTUATOR_FIELD( valveIOFPPWMPullIn, valvePWMPullIn );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAValveIOFPPWMLow function sets the IO & FP valves "low"
  * period where PWM is at 0% in 0.1us resolution.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.valveIOFPPWMLow
+ * @details \b Outputs: valveIOFPPWMLow
  * @param valvePWMLow low period in 0.1us resolution.
  * @return none
  *************************************************************************/
 void setFPGAValveIOFPPWMLow( U16 valvePWMLow )
 {
-    fpgaActuatorSetPoints.valveIOFPPWMLow = valvePWMLow;
+    SET_FPGA_ACTUATOR_FIELD( valveIOFPPWMLow, valvePWMLow );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAValveIOFPPWMPeriod function sets the IO & FP valves pwm
  * period in 0.1us resolution.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.valveIOFPPWMPeriod
+ * @details \b Outputs: valveIOFPPWMPeriod
  * @param valvePWMPeriod period in 0.1us resolution.
  * @return none
  *************************************************************************/
 void setFPGAValveIOFPPWMPeriod( U16 valvePWMPeriod )
 {
-    fpgaActuatorSetPoints.valveIOFPPWMPeriod = valvePWMPeriod;
+    SET_FPGA_ACTUATOR_FIELD( valveIOFPPWMPeriod, valvePWMPeriod );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAP12PumpEnable function enables or disables the P12 pump.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.p12PumpControl
+ * @details \b Outputs: p12PumpControl
  * @param enable flag indicating whether to enable or disable the P12 pump.
  * @return none
  *************************************************************************/
 void setFPGAP12PumpEnable( BOOL enable )
 {
-    fpgaActuatorSetPoints.p12PumpControl = ( TRUE == enable ? 0x1 : 0x0 );
+    SET_FPGA_ACTUATOR_FIELD( p12PumpControl, ( TRUE == enable ? 0x1 : 0x0 ) );
 }
 
 /*********************************************************************//**
@@ -3651,13 +3654,13 @@
  * @note PWM values < 5% or > 95% will cause pump to stop so effective
  * range is actually 25..475.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.p12PumpPWMDutyCyclePct
+ * @details \b Outputs: p12PumpPWMDutyCyclePct
  * @param pwm PWM duty cycle magnitude
  * @return none
  *************************************************************************/
 void setFPGAP12PumpPWM( U16 pwm )
 {
-   fpgaActuatorSetPoints.p12PumpPWMDutyCyclePct = pwm;
+   SET_FPGA_ACTUATOR_FIELD( p12PumpPWMDutyCyclePct, pwm );
 }
 
 /*********************************************************************//**
@@ -3670,7 +3673,7 @@
  *************************************************************************/
 U16 getFPGAP12PumpPWM( void )
 {
-    return fpgaSensorReadings.p12PumpPWMReadback;
+    return GET_FPGA_SENSOR_FIELD( p12PumpPWMReadback );
 }
 
 /*********************************************************************//**
@@ -3683,14 +3686,14 @@
  *************************************************************************/
 U16 getFPGAP12PumpTachCount( void )
 {
-    return fpgaSensorReadings.p12PumpTachCount;
+    return GET_FPGA_SENSOR_FIELD( p12PumpTachCount );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAP24Enabled function sets the heater enable on or off.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.p24Control
+ * @details \b Outputs: p24Control
  * @param enable Flag indicating whether to enable or disable the P24 heater.
  * @return none
  *************************************************************************/
@@ -3706,7 +3709,7 @@
  * @note PWM values < 5% or > 95% will cause heater to go off so effective
  * range is actually 25..475.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.p24PWMDutyCyclePct
+ * @details \b Outputs: p24PWMDutyCyclePct
  * @param pwm PWM duty cycle magnitude
  * @return none
  *************************************************************************/
@@ -3724,7 +3727,7 @@
  *************************************************************************/
 S16 getFPGAP46RawPressure( void )
 {
-    return fpgaSensorReadings.pressureP46;
+    return GET_FPGA_SENSOR_FIELD( pressureP46 );
 }
 
 /*********************************************************************//**
@@ -3736,7 +3739,7 @@
  *************************************************************************/
 S16 getFPGAP46RawTemperature( void )
 {
-    return fpgaSensorReadings.temperatureP46;
+    return GET_FPGA_SENSOR_FIELD( temperatureP46 );
 }
 
 /*********************************************************************//**
@@ -3748,7 +3751,7 @@
  *************************************************************************/
 S16 getFPGAM3RawPressure( void )
 {
-    return fpgaSensorReadings.pressureM3;
+    return GET_FPGA_SENSOR_FIELD( pressureM3 );
 }
 
 /*********************************************************************//**
@@ -3760,7 +3763,7 @@
  *************************************************************************/
 S16 getFPGAM3RawTemperature( void )
 {
-    return fpgaSensorReadings.temperatureM3;
+    return GET_FPGA_SENSOR_FIELD( temperatureM3 );
 }
 
 /*********************************************************************//**
@@ -3772,7 +3775,7 @@
  *************************************************************************/
 S16 getFPGAP8RawPressure( void )
 {
-    return fpgaSensorReadings.pressureP8;
+    return GET_FPGA_SENSOR_FIELD( pressureP8 );
 }
 
 /*********************************************************************//**
@@ -3784,7 +3787,7 @@
  *************************************************************************/
 S16 getFPGAP8RawTemperature( void )
 {
-    return fpgaSensorReadings.temperatureP8;
+    return GET_FPGA_SENSOR_FIELD( temperatureP8 );
 }
 
 /*********************************************************************//**
@@ -3796,7 +3799,7 @@
  *************************************************************************/
 S16 getFPGAP13RawPressure( void )
 {
-    return fpgaSensorReadings.pressureP13;
+    return GET_FPGA_SENSOR_FIELD( pressureP13 );
 }
 
 /*********************************************************************//**
@@ -3808,7 +3811,7 @@
  *************************************************************************/
 S16 getFPGAP13RawTemperature( void )
 {
-    return fpgaSensorReadings.temperatureP13;
+    return GET_FPGA_SENSOR_FIELD( temperatureP13 );
 }
 
 /*********************************************************************//**
@@ -3820,7 +3823,7 @@
  *************************************************************************/
 S16 getFPGAP17RawPressure( void )
 {
-    return fpgaSensorReadings.pressureP17;
+    return GET_FPGA_SENSOR_FIELD( pressureP17 );
 }
 
 /*********************************************************************//**
@@ -3832,7 +3835,7 @@
  *************************************************************************/
 S16 getFPGAP17RawTemperature( void )
 {
-    return fpgaSensorReadings.temperatureP17;
+    return GET_FPGA_SENSOR_FIELD( temperatureP17 );
 }
 
 /*********************************************************************//**
@@ -3872,7 +3875,7 @@
  *************************************************************************/
 U16 getFPGAFlowP16Temp( void )
 {
-    return fpgaSensorReadings.flowTempP16;
+    return GET_FPGA_SENSOR_FIELD( flowTempP16 );
 }
 
 /*********************************************************************//**
@@ -3885,7 +3888,7 @@
  *************************************************************************/
 U16 getFPGAFlowP16InternalTemp( void )
 {
-    return fpgaSensorReadings.flowIntTempP16;
+    return GET_FPGA_SENSOR_FIELD( flowIntTempP16 );
 }
 
 /*********************************************************************//**
@@ -3897,7 +3900,7 @@
  *************************************************************************/
 U16 getFPGAFlowP7( void )
 {
-    return fpgaSensorReadings.flowRateP7;
+    return GET_FPGA_SENSOR_FIELD( flowRateP7 );
 }
 
 /*********************************************************************//**
@@ -3910,7 +3913,7 @@
  *************************************************************************/
 U16 getFPGAFlowP7Temp( void )
 {
-    return fpgaSensorReadings.flowTempP7;
+    return GET_FPGA_SENSOR_FIELD( flowTempP7 );
 }
 
 /*********************************************************************//**
@@ -3923,7 +3926,7 @@
  *************************************************************************/
 U16 getFPGAFlowP7InternalTemp( void )
 {
-    return fpgaSensorReadings.flowIntTempP7;
+    return GET_FPGA_SENSOR_FIELD( flowIntTempP7 );
 }
 
 /*********************************************************************//**
@@ -3936,41 +3939,41 @@
  *      bit 1: Enable P9 initialization procedure
  *      bit 0: reset P9 sensor
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.conductivityP9Control
+ * @details \b Outputs: conductivityP9Control
  * @param control bits indicating control action to take
  * @return none
  *************************************************************************/
 void setFPGAP9Control( U08 control )
 {
-    fpgaActuatorSetPoints.conductivityP9Control = control;
+    SET_FPGA_ACTUATOR_FIELD( conductivityP9Control, control );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAP9Address function sets the read/write address for a read/write
  * action on the P9 sensor.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.conductivityP9Address
+ * @details \b Outputs: conductivityP9Address
  * @param address The P9 sensor address to read from or write to
  * @return none
  *************************************************************************/
 void setFPGAP9Address( U16 address )
 {
-    fpgaActuatorSetPoints.conductivityP9Address = address;
+    SET_FPGA_ACTUATOR_FIELD( conductivityP9Address, address );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAP9Data function sets the write data for a write action on
  * the P9 sensor.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.conductivityP9Data
+ * @details \b Outputs: conductivityP9Data
  * @param data The 32-bit data to write to the P9 sensor
  * @return none
  *************************************************************************/
 void setFPGAP9Data( U32 data )
 {
-    fpgaActuatorSetPoints.conductivityP9Data = data;
+    SET_FPGA_ACTUATOR_FIELD( conductivityP9Data, data );
 }
 
 /*********************************************************************//**
@@ -3983,245 +3986,245 @@
  *      bit 1: Enable P18 initialization procedure
  *      bit 0: reset P18 sensor
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.conductivityP18Control
+ * @details \b Outputs: conductivityP18Control
  * @param control bits indicating control action to take
  * @return none
  *************************************************************************/
 void setFPGAP18Control( U08 control )
 {
-    fpgaActuatorSetPoints.conductivityP18Control = control;
+    SET_FPGA_ACTUATOR_FIELD( conductivityP18Control, control );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAP18Address function sets the read/write address for a read/write
  * action on the P18 sensor.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.conductivityP18Address
+ * @details \b Outputs: conductivityP18Address
  * @param address The P18 sensor address to read from or write to
  * @return none
  *************************************************************************/
 void setFPGAP18Address( U16 address )
 {
-    fpgaActuatorSetPoints.conductivityP18Address = address;
+    SET_FPGA_ACTUATOR_FIELD( conductivityP18Address, address );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAP18Data function sets the write data for a write action on
  * the P18 sensor.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.conductivityP18Data
+ * @details \b Outputs: conductivityP18Data
  * @param data The 32-bit data to write to the P18 sensor
  * @return none
  *************************************************************************/
 void setFPGAP18Data( U32 data )
 {
-    fpgaActuatorSetPoints.conductivityP18Data = data;
+    SET_FPGA_ACTUATOR_FIELD( conductivityP18Data, data );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAP9Reset function sets the reset command bit for P9 sensor.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.conductivityP9Control
+ * @details \b Outputs: conductivityP9Control
  * @return none
  *************************************************************************/
 void setFPGAP9Reset( void )
 {
-    fpgaActuatorSetPoints.conductivityP9Control |= FPGA_CONDUCTIVITY_RESET_BIT;
+    SET_FPGA_ACTUATOR_FIELD( conductivityP9Control ) |= FPGA_CONDUCTIVITY_RESET_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The clearFPGAP9Reset function clears the reset command bit for P9 sensor.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.conductivityP9Control
+ * @details \b Outputs: conductivityP9Control
  * @return none
  *************************************************************************/
 void clearFPGAP9Reset( void )
 {
-    fpgaActuatorSetPoints.conductivityP9Control &= ~FPGA_CONDUCTIVITY_RESET_BIT;
+    SET_FPGA_ACTUATOR_FIELD( conductivityP9Control ) &= ~FPGA_CONDUCTIVITY_RESET_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAP9InitEnable function sets the initialize command bit for
  * P9 sensor.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.conductivityP9Control
+ * @details \b Outputs: conductivityP9Control
  * @return none
  *************************************************************************/
 void setFPGAP9InitEnable( void )
 {
-    fpgaActuatorSetPoints.conductivityP9Control |= FPGA_CONDUCTIVITY_INIT_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( conductivityP9Control ) |= FPGA_CONDUCTIVITY_INIT_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The clearFPGAP9InitEnable function clears the initialize command bit for
  * P9 sensor.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.conductivityP9Control
+ * @details \b Outputs: conductivityP9Control
  * @return none
  *************************************************************************/
 void clearFPGAP9InitEnable( void )
 {
-    fpgaActuatorSetPoints.conductivityP9Control &= ~FPGA_CONDUCTIVITY_INIT_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( conductivityP9Control ) &= ~FPGA_CONDUCTIVITY_INIT_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAP9WriteEnable function sets the write enable command bit for
  * P9 sensor.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.conductivityP9Control
+ * @details \b Outputs: conductivityP9Control
  * @return none
  *************************************************************************/
 void setFPGAP9WriteEnable( void )
 {
-    fpgaActuatorSetPoints.conductivityP9Control |= FPGA_CONDUCTIVITY_WR_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( conductivityP9Control ) |= FPGA_CONDUCTIVITY_WR_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The clearFPGAP9WriteEnable function clears the write enable command bit
  * for P9 sensor.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.conductivityP9Control
+ * @details \b Outputs: conductivityP9Control
  * @return none
  *************************************************************************/
 void clearFPGAP9WriteEnable( void )
 {
-    fpgaActuatorSetPoints.conductivityP9Control &= ~FPGA_CONDUCTIVITY_WR_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( conductivityP9Control ) &= ~FPGA_CONDUCTIVITY_WR_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAP9ReadEnable function sets the read enable command bit for
  * P9 sensor.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.conductivityP9Control
+ * @details \b Outputs: conductivityP9Control
  * @return none
  *************************************************************************/
 void setFPGAP9ReadEnable( void )
 {
-    fpgaActuatorSetPoints.conductivityP9Control |= FPGA_CONDUCTIVITY_RD_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( conductivityP9Control ) |= FPGA_CONDUCTIVITY_RD_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The clearFPGAP9ReadEnable function clears the read enable command bit
  * for P9 sensor.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.conductivityP9Control
+ * @details \b Outputs: conductivityP9Control
  * @return none
  *************************************************************************/
 void clearFPGAP9ReadEnable( void )
 {
-    fpgaActuatorSetPoints.conductivityP9Control &= ~FPGA_CONDUCTIVITY_RD_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( conductivityP9Control ) &= ~FPGA_CONDUCTIVITY_RD_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAP18Reset function sets the reset command bit for P18 sensor.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.conductivityP18Control
+ * @details \b Outputs: conductivityP18Control
  * @return none
  *************************************************************************/
 void setFPGAP18Reset( void )
 {
-    fpgaActuatorSetPoints.conductivityP18Control |= FPGA_CONDUCTIVITY_RESET_BIT;
+    SET_FPGA_ACTUATOR_FIELD( conductivityP18Control ) |= FPGA_CONDUCTIVITY_RESET_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The clearFPGAP18Reset function clears the reset command bit for P18 sensor.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.conductivityP18Control
+ * @details \b Outputs: conductivityP18Control
  * @return none
  *************************************************************************/
 void clearFPGAP18Reset( void )
 {
-    fpgaActuatorSetPoints.conductivityP18Control &= ~FPGA_CONDUCTIVITY_RESET_BIT;
+    SET_FPGA_ACTUATOR_FIELD( conductivityP18Control ) &= ~FPGA_CONDUCTIVITY_RESET_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAP18InitEnable function sets the initialize command bit for
  * P18 sensor.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.conductivityP18Control
+ * @details \b Outputs: conductivityP18Control
  * @return none
  *************************************************************************/
 void setFPGAP18InitEnable( void )
 {
-    fpgaActuatorSetPoints.conductivityP18Control |= FPGA_CONDUCTIVITY_INIT_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( conductivityP18Control ) |= FPGA_CONDUCTIVITY_INIT_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The clearFPGAP18InitEnable function clears the initialize command bit for
  * P18 sensor.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.conductivityP18Control
+ * @details \b Outputs: conductivityP18Control
  * @return none
  *************************************************************************/
 void clearFPGAP18InitEnable( void )
 {
-    fpgaActuatorSetPoints.conductivityP18Control &= ~FPGA_CONDUCTIVITY_INIT_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( conductivityP18Control ) &= ~FPGA_CONDUCTIVITY_INIT_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAP18WriteEnable function sets the write enable command bit for
  * P18 sensor.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.conductivityP18Control
+ * @details \b Outputs: conductivityP18Control
  * @return none
  *************************************************************************/
 void setFPGAP18WriteEnable( void )
 {
-    fpgaActuatorSetPoints.conductivityP18Control |= FPGA_CONDUCTIVITY_WR_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( conductivityP18Control ) |= FPGA_CONDUCTIVITY_WR_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The clearFPGAP18WriteEnable function clears the write enable command bit
  * for P18 sensor.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.conductivityP18Control
+ * @details \b Outputs: conductivityP18Control
  * @return none
  *************************************************************************/
 void clearFPGAP18WriteEnable( void )
 {
-    fpgaActuatorSetPoints.conductivityP18Control &= ~FPGA_CONDUCTIVITY_WR_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( conductivityP18Control ) &= ~FPGA_CONDUCTIVITY_WR_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAP18ReadEnable function sets the read enable command bit for
  * P18 sensor.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.conductivityP18Control
+ * @details \b Outputs: conductivityP18Control
  * @return none
  *************************************************************************/
 void setFPGAP18ReadEnable( void )
 {
-    fpgaActuatorSetPoints.conductivityP18Control |= FPGA_CONDUCTIVITY_RD_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( conductivityP18Control ) |= FPGA_CONDUCTIVITY_RD_ENABLE_BIT;
 }
 
 /*********************************************************************//**
  * @brief
  * The clearFPGAP18ReadEnable function clears the read enable command bit
  * for P18 sensor.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.conductivityP18Control
+ * @details \b Outputs: conductivityP18Control
  * @return none
  *************************************************************************/
 void clearFPGAP18ReadEnable( void )
 {
-    fpgaActuatorSetPoints.conductivityP18Control &= ~FPGA_CONDUCTIVITY_RD_ENABLE_BIT;
+    SET_FPGA_ACTUATOR_FIELD( conductivityP18Control ) &= ~FPGA_CONDUCTIVITY_RD_ENABLE_BIT;
 }
 
 /*********************************************************************//**
@@ -4233,7 +4236,7 @@
  *************************************************************************/
 U08 getFPGAP9ReadCount( void )
 {
-    return fpgaSensorReadings.conductivityP9ReadCount;
+    return GET_FPGA_SENSOR_FIELD( conductivityP9ReadCount );
 }
 
 /*********************************************************************//**
@@ -4245,7 +4248,7 @@
  *************************************************************************/
 U08 getFPGAP9ErrorCount( void )
 {
-    return fpgaSensorReadings.conductivityP9ErrorCount;
+    return GET_FPGA_SENSOR_FIELD( conductivityP9ErrorCount );
 }
 
 /*********************************************************************//**
@@ -4258,7 +4261,7 @@
  *************************************************************************/
 U16 getFPGAP9Conductivity( void )
 {
-    return fpgaSensorReadings.conductivityP9Cond;
+    return GET_FPGA_SENSOR_FIELD( conductivityP9Cond );
 }
 
 /*********************************************************************//**
@@ -4270,7 +4273,7 @@
  *************************************************************************/
 U16 getFPGAP9Temperature( void )
 {
-    return fpgaSensorReadings.conductivityP9Temp;
+    return GET_FPGA_SENSOR_FIELD( conductivityP9Temp );
 }
 
 /*********************************************************************//**
@@ -4283,7 +4286,7 @@
  *************************************************************************/
 U32 getFPGAP9Data( void )
 {
-    return fpgaSensorReadings.conductivityP9Data;
+    return GET_FPGA_SENSOR_FIELD( conductivityP9Data );
 }
 
 /*********************************************************************//**
@@ -4295,7 +4298,7 @@
  *************************************************************************/
 U08 getFPGAP18ReadCount( void )
 {
-    return fpgaSensorReadings.conductivityP18ReadCount;
+    return GET_FPGA_SENSOR_FIELD( conductivityP18ReadCount );
 }
 
 /*********************************************************************//**
@@ -4307,7 +4310,7 @@
  *************************************************************************/
 U08 getFPGAP18ErrorCount( void )
 {
-    return fpgaSensorReadings.conductivityP18ErrorCount;
+    return GET_FPGA_SENSOR_FIELD( conductivityP18ErrorCount );
 }
 
 /*********************************************************************//**
@@ -4320,7 +4323,7 @@
  *************************************************************************/
 U16 getFPGAP18Conductivity( void )
 {
-    return fpgaSensorReadings.conductivityP18Cond;
+    return GET_FPGA_SENSOR_FIELD( conductivityP18Cond );
 }
 
 /*********************************************************************//**
@@ -4332,7 +4335,7 @@
  *************************************************************************/
 U16 getFPGAP18Temperature( void )
 {
-    return fpgaSensorReadings.conductivityP18Temp;
+    return GET_FPGA_SENSOR_FIELD( conductivityP18Temp );
 }
 
 /*********************************************************************//**
@@ -4345,20 +4348,20 @@
  *************************************************************************/
 U32 getFPGAP18Data( void )
 {
-    return fpgaSensorReadings.conductivityP18Data;
+    return GET_FPGA_SENSOR_FIELD( conductivityP18Data );
 }
 
 /*********************************************************************//**
  * @brief
  * The setFPGAP40PumpEnable function enables or disables the P40 pump.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.p40PumpControl
+ * @details \b Outputs: p40PumpControl
  * @param enable flag indicating whether to enable or disable the P40 pump.
  * @return none
  *************************************************************************/
 void setFPGAP40PumpEnable( BOOL enable )
 {
-    fpgaActuatorSetPoints.p40PumpControl = ( TRUE == enable ? 0x1 : 0x0 );
+    SET_FPGA_ACTUATOR_FIELD( p40PumpControl, ( TRUE == enable ? 0x1 : 0x0 ) );
 }
 
 /*********************************************************************//**
@@ -4368,13 +4371,13 @@
  * @note PWM values < 5% or > 95% will cause pump to stop so effective
  * range is actually 25..475.
  * @details \b Inputs: none
- * @details \b Outputs: fpgaActuatorSetPoints.p40PumpPWMDutyCyclePct
+ * @details \b Outputs: p40PumpPWMDutyCyclePct
  * @param pwm PWM duty cycle magnitude
  * @return none
  *************************************************************************/
 void setFPGAP40PumpPWM( U16 pwm )
 {
-   fpgaActuatorSetPoints.p40PumpPWMDutyCyclePct = pwm;
+   SET_FPGA_ACTUATOR_FIELD( p40PumpPWMDutyCyclePct, pwm );
 }
 
 /*********************************************************************//**
@@ -4387,7 +4390,7 @@
  *************************************************************************/
 U16 getFPGAP40PumpPWM( void )
 {
-    return fpgaSensorReadings.p40PumpPWMReadback;
+    return GET_FPGA_SENSOR_FIELD( p40PumpPWMReadback );
 }
 
 /*********************************************************************//**
@@ -4400,7 +4403,7 @@
  *************************************************************************/
 U16 getFPGAP40PumpTachCount( void )
 {
-    return fpgaSensorReadings.p40PumpTachCount;
+    return GET_FPGA_SENSOR_FIELD( p40PumpTachCount );
 }
 
 /**@}*/