Index: firmware/App/Controllers/AirPump.c
===================================================================
diff -u -r4bcafe45ae40939d6b3471f4ccca7e2b4fa7c0f5 -r0e1203044c8a58afcb2a1d51b08d2073e4bee4a3
--- firmware/App/Controllers/AirPump.c	(.../AirPump.c)	(revision 4bcafe45ae40939d6b3471f4ccca7e2b4fa7c0f5)
+++ firmware/App/Controllers/AirPump.c	(.../AirPump.c)	(revision 0e1203044c8a58afcb2a1d51b08d2073e4bee4a3)
@@ -32,13 +32,11 @@
  */
 
 // ********** private definitions **********
+
 #define AIR_PUMP_DATA_PUB_INTERVAL          ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )
 #define DATA_PUBLISH_COUNTER_START_COUNT
 #define AIR_PUMP_GPIO_PIN                   0x24
 
-
-static const U32 AIR_PUMP_STATUS_PERSISTENCE = ( MS_PER_SECOND / TASK_GENERAL_INTERVAL );
-
 typedef enum AirPumpMotorStates
 {
     AIR_PUMP_MOTOR_OFF = 0,      ///< Air Pump Off
@@ -49,14 +47,12 @@
 
 // ********** private data **********
 
+static const U32 AIR_PUMP_STATUS_PERSISTENCE = ( MS_PER_SECOND / TASK_GENERAL_INTERVAL );
 static AIR_PUMP_MOTOR_STATE_T currentAirPumpMotorState;
-
 static AIR_PUMP_STATE_T currentAirPumpState;
 static U32 airPumpDataPublicationTimerCounter;
-
 static OVERRIDE_U32_T airPumpDataPublishInterval = { AIR_PUMP_DATA_PUB_INTERVAL, AIR_PUMP_DATA_PUB_INTERVAL, 0, 0 };
 
-
 // ********** private function prototypes **********
 
 static AIR_PUMP_STATE_T handleAirPumpStartState( void );
@@ -72,7 +68,7 @@
 
 }
 
-static void setAirPumpMotor(AIR_PUMP_MOTOR_STATE_T state)
+static void setAirPumpMotor( AIR_PUMP_MOTOR_STATE_T state )
 {
     if ( state < NUM_OF_AIR_PUMP_MOTOR_STATES )
     {
@@ -96,11 +92,6 @@
     }
 }
 
-AIR_PUMP_MOTOR_STATE_T getAirPumpMotorState( void )
-{
-    return (AIR_PUMP_MOTOR_STATE_T)gioGetBit( hetPORT1, AIR_PUMP_GPIO_PIN );
-}
-
 AIR_PUMP_STATE_T getAirPumpState( void )
 {
     return currentAirPumpState;
@@ -155,7 +146,6 @@
     {
         AIR_PUMP_PAYLOAD_T data;
         data.airPumpStateStatus = getAirPumpState();
-        data.airPumpMotorStatus = getAirPumpMotorState();
 
         broadcastData( MSG_ID_HD_AIR_PUMP_DATA, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( AIR_PUMP_PAYLOAD_T ) );
     }
@@ -221,7 +211,7 @@
 
     if ( TRUE == isTestingActivated() )
     {
-        setAirPumpState( (AIR_PUMP_STATE_T) state );
+        setAirPumpState( ( AIR_PUMP_STATE_T ) state );
         result = TRUE;
     }