merge alarm handling from remote

29 files changed, 1549 insertions, 1302 deletions

diff --git a/Software/Embedded_SW/Embedded/Communication/Container.c b/Software/Embedded_SW/Embedded/Communication/Container.c
index bb6b82743..89d8cb062 100644
--- a/Software/Embedded_SW/Embedded/Communication/Container.c
+++ b/Software/Embedded_SW/Embedded/Communication/Container.c
@@ -16,7 +16,7 @@
 #include "Modules/Stubs_Handler/Stub_ExtFlash.h"
 #include "Modules/Stubs_Handler/Stub_FPGAReadBackReg.h"
 #include "Modules/Stubs_Handler/Stub_FPGAReadVersion.h"
-#include "Modules/Stubs_Handler/Stub_L6470.h"
+//#include "Modules/Stubs_Handler/Stub_L6470.h"
 #include "Modules/Stubs_Handler/Stub_Motor.h"
 #include "Modules/Stubs_Handler/Stub_HW_Version.h"
 #include "Modules/Stubs_Handler/Stub_FPGARWReg.h"
@@ -43,6 +43,7 @@
 #include "Communication/CommunicationTask.h"
 
 #include "StateMachines/Printing/PrintingSTM.h"
+#include "StateMachines/Initialization/PowerIdle.h"
 #include "Common/report/report.h"
 #include "Connection.h"
 
@@ -130,13 +131,16 @@ void receive_callback(char* buffer, size_t length)
      if (requestContainer == NULL)
          return;
    //  HeatingTestSendResonse(0, false,true,true, /*OriginalMotorSpd_2PPS[index]*/length,requestContainer->type,0,0, "Container");
-
+    if (requestContainer->type != MESSAGE_TYPE__KeepAliveRequest) //user action resets the idle counter
+    {
+        resetIdleCounter();
+        REPORT_MSG(requestContainer->type,"Message received");
+    }
      msgId[index] = requestContainer->type;
      Length[index] = length;
      DataLength[index] = requestContainer->data.len;
      if (index++>=MAX_CONT_LOG)
          index = 0;
-     REPORT_MSG(requestContainer->type,"Message received");
      switch(requestContainer->type)
      {
          case MESSAGE_TYPE__CalculateRequest:
@@ -145,12 +149,12 @@ void receive_callback(char* buffer, size_t length)
          case MESSAGE_TYPE__ProgressRequest:
              Stub_ProgressRequest(requestContainer);
              break;
-         case MESSAGE_TYPE__StubCartridgeReadRequest:
-             Stub_CartridgeReadRequest(requestContainer);
-             break;
-         case MESSAGE_TYPE__StubCartridgeWriteRequest:
-             Stub_CartridgeWriteRequest(requestContainer);
-             break;
+//         case MESSAGE_TYPE__StubCartridgeReadRequest:
+//             Stub_CartridgeReadRequest(requestContainer);
+//             break;
+//         case MESSAGE_TYPE__StubCartridgeWriteRequest:
+//             Stub_CartridgeWriteRequest(requestContainer);
+//             break;
          case MESSAGE_TYPE__StubDispenserRequest:
              Stub_DispenserRequest(requestContainer);
              break;
@@ -175,12 +179,12 @@ void receive_callback(char* buffer, size_t length)
          case MESSAGE_TYPE__StubI2CRequest:
              Stub_I2CRequest(requestContainer);
              break;
-         case MESSAGE_TYPE__StubOptLimitSwitchRequest:
-             Stub_OptLimitSwitchRequest(requestContainer);
-             break;
-         case MESSAGE_TYPE__StubSteperMotorRequest:
-             Stub_SteperMotorRequest(requestContainer);
-             break;
+//         case MESSAGE_TYPE__StubOptLimitSwitchRequest:
+//             Stub_OptLimitSwitchRequest(requestContainer);
+//             break;
+//         case MESSAGE_TYPE__StubSteperMotorRequest:
+//             Stub_SteperMotorRequest(requestContainer);
+//             break;
          case MESSAGE_TYPE__StubValveRequest:
              Stub_ValveRequest(requestContainer);
              break;
@@ -190,9 +194,9 @@ void receive_callback(char* buffer, size_t length)
          case MESSAGE_TYPE__StubExtFlashWriteRequest:
              Stub_ExtFlashWriteRequest(requestContainer);
              break;
-		case MESSAGE_TYPE__StubFPGAReadBackRegRequest:
-             Stub_FPGAReadBackRegRequest(requestContainer);
-             break;
+//		case MESSAGE_TYPE__StubFPGAReadBackRegRequest:
+//             Stub_FPGAReadBackRegRequest(requestContainer);
+//             break;
          case MESSAGE_TYPE__StubFPGAReadVersionRequest:
              Stub_FPGAReadVersionRequest(requestContainer);
              break;
@@ -204,9 +208,9 @@ void receive_callback(char* buffer, size_t length)
              Stub_FpgaWriteRegRequest(requestContainer);
              break;
              /*************************************/
-         case MESSAGE_TYPE__StubL6470DriverRequest:
-             Stub_L6470DriverRequest(requestContainer);
-             break;
+//         case MESSAGE_TYPE__StubL6470DriverRequest:
+//             Stub_L6470DriverRequest(requestContainer);
+//             break;
          case MESSAGE_TYPE__StubMotorInitRequest:
              Stub_MotorInitRequest(requestContainer);
              break;
@@ -237,9 +241,9 @@ void receive_callback(char* buffer, size_t length)
          case MESSAGE_TYPE__StubAbortJobRequest:
              Stub_AbortJobRequest(requestContainer);
              break;
-         case MESSAGE_TYPE__StubHWVersionRequest:
-             Stub_HWVersionRequest(requestContainer);
-             break;
+//         case MESSAGE_TYPE__StubHWVersionRequest:
+//             Stub_HWVersionRequest(requestContainer);
+//             break;
          case MESSAGE_TYPE__StartDebugLogRequest:
              ReportInitMessage(requestContainer);
              break;
@@ -281,18 +285,18 @@ void receive_callback(char* buffer, size_t length)
          case MESSAGE_TYPE__SystemResetRequest:
              HWSystemResetRequest(requestContainer);
              break;
-         case MESSAGE_TYPE__StubTivaReadRegRequest:
-             Stub_TivaReadRegRequest(requestContainer);
-             break;
-         case MESSAGE_TYPE__StubTivaWriteRegRequest:
-             Stub_TivaWriteRegRequest(requestContainer);
-             break;
+//         case MESSAGE_TYPE__StubTivaReadRegRequest:
+//             Stub_TivaReadRegRequest(requestContainer);
+//             break;
+//         case MESSAGE_TYPE__StubTivaWriteRegRequest:
+//             Stub_TivaWriteRegRequest(requestContainer);
+//             break;
          case MESSAGE_TYPE__StubDancerPositionRequest:
              Stub_DancerPositionRequest(requestContainer);
              break;
-         case MESSAGE_TYPE__StubSpeedSensorRequest:
-             Stub_SpeedSensorRequest(requestContainer);
-             break;
+//         case MESSAGE_TYPE__StubSpeedSensorRequest:
+//             Stub_SpeedSensorRequest(requestContainer);
+//             break;
          case MESSAGE_TYPE__StubRealTimeUsageRequest:
              Stub_RealTimeUsageRequest(requestContainer);
              break;
@@ -416,6 +420,9 @@ void receive_callback(char* buffer, size_t length)
          case MESSAGE_TYPE__StubMidTankPressureSensorRequest:
              Stub_MidTankPressureSensorRequest(requestContainer);
              break;
+         case MESSAGE_TYPE__DispenserDataRequest:
+             DispenserDataRequestFunc(requestContainer);
+             break;
          default:
              //unsupported message type !!
              LOG_ERROR (requestContainer->type,"unsupported message type");
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.c
index 0218796ed..48bc98319 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.c
@@ -7,7 +7,7 @@
 #endif
 
 #include "MessageType.pb-c.h"
-static const ProtobufCEnumValue message_type__enum_values_by_number[205] =
+static const ProtobufCEnumValue message_type__enum_values_by_number[207] =
 {
   { "None", "MESSAGE_TYPE__None", 0 },
   { "ErrorResponse", "MESSAGE_TYPE__ErrorResponse", 1 },
@@ -214,11 +214,13 @@ static const ProtobufCEnumValue message_type__enum_values_by_number[205] =
   { "ValidateVersionResponse", "MESSAGE_TYPE__ValidateVersionResponse", 7021 },
   { "ActivateVersionRequest", "MESSAGE_TYPE__ActivateVersionRequest", 7022 },
   { "ActivateVersionResponse", "MESSAGE_TYPE__ActivateVersionResponse", 7023 },
+  { "DispenserDataRequest", "MESSAGE_TYPE__DispenserDataRequest", 8000 },
+  { "DispenserDataResponse", "MESSAGE_TYPE__DispenserDataResponse", 8001 },
 };
 static const ProtobufCIntRange message_type__value_ranges[] = {
-{0, 0},{3, 2},{1000, 104},{2000, 117},{3000, 157},{4000, 167},{5000, 171},{6000, 175},{7000, 181},{0, 205}
+{0, 0},{3, 2},{1000, 104},{2000, 117},{3000, 157},{4000, 167},{5000, 171},{6000, 175},{7000, 181},{8000, 205},{0, 207}
 };
-static const ProtobufCEnumValueIndex message_type__enum_values_by_name[205] =
+static const ProtobufCEnumValueIndex message_type__enum_values_by_name[207] =
 {
   { "AbortJobRequest", 159 },
   { "AbortJobResponse", 160 },
@@ -242,6 +244,8 @@ static const ProtobufCEnumValueIndex message_type__enum_values_by_name[205] =
   { "DispenserAbortHomingResponse", 128 },
   { "DispenserAbortJoggingRequest", 133 },
   { "DispenserAbortJoggingResponse", 134 },
+  { "DispenserDataRequest", 205 },
+  { "DispenserDataResponse", 206 },
   { "DispenserHomingRequest", 129 },
   { "DispenserHomingResponse", 130 },
   { "DispenserJoggingRequest", 131 },
@@ -433,11 +437,11 @@ const ProtobufCEnumDescriptor message_type__descriptor =
   "MessageType",
   "MessageType",
   "",
-  205,
+  207,
   message_type__enum_values_by_number,
-  205,
+  207,
   message_type__enum_values_by_name,
-  9,
+  10,
   message_type__value_ranges,
   NULL,NULL,NULL,NULL   /* reserved[1234] */
 };
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.h
index bfbdf880d..7fde64335 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.h
@@ -224,7 +224,9 @@ typedef enum _MessageType {
   MESSAGE_TYPE__ValidateVersionRequest = 7020,
   MESSAGE_TYPE__ValidateVersionResponse = 7021,
   MESSAGE_TYPE__ActivateVersionRequest = 7022,
-  MESSAGE_TYPE__ActivateVersionResponse = 7023
+  MESSAGE_TYPE__ActivateVersionResponse = 7023,
+  MESSAGE_TYPE__DispenserDataRequest = 8000,
+  MESSAGE_TYPE__DispenserDataResponse = 8001
     PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(MESSAGE_TYPE)
 } MessageType;
 
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/DebugDistributor.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/DebugDistributor.pb-c.c
new file mode 100644
index 000000000..df9728c6c
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/DebugDistributor.pb-c.c
@@ -0,0 +1,61 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: DebugDistributor.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "DebugDistributor.pb-c.h"
+static const ProtobufCEnumValue debug_distributor__enum_values_by_number[14] =
+{
+  { "ControlFilter", "DEBUG_DISTRIBUTOR__ControlFilter", 0 },
+  { "HeatersFilter", "DEBUG_DISTRIBUTOR__HeatersFilter", 1 },
+  { "JobFilter", "DEBUG_DISTRIBUTOR__JobFilter", 2 },
+  { "WasteFilter", "DEBUG_DISTRIBUTOR__WasteFilter", 3 },
+  { "AlarmFilter", "DEBUG_DISTRIBUTOR__AlarmFilter", 4 },
+  { "DiagnosticsFilter", "DEBUG_DISTRIBUTOR__DiagnosticsFilter", 5 },
+  { "IDSFilter", "DEBUG_DISTRIBUTOR__IDSFilter", 6 },
+  { "ThreadFilter", "DEBUG_DISTRIBUTOR__ThreadFilter", 7 },
+  { "GeneralFilter", "DEBUG_DISTRIBUTOR__GeneralFilter", 8 },
+  { "CommFilter", "DEBUG_DISTRIBUTOR__CommFilter", 9 },
+  { "FPGAFilter", "DEBUG_DISTRIBUTOR__FPGAFilter", 10 },
+  { "LoadFilter", "DEBUG_DISTRIBUTOR__LoadFilter", 11 },
+  { "InitFilter", "DEBUG_DISTRIBUTOR__InitFilter", 12 },
+  { "MaintFilter", "DEBUG_DISTRIBUTOR__MaintFilter", 13 },
+};
+static const ProtobufCIntRange debug_distributor__value_ranges[] = {
+{0, 0},{0, 14}
+};
+static const ProtobufCEnumValueIndex debug_distributor__enum_values_by_name[14] =
+{
+  { "AlarmFilter", 4 },
+  { "CommFilter", 9 },
+  { "ControlFilter", 0 },
+  { "DiagnosticsFilter", 5 },
+  { "FPGAFilter", 10 },
+  { "GeneralFilter", 8 },
+  { "HeatersFilter", 1 },
+  { "IDSFilter", 6 },
+  { "InitFilter", 12 },
+  { "JobFilter", 2 },
+  { "LoadFilter", 11 },
+  { "MaintFilter", 13 },
+  { "ThreadFilter", 7 },
+  { "WasteFilter", 3 },
+};
+const ProtobufCEnumDescriptor debug_distributor__descriptor =
+{
+  PROTOBUF_C__ENUM_DESCRIPTOR_MAGIC,
+  "DebugDistributor",
+  "DebugDistributor",
+  "DebugDistributor",
+  "",
+  14,
+  debug_distributor__enum_values_by_number,
+  14,
+  debug_distributor__enum_values_by_name,
+  1,
+  debug_distributor__value_ranges,
+  NULL,NULL,NULL,NULL   /* reserved[1234] */
+};
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/DebugDistributor.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/DebugDistributor.pb-c.h
new file mode 100644
index 000000000..c4385cf7e
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/DebugDistributor.pb-c.h
@@ -0,0 +1,55 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: DebugDistributor.proto */
+
+#ifndef PROTOBUF_C_DebugDistributor_2eproto__INCLUDED
+#define PROTOBUF_C_DebugDistributor_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c.
+#endif
+
+
+
+
+/* --- enums --- */
+
+typedef enum _DebugDistributor {
+  DEBUG_DISTRIBUTOR__ControlFilter = 0,
+  DEBUG_DISTRIBUTOR__HeatersFilter = 1,
+  DEBUG_DISTRIBUTOR__JobFilter = 2,
+  DEBUG_DISTRIBUTOR__WasteFilter = 3,
+  DEBUG_DISTRIBUTOR__AlarmFilter = 4,
+  DEBUG_DISTRIBUTOR__DiagnosticsFilter = 5,
+  DEBUG_DISTRIBUTOR__IDSFilter = 6,
+  DEBUG_DISTRIBUTOR__ThreadFilter = 7,
+  DEBUG_DISTRIBUTOR__GeneralFilter = 8,
+  DEBUG_DISTRIBUTOR__CommFilter = 9,
+  DEBUG_DISTRIBUTOR__FPGAFilter = 10,
+  DEBUG_DISTRIBUTOR__LoadFilter = 11,
+  DEBUG_DISTRIBUTOR__InitFilter = 12,
+  DEBUG_DISTRIBUTOR__MaintFilter = 13
+    PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(DEBUG_DISTRIBUTOR)
+} DebugDistributor;
+
+/* --- messages --- */
+
+/* --- per-message closures --- */
+
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCEnumDescriptor    debug_distributor__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_DebugDistributor_2eproto__INCLUDED */
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/Debugging/SetupDebugDisributorsRequest.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/SetupDebugDisributorsRequest.pb-c.c
new file mode 100644
index 000000000..ebdad2054
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/SetupDebugDisributorsRequest.pb-c.c
@@ -0,0 +1,92 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: SetupDebugDisributorsRequest.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "SetupDebugDisributorsRequest.pb-c.h"
+void   setup_debug_disributors_request__init
+                     (SetupDebugDisributorsRequest         *message)
+{
+  static const SetupDebugDisributorsRequest init_value = SETUP_DEBUG_DISRIBUTORS_REQUEST__INIT;
+  *message = init_value;
+}
+size_t setup_debug_disributors_request__get_packed_size
+                     (const SetupDebugDisributorsRequest *message)
+{
+  assert(message->base.descriptor == &setup_debug_disributors_request__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t setup_debug_disributors_request__pack
+                     (const SetupDebugDisributorsRequest *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &setup_debug_disributors_request__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t setup_debug_disributors_request__pack_to_buffer
+                     (const SetupDebugDisributorsRequest *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &setup_debug_disributors_request__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+SetupDebugDisributorsRequest *
+       setup_debug_disributors_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (SetupDebugDisributorsRequest *)
+     protobuf_c_message_unpack (&setup_debug_disributors_request__descriptor,
+                                allocator, len, data);
+}
+void   setup_debug_disributors_request__free_unpacked
+                     (SetupDebugDisributorsRequest *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &setup_debug_disributors_request__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor setup_debug_disributors_request__field_descriptors[1] =
+{
+  {
+    "DistributorActive",
+    1,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(SetupDebugDisributorsRequest, n_distributoractive),
+    offsetof(SetupDebugDisributorsRequest, distributoractive),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned setup_debug_disributors_request__field_indices_by_name[] = {
+  0,   /* field[0] = DistributorActive */
+};
+static const ProtobufCIntRange setup_debug_disributors_request__number_ranges[1 + 1] =
+{
+  { 1, 0 },
+  { 0, 1 }
+};
+const ProtobufCMessageDescriptor setup_debug_disributors_request__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "SetupDebugDisributorsRequest",
+  "SetupDebugDisributorsRequest",
+  "SetupDebugDisributorsRequest",
+  "",
+  sizeof(SetupDebugDisributorsRequest),
+  1,
+  setup_debug_disributors_request__field_descriptors,
+  setup_debug_disributors_request__field_indices_by_name,
+  1,  setup_debug_disributors_request__number_ranges,
+  (ProtobufCMessageInit) setup_debug_disributors_request__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/SetupDebugDisributorsRequest.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/SetupDebugDisributorsRequest.pb-c.h
new file mode 100644
index 000000000..65a5091ac
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/SetupDebugDisributorsRequest.pb-c.h
@@ -0,0 +1,72 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: SetupDebugDisributorsRequest.proto */
+
+#ifndef PROTOBUF_C_SetupDebugDisributorsRequest_2eproto__INCLUDED
+#define PROTOBUF_C_SetupDebugDisributorsRequest_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c.
+#endif
+
+
+typedef struct _SetupDebugDisributorsRequest SetupDebugDisributorsRequest;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _SetupDebugDisributorsRequest
+{
+  ProtobufCMessage base;
+  size_t n_distributoractive;
+  protobuf_c_boolean *distributoractive;
+};
+#define SETUP_DEBUG_DISRIBUTORS_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&setup_debug_disributors_request__descriptor) \
+    , 0,NULL }
+
+
+/* SetupDebugDisributorsRequest methods */
+void   setup_debug_disributors_request__init
+                     (SetupDebugDisributorsRequest         *message);
+size_t setup_debug_disributors_request__get_packed_size
+                     (const SetupDebugDisributorsRequest   *message);
+size_t setup_debug_disributors_request__pack
+                     (const SetupDebugDisributorsRequest   *message,
+                      uint8_t             *out);
+size_t setup_debug_disributors_request__pack_to_buffer
+                     (const SetupDebugDisributorsRequest   *message,
+                      ProtobufCBuffer     *buffer);
+SetupDebugDisributorsRequest *
+       setup_debug_disributors_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   setup_debug_disributors_request__free_unpacked
+                     (SetupDebugDisributorsRequest *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*SetupDebugDisributorsRequest_Closure)
+                 (const SetupDebugDisributorsRequest *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor setup_debug_disributors_request__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_SetupDebugDisributorsRequest_2eproto__INCLUDED */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/SetupDebugDisributorsResponse.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/SetupDebugDisributorsResponse.pb-c.c
new file mode 100644
index 000000000..514e7c05b
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/SetupDebugDisributorsResponse.pb-c.c
@@ -0,0 +1,72 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: SetupDebugDisributorsResponse.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "SetupDebugDisributorsResponse.pb-c.h"
+void   setup_debug_disributors_response__init
+                     (SetupDebugDisributorsResponse         *message)
+{
+  static const SetupDebugDisributorsResponse init_value = SETUP_DEBUG_DISRIBUTORS_RESPONSE__INIT;
+  *message = init_value;
+}
+size_t setup_debug_disributors_response__get_packed_size
+                     (const SetupDebugDisributorsResponse *message)
+{
+  assert(message->base.descriptor == &setup_debug_disributors_response__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t setup_debug_disributors_response__pack
+                     (const SetupDebugDisributorsResponse *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &setup_debug_disributors_response__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t setup_debug_disributors_response__pack_to_buffer
+                     (const SetupDebugDisributorsResponse *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &setup_debug_disributors_response__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+SetupDebugDisributorsResponse *
+       setup_debug_disributors_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (SetupDebugDisributorsResponse *)
+     protobuf_c_message_unpack (&setup_debug_disributors_response__descriptor,
+                                allocator, len, data);
+}
+void   setup_debug_disributors_response__free_unpacked
+                     (SetupDebugDisributorsResponse *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &setup_debug_disributors_response__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+#define setup_debug_disributors_response__field_descriptors NULL
+#define setup_debug_disributors_response__field_indices_by_name NULL
+#define setup_debug_disributors_response__number_ranges NULL
+const ProtobufCMessageDescriptor setup_debug_disributors_response__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "SetupDebugDisributorsResponse",
+  "SetupDebugDisributorsResponse",
+  "SetupDebugDisributorsResponse",
+  "",
+  sizeof(SetupDebugDisributorsResponse),
+  0,
+  setup_debug_disributors_response__field_descriptors,
+  setup_debug_disributors_response__field_indices_by_name,
+  0,  setup_debug_disributors_response__number_ranges,
+  (ProtobufCMessageInit) setup_debug_disributors_response__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/SetupDebugDisributorsResponse.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/SetupDebugDisributorsResponse.pb-c.h
new file mode 100644
index 000000000..a3ecfb1d7
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Debugging/SetupDebugDisributorsResponse.pb-c.h
@@ -0,0 +1,70 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: SetupDebugDisributorsResponse.proto */
+
+#ifndef PROTOBUF_C_SetupDebugDisributorsResponse_2eproto__INCLUDED
+#define PROTOBUF_C_SetupDebugDisributorsResponse_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c.
+#endif
+
+
+typedef struct _SetupDebugDisributorsResponse SetupDebugDisributorsResponse;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _SetupDebugDisributorsResponse
+{
+  ProtobufCMessage base;
+};
+#define SETUP_DEBUG_DISRIBUTORS_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&setup_debug_disributors_response__descriptor) \
+     }
+
+
+/* SetupDebugDisributorsResponse methods */
+void   setup_debug_disributors_response__init
+                     (SetupDebugDisributorsResponse         *message);
+size_t setup_debug_disributors_response__get_packed_size
+                     (const SetupDebugDisributorsResponse   *message);
+size_t setup_debug_disributors_response__pack
+                     (const SetupDebugDisributorsResponse   *message,
+                      uint8_t             *out);
+size_t setup_debug_disributors_response__pack_to_buffer
+                     (const SetupDebugDisributorsResponse   *message,
+                      ProtobufCBuffer     *buffer);
+SetupDebugDisributorsResponse *
+       setup_debug_disributors_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   setup_debug_disributors_response__free_unpacked
+                     (SetupDebugDisributorsResponse *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*SetupDebugDisributorsResponse_Closure)
+                 (const SetupDebugDisributorsResponse *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor setup_debug_disributors_response__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_SetupDebugDisributorsResponse_2eproto__INCLUDED */
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 3bbdcdd8c..2a5974162 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[55] =
+static const ProtobufCFieldDescriptor diagnostics_monitors__field_descriptors[63] =
 {
   {
     "Dancer1Angle",
@@ -714,6 +714,102 @@ static const ProtobufCFieldDescriptor diagnostics_monitors__field_descriptors[55
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "DrierZone1HeaterCurrent",
+    56,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(DiagnosticsMonitors, n_drierzone1heatercurrent),
+    offsetof(DiagnosticsMonitors, drierzone1heatercurrent),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "DrierZone2HeaterCurrent",
+    57,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(DiagnosticsMonitors, n_drierzone2heatercurrent),
+    offsetof(DiagnosticsMonitors, drierzone2heatercurrent),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "HeadZone1HeaterCurrent",
+    58,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(DiagnosticsMonitors, n_headzone1heatercurrent),
+    offsetof(DiagnosticsMonitors, headzone1heatercurrent),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "HeadZone2HeaterCurrent",
+    59,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(DiagnosticsMonitors, n_headzone2heatercurrent),
+    offsetof(DiagnosticsMonitors, headzone2heatercurrent),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "HeadZone3HeaterCurrent",
+    60,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(DiagnosticsMonitors, n_headzone3heatercurrent),
+    offsetof(DiagnosticsMonitors, headzone3heatercurrent),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "HeadZone4HeaterCurrent",
+    61,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(DiagnosticsMonitors, n_headzone4heatercurrent),
+    offsetof(DiagnosticsMonitors, headzone4heatercurrent),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "HeadZone5_6HeaterCurrent",
+    62,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(DiagnosticsMonitors, n_headzone5_6heatercurrent),
+    offsetof(DiagnosticsMonitors, headzone5_6heatercurrent),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "Mixer1HeaterCurrent",
+    63,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(DiagnosticsMonitors, n_mixer1heatercurrent),
+    offsetof(DiagnosticsMonitors, mixer1heatercurrent),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned diagnostics_monitors__field_indices_by_name[] = {
   38,   /* field[38] = BlowerVoltage */
@@ -741,6 +837,8 @@ static const unsigned diagnostics_monitors__field_indices_by_name[] = {
   23,   /* field[23] = DispensersLinearPositions */
   21,   /* field[21] = DispensersMotorsFrequency */
   24,   /* field[24] = DispensersPressure */
+  55,   /* field[55] = DrierZone1HeaterCurrent */
+  56,   /* field[56] = DrierZone2HeaterCurrent */
   19,   /* field[19] = DryerAirFlow */
   4,   /* field[4] = DryerMotor */
   16,   /* field[16] = DryerZone1Temperature */
@@ -750,11 +848,16 @@ static const unsigned diagnostics_monitors__field_indices_by_name[] = {
   14,   /* field[14] = FeederTension */
   25,   /* field[25] = FilterDeltaPressure */
   13,   /* field[13] = HeadAirFlow */
+  57,   /* field[57] = HeadZone1HeaterCurrent */
   10,   /* field[10] = HeadZone1Temperature */
+  58,   /* field[58] = HeadZone2HeaterCurrent */
   11,   /* field[11] = HeadZone2Temperature */
+  59,   /* field[59] = HeadZone3HeaterCurrent */
   12,   /* field[12] = HeadZone3Temperature */
+  60,   /* field[60] = HeadZone4HeaterCurrent */
   35,   /* field[35] = HeadZone4Temperature */
   36,   /* field[36] = HeadZone5Temperature */
+  61,   /* field[61] = HeadZone5_6HeaterCurrent */
   37,   /* field[37] = HeadZone6Temperature */
   47,   /* field[47] = MidTank1Level */
   48,   /* field[48] = MidTank2Level */
@@ -764,6 +867,7 @@ static const unsigned diagnostics_monitors__field_indices_by_name[] = {
   52,   /* field[52] = MidTank6Level */
   53,   /* field[53] = MidTank7Level */
   54,   /* field[54] = MidTank8Level */
+  62,   /* field[62] = Mixer1HeaterCurrent */
   9,   /* field[9] = MixerTemperature */
   5,   /* field[5] = PollerMotor */
   15,   /* field[15] = PullerTension */
@@ -775,7 +879,7 @@ static const unsigned diagnostics_monitors__field_indices_by_name[] = {
 static const ProtobufCIntRange diagnostics_monitors__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 55 }
+  { 0, 63 }
 };
 const ProtobufCMessageDescriptor diagnostics_monitors__descriptor =
 {
@@ -785,7 +889,7 @@ const ProtobufCMessageDescriptor diagnostics_monitors__descriptor =
   "DiagnosticsMonitors",
   "",
   sizeof(DiagnosticsMonitors),
-  55,
+  63,
   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 5917ffd76..13ebbaf21 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
@@ -137,10 +137,26 @@ struct  _DiagnosticsMonitors
   double *midtank7level;
   size_t n_midtank8level;
   double *midtank8level;
+  size_t n_drierzone1heatercurrent;
+  double *drierzone1heatercurrent;
+  size_t n_drierzone2heatercurrent;
+  double *drierzone2heatercurrent;
+  size_t n_headzone1heatercurrent;
+  double *headzone1heatercurrent;
+  size_t n_headzone2heatercurrent;
+  double *headzone2heatercurrent;
+  size_t n_headzone3heatercurrent;
+  double *headzone3heatercurrent;
+  size_t n_headzone4heatercurrent;
+  double *headzone4heatercurrent;
+  size_t n_headzone5_6heatercurrent;
+  double *headzone5_6heatercurrent;
+  size_t n_mixer1heatercurrent;
+  double *mixer1heatercurrent;
 };
 #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 }
 
 
 /* DiagnosticsMonitors methods */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.c
index 785da53e2..d5b888912 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.c
@@ -7,7 +7,7 @@
 #endif
 
 #include "EventType.pb-c.h"
-static const ProtobufCEnumValue event_type__enum_values_by_number[279] =
+static const ProtobufCEnumValue event_type__enum_values_by_number[285] =
 {
   { "None", "EVENT_TYPE__None", 0 },
   { "REQUEST_SENT", "EVENT_TYPE__REQUEST_SENT", 1000 },
@@ -33,6 +33,10 @@ static const ProtobufCEnumValue event_type__enum_values_by_number[279] =
   { "MACHINE_FANS_STOPPED", "EVENT_TYPE__MACHINE_FANS_STOPPED", 2010 },
   { "ELECTRICAL_CABINET_FANS_RPM_TOO_LOW", "EVENT_TYPE__ELECTRICAL_CABINET_FANS_RPM_TOO_LOW", 2011 },
   { "ELECTRICAL_CABINET_FANS_STOPPED", "EVENT_TYPE__ELECTRICAL_CABINET_FANS_STOPPED", 2012 },
+  { "MACHINE_STATE_NO_CFG_FILE", "EVENT_TYPE__MACHINE_STATE_NO_CFG_FILE", 2013 },
+  { "MACHINE_STATE_HW_CONFIG_FAILED", "EVENT_TYPE__MACHINE_STATE_HW_CONFIG_FAILED", 2014 },
+  { "MACHINE_STATE_INITIAL_BLOWER_FAILED", "EVENT_TYPE__MACHINE_STATE_INITIAL_BLOWER_FAILED", 2015 },
+  { "UNSPECIFIED", "EVENT_TYPE__UNSPECIFIED", 2016 },
   { "THREAD_BREAK", "EVENT_TYPE__THREAD_BREAK", 3000 },
   { "THREAD_TENSION_CONTROL_FAILURE_FEEDER_DANCER", "EVENT_TYPE__THREAD_TENSION_CONTROL_FAILURE_FEEDER_DANCER", 3001 },
   { "WINDER_CONE_DOES_NOT_EXIST", "EVENT_TYPE__WINDER_CONE_DOES_NOT_EXIST", 3002 },
@@ -83,6 +87,7 @@ static const ProtobufCEnumValue event_type__enum_values_by_number[279] =
   { "FEEDER_DANCER_MOTOR_UNDERVOLTAGE", "EVENT_TYPE__FEEDER_DANCER_MOTOR_UNDERVOLTAGE", 3047 },
   { "THREAD_TENSION_CONTROL_FAILURE_PULLER_DANCER", "EVENT_TYPE__THREAD_TENSION_CONTROL_FAILURE_PULLER_DANCER", 3048 },
   { "THREAD_TENSION_CONTROL_FAILURE_WINDER_DANCER", "EVENT_TYPE__THREAD_TENSION_CONTROL_FAILURE_WINDER_DANCER", 3049 },
+  { "MACHINE_STATE_NO_THREAD_DETECTED", "EVENT_TYPE__MACHINE_STATE_NO_THREAD_DETECTED", 3050 },
   { "DRYER_MOTOR_OVERCURRENT", "EVENT_TYPE__DRYER_MOTOR_OVERCURRENT", 4000 },
   { "DRYER_MOTOR_OVERTEMPERATURE", "EVENT_TYPE__DRYER_MOTOR_OVERTEMPERATURE", 4001 },
   { "DRYER_MOTOR_STALL", "EVENT_TYPE__DRYER_MOTOR_STALL", 4002 },
@@ -240,8 +245,8 @@ static const ProtobufCEnumValue event_type__enum_values_by_number[279] =
   { "DISPENSER_4_HIGH_PRESSURE", "EVENT_TYPE__DISPENSER_4_HIGH_PRESSURE", 7083 },
   { "DISPENSER_5_HIGH_PRESSURE", "EVENT_TYPE__DISPENSER_5_HIGH_PRESSURE", 7084 },
   { "DISPENSER_6_HIGH_PRESSURE", "EVENT_TYPE__DISPENSER_6_HIGH_PRESSURE", 7085 },
-  { "DISPENSER_8_HIGH_PRESSURE", "EVENT_TYPE__DISPENSER_8_HIGH_PRESSURE", 7086 },
-  { "DISPENSER_7_HIGH_PRESSURE", "EVENT_TYPE__DISPENSER_7_HIGH_PRESSURE", 7087 },
+  { "DISPENSER_7_HIGH_PRESSURE", "EVENT_TYPE__DISPENSER_7_HIGH_PRESSURE", 7086 },
+  { "DISPENSER_8_HIGH_PRESSURE", "EVENT_TYPE__DISPENSER_8_HIGH_PRESSURE", 7087 },
   { "MID_TANK_1_LOW_LEVEL", "EVENT_TYPE__MID_TANK_1_LOW_LEVEL", 8000 },
   { "MID_TANK_2_LOW_LEVEL", "EVENT_TYPE__MID_TANK_2_LOW_LEVEL", 8001 },
   { "MID_TANK_3_LOW_LEVEL", "EVENT_TYPE__MID_TANK_3_LOW_LEVEL", 8002 },
@@ -279,9 +284,10 @@ static const ProtobufCEnumValue event_type__enum_values_by_number[279] =
   { "WASTE_CONTAINER_EMPTYING_TIMEOUT", "EVENT_TYPE__WASTE_CONTAINER_EMPTYING_TIMEOUT", 9002 },
   { "NO_AIR_PRESSURE", "EVENT_TYPE__NO_AIR_PRESSURE", 9003 },
   { "WASTE_CONTAINER_OVERFLOW", "EVENT_TYPE__WASTE_CONTAINER_OVERFLOW", 9004 },
-  { "VOC_SENSOR_ALARM", "EVENT_TYPE__VOC_SENSOR_ALARM", 9005 },
+  { "VOC_SENSOR_ALARM_TIME", "EVENT_TYPE__VOC_SENSOR_ALARM_TIME", 9005 },
   { "CHILLER_DRY_CONTACT", "EVENT_TYPE__CHILLER_DRY_CONTACT", 9006 },
   { "INSUFFICIENT_AIR_FLOW", "EVENT_TYPE__INSUFFICIENT_AIR_FLOW", 9007 },
+  { "VOC_SENSOR_ALARM_SLOPE", "EVENT_TYPE__VOC_SENSOR_ALARM_SLOPE", 9008 },
   { "INK_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT", "EVENT_TYPE__INK_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT", 10000 },
   { "INK_CARTRIDGE_RFID_TIMEOUT", "EVENT_TYPE__INK_CARTRIDGE_RFID_TIMEOUT", 10001 },
   { "NO_WASTE_CARTRIDGE_AVAILABLE", "EVENT_TYPE__NO_WASTE_CARTRIDGE_AVAILABLE", 10002 },
@@ -290,289 +296,295 @@ static const ProtobufCEnumValue event_type__enum_values_by_number[279] =
   { "WASTE_CARTRIDGE_RFID_TIMEOUT", "EVENT_TYPE__WASTE_CARTRIDGE_RFID_TIMEOUT", 10005 },
 };
 static const ProtobufCIntRange event_type__value_ranges[] = {
-{0, 0},{1000, 1},{2000, 11},{3000, 24},{4000, 74},{5000, 96},{6000, 139},{7000, 145},{8000, 233},{9000, 265},{10000, 273},{0, 279}
+{0, 0},{1000, 1},{2000, 11},{3000, 28},{4000, 79},{5000, 101},{6000, 144},{7000, 150},{8000, 238},{9000, 270},{10000, 279},{0, 285}
 };
-static const ProtobufCEnumValueIndex event_type__enum_values_by_name[279] =
+static const ProtobufCEnumValueIndex event_type__enum_values_by_name[285] =
 {
-  { "AIR_FILTER_CLOGGED", 266 },
-  { "AIR_FILTER_NOT_INSTALLED", 265 },
-  { "ALL_WASTE_CARTRIDGES_FULL", 276 },
+  { "AIR_FILTER_CLOGGED", 271 },
+  { "AIR_FILTER_NOT_INSTALLED", 270 },
+  { "ALL_WASTE_CARTRIDGES_FULL", 282 },
   { "APPLICATION_EXCEPTION", 4 },
   { "APPLICATION_INFORMATION", 5 },
   { "APPLICATION_STARTED", 6 },
   { "APPLICATION_TERMINATED", 7 },
   { "CARTRIDGES_COVER_OPEN", 17 },
-  { "CHILLER_DRY_CONTACT", 271 },
-  { "DISPENSER_1_EMPTY", 161 },
-  { "DISPENSER_1_HIGH_PRESSURE", 225 },
-  { "DISPENSER_1_LOWER_HARD_LIMIT", 217 },
-  { "DISPENSER_1_MOTOR_OVERCURRENT", 177 },
-  { "DISPENSER_1_MOTOR_OVERTEMPERATURE", 185 },
-  { "DISPENSER_1_MOTOR_STALL", 193 },
-  { "DISPENSER_1_MOTOR_UNDERVOLTAGE", 201 },
-  { "DISPENSER_1_OVERPRESSURE", 145 },
-  { "DISPENSER_1_REFILL_FAILURE", 169 },
-  { "DISPENSER_1_UNDERPRESSURE", 153 },
-  { "DISPENSER_1_UPPER_HARD_LIMIT", 209 },
-  { "DISPENSER_2_EMPTY", 162 },
-  { "DISPENSER_2_HIGH_PRESSURE", 226 },
-  { "DISPENSER_2_LOWER_HARD_LIMIT", 218 },
-  { "DISPENSER_2_MOTOR_OVERCURRENT", 178 },
-  { "DISPENSER_2_MOTOR_OVERTEMPERATURE", 186 },
-  { "DISPENSER_2_MOTOR_STALL", 194 },
-  { "DISPENSER_2_MOTOR_UNDERVOLTAGE", 202 },
-  { "DISPENSER_2_OVERPRESSURE", 146 },
-  { "DISPENSER_2_REFILL_FAILURE", 170 },
-  { "DISPENSER_2_UNDERPRESSURE", 154 },
-  { "DISPENSER_2_UPPER_HARD_LIMIT", 210 },
-  { "DISPENSER_3_EMPTY", 163 },
-  { "DISPENSER_3_HIGH_PRESSURE", 227 },
-  { "DISPENSER_3_LOWER_HARD_LIMIT", 219 },
-  { "DISPENSER_3_MOTOR_OVERCURRENT", 179 },
-  { "DISPENSER_3_MOTOR_OVERTEMPERATURE", 187 },
-  { "DISPENSER_3_MOTOR_STALL", 195 },
-  { "DISPENSER_3_MOTOR_UNDERVOLTAGE", 203 },
-  { "DISPENSER_3_OVERPRESSURE", 147 },
-  { "DISPENSER_3_REFILL_FAILURE", 171 },
-  { "DISPENSER_3_UNDERPRESSURE", 155 },
-  { "DISPENSER_3_UPPER_HARD_LIMIT", 211 },
-  { "DISPENSER_4_EMPTY", 164 },
-  { "DISPENSER_4_HIGH_PRESSURE", 228 },
-  { "DISPENSER_4_LOWER_HARD_LIMIT", 220 },
-  { "DISPENSER_4_MOTOR_OVERCURRENT", 180 },
-  { "DISPENSER_4_MOTOR_OVERTEMPERATURE", 188 },
-  { "DISPENSER_4_MOTOR_STALL", 196 },
-  { "DISPENSER_4_MOTOR_UNDERVOLTAGE", 204 },
-  { "DISPENSER_4_OVERPRESSURE", 148 },
-  { "DISPENSER_4_REFILL_FAILURE", 172 },
-  { "DISPENSER_4_UNDERPRESSURE", 156 },
-  { "DISPENSER_4_UPPER_HARD_LIMIT", 212 },
-  { "DISPENSER_5_EMPTY", 165 },
-  { "DISPENSER_5_HIGH_PRESSURE", 229 },
-  { "DISPENSER_5_LOWER_HARD_LIMIT", 221 },
-  { "DISPENSER_5_MOTOR_OVERCURRENT", 181 },
-  { "DISPENSER_5_MOTOR_OVERTEMPERATURE", 189 },
-  { "DISPENSER_5_MOTOR_STALL", 197 },
-  { "DISPENSER_5_MOTOR_UNDERVOLTAGE", 205 },
-  { "DISPENSER_5_OVERPRESSURE", 149 },
-  { "DISPENSER_5_REFILL_FAILURE", 173 },
-  { "DISPENSER_5_UNDERPRESSURE", 157 },
-  { "DISPENSER_5_UPPER_HARD_LIMIT", 213 },
-  { "DISPENSER_6_EMPTY", 166 },
-  { "DISPENSER_6_HIGH_PRESSURE", 230 },
-  { "DISPENSER_6_LOWER_HARD_LIMIT", 222 },
-  { "DISPENSER_6_MOTOR_OVERCURRENT", 182 },
-  { "DISPENSER_6_MOTOR_OVERTEMPERATURE", 190 },
-  { "DISPENSER_6_MOTOR_STALL", 198 },
-  { "DISPENSER_6_MOTOR_UNDERVOLTAGE", 206 },
-  { "DISPENSER_6_OVERPRESSURE", 150 },
-  { "DISPENSER_6_REFILL_FAILURE", 174 },
-  { "DISPENSER_6_UNDERPRESSURE", 158 },
-  { "DISPENSER_6_UPPER_HARD_LIMIT", 214 },
-  { "DISPENSER_7_EMPTY", 167 },
-  { "DISPENSER_7_HIGH_PRESSURE", 232 },
-  { "DISPENSER_7_LOWER_HARD_LIMIT", 223 },
-  { "DISPENSER_7_MOTOR_OVERCURRENT", 183 },
-  { "DISPENSER_7_MOTOR_OVERTEMPERATURE", 191 },
-  { "DISPENSER_7_MOTOR_STALL", 199 },
-  { "DISPENSER_7_MOTOR_UNDERVOLTAGE", 207 },
-  { "DISPENSER_7_OVERPRESSURE", 151 },
-  { "DISPENSER_7_REFILL_FAILURE", 175 },
-  { "DISPENSER_7_UNDERPRESSURE", 159 },
-  { "DISPENSER_7_UPPER_HARD_LIMIT", 215 },
-  { "DISPENSER_8_EMPTY", 168 },
-  { "DISPENSER_8_HIGH_PRESSURE", 231 },
-  { "DISPENSER_8_LOWER_HARD_LIMIT", 224 },
-  { "DISPENSER_8_MOTOR_OVERCURRENT", 184 },
-  { "DISPENSER_8_MOTOR_OVERTEMPERATURE", 192 },
-  { "DISPENSER_8_MOTOR_STALL", 200 },
-  { "DISPENSER_8_MOTOR_UNDERVOLTAGE", 208 },
-  { "DISPENSER_8_OVERPRESSURE", 152 },
-  { "DISPENSER_8_REFILL_FAILURE", 176 },
-  { "DISPENSER_8_UNDERPRESSURE", 160 },
-  { "DISPENSER_8_UPPER_HARD_LIMIT", 216 },
-  { "DRYER_DOOR_OPEN", 78 },
-  { "DRYER_FAN_RPM_TOO_LOW", 89 },
-  { "DRYER_FAN_STOPPED", 90 },
-  { "DRYER_HEATERS_ZONE_1_CURRENT_LOOP_BREAK", 87 },
-  { "DRYER_HEATERS_ZONE_1_CURRENT_OUT_OF_RANGE", 85 },
-  { "DRYER_HEATERS_ZONE_2_CURRENT_LOOP_BREAK", 88 },
-  { "DRYER_HEATERS_ZONE_2_CURRENT_OUT_OF_RANGE", 86 },
-  { "DRYER_LID_MOTOR_OVERCURRENT", 91 },
-  { "DRYER_LID_MOTOR_OVERTEMPERATURE", 92 },
-  { "DRYER_LID_MOTOR_STALL", 93 },
-  { "DRYER_LID_MOTOR_UNDERVOLTAGE", 94 },
-  { "DRYER_MOTOR_OVERCURRENT", 74 },
-  { "DRYER_MOTOR_OVERTEMPERATURE", 75 },
-  { "DRYER_MOTOR_STALL", 76 },
-  { "DRYER_MOTOR_UNDERVOLTAGE", 77 },
-  { "DRYER_THERMAL_CUTOFF", 84 },
-  { "DRYER_ZONE_1_OVERTEMPERATURE", 79 },
-  { "DRYER_ZONE_1_UNDERTEMPERATURE_A", 81 },
-  { "DRYER_ZONE_1_UNDERTEMPERATURE_B", 82 },
-  { "DRYER_ZONE_2_OVERTEMPERATURE", 80 },
-  { "DRYER_ZONE_2_UNDERTEMPERATURE_A", 95 },
-  { "DRYER_ZONE_2_UNDERTEMPERATURE_B", 83 },
-  { "DYEING_HEAD_CLEANING_HEAD_MOTOR_OVERCURRENT", 135 },
-  { "DYEING_HEAD_CLEANING_HEAD_MOTOR_OVERTEMPERATURE", 136 },
-  { "DYEING_HEAD_CLEANING_HEAD_MOTOR_STALL", 137 },
-  { "DYEING_HEAD_CLEANING_HEAD_MOTOR_UNDERVOLTAGE", 138 },
-  { "DYEING_HEAD_CLEANING_MECHANISM_MOTOR_OVERCURRENT", 131 },
-  { "DYEING_HEAD_CLEANING_MECHANISM_MOTOR_OVERTEMPERATURE", 132 },
-  { "DYEING_HEAD_CLEANING_MECHANISM_MOTOR_STALL", 133 },
-  { "DYEING_HEAD_CLEANING_MECHANISM_MOTOR_UNDERVOLTAGE", 134 },
-  { "DYEING_HEAD_COVER_CLOSE_TIMEOUT", 126 },
-  { "DYEING_HEAD_COVER_MOTOR_OVERCURRENT", 127 },
-  { "DYEING_HEAD_COVER_MOTOR_OVERTEMPERATURE", 128 },
-  { "DYEING_HEAD_COVER_MOTOR_STALL", 129 },
-  { "DYEING_HEAD_COVER_MOTOR_UNDERVOLTAGE", 130 },
-  { "DYEING_HEAD_COVER_OPEN_TIMEOUT", 125 },
-  { "DYEING_HEAD_THERMAL_CUTOFF", 124 },
-  { "DYEING_HEAD_ZONE_1_CURRENT_LOOP_BREAK", 119 },
-  { "DYEING_HEAD_ZONE_1_CURRENT_OUT_OF_RANGE", 114 },
-  { "DYEING_HEAD_ZONE_1_OVERTEMPERATURE", 96 },
-  { "DYEING_HEAD_ZONE_1_UNDERTEMPERATURE_A", 102 },
-  { "DYEING_HEAD_ZONE_1_UNDERTEMPERATURE_B", 108 },
-  { "DYEING_HEAD_ZONE_2_CURRENT_LOOP_BREAK", 120 },
-  { "DYEING_HEAD_ZONE_2_CURRENT_OUT_OF_RANGE", 115 },
-  { "DYEING_HEAD_ZONE_2_OVERTEMPERATURE", 97 },
-  { "DYEING_HEAD_ZONE_2_UNDERTEMPERATURE_A", 103 },
-  { "DYEING_HEAD_ZONE_2_UNDERTEMPERATURE_B", 109 },
-  { "DYEING_HEAD_ZONE_3_CURRENT_LOOP_BREAK", 121 },
-  { "DYEING_HEAD_ZONE_3_CURRENT_OUT_OF_RANGE", 116 },
-  { "DYEING_HEAD_ZONE_3_OVERTEMPERATURE", 98 },
-  { "DYEING_HEAD_ZONE_3_UNDERTEMPERATURE_A", 104 },
-  { "DYEING_HEAD_ZONE_3_UNDERTEMPERATURE_B", 110 },
-  { "DYEING_HEAD_ZONE_4_CURRENT_LOOP_BREAK", 122 },
-  { "DYEING_HEAD_ZONE_4_CURRENT_OUT_OF_RANGE", 117 },
-  { "DYEING_HEAD_ZONE_4_OVERTEMPERATURE", 99 },
-  { "DYEING_HEAD_ZONE_4_UNDERTEMPERATURE_A", 105 },
-  { "DYEING_HEAD_ZONE_4_UNDERTEMPERATURE_B", 111 },
-  { "DYEING_HEAD_ZONE_5_6_CURRENT_LOOP_BREAK", 123 },
-  { "DYEING_HEAD_ZONE_5_6_CURRENT_OUT_OF_RANGE", 118 },
-  { "DYEING_HEAD_ZONE_5_OVERTEMPERATURE", 100 },
-  { "DYEING_HEAD_ZONE_5_UNDERTEMPERATURE_A", 106 },
-  { "DYEING_HEAD_ZONE_5_UNDERTEMPERATURE_B", 112 },
-  { "DYEING_HEAD_ZONE_6_OVERTEMPERATURE", 101 },
-  { "DYEING_HEAD_ZONE_6_UNDERTEMPERATURE_A", 107 },
-  { "DYEING_HEAD_ZONE_6_UNDERTEMPERATURE_B", 113 },
+  { "CHILLER_DRY_CONTACT", 276 },
+  { "DISPENSER_1_EMPTY", 166 },
+  { "DISPENSER_1_HIGH_PRESSURE", 230 },
+  { "DISPENSER_1_LOWER_HARD_LIMIT", 222 },
+  { "DISPENSER_1_MOTOR_OVERCURRENT", 182 },
+  { "DISPENSER_1_MOTOR_OVERTEMPERATURE", 190 },
+  { "DISPENSER_1_MOTOR_STALL", 198 },
+  { "DISPENSER_1_MOTOR_UNDERVOLTAGE", 206 },
+  { "DISPENSER_1_OVERPRESSURE", 150 },
+  { "DISPENSER_1_REFILL_FAILURE", 174 },
+  { "DISPENSER_1_UNDERPRESSURE", 158 },
+  { "DISPENSER_1_UPPER_HARD_LIMIT", 214 },
+  { "DISPENSER_2_EMPTY", 167 },
+  { "DISPENSER_2_HIGH_PRESSURE", 231 },
+  { "DISPENSER_2_LOWER_HARD_LIMIT", 223 },
+  { "DISPENSER_2_MOTOR_OVERCURRENT", 183 },
+  { "DISPENSER_2_MOTOR_OVERTEMPERATURE", 191 },
+  { "DISPENSER_2_MOTOR_STALL", 199 },
+  { "DISPENSER_2_MOTOR_UNDERVOLTAGE", 207 },
+  { "DISPENSER_2_OVERPRESSURE", 151 },
+  { "DISPENSER_2_REFILL_FAILURE", 175 },
+  { "DISPENSER_2_UNDERPRESSURE", 159 },
+  { "DISPENSER_2_UPPER_HARD_LIMIT", 215 },
+  { "DISPENSER_3_EMPTY", 168 },
+  { "DISPENSER_3_HIGH_PRESSURE", 232 },
+  { "DISPENSER_3_LOWER_HARD_LIMIT", 224 },
+  { "DISPENSER_3_MOTOR_OVERCURRENT", 184 },
+  { "DISPENSER_3_MOTOR_OVERTEMPERATURE", 192 },
+  { "DISPENSER_3_MOTOR_STALL", 200 },
+  { "DISPENSER_3_MOTOR_UNDERVOLTAGE", 208 },
+  { "DISPENSER_3_OVERPRESSURE", 152 },
+  { "DISPENSER_3_REFILL_FAILURE", 176 },
+  { "DISPENSER_3_UNDERPRESSURE", 160 },
+  { "DISPENSER_3_UPPER_HARD_LIMIT", 216 },
+  { "DISPENSER_4_EMPTY", 169 },
+  { "DISPENSER_4_HIGH_PRESSURE", 233 },
+  { "DISPENSER_4_LOWER_HARD_LIMIT", 225 },
+  { "DISPENSER_4_MOTOR_OVERCURRENT", 185 },
+  { "DISPENSER_4_MOTOR_OVERTEMPERATURE", 193 },
+  { "DISPENSER_4_MOTOR_STALL", 201 },
+  { "DISPENSER_4_MOTOR_UNDERVOLTAGE", 209 },
+  { "DISPENSER_4_OVERPRESSURE", 153 },
+  { "DISPENSER_4_REFILL_FAILURE", 177 },
+  { "DISPENSER_4_UNDERPRESSURE", 161 },
+  { "DISPENSER_4_UPPER_HARD_LIMIT", 217 },
+  { "DISPENSER_5_EMPTY", 170 },
+  { "DISPENSER_5_HIGH_PRESSURE", 234 },
+  { "DISPENSER_5_LOWER_HARD_LIMIT", 226 },
+  { "DISPENSER_5_MOTOR_OVERCURRENT", 186 },
+  { "DISPENSER_5_MOTOR_OVERTEMPERATURE", 194 },
+  { "DISPENSER_5_MOTOR_STALL", 202 },
+  { "DISPENSER_5_MOTOR_UNDERVOLTAGE", 210 },
+  { "DISPENSER_5_OVERPRESSURE", 154 },
+  { "DISPENSER_5_REFILL_FAILURE", 178 },
+  { "DISPENSER_5_UNDERPRESSURE", 162 },
+  { "DISPENSER_5_UPPER_HARD_LIMIT", 218 },
+  { "DISPENSER_6_EMPTY", 171 },
+  { "DISPENSER_6_HIGH_PRESSURE", 235 },
+  { "DISPENSER_6_LOWER_HARD_LIMIT", 227 },
+  { "DISPENSER_6_MOTOR_OVERCURRENT", 187 },
+  { "DISPENSER_6_MOTOR_OVERTEMPERATURE", 195 },
+  { "DISPENSER_6_MOTOR_STALL", 203 },
+  { "DISPENSER_6_MOTOR_UNDERVOLTAGE", 211 },
+  { "DISPENSER_6_OVERPRESSURE", 155 },
+  { "DISPENSER_6_REFILL_FAILURE", 179 },
+  { "DISPENSER_6_UNDERPRESSURE", 163 },
+  { "DISPENSER_6_UPPER_HARD_LIMIT", 219 },
+  { "DISPENSER_7_EMPTY", 172 },
+  { "DISPENSER_7_HIGH_PRESSURE", 236 },
+  { "DISPENSER_7_LOWER_HARD_LIMIT", 228 },
+  { "DISPENSER_7_MOTOR_OVERCURRENT", 188 },
+  { "DISPENSER_7_MOTOR_OVERTEMPERATURE", 196 },
+  { "DISPENSER_7_MOTOR_STALL", 204 },
+  { "DISPENSER_7_MOTOR_UNDERVOLTAGE", 212 },
+  { "DISPENSER_7_OVERPRESSURE", 156 },
+  { "DISPENSER_7_REFILL_FAILURE", 180 },
+  { "DISPENSER_7_UNDERPRESSURE", 164 },
+  { "DISPENSER_7_UPPER_HARD_LIMIT", 220 },
+  { "DISPENSER_8_EMPTY", 173 },
+  { "DISPENSER_8_HIGH_PRESSURE", 237 },
+  { "DISPENSER_8_LOWER_HARD_LIMIT", 229 },
+  { "DISPENSER_8_MOTOR_OVERCURRENT", 189 },
+  { "DISPENSER_8_MOTOR_OVERTEMPERATURE", 197 },
+  { "DISPENSER_8_MOTOR_STALL", 205 },
+  { "DISPENSER_8_MOTOR_UNDERVOLTAGE", 213 },
+  { "DISPENSER_8_OVERPRESSURE", 157 },
+  { "DISPENSER_8_REFILL_FAILURE", 181 },
+  { "DISPENSER_8_UNDERPRESSURE", 165 },
+  { "DISPENSER_8_UPPER_HARD_LIMIT", 221 },
+  { "DRYER_DOOR_OPEN", 83 },
+  { "DRYER_FAN_RPM_TOO_LOW", 94 },
+  { "DRYER_FAN_STOPPED", 95 },
+  { "DRYER_HEATERS_ZONE_1_CURRENT_LOOP_BREAK", 92 },
+  { "DRYER_HEATERS_ZONE_1_CURRENT_OUT_OF_RANGE", 90 },
+  { "DRYER_HEATERS_ZONE_2_CURRENT_LOOP_BREAK", 93 },
+  { "DRYER_HEATERS_ZONE_2_CURRENT_OUT_OF_RANGE", 91 },
+  { "DRYER_LID_MOTOR_OVERCURRENT", 96 },
+  { "DRYER_LID_MOTOR_OVERTEMPERATURE", 97 },
+  { "DRYER_LID_MOTOR_STALL", 98 },
+  { "DRYER_LID_MOTOR_UNDERVOLTAGE", 99 },
+  { "DRYER_MOTOR_OVERCURRENT", 79 },
+  { "DRYER_MOTOR_OVERTEMPERATURE", 80 },
+  { "DRYER_MOTOR_STALL", 81 },
+  { "DRYER_MOTOR_UNDERVOLTAGE", 82 },
+  { "DRYER_THERMAL_CUTOFF", 89 },
+  { "DRYER_ZONE_1_OVERTEMPERATURE", 84 },
+  { "DRYER_ZONE_1_UNDERTEMPERATURE_A", 86 },
+  { "DRYER_ZONE_1_UNDERTEMPERATURE_B", 87 },
+  { "DRYER_ZONE_2_OVERTEMPERATURE", 85 },
+  { "DRYER_ZONE_2_UNDERTEMPERATURE_A", 100 },
+  { "DRYER_ZONE_2_UNDERTEMPERATURE_B", 88 },
+  { "DYEING_HEAD_CLEANING_HEAD_MOTOR_OVERCURRENT", 140 },
+  { "DYEING_HEAD_CLEANING_HEAD_MOTOR_OVERTEMPERATURE", 141 },
+  { "DYEING_HEAD_CLEANING_HEAD_MOTOR_STALL", 142 },
+  { "DYEING_HEAD_CLEANING_HEAD_MOTOR_UNDERVOLTAGE", 143 },
+  { "DYEING_HEAD_CLEANING_MECHANISM_MOTOR_OVERCURRENT", 136 },
+  { "DYEING_HEAD_CLEANING_MECHANISM_MOTOR_OVERTEMPERATURE", 137 },
+  { "DYEING_HEAD_CLEANING_MECHANISM_MOTOR_STALL", 138 },
+  { "DYEING_HEAD_CLEANING_MECHANISM_MOTOR_UNDERVOLTAGE", 139 },
+  { "DYEING_HEAD_COVER_CLOSE_TIMEOUT", 131 },
+  { "DYEING_HEAD_COVER_MOTOR_OVERCURRENT", 132 },
+  { "DYEING_HEAD_COVER_MOTOR_OVERTEMPERATURE", 133 },
+  { "DYEING_HEAD_COVER_MOTOR_STALL", 134 },
+  { "DYEING_HEAD_COVER_MOTOR_UNDERVOLTAGE", 135 },
+  { "DYEING_HEAD_COVER_OPEN_TIMEOUT", 130 },
+  { "DYEING_HEAD_THERMAL_CUTOFF", 129 },
+  { "DYEING_HEAD_ZONE_1_CURRENT_LOOP_BREAK", 124 },
+  { "DYEING_HEAD_ZONE_1_CURRENT_OUT_OF_RANGE", 119 },
+  { "DYEING_HEAD_ZONE_1_OVERTEMPERATURE", 101 },
+  { "DYEING_HEAD_ZONE_1_UNDERTEMPERATURE_A", 107 },
+  { "DYEING_HEAD_ZONE_1_UNDERTEMPERATURE_B", 113 },
+  { "DYEING_HEAD_ZONE_2_CURRENT_LOOP_BREAK", 125 },
+  { "DYEING_HEAD_ZONE_2_CURRENT_OUT_OF_RANGE", 120 },
+  { "DYEING_HEAD_ZONE_2_OVERTEMPERATURE", 102 },
+  { "DYEING_HEAD_ZONE_2_UNDERTEMPERATURE_A", 108 },
+  { "DYEING_HEAD_ZONE_2_UNDERTEMPERATURE_B", 114 },
+  { "DYEING_HEAD_ZONE_3_CURRENT_LOOP_BREAK", 126 },
+  { "DYEING_HEAD_ZONE_3_CURRENT_OUT_OF_RANGE", 121 },
+  { "DYEING_HEAD_ZONE_3_OVERTEMPERATURE", 103 },
+  { "DYEING_HEAD_ZONE_3_UNDERTEMPERATURE_A", 109 },
+  { "DYEING_HEAD_ZONE_3_UNDERTEMPERATURE_B", 115 },
+  { "DYEING_HEAD_ZONE_4_CURRENT_LOOP_BREAK", 127 },
+  { "DYEING_HEAD_ZONE_4_CURRENT_OUT_OF_RANGE", 122 },
+  { "DYEING_HEAD_ZONE_4_OVERTEMPERATURE", 104 },
+  { "DYEING_HEAD_ZONE_4_UNDERTEMPERATURE_A", 110 },
+  { "DYEING_HEAD_ZONE_4_UNDERTEMPERATURE_B", 116 },
+  { "DYEING_HEAD_ZONE_5_6_CURRENT_LOOP_BREAK", 128 },
+  { "DYEING_HEAD_ZONE_5_6_CURRENT_OUT_OF_RANGE", 123 },
+  { "DYEING_HEAD_ZONE_5_OVERTEMPERATURE", 105 },
+  { "DYEING_HEAD_ZONE_5_UNDERTEMPERATURE_A", 111 },
+  { "DYEING_HEAD_ZONE_5_UNDERTEMPERATURE_B", 117 },
+  { "DYEING_HEAD_ZONE_6_OVERTEMPERATURE", 106 },
+  { "DYEING_HEAD_ZONE_6_UNDERTEMPERATURE_A", 112 },
+  { "DYEING_HEAD_ZONE_6_UNDERTEMPERATURE_B", 118 },
   { "ELECTRICAL_CABINET_FANS_RPM_TOO_LOW", 22 },
   { "ELECTRICAL_CABINET_FANS_STOPPED", 23 },
   { "EMERGENCY_PUSH_BUTTON_PRESSED", 12 },
-  { "FEEDER_DANCER_MOTOR_OVERCURRENT", 62 },
-  { "FEEDER_DANCER_MOTOR_OVERTEMPERATURE", 65 },
-  { "FEEDER_DANCER_MOTOR_STALL", 68 },
-  { "FEEDER_DANCER_MOTOR_UNDERVOLTAGE", 71 },
-  { "FEEDER_MOTOR_OVERCURRENT", 27 },
-  { "FEEDER_MOTOR_OVERTEMPERATURE", 34 },
-  { "FEEDER_MOTOR_STALL", 41 },
-  { "FEEDER_MOTOR_UNDERVOLTAGE", 48 },
+  { "FEEDER_DANCER_MOTOR_OVERCURRENT", 66 },
+  { "FEEDER_DANCER_MOTOR_OVERTEMPERATURE", 69 },
+  { "FEEDER_DANCER_MOTOR_STALL", 72 },
+  { "FEEDER_DANCER_MOTOR_UNDERVOLTAGE", 75 },
+  { "FEEDER_MOTOR_OVERCURRENT", 31 },
+  { "FEEDER_MOTOR_OVERTEMPERATURE", 38 },
+  { "FEEDER_MOTOR_STALL", 45 },
+  { "FEEDER_MOTOR_UNDERVOLTAGE", 52 },
   { "FRONT_COVER_1_OPEN", 13 },
   { "FRONT_COVER_2_OPEN", 14 },
   { "FRONT_COVER_3_OPEN", 15 },
   { "FRONT_COVER_4_OPEN", 16 },
-  { "INK_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT", 273 },
-  { "INK_CARTRIDGE_RFID_TIMEOUT", 274 },
-  { "INSUFFICIENT_AIR_FLOW", 272 },
+  { "INK_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT", 279 },
+  { "INK_CARTRIDGE_RFID_TIMEOUT", 280 },
+  { "INSUFFICIENT_AIR_FLOW", 277 },
   { "JOB_STATUS", 10 },
-  { "LEFT_LOADER_MOTOR_OVERCURRENT", 30 },
-  { "LEFT_LOADER_MOTOR_OVERTEMPERATURE", 37 },
-  { "LEFT_LOADER_MOTOR_STALL", 44 },
-  { "LEFT_LOADER_MOTOR_UNDERVOLTAGE", 51 },
-  { "LOADING_ARM_MOTOR_OVERCURRENT", 33 },
-  { "LOADING_ARM_MOTOR_OVERTEMPERATURE", 40 },
-  { "LOADING_ARM_MOTOR_STALL", 47 },
-  { "LOADING_ARM_MOTOR_UNDERVOLTAGE", 54 },
-  { "LTFU_DOWN_TIMEOUT", 56 },
-  { "LTFU_UP_TIMEOUT", 55 },
+  { "LEFT_LOADER_MOTOR_OVERCURRENT", 34 },
+  { "LEFT_LOADER_MOTOR_OVERTEMPERATURE", 41 },
+  { "LEFT_LOADER_MOTOR_STALL", 48 },
+  { "LEFT_LOADER_MOTOR_UNDERVOLTAGE", 55 },
+  { "LOADING_ARM_MOTOR_OVERCURRENT", 37 },
+  { "LOADING_ARM_MOTOR_OVERTEMPERATURE", 44 },
+  { "LOADING_ARM_MOTOR_STALL", 51 },
+  { "LOADING_ARM_MOTOR_UNDERVOLTAGE", 58 },
+  { "LTFU_DOWN_TIMEOUT", 60 },
+  { "LTFU_UP_TIMEOUT", 59 },
   { "MACHINE_FANS_RPM_TOO_LOW", 20 },
   { "MACHINE_FANS_STOPPED", 21 },
   { "MACHINE_INTERNAL_OVERTEMPERATURE", 19 },
-  { "MID_TANK_1_EMPTY", 241 },
-  { "MID_TANK_1_FILL_TIMEOUT", 257 },
-  { "MID_TANK_1_LOW_LEVEL", 233 },
-  { "MID_TANK_1_OVERFLOW", 249 },
-  { "MID_TANK_2_EMPTY", 242 },
-  { "MID_TANK_2_FILL_TIMEOUT", 258 },
-  { "MID_TANK_2_LOW_LEVEL", 234 },
-  { "MID_TANK_2_OVERFLOW", 250 },
-  { "MID_TANK_3_EMPTY", 243 },
-  { "MID_TANK_3_FILL_TIMEOUT", 259 },
-  { "MID_TANK_3_LOW_LEVEL", 235 },
-  { "MID_TANK_3_OVERFLOW", 251 },
-  { "MID_TANK_4_EMPTY", 244 },
-  { "MID_TANK_4_FILL_TIMEOUT", 260 },
-  { "MID_TANK_4_LOW_LEVEL", 236 },
-  { "MID_TANK_4_OVERFLOW", 252 },
-  { "MID_TANK_5_EMPTY", 245 },
-  { "MID_TANK_5_FILL_TIMEOUT", 261 },
-  { "MID_TANK_5_LOW_LEVEL", 237 },
-  { "MID_TANK_5_OVERFLOW", 253 },
-  { "MID_TANK_6_EMPTY", 246 },
-  { "MID_TANK_6_FILL_TIMEOUT", 262 },
-  { "MID_TANK_6_LOW_LEVEL", 238 },
-  { "MID_TANK_6_OVERFLOW", 254 },
-  { "MID_TANK_7_EMPTY", 247 },
-  { "MID_TANK_7_FILL_TIMEOUT", 263 },
-  { "MID_TANK_7_LOW_LEVEL", 239 },
-  { "MID_TANK_7_OVERFLOW", 255 },
-  { "MID_TANK_8_EMPTY", 248 },
-  { "MID_TANK_8_FILL_TIMEOUT", 264 },
-  { "MID_TANK_8_LOW_LEVEL", 240 },
-  { "MID_TANK_8_OVERFLOW", 256 },
-  { "MIXER_CURRENT_LOOP_BREAK", 144 },
-  { "MIXER_CURRENT_OUT_OF_RANGE", 143 },
-  { "MIXER_OVERTEMPERATURE", 139 },
-  { "MIXER_THERMAL_CUTOFF", 142 },
-  { "MIXER_UNDERTEMPERATURE_A", 140 },
-  { "MIXER_UNDERTEMPERATURE_B", 141 },
-  { "NO_AIR_PRESSURE", 268 },
-  { "NO_WASTE_CARTRIDGE_AVAILABLE", 275 },
+  { "MACHINE_STATE_HW_CONFIG_FAILED", 25 },
+  { "MACHINE_STATE_INITIAL_BLOWER_FAILED", 26 },
+  { "MACHINE_STATE_NO_CFG_FILE", 24 },
+  { "MACHINE_STATE_NO_THREAD_DETECTED", 78 },
+  { "MID_TANK_1_EMPTY", 246 },
+  { "MID_TANK_1_FILL_TIMEOUT", 262 },
+  { "MID_TANK_1_LOW_LEVEL", 238 },
+  { "MID_TANK_1_OVERFLOW", 254 },
+  { "MID_TANK_2_EMPTY", 247 },
+  { "MID_TANK_2_FILL_TIMEOUT", 263 },
+  { "MID_TANK_2_LOW_LEVEL", 239 },
+  { "MID_TANK_2_OVERFLOW", 255 },
+  { "MID_TANK_3_EMPTY", 248 },
+  { "MID_TANK_3_FILL_TIMEOUT", 264 },
+  { "MID_TANK_3_LOW_LEVEL", 240 },
+  { "MID_TANK_3_OVERFLOW", 256 },
+  { "MID_TANK_4_EMPTY", 249 },
+  { "MID_TANK_4_FILL_TIMEOUT", 265 },
+  { "MID_TANK_4_LOW_LEVEL", 241 },
+  { "MID_TANK_4_OVERFLOW", 257 },
+  { "MID_TANK_5_EMPTY", 250 },
+  { "MID_TANK_5_FILL_TIMEOUT", 266 },
+  { "MID_TANK_5_LOW_LEVEL", 242 },
+  { "MID_TANK_5_OVERFLOW", 258 },
+  { "MID_TANK_6_EMPTY", 251 },
+  { "MID_TANK_6_FILL_TIMEOUT", 267 },
+  { "MID_TANK_6_LOW_LEVEL", 243 },
+  { "MID_TANK_6_OVERFLOW", 259 },
+  { "MID_TANK_7_EMPTY", 252 },
+  { "MID_TANK_7_FILL_TIMEOUT", 268 },
+  { "MID_TANK_7_LOW_LEVEL", 244 },
+  { "MID_TANK_7_OVERFLOW", 260 },
+  { "MID_TANK_8_EMPTY", 253 },
+  { "MID_TANK_8_FILL_TIMEOUT", 269 },
+  { "MID_TANK_8_LOW_LEVEL", 245 },
+  { "MID_TANK_8_OVERFLOW", 261 },
+  { "MIXER_CURRENT_LOOP_BREAK", 149 },
+  { "MIXER_CURRENT_OUT_OF_RANGE", 148 },
+  { "MIXER_OVERTEMPERATURE", 144 },
+  { "MIXER_THERMAL_CUTOFF", 147 },
+  { "MIXER_UNDERTEMPERATURE_A", 145 },
+  { "MIXER_UNDERTEMPERATURE_B", 146 },
+  { "NO_AIR_PRESSURE", 273 },
+  { "NO_WASTE_CARTRIDGE_AVAILABLE", 281 },
   { "None", 0 },
   { "POWER_UP_BIT_FAILURE", 11 },
-  { "PULLER_DANCER_MOTOR_OVERCURRENT", 61 },
-  { "PULLER_DANCER_MOTOR_OVERTEMPERATURE", 64 },
-  { "PULLER_DANCER_MOTOR_STALL", 67 },
-  { "PULLER_DANCER_MOTOR_UNDERVOLTAGE", 70 },
-  { "PULLER_MOTOR_OVERCURRENT", 29 },
-  { "PULLER_MOTOR_OVERTEMPERATURE", 36 },
-  { "PULLER_MOTOR_STALL", 43 },
-  { "PULLER_MOTOR_UNDERVOLTAGE", 50 },
+  { "PULLER_DANCER_MOTOR_OVERCURRENT", 65 },
+  { "PULLER_DANCER_MOTOR_OVERTEMPERATURE", 68 },
+  { "PULLER_DANCER_MOTOR_STALL", 71 },
+  { "PULLER_DANCER_MOTOR_UNDERVOLTAGE", 74 },
+  { "PULLER_MOTOR_OVERCURRENT", 33 },
+  { "PULLER_MOTOR_OVERTEMPERATURE", 40 },
+  { "PULLER_MOTOR_STALL", 47 },
+  { "PULLER_MOTOR_UNDERVOLTAGE", 54 },
   { "REAR_COVER_OPEN", 18 },
   { "RECORDING_STARTED", 8 },
   { "RECORDING_STOPPED", 9 },
   { "REQUEST_FAILED", 3 },
   { "REQUEST_SENT", 1 },
   { "RESPONSE_RECEIVED", 2 },
-  { "RIGHT_LOADER_MOTOR_OVERCURRENT", 28 },
-  { "RIGHT_LOADER_MOTOR_OVERTEMPERATURE", 35 },
-  { "RIGHT_LOADER_MOTOR_STALL", 42 },
-  { "RIGHT_LOADER_MOTOR_UNDERVOLTAGE", 49 },
-  { "RTFU_DOWN_TIMEOUT", 58 },
-  { "RTFU_UP_TIMEOUT", 57 },
-  { "SCREW_MOTOR_LIMIT_TIMEOUT", 59 },
-  { "SCREW_MOTOR_OVERCURRENT", 32 },
-  { "SCREW_MOTOR_OVERTEMPERATURE", 39 },
-  { "SCREW_MOTOR_STALL", 46 },
-  { "SCREW_MOTOR_UNDERVOLTAGE", 53 },
-  { "THREAD_BREAK", 24 },
-  { "THREAD_TENSION_CONTROL_FAILURE_FEEDER_DANCER", 25 },
-  { "THREAD_TENSION_CONTROL_FAILURE_PULLER_DANCER", 72 },
-  { "THREAD_TENSION_CONTROL_FAILURE_WINDER_DANCER", 73 },
-  { "VOC_SENSOR_ALARM", 270 },
-  { "WASTE_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT", 277 },
-  { "WASTE_CARTRIDGE_RFID_TIMEOUT", 278 },
-  { "WASTE_CONTAINER_EMPTYING_TIMEOUT", 267 },
-  { "WASTE_CONTAINER_OVERFLOW", 269 },
-  { "WINDER_CONE_DOES_NOT_EXIST", 26 },
-  { "WINDER_DANCER_MOTOR_OVERCURRENT", 60 },
-  { "WINDER_DANCER_MOTOR_OVERTEMPERATURE", 63 },
-  { "WINDER_DANCER_MOTOR_STALL", 66 },
-  { "WINDER_DANCER_MOTOR_UNDERVOLTAGE", 69 },
-  { "WINDER_MOTOR_OVERCURRENT", 31 },
-  { "WINDER_MOTOR_OVERTEMPERATURE", 38 },
-  { "WINDER_MOTOR_STALL", 45 },
-  { "WINDER_MOTOR_UNDERVOLTAGE", 52 },
+  { "RIGHT_LOADER_MOTOR_OVERCURRENT", 32 },
+  { "RIGHT_LOADER_MOTOR_OVERTEMPERATURE", 39 },
+  { "RIGHT_LOADER_MOTOR_STALL", 46 },
+  { "RIGHT_LOADER_MOTOR_UNDERVOLTAGE", 53 },
+  { "RTFU_DOWN_TIMEOUT", 62 },
+  { "RTFU_UP_TIMEOUT", 61 },
+  { "SCREW_MOTOR_LIMIT_TIMEOUT", 63 },
+  { "SCREW_MOTOR_OVERCURRENT", 36 },
+  { "SCREW_MOTOR_OVERTEMPERATURE", 43 },
+  { "SCREW_MOTOR_STALL", 50 },
+  { "SCREW_MOTOR_UNDERVOLTAGE", 57 },
+  { "THREAD_BREAK", 28 },
+  { "THREAD_TENSION_CONTROL_FAILURE_FEEDER_DANCER", 29 },
+  { "THREAD_TENSION_CONTROL_FAILURE_PULLER_DANCER", 76 },
+  { "THREAD_TENSION_CONTROL_FAILURE_WINDER_DANCER", 77 },
+  { "UNSPECIFIED", 27 },
+  { "VOC_SENSOR_ALARM_SLOPE", 278 },
+  { "VOC_SENSOR_ALARM_TIME", 275 },
+  { "WASTE_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT", 283 },
+  { "WASTE_CARTRIDGE_RFID_TIMEOUT", 284 },
+  { "WASTE_CONTAINER_EMPTYING_TIMEOUT", 272 },
+  { "WASTE_CONTAINER_OVERFLOW", 274 },
+  { "WINDER_CONE_DOES_NOT_EXIST", 30 },
+  { "WINDER_DANCER_MOTOR_OVERCURRENT", 64 },
+  { "WINDER_DANCER_MOTOR_OVERTEMPERATURE", 67 },
+  { "WINDER_DANCER_MOTOR_STALL", 70 },
+  { "WINDER_DANCER_MOTOR_UNDERVOLTAGE", 73 },
+  { "WINDER_MOTOR_OVERCURRENT", 35 },
+  { "WINDER_MOTOR_OVERTEMPERATURE", 42 },
+  { "WINDER_MOTOR_STALL", 49 },
+  { "WINDER_MOTOR_UNDERVOLTAGE", 56 },
 };
 const ProtobufCEnumDescriptor event_type__descriptor =
 {
@@ -581,9 +593,9 @@ const ProtobufCEnumDescriptor event_type__descriptor =
   "EventType",
   "EventType",
   "",
-  279,
+  285,
   event_type__enum_values_by_number,
-  279,
+  285,
   event_type__enum_values_by_name,
   11,
   event_type__value_ranges,
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.h
index ae437f66c..f8aecc24f 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/EventType.pb-c.h
@@ -44,6 +44,10 @@ typedef enum _EventType {
   EVENT_TYPE__MACHINE_FANS_STOPPED = 2010,
   EVENT_TYPE__ELECTRICAL_CABINET_FANS_RPM_TOO_LOW = 2011,
   EVENT_TYPE__ELECTRICAL_CABINET_FANS_STOPPED = 2012,
+  EVENT_TYPE__MACHINE_STATE_NO_CFG_FILE = 2013,
+  EVENT_TYPE__MACHINE_STATE_HW_CONFIG_FAILED = 2014,
+  EVENT_TYPE__MACHINE_STATE_INITIAL_BLOWER_FAILED = 2015,
+  EVENT_TYPE__UNSPECIFIED = 2016,
   EVENT_TYPE__THREAD_BREAK = 3000,
   EVENT_TYPE__THREAD_TENSION_CONTROL_FAILURE_FEEDER_DANCER = 3001,
   EVENT_TYPE__WINDER_CONE_DOES_NOT_EXIST = 3002,
@@ -94,6 +98,7 @@ typedef enum _EventType {
   EVENT_TYPE__FEEDER_DANCER_MOTOR_UNDERVOLTAGE = 3047,
   EVENT_TYPE__THREAD_TENSION_CONTROL_FAILURE_PULLER_DANCER = 3048,
   EVENT_TYPE__THREAD_TENSION_CONTROL_FAILURE_WINDER_DANCER = 3049,
+  EVENT_TYPE__MACHINE_STATE_NO_THREAD_DETECTED = 3050,
   EVENT_TYPE__DRYER_MOTOR_OVERCURRENT = 4000,
   EVENT_TYPE__DRYER_MOTOR_OVERTEMPERATURE = 4001,
   EVENT_TYPE__DRYER_MOTOR_STALL = 4002,
@@ -251,8 +256,8 @@ typedef enum _EventType {
   EVENT_TYPE__DISPENSER_4_HIGH_PRESSURE = 7083,
   EVENT_TYPE__DISPENSER_5_HIGH_PRESSURE = 7084,
   EVENT_TYPE__DISPENSER_6_HIGH_PRESSURE = 7085,
-  EVENT_TYPE__DISPENSER_8_HIGH_PRESSURE = 7086,
-  EVENT_TYPE__DISPENSER_7_HIGH_PRESSURE = 7087,
+  EVENT_TYPE__DISPENSER_7_HIGH_PRESSURE = 7086,
+  EVENT_TYPE__DISPENSER_8_HIGH_PRESSURE = 7087,
   EVENT_TYPE__MID_TANK_1_LOW_LEVEL = 8000,
   EVENT_TYPE__MID_TANK_2_LOW_LEVEL = 8001,
   EVENT_TYPE__MID_TANK_3_LOW_LEVEL = 8002,
@@ -290,9 +295,10 @@ typedef enum _EventType {
   EVENT_TYPE__WASTE_CONTAINER_EMPTYING_TIMEOUT = 9002,
   EVENT_TYPE__NO_AIR_PRESSURE = 9003,
   EVENT_TYPE__WASTE_CONTAINER_OVERFLOW = 9004,
-  EVENT_TYPE__VOC_SENSOR_ALARM = 9005,
+  EVENT_TYPE__VOC_SENSOR_ALARM_TIME = 9005,
   EVENT_TYPE__CHILLER_DRY_CONTACT = 9006,
   EVENT_TYPE__INSUFFICIENT_AIR_FLOW = 9007,
+  EVENT_TYPE__VOC_SENSOR_ALARM_SLOPE = 9008,
   EVENT_TYPE__INK_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT = 10000,
   EVENT_TYPE__INK_CARTRIDGE_RFID_TIMEOUT = 10001,
   EVENT_TYPE__NO_WASTE_CARTRIDGE_AVAILABLE = 10002,
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 e71fd9af5..c5c19ee52 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,171 +7,19 @@
 #endif
 
 #include "InterfaceIOs.pb-c.h"
-static const ProtobufCEnumValue interface_ios__enum_values_by_number[347] =
+static const ProtobufCEnumValue interface_ios__enum_values_by_number[38] =
 {
   { "ANALOG_MIXCHIP_TEMP", "INTERFACE_IOS__ANALOG_MIXCHIP_TEMP", 0 },
-  { "AN_DYEINGH_CURSEN_1", "INTERFACE_IOS__AN_DYEINGH_CURSEN_1", 1 },
-  { "AN_DYEINGH_CURSEN_2", "INTERFACE_IOS__AN_DYEINGH_CURSEN_2", 2 },
-  { "AN_DYEINGH_CURSEN_3", "INTERFACE_IOS__AN_DYEINGH_CURSEN_3", 3 },
-  { "AN_DYEINGH_CURSEN_4", "INTERFACE_IOS__AN_DYEINGH_CURSEN_4", 4 },
-  { "AN_DYEINGH_CURSEN_5", "INTERFACE_IOS__AN_DYEINGH_CURSEN_5", 5 },
-  { "ANALOG_DYEINGH_TEMP1", "INTERFACE_IOS__ANALOG_DYEINGH_TEMP1", 6 },
-  { "ANALOG_DYEINGH_TEMP2", "INTERFACE_IOS__ANALOG_DYEINGH_TEMP2", 7 },
-  { "ANALOG_DYEINGH_TEMP3", "INTERFACE_IOS__ANALOG_DYEINGH_TEMP3", 8 },
-  { "ANALOG_DYEINGH_TEMP4", "INTERFACE_IOS__ANALOG_DYEINGH_TEMP4", 9 },
-  { "ANALOG_DYEINGH_TEMP5", "INTERFACE_IOS__ANALOG_DYEINGH_TEMP5", 10 },
-  { "LS_DH_CLEAN_DOWN", "INTERFACE_IOS__LS_DH_CLEAN_DOWN", 11 },
-  { "LS_DH_CLEAN_LEFT", "INTERFACE_IOS__LS_DH_CLEAN_LEFT", 12 },
-  { "LS_DH_CLEAN_RIGHT", "INTERFACE_IOS__LS_DH_CLEAN_RIGHT", 13 },
-  { "LS_DH_CLEAN_UP", "INTERFACE_IOS__LS_DH_CLEAN_UP", 14 },
-  { "LS_DH_LID_CLEANING", "INTERFACE_IOS__LS_DH_LID_CLEANING", 15 },
-  { "LS_DH_LID_CLOSED", "INTERFACE_IOS__LS_DH_LID_CLOSED", 16 },
-  { "LS_DH_LID_OPEN", "INTERFACE_IOS__LS_DH_LID_OPEN", 17 },
-  { "LS_DH_SPARE1", "INTERFACE_IOS__LS_DH_SPARE1", 18 },
   { "GPO_MIXCHIP_SSR4_CTRL", "INTERFACE_IOS__GPO_MIXCHIP_SSR4_CTRL", 19 },
   { "GPO_DYEINGH_SSR5_CTRL", "INTERFACE_IOS__GPO_DYEINGH_SSR5_CTRL", 20 },
   { "GPO_DYEINGH_SSR6_CTRL", "INTERFACE_IOS__GPO_DYEINGH_SSR6_CTRL", 21 },
   { "GPO_DYEINGH_SSR7_CTRL", "INTERFACE_IOS__GPO_DYEINGH_SSR7_CTRL", 22 },
   { "GPO_DYEINGH_SSR8_CTRL", "INTERFACE_IOS__GPO_DYEINGH_SSR8_CTRL", 23 },
-  { "DH2", "INTERFACE_IOS__DH2", 24 },
-  { "DH1", "INTERFACE_IOS__DH1", 25 },
-  { "MOTO_DH_CLEANHEAD", "INTERFACE_IOS__MOTO_DH_CLEANHEAD", 26 },
-  { "MOTO_DH_CLEANMECH", "INTERFACE_IOS__MOTO_DH_CLEANMECH", 27 },
-  { "MOTO_DH_LID", "INTERFACE_IOS__MOTO_DH_LID", 28 },
-  { "AN_DRYER_CURSEN1", "INTERFACE_IOS__AN_DRYER_CURSEN1", 29 },
-  { "AN_DRYER_CURSEN2", "INTERFACE_IOS__AN_DRYER_CURSEN2", 30 },
-  { "AN_DRYER_CURSEN3", "INTERFACE_IOS__AN_DRYER_CURSEN3", 31 },
-  { "ANALOG_DRYER_TEMP1", "INTERFACE_IOS__ANALOG_DRYER_TEMP1", 32 },
-  { "ANALOG_DRYER_TEMP2", "INTERFACE_IOS__ANALOG_DRYER_TEMP2", 33 },
-  { "ANALOG_DRYER_TEMP3", "INTERFACE_IOS__ANALOG_DRYER_TEMP3", 34 },
-  { "LS_DRYER_LID_CLOSED", "INTERFACE_IOS__LS_DRYER_LID_CLOSED", 35 },
-  { "LS_DRYER_LID_OPEN", "INTERFACE_IOS__LS_DRYER_LID_OPEN", 36 },
-  { "LS_DRYER_SPARE1", "INTERFACE_IOS__LS_DRYER_SPARE1", 37 },
-  { "LS_DRYER_SPARE2", "INTERFACE_IOS__LS_DRYER_SPARE2", 38 },
-  { "LS_DRYER_SPARE3", "INTERFACE_IOS__LS_DRYER_SPARE3", 39 },
-  { "LS_DRYER_SPARE4", "INTERFACE_IOS__LS_DRYER_SPARE4", 40 },
-  { "LS_LOADARM_LEFT", "INTERFACE_IOS__LS_LOADARM_LEFT", 41 },
-  { "LS_LOADARM_RIGHT", "INTERFACE_IOS__LS_LOADARM_RIGHT", 42 },
   { "GPO_DRYER_SSR1_CTRL", "INTERFACE_IOS__GPO_DRYER_SSR1_CTRL", 43 },
   { "GPO_DRYER_SSR2_CTRL", "INTERFACE_IOS__GPO_DRYER_SSR2_CTRL", 44 },
   { "GPO_DRYER_SSR3_CTRL", "INTERFACE_IOS__GPO_DRYER_SSR3_CTRL", 45 },
-  { "DRYER2", "INTERFACE_IOS__DRYER2", 46 },
-  { "DRYER1", "INTERFACE_IOS__DRYER1", 47 },
-  { "MOTO_DRYER_DRIVING", "INTERFACE_IOS__MOTO_DRYER_DRIVING", 48 },
-  { "MOTO_DRYER_LID", "INTERFACE_IOS__MOTO_DRYER_LID", 49 },
-  { "MOTO_DRYER_LOADARM", "INTERFACE_IOS__MOTO_DRYER_LOADARM", 50 },
-  { "DRYER_LOADARM_ROTENC", "INTERFACE_IOS__DRYER_LOADARM_ROTENC", 51 },
-  { "GPI_PS1_DC_OK", "INTERFACE_IOS__GPI_PS1_DC_OK", 52 },
-  { "GPO_PDOWN_RL1_CTRL", "INTERFACE_IOS__GPO_PDOWN_RL1_CTRL", 53 },
-  { "GPO_SPARE_SSR12_CTRL", "INTERFACE_IOS__GPO_SPARE_SSR12_CTRL", 54 },
   { "GPO_SPARE_SSR13_CTRL", "INTERFACE_IOS__GPO_SPARE_SSR13_CTRL", 55 },
-  { "ELECTRICALENC", "INTERFACE_IOS__ELECTRICALENC", 56 },
-  { "USERPANEL", "INTERFACE_IOS__USERPANEL", 57 },
-  { "GPI_EXTWINDER_1", "INTERFACE_IOS__GPI_EXTWINDER_1", 58 },
-  { "GPI_EXTWINDER_2", "INTERFACE_IOS__GPI_EXTWINDER_2", 59 },
-  { "GPI_EXTWINDER_3", "INTERFACE_IOS__GPI_EXTWINDER_3", 60 },
-  { "GPO_EXTWINDER_1", "INTERFACE_IOS__GPO_EXTWINDER_1", 61 },
-  { "GPO_EXTWINDER_2", "INTERFACE_IOS__GPO_EXTWINDER_2", 62 },
-  { "GPO_EXTWINDER_3", "INTERFACE_IOS__GPO_EXTWINDER_3", 63 },
   { "GPO_EXTWINDER_SSR11_CTRL", "INTERFACE_IOS__GPO_EXTWINDER_SSR11_CTRL", 64 },
-  { "EXTWINDER_CTRL", "INTERFACE_IOS__EXTWINDER_CTRL", 65 },
-  { "EXTWINDINGUNIT", "INTERFACE_IOS__EXTWINDINGUNIT", 66 },
-  { "AN_IDS_PRESSENS_1", "INTERFACE_IOS__AN_IDS_PRESSENS_1", 67 },
-  { "AN_IDS_PRESSENS_2", "INTERFACE_IOS__AN_IDS_PRESSENS_2", 68 },
-  { "AN_IDS_PRESSENS_3", "INTERFACE_IOS__AN_IDS_PRESSENS_3", 69 },
-  { "AN_IDS_PRESSENS_4", "INTERFACE_IOS__AN_IDS_PRESSENS_4", 70 },
-  { "AN_IDS_PRESSENS_5", "INTERFACE_IOS__AN_IDS_PRESSENS_5", 71 },
-  { "AN_IDS_PRESSENS_6", "INTERFACE_IOS__AN_IDS_PRESSENS_6", 72 },
-  { "AN_IDS_PRESSENS_7", "INTERFACE_IOS__AN_IDS_PRESSENS_7", 73 },
-  { "AN_IDS_PRESSENS_8", "INTERFACE_IOS__AN_IDS_PRESSENS_8", 74 },
-  { "AN_MIDTANK_PRESSENS1", "INTERFACE_IOS__AN_MIDTANK_PRESSENS1", 75 },
-  { "AN_MIDTANK_PRESSENS2", "INTERFACE_IOS__AN_MIDTANK_PRESSENS2", 76 },
-  { "AN_MIDTANK_PRESSENS3", "INTERFACE_IOS__AN_MIDTANK_PRESSENS3", 77 },
-  { "AN_MIDTANK_PRESSENS4", "INTERFACE_IOS__AN_MIDTANK_PRESSENS4", 78 },
-  { "AN_MIDTANK_PRESSENS5", "INTERFACE_IOS__AN_MIDTANK_PRESSENS5", 79 },
-  { "AN_MIDTANK_PRESSENS6", "INTERFACE_IOS__AN_MIDTANK_PRESSENS6", 80 },
-  { "AN_MIDTANK_PRESSENS7", "INTERFACE_IOS__AN_MIDTANK_PRESSENS7", 81 },
-  { "AN_MIXCHIP_CURSENn", "INTERFACE_IOS__AN_MIXCHIP_CURSENn", 82 },
-  { "LS_DISPENSER_25_1", "INTERFACE_IOS__LS_DISPENSER_25_1", 83 },
-  { "LS_DISPENSER_25_2", "INTERFACE_IOS__LS_DISPENSER_25_2", 84 },
-  { "LS_DISPENSER_25_3", "INTERFACE_IOS__LS_DISPENSER_25_3", 85 },
-  { "LS_DISPENSER_25_4", "INTERFACE_IOS__LS_DISPENSER_25_4", 86 },
-  { "LS_DISPENSER_25_5", "INTERFACE_IOS__LS_DISPENSER_25_5", 87 },
-  { "LS_DISPENSER_25_6", "INTERFACE_IOS__LS_DISPENSER_25_6", 88 },
-  { "LS_DISPENSER_25_7", "INTERFACE_IOS__LS_DISPENSER_25_7", 89 },
-  { "LS_DISPENSER_25_8", "INTERFACE_IOS__LS_DISPENSER_25_8", 90 },
-  { "LS_DISPENSER_50_1", "INTERFACE_IOS__LS_DISPENSER_50_1", 91 },
-  { "LS_DISPENSER_50_2", "INTERFACE_IOS__LS_DISPENSER_50_2", 92 },
-  { "LS_DISPENSER_50_3", "INTERFACE_IOS__LS_DISPENSER_50_3", 93 },
-  { "LS_DISPENSER_50_4", "INTERFACE_IOS__LS_DISPENSER_50_4", 94 },
-  { "LS_DISPENSER_50_5", "INTERFACE_IOS__LS_DISPENSER_50_5", 95 },
-  { "LS_DISPENSER_50_6", "INTERFACE_IOS__LS_DISPENSER_50_6", 96 },
-  { "LS_DISPENSER_50_7", "INTERFACE_IOS__LS_DISPENSER_50_7", 97 },
-  { "LS_DISPENSER_50_8", "INTERFACE_IOS__LS_DISPENSER_50_8", 98 },
-  { "LS_DISPENSER_75_1", "INTERFACE_IOS__LS_DISPENSER_75_1", 99 },
-  { "LS_DISPENSER_75_2", "INTERFACE_IOS__LS_DISPENSER_75_2", 100 },
-  { "LS_DISPENSER_75_3", "INTERFACE_IOS__LS_DISPENSER_75_3", 101 },
-  { "LS_DISPENSER_75_4", "INTERFACE_IOS__LS_DISPENSER_75_4", 102 },
-  { "LS_DISPENSER_75_5", "INTERFACE_IOS__LS_DISPENSER_75_5", 103 },
-  { "LS_DISPENSER_75_6", "INTERFACE_IOS__LS_DISPENSER_75_6", 104 },
-  { "LS_DISPENSER_75_7", "INTERFACE_IOS__LS_DISPENSER_75_7", 105 },
-  { "LS_DISPENSER_75_8", "INTERFACE_IOS__LS_DISPENSER_75_8", 106 },
-  { "LS_DISPENSER_DOWN_1", "INTERFACE_IOS__LS_DISPENSER_DOWN_1", 107 },
-  { "LS_DISPENSER_DOWN_2", "INTERFACE_IOS__LS_DISPENSER_DOWN_2", 108 },
-  { "LS_DISPENSER_DOWN_3", "INTERFACE_IOS__LS_DISPENSER_DOWN_3", 109 },
-  { "LS_DISPENSER_DOWN_4", "INTERFACE_IOS__LS_DISPENSER_DOWN_4", 110 },
-  { "LS_DISPENSER_DOWN_5", "INTERFACE_IOS__LS_DISPENSER_DOWN_5", 111 },
-  { "LS_DISPENSER_DOWN_6", "INTERFACE_IOS__LS_DISPENSER_DOWN_6", 112 },
-  { "LS_DISPENSER_DOWN_7", "INTERFACE_IOS__LS_DISPENSER_DOWN_7", 113 },
-  { "LS_DISPENSER_DOWN_8", "INTERFACE_IOS__LS_DISPENSER_DOWN_8", 114 },
-  { "LS_DISPENSER_SPARE_1", "INTERFACE_IOS__LS_DISPENSER_SPARE_1", 115 },
-  { "LS_DISPENSER_SPARE_2", "INTERFACE_IOS__LS_DISPENSER_SPARE_2", 116 },
-  { "LS_DISPENSER_SPARE_3", "INTERFACE_IOS__LS_DISPENSER_SPARE_3", 117 },
-  { "LS_DISPENSER_SPARE_4", "INTERFACE_IOS__LS_DISPENSER_SPARE_4", 118 },
-  { "LS_DISPENSER_SPARE_5", "INTERFACE_IOS__LS_DISPENSER_SPARE_5", 119 },
-  { "LS_DISPENSER_SPARE_6", "INTERFACE_IOS__LS_DISPENSER_SPARE_6", 120 },
-  { "LS_DISPENSER_SPARE_7", "INTERFACE_IOS__LS_DISPENSER_SPARE_7", 121 },
-  { "LS_DISPENSER_SPARE_8", "INTERFACE_IOS__LS_DISPENSER_SPARE_8", 122 },
-  { "LS_DISPENSER_UP_1", "INTERFACE_IOS__LS_DISPENSER_UP_1", 123 },
-  { "LS_DISPENSER_UP_2", "INTERFACE_IOS__LS_DISPENSER_UP_2", 124 },
-  { "LS_DISPENSER_UP_3", "INTERFACE_IOS__LS_DISPENSER_UP_3", 125 },
-  { "LS_DISPENSER_UP_4", "INTERFACE_IOS__LS_DISPENSER_UP_4", 126 },
-  { "LS_DISPENSER_UP_5", "INTERFACE_IOS__LS_DISPENSER_UP_5", 127 },
-  { "LS_DISPENSER_UP_6", "INTERFACE_IOS__LS_DISPENSER_UP_6", 128 },
-  { "LS_DISPENSER_UP_7", "INTERFACE_IOS__LS_DISPENSER_UP_7", 129 },
-  { "LS_DISPENSER_UP_8", "INTERFACE_IOS__LS_DISPENSER_UP_8", 130 },
-  { "MIDTANK1_LVL1_FLOAT", "INTERFACE_IOS__MIDTANK1_LVL1_FLOAT", 131 },
-  { "MIDTANK1_LVL2_FLOAT", "INTERFACE_IOS__MIDTANK1_LVL2_FLOAT", 132 },
-  { "MIDTANK1_LVL3_FLOAT", "INTERFACE_IOS__MIDTANK1_LVL3_FLOAT", 133 },
-  { "MIDTANK1_LVL4_FLOAT", "INTERFACE_IOS__MIDTANK1_LVL4_FLOAT", 134 },
-  { "MIDTANK2_LVL1_FLOAT", "INTERFACE_IOS__MIDTANK2_LVL1_FLOAT", 135 },
-  { "MIDTANK2_LVL2_FLOAT", "INTERFACE_IOS__MIDTANK2_LVL2_FLOAT", 136 },
-  { "MIDTANK2_LVL3_FLOAT", "INTERFACE_IOS__MIDTANK2_LVL3_FLOAT", 137 },
-  { "MIDTANK2_LVL4_FLOAT", "INTERFACE_IOS__MIDTANK2_LVL4_FLOAT", 138 },
-  { "MIDTANK3_LVL1_FLOAT", "INTERFACE_IOS__MIDTANK3_LVL1_FLOAT", 139 },
-  { "MIDTANK3_LVL2_FLOAT", "INTERFACE_IOS__MIDTANK3_LVL2_FLOAT", 140 },
-  { "MIDTANK3_LVL3_FLOAT", "INTERFACE_IOS__MIDTANK3_LVL3_FLOAT", 141 },
-  { "MIDTANK3_LVL4_FLOAT", "INTERFACE_IOS__MIDTANK3_LVL4_FLOAT", 142 },
-  { "MIDTANK4_LVL1_FLOAT", "INTERFACE_IOS__MIDTANK4_LVL1_FLOAT", 143 },
-  { "MIDTANK4_LVL2_FLOAT", "INTERFACE_IOS__MIDTANK4_LVL2_FLOAT", 144 },
-  { "MIDTANK4_LVL3_FLOAT", "INTERFACE_IOS__MIDTANK4_LVL3_FLOAT", 145 },
-  { "MIDTANK4_LVL4_FLOAT", "INTERFACE_IOS__MIDTANK4_LVL4_FLOAT", 146 },
-  { "MIDTANK5_LVL1_FLOAT", "INTERFACE_IOS__MIDTANK5_LVL1_FLOAT", 147 },
-  { "MIDTANK5_LVL2_FLOAT", "INTERFACE_IOS__MIDTANK5_LVL2_FLOAT", 148 },
-  { "MIDTANK5_LVL3_FLOAT", "INTERFACE_IOS__MIDTANK5_LVL3_FLOAT", 149 },
-  { "MIDTANK5_LVL4_FLOAT", "INTERFACE_IOS__MIDTANK5_LVL4_FLOAT", 150 },
-  { "MIDTANK6_LVL1_FLOAT", "INTERFACE_IOS__MIDTANK6_LVL1_FLOAT", 151 },
-  { "MIDTANK6_LVL2_FLOAT", "INTERFACE_IOS__MIDTANK6_LVL2_FLOAT", 152 },
-  { "MIDTANK6_LVL3_FLOAT", "INTERFACE_IOS__MIDTANK6_LVL3_FLOAT", 153 },
-  { "MIDTANK6_LVL4_FLOAT", "INTERFACE_IOS__MIDTANK6_LVL4_FLOAT", 154 },
-  { "MIDTANK7_LVL1_FLOAT", "INTERFACE_IOS__MIDTANK7_LVL1_FLOAT", 155 },
-  { "MIDTANK7_LVL2_FLOAT", "INTERFACE_IOS__MIDTANK7_LVL2_FLOAT", 156 },
-  { "MIDTANK7_LVL3_FLOAT", "INTERFACE_IOS__MIDTANK7_LVL3_FLOAT", 157 },
-  { "MIDTANK7_LVL4_FLOAT", "INTERFACE_IOS__MIDTANK7_LVL4_FLOAT", 158 },
-  { "MIDTANK8_LVL1_FLOAT", "INTERFACE_IOS__MIDTANK8_LVL1_FLOAT", 159 },
-  { "MIDTANK8_LVL2_FLOAT", "INTERFACE_IOS__MIDTANK8_LVL2_FLOAT", 160 },
-  { "MIDTANK8_LVL3_FLOAT", "INTERFACE_IOS__MIDTANK8_LVL3_FLOAT", 161 },
-  { "MIDTANK8_LVL4_FLOAT", "INTERFACE_IOS__MIDTANK8_LVL4_FLOAT", 162 },
   { "GPO_DILUTORPUMP_SSR10_CTRL", "INTERFACE_IOS__GPO_DILUTORPUMP_SSR10_CTRL", 163 },
   { "GPO_WASTECH_PUMP2", "INTERFACE_IOS__GPO_WASTECH_PUMP2", 164 },
   { "Midtank1Air", "INTERFACE_IOS__Midtank1Air", 165 },
@@ -190,166 +38,9 @@ static const ProtobufCEnumValue interface_ios__enum_values_by_number[347] =
   { "Midtank6Cartridge", "INTERFACE_IOS__Midtank6Cartridge", 178 },
   { "Midtank7Cartridge", "INTERFACE_IOS__Midtank7Cartridge", 179 },
   { "Midtank8Cartridge", "INTERFACE_IOS__Midtank8Cartridge", 180 },
-  { "MOTO_DISPENSER_1", "INTERFACE_IOS__MOTO_DISPENSER_1", 181 },
-  { "MOTO_DISPENSER_2", "INTERFACE_IOS__MOTO_DISPENSER_2", 182 },
-  { "MOTO_DISPENSER_3", "INTERFACE_IOS__MOTO_DISPENSER_3", 183 },
-  { "MOTO_DISPENSER_4", "INTERFACE_IOS__MOTO_DISPENSER_4", 184 },
-  { "MOTO_DISPENSER_5", "INTERFACE_IOS__MOTO_DISPENSER_5", 185 },
-  { "MOTO_DISPENSER_6", "INTERFACE_IOS__MOTO_DISPENSER_6", 186 },
-  { "MOTO_DISPENSER_7", "INTERFACE_IOS__MOTO_DISPENSER_7", 187 },
-  { "MOTO_DISPENSER_8", "INTERFACE_IOS__MOTO_DISPENSER_8", 188 },
-  { "DISPENSER_ROTENC1", "INTERFACE_IOS__DISPENSER_ROTENC1", 189 },
-  { "DISPENSER_ROTENC2", "INTERFACE_IOS__DISPENSER_ROTENC2", 190 },
-  { "DISPENSER_ROTENC3", "INTERFACE_IOS__DISPENSER_ROTENC3", 191 },
-  { "DISPENSER_ROTENC4", "INTERFACE_IOS__DISPENSER_ROTENC4", 192 },
-  { "DISPENSER_ROTENC5", "INTERFACE_IOS__DISPENSER_ROTENC5", 193 },
-  { "DISPENSER_ROTENC6", "INTERFACE_IOS__DISPENSER_ROTENC6", 194 },
-  { "DISPENSER_ROTENC7", "INTERFACE_IOS__DISPENSER_ROTENC7", 195 },
-  { "DISPENSER_ROTENC8", "INTERFACE_IOS__DISPENSER_ROTENC8", 196 },
-  { "DISPENSER_VALVE_1", "INTERFACE_IOS__DISPENSER_VALVE_1", 197 },
-  { "DISPENSER_VALVE_2", "INTERFACE_IOS__DISPENSER_VALVE_2", 198 },
-  { "DISPENSER_VALVE_3", "INTERFACE_IOS__DISPENSER_VALVE_3", 199 },
-  { "DISPENSER_VALVE_4", "INTERFACE_IOS__DISPENSER_VALVE_4", 200 },
-  { "DISPENSER_VALVE_5", "INTERFACE_IOS__DISPENSER_VALVE_5", 201 },
-  { "DISPENSER_VALVE_6", "INTERFACE_IOS__DISPENSER_VALVE_6", 202 },
-  { "DISPENSER_VALVE_7", "INTERFACE_IOS__DISPENSER_VALVE_7", 203 },
-  { "DISPENSER_1", "INTERFACE_IOS__DISPENSER_1", 204 },
-  { "DISPENSER_3", "INTERFACE_IOS__DISPENSER_3", 205 },
-  { "DISPENSER_5", "INTERFACE_IOS__DISPENSER_5", 206 },
-  { "DISPENSER_7", "INTERFACE_IOS__DISPENSER_7", 207 },
-  { "MIDTANK3_1", "INTERFACE_IOS__MIDTANK3_1", 208 },
-  { "DISPENSER_2", "INTERFACE_IOS__DISPENSER_2", 209 },
-  { "DISPENSER_4", "INTERFACE_IOS__DISPENSER_4", 210 },
-  { "DISPENSER_6", "INTERFACE_IOS__DISPENSER_6", 211 },
-  { "DISPENSER_8", "INTERFACE_IOS__DISPENSER_8", 212 },
-  { "MIDTANK3_2", "INTERFACE_IOS__MIDTANK3_2", 213 },
-  { "CART3", "INTERFACE_IOS__CART3", 214 },
-  { "CART1", "INTERFACE_IOS__CART1", 215 },
-  { "CART2", "INTERFACE_IOS__CART2", 216 },
-  { "CART4", "INTERFACE_IOS__CART4", 217 },
-  { "CART7", "INTERFACE_IOS__CART7", 218 },
-  { "CART5", "INTERFACE_IOS__CART5", 219 },
-  { "CART6", "INTERFACE_IOS__CART6", 220 },
-  { "CART8", "INTERFACE_IOS__CART8", 221 },
-  { "LS_SCREW_LEFT", "INTERFACE_IOS__LS_SCREW_LEFT", 222 },
-  { "LS_SCREW_RIGHT", "INTERFACE_IOS__LS_SCREW_RIGHT", 223 },
-  { "SW_SPARE", "INTERFACE_IOS__SW_SPARE", 224 },
-  { "SW_SPOOL_EXISTS", "INTERFACE_IOS__SW_SPOOL_EXISTS", 225 },
-  { "MOTO_SCREW", "INTERFACE_IOS__MOTO_SCREW", 226 },
-  { "MOTO_WINDER", "INTERFACE_IOS__MOTO_WINDER", 227 },
-  { "SCREW_ROTENC", "INTERFACE_IOS__SCREW_ROTENC", 228 },
-  { "INTWINDINGUNIT", "INTERFACE_IOS__INTWINDINGUNIT", 229 },
-  { "AN5V_LDANCER1", "INTERFACE_IOS__AN5V_LDANCER1", 230 },
-  { "AN5V_LDANCER2", "INTERFACE_IOS__AN5V_LDANCER2", 231 },
-  { "LS_LDANCER1_DOWN", "INTERFACE_IOS__LS_LDANCER1_DOWN", 232 },
-  { "LS_LDANCER1_UP", "INTERFACE_IOS__LS_LDANCER1_UP", 233 },
-  { "LS_LDANCER2_DOWN", "INTERFACE_IOS__LS_LDANCER2_DOWN", 234 },
-  { "LS_LDANCER2_UP", "INTERFACE_IOS__LS_LDANCER2_UP", 235 },
-  { "LS_LLOADMOTOR_DOWN", "INTERFACE_IOS__LS_LLOADMOTOR_DOWN", 236 },
-  { "LS_LLOADMOTOR_UP", "INTERFACE_IOS__LS_LLOADMOTOR_UP", 237 },
-  { "LS_LPIVOT_DOWN", "INTERFACE_IOS__LS_LPIVOT_DOWN", 238 },
-  { "LS_LPIVOT_UP", "INTERFACE_IOS__LS_LPIVOT_UP", 239 },
-  { "LS_LSPARE1", "INTERFACE_IOS__LS_LSPARE1", 240 },
-  { "LS_LSPARE2", "INTERFACE_IOS__LS_LSPARE2", 241 },
-  { "LS_PIVOT_SPARE1", "INTERFACE_IOS__LS_PIVOT_SPARE1", 242 },
-  { "LS_PIVOT_SPARE2", "INTERFACE_IOS__LS_PIVOT_SPARE2", 243 },
-  { "MOTO_LDANCER1", "INTERFACE_IOS__MOTO_LDANCER1", 244 },
-  { "MOTO_LDANCER2", "INTERFACE_IOS__MOTO_LDANCER2", 245 },
-  { "MOTO_LDRIVING", "INTERFACE_IOS__MOTO_LDRIVING", 246 },
-  { "MOTO_LLOADING", "INTERFACE_IOS__MOTO_LLOADING", 247 },
-  { "MOTO_LPIVOT1", "INTERFACE_IOS__MOTO_LPIVOT1", 248 },
-  { "LSPARE1_ROTENC", "INTERFACE_IOS__LSPARE1_ROTENC", 249 },
-  { "LSPARE2_ROTENC", "INTERFACE_IOS__LSPARE2_ROTENC", 250 },
-  { "LDANCER1_ROTENC", "INTERFACE_IOS__LDANCER1_ROTENC", 251 },
-  { "LDANCER2_ROTENC", "INTERFACE_IOS__LDANCER2_ROTENC", 252 },
-  { "LSPARE_ROTENC", "INTERFACE_IOS__LSPARE_ROTENC", 253 },
-  { "LTFEEDUNIT2", "INTERFACE_IOS__LTFEEDUNIT2", 254 },
-  { "LTFEEDUNIT1", "INTERFACE_IOS__LTFEEDUNIT1", 255 },
-  { "AN_ENCLOSURETEMP1", "INTERFACE_IOS__AN_ENCLOSURETEMP1", 256 },
-  { "AN_ENCLOSURETEMP2", "INTERFACE_IOS__AN_ENCLOSURETEMP2", 257 },
-  { "AN_ENCLOSURETEMP3", "INTERFACE_IOS__AN_ENCLOSURETEMP3", 258 },
-  { "GPI_PANSW1", "INTERFACE_IOS__GPI_PANSW1", 259 },
-  { "GPI_PANSW2", "INTERFACE_IOS__GPI_PANSW2", 260 },
-  { "GPI_PANSW3", "INTERFACE_IOS__GPI_PANSW3", 261 },
-  { "GPI_PANSW4", "INTERFACE_IOS__GPI_PANSW4", 262 },
-  { "GPI_PANSW5", "INTERFACE_IOS__GPI_PANSW5", 263 },
-  { "GPI_PANSW6", "INTERFACE_IOS__GPI_PANSW6", 264 },
-  { "GPI_PWRBUTTON", "INTERFACE_IOS__GPI_PWRBUTTON", 265 },
-  { "GPI_TACTSW1", "INTERFACE_IOS__GPI_TACTSW1", 266 },
-  { "GPI_TACTSW2", "INTERFACE_IOS__GPI_TACTSW2", 267 },
-  { "GPI_TACTSW3", "INTERFACE_IOS__GPI_TACTSW3", 268 },
-  { "GPI_TACTSW4", "INTERFACE_IOS__GPI_TACTSW4", 269 },
-  { "GPO_BUZZER", "INTERFACE_IOS__GPO_BUZZER", 270 },
-  { "GPO_LED1", "INTERFACE_IOS__GPO_LED1", 271 },
-  { "GPO_LED2", "INTERFACE_IOS__GPO_LED2", 272 },
-  { "GPO_LED3", "INTERFACE_IOS__GPO_LED3", 273 },
   { "GPO_LED4", "INTERFACE_IOS__GPO_LED4", 274 },
-  { "FAN_TACHO1", "INTERFACE_IOS__FAN_TACHO1", 275 },
-  { "FAN_TACHO2", "INTERFACE_IOS__FAN_TACHO2", 276 },
-  { "FAN_TACHO3", "INTERFACE_IOS__FAN_TACHO3", 277 },
-  { "FAN1_TACH", "INTERFACE_IOS__FAN1_TACH", 278 },
-  { "FAN2_TACH", "INTERFACE_IOS__FAN2_TACH", 279 },
-  { "FAN3_TACH", "INTERFACE_IOS__FAN3_TACH", 280 },
-  { "FAN4_TACH", "INTERFACE_IOS__FAN4_TACH", 281 },
-  { "FAN5_TACH", "INTERFACE_IOS__FAN5_TACH", 282 },
-  { "AN5V_RDANCER", "INTERFACE_IOS__AN5V_RDANCER", 283 },
-  { "LS_RLOADMOTOR_UP", "INTERFACE_IOS__LS_RLOADMOTOR_UP", 284 },
-  { "GPI_TFEED_BREAK_1", "INTERFACE_IOS__GPI_TFEED_BREAK_1", 285 },
-  { "GPI_TFEED_BREAK_2", "INTERFACE_IOS__GPI_TFEED_BREAK_2", 286 },
-  { "LS_RDANCER_DOWN", "INTERFACE_IOS__LS_RDANCER_DOWN", 287 },
-  { "LS_RDANCER_UP", "INTERFACE_IOS__LS_RDANCER_UP", 288 },
-  { "RTFEEDUNIT2", "INTERFACE_IOS__RTFEEDUNIT2", 289 },
-  { "RTFEEDUNIT1", "INTERFACE_IOS__RTFEEDUNIT1", 290 },
-  { "LS_RLOADMOTOR_DOWN", "INTERFACE_IOS__LS_RLOADMOTOR_DOWN", 291 },
-  { "LS_RLOADRAM_DOWN", "INTERFACE_IOS__LS_RLOADRAM_DOWN", 292 },
-  { "LS_RLOADRAM_UP", "INTERFACE_IOS__LS_RLOADRAM_UP", 293 },
-  { "LS_RSPARE1", "INTERFACE_IOS__LS_RSPARE1", 294 },
-  { "LS_RSPARE2", "INTERFACE_IOS__LS_RSPARE2", 295 },
-  { "GPO_TFEED_BREAK_1", "INTERFACE_IOS__GPO_TFEED_BREAK_1", 296 },
-  { "GPO_TFEED_BREAK_2", "INTERFACE_IOS__GPO_TFEED_BREAK_2", 297 },
-  { "MOTO_RDANCER", "INTERFACE_IOS__MOTO_RDANCER", 298 },
-  { "MOTO_RDRIVING", "INTERFACE_IOS__MOTO_RDRIVING", 299 },
-  { "MOTO_RLOADARM", "INTERFACE_IOS__MOTO_RLOADARM", 300 },
-  { "MOTO_RLOADING", "INTERFACE_IOS__MOTO_RLOADING", 301 },
-  { "RSPARE_ROTENC1", "INTERFACE_IOS__RSPARE_ROTENC1", 302 },
-  { "RSPEEDSENS_ROTENC", "INTERFACE_IOS__RSPEEDSENS_ROTENC", 303 },
-  { "RDANCER_ROTENC", "INTERFACE_IOS__RDANCER_ROTENC", 304 },
-  { "RSPARE_ROTENC2", "INTERFACE_IOS__RSPARE_ROTENC2", 305 },
-  { "AN10V_SPARE1", "INTERFACE_IOS__AN10V_SPARE1", 306 },
-  { "AN10V_SPARE2", "INTERFACE_IOS__AN10V_SPARE2", 307 },
-  { "LS_SPARE1_1", "INTERFACE_IOS__LS_SPARE1_1", 308 },
-  { "LS_SPARE1_2", "INTERFACE_IOS__LS_SPARE1_2", 309 },
-  { "LS_SPARE1_3", "INTERFACE_IOS__LS_SPARE1_3", 310 },
-  { "LS_SPARE1_4", "INTERFACE_IOS__LS_SPARE1_4", 311 },
-  { "LS_SPARE2_1", "INTERFACE_IOS__LS_SPARE2_1", 312 },
-  { "SPARE2", "INTERFACE_IOS__SPARE2", 313 },
-  { "SPARE1", "INTERFACE_IOS__SPARE1", 314 },
-  { "LS_SPARE2_2", "INTERFACE_IOS__LS_SPARE2_2", 315 },
-  { "LS_SPARE2_3", "INTERFACE_IOS__LS_SPARE2_3", 316 },
-  { "LS_SPARE2_4", "INTERFACE_IOS__LS_SPARE2_4", 317 },
   { "GPO_SPARE1_1", "INTERFACE_IOS__GPO_SPARE1_1", 318 },
   { "GPO_SPARE1_2", "INTERFACE_IOS__GPO_SPARE1_2", 319 },
-  { "GPO_SPARE2_1", "INTERFACE_IOS__GPO_SPARE2_1", 320 },
-  { "GPO_SPARE2_2", "INTERFACE_IOS__GPO_SPARE2_2", 321 },
-  { "MOTO_SPARE1_1", "INTERFACE_IOS__MOTO_SPARE1_1", 322 },
-  { "MOTO_SPARE1_2", "INTERFACE_IOS__MOTO_SPARE1_2", 323 },
-  { "MOTO_SPARE2_1", "INTERFACE_IOS__MOTO_SPARE2_1", 324 },
-  { "MOTO_SPARE2_2", "INTERFACE_IOS__MOTO_SPARE2_2", 325 },
-  { "SPARE1_ROTENC1", "INTERFACE_IOS__SPARE1_ROTENC1", 326 },
-  { "SPARE2_ROTENC2", "INTERFACE_IOS__SPARE2_ROTENC2", 327 },
-  { "SPARE1_ROTENC3", "INTERFACE_IOS__SPARE1_ROTENC3", 328 },
-  { "SPARE2_ROTENC4", "INTERFACE_IOS__SPARE2_ROTENC4", 329 },
-  { "CHILLER_CTRL", "INTERFACE_IOS__CHILLER_CTRL", 330 },
-  { "AN_AIRPRESS_1", "INTERFACE_IOS__AN_AIRPRESS_1", 331 },
-  { "AN_AIRPRESS_2", "INTERFACE_IOS__AN_AIRPRESS_2", 332 },
-  { "AN_VOCSENS", "INTERFACE_IOS__AN_VOCSENS", 333 },
-  { "AN_BLOWERCTRL", "INTERFACE_IOS__AN_BLOWERCTRL", 334 },
-  { "GPI_AIRFLOW_FLAP", "INTERFACE_IOS__GPI_AIRFLOW_FLAP", 335 },
-  { "GPI_BLOWER_TACH", "INTERFACE_IOS__GPI_BLOWER_TACH", 336 },
-  { "GPI_CHILLER_FAULT", "INTERFACE_IOS__GPI_CHILLER_FAULT", 337 },
-  { "GPI_CHILLER_STAT1", "INTERFACE_IOS__GPI_CHILLER_STAT1", 338 },
-  { "WHS_VOCTEMP", "INTERFACE_IOS__WHS_VOCTEMP", 339 },
-  { "GPI_SW_FILTER_PRES", "INTERFACE_IOS__GPI_SW_FILTER_PRES", 340 },
   { "GPI_WCONTAINER_FULL", "INTERFACE_IOS__GPI_WCONTAINER_FULL", 341 },
   { "GPI_WCONTAINER_WARN", "INTERFACE_IOS__GPI_WCONTAINER_WARN", 342 },
   { "GPO_BLOWER_PWM", "INTERFACE_IOS__GPO_BLOWER_PWM", 343 },
@@ -358,357 +49,48 @@ static const ProtobufCEnumValue interface_ios__enum_values_by_number[347] =
   { "VALVE_WASTE_TANK", "INTERFACE_IOS__VALVE_WASTE_TANK", 346 },
 };
 static const ProtobufCIntRange interface_ios__value_ranges[] = {
-{0, 0},{0, 347}
+{0, 0},{19, 1},{43, 6},{55, 9},{64, 10},{163, 11},{274, 29},{318, 30},{341, 32},{0, 38}
 };
-static const ProtobufCEnumValueIndex interface_ios__enum_values_by_name[347] =
+static const ProtobufCEnumValueIndex interface_ios__enum_values_by_name[38] =
 {
-  { "AN10V_SPARE1", 306 },
-  { "AN10V_SPARE2", 307 },
-  { "AN5V_LDANCER1", 230 },
-  { "AN5V_LDANCER2", 231 },
-  { "AN5V_RDANCER", 283 },
-  { "ANALOG_DRYER_TEMP1", 32 },
-  { "ANALOG_DRYER_TEMP2", 33 },
-  { "ANALOG_DRYER_TEMP3", 34 },
-  { "ANALOG_DYEINGH_TEMP1", 6 },
-  { "ANALOG_DYEINGH_TEMP2", 7 },
-  { "ANALOG_DYEINGH_TEMP3", 8 },
-  { "ANALOG_DYEINGH_TEMP4", 9 },
-  { "ANALOG_DYEINGH_TEMP5", 10 },
   { "ANALOG_MIXCHIP_TEMP", 0 },
-  { "AN_AIRPRESS_1", 331 },
-  { "AN_AIRPRESS_2", 332 },
-  { "AN_BLOWERCTRL", 334 },
-  { "AN_DRYER_CURSEN1", 29 },
-  { "AN_DRYER_CURSEN2", 30 },
-  { "AN_DRYER_CURSEN3", 31 },
-  { "AN_DYEINGH_CURSEN_1", 1 },
-  { "AN_DYEINGH_CURSEN_2", 2 },
-  { "AN_DYEINGH_CURSEN_3", 3 },
-  { "AN_DYEINGH_CURSEN_4", 4 },
-  { "AN_DYEINGH_CURSEN_5", 5 },
-  { "AN_ENCLOSURETEMP1", 256 },
-  { "AN_ENCLOSURETEMP2", 257 },
-  { "AN_ENCLOSURETEMP3", 258 },
-  { "AN_IDS_PRESSENS_1", 67 },
-  { "AN_IDS_PRESSENS_2", 68 },
-  { "AN_IDS_PRESSENS_3", 69 },
-  { "AN_IDS_PRESSENS_4", 70 },
-  { "AN_IDS_PRESSENS_5", 71 },
-  { "AN_IDS_PRESSENS_6", 72 },
-  { "AN_IDS_PRESSENS_7", 73 },
-  { "AN_IDS_PRESSENS_8", 74 },
-  { "AN_MIDTANK_PRESSENS1", 75 },
-  { "AN_MIDTANK_PRESSENS2", 76 },
-  { "AN_MIDTANK_PRESSENS3", 77 },
-  { "AN_MIDTANK_PRESSENS4", 78 },
-  { "AN_MIDTANK_PRESSENS5", 79 },
-  { "AN_MIDTANK_PRESSENS6", 80 },
-  { "AN_MIDTANK_PRESSENS7", 81 },
-  { "AN_MIXCHIP_CURSENn", 82 },
-  { "AN_VOCSENS", 333 },
-  { "CART1", 215 },
-  { "CART2", 216 },
-  { "CART3", 214 },
-  { "CART4", 217 },
-  { "CART5", 219 },
-  { "CART6", 220 },
-  { "CART7", 218 },
-  { "CART8", 221 },
-  { "CHILLER_CTRL", 330 },
-  { "DH1", 25 },
-  { "DH2", 24 },
-  { "DISPENSER_1", 204 },
-  { "DISPENSER_2", 209 },
-  { "DISPENSER_3", 205 },
-  { "DISPENSER_4", 210 },
-  { "DISPENSER_5", 206 },
-  { "DISPENSER_6", 211 },
-  { "DISPENSER_7", 207 },
-  { "DISPENSER_8", 212 },
-  { "DISPENSER_ROTENC1", 189 },
-  { "DISPENSER_ROTENC2", 190 },
-  { "DISPENSER_ROTENC3", 191 },
-  { "DISPENSER_ROTENC4", 192 },
-  { "DISPENSER_ROTENC5", 193 },
-  { "DISPENSER_ROTENC6", 194 },
-  { "DISPENSER_ROTENC7", 195 },
-  { "DISPENSER_ROTENC8", 196 },
-  { "DISPENSER_VALVE_1", 197 },
-  { "DISPENSER_VALVE_2", 198 },
-  { "DISPENSER_VALVE_3", 199 },
-  { "DISPENSER_VALVE_4", 200 },
-  { "DISPENSER_VALVE_5", 201 },
-  { "DISPENSER_VALVE_6", 202 },
-  { "DISPENSER_VALVE_7", 203 },
-  { "DRYER1", 47 },
-  { "DRYER2", 46 },
-  { "DRYER_LOADARM_ROTENC", 51 },
-  { "ELECTRICALENC", 56 },
-  { "EXTWINDER_CTRL", 65 },
-  { "EXTWINDINGUNIT", 66 },
-  { "FAN1_TACH", 278 },
-  { "FAN2_TACH", 279 },
-  { "FAN3_TACH", 280 },
-  { "FAN4_TACH", 281 },
-  { "FAN5_TACH", 282 },
-  { "FAN_TACHO1", 275 },
-  { "FAN_TACHO2", 276 },
-  { "FAN_TACHO3", 277 },
-  { "GPI_AIRFLOW_FLAP", 335 },
-  { "GPI_BLOWER_TACH", 336 },
-  { "GPI_CHILLER_FAULT", 337 },
-  { "GPI_CHILLER_STAT1", 338 },
-  { "GPI_EXTWINDER_1", 58 },
-  { "GPI_EXTWINDER_2", 59 },
-  { "GPI_EXTWINDER_3", 60 },
-  { "GPI_PANSW1", 259 },
-  { "GPI_PANSW2", 260 },
-  { "GPI_PANSW3", 261 },
-  { "GPI_PANSW4", 262 },
-  { "GPI_PANSW5", 263 },
-  { "GPI_PANSW6", 264 },
-  { "GPI_PS1_DC_OK", 52 },
-  { "GPI_PWRBUTTON", 265 },
-  { "GPI_SW_FILTER_PRES", 340 },
-  { "GPI_TACTSW1", 266 },
-  { "GPI_TACTSW2", 267 },
-  { "GPI_TACTSW3", 268 },
-  { "GPI_TACTSW4", 269 },
-  { "GPI_TFEED_BREAK_1", 285 },
-  { "GPI_TFEED_BREAK_2", 286 },
-  { "GPI_WCONTAINER_FULL", 341 },
-  { "GPI_WCONTAINER_WARN", 342 },
-  { "GPO_BLOWER_PWM", 343 },
-  { "GPO_BUZZER", 270 },
-  { "GPO_CHILLER_SSR9_CTRL", 344 },
-  { "GPO_DILUTORPUMP_SSR10_CTRL", 163 },
-  { "GPO_DRYER_SSR1_CTRL", 43 },
-  { "GPO_DRYER_SSR2_CTRL", 44 },
-  { "GPO_DRYER_SSR3_CTRL", 45 },
-  { "GPO_DYEINGH_SSR5_CTRL", 20 },
-  { "GPO_DYEINGH_SSR6_CTRL", 21 },
-  { "GPO_DYEINGH_SSR7_CTRL", 22 },
-  { "GPO_DYEINGH_SSR8_CTRL", 23 },
-  { "GPO_EXTWINDER_1", 61 },
-  { "GPO_EXTWINDER_2", 62 },
-  { "GPO_EXTWINDER_3", 63 },
-  { "GPO_EXTWINDER_SSR11_CTRL", 64 },
-  { "GPO_LED1", 271 },
-  { "GPO_LED2", 272 },
-  { "GPO_LED3", 273 },
-  { "GPO_LED4", 274 },
-  { "GPO_MIXCHIP_SSR4_CTRL", 19 },
-  { "GPO_PDOWN_RL1_CTRL", 53 },
-  { "GPO_SPARE1_1", 318 },
-  { "GPO_SPARE1_2", 319 },
-  { "GPO_SPARE2_1", 320 },
-  { "GPO_SPARE2_2", 321 },
-  { "GPO_SPARE_SSR12_CTRL", 54 },
-  { "GPO_SPARE_SSR13_CTRL", 55 },
-  { "GPO_TFEED_BREAK_1", 296 },
-  { "GPO_TFEED_BREAK_2", 297 },
-  { "GPO_WASTECH_PUMP2", 164 },
-  { "GPO_WHS_WTANKPUMP2", 345 },
-  { "INTWINDINGUNIT", 229 },
-  { "LDANCER1_ROTENC", 251 },
-  { "LDANCER2_ROTENC", 252 },
-  { "LSPARE1_ROTENC", 249 },
-  { "LSPARE2_ROTENC", 250 },
-  { "LSPARE_ROTENC", 253 },
-  { "LS_DH_CLEAN_DOWN", 11 },
-  { "LS_DH_CLEAN_LEFT", 12 },
-  { "LS_DH_CLEAN_RIGHT", 13 },
-  { "LS_DH_CLEAN_UP", 14 },
-  { "LS_DH_LID_CLEANING", 15 },
-  { "LS_DH_LID_CLOSED", 16 },
-  { "LS_DH_LID_OPEN", 17 },
-  { "LS_DH_SPARE1", 18 },
-  { "LS_DISPENSER_25_1", 83 },
-  { "LS_DISPENSER_25_2", 84 },
-  { "LS_DISPENSER_25_3", 85 },
-  { "LS_DISPENSER_25_4", 86 },
-  { "LS_DISPENSER_25_5", 87 },
-  { "LS_DISPENSER_25_6", 88 },
-  { "LS_DISPENSER_25_7", 89 },
-  { "LS_DISPENSER_25_8", 90 },
-  { "LS_DISPENSER_50_1", 91 },
-  { "LS_DISPENSER_50_2", 92 },
-  { "LS_DISPENSER_50_3", 93 },
-  { "LS_DISPENSER_50_4", 94 },
-  { "LS_DISPENSER_50_5", 95 },
-  { "LS_DISPENSER_50_6", 96 },
-  { "LS_DISPENSER_50_7", 97 },
-  { "LS_DISPENSER_50_8", 98 },
-  { "LS_DISPENSER_75_1", 99 },
-  { "LS_DISPENSER_75_2", 100 },
-  { "LS_DISPENSER_75_3", 101 },
-  { "LS_DISPENSER_75_4", 102 },
-  { "LS_DISPENSER_75_5", 103 },
-  { "LS_DISPENSER_75_6", 104 },
-  { "LS_DISPENSER_75_7", 105 },
-  { "LS_DISPENSER_75_8", 106 },
-  { "LS_DISPENSER_DOWN_1", 107 },
-  { "LS_DISPENSER_DOWN_2", 108 },
-  { "LS_DISPENSER_DOWN_3", 109 },
-  { "LS_DISPENSER_DOWN_4", 110 },
-  { "LS_DISPENSER_DOWN_5", 111 },
-  { "LS_DISPENSER_DOWN_6", 112 },
-  { "LS_DISPENSER_DOWN_7", 113 },
-  { "LS_DISPENSER_DOWN_8", 114 },
-  { "LS_DISPENSER_SPARE_1", 115 },
-  { "LS_DISPENSER_SPARE_2", 116 },
-  { "LS_DISPENSER_SPARE_3", 117 },
-  { "LS_DISPENSER_SPARE_4", 118 },
-  { "LS_DISPENSER_SPARE_5", 119 },
-  { "LS_DISPENSER_SPARE_6", 120 },
-  { "LS_DISPENSER_SPARE_7", 121 },
-  { "LS_DISPENSER_SPARE_8", 122 },
-  { "LS_DISPENSER_UP_1", 123 },
-  { "LS_DISPENSER_UP_2", 124 },
-  { "LS_DISPENSER_UP_3", 125 },
-  { "LS_DISPENSER_UP_4", 126 },
-  { "LS_DISPENSER_UP_5", 127 },
-  { "LS_DISPENSER_UP_6", 128 },
-  { "LS_DISPENSER_UP_7", 129 },
-  { "LS_DISPENSER_UP_8", 130 },
-  { "LS_DRYER_LID_CLOSED", 35 },
-  { "LS_DRYER_LID_OPEN", 36 },
-  { "LS_DRYER_SPARE1", 37 },
-  { "LS_DRYER_SPARE2", 38 },
-  { "LS_DRYER_SPARE3", 39 },
-  { "LS_DRYER_SPARE4", 40 },
-  { "LS_LDANCER1_DOWN", 232 },
-  { "LS_LDANCER1_UP", 233 },
-  { "LS_LDANCER2_DOWN", 234 },
-  { "LS_LDANCER2_UP", 235 },
-  { "LS_LLOADMOTOR_DOWN", 236 },
-  { "LS_LLOADMOTOR_UP", 237 },
-  { "LS_LOADARM_LEFT", 41 },
-  { "LS_LOADARM_RIGHT", 42 },
-  { "LS_LPIVOT_DOWN", 238 },
-  { "LS_LPIVOT_UP", 239 },
-  { "LS_LSPARE1", 240 },
-  { "LS_LSPARE2", 241 },
-  { "LS_PIVOT_SPARE1", 242 },
-  { "LS_PIVOT_SPARE2", 243 },
-  { "LS_RDANCER_DOWN", 287 },
-  { "LS_RDANCER_UP", 288 },
-  { "LS_RLOADMOTOR_DOWN", 291 },
-  { "LS_RLOADMOTOR_UP", 284 },
-  { "LS_RLOADRAM_DOWN", 292 },
-  { "LS_RLOADRAM_UP", 293 },
-  { "LS_RSPARE1", 294 },
-  { "LS_RSPARE2", 295 },
-  { "LS_SCREW_LEFT", 222 },
-  { "LS_SCREW_RIGHT", 223 },
-  { "LS_SPARE1_1", 308 },
-  { "LS_SPARE1_2", 309 },
-  { "LS_SPARE1_3", 310 },
-  { "LS_SPARE1_4", 311 },
-  { "LS_SPARE2_1", 312 },
-  { "LS_SPARE2_2", 315 },
-  { "LS_SPARE2_3", 316 },
-  { "LS_SPARE2_4", 317 },
-  { "LTFEEDUNIT1", 255 },
-  { "LTFEEDUNIT2", 254 },
-  { "MIDTANK1_LVL1_FLOAT", 131 },
-  { "MIDTANK1_LVL2_FLOAT", 132 },
-  { "MIDTANK1_LVL3_FLOAT", 133 },
-  { "MIDTANK1_LVL4_FLOAT", 134 },
-  { "MIDTANK2_LVL1_FLOAT", 135 },
-  { "MIDTANK2_LVL2_FLOAT", 136 },
-  { "MIDTANK2_LVL3_FLOAT", 137 },
-  { "MIDTANK2_LVL4_FLOAT", 138 },
-  { "MIDTANK3_1", 208 },
-  { "MIDTANK3_2", 213 },
-  { "MIDTANK3_LVL1_FLOAT", 139 },
-  { "MIDTANK3_LVL2_FLOAT", 140 },
-  { "MIDTANK3_LVL3_FLOAT", 141 },
-  { "MIDTANK3_LVL4_FLOAT", 142 },
-  { "MIDTANK4_LVL1_FLOAT", 143 },
-  { "MIDTANK4_LVL2_FLOAT", 144 },
-  { "MIDTANK4_LVL3_FLOAT", 145 },
-  { "MIDTANK4_LVL4_FLOAT", 146 },
-  { "MIDTANK5_LVL1_FLOAT", 147 },
-  { "MIDTANK5_LVL2_FLOAT", 148 },
-  { "MIDTANK5_LVL3_FLOAT", 149 },
-  { "MIDTANK5_LVL4_FLOAT", 150 },
-  { "MIDTANK6_LVL1_FLOAT", 151 },
-  { "MIDTANK6_LVL2_FLOAT", 152 },
-  { "MIDTANK6_LVL3_FLOAT", 153 },
-  { "MIDTANK6_LVL4_FLOAT", 154 },
-  { "MIDTANK7_LVL1_FLOAT", 155 },
-  { "MIDTANK7_LVL2_FLOAT", 156 },
-  { "MIDTANK7_LVL3_FLOAT", 157 },
-  { "MIDTANK7_LVL4_FLOAT", 158 },
-  { "MIDTANK8_LVL1_FLOAT", 159 },
-  { "MIDTANK8_LVL2_FLOAT", 160 },
-  { "MIDTANK8_LVL3_FLOAT", 161 },
-  { "MIDTANK8_LVL4_FLOAT", 162 },
-  { "MOTO_DH_CLEANHEAD", 26 },
-  { "MOTO_DH_CLEANMECH", 27 },
-  { "MOTO_DH_LID", 28 },
-  { "MOTO_DISPENSER_1", 181 },
-  { "MOTO_DISPENSER_2", 182 },
-  { "MOTO_DISPENSER_3", 183 },
-  { "MOTO_DISPENSER_4", 184 },
-  { "MOTO_DISPENSER_5", 185 },
-  { "MOTO_DISPENSER_6", 186 },
-  { "MOTO_DISPENSER_7", 187 },
-  { "MOTO_DISPENSER_8", 188 },
-  { "MOTO_DRYER_DRIVING", 48 },
-  { "MOTO_DRYER_LID", 49 },
-  { "MOTO_DRYER_LOADARM", 50 },
-  { "MOTO_LDANCER1", 244 },
-  { "MOTO_LDANCER2", 245 },
-  { "MOTO_LDRIVING", 246 },
-  { "MOTO_LLOADING", 247 },
-  { "MOTO_LPIVOT1", 248 },
-  { "MOTO_RDANCER", 298 },
-  { "MOTO_RDRIVING", 299 },
-  { "MOTO_RLOADARM", 300 },
-  { "MOTO_RLOADING", 301 },
-  { "MOTO_SCREW", 226 },
-  { "MOTO_SPARE1_1", 322 },
-  { "MOTO_SPARE1_2", 323 },
-  { "MOTO_SPARE2_1", 324 },
-  { "MOTO_SPARE2_2", 325 },
-  { "MOTO_WINDER", 227 },
-  { "Midtank1Air", 165 },
-  { "Midtank1Cartridge", 173 },
-  { "Midtank2Air", 166 },
-  { "Midtank2Cartridge", 174 },
-  { "Midtank3Air", 167 },
-  { "Midtank3Cartridge", 175 },
-  { "Midtank4Air", 168 },
-  { "Midtank4Cartridge", 176 },
-  { "Midtank5Air", 169 },
-  { "Midtank5Cartridge", 177 },
-  { "Midtank6Air", 170 },
-  { "Midtank6Cartridge", 178 },
-  { "Midtank7Air", 171 },
-  { "Midtank7Cartridge", 179 },
-  { "Midtank8Air", 172 },
-  { "Midtank8Cartridge", 180 },
-  { "RDANCER_ROTENC", 304 },
-  { "RSPARE_ROTENC1", 302 },
-  { "RSPARE_ROTENC2", 305 },
-  { "RSPEEDSENS_ROTENC", 303 },
-  { "RTFEEDUNIT1", 290 },
-  { "RTFEEDUNIT2", 289 },
-  { "SCREW_ROTENC", 228 },
-  { "SPARE1", 314 },
-  { "SPARE1_ROTENC1", 326 },
-  { "SPARE1_ROTENC3", 328 },
-  { "SPARE2", 313 },
-  { "SPARE2_ROTENC2", 327 },
-  { "SPARE2_ROTENC4", 329 },
-  { "SW_SPARE", 224 },
-  { "SW_SPOOL_EXISTS", 225 },
-  { "USERPANEL", 57 },
-  { "VALVE_WASTE_TANK", 346 },
-  { "WHS_VOCTEMP", 339 },
+  { "GPI_WCONTAINER_FULL", 32 },
+  { "GPI_WCONTAINER_WARN", 33 },
+  { "GPO_BLOWER_PWM", 34 },
+  { "GPO_CHILLER_SSR9_CTRL", 35 },
+  { "GPO_DILUTORPUMP_SSR10_CTRL", 11 },
+  { "GPO_DRYER_SSR1_CTRL", 6 },
+  { "GPO_DRYER_SSR2_CTRL", 7 },
+  { "GPO_DRYER_SSR3_CTRL", 8 },
+  { "GPO_DYEINGH_SSR5_CTRL", 2 },
+  { "GPO_DYEINGH_SSR6_CTRL", 3 },
+  { "GPO_DYEINGH_SSR7_CTRL", 4 },
+  { "GPO_DYEINGH_SSR8_CTRL", 5 },
+  { "GPO_EXTWINDER_SSR11_CTRL", 10 },
+  { "GPO_LED4", 29 },
+  { "GPO_MIXCHIP_SSR4_CTRL", 1 },
+  { "GPO_SPARE1_1", 30 },
+  { "GPO_SPARE1_2", 31 },
+  { "GPO_SPARE_SSR13_CTRL", 9 },
+  { "GPO_WASTECH_PUMP2", 12 },
+  { "GPO_WHS_WTANKPUMP2", 36 },
+  { "Midtank1Air", 13 },
+  { "Midtank1Cartridge", 21 },
+  { "Midtank2Air", 14 },
+  { "Midtank2Cartridge", 22 },
+  { "Midtank3Air", 15 },
+  { "Midtank3Cartridge", 23 },
+  { "Midtank4Air", 16 },
+  { "Midtank4Cartridge", 24 },
+  { "Midtank5Air", 17 },
+  { "Midtank5Cartridge", 25 },
+  { "Midtank6Air", 18 },
+  { "Midtank6Cartridge", 26 },
+  { "Midtank7Air", 19 },
+  { "Midtank7Cartridge", 27 },
+  { "Midtank8Air", 20 },
+  { "Midtank8Cartridge", 28 },
+  { "VALVE_WASTE_TANK", 37 },
 };
 const ProtobufCEnumDescriptor interface_ios__descriptor =
 {
@@ -717,11 +99,11 @@ const ProtobufCEnumDescriptor interface_ios__descriptor =
   "InterfaceIOs",
   "InterfaceIOs",
   "",
-  347,
+  38,
   interface_ios__enum_values_by_number,
-  347,
+  38,
   interface_ios__enum_values_by_name,
-  1,
+  9,
   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 006eab1d7..c3608b155 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
@@ -21,168 +21,16 @@ PROTOBUF_C__BEGIN_DECLS
 
 typedef enum _InterfaceIOs {
   INTERFACE_IOS__ANALOG_MIXCHIP_TEMP = 0,
-  INTERFACE_IOS__AN_DYEINGH_CURSEN_1 = 1,
-  INTERFACE_IOS__AN_DYEINGH_CURSEN_2 = 2,
-  INTERFACE_IOS__AN_DYEINGH_CURSEN_3 = 3,
-  INTERFACE_IOS__AN_DYEINGH_CURSEN_4 = 4,
-  INTERFACE_IOS__AN_DYEINGH_CURSEN_5 = 5,
-  INTERFACE_IOS__ANALOG_DYEINGH_TEMP1 = 6,
-  INTERFACE_IOS__ANALOG_DYEINGH_TEMP2 = 7,
-  INTERFACE_IOS__ANALOG_DYEINGH_TEMP3 = 8,
-  INTERFACE_IOS__ANALOG_DYEINGH_TEMP4 = 9,
-  INTERFACE_IOS__ANALOG_DYEINGH_TEMP5 = 10,
-  INTERFACE_IOS__LS_DH_CLEAN_DOWN = 11,
-  INTERFACE_IOS__LS_DH_CLEAN_LEFT = 12,
-  INTERFACE_IOS__LS_DH_CLEAN_RIGHT = 13,
-  INTERFACE_IOS__LS_DH_CLEAN_UP = 14,
-  INTERFACE_IOS__LS_DH_LID_CLEANING = 15,
-  INTERFACE_IOS__LS_DH_LID_CLOSED = 16,
-  INTERFACE_IOS__LS_DH_LID_OPEN = 17,
-  INTERFACE_IOS__LS_DH_SPARE1 = 18,
   INTERFACE_IOS__GPO_MIXCHIP_SSR4_CTRL = 19,
   INTERFACE_IOS__GPO_DYEINGH_SSR5_CTRL = 20,
   INTERFACE_IOS__GPO_DYEINGH_SSR6_CTRL = 21,
   INTERFACE_IOS__GPO_DYEINGH_SSR7_CTRL = 22,
   INTERFACE_IOS__GPO_DYEINGH_SSR8_CTRL = 23,
-  INTERFACE_IOS__DH2 = 24,
-  INTERFACE_IOS__DH1 = 25,
-  INTERFACE_IOS__MOTO_DH_CLEANHEAD = 26,
-  INTERFACE_IOS__MOTO_DH_CLEANMECH = 27,
-  INTERFACE_IOS__MOTO_DH_LID = 28,
-  INTERFACE_IOS__AN_DRYER_CURSEN1 = 29,
-  INTERFACE_IOS__AN_DRYER_CURSEN2 = 30,
-  INTERFACE_IOS__AN_DRYER_CURSEN3 = 31,
-  INTERFACE_IOS__ANALOG_DRYER_TEMP1 = 32,
-  INTERFACE_IOS__ANALOG_DRYER_TEMP2 = 33,
-  INTERFACE_IOS__ANALOG_DRYER_TEMP3 = 34,
-  INTERFACE_IOS__LS_DRYER_LID_CLOSED = 35,
-  INTERFACE_IOS__LS_DRYER_LID_OPEN = 36,
-  INTERFACE_IOS__LS_DRYER_SPARE1 = 37,
-  INTERFACE_IOS__LS_DRYER_SPARE2 = 38,
-  INTERFACE_IOS__LS_DRYER_SPARE3 = 39,
-  INTERFACE_IOS__LS_DRYER_SPARE4 = 40,
-  INTERFACE_IOS__LS_LOADARM_LEFT = 41,
-  INTERFACE_IOS__LS_LOADARM_RIGHT = 42,
   INTERFACE_IOS__GPO_DRYER_SSR1_CTRL = 43,
   INTERFACE_IOS__GPO_DRYER_SSR2_CTRL = 44,
   INTERFACE_IOS__GPO_DRYER_SSR3_CTRL = 45,
-  INTERFACE_IOS__DRYER2 = 46,
-  INTERFACE_IOS__DRYER1 = 47,
-  INTERFACE_IOS__MOTO_DRYER_DRIVING = 48,
-  INTERFACE_IOS__MOTO_DRYER_LID = 49,
-  INTERFACE_IOS__MOTO_DRYER_LOADARM = 50,
-  INTERFACE_IOS__DRYER_LOADARM_ROTENC = 51,
-  INTERFACE_IOS__GPI_PS1_DC_OK = 52,
-  INTERFACE_IOS__GPO_PDOWN_RL1_CTRL = 53,
-  INTERFACE_IOS__GPO_SPARE_SSR12_CTRL = 54,
   INTERFACE_IOS__GPO_SPARE_SSR13_CTRL = 55,
-  INTERFACE_IOS__ELECTRICALENC = 56,
-  INTERFACE_IOS__USERPANEL = 57,
-  INTERFACE_IOS__GPI_EXTWINDER_1 = 58,
-  INTERFACE_IOS__GPI_EXTWINDER_2 = 59,
-  INTERFACE_IOS__GPI_EXTWINDER_3 = 60,
-  INTERFACE_IOS__GPO_EXTWINDER_1 = 61,
-  INTERFACE_IOS__GPO_EXTWINDER_2 = 62,
-  INTERFACE_IOS__GPO_EXTWINDER_3 = 63,
   INTERFACE_IOS__GPO_EXTWINDER_SSR11_CTRL = 64,
-  INTERFACE_IOS__EXTWINDER_CTRL = 65,
-  INTERFACE_IOS__EXTWINDINGUNIT = 66,
-  INTERFACE_IOS__AN_IDS_PRESSENS_1 = 67,
-  INTERFACE_IOS__AN_IDS_PRESSENS_2 = 68,
-  INTERFACE_IOS__AN_IDS_PRESSENS_3 = 69,
-  INTERFACE_IOS__AN_IDS_PRESSENS_4 = 70,
-  INTERFACE_IOS__AN_IDS_PRESSENS_5 = 71,
-  INTERFACE_IOS__AN_IDS_PRESSENS_6 = 72,
-  INTERFACE_IOS__AN_IDS_PRESSENS_7 = 73,
-  INTERFACE_IOS__AN_IDS_PRESSENS_8 = 74,
-  INTERFACE_IOS__AN_MIDTANK_PRESSENS1 = 75,
-  INTERFACE_IOS__AN_MIDTANK_PRESSENS2 = 76,
-  INTERFACE_IOS__AN_MIDTANK_PRESSENS3 = 77,
-  INTERFACE_IOS__AN_MIDTANK_PRESSENS4 = 78,
-  INTERFACE_IOS__AN_MIDTANK_PRESSENS5 = 79,
-  INTERFACE_IOS__AN_MIDTANK_PRESSENS6 = 80,
-  INTERFACE_IOS__AN_MIDTANK_PRESSENS7 = 81,
-  INTERFACE_IOS__AN_MIXCHIP_CURSENn = 82,
-  INTERFACE_IOS__LS_DISPENSER_25_1 = 83,
-  INTERFACE_IOS__LS_DISPENSER_25_2 = 84,
-  INTERFACE_IOS__LS_DISPENSER_25_3 = 85,
-  INTERFACE_IOS__LS_DISPENSER_25_4 = 86,
-  INTERFACE_IOS__LS_DISPENSER_25_5 = 87,
-  INTERFACE_IOS__LS_DISPENSER_25_6 = 88,
-  INTERFACE_IOS__LS_DISPENSER_25_7 = 89,
-  INTERFACE_IOS__LS_DISPENSER_25_8 = 90,
-  INTERFACE_IOS__LS_DISPENSER_50_1 = 91,
-  INTERFACE_IOS__LS_DISPENSER_50_2 = 92,
-  INTERFACE_IOS__LS_DISPENSER_50_3 = 93,
-  INTERFACE_IOS__LS_DISPENSER_50_4 = 94,
-  INTERFACE_IOS__LS_DISPENSER_50_5 = 95,
-  INTERFACE_IOS__LS_DISPENSER_50_6 = 96,
-  INTERFACE_IOS__LS_DISPENSER_50_7 = 97,
-  INTERFACE_IOS__LS_DISPENSER_50_8 = 98,
-  INTERFACE_IOS__LS_DISPENSER_75_1 = 99,
-  INTERFACE_IOS__LS_DISPENSER_75_2 = 100,
-  INTERFACE_IOS__LS_DISPENSER_75_3 = 101,
-  INTERFACE_IOS__LS_DISPENSER_75_4 = 102,
-  INTERFACE_IOS__LS_DISPENSER_75_5 = 103,
-  INTERFACE_IOS__LS_DISPENSER_75_6 = 104,
-  INTERFACE_IOS__LS_DISPENSER_75_7 = 105,
-  INTERFACE_IOS__LS_DISPENSER_75_8 = 106,
-  INTERFACE_IOS__LS_DISPENSER_DOWN_1 = 107,
-  INTERFACE_IOS__LS_DISPENSER_DOWN_2 = 108,
-  INTERFACE_IOS__LS_DISPENSER_DOWN_3 = 109,
-  INTERFACE_IOS__LS_DISPENSER_DOWN_4 = 110,
-  INTERFACE_IOS__LS_DISPENSER_DOWN_5 = 111,
-  INTERFACE_IOS__LS_DISPENSER_DOWN_6 = 112,
-  INTERFACE_IOS__LS_DISPENSER_DOWN_7 = 113,
-  INTERFACE_IOS__LS_DISPENSER_DOWN_8 = 114,
-  INTERFACE_IOS__LS_DISPENSER_SPARE_1 = 115,
-  INTERFACE_IOS__LS_DISPENSER_SPARE_2 = 116,
-  INTERFACE_IOS__LS_DISPENSER_SPARE_3 = 117,
-  INTERFACE_IOS__LS_DISPENSER_SPARE_4 = 118,
-  INTERFACE_IOS__LS_DISPENSER_SPARE_5 = 119,
-  INTERFACE_IOS__LS_DISPENSER_SPARE_6 = 120,
-  INTERFACE_IOS__LS_DISPENSER_SPARE_7 = 121,
-  INTERFACE_IOS__LS_DISPENSER_SPARE_8 = 122,
-  INTERFACE_IOS__LS_DISPENSER_UP_1 = 123,
-  INTERFACE_IOS__LS_DISPENSER_UP_2 = 124,
-  INTERFACE_IOS__LS_DISPENSER_UP_3 = 125,
-  INTERFACE_IOS__LS_DISPENSER_UP_4 = 126,
-  INTERFACE_IOS__LS_DISPENSER_UP_5 = 127,
-  INTERFACE_IOS__LS_DISPENSER_UP_6 = 128,
-  INTERFACE_IOS__LS_DISPENSER_UP_7 = 129,
-  INTERFACE_IOS__LS_DISPENSER_UP_8 = 130,
-  INTERFACE_IOS__MIDTANK1_LVL1_FLOAT = 131,
-  INTERFACE_IOS__MIDTANK1_LVL2_FLOAT = 132,
-  INTERFACE_IOS__MIDTANK1_LVL3_FLOAT = 133,
-  INTERFACE_IOS__MIDTANK1_LVL4_FLOAT = 134,
-  INTERFACE_IOS__MIDTANK2_LVL1_FLOAT = 135,
-  INTERFACE_IOS__MIDTANK2_LVL2_FLOAT = 136,
-  INTERFACE_IOS__MIDTANK2_LVL3_FLOAT = 137,
-  INTERFACE_IOS__MIDTANK2_LVL4_FLOAT = 138,
-  INTERFACE_IOS__MIDTANK3_LVL1_FLOAT = 139,
-  INTERFACE_IOS__MIDTANK3_LVL2_FLOAT = 140,
-  INTERFACE_IOS__MIDTANK3_LVL3_FLOAT = 141,
-  INTERFACE_IOS__MIDTANK3_LVL4_FLOAT = 142,
-  INTERFACE_IOS__MIDTANK4_LVL1_FLOAT = 143,
-  INTERFACE_IOS__MIDTANK4_LVL2_FLOAT = 144,
-  INTERFACE_IOS__MIDTANK4_LVL3_FLOAT = 145,
-  INTERFACE_IOS__MIDTANK4_LVL4_FLOAT = 146,
-  INTERFACE_IOS__MIDTANK5_LVL1_FLOAT = 147,
-  INTERFACE_IOS__MIDTANK5_LVL2_FLOAT = 148,
-  INTERFACE_IOS__MIDTANK5_LVL3_FLOAT = 149,
-  INTERFACE_IOS__MIDTANK5_LVL4_FLOAT = 150,
-  INTERFACE_IOS__MIDTANK6_LVL1_FLOAT = 151,
-  INTERFACE_IOS__MIDTANK6_LVL2_FLOAT = 152,
-  INTERFACE_IOS__MIDTANK6_LVL3_FLOAT = 153,
-  INTERFACE_IOS__MIDTANK6_LVL4_FLOAT = 154,
-  INTERFACE_IOS__MIDTANK7_LVL1_FLOAT = 155,
-  INTERFACE_IOS__MIDTANK7_LVL2_FLOAT = 156,
-  INTERFACE_IOS__MIDTANK7_LVL3_FLOAT = 157,
-  INTERFACE_IOS__MIDTANK7_LVL4_FLOAT = 158,
-  INTERFACE_IOS__MIDTANK8_LVL1_FLOAT = 159,
-  INTERFACE_IOS__MIDTANK8_LVL2_FLOAT = 160,
-  INTERFACE_IOS__MIDTANK8_LVL3_FLOAT = 161,
-  INTERFACE_IOS__MIDTANK8_LVL4_FLOAT = 162,
   INTERFACE_IOS__GPO_DILUTORPUMP_SSR10_CTRL = 163,
   INTERFACE_IOS__GPO_WASTECH_PUMP2 = 164,
   INTERFACE_IOS__Midtank1Air = 165,
@@ -201,166 +49,9 @@ typedef enum _InterfaceIOs {
   INTERFACE_IOS__Midtank6Cartridge = 178,
   INTERFACE_IOS__Midtank7Cartridge = 179,
   INTERFACE_IOS__Midtank8Cartridge = 180,
-  INTERFACE_IOS__MOTO_DISPENSER_1 = 181,
-  INTERFACE_IOS__MOTO_DISPENSER_2 = 182,
-  INTERFACE_IOS__MOTO_DISPENSER_3 = 183,
-  INTERFACE_IOS__MOTO_DISPENSER_4 = 184,
-  INTERFACE_IOS__MOTO_DISPENSER_5 = 185,
-  INTERFACE_IOS__MOTO_DISPENSER_6 = 186,
-  INTERFACE_IOS__MOTO_DISPENSER_7 = 187,
-  INTERFACE_IOS__MOTO_DISPENSER_8 = 188,
-  INTERFACE_IOS__DISPENSER_ROTENC1 = 189,
-  INTERFACE_IOS__DISPENSER_ROTENC2 = 190,
-  INTERFACE_IOS__DISPENSER_ROTENC3 = 191,
-  INTERFACE_IOS__DISPENSER_ROTENC4 = 192,
-  INTERFACE_IOS__DISPENSER_ROTENC5 = 193,
-  INTERFACE_IOS__DISPENSER_ROTENC6 = 194,
-  INTERFACE_IOS__DISPENSER_ROTENC7 = 195,
-  INTERFACE_IOS__DISPENSER_ROTENC8 = 196,
-  INTERFACE_IOS__DISPENSER_VALVE_1 = 197,
-  INTERFACE_IOS__DISPENSER_VALVE_2 = 198,
-  INTERFACE_IOS__DISPENSER_VALVE_3 = 199,
-  INTERFACE_IOS__DISPENSER_VALVE_4 = 200,
-  INTERFACE_IOS__DISPENSER_VALVE_5 = 201,
-  INTERFACE_IOS__DISPENSER_VALVE_6 = 202,
-  INTERFACE_IOS__DISPENSER_VALVE_7 = 203,
-  INTERFACE_IOS__DISPENSER_1 = 204,
-  INTERFACE_IOS__DISPENSER_3 = 205,
-  INTERFACE_IOS__DISPENSER_5 = 206,
-  INTERFACE_IOS__DISPENSER_7 = 207,
-  INTERFACE_IOS__MIDTANK3_1 = 208,
-  INTERFACE_IOS__DISPENSER_2 = 209,
-  INTERFACE_IOS__DISPENSER_4 = 210,
-  INTERFACE_IOS__DISPENSER_6 = 211,
-  INTERFACE_IOS__DISPENSER_8 = 212,
-  INTERFACE_IOS__MIDTANK3_2 = 213,
-  INTERFACE_IOS__CART3 = 214,
-  INTERFACE_IOS__CART1 = 215,
-  INTERFACE_IOS__CART2 = 216,
-  INTERFACE_IOS__CART4 = 217,
-  INTERFACE_IOS__CART7 = 218,
-  INTERFACE_IOS__CART5 = 219,
-  INTERFACE_IOS__CART6 = 220,
-  INTERFACE_IOS__CART8 = 221,
-  INTERFACE_IOS__LS_SCREW_LEFT = 222,
-  INTERFACE_IOS__LS_SCREW_RIGHT = 223,
-  INTERFACE_IOS__SW_SPARE = 224,
-  INTERFACE_IOS__SW_SPOOL_EXISTS = 225,
-  INTERFACE_IOS__MOTO_SCREW = 226,
-  INTERFACE_IOS__MOTO_WINDER = 227,
-  INTERFACE_IOS__SCREW_ROTENC = 228,
-  INTERFACE_IOS__INTWINDINGUNIT = 229,
-  INTERFACE_IOS__AN5V_LDANCER1 = 230,
-  INTERFACE_IOS__AN5V_LDANCER2 = 231,
-  INTERFACE_IOS__LS_LDANCER1_DOWN = 232,
-  INTERFACE_IOS__LS_LDANCER1_UP = 233,
-  INTERFACE_IOS__LS_LDANCER2_DOWN = 234,
-  INTERFACE_IOS__LS_LDANCER2_UP = 235,
-  INTERFACE_IOS__LS_LLOADMOTOR_DOWN = 236,
-  INTERFACE_IOS__LS_LLOADMOTOR_UP = 237,
-  INTERFACE_IOS__LS_LPIVOT_DOWN = 238,
-  INTERFACE_IOS__LS_LPIVOT_UP = 239,
-  INTERFACE_IOS__LS_LSPARE1 = 240,
-  INTERFACE_IOS__LS_LSPARE2 = 241,
-  INTERFACE_IOS__LS_PIVOT_SPARE1 = 242,
-  INTERFACE_IOS__LS_PIVOT_SPARE2 = 243,
-  INTERFACE_IOS__MOTO_LDANCER1 = 244,
-  INTERFACE_IOS__MOTO_LDANCER2 = 245,
-  INTERFACE_IOS__MOTO_LDRIVING = 246,
-  INTERFACE_IOS__MOTO_LLOADING = 247,
-  INTERFACE_IOS__MOTO_LPIVOT1 = 248,
-  INTERFACE_IOS__LSPARE1_ROTENC = 249,
-  INTERFACE_IOS__LSPARE2_ROTENC = 250,
-  INTERFACE_IOS__LDANCER1_ROTENC = 251,
-  INTERFACE_IOS__LDANCER2_ROTENC = 252,
-  INTERFACE_IOS__LSPARE_ROTENC = 253,
-  INTERFACE_IOS__LTFEEDUNIT2 = 254,
-  INTERFACE_IOS__LTFEEDUNIT1 = 255,
-  INTERFACE_IOS__AN_ENCLOSURETEMP1 = 256,
-  INTERFACE_IOS__AN_ENCLOSURETEMP2 = 257,
-  INTERFACE_IOS__AN_ENCLOSURETEMP3 = 258,
-  INTERFACE_IOS__GPI_PANSW1 = 259,
-  INTERFACE_IOS__GPI_PANSW2 = 260,
-  INTERFACE_IOS__GPI_PANSW3 = 261,
-  INTERFACE_IOS__GPI_PANSW4 = 262,
-  INTERFACE_IOS__GPI_PANSW5 = 263,
-  INTERFACE_IOS__GPI_PANSW6 = 264,
-  INTERFACE_IOS__GPI_PWRBUTTON = 265,
-  INTERFACE_IOS__GPI_TACTSW1 = 266,
-  INTERFACE_IOS__GPI_TACTSW2 = 267,
-  INTERFACE_IOS__GPI_TACTSW3 = 268,
-  INTERFACE_IOS__GPI_TACTSW4 = 269,
-  INTERFACE_IOS__GPO_BUZZER = 270,
-  INTERFACE_IOS__GPO_LED1 = 271,
-  INTERFACE_IOS__GPO_LED2 = 272,
-  INTERFACE_IOS__GPO_LED3 = 273,
   INTERFACE_IOS__GPO_LED4 = 274,
-  INTERFACE_IOS__FAN_TACHO1 = 275,
-  INTERFACE_IOS__FAN_TACHO2 = 276,
-  INTERFACE_IOS__FAN_TACHO3 = 277,
-  INTERFACE_IOS__FAN1_TACH = 278,
-  INTERFACE_IOS__FAN2_TACH = 279,
-  INTERFACE_IOS__FAN3_TACH = 280,
-  INTERFACE_IOS__FAN4_TACH = 281,
-  INTERFACE_IOS__FAN5_TACH = 282,
-  INTERFACE_IOS__AN5V_RDANCER = 283,
-  INTERFACE_IOS__LS_RLOADMOTOR_UP = 284,
-  INTERFACE_IOS__GPI_TFEED_BREAK_1 = 285,
-  INTERFACE_IOS__GPI_TFEED_BREAK_2 = 286,
-  INTERFACE_IOS__LS_RDANCER_DOWN = 287,
-  INTERFACE_IOS__LS_RDANCER_UP = 288,
-  INTERFACE_IOS__RTFEEDUNIT2 = 289,
-  INTERFACE_IOS__RTFEEDUNIT1 = 290,
-  INTERFACE_IOS__LS_RLOADMOTOR_DOWN = 291,
-  INTERFACE_IOS__LS_RLOADRAM_DOWN = 292,
-  INTERFACE_IOS__LS_RLOADRAM_UP = 293,
-  INTERFACE_IOS__LS_RSPARE1 = 294,
-  INTERFACE_IOS__LS_RSPARE2 = 295,
-  INTERFACE_IOS__GPO_TFEED_BREAK_1 = 296,
-  INTERFACE_IOS__GPO_TFEED_BREAK_2 = 297,
-  INTERFACE_IOS__MOTO_RDANCER = 298,
-  INTERFACE_IOS__MOTO_RDRIVING = 299,
-  INTERFACE_IOS__MOTO_RLOADARM = 300,
-  INTERFACE_IOS__MOTO_RLOADING = 301,
-  INTERFACE_IOS__RSPARE_ROTENC1 = 302,
-  INTERFACE_IOS__RSPEEDSENS_ROTENC = 303,
-  INTERFACE_IOS__RDANCER_ROTENC = 304,
-  INTERFACE_IOS__RSPARE_ROTENC2 = 305,
-  INTERFACE_IOS__AN10V_SPARE1 = 306,
-  INTERFACE_IOS__AN10V_SPARE2 = 307,
-  INTERFACE_IOS__LS_SPARE1_1 = 308,
-  INTERFACE_IOS__LS_SPARE1_2 = 309,
-  INTERFACE_IOS__LS_SPARE1_3 = 310,
-  INTERFACE_IOS__LS_SPARE1_4 = 311,
-  INTERFACE_IOS__LS_SPARE2_1 = 312,
-  INTERFACE_IOS__SPARE2 = 313,
-  INTERFACE_IOS__SPARE1 = 314,
-  INTERFACE_IOS__LS_SPARE2_2 = 315,
-  INTERFACE_IOS__LS_SPARE2_3 = 316,
-  INTERFACE_IOS__LS_SPARE2_4 = 317,
   INTERFACE_IOS__GPO_SPARE1_1 = 318,
   INTERFACE_IOS__GPO_SPARE1_2 = 319,
-  INTERFACE_IOS__GPO_SPARE2_1 = 320,
-  INTERFACE_IOS__GPO_SPARE2_2 = 321,
-  INTERFACE_IOS__MOTO_SPARE1_1 = 322,
-  INTERFACE_IOS__MOTO_SPARE1_2 = 323,
-  INTERFACE_IOS__MOTO_SPARE2_1 = 324,
-  INTERFACE_IOS__MOTO_SPARE2_2 = 325,
-  INTERFACE_IOS__SPARE1_ROTENC1 = 326,
-  INTERFACE_IOS__SPARE2_ROTENC2 = 327,
-  INTERFACE_IOS__SPARE1_ROTENC3 = 328,
-  INTERFACE_IOS__SPARE2_ROTENC4 = 329,
-  INTERFACE_IOS__CHILLER_CTRL = 330,
-  INTERFACE_IOS__AN_AIRPRESS_1 = 331,
-  INTERFACE_IOS__AN_AIRPRESS_2 = 332,
-  INTERFACE_IOS__AN_VOCSENS = 333,
-  INTERFACE_IOS__AN_BLOWERCTRL = 334,
-  INTERFACE_IOS__GPI_AIRFLOW_FLAP = 335,
-  INTERFACE_IOS__GPI_BLOWER_TACH = 336,
-  INTERFACE_IOS__GPI_CHILLER_FAULT = 337,
-  INTERFACE_IOS__GPI_CHILLER_STAT1 = 338,
-  INTERFACE_IOS__WHS_VOCTEMP = 339,
-  INTERFACE_IOS__GPI_SW_FILTER_PRES = 340,
   INTERFACE_IOS__GPI_WCONTAINER_FULL = 341,
   INTERFACE_IOS__GPI_WCONTAINER_WARN = 342,
   INTERFACE_IOS__GPO_BLOWER_PWM = 343,
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 5e36720c9..0e060b5aa 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[18] =
+static const ProtobufCFieldDescriptor configuration_parameters__field_descriptors[36] =
 {
   {
     "BreakSensorLimit",
@@ -270,12 +270,230 @@ static const ProtobufCFieldDescriptor configuration_parameters__field_descriptor
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "DispenserPresegmentWFCF",
+    19,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(ConfigurationParameters, has_dispenserpresegmentwfcf),
+    offsetof(ConfigurationParameters, dispenserpresegmentwfcf),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "StartHeatingOnInitSequence",
+    20,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_BOOL,
+    offsetof(ConfigurationParameters, has_startheatingoninitsequence),
+    offsetof(ConfigurationParameters, startheatingoninitsequence),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "GeneralParameters",
+    21,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(ConfigurationParameters, n_generalparameters),
+    offsetof(ConfigurationParameters, generalparameters),
+    NULL,
+    NULL,
+    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_CleaningStartSprayPreSegmentTime",
+    28,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(ConfigurationParameters, has_ids_cleaningstartspraypresegmenttime),
+    offsetof(ConfigurationParameters, ids_cleaningstartspraypresegmenttime),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "IDS_LeftCleaningMotorSpeed",
+    29,
+    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",
+    30,
+    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 */
+  },
+  {
+    "SwitchToIdleTimeinSeconds",
+    31,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_UINT32,
+    offsetof(ConfigurationParameters, has_switchtoidletimeinseconds),
+    offsetof(ConfigurationParameters, switchtoidletimeinseconds),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "IdleDrierTemperature",
+    32,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_UINT32,
+    offsetof(ConfigurationParameters, has_idledriertemperature),
+    offsetof(ConfigurationParameters, idledriertemperature),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "IdleHeadTemperature",
+    33,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_UINT32,
+    offsetof(ConfigurationParameters, has_idleheadtemperature),
+    offsetof(ConfigurationParameters, idleheadtemperature),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "IdleMixerTemperature",
+    34,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_UINT32,
+    offsetof(ConfigurationParameters, has_idlemixertemperature),
+    offsetof(ConfigurationParameters, idlemixertemperature),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "PowerOffTemperatureLimit",
+    35,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_UINT32,
+    offsetof(ConfigurationParameters, has_powerofftemperaturelimit),
+    offsetof(ConfigurationParameters, powerofftemperaturelimit),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "IDS_PreSegment_WFCF_TimeBeforeSegment",
+    36,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(ConfigurationParameters, has_ids_presegment_wfcf_timebeforesegment),
+    offsetof(ConfigurationParameters, ids_presegment_wfcf_timebeforesegment),
+    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 */
@@ -283,18 +501,34 @@ static const unsigned configuration_parameters__field_indices_by_name[] = {
   10,   /* field[10] = DispenserBuildPressureLimit */
   9,   /* field[9] = DispenserBuildPressureSpeed */
   11,   /* field[11] = DispenserBuildPressureTimeout */
+  18,   /* field[18] = DispenserPresegmentWFCF */
+  20,   /* field[20] = GeneralParameters */
+  25,   /* field[25] = IDS_CleaningSpeed */
+  27,   /* field[27] = IDS_CleaningStartSprayPreSegmentTime */
+  26,   /* field[26] = IDS_CleaningStopBeforeSegmentTime */
+  28,   /* field[28] = IDS_LeftCleaningMotorSpeed */
+  24,   /* field[24] = IDS_PreSegmentBuildupTime */
+  35,   /* field[35] = IDS_PreSegment_WFCF_TimeBeforeSegment */
+  29,   /* field[29] = IDS_RightCleaningMotorSpeed */
+  23,   /* field[23] = IDS_SegmentRefillTimeout */
+  31,   /* field[31] = IdleDrierTemperature */
+  32,   /* field[32] = IdleHeadTemperature */
+  33,   /* field[33] = IdleMixerTemperature */
   6,   /* field[6] = InitialDispenserPressure */
   8,   /* field[8] = InitialDispenserTimeLag */
   7,   /* field[7] = InitialDispenserTimeout */
   17,   /* field[17] = MidTankPressureCorrection */
   5,   /* field[5] = OpenValveTimeout */
   2,   /* field[2] = OverHeatCountLimit */
+  34,   /* field[34] = PowerOffTemperatureLimit */
+  19,   /* field[19] = StartHeatingOnInitSequence */
+  30,   /* field[30] = SwitchToIdleTimeinSeconds */
   3,   /* field[3] = UnderHeatCountLimit */
 };
 static const ProtobufCIntRange configuration_parameters__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 18 }
+  { 0, 36 }
 };
 const ProtobufCMessageDescriptor configuration_parameters__descriptor =
 {
@@ -304,7 +538,7 @@ const ProtobufCMessageDescriptor configuration_parameters__descriptor =
   "ConfigurationParameters",
   "",
   sizeof(ConfigurationParameters),
-  18,
+  36,
   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 307352efd..4901daef5 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
@@ -62,10 +62,46 @@ struct  _ConfigurationParameters
   uint32_t dcheatersupperoperationlimit;
   protobuf_c_boolean has_midtankpressurecorrection;
   double midtankpressurecorrection;
+  protobuf_c_boolean has_dispenserpresegmentwfcf;
+  double dispenserpresegmentwfcf;
+  protobuf_c_boolean has_startheatingoninitsequence;
+  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_cleaningstartspraypresegmenttime;
+  double ids_cleaningstartspraypresegmenttime;
+  protobuf_c_boolean has_ids_leftcleaningmotorspeed;
+  double ids_leftcleaningmotorspeed;
+  protobuf_c_boolean has_ids_rightcleaningmotorspeed;
+  double ids_rightcleaningmotorspeed;
+  protobuf_c_boolean has_switchtoidletimeinseconds;
+  uint32_t switchtoidletimeinseconds;
+  protobuf_c_boolean has_idledriertemperature;
+  uint32_t idledriertemperature;
+  protobuf_c_boolean has_idleheadtemperature;
+  uint32_t idleheadtemperature;
+  protobuf_c_boolean has_idlemixertemperature;
+  uint32_t idlemixertemperature;
+  protobuf_c_boolean has_powerofftemperaturelimit;
+  uint32_t powerofftemperaturelimit;
+  protobuf_c_boolean has_ids_presegment_wfcf_timebeforesegment;
+  double ids_presegment_wfcf_timebeforesegment;
 };
 #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, 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 }
 
 
 /* ConfigurationParameters methods */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/DispenserDataRequest.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/DispenserDataRequest.pb-c.c
new file mode 100644
index 000000000..32bef6df2
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/DispenserDataRequest.pb-c.c
@@ -0,0 +1,72 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: DispenserDataRequest.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "DispenserDataRequest.pb-c.h"
+void   dispenser_data_request__init
+                     (DispenserDataRequest         *message)
+{
+  static const DispenserDataRequest init_value = DISPENSER_DATA_REQUEST__INIT;
+  *message = init_value;
+}
+size_t dispenser_data_request__get_packed_size
+                     (const DispenserDataRequest *message)
+{
+  assert(message->base.descriptor == &dispenser_data_request__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t dispenser_data_request__pack
+                     (const DispenserDataRequest *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &dispenser_data_request__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t dispenser_data_request__pack_to_buffer
+                     (const DispenserDataRequest *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &dispenser_data_request__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+DispenserDataRequest *
+       dispenser_data_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (DispenserDataRequest *)
+     protobuf_c_message_unpack (&dispenser_data_request__descriptor,
+                                allocator, len, data);
+}
+void   dispenser_data_request__free_unpacked
+                     (DispenserDataRequest *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &dispenser_data_request__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+#define dispenser_data_request__field_descriptors NULL
+#define dispenser_data_request__field_indices_by_name NULL
+#define dispenser_data_request__number_ranges NULL
+const ProtobufCMessageDescriptor dispenser_data_request__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "DispenserDataRequest",
+  "DispenserDataRequest",
+  "DispenserDataRequest",
+  "",
+  sizeof(DispenserDataRequest),
+  0,
+  dispenser_data_request__field_descriptors,
+  dispenser_data_request__field_indices_by_name,
+  0,  dispenser_data_request__number_ranges,
+  (ProtobufCMessageInit) dispenser_data_request__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/DispenserDataRequest.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/DispenserDataRequest.pb-c.h
new file mode 100644
index 000000000..dfc825cfb
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/DispenserDataRequest.pb-c.h
@@ -0,0 +1,70 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: DispenserDataRequest.proto */
+
+#ifndef PROTOBUF_C_DispenserDataRequest_2eproto__INCLUDED
+#define PROTOBUF_C_DispenserDataRequest_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c.
+#endif
+
+
+typedef struct _DispenserDataRequest DispenserDataRequest;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _DispenserDataRequest
+{
+  ProtobufCMessage base;
+};
+#define DISPENSER_DATA_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&dispenser_data_request__descriptor) \
+     }
+
+
+/* DispenserDataRequest methods */
+void   dispenser_data_request__init
+                     (DispenserDataRequest         *message);
+size_t dispenser_data_request__get_packed_size
+                     (const DispenserDataRequest   *message);
+size_t dispenser_data_request__pack
+                     (const DispenserDataRequest   *message,
+                      uint8_t             *out);
+size_t dispenser_data_request__pack_to_buffer
+                     (const DispenserDataRequest   *message,
+                      ProtobufCBuffer     *buffer);
+DispenserDataRequest *
+       dispenser_data_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   dispenser_data_request__free_unpacked
+                     (DispenserDataRequest *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*DispenserDataRequest_Closure)
+                 (const DispenserDataRequest *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor dispenser_data_request__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_DispenserDataRequest_2eproto__INCLUDED */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/DispenserDataResponse.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/DispenserDataResponse.pb-c.c
new file mode 100644
index 000000000..55c021567
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/DispenserDataResponse.pb-c.c
@@ -0,0 +1,92 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: DispenserDataResponse.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "DispenserDataResponse.pb-c.h"
+void   dispenser_data_response__init
+                     (DispenserDataResponse         *message)
+{
+  static const DispenserDataResponse init_value = DISPENSER_DATA_RESPONSE__INIT;
+  *message = init_value;
+}
+size_t dispenser_data_response__get_packed_size
+                     (const DispenserDataResponse *message)
+{
+  assert(message->base.descriptor == &dispenser_data_response__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t dispenser_data_response__pack
+                     (const DispenserDataResponse *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &dispenser_data_response__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t dispenser_data_response__pack_to_buffer
+                     (const DispenserDataResponse *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &dispenser_data_response__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+DispenserDataResponse *
+       dispenser_data_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (DispenserDataResponse *)
+     protobuf_c_message_unpack (&dispenser_data_response__descriptor,
+                                allocator, len, data);
+}
+void   dispenser_data_response__free_unpacked
+                     (DispenserDataResponse *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &dispenser_data_response__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor dispenser_data_response__field_descriptors[1] =
+{
+  {
+    "DispenserInfo",
+    1,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_MESSAGE,
+    offsetof(DispenserDataResponse, n_dispenserinfo),
+    offsetof(DispenserDataResponse, dispenserinfo),
+    &dispenser_running_data__descriptor,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned dispenser_data_response__field_indices_by_name[] = {
+  0,   /* field[0] = DispenserInfo */
+};
+static const ProtobufCIntRange dispenser_data_response__number_ranges[1 + 1] =
+{
+  { 1, 0 },
+  { 0, 1 }
+};
+const ProtobufCMessageDescriptor dispenser_data_response__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "DispenserDataResponse",
+  "DispenserDataResponse",
+  "DispenserDataResponse",
+  "",
+  sizeof(DispenserDataResponse),
+  1,
+  dispenser_data_response__field_descriptors,
+  dispenser_data_response__field_indices_by_name,
+  1,  dispenser_data_response__number_ranges,
+  (ProtobufCMessageInit) dispenser_data_response__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/DispenserDataResponse.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/DispenserDataResponse.pb-c.h
new file mode 100644
index 000000000..27ce9c009
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/DispenserDataResponse.pb-c.h
@@ -0,0 +1,73 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: DispenserDataResponse.proto */
+
+#ifndef PROTOBUF_C_DispenserDataResponse_2eproto__INCLUDED
+#define PROTOBUF_C_DispenserDataResponse_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c.
+#endif
+
+#include "DispenserRunningData.pb-c.h"
+
+typedef struct _DispenserDataResponse DispenserDataResponse;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _DispenserDataResponse
+{
+  ProtobufCMessage base;
+  size_t n_dispenserinfo;
+  DispenserRunningData **dispenserinfo;
+};
+#define DISPENSER_DATA_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&dispenser_data_response__descriptor) \
+    , 0,NULL }
+
+
+/* DispenserDataResponse methods */
+void   dispenser_data_response__init
+                     (DispenserDataResponse         *message);
+size_t dispenser_data_response__get_packed_size
+                     (const DispenserDataResponse   *message);
+size_t dispenser_data_response__pack
+                     (const DispenserDataResponse   *message,
+                      uint8_t             *out);
+size_t dispenser_data_response__pack_to_buffer
+                     (const DispenserDataResponse   *message,
+                      ProtobufCBuffer     *buffer);
+DispenserDataResponse *
+       dispenser_data_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   dispenser_data_response__free_unpacked
+                     (DispenserDataResponse *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*DispenserDataResponse_Closure)
+                 (const DispenserDataResponse *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor dispenser_data_response__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_DispenserDataResponse_2eproto__INCLUDED */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/DispenserLiquidType.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/DispenserLiquidType.pb-c.c
index 15fe539f2..b4e2a9e3a 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/DispenserLiquidType.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/DispenserLiquidType.pb-c.c
@@ -15,18 +15,18 @@ static const ProtobufCEnumValue dispenser_liquid_type__enum_values_by_number[7]
   { "Black", "DISPENSER_LIQUID_TYPE__Black", 3 },
   { "TransparentInk", "DISPENSER_LIQUID_TYPE__TransparentInk", 4 },
   { "Lubricant", "DISPENSER_LIQUID_TYPE__Lubricant", 5 },
-  { "Red", "DISPENSER_LIQUID_TYPE__Red", 7 },
+  { "Cleaner", "DISPENSER_LIQUID_TYPE__Cleaner", 6 },
 };
 static const ProtobufCIntRange dispenser_liquid_type__value_ranges[] = {
-{0, 0},{7, 6},{0, 7}
+{0, 0},{0, 7}
 };
 static const ProtobufCEnumValueIndex dispenser_liquid_type__enum_values_by_name[7] =
 {
   { "Black", 3 },
+  { "Cleaner", 6 },
   { "Cyan", 0 },
   { "Lubricant", 5 },
   { "Magenta", 1 },
-  { "Red", 6 },
   { "TransparentInk", 4 },
   { "Yellow", 2 },
 };
@@ -41,7 +41,7 @@ const ProtobufCEnumDescriptor dispenser_liquid_type__descriptor =
   dispenser_liquid_type__enum_values_by_number,
   7,
   dispenser_liquid_type__enum_values_by_name,
-  2,
+  1,
   dispenser_liquid_type__value_ranges,
   NULL,NULL,NULL,NULL   /* reserved[1234] */
 };
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/DispenserLiquidType.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/DispenserLiquidType.pb-c.h
index a6ae3e867..75027409c 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Printing/DispenserLiquidType.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Printing/DispenserLiquidType.pb-c.h
@@ -26,7 +26,7 @@ typedef enum _DispenserLiquidType {
   DISPENSER_LIQUID_TYPE__Black = 3,
   DISPENSER_LIQUID_TYPE__TransparentInk = 4,
   DISPENSER_LIQUID_TYPE__Lubricant = 5,
-  DISPENSER_LIQUID_TYPE__Red = 7
+  DISPENSER_LIQUID_TYPE__Cleaner = 6
     PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(DISPENSER_LIQUID_TYPE)
 } DispenserLiquidType;
 
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 */