Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -rc67def50892f9a7c2f1f22985b5351465a8f6773 -r1a685471524555a374854c0c9ec8e208e71fe2df
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision c67def50892f9a7c2f1f22985b5351465a8f6773)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 1a685471524555a374854c0c9ec8e208e71fe2df)
@@ -362,7 +362,7 @@
  * position.
  * @details Inputs: valveAirTrapStatus
  * @details Outputs: valveAirTrapStatus
- * @param: state enumeration of open or close for valve
+ * @param state enumeration of open or close for valve
  * @return: none
  *************************************************************************/
 void setValveAirTrap( OPN_CLS_STATE_T state )
@@ -702,7 +702,9 @@
                  valvesStatus[ valve ].hasValveBeenHomed = FALSE;
                  valvesStatus[ valve ].hasHomingFailed = TRUE;
                  state = VALVE_STATE_HOMING_NOT_STARTED;
+#ifndef DISABLE_VALVE_ALARMS
                  SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_VALVE_HOMING_FAILED, (U32)valve );
+#endif
              }
              else
              {
@@ -831,7 +833,9 @@
         valvesStatus[ valve ].hasTransitionBeenRequested = FALSE;
         // Go back to Idle state
         state = VALVE_STATE_IDLE;
+#ifndef DISABLE_VALVE_ALARMS
         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_VALVE_TRANSITION_TIMEOUT, (U32)valve );
+#endif
     }
     // Check if the valve is close to the temporary target position and if it is, assign the next target position
     else if ( abs( currentPosition - targetPosition ) < MAX_DEVIATION_FROM_TARGET_IN_COUNTS )
@@ -1082,7 +1086,9 @@
         // Check if the current is over the threshold for the defined amount of time
         if ( valvesStatus[ valve ].overCurrentCounter > MAX_OVER_CURRENT_TIME_INTERVAL_COUNTER )
         {
+#ifndef DISABLE_VALVE_ALARMS
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_VALVE_CURRENT_OUT_OF_RANGE, (F32)valve, current );
+#endif
         }
         // If the current is below the threshold again and the counter for the time is greater than
         else if ( current < VALVES_CURRENT_THRESHOLD_AMPS &&
@@ -1146,7 +1152,9 @@
 
             if ( valvesStatus[ valve ].positionOutOfRangeCounter >  MAX_POS_DEVIATION_TIME_INTERVAL_COUNTER )
             {
+#ifndef DISABLE_VALVE_ALARMS
                 SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_VALVE_POSITION_OUT_OF_RANGE, (U32)valve, currentPostion );
+#endif
             }
             else if ( abs( currentPostion - commandedPoistion ) < MAX_DEVIATION_FROM_TARGET_IN_COUNTS &&
                       valvesStatus[ valve ].positionOutOfRangeCounter > 0 )
@@ -1371,6 +1379,7 @@
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
 
+
 /*********************************************************************//**
  * @brief
  * The testSetValvesDataPublishInterval function overrides the valves data