Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -r3701c29d97c1b1571d41732ad7fba58ace4b75d7 -r69b6a8036f72eeb935a20701c7d30d402a9ba1f5 --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 3701c29d97c1b1571d41732ad7fba58ace4b75d7) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 69b6a8036f72eeb935a20701c7d30d402a9ba1f5) @@ -1237,7 +1237,7 @@ *************************************************************************/ void setFPGAD10D11CTRL1Reg( U08 control ) { - SET_FPGA_ACTUATOR_FIELD( fpgaD10D11CTRL1Reg, control ); + fpgaActuatorSetPoints.fpgaD10D11CTRL1Reg = control; } /*********************************************************************//** @@ -1251,7 +1251,7 @@ *************************************************************************/ void setFPGAD10D11CTRL2Reg( U08 control ) { - SET_FPGA_ACTUATOR_FIELD( fpgaD10D11CTRL2Reg, control ); + fpgaActuatorSetPoints.fpgaD10D11CTRL2Reg = control; } /*********************************************************************//** @@ -1266,7 +1266,7 @@ *************************************************************************/ void setFPGAD10D11CTRL4Reg( U08 control ) { - SET_FPGA_ACTUATOR_FIELD( fpgaD10D11CTRL4Reg, control ); + fpgaActuatorSetPoints.fpgaD10D11CTRL4Reg = control; } /*********************************************************************//** @@ -1281,7 +1281,7 @@ *************************************************************************/ void setFPGAD10D11CTRL5Reg( U08 control ) { - SET_FPGA_ACTUATOR_FIELD( fpgaD10D11CTRL5Reg, control ); + fpgaActuatorSetPoints.fpgaD10D11CTRL5Reg = control; } /*********************************************************************//** @@ -1296,7 +1296,7 @@ *************************************************************************/ void setFPGAD10D11CTRL6Reg( U08 control ) { - SET_FPGA_ACTUATOR_FIELD( fpgaD10D11CTRL6Reg, control ); + fpgaActuatorSetPoints.fpgaD10D11CTRL6Reg = control; } /*********************************************************************//** @@ -1311,7 +1311,7 @@ *************************************************************************/ void setFPGAD10D11CTRL7Reg( U08 control ) { - SET_FPGA_ACTUATOR_FIELD( fpgaD10D11CTRL7Reg, control ); + fpgaActuatorSetPoints.fpgaD10D11CTRL7Reg = control; } /*********************************************************************//** @@ -1325,7 +1325,7 @@ *************************************************************************/ void setFPGAD76CTRL1Reg( U08 control ) { - SET_FPGA_ACTUATOR_FIELD( fpgaD76CTRL1Reg, control ); + fpgaActuatorSetPoints.fpgaD76CTRL1Reg = control; } /*********************************************************************//** @@ -1339,7 +1339,7 @@ *************************************************************************/ void setFPGAD76CTRL2Reg( U08 control ) { - SET_FPGA_ACTUATOR_FIELD( fpgaD76CTRL2Reg, control ); + fpgaActuatorSetPoints.fpgaD76CTRL2Reg = control; } /*********************************************************************//** @@ -1354,7 +1354,7 @@ *************************************************************************/ void setFPGAD76CTRL4Reg( U08 control ) { - SET_FPGA_ACTUATOR_FIELD( fpgaD76CTRL4Reg, control ); + fpgaActuatorSetPoints.fpgaD76CTRL4Reg = control; } /*********************************************************************//** @@ -1368,7 +1368,7 @@ *************************************************************************/ void setFPGAD76CTRL5Reg( U08 control ) { - SET_FPGA_ACTUATOR_FIELD( fpgaD76CTRL5Reg, control ); + fpgaActuatorSetPoints.fpgaD76CTRL5Reg = control; } /*********************************************************************//** @@ -1382,7 +1382,7 @@ *************************************************************************/ void setFPGAD76CTRL6Reg( U08 control ) { - SET_FPGA_ACTUATOR_FIELD( fpgaD76CTRL6Reg, control ); + fpgaActuatorSetPoints.fpgaD76CTRL6Reg = control; } /*********************************************************************//** @@ -1397,7 +1397,7 @@ *************************************************************************/ void setFPGAD76CTRL7Reg( U08 control ) { - SET_FPGA_ACTUATOR_FIELD( fpgaD76CTRL7Reg, control ); + fpgaActuatorSetPoints.fpgaD76CTRL7Reg = control; } /*********************************************************************//** @@ -1411,7 +1411,7 @@ *************************************************************************/ void setFPGAD92CTRL1Reg( U08 control ) { - SET_FPGA_ACTUATOR_FIELD( fpgaD92CTRL1Reg, control ); + fpgaActuatorSetPoints.fpgaD92CTRL1Reg = control; } /*********************************************************************//** @@ -1425,7 +1425,7 @@ *************************************************************************/ void setFPGAD92CTRL2Reg( U08 control ) { - SET_FPGA_ACTUATOR_FIELD( fpgaD92CTRL2Reg, control ); + fpgaActuatorSetPoints.fpgaD92CTRL2Reg = control; } /*********************************************************************//** @@ -1440,7 +1440,7 @@ *************************************************************************/ void setFPGAD92CTRL4Reg( U08 control ) { - SET_FPGA_ACTUATOR_FIELD( fpgaD92CTRL4Reg, control ); + fpgaActuatorSetPoints.fpgaD92CTRL4Reg = control; } /*********************************************************************//** @@ -1454,7 +1454,7 @@ *************************************************************************/ void setFPGAD92CTRL5Reg( U08 control ) { - SET_FPGA_ACTUATOR_FIELD( fpgaD92CTRL5Reg, control ); + fpgaActuatorSetPoints.fpgaD92CTRL5Reg = control; } /*********************************************************************//** @@ -1468,7 +1468,7 @@ *************************************************************************/ void setFPGAD92CTRL6Reg( U08 control ) { - SET_FPGA_ACTUATOR_FIELD( fpgaD92CTRL6Reg, control ); + fpgaActuatorSetPoints.fpgaD92CTRL6Reg = control; } /*********************************************************************//** @@ -1482,7 +1482,7 @@ *************************************************************************/ void setFPGAD92CTRL7Reg( U08 control ) { - SET_FPGA_ACTUATOR_FIELD( fpgaD92CTRL7Reg, control ); + fpgaActuatorSetPoints.fpgaD92CTRL7Reg = control; } /*********************************************************************//** @@ -1667,7 +1667,7 @@ { SET_FPGA_ACTUATOR_FIELD( fpgaD10PumpRevCount, count ); } -CONCENTRATE_PUMP_CONTROL_ENABLE_MASK + /*********************************************************************//** * @brief * The setFPGAD76PumpRevolutionCount function sets the UltraFilteration