version 1.4.6.0 - going forward

6 files changed, 59 insertions, 26 deletions

diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DiagnosticsMonitors.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DiagnosticsMonitors.pb-c.c
index 2a5974162..dfa72d2db 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DiagnosticsMonitors.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DiagnosticsMonitors.pb-c.c
@@ -52,7 +52,7 @@ void   diagnostics_monitors__free_unpacked
   assert(message->base.descriptor == &diagnostics_monitors__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor diagnostics_monitors__field_descriptors[63] =
+static const ProtobufCFieldDescriptor diagnostics_monitors__field_descriptors[65] =
 {
   {
     "Dancer1Angle",
@@ -810,6 +810,30 @@ static const ProtobufCFieldDescriptor diagnostics_monitors__field_descriptors[63
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "DispensersInkLevel",
+    64,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_MESSAGE,
+    offsetof(DiagnosticsMonitors, n_dispensersinklevel),
+    offsetof(DiagnosticsMonitors, dispensersinklevel),
+    &double_array__descriptor,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "MidTanksInkLevel",
+    65,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_MESSAGE,
+    offsetof(DiagnosticsMonitors, n_midtanksinklevel),
+    offsetof(DiagnosticsMonitors, midtanksinklevel),
+    &double_array__descriptor,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned diagnostics_monitors__field_indices_by_name[] = {
   38,   /* field[38] = BlowerVoltage */
@@ -834,6 +858,7 @@ static const unsigned diagnostics_monitors__field_indices_by_name[] = {
   34,   /* field[34] = Dispenser8MotorFrequency */
   46,   /* field[46] = Dispenser8Pressure */
   22,   /* field[22] = DispensersAngularEncoders */
+  63,   /* field[63] = DispensersInkLevel */
   23,   /* field[23] = DispensersLinearPositions */
   21,   /* field[21] = DispensersMotorsFrequency */
   24,   /* field[24] = DispensersPressure */
@@ -867,6 +892,7 @@ static const unsigned diagnostics_monitors__field_indices_by_name[] = {
   52,   /* field[52] = MidTank6Level */
   53,   /* field[53] = MidTank7Level */
   54,   /* field[54] = MidTank8Level */
+  64,   /* field[64] = MidTanksInkLevel */
   62,   /* field[62] = Mixer1HeaterCurrent */
   9,   /* field[9] = MixerTemperature */
   5,   /* field[5] = PollerMotor */
@@ -879,7 +905,7 @@ static const unsigned diagnostics_monitors__field_indices_by_name[] = {
 static const ProtobufCIntRange diagnostics_monitors__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 63 }
+  { 0, 65 }
 };
 const ProtobufCMessageDescriptor diagnostics_monitors__descriptor =
 {
@@ -889,7 +915,7 @@ const ProtobufCMessageDescriptor diagnostics_monitors__descriptor =
   "DiagnosticsMonitors",
   "",
   sizeof(DiagnosticsMonitors),
-  63,
+  65,
   diagnostics_monitors__field_descriptors,
   diagnostics_monitors__field_indices_by_name,
   1,  diagnostics_monitors__number_ranges,
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DiagnosticsMonitors.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DiagnosticsMonitors.pb-c.h
index 13ebbaf21..ef860a31f 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DiagnosticsMonitors.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DiagnosticsMonitors.pb-c.h
@@ -153,10 +153,14 @@ struct  _DiagnosticsMonitors
   double *headzone5_6heatercurrent;
   size_t n_mixer1heatercurrent;
   double *mixer1heatercurrent;
+  size_t n_dispensersinklevel;
+  DoubleArray **dispensersinklevel;
+  size_t n_midtanksinklevel;
+  DoubleArray **midtanksinklevel;
 };
 #define DIAGNOSTICS_MONITORS__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&diagnostics_monitors__descriptor) \
-    , 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL }
+    , 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL }
 
 
 /* DiagnosticsMonitors methods */
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 b15763408..e51a7693c 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[41] =
+static const ProtobufCEnumValue interface_ios__enum_values_by_number[42] =
 {
   { "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[41] =
   { "Midtank7Cartridge", "INTERFACE_IOS__Midtank7Cartridge", 179 },
   { "Midtank8Cartridge", "INTERFACE_IOS__Midtank8Cartridge", 180 },
   { "SW_SPARE", "INTERFACE_IOS__SW_SPARE", 224 },
+  { "GPO_BUZZER", "INTERFACE_IOS__GPO_BUZZER", 270 },
   { "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 },
@@ -52,15 +53,16 @@ static const ProtobufCEnumValue interface_ios__enum_values_by_number[41] =
   { "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},{224, 30},{274, 31},{296, 32},{318, 33},{341, 35},{0, 41}
+{0, 0},{19, 1},{43, 6},{54, 9},{64, 11},{163, 12},{224, 30},{270, 31},{274, 32},{296, 33},{318, 34},{341, 36},{0, 42}
 };
-static const ProtobufCEnumValueIndex interface_ios__enum_values_by_name[41] =
+static const ProtobufCEnumValueIndex interface_ios__enum_values_by_name[42] =
 {
   { "ANALOG_MIXCHIP_TEMP", 0 },
-  { "GPI_WCONTAINER_FULL", 35 },
-  { "GPI_WCONTAINER_WARN", 36 },
-  { "GPO_BLOWER_PWM", 37 },
-  { "GPO_CHILLER_SSR9_CTRL", 38 },
+  { "GPI_WCONTAINER_FULL", 36 },
+  { "GPI_WCONTAINER_WARN", 37 },
+  { "GPO_BLOWER_PWM", 38 },
+  { "GPO_BUZZER", 31 },
+  { "GPO_CHILLER_SSR9_CTRL", 39 },
   { "GPO_DILUTORPUMP_SSR10_CTRL", 12 },
   { "GPO_DRYER_SSR1_CTRL", 6 },
   { "GPO_DRYER_SSR2_CTRL", 7 },
@@ -70,15 +72,15 @@ static const ProtobufCEnumValueIndex interface_ios__enum_values_by_name[41] =
   { "GPO_DYEINGH_SSR7_CTRL", 4 },
   { "GPO_DYEINGH_SSR8_CTRL", 5 },
   { "GPO_EXTWINDER_SSR11_CTRL", 11 },
-  { "GPO_LED4", 31 },
+  { "GPO_LED4", 32 },
   { "GPO_MIXCHIP_SSR4_CTRL", 1 },
-  { "GPO_SPARE1_1", 33 },
-  { "GPO_SPARE1_2", 34 },
+  { "GPO_SPARE1_1", 34 },
+  { "GPO_SPARE1_2", 35 },
   { "GPO_SPARE_SSR12_CTRL", 9 },
   { "GPO_SPARE_SSR13_CTRL", 10 },
-  { "GPO_TFEED_BREAK_1", 32 },
+  { "GPO_TFEED_BREAK_1", 33 },
   { "GPO_WASTECH_PUMP2", 13 },
-  { "GPO_WHS_WTANKPUMP2", 39 },
+  { "GPO_WHS_WTANKPUMP2", 40 },
   { "Midtank1Air", 14 },
   { "Midtank1Cartridge", 22 },
   { "Midtank2Air", 15 },
@@ -96,7 +98,7 @@ static const ProtobufCEnumValueIndex interface_ios__enum_values_by_name[41] =
   { "Midtank8Air", 21 },
   { "Midtank8Cartridge", 29 },
   { "SW_SPARE", 30 },
-  { "VALVE_WASTE_TANK", 40 },
+  { "VALVE_WASTE_TANK", 41 },
 };
 const ProtobufCEnumDescriptor interface_ios__descriptor =
 {
@@ -105,11 +107,11 @@ const ProtobufCEnumDescriptor interface_ios__descriptor =
   "InterfaceIOs",
   "InterfaceIOs",
   "",
-  41,
+  42,
   interface_ios__enum_values_by_number,
-  41,
+  42,
   interface_ios__enum_values_by_name,
-  11,
+  12,
   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 eea1cb6b8..31e40ba6e 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__SW_SPARE = 224,
+  INTERFACE_IOS__GPO_BUZZER = 270,
   INTERFACE_IOS__GPO_LED4 = 274,
   INTERFACE_IOS__GPO_TFEED_BREAK_1 = 296,
   INTERFACE_IOS__GPO_SPARE1_1 = 318,
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 53754f409..70d17789c 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
@@ -199,12 +199,12 @@ static const ProtobufCFieldDescriptor job_ticket__field_descriptors[14] =
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "units",
+    "NumberOfUnits",
     13,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    offsetof(JobTicket, has_units),
-    offsetof(JobTicket, units),
+    offsetof(JobTicket, has_numberofunits),
+    offsetof(JobTicket, numberofunits),
     NULL,
     NULL,
     0,             /* flags */
@@ -231,13 +231,13 @@ static const unsigned job_ticket__field_indices_by_name[] = {
   10,   /* field[10] = JobDescriptionFile */
   4,   /* field[4] = Length */
   1,   /* field[1] = Name */
+  12,   /* field[12] = NumberOfUnits */
   5,   /* field[5] = ProcessParameters */
   13,   /* field[13] = SampleWinding */
   8,   /* field[8] = Segments */
   7,   /* field[7] = Spool */
   9,   /* field[9] = UploadStrategy */
   6,   /* field[6] = WindingMethod */
-  12,   /* field[12] = units */
 };
 static const ProtobufCIntRange job_ticket__number_ranges[1 + 1] =
 {
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 d54a9c32e..3d555b717 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
@@ -50,8 +50,8 @@ struct  _JobTicket
   char *jobdescriptionfile;
   protobuf_c_boolean has_enablelubrication;
   protobuf_c_boolean enablelubrication;
-  protobuf_c_boolean has_units;
-  uint32_t units;
+  protobuf_c_boolean has_numberofunits;
+  uint32_t numberofunits;
   protobuf_c_boolean has_samplewinding;
   protobuf_c_boolean samplewinding;
 };