Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r20fe5dc6869557f96c86fbd9d7f2f634ce23696a -r8d3dbd25627fb7e993409eb47b2575e0430afddd
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 20fe5dc6869557f96c86fbd9d7f2f634ce23696a)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 8d3dbd25627fb7e993409eb47b2575e0430afddd)
@@ -364,7 +364,7 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_VALVES_INVALID_VALVE_SELECTED, (U32)valve );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_VALVES_INVALID_VALVE_SELECTED1, (U32)valve );
     }
 
     return result;
@@ -393,19 +393,20 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_VALVES_INVALID_VALVE_SELECTED, (U32)valve );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_VALVES_INVALID_VALVE_SELECTED2, (U32)valve );
     }
 
     return result;
 }
 
 /*********************************************************************//**
  * @brief
- * The getValvePosition function returns the current position of a valve.
+ * The getValvePosition function returns the current position of a
+ * given valve.
  * @details Inputs: none
  * @details Outputs: valvesStatus
- * @param valve that the position is requested
- * @return returns the current position of the valve in enum
+ * @param valve Valve to get the position of
+ * @return returns the current position of the given valve
  *************************************************************************/
 VALVE_POSITION_T getValvePosition( VALVE_T valve )
 {
@@ -417,7 +418,7 @@
     }
     else
     {
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_VALVES_INVALID_VALVE_SELECTED, (U32)valve );
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_VALVES_INVALID_VALVE_SELECTED3, (U32)valve );
     }
 
     return position;
@@ -1122,7 +1123,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_VALVES_INVALID_VALVE_SELECTED, (U32)valve );
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_VALVES_INVALID_VALVE_SELECTED5, (U32)valve );
             break;
     }
 }
@@ -1443,7 +1444,7 @@
             break;
 
         default:
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_VALVES_INVALID_VALVE_SELECTED, (U32)valve );
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_VALVES_INVALID_VALVE_SELECTED6, (U32)valve );
             break;
     }
 }