Index: firmware/App/Services/FPGA.c =================================================================== diff -u -r2453a1f92978ed1900becfc0dda2cf5a9b8e8d0b -rdc0d9b087c609e71cacdb7f0395cccf29d749c00 --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision 2453a1f92978ed1900becfc0dda2cf5a9b8e8d0b) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision dc0d9b087c609e71cacdb7f0395cccf29d749c00) @@ -44,7 +44,7 @@ #define FPGA_HEADER_START_ADDR 0x0000 #define FPGA_BULK_READ_START_ADDR 0x0100 -#define FPGA_BULK_WRITE_START_ADDR 0x000C +#define FPGA_BULK_WRITE_START_ADDR 0x000E #define FPGA_WRITE_CMD_BUFFER_LEN (FPGA_PAGE_SIZE+8) #define FPGA_READ_CMD_BUFFER_LEN 8 @@ -153,13 +153,11 @@ } DG_FPGA_SENSORS_T; typedef struct -{ - U08 fpgaCPoControlReg; ///< Reg 12. CPo control register - U08 fpgaCPiControlReg; ///< Reg 13. CPi control register - U16 fpgaCPoProbeType; ///< Reg 14. CPo probe type - U16 fpgaCPiProbeType; ///< Reg 16. CPi probe type - U16 fpgaDrainPumpSetSpeed; ///< Reg 18. Drain pump control register - U16 fpgaValveStates; ///< Reg 20. Valve control register +{ + U16 fpgaCPoProbeType; + U16 fpgaCPiProbeType; + U16 fpgaDrainPumpSetSpeed; + U16 fpgaValveStates; } FPGA_ACTUATORS_T; #pragma pack(pop) @@ -934,24 +932,8 @@ dac = dac << DRAIN_PUMP_DAC_SHIFT_BITS; fpgaActuatorSetPoints.fpgaDrainPumpSetSpeed = dac; -} +} -/*********************************************************************//** - * @brief - * The setFPGACPoProbeType function sets the CPo sensor probe type and - * sets the control register to write probte type to the device. - * @details - * Inputs : none - * Outputs : fpgaActuatorSetPoints.fpgaCPoProbeType, fpgaActuatorSetPoints.fpgaCPoControlReg - * @param probeType The probe cell constant value to set to - * @return none - *************************************************************************/ -void setFPGACPoProbeType( U16 probeType ) -{ - fpgaActuatorSetPoints.fpgaCPoProbeType = probeType; - fpgaActuatorSetPoints.fpgaCPoControlReg = 0x1; -} - /*********************************************************************//** * @brief * The getFPGAId function gets the version read from the Id register \n