Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -r834e2f1c57b828c546c56dea42a9757988e16314 -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 834e2f1c57b828c546c56dea42a9757988e16314) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) @@ -404,7 +404,7 @@ if( ++heatersStatus.controlIntervalCounter > HEATER_CONTROL_INTERVAL_COUNT ) { - measuredTemperature = getTemperatureValue( TEMP_SENSOR_TRO1 ); + measuredTemperature = getTemperatureValue( P23_TEMP ); if ( measuredTemperature >= targetTemperature ) { // Turn off heater @@ -465,8 +465,8 @@ { enable = TRUE; } - setFPGAHeaterEnabled( enable ); - setFPGAHeaterPWM( pwm ); + setFPGAP24Enabled( enable ); + setFPGAP24PWM( pwm ); } /*********************************************************************//** @@ -490,36 +490,28 @@ * @details \b Outputs: none * @details \b Alarms: ALARM_ID_DD_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE when * primary heater voltage found out of range. - * @details \b Alarms: ALARM_ID_DD_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE when - * trimmer heater voltage found out of range. * @return none *************************************************************************/ //static void monitorHeatersVoltage( void ) //{ // F32 mainPriVoltage = getMonitoredLineLevel( MONITORED_LINE_24V_GND_MAIN_PRIM_HTR_V ); -// F32 trimmerVoltage = getMonitoredLineLevel( MONITORED_LINE_24V_GND_TRIM_HTR_V ); // // // Voltage to PWM is reverse. If PWM = 0 -> V = 24V // F32 mainPriDC = getHeaterControl( DD_PRIMARY_HEATER ); -// F32 trimmerDC = getHeaterControl( DD_TRIMMER_HEATER ); // // // The expected voltage is the inverse of the duty cycle // F32 mainPriExpectedVoltage = HEATERS_MAX_OPERATING_VOLTAGE_V * ( 1.0F - mainPriDC ); -// F32 trimmerExpectedVoltage = HEATERS_MAX_OPERATING_VOLTAGE_V * ( 1.0F - trimmerDC ); // // BOOL isMainPriOut = FALSE; -// BOOL isTrimmerOut = FALSE; // // // If the system is DVT, check the FPGA persistent alarm of the main primary heater's voltage ADC // checkFPGAPersistentAlarms( FPGA_PERS_ERROR_MAIN_PRIMARY_HEATER_VOLTAGE_ADC, getFPGAHeaterGateADCReadCount() ); // // isMainPriOut = ( fabs( mainPriExpectedVoltage - mainPriVoltage ) > HEATERS_VOLTAGE_TOLERANCE_V ? TRUE : FALSE ); -// isTrimmerOut = ( fabs( trimmerExpectedVoltage - trimmerVoltage ) > HEATERS_VOLTAGE_TOLERANCE_V ? TRUE : FALSE ); // // if ( getCurrentOperationMode() != DD_MODE_INIT ) // { // checkPersistentAlarm( ALARM_ID_DD_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, isMainPriOut, mainPriDC, HEATERS_VOLTAGE_TOLERANCE_V ); -// checkPersistentAlarm( ALARM_ID_DD_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE, isTrimmerOut, trimmerDC, HEATERS_VOLTAGE_TOLERANCE_V ); // } //} @@ -539,10 +531,10 @@ { HEATERS_DATA_T data; - data.heaterHroDC = getHeaterControl(); - data.heaterHroTargetTemp = getHeaterTargetTemperature(); - data.heaterHroState = heatersStatus.state; - data.heaterHroControlCounter = heatersStatus.controlIntervalCounter; + data.heaterP24DC = getHeaterControl(); + data.heaterP24TargetTemp = getHeaterTargetTemperature(); + data.heaterP24State = heatersStatus.state; + data.heaterP24ControlCounter = heatersStatus.controlIntervalCounter; dataPublicationTimerCounter = 0; Index: firmware/App/Controllers/Heaters.h =================================================================== diff -u -r834e2f1c57b828c546c56dea42a9757988e16314 -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 --- firmware/App/Controllers/Heaters.h (.../Heaters.h) (revision 834e2f1c57b828c546c56dea42a9757988e16314) +++ firmware/App/Controllers/Heaters.h (.../Heaters.h) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) @@ -22,11 +22,7 @@ /** * @defgroup Heaters Heaters - * @brief Heaters driver modules. Controls the primary and trimmer heaters. - * The primary heaters are manufactured by Watlow with - * fluid operating temperature in between 5 degrees C and 95 degrees C. - * The trimmer heater is manufactured by Watlow with - * fluid operating temperature in between 5 degrees C and 95 degrees C. + * @brief Heater driver module. Controls the heater. * * @addtogroup Heaters * @{ @@ -37,10 +33,10 @@ /// Heaters data structure. typedef struct { - F32 heaterHroDC; ///< HRO duty cycle - F32 heaterHroTargetTemp; ///< HRO target temperature - U32 heaterHroState; ///< HRO state - U32 heaterHroControlCounter; ///< HRO control interval count + F32 heaterP24DC; ///< P24 duty cycle + F32 heaterP24TargetTemp; ///< P24 target temperature + U32 heaterP24State; ///< P24 state + U32 heaterP24ControlCounter; ///< P24 control interval count } HEATERS_DATA_T; // ********** Public function prototypes ********** Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -rd4d21b42ee8bd292a6d9f7966fe37abe0271dfda -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision d4d21b42ee8bd292a6d9f7966fe37abe0271dfda) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) @@ -232,14 +232,14 @@ { RO_PUMP_DATA_T pumpData; - pumpData.roPumpState = (U32)roPumpState[ RO_PUMP ]; - pumpData.roPumpDutyCycle = (U32)getBoostPumpPWMDutyCycle( RO_PUMP ); - pumpData.roPumpFBDutyCycle = (U32)getBoostPumpReadPWMDutyCycle( RO_PUMP ); - pumpData.roPumpSpeed = getBoostPumpRPM( RO_PUMP ); - pumpData.bstPumpState = (U32)roPumpState[ RO_BOOST_PUMP ]; - pumpData.bstPumpDutyCycle = (U32)getBoostPumpPWMDutyCycle( RO_BOOST_PUMP ); - pumpData.bstPumpFBDutyCycle = (U32)getBoostPumpReadPWMDutyCycle( RO_BOOST_PUMP ); - pumpData.bstPumpSpeed = getBoostPumpRPM( RO_BOOST_PUMP ); + pumpData.roPumpState = (U32)roPumpState[ P12_PUMP ]; + pumpData.roPumpDutyCycle = (U32)getBoostPumpPWMDutyCycle( P12_PUMP ); + pumpData.roPumpFBDutyCycle = (U32)getBoostPumpReadPWMDutyCycle( P12_PUMP ); + pumpData.roPumpSpeed = getBoostPumpRPM( P12_PUMP ); + pumpData.bstPumpState = (U32)roPumpState[ P40_PUMP ]; + pumpData.bstPumpDutyCycle = (U32)getBoostPumpPWMDutyCycle( P40_PUMP ); + pumpData.bstPumpFBDutyCycle = (U32)getBoostPumpReadPWMDutyCycle( P40_PUMP ); + pumpData.bstPumpSpeed = getBoostPumpRPM( P40_PUMP ); broadcastData( MSG_ID_RO_PUMP_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&pumpData, sizeof( RO_PUMP_DATA_T ) ); roPumpDataPublicationTimerCounter = 0; Index: firmware/App/Controllers/Valves.h =================================================================== diff -u -rce66580e076bffa157868ff7e422556f78a95cac -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 --- firmware/App/Controllers/Valves.h (.../Valves.h) (revision ce66580e076bffa157868ff7e422556f78a95cac) +++ firmware/App/Controllers/Valves.h (.../Valves.h) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) @@ -31,16 +31,16 @@ /// Enumeration of valves. typedef enum Valves { - VWI = 0, ///< Valve (M4 VWi) - FIRST_VALVE = VWI, ///< First valve - VROD, ///< Valve (P39 VROd) - VFF, ///< Valve (P6 VFF) - VPI, ///< Valve (P11 VPi) - VCR, ///< Valve (P33 VCr) - VCB, ///< Valve (P34 VCb) - VCD, ///< Valve (P37 VCd) - VFB, ///< Valve (M7 VFB) - SPP, ///< Valve (P20 SPP) + M4_VALV = 0, ///< Valve (M4) + FIRST_VALVE = M4_VALV, ///< First valve + P39_VALV, ///< Valve (P39) + P6_VALV, ///< Valve (P6) + P11_VALV, ///< Valve (P11) + P33_VALV, ///< Valve (P33) + P34_VALV, ///< Valve (P34) + P37_VALV, ///< Valve (P37) + M7_VALV, ///< Valve (M7) + P20_VALV, ///< Valve (P20) NUM_OF_VALVES ///< Number of valves } VALVES_T; Index: firmware/App/Drivers/BoostPump.c =================================================================== diff -u -r834e2f1c57b828c546c56dea42a9757988e16314 -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 --- firmware/App/Drivers/BoostPump.c (.../BoostPump.c) (revision 834e2f1c57b828c546c56dea42a9757988e16314) +++ firmware/App/Drivers/BoostPump.c (.../BoostPump.c) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) @@ -74,7 +74,7 @@ } // set RO pump to stop - setROPumpPWM( 0 ); + setFPGAP12PumpPWM( 0 ); // TODO set boost pump to stop } @@ -91,17 +91,17 @@ U32 tach; // get latest RO pump duty cycle read back from FPGA - boostPumpReadDutyCycle[ RO_PUMP ].data = getROPumpPWM(); + boostPumpReadDutyCycle[ P12_PUMP ].data = getFPGAP12PumpPWM(); // get latest RO pump tachometer count from FPGA and convert to RPM - tach = (U32)getROPumpTachCount(); + tach = (U32)getFPGAP12PumpTachCount(); if ( ( tach != 0 ) && ( tach < BOOST_PUMP_COUNTS_FOR_STOPPED_PUMP ) ) { - boostPumpMeasRPM[ RO_PUMP ].data = BOOST_PUMP_COUNTS_2_RPM_NUMERATOR / (F32)tach; + boostPumpMeasRPM[ P12_PUMP ].data = BOOST_PUMP_COUNTS_2_RPM_NUMERATOR / (F32)tach; } else { - boostPumpMeasRPM[ RO_PUMP ].data = 0.0F; + boostPumpMeasRPM[ P12_PUMP ].data = 0.0F; } // TODO - get latest for booster pump PWM and tach @@ -127,19 +127,19 @@ // enable/disable pump per given PWM if ( 0 == pwm ) { - setROPumpEnable( FALSE ); + setFPGAP12PumpEnable( FALSE ); } else { - setROPumpEnable( TRUE ); + setFPGAP12PumpEnable( TRUE ); } // constrain given pwm magnitude to valid range pwm = MIN( pwm, MAX_BOOST_PUMP_PWM_DUTY_CYCLE ); // set commanded duty cycle for given boost pump to given pwm magnitude boostPumpCmdDutyCycle[ pumpID ] = pwm; - if ( RO_PUMP == pumpID ) + if ( P12_PUMP == pumpID ) { - setROPumpPWM( pwm ); + setFPGAP12PumpPWM( pwm ); } else { Index: firmware/App/Drivers/BoostPump.h =================================================================== diff -u -r0d2351b8e47e40fdcd706ed7b7ac1379b69a20ef -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 --- firmware/App/Drivers/BoostPump.h (.../BoostPump.h) (revision 0d2351b8e47e40fdcd706ed7b7ac1379b69a20ef) +++ firmware/App/Drivers/BoostPump.h (.../BoostPump.h) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) @@ -37,8 +37,8 @@ /// Enumerations of RO boost pumps. typedef enum BoostPumps { - RO_PUMP = 0, ///< RO pump - RO_BOOST_PUMP, ///< Optional boost pump + P12_PUMP = 0, ///< RO pump + P40_PUMP, ///< Optional inlet boost pump NUM_OF_BOOST_PUMPS, ///< Number of boost pumps } RO_BOOST_PUMP_T; Index: firmware/App/Drivers/ConductivitySensors.c =================================================================== diff -u -r6ebf16aefe8865d3ecca50348cabc3f42e676fb5 -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 --- firmware/App/Drivers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 6ebf16aefe8865d3ecca50348cabc3f42e676fb5) +++ firmware/App/Drivers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) @@ -160,19 +160,19 @@ void readConductivitySensors( void ) { // Read raw conductivity - currentConductivityReadings[ CONDUCTIVITYSENSORS_CPI_SENSOR ].data = (F32)getFPGACPiConductivity(); - currentConductivityReadings[ CONDUCTIVITYSENSORS_CPO_SENSOR ].data = (F32)getFPGACPoConductivity(); + currentConductivityReadings[ P9_COND ].data = (F32)getFPGAP9Conductivity(); + currentConductivityReadings[ P18_COND ].data = (F32)getFPGAP18Conductivity(); // Read temperature associated to conductivity sensor - currentTemperatureReadings[ CONDUCTIVITYSENSORS_CPI_SENSOR ].data = (F32)getFPGACPiTemperature(); - currentTemperatureReadings[ CONDUCTIVITYSENSORS_CPO_SENSOR ].data = (F32)getFPGACPoTemperature(); + currentTemperatureReadings[ P9_COND ].data = (F32)getFPGAP9Temperature(); + currentTemperatureReadings[ P18_COND ].data = (F32)getFPGAP18Temperature(); // Update read and error counters for each conductivity sensor - lastConductivityReadCounter[ CONDUCTIVITYSENSORS_CPI_SENSOR ].data = (U32)getFPGACPiReadCount(); - lastConductivityReadCounter[ CONDUCTIVITYSENSORS_CPO_SENSOR ].data = (U32)getFPGACPoReadCount(); + lastConductivityReadCounter[ P9_COND ].data = (U32)getFPGAP9ReadCount(); + lastConductivityReadCounter[ P18_COND ].data = (U32)getFPGAP18ReadCount(); - lastConductivityErrorCounter[ CONDUCTIVITYSENSORS_CPI_SENSOR ].data = (U32)getFPGACPiErrorCount(); - lastConductivityErrorCounter[ CONDUCTIVITYSENSORS_CPO_SENSOR ].data = (U32)getFPGACPoErrorCount(); + lastConductivityErrorCounter[ P9_COND ].data = (U32)getFPGAP9ErrorCount(); + lastConductivityErrorCounter[ P18_COND ].data = (U32)getFPGAP18ErrorCount(); // Monitor conductivity sensor health // checkConductivitySensors(); @@ -459,28 +459,28 @@ *************************************************************************/ void handleConductivitySensorsReset( void ) { - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CPI_SENSOR ].resetRequested ) + if ( TRUE == conductivitySensorControl[ P9_COND ].resetRequested ) { - // CPi reset - setFPGACPiReset(); - conductivitySensorControl[ CONDUCTIVITYSENSORS_CPI_SENSOR ].resetRequested = FALSE; + // P9 reset + setFPGAP9Reset(); + conductivitySensorControl[ P9_COND ].resetRequested = FALSE; } else { - // clear CPi reset - clearFPGACPiReset(); + // clear P9 reset + clearFPGAP9Reset(); } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CPO_SENSOR ].resetRequested ) + if ( TRUE == conductivitySensorControl[ P18_COND ].resetRequested ) { - // CPo reset - setFPGACPoReset(); - conductivitySensorControl[ CONDUCTIVITYSENSORS_CPO_SENSOR ].resetRequested = FALSE; + // P18 reset + setFPGAP18Reset(); + conductivitySensorControl[ P18_COND ].resetRequested = FALSE; } else { - // clear CPo reset - clearFPGACPoReset(); + // clear P18 reset + clearFPGAP18Reset(); } } @@ -497,28 +497,28 @@ *************************************************************************/ void handleConductivitySensorsInitProcedure( void ) { - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CPI_SENSOR ].initEnable ) + if ( TRUE == conductivitySensorControl[ P9_COND ].initEnable ) { - // CPi initialization - setFPGACPiInitEnable(); - conductivitySensorControl[ CONDUCTIVITYSENSORS_CPI_SENSOR ].initEnable = FALSE; + // P9 initialization + setFPGAP9InitEnable(); + conductivitySensorControl[ P9_COND ].initEnable = FALSE; } else { - // clear CPi Init command - clearFPGACPiInitEnable(); + // clear P9 Init command + clearFPGAP9InitEnable(); } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CPO_SENSOR ].initEnable ) + if ( TRUE == conductivitySensorControl[ P18_COND ].initEnable ) { - // CPo initialization - setFPGACPoInitEnable(); - conductivitySensorControl[ CONDUCTIVITYSENSORS_CPO_SENSOR ].initEnable = FALSE; + // P18 initialization + setFPGAP18InitEnable(); + conductivitySensorControl[ P18_COND ].initEnable = FALSE; } else { - // clear CPo Init command - clearFPGACPoInitEnable(); + // clear P18 Init command + clearFPGAP18InitEnable(); } } @@ -575,17 +575,17 @@ { conductivitySensorControl[ sensorID ].writeComplete = FALSE; conductivitySensorControl[ sensorID ].writeInProgress = TRUE; - if ( CONDUCTIVITYSENSORS_CPI_SENSOR == sensorID ) + if ( P9_COND == sensorID ) { - setFPGACPiAddress( conductivitySensorControl[ sensorID ].writeAddress ); - setFPGACPiData( conductivitySensorControl[ sensorID ].writeData ); - setFPGACPiWriteEnable(); + setFPGAP9Address( conductivitySensorControl[ sensorID ].writeAddress ); + setFPGAP9Data( conductivitySensorControl[ sensorID ].writeData ); + setFPGAP9WriteEnable(); } else { - setFPGACPoAddress( conductivitySensorControl[ sensorID ].writeAddress ); - setFPGACPoData( conductivitySensorControl[ sensorID ].writeData ); - setFPGACPoWriteEnable(); + setFPGAP18Address( conductivitySensorControl[ sensorID ].writeAddress ); + setFPGAP18Data( conductivitySensorControl[ sensorID ].writeData ); + setFPGAP18WriteEnable(); } state = CONDUCTIVITY_WRITE_COMPLETE; } @@ -610,13 +610,13 @@ { conductivitySensorControl[ sensorID ].writeComplete = TRUE; conductivitySensorControl[ sensorID ].writeEnable = FALSE; - if ( CONDUCTIVITYSENSORS_CPI_SENSOR == sensorID ) + if ( P9_COND == sensorID ) { - clearFPGACPiWriteEnable(); + clearFPGAP9WriteEnable(); } else { - clearFPGACPoWriteEnable(); + clearFPGAP18WriteEnable(); } state = CONDUCTIVITY_WRITE_INITIATE; } @@ -677,15 +677,15 @@ { conductivitySensorControl[ sensorID ].readComplete = FALSE; conductivitySensorControl[ sensorID ].readInProgress = TRUE; - if ( CONDUCTIVITYSENSORS_CPI_SENSOR == sensorID ) + if ( P9_COND == sensorID ) { - setFPGACPiAddress( conductivitySensorControl[ sensorID ].readAddress ); - setFPGACPiReadEnable(); + setFPGAP9Address( conductivitySensorControl[ sensorID ].readAddress ); + setFPGAP9ReadEnable(); } else { - setFPGACPoAddress( conductivitySensorControl[ sensorID ].readAddress ); - setFPGACPoReadEnable(); + setFPGAP18Address( conductivitySensorControl[ sensorID ].readAddress ); + setFPGAP18ReadEnable(); } state = CONDUCTIVITY_READ_COMPLETE; } @@ -708,15 +708,15 @@ if ( TRUE == conductivitySensorControl[ sensorID ].readInProgress ) { - if ( CONDUCTIVITYSENSORS_CPI_SENSOR == sensorID ) + if ( P9_COND == sensorID ) { - conductivitySensorControl[ sensorID ].readData = getFPGACPiData(); - clearFPGACPiReadEnable(); + conductivitySensorControl[ sensorID ].readData = getFPGAP9Data(); + clearFPGAP9ReadEnable(); } else { - conductivitySensorControl[ sensorID ].readData = getFPGACPoData(); - clearFPGACPoReadEnable(); + conductivitySensorControl[ sensorID ].readData = getFPGAP18Data(); + clearFPGAP18ReadEnable(); } conductivitySensorControl[ sensorID ].readComplete = TRUE; conductivitySensorControl[ sensorID ].readEnable = FALSE; Index: firmware/App/Drivers/ConductivitySensors.h =================================================================== diff -u -r6ebf16aefe8865d3ecca50348cabc3f42e676fb5 -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 --- firmware/App/Drivers/ConductivitySensors.h (.../ConductivitySensors.h) (revision 6ebf16aefe8865d3ecca50348cabc3f42e676fb5) +++ firmware/App/Drivers/ConductivitySensors.h (.../ConductivitySensors.h) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) @@ -40,9 +40,9 @@ /// Enumeration of conductivity sensors. typedef enum ConductivitySensors { - CONDUCTIVITYSENSORS_CPI_SENSOR = 0, ///< Inlet water conductivity sensor - CONDUCTIVITYSENSORS_FIRST = CONDUCTIVITYSENSORS_CPI_SENSOR, ///< First conductivity sensor - CONDUCTIVITYSENSORS_CPO_SENSOR, ///< RO outlet water conductivity sensor + P9_COND = 0, ///< Inlet water conductivity sensor + CONDUCTIVITYSENSORS_FIRST = P9_COND, ///< First conductivity sensor + P18_COND, ///< RO outlet water conductivity sensor NUM_OF_CONDUCTIVITY_SENSORS ///< Number of conductivity sensors } CONDUCTIVITY_SENSORS_T; Index: firmware/App/Drivers/FlowSensor.c =================================================================== diff -u -reaadab648c4c1d6d34f3927df6ce5cfb59cdebb6 -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 --- firmware/App/Drivers/FlowSensor.c (.../FlowSensor.c) (revision eaadab648c4c1d6d34f3927df6ce5cfb59cdebb6) +++ firmware/App/Drivers/FlowSensor.c (.../FlowSensor.c) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) @@ -76,12 +76,12 @@ void readFlowSensors( void ) { // Update and convert raw flow rates to mL/min - currentFlowReadings[ FLOW_SENSOR_RO_OUTLET ].data = (F32)( (S16)getFPGAFlowFMP() ); - currentFlowReadings[ FLOW_SENSOR_WATER_INLET ].data = (F32)( (S16)getFPGAFlowFMS() ); + currentFlowReadings[ P16_FLOW ].data = (F32)( (S16)getFPGAFlowP16() ); + currentFlowReadings[ P7_FLOW ].data = (F32)( (S16)getFPGAFlowP7() ); // Update and convert raw flow sensor temperatures to deg C - currentFlowTempReadings[ FLOW_SENSOR_RO_OUTLET ].data = (F32)( (S16)getFPGAFlowFMPTemp() ) / FLOW_TEMPERATURE_DIVIDER; - currentFlowTempReadings[ FLOW_SENSOR_WATER_INLET ].data = (F32)( (S16)getFPGAFlowFMSTemp() ) / FLOW_TEMPERATURE_DIVIDER; + currentFlowTempReadings[ P16_FLOW ].data = (F32)( (S16)getFPGAFlowP16Temp() ) / FLOW_TEMPERATURE_DIVIDER; + currentFlowTempReadings[ P7_FLOW ].data = (F32)( (S16)getFPGAFlowP7Temp() ) / FLOW_TEMPERATURE_DIVIDER; } /*********************************************************************//** Index: firmware/App/Drivers/FlowSensor.h =================================================================== diff -u -r3edf8084a5028ee0d00a3fba496284e593e4254d -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 --- firmware/App/Drivers/FlowSensor.h (.../FlowSensor.h) (revision 3edf8084a5028ee0d00a3fba496284e593e4254d) +++ firmware/App/Drivers/FlowSensor.h (.../FlowSensor.h) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) @@ -14,42 +14,42 @@ * @date (original) 21-Nov-2024 * ***************************************************************************/ - -#ifndef __FLOW_SENSOR_H__ -#define __FLOW_SENSOR_H__ - + +#ifndef __FLOW_SENSOR_H__ +#define __FLOW_SENSOR_H__ + #include "ROCommon.h" - -/** - * @defgroup FlowSensor FlowSensor + +/** + * @defgroup FlowSensor FlowSensor * @brief Flow sensors driver unit. Reads the flow rates and temperatures - * from the various RO flow sensors. - * - * @addtogroup FlowSensor - * @{ - */ - + * from the various RO flow sensors. + * + * @addtogroup FlowSensor + * @{ + */ + // ********** public definitions ********** - -/// Enumeration of flow sensors handled by this unit. -typedef enum FlowSensors -{ - FLOW_SENSOR_WATER_INLET = 0, ///< Water inlet flow sensor (FMS P7) - FLOW_SENSOR_FIRST = FLOW_SENSOR_WATER_INLET, ///< First flow - FLOW_SENSOR_RO_OUTLET, ///< RO outlet flow sensor (FMP P16) - NUM_OF_FLOW_SENSORS ///< Number of flow sensors -} FLOW_SENSORS_T; - -// ********** public function prototypes ********** - -void initFlowSensor( void ); + +/// Enumeration of flow sensors handled by this unit. +typedef enum FlowSensors +{ + P7_FLOW = 0, ///< Water inlet flow sensor (FMS P7) + FLOW_SENSOR_FIRST = P7_FLOW, ///< First flow + P16_FLOW, ///< RO outlet flow sensor (FMP P16) + NUM_OF_FLOW_SENSORS ///< Number of flow sensors +} FLOW_SENSORS_T; + +// ********** public function prototypes ********** + +void initFlowSensor( void ); void readFlowSensors( void ); F32 getFlowRate( FLOW_SENSORS_T sensor ); F32 getFlowTemperature( FLOW_SENSORS_T sensor ); BOOL testFlowSensorReadingsOverride( MESSAGE_T *message ); BOOL testFlowSensorTemperatureReadingsOverride( MESSAGE_T *message ); - -/**@}*/ - -#endif + +/**@}*/ + +#endif Index: firmware/App/Drivers/PressureSensor.c =================================================================== diff -u -rce66580e076bffa157868ff7e422556f78a95cac -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 --- firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision ce66580e076bffa157868ff7e422556f78a95cac) +++ firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) @@ -103,35 +103,35 @@ void readPressureSensors( void ) { // Update and convert raw pressures to mmHg - currentPressureReadings[ PRESSURE_SENSOR_WATER_INLET_PRE_REG ].data = convertPressureReading( getFPGAPRiRawPressure(), PRES_MIN_PSI, PRES_MAX_PSI ); - currentPressureReadings[ PRESSURE_SENSOR_WATER_INLET_POST_REG ].data = convertPressureReading( getFPGAPRoRawPressure(), PRES_MIN_PSI, PRES_MAX_PSI ); - currentPressureReadings[ PRESSURE_SENSOR_WATER_INLET_PRE_COND ].data = convertPressureReading( getFPGAPC2oRawPressure(), PRES_MIN_PSI, PRES_MAX_PSI ); - currentPressureReadings[ PRESSURE_SENSOR_PRE_RO_FILTER ].data = convertPressureReading( getFPGAPPoRawPressure(), PRES_MIN_PSI, PRES_MAX_PSI ); - currentPressureReadings[ PRESSURE_SENSOR_POST_RO_FILTER ].data = convertPressureReading( getFPGAPMpRawPressure(), PRES_MIN_PSI, PRES_MAX_PSI ); - currentPressureReadings[ PRESSURE_SENSOR_PRE_RO_PUMP ].data = convertPressureReading( getFPGAPPiRawPressure(), PRES_MIN_PSI, PRES_MAX_PSI ); + currentPressureReadings[ M1_PRES ].data = convertPressureReading( getFPGAM1RawPressure(), PRES_MIN_PSI, PRES_MAX_PSI ); + currentPressureReadings[ M3_PRES ].data = convertPressureReading( getFPGAM3RawPressure(), PRES_MIN_PSI, PRES_MAX_PSI ); + currentPressureReadings[ P8_PRES ].data = convertPressureReading( getFPGAP8RawPressure(), PRES_MIN_PSI, PRES_MAX_PSI ); + currentPressureReadings[ P13_PRES ].data = convertPressureReading( getFPGAP13RawPressure(), PRES_MIN_PSI, PRES_MAX_PSI ); + currentPressureReadings[ P17_PRES ].data = convertPressureReading( getFPGAP17RawPressure(), PRES_MIN_PSI, PRES_MAX_PSI ); + currentPressureReadings[ X1_PRES ].data = convertPressureReading( getFPGAX1RawPressure(), PRES_MIN_PSI, PRES_MAX_PSI ); // Update and convert raw pressure sensor temperatures to deg C - currentPresTempReadings[ PRESSURE_SENSOR_WATER_INLET_PRE_REG ].data = convertPressureTempReading2DegC( getFPGAPRiRawTemperature() ); - currentPresTempReadings[ PRESSURE_SENSOR_WATER_INLET_POST_REG ].data = convertPressureTempReading2DegC( getFPGAPRoRawTemperature() ); - currentPresTempReadings[ PRESSURE_SENSOR_WATER_INLET_PRE_COND ].data = convertPressureTempReading2DegC( getFPGAPC2oRawTemperature() ); - currentPresTempReadings[ PRESSURE_SENSOR_PRE_RO_FILTER ].data = convertPressureTempReading2DegC( getFPGAPPoRawTemperature() ); - currentPresTempReadings[ PRESSURE_SENSOR_POST_RO_FILTER ].data = convertPressureTempReading2DegC( getFPGAPMpRawTemperature() ); - currentPresTempReadings[ PRESSURE_SENSOR_PRE_RO_PUMP ].data = convertPressureTempReading2DegC( getFPGAPPiRawTemperature() ); + currentPresTempReadings[ M1_PRES ].data = convertPressureTempReading2DegC( getFPGAM1RawTemperature() ); + currentPresTempReadings[ M3_PRES ].data = convertPressureTempReading2DegC( getFPGAM3RawTemperature() ); + currentPresTempReadings[ P8_PRES ].data = convertPressureTempReading2DegC( getFPGAP8RawTemperature() ); + currentPresTempReadings[ P13_PRES ].data = convertPressureTempReading2DegC( getFPGAP13RawTemperature() ); + currentPresTempReadings[ P17_PRES ].data = convertPressureTempReading2DegC( getFPGAP17RawTemperature() ); + currentPresTempReadings[ X1_PRES ].data = convertPressureTempReading2DegC( getFPGAX1RawTemperature() ); // Update read and error counters for each pressure sensor - lastPressureReadCounter[ PRESSURE_SENSOR_WATER_INLET_PRE_REG ].data = (U32)getFPGAPRiReadCount(); - lastPressureReadCounter[ PRESSURE_SENSOR_WATER_INLET_POST_REG ].data = (U32)getFPGAPRoReadCount(); - lastPressureReadCounter[ PRESSURE_SENSOR_WATER_INLET_PRE_COND ].data = (U32)getFPGAPC2oReadCount(); - lastPressureReadCounter[ PRESSURE_SENSOR_PRE_RO_FILTER ].data = (U32)getFPGAPPoReadCount(); - lastPressureReadCounter[ PRESSURE_SENSOR_POST_RO_FILTER ].data = (U32)getFPGAPMpReadCount(); - lastPressureReadCounter[ PRESSURE_SENSOR_PRE_RO_PUMP ].data = (U32)getFPGAPPiReadCount(); + lastPressureReadCounter[ M1_PRES ].data = (U32)getFPGAM1ReadCount(); + lastPressureReadCounter[ M3_PRES ].data = (U32)getFPGAM3ReadCount(); + lastPressureReadCounter[ P8_PRES ].data = (U32)getFPGAP8ReadCount(); + lastPressureReadCounter[ P13_PRES ].data = (U32)getFPGAP13ReadCount(); + lastPressureReadCounter[ P17_PRES ].data = (U32)getFPGAP17ReadCount(); + lastPressureReadCounter[ X1_PRES ].data = (U32)getFPGAX1ReadCount(); - lastPressureErrorCounter[ PRESSURE_SENSOR_WATER_INLET_PRE_REG ].data = (U32)getFPGAPRiErrorCount(); - lastPressureErrorCounter[ PRESSURE_SENSOR_WATER_INLET_POST_REG ].data = (U32)getFPGAPRoErrorCount(); - lastPressureErrorCounter[ PRESSURE_SENSOR_WATER_INLET_PRE_COND ].data = (U32)getFPGAPC2oErrorCount(); - lastPressureErrorCounter[ PRESSURE_SENSOR_PRE_RO_FILTER ].data = (U32)getFPGAPPoErrorCount(); - lastPressureErrorCounter[ PRESSURE_SENSOR_POST_RO_FILTER ].data = (U32)getFPGAPMpErrorCount(); - lastPressureErrorCounter[ PRESSURE_SENSOR_PRE_RO_PUMP ].data = (U32)getFPGAPPiErrorCount(); + lastPressureErrorCounter[ M1_PRES ].data = (U32)getFPGAM1ErrorCount(); + lastPressureErrorCounter[ M3_PRES ].data = (U32)getFPGAM3ErrorCount(); + lastPressureErrorCounter[ P8_PRES ].data = (U32)getFPGAP8ErrorCount(); + lastPressureErrorCounter[ P13_PRES ].data = (U32)getFPGAP13ErrorCount(); + lastPressureErrorCounter[ P17_PRES ].data = (U32)getFPGAP17ErrorCount(); + lastPressureErrorCounter[ X1_PRES ].data = (U32)getFPGAX1ErrorCount(); // // Monitor pressure sensor health // checkPressureSensors(); Index: firmware/App/Drivers/PressureSensor.h =================================================================== diff -u -rce66580e076bffa157868ff7e422556f78a95cac -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 --- firmware/App/Drivers/PressureSensor.h (.../PressureSensor.h) (revision ce66580e076bffa157868ff7e422556f78a95cac) +++ firmware/App/Drivers/PressureSensor.h (.../PressureSensor.h) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) @@ -35,14 +35,14 @@ /// Enumeration of pressure sensors monitored by this unit. typedef enum PressureSensors { - PRESSURE_SENSOR_WATER_INLET_PRE_REG = 0, ///< Water inlet pressure before regulator (PRi) - PRESSURE_SENSOR_FIRST = PRESSURE_SENSOR_WATER_INLET_PRE_REG, ///< First pressure to scan - PRESSURE_SENSOR_WATER_INLET_POST_REG, ///< Water inlet pressure after regulator (PRo) - PRESSURE_SENSOR_WATER_INLET_PRE_COND, ///< Water inlet pressure before conductivity sensor (PC2o) - PRESSURE_SENSOR_PRE_RO_FILTER, ///< Pressure before RO filter (PPo) - PRESSURE_SENSOR_POST_RO_FILTER, ///< Pressure after RO filter (PMp) - PRESSURE_SENSOR_PRE_RO_PUMP, ///< Pressure before RO pump (PPi) - NUM_OF_PRESSURE_SENSORS ///< Number of pressure sensors + M1_PRES = 0, ///< Water inlet pressure before regulator + PRESSURE_SENSOR_FIRST = M1_PRES, ///< First pressure to scan + M3_PRES, ///< Water inlet pressure after regulator + P8_PRES, ///< Water inlet pressure before conductivity sensor + P13_PRES, ///< Pressure before RO filter + P17_PRES, ///< Pressure after RO filter + X1_PRES, ///< Pressure before RO pump + NUM_OF_PRESSURE_SENSORS ///< Number of pressure sensors } PRESSURE_SENSORS_T; // ********** public function prototypes ********** Index: firmware/App/Drivers/TemperatureSensors.c =================================================================== diff -u -r340b6bedc5aac2ad47364ade48a842f00b12b8fe -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 --- firmware/App/Drivers/TemperatureSensors.c (.../TemperatureSensors.c) (revision 340b6bedc5aac2ad47364ade48a842f00b12b8fe) +++ firmware/App/Drivers/TemperatureSensors.c (.../TemperatureSensors.c) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) @@ -18,13 +18,15 @@ #include // For temperature calculation #include // For memset() +#include "Conductivity.h" +#include "Flow.h" #include "FpgaRO.h" #include "MessageSupport.h" #include "Messaging.h" //#include "NVDataMgmt.h" #include "OperationModes.h" #include "PersistentAlarm.h" -#include "TemperatureSensors.h" +#include "Temperature.h" #include "Timers.h" #include "Utilities.h" @@ -117,25 +119,25 @@ //benignPolynomialCalRecord( &tempSensorCalRecord.tempSensors[ i ] ); } - // Initialize TRO1 and TRO2 sensors + // Initialize P23 and P22 temperature sensors #ifdef USE_PT_100_SENSORS - tempSensors[ TEMP_SENSOR_TRO1 ].gain = PT100_TEMP_SENSORS_GAIN; - tempSensors[ TEMP_SENSOR_TRO1 ].refResistance = PT100_TEMP_SENSORS_REF_RESISTANCE; - tempSensors[ TEMP_SENSOR_TRO1 ].zeroDegreeResistance = PT100_TEMP_SENSORS_0_DEGREE_RESISTANCE; - tempSensors[ TEMP_SENSOR_TRO1 ].maxAllowedTemp = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; - tempSensors[ TEMP_SENSOR_TRO2 ].gain = PT100_TEMP_SENSORS_GAIN; - tempSensors[ TEMP_SENSOR_TRO2 ].refResistance = PT100_TEMP_SENSORS_REF_RESISTANCE; - tempSensors[ TEMP_SENSOR_TRO2 ].zeroDegreeResistance = PT100_TEMP_SENSORS_0_DEGREE_RESISTANCE; - tempSensors[ TEMP_SENSOR_TRO2 ].maxAllowedTemp = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; + tempSensors[ P23_TEMP ].gain = PT100_TEMP_SENSORS_GAIN; + tempSensors[ P23_TEMP ].refResistance = PT100_TEMP_SENSORS_REF_RESISTANCE; + tempSensors[ P23_TEMP ].zeroDegreeResistance = PT100_TEMP_SENSORS_0_DEGREE_RESISTANCE; + tempSensors[ P23_TEMP ].maxAllowedTemp = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; + tempSensors[ P22_TEMP ].gain = PT100_TEMP_SENSORS_GAIN; + tempSensors[ P22_TEMP ].refResistance = PT100_TEMP_SENSORS_REF_RESISTANCE; + tempSensors[ P22_TEMP ].zeroDegreeResistance = PT100_TEMP_SENSORS_0_DEGREE_RESISTANCE; + tempSensors[ P22_TEMP ].maxAllowedTemp = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; #else - tempSensors[ TEMP_SENSOR_TRO1 ].gain = PRIMARY_HEATER_TEMP_SENSORS_GAIN; - tempSensors[ TEMP_SENSOR_TRO1 ].refResistance = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE; - tempSensors[ TEMP_SENSOR_TRO1 ].zeroDegreeResistance = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE; - tempSensors[ TEMP_SENSOR_TRO1 ].maxAllowedTemp = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; - tempSensors[ TEMP_SENSOR_TRO2 ].gain = PRIMARY_HEATER_TEMP_SENSORS_GAIN; - tempSensors[ TEMP_SENSOR_TRO2 ].refResistance = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE; - tempSensors[ TEMP_SENSOR_TRO2 ].zeroDegreeResistance = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE; - tempSensors[ TEMP_SENSOR_TRO2 ].maxAllowedTemp = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; + tempSensors[ P23_TEMP ].gain = PRIMARY_HEATER_TEMP_SENSORS_GAIN; + tempSensors[ P23_TEMP ].refResistance = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE; + tempSensors[ P23_TEMP ].zeroDegreeResistance = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE; + tempSensors[ P23_TEMP ].maxAllowedTemp = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; + tempSensors[ P22_TEMP ].gain = PRIMARY_HEATER_TEMP_SENSORS_GAIN; + tempSensors[ P22_TEMP ].refResistance = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE; + tempSensors[ P22_TEMP ].zeroDegreeResistance = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE; + tempSensors[ P22_TEMP ].maxAllowedTemp = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; #endif // Board temperature sensors conversion coefficient @@ -190,8 +192,8 @@ // lastTemperatureReadCounter.data = (U32)getFPGARTDReadCount(); //Read temperature sensors - processTempSnsrsADCRead( TEMP_SENSOR_TRO1, getFPGATro1Temperature() ); - processTempSnsrsADCRead( TEMP_SENSOR_TRO2, getFPGATro2Temperature() ); + processTempSnsrsADCRead( P23_TEMP, getFPGAP23Temperature() ); + processTempSnsrsADCRead( P22_TEMP, getFPGAP22Temperature() ); // //TODO: Read Board temperature // //processTempSnsrsADCRead( TEMPSENSORS_INTERNAL_COND_TEMP_SENSOR, getFPGACondSnsrInternalTemp() ); @@ -313,26 +315,43 @@ // Different sensors have different ADC to temperature conversion methods switch( sensorIndex ) { - case TEMP_SENSOR_TRO1: - case TEMP_SENSOR_TRO2: + case P23_TEMP: + case P22_TEMP: temperature = getADC2TempConversion( avgADCReads, (U32)tempSensors [ sensorIndex ].gain, (U32)tempSensors [ sensorIndex ].refResistance, (U32)tempSensors [ sensorIndex ].zeroDegreeResistance, tempSensors [ sensorIndex ].conversionCoeff ); break; + case P10_TEMP: + temperature = getConductivityTemperatureValue( P9_COND ); + break; + + case P19_TEMP: + temperature = getConductivityTemperatureValue( P18_COND ); + break; + + case P7_TEMP: + temperature = getFilteredFlowSensorTemperature( P7_FLOW ); + break; + + case P16_TEMP: + temperature = getFilteredFlowSensorTemperature( P16_FLOW ); + break; + // case TEMPSENSORS_BOARD_TEMPERATURE: // //TODO : Need details on calculations. // break; default: // invalid sensor ID, raise an alarm - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_TEMPERATURE_SENSOR_SELECTED2, sensorIndex ); + SET_ALARM_WITH_2_U32_DATA( ALARM_ID_RO_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_TEMPERATURE_SENSOR_SELECTED2, sensorIndex ); // Wrong sensor, return temperature to be -1 temperature = -1.0F; break; } // Calibrate temperature sensor reading // getCalibrationAppliedTemperatureValue( sensorIndex, &temperature ); + // Update the temperature temperatureValue[ sensorIndex ].data = temperature; } Index: firmware/App/Drivers/TemperatureSensors.h =================================================================== diff -u -r340b6bedc5aac2ad47364ade48a842f00b12b8fe -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 --- firmware/App/Drivers/TemperatureSensors.h (.../TemperatureSensors.h) (revision 340b6bedc5aac2ad47364ade48a842f00b12b8fe) +++ firmware/App/Drivers/TemperatureSensors.h (.../TemperatureSensors.h) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) @@ -35,9 +35,13 @@ /// Enumeration of temperature sensors. typedef enum SENSORS_NAME { - TEMP_SENSOR_TRO1 = 0, ///< Tank temperature sensor at hottest point (TRO1). - TEMP_SENSOR_FIRST = TEMP_SENSOR_TRO1, ///< First temp sensor to scan - TEMP_SENSOR_TRO2, ///< Pre-tank temperature sensor at coldest point (TRO2). + P23_TEMP = 0, ///< Tank temperature sensor at hottest point. + TEMP_SENSOR_FIRST = P23_TEMP, ///< First temp sensor. + P22_TEMP, ///< Pre-tank temperature sensor at coldest point. + P10_TEMP, ///< Inlet conductivity sensor temperature. + P19_TEMP, ///< Outlet conductivity sensor temperature. + P7_TEMP, ///< Inlet flow sensor temperature. + P16_TEMP, ///< Outlet flow sensor temperature. NUM_OF_TEMPERATURE_SENSORS ///< Number of temperature sensors } TEMPERATURE_SENSOR_T; Index: firmware/App/Monitors/Conductivity.c =================================================================== diff -u -rf47296145b6a0adb78df0e325587629171909fd6 -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 --- firmware/App/Monitors/Conductivity.c (.../Conductivity.c) (revision f47296145b6a0adb78df0e325587629171909fd6) +++ firmware/App/Monitors/Conductivity.c (.../Conductivity.c) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) @@ -105,10 +105,8 @@ { CONDUCTIVITY_DATA_T data; - data.CPiConductivity = getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR ); - data.CPoConductivity = getConductivityValue( CONDUCTIVITYSENSORS_CPO_SENSOR ); - data.CPiTemperature = getConductivityTemperatureValue( CONDUCTIVITYSENSORS_CPI_SENSOR ); - data.CPoTemperature = getConductivityTemperatureValue( CONDUCTIVITYSENSORS_CPO_SENSOR ); + data.p9Conductivity = getConductivityValue( P9_COND ); + data.p18Conductivity = getConductivityValue( P18_COND ); conductivityPublishTimerCounter = 0; broadcastData( MSG_ID_RO_CONDUCTIVITY_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&data, sizeof( CONDUCTIVITY_DATA_T ) ); Index: firmware/App/Monitors/Conductivity.h =================================================================== diff -u -r2205857f59dd884c4af450239381387cfb560c2e -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 --- firmware/App/Monitors/Conductivity.h (.../Conductivity.h) (revision 2205857f59dd884c4af450239381387cfb560c2e) +++ firmware/App/Monitors/Conductivity.h (.../Conductivity.h) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) @@ -34,10 +34,8 @@ /// Conductivity data struct. typedef struct { - F32 CPiConductivity; ///< CPi (P9) conductivity sensor value - F32 CPoConductivity; ///< CPo (P18) conductivity sensor value - F32 CPiTemperature; ///< CPi (P9) temperature value - F32 CPoTemperature; ///< CPo (P18) temperature value + F32 p9Conductivity; ///< (P9) conductivity sensor value + F32 p18Conductivity; ///< (P18) conductivity sensor value } CONDUCTIVITY_DATA_T; // ********** public function prototypes ********** Index: firmware/App/Monitors/Flow.c =================================================================== diff -u -r340b6bedc5aac2ad47364ade48a842f00b12b8fe -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 --- firmware/App/Monitors/Flow.c (.../Flow.c) (revision 340b6bedc5aac2ad47364ade48a842f00b12b8fe) +++ firmware/App/Monitors/Flow.c (.../Flow.c) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) @@ -368,12 +368,9 @@ { FLOW_TEMP_DATA_T data; - data.FlowFMS = getFilteredFlow( FLOW_SENSOR_WATER_INLET ); - data.FlowFMP = getFilteredFlow( FLOW_SENSOR_RO_OUTLET ); + data.FlowP7 = getFilteredFlow( P7_FLOW ); + data.FlowP16 = getFilteredFlow( P16_FLOW ); - data.TempFMS = getFilteredFlowSensorTemperature( FLOW_SENSOR_WATER_INLET ); - data.TempFMP = getFilteredFlowSensorTemperature( FLOW_SENSOR_RO_OUTLET ); - broadcastData( MSG_ID_RO_FLOW_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&data, sizeof( FLOW_TEMP_DATA_T ) ); flowsDataPublicationTimerCounter = 0; } Index: firmware/App/Monitors/Flow.h =================================================================== diff -u -r340b6bedc5aac2ad47364ade48a842f00b12b8fe -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 --- firmware/App/Monitors/Flow.h (.../Flow.h) (revision 340b6bedc5aac2ad47364ade48a842f00b12b8fe) +++ firmware/App/Monitors/Flow.h (.../Flow.h) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) @@ -35,10 +35,8 @@ /// Flow data record. typedef struct { - F32 FlowFMS; ///< Flow rate at water inlet (P7 FMS) - F32 FlowFMP; ///< Flow rate at RO filter outlet (P16 FMP) - F32 TempFMS; ///< Temperature of fluid (P7 FMS) - F32 TempFMP; ///< Temperature of fluid (P16 FMP) + F32 FlowP7; ///< Flow rate at water inlet (P7) + F32 FlowP16; ///< Flow rate at RO filter outlet (P16) } FLOW_TEMP_DATA_T; // ********** public function prototypes ********** Index: firmware/App/Monitors/Level.c =================================================================== diff -u -reaadab648c4c1d6d34f3927df6ce5cfb59cdebb6 -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 --- firmware/App/Monitors/Level.c (.../Level.c) (revision eaadab648c4c1d6d34f3927df6ce5cfb59cdebb6) +++ firmware/App/Monitors/Level.c (.../Level.c) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) @@ -89,7 +89,7 @@ *************************************************************************/ void execLevels( void ) { - U08 levelBits = getFPGAFloaterState() & LEVEL_SWITCH_BIT_MASK; + U08 levelBits = getFPGAP25FloaterState() & LEVEL_SWITCH_BIT_MASK; U32 currentLevelState = LEVEL_STATE_LOW; // Convert floater switch bits to level @@ -166,7 +166,7 @@ { LEVEL_DATA_T data; - data.floaterLevel = (U32)getLevelStatus(); + data.p25Level = (U32)getLevelStatus(); levelsDataPublicationCounter = 0; broadcastData( MSG_ID_RO_LEVEL_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&data, sizeof( LEVEL_DATA_T ) ); } Index: firmware/App/Monitors/Level.h =================================================================== diff -u -rc9aa3971be05f25a7b0d7124e57cc60617c90ad7 -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 --- firmware/App/Monitors/Level.h (.../Level.h) (revision c9aa3971be05f25a7b0d7124e57cc60617c90ad7) +++ firmware/App/Monitors/Level.h (.../Level.h) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) @@ -44,7 +44,7 @@ /// DD floater and level sensor data publish structure typedef struct { - U32 floaterLevel; ///< Floater level + U32 p25Level; ///< P25 level from floater sensor. } LEVEL_DATA_T; // ********** public function prototypes ********** Index: firmware/App/Monitors/Pressure.c =================================================================== diff -u -rce66580e076bffa157868ff7e422556f78a95cac -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 --- firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision ce66580e076bffa157868ff7e422556f78a95cac) +++ firmware/App/Monitors/Pressure.c (.../Pressure.c) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) @@ -480,19 +480,19 @@ { PRESSURE_TEMP_DATA_T data; - data.PressurePRi = getFilteredPressure( PRESSURE_SENSOR_WATER_INLET_PRE_REG ); - data.PressurePRo = getFilteredPressure( PRESSURE_SENSOR_WATER_INLET_POST_REG ); - data.PressurePC2o = getFilteredPressure( PRESSURE_SENSOR_WATER_INLET_PRE_COND ); - data.PressurePPo = getFilteredPressure( PRESSURE_SENSOR_PRE_RO_FILTER ); - data.PressurePMp = getFilteredPressure( PRESSURE_SENSOR_POST_RO_FILTER ); - data.PressurePPi = getFilteredPressure( PRESSURE_SENSOR_PRE_RO_PUMP ); + data.PressureM1 = getFilteredPressure( M1_PRES ); + data.PressureM3 = getFilteredPressure( M3_PRES ); + data.PressureP8 = getFilteredPressure( P8_PRES ); + data.PressureP13 = getFilteredPressure( P13_PRES ); + data.PressureP17 = getFilteredPressure( P17_PRES ); + data.PressureX1 = getFilteredPressure( X1_PRES ); - data.TempPRi = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_WATER_INLET_PRE_REG ); - data.TempPRo = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_WATER_INLET_POST_REG ); - data.TempPC2o = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_WATER_INLET_PRE_COND ); - data.TempPPo = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_PRE_RO_FILTER ); - data.TempPMp = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_POST_RO_FILTER ); - data.TempPPi = getFilteredPressureSensorTemperature( PRESSURE_SENSOR_PRE_RO_PUMP ); + data.TempM1 = getFilteredPressureSensorTemperature( M1_PRES ); + data.TempM3 = getFilteredPressureSensorTemperature( M3_PRES ); + data.TempP8 = getFilteredPressureSensorTemperature( P8_PRES ); + data.TempP13 = getFilteredPressureSensorTemperature( P13_PRES ); + data.TempP17 = getFilteredPressureSensorTemperature( P17_PRES ); + data.TempX1 = getFilteredPressureSensorTemperature( X1_PRES ); broadcastData( MSG_ID_RO_PRESSURES_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&data, sizeof( PRESSURE_TEMP_DATA_T ) ); pressuresDataPublicationTimerCounter = 0; Index: firmware/App/Monitors/Pressure.h =================================================================== diff -u -rce66580e076bffa157868ff7e422556f78a95cac -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 --- firmware/App/Monitors/Pressure.h (.../Pressure.h) (revision ce66580e076bffa157868ff7e422556f78a95cac) +++ firmware/App/Monitors/Pressure.h (.../Pressure.h) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) @@ -35,18 +35,18 @@ /// Pressure data struct. typedef struct { - F32 PressurePRi; ///< Pressure before pressure regulator (M1 PRi) - F32 PressurePRo; ///< Pressure after pressure regulator (M3 PRo) - F32 PressurePC2o; ///< Pressure before inlet conductivity sensor (P8 PC2o) - F32 PressurePPo; ///< Pressure before RO filter (P13 PPo) - F32 PressurePMp; ///< Pressure after RO filter (P17 PMp) - F32 PressurePPi; ///< Pressure before RO pump (X1 PPi) - F32 TempPRi; ///< Temperature before pressure regulator (M1 PRi) - F32 TempPRo; ///< Temperature after pressure regulator (M3 PRo) - F32 TempPC2o; ///< Temperature before inlet conductivity sensor (P8 PC2o) - F32 TempPPo; ///< Temperature before RO filter (P13 PPo) - F32 TempPMp; ///< Temperature after RO filter (P17 PMp) - F32 TempPPi; ///< Temperature before RO pump (X1 PPi) + F32 PressureM1; ///< Pressure before pressure regulator (M1) + F32 PressureM3; ///< Pressure after pressure regulator (M3) + F32 PressureP8; ///< Pressure before inlet conductivity sensor (P8) + F32 PressureP13; ///< Pressure before RO filter (P13) + F32 PressureP17; ///< Pressure after RO filter (P17) + F32 PressureX1; ///< Pressure before RO pump (X1) + F32 TempM1; ///< Temperature before pressure regulator (M1) + F32 TempM3; ///< Temperature after pressure regulator (M3) + F32 TempP8; ///< Temperature before inlet conductivity sensor (P8) + F32 TempP13; ///< Temperature before RO filter (P13) + F32 TempP17; ///< Temperature after RO filter (P17) + F32 TempX1; ///< Temperature before RO pump (X1) } PRESSURE_TEMP_DATA_T; // ********** public function prototypes ********** Index: firmware/App/Monitors/Temperature.c =================================================================== diff -u -r340b6bedc5aac2ad47364ade48a842f00b12b8fe -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 --- firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision 340b6bedc5aac2ad47364ade48a842f00b12b8fe) +++ firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) @@ -209,9 +209,13 @@ { TEMPERATURE_SENSORS_DATA_T data; - data.tempTRO1 = getTemperatureValue( TEMP_SENSOR_TRO1 ); - data.tempTRO1 = getTemperatureValue( TEMP_SENSOR_TRO2 ); - data.boardTemp = 0.0F; // TODO + data.tempP23 = getTemperatureValue( P23_TEMP ); + data.tempP23 = getTemperatureValue( P22_TEMP ); + data.tempP10 = getTemperatureValue( P10_TEMP ); + data.tempP19 = getTemperatureValue( P19_TEMP ); + data.tempP7 = getTemperatureValue( P7_TEMP ); + data.tempP16 = getTemperatureValue( P16_TEMP ); + data.tempBoard = 0.0F; // TODO broadcastData( MSG_ID_RO_TEMPERATURE_DATA, COMM_BUFFER_OUT_CAN_RO_BROADCAST, (U08*)&data, sizeof( TEMPERATURE_SENSORS_DATA_T ) ); dataPublicationTimerCounter = 0; Index: firmware/App/Monitors/Temperature.h =================================================================== diff -u -r340b6bedc5aac2ad47364ade48a842f00b12b8fe -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 --- firmware/App/Monitors/Temperature.h (.../Temperature.h) (revision 340b6bedc5aac2ad47364ade48a842f00b12b8fe) +++ firmware/App/Monitors/Temperature.h (.../Temperature.h) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) @@ -35,9 +35,13 @@ /// Temperature sensors data structure. typedef struct { - F32 tempTRO1; ///< TRO1 temperature sensor (P22) - F32 tempTRO2; ///< TRO2 temperature sensor (P21) - F32 boardTemp; ///< Board temperature sensor + F32 tempP23; ///< P23 temperature sensor. + F32 tempP22; ///< P22 temperature sensor. + F32 tempP10; ///< P10 temperature from inlet conductivity sensor. + F32 tempP19; ///< P19 temperature from outlet conductivity sensor. + F32 tempP7; ///< P7 temperature from inlet flow sensor. + F32 tempP16; ///< P16 temperature from outlet flow sensor. + F32 tempBoard; ///< Board temperature sensor } TEMPERATURE_SENSORS_DATA_T; // ********** public function prototypes ********** Index: firmware/App/Services/FpgaRO.c =================================================================== diff -u -r834e2f1c57b828c546c56dea42a9757988e16314 -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 --- firmware/App/Services/FpgaRO.c (.../FpgaRO.c) (revision 834e2f1c57b828c546c56dea42a9757988e16314) +++ firmware/App/Services/FpgaRO.c (.../FpgaRO.c) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) @@ -66,100 +66,100 @@ U16 fpgaGenWrRd; ///< Reg 260. FPGA general read-back register (mirrored from a general write register in write page at addr 4). U08 errorCountProcessor; ///< Reg 262. Error count for processor communications. U08 errorCountPC; ///< Reg 263. Error count for TBD. - S16 pressurePri; ///< Reg 264. PRi pressure data. - U16 temperaturePri; ///< Reg 266. PRi temperature data. - U08 readCountPri; ///< Reg 268. PRi read counter. - U08 errorCountPri; ///< Reg 269. PRi error counter. - S16 pressurePro; ///< Reg 270. PRo pressure data. - U16 temperaturePro; ///< Reg 272. PRo temperature data. - U08 readCountPro; ///< Reg 274. PRo read counter. - U08 errorCountPro; ///< Reg 275. PRo error counter. - S16 pressurePc2o; ///< Reg 276. PC2o pressure data. - U16 temperaturePc2o; ///< Reg 278. PC2o temperature data. - U08 readCountPc2o; ///< Reg 280. PC2o read counter. - U08 errorCountPc2o; ///< Reg 281. PC2o error counter. - S16 pressurePpo; ///< Reg 282. PPo pressure data. - U16 temperaturePpo; ///< Reg 284. PPo temperature data. - U08 readCountPpo; ///< Reg 286. PPo read counter. - U08 errorCountPpo; ///< Reg 287. PPo error counter. - S16 pressurePmp; ///< Reg 288. PMp pressure data. - U16 temperaturePmp; ///< Reg 290. PMp temperature data. - U08 readCountPmp; ///< Reg 292. PMp read counter. - U08 errorCountPmp; ///< Reg 293. PMp error counter. - S16 pressurePpi; ///< Reg 294. PPi pressure data. - U16 temperaturePpi; ///< Reg 296. PPi temperature data. - U08 readCountPpi; ///< Reg 298. PPi read counter. - U08 errorCountPpi; ///< Reg 299. PPi error counter. - S16 pressurePmc; ///< Reg 300. PMc pressure data. - U16 temperaturePmc; ///< Reg 302. PMc temperature data. - U08 readCountPmc; ///< Reg 304. PMc read counter. - U08 errorCountPmc; ///< Reg 305. PMc error counter. - S16 pressurePax1; ///< Reg 306. Pax1 pressure data. - U16 temperaturePax1; ///< Reg 308. Pax1 temperature data. - U08 readCountPax1; ///< Reg 310. Pax1 read counter. - U08 errorCountPax1; ///< Reg 311. Pax1 error counter. - S16 pressurePax2; ///< Reg 312. Pax2 pressure data. - U16 temperaturePax2; ///< Reg 314. Pax2 temperature data. - U08 readCountPax2; ///< Reg 316. Pax2 read counter. - U08 errorCountPax2; ///< Reg 317. Pax2 error counter. - S16 pressurePax3; ///< Reg 318. Pax3 pressure data. - U16 temperaturePax3; ///< Reg 320. Pax3 temperature data. - U08 readCountPax3; ///< Reg 322. Pax3 read counter. - U08 errorCountPax3; ///< Reg 323. Pax3 error counter. + S16 pressureM1; ///< Reg 264. M1 pressure data. + U16 temperatureM1; ///< Reg 266. M1 temperature data. + U08 readCountM1; ///< Reg 268. M1 read counter. + U08 errorCountM1; ///< Reg 269. M1 error counter. + S16 pressureM3; ///< Reg 270. M3 pressure data. + U16 temperatureM3; ///< Reg 272. M3 temperature data. + U08 readCountM3; ///< Reg 274. M3 read counter. + U08 errorCountM3; ///< Reg 275. M3 error counter. + S16 pressureP8; ///< Reg 276. P8 pressure data. + U16 temperatureP8; ///< Reg 278. P8 temperature data. + U08 readCountP8; ///< Reg 280. P8 read counter. + U08 errorCountP8; ///< Reg 281. P8 error counter. + S16 pressureP13; ///< Reg 282. P13 pressure data. + U16 temperatureP13; ///< Reg 284. P13 temperature data. + U08 readCountP13; ///< Reg 286. P13 read counter. + U08 errorCountP13; ///< Reg 287. P13 error counter. + S16 pressureP17; ///< Reg 288. P17 pressure data. + U16 temperatureP17; ///< Reg 290. P17 temperature data. + U08 readCountP17; ///< Reg 292. P17 read counter. + U08 errorCountP17; ///< Reg 293. P17 error counter. + S16 pressureX1; ///< Reg 294. X1 pressure data. + U16 temperatureX1; ///< Reg 296. X1 temperature data. + U08 readCountX1; ///< Reg 298. X1 read counter. + U08 errorCountX1; ///< Reg 299. X1 error counter. + S16 pressureX2; ///< Reg 300. X2 pressure data. + U16 temperatureX2; ///< Reg 302. X2 temperature data. + U08 readCountX2; ///< Reg 304. X2 read counter. + U08 errorCountX2; ///< Reg 305. X2 error counter. + S16 pressureX3; ///< Reg 306. X3 pressure data. + U16 temperatureX3; ///< Reg 308. X3 temperature data. + U08 readCountX3; ///< Reg 310. X3 read counter. + U08 errorCountX3; ///< Reg 311. X3 error counter. + S16 pressureX4; ///< Reg 312. X4 pressure data. + U16 temperatureX4; ///< Reg 314. X4 temperature data. + U08 readCountX4; ///< Reg 316. X4 read counter. + U08 errorCountX4; ///< Reg 317. X4 error counter. + S16 pressureX5; ///< Reg 318. X5 pressure data. + U16 temperatureX5; ///< Reg 320. X5 temperature data. + U08 readCountX5; ///< Reg 322. X5 read counter. + U08 errorCountX5; ///< Reg 323. X5 error counter. U16 reserved1; ///< Reg 324. Reserved. U16 reserved2; ///< Reg 326. Reserved. - U08 levelSwitch; ///< Reg 328. Level switch. + U08 p25LevelSwitch; ///< Reg 328. P25 level switch. U08 reserved3; ///< Reg 329. Reserved. U16 reserved4; ///< Reg 330. Reserved. U16 reserved5; ///< Reg 332. Reserved. U08 reserved6; ///< Reg 334. Reserved. U08 reserved7; ///< Reg 335. Reserved. - U32 conductivityCpiData; ///< Reg 336. CPi conductivity sensor data. - U16 conductivityCpiCond; ///< Reg 340. CPi conductivity sensor conductivity. - U16 conductivityCpiTemp; ///< Reg 342. CPi conductivity sensor temperature. - U08 conductivityCpiReadCount; ///< Reg 344. CPi conductivity sensor read counter. - U08 conductivityCpiErrorCount; ///< Reg 345. CPi conductivity sensor error counter. - U32 conductivityCpoData; ///< Reg 346. CPo conductivity sensor data. - U16 conductivityCpoCond; ///< Reg 350. CPo conductivity sensor conductivity. - U16 conductivityCpoTemp; ///< Reg 352. CPo conductivity sensor temperature. - U08 conductivityCpoReadCount; ///< Reg 354. CPo conductivity sensor read counter. - U08 conductivityCpoErrorCount; ///< Reg 355. CPo conductivity sensor error counter. - U16 flowRateFmp; ///< Reg 356. FMP flow sensor rate. - U16 flowTempFmp; ///< Reg 358. FMP flow sensor temperature. - U16 roPumpTachCount; ///< Reg 360. ROP tachometer counter. + U32 conductivityP9Data; ///< Reg 336. P9 conductivity sensor data. + U16 conductivityP9Cond; ///< Reg 340. P9 conductivity sensor conductivity. + U16 conductivityP9Temp; ///< Reg 342. P9 conductivity sensor temperature. + U08 conductivityP9ReadCount; ///< Reg 344. P9 conductivity sensor read counter. + U08 conductivityP9ErrorCount; ///< Reg 345. P9 conductivity sensor error counter. + U32 conductivityP18Data; ///< Reg 346. P18 conductivity sensor data. + U16 conductivityP18Cond; ///< Reg 350. P18 conductivity sensor conductivity. + U16 conductivityP18Temp; ///< Reg 352. P18 conductivity sensor temperature. + U08 conductivityP18ReadCount; ///< Reg 354. P18 conductivity sensor read counter. + U08 conductivityP18ErrorCount; ///< Reg 355. P18 conductivity sensor error counter. + U16 flowRateP16; ///< Reg 356. P16 flow sensor rate. + U16 flowTempP16; ///< Reg 358. P16 flow sensor temperature. + U16 p12PumpTachCount; ///< Reg 360. P12 pump tachometer counter. U16 dsPumpTachCount; ///< Reg 362. DSP tachometer counter. - U16 flowIntTempFmp; ///< Reg 364. FMP flow sensor internal temperature. + U16 flowIntTempP16; ///< Reg 364. P16 flow sensor internal temperature. U16 valveControlReadback; ///< Reg 366. Valve control bits read back. - U16 roPumpPWMReadback; ///< Reg 368. ROP PWM read back. + U16 p12PumpPWMReadback; ///< Reg 368. P12 pump PWM read back. U16 heaterPWMReadback; ///< Reg 370. Heater PWM read back. U08 flowReadCount; ///< Reg 372. Flow sensor read counter. U08 flowErrorCount; ///< Reg 373. Flow sensor error counter. U16 valvePWMEnableReadback; ///< Reg 374. Valve PWM enable read back. - U32 tempTRO1; ///< Reg 376. TRO1 temperature sensor reading. - U32 tempTRO2; ///< Reg 380. TRO2 temperature sensor reading. + U32 tempP23; ///< Reg 376. P23 temperature sensor reading. + U32 tempP22; ///< Reg 380. P22 temperature sensor reading. } FPGA_SENSORS_T; /// Record structure for FPGA continuous priority writes. typedef struct { U16 valveControl; ///< Reg 04. Valve control register. - U08 conductivityCPiControl; ///< Reg 06. CPi conductivity control register. - U08 conductivityCPoControl; ///< Reg 07. CPo conductivity control register. - U16 conductivityCPiAddress; ///< Reg 08. CPi conductivity address register. - U32 conductivityCPiData; ///< Reg 10. CPi conductivity data in register. - U16 conductivityCPoAddress; ///< Reg 14. CPo conductivity address register. - U32 conductivityCPoData; ///< Reg 16. CPo conductivity data in register. + U08 conductivityP9Control; ///< Reg 06. P9 conductivity control register. + U08 conductivityP18Control; ///< Reg 07. P18 conductivity control register. + U16 conductivityP9Address; ///< Reg 08. P9 conductivity address register. + U32 conductivityP9Data; ///< Reg 10. P9 conductivity data in register. + U16 conductivityP18Address; ///< Reg 14. P18 conductivity address register. + U32 conductivityP18Data; ///< Reg 16. P18 conductivity data in register. U16 fpgaGenWrRd; ///< Reg 20. FPGA general write/read-back register (mirrored to a general read register in read page at addr 256). U16 descalePumpSpeed; ///< Reg 22. Descaler pump speed register. U08 descalePumpControl; ///< Reg 24. Descaler pump control register. - U08 roPumpControl; ///< Reg 25. RO pump control register.. + U08 p12PumpControl; ///< Reg 25. P12 pump control register.. U16 valveVwiPWMLow; ///< Reg 26. Valve VWi PWM low pulse period in 0.1 uSec. U16 valveVwiPWMPeriod; ///< Reg 28. Valve VWi PWM full period in 0.1 uSec. U16 valvePWMPullIn; ///< Reg 30. Valve PWM high pulse period when valve is on in 0.1 uSec. - U16 roPumpPWMDutyCyclePct; ///< Reg 32. ROP PWM duty cycle in percentage. - U16 heaterPWMDutyCyclePct; ///< Reg 34. HRO PWM duty cycle in percentage. + U16 p12PumpPWMDutyCyclePct; ///< Reg 32. P12 pump PWM duty cycle in percentage. + U16 p24PWMDutyCyclePct; ///< Reg 34. P24 heater PWM duty cycle in percentage. U08 reserved1; ///< Reg 36. Not used. - U08 heaterControl; ///< Reg 37. Heater (HRO) control register. + U08 p24Control; ///< Reg 37. P24 heater (HRO) control register. U08 flowControl; ///< Reg 38. AVS Romer flow sensor control register. U08 flowAddress; ///< Reg 39. AVS Romer flow sensor I2C slave address register. U16 valvePWMEnable; ///< Reg 40. Valve PWM enable register. @@ -393,891 +393,891 @@ /*********************************************************************//** * @brief - * The setROPumpEnable function enables or disables the RO pump. + * The setFPGAP12PumpEnable function enables or disables the P12 pump. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.roPumpControl - * @param enable flag indicating whether to enable or disable the RO pump. + * @details \b Outputs: fpgaActuatorSetPoints.p12PumpControl + * @param enable flag indicating whether to enable or disable the P12 pump. * @return none *************************************************************************/ -void setROPumpEnable( BOOL enable ) +void setFPGAP12PumpEnable( BOOL enable ) { - fpgaActuatorSetPoints.roPumpControl = ( TRUE == enable ? 0x1 : 0x0 ); + fpgaActuatorSetPoints.p12PumpControl = ( TRUE == enable ? 0x1 : 0x0 ); } /*********************************************************************//** * @brief - * The setROPumpPWM function sets the RO pump PWM duty cycle. + * The setFPGAP12PumpPWM function sets the P12 pump PWM duty cycle. * The higher the PWM duty cycle (0..500), the faster the pump will go. * @note PWM values < 5% or > 95% will cause pump to stop so effective * range is actually 25..475. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.roPumpPWMDutyCyclePct + * @details \b Outputs: fpgaActuatorSetPoints.p12PumpPWMDutyCyclePct * @param pwm PWM duty cycle magnitude * @return none *************************************************************************/ -void setROPumpPWM( U16 pwm ) +void setFPGAP12PumpPWM( U16 pwm ) { - fpgaActuatorSetPoints.roPumpPWMDutyCyclePct = pwm; + fpgaActuatorSetPoints.p12PumpPWMDutyCyclePct = pwm; } /*********************************************************************//** * @brief - * The getROPumpPWM function gets a read back from FPGA of RO pump PWM + * The getFPGAP12PumpPWM function gets a read back from FPGA of RO pump PWM * duty cycle. * @details \b Inputs: fpgaSensorReadings.roPumpPWMReadback * @details \b Outputs: none * @return measured speed (RPM) of the RO pump *************************************************************************/ -U16 getROPumpPWM( void ) +U16 getFPGAP12PumpPWM( void ) { - return fpgaSensorReadings.roPumpPWMReadback; + return fpgaSensorReadings.p12PumpPWMReadback; } /*********************************************************************//** * @brief - * The getROPumpTachCount function gets the running 16-bit tachometer count - * from the RO pump hall sensor. - * @details \b Inputs: fpgaSensorReadings.roPumpTachCount + * The getFPGAP12PumpTachCount function gets the running 16-bit tachometer count + * from the P12 pump hall sensor. + * @details \b Inputs: fpgaSensorReadings.p12PumpTachCount * @details \b Outputs: none - * @return RO pump tachometer count + * @return P12 pump tachometer count *************************************************************************/ -U16 getROPumpTachCount( void ) +U16 getFPGAP12PumpTachCount( void ) { - return fpgaSensorReadings.roPumpTachCount; + return fpgaSensorReadings.p12PumpTachCount; } /*********************************************************************//** * @brief - * The setFPGAHeaterEnabled function sets the heater enable on or off. + * The setFPGAP24Enabled function sets the heater enable on or off. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.heaterControl - * @param enable Flag indicating whether to enable or disable the heater. + * @details \b Outputs: fpgaActuatorSetPoints.p24Control + * @param enable Flag indicating whether to enable or disable the P24 heater. * @return none *************************************************************************/ -void setFPGAHeaterEnabled( BOOL enable ) +void setFPGAP24Enabled( BOOL enable ) { if ( TRUE == enable ) { - fpgaActuatorSetPoints.heaterControl = HEATER_ENABLED; + fpgaActuatorSetPoints.p24Control = HEATER_ENABLED; } else { - fpgaActuatorSetPoints.heaterControl = HEATER_DISABLED; + fpgaActuatorSetPoints.p24Control = HEATER_DISABLED; } } /*********************************************************************//** * @brief - * The setFPGAHeaterPWM function sets the heater PWM duty cycle. + * The setFPGAP24PWM function sets the P24 heater PWM duty cycle. * The higher the PWM duty cycle (0..500), the faster the pump will go. * @note PWM values < 5% or > 95% will cause heater to go off so effective * range is actually 25..475. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.heaterPWMDutyCyclePct + * @details \b Outputs: fpgaActuatorSetPoints.p24PWMDutyCyclePct * @param pwm PWM duty cycle magnitude * @return none *************************************************************************/ -void setFPGAHeaterPWM( U16 pwm ) +void setFPGAP24PWM( U16 pwm ) { - fpgaActuatorSetPoints.heaterPWMDutyCyclePct = pwm; + fpgaActuatorSetPoints.p24PWMDutyCyclePct = pwm; } /*********************************************************************//** * @brief - * The getFPGAPRiRawPressure function gets the PRi pressure reading. - * @details \b Inputs: fpgaSensorReadings.pressurePri + * The getFPGAM1RawPressure function gets the M1 pressure reading. + * @details \b Inputs: fpgaSensorReadings.pressureM1 * @details \b Outputs: none - * @return PRi pressure + * @return M1 pressure *************************************************************************/ -S16 getFPGAPRiRawPressure( void ) +S16 getFPGAM1RawPressure( void ) { - return fpgaSensorReadings.pressurePri; + return fpgaSensorReadings.pressureM1; } /*********************************************************************//** * @brief - * The getFPGAPRiRawTemperature function gets the PRi sensor temperature reading. - * @details \b Inputs: fpgaSensorReadings.temperaturePri + * The getFPGAM1RawTemperature function gets the M1 sensor temperature reading. + * @details \b Inputs: fpgaSensorReadings.temperatureM1 * @details \b Outputs: none - * @return PRi sensor temperature + * @return M1 sensor temperature *************************************************************************/ -S16 getFPGAPRiRawTemperature( void ) +S16 getFPGAM1RawTemperature( void ) { - return fpgaSensorReadings.temperaturePri; + return fpgaSensorReadings.temperatureM1; } /*********************************************************************//** * @brief - * The getFPGAPRiReadCount function gets the PRi sensor read count. - * @details \b Inputs: fpgaSensorReadings.readCountPri + * The getFPGAM1ReadCount function gets the M1 sensor read count. + * @details \b Inputs: fpgaSensorReadings.readCountM1 * @details \b Outputs: none - * @return PRi sensor read count + * @return M1 sensor read count *************************************************************************/ -U08 getFPGAPRiReadCount( void ) +U08 getFPGAM1ReadCount( void ) { - return fpgaSensorReadings.readCountPri; + return fpgaSensorReadings.readCountM1; } /*********************************************************************//** * @brief - * The getFPGAPRiErrorCount function gets the PRi sensor error count. - * @details \b Inputs: fpgaSensorReadings.errorCountPri + * The getFPGAM1ErrorCount function gets the M1 sensor error count. + * @details \b Inputs: fpgaSensorReadings.errorCountM1 * @details \b Outputs: none - * @return PRi sensor error count + * @return M1 sensor error count *************************************************************************/ -U08 getFPGAPRiErrorCount( void ) +U08 getFPGAM1ErrorCount( void ) { - return fpgaSensorReadings.errorCountPri; + return fpgaSensorReadings.errorCountM1; } /*********************************************************************//** * @brief - * The getFPGAPRoRawPressure function gets the PRo pressure reading. - * @details \b Inputs: fpgaSensorReadings.pressurePro + * The getFPGAM3RawPressure function gets the M3 pressure reading. + * @details \b Inputs: fpgaSensorReadings.pressureM3 * @details \b Outputs: none - * @return PRo pressure + * @return M3 pressure *************************************************************************/ -S16 getFPGAPRoRawPressure( void ) +S16 getFPGAM3RawPressure( void ) { - return fpgaSensorReadings.pressurePro; + return fpgaSensorReadings.pressureM3; } /*********************************************************************//** * @brief - * The getFPGAPRoRawTemperature function gets the PRo sensor temperature. - * @details \b Inputs: fpgaSensorReadings.temperaturePro + * The getFPGAM3RawTemperature function gets the M3 sensor temperature. + * @details \b Inputs: fpgaSensorReadings.temperatureM3 * @details \b Outputs: none - * @return PRo sensor temperature + * @return M3 sensor temperature *************************************************************************/ -S16 getFPGAPRoRawTemperature( void ) +S16 getFPGAM3RawTemperature( void ) { - return fpgaSensorReadings.temperaturePro; + return fpgaSensorReadings.temperatureM3; } /*********************************************************************//** * @brief - * The getFPGAPRoReadCount function gets the PRo sensor read count. - * @details \b Inputs: fpgaSensorReadings.readCountPro + * The getFPGAM3ReadCount function gets the M3 sensor read count. + * @details \b Inputs: fpgaSensorReadings.readCountM3 * @details \b Outputs: none - * @return PRo sensor read count + * @return M3 sensor read count *************************************************************************/ -U08 getFPGAPRoReadCount( void ) +U08 getFPGAM3ReadCount( void ) { - return fpgaSensorReadings.readCountPro; + return fpgaSensorReadings.readCountM3; } /*********************************************************************//** * @brief - * The getFPGAPRoErrorCount function gets the PRo sensor error count. - * @details \b Inputs: fpgaSensorReadings.errorCountPro + * The getFPGAM3ErrorCount function gets the M3 sensor error count. + * @details \b Inputs: fpgaSensorReadings.errorCountM3 * @details \b Outputs: none - * @return PRo sensor error count + * @return M3 sensor error count *************************************************************************/ -U08 getFPGAPRoErrorCount( void ) +U08 getFPGAM3ErrorCount( void ) { - return fpgaSensorReadings.errorCountPro; + return fpgaSensorReadings.errorCountM3; } /*********************************************************************//** * @brief - * The getFPGAPC2oRawPressure function gets the PC2o pressure reading. - * @details \b Inputs: fpgaSensorReadings.pressurePc2o + * The getFPGAP8RawPressure function gets the P8 pressure reading. + * @details \b Inputs: fpgaSensorReadings.pressureP8 * @details \b Outputs: none - * @return PC2o pressure + * @return P8 pressure *************************************************************************/ -S16 getFPGAPC2oRawPressure( void ) +S16 getFPGAP8RawPressure( void ) { - return fpgaSensorReadings.pressurePc2o; + return fpgaSensorReadings.pressureP8; } /*********************************************************************//** * @brief - * The getFPGAPC2oRawTemperature function gets the PC2o sensor temperature. - * @details \b Inputs: fpgaSensorReadings.temperaturePc2o + * The getFPGAP8RawTemperature function gets the P8 sensor temperature. + * @details \b Inputs: fpgaSensorReadings.temperatureP8 * @details \b Outputs: none - * @return PC2o sensor temperature + * @return P8 sensor temperature *************************************************************************/ -S16 getFPGAPC2oRawTemperature( void ) +S16 getFPGAP8RawTemperature( void ) { - return fpgaSensorReadings.temperaturePc2o; + return fpgaSensorReadings.temperatureP8; } /*********************************************************************//** * @brief - * The getFPGAPC2oReadCount function gets the PC2o sensor read count. - * @details \b Inputs: fpgaSensorReadings.readCountPc2o + * The getFPGAP8ReadCount function gets the P8 sensor read count. + * @details \b Inputs: fpgaSensorReadings.readCountP8 * @details \b Outputs: none - * @return PC2o sensor read count + * @return P8 sensor read count *************************************************************************/ -U08 getFPGAPC2oReadCount( void ) +U08 getFPGAP8ReadCount( void ) { - return fpgaSensorReadings.readCountPc2o; + return fpgaSensorReadings.readCountP8; } /*********************************************************************//** * @brief - * The getFPGAPC2oErrorCount function gets the PC2o sensor error count. - * @details \b Inputs: fpgaSensorReadings.errorCountPc2o + * The getFPGAP8ErrorCount function gets the P8 sensor error count. + * @details \b Inputs: fpgaSensorReadings.errorCountP8 * @details \b Outputs: none - * @return PC2o sensor error count + * @return P8 sensor error count *************************************************************************/ -U08 getFPGAPC2oErrorCount( void ) +U08 getFPGAP8ErrorCount( void ) { - return fpgaSensorReadings.errorCountPc2o; + return fpgaSensorReadings.errorCountP8; } /*********************************************************************//** * @brief - * The getFPGAPPoRawPressure function gets the PPo pressure reading. - * @details \b Inputs: fpgaSensorReadings.pressurePpo + * The getFPGAP13RawPressure function gets the P13 pressure reading. + * @details \b Inputs: fpgaSensorReadings.pressureP13 * @details \b Outputs: none - * @return PPo pressure + * @return P13 pressure *************************************************************************/ -S16 getFPGAPPoRawPressure( void ) +S16 getFPGAP13RawPressure( void ) { - return fpgaSensorReadings.pressurePpo; + return fpgaSensorReadings.pressureP13; } /*********************************************************************//** * @brief - * The getFPGAPPoRawTemperature function gets the PPo sensor temperature. - * @details \b Inputs: fpgaSensorReadings.temperaturePpo + * The getFPGAP13RawTemperature function gets the P13 sensor temperature. + * @details \b Inputs: fpgaSensorReadings.temperatureP13 * @details \b Outputs: none - * @return PPo sensor temperature + * @return P13 sensor temperature *************************************************************************/ -S16 getFPGAPPoRawTemperature( void ) +S16 getFPGAP13RawTemperature( void ) { - return fpgaSensorReadings.temperaturePpo; + return fpgaSensorReadings.temperatureP13; } /*********************************************************************//** * @brief - * The getFPGAPPoReadCount function gets the PPo sensor read count. - * @details \b Inputs: fpgaSensorReadings.readCountPpo + * The getFPGAP13ReadCount function gets the P13 sensor read count. + * @details \b Inputs: fpgaSensorReadings.readCountP13 * @details \b Outputs: none - * @return PPo sensor read count + * @return P13 sensor read count *************************************************************************/ -U08 getFPGAPPoReadCount( void ) +U08 getFPGAP13ReadCount( void ) { - return fpgaSensorReadings.readCountPpo; + return fpgaSensorReadings.readCountP13; } /*********************************************************************//** * @brief - * The getFPGAPPoErrorCount function gets the PPo sensor error count. - * @details \b Inputs: fpgaSensorReadings.errorCountPpo + * The getFPGAP13ErrorCount function gets the P13 sensor error count. + * @details \b Inputs: fpgaSensorReadings.errorCountP13 * @details \b Outputs: none - * @return PPo sensor error count + * @return P13 sensor error count *************************************************************************/ -U08 getFPGAPPoErrorCount( void ) +U08 getFPGAP13ErrorCount( void ) { - return fpgaSensorReadings.errorCountPpo; + return fpgaSensorReadings.errorCountP13; } /*********************************************************************//** * @brief - * The getFPGAPMpRawPressure function gets the PMp pressure reading. - * @details \b Inputs: fpgaSensorReadings.pressurePmp + * The getFPGAP17RawPressure function gets the P17 pressure reading. + * @details \b Inputs: fpgaSensorReadings.pressureP17 * @details \b Outputs: none - * @return PMp pressure + * @return P17 pressure *************************************************************************/ -S16 getFPGAPMpRawPressure( void ) +S16 getFPGAP17RawPressure( void ) { - return fpgaSensorReadings.pressurePmp; + return fpgaSensorReadings.pressureP17; } /*********************************************************************//** * @brief - * The getFPGAPMpRawTemperature function gets the PMp sensor temperature. - * @details \b Inputs: fpgaSensorReadings.temperaturePmp + * The getFPGAP17RawTemperature function gets the P17 sensor temperature. + * @details \b Inputs: fpgaSensorReadings.temperatureP17 * @details \b Outputs: none - * @return PMp sensor temperature + * @return P17 sensor temperature *************************************************************************/ -S16 getFPGAPMpRawTemperature( void ) +S16 getFPGAP17RawTemperature( void ) { - return fpgaSensorReadings.temperaturePmp; + return fpgaSensorReadings.temperatureP17; } /*********************************************************************//** * @brief - * The getFPGAPMpReadCount function gets the PMp sensor read count. - * @details \b Inputs: fpgaSensorReadings.readCountPmp + * The getFPGAP17ReadCount function gets the P17 sensor read count. + * @details \b Inputs: fpgaSensorReadings.readCountP17 * @details \b Outputs: none - * @return PMp sensor read count + * @return P17 sensor read count *************************************************************************/ -U08 getFPGAPMpReadCount( void ) +U08 getFPGAP17ReadCount( void ) { - return fpgaSensorReadings.readCountPmp; + return fpgaSensorReadings.readCountP17; } /*********************************************************************//** * @brief - * The getFPGAPMpErrorCount function gets the PMp sensor error count. - * @details \b Inputs: fpgaSensorReadings.errorCountPmp + * The getFPGAP17ErrorCount function gets the P17 sensor error count. + * @details \b Inputs: fpgaSensorReadings.errorCountP17 * @details \b Outputs: none - * @return PMp sensor error count + * @return P17 sensor error count *************************************************************************/ -U08 getFPGAPMpErrorCount( void ) +U08 getFPGAP17ErrorCount( void ) { - return fpgaSensorReadings.errorCountPmp; + return fpgaSensorReadings.errorCountP17; } /*********************************************************************//** * @brief - * The getFPGAPPiRawPressure function gets the PPi pressure reading. - * @details \b Inputs: fpgaSensorReadings.pressurePpi + * The getFPGAX1RawPressure function gets the X1 pressure reading. + * @details \b Inputs: fpgaSensorReadings.pressureX1 * @details \b Outputs: none - * @return PPi pressure + * @return X1 pressure *************************************************************************/ -S16 getFPGAPPiRawPressure( void ) +S16 getFPGAX1RawPressure( void ) { - return fpgaSensorReadings.pressurePpi; + return fpgaSensorReadings.pressureX1; } /*********************************************************************//** * @brief - * The getFPGAPPiRawTemperature function gets the PPi sensor temperature. - * @details \b Inputs: fpgaSensorReadings.temperaturePpi + * The getFPGAX1RawTemperature function gets the X1 sensor temperature. + * @details \b Inputs: fpgaSensorReadings.temperatureX1 * @details \b Outputs: none - * @return PPi sensor temperature + * @return X1 sensor temperature *************************************************************************/ -S16 getFPGAPPiRawTemperature( void ) +S16 getFPGAX1RawTemperature( void ) { - return fpgaSensorReadings.temperaturePpi; + return fpgaSensorReadings.temperatureX1; } /*********************************************************************//** * @brief - * The getFPGAPPiReadCount function gets the PPi sensor read count. - * @details \b Inputs: fpgaSensorReadings.readCountPpi + * The getFPGAX1ReadCount function gets the X1 sensor read count. + * @details \b Inputs: fpgaSensorReadings.readCountX1 * @details \b Outputs: none - * @return PPi sensor read count + * @return X1 sensor read count *************************************************************************/ -U08 getFPGAPPiReadCount( void ) +U08 getFPGAX1ReadCount( void ) { - return fpgaSensorReadings.readCountPpi; + return fpgaSensorReadings.readCountX1; } /*********************************************************************//** * @brief - * The getFPGAPPiErrorCount function gets the PPi sensor error count. - * @details \b Inputs: fpgaSensorReadings.errorCountPpi + * The getFPGAX1ErrorCount function gets the X1 sensor error count. + * @details \b Inputs: fpgaSensorReadings.errorCountX1 * @details \b Outputs: none - * @return PPi sensor error count + * @return X1 sensor error count *************************************************************************/ -U08 getFPGAPPiErrorCount( void ) +U08 getFPGAX1ErrorCount( void ) { - return fpgaSensorReadings.errorCountPpi; + return fpgaSensorReadings.errorCountX1; } /*********************************************************************//** * @brief - * The getFPGATro1Temperature function gets the TRO1 temperature sensor reading. - * @details \b Inputs: fpgaSensorReadings.tempTRO1 + * The getFPGAP23Temperature function gets the TRO1 temperature sensor reading. + * @details \b Inputs: fpgaSensorReadings.tempP23 * @details \b Outputs: none - * @return TRO1 temperature sensor reading + * @return P23 temperature sensor reading *************************************************************************/ -U32 getFPGATro1Temperature( void ) +U32 getFPGAP23Temperature( void ) { - return fpgaSensorReadings.tempTRO1; + return fpgaSensorReadings.tempP23; } /*********************************************************************//** * @brief - * The getFPGATro2Temperature function gets the TRO2 temperature sensor reading. - * @details \b Inputs: fpgaSensorReadings.tempTRO2 + * The getFPGAP22Temperature function gets the TRO2 temperature sensor reading. + * @details \b Inputs: fpgaSensorReadings.tempP22 * @details \b Outputs: none - * @return TRO2 temperature sensor reading + * @return P22 temperature sensor reading *************************************************************************/ -U32 getFPGATro2Temperature( void ) +U32 getFPGAP22Temperature( void ) { - return fpgaSensorReadings.tempTRO2; + return fpgaSensorReadings.tempP22; } /*********************************************************************//** * @brief - * The getFPGAFloaterState function gets the floater level state. + * The getFPGAP25FloaterState function gets the P25 floater level state. * @details \b Inputs: fpgaSensorReadings.levelSwitch * @details \b Outputs: none - * @return floater level state + * @return P25 floater level state *************************************************************************/ -U08 getFPGAFloaterState( void ) +U08 getFPGAP25FloaterState( void ) { - return fpgaSensorReadings.levelSwitch; + return fpgaSensorReadings.p25LevelSwitch; } /*********************************************************************//** * @brief - * The getFPGAFlowFMP function gets the FMP flow rate (in mL/min). - * @details \b Inputs: fpgaSensorReadings.flowRateFmp + * The getFPGAFlowFMP function gets the P16 flow rate (in mL/min). + * @details \b Inputs: fpgaSensorReadings.flowRateP16 * @details \b Outputs: none - * @return FMP flow rate (in mL/min) + * @return P16 flow rate (in mL/min) *************************************************************************/ -U16 getFPGAFlowFMP( void ) +U16 getFPGAFlowP16( void ) { - return fpgaSensorReadings.flowRateFmp; + return fpgaSensorReadings.flowRateP16; } /*********************************************************************//** * @brief - * The getFPGAFlowFMPTemp function gets the FMP flow sensor temperature, the + * The getFPGAFlowP16Temp function gets the P16 flow sensor temperature, the * temperature of the fluid flowing through the sensor. - * @details \b Inputs: fpgaSensorReadings.flowTempFmp + * @details \b Inputs: fpgaSensorReadings.flowTempP16 * @details \b Outputs: none - * @return FMP fluid temperature + * @return P16 fluid temperature *************************************************************************/ -U16 getFPGAFlowFMPTemp( void ) +U16 getFPGAFlowP16Temp( void ) { - return fpgaSensorReadings.flowTempFmp; + return fpgaSensorReadings.flowTempP16; } /*********************************************************************//** * @brief - * The getFPGAFlowFMS function gets the FMS flow rate (in mL/min). - * @details \b Inputs: fpgaSensorReadings.flowRateFms + * The getFPGAFlowP7 function gets the P7 flow rate (in mL/min). + * @details \b Inputs: fpgaSensorReadings.flowRateP7 * @details \b Outputs: none - * @return FMS flow rate (in mL/min) + * @return P7 flow rate (in mL/min) *************************************************************************/ -U16 getFPGAFlowFMS( void ) +U16 getFPGAFlowP7( void ) { - //return fpgaSensorReadings.flowRateFms; + //return fpgaSensorReadings.flowRateP7; return 0; } /*********************************************************************//** * @brief - * The getFPGAFlowFMSTemp function gets the FMS flow sensor temperature, the + * The getFPGAFlowP7Temp function gets the P7 flow sensor temperature, the * temperature of the fluid flowing through the sensor. - * @details \b Inputs: fpgaSensorReadings.flowTempFms + * @details \b Inputs: fpgaSensorReadings.flowTempP7 * @details \b Outputs: none - * @return FMS fluid temperature + * @return P7 fluid temperature *************************************************************************/ -U16 getFPGAFlowFMSTemp( void ) +U16 getFPGAFlowP7Temp( void ) { - //return fpgaSensorReadings.flowTempFms; + //return fpgaSensorReadings.flowTempP7; return 0; } /*********************************************************************//** * @brief - * The setFPGACPiControl function sets the FPGA CPi sensor control register + * The setFPGAP9Control function sets the FPGA P9 sensor control register * to perform a given action. * bit 4..7: unused - * bit 3: Enable CPi read transaction; address needed - * bit 2: Enable CPi write transaction; address and data needs to be set - * bit 1: Enable CPi initialization procedure - * bit 0: reset CPi sensor + * bit 3: Enable P9 read transaction; address needed + * bit 2: Enable P9 write transaction; address and data needs to be set + * bit 1: Enable P9 initialization procedure + * bit 0: reset P9 sensor * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.conductivityCPiControl + * @details \b Outputs: fpgaActuatorSetPoints.conductivityP9Control * @param control bits indicating control action to take * @return none *************************************************************************/ -void setFPGACPiControl( U08 control ) +void setFPGAP9Control( U08 control ) { - fpgaActuatorSetPoints.conductivityCPiControl = control; + fpgaActuatorSetPoints.conductivityP9Control = control; } /*********************************************************************//** * @brief - * The setFPGACPiAddress function sets the read/write address for a read/write - * action on the CPi sensor. + * The setFPGAP9Address function sets the read/write address for a read/write + * action on the P9 sensor. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.conductivityCPiAddress - * @param address The CPi sensor address to read from or write to + * @details \b Outputs: fpgaActuatorSetPoints.conductivityP9Address + * @param address The P9 sensor address to read from or write to * @return none *************************************************************************/ -void setFPGACPiAddress( U16 address ) +void setFPGAP9Address( U16 address ) { - fpgaActuatorSetPoints.conductivityCPiAddress = address; + fpgaActuatorSetPoints.conductivityP9Address = address; } /*********************************************************************//** * @brief - * The setFPGACPiData function sets the write data for a write action on - * the CPi sensor. + * The setFPGAP9Data function sets the write data for a write action on + * the P9 sensor. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.conductivityCPiData - * @param data The 32-bit data to write to the CPi sensor + * @details \b Outputs: fpgaActuatorSetPoints.conductivityP9Data + * @param data The 32-bit data to write to the P9 sensor * @return none *************************************************************************/ -void setFPGACPiData( U32 data ) +void setFPGAP9Data( U32 data ) { - fpgaActuatorSetPoints.conductivityCPiData = data; + fpgaActuatorSetPoints.conductivityP9Data = data; } /*********************************************************************//** * @brief - * The setFPGACPiControl function sets the FPGA CPo sensor control register + * The setFPGAP18Control function sets the FPGA P18 sensor control register * to perform a given action. * bit 4..7: unused - * bit 3: Enable CPo read transaction; address needed - * bit 2: Enable CPo write transaction; address and data needs to be set - * bit 1: Enable CPo initialization procedure - * bit 0: reset CPo sensor + * bit 3: Enable P18 read transaction; address needed + * bit 2: Enable P18 write transaction; address and data needs to be set + * bit 1: Enable P18 initialization procedure + * bit 0: reset P18 sensor * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.conductivityCPoControl + * @details \b Outputs: fpgaActuatorSetPoints.conductivityP18Control * @param control bits indicating control action to take * @return none *************************************************************************/ -void setFPGACPoControl( U08 control ) +void setFPGAP18Control( U08 control ) { - fpgaActuatorSetPoints.conductivityCPoControl = control; + fpgaActuatorSetPoints.conductivityP18Control = control; } /*********************************************************************//** * @brief - * The setFPGACPoAddress function sets the read/write address for a read/write - * action on the CPo sensor. + * The setFPGAP18Address function sets the read/write address for a read/write + * action on the P18 sensor. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.conductivityCPoAddress - * @param address The CPo sensor address to read from or write to + * @details \b Outputs: fpgaActuatorSetPoints.conductivityP18Address + * @param address The P18 sensor address to read from or write to * @return none *************************************************************************/ -void setFPGACPoAddress( U16 address ) +void setFPGAP18Address( U16 address ) { - fpgaActuatorSetPoints.conductivityCPoAddress = address; + fpgaActuatorSetPoints.conductivityP18Address = address; } /*********************************************************************//** * @brief - * The setFPGACPoData function sets the write data for a write action on - * the CPo sensor. + * The setFPGAP18Data function sets the write data for a write action on + * the P18 sensor. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.conductivityCPoData - * @param data The 32-bit data to write to the CPo sensor + * @details \b Outputs: fpgaActuatorSetPoints.conductivityP18Data + * @param data The 32-bit data to write to the P18 sensor * @return none *************************************************************************/ -void setFPGACPoData( U32 data ) +void setFPGAP18Data( U32 data ) { - fpgaActuatorSetPoints.conductivityCPoData = data; + fpgaActuatorSetPoints.conductivityP18Data = data; } /*********************************************************************//** * @brief - * The setFPGACPiReset function sets the reset command bit for CPi sensor. + * The setFPGAP9Reset function sets the reset command bit for P9 sensor. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.conductivityCPiControl + * @details \b Outputs: fpgaActuatorSetPoints.conductivityP9Control * @return none *************************************************************************/ -void setFPGACPiReset( void ) +void setFPGAP9Reset( void ) { - fpgaActuatorSetPoints.conductivityCPiControl |= FPGA_CONDUCTIVITY_RESET_BIT; + fpgaActuatorSetPoints.conductivityP9Control |= FPGA_CONDUCTIVITY_RESET_BIT; } /*********************************************************************//** * @brief - * The clearFPGACPiReset function clears the reset command bit for CPi sensor. + * The clearFPGAP9Reset function clears the reset command bit for P9 sensor. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.conductivityCPiControl + * @details \b Outputs: fpgaActuatorSetPoints.conductivityP9Control * @return none *************************************************************************/ -void clearFPGACPiReset( void ) +void clearFPGAP9Reset( void ) { - fpgaActuatorSetPoints.conductivityCPiControl &= ~FPGA_CONDUCTIVITY_RESET_BIT; + fpgaActuatorSetPoints.conductivityP9Control &= ~FPGA_CONDUCTIVITY_RESET_BIT; } /*********************************************************************//** * @brief - * The setFPGACPiInitEnable function sets the initialize command bit for - * CPi sensor. + * The setFPGAP9InitEnable function sets the initialize command bit for + * P9 sensor. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.conductivityCPiControl + * @details \b Outputs: fpgaActuatorSetPoints.conductivityP9Control * @return none *************************************************************************/ -void setFPGACPiInitEnable( void ) +void setFPGAP9InitEnable( void ) { - fpgaActuatorSetPoints.conductivityCPiControl |= FPGA_CONDUCTIVITY_INIT_ENABLE_BIT; + fpgaActuatorSetPoints.conductivityP9Control |= FPGA_CONDUCTIVITY_INIT_ENABLE_BIT; } /*********************************************************************//** * @brief - * The clearFPGACPiInitEnable function clears the initialize command bit for - * CPi sensor. + * The clearFPGAP9InitEnable function clears the initialize command bit for + * P9 sensor. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.conductivityCPiControl + * @details \b Outputs: fpgaActuatorSetPoints.conductivityP9Control * @return none *************************************************************************/ -void clearFPGACPiInitEnable( void ) +void clearFPGAP9InitEnable( void ) { - fpgaActuatorSetPoints.conductivityCPiControl &= ~FPGA_CONDUCTIVITY_INIT_ENABLE_BIT; + fpgaActuatorSetPoints.conductivityP9Control &= ~FPGA_CONDUCTIVITY_INIT_ENABLE_BIT; } /*********************************************************************//** * @brief - * The setFPGACPiWriteEnable function sets the write enable command bit for - * CPi sensor. + * The setFPGAP9WriteEnable function sets the write enable command bit for + * P9 sensor. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.conductivityCPiControl + * @details \b Outputs: fpgaActuatorSetPoints.conductivityP9Control * @return none *************************************************************************/ -void setFPGACPiWriteEnable( void ) +void setFPGAP9WriteEnable( void ) { - fpgaActuatorSetPoints.conductivityCPiControl |= FPGA_CONDUCTIVITY_WR_ENABLE_BIT; + fpgaActuatorSetPoints.conductivityP9Control |= FPGA_CONDUCTIVITY_WR_ENABLE_BIT; } /*********************************************************************//** * @brief - * The clearFPGACPiWriteEnable function clears the write enable command bit - * for CPi sensor. + * The clearFPGAP9WriteEnable function clears the write enable command bit + * for P9 sensor. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.conductivityCPiControl + * @details \b Outputs: fpgaActuatorSetPoints.conductivityP9Control * @return none *************************************************************************/ -void clearFPGACPiWriteEnable( void ) +void clearFPGAP9WriteEnable( void ) { - fpgaActuatorSetPoints.conductivityCPiControl &= ~FPGA_CONDUCTIVITY_WR_ENABLE_BIT; + fpgaActuatorSetPoints.conductivityP9Control &= ~FPGA_CONDUCTIVITY_WR_ENABLE_BIT; } /*********************************************************************//** * @brief - * The setFPGACPiReadEnable function sets the read enable command bit for - * CPi sensor. + * The setFPGAP9ReadEnable function sets the read enable command bit for + * P9 sensor. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.conductivityCPiControl + * @details \b Outputs: fpgaActuatorSetPoints.conductivityP9Control * @return none *************************************************************************/ -void setFPGACPiReadEnable( void ) +void setFPGAP9ReadEnable( void ) { - fpgaActuatorSetPoints.conductivityCPiControl |= FPGA_CONDUCTIVITY_RD_ENABLE_BIT; + fpgaActuatorSetPoints.conductivityP9Control |= FPGA_CONDUCTIVITY_RD_ENABLE_BIT; } /*********************************************************************//** * @brief - * The clearFPGACPiReadEnable function clears the read enable command bit - * for CPi sensor. + * The clearFPGAP9ReadEnable function clears the read enable command bit + * for P9 sensor. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.conductivityCPiControl + * @details \b Outputs: fpgaActuatorSetPoints.conductivityP9Control * @return none *************************************************************************/ -void clearFPGACPiReadEnable( void ) +void clearFPGAP9ReadEnable( void ) { - fpgaActuatorSetPoints.conductivityCPiControl &= ~FPGA_CONDUCTIVITY_RD_ENABLE_BIT; + fpgaActuatorSetPoints.conductivityP9Control &= ~FPGA_CONDUCTIVITY_RD_ENABLE_BIT; } /*********************************************************************//** * @brief - * The setFPGACPoReset function sets the reset command bit for CPo sensor. + * The setFPGAP18Reset function sets the reset command bit for P18 sensor. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.conductivityCPoControl + * @details \b Outputs: fpgaActuatorSetPoints.conductivityP18Control * @return none *************************************************************************/ -void setFPGACPoReset( void ) +void setFPGAP18Reset( void ) { - fpgaActuatorSetPoints.conductivityCPoControl |= FPGA_CONDUCTIVITY_RESET_BIT; + fpgaActuatorSetPoints.conductivityP18Control |= FPGA_CONDUCTIVITY_RESET_BIT; } /*********************************************************************//** * @brief - * The clearFPGACPoReset function clears the reset command bit for CPo sensor. + * The clearFPGAP18Reset function clears the reset command bit for P18 sensor. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.conductivityCPoControl + * @details \b Outputs: fpgaActuatorSetPoints.conductivityP18Control * @return none *************************************************************************/ -void clearFPGACPoReset( void ) +void clearFPGAP18Reset( void ) { - fpgaActuatorSetPoints.conductivityCPoControl &= ~FPGA_CONDUCTIVITY_RESET_BIT; + fpgaActuatorSetPoints.conductivityP18Control &= ~FPGA_CONDUCTIVITY_RESET_BIT; } /*********************************************************************//** * @brief - * The setFPGACPoInitEnable function sets the initialize command bit for - * CPo sensor. + * The setFPGAP18InitEnable function sets the initialize command bit for + * P18 sensor. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.conductivityCPoControl + * @details \b Outputs: fpgaActuatorSetPoints.conductivityP18Control * @return none *************************************************************************/ -void setFPGACPoInitEnable( void ) +void setFPGAP18InitEnable( void ) { - fpgaActuatorSetPoints.conductivityCPoControl |= FPGA_CONDUCTIVITY_INIT_ENABLE_BIT; + fpgaActuatorSetPoints.conductivityP18Control |= FPGA_CONDUCTIVITY_INIT_ENABLE_BIT; } /*********************************************************************//** * @brief - * The clearFPGACPoInitEnable function clears the initialize command bit for - * CPo sensor. + * The clearFPGAP18InitEnable function clears the initialize command bit for + * P18 sensor. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.conductivityCPoControl + * @details \b Outputs: fpgaActuatorSetPoints.conductivityP18Control * @return none *************************************************************************/ -void clearFPGACPoInitEnable( void ) +void clearFPGAP18InitEnable( void ) { - fpgaActuatorSetPoints.conductivityCPoControl &= ~FPGA_CONDUCTIVITY_INIT_ENABLE_BIT; + fpgaActuatorSetPoints.conductivityP18Control &= ~FPGA_CONDUCTIVITY_INIT_ENABLE_BIT; } /*********************************************************************//** * @brief - * The setFPGACPoWriteEnable function sets the write enable command bit for - * CPo sensor. + * The setFPGAP18WriteEnable function sets the write enable command bit for + * P18 sensor. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.conductivityCPoControl + * @details \b Outputs: fpgaActuatorSetPoints.conductivityP18Control * @return none *************************************************************************/ -void setFPGACPoWriteEnable( void ) +void setFPGAP18WriteEnable( void ) { - fpgaActuatorSetPoints.conductivityCPoControl |= FPGA_CONDUCTIVITY_WR_ENABLE_BIT; + fpgaActuatorSetPoints.conductivityP18Control |= FPGA_CONDUCTIVITY_WR_ENABLE_BIT; } /*********************************************************************//** * @brief - * The clearFPGACPoWriteEnable function clears the write enable command bit - * for CPo sensor. + * The clearFPGAP18WriteEnable function clears the write enable command bit + * for P18 sensor. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.conductivityCPoControl + * @details \b Outputs: fpgaActuatorSetPoints.conductivityP18Control * @return none *************************************************************************/ -void clearFPGACPoWriteEnable( void ) +void clearFPGAP18WriteEnable( void ) { - fpgaActuatorSetPoints.conductivityCPoControl &= ~FPGA_CONDUCTIVITY_WR_ENABLE_BIT; + fpgaActuatorSetPoints.conductivityP18Control &= ~FPGA_CONDUCTIVITY_WR_ENABLE_BIT; } /*********************************************************************//** * @brief - * The setFPGACPoReadEnable function sets the read enable command bit for - * CPo sensor. + * The setFPGAP18ReadEnable function sets the read enable command bit for + * P18 sensor. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.conductivityCPoControl + * @details \b Outputs: fpgaActuatorSetPoints.conductivityP18Control * @return none *************************************************************************/ -void setFPGACPoReadEnable( void ) +void setFPGAP18ReadEnable( void ) { - fpgaActuatorSetPoints.conductivityCPoControl |= FPGA_CONDUCTIVITY_RD_ENABLE_BIT; + fpgaActuatorSetPoints.conductivityP18Control |= FPGA_CONDUCTIVITY_RD_ENABLE_BIT; } /*********************************************************************//** * @brief - * The clearFPGACPoReadEnable function clears the read enable command bit - * for CPo sensor. + * The clearFPGAP18ReadEnable function clears the read enable command bit + * for P18 sensor. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.conductivityCPoControl + * @details \b Outputs: fpgaActuatorSetPoints.conductivityP18Control * @return none *************************************************************************/ -void clearFPGACPoReadEnable( void ) +void clearFPGAP18ReadEnable( void ) { - fpgaActuatorSetPoints.conductivityCPoControl &= ~FPGA_CONDUCTIVITY_RD_ENABLE_BIT; + fpgaActuatorSetPoints.conductivityP18Control &= ~FPGA_CONDUCTIVITY_RD_ENABLE_BIT; } /*********************************************************************//** * @brief - * The getFPGACPiReadCount function gets the latest CPi sensor read count. - * @details \b Inputs: fpgaSensorReadings.conductivityCPiReadCount + * The getFPGAP9ReadCount function gets the latest P9 sensor read count. + * @details \b Inputs: fpgaSensorReadings.conductivityP9ReadCount * @details \b Outputs: none - * @return Current read count for CPi sensor. + * @return Current read count for P9 sensor. *************************************************************************/ -U08 getFPGACPiReadCount( void ) +U08 getFPGAP9ReadCount( void ) { - return fpgaSensorReadings.conductivityCpiReadCount; + return fpgaSensorReadings.conductivityP9ReadCount; } /*********************************************************************//** * @brief - * The getFPGACPiErrorCount function gets the latest CPi sensor error count. - * @details \b Inputs: fpgaSensorReadings.conductivityCpiErrorCount + * The getFPGAP9ErrorCount function gets the latest P9 sensor error count. + * @details \b Inputs: fpgaSensorReadings.conductivityP9ErrorCount * @details \b Outputs: none - * @return Current error count for CPi sensor. + * @return Current error count for P9 sensor. *************************************************************************/ -U08 getFPGACPiErrorCount( void ) +U08 getFPGAP9ErrorCount( void ) { - return fpgaSensorReadings.conductivityCpiErrorCount; + return fpgaSensorReadings.conductivityP9ErrorCount; } /*********************************************************************//** * @brief - * The getFPGACPiConductivity function gets the latest CPi sensor conductivity + * The getFPGAP9Conductivity function gets the latest P9 sensor conductivity * reading. - * @details \b Inputs: fpgaSensorReadings.conductivityCpiCond + * @details \b Inputs: fpgaSensorReadings.conductivityP9Cond * @details \b Outputs: none - * @return Current conductivity reading from CPi sensor. + * @return Current conductivity reading from P9 sensor. *************************************************************************/ -U16 getFPGACPiConductivity( void ) +U16 getFPGAP9Conductivity( void ) { - return fpgaSensorReadings.conductivityCpiCond; + return fpgaSensorReadings.conductivityP9Cond; } /*********************************************************************//** * @brief - * The getFPGACPiTemperature function gets the latest CPi sensor temperature. - * @details \b Inputs: fpgaSensorReadings.conductivityCpiTemp + * The getFPGAP9Temperature function gets the latest P9 sensor temperature. + * @details \b Inputs: fpgaSensorReadings.conductivityP9Temp * @details \b Outputs: none - * @return Current temperature from CPi sensor. + * @return Current temperature from P9 sensor. *************************************************************************/ -U16 getFPGACPiTemperature( void ) +U16 getFPGAP9Temperature( void ) { - return fpgaSensorReadings.conductivityCpiTemp; + return fpgaSensorReadings.conductivityP9Temp; } /*********************************************************************//** * @brief - * The getFPGACPiData function gets the latest CPi sensor data from a read + * The getFPGAP9Data function gets the latest P9 sensor data from a read * action. - * @details \b Inputs: fpgaSensorReadings.conductivityCpiData + * @details \b Inputs: fpgaSensorReadings.conductivityP9Data * @details \b Outputs: none - * @return Latest data read from CPi sensor. + * @return Latest data read from P9 sensor. *************************************************************************/ -U32 getFPGACPiData( void ) +U32 getFPGAP9Data( void ) { - return fpgaSensorReadings.conductivityCpiData; + return fpgaSensorReadings.conductivityP9Data; } /*********************************************************************//** * @brief - * The getFPGACPoReadCount function gets the latest CPo sensor read count. - * @details \b Inputs: fpgaSensorReadings.conductivityCpoReadCount + * The getFPGAP18ReadCount function gets the latest P18 sensor read count. + * @details \b Inputs: fpgaSensorReadings.conductivityP18ReadCount * @details \b Outputs: none - * @return Current read count for CPo sensor. + * @return Current read count for P18 sensor. *************************************************************************/ -U08 getFPGACPoReadCount( void ) +U08 getFPGAP18ReadCount( void ) { - return fpgaSensorReadings.conductivityCpoReadCount; + return fpgaSensorReadings.conductivityP18ReadCount; } /*********************************************************************//** * @brief - * The getFPGACPoErrorCount function gets the latest CPo sensor error count. - * @details \b Inputs: fpgaSensorReadings.conductivityCpoErrorCount + * The getFPGAP18ErrorCount function gets the latest P18 sensor error count. + * @details \b Inputs: fpgaSensorReadings.conductivityP18ErrorCount * @details \b Outputs: none - * @return Current error count for CPo sensor. + * @return Current error count for P18 sensor. *************************************************************************/ -U08 getFPGACPoErrorCount( void ) +U08 getFPGAP18ErrorCount( void ) { - return fpgaSensorReadings.conductivityCpoErrorCount; + return fpgaSensorReadings.conductivityP18ErrorCount; } /*********************************************************************//** * @brief - * The getFPGACPoConductivity function gets the latest CPo sensor conductivity + * The getFPGAP18Conductivity function gets the latest P18 sensor conductivity * reading. - * @details \b Inputs: fpgaSensorReadings.conductivityCpoCond + * @details \b Inputs: fpgaSensorReadings.conductivityP18Cond * @details \b Outputs: none - * @return Current conductivity reading from CPo sensor. + * @return Current conductivity reading from P18 sensor. *************************************************************************/ -U16 getFPGACPoConductivity( void ) +U16 getFPGAP18Conductivity( void ) { - return fpgaSensorReadings.conductivityCpoCond; + return fpgaSensorReadings.conductivityP18Cond; } /*********************************************************************//** * @brief - * The getFPGACPoTemperature function gets the latest CPo sensor temperature. - * @details \b Inputs: fpgaSensorReadings.conductivityCpoTemp + * The getFPGAP18Temperature function gets the latest P18 sensor temperature. + * @details \b Inputs: fpgaSensorReadings.conductivityP18Temp * @details \b Outputs: none - * @return Current temperature from CPo sensor. + * @return Current temperature from P18 sensor. *************************************************************************/ -U16 getFPGACPoTemperature( void ) +U16 getFPGAP18Temperature( void ) { - return fpgaSensorReadings.conductivityCpoTemp; + return fpgaSensorReadings.conductivityP18Temp; } /*********************************************************************//** * @brief - * The getFPGACPoData function gets the latest CPo sensor data from a read + * The getFPGAP18Data function gets the latest P18 sensor data from a read * action. - * @details \b Inputs: fpgaSensorReadings.conductivityCpoData + * @details \b Inputs: fpgaSensorReadings.conductivityP18Data * @details \b Outputs: none - * @return Latest data read from CPo sensor. + * @return Latest data read from P18 sensor. *************************************************************************/ -U32 getFPGACPoData( void ) +U32 getFPGAP18Data( void ) { - return fpgaSensorReadings.conductivityCpoData; + return fpgaSensorReadings.conductivityP18Data; } /**@}*/ Index: firmware/App/Services/FpgaRO.h =================================================================== diff -u -r834e2f1c57b828c546c56dea42a9757988e16314 -r3241c6b7f66889b6443e377ab1f5ecf2cedd2602 --- firmware/App/Services/FpgaRO.h (.../FpgaRO.h) (revision 834e2f1c57b828c546c56dea42a9757988e16314) +++ firmware/App/Services/FpgaRO.h (.../FpgaRO.h) (revision 3241c6b7f66889b6443e377ab1f5ecf2cedd2602) @@ -44,90 +44,90 @@ void setFPGAValveStates( U16 valveStates ); U16 getFPGAValveStates( void ); -void setROPumpEnable( BOOL enable ); -void setROPumpPWM( U16 pwm ); -U16 getROPumpPWM( void ); -U16 getROPumpTachCount( void ); +void setFPGAP12PumpEnable( BOOL enable ); +void setFPGAP12PumpPWM( U16 pwm ); +U16 getFPGAP12PumpPWM( void ); +U16 getFPGAP12PumpTachCount( void ); -void setFPGAHeaterEnabled( BOOL enable ); -void setFPGAHeaterPWM( U16 pwm ); +void setFPGAP24Enabled( BOOL enable ); +void setFPGAP24PWM( U16 pwm ); -S16 getFPGAPRiRawPressure( void ); -S16 getFPGAPRiRawTemperature( void ); -U08 getFPGAPRiReadCount( void ); -U08 getFPGAPRiErrorCount( void ); +S16 getFPGAM1RawPressure( void ); +S16 getFPGAM1RawTemperature( void ); +U08 getFPGAM1ReadCount( void ); +U08 getFPGAM1ErrorCount( void ); -S16 getFPGAPRoRawPressure( void ); -S16 getFPGAPRoRawTemperature( void ); -U08 getFPGAPRoReadCount( void ); -U08 getFPGAPRoErrorCount( void ); +S16 getFPGAM3RawPressure( void ); +S16 getFPGAM3RawTemperature( void ); +U08 getFPGAM3ReadCount( void ); +U08 getFPGAM3ErrorCount( void ); -S16 getFPGAPC2oRawPressure( void ); -S16 getFPGAPC2oRawTemperature( void ); -U08 getFPGAPC2oReadCount( void ); -U08 getFPGAPC2oErrorCount( void ); +S16 getFPGAP8RawPressure( void ); +S16 getFPGAP8RawTemperature( void ); +U08 getFPGAP8ReadCount( void ); +U08 getFPGAP8ErrorCount( void ); -S16 getFPGAPPoRawPressure( void ); -S16 getFPGAPPoRawTemperature( void ); -U08 getFPGAPPoReadCount( void ); -U08 getFPGAPPoErrorCount( void ); +S16 getFPGAP13RawPressure( void ); +S16 getFPGAP13RawTemperature( void ); +U08 getFPGAP13ReadCount( void ); +U08 getFPGAP13ErrorCount( void ); -S16 getFPGAPMpRawPressure( void ); -S16 getFPGAPMpRawTemperature( void ); -U08 getFPGAPMpReadCount( void ); -U08 getFPGAPMpErrorCount( void ); +S16 getFPGAP17RawPressure( void ); +S16 getFPGAP17RawTemperature( void ); +U08 getFPGAP17ReadCount( void ); +U08 getFPGAP17ErrorCount( void ); -S16 getFPGAPPiRawPressure( void ); -S16 getFPGAPPiRawTemperature( void ); -U08 getFPGAPPiReadCount( void ); -U08 getFPGAPPiErrorCount( void ); +S16 getFPGAX1RawPressure( void ); +S16 getFPGAX1RawTemperature( void ); +U08 getFPGAX1ReadCount( void ); +U08 getFPGAX1ErrorCount( void ); -U32 getFPGATro1Temperature( void ); -U32 getFPGATro2Temperature( void ); +U32 getFPGAP23Temperature( void ); +U32 getFPGAP22Temperature( void ); -U08 getFPGAFloaterState( void ); +U08 getFPGAP25FloaterState( void ); -U16 getFPGAFlowFMP( void ); -U16 getFPGAFlowFMPTemp( void ); -U16 getFPGAFlowFMS( void ); -U16 getFPGAFlowFMSTemp( void ); +U16 getFPGAFlowP16( void ); +U16 getFPGAFlowP16Temp( void ); +U16 getFPGAFlowP7( void ); +U16 getFPGAFlowP7Temp( void ); -void setFPGACPiControl( U08 control ); -void setFPGACPiAddress( U16 address ); -void setFPGACPiData( U32 data ); -void setFPGACPoControl( U08 control ); -void setFPGACPoAddress( U16 address ); -void setFPGACPoData( U32 data ); +void setFPGAP9Control( U08 control ); +void setFPGAP9Address( U16 address ); +void setFPGAP9Data( U32 data ); +void setFPGAP18Control( U08 control ); +void setFPGAP18Address( U16 address ); +void setFPGAP18Data( U32 data ); -void setFPGACPiReset( void ); -void clearFPGACPiReset( void ); -void setFPGACPiInitEnable( void ); -void clearFPGACPiInitEnable( void ); -void setFPGACPiWriteEnable( void ); -void clearFPGACPiWriteEnable( void ); -void setFPGACPiReadEnable( void ); -void clearFPGACPiReadEnable( void ); +void setFPGAP9Reset( void ); +void clearFPGAP9Reset( void ); +void setFPGAP9InitEnable( void ); +void clearFPGAP9InitEnable( void ); +void setFPGAP9WriteEnable( void ); +void clearFPGAP9WriteEnable( void ); +void setFPGAP9ReadEnable( void ); +void clearFPGAP9ReadEnable( void ); -void setFPGACPoReset( void ); -void clearFPGACPoReset( void ); -void setFPGACPoInitEnable( void ); -void clearFPGACPoInitEnable( void ); -void setFPGACPoWriteEnable( void ); -void clearFPGACPoWriteEnable( void ); -void setFPGACPoReadEnable( void ); -void clearFPGACPoReadEnable( void ); +void setFPGAP18Reset( void ); +void clearFPGAP18Reset( void ); +void setFPGAP18InitEnable( void ); +void clearFPGAP18InitEnable( void ); +void setFPGAP18WriteEnable( void ); +void clearFPGAP18WriteEnable( void ); +void setFPGAP18ReadEnable( void ); +void clearFPGAP18ReadEnable( void ); -U08 getFPGACPiReadCount( void ); -U08 getFPGACPiErrorCount( void ); -U16 getFPGACPiConductivity( void ); -U16 getFPGACPiTemperature( void ); -U32 getFPGACPiData( void ); +U08 getFPGAP9ReadCount( void ); +U08 getFPGAP9ErrorCount( void ); +U16 getFPGAP9Conductivity( void ); +U16 getFPGAP9Temperature( void ); +U32 getFPGAP9Data( void ); -U08 getFPGACPoReadCount( void ); -U08 getFPGACPoErrorCount( void ); -U16 getFPGACPoConductivity( void ); -U16 getFPGACPoTemperature( void ); -U32 getFPGACPoData( void ); +U08 getFPGAP18ReadCount( void ); +U08 getFPGAP18ErrorCount( void ); +U16 getFPGAP18Conductivity( void ); +U16 getFPGAP18Temperature( void ); +U32 getFPGAP18Data( void ); /**@}*/