Index: firmware/App/Services/FpgaDD.h =================================================================== diff -u -ra3a396aa37fb562327f05e54990f06538c7617ed -rf5baeac6a5f000705cd51e4779a967acf4088981 --- firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision a3a396aa37fb562327f05e54990f06538c7617ed) +++ firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision f5baeac6a5f000705cd51e4779a967acf4088981) @@ -59,65 +59,65 @@ void setFPGACD12Data( U32 data ); void setFPGACD34Data( U32 data ); -void setFPGACD1Reset( void ); -void clearFPGACD1Reset( void ); -void setFPGACD1InitEnable( void ); -void clearFPGACD1InitEnable( void ); -void setFPGACD1WriteEnable( void ); -void clearFPGACD1WriteEnable( void ); -void setFPGACD1ReadEnable( void ); -void clearFPGACD1ReadEnable( void ); +void setFPGAD17CondReset( void ); +void clearFPGAD17CondReset( void ); +void setFPGAD17CondInitEnable( void ); +void clearFPGAD17CondInitEnable( void ); +void setFPGAD17CondWriteEnable( void ); +void clearFPGAD17CondWriteEnable( void ); +void setFPGAD17CondReadEnable( void ); +void clearFPGAD17CondReadEnable( void ); -void setFPGACD2Reset( void ); -void clearFPGACD2Reset( void ); -void setFPGACD2InitEnable( void ); -void clearFPGACD2InitEnable( void ); -void setFPGACD2WriteEnable( void ); -void clearFPGACD2WriteEnable( void ); -void setFPGACD2ReadEnable( void ); -void clearFPGACD2ReadEnable( void ); +void setFPGAD27CondReset( void ); +void clearFPGAD27CondReset( void ); +void setFPGAD27CondInitEnable( void ); +void clearFPGAD27CondInitEnable( void ); +void setFPGAD27CondWriteEnable( void ); +void clearFPGAD27CondWriteEnable( void ); +void setFPGAD27CondReadEnable( void ); +void clearFPGAD27CondReadEnable( void ); -void setFPGACD3Reset( void ); -void clearFPGACD3Reset( void ); -void setFPGACD3InitEnable( void ); -void clearFPGACD3InitEnable( void ); -void setFPGACD3WriteEnable( void ); -void clearFPGACD3WriteEnable( void ); -void setFPGACD3ReadEnable( void ); -void clearFPGACD3ReadEnable( void ); +void setFPGAD29CondReset( void ); +void clearFPGAD29CondReset( void ); +void setFPGAD29CondInitEnable( void ); +void clearFPGAD29CondInitEnable( void ); +void setFPGAD29CondWriteEnable( void ); +void clearFPGAD29CondWriteEnable( void ); +void setFPGAD29CondReadEnable( void ); +void clearFPGAD29CondReadEnable( void ); -void setFPGACD4Reset( void ); -void clearFPGACD4Reset( void ); -void setFPGACD4InitEnable( void ); -void clearFPGACD4InitEnable( void ); -void setFPGACD4WriteEnable( void ); -void clearFPGACD4WriteEnable( void ); -void setFPGACD4ReadEnable( void ); -void clearFPGACD4ReadEnable( void ); +void setFPGAD43CondReset( void ); +void clearFPGAD43CondReset( void ); +void setFPGAD43CondInitEnable( void ); +void clearFPGAD43CondInitEnable( void ); +void setFPGAD43CondWriteEnable( void ); +void clearFPGAD43CondWriteEnable( void ); +void setFPGAD43CondReadEnable( void ); +void clearFPGAD43CondReadEnable( void ); -U08 getFPGACD1ReadCount( void ); -U08 getFPGACD1ErrorCount( void ); -U16 getFPGACD1( void ); -U16 getFPGACD1Temp( void ); -U32 getFPGACD1Data( void ); +U08 getFPGAD17CondReadCount( void ); +U08 getFPGAD17CondErrorCount( void ); +U16 getFPGAD17Cond( void ); +U16 getFPGAD17CondTemp( void ); +U32 getFPGAD17CondData( void ); -U08 getFPGACD2ReadCount( void ); -U08 getFPGACD2ErrorCount( void ); -U16 getFPGACD2( void ); -U16 getFPGACD2Temp( void ); -U32 getFPGACD2Data( void ); +U08 getFPGAD27CondReadCount( void ); +U08 getFPGAD27CondErrorCount( void ); +U16 getFPGAD27Cond( void ); +U16 getFPGAD27CondTemp( void ); +U32 getFPGAD27CondData( void ); -U08 getFPGACD3ReadCount( void ); -U08 getFPGACD3ErrorCount( void ); -U16 getFPGACD3( void ); -U16 getFPGACD3Temp( void ); -U32 getFPGACD3Data( void ); +U08 getFPGAD29CondReadCount( void ); +U08 getFPGAD29CondErrorCount( void ); +U16 getFPGAD29Cond( void ); +U16 getFPGAD29CondTemp( void ); +U32 getFPGAD29CondData( void ); -U08 getFPGACD4ReadCount( void ); -U08 getFPGACD4ErrorCount( void ); -U16 getFPGACD4( void ); -U16 getFPGACD4Temp( void ); -U32 getFPGACD4Data( void ); +U08 getFPGAD43CondReadCount( void ); +U08 getFPGAD43CondErrorCount( void ); +U16 getFPGAD43Cond( void ); +U16 getFPGAD43CondTemp( void ); +U32 getFPGAD43CondData( void ); // Pumps (Concentrate and Gear pumps ) void setFPGAD11PumpSetStepSpeed( U16 stepSpeed ); @@ -158,40 +158,40 @@ U08 getFPGAD48PumpHallDirectionStatus( void ); //Pressure sensor -U08 getFPGAPnReadCount( void ); -U08 getFPGAPnErrorCount( void ); -U16 getFPGAPnRawPressure( void ); -U16 getFPGAPnRawTemperature( void ); +U08 getFPGAD9PresReadCount( void ); +U08 getFPGAD9PresErrorCount( void ); +U16 getFPGAD9PresRawPressure( void ); +U16 getFPGAD9PresRawTemperature( void ); -U08 getFPGAPCbReadCount( void ); -U08 getFPGAPCbErrorCount( void ); -U16 getFPGAPCbRawPressure( void ); -U16 getFPGAPCbRawTemperature( void ); +U08 getFPGAD66PresReadCount( void ); +U08 getFPGAD66PresErrorCount( void ); +U16 getFPGAD66PresRawPressure( void ); +U16 getFPGAD66PresRawTemperature( void ); -U08 getFPGAPDsReadCount( void ); -U08 getFPGAPDsErrorCount( void ); -U16 getFPGAPDsRawPressure( void ); -U16 getFPGAPDsRawTemperature( void ); +U08 getFPGAD51PresReadCount( void ); +U08 getFPGAD51PresErrorCount( void ); +U16 getFPGAD51PresRawPressure( void ); +U16 getFPGAD51PresRawTemperature( void ); -U08 getFPGAPDfReadCount( void ); -U08 getFPGAPDfErrorCount( void ); -U16 getFPGAPDfRawPressure( void ); -U16 getFPGAPDfRawTemperature( void ); +U08 getFPGAD18PresReadCount( void ); +U08 getFPGAD18PresErrorCount( void ); +U16 getFPGAD18PresRawPressure( void ); +U16 getFPGAD18PresRawTemperature( void ); -U08 getFPGAPtmReadCount( void ); -U08 getFPGAPtmErrorCount( void ); -U16 getFPGAPtmRawPressure( void ); -U16 getFPGAPtmRawTemperature( void ); +U08 getFPGAD41PresReadCount( void ); +U08 getFPGAD41PresErrorCount( void ); +U16 getFPGAD41PresRawPressure( void ); +U16 getFPGAD41PresRawTemperature( void ); -U08 getFPGAPRiReadCount( void ); -U08 getFPGAPRiErrorCount( void ); -U16 getFPGAPRiRawPressure( void ); -U16 getFPGAPRiRawTemperature( void ); +U08 getFPGAM1PresReadCount( void ); +U08 getFPGAM1PresErrorCount( void ); +U16 getFPGAM1PresRawPressure( void ); +U16 getFPGAM1PresRawTemperature( void ); -U08 getFPGAPRoReadCount( void ); -U08 getFPGAPRoErrorCount( void ); -U16 getFPGAPRoRawPressure( void ); -U16 getFPGAPRoRawTemperature( void ); +U08 getFPGAM3PresReadCount( void ); +U08 getFPGAM3PresErrorCount( void ); +U16 getFPGAM3PresRawPressure( void ); +U16 getFPGAM3PresRawTemperature( void ); //Level sensor U16 getFPGALevelSensor1( void );