Index: firmware/App/Services/FpgaTD.c =================================================================== diff -u -r52761961d73cdc8f5f9c0c83ef420bcd43a27551 -r16d6398acc1c6cf604d9dc993b27c94d895132e9 --- firmware/App/Services/FpgaTD.c (.../FpgaTD.c) (revision 52761961d73cdc8f5f9c0c83ef420bcd43a27551) +++ firmware/App/Services/FpgaTD.c (.../FpgaTD.c) (revision 16d6398acc1c6cf604d9dc993b27c94d895132e9) @@ -104,7 +104,7 @@ U08 errorCountPC; ///< Reg 259. Error count for TBD. U08 h10DACRdStatus; ///< Reg 260. H10 Syringe pump DAC read status. U08 h6HallStatus; ///< Reg 261. H6 hall sensor status. - U16 h10DACSet; ///< Reg 262. H10 Syringe pump DAC setting. + U16 h10DACSetting; ///< Reg 262. H10 Syringe pump DAC setting. U16 h10DACEEProm; ///< Reg 264. H10 Syringe pump DAC EEProm data. U16 h14Pressure; ///< Reg 266. H14 raw pressure data. S16 h14Temperature; ///< Reg 268. H14 raw temperature data. @@ -189,10 +189,10 @@ U08 h1Control; ///< Reg 30. H1 control register. U08 h1h19ValveEncoderControl; ///< Reg 31. H1/H19 valve encoder control register. U08 alarmControl; ///< Reg 32. Alarm audio control register. - U08 h10Control; ///< Reg 33. H10 Syringe pump control register. - U32 h10Speed; ///< Reg 34. H10 Syringe pump time between step toggle (1/2 step period). - U16 h10DACData; ///< Reg 38. H10 Syringe pump DAC data (12 bits). - U16 h10DACControl; ///< Reg 40. H10 Syringe pump ADC and DAC control register. + U08 h10Control; ///< Reg 33. H10 Syringe pump control register. + U32 h10Speed; ///< Reg 34. H10 Syringe pump time between step toggle (1/2 step period). + U16 h10DACData; ///< Reg 38. H10 Syringe pump DAC data (12 bits). + U16 h10DACControl; ///< Reg 40. H10 Syringe pump ADC and DAC control register. U16 h12Period; ///< Reg 42. H12 Air pump time period for each count in PWM register. U32 h5SetSpeed; ///< Reg 44. H5 ejector motor set speed. } FPGA_ACTUATORS_T; @@ -1547,7 +1547,7 @@ *************************************************************************/ U16 getFPGASyringePumpDACSetting( void ) { - return fpgaSensorReadings.h10DACSet; + return fpgaSensorReadings.h10DACSetting; } /*********************************************************************//**