Index: firmware/App/Services/FpgaDD.c =================================================================== diff -u -rf66ffb2807dae4ad719d41520bc8c3739210bfd0 -rbe3fa274cd01b6dec1f98fa7266739b55648d582 --- firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision f66ffb2807dae4ad719d41520bc8c3739210bfd0) +++ firmware/App/Services/FpgaDD.c (.../FpgaDD.c) (revision be3fa274cd01b6dec1f98fa7266739b55648d582) @@ -144,7 +144,7 @@ U08 fpgaRevLab; ///< Reg 3. FPGA revision (lab) being reported } FPGA_HEADER_T; // read only on FPGA -#if 1 // Remove when Beta 1.9 is obsolete +#if 1 // TODO: Remove when Beta 1.9 is obsolete /// FPGA sensor readings struct. typedef struct { @@ -450,7 +450,7 @@ U08 fpgaP18CalMemCounter; ///< Reg 820. TBD } DD_FPGA_SENSORS_T; -#if 1 // Remove when Beta 1.9 is obsolete +#if 1 // TODO: Remove when Beta 1.9 is obsolete typedef struct { U16 fpgaValveControl; ///< Reg 04. Valve control register @@ -658,7 +658,7 @@ fpgaActuatorSetPoints.fpgaDDSpareValvePWMControl = FPGA_ENABLE_UF_VALVES_PWM; fpgaActuatorSetPoints.fpgaADCControl = FPGA_ADC_AUTO_READ_ENABLE; -#if 1 // Remove when Beta 1.9 is obsolete +#if 1 // TODO: Remove when Beta 1.9 is obsolete // Set the valve control mode and default state of valve for Beta 1.9 HW fpgaBeta19ActuatorSetPoints.fpgaValveControl = FPGA_ENABLE_VALVES_CONTROL; fpgaBeta19ActuatorSetPoints.fpgaValvePWMEnable = FPGA_ENABLE_VALVES_PWM; @@ -776,21 +776,22 @@ * The setFPGADDValveStates function sets the DD valve states with a 16-bit * set 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 - D53Valve.\n + * 0 - D14Valve.\n * 1 - D52Valve.\n * 2 - D8Valve.\n * 3 - D54Valve.\n - * 4 - D14Valve.\n - * 5 - D65Valve.\n + * 4 - Unused.\n + * 5 - D34Valve.\n * 6 - D64Valve.\n * 7 - D31Valve.\n - * 8 - D34Valve.\n + * 8 - D65Valve.\n * 9 - D35Valve.\n * 10 - D40Valve.\n * 11 - D47Valve.\n * 12 - D3Valve.\n - * 13 - M4Valve.\n - * 14..15 - reserved or unused. + * 13 - D80Valve.\n + * 14 - D81Valve.\n + * 15 - D85Valve.\n * @details \b Inputs: none * @details \b Outputs: fpgaValveControl * @param valveStates bit mask for the various valve states @@ -829,13 +830,13 @@ * The setFPGASpareValveStates function sets the DD spare valve states with a * 8-bit set of states - one bit per valve, with a 1 meaning "energized" and a 0 * meaning "de-energized". Bit positions per HDD (2.0 valves - beta 1/1.9 to be deprecated): - * 0 - D88 valve (Spare valve 0).\n - * 1 - D83 valve (Spare valve 1).\n - * 2 - D91 valve (Spare valve 2).\n - * 3 - D104 valve (Spare valve 3).\n - * 4 - D95 valve (Spare valve 4).\n + * 0 - D88 valve.\n + * 1 - D83 valve.\n + * 2 - D91 valve.\n + * 3 - D104 valve.\n + * 4 - D95 valve.\n * 5 - Spare valve 5.\n - * 6 - D100 valve (Spare valve 6).\n + * 6 - D100 valve.\n * 7 - Spare valve 7.\n * @details \b Inputs: none * @details \b Outputs: fpgaDDSpareValveControl @@ -1071,7 +1072,7 @@ *************************************************************************/ void setFPGAD48PumpSpeed( U16 speed ) { -#ifdef __MAXON_SPEED_UPDATE__ /* Enable for B1.0/B1.9 with Diener Silencer 2000 pumps */ +#ifdef __MAXON_SPEED_UPDATE__ //TODO: Enable for Beat 1/1.9 with Diener silencer 2000 pump. { U16 currentSpeed =(U16)( ( ( speed + PUMP_SPEED_OFFSET ) / PUMP_SPEED_FULL_SCALE ) * MAX_PUMP_SPEED ); SET_FPGA_ACTUATOR_FIELD( fpgaD48PumpSpeed, currentSpeed );