Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -rf469421f00fff93217379150c82b5c291a0afa64 -r1077fee46974061e6e0038b6c0ce0e1471715b61 --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision f469421f00fff93217379150c82b5c291a0afa64) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision 1077fee46974061e6e0038b6c0ce0e1471715b61) @@ -8,8 +8,8 @@ * * @file FpgaDD.c * -* @author (last) Raghu Kallala -* @date (last) 23-Feb-2026 +* @author (last) Jashwant Gantyada +* @date (last) 12-Mar-2026 * * @author (original) Vinayakam Mani * @date (original) 26-Aug-2024 @@ -143,6 +143,10 @@ #define PUMP_SPEED_OFFSET 168.7F ///< Speed Scale adjustment intercept factor #define PUMP_SPEED_FULL_SCALE 3187.0F ///< Speed scale adjustment slope factor +#define DIENER_1000_PUMP_SLOPE 0.000296F ///< Speed adjustment slope factor (Diener 1000 pump) +#define DIENER_1000_PUMP_INTERCEPT 0.07040F ///< Speed adjustment intercept factor (Diener 1000 pump) +#define DIENER_1000_PUMP_SPEED_FULL_SCALE 3150 ///< Maximum speed factor (Diener 1000 pump) + #pragma pack(push,1) /// FPGA header struct. typedef struct @@ -1087,16 +1091,16 @@ *************************************************************************/ void setFPGAD48PumpSpeed( U16 speed ) { -#ifdef __MAXON_SPEED_UPDATE__ //TODO: Enable for Beat 1/1.9 with Diener silencer 2000 pump. + if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DIENER_2000_PUMP )) { U16 currentSpeed =(U16)( ( ( speed + PUMP_SPEED_OFFSET ) / PUMP_SPEED_FULL_SCALE ) * MAX_PUMP_SPEED ); SET_FPGA_ACTUATOR_FIELD( fpgaD48PumpSpeed, currentSpeed ); } -#else + else { - SET_FPGA_ACTUATOR_FIELD( fpgaD48PumpSpeed, speed ); + U16 currentSpeed = (U16)( ( ( DIENER_1000_PUMP_SLOPE * speed ) + DIENER_1000_PUMP_INTERCEPT) * DIENER_1000_PUMP_SPEED_FULL_SCALE ); + SET_FPGA_ACTUATOR_FIELD( fpgaD48PumpSpeed, currentSpeed ); } -#endif } /*********************************************************************//** @@ -1110,16 +1114,8 @@ *************************************************************************/ void setFPGAD12PumpSpeed( U16 speed ) { -#ifdef __MAXON_SPEED_UPDATE__ /* Enable for B1.0/B1.9 with Diener Silencer 2000 pumps */ - { - U16 currentSpeed =(U16)( ( ( speed + PUMP_SPEED_OFFSET ) / PUMP_SPEED_FULL_SCALE ) * MAX_PUMP_SPEED ); - SET_FPGA_ACTUATOR_FIELD( fpgaD12PumpSpeed, currentSpeed ); - } -#else - { - SET_FPGA_ACTUATOR_FIELD( fpgaD12PumpSpeed, speed ); - } -#endif + U16 currentSpeed =(U16)( ( ( speed + PUMP_SPEED_OFFSET ) / PUMP_SPEED_FULL_SCALE ) * MAX_PUMP_SPEED ); + SET_FPGA_ACTUATOR_FIELD( fpgaD12PumpSpeed, currentSpeed ); } /*********************************************************************//**