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

5 files changed, 44 insertions, 40 deletions

diff --git a/Software/Embedded_SW/Embedded/Communication/Connection.c b/Software/Embedded_SW/Embedded/Communication/Connection.c
index 50f23d26e..cfcfc6658 100644
--- a/Software/Embedded_SW/Embedded/Communication/Connection.c
+++ b/Software/Embedded_SW/Embedded/Communication/Connection.c
@@ -60,6 +60,7 @@ void ConnectionRequest(MessageContainer* requestContainer)
 	char AssyVersion[30] = {0};
     response.deviceinformation = &DevInfo;
 
+    utilsUpdateDateTime(1564403262);//(request->seconds);
     /*
     extern TangoVersion_t _gTangoVersion;
     extern char Dat[50];
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/InterfaceIOs.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/InterfaceIOs.pb-c.c
index ec93b525c..3dfdfc2bb 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/InterfaceIOs.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/InterfaceIOs.pb-c.c
@@ -7,7 +7,7 @@
 #endif
 
 #include "InterfaceIOs.pb-c.h"
-static const ProtobufCEnumValue interface_ios__enum_values_by_number[39] =
+static const ProtobufCEnumValue interface_ios__enum_values_by_number[40] =
 {
   { "ANALOG_MIXCHIP_TEMP", "INTERFACE_IOS__ANALOG_MIXCHIP_TEMP", 0 },
   { "GPO_MIXCHIP_SSR4_CTRL", "INTERFACE_IOS__GPO_MIXCHIP_SSR4_CTRL", 19 },
@@ -40,6 +40,7 @@ static const ProtobufCEnumValue interface_ios__enum_values_by_number[39] =
   { "Midtank7Cartridge", "INTERFACE_IOS__Midtank7Cartridge", 179 },
   { "Midtank8Cartridge", "INTERFACE_IOS__Midtank8Cartridge", 180 },
   { "GPO_LED4", "INTERFACE_IOS__GPO_LED4", 274 },
+  { "GPO_TFEED_BREAK_1", "INTERFACE_IOS__GPO_TFEED_BREAK_1", 296 },
   { "GPO_SPARE1_1", "INTERFACE_IOS__GPO_SPARE1_1", 318 },
   { "GPO_SPARE1_2", "INTERFACE_IOS__GPO_SPARE1_2", 319 },
   { "GPI_WCONTAINER_FULL", "INTERFACE_IOS__GPI_WCONTAINER_FULL", 341 },
@@ -50,15 +51,15 @@ static const ProtobufCEnumValue interface_ios__enum_values_by_number[39] =
   { "VALVE_WASTE_TANK", "INTERFACE_IOS__VALVE_WASTE_TANK", 346 },
 };
 static const ProtobufCIntRange interface_ios__value_ranges[] = {
-{0, 0},{19, 1},{43, 6},{54, 9},{64, 11},{163, 12},{274, 30},{318, 31},{341, 33},{0, 39}
+{0, 0},{19, 1},{43, 6},{54, 9},{64, 11},{163, 12},{274, 30},{296, 31},{318, 32},{341, 34},{0, 40}
 };
-static const ProtobufCEnumValueIndex interface_ios__enum_values_by_name[39] =
+static const ProtobufCEnumValueIndex interface_ios__enum_values_by_name[40] =
 {
   { "ANALOG_MIXCHIP_TEMP", 0 },
-  { "GPI_WCONTAINER_FULL", 33 },
-  { "GPI_WCONTAINER_WARN", 34 },
-  { "GPO_BLOWER_PWM", 35 },
-  { "GPO_CHILLER_SSR9_CTRL", 36 },
+  { "GPI_WCONTAINER_FULL", 34 },
+  { "GPI_WCONTAINER_WARN", 35 },
+  { "GPO_BLOWER_PWM", 36 },
+  { "GPO_CHILLER_SSR9_CTRL", 37 },
   { "GPO_DILUTORPUMP_SSR10_CTRL", 12 },
   { "GPO_DRYER_SSR1_CTRL", 6 },
   { "GPO_DRYER_SSR2_CTRL", 7 },
@@ -70,12 +71,13 @@ static const ProtobufCEnumValueIndex interface_ios__enum_values_by_name[39] =
   { "GPO_EXTWINDER_SSR11_CTRL", 11 },
   { "GPO_LED4", 30 },
   { "GPO_MIXCHIP_SSR4_CTRL", 1 },
-  { "GPO_SPARE1_1", 31 },
-  { "GPO_SPARE1_2", 32 },
+  { "GPO_SPARE1_1", 32 },
+  { "GPO_SPARE1_2", 33 },
   { "GPO_SPARE_SSR12_CTRL", 9 },
   { "GPO_SPARE_SSR13_CTRL", 10 },
+  { "GPO_TFEED_BREAK_1", 31 },
   { "GPO_WASTECH_PUMP2", 13 },
-  { "GPO_WHS_WTANKPUMP2", 37 },
+  { "GPO_WHS_WTANKPUMP2", 38 },
   { "Midtank1Air", 14 },
   { "Midtank1Cartridge", 22 },
   { "Midtank2Air", 15 },
@@ -92,7 +94,7 @@ static const ProtobufCEnumValueIndex interface_ios__enum_values_by_name[39] =
   { "Midtank7Cartridge", 28 },
   { "Midtank8Air", 21 },
   { "Midtank8Cartridge", 29 },
-  { "VALVE_WASTE_TANK", 38 },
+  { "VALVE_WASTE_TANK", 39 },
 };
 const ProtobufCEnumDescriptor interface_ios__descriptor =
 {
@@ -101,11 +103,11 @@ const ProtobufCEnumDescriptor interface_ios__descriptor =
   "InterfaceIOs",
   "InterfaceIOs",
   "",
-  39,
+  40,
   interface_ios__enum_values_by_number,
-  39,
+  40,
   interface_ios__enum_values_by_name,
-  9,
+  10,
   interface_ios__value_ranges,
   NULL,NULL,NULL,NULL   /* reserved[1234] */
 };
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/InterfaceIOs.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/InterfaceIOs.pb-c.h
index 341997ea0..1baf3dbc6 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/InterfaceIOs.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/InterfaceIOs.pb-c.h
@@ -51,6 +51,7 @@ typedef enum _InterfaceIOs {
   INTERFACE_IOS__Midtank7Cartridge = 179,
   INTERFACE_IOS__Midtank8Cartridge = 180,
   INTERFACE_IOS__GPO_LED4 = 274,
+  INTERFACE_IOS__GPO_TFEED_BREAK_1 = 296,
   INTERFACE_IOS__GPO_SPARE1_1 = 318,
   INTERFACE_IOS__GPO_SPARE1_2 = 319,
   INTERFACE_IOS__GPI_WCONTAINER_FULL = 341,
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwareMotor.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwareMotor.pb-c.c
index bfda97424..fb4967ab5 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwareMotor.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwareMotor.pb-c.c
@@ -358,7 +358,7 @@ static const ProtobufCFieldDescriptor hardware_motor__field_descriptors[34] =
     "GateCfg1",
     26,
     PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
+    PROTOBUF_C_TYPE_INT32,
     offsetof(HardwareMotor, has_gatecfg1),
     offsetof(HardwareMotor, gatecfg1),
     NULL,
@@ -370,7 +370,7 @@ static const ProtobufCFieldDescriptor hardware_motor__field_descriptors[34] =
     "GateCfg2",
     27,
     PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
+    PROTOBUF_C_TYPE_INT32,
     offsetof(HardwareMotor, has_gatecfg2),
     offsetof(HardwareMotor, gatecfg2),
     NULL,
@@ -379,10 +379,10 @@ static const ProtobufCFieldDescriptor hardware_motor__field_descriptors[34] =
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "TvalHold",
+    "TValHold",
     28,
     PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
+    PROTOBUF_C_TYPE_INT32,
     offsetof(HardwareMotor, has_tvalhold),
     offsetof(HardwareMotor, tvalhold),
     NULL,
@@ -391,10 +391,10 @@ static const ProtobufCFieldDescriptor hardware_motor__field_descriptors[34] =
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "TvalRun",
+    "TValRun",
     29,
     PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
+    PROTOBUF_C_TYPE_INT32,
     offsetof(HardwareMotor, has_tvalrun),
     offsetof(HardwareMotor, tvalrun),
     NULL,
@@ -403,10 +403,10 @@ static const ProtobufCFieldDescriptor hardware_motor__field_descriptors[34] =
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "TvalAcc",
+    "TValAcc",
     30,
     PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
+    PROTOBUF_C_TYPE_INT32,
     offsetof(HardwareMotor, has_tvalacc),
     offsetof(HardwareMotor, tvalacc),
     NULL,
@@ -415,10 +415,10 @@ static const ProtobufCFieldDescriptor hardware_motor__field_descriptors[34] =
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "TvalDec",
+    "TValDec",
     31,
     PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
+    PROTOBUF_C_TYPE_INT32,
     offsetof(HardwareMotor, has_tvaldec),
     offsetof(HardwareMotor, tvaldec),
     NULL,
@@ -430,7 +430,7 @@ static const ProtobufCFieldDescriptor hardware_motor__field_descriptors[34] =
     "TFast",
     32,
     PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
+    PROTOBUF_C_TYPE_INT32,
     offsetof(HardwareMotor, has_tfast),
     offsetof(HardwareMotor, tfast),
     NULL,
@@ -442,7 +442,7 @@ static const ProtobufCFieldDescriptor hardware_motor__field_descriptors[34] =
     "TOnMin",
     33,
     PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
+    PROTOBUF_C_TYPE_INT32,
     offsetof(HardwareMotor, has_tonmin),
     offsetof(HardwareMotor, tonmin),
     NULL,
@@ -454,7 +454,7 @@ static const ProtobufCFieldDescriptor hardware_motor__field_descriptors[34] =
     "TOffMin",
     34,
     PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
+    PROTOBUF_C_TYPE_INT32,
     offsetof(HardwareMotor, has_toffmin),
     offsetof(HardwareMotor, toffmin),
     NULL,
@@ -493,11 +493,11 @@ static const unsigned hardware_motor__field_indices_by_name[] = {
   31,   /* field[31] = TFast */
   33,   /* field[33] = TOffMin */
   32,   /* field[32] = TOnMin */
+  29,   /* field[29] = TValAcc */
+  30,   /* field[30] = TValDec */
+  27,   /* field[27] = TValHold */
+  28,   /* field[28] = TValRun */
   18,   /* field[18] = ThermalCompensationFactor */
-  29,   /* field[29] = TvalAcc */
-  30,   /* field[30] = TvalDec */
-  27,   /* field[27] = TvalHold */
-  28,   /* field[28] = TvalRun */
 };
 static const ProtobufCIntRange hardware_motor__number_ranges[1 + 1] =
 {
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwareMotor.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwareMotor.pb-c.h
index 789e1e139..2dfc0b200 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwareMotor.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Hardware/HardwareMotor.pb-c.h
@@ -78,23 +78,23 @@ struct  _HardwareMotor
   protobuf_c_boolean has_fsspd;
   int32_t fsspd;
   protobuf_c_boolean has_gatecfg1;
-  uint32_t gatecfg1;
+  int32_t gatecfg1;
   protobuf_c_boolean has_gatecfg2;
-  uint32_t gatecfg2;
+  int32_t gatecfg2;
   protobuf_c_boolean has_tvalhold;
-  uint32_t tvalhold;
+  int32_t tvalhold;
   protobuf_c_boolean has_tvalrun;
-  uint32_t tvalrun;
+  int32_t tvalrun;
   protobuf_c_boolean has_tvalacc;
-  uint32_t tvalacc;
+  int32_t tvalacc;
   protobuf_c_boolean has_tvaldec;
-  uint32_t tvaldec;
+  int32_t tvaldec;
   protobuf_c_boolean has_tfast;
-  uint32_t tfast;
+  int32_t tfast;
   protobuf_c_boolean has_tonmin;
-  uint32_t tonmin;
+  int32_t tonmin;
   protobuf_c_boolean has_toffmin;
-  uint32_t toffmin;
+  int32_t toffmin;
 };
 #define HARDWARE_MOTOR__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&hardware_motor__descriptor) \