Index: firmware/App/Drivers/ConductivitySensors.c =================================================================== diff -u -red39129abdca4ec343369d83494530b23621e052 -ra9983d3e6b07e7c927fab3d16e80b715594fe221 --- firmware/App/Drivers/ConductivitySensors.c (.../ConductivitySensors.c) (revision ed39129abdca4ec343369d83494530b23621e052) +++ firmware/App/Drivers/ConductivitySensors.c (.../ConductivitySensors.c) (revision a9983d3e6b07e7c927fab3d16e80b715594fe221) @@ -143,6 +143,7 @@ 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 ); + initFPGAPersistentAlarm( FPGA_PERS_ERROR_D74_COND_SENSOR, ALARM_ID_DD_D74_COND_SENSOR_FPGA_FAULT, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS, COND_SENSORS_FPGA_ERROR_TIMEOUT_MS ); } /*********************************************************************//** @@ -165,23 +166,27 @@ currentConductivityReadings[ D27_COND ].data = (F32)getFPGAD27Cond(); currentConductivityReadings[ D29_COND ].data = (F32)getFPGAD29Cond(); currentConductivityReadings[ D43_COND ].data = (F32)getFPGAD43Cond(); + currentConductivityReadings[ D74_COND ].data = (F32)getFPGAD74Cond(); // Read temperature associated to conductivity sensor currentTemperatureReadings[ D17_COND ].data = (F32)getFPGAD17CondTemp(); currentTemperatureReadings[ D27_COND ].data = (F32)getFPGAD27CondTemp(); currentTemperatureReadings[ D29_COND ].data = (F32)getFPGAD29CondTemp(); currentTemperatureReadings[ D43_COND ].data = (F32)getFPGAD43CondTemp(); + currentTemperatureReadings[ D74_COND ].data = (F32)getFPGAD74CondTemp(); // Update read and error counters for each conductivity sensor lastConductivityReadCounter[ D17_COND ].data = (U32)getFPGAD17CondReadCount(); lastConductivityReadCounter[ D27_COND ].data = (U32)getFPGAD27CondReadCount(); lastConductivityReadCounter[ D29_COND ].data = (U32)getFPGAD29CondReadCount(); lastConductivityReadCounter[ D43_COND ].data = (U32)getFPGAD43CondReadCount(); + lastConductivityReadCounter[ D74_COND ].data = (U32)getFPGAD74CondReadCount(); lastConductivityErrorCounter[ D17_COND ].data = (U32)getFPGAD17CondErrorCount(); lastConductivityErrorCounter[ D27_COND ].data = (U32)getFPGAD27CondErrorCount(); lastConductivityErrorCounter[ D29_COND ].data = (U32)getFPGAD29CondErrorCount(); lastConductivityErrorCounter[ D43_COND ].data = (U32)getFPGAD43CondErrorCount(); + lastConductivityErrorCounter[ D74_COND ].data = (U32)getFPGAD74CondErrorCount(); // Monitor conductivity sensor health checkConductivitySensors(); @@ -199,6 +204,8 @@ * 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 Alarm: ALARM_ID_DD_D74_COND_SENSOR_FPGA_FAULT if the + * D74 conductivity sensor is not able to be read. * @details \b Inputs: lastConductivityReadCounter, lastConductivityErrorCounter * @details \b Outputs: none * @return none @@ -209,11 +216,13 @@ 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) ); + checkFPGAPersistentAlarms( FPGA_PERS_ERROR_D74_COND_SENSOR, getConductivitySensorReadCount(D74_COND) ); 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 ) ); + checkFPGAPersistentErrorCountAlarm( FPGA_PERS_ERROR_D74_COND_SENSOR, getConductivitySensorErrorCount( D74_COND ) ); } /*********************************************************************//** @@ -515,6 +524,18 @@ // clear D43 reset clearFPGAD43CondReset(); } + + if ( TRUE == conductivitySensorControl[ D74_COND ].resetRequested ) + { + // D74 reset + setFPGAD74CondReset(); + conductivitySensorControl[ D74_COND ].resetRequested = FALSE; + } + else + { + // clear D74 reset + clearFPGAD74CondReset(); + } } /*********************************************************************//** @@ -577,6 +598,18 @@ // clear D43 Init command clearFPGAD43CondInitEnable(); } + + if ( TRUE == conductivitySensorControl[ D74_COND ].initEnable ) + { + // D74 initialization + setFPGAD74CondInitEnable(); + conductivitySensorControl[ D74_COND ].initEnable = FALSE; + } + else + { + // clear D74 Init command + clearFPGAD74CondInitEnable(); + } } /*********************************************************************//** @@ -674,6 +707,18 @@ state = CONDUCTIVITY_WRITE_COMPLETE; } + if ( TRUE == conductivitySensorControl[ D74_COND ].writeEnable && + FALSE == conductivitySensorControl[ D74_COND ].writeInProgress ) + { + // D74 write request + conductivitySensorControl[ D74_COND ].writeComplete = FALSE; + conductivitySensorControl[ D74_COND ].writeInProgress = TRUE; + setFPGACD5Address( conductivitySensorControl[ D74_COND ].writeAddress ); + setFPGACD5Data( conductivitySensorControl[ D74_COND ].writeData ); + setFPGAD74CondWriteEnable(); + state = CONDUCTIVITY_WRITE_COMPLETE; + } + return state; } @@ -721,6 +766,13 @@ state = CONDUCTIVITY_WRITE_INITIATE; } + if ( TRUE == conductivitySensorControl[ D74_COND ].writeInProgress ) + { + conductivitySensorControl[ D74_COND ].writeComplete = TRUE; + conductivitySensorControl[ D74_COND ].writeEnable = FALSE; + clearFPGAD74CondWriteEnable(); + state = CONDUCTIVITY_WRITE_INITIATE; + } return state; } @@ -815,6 +867,17 @@ state = CONDUCTIVITY_READ_COMPLETE; } + if ( TRUE == conductivitySensorControl[ D74_COND ].readEnable && + FALSE == conductivitySensorControl[ D74_COND ].readInProgress ) + { + // D74 read request + conductivitySensorControl[ D74_COND ].readComplete = FALSE; + conductivitySensorControl[ D74_COND ].readInProgress = TRUE; + setFPGACD5Address( conductivitySensorControl[ D74_COND ].readAddress ); + setFPGAD74CondReadEnable(); + state = CONDUCTIVITY_READ_COMPLETE; + } + return state; } @@ -866,6 +929,15 @@ state = CONDUCTIVITY_READ_INITIATE; } + if ( TRUE == conductivitySensorControl[ D74_COND ].readInProgress ) + { + conductivitySensorControl[ D74_COND ].readData = getFPGAD74CondData(); + conductivitySensorControl[ D74_COND ].readComplete = TRUE; + conductivitySensorControl[ D74_COND ].readEnable = FALSE; + clearFPGAD74CondReadEnable(); + state = CONDUCTIVITY_READ_INITIATE; + } + return state; } Index: firmware/App/Drivers/ConductivitySensors.h =================================================================== diff -u -red39129abdca4ec343369d83494530b23621e052 -ra9983d3e6b07e7c927fab3d16e80b715594fe221 --- firmware/App/Drivers/ConductivitySensors.h (.../ConductivitySensors.h) (revision ed39129abdca4ec343369d83494530b23621e052) +++ firmware/App/Drivers/ConductivitySensors.h (.../ConductivitySensors.h) (revision a9983d3e6b07e7c927fab3d16e80b715594fe221) @@ -41,10 +41,11 @@ typedef enum ConductivitySensors { FIRST_COND_SENSOR = 0, ///< First conductivity sensor - D17_COND = FIRST_COND_SENSOR, ///< Bicarb only conductivity sensor + D17_COND = FIRST_COND_SENSOR, ///< Bicarb only conductivity sensor - 1 D27_COND, ///< Acid and Bicarb mix conductivity sensor - 1 D29_COND, ///< Acid and Bicarb mix conductivity sensor - 2 D43_COND, ///< Spent dialysate conductivity sensor + D74_COND, ///< Bicarb only conductivity sensor - 2 NUM_OF_CONDUCTIVITY_SENSORS ///< Number of conductivity sensors } CONDUCTIVITY_SENSORS_T; Index: firmware/App/Monitors/Conductivity.c =================================================================== diff -u -r313982ccc772f1bbe182877dff7e00381b04e0f4 -ra9983d3e6b07e7c927fab3d16e80b715594fe221 --- firmware/App/Monitors/Conductivity.c (.../Conductivity.c) (revision 313982ccc772f1bbe182877dff7e00381b04e0f4) +++ firmware/App/Monitors/Conductivity.c (.../Conductivity.c) (revision a9983d3e6b07e7c927fab3d16e80b715594fe221) @@ -74,11 +74,12 @@ //control conductivity sensor // TODO : need more clarity on why and when to execute following control. +#if 0 handleConductivitySensorsReset(); handleConductivitySensorsInitProcedure(); execConductivitySensorWrite(); execConductivitySensorRead(); - +#endif // publish conductivity sensors publishConductivitySensorsData(); } Index: firmware/App/Services/AlarmMgmtDD.c =================================================================== diff -u -r313982ccc772f1bbe182877dff7e00381b04e0f4 -ra9983d3e6b07e7c927fab3d16e80b715594fe221 --- firmware/App/Services/AlarmMgmtDD.c (.../AlarmMgmtDD.c) (revision 313982ccc772f1bbe182877dff7e00381b04e0f4) +++ firmware/App/Services/AlarmMgmtDD.c (.../AlarmMgmtDD.c) (revision a9983d3e6b07e7c927fab3d16e80b715594fe221) @@ -14,6 +14,7 @@ * @date (original) 05-Aug-2024 * ***************************************************************************/ +#define __ALARM_MGMT_DD_C__ #include "AlarmMgmtDD.h" #include "Messaging.h" Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -r521cd469ec8e35476a27475170848d0f62aa0ec8 -ra9983d3e6b07e7c927fab3d16e80b715594fe221 --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 521cd469ec8e35476a27475170848d0f62aa0ec8) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision a9983d3e6b07e7c927fab3d16e80b715594fe221) @@ -65,6 +65,11 @@ #define FPGA_D43_WR_ENABLE_BIT 0x40 ///< Conductivity Sensor D43 write enable bit mask. #define FPGA_D43_RD_ENABLE_BIT 0x80 ///< Conductivity Sensor D43 read enable bit mask. +#define FPGA_D74_RESET_BIT 0x01 ///< Conductivity Sensor D74 reset bit mask. +#define FPGA_D74_INIT_ENABLE_BIT 0x02 ///< Conductivity Sensor D74 Initialization enable bit mask. +#define FPGA_D74_WR_ENABLE_BIT 0x04 ///< Conductivity Sensor D74 write enable bit mask. +#define FPGA_D74_RD_ENABLE_BIT 0x08 ///< Conductivity Sensor D74 read enable bit mask. + // Assuming all valves are ON/OFF based control ( No PWM control used) #define FPGA_ENABLE_VALVES_PWM 0x0000 ///< FPGA enable valves PWM. #define FPGA_ENABLE_BC_VALVES_PWM 0x00 ///< FPGA enable Balancing chamber valves PWM. @@ -233,6 +238,12 @@ U08 fpgaFloater2Status; ///< Reg 427. Floater 2 level sensor status U16 fpgaD11PumpStepCountStatus; ///< Reg 428. Acid concentrate pump revolution down count status U16 fpgaD10PumpStepCountStatus; ///< Reg 430. Bicarb concentrate pump revolution down count status + + U32 fpgaD74CondDataOut; ///< Reg 432. Data read from Conductivity Sensor D74 register + U16 fpgaD74CondCond; ///< Reg 436. D74 conductivity + U16 fpgaD74CondTemp; ///< Reg 438. D74 Temperature + U08 fpgaD74CondReadCnt; ///< Reg 440. D74 successful read count + U08 fpgaD74CondErrorCnt; ///< Reg 441. D74 error read count } DD_FPGA_SENSORS_T; typedef struct @@ -327,6 +338,11 @@ U08 fpgaGPIOControl; ///< Reg 147. FPGA GPIO control interface U16 fpgaACRelayPWMLow; ///< Reg 148. Length of time in 10us resoultion that PWM output stays low. U16 fpgaACRelayPWMPeriod; ///< Reg 150. PWM period for AC relay/heater. + + U08 fpgaConSensD74Control; ///< Reg 152. Conductivity/Temperature Sensors D74 Control registers + U16 fpgaConSensD74_Addrs; ///< Reg 153. D74 Initialization Address register + U32 fpgaConSensD74_Data_In; ///< Reg 155. D74 Initialization data register + } FPGA_ACTUATORS_T; #pragma pack(pop) @@ -1167,6 +1183,125 @@ /*********************************************************************//** * @brief + * The setFPGAD74CondReset function resets the FPGA Conductivity + * Sensor D74. + * @details \b Inputs: none + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD74Control + * @param none + * @return none + *************************************************************************/ +void setFPGAD74CondReset( void ) +{ + fpgaActuatorSetPoints.fpgaConSensD74Control |= FPGA_D74_RESET_BIT; +} + +/*********************************************************************//** + * @brief + * The clearFPGAD74CondReset function clears the reset of FPGA Conductivity + * Sensor D74. + * @details \b Inputs: none + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD74Control + * @param none + * @return none + *************************************************************************/ +void clearFPGAD74CondReset( void ) +{ + fpgaActuatorSetPoints.fpgaConSensD74Control &= ~FPGA_D74_RESET_BIT; +} + +/*********************************************************************//** + * @brief + * The setFPGAD74CondInitEnable function enables the FPGA Conductivity + * Sensor D74 initialzation procedure. + * @details \b Inputs: none + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD74Control + * @param none + * @return none + *************************************************************************/ +void setFPGAD74CondInitEnable( void ) +{ + fpgaActuatorSetPoints.fpgaConSensD74Control |= FPGA_D74_INIT_ENABLE_BIT; +} + +/*********************************************************************//** + * @brief + * The clearFPGAD74CondInitEnable function clears the init process of FPGA Conductivity + * Sensor D74. + * @details \b Inputs: none + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD74Control + * @param none + * @return none + *************************************************************************/ +void clearFPGAD74CondInitEnable( void ) +{ + fpgaActuatorSetPoints.fpgaConSensD74Control &= ~FPGA_D74_INIT_ENABLE_BIT; +} + +/*********************************************************************//** + * @brief + * The setFPGAD74CondWriteEnable function enables the FPGA Conductivity + * Sensor D74 write transaction. + * @details \b Inputs: none + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD74Control + * @param none + * @warning: The address (setFPGACD74Address) and data (setFPGACD74Data) register + * must be populated before invoking this write enable function to initiate + * write transaction with the sensor. + * @return none + *************************************************************************/ +void setFPGAD74CondWriteEnable( void ) +{ + fpgaActuatorSetPoints.fpgaConSensD74Control |= FPGA_D74_WR_ENABLE_BIT; +} + +/*********************************************************************//** + * @brief + * The clearFPGAD74CondWriteEnable function clears the write enable of FPGA Conductivity + * Sensor D74. + * @details \b Inputs: none + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD74Control + * @param none + * @return none + *************************************************************************/ +void clearFPGAD74CondWriteEnable( void ) +{ + fpgaActuatorSetPoints.fpgaConSensD74Control &= ~FPGA_D74_WR_ENABLE_BIT; +} + +/*********************************************************************//** + * @brief + * The setFPGAD74CondReadEnable function enables the FPGA Conductivity + * Sensor D74 read transaction. + * @details \b Inputs: none + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD74Control + * @param none + * @warning: The address (setFPGACD74Address) register must be populated + * before invoking this read enable function to initiate read transaction + * with the sensor. + * @return none + *************************************************************************/ +void setFPGAD74CondReadEnable( void ) +{ + fpgaActuatorSetPoints.fpgaConSensD74Control |= FPGA_D74_RD_ENABLE_BIT; +} + +/*********************************************************************//** + * @brief + * The clearFPGAD74CondReadEnable function clears the read enable of FPGA Conductivity + * Sensor D74. + * @details \b Inputs: none + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD74Control + * @param none + * @return none + *************************************************************************/ +void clearFPGAD74CondReadEnable( void ) +{ + fpgaActuatorSetPoints.fpgaConSensD74Control &= ~FPGA_D74_RD_ENABLE_BIT; +} + + +/*********************************************************************//** + * @brief * The setFpgaCD12Control function sets the FPGA Conductivity * Sensor control register for CD1&2. * bit 7: Enables D27 read transaction (1), address needed @@ -1211,6 +1346,25 @@ /*********************************************************************//** * @brief + * The setFpgaCD5Control function sets the FPGA Conductivity + * Sensor control register for CD5. + * bit 4- 7: Reserved. + * bit 3: Enables D74 read transaction (1), address needed + * bit 2: Enables D74 write transaction (1), address and data needs to be set + * bit 1: Enable D74 Init procedure (1) + * bit 0: reset D74 Conduct sensor (1) + * @details \b Inputs: none + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD74Control + * @param control Conductivity sensor control set + * @return none + *************************************************************************/ +void setFPGACD5Control( U08 control ) +{ + fpgaActuatorSetPoints.fpgaConSensD74Control = control; +} + +/*********************************************************************//** + * @brief * The setFPGACD12Address function sets the conductivity sensor * CD12 address register to perform read and write operations. * @details \b Inputs: none @@ -1239,6 +1393,20 @@ /*********************************************************************//** * @brief + * The setFPGACD5Address function sets the conductivity sensor + * D74 address register to perform read and write operations. + * @details \b Inputs: none + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD74_Addrs + * @param address The conductivity sensor CD74 address + * @return none + *************************************************************************/ +void setFPGACD5Address( U16 address ) +{ + fpgaActuatorSetPoints.fpgaConSensD74_Addrs = address; +} + +/*********************************************************************//** + * @brief * The setFPGACD12Data function sets the conductivity sensor * CD12 data outputfor write operations. * @details \b Inputs: none @@ -1267,6 +1435,20 @@ /*********************************************************************//** * @brief + * The setFPGACD5Data function sets the conductivity sensor + * CD5 data outputfor write operations. + * @details \b Inputs: none + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD74_Data_In + * @param data The conductivity sensor CD74 Data + * @return none + *************************************************************************/ +void setFPGACD5Data( U32 data ) +{ + fpgaActuatorSetPoints.fpgaConSensD74_Data_In = data; +} + +/*********************************************************************//** + * @brief * The setFPGAD5HeaterPWMControl function sets the primary heater * PWM input. * @details \b Inputs: none @@ -2345,6 +2527,66 @@ /*********************************************************************//** * @brief + * The getFPGAD74CondReadCount function gets D74 conductivity sensor read count. + * @details \b Inputs: fpgaSensorReadings.fpgaD74CondReadCnt + * @details \b Outputs: none + * @return Latest D74 conductivity sensor read count + *************************************************************************/ +U08 getFPGAD74CondReadCount( void ) +{ + return fpgaSensorReadings.fpgaD74CondReadCnt; +} + +/*********************************************************************//** + * @brief + * The getFPGAD74CondErrorCount function gets D74 conductivity sensor error count. + * @details \b Inputs: fpgaSensorReadings.fpgaD74CondErrorCnt + * @details \b Outputs: none + * @return Latest D74 conductivity sensor read error count + *************************************************************************/ +U08 getFPGAD74CondErrorCount( void ) +{ + return fpgaSensorReadings.fpgaD74CondErrorCnt; +} + +/*********************************************************************//** + * @brief + * The getFPGAD74Cond function gets D74 conductivity sensor value. + * @details \b Inputs: fpgaSensorReadings.fpgaD74Cond + * @details \b Outputs: none + * @return Latest D74 conductivity sensor value + *************************************************************************/ +U16 getFPGAD74Cond( void ) +{ + return fpgaSensorReadings.fpgaD74CondCond; +} + +/*********************************************************************//** + * @brief + * The getFPGAD74CondTemp function gets D74 conductivity sensor temperature value. + * @details \b Inputs: fpgaSensorReadings.fpgaD74CondTemp + * @details \b Outputs: none + * @return Latest D74 conductivity sensor temperature value + *************************************************************************/ +U16 getFPGAD74CondTemp( void ) +{ + return fpgaSensorReadings.fpgaD74CondTemp; +} + +/*********************************************************************//** + * @brief + * The getFPGAD74CondData function gets D74 conductivity sensor register value. + * @details \b Inputs: fpgaSensorReadings.fpgaD74CondDataOut + * @details \b Outputs: none + * @return Latest D74 conductivity sensor register data value + *************************************************************************/ +U32 getFPGAD74CondData( void ) +{ + return fpgaSensorReadings.fpgaD74CondDataOut; +} + +/*********************************************************************//** + * @brief * The getFPGAD63LevelSensor function gets the latest FPGA D63 level sensor * reading. * @details \b Inputs: fpgaSensorReadings.fpgaD63LevelSensor Index: firmware/App/Services/FpgaDD.h =================================================================== diff -u -r521cd469ec8e35476a27475170848d0f62aa0ec8 -ra9983d3e6b07e7c927fab3d16e80b715594fe221 --- firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision 521cd469ec8e35476a27475170848d0f62aa0ec8) +++ firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision a9983d3e6b07e7c927fab3d16e80b715594fe221) @@ -54,10 +54,13 @@ // Conductivity and Temperature Sensor void setFPGACD12Control( U08 control ); void setFPGACD34Control( U08 control ); +void setFPGACD5Control( U08 control ); void setFPGACD12Address( U16 address ); void setFPGACD34Address( U16 address ); +void setFPGACD5Address( U16 address ); void setFPGACD12Data( U32 data ); void setFPGACD34Data( U32 data ); +void setFPGACD5Data( U32 data ); void setFPGAD17CondReset( void ); void clearFPGAD17CondReset( void ); @@ -95,6 +98,15 @@ void setFPGAD43CondReadEnable( void ); void clearFPGAD43CondReadEnable( void ); +void setFPGAD74CondReset( void ); +void clearFPGAD74CondReset( void ); +void setFPGAD74CondInitEnable( void ); +void clearFPGAD74CondInitEnable( void ); +void setFPGAD74CondWriteEnable( void ); +void clearFPGAD74CondWriteEnable( void ); +void setFPGAD74CondReadEnable( void ); +void clearFPGAD74CondReadEnable( void ); + U08 getFPGAD17CondReadCount( void ); U08 getFPGAD17CondErrorCount( void ); U16 getFPGAD17Cond( void ); @@ -119,6 +131,12 @@ U16 getFPGAD43CondTemp( void ); U32 getFPGAD43CondData( void ); +U08 getFPGAD74CondReadCount( void ); +U08 getFPGAD74CondErrorCount( void ); +U16 getFPGAD74Cond( void ); +U16 getFPGAD74CondTemp( void ); +U32 getFPGAD74CondData( void ); + // Pumps (Concentrate and Gear pumps ) void setFPGAD11PumpSetStepSpeed( U16 stepSpeed ); void setFPGAD10PumpSetStepSpeed( U16 stepSpeed ); Index: firmware/App/Tasks/TaskPriority.c =================================================================== diff -u -r313982ccc772f1bbe182877dff7e00381b04e0f4 -ra9983d3e6b07e7c927fab3d16e80b715594fe221 --- firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision 313982ccc772f1bbe182877dff7e00381b04e0f4) +++ firmware/App/Tasks/TaskPriority.c (.../TaskPriority.c) (revision a9983d3e6b07e7c927fab3d16e80b715594fe221) @@ -77,7 +77,7 @@ //execFPGAClockSpeedTest(); // Read/write Conductivity sensors - //execConductivity(); + execConductivity(); // Control valves execValves();