Index: firmware/App/Services/FpgaDD.h =================================================================== diff -u -r65aab053022c1cab102e503012833f4879501fd1 -rfd63d4e5294ee1c3585359936e9b9afd06c08314 --- firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision 65aab053022c1cab102e503012833f4879501fd1) +++ firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision fd63d4e5294ee1c3585359936e9b9afd06c08314) @@ -82,58 +82,48 @@ void setFPGAValveSPPWMPeriod( U16 valvePWMPeriod ); // Conductivity and Temperature Sensor -void setFPGAD17D74Control( U08 control ); -void setFPGAD27D29Control( U08 control ); -void setFPGAD43Control( U08 control ); -void setFPGAD17D74Address( U16 address ); -void setFPGAD27D29Address( U16 address ); -void setFPGAD43Address( U16 address ); -void setFPGAD17D74Data( U32 data ); -void setFPGAD27D29Data( U32 data ); -void setFPGAD43Data( U32 data ); - U08 getFPGAD17CondReadCount( void ); U08 getFPGAD17CondErrorCount( void ); U08 getFPGAD17TempReadCount( void ); U08 getFPGAD17TempErrorCount( void ); -U32 getFPGAD17CondData( void ); -U32 getFPGAD17CondTemp( void ); +F32 getFPGAD17CondData( void ); +F32 getFPGAD17CondTemp( void ); U32 getFPGAD17CondCalData( void ); U08 getFPGAD17CalMemCounter( void ); U08 getFPGAD27CondReadCount( void ); U08 getFPGAD27CondErrorCount( void ); U08 getFPGAD27TempReadCount( void ); U08 getFPGAD27TempErrorCount( void ); -U32 getFPGAD27CondData( void ); -U32 getFPGAD27CondTemp( void ); +F32 getFPGAD27CondData( void ); +F32 getFPGAD27CondTemp( void ); U32 getFPGAD27CondCalData( void ); U08 getFPGAD27CalMemCounter( void ); U08 getFPGAD29CondReadCount( void ); U08 getFPGAD29CondErrorCount( void ); U08 getFPGAD29TempReadCount( void ); U08 getFPGAD29TempErrorCount( void ); -U32 getFPGAD29CondData( void ); -U32 getFPGAD29CondTemp( void ); +F32 getFPGAD29CondData( void ); +F32 getFPGAD29CondTemp( void ); U32 getFPGAD29CondCalData( void ); U08 getFPGAD29CalMemCounter( void ); U08 getFPGAD43CondReadCount( void ); U08 getFPGAD43CondErrorCount( void ); U08 getFPGAD43TempReadCount( void ); U08 getFPGAD43TempErrorCount( void ); -U32 getFPGAD43CondData( void ); -U32 getFPGAD43CondTemp( void ); +F32 getFPGAD43CondData( void ); +F32 getFPGAD43CondTemp( void ); U32 getFPGAD43CondCalData( void ); U08 getFPGAD43CalMemCounter( void ); U08 getFPGAD74CondReadCount( void ); U08 getFPGAD74CondErrorCount( void ); U08 getFPGAD74TempReadCount( void ); U08 getFPGAD74TempErrorCount( void ); -U32 getFPGAD74CondData( void ); -U32 getFPGAD74CondTemp( void ); +F32 getFPGAD74CondData( void ); +F32 getFPGAD74CondTemp( void ); U32 getFPGAD74CondCalData( void ); U08 getFPGAD74CalMemCounter( void ); @@ -304,22 +294,29 @@ U08 getFPGAFlowP16ReadCount( void ); U08 getFPGAFlowP16ErrorCount( void ); +void setFPGAP9Control( U08 control ); +void setFPGAP9Address( U16 address ); +void setFPGAP9Data( U32 data ); +void setFPGAP18Control( U08 control ); +void setFPGAP18Address( U16 address ); +void setFPGAP18Data( U32 data ); + // Conductivity U08 getFPGAP9CondReadCount( void ); U08 getFPGAP9CondErrorCount( void ); U08 getFPGAP9TempReadCount( void ); U08 getFPGAP9TempErrorCount( void ); -U32 getFPGAP9CondData( void ); -U32 getFPGAP9CondTemp( void ); +F32 getFPGAP9CondData( void ); +F32 getFPGAP9CondTemp( void ); U32 getFPGAP9CondCalData( void ); U08 getFPGAP9CalMemCounter( void ); U08 getFPGAP18CondReadCount( void ); U08 getFPGAP18CondErrorCount( void ); U08 getFPGAP18TempReadCount( void ); U08 getFPGAP18TempErrorCount( void ); -U32 getFPGAP18CondData( void ); -U32 getFPGAP18CondTemp( void ); +F32 getFPGAP18CondData( void ); +F32 getFPGAP18CondTemp( void ); U32 getFPGAP18CondCalData( void ); U08 getFPGAP18CalMemCounter( void );