Index: sources/model/hd/alarm/MAlarmTriggered.cpp
===================================================================
diff -u -r2bc6542cebc264eb343f791f75223a1ca151465e -r2dd767833cf0cf706c457951c2d78e7e20aff768
--- sources/model/hd/alarm/MAlarmTriggered.cpp	(.../MAlarmTriggered.cpp)	(revision 2bc6542cebc264eb343f791f75223a1ca151465e)
+++ sources/model/hd/alarm/MAlarmTriggered.cpp	(.../MAlarmTriggered.cpp)	(revision 2dd767833cf0cf706c457951c2d78e7e20aff768)
@@ -53,16 +53,16 @@
         params += {zero, zero};
         break;
     case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_U32    :
-        params += {_data.mFieldDescriptor1.value, _data.mDataFieldU2.value};
+        params += {_data.mFieldDescriptor2.value, _data.mDataFieldU2.value};
         break;
     case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_S32    :
-        params += {_data.mFieldDescriptor1.value, _data.mDataFieldS2.value};
+        params += {_data.mFieldDescriptor2.value, _data.mDataFieldS2.value};
         break;
     case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_F32    :
-        params += {_data.mFieldDescriptor1.value, _data.mDataFieldF2.value};
+        params += {_data.mFieldDescriptor2.value, _data.mDataFieldF2.value};
         break;
     case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_BOOL   :
-        params += {_data.mFieldDescriptor1.value, _data.mDataFieldB2.value};
+        params += {_data.mFieldDescriptor2.value, _data.mDataFieldB2.value};
         break;
     default:
         params += {zero, zero};
@@ -85,6 +85,7 @@
     _data.mDataFieldS2      .value = 0;
     _data.mDataFieldF2      .value = 0;
     _data.mDataFieldB2      .value = 0;
+
     if (GetValue(vByteArray, index, _data.mAlarmID          ))
     if (GetValue(vByteArray, index, _data.mFieldDescriptor1 ))
     {
@@ -119,8 +120,8 @@
 
         if (GetValue(vByteArray, index, _data.mFieldDescriptor2 ))
         {
-            Gui::GuiAlarmDataTypes field1Type = static_cast<Gui::GuiAlarmDataTypes>(_data.mFieldDescriptor2.value);
-            switch (field1Type) {
+            Gui::GuiAlarmDataTypes field2Type = static_cast<Gui::GuiAlarmDataTypes>(_data.mFieldDescriptor2.value);
+            switch (field2Type) {
             case Gui::GuiAlarmDataTypes::ALARM_DATA_TYPE_NONE   :
                 return true;