Index: firmware/App/Controllers/Buttons.c
===================================================================
diff -u -ra3a01327c8fe80f65f6658ae6cbef4910a4a8033 -r9a20996b770f446b8c669cba7a49668c1fdadd67
--- firmware/App/Controllers/Buttons.c	(.../Buttons.c)	(revision a3a01327c8fe80f65f6658ae6cbef4910a4a8033)
+++ firmware/App/Controllers/Buttons.c	(.../Buttons.c)	(revision 9a20996b770f446b8c669cba7a49668c1fdadd67)
@@ -16,7 +16,8 @@
 ***************************************************************************/
 
 #include "Buttons.h"
-#include "CPLD.h"
+#include "CPLD.h"
+#include "NVDataMgmt.h"
 #include "OperationModes.h"
 #include "SystemCommMessages.h"
 #include "TaskPriority.h"
@@ -303,7 +304,8 @@
                 // if we're in a mode that allows power off, initiate power off sequence
                 if ( TRUE == isCurrentOpModeOkToTurnOff() )
                 {
-                    broadcastPowerOffWarning();
+                    broadcastPowerOffWarning();
+                    signalPowerOffWarning();
                     offButtonPressPending = TRUE;
                     offRequestPulseCount = OFF_REQUEST_PULSE_COUNT;
                     offRequestPulseTimer = 0;
Index: firmware/App/Services/FPGA.c
===================================================================
diff -u -ra3a01327c8fe80f65f6658ae6cbef4910a4a8033 -r9a20996b770f446b8c669cba7a49668c1fdadd67
--- firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision a3a01327c8fe80f65f6658ae6cbef4910a4a8033)
+++ firmware/App/Services/FPGA.c	(.../FPGA.c)	(revision 9a20996b770f446b8c669cba7a49668c1fdadd67)
@@ -1314,134 +1314,6 @@
 
 /*********************************************************************//**
  * @brief
- * The enableValvesPIDControl function enables PID on valves per given bit
- * mask.
- * @details
- * Inputs : none
- * Outputs : fpgaActuatorSetPoints
- * @param enableBits bit mask indicating which valves to enable
- * @return none
- *************************************************************************/
-void enableValvesPIDControl( U16 enableBits )
-{
-    fpgaActuatorSetPoints.fpgaPIDControl = 0x55;  // TODO - this looks hard coded - ignoring param - fix this
-}
-
-/*********************************************************************//**
- * @brief
- * The setDialyzerInletValvePosition function sets the target position for
- * the dialyzer inlet valve.
- * @details
- * Inputs : none
- * Outputs : fpgaActuatorSetPoints
- * @param setPoint target position for the dialyzer inlet valve
- * @return none
- *************************************************************************/
-void setDialyzerInletValvePosition( S16 setPoint )
-{
-    fpgaActuatorSetPoints.VDiSetPoint = setPoint;
-}
-
-/*********************************************************************//**
- * @brief
- * The getDialyzerInletValvePosition function gets the last read position
- * for the dialyzer inlet valve.
- * @details
- * Inputs : fpgaSensorReadings
- * Outputs : none
- * @return last read position of the dialyzer inlet valve
- *************************************************************************/
-S16 getDialyzerInletValvePosition( void )
-{
-    return fpgaSensorReadings.VDiPosition;
-}
-
-/*********************************************************************//**
- * @brief
- * The setDialyzerOutletValvePosition function sets the target position for
- * the dialyzer outlet valve.
- * @details
- * Inputs : none
- * Outputs : fpgaActuatorSetPoints
- * @return none
- *************************************************************************/
-void setDialyzerOutletValvePosition( S16 setPoint )
-{
-    fpgaActuatorSetPoints.VDoSetPoint = setPoint;
-}
-
-/*********************************************************************//**
- * @brief
- * The getDialyzerOutletValvePosition function gets the last read position
- * for the dialyzer outlet valve.
- * @details
- * Inputs : fpgaSensorReadings
- * Outputs : none
- * @return last read position of the dialyzer outlet valve
- *************************************************************************/
-S16 getDialyzerOutletValvePosition( void )
-{
-    return fpgaSensorReadings.VDoPosition;
-}
-
-/*********************************************************************//**
- * @brief
- * The setVenousBloodValvePosition function sets the target position for
- * the venous blood valve.
- * @details
- * Inputs : none
- * Outputs : fpgaActuatorSetPoints
- * @return none
- *************************************************************************/
-void setVenousBloodValvePosition( S16 setPoint )
-{
-    fpgaActuatorSetPoints.VBVSetPoint = setPoint;
-}
-
-/*********************************************************************//**
- * @brief
- * The getVenousBloodValvePoistion function gets the last read position
- * for the venous blood valve.
- * @details
- * Inputs : fpgaSensorReadings
- * Outputs : none
- * @return last read position of the venous blood valve
- *************************************************************************/
-S16 getVenousBloodValvePoistion( void )
-{
-    return fpgaSensorReadings.VBVPosition;
-}
-
-/*********************************************************************//**
- * @brief
- * The setArterialBloodValvePosition function sets the target position for
- * the arterial blood valve.
- * @details
- * Inputs : none
- * Outputs : fpgaActuatorSetPoints
- * @return none
- *************************************************************************/
-void setArterialBloodValvePosition( S16 setPoint )
-{
-    fpgaActuatorSetPoints.VBASetPoint = setPoint;
-}
-
-/*********************************************************************//**
- * @brief
- * The getArterialBloodValvePoistion function gets the last read position
- * for the arterial blood valve.
- * @details
- * Inputs : fpgaSensorReadings
- * Outputs : none
- * @return last read position of the arterial blood valve
- *************************************************************************/
-S16 getArterialBloodValvePoistion( void )
-{
-    return fpgaSensorReadings.VBAPosition;
-}
-
-/*********************************************************************//**
- * @brief
  * The consumeUnexpectedData function checks to see if a byte is sitting in
  * the SCI2 received data register.
  * @details
Index: firmware/App/Services/FPGA.h
===================================================================
diff -u -r8fdca8ef380555c6c93e30b517258988333ffd89 -r9a20996b770f446b8c669cba7a49668c1fdadd67
--- firmware/App/Services/FPGA.h	(.../FPGA.h)	(revision 8fdca8ef380555c6c93e30b517258988333ffd89)
+++ firmware/App/Services/FPGA.h	(.../FPGA.h)	(revision 9a20996b770f446b8c669cba7a49668c1fdadd67)
@@ -68,20 +68,6 @@
 void getFPGAAccelMaxes( S16 *xm, S16*ym, S16*zm );
 void getFPGAAccelStatus( U16 *cnt, U16 *accelFPGAFaultReg );
 
-void enableValvesPIDControl( U16 enableBits );
-
-void setDialyzerInletValvePosition( S16 setPoint );
-S16 getDialyzerInletValvePosition( void );
-
-void setDialyzerOutletValvePosition( S16 setPoint );
-S16 getDialyzerOutletValvePosition( void );
-
-void setVenousBloodValvePosition( S16 setPoint );
-S16 getVenousBloodValvePoistion( void );
-
-void setArterialBloodValvePosition( S16 setPoint );
-S16 getArterialBloodValvePoistion( void );
-
 /**@}*/
 
 #endif