Index: firmware/App/Services/FpgaRO.c =================================================================== diff -u -r0d2351b8e47e40fdcd706ed7b7ac1379b69a20ef -rd8cd7de2f84b26aafc153e2bb665a5058a040bf0 --- firmware/App/Services/FpgaRO.c (.../FpgaRO.c) (revision 0d2351b8e47e40fdcd706ed7b7ac1379b69a20ef) +++ firmware/App/Services/FpgaRO.c (.../FpgaRO.c) (revision d8cd7de2f84b26aafc153e2bb665a5058a040bf0) @@ -66,46 +66,46 @@ U16 temperaturePro; ///< Reg 272. PRo temperature data. U08 readCountPro; ///< Reg 274. PRo read counter. U08 errorCountPro; ///< Reg 275. PRo error counter. - S16 pressurePsi; ///< Reg 276. PSi pressure data. - U16 temperaturePsi; ///< Reg 278. PSi temperature data. - U08 readCountPsi; ///< Reg 280. PSi read counter. - U08 errorCountPsi; ///< Reg 281. PSi error counter. - S16 pressurePso; ///< Reg 282. PSo pressure data. - U16 temperaturePso; ///< Reg 284. PSo temperature data. - U08 readCountPso; ///< Reg 286. PSo read counter. - U08 errorCountPso; ///< Reg 287. PSo error counter. - S16 pressurePc1o; ///< Reg 288. PC1o pressure data. - U16 temperaturePc1o; ///< Reg 290. PC1o temperature data. - U08 readCountPc1o; ///< Reg 292. PC1o read counter. - U08 errorCountPc1o; ///< Reg 293. PC1o error counter. - S16 pressurePc2o; ///< Reg 294. PC2o pressure data. - U16 temperaturePc2o; ///< Reg 296. PC2o temperature data. - U08 readCountPc2o; ///< Reg 298. PC2o read counter. - U08 errorCountPc2o; ///< Reg 299. PC2o error counter. - S16 pressurePpo; ///< Reg 300. PPo pressure data. - U16 temperaturePpo; ///< Reg 302. PPo temperature data. - U08 readCountPpo; ///< Reg 304. PPo read counter. - U08 errorCountPpo; ///< Reg 305. PPo error counter. - S16 pressurePmp; ///< Reg 306. PMp pressure data. - U16 temperaturePmp; ///< Reg 308. PMp temperature data. - U08 readCountPmp; ///< Reg 310. PMp read counter. - U08 errorCountPmp; ///< Reg 311. PMp error counter. - S16 pressurePmc; ///< Reg 312. PMc pressure data. - U16 temperaturePmc; ///< Reg 314. PMc temperature data. - U08 readCountPmc; ///< Reg 316. PMc read counter. - U08 errorCountPmc; ///< Reg 317. PMc error counter. - S16 pressurePpi; ///< Reg 318. PPi pressure data. - U16 temperaturePpi; ///< Reg 320. PPi temperature data. - U08 readCountPpi; ///< Reg 322. PPi read counter. - U08 errorCountPpi; ///< Reg 323. PPi error counter. - S16 pressurePax1; ///< Reg 324. Pax1 pressure data. - U16 temperaturePax1; ///< Reg 326. Pax1 temperature data. - U08 readCountPax1; ///< Reg 328. Pax1 read counter. - U08 errorCountPax1; ///< Reg 329. Pax1 error counter. - S16 pressurePax2; ///< Reg 330. Pax2 pressure data. - U16 temperaturePax2; ///< Reg 332. Pax2 temperature data. - U08 readCountPax2; ///< Reg 334. Pax2 read counter. - U08 errorCountPax2; ///< Reg 335. Pax2 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. + U16 reserved1; ///< Reg 324. Reserved. + U16 reserved2; ///< Reg 326. Reserved. + U08 levelSwitch; ///< Reg 328. 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 conductSensor1; ///< Reg 336. Conductivity sensor 1. U16 conductSensor1Data; ///< Reg 340. Conductivity sensor 1 data. U16 conductSensor1Temp; ///< Reg 342. Conductivity sensor 1 temperature. @@ -418,4 +418,104 @@ return fpgaSensorReadings.roPumpTachCount; } +S16 getFPGAPRiRawPressure( void ) +{ + return fpgaSensorReadings.pressurePri; +} + +S16 getFPGAPRiRawTemperature( void ) +{ + return fpgaSensorReadings.temperaturePri; +} + +U08 getFPGAPRiReadCount( void ) +{ + return fpgaSensorReadings.readCountPri; +} + +U08 getFPGAPRiErrorCount( void ) +{ + return fpgaSensorReadings.errorCountPri; +} + +S16 getFPGAPRoRawPressure( void ) +{ + return fpgaSensorReadings.pressurePri; +} + +S16 getFPGAPRoRawTemperature( void ) +{ + return fpgaSensorReadings.temperaturePri; +} + +U08 getFPGAPRoReadCount( void ) +{ + return fpgaSensorReadings.readCountPri; +} + +U08 getFPGAPRoErrorCount( void ) +{ + return fpgaSensorReadings.errorCountPri; +} + +S16 getFPGAPC2oRawPressure( void ) +{ + return fpgaSensorReadings.pressurePri; +} + +S16 getFPGAPC2oRawTemperature( void ) +{ + return fpgaSensorReadings.temperaturePri; +} + +U08 getFPGAPC2oReadCount( void ) +{ + return fpgaSensorReadings.readCountPri; +} + +U08 getFPGAPC2oErrorCount( void ) +{ + return fpgaSensorReadings.errorCountPri; +} + +S16 getFPGAPPoRawPressure( void ) +{ + return fpgaSensorReadings.pressurePri; +} + +S16 getFPGAPPoRawTemperature( void ) +{ + return fpgaSensorReadings.temperaturePri; +} + +U08 getFPGAPPoReadCount( void ) +{ + return fpgaSensorReadings.readCountPri; +} + +U08 getFPGAPPoErrorCount( void ) +{ + return fpgaSensorReadings.errorCountPri; +} + +S16 getFPGAPMpRawPressure( void ) +{ + return fpgaSensorReadings.pressurePri; +} + +S16 getFPGAPMpRawTemperature( void ) +{ + return fpgaSensorReadings.temperaturePri; +} + +U08 getFPGAPMpReadCount( void ) +{ + return fpgaSensorReadings.readCountPri; +} + +U08 getFPGAPMpErrorCount( void ) +{ + return fpgaSensorReadings.errorCountPri; +} + /**@}*/