Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

8 files changed, 161 insertions, 17 deletions

diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/DebugLogCategory.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/DebugLogCategory.pb-c.c
index b651d2acb..ebb901ba8 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/DebugLogCategory.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/DebugLogCategory.pb-c.c
@@ -13,7 +13,7 @@ static const ProtobufCEnumValue debug_log_category__enum_values_by_number[5] =
   { "Warning", "DEBUG_LOG_CATEGORY__Warning", 1 },
   { "Error", "DEBUG_LOG_CATEGORY__Error", 2 },
   { "Critical", "DEBUG_LOG_CATEGORY__Critical", 3 },
-  { "Safety", "DEBUG_LOG_CATEGORY__Safety", 4 },
+  { "Debug", "DEBUG_LOG_CATEGORY__Debug", 4 },
 };
 static const ProtobufCIntRange debug_log_category__value_ranges[] = {
 {0, 0},{0, 5}
@@ -21,9 +21,9 @@ static const ProtobufCIntRange debug_log_category__value_ranges[] = {
 static const ProtobufCEnumValueIndex debug_log_category__enum_values_by_name[5] =
 {
   { "Critical", 3 },
+  { "Debug", 4 },
   { "Error", 2 },
   { "Info", 0 },
-  { "Safety", 4 },
   { "Warning", 1 },
 };
 const ProtobufCEnumDescriptor debug_log_category__descriptor =
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/DebugLogCategory.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/DebugLogCategory.pb-c.h
index 1fda3ab01..d97b42d33 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/DebugLogCategory.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/DebugLogCategory.pb-c.h
@@ -24,7 +24,7 @@ typedef enum _DebugLogCategory {
   DEBUG_LOG_CATEGORY__Warning = 1,
   DEBUG_LOG_CATEGORY__Error = 2,
   DEBUG_LOG_CATEGORY__Critical = 3,
-  DEBUG_LOG_CATEGORY__Safety = 4
+  DEBUG_LOG_CATEGORY__Debug = 4
     PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(DEBUG_LOG_CATEGORY)
 } DebugLogCategory;
 
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/AlarmSourceType.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/AlarmSourceType.pb-c.c
index 59509c39e..4167a9599 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/AlarmSourceType.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/AlarmSourceType.pb-c.c
@@ -7,7 +7,7 @@
 #endif
 
 #include "AlarmSourceType.pb-c.h"
-static const ProtobufCEnumValue alarm_source_type__enum_values_by_number[7] =
+static const ProtobufCEnumValue alarm_source_type__enum_values_by_number[10] =
 {
   { "TemperatureAlarm", "ALARM_SOURCE_TYPE__TemperatureAlarm", 0 },
   { "LimitSwitchAlarm", "ALARM_SOURCE_TYPE__LimitSwitchAlarm", 1 },
@@ -16,18 +16,24 @@ static const ProtobufCEnumValue alarm_source_type__enum_values_by_number[7] =
   { "MotorAlarm", "ALARM_SOURCE_TYPE__MotorAlarm", 4 },
   { "CoversAlarm", "ALARM_SOURCE_TYPE__CoversAlarm", 5 },
   { "DoNotPollAlarm", "ALARM_SOURCE_TYPE__DoNotPollAlarm", 6 },
+  { "HardLimitAlarm", "ALARM_SOURCE_TYPE__HardLimitAlarm", 7 },
+  { "TachoAlarm", "ALARM_SOURCE_TYPE__TachoAlarm", 8 },
+  { "FluidLevelAlarm", "ALARM_SOURCE_TYPE__FluidLevelAlarm", 9 },
 };
 static const ProtobufCIntRange alarm_source_type__value_ranges[] = {
-{0, 0},{0, 7}
+{0, 0},{0, 10}
 };
-static const ProtobufCEnumValueIndex alarm_source_type__enum_values_by_name[7] =
+static const ProtobufCEnumValueIndex alarm_source_type__enum_values_by_name[10] =
 {
   { "CoversAlarm", 5 },
   { "CurrentAlarm", 3 },
   { "DoNotPollAlarm", 6 },
+  { "FluidLevelAlarm", 9 },
+  { "HardLimitAlarm", 7 },
   { "LimitSwitchAlarm", 1 },
   { "MotorAlarm", 4 },
   { "PressureAlarm", 2 },
+  { "TachoAlarm", 8 },
   { "TemperatureAlarm", 0 },
 };
 const ProtobufCEnumDescriptor alarm_source_type__descriptor =
@@ -37,9 +43,9 @@ const ProtobufCEnumDescriptor alarm_source_type__descriptor =
   "AlarmSourceType",
   "AlarmSourceType",
   "",
-  7,
+  10,
   alarm_source_type__enum_values_by_number,
-  7,
+  10,
   alarm_source_type__enum_values_by_name,
   1,
   alarm_source_type__value_ranges,
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/AlarmSourceType.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/AlarmSourceType.pb-c.h
index 2f6135176..4c7d0f91e 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/AlarmSourceType.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/AlarmSourceType.pb-c.h
@@ -26,7 +26,10 @@ typedef enum _AlarmSourceType {
   ALARM_SOURCE_TYPE__CurrentAlarm = 3,
   ALARM_SOURCE_TYPE__MotorAlarm = 4,
   ALARM_SOURCE_TYPE__CoversAlarm = 5,
-  ALARM_SOURCE_TYPE__DoNotPollAlarm = 6
+  ALARM_SOURCE_TYPE__DoNotPollAlarm = 6,
+  ALARM_SOURCE_TYPE__HardLimitAlarm = 7,
+  ALARM_SOURCE_TYPE__TachoAlarm = 8,
+  ALARM_SOURCE_TYPE__FluidLevelAlarm = 9
     PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(ALARM_SOURCE_TYPE)
 } AlarmSourceType;
 
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/ConfigurationParameters.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/ConfigurationParameters.pb-c.c
index b5e08ea1f..c4c74c826 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/ConfigurationParameters.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/ConfigurationParameters.pb-c.c
@@ -52,7 +52,7 @@ void   configuration_parameters__free_unpacked
   assert(message->base.descriptor == &configuration_parameters__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor configuration_parameters__field_descriptors[21] =
+static const ProtobufCFieldDescriptor configuration_parameters__field_descriptors[29] =
 {
   {
     "BreakSensorLimit",
@@ -306,12 +306,110 @@ static const ProtobufCFieldDescriptor configuration_parameters__field_descriptor
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "CurrentAlarmLowLimit",
+    22,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(ConfigurationParameters, has_currentalarmlowlimit),
+    offsetof(ConfigurationParameters, currentalarmlowlimit),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "CurrentAlarmHighLimit",
+    23,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(ConfigurationParameters, has_currentalarmhighlimit),
+    offsetof(ConfigurationParameters, currentalarmhighlimit),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "IDS_SegmentRefillTimeout",
+    24,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(ConfigurationParameters, has_ids_segmentrefilltimeout),
+    offsetof(ConfigurationParameters, ids_segmentrefilltimeout),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "IDS_PreSegmentBuildupTime",
+    25,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(ConfigurationParameters, has_ids_presegmentbuilduptime),
+    offsetof(ConfigurationParameters, ids_presegmentbuilduptime),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "IDS_CleaningSpeed",
+    26,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(ConfigurationParameters, has_ids_cleaningspeed),
+    offsetof(ConfigurationParameters, ids_cleaningspeed),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "IDS_CleaningStopBeforeSegmentTime",
+    27,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(ConfigurationParameters, has_ids_cleaningstopbeforesegmenttime),
+    offsetof(ConfigurationParameters, ids_cleaningstopbeforesegmenttime),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "IDS_LeftCleaningMotorSpeed",
+    28,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(ConfigurationParameters, has_ids_leftcleaningmotorspeed),
+    offsetof(ConfigurationParameters, ids_leftcleaningmotorspeed),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "IDS_RightCleaningMotorSpeed",
+    29,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(ConfigurationParameters, has_ids_rightcleaningmotorspeed),
+    offsetof(ConfigurationParameters, ids_rightcleaningmotorspeed),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned configuration_parameters__field_indices_by_name[] = {
   13,   /* field[13] = ACHeatersLowerOperationLimit */
   14,   /* field[14] = ACHeatersUpperOperationLimit */
   0,   /* field[0] = BreakSensorLimit */
   4,   /* field[4] = CloseValveTimeout */
+  22,   /* field[22] = CurrentAlarmHighLimit */
+  21,   /* field[21] = CurrentAlarmLowLimit */
   15,   /* field[15] = DCHeatersLowerOperationLimit */
   16,   /* field[16] = DCHeatersUpperOperationLimit */
   1,   /* field[1] = DiagnosticCollectionLimit */
@@ -321,6 +419,12 @@ static const unsigned configuration_parameters__field_indices_by_name[] = {
   11,   /* field[11] = DispenserBuildPressureTimeout */
   18,   /* field[18] = DispenserPresegmentWFCF */
   20,   /* field[20] = GeneralParameters */
+  25,   /* field[25] = IDS_CleaningSpeed */
+  26,   /* field[26] = IDS_CleaningStopBeforeSegmentTime */
+  27,   /* field[27] = IDS_LeftCleaningMotorSpeed */
+  24,   /* field[24] = IDS_PreSegmentBuildupTime */
+  28,   /* field[28] = IDS_RightCleaningMotorSpeed */
+  23,   /* field[23] = IDS_SegmentRefillTimeout */
   6,   /* field[6] = InitialDispenserPressure */
   8,   /* field[8] = InitialDispenserTimeLag */
   7,   /* field[7] = InitialDispenserTimeout */
@@ -333,7 +437,7 @@ static const unsigned configuration_parameters__field_indices_by_name[] = {
 static const ProtobufCIntRange configuration_parameters__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 21 }
+  { 0, 29 }
 };
 const ProtobufCMessageDescriptor configuration_parameters__descriptor =
 {
@@ -343,7 +447,7 @@ const ProtobufCMessageDescriptor configuration_parameters__descriptor =
   "ConfigurationParameters",
   "",
   sizeof(ConfigurationParameters),
-  21,
+  29,
   configuration_parameters__field_descriptors,
   configuration_parameters__field_indices_by_name,
   1,  configuration_parameters__number_ranges,
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/ConfigurationParameters.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/ConfigurationParameters.pb-c.h
index 3911bbcb1..1b729c0d0 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/ConfigurationParameters.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/ConfigurationParameters.pb-c.h
@@ -68,10 +68,26 @@ struct  _ConfigurationParameters
   protobuf_c_boolean startheatingoninitsequence;
   size_t n_generalparameters;
   double *generalparameters;
+  protobuf_c_boolean has_currentalarmlowlimit;
+  double currentalarmlowlimit;
+  protobuf_c_boolean has_currentalarmhighlimit;
+  double currentalarmhighlimit;
+  protobuf_c_boolean has_ids_segmentrefilltimeout;
+  double ids_segmentrefilltimeout;
+  protobuf_c_boolean has_ids_presegmentbuilduptime;
+  double ids_presegmentbuilduptime;
+  protobuf_c_boolean has_ids_cleaningspeed;
+  double ids_cleaningspeed;
+  protobuf_c_boolean has_ids_cleaningstopbeforesegmenttime;
+  double ids_cleaningstopbeforesegmenttime;
+  protobuf_c_boolean has_ids_leftcleaningmotorspeed;
+  double ids_leftcleaningmotorspeed;
+  protobuf_c_boolean has_ids_rightcleaningmotorspeed;
+  double ids_rightcleaningmotorspeed;
 };
 #define CONFIGURATION_PARAMETERS__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&configuration_parameters__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,NULL }
+    , 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 
 
 /* ConfigurationParameters methods */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/JobTicket.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/JobTicket.pb-c.c
index d624cee6a..a47ff627b 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/JobTicket.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/JobTicket.pb-c.c
@@ -52,7 +52,7 @@ void   job_ticket__free_unpacked
   assert(message->base.descriptor == &job_ticket__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor job_ticket__field_descriptors[11] =
+static const ProtobufCFieldDescriptor job_ticket__field_descriptors[12] =
 {
   {
     "Guid",
@@ -186,9 +186,22 @@ static const ProtobufCFieldDescriptor job_ticket__field_descriptors[11] =
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "EnableLubrication",
+    12,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(JobTicket, has_enablelubrication),
+    offsetof(JobTicket, enablelubrication),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned job_ticket__field_indices_by_name[] = {
   2,   /* field[2] = EnableInterSegment */
+  11,   /* field[11] = EnableLubrication */
   0,   /* field[0] = Guid */
   3,   /* field[3] = InterSegmentLength */
   10,   /* field[10] = JobDescriptionFile */
@@ -203,7 +216,7 @@ static const unsigned job_ticket__field_indices_by_name[] = {
 static const ProtobufCIntRange job_ticket__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 11 }
+  { 0, 12 }
 };
 const ProtobufCMessageDescriptor job_ticket__descriptor =
 {
@@ -213,7 +226,7 @@ const ProtobufCMessageDescriptor job_ticket__descriptor =
   "JobTicket",
   "",
   sizeof(JobTicket),
-  11,
+  12,
   job_ticket__field_descriptors,
   job_ticket__field_indices_by_name,
   1,  job_ticket__number_ranges,
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/JobTicket.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/JobTicket.pb-c.h
index 6e6794e63..bf75643a9 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/JobTicket.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/JobTicket.pb-c.h
@@ -48,10 +48,12 @@ struct  _JobTicket
   protobuf_c_boolean has_uploadstrategy;
   JobUploadStrategy uploadstrategy;
   char *jobdescriptionfile;
+  protobuf_c_boolean has_enablelubrication;
+  protobuf_c_boolean enablelubrication;
 };
 #define JOB_TICKET__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&job_ticket__descriptor) \
-    , NULL, NULL, 0, 0, 0, 0, 0, 0, NULL, 0, JOB_WINDING_METHOD__Embroidery, NULL, 0,NULL, 0, JOB_UPLOAD_STRATEGY__Default, NULL }
+    , NULL, NULL, 0, 0, 0, 0, 0, 0, NULL, 0, JOB_WINDING_METHOD__Embroidery, NULL, 0,NULL, 0, JOB_UPLOAD_STRATEGY__Default, NULL, 0, 0 }
 
 
 /* JobTicket methods */