Index: firmware/App/Controllers/Heaters.c =================================================================== diff -u -r6f961c6e113a4076ba9d5f97e078a398a8976d7c -r325e67dab10f6666702bf0f1256015b31e58de4f --- firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) +++ firmware/App/Controllers/Heaters.c (.../Heaters.c) (revision 325e67dab10f6666702bf0f1256015b31e58de4f) @@ -742,7 +742,7 @@ { measuredTemperature = getD4AverageTemperature(); // Inlet temperature post heat exchanger - inletTemperature = getTemperatureValue( X6_TEMP ); + inletTemperature = getTemperatureValue( D78_TEMP ); if ( TRUE == startupHeaterControl ) { Index: firmware/App/Controllers/Valves.c =================================================================== diff -u -r6f961c6e113a4076ba9d5f97e078a398a8976d7c -r325e67dab10f6666702bf0f1256015b31e58de4f --- firmware/App/Controllers/Valves.c (.../Valves.c) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) +++ firmware/App/Controllers/Valves.c (.../Valves.c) (revision 325e67dab10f6666702bf0f1256015b31e58de4f) @@ -52,7 +52,7 @@ static U32 fpValveStatesPublicationTimerCounter; ///< Timer counter used to schedule IOFP valve state publication to CAN bus. static U16 commandedValvesStates; ///< Initialize commanded valves states bit field. static U08 commandedBCValveStates; ///< Initialize balancing chamber commanded valves states bit field. -static U08 commandedIOFPValveStates; ///< Initialize commanded IOFP valves states bit field. +static U16 commandedIOFPValveStates; ///< Initialize commanded IOFP valves states bit field. static U32 valveStateMismatchTimerCounter; ///< Initialize valve state mismatch timer. static U32 pendingValveStateChanges[ DD_NUM_OF_VALVES ]; ///< Delayed (pending) valve state changes. static U32 pendingValveStateChangeCountDowns[ DD_NUM_OF_VALVES ]; ///< Delayed (pending) valve state change count down timers (in task intervals). Index: firmware/App/Drivers/ConductivitySensors.c =================================================================== diff -u -r6f961c6e113a4076ba9d5f97e078a398a8976d7c -r325e67dab10f6666702bf0f1256015b31e58de4f --- firmware/App/Drivers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) +++ firmware/App/Drivers/ConductivitySensors.c (.../ConductivitySensors.c) (revision 325e67dab10f6666702bf0f1256015b31e58de4f) @@ -732,32 +732,32 @@ if ( D17_COND == sensorID ) { - setFPGACD12Address( conductivitySensorControl[ sensorID ].writeAddress ); - setFPGACD12Data( conductivitySensorControl[ sensorID ].writeData ); + setFPGAD17D74Address( conductivitySensorControl[ sensorID ].writeAddress ); + setFPGAD17D74Data( conductivitySensorControl[ sensorID ].writeData ); setFPGAD17CondWriteEnable(); } else if ( D27_COND == sensorID ) { - setFPGACD12Address( conductivitySensorControl[ sensorID ].writeAddress ); - setFPGACD12Data( conductivitySensorControl[ sensorID ].writeData ); + setFPGAD27D29Address( conductivitySensorControl[ sensorID ].writeAddress ); + setFPGAD27D29Data( conductivitySensorControl[ sensorID ].writeData ); setFPGAD27CondWriteEnable(); } else if ( D29_COND == sensorID ) { - setFPGACD34Address( conductivitySensorControl[ sensorID ].writeAddress ); - setFPGACD34Data( conductivitySensorControl[ sensorID ].writeData ); + setFPGAD27D29Address( conductivitySensorControl[ sensorID ].writeAddress ); + setFPGAD27D29Data( conductivitySensorControl[ sensorID ].writeData ); setFPGAD29CondWriteEnable(); } else if ( D43_COND == sensorID ) { - setFPGACD34Address( conductivitySensorControl[ sensorID ].writeAddress ); - setFPGACD34Data( conductivitySensorControl[ sensorID ].writeData ); + setFPGAD43Address( conductivitySensorControl[ sensorID ].writeAddress ); + setFPGAD43Data( conductivitySensorControl[ sensorID ].writeData ); setFPGAD43CondWriteEnable(); } else if ( D74_COND == sensorID ) { - setFPGACD5Address( conductivitySensorControl[ sensorID ].writeAddress ); - setFPGACD5Data( conductivitySensorControl[ sensorID ].writeData ); + setFPGAD17D74Address( conductivitySensorControl[ sensorID ].writeAddress ); + setFPGAD17D74Data( conductivitySensorControl[ sensorID ].writeData ); setFPGAD74CondWriteEnable(); } else if ( P9_COND == sensorID ) @@ -889,27 +889,27 @@ if ( D17_COND == sensorID ) { - setFPGACD12Address( conductivitySensorControl[ sensorID ].readAddress ); + setFPGAD17D74Address( conductivitySensorControl[ sensorID ].readAddress ); setFPGAD17CondReadEnable(); } else if ( D27_COND == sensorID ) { - setFPGACD12Address( conductivitySensorControl[ sensorID ].readAddress ); + setFPGAD27D29Address( conductivitySensorControl[ sensorID ].readAddress ); setFPGAD27CondReadEnable(); } else if ( D29_COND == sensorID ) { - setFPGACD34Address( conductivitySensorControl[ sensorID ].readAddress ); + setFPGAD27D29Address( conductivitySensorControl[ sensorID ].readAddress ); setFPGAD29CondReadEnable(); } else if ( D43_COND == sensorID ) { - setFPGACD34Address( conductivitySensorControl[ sensorID ].readAddress ); + setFPGAD43Address( conductivitySensorControl[ sensorID ].readAddress ); setFPGAD43CondReadEnable(); } else if ( D74_COND == sensorID ) { - setFPGACD5Address( conductivitySensorControl[ sensorID ].readAddress ); + setFPGAD17D74Address( conductivitySensorControl[ sensorID ].readAddress ); setFPGAD74CondReadEnable(); } else if ( P9_COND == sensorID ) Index: firmware/App/Drivers/TemperatureSensors.c =================================================================== diff -u -re6504e7e162d00745033a55191d6f810d2753105 -r325e67dab10f6666702bf0f1256015b31e58de4f --- firmware/App/Drivers/TemperatureSensors.c (.../TemperatureSensors.c) (revision e6504e7e162d00745033a55191d6f810d2753105) +++ firmware/App/Drivers/TemperatureSensors.c (.../TemperatureSensors.c) (revision 325e67dab10f6666702bf0f1256015b31e58de4f) @@ -117,10 +117,10 @@ tempSensors[ D1_TEMP ].zeroDegreeResistance = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE; tempSensors[ D1_TEMP ].maxAllowedTemp = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; - tempSensors[ X6_TEMP ].gain = PRIMARY_HEATER_TEMP_SENSORS_GAIN; - tempSensors[ X6_TEMP ].refResistance = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE; - tempSensors[ X6_TEMP ].zeroDegreeResistance = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE; - tempSensors[ X6_TEMP ].maxAllowedTemp = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; + tempSensors[ D78_TEMP ].gain = PRIMARY_HEATER_TEMP_SENSORS_GAIN; + tempSensors[ D78_TEMP ].refResistance = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE; + tempSensors[ D78_TEMP ].zeroDegreeResistance = PRIMARY_HEATER_TEMP_SENSORS_0_DEGREE_RESISTANCE; + tempSensors[ D78_TEMP ].maxAllowedTemp = TEMP_SENSORS_MAX_ALLOWED_DEGREE_C; tempSensors[ D4_TEMP ].gain = PRIMARY_HEATER_TEMP_SENSORS_GAIN; tempSensors[ D4_TEMP ].refResistance = PRIMARY_HEATER_TEMP_SENSORS_REF_RESISTANCE; @@ -186,7 +186,7 @@ //Read temperature sensors processTempSnsrsADCRead( D1_TEMP, getFPGAD1Temp() ); - processTempSnsrsADCRead( X6_TEMP, getFPGAX6Temp() ); + processTempSnsrsADCRead( D78_TEMP, getFPGAD78Temp() ); processTempSnsrsADCRead( D4_TEMP, getFPGAD4Temp() ); processTempSnsrsADCRead( D50_TEMP, getFPGAD50Temp() ); @@ -311,7 +311,7 @@ switch( sensorIndex ) { case D1_TEMP: - case X6_TEMP: + case D78_TEMP: case D4_TEMP: case D50_TEMP: temperature = getADC2TempConversion( avgADCReads, (U32)tempSensors [ sensorIndex ].gain, (U32)tempSensors [ sensorIndex ].refResistance, @@ -396,7 +396,7 @@ //calId = CAL_DATA_INLET_HEAT_EXCHANGER_TEMP; break; - case X6_TEMP: + case D78_TEMP: //calId = CAL_DATA_OUTLET_HEAT_EXCHANGER_TEMP; break; Index: firmware/App/Drivers/TemperatureSensors.h =================================================================== diff -u -re6504e7e162d00745033a55191d6f810d2753105 -r325e67dab10f6666702bf0f1256015b31e58de4f --- firmware/App/Drivers/TemperatureSensors.h (.../TemperatureSensors.h) (revision e6504e7e162d00745033a55191d6f810d2753105) +++ firmware/App/Drivers/TemperatureSensors.h (.../TemperatureSensors.h) (revision 325e67dab10f6666702bf0f1256015b31e58de4f) @@ -37,7 +37,7 @@ { D1_TEMP = 0, ///< First temp sensor to scan TEMPSENSORS_FIRST = D1_TEMP, ///< Heat exchanger Inlet temperature sensor - X6_TEMP, ///< Heat exchanger Outlet temperature sensor + D78_TEMP, ///< Heat exchanger Outlet temperature sensor D4_TEMP, ///< Hydraulics primary heater temperature sensor D50_TEMP, ///< Trimmer heater temperature sensor BRD_TEMP, ///< DD board temperature sensor ( thermistor ) Index: firmware/App/Modes/ModeGenDialysate.c =================================================================== diff -u -r5398b91c33e6fd39a74dbe132e50120965ef4107 -r325e67dab10f6666702bf0f1256015b31e58de4f --- firmware/App/Modes/ModeGenDialysate.c (.../ModeGenDialysate.c) (revision 5398b91c33e6fd39a74dbe132e50120965ef4107) +++ firmware/App/Modes/ModeGenDialysate.c (.../ModeGenDialysate.c) (revision 325e67dab10f6666702bf0f1256015b31e58de4f) @@ -237,7 +237,6 @@ //Previous state setValveState( D47_VALV, VALVE_STATE_CLOSED ); // spent chamber purge valve setValveState( D64_VALV, VALVE_STATE_CLOSED ); - setValveState( M4_VALV, VALVE_STATE_OPEN ); setValveState( D14_VALV, VALVE_STATE_OPEN ); setValveState( D53_VALV, VALVE_STATE_OPEN ); // Drain valve @@ -262,8 +261,6 @@ //Set valves and actuators setValveState( D35_VALV, VALVE_STATE_CLOSED ); // VDI setValveState( D40_VALV, VALVE_STATE_CLOSED ); // VDO - - setValveState( M4_VALV, VALVE_STATE_OPEN ); setValveState( D14_VALV, VALVE_STATE_OPEN ); setValveState( D53_VALV, VALVE_STATE_OPEN ); // Drain valve setValveState( D34_VALV, VALVE_STATE_OPEN ); // Bypass valve @@ -299,7 +296,6 @@ setValveState( D53_VALV, VALVE_STATE_OPEN ); // Drain valve setValveState( D34_VALV, VALVE_STATE_OPEN ); // Bypass valve - setValveState( M4_VALV, VALVE_STATE_OPEN ); setValveState( D64_VALV, VALVE_STATE_OPEN ); // Bicarb chamber purge valve bicarbFillStartTimeMS = getMSTimerCount(); Index: firmware/App/Modes/ModePreGenDialysate.c =================================================================== diff -u -r6f961c6e113a4076ba9d5f97e078a398a8976d7c -r325e67dab10f6666702bf0f1256015b31e58de4f --- firmware/App/Modes/ModePreGenDialysate.c (.../ModePreGenDialysate.c) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) +++ firmware/App/Modes/ModePreGenDialysate.c (.../ModePreGenDialysate.c) (revision 325e67dab10f6666702bf0f1256015b31e58de4f) @@ -267,9 +267,6 @@ break; case DD_WET_SELF_TEST_NEGATIVE_DEAERATION_PRES_CHECK: - //Make sure Water Inlet Valve is open - setValveState( M4_VALV, VALVE_STATE_OPEN ); - // Start timer for hyd chamber negative pressure check state hydChamberPressureCheckStartTimeMS = getMSTimerCount(); // Start D12/Degassing pump - closed loop control Index: firmware/App/Monitors/Temperature.c =================================================================== diff -u -r6f961c6e113a4076ba9d5f97e078a398a8976d7c -r325e67dab10f6666702bf0f1256015b31e58de4f --- firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) +++ firmware/App/Monitors/Temperature.c (.../Temperature.c) (revision 325e67dab10f6666702bf0f1256015b31e58de4f) @@ -460,7 +460,7 @@ TEMPERATURE_SENSORS_DD_DATA_T data; data.d1Temp = getTemperatureValue( D1_TEMP ); - data.x6Temp = getTemperatureValue( X6_TEMP ); + data.d78Temp = getTemperatureValue( D78_TEMP ); data.d4Temp = getTemperatureValue( D4_TEMP ); data.d50Temp = getTemperatureValue( D50_TEMP ); data.boardTemp = getTemperatureValue( BRD_TEMP ); Index: firmware/App/Monitors/Temperature.h =================================================================== diff -u -r97ea48347859157d941d743deedb5b980b4c4594 -r325e67dab10f6666702bf0f1256015b31e58de4f --- firmware/App/Monitors/Temperature.h (.../Temperature.h) (revision 97ea48347859157d941d743deedb5b980b4c4594) +++ firmware/App/Monitors/Temperature.h (.../Temperature.h) (revision 325e67dab10f6666702bf0f1256015b31e58de4f) @@ -35,7 +35,7 @@ typedef struct { F32 d1Temp; ///< Inlet heat exchanger temperature sensor - F32 x6Temp; ///< Outlet heat exchanger temperature sensor + F32 d78Temp; ///< Outlet heat exchanger temperature sensor F32 d4Temp; ///< Hydraulics primary heater temperature sensor F32 d50Temp; ///< Trimmer heater temperature sensor F32 boardTemp; ///< Board temperature sensor Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -r89f18a07a6d5837bf9b4559a69046e2b06f32c35 -r325e67dab10f6666702bf0f1256015b31e58de4f --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 89f18a07a6d5837bf9b4559a69046e2b06f32c35) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 325e67dab10f6666702bf0f1256015b31e58de4f) @@ -50,24 +50,24 @@ #define FPGA_D17_INIT_ENABLE_BIT 0x02 ///< Conductivity Sensor D17 Initialization enable bit mask. #define FPGA_D17_WR_ENABLE_BIT 0x04 ///< Conductivity Sensor D17 write enable bit mask. #define FPGA_D17_RD_ENABLE_BIT 0x08 ///< Conductivity Sensor D17 read enable bit mask. -#define FPGA_D27_RESET_BIT 0x10 ///< Conductivity Sensor D27 reset bit mask. -#define FPGA_D27_INIT_ENABLE_BIT 0x20 ///< Conductivity Sensor D27 Initialization enable bit mask. -#define FPGA_D27_WR_ENABLE_BIT 0x40 ///< Conductivity Sensor D27 write enable bit mask. -#define FPGA_D27_RD_ENABLE_BIT 0x80 ///< Conductivity Sensor D27 read enable bit mask. +#define FPGA_D74_RESET_BIT 0x10 ///< Conductivity Sensor D74 reset bit mask. +#define FPGA_D74_INIT_ENABLE_BIT 0x20 ///< Conductivity Sensor D74 Initialization enable bit mask. +#define FPGA_D74_WR_ENABLE_BIT 0x40 ///< Conductivity Sensor D74 write enable bit mask. +#define FPGA_D74_RD_ENABLE_BIT 0x80 ///< Conductivity Sensor D74 read enable bit mask. -#define FPGA_D29_RESET_BIT 0x01 ///< Conductivity Sensor D29 reset bit mask. -#define FPGA_D29_INIT_ENABLE_BIT 0x02 ///< Conductivity Sensor D29 Initialization enable bit mask. -#define FPGA_D29_WR_ENABLE_BIT 0x04 ///< Conductivity Sensor D29 write enable bit mask. -#define FPGA_D29_RD_ENABLE_BIT 0x08 ///< Conductivity Sensor D29 read enable bit mask. -#define FPGA_D43_RESET_BIT 0x10 ///< Conductivity Sensor D43 reset bit mask. -#define FPGA_D43_INIT_ENABLE_BIT 0x20 ///< Conductivity Sensor D43 Initialization enable bit mask. -#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_D27_RESET_BIT 0x01 ///< Conductivity Sensor D27 reset bit mask. +#define FPGA_D27_INIT_ENABLE_BIT 0x02 ///< Conductivity Sensor D27 Initialization enable bit mask. +#define FPGA_D27_WR_ENABLE_BIT 0x04 ///< Conductivity Sensor D27 write enable bit mask. +#define FPGA_D27_RD_ENABLE_BIT 0x08 ///< Conductivity Sensor D27 read enable bit mask. +#define FPGA_D29_RESET_BIT 0x10 ///< Conductivity Sensor D29 reset bit mask. +#define FPGA_D29_INIT_ENABLE_BIT 0x20 ///< Conductivity Sensor D29 Initialization enable bit mask. +#define FPGA_D29_WR_ENABLE_BIT 0x40 ///< Conductivity Sensor D29 write enable bit mask. +#define FPGA_D29_RD_ENABLE_BIT 0x80 ///< Conductivity Sensor D29 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. +#define FPGA_D43_RESET_BIT 0x01 ///< Conductivity Sensor D43 reset bit mask. +#define FPGA_D43_INIT_ENABLE_BIT 0x02 ///< Conductivity Sensor D43 Initialization enable bit mask. +#define FPGA_D43_WR_ENABLE_BIT 0x04 ///< Conductivity Sensor D43 write enable bit mask. +#define FPGA_D43_RD_ENABLE_BIT 0x08 ///< Conductivity Sensor D43 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. @@ -135,22 +135,22 @@ U16 fpgaD18PresTemp; ///< Reg 534. D18 MPM pressure sensor RAW temperature data U16 fpgaD41PresPressure; ///< Reg 536. D41 MPM pressure sensor RAW pressure data U16 fpgaD41PresTemp; ///< Reg 538. D41 MPM pressure sensor RAW temperature data - U32 fpgaD17CondDataOut; ///< Reg 540. Data read from Conductivity Sensor 1 register + U32 fpgaD17CondDataOut; ///< Reg 540. Data read from Conductivity Sensor D17 register U16 fpgaD17CondCond; ///< Reg 544. D17 conductivity U16 fpgaD17CondTemp; ///< Reg 546. D17 Temperature U08 fpgaD17CondReadCnt; ///< Reg 548. D17 successful read count U08 fpgaD17CondErrorCnt; ///< Reg 549. D17 error read count - U32 fpgaD27CondDataOut; ///< Reg 550. Data read from Conductivity Sensor 2 register + U32 fpgaD27CondDataOut; ///< Reg 550. Data read from Conductivity Sensor D27 register U16 fpgaD27CondCond; ///< Reg 554. D27 conductivity U16 fpgaD27CondTemp; ///< Reg 556. D27 Temperature U08 fpgaD27CondReadCnt; ///< Reg 558. D27 successful read count U08 fpgaD27CondErrorCnt; ///< Reg 559. D27 error read count - U32 fpgaD29CondDataOut; ///< Reg 560. Data read from Conductivity Sensor 3 register + U32 fpgaD29CondDataOut; ///< Reg 560. Data read from Conductivity Sensor D29 register U16 fpgaD29CondCond; ///< Reg 564. D29 conductivity U16 fpgaD29CondTemp; ///< Reg 566. D29 Temperature U08 fpgaD29CondReadCnt; ///< Reg 568. D29 successful read count U08 fpgaD29CondErrorCnt; ///< Reg 569. D29 error read count - U32 fpgaD43CondDataOut; ///< Reg 570. Data read from Conductivity Sensor 4 register + U32 fpgaD43CondDataOut; ///< Reg 570. Data read from Conductivity Sensor D43 register U16 fpgaD43CondCond; ///< Reg 574. D43 conductivity U16 fpgaD43CondTemp; ///< Reg 576. D43 Temperature U08 fpgaD43CondReadCnt; ///< Reg 578. D43 successful read count @@ -173,7 +173,7 @@ U08 fpgaRTDCountErrorCycles; ///< Reg 601. Count of each incomplete seq of reads from RTD ADC. U16 fpgaD11PumpHallSense; ///< Reg 602. Concentrate pump D11_Pump hall sensor pulse width U16 fpgaD10PumpHallSense; ///< Reg 604. Concentrate pump D10_Pump hall sensor pulse width - U32 fpgaX6Temp; ///< Reg 606. Outlet heat exchanger temperature + U32 fpgaD78Temp; ///< Reg 606. Outlet heat exchanger temperature U32 fpgaD1Temp; ///< Reg 610. Inlet heat exchanger temperature U32 fpgaD4Temp; ///< Reg 614. Hydraulics primary heater temperature U32 fpgaD50Temp; ///< Reg 618. Trimmer heater temperature @@ -265,13 +265,13 @@ U08 fpgaBCValveControl; ///< Reg 14. Balancing Chamber Valves Control Registers U08 fpgaBCValvePWMControl; ///< Reg 15. Balancing Chamber Valves PWM control U08 fpgaDDSpareValveControl; ///< Reg 16. Spare Valves Control Registers - U08 fpgaDDSpareValvePWMControl; ///< Reg 17. Ultra filtration Valves PWM control - U08 fpgaConSensTD12Control; ///< Reg 18. Conductivity/Temperature Sensors D17 & D27 Control registers - U08 fpgaConSensTD34Control; ///< Reg 19. Conductivity/Temperature Sensors D29 & D43 Control registers - U16 fpgaConSensTD12_Addrs; ///< Reg 20. D16,D17 Initialization Address register - U32 fpgaConSensTD12_Data_In; ///< Reg 22. D16,D17 Initialization data register - U16 fpgaConSensTD34_Addrs; ///< Reg 26. D27,D28 Initialization Address register - U32 fpgaConSensTD34_Data_In; ///< Reg 28. D27,D28 Initialization data register + U08 fpgaDDSpareValvePWMControl; ///< Reg 17. Spare Valves PWM control + U08 fpgaConSensD17D74Control; ///< Reg 18. Conductivity/Temperature Sensors D17 & D74 Control registers + U08 fpgaConSensD27D29Control; ///< Reg 19. Conductivity/Temperature Sensors D27 & D29 Control registers + U16 fpgaConSensD17D74_Addrs; ///< Reg 20. D17,D74 Initialization Address register + U32 fpgaConSensD17D74_Data_In; ///< Reg 22. D17,D74 Initialization data register + U16 fpgaConSensD27D29_Addrs; ///< Reg 26. D27,D29 Initialization Address register + U32 fpgaConSensD27D29_Data_In; ///< Reg 28. D27,D29 Initialization data register U16 fpgaRemoteUpdate_Write; ///< Reg 32.Register for Remote update used by SW. U16 fpgaD12PumpSpeed; ///< Reg 34. D48 Speed/RPM Control U08 fpgaD12PumpControl; ///< Reg 36. DGP Control @@ -303,33 +303,34 @@ U16 fpgaD76PumpRevCount; ///< Reg 76. UF pump revolution count U08 fpgaD76PumpControl; ///< Reg 78. UF Pump Control - U08 valveControl; ///< Reg 79. Valve control register. - U08 conductivityP9Control; ///< Reg 80. P9 conductivity control register. - U08 conductivityP18Control; ///< Reg 81. P18 conductivity control register. - U16 conductivityP9Address; ///< Reg 82. P9 conductivity address register. - U32 conductivityP9Data; ///< Reg 84. P9 conductivity data in register. - U16 conductivityP18Address; ///< Reg 88. P18 conductivity address register. - U32 conductivityP18Data; ///< Reg 90. P18 conductivity data in register. - U16 fpgaGenWrRd; ///< Reg 94. FPGA general write/read-back register (mirrored to a general read register in read page at addr 256). - U16 descalePumpSpeed; ///< Reg 96. Descaler pump speed register. - U08 descalePumpControl; ///< Reg 98. Descaler pump control register. - U08 p12PumpControl; ///< Reg 99. P12 pump control register. - U16 valveVwiPWMLow; ///< Reg 100. Valve VWi PWM low pulse period in 0.1 uSec. - U16 valveVwiPWMPeriod; ///< Reg 102. Valve VWi PWM full period in 0.1 uSec. - U16 valvePWMPullIn; ///< Reg 104. Valve PWM high pulse period when valve is on in 0.1 uSec. - U16 p12PumpPWMDutyCyclePct; ///< Reg 106. P12 pump PWM duty cycle in percentage. - U16 p40PumpPWMDutyCyclePct; ///< Reg 108. P40 pump PWM duty cycle in percentage. - U08 p40PumpControl; ///< Reg 110. P40 pump control register. - U08 reserved1; ///< Reg 111. Reserved. - U08 flowControlp7; ///< Reg 112. P7 AVS Romer flow sensor control register. - U08 flowAddressp7; ///< Reg 113. P7 AVS Romer flow sensor I2C slave address register. - U08 valvePWMEnable; ///< Reg 114. Valve PWM enable register. - U08 flowControlp16; ///< Reg 115. P16 AVS Romer flow sensor control register. - U08 flowAddressp16; ///< Reg 116. P16 AVS Romer flow sensor I2C slave address register. + U16 valveControl; ///< Reg 79. Valve control register. + U08 notused; ///< Reg 81. Not used + U08 conductivityP9Control; ///< Reg 82. P9 conductivity control register. + U08 conductivityP18Control; ///< Reg 83. P18 conductivity control register. + U16 conductivityP9Address; ///< Reg 84. P9 conductivity address register. + U32 conductivityP9Data; ///< Reg 86. P9 conductivity data in register. + U16 conductivityP18Address; ///< Reg 90. P18 conductivity address register. + U32 conductivityP18Data; ///< Reg 92. P18 conductivity data in register. + U16 fpgaGenWrRd; ///< Reg 96. FPGA general write/read-back register (mirrored to a general read register in read page at addr 256). + U16 descalePumpSpeed; ///< Reg 98. Descaler pump speed register. + U08 descalePumpControl; ///< Reg 100. Descaler pump control register. + U08 p12PumpControl; ///< Reg 101. P12 pump control register. + U16 valveVwiPWMLow; ///< Reg 102. Valve VWi PWM low pulse period in 0.1 uSec. + U16 valveVwiPWMPeriod; ///< Reg 104. Valve VWi PWM full period in 0.1 uSec. + U16 valvePWMPullIn; ///< Reg 106. Valve PWM high pulse period when valve is on in 0.1 uSec. + U16 p12PumpPWMDutyCyclePct; ///< Reg 108. P12 pump PWM duty cycle in percentage. + U16 p40PumpPWMDutyCyclePct; ///< Reg 110. P40 pump PWM duty cycle in percentage. + U08 p40PumpControl; ///< Reg 112. P40 pump control register. + U08 reserved1; ///< Reg 113. Reserved. + U08 flowControlp7; ///< Reg 114. P7 AVS Romer flow sensor control register. + U08 flowAddressp7; ///< Reg 115. P7 AVS Romer flow sensor I2C slave address register. + U16 valvePWMEnable; ///< Reg 116. Valve PWM enable register. + U08 flowControlp16; ///< Reg 118. P16 AVS Romer flow sensor control register. + U08 flowAddressp16; ///< Reg 119. P16 AVS Romer flow sensor I2C slave address register. - U08 fpgaConSensD74Control; ///< Reg 117. Conductivity/Temperature Sensors D74 Control registers - U16 fpgaConSensD74_Addrs; ///< Reg 118. D74 Initialization Address register - U32 fpgaConSensD74_Data_In; ///< Reg 120. D74 Initialization data register + U08 fpgaConSensD43Control; ///< Reg 120. Conductivity/Temperature Sensors D43 Control registers + U16 fpgaConSensD43_Addrs; ///< Reg 121. D43 Initialization Address register + U32 fpgaConSensD43_Data_In; ///< Reg 123. D43 Initialization data register } FPGA_ACTUATORS_T; #pragma pack(pop) @@ -750,181 +751,181 @@ * The setFPGAD17CondReset function resets the FPGA Conductivity * Sensor D17. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control * @param none * @return none *************************************************************************/ void setFPGAD17CondReset( void ) { - fpgaActuatorSetPoints.fpgaConSensTD12Control |= FPGA_D17_RESET_BIT; + fpgaActuatorSetPoints.fpgaConSensD17D74Control |= FPGA_D17_RESET_BIT; } /*********************************************************************//** * @brief * The clearFPGAD17CondReset function clears the reset of FPGA Conductivity * Sensor D17. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control * @param none * @return none *************************************************************************/ void clearFPGAD17CondReset( void ) { - fpgaActuatorSetPoints.fpgaConSensTD12Control &= ~FPGA_D17_RESET_BIT; + fpgaActuatorSetPoints.fpgaConSensD17D74Control &= ~FPGA_D17_RESET_BIT; } /*********************************************************************//** * @brief * The setFPGAD17CondInitEnable function enables the FPGA Conductivity * Sensor D17 initialzation procedure. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control * @param none * @return none *************************************************************************/ void setFPGAD17CondInitEnable( void ) { - fpgaActuatorSetPoints.fpgaConSensTD12Control |= FPGA_D17_INIT_ENABLE_BIT; + fpgaActuatorSetPoints.fpgaConSensD17D74Control |= FPGA_D17_INIT_ENABLE_BIT; } /*********************************************************************//** * @brief * The clearFPGAD17CondInitEnable function clears the init process of FPGA Conductivity * Sensor D17. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control * @param none * @return none *************************************************************************/ void clearFPGAD17CondInitEnable( void ) { - fpgaActuatorSetPoints.fpgaConSensTD12Control &= ~FPGA_D17_INIT_ENABLE_BIT; + fpgaActuatorSetPoints.fpgaConSensD17D74Control &= ~FPGA_D17_INIT_ENABLE_BIT; } /*********************************************************************//** * @brief * The setFPGAD17CondWriteEnable function enables the FPGA Conductivity * Sensor D17 write transaction. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control * @param none - * @warning: The address (setFPGACD12Address) and data (setFPGACD12Data) register + * @warning: The address (setFPGAD17D74Address) and data (setFPGACD12Data) register * must be populated before invoking this write enable function to initiate * write transaction with the sensor. * @return none *************************************************************************/ void setFPGAD17CondWriteEnable( void ) { - fpgaActuatorSetPoints.fpgaConSensTD12Control |= FPGA_D17_WR_ENABLE_BIT; + fpgaActuatorSetPoints.fpgaConSensD17D74Control |= FPGA_D17_WR_ENABLE_BIT; } /*********************************************************************//** * @brief * The clearFPGAD17CondWriteEnable function clears the write enable of FPGA Conductivity * Sensor D17. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control * @param none * @return none *************************************************************************/ void clearFPGAD17CondWriteEnable( void ) { - fpgaActuatorSetPoints.fpgaConSensTD12Control &= ~FPGA_D17_WR_ENABLE_BIT; + fpgaActuatorSetPoints.fpgaConSensD17D74Control &= ~FPGA_D17_WR_ENABLE_BIT; } /*********************************************************************//** * @brief * The setFPGAD17CondReadEnable function enables the FPGA Conductivity * Sensor D17 read transaction. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control * @param none - * @warning: The address (setFPGACD12Address) register must be populated + * @warning: The address (setFPGAD17D74Address) register must be populated * before invoking this read enable function to initiate read transaction * with the sensor. * @return none *************************************************************************/ void setFPGAD17CondReadEnable( void ) { - fpgaActuatorSetPoints.fpgaConSensTD12Control |= FPGA_D17_RD_ENABLE_BIT; + fpgaActuatorSetPoints.fpgaConSensD17D74Control |= FPGA_D17_RD_ENABLE_BIT; } /*********************************************************************//** * @brief * The clearFPGAD17CondReadEnable function clears the read enable of FPGA Conductivity * Sensor D17. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control * @param none * @return none *************************************************************************/ void clearFPGAD17CondReadEnable( void ) { - fpgaActuatorSetPoints.fpgaConSensTD12Control &= ~FPGA_D17_RD_ENABLE_BIT; + fpgaActuatorSetPoints.fpgaConSensD17D74Control &= ~FPGA_D17_RD_ENABLE_BIT; } /*********************************************************************//** * @brief * The setFPGAD27CondReset function resets the FPGA Conductivity * Sensor D27. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control * @param none * @return none *************************************************************************/ void setFPGAD27CondReset( void ) { - fpgaActuatorSetPoints.fpgaConSensTD12Control |= FPGA_D27_RESET_BIT; + fpgaActuatorSetPoints.fpgaConSensD27D29Control |= FPGA_D27_RESET_BIT; } /*********************************************************************//** * @brief * The clearFPGAD27CondReset function clears the reset of FPGA Conductivity * Sensor D27. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control * @param none * @return none *************************************************************************/ void clearFPGAD27CondReset( void ) { - fpgaActuatorSetPoints.fpgaConSensTD12Control &= ~FPGA_D27_RESET_BIT; + fpgaActuatorSetPoints.fpgaConSensD27D29Control &= ~FPGA_D27_RESET_BIT; } /*********************************************************************//** * @brief * The setFPGAD27CondInitEnable function enables the FPGA Conductivity * Sensor D27 initialzation procedure. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control * @param none * @return none *************************************************************************/ void setFPGAD27CondInitEnable( void ) { - fpgaActuatorSetPoints.fpgaConSensTD12Control |= FPGA_D27_INIT_ENABLE_BIT; + fpgaActuatorSetPoints.fpgaConSensD27D29Control |= FPGA_D27_INIT_ENABLE_BIT; } /*********************************************************************//** * @brief * The clearFPGAD27CondInitEnable function clears the init process of FPGA Conductivity * Sensor D27. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control * @param none * @return none *************************************************************************/ void clearFPGAD27CondInitEnable( void ) { - fpgaActuatorSetPoints.fpgaConSensTD12Control &= ~FPGA_D27_INIT_ENABLE_BIT; + fpgaActuatorSetPoints.fpgaConSensD27D29Control &= ~FPGA_D27_INIT_ENABLE_BIT; } /*********************************************************************//** * @brief * The setFPGAD27CondWriteEnable function enables the FPGA Conductivity * Sensor D27 write transaction. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control * @param none * @warning: The address (setFPGACD12Address) and data (setFPGACD12Data) register * must be populated before invoking this write enable function to initiate @@ -933,29 +934,29 @@ *************************************************************************/ void setFPGAD27CondWriteEnable( void ) { - fpgaActuatorSetPoints.fpgaConSensTD12Control |= FPGA_D27_WR_ENABLE_BIT; + fpgaActuatorSetPoints.fpgaConSensD27D29Control |= FPGA_D27_WR_ENABLE_BIT; } /*********************************************************************//** * @brief * The clearFPGAD27CondWriteEnable function clears the write enable of FPGA Conductivity * Sensor D27. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control * @param none * @return none *************************************************************************/ void clearFPGAD27CondWriteEnable( void ) { - fpgaActuatorSetPoints.fpgaConSensTD12Control &= ~FPGA_D27_WR_ENABLE_BIT; + fpgaActuatorSetPoints.fpgaConSensD27D29Control &= ~FPGA_D27_WR_ENABLE_BIT; } /*********************************************************************//** * @brief * The setFPGAD27CondReadEnable function enables the FPGA Conductivity * Sensor D27 read transaction. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control * @param none * @warning: The address (setFPGACD12Address) register must be populated * before invoking this read enable function to initiate read transaction @@ -964,85 +965,85 @@ *************************************************************************/ void setFPGAD27CondReadEnable( void ) { - fpgaActuatorSetPoints.fpgaConSensTD12Control |= FPGA_D27_RD_ENABLE_BIT; + fpgaActuatorSetPoints.fpgaConSensD27D29Control |= FPGA_D27_RD_ENABLE_BIT; } /*********************************************************************//** * @brief * The clearFPGAD27CondReadEnable function clears the read enable of FPGA Conductivity * Sensor D27. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control * @param none * @return none *************************************************************************/ void clearFPGAD27CondReadEnable( void ) { - fpgaActuatorSetPoints.fpgaConSensTD12Control &= ~FPGA_D27_RD_ENABLE_BIT; + fpgaActuatorSetPoints.fpgaConSensD27D29Control &= ~FPGA_D27_RD_ENABLE_BIT; } /*********************************************************************//** * @brief * The setFPGD29CondReset function resets the FPGA Conductivity * Sensor D29. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control * @param none * @return none *************************************************************************/ void setFPGAD29CondReset( void ) { - fpgaActuatorSetPoints.fpgaConSensTD34Control |= FPGA_D29_RESET_BIT; + fpgaActuatorSetPoints.fpgaConSensD27D29Control |= FPGA_D29_RESET_BIT; } /*********************************************************************//** * @brief * The clearFPGAD29CondReset function clears the reset of FPGA Conductivity * Sensor D29. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control * @param none * @return none *************************************************************************/ void clearFPGAD29CondReset( void ) { - fpgaActuatorSetPoints.fpgaConSensTD34Control &= ~FPGA_D29_RESET_BIT; + fpgaActuatorSetPoints.fpgaConSensD27D29Control &= ~FPGA_D29_RESET_BIT; } /*********************************************************************//** * @brief * The setFPGAD29CondInitEnable function enables the FPGA Conductivity * Sensor D29 initialzation procedure. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control * @param none * @return none *************************************************************************/ void setFPGAD29CondInitEnable( void ) { - fpgaActuatorSetPoints.fpgaConSensTD34Control |= FPGA_D29_INIT_ENABLE_BIT; + fpgaActuatorSetPoints.fpgaConSensD27D29Control |= FPGA_D29_INIT_ENABLE_BIT; } /*********************************************************************//** * @brief * The clearFPGAD29CondInitEnable function clears the init process of FPGA Conductivity * Sensor D29. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control * @param none * @return none *************************************************************************/ void clearFPGAD29CondInitEnable( void ) { - fpgaActuatorSetPoints.fpgaConSensTD34Control &= ~FPGA_D29_INIT_ENABLE_BIT; + fpgaActuatorSetPoints.fpgaConSensD27D29Control &= ~FPGA_D29_INIT_ENABLE_BIT; } /*********************************************************************//** * @brief * The setFPGAD29CondWriteEnable function enables the FPGA Conductivity * Sensor D29 write transaction. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control * @param none * @warning: The address (setFPGACD12Address) and data (setFPGACD12Data) register * must be populated before invoking this write enable function to initiate @@ -1051,29 +1052,29 @@ *************************************************************************/ void setFPGAD29CondWriteEnable( void ) { - fpgaActuatorSetPoints.fpgaConSensTD34Control |= FPGA_D29_WR_ENABLE_BIT; + fpgaActuatorSetPoints.fpgaConSensD27D29Control |= FPGA_D29_WR_ENABLE_BIT; } /*********************************************************************//** * @brief * The clearFPGAD29CondWriteEnable function clears the write enable of FPGA Conductivity * Sensor D29. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control * @param none * @return none *************************************************************************/ void clearFPGAD29CondWriteEnable( void ) { - fpgaActuatorSetPoints.fpgaConSensTD34Control &= ~FPGA_D29_WR_ENABLE_BIT; + fpgaActuatorSetPoints.fpgaConSensD27D29Control &= ~FPGA_D29_WR_ENABLE_BIT; } /*********************************************************************//** * @brief * The setFPGAD29CondReadEnable function enables the FPGA Conductivity * Sensor D29 read transaction. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control * @param none * @warning: The address (setFPGACD12Address) register must be populated * before invoking this read enable function to initiate read transaction @@ -1082,85 +1083,85 @@ *************************************************************************/ void setFPGAD29CondReadEnable( void ) { - fpgaActuatorSetPoints.fpgaConSensTD34Control |= FPGA_D29_RD_ENABLE_BIT; + fpgaActuatorSetPoints.fpgaConSensD27D29Control |= FPGA_D29_RD_ENABLE_BIT; } /*********************************************************************//** * @brief * The clearFPGAD29CondReadEnable function clears the read enable of FPGA Conductivity * Sensor D29. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29Control * @param none * @return none *************************************************************************/ void clearFPGAD29CondReadEnable( void ) { - fpgaActuatorSetPoints.fpgaConSensTD34Control &= ~FPGA_D29_RD_ENABLE_BIT; + fpgaActuatorSetPoints.fpgaConSensD27D29Control &= ~FPGA_D29_RD_ENABLE_BIT; } /*********************************************************************//** * @brief * The setFPGAD43CondReset function resets the FPGA Conductivity * Sensor D43. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD43Control * @param none * @return none *************************************************************************/ void setFPGAD43CondReset( void ) { - fpgaActuatorSetPoints.fpgaConSensTD34Control |= FPGA_D43_RESET_BIT; + fpgaActuatorSetPoints.fpgaConSensD43Control |= FPGA_D43_RESET_BIT; } /*********************************************************************//** * @brief * The clearFPGAD43CondReset function clears the reset of FPGA Conductivity * Sensor D43. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD43Control * @param none * @return none *************************************************************************/ void clearFPGAD43CondReset( void ) { - fpgaActuatorSetPoints.fpgaConSensTD34Control &= ~FPGA_D43_RESET_BIT; + fpgaActuatorSetPoints.fpgaConSensD43Control &= ~FPGA_D43_RESET_BIT; } /*********************************************************************//** * @brief * The setFPGAD43CondInitEnable function enables the FPGA Conductivity * Sensor D43 initialzation procedure. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD43Control * @param none * @return none *************************************************************************/ void setFPGAD43CondInitEnable( void ) { - fpgaActuatorSetPoints.fpgaConSensTD34Control |= FPGA_D43_INIT_ENABLE_BIT; + fpgaActuatorSetPoints.fpgaConSensD43Control |= FPGA_D43_INIT_ENABLE_BIT; } /*********************************************************************//** * @brief * The clearFPGAD43CondInitEnable function clears the init process of FPGA Conductivity * Sensor D43. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD43Control * @param none * @return none *************************************************************************/ void clearFPGAD43CondInitEnable( void ) { - fpgaActuatorSetPoints.fpgaConSensTD34Control &= ~FPGA_D43_INIT_ENABLE_BIT; + fpgaActuatorSetPoints.fpgaConSensD43Control &= ~FPGA_D43_INIT_ENABLE_BIT; } /*********************************************************************//** * @brief * The setFPGAD43CondWriteEnable function enables the FPGA Conductivity * Sensor D43 write transaction. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD43Control * @param none * @warning: The address (setFPGACD12Address) and data (setFPGACD12Data) register * must be populated before invoking this write enable function to initiate @@ -1169,29 +1170,29 @@ *************************************************************************/ void setFPGAD43CondWriteEnable( void ) { - fpgaActuatorSetPoints.fpgaConSensTD34Control |= FPGA_D43_WR_ENABLE_BIT; + fpgaActuatorSetPoints.fpgaConSensD43Control |= FPGA_D43_WR_ENABLE_BIT; } /*********************************************************************//** * @brief * The clearFPGAD43CondWriteEnable function clears the write enable of FPGA Conductivity * Sensor D43. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD43Control * @param none * @return none *************************************************************************/ void clearFPGAD43CondWriteEnable( void ) { - fpgaActuatorSetPoints.fpgaConSensTD34Control &= ~FPGA_D43_WR_ENABLE_BIT; + fpgaActuatorSetPoints.fpgaConSensD43Control &= ~FPGA_D43_WR_ENABLE_BIT; } /*********************************************************************//** * @brief * The setFPGAD43CondReadEnable function enables the FPGA Conductivity * Sensor D43 read transaction. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD43Control * @param none * @warning: The address (setFPGACD12Address) register must be populated * before invoking this read enable function to initiate read transaction @@ -1200,85 +1201,85 @@ *************************************************************************/ void setFPGAD43CondReadEnable( void ) { - fpgaActuatorSetPoints.fpgaConSensTD34Control |= FPGA_D43_RD_ENABLE_BIT; + fpgaActuatorSetPoints.fpgaConSensD43Control |= FPGA_D43_RD_ENABLE_BIT; } /*********************************************************************//** * @brief * The clearFPGAD43CondReadEnable function clears the read enable of FPGA Conductivity * Sensor D43. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD43Control * @param none * @return none *************************************************************************/ void clearFPGAD43CondReadEnable( void ) { - fpgaActuatorSetPoints.fpgaConSensTD34Control &= ~FPGA_D43_RD_ENABLE_BIT; + fpgaActuatorSetPoints.fpgaConSensD43Control &= ~FPGA_D43_RD_ENABLE_BIT; } /*********************************************************************//** * @brief * The setFPGAD74CondReset function resets the FPGA Conductivity * Sensor D74. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD74Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control * @param none * @return none *************************************************************************/ void setFPGAD74CondReset( void ) { - fpgaActuatorSetPoints.fpgaConSensD74Control |= FPGA_D74_RESET_BIT; + fpgaActuatorSetPoints.fpgaConSensD17D74Control |= 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 + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control * @param none * @return none *************************************************************************/ void clearFPGAD74CondReset( void ) { - fpgaActuatorSetPoints.fpgaConSensD74Control &= ~FPGA_D74_RESET_BIT; + fpgaActuatorSetPoints.fpgaConSensD17D74Control &= ~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 + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control * @param none * @return none *************************************************************************/ void setFPGAD74CondInitEnable( void ) { - fpgaActuatorSetPoints.fpgaConSensD74Control |= FPGA_D74_INIT_ENABLE_BIT; + fpgaActuatorSetPoints.fpgaConSensD17D74Control |= 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 + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control * @param none * @return none *************************************************************************/ void clearFPGAD74CondInitEnable( void ) { - fpgaActuatorSetPoints.fpgaConSensD74Control &= ~FPGA_D74_INIT_ENABLE_BIT; + fpgaActuatorSetPoints.fpgaConSensD17D74Control &= ~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 + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control * @param none * @warning: The address (setFPGACD74Address) and data (setFPGACD74Data) register * must be populated before invoking this write enable function to initiate @@ -1287,29 +1288,29 @@ *************************************************************************/ void setFPGAD74CondWriteEnable( void ) { - fpgaActuatorSetPoints.fpgaConSensD74Control |= FPGA_D74_WR_ENABLE_BIT; + fpgaActuatorSetPoints.fpgaConSensD17D74Control |= 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 + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control * @param none * @return none *************************************************************************/ void clearFPGAD74CondWriteEnable( void ) { - fpgaActuatorSetPoints.fpgaConSensD74Control &= ~FPGA_D74_WR_ENABLE_BIT; + fpgaActuatorSetPoints.fpgaConSensD17D74Control &= ~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 + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control * @param none * @warning: The address (setFPGACD74Address) register must be populated * before invoking this read enable function to initiate read transaction @@ -1318,169 +1319,169 @@ *************************************************************************/ void setFPGAD74CondReadEnable( void ) { - fpgaActuatorSetPoints.fpgaConSensD74Control |= FPGA_D74_RD_ENABLE_BIT; + fpgaActuatorSetPoints.fpgaConSensD17D74Control |= 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 + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control * @param none * @return none *************************************************************************/ void clearFPGAD74CondReadEnable( void ) { - fpgaActuatorSetPoints.fpgaConSensD74Control &= ~FPGA_D74_RD_ENABLE_BIT; + fpgaActuatorSetPoints.fpgaConSensD17D74Control &= ~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 - * bit 6: Enables D27 write transaction (1), address and data needs to be set - * bit 5: Enable D27 Init procedure (1) - * bit 4: reset D27 Conduct sensor (1) + * The setFPGAD17D74Control function sets the FPGA Conductivity + * Sensor control register for D17 and D74. + * bit 7: Enables D74 read transaction (1), address needed + * bit 6: Enables D74 write transaction (1), address and data needs to be set + * bit 5: Enable D74 Init procedure (1) + * bit 4: reset D74 Conduct sensor (1) * bit 3: Enables D17 read transaction (1), address needed * bit 2: Enables D17 write transaction (1), address and data needs to be set * bit 1: Enable D17 Init procedure (1) * bit 0: reset D17 Conduct sensor (1) * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12Control + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74Control * @param control Conductivity Sensor control set * @return none *************************************************************************/ -void setFPGACD12Control( U08 control ) +void setFPGAD17D74Control( U08 control ) { - fpgaActuatorSetPoints.fpgaConSensTD12Control = control; + fpgaActuatorSetPoints.fpgaConSensD17D74Control = control; } /*********************************************************************//** * @brief * The setFpgaCD34Control function sets the FPGA Conductivity - * Sensor control register for CD3&4. - * bit 7: Enables D43 read transaction (1), address needed - * bit 6: Enables D43 write transaction (1), address and data needs to be set - * bit 5: Enable D43 Init procedure (1) - * bit 4: reset D43 Conduct sensor (1) - * bit 3: Enables D29 read transaction (1), address needed - * bit 2: Enables D29 write transaction (1), address and data needs to be set - * bit 1: Enable D29 Init procedure (1) - * bit 0: reset D29 Conduct sensor (1) + * Sensor control register for D27 and D29. + * bit 7: Enables D29 read transaction (1), address needed + * bit 6: Enables D29 write transaction (1), address and data needs to be set + * bit 5: Enable D29 Init procedure (1) + * bit 4: reset D29 Conduct sensor (1) + * bit 3: Enables D27 read transaction (1), address needed + * bit 2: Enables D27 write transaction (1), address and data needs to be set + * bit 1: Enable D27 Init procedure (1) + * bit 0: reset D27 Conduct sensor (1) * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34Control * @param control Conductivity sensor control set * @return none *************************************************************************/ -void setFPGACD34Control( U08 control ) +void setFPGAD27D29Control( U08 control ) { - fpgaActuatorSetPoints.fpgaConSensTD34Control = control; + fpgaActuatorSetPoints.fpgaConSensD27D29Control = control; } /*********************************************************************//** * @brief * The setFpgaCD5Control function sets the FPGA Conductivity - * Sensor control register for CD5. + * Sensor control register for D43. * 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) + * bit 3: Enables D43 read transaction (1), address needed + * bit 2: Enables D43 write transaction (1), address and data needs to be set + * bit 1: Enable D43 Init procedure (1) + * bit 0: reset D43 Conduct sensor (1) * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD74Control * @param control Conductivity sensor control set * @return none *************************************************************************/ -void setFPGACD5Control( U08 control ) +void setFPGAD43Control( U08 control ) { - fpgaActuatorSetPoints.fpgaConSensD74Control = control; + fpgaActuatorSetPoints.fpgaConSensD43Control = control; } /*********************************************************************//** * @brief - * The setFPGACD12Address function sets the conductivity sensor + * The setFPGAD17D74Address function sets the conductivity sensor * CD12 address register to perform read and write operations. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12_Addrs - * @param address The conductivity sensor CD12 address + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74_Addrs + * @param address The conductivity sensor D17 and D74 address * @return none *************************************************************************/ -void setFPGACD12Address( U16 address ) +void setFPGAD17D74Address( U16 address ) { - fpgaActuatorSetPoints.fpgaConSensTD12_Addrs = address; + fpgaActuatorSetPoints.fpgaConSensD17D74_Addrs = address; } /*********************************************************************//** * @brief - * The setFPGACD34Address function sets the conductivity sensor + * The setFPGAD27D29Address function sets the conductivity sensor * CD34 address register to perform read and write operations. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34_Addrs + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29_Addrs * @param address The conductivity sensor CD34 address * @return none *************************************************************************/ -void setFPGACD34Address( U16 address ) +void setFPGAD27D29Address( U16 address ) { - fpgaActuatorSetPoints.fpgaConSensTD34_Addrs = address; + fpgaActuatorSetPoints.fpgaConSensD27D29_Addrs = address; } /*********************************************************************//** * @brief - * The setFPGACD5Address function sets the conductivity sensor + * The setFPGAD43Address 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 + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD43_Addrs + * @param address The conductivity sensor D43 address * @return none *************************************************************************/ -void setFPGACD5Address( U16 address ) +void setFPGAD43Address( U16 address ) { - fpgaActuatorSetPoints.fpgaConSensD74_Addrs = address; + fpgaActuatorSetPoints.fpgaConSensD43_Addrs = address; } /*********************************************************************//** * @brief - * The setFPGACD12Data function sets the conductivity sensor + * The setFPGAD17D74Data function sets the conductivity sensor * CD12 data outputfor write operations. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD12_Data_In - * @param data The conductivity sensor CD12 Data + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD17D74_Data_In + * @param data The conductivity sensor D17 and D74 Data * @return none *************************************************************************/ -void setFPGACD12Data( U32 data ) +void setFPGAD17D74Data( U32 data ) { - fpgaActuatorSetPoints.fpgaConSensTD12_Data_In = data; + fpgaActuatorSetPoints.fpgaConSensD17D74_Data_In = data; } /*********************************************************************//** * @brief - * The setFPGACD34Data function sets the conductivity sensor + * The setFPGAD27D29Data function sets the conductivity sensor * CD34 data outputfor write operations. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensTD34_Data_In - * @param data The conductivity sensor CD34 Data + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD27D29_Data_In + * @param data The conductivity sensor D27 and D29 Data * @return none *************************************************************************/ -void setFPGACD34Data( U32 data ) +void setFPGAD27D29Data( U32 data ) { - fpgaActuatorSetPoints.fpgaConSensTD34_Data_In = data; + fpgaActuatorSetPoints.fpgaConSensD27D29_Data_In = data; } /*********************************************************************//** * @brief - * The setFPGACD5Data function sets the conductivity sensor - * CD5 data outputfor write operations. + * The setFPGAD43Data function sets the conductivity sensor + * D43 data output for write operations. * @details \b Inputs: none - * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD74_Data_In - * @param data The conductivity sensor CD74 Data + * @details \b Outputs: fpgaActuatorSetPoints.fpgaConSensD43_Data_In + * @param data The conductivity sensor D43 Data * @return none *************************************************************************/ -void setFPGACD5Data( U32 data ) +void setFPGAD43Data( U32 data ) { - fpgaActuatorSetPoints.fpgaConSensD74_Data_In = data; + fpgaActuatorSetPoints.fpgaConSensD43_Data_In = data; } /*********************************************************************//** @@ -2562,15 +2563,15 @@ /*********************************************************************//** * @brief - * The getFPGAX6Temp function gets the outlet heat exchanger + * The getFPGAD78Temp function gets the outlet heat exchanger * temperature. * @details \b Inputs: fpgaSensorReadings * @details \b Outputs: none * @return outlet heat exchanger temperature *************************************************************************/ -U32 getFPGAX6Temp( void ) +U32 getFPGAD78Temp( void ) { - return fpgaSensorReadings.fpgaX6Temp; + return fpgaSensorReadings.fpgaD78Temp; } /*********************************************************************//** @@ -2815,20 +2816,21 @@ * The setFPGAIOFPValveStates function sets the RO valve states with an 8-bit * mask of states - one bit per valve, with a 1 meaning "energized" and a 0 * meaning "de-energized". The bit positions for these bit states are as follows: - * 0 - VWi.\n - * 1 - VFb.\n - * 2 - VFf.\n - * 3 - VPi.\n - * 4 - VCr.\n - * 5 - VCb.\n - * 6 - VCd.\n - * 7 - VROd.\n + * 0 - M4.\n + * 1 - P11.\n + * 2 - P33.\n + * 3 - P34.\n + * 4 - P37.\n + * 5 - P39.\n + * 6 - P43.\n + * 7 - P6.\n + * 15:8 - Not used. \n * @details \b Inputs: none * @details \b Outputs: fpgaActuatorSetPoints.valveControl * @param valveStates bit mask for requested valve states * @return none *************************************************************************/ -void setFPGAIOFPValveStates( U08 valveStates ) +void setFPGAIOFPValveStates( U16 valveStates ) { fpgaActuatorSetPoints.valveControl = valveStates; } Index: firmware/App/Services/FpgaDD.h =================================================================== diff -u -r6f961c6e113a4076ba9d5f97e078a398a8976d7c -r325e67dab10f6666702bf0f1256015b31e58de4f --- firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c) +++ firmware/App/Services/FpgaDD.h (.../FpgaDD.h) (revision 325e67dab10f6666702bf0f1256015b31e58de4f) @@ -51,15 +51,15 @@ U08 getFPGAValveSpStates( void ); // 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 setFPGAD17D74Control( U08 control ); +void setFPGAD27D29Control( U08 control ); +void setFPGAD43Control( U08 control ); +void setFPGAD17D74Address( U16 address ); +void setFPGAD27D29Address( U16 address ); +void setFPGAD43Address( U16 address ); +void setFPGAD17D74Data( U32 data ); +void setFPGAD27D29Data( U32 data ); +void setFPGAD43Data( U32 data ); void setFPGAD17CondReset( void ); void clearFPGAD17CondReset( void ); @@ -208,7 +208,7 @@ //Temperature sensors U32 getFPGAD1Temp( void ); -U32 getFPGAX6Temp( void ); +U32 getFPGAD78Temp( void ); U32 getFPGAD4Temp( void ); U32 getFPGAD50Temp( void ); U08 getFPGARTDReadCount( void ); @@ -233,7 +233,7 @@ //*************** IOFP ******************* -void setFPGAIOFPValveStates( U08 valveStates ); +void setFPGAIOFPValveStates( U16 valveStates ); U08 getFPGAIOFPValveStates( void ); void setFPGAP12PumpEnable( BOOL enable );