Index: firmware/App/Controllers/SyringePump.c =================================================================== diff -u -rde1c5ec969a5529cbdb7e66a4168fc11b9b3e58a -r16d6398acc1c6cf604d9dc993b27c94d895132e9 --- firmware/App/Controllers/SyringePump.c (.../SyringePump.c) (revision de1c5ec969a5529cbdb7e66a4168fc11b9b3e58a) +++ firmware/App/Controllers/SyringePump.c (.../SyringePump.c) (revision 16d6398acc1c6cf604d9dc993b27c94d895132e9) @@ -199,7 +199,6 @@ static OVERRIDE_U32_T syringePumpDataPublishInterval = { SYRINGE_PUMP_DATA_PUB_INTERVAL, SYRINGE_PUMP_DATA_PUB_INTERVAL, 0, 0 }; static OVERRIDE_F32_T syringePumpMeasRate = { 0.0, 0.0, 0.0, 0 }; ///< Measured rate for syringe pump (in mL/hr). static OVERRIDE_F32_T syringePumpMeasForce = { 0.0, 0.0, 0.0, 0 }; ///< Measured driver force (in V). -static OVERRIDE_F32_T syringePumpMeasSyringeDetectionSwitch = { 0, 0, 0, 0 }; ///< Measured syringe detect switch (in V). static OVERRIDE_F32_T syringePumpMeasHome = { 0.0, 0.0, 0.0, 0 }; ///< Measured optical home (in V). static OVERRIDE_S32_T syringePumpPosition = { 0, 0, 0, 0 }; ///< Encoder based position (in steps). static OVERRIDE_F32_T syringePumpVolumeDelivered = { 0.0, 0.0, 0.0, 0 }; ///< Measured volume delivered (in mL). @@ -273,7 +272,6 @@ static S32 getSyringePumpPosition( void ); static F32 getSyringePumpMeasRate( void ); -static F32 getSyringePumpSyringeDetectorV( void ); static F32 getSyringePumpHomeDetectorV( void ); static F32 getSyringePumpForceV( void ); static F32 getHeparinBolusTargetRate( void ); @@ -1068,17 +1066,6 @@ // Get latest ADC data and convert to V syringePumpMeasHome.data = ( (F32)getFPGASyringePumpADCChannel2() * SYRINGE_PUMP_ADC_REF_V ) / SYRINGE_PUMP_ADC_FULL_SCALE_BITS; -#ifndef _RELEASE_ -// if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SYRINGE_PUMP ) != SW_CONFIG_DISABLE_VALUE ) - { - syringePumpMeasSyringeDetectionSwitch.data = 0.0; // if syringe pump disabled, always report no detection - } -// else -#endif - { - syringePumpMeasSyringeDetectionSwitch.data = ( (F32)getFPGASyringePumpADCChannel1() * SYRINGE_PUMP_ADC_REF_V ) / SYRINGE_PUMP_ADC_FULL_SCALE_BITS; - } - syringePumpMeasForce.data = ( (F32)getFPGASyringePumpADCChannel0() * SYRINGE_PUMP_ADC_REF_V ) / SYRINGE_PUMP_ADC_FULL_SCALE_BITS; // Apply home offset to encoder position @@ -1666,19 +1653,6 @@ /*********************************************************************//** * @brief - * The getSyringePumpSyringeDetectorV function gets the current syringe pump - * syringe detect signal. - * @details \b Inputs: syringePumpMeasSyringeDetectionSwitch - * @details \b Outputs: none - * @return the current syringe pump syringe detect signal (in V). - *************************************************************************/ -static F32 getSyringePumpSyringeDetectorV( void ) -{ - return getF32OverrideValue( &syringePumpMeasSyringeDetectionSwitch ); -} - -/*********************************************************************//** - * @brief * The getSyringePumpHomeDetectorV function gets the current syringe pump * home detect signal. * @details \b Inputs: syringePumpMeasHome @@ -2149,7 +2123,6 @@ data.syringePumpMeasForce = getSyringePumpForceV(); data.syringePumpMeasHome = getSyringePumpHomeDetectorV(); data.syringePumpMeasRate = getSyringePumpMeasRate(); - data.syringePumpMeasSwitch = getSyringePumpSyringeDetectorV(); data.syringePumpPosition = getSyringePumpPosition(); data.syringePumpSetRate = syringePumpSetRate; data.syringePumpState = (U32)syringePumpState; @@ -2290,22 +2263,6 @@ /*********************************************************************//** * @brief - * The testSyringePumpMeasuredSyringeDetectOverride function overrides the measured - * syringe detect analog signal of the syringe pump. - * @details \b Inputs: none - * @details \b Outputs: syringePumpMeasSyringeDetectionSwitch - * @param value override syringe pump measured syringe detection signal with this value (in V) - * @return TRUE if override successful, FALSE if not - *************************************************************************/ -BOOL testSyringePumpMeasuredSyringeDetectOverride( MESSAGE_T *message ) -{ - BOOL result = f32Override( message, &syringePumpMeasSyringeDetectionSwitch ); - - return result; -} - -/*********************************************************************//** - * @brief * The testSyringePumpMeasuredHomeOverride function overrides the measured * home analog signal of the syringe pump. * @details \b Inputs: syringePumpMeasHome Index: firmware/App/Controllers/SyringePump.h =================================================================== diff -u -rde1c5ec969a5529cbdb7e66a4168fc11b9b3e58a -r16d6398acc1c6cf604d9dc993b27c94d895132e9 --- firmware/App/Controllers/SyringePump.h (.../SyringePump.h) (revision de1c5ec969a5529cbdb7e66a4168fc11b9b3e58a) +++ firmware/App/Controllers/SyringePump.h (.../SyringePump.h) (revision 16d6398acc1c6cf604d9dc993b27c94d895132e9) @@ -73,7 +73,6 @@ S32 syringePumpPosition; ///< Syringe pump position. F32 syringePumpVolumeDelivered; ///< Syringe pump volume delivered. F32 syringePumpMeasHome; ///< Syringe pump measured home. - F32 syringePumpMeasSwitch; ///< Syringe pump measured switch. F32 syringePumpMeasForce; ///< Syringe pump measured force. F32 syringePumpSafetyVolume; ///< Syringe pump safety volume. U32 syringePumpStatus; ///< Syringe pump status. @@ -151,7 +150,6 @@ BOOL testSyringePumpDataPublishIntervalOverride( MESSAGE_T *message ); BOOL testSyringePumpMeasuredRateOverride( MESSAGE_T *message ); BOOL testSyringePumpMeasuredForceOverride( MESSAGE_T *message ); -BOOL testSyringePumpMeasuredSyringeDetectOverride( MESSAGE_T *message ); BOOL testSyringePumpMeasuredHomeOverride( MESSAGE_T *message ); BOOL testSyringePumpMeasuredPositionOverride( MESSAGE_T *message ); BOOL testSyringePumpMeasuredVolumeOverride( MESSAGE_T *message ); 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; } /*********************************************************************//** Index: firmware/App/Services/Messaging.c =================================================================== diff -u -r42b82bcd2bb2c2fa07349108e6b2bd9995173fa4 -r16d6398acc1c6cf604d9dc993b27c94d895132e9 --- firmware/App/Services/Messaging.c (.../Messaging.c) (revision 42b82bcd2bb2c2fa07349108e6b2bd9995173fa4) +++ firmware/App/Services/Messaging.c (.../Messaging.c) (revision 16d6398acc1c6cf604d9dc993b27c94d895132e9) @@ -188,7 +188,6 @@ { MSG_ID_HD_SYRINGE_PUMP_PUBLISH_INTERVAL_OVERRIDE, &testSyringePumpDataPublishIntervalOverride }, { MSG_ID_TD_SYRINGE_PUMP_RATE_OVERRIDE_REQUEST, &testSyringePumpMeasuredRateOverride }, { MSG_ID_TD_SYRINGE_PUMP_FORCE_OVERRIDE_REQUEST, &testSyringePumpMeasuredForceOverride }, - { MSG_ID_TD_SYRINGE_PUMP_SYRINGE_DETECT_OVERRIDE_REQUEST, &testSyringePumpMeasuredSyringeDetectOverride }, { MSG_ID_TD_SYRINGE_PUMP_HOME_OVERRIDE_REQUEST, &testSyringePumpMeasuredHomeOverride }, { MSG_ID_TD_SYRINGE_PUMP_POSITION_OVERRIDE_REQUEST, &testSyringePumpMeasuredPositionOverride }, { MSG_ID_TD_SYRINGE_PUMP_VOLUME_OVERRIDE_REQUEST, &testSyringePumpMeasuredVolumeOverride }, Index: firmware/source/sys_main.c =================================================================== diff -u -rf979c391268b595e44fb6747d43487e4d2294e68 -r16d6398acc1c6cf604d9dc993b27c94d895132e9 --- firmware/source/sys_main.c (.../sys_main.c) (revision f979c391268b595e44fb6747d43487e4d2294e68) +++ firmware/source/sys_main.c (.../sys_main.c) (revision 16d6398acc1c6cf604d9dc993b27c94d895132e9) @@ -77,6 +77,7 @@ #include "OperationModes.h" #include "Pressures.h" #include "Switches.h" +#include "SyringePump.h" #include "SystemCommTD.h" #include "TaskBG.h" #include "Temperatures.h" @@ -202,6 +203,7 @@ initAirTrap(); initBloodFlow(); initEjector(); + initSyringePump(); initValves(); // Initialize modes initOperationModes();