Index: firmware/App/Controllers/DialysateFlow.c =================================================================== diff -u -r9cf99616cedc2bdf73b1af4dbbb43ee1cf3ef06b -r3dd12fb9d032f85126db82ca48812a4652a5b75f --- firmware/App/Controllers/DialysateFlow.c (.../DialysateFlow.c) (revision 9cf99616cedc2bdf73b1af4dbbb43ee1cf3ef06b) +++ firmware/App/Controllers/DialysateFlow.c (.../DialysateFlow.c) (revision 3dd12fb9d032f85126db82ca48812a4652a5b75f) @@ -120,7 +120,7 @@ if ( TRUE == isNewCalibrationRecordAvailable() ) { getNVRecord2Driver( GET_CAL_FLOW_SENSORS, (U08*)&flowSensorsCalRecord, sizeof( DG_FLOW_SENSORS_CAL_RECORD_T ), - NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD ); + NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_DG_DIALYSATE_FLOW_SENSOR_INVALID_CAL_RECORD ); } // Read flow at the control set Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -r544e9782a1b8d444224f41efef38a5204c262722 -r3dd12fb9d032f85126db82ca48812a4652a5b75f --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 544e9782a1b8d444224f41efef38a5204c262722) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 3dd12fb9d032f85126db82ca48812a4652a5b75f) @@ -69,6 +69,7 @@ static const F32 WATER_SPECIFIC_HEAT_DIVIDED_BY_MINUTES = 4184 / SEC_PER_MIN; ///< Water specific heat in J/KgC / 60. static const F32 PRIMARY_HEATERS_MAXIMUM_POWER_WATTS = 475 + 237.5F; ///< Primary heaters maximum power (main primary = 475W and small primary = 237.5W). +static const F32 HEATERS_VOLTAGE_TOLERANCE_V = HEATERS_MAX_OPERATING_VOLTAGE_V * HEATERS_MAX_VOLTAGE_OUT_OF_RANGE_TOL; ///< Heaters voltage tolerance in volts. /// Heaters exec states typedef enum Heaters_Exec_States @@ -802,7 +803,6 @@ data.primaryEfficiency = heatersStatus[ DG_PRIMARY_HEATER ].heaterEfficiency * 100; data.primaryCalcTargetTemp = heatersStatus[ DG_PRIMARY_HEATER ].calculatedTemperature; data.trimmerCalcCurrentTemp = heatersStatus[ DG_TRIMMER_HEATER ].calculatedTemperature; - broadcastData( MSG_ID_DG_HEATERS_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( HEATERS_DATA_T ) ); dataPublicationTimerCounter = 0; @@ -830,21 +830,17 @@ F32 smallPriDC = heatersStatus[ DG_PRIMARY_HEATER ].dutycycle; F32 trimmerDC = heatersStatus[ DG_TRIMMER_HEATER ].dutycycle; - F32 mainPriVoltageTol = HEATERS_MAX_VOLTAGE_OUT_OF_RANGE_TOL * HEATERS_MAX_OPERATING_VOLTAGE_V; - F32 smallPriVoltageTol = HEATERS_MAX_VOLTAGE_OUT_OF_RANGE_TOL * HEATERS_MAX_OPERATING_VOLTAGE_V; - F32 trimmerVoltageTol = HEATERS_MAX_VOLTAGE_OUT_OF_RANGE_TOL * HEATERS_MAX_OPERATING_VOLTAGE_V; - F32 mainPriExpectedVoltage = HEATERS_MAX_OPERATING_VOLTAGE_V * ( 1.0 - mainPriDC ); F32 smallPriExpectedVoltage = HEATERS_MAX_OPERATING_VOLTAGE_V * ( 1.0 - smallPriDC ); F32 trimmerExpectedVoltage = HEATERS_MAX_OPERATING_VOLTAGE_V * ( 1.0 - trimmerDC ); - BOOL isMainPriOut = ( fabs( mainPriExpectedVoltage - mainPriVoltage ) > mainPriVoltageTol ? TRUE : FALSE ); - BOOL isSmallPriOut = ( fabs( smallPriExpectedVoltage - smallPriVoltage ) > smallPriVoltageTol ? TRUE : FALSE ); - BOOL isTrimmerOut = ( fabs( trimmerExpectedVoltage - trimmerVoltage ) > trimmerVoltageTol ? TRUE : FALSE ); + BOOL isMainPriOut = ( fabs( mainPriExpectedVoltage - mainPriVoltage ) > HEATERS_VOLTAGE_TOLERANCE_V ? TRUE : FALSE ); + BOOL isSmallPriOut = ( fabs( smallPriExpectedVoltage - smallPriVoltage ) > HEATERS_VOLTAGE_TOLERANCE_V ? TRUE : FALSE ); + BOOL isTrimmerOut = ( fabs( trimmerExpectedVoltage - trimmerVoltage ) > HEATERS_VOLTAGE_TOLERANCE_V ? TRUE : FALSE ); - //checkPersistentAlarm( ALARM_ID_DG_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, isMainPriOut, mainPriDC, mainPriVoltageTol ); - //checkPersistentAlarm( ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, isSmallPriOut, smallPriDC, smallPriVoltageTol ); - //checkPersistentAlarm( ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE, isTrimmerOut, trimmerDC, trimmerVoltageTol ); + checkPersistentAlarm( ALARM_ID_DG_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, isMainPriOut, mainPriDC, HEATERS_VOLTAGE_TOLERANCE_V ); + checkPersistentAlarm( ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, isSmallPriOut, smallPriDC, HEATERS_VOLTAGE_TOLERANCE_V ); + checkPersistentAlarm( ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE, isTrimmerOut, trimmerDC, HEATERS_VOLTAGE_TOLERANCE_V ); } Index: firmware/App/Controllers/Pressures.c =================================================================== diff -u -r544e9782a1b8d444224f41efef38a5204c262722 -r3dd12fb9d032f85126db82ca48812a4652a5b75f --- firmware/App/Controllers/Pressures.c (.../Pressures.c) (revision 544e9782a1b8d444224f41efef38a5204c262722) +++ firmware/App/Controllers/Pressures.c (.../Pressures.c) (revision 3dd12fb9d032f85126db82ca48812a4652a5b75f) @@ -85,21 +85,19 @@ /// Barometric sensor conversion coefficients typedef struct { - U16 pressureSensitivity; - U16 pressureOffset; - U16 pressureSensitivityTempCoeff; - U16 pressureOffsetTempCoeff; + U16 pressureSensitivity; ///< Barometric sensor pressure sensitivity constant. + U16 pressureOffset; ///< Barometric sensor pressure offset constant. + U16 pressureSensitivityTempCoeff; ///< Barometric sensor pressure sensitivity temperature coefficient. + U16 pressureOffsetTempCoeff; ///< Barometric sensor pressure offset temperature coefficient. } BARO_SENSOR_CONSTS_T; // ********** private data ********** static PRESSURE_STATE_T pressuresState; ///< current state of pressure monitor state machine. -static U32 pressuresDataPublicationTimerCounter; ///< used to schedule pressure data publication to CAN bus. - +static U32 pressuresDataPublicationTimerCounter; ///< used to schedule pressure data publication to CAN bus. static OVERRIDE_U32_T pressuresDataPublishInterval = { PRESSURES_DATA_PUB_INTERVAL, PRESSURES_DATA_PUB_INTERVAL, 0, 0 }; /// Pressure data publish interval. static OVERRIDE_F32_T pressures[ NUM_OF_PRESSURE_SENSORS ]; ///< Measured pressure from sensors. - static S32 msrdPressureSum[ NUM_OF_PRESSURE_SENSORS ]; ///< Raw pressure sensor sums for averaging. static U32 pressureFilterCounter; ///< Used to schedule pressure sensor filtering. static BARO_SENSOR_CONSTS_T baroConvConsts; ///< Barometric sensor conversion constants. @@ -303,26 +301,10 @@ static PRESSURE_STATE_T handlePressuresContReadState( void ) { PRESSURE_STATE_T result = PRESSURE_CONTINUOUS_READ_STATE; - S32 measuredPressureReadingsRaw[ NUM_OF_PRESSURE_SENSORS ]; U08 sensorId; F32 pressureReading; BOOL isPressureOutOfRange; - - // Get latest raw pressure readings - /*measuredPressureReadingsRaw[ PRESSURE_SENSOR_RO_PUMP_INLET ] = (S32)getIntADCReading( INT_ADC_RO_PUMP_INLET_PRESSURE ) - PUMP_PRESSURE_ZERO; - measuredPressureReadingsRaw[ PRESSURE_SENSOR_RO_PUMP_OUTLET ] = (S32)getIntADCReading( INT_ADC_RO_PUMP_OUTLET_PRESSURE ) - PUMP_PRESSURE_ZERO; - measuredPressureReadingsRaw[ PRESSURE_SENSOR_DRAIN_PUMP_INLET ] = (S32)getIntADCReading( INT_ADC_DRAIN_PUMP_INLET_PRESSURE ) - PUMP_PRESSURE_ZERO; - measuredPressureReadingsRaw[ PRESSURE_SENSOR_DRAIN_PUMP_OUTLET ] = (S32)getIntADCReading( INT_ADC_DRAIN_PUMP_OUTLET_PRESSURE ) - PUMP_PRESSURE_ZERO; - measuredPressureReadingsRaw[ PRESSURE_SENSOR_BAROMETRIC ] = (S32)getFPGABaroPressure(); - // TODO why is this needed? - // Update sums for pressure average calculations - msrdPressureSum[ PRESSURE_SENSOR_RO_PUMP_INLET ] += measuredPressureReadingsRaw[ PRESSURE_SENSOR_RO_PUMP_INLET ]; - msrdPressureSum[ PRESSURE_SENSOR_RO_PUMP_OUTLET ] += measuredPressureReadingsRaw[ PRESSURE_SENSOR_RO_PUMP_OUTLET ]; - msrdPressureSum[ PRESSURE_SENSOR_DRAIN_PUMP_INLET ] += measuredPressureReadingsRaw[ PRESSURE_SENSOR_DRAIN_PUMP_INLET ]; - msrdPressureSum[ PRESSURE_SENSOR_DRAIN_PUMP_OUTLET ] += measuredPressureReadingsRaw[ PRESSURE_SENSOR_DRAIN_PUMP_OUTLET ]; - msrdPressureSum[ PRESSURE_SENSOR_BAROMETRIC ] += measuredPressureReadingsRaw[ PRESSURE_SENSOR_BAROMETRIC ];*/ - // Update sums for pressure average calculations msrdPressureSum[ PRESSURE_SENSOR_RO_PUMP_INLET ] += (S32)getIntADCReading( INT_ADC_RO_PUMP_INLET_PRESSURE ) - PUMP_PRESSURE_ZERO; msrdPressureSum[ PRESSURE_SENSOR_RO_PUMP_OUTLET ] += (S32)getIntADCReading( INT_ADC_RO_PUMP_OUTLET_PRESSURE ) - PUMP_PRESSURE_ZERO; @@ -367,37 +349,6 @@ break; } } - - // TODO remove - // Calculate average pressures - /*F32 avgRoIn = (F32)msrdPressureSum[ PRESSURE_SENSOR_RO_PUMP_INLET ] * PRESSURE_AVERAGE_MULTIPLIER; - F32 avgRoOut = (F32)msrdPressureSum[ PRESSURE_SENSOR_RO_PUMP_OUTLET ] * PRESSURE_AVERAGE_MULTIPLIER; - F32 avgDrnIn = (F32)msrdPressureSum[ PRESSURE_SENSOR_DRAIN_PUMP_INLET ] * PRESSURE_AVERAGE_MULTIPLIER; - F32 avgDrnOut = (F32)msrdPressureSum[ PRESSURE_SENSOR_DRAIN_PUMP_OUTLET ] * PRESSURE_AVERAGE_MULTIPLIER; - - // Convert average pressure readings to PSI - pressuresBeforeCal[ PRESSURE_SENSOR_RO_PUMP_INLET ] = avgRoIn * PUMP_PRESSURE_PSIA_PER_COUNT - PUMP_PRESSURE_PSIA_TO_PSI_OFFSET; - pressuresBeforeCal[ PRESSURE_SENSOR_RO_PUMP_OUTLET ] = avgRoOut * PUMP_PRESSURE_PSIA_PER_COUNT - PUMP_PRESSURE_PSIA_TO_PSI_OFFSET; - pressuresBeforeCal[ PRESSURE_SENSOR_DRAIN_PUMP_INLET ] = avgDrnIn * PUMP_PRESSURE_PSIA_PER_COUNT - PUMP_PRESSURE_PSIA_TO_PSI_OFFSET; - pressuresBeforeCal[ PRESSURE_SENSOR_DRAIN_PUMP_OUTLET ] = avgDrnOut * PUMP_PRESSURE_PSIA_PER_COUNT - PUMP_PRESSURE_PSIA_TO_PSI_OFFSET; - - - - // Apply calibration to the pressure values prior to storing them - for ( sensorId = 0; sensorId < NUM_OF_PRESSURE_SENSORS; sensorId++ ) - { - pressures[ sensorId ].data = pow( pressuresBeforeCal[ sensorId ], 4 ) * pressuresCalRecord.pressureSensors[ sensorId ].fourthOrderCoeff + - pow( pressuresBeforeCal[ sensorId ], 3 ) * pressuresCalRecord.pressureSensors[ sensorId ].thirdOrderCoeff + - pow( pressuresBeforeCal[ sensorId ], 2 ) * pressuresCalRecord.pressureSensors[ sensorId ].secondOrderCoeff + - pressuresBeforeCal[ sensorId ] * pressuresCalRecord.pressureSensors[ sensorId ].gain + - pressuresCalRecord.pressureSensors[ sensorId ].offset; - } - - // reset sums for next averaging - msrdPressureSum[ PRESSURE_SENSOR_RO_PUMP_INLET ] = 0; - msrdPressureSum[ PRESSURE_SENSOR_RO_PUMP_OUTLET ] = 0; - msrdPressureSum[ PRESSURE_SENSOR_DRAIN_PUMP_INLET ] = 0; - msrdPressureSum[ PRESSURE_SENSOR_DRAIN_PUMP_OUTLET ] = 0;*/ } for ( sensorId = 0; sensorId < NUM_OF_PRESSURE_SENSORS; sensorId++ ) Index: firmware/App/Controllers/ROPump.c =================================================================== diff -u -r24e6e4df038de04e13363d1eb929b4fd693046ff -r3dd12fb9d032f85126db82ca48812a4652a5b75f --- firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 24e6e4df038de04e13363d1eb929b4fd693046ff) +++ firmware/App/Controllers/ROPump.c (.../ROPump.c) (revision 3dd12fb9d032f85126db82ca48812a4652a5b75f) @@ -505,7 +505,7 @@ BOOL calStatus = FALSE; calStatus |= getNVRecord2Driver( GET_CAL_FLOW_SENSORS, (U08*)&flowSensorsCalRecord, sizeof( DG_FLOW_SENSORS_CAL_RECORD_T ), - NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_DG_FLOW_SENSORS_INVALID_CAL_RECORD ); + NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_DG_RO_FLOW_SENSOR_INVALID_CAL_RECORD ); calStatus |= getNVRecord2Driver( GET_CAL_RO_PUMP_RECORD, (U08*)&roPumpCalRecord, sizeof( DG_RO_PUMP_CAL_RECORD_T ), NUM_OF_CAL_DATA_FLOW_SENSORS, ALARM_ID_NO_ALARM ); Index: firmware/App/Controllers/Voltages.c =================================================================== diff -u -r22176ce95e49213c48454f34ddf5d29b8109f2cb -r3dd12fb9d032f85126db82ca48812a4652a5b75f --- firmware/App/Controllers/Voltages.c (.../Voltages.c) (revision 22176ce95e49213c48454f34ddf5d29b8109f2cb) +++ firmware/App/Controllers/Voltages.c (.../Voltages.c) (revision 3dd12fb9d032f85126db82ca48812a4652a5b75f) @@ -282,22 +282,21 @@ if ( ++voltagesDataPublicationTimerCounter >= getU32OverrideValue( &voltagesDataPublishInterval ) ) { VOLTAGES_DATA_PAYLOAD_T data; - - data.adc1VFPGA = getMonitoredLineLevel( MONITORED_LINE_1V_FPGA ); - data.adc1_2VProc = getMonitoredLineLevel( MONITORED_LINE_1_2V_PROC ); - data.adc1_8VProc = getMonitoredLineLevel( MONITORED_LINE_1_8V_PROC ); - data.adc1_8VFPGA = getMonitoredLineLevel( MONITORED_LINE_1_8V_FPGA ); - data.adc3VRef = getMonitoredLineLevel( MONITORED_LINE_V_REF ); - data.adc3VExtADC1 = getMonitoredLineLevel( MONITORED_LINE_EXT_ADC_1_REF_V ); - data.adc3VExtADC2 = getMonitoredLineLevel( MONITORED_LINE_EXT_ADC_2_REF_V ); - data.adc3_3V = getMonitoredLineLevel( MONITORED_LINE_3_3V ); - data.adc3_3VSensors = getMonitoredLineLevel( MONITORED_LINE_3_3V_SENSORS ); - data.adc5VLogic = getMonitoredLineLevel( MONITORED_LINE_5V_LOGIC ); - data.adc5VSensors = getMonitoredLineLevel( MONITORED_LINE_5V_SENSORS ); + data.adc1VFPGA = getMonitoredLineLevel( MONITORED_LINE_1V_FPGA ); + data.adc1_2VProc = getMonitoredLineLevel( MONITORED_LINE_1_2V_PROC ); + data.adc1_8VProc = getMonitoredLineLevel( MONITORED_LINE_1_8V_PROC ); + data.adc1_8VFPGA = getMonitoredLineLevel( MONITORED_LINE_1_8V_FPGA ); + data.adc3VRef = getMonitoredLineLevel( MONITORED_LINE_V_REF ); + data.adc3VExtADC1 = getMonitoredLineLevel( MONITORED_LINE_EXT_ADC_1_REF_V ); + data.adc3VExtADC2 = getMonitoredLineLevel( MONITORED_LINE_EXT_ADC_2_REF_V ); + data.adc3_3V = getMonitoredLineLevel( MONITORED_LINE_3_3V ); + data.adc3_3VSensors = getMonitoredLineLevel( MONITORED_LINE_3_3V_SENSORS ); + data.adc5VLogic = getMonitoredLineLevel( MONITORED_LINE_5V_LOGIC ); + data.adc5VSensors = getMonitoredLineLevel( MONITORED_LINE_5V_SENSORS ); data.adc5VPSGateDriver = getMonitoredLineLevel( MONITORED_LINE_PS_GATE_DRIVER_V ); - data.adc24V = getMonitoredLineLevel( MONITORED_LINE_24V_MAIN ); - data.adc24VPrimaryHtr = getMonitoredLineLevel( MONITORED_LINE_24V_TRIM_HTR_V ); - data.adc24VTrimmerHtr = getMonitoredLineLevel( MONITORED_LINE_24V_PRIM_HTR_V ); + data.adc24V = getMonitoredLineLevel( MONITORED_LINE_24V_MAIN ); + data.adc24VPrimaryHtr = getMonitoredLineLevel( MONITORED_LINE_24V_PRIM_HTR_V ); + data.adc24VTrimmerHtr = getMonitoredLineLevel( MONITORED_LINE_24V_TRIM_HTR_V ); broadcastData( MSG_ID_DG_VOLTAGES_DATA, COMM_BUFFER_OUT_CAN_DG_BROADCAST, (U08*)&data, sizeof( VOLTAGES_DATA_PAYLOAD_T ) ); voltagesDataPublicationTimerCounter = 0; Index: firmware/App/Drivers/InternalADC.c =================================================================== diff -u -ra9315539f527b92523b1598ff91e47db4d71dae2 -r3dd12fb9d032f85126db82ca48812a4652a5b75f --- firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision a9315539f527b92523b1598ff91e47db4d71dae2) +++ firmware/App/Drivers/InternalADC.c (.../InternalADC.c) (revision 3dd12fb9d032f85126db82ca48812a4652a5b75f) @@ -50,8 +50,8 @@ INT_ADC_AVAILABLE_CHANNEL, // 14 INT_ADC_PROCESSOR_1_2_VOLTS, // 15 INT_ADC_REFERENCE_VOLTAGE, // 16 - INT_ADC_PRIMARY_HEATER_24_VOLTS, // 17 - INT_ADC_TRIMMER_HEATER_24_VOLTS, // 18 + INT_ADC_TRIMMER_HEATER_24_VOLTS, // 17 + INT_ADC_PRIMARY_HEATER_24_VOLTS, // 18 INT_ADC_REF_IN1, // 19 INT_ADC_REF_IN2, // 20 INT_ADC_BOARD_THERMISTOR, // 21 @@ -68,8 +68,8 @@ 0.06438104, // PSIA- INT_ADC_DRAIN_PUMP_INLET_PRESSURE 0.00073242, // V - INT_ADC_RO_PUMP_FEEDBACK_DUTY_CYCLE 1.0, // ? - INT_ADC_AVAILABLE_CHANNEL - 0.00700441, // V - INT_ADC_PRIMARY_HEATER_24_VOLTS (varies inversely with PWM for secondary element) 0.00763285, // V - INT_ADC_TRIMMER_HEATER_24_VOLTS (varies inversely with PWM) + 0.00700441, // V - INT_ADC_PRIMARY_HEATER_24_VOLTS (varies inversely with PWM for secondary element) 0.001221, // V - INT_ADC_BOARD_THERMISTOR 0.0007326, // V - INT_ADC_FPGA_1_8_VOLTS 0.0007326, // V - INT_ADC_FPGA_1_VOLT Index: firmware/App/Services/FPGA.c =================================================================== diff -u -r544e9782a1b8d444224f41efef38a5204c262722 -r3dd12fb9d032f85126db82ca48812a4652a5b75f --- firmware/App/Services/FPGA.c (.../FPGA.c) (revision 544e9782a1b8d444224f41efef38a5204c262722) +++ firmware/App/Services/FPGA.c (.../FPGA.c) (revision 3dd12fb9d032f85126db82ca48812a4652a5b75f) @@ -195,37 +195,39 @@ U16 fpgaADCVccInt; ///< Reg 406. Internal FPGA Vcc Voltage. U16 fpgaADCVccAux; ///< Reg 408. Internal FPGA Vcc auxiliary voltage U16 fpgaADCVPVN; ///< Reg 410. Internal FPGA VPVN voltage + U16 fpgaDialysateFlowRate; ///< Reg 412. Dialysate flow rate measurement + U16 fpgaROFlowRateCount; ///< Reg 414. RO flow rate count + U16 fpgaDialysateFlowRateCount; ///< Reg 416. Dialysate flow rate count // DVT changes - U08 fpgaBaroReadCount; ///< Reg 412. Barometric sensor read count - U08 fpgaBaroErroCount; ///< Reg 413. Barometric sensor error count - U16 fpgaDrainPumpSpeedFeedback; ///< Reg 414. Drain pump speed feedback - U16 fpgaDrainPumpCurrentFeedback; ///< Reg 416. Drain pump current feedback - U16 fpgaDialysateFlowRate; ///< Req 418. Dialysate flow rate measurement - U16 fpgaHeaterGateADC; ///< Reg 420. Heater gate ADC - U16 fpgaHeaterGNDADC; ///< Reg 422. Heater ground ADC - U08 fpgaHeater1ADCReadCount; ///< Reg 424. Heater 1 ADC read count - U08 fpgaHeater1ADCErrorCount; ///< Reg 425. Heater 1 ADC error count - U16 fpgaBaroManufacInfo; ///< Reg 426. Barometric sensor manufacturing information - U16 fpgaBaroPROMCoeff1; ///< Reg 428. Barometric sensor PROM coefficient 1 - U16 fpgaBaroPROMCoeff2; ///< Reg 430. Barometric sensor PROM coefficient 2 - U16 fpgaBaroPROMCoeff3; ///< Reg 432. Barometric sensor PROM coefficient 3 - U16 fpgaBaroPROMCoeff4; ///< Reg 434. Barometric sensor PROM coefficient 4 - U16 fpgaBaroPROMCoeff5; ///< Reg 436. Barometric sensor PROM coefficient 5 - U16 fpgaBaroPROMCoeff6; ///< Reg 438. Barometric sensor PROM coefficient 6 - U16 fpgaBaroPROMCRC; ///< Reg 440. Barometric sensor PROM CRC - U32 fpgaBaroPressure; ///< Reg 442. Barometric sensor pressure value - U32 fpgaBaroTemperature; ///< Reg 446. Barometric sensor temperature sensor - U08 fpgaTHdRTDReadCount; ///< Reg 450. THD RTD read count - U08 fpgaTHdRTDErrorCount; ///< Reg 451. THD RTD error count - U32 fpgaTHdTemp; ///< Reg 452. THD channel 0 read data - temperature sensor - U32 fpgaTHdInternalTemp; ///< Reg 456. THD channel 1 read data - ADC internal temperature sensor - U08 fpgaCPiCPoEmstatOutByte; ///< Reg 460. CPi/CPo Emstat out byte - U08 fpgaCPiCPoEmstatRxErrCount; ///< Reg 461. CPi/CPo Emstat Rx error count - U16 fpgaCPiCPoEmstatTxFIFOCount; ///< Reg 462. CPi/CPo Emstat Tx FIFO count - U16 fpgaCPiCPoEmstatRxFIFOCount; ///< Reg 464. CPi/CPo Emstat Rx FIFO count - U16 fpgaPowerSupply2; ///< Reg 466. power supply 2 count - U16 fpgaOnBoardThermistor; ///< Reg 468. onboard thermistor + U16 fpgaDrainPumpSpeedFeedback; ///< Reg 418. Drain pump speed feedback + U16 fpgaDrainPumpCurrentFeedback; ///< Reg 420. Drain pump current feedback + U08 fpgaBaroReadCount; ///< Reg 422. Barometric sensor read count + U08 fpgaBaroErrorCount; ///< Reg 423. Barometric sensor error count + U16 fpgaBaroManufacInfo; ///< Reg 424. Barometric sensor manufacturing information + U16 fpgaBaroPROMCoeff1; ///< Reg 426. Barometric sensor PROM coefficient 1 + U16 fpgaBaroPROMCoeff2; ///< Reg 428. Barometric sensor PROM coefficient 2 + U16 fpgaBaroPROMCoeff3; ///< Reg 430. Barometric sensor PROM coefficient 3 + U16 fpgaBaroPROMCoeff4; ///< Reg 432. Barometric sensor PROM coefficient 4 + U16 fpgaBaroPROMCoeff5; ///< Reg 434. Barometric sensor PROM coefficient 5 + U16 fpgaBaroPROMCoeff6; ///< Reg 436. Barometric sensor PROM coefficient 6 + U16 fpgaBaroPROMCRC; ///< Reg 438. Barometric sensor PROM CRC + U32 fpgaBaroPressure; ///< Reg 440. Barometric sensor pressure value + U32 fpgaBaroTemperature; ///< Reg 444. Barometric sensor temperature sensor + U08 fpgaTHdRTDReadCount; ///< Reg 448. THD RTD read count + U08 fpgaTHdRTDErrorCount; ///< Reg 449. THD RTD error count + U32 fpgaTHdTemp; ///< Reg 450. THD channel 0 read data - temperature sensor + U32 fpgaTHdInternalTemp; ///< Reg 454. THD channel 1 read data - ADC internal temperature sensor + U08 fpgaCPiCPoEmstatOutByte; ///< Reg 458. CPi/CPo Emstat out byte + U08 fpgaCPiCPoEmstatRxErrCount; ///< Reg 459. CPi/CPo Emstat Rx error count + U16 fpgaCPiCPoEmstatTxFIFOCount; ///< Reg 460. CPi/CPo Emstat Tx FIFO count + U16 fpgaCPiCPoEmstatRxFIFOCount; ///< Reg 462. CPi/CPo Emstat Rx FIFO count + U16 fpgaHeaterGateADC; ///< Reg 464. Heater gate ADC + U16 fpgaHeaterGNDADC; ///< Reg 466. Heater ground ADC + U08 fpgaHeater1ADCReadCount; ///< Reg 468. Heater 1 ADC read count + U08 fpgaHeater1ADCErrorCount; ///< Reg 469. Heater 1 ADC error count + U16 fpgaPowerSupply2; ///< Reg 470. power supply 2 count + U16 fpgaOnBoardThermistor; ///< Reg 472. onboard thermistor } DG_FPGA_SENSORS_T; typedef struct @@ -2093,7 +2095,7 @@ *************************************************************************/ U08 getFPGABaroErrorCount( void ) { - return fpgaSensorReadings.fpgaBaroErroCount; + return fpgaSensorReadings.fpgaBaroErrorCount; } /*********************************************************************//**