Index: firmware/App/Controllers/BalancingChamber.c =================================================================== diff -u -r8e51a0b2c665b26f2a48430c10717762c427e583 -rd8bed1d90475d31ed0f787017f392e7c1e498620 --- firmware/App/Controllers/BalancingChamber.c (.../BalancingChamber.c) (revision 8e51a0b2c665b26f2a48430c10717762c427e583) +++ firmware/App/Controllers/BalancingChamber.c (.../BalancingChamber.c) (revision d8bed1d90475d31ed0f787017f392e7c1e498620) @@ -7,8 +7,8 @@ * * @file BalancingChamber.c * -* @author (last) Varshini Nagabooshanam -* @date (last) 26-Jan-2026 +* @author (last) Vinayakam Mani +* @date (last) 03-Sep-2025 * * @author (original) Vinayakam Mani * @date (original) 28-Jan-2025 Index: firmware/App/Controllers/Valves.c =================================================================== diff -u -r7e2325379e4c4f7f891776646fbbcd4aa9c6eaca -rd8bed1d90475d31ed0f787017f392e7c1e498620 --- firmware/App/Controllers/Valves.c (.../Valves.c) (revision 7e2325379e4c4f7f891776646fbbcd4aa9c6eaca) +++ firmware/App/Controllers/Valves.c (.../Valves.c) (revision d8bed1d90475d31ed0f787017f392e7c1e498620) @@ -35,7 +35,7 @@ #define ENERGIZED 1 ///< 1 for energized valve. #define ALL_VALVES_DEENERGIZED 0x0000 ///< 0 in U16 bit field for all valves. -#define VALVE_PWM_PERIOD 50 ///< Valve PWM Period in 0.1 us res ( 20kHz ) +#define VALVE_PWM_PERIOD 500 ///< Valve PWM Period in 0.1 us res ( 20kHz ) #define VALVE_PWM_LOW ( VALVE_PWM_PERIOD * 0.2 ) ///< Valve low PWM percentage #define VALVE_PWM_PULL_IN 100 ///< Valve 'strike' period at 100% PWM in ms @@ -126,7 +126,7 @@ // TODO set FPGA PWM after finalizing the decision on valve strike and hold behavior // initially set valve PWM configuration and enable -// setFPGAPWMConfigurations(); + //setFPGAPWMConfigurations(); // initially set all valves to de-energized state via FPGA setFPGADDValveStates( commandedValvesStates ); @@ -175,7 +175,7 @@ valveSPBits |= 0x01 << ( i - FIRST_SP_VALVE ); } - for ( i = FIRST_IO_VALVE; i <= LAST_IO_VALVE; i++ ) + for ( i = M12_VALV; i <= LAST_IO_VALVE; i++ ) { valveIOBits |= 0x01 << ( i - FIRST_IO_VALVE ); } @@ -525,25 +525,6 @@ /*********************************************************************//** * @brief - * The setHydValvesStatetoClosedState function sets all Hydraulics / DD - * valves to close state except balancing chamber, UF and Inlet water control. - * @details \b Inputs: none - * @details \b Outputs: valve states - * @return none. - *************************************************************************/ -void setHydValvesStatetoClosedState( void ) -{ - DD_VALVES_T valve; - - // Set all Hydraulics valves to closed state - for ( valve = FIRST_HYD_VALVE; valve <= LAST_HYD_VALVE; valve++ ) - { - setValveState( valve, VALVE_STATE_CLOSED ); - } -} - -/*********************************************************************//** - * @brief * The setRecoveryValvesConfig function sets all recovery valves per * recovery configuration from institutional record. * @details \b Inputs: none Index: firmware/App/DDCommon.h =================================================================== diff -u -r7e2325379e4c4f7f891776646fbbcd4aa9c6eaca -rd8bed1d90475d31ed0f787017f392e7c1e498620 --- firmware/App/DDCommon.h (.../DDCommon.h) (revision 7e2325379e4c4f7f891776646fbbcd4aa9c6eaca) +++ firmware/App/DDCommon.h (.../DDCommon.h) (revision d8bed1d90475d31ed0f787017f392e7c1e498620) @@ -25,7 +25,7 @@ #define DD_VERSION_MAJOR 0 #define DD_VERSION_MINOR 0 #define DD_VERSION_MICRO 0 -#define DD_VERSION_BUILD 42 +#define DD_VERSION_BUILD 51 // ********** development build switches ********** @@ -51,6 +51,9 @@ //Uncomment below for Maxon controller speed change #define __MAXON_SPEED_UPDATE__ 1 +//UnComment below for DryBicarb testing +//#define __DRY_BICARB__ 1 + //Uncomment below to disable heaters debug message #define __HEATERS_DEBUG__ 1 Index: firmware/App/Services/Messaging.c =================================================================== diff -u -r89c8709e3b27648926fbb20f25c9a67cbeb99adc -rd8bed1d90475d31ed0f787017f392e7c1e498620 --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision 89c8709e3b27648926fbb20f25c9a67cbeb99adc) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision d8bed1d90475d31ed0f787017f392e7c1e498620) @@ -250,6 +250,12 @@ { MSG_ID_DD_RINSE_PUMP_PWM_PERCENT_OVERRIDE_REQUEST, &testRinsePumpPWMPercentOverride }, { MSG_ID_DD_RINSE_PUMP_TURN_ON_OFF_REQUEST, &testRinsePumpTurnOnOffRequest }, { MSG_ID_FP_SET_START_STOP_OVERRIDE_REQUEST, &testSetGeneratePermeateSignal }, + { MSG_ID_DD_DRY_BICART_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testDryBiCartDataPublishIntervalOverride }, + { MSG_ID_DD_DRY_BICART_FILL_CYCLE_MAX_OVERRIDE_REQUEST, &testDryBiCartFillCycleMaxCountOverride }, + { MSG_ID_DD_DRY_BICART_FILL_REQUEST_OVERRIDE_REQUEST, &testDryBiCartFillRequestOverride }, + { MSG_ID_DD_BICARB_CHAMBER_FILL_REQUEST_OVERRIDE_REQUEST, &testBiCarbChamberFillRequestOverride }, + { MSG_ID_DD_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST, &testDryBiCartDrainRequestOverride }, + { MSG_ID_DD_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST, &testDryBiCartTypeOverride }, { MSG_ID_FP_RO_REJECTION_RATIO_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testRORejectionRatioDataPublishIntervalOverride }, { MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST, &testRORejectionRatioFilteredOverride }, { MSG_ID_FP_SET_TEST_CONFIGURATION, &testSetTestConfiguration }, @@ -268,12 +274,7 @@ { MSG_ID_FP_DEF_PRE_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testPreGenPermeateDefDataPublishIntervalOverride}, { MSG_ID_FP_DEF_GEN_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testGenPermeateDefDataPublishIntervalOverride}, { MSG_ID_FP_DEF_STATUS_REQUEST, &testGetFPDefeaturedStatus }, - { MSG_ID_DD_DRY_BICART_DATA_PUBLISH_INTERVAL_OVERRIDE_REQUEST, &testDryBiCartDataPublishIntervalOverride }, - { MSG_ID_DD_DRY_BICART_FILL_CYCLE_MAX_OVERRIDE_REQUEST, &testDryBiCartFillCycleMaxCountOverride }, - { MSG_ID_DD_DRY_BICART_FILL_REQUEST_OVERRIDE_REQUEST, &testDryBiCartFillRequestOverride }, { MSG_ID_FP_RO_FILTERED_REJECTION_RATIO_OVERRIDE_REQUEST, &testRORejectionRatioFilteredOverride }, - { MSG_ID_DD_BICART_DRAIN_REQUEST_OVERRIDE_REQUEST, &testDryBiCartDrainRequestOverride }, - { MSG_ID_DD_BICART_CARTRIDGE_SELECT_OVERRIDE_REQUEST, &testDryBiCartTypeOverride }, #ifdef __TEENSY_CONDUCTIVITY_DRIVER__ { MSG_ID_DD_SET_CONDUCTIVITY_MODEL_REQUEST, &testSetTeenyConductivityModel }, #endif