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; } /**@}*/