Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -ra6109e69046323d34c8d92e590a07d8d4a71eb91 -rd6d33f24b37947f0590effb2d42a5eb3e6f3028b --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision a6109e69046323d34c8d92e590a07d8d4a71eb91) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision d6d33f24b37947f0590effb2d42a5eb3e6f3028b) @@ -485,18 +485,17 @@ // finds the delta temperature to be added with the target temperature // to maintain the target temperature at dialyzer. // Lets calculate the B1,B2 and B3 heat dissipation factors - if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) ) + if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) ) { - heatDissipation_b3 = calculateHeatDissipationB3(); - heatDissipation_b1b2 = calculateHeatDissipationB1andB2(); - - } - else - { // based on Beta2.0 heat loss model heatDissipation_b3 = calculateBeta2HeatDissipationB3(); heatDissipation_b1b2 = calculateBeta2HeatDissipationB1andB2(); } + else + { + heatDissipation_b3 = calculateHeatDissipationB3(); + heatDissipation_b1b2 = calculateHeatDissipationB1andB2(); + } // Reverse calculation of target temp at D28 to get the target dialyzer temperature targetTempAtD28 = calculateInitialTemp( targetTemp, heatDissipation_b3 ); @@ -522,13 +521,13 @@ F32 targetTempfromTD = getTDTargetDialysateTemperature(); F32 measuredTempAtDialyzer = 0.0F; - if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE ) + if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE ) { - measuredTempAtDialyzer = getFilteredConductivitySensorTemperature( D27_COND ); + measuredTempAtDialyzer = getTeensyConductivityTemperatureValue( D27_COND ); } else { - measuredTempAtDialyzer = getTeensyConductivityTemperatureValue( D27_COND ); + measuredTempAtDialyzer = getConductivityTemperature( D27_COND ); } F32 calcTargetTemp = getHeaterTargetTemperature( D5_HEAT ); Index: firmware/App/Controllers/RinsePump.c =================================================================== diff -u -ra6109e69046323d34c8d92e590a07d8d4a71eb91 -rd6d33f24b37947f0590effb2d42a5eb3e6f3028b --- firmware/App/Controllers/RinsePump.c (.../RinsePump.c) (revision a6109e69046323d34c8d92e590a07d8d4a71eb91) +++ firmware/App/Controllers/RinsePump.c (.../RinsePump.c) (revision d6d33f24b37947f0590effb2d42a5eb3e6f3028b) @@ -274,15 +274,15 @@ rinsePumpTargetSpeedRPM = 0; - if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) ) + if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) ) { - // Current Beta 1.9 system uses on/off bit - setValveState( D88_79_VALV, VALVE_STATE_CLOSED ); + // Set PWM count zero to stop the logical rinse pump + setRinsePumpPwmCount( D79_RINSE_PUMP, RINSE_PUMP_OFF_COUNT ); } else { - // Set PWM count zero to stop the logical rinse pump - setRinsePumpPwmCount( D79_RINSE_PUMP, RINSE_PUMP_OFF_COUNT ); + // Current Beta 1.9 system uses on/off bit + setValveState( D88_79_VALV, VALVE_STATE_CLOSED ); } return state; @@ -299,13 +299,8 @@ { RINSE_PUMP_STATE_T state = RINSE_PUMP_STATE_ON; - if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) ) + if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) ) { - // Current Beat 1.9 system uses on/off bit - setValveState( D88_79_VALV, VALVE_STATE_OPEN ); - } - else - { F32 pwmPercent = getF32OverrideValue( &rinsePumpPwmPercentage ); // TODO should this conversion happen in setPWMCount function? U32 pwmInCount = (U32)( ( pwmPercent / RINSE_PUMP_MAX_PWM_PERCENT ) * RINSE_PUMP_PWM_IN_COUNT_MAX ); @@ -314,6 +309,11 @@ // Turn on logical rinse pump with given PWM value setRinsePumpPwmCount( D79_RINSE_PUMP, (U32)pwmInCount ); } + else + { + // Current Beat 1.9 system uses on/off bit + setValveState( D88_79_VALV, VALVE_STATE_OPEN ); + } return state; } Index: firmware/App/Monitors/Conductivity.c =================================================================== diff -u -ra6109e69046323d34c8d92e590a07d8d4a71eb91 -rd6d33f24b37947f0590effb2d42a5eb3e6f3028b --- firmware/App/Monitors/Conductivity.c (.../Conductivity.c) (revision a6109e69046323d34c8d92e590a07d8d4a71eb91) +++ firmware/App/Monitors/Conductivity.c (.../Conductivity.c) (revision d6d33f24b37947f0590effb2d42a5eb3e6f3028b) @@ -256,27 +256,26 @@ for ( sensor = FIRST_DD_COND_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ ) { - if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE ) + if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE ) { - // Check FPGA read counts for freshness rather than wait on fix time. - if ( condPrevReadCount[ sensor ] != getConductivityReadCount( sensor ) ) + if ( sensor != D74_COND ) { + calculatedConductivity = getTeensyConductivityValue( sensor ); + freshData = TRUE; + } + else + { calculatedConductivity = getConductivity( sensor ); - condPrevReadCount[ sensor ] = getConductivityReadCount( sensor ); freshData = TRUE; } } - else { - if ( sensor != D74_COND ) + // Check FPGA read counts for freshness rather than wait on fix time. + if ( condPrevReadCount[ sensor ] != getConductivityReadCount( sensor ) ) { - calculatedConductivity = getTeensyConductivityValue( sensor ); - freshData = TRUE; - } - else - { calculatedConductivity = getConductivity( sensor ); + condPrevReadCount[ sensor ] = getConductivityReadCount( sensor ); freshData = TRUE; } } @@ -344,26 +343,26 @@ for ( sensor = FIRST_DD_COND_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ ) { - if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE ) + if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE ) { - // Check FPGA read counts for freshness rather than wait on fix time. - if ( condTempPrevReadCount[ sensor ] != getConductivityTemperatureReadCount( sensor ) ) + if ( sensor != D74_COND ) { + calculatedTemperature = getTeensyConductivityTemperatureValue( sensor ); + freshData = TRUE; + } + else + { calculatedTemperature = getConductivityTemperature( sensor ); - condTempPrevReadCount[ sensor ] = getConductivityTemperatureReadCount( sensor ); freshData = TRUE; } } else { - if ( sensor != D74_COND ) + // Check FPGA read counts for freshness rather than wait on fix time. + if ( condTempPrevReadCount[ sensor ] != getConductivityTemperatureReadCount( sensor ) ) { - calculatedTemperature = getTeensyConductivityTemperatureValue( sensor ); - freshData = TRUE; - } - else - { calculatedTemperature = getConductivityTemperature( sensor ); + condTempPrevReadCount[ sensor ] = getConductivityTemperatureReadCount( sensor ); freshData = TRUE; } } @@ -742,12 +741,8 @@ TEST_OVERRIDE_ARRAY_PAYLOAD_T payload; OVERRIDE_TYPE_T ovType = getOverrideArrayPayloadFromMessage( message, &payload ); - if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE ) + if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE ) { - result = testConductivitySensorConductivityReadingsOverride( message ); - } - else - { if ( payload.index != D74_COND ) { @@ -758,6 +753,10 @@ result = testConductivitySensorReadingsOverride( message ); } } + else + { + result = testConductivitySensorConductivityReadingsOverride( message ); + } return result; } @@ -779,12 +778,8 @@ TEST_OVERRIDE_ARRAY_PAYLOAD_T payload; OVERRIDE_TYPE_T ovType = getOverrideArrayPayloadFromMessage( message, &payload ); - if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE ) + if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE ) { - result = testConductivitySensorTemperatureReadingsOverride( message ); - } - else - { if ( payload.index != D74_COND ) { @@ -795,6 +790,10 @@ result = testConductivitySensorTemperatureReadingsOverride( message ); } } + else + { + result = testConductivitySensorTemperatureReadingsOverride( message ); + } return result; } Index: firmware/App/Monitors/Level.c =================================================================== diff -u -ra6109e69046323d34c8d92e590a07d8d4a71eb91 -rd6d33f24b37947f0590effb2d42a5eb3e6f3028b --- firmware/App/Monitors/Level.c (.../Level.c) (revision a6109e69046323d34c8d92e590a07d8d4a71eb91) +++ firmware/App/Monitors/Level.c (.../Level.c) (revision d6d33f24b37947f0590effb2d42a5eb3e6f3028b) @@ -134,35 +134,35 @@ break; case D63_LEVL: - if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) ) + if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) ) { - currentLevelStatus = ( processLevelCount( getFPGAD63LevelSensor() ) == LEVEL_SENSOR_LIQUID ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW ); + currentLevelStatus = ( LEVEL_SENSOR_VALUE_LOW == getFPGAD63LevelSensor() ) ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW; } else { - currentLevelStatus = ( LEVEL_SENSOR_LIQUID == getFPGAD63LevelSensor() ) ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW; + currentLevelStatus = ( processLevelCount( getFPGAD63LevelSensor() ) == LEVEL_SENSOR_VALUE_LOW ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH ); } break; case D98_LEVL: - if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) ) + if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) ) { - currentLevelStatus = ( processLevelCount( getFPGAD98LevelSensor() ) == LEVEL_SENSOR_LIQUID ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW ); + currentLevelStatus = ( LEVEL_SENSOR_VALUE_LOW == getFPGAD98LevelSensor() ) ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW; } else { - currentLevelStatus = ( LEVEL_SENSOR_LIQUID == getFPGAD98LevelSensor() ) ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW; + currentLevelStatus = ( processLevelCount( getFPGAD98LevelSensor() ) == LEVEL_SENSOR_VALUE_LOW ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH ); } break; case D46_LEVL: - if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) ) + if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) ) { - currentLevelStatus = ( processLevelCount( getFPGAD46LevelSensor() ) == LEVEL_SENSOR_LIQUID ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW ); + currentLevelStatus = ( LEVEL_SENSOR_VALUE_LOW == getFPGAD46LevelSensor() ) ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH; } else { - currentLevelStatus = ( LEVEL_SENSOR_LIQUID == getFPGAD46LevelSensor() ) ? LEVEL_STATE_HIGH : LEVEL_STATE_LOW; + currentLevelStatus = ( processLevelCount( getFPGAD46LevelSensor() ) == LEVEL_SENSOR_VALUE_LOW ? LEVEL_STATE_LOW : LEVEL_STATE_HIGH ); } break; @@ -410,21 +410,20 @@ levelStatus = getFPGAD6LevelStatus(); if ( ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) != TRUE ) && - ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) == TRUE ) ) + ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE ) ) { // Beta 1.9 behavior currentLevelStatus = getLevelStateBeta19( levelStatus ); } - else if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE ) + else if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ) { - // Beta 1.0 behavior - currentLevelStatus = getLevelStateBeta10( levelStatus ); + // Beta 2.0 behavior + currentLevelStatus = getLevelState( levelStatus ); } else { - // Beta 2.0 behavior - currentLevelStatus = getLevelState( levelStatus ); - + // Beta 1.0 behavior + currentLevelStatus = getLevelStateBeta10( levelStatus ); } } @@ -433,22 +432,21 @@ levelStatus = getFPGAP25FloaterState(); if ( ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) != TRUE ) && - ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) == TRUE ) ) + ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE ) ) { // Beta 1.9 behavior currentLevelStatus = getLevelStateBeta19( levelStatus ); } - else if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE ) + else if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ) + { + // Beta 2.0 behavior + currentLevelStatus = getLevelState( levelStatus ); + } + else { // Beta 1.0 behavior currentLevelStatus = getLevelStateBeta10( levelStatus ); } - else - { - // Beta 2.0 behavior - currentLevelStatus = getLevelState( levelStatus ); - } - } else Index: firmware/App/Monitors/Temperature.c =================================================================== diff -u -ra6109e69046323d34c8d92e590a07d8d4a71eb91 -rd6d33f24b37947f0590effb2d42a5eb3e6f3028b --- firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision a6109e69046323d34c8d92e590a07d8d4a71eb91) +++ firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision d6d33f24b37947f0590effb2d42a5eb3e6f3028b) @@ -349,13 +349,13 @@ { CONDUCTIVITY_SENSORS_T sensor = ( DIAL_TEMP_D28 == i ? D27_COND : D29_COND ); - if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE ) + if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE ) { - temperatureC = getConductivityTemperature( sensor ); + temperatureC = getTeensyConductivityTemperatureValue( sensor ); } else { - temperatureC = getTeensyConductivityTemperatureValue( sensor ); + temperatureC = getConductivityTemperature( sensor ); } currentIndex = dialTempMovingAvgData[ i ].dialTempSamplesNextIndex; @@ -477,24 +477,23 @@ data.d99Temp = getTemperatureValue( D99_TEMP ); data.boardTemp = getTemperatureValue( BRD_TEMP ); - if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE ) + if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE ) { - data.d16CondTemp = getConductivityTemperature( D17_COND ); - data.d28CondTemp = getConductivityTemperature( D27_COND ); - data.d30CondTemp = getConductivityTemperature( D29_COND ); - data.d44CondTemp = getConductivityTemperature( D43_COND ); - data.d75CondTemp = getConductivityTemperature( D74_COND ); - } - else - { data.d16CondTemp = getTeensyConductivityTemperatureValue( D17_COND ); data.d28CondTemp = getTeensyConductivityTemperatureValue( D27_COND ); data.d30CondTemp = getTeensyConductivityTemperatureValue( D29_COND ); data.d44CondTemp = getTeensyConductivityTemperatureValue( D43_COND ); data.d75CondTemp = getConductivityTemperature( D74_COND ); } + else + { + data.d16CondTemp = getConductivityTemperature( D17_COND ); + data.d28CondTemp = getConductivityTemperature( D27_COND ); + data.d30CondTemp = getConductivityTemperature( D29_COND ); + data.d44CondTemp = getConductivityTemperature( D43_COND ); + data.d75CondTemp = getConductivityTemperature( D74_COND ); + } - data.d4AvgTemp = getFilteredTemperatureValue( D4_TEMP ); data.d50AvgTemp = getFilteredTemperatureValue( D50_TEMP ); data.d99AvgTemp = getFilteredTemperatureValue( D99_TEMP ); Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -ra6109e69046323d34c8d92e590a07d8d4a71eb91 -rd6d33f24b37947f0590effb2d42a5eb3e6f3028b --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision a6109e69046323d34c8d92e590a07d8d4a71eb91) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision d6d33f24b37947f0590effb2d42a5eb3e6f3028b) @@ -40,23 +40,23 @@ // ********** private definitions ********** /// Macro to retrieve the FPGA sensor field based on HW type -#define GET_FPGA_SENSOR_FIELD(field) (getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE ? fpgaSensorReadings.field : fpgaBeta19SensorReadings.field) +#define GET_FPGA_SENSOR_FIELD(field) (getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ? fpgaSensorReadings.field : fpgaBeta19SensorReadings.field) //#define GET_FPGA_SENSOR_FIELD(field) (fpgaSensorReadings.field) /// Macro to retrieve the FPGA sensor field based on HW type -#define GET_FPGA_ACTUATOR_FIELD(field) (getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE ? fpgaActuatorSetPoints.field : fpgaBeta19ActuatorSetPoints.field) +#define GET_FPGA_ACTUATOR_FIELD(field) (getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ? fpgaActuatorSetPoints.field : fpgaBeta19ActuatorSetPoints.field) //#define GET_FPGA_ACTUATOR_FIELD(field) (fpgaActuatorSetPoints.field) /// Macro to set the FPGA actuator field value based on HW type -#define SET_FPGA_ACTUATOR_FIELD(field, value) (getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE ? ( fpgaActuatorSetPoints.field = value ) : ( fpgaBeta19ActuatorSetPoints.field = value )) +#define SET_FPGA_ACTUATOR_FIELD(field, value) (getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ? ( fpgaActuatorSetPoints.field = value ) : ( fpgaBeta19ActuatorSetPoints.field = value )) //#define SET_FPGA_ACTUATOR_FIELD(field, value) (fpgaActuatorSetPoints.field = value) /// Macro to set the FPGA actuator bits based on HW type -#define SET_FPGA_ACTUATOR_BITS(field, bits) (getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE ? ( fpgaActuatorSetPoints.field |= bits ) : ( fpgaBeta19ActuatorSetPoints.field |= bits )) +#define SET_FPGA_ACTUATOR_BITS(field, bits) (getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ? ( fpgaActuatorSetPoints.field |= bits ) : ( fpgaBeta19ActuatorSetPoints.field |= bits )) //#define SET_FPGA_ACTUATOR_BITS(field, bits) (fpgaActuatorSetPoints.field |= bits) /// Macro to clear the FPGA actuator bits based on HW type -#define CLEAR_FPGA_ACTUATOR_BITS(field, bits) (getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE ? ( fpgaActuatorSetPoints.field &= bits ) : ( fpgaBeta19ActuatorSetPoints.field &= bits )) +#define CLEAR_FPGA_ACTUATOR_BITS(field, bits) (getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ? ( fpgaActuatorSetPoints.field &= bits ) : ( fpgaBeta19ActuatorSetPoints.field &= bits )) //#define CLEAR_FPGA_ACTUATOR_BITS(field, bits) (fpgaActuatorSetPoints.field &= bits) #define FPGA_EXPECTED_ID 0x06 ///< FPGA expected ID for Beta 2 systems. @@ -644,8 +644,8 @@ void initFPGADD( void ) { // Initialize fpga driver for beta 2 hardware - initFPGA( (U08*)&fpgaHeader, (U08*)&fpgaSensorReadings, (U08*)&fpgaActuatorSetPoints, - sizeof(FPGA_HEADER_T), sizeof(DD_FPGA_SENSORS_T), sizeof(FPGA_ACTUATORS_T) ); + initFPGA( (U08*)&fpgaHeader, (U08*)&fpgaBeta19SensorReadings, (U08*)&fpgaBeta19ActuatorSetPoints, + sizeof(FPGA_HEADER_T), sizeof(DD_FPGA_SENSORS_BETA_1_9_T), sizeof(FPGA_ACTUATORS_BETA_1_9_T) ); // initialize fpga data structures memset( &fpgaHeader, 0, sizeof( FPGA_HEADER_T ) ); @@ -2518,13 +2518,13 @@ U16 result; #if 1 // Remove when Beta 1.9 is obsolete - if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) == TRUE ) + if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ) { - result = fpgaBeta19SensorReadings.fpgaD63LevelSensor; + result = ( fpgaSensorReadings.fpgaConductiveLevelStatus & BIT( BIT1 ) ) >> BIT1; } else { - result = ( fpgaSensorReadings.fpgaConductiveLevelStatus & BIT( BIT1 ) ) >> BIT1; + result = fpgaBeta19SensorReadings.fpgaD63LevelSensor; } #else result = GET_FPGA_SENSOR_FIELD( fpgaConductiveLevelStatus ); @@ -2546,15 +2546,14 @@ U16 result; #if 1 // Remove when Beta 1.9 is obsolete - if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) == TRUE ) + if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ) { - result = fpgaBeta19SensorReadings.fpgaD98LevelSensor; + result = ( fpgaSensorReadings.fpgaConductiveLevelStatus & BIT( BIT2 ) ) >> BIT2; } else { - result = ( fpgaSensorReadings.fpgaConductiveLevelStatus & BIT( BIT2 ) ) >> BIT2; + result = fpgaBeta19SensorReadings.fpgaD98LevelSensor; } - #else result = GET_FPGA_SENSOR_FIELD( fpgaConductiveLevelStatus ); #endif @@ -2575,13 +2574,13 @@ U16 result; #if 1 // Remove when Beta 1.9 is obsolete - if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) == TRUE ) + if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ) { - result = fpgaBeta19SensorReadings.fpgaD46LevelSensor; + result = ( fpgaSensorReadings.fpgaConductiveLevelStatus & BIT ( BIT0 ) ) >> BIT0; } else { - result = ( fpgaSensorReadings.fpgaConductiveLevelStatus & BIT ( BIT0 ) ) >> BIT0; + result = fpgaBeta19SensorReadings.fpgaD46LevelSensor; } #else result = GET_FPGA_SENSOR_FIELD( fpgaConductiveLevelStatus ); @@ -2617,13 +2616,12 @@ #if 1 // Remove when Beta 1.9 is obsolete if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ) { - result = fpgaBeta19SensorReadings.fpgaFloater2Status; + result = fpgaSensorReadings.fpgaConductiveLevelStatus; } else { - result = fpgaSensorReadings.fpgaConductiveLevelStatus; + result = fpgaBeta19SensorReadings.fpgaFloater2Status; } - #else result = GET_FPGA_SENSOR_FIELD( fpgaConductiveLevelStatus ); #endif @@ -2743,7 +2741,7 @@ { U08 result = 0U; - if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE ) + if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ) { result = fpgaSensorReadings.fpgaIOExpReadCount; } @@ -2763,7 +2761,7 @@ { U08 result = 0U; - if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE ) + if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ) { result = fpgaSensorReadings.fpgaIOExpERrorCount; } @@ -2782,7 +2780,7 @@ { U08 result = 0U; - if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE ) + if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ) { result = fpgaSensorReadings.fpgaHallSensorStatus; } @@ -2801,7 +2799,7 @@ { U08 result = 0U; - if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE ) + if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ) { result = fpgaSensorReadings.fpgaGPIOStatus; } @@ -2853,7 +2851,7 @@ { U32 result = 0UL; - if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE ) + if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ) { result = fpgaSensorReadings.tempTax1; } @@ -2872,7 +2870,7 @@ { U32 result = 0UL; - if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE ) + if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ) { result = fpgaSensorReadings.tempRTD; } @@ -2892,7 +2890,7 @@ { U08 result = 0U; - if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE ) + if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ) { result = fpgaSensorReadings.ad7124readcnt; } @@ -2912,7 +2910,7 @@ { U08 result = 0U; - if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE ) + if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ) { result = fpgaSensorReadings.ad7124errcnt; } @@ -3620,7 +3618,7 @@ { U08 result = 0U; - if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE ) + if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ) { result = fpgaSensorReadings.p7flowReadCount; } @@ -3640,7 +3638,7 @@ { U08 result = 0U; - if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE ) + if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ) { result = fpgaSensorReadings.p7flowErrorCount; } @@ -3660,7 +3658,7 @@ { U08 result = 0U; - if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE ) + if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ) { result = fpgaSensorReadings.p16flowReadCount; } @@ -3680,7 +3678,7 @@ { U08 result = 0U; - if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE ) + if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) == TRUE ) { result = fpgaSensorReadings.p16flowErrorCount; }