Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -r3cc784af591b14e5d292f92c796db70bcbd5a40b -r333e2d0c0462dcb4343a279420949cce716ebab7 --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 3cc784af591b14e5d292f92c796db70bcbd5a40b) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 333e2d0c0462dcb4343a279420949cce716ebab7) @@ -239,13 +239,20 @@ U16 fpgaD11PumpStepCountStatus; ///< Reg 428. Acid concentrate pump revolution down count status U16 fpgaD10PumpStepCountStatus; ///< Reg 430. Bicarb concentrate pump revolution down count status - U32 fpgaD74CondDataOut; ///< Reg 432. Data read from Conductivity Sensor D74 register - U16 fpgaD74CondCond; ///< Reg 436. D74 conductivity - U16 fpgaD74CondTemp; ///< Reg 438. D74 Temperature - U08 fpgaD74CondReadCnt; ///< Reg 440. D74 successful read count - U08 fpgaD74CondErrorCnt; ///< Reg 441. D74 error read count - U16 fpgaD76PumpHallSense; ///< Reg 442. UF D76_Pump hall sensor pulse width - U16 fpgaD76PumpStepCountStatus; ///< Reg 444. UF pump revolution down count status + U16 fpgaAdcTemp; ///< Reg 432. TBD + U16 fpgaAdcVccInt; ///< Reg 434. TBD + U16 fpgaAdcVccAux; ///< Reg 436. TBD + U16 fpgaAdcVpVn; ///< Reg 438. TBD + U16 fpgaD12PumpSpeedFeedback; ///< Reg 440. D12 Pump speed feedback + U16 fpgaD48PumpSpeedFeedback; ///< Reg 442. D48 Pump Speed feedback + U16 fpgaD76PumpHallSense; ///< Reg 444. UF D76_Pump hall sensor pulse width + U16 fpgaD76PumpStepCountStatus; ///< Reg 446. UF pump revolution down count status + + U32 fpgaD74CondDataOut; ///< Reg 448. Data read from Conductivity Sensor D74 register + U16 fpgaD74CondCond; ///< Reg 452. D74 conductivity + U16 fpgaD74CondTemp; ///< Reg 454. D74 Temperature + U08 fpgaD74CondReadCnt; ///< Reg 456. D74 successful read count + U08 fpgaD74CondErrorCnt; ///< Reg 457. D74 error read count } DD_FPGA_SENSORS_T; typedef struct @@ -341,12 +348,12 @@ U16 fpgaACRelayPWMLow; ///< Reg 148. Length of time in 10us resoultion that PWM output stays low. U16 fpgaACRelayPWMPeriod; ///< Reg 150. PWM period for AC relay/heater. - U08 fpgaConSensD74Control; ///< Reg 152. Conductivity/Temperature Sensors D74 Control registers - U16 fpgaConSensD74_Addrs; ///< Reg 153. D74 Initialization Address register - U32 fpgaConSensD74_Data_In; ///< Reg 155. D74 Initialization data register - U16 fpgaD76PumpSpeed; ///< Reg 159. UF Pump Speed/RPM Control - U08 fpgaD76PumpControl; ///< Reg 161. UF Pump Control - U16 fpgaD76PumpRevCount; ///< Reg 162. UF pump revolution count + U16 fpgaD76PumpSpeed; ///< Reg 152. UF Pump Speed/RPM Control + U16 fpgaD76PumpRevCount; ///< Reg 154. UF pump revolution count + U08 fpgaD76PumpControl; ///< Reg 156. UF Pump Control + U08 fpgaConSensD74Control; ///< Reg 157. Conductivity/Temperature Sensors D74 Control registers + U16 fpgaConSensD74_Addrs; ///< Reg 158. D74 Initialization Address register + U32 fpgaConSensD74_Data_In; ///< Reg 160. D74 Initialization data register } FPGA_ACTUATORS_T; #pragma pack(pop) @@ -1979,7 +1986,7 @@ * hall sense pulse width. * @details \b Inputs: fpgaSensorReadings.fpgaD76PumpHallSense * @details \b Outputs: none - * @return ultrafilteration pump D76_Pump hall sense pulse width + * @return ultrafiltration pump D76_Pump hall sense pulse width *************************************************************************/ U16 getFPGAD76PumpHallSensePulseWidth( void ) {