Index: firmware/App/Services/FpgaDD.h =================================================================== diff -u -rf7c714a1a09b10d85a8b013712532d37b4d7b97a -rfefb47e88a5285e99498efb830fdceb9e95c2c3e --- firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision f7c714a1a09b10d85a8b013712532d37b4d7b97a) +++ firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision fefb47e88a5285e99498efb830fdceb9e95c2c3e) @@ -56,75 +56,145 @@ void setFPGACD34Control( U08 control ); void setFPGACD12Address( U16 address ); void setFPGACD34Address( U16 address ); -void setFPGACD12Data( U16 data ); -void setFPGACD34Data( U16 data ); +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 setFPGACD2Reset( void ); +void clearFPGACD2Reset( void ); +void setFPGACD2InitEnable( void ); +void clearFPGACD2InitEnable( void ); +void setFPGACD2WriteEnable( void ); +void clearFPGACD2WriteEnable( void ); +void setFPGACD2ReadEnable( void ); +void clearFPGACD2ReadEnable( 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 setFPGACD4Reset( void ); +void clearFPGACD4Reset( void ); +void setFPGACD4InitEnable( void ); +void clearFPGACD4InitEnable( void ); +void setFPGACD4WriteEnable( void ); +void clearFPGACD4WriteEnable( void ); +void setFPGACD4ReadEnable( void ); +void clearFPGACD4ReadEnable( void ); + U08 getFPGACD1ReadCount( void ); U08 getFPGACD1ErrorCount( void ); U16 getFPGACD1( void ); U16 getFPGACD1Temp( void ); -U16 getFPGACD1Data( void ); +U32 getFPGACD1Data( void ); U08 getFPGACD2ReadCount( void ); U08 getFPGACD2ErrorCount( void ); U16 getFPGACD2( void ); U16 getFPGACD2Temp( void ); -U16 getFPGACD2Data( void ); +U32 getFPGACD2Data( void ); U08 getFPGACD3ReadCount( void ); U08 getFPGACD3ErrorCount( void ); U16 getFPGACD3( void ); U16 getFPGACD3Temp( void ); -U16 getFPGACD3Data( void ); +U32 getFPGACD3Data( void ); U08 getFPGACD4ReadCount( void ); U08 getFPGACD4ErrorCount( void ); U16 getFPGACD4( void ); U16 getFPGACD4Temp( void ); -U16 getFPGACD4Data( void ); +U32 getFPGACD4Data( void ); -// Pumps ( Concentrate and Gear pumps ) +// Pumps (Concentrate and Gear pumps ) void setFPGAAcidPumpSetStepSpeed( U16 stepSpeed ); void setFPGABicarbSetStepSpeed( U16 stepSpeed ); +void setFPGAAcidPumpControl( U08 control ); +void setFPGABicarbPumpControl( U08 control ); +void setFPGAAcidPumpParkCmd( void ); +void setFPGABicarbPumpParkCmd( void ); + +U08 getFPGAAcidPumpControlStatus( void ); +U08 getFPGABicarbPumpControlStatus( void ); +U08 getFPGAConcentratePumpsFault( void ); +BOOL getFPGAAcidPumpIsParked( void ); +BOOL getFPGABicarbPumpIsParked( void ); +BOOL getFPGAAcidPumpParkFault( void ); +BOOL getFPGABicarbPumpParkFault( void ); +U16 getFPGACPAHallSensePulseWidth( void ); +U16 getFPGACPBHallSensePulseWidth( void ); + void setFPGADialysateOutPumpSpeed( U16 speed ); void setFPGADialysateOutPumpControl( U08 control ); void setFPGADialysateInPumpControl( U08 control ); -void setFPGAAcidPumpControl( U08 control ); -void setFPGABicarbPumpControl( U08 control ); U08 getFPGADialysateOutPumpControl( void ); U08 getFPGADialysateInPumpControl( void ); //Pressure sensor U08 getFPGAPnReadCount( void ); U08 getFPGAPnErrorCount( void ); -U32 getFPGAPnRawPressure( void ); -U32 getFPGAPnRawTemperature( void ); +U16 getFPGAPnRawPressure( void ); +U16 getFPGAPnRawTemperature( void ); U08 getFPGAPCbReadCount( void ); U08 getFPGAPCbErrorCount( void ); -U32 getFPGAPCbRawPressure( void ); -U32 getFPGAPCbRawTemperature( void ); +U16 getFPGAPCbRawPressure( void ); +U16 getFPGAPCbRawTemperature( void ); U08 getFPGAPDsReadCount( void ); U08 getFPGAPDsErrorCount( void ); -U32 getFPGAPDsRawPressure( void ); -U32 getFPGAPDsRawTemperature( void ); +U16 getFPGAPDsRawPressure( void ); +U16 getFPGAPDsRawTemperature( void ); U08 getFPGAPDfReadCount( void ); U08 getFPGAPDfErrorCount( void ); -U32 getFPGAPDfRawPressure( void ); -U32 getFPGAPDfRawTemperature( void ); +U16 getFPGAPDfRawPressure( void ); +U16 getFPGAPDfRawTemperature( void ); U08 getFPGAPtmReadCount( void ); U08 getFPGAPtmErrorCount( void ); -U32 getFPGAPtmRawPressure( void ); -U32 getFPGAPtmRawTemperature( void ); +U16 getFPGAPtmRawPressure( void ); +U16 getFPGAPtmRawTemperature( void ); //Level sensor U16 getFPGALevelSensor1( void ); U16 getFPGALevelSensor2( void ); +//Temperature sensors +U32 getFPGAInletHeatExchangerTemp( void ); +U32 getFPGAOutletHeatExchangerTemp( void ); +U32 getFPGAHydraulicsPrimaryHeaterTemp( void ); +U32 getFPGATrimmerHeaterTemp( void ); +U08 getFPGARTDReadCount( void ); + +//Barometric sensor +U08 getFPGABaroReadCount( void ); +U08 getFPGABaroErrorCount( void ); +U16 getFPGABaroMfgInfo( void ); +U16 getFPGABaroPressureSensitivity( void ); +U16 getFPGABaroPressureOffset( void ); +U16 getFPGABaroTempCoeffOfPressSensitvity( void ); +U16 getFPGABaroTempCoeffOfPressOffset( void ); +U16 getFPGABaroReferenceTemperature( void ); +U16 getFPGABaroTempCoeffOfTemperature( void ); +U16 getFPGABaroCoeffsCRC( void ); +U32 getFPGABaroPressure( void ); +U32 getFPGABaroTemperature( void ); + /**@}*/ #endif