Index: firmware/App/Drivers/ConductivitySensors.c =================================================================== diff -u -re7fe0454b5b2d39009dc784dc8c156856df8bc86 -rf5baeac6a5f000705cd51e4779a967acf4088981 --- firmware/App/Drivers/ConductivitySensors.c (.../ConductivitySensors.c) (revision e7fe0454b5b2d39009dc784dc8c156856df8bc86) +++ firmware/App/Drivers/ConductivitySensors.c (.../ConductivitySensors.c) (revision f5baeac6a5f000705cd51e4779a967acf4088981) @@ -139,10 +139,10 @@ } // Initialize the conductivity sensor FPGA alarms - initFPGAPersistentAlarm( FPGA_PERS_ERROR_CD1_COND_SENSOR, ALARM_ID_DD_CD1_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS ); - initFPGAPersistentAlarm( FPGA_PERS_ERROR_CD2_COND_SENSOR, ALARM_ID_DD_CD2_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS ); - initFPGAPersistentAlarm( FPGA_PERS_ERROR_CD3_COND_SENSOR, ALARM_ID_DD_CD3_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS ); - initFPGAPersistentAlarm( FPGA_PERS_ERROR_CD4_COND_SENSOR, ALARM_ID_DD_CD4_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS ); + initFPGAPersistentAlarm( FPGA_PERS_ERROR_D17_COND_SENSOR, ALARM_ID_DD_D17_COND_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS ); + initFPGAPersistentAlarm( FPGA_PERS_ERROR_D27_COND_SENSOR, ALARM_ID_DD_D27_COND_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS ); + initFPGAPersistentAlarm( FPGA_PERS_ERROR_D29_COND_SENSOR, ALARM_ID_DD_D29_COND_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS ); + initFPGAPersistentAlarm( FPGA_PERS_ERROR_D43_COND_SENSOR, ALARM_ID_DD_D43_COND_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS ); } /*********************************************************************//** @@ -161,27 +161,27 @@ void readConductivitySensors( void ) { // Read raw conductivity - currentConductivityReadings[ CONDUCTIVITYSENSORS_CD1_SENSOR ].data = (F32)getFPGACD1(); - currentConductivityReadings[ CONDUCTIVITYSENSORS_CD2_SENSOR ].data = (F32)getFPGACD2(); - currentConductivityReadings[ CONDUCTIVITYSENSORS_CD3_SENSOR ].data = (F32)getFPGACD3(); - currentConductivityReadings[ CONDUCTIVITYSENSORS_CD4_SENSOR ].data = (F32)getFPGACD4(); + currentConductivityReadings[ D17_COND ].data = (F32)getFPGAD17Cond(); + currentConductivityReadings[ D27_COND ].data = (F32)getFPGAD27Cond(); + currentConductivityReadings[ D29_COND ].data = (F32)getFPGAD29Cond(); + currentConductivityReadings[ D43_COND ].data = (F32)getFPGAD43Cond(); // Read temperature associated to conductivity sensor - currentTemperatureReadings[ CONDUCTIVITYSENSORS_CD1_SENSOR ].data = (F32)getFPGACD1Temp(); - currentTemperatureReadings[ CONDUCTIVITYSENSORS_CD2_SENSOR ].data = (F32)getFPGACD2Temp(); - currentTemperatureReadings[ CONDUCTIVITYSENSORS_CD3_SENSOR ].data = (F32)getFPGACD3Temp(); - currentTemperatureReadings[ CONDUCTIVITYSENSORS_CD4_SENSOR ].data = (F32)getFPGACD4Temp(); + currentTemperatureReadings[ D17_COND ].data = (F32)getFPGAD17CondTemp(); + currentTemperatureReadings[ D27_COND ].data = (F32)getFPGAD27CondTemp(); + currentTemperatureReadings[ D29_COND ].data = (F32)getFPGAD29CondTemp(); + currentTemperatureReadings[ D43_COND ].data = (F32)getFPGAD43CondTemp(); // Update read and error counters for each conductivity sensor - lastConductivityReadCounter[ CONDUCTIVITYSENSORS_CD1_SENSOR ].data = (U32)getFPGACD1ReadCount(); - lastConductivityReadCounter[ CONDUCTIVITYSENSORS_CD2_SENSOR ].data = (U32)getFPGACD2ReadCount(); - lastConductivityReadCounter[ CONDUCTIVITYSENSORS_CD3_SENSOR ].data = (U32)getFPGACD3ReadCount(); - lastConductivityReadCounter[ CONDUCTIVITYSENSORS_CD4_SENSOR ].data = (U32)getFPGACD4ReadCount(); + lastConductivityReadCounter[ D17_COND ].data = (U32)getFPGAD17CondReadCount(); + lastConductivityReadCounter[ D27_COND ].data = (U32)getFPGAD27CondReadCount(); + lastConductivityReadCounter[ D29_COND ].data = (U32)getFPGAD29CondReadCount(); + lastConductivityReadCounter[ D43_COND ].data = (U32)getFPGAD43CondReadCount(); - lastConductivityErrorCounter[ CONDUCTIVITYSENSORS_CD1_SENSOR ].data = (U32)getFPGACD1ErrorCount(); - lastConductivityErrorCounter[ CONDUCTIVITYSENSORS_CD2_SENSOR ].data = (U32)getFPGACD2ErrorCount(); - lastConductivityErrorCounter[ CONDUCTIVITYSENSORS_CD3_SENSOR ].data = (U32)getFPGACD3ErrorCount(); - lastConductivityErrorCounter[ CONDUCTIVITYSENSORS_CD4_SENSOR ].data = (U32)getFPGACD4ErrorCount(); + lastConductivityErrorCounter[ D17_COND ].data = (U32)getFPGAD17CondErrorCount(); + lastConductivityErrorCounter[ D27_COND ].data = (U32)getFPGAD27CondErrorCount(); + lastConductivityErrorCounter[ D29_COND ].data = (U32)getFPGAD29CondErrorCount(); + lastConductivityErrorCounter[ D43_COND ].data = (U32)getFPGAD43CondErrorCount(); // Monitor conductivity sensor health checkConductivitySensors(); @@ -191,29 +191,29 @@ * @brief * The checkConductivitySensors function checks the read and error counters for * each conductivity sensor. - * @details \b Alarm: ALARM_ID_DD_CD1_SENSOR_FPGA_FAULT if the - * CD1 conductivity sensor is not able to be read. - * @details \b Alarm: ALARM_ID_DD_CD2_SENSOR_FPGA_FAULT if the - * CD2 conductivity sensor is not able to be read. - * @details \b Alarm: ALARM_ID_DD_CD3_SENSOR_FPGA_FAULT if the - * CD3 conductivity sensor is not able to be read. - * @details \b Alarm: ALARM_ID_DD_CD4_SENSOR_FPGA_FAULT if the - * CD4 conductivity sensor is not able to be read. + * @details \b Alarm: ALARM_ID_DD_D17_COND_SENSOR_FPGA_FAULT if the + * D17 conductivity sensor is not able to be read. + * @details \b Alarm: ALARM_ID_DD_D27_COND_SENSOR_FPGA_FAULT if the + * D27 conductivity sensor is not able to be read. + * @details \b Alarm: ALARM_ID_DD_D29_COND_SENSOR_FPGA_FAULT if the + * D29 conductivity sensor is not able to be read. + * @details \b Alarm: ALARM_ID_DD_D43_COND_SENSOR_FPGA_FAULT if the + * D43 conductivity sensor is not able to be read. * @details \b Inputs: lastConductivityReadCounter, lastConductivityErrorCounter * @details \b Outputs: none * @return none *************************************************************************/ static void checkConductivitySensors( void ) { - checkFPGAPersistentAlarms( FPGA_PERS_ERROR_CD1_COND_SENSOR, getConductivitySensorReadCount(CONDUCTIVITYSENSORS_CD1_SENSOR) ); - checkFPGAPersistentAlarms( FPGA_PERS_ERROR_CD2_COND_SENSOR, getConductivitySensorReadCount(CONDUCTIVITYSENSORS_CD2_SENSOR) ); - checkFPGAPersistentAlarms( FPGA_PERS_ERROR_CD3_COND_SENSOR, getConductivitySensorReadCount(CONDUCTIVITYSENSORS_CD3_SENSOR) ); - checkFPGAPersistentAlarms( FPGA_PERS_ERROR_CD4_COND_SENSOR, getConductivitySensorReadCount(CONDUCTIVITYSENSORS_CD4_SENSOR) ); + checkFPGAPersistentAlarms( FPGA_PERS_ERROR_D17_COND_SENSOR, getConductivitySensorReadCount(D17_COND) ); + checkFPGAPersistentAlarms( FPGA_PERS_ERROR_D27_COND_SENSOR, getConductivitySensorReadCount(D27_COND) ); + checkFPGAPersistentAlarms( FPGA_PERS_ERROR_D29_COND_SENSOR, getConductivitySensorReadCount(D29_COND) ); + checkFPGAPersistentAlarms( FPGA_PERS_ERROR_D43_COND_SENSOR, getConductivitySensorReadCount(D43_COND) ); - checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_CD1_COND_SENSOR, getConductivitySensorErrorCount( CONDUCTIVITYSENSORS_CD1_SENSOR ) ); - checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_CD2_COND_SENSOR, getConductivitySensorErrorCount( CONDUCTIVITYSENSORS_CD2_SENSOR ) ); - checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_CD3_COND_SENSOR, getConductivitySensorErrorCount( CONDUCTIVITYSENSORS_CD3_SENSOR ) ); - checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_CD4_COND_SENSOR, getConductivitySensorErrorCount( CONDUCTIVITYSENSORS_CD4_SENSOR ) ); + checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_D17_COND_SENSOR, getConductivitySensorErrorCount( D17_COND ) ); + checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_D27_COND_SENSOR, getConductivitySensorErrorCount( D27_COND ) ); + checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_D27_COND_SENSOR, getConductivitySensorErrorCount( D29_COND ) ); + checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_D43_COND_SENSOR, getConductivitySensorErrorCount( D43_COND ) ); } /*********************************************************************//** @@ -468,52 +468,52 @@ *************************************************************************/ void handleConductivitySensorsReset( void ) { - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].resetRequested ) + if ( TRUE == conductivitySensorControl[ D17_COND ].resetRequested ) { - // CD1 reset - setFPGACD1Reset(); - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].resetRequested = FALSE; + // D17 Cond sensor reset + setFPGAD17CondReset(); + conductivitySensorControl[ D17_COND ].resetRequested = FALSE; } else { - // clear CD1 reset - clearFPGACD1Reset(); + // clear D17 reset + clearFPGAD17CondReset(); } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].resetRequested ) + if ( TRUE == conductivitySensorControl[ D27_COND ].resetRequested ) { - // CD2 reset - setFPGACD2Reset(); - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].resetRequested = FALSE; + // D27 reset + setFPGAD27CondReset(); + conductivitySensorControl[ D27_COND ].resetRequested = FALSE; } else { - // clear CD2 reset - clearFPGACD2Reset(); + // clear D27 reset + clearFPGAD27CondReset(); } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].resetRequested ) + if ( TRUE == conductivitySensorControl[ D29_COND ].resetRequested ) { - // CD3 reset - setFPGACD3Reset(); - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].resetRequested = FALSE; + // D29 reset + setFPGAD29CondReset(); + conductivitySensorControl[ D29_COND ].resetRequested = FALSE; } else { - // clear CD3 reset - clearFPGACD3Reset(); + // clear D29 reset + clearFPGAD29CondReset(); } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].resetRequested ) + if ( TRUE == conductivitySensorControl[ D43_COND ].resetRequested ) { - // CD4 reset - setFPGACD4Reset(); - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].resetRequested = FALSE; + // D43 reset + setFPGAD43CondReset(); + conductivitySensorControl[ D43_COND ].resetRequested = FALSE; } else { - // clear CD4 reset - clearFPGACD4Reset(); + // clear D43 reset + clearFPGAD43CondReset(); } } @@ -530,52 +530,52 @@ *************************************************************************/ void handleConductivitySensorsInitProcedure( void ) { - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].initEnable ) + if ( TRUE == conductivitySensorControl[ D17_COND ].initEnable ) { - // CD1 initialization - setFPGACD1InitEnable(); - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].initEnable = FALSE; + // D17 initialization + setFPGAD17CondInitEnable(); + conductivitySensorControl[ D17_COND ].initEnable = FALSE; } else { - // clear CD1 Init command - clearFPGACD1InitEnable(); + // clear D17 Init command + clearFPGAD17CondInitEnable(); } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].initEnable ) + if ( TRUE == conductivitySensorControl[ D27_COND ].initEnable ) { - // CD2 initialization - setFPGACD2InitEnable(); - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].initEnable = FALSE; + // D27 initialization + setFPGAD27CondInitEnable(); + conductivitySensorControl[ D27_COND ].initEnable = FALSE; } else { - // clear CD2 Init command - clearFPGACD2InitEnable(); + // clear D27 Init command + clearFPGAD27CondInitEnable(); } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].initEnable ) + if ( TRUE == conductivitySensorControl[ D29_COND ].initEnable ) { - // CD3 initialization - setFPGACD3InitEnable(); - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].initEnable = FALSE; + // D29 initialization + setFPGAD29CondInitEnable(); + conductivitySensorControl[ D29_COND ].initEnable = FALSE; } else { - // clear CD3 Init command - clearFPGACD3InitEnable(); + // clear D29 Init command + clearFPGAD29CondInitEnable(); } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].initEnable ) + if ( TRUE == conductivitySensorControl[ D43_COND ].initEnable ) { - // CD4 initialization - setFPGACD4InitEnable(); - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].initEnable = FALSE; + // D43 initialization + setFPGAD43CondInitEnable(); + conductivitySensorControl[ D43_COND ].initEnable = FALSE; } else { - // clear CD4 Init command - clearFPGACD4InitEnable(); + // clear D43 Init command + clearFPGAD43CondInitEnable(); } } @@ -593,7 +593,7 @@ { CONDUCTIVITY_SENSORS_T sensor; - for ( sensor = CONDUCTIVITYSENSORS_CD1_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ ) + for ( sensor = FIRST_COND_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ ) { // write state machine switch ( conductivitySensorControl[sensor].writeExecState ) @@ -626,51 +626,51 @@ { CONDUCTIVITY_WRITE_STATE_T state = CONDUCTIVITY_WRITE_INITIATE; - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].writeEnable && - FALSE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].writeInProgress ) + if ( TRUE == conductivitySensorControl[ D17_COND ].writeEnable && + FALSE == conductivitySensorControl[ D17_COND ].writeInProgress ) { - // CD1 write request - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].writeComplete = FALSE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].writeInProgress = TRUE; - setFPGACD12Address( conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].writeAddress ); - setFPGACD12Data( conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].writeData ); - setFPGACD1WriteEnable(); + // D17 write request + conductivitySensorControl[ D17_COND ].writeComplete = FALSE; + conductivitySensorControl[ D17_COND ].writeInProgress = TRUE; + setFPGACD12Address( conductivitySensorControl[ D17_COND ].writeAddress ); + setFPGACD12Data( conductivitySensorControl[ D17_COND ].writeData ); + setFPGAD17CondWriteEnable(); state = CONDUCTIVITY_WRITE_COMPLETE; } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].writeEnable && - FALSE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].writeInProgress ) + if ( TRUE == conductivitySensorControl[ D27_COND ].writeEnable && + FALSE == conductivitySensorControl[ D27_COND ].writeInProgress ) { - // CD2 write request - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].writeComplete = FALSE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].writeInProgress = TRUE; - setFPGACD12Address( conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].writeAddress ); - setFPGACD12Data( conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].writeData ); - setFPGACD2WriteEnable(); + // D27 write request + conductivitySensorControl[ D27_COND ].writeComplete = FALSE; + conductivitySensorControl[ D27_COND ].writeInProgress = TRUE; + setFPGACD12Address( conductivitySensorControl[ D27_COND ].writeAddress ); + setFPGACD12Data( conductivitySensorControl[ D27_COND ].writeData ); + setFPGAD27CondWriteEnable(); state = CONDUCTIVITY_WRITE_COMPLETE; } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].writeEnable && - FALSE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].writeInProgress ) + if ( TRUE == conductivitySensorControl[ D29_COND ].writeEnable && + FALSE == conductivitySensorControl[ D29_COND ].writeInProgress ) { - // CD3 write request - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].writeComplete = FALSE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].writeInProgress = TRUE; - setFPGACD34Address( conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].writeAddress ); - setFPGACD34Data( conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].writeData ); - setFPGACD3WriteEnable(); + // D29 write request + conductivitySensorControl[ D29_COND ].writeComplete = FALSE; + conductivitySensorControl[ D29_COND ].writeInProgress = TRUE; + setFPGACD34Address( conductivitySensorControl[ D29_COND ].writeAddress ); + setFPGACD34Data( conductivitySensorControl[ D29_COND ].writeData ); + setFPGAD29CondWriteEnable(); state = CONDUCTIVITY_WRITE_COMPLETE; } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].writeEnable && - FALSE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].writeInProgress ) + if ( TRUE == conductivitySensorControl[ D43_COND ].writeEnable && + FALSE == conductivitySensorControl[ D43_COND ].writeInProgress ) { - // CD4 write request - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].writeComplete = FALSE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].writeInProgress = TRUE; - setFPGACD34Address( conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].writeAddress ); - setFPGACD34Data( conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].writeData ); - setFPGACD4WriteEnable(); + // D43 write request + conductivitySensorControl[ D43_COND ].writeComplete = FALSE; + conductivitySensorControl[ D43_COND ].writeInProgress = TRUE; + setFPGACD34Address( conductivitySensorControl[ D43_COND ].writeAddress ); + setFPGACD34Data( conductivitySensorControl[ D43_COND ].writeData ); + setFPGAD43CondWriteEnable(); state = CONDUCTIVITY_WRITE_COMPLETE; } @@ -689,35 +689,35 @@ { CONDUCTIVITY_WRITE_STATE_T state = CONDUCTIVITY_WRITE_COMPLETE; - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].writeInProgress ) + if ( TRUE == conductivitySensorControl[ D17_COND ].writeInProgress ) { - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].writeComplete = TRUE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].writeEnable = FALSE; - clearFPGACD1WriteEnable(); + conductivitySensorControl[ D17_COND ].writeComplete = TRUE; + conductivitySensorControl[ D17_COND ].writeEnable = FALSE; + clearFPGAD17CondWriteEnable(); state = CONDUCTIVITY_WRITE_INITIATE; } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].writeInProgress ) + if ( TRUE == conductivitySensorControl[ D27_COND ].writeInProgress ) { - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].writeComplete = TRUE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].writeEnable = FALSE; - clearFPGACD2WriteEnable(); + conductivitySensorControl[ D27_COND ].writeComplete = TRUE; + conductivitySensorControl[ D27_COND ].writeEnable = FALSE; + clearFPGAD27CondWriteEnable(); state = CONDUCTIVITY_WRITE_INITIATE; } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].writeInProgress ) + if ( TRUE == conductivitySensorControl[ D29_COND ].writeInProgress ) { - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].writeComplete = TRUE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].writeEnable = FALSE; - clearFPGACD3WriteEnable(); + conductivitySensorControl[ D29_COND ].writeComplete = TRUE; + conductivitySensorControl[ D29_COND ].writeEnable = FALSE; + clearFPGAD29CondWriteEnable(); state = CONDUCTIVITY_WRITE_INITIATE; } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].writeInProgress ) + if ( TRUE == conductivitySensorControl[ D43_COND ].writeInProgress ) { - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].writeComplete = TRUE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].writeEnable = FALSE; - clearFPGACD4WriteEnable(); + conductivitySensorControl[ D43_COND ].writeComplete = TRUE; + conductivitySensorControl[ D43_COND ].writeEnable = FALSE; + clearFPGAD43CondWriteEnable(); state = CONDUCTIVITY_WRITE_INITIATE; } @@ -738,7 +738,7 @@ { CONDUCTIVITY_SENSORS_T sensor; - for ( sensor = CONDUCTIVITYSENSORS_CD1_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ ) + for ( sensor = FIRST_COND_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ ) { // Read state machine switch ( conductivitySensorControl[sensor].readExecState ) @@ -771,47 +771,47 @@ { CONDUCTIVITY_READ_STATE_T state = CONDUCTIVITY_READ_INITIATE; - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].readEnable && - FALSE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].readInProgress ) + if ( TRUE == conductivitySensorControl[ D17_COND ].readEnable && + FALSE == conductivitySensorControl[ D17_COND ].readInProgress ) { - // CD1 read request - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].readComplete = FALSE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].readInProgress = TRUE; - setFPGACD12Address( conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].readAddress ); - setFPGACD1ReadEnable(); + // D17 read request + conductivitySensorControl[ D17_COND ].readComplete = FALSE; + conductivitySensorControl[ D17_COND ].readInProgress = TRUE; + setFPGACD12Address( conductivitySensorControl[ D17_COND ].readAddress ); + setFPGAD17CondReadEnable(); state = CONDUCTIVITY_READ_COMPLETE; } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].readEnable && - FALSE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].readInProgress ) + if ( TRUE == conductivitySensorControl[ D27_COND ].readEnable && + FALSE == conductivitySensorControl[ D27_COND ].readInProgress ) { - // CD2 read request - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].readComplete = FALSE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].readInProgress = TRUE; - setFPGACD12Address( conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].readAddress ); - setFPGACD2ReadEnable(); + // D27 read request + conductivitySensorControl[ D27_COND ].readComplete = FALSE; + conductivitySensorControl[ D27_COND ].readInProgress = TRUE; + setFPGACD12Address( conductivitySensorControl[ D27_COND ].readAddress ); + setFPGAD27CondReadEnable(); state = CONDUCTIVITY_READ_COMPLETE; } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].readEnable && - FALSE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].readInProgress ) + if ( TRUE == conductivitySensorControl[ D29_COND ].readEnable && + FALSE == conductivitySensorControl[ D29_COND ].readInProgress ) { - // CD3 read request - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].readComplete = FALSE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].readInProgress = TRUE; - setFPGACD34Address( conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].readAddress ); - setFPGACD3ReadEnable(); + // D29 read request + conductivitySensorControl[ D29_COND ].readComplete = FALSE; + conductivitySensorControl[ D29_COND ].readInProgress = TRUE; + setFPGACD34Address( conductivitySensorControl[ D29_COND ].readAddress ); + setFPGAD29CondReadEnable(); state = CONDUCTIVITY_READ_COMPLETE; } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].readEnable && - FALSE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].readInProgress ) + if ( TRUE == conductivitySensorControl[ D43_COND ].readEnable && + FALSE == conductivitySensorControl[ D43_COND ].readInProgress ) { - // CD4 read request - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].readComplete = FALSE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].readInProgress = TRUE; - setFPGACD34Address( conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].readAddress ); - setFPGACD4ReadEnable(); + // D43 read request + conductivitySensorControl[ D43_COND ].readComplete = FALSE; + conductivitySensorControl[ D43_COND ].readInProgress = TRUE; + setFPGACD34Address( conductivitySensorControl[ D43_COND ].readAddress ); + setFPGAD43CondReadEnable(); state = CONDUCTIVITY_READ_COMPLETE; } @@ -830,39 +830,39 @@ { CONDUCTIVITY_READ_STATE_T state = CONDUCTIVITY_READ_COMPLETE; - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].readInProgress ) + if ( TRUE == conductivitySensorControl[ D17_COND ].readInProgress ) { - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].readData = getFPGACD1Data(); - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].readComplete = TRUE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD1_SENSOR ].readEnable = FALSE; - clearFPGACD1ReadEnable(); + conductivitySensorControl[ D17_COND ].readData = getFPGAD17CondData(); + conductivitySensorControl[ D17_COND ].readComplete = TRUE; + conductivitySensorControl[ D17_COND ].readEnable = FALSE; + clearFPGAD17CondReadEnable(); state = CONDUCTIVITY_READ_INITIATE; } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].readInProgress ) + if ( TRUE == conductivitySensorControl[ D27_COND ].readInProgress ) { - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].readData = getFPGACD2Data(); - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].readComplete = TRUE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD2_SENSOR ].readEnable = FALSE; - clearFPGACD2ReadEnable(); + conductivitySensorControl[ D27_COND ].readData = getFPGAD27CondData(); + conductivitySensorControl[ D27_COND ].readComplete = TRUE; + conductivitySensorControl[ D27_COND ].readEnable = FALSE; + clearFPGAD27CondReadEnable(); state = CONDUCTIVITY_READ_INITIATE; } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].readInProgress ) + if ( TRUE == conductivitySensorControl[ D29_COND ].readInProgress ) { - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].readData = getFPGACD3Data(); - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].readComplete = TRUE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD3_SENSOR ].readEnable = FALSE; - clearFPGACD3ReadEnable(); + conductivitySensorControl[ D29_COND ].readData = getFPGAD29CondData(); + conductivitySensorControl[ D29_COND ].readComplete = TRUE; + conductivitySensorControl[ D29_COND ].readEnable = FALSE; + clearFPGAD29CondReadEnable(); state = CONDUCTIVITY_READ_INITIATE; } - if ( TRUE == conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].readInProgress ) + if ( TRUE == conductivitySensorControl[ D43_COND ].readInProgress ) { - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].readData = getFPGACD4Data(); - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].readComplete = TRUE; - conductivitySensorControl[ CONDUCTIVITYSENSORS_CD4_SENSOR ].readEnable = FALSE; - clearFPGACD4ReadEnable(); + conductivitySensorControl[ D43_COND ].readData = getFPGAD43CondData(); + conductivitySensorControl[ D43_COND ].readComplete = TRUE; + conductivitySensorControl[ D43_COND ].readEnable = FALSE; + clearFPGAD43CondReadEnable(); state = CONDUCTIVITY_READ_INITIATE; }