Index: firmware/App/Controllers/BoostPump.c =================================================================== diff -u -r863f8f88c73ee5dd285242f6e131a14862b4f5c4 -r051cd0430ef8342bd606115c98871e26dc24acf1 --- firmware/App/Controllers/BoostPump.c (.../BoostPump.c) (revision 863f8f88c73ee5dd285242f6e131a14862b4f5c4) +++ firmware/App/Controllers/BoostPump.c (.../BoostPump.c) (revision 051cd0430ef8342bd606115c98871e26dc24acf1) @@ -58,8 +58,6 @@ #define BOOST_FLOW_TO_PWM(flow) ( BOOST_FLOW_TO_PWM_SLOPE * flow + BOOST_FLOW_TO_PWM_INTERCEPT ) ///< PWM line equation for flow. #define BOOST_PRESSURE_TO_PWM(pres) ( BOOST_PRESSURE_TO_PWM_SLOPE * pres + BOOST_PRESSURE_TO_PWM_INTERCEPT ) ///< PWM line equation for pressure. - - /// Enumeration of Boost pump states. typedef enum BoostPump_States { Index: firmware/App/Drivers/FluidPump.c =================================================================== diff -u -rd5574e12aa9638c933d11b9bee8d5cf024864440 -r051cd0430ef8342bd606115c98871e26dc24acf1 --- firmware/App/Drivers/FluidPump.c (.../FluidPump.c) (revision d5574e12aa9638c933d11b9bee8d5cf024864440) +++ firmware/App/Drivers/FluidPump.c (.../FluidPump.c) (revision 051cd0430ef8342bd606115c98871e26dc24acf1) @@ -30,21 +30,21 @@ // ********** private definitions ********** -#define FLUID_PUMP_COUNTS_2_RPM_NUMERATOR 1500000.0F ///< Numerator in counts to RPM conversion. -#define FLUID_PUMP_COUNTS_FOR_STOPPED_PUMP 0xFFFF ///< FPGA will report FFFF counts when pump is stopped. +#define FLUID_PUMP_COUNTS_2_RPM_NUMERATOR 1500000.0F ///< Numerator in counts to RPM conversion. +#define FLUID_PUMP_COUNTS_FOR_STOPPED_PUMP 0xFFFF ///< FPGA will report FFFF counts when pump is stopped. /// Payload record structure for fluid pump set PWM request typedef struct { - U32 pumpID; ///< Pump ID - U32 pwm; ///< Pump PWM magnitude (0..500). + U32 pumpID; ///< Pump ID + U32 pwm; ///< Pump PWM magnitude (0..500). } FLUID_PUMP_CMD_PAYLOAD_T; // ********** private data ********** -static U16 fluidPumpCmdDutyCycle[ NUM_OF_PUMPS ]; ///< Commanded duty cycles for fluid pumps. -static OVERRIDE_U32_T fluidPumpReadDutyCycle[ NUM_OF_PUMPS ]; ///< Fluid pump duty cycles read back from FPGA. -static OVERRIDE_F32_T fluidPumpMeasRPM[ NUM_OF_PUMPS ]; ///< Fluid pump measured speeds (RPM). +static U16 fluidPumpCmdDutyCycle[ NUM_OF_PUMPS ]; ///< Commanded duty cycles for fluid pumps. +static OVERRIDE_U32_T fluidPumpReadDutyCycle[ NUM_OF_PUMPS ]; ///< Fluid pump duty cycles read back from FPGA. +static OVERRIDE_F32_T fluidPumpMeasRPM[ NUM_OF_PUMPS ]; ///< Fluid pump measured speeds (RPM). // ********** private function prototypes ********** @@ -89,6 +89,7 @@ void readFluidPumps( void ) { U32 tach; + U32 pump; for ( pump = 0; pump < NUM_OF_PUMPS; pump++ ) { Index: firmware/App/Drivers/PressureSensor.c =================================================================== diff -u -r867bbcd8241071f4c3a994726bbf6c4a6fc6df0d -r051cd0430ef8342bd606115c98871e26dc24acf1 --- firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision 867bbcd8241071f4c3a994726bbf6c4a6fc6df0d) +++ firmware/App/Drivers/PressureSensor.c (.../PressureSensor.c) (revision 051cd0430ef8342bd606115c98871e26dc24acf1) @@ -42,7 +42,6 @@ static OVERRIDE_F32_T currentPressureReadings[ NUM_OF_PRESSURE_SENSORS ]; ///< Current pressure sensor pressure readings (overrideable). static OVERRIDE_F32_T currentPresTempReadings[ NUM_OF_PRESSURE_SENSORS ]; ///< Current pressure sensor temperature readings (overrideable). static OVERRIDE_U32_T lastPressureReadCounter[ NUM_OF_PRESSURE_SENSORS ]; ///< Last pressure sensor read count (Overrideable). -static OVERRIDE_U32_T lastPressureErrorCounter[ NUM_OF_PRESSURE_SENSORS ]; ///< Last pressure sensor error count (Overrideable). // ********** private function prototypes ********** @@ -77,10 +76,6 @@ lastPressureReadCounter[ sensor ].ovInitData = 0; lastPressureReadCounter[ sensor ].override = OVERRIDE_RESET; - lastPressureErrorCounter[ sensor ].data = 0; - lastPressureErrorCounter[ sensor ].ovData = 0; - lastPressureErrorCounter[ sensor ].ovInitData = 0; - lastPressureErrorCounter[ sensor ].override = OVERRIDE_RESET; } // Initialize the FPGA persistent alarms @@ -97,7 +92,7 @@ * sensor readings for all pressure sensors. * @details \b Inputs: FPGA * @details \b Outputs: currentPressureReadings[],currentPresTempReadings[], - * lastPressureReadCounter[],lastPressureErrorCounter[]. + * lastPressureReadCounter[]. * @return none *************************************************************************/ void readPressureSensors( void ) @@ -250,37 +245,7 @@ return result; } -/*********************************************************************//** - * @brief - * The getPressureSensorErrorCount function gets the current pressure sensor - * error count for a given pressure sensor. - * @details \b Alarm: ALARM_ID_RO_SOFTWARE_FAULT if given sensor is invalid. - * @details \b Inputs: lastPressureErrorCounter - * @details \b Outputs: none - * @param sensor ID of pressure sensor to get error count for. - * @return The current pressure sensor error count of a given pressure sensor. - *************************************************************************/ -U32 getPressureSensorErrorCount( PRESSURE_SENSORS_T sensor ) -{ - U32 result = 0; - if ( sensor < NUM_OF_PRESSURE_SENSORS ) - { - result = lastPressureErrorCounter[ sensor ].data; - if ( OVERRIDE_KEY == lastPressureErrorCounter[ sensor ].override ) - { - result = lastPressureErrorCounter[ sensor ].ovData; - } - } - else - { - SET_ALARM_WITH_2_U32_DATA( ALARM_ID_FP_SOFTWARE_FAULT, SW_FAULT_ID_PRESSURE_SENSOR_INVALID_SENSOR4, sensor ) - } - - return result; -} - - /************************************************************************* * TEST SUPPORT FUNCTIONS *************************************************************************/ @@ -337,21 +302,4 @@ return result; } -/*********************************************************************//** - * @brief - * The testPressureSensorErrorCounterOverride function overrides the value - * of the specified pressure sensor error counter with a given value. - * @details \b Inputs: none - * @details \b Outputs: lastPressureErrorCounter[] - * @param message Override message from Dialin which includes an sensor - * ID and override value of the pressure sensor error counter. - * @return TRUE if override successful, FALSE if not - *************************************************************************/ -BOOL testPressureSensorErrorCounterOverride( MESSAGE_T *message ) -{ - BOOL result = u32ArrayOverride( message, &lastPressureErrorCounter[0], NUM_OF_PRESSURE_SENSORS - 1, 0, PRES_SENSORS_READ_ERR_MAX_CNT ); - - return result; -} - /**@}*/ Index: firmware/App/Drivers/PressureSensor.h =================================================================== diff -u -r99498a5bab0a1f4c706376feceadc66df6d1c22e -r051cd0430ef8342bd606115c98871e26dc24acf1 --- firmware/App/Drivers/PressureSensor.h (.../PressureSensor.h) (revision 99498a5bab0a1f4c706376feceadc66df6d1c22e) +++ firmware/App/Drivers/PressureSensor.h (.../PressureSensor.h) (revision 051cd0430ef8342bd606115c98871e26dc24acf1) @@ -56,12 +56,10 @@ F32 getPressure( PRESSURE_SENSORS_T sensor ); F32 getPressureSensorTemperature( PRESSURE_SENSORS_T sensor ); U32 getPressureSensorReadCount( PRESSURE_SENSORS_T sensor ); -U32 getPressureSensorErrorCount( PRESSURE_SENSORS_T sensor ); BOOL testPressureSensorReadingsOverride( MESSAGE_T *message ); BOOL testPressureSensorTemperatureReadingsOverride( MESSAGE_T *message ); BOOL testPressureSensorReadCounterOverride( MESSAGE_T *message ); -BOOL testPressureSensorErrorCounterOverride( MESSAGE_T *message ); /**@}*/ Index: firmware/App/Drivers/TemperatureSensor.h =================================================================== diff -u -rd5574e12aa9638c933d11b9bee8d5cf024864440 -r051cd0430ef8342bd606115c98871e26dc24acf1 --- firmware/App/Drivers/TemperatureSensor.h (.../TemperatureSensor.h) (revision d5574e12aa9638c933d11b9bee8d5cf024864440) +++ firmware/App/Drivers/TemperatureSensor.h (.../TemperatureSensor.h) (revision 051cd0430ef8342bd606115c98871e26dc24acf1) @@ -5,7 +5,7 @@ * THIS CODE MAY NOT BE COPIED OR REPRODUCED IN ANY FORM, IN PART OR IN * WHOLE, WITHOUT THE EXPLICIT PERMISSION OF THE COPYRIGHT OWNER. * -* @file TemperatureSensors.h +* @file TemperatureSensor.h * * @author (last) Sean Nash * @date (last) 09-Nov-2024 @@ -15,8 +15,8 @@ * ***************************************************************************/ -#ifndef __TEMPERATURE_SENSORS_H__ -#define __TEMPERATURE_SENSORS_H__ +#ifndef __TEMPERATURE_SENSOR_H__ +#define __TEMPERATURE_SENSOR_H__ #include "FPCommon.h" //#include "NVDataMgmt.h" Index: firmware/App/Modes/ModeWaterPreGen.c =================================================================== diff -u -rd5574e12aa9638c933d11b9bee8d5cf024864440 -r051cd0430ef8342bd606115c98871e26dc24acf1 --- firmware/App/Modes/ModeWaterPreGen.c (.../ModeWaterPreGen.c) (revision d5574e12aa9638c933d11b9bee8d5cf024864440) +++ firmware/App/Modes/ModeWaterPreGen.c (.../ModeWaterPreGen.c) (revision 051cd0430ef8342bd606115c98871e26dc24acf1) @@ -139,6 +139,7 @@ break; } } + /*********************************************************************//** * @brief * The handlePreGenWStartState handles the initial state of pre gen water. Index: firmware/App/Services/FpgaRO.h =================================================================== diff -u -r17a448770daa138ebeb6ce79974966e650828f25 -r051cd0430ef8342bd606115c98871e26dc24acf1 --- firmware/App/Services/FpgaRO.h (.../FpgaRO.h) (revision 17a448770daa138ebeb6ce79974966e650828f25) +++ firmware/App/Services/FpgaRO.h (.../FpgaRO.h) (revision 051cd0430ef8342bd606115c98871e26dc24acf1) @@ -55,52 +55,42 @@ S16 getFPGAM1RawPressure( void ); S16 getFPGAM1RawTemperature( void ); U08 getFPGAM1ReadCount( void ); -U08 getFPGAM1ErrorCount( void ); S16 getFPGAM3RawPressure( void ); S16 getFPGAM3RawTemperature( void ); U08 getFPGAM3ReadCount( void ); -U08 getFPGAM3ErrorCount( void ); S16 getFPGAP8RawPressure( void ); S16 getFPGAP8RawTemperature( void ); U08 getFPGAP8ReadCount( void ); -U08 getFPGAP8ErrorCount( void ); S16 getFPGAP13RawPressure( void ); S16 getFPGAP13RawTemperature( void ); U08 getFPGAP13ReadCount( void ); -U08 getFPGAP13ErrorCount( void ); S16 getFPGAP17RawPressure( void ); S16 getFPGAP17RawTemperature( void ); U08 getFPGAP17ReadCount( void ); -U08 getFPGAP17ErrorCount( void ); S16 getFPGAX1RawPressure( void ); S16 getFPGAX1RawTemperature( void ); U08 getFPGAX1ReadCount( void ); -U08 getFPGAX1ErrorCount( void ); S16 getFPGAX2RawPressure( void ); S16 getFPGAX2RawTemperature( void ); U08 getFPGAX2ReadCount( void ); -U08 getFPGAX2ErrorCount( void ); S16 getFPGAX3RawPressure( void ); S16 getFPGAX3RawTemperature( void ); U08 getFPGAX3ReadCount( void ); -U08 getFPGAX3ErrorCount( void ); S16 getFPGAX4RawPressure( void ); S16 getFPGAX4RawTemperature( void ); U08 getFPGAX4ReadCount( void ); -U08 getFPGAX4ErrorCount( void ); S16 getFPGAX5RawPressure( void ); S16 getFPGAX5RawTemperature( void ); U08 getFPGAX5ReadCount( void ); -U08 getFPGAX5ErrorCount( void ); U32 getFPGAP23Temperature( void ); U32 getFPGAP22Temperature( void ); Index: firmware/App/Services/Messaging.c =================================================================== diff -u -rd36643be8a309f2ee587b5975663e7519b3addf9 -r051cd0430ef8342bd606115c98871e26dc24acf1 --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision d36643be8a309f2ee587b5975663e7519b3addf9) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision 051cd0430ef8342bd606115c98871e26dc24acf1) @@ -78,7 +78,6 @@ { MSG_ID_FP_PRESSURE_OVERRIDE_REQUEST, &testPressureSensorReadingsOverride }, { MSG_ID_FP_PRESSURE_TEMP_OVERRIDE_REQUEST, &testPressureSensorTemperatureReadingsOverride }, { MSG_ID_FP_PRESSURE_READ_COUNT_OVERRIDE_REQUEST, &testPressureSensorReadCounterOverride }, -{ MSG_ID_FP_PRESSURE_ERROR_COUNT_OVERRIDE_REQUEST, &testPressureSensorErrorCounterOverride }, { MSG_ID_FP_PRESSURE_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testPressureSensorDataPublishIntervalOverride }, { MSG_ID_FP_DEBUG_EVENT, &handleUnhandledMsg }, { MSG_ID_FP_LEVEL_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testLevelsDataPublishIntervalOverride },