commit merge

51 files changed, 800 insertions, 1621 deletions

diff --git a/Software/Embedded_SW/Embedded/CheckSum/Checksum.c b/Software/Embedded_SW/Embedded/Common/CheckSum/Checksum.c
index 391946698..391946698 100644
--- a/Software/Embedded_SW/Embedded/CheckSum/Checksum.c
+++ b/Software/Embedded_SW/Embedded/Common/CheckSum/Checksum.c
diff --git a/Software/Embedded_SW/Embedded/CheckSum/Checksum.h b/Software/Embedded_SW/Embedded/Common/CheckSum/Checksum.h
index 2d245f81a..2d245f81a 100644
--- a/Software/Embedded_SW/Embedded/CheckSum/Checksum.h
+++ b/Software/Embedded_SW/Embedded/Common/CheckSum/Checksum.h
diff --git a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
index feac91829..84d8fa725 100644
--- a/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
+++ b/Software/Embedded_SW/Embedded/Common/SWUpdate/FileSystem.c
@@ -194,7 +194,7 @@ uint32_t    FileChunkUploadRequestFunc(MessageContainer* requestContainer)
         else
         {
             FileReceivedLength += WrittenBytes;
-            ReportWithPackageFilter(CommFilter,"Chunk received", __FILE__,WrittenBytes,FileReceivedLength, RpMessage,msec_millisecondCounter-save_milisec, 0);
+            ReportWithPackageFilter(CommFilter,"Chunk received", __FILE__,FileLength,FileReceivedLength, RpMessage,msec_millisecondCounter-save_milisec, 0);
 
             //REPORT_MSG (FileReceivedLength,"file upload chunk");
             if (FileReceivedLength == FileLength)
diff --git a/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c b/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c
index 80b4719fb..86f8fecc1 100644
--- a/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c
+++ b/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c
@@ -20,7 +20,7 @@ typedef struct
 } TangoVersion_t;
 
 
-TangoVersion_t _gTangoVersion = {1,4,6,24};
+TangoVersion_t _gTangoVersion = {1,4,6,25};
 #define BUILD_DATE __DATE__
 char Dat[50] = BUILD_DATE; 
  char _gTangoName [MAX_STRING_LEN] = "Tango01 ";//d
diff --git a/Software/Embedded_SW/Embedded/Communication/Container.c b/Software/Embedded_SW/Embedded/Communication/Container.c
index 090609748..dec940191 100644
--- a/Software/Embedded_SW/Embedded/Communication/Container.c
+++ b/Software/Embedded_SW/Embedded/Communication/Container.c
@@ -33,6 +33,7 @@
 #include "Modules/General/GeneralHardware.h"
 #include "Modules/General/MachineStatus.h"
 #include "Drivers/I2C_Communication/Dispenser_Card/EEPROM/Dispenser_EEPROM.h"
+#include "Drivers/I2C_Communication/WHS_Card/EEPROM/WHS_EEPROM.h"
 
 #include "Modules/heaters/heaters_ex.h"
 #include "Modules/AlarmHandling/AlarmHandling.h"
@@ -491,13 +492,10 @@ void receive_callback(char* buffer, size_t length)
          case MESSAGE_TYPE__StopThreadLoadingRequest:
              StopThreadLoadingFunc(requestContainer);
              break;
-         case MESSAGE_TYPE__DispenserEEpromRequest:
-             DispenserEEpromRequestFunc(requestContainer);
-             break;
          case MESSAGE_TYPE__StubDispenserEEpromRequest:
              StubDispenserEEpromRequestFunc(requestContainer);
              break;
-         case MESSAGE_TYPE__StubWHSEEpromRequest:
+         case MESSAGE_TYPE__StubWhsEEpromRequest:
              WhsEEpromRequestFunc(requestContainer);
              break;
          default:
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 407e1e022..000774ad7 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[255] =
+static const ProtobufCEnumValue message_type__enum_values_by_number[253] =
 {
   { "", "", 0 },
   { "", "", 1 },
@@ -182,8 +182,6 @@ static const ProtobufCEnumValue message_type__enum_values_by_number[255] =
   { "", "", 2043 },
   { "", "", 2044 },
   { "", "", 2045 },
-  { "", "", 2046 },
-  { "", "", 2047 },
   { "", "", 3000 },
   { "", "", 3001 },
   { "", "", 3002 },
@@ -266,84 +264,82 @@ static const ProtobufCEnumValue message_type__enum_values_by_number[255] =
   { "", "", 11005 },
 };
 static const ProtobufCIntRange message_type__value_ranges[] = {
-{0, 0},{3, 2},{1000, 108},{2000, 127},{3000, 175},{4000, 189},{5000, 197},{6000, 201},{7000, 207},{8000, 231},{9000, 237},{10000, 241},{11000, 249},{0, 255}
+{0, 0},{3, 2},{1000, 108},{2000, 127},{3000, 173},{4000, 187},{5000, 195},{6000, 199},{7000, 205},{8000, 229},{9000, 235},{10000, 239},{11000, 247},{0, 253}
 };
-static const ProtobufCEnumValueIndex message_type__enum_values_by_name[255] =
+static const ProtobufCEnumValueIndex message_type__enum_values_by_name[253] =
 {
-  { "", 187 },
-  { "", 188 },
-  { "", 177 },
-  { "", 178 },
-  { "", 243 },
-  { "", 244 },
-  { "", 247 },
-  { "", 248 },
-  { "", 229 },
-  { "", 230 },
+  { "", 185 },
+  { "", 186 },
+  { "", 175 },
+  { "", 176 },
+  { "", 241 },
+  { "", 242 },
+  { "", 245 },
+  { "", 246 },
+  { "", 227 },
+  { "", 228 },
   { "", 2 },
   { "", 3 },
   { "", 171 },
   { "", 172 },
   { "", 121 },
   { "", 122 },
-  { "", 203 },
-  { "", 204 },
-  { "", 251 },
-  { "", 252 },
+  { "", 201 },
+  { "", 202 },
+  { "", 249 },
+  { "", 250 },
+  { "", 213 },
+  { "", 214 },
+  { "", 179 },
+  { "", 180 },
   { "", 215 },
   { "", 216 },
-  { "", 181 },
-  { "", 182 },
-  { "", 217 },
-  { "", 218 },
   { "", 113 },
   { "", 114 },
-  { "", 205 },
-  { "", 206 },
+  { "", 203 },
+  { "", 204 },
   { "", 137 },
   { "", 138 },
   { "", 143 },
   { "", 144 },
-  { "", 231 },
-  { "", 232 },
-  { "", 173 },
-  { "", 174 },
+  { "", 229 },
+  { "", 230 },
   { "", 139 },
   { "", 140 },
   { "", 141 },
   { "", 142 },
   { "", 1 },
-  { "", 211 },
-  { "", 212 },
+  { "", 209 },
+  { "", 210 },
   { "", 109 },
   { "", 110 },
   { "", 111 },
   { "", 112 },
   { "", 108 },
-  { "", 225 },
-  { "", 226 },
-  { "", 209 },
-  { "", 210 },
   { "", 223 },
   { "", 224 },
   { "", 207 },
   { "", 208 },
-  { "", 125 },
-  { "", 126 },
   { "", 221 },
   { "", 222 },
+  { "", 205 },
+  { "", 206 },
+  { "", 125 },
+  { "", 126 },
   { "", 219 },
   { "", 220 },
-  { "", 175 },
-  { "", 176 },
-  { "", 201 },
-  { "", 202 },
-  { "", 213 },
-  { "", 214 },
-  { "", 235 },
-  { "", 236 },
+  { "", 217 },
+  { "", 218 },
+  { "", 173 },
+  { "", 174 },
+  { "", 199 },
+  { "", 200 },
+  { "", 211 },
+  { "", 212 },
   { "", 233 },
   { "", 234 },
+  { "", 231 },
+  { "", 232 },
   { "", 129 },
   { "", 130 },
   { "", 135 },
@@ -359,56 +355,56 @@ static const ProtobufCEnumValueIndex message_type__enum_values_by_name[255] =
   { "", 5 },
   { "", 153 },
   { "", 154 },
-  { "", 183 },
-  { "", 184 },
+  { "", 181 },
+  { "", 182 },
   { "", 163 },
   { "", 164 },
   { "", 151 },
   { "", 152 },
-  { "", 193 },
-  { "", 194 },
+  { "", 191 },
+  { "", 192 },
   { "", 145 },
   { "", 146 },
   { "", 161 },
   { "", 162 },
   { "", 165 },
   { "", 166 },
-  { "", 195 },
-  { "", 196 },
+  { "", 193 },
+  { "", 194 },
   { "", 117 },
   { "", 118 },
   { "", 167 },
   { "", 168 },
-  { "", 189 },
-  { "", 190 },
+  { "", 187 },
+  { "", 188 },
   { "", 127 },
   { "", 128 },
   { "", 157 },
   { "", 158 },
-  { "", 185 },
-  { "", 186 },
-  { "", 237 },
-  { "", 238 },
-  { "", 241 },
-  { "", 242 },
-  { "", 245 },
-  { "", 246 },
-  { "", 249 },
-  { "", 250 },
+  { "", 183 },
+  { "", 184 },
+  { "", 235 },
+  { "", 236 },
+  { "", 239 },
+  { "", 240 },
+  { "", 243 },
+  { "", 244 },
+  { "", 247 },
+  { "", 248 },
   { "", 119 },
   { "", 120 },
   { "", 169 },
   { "", 170 },
-  { "", 191 },
-  { "", 192 },
+  { "", 189 },
+  { "", 190 },
   { "", 155 },
   { "", 156 },
   { "", 159 },
   { "", 160 },
-  { "", 239 },
-  { "", 240 },
-  { "", 253 },
-  { "", 254 },
+  { "", 237 },
+  { "", 238 },
+  { "", 251 },
+  { "", 252 },
   { "", 100 },
   { "", 101 },
   { "", 6 },
@@ -511,20 +507,20 @@ static const ProtobufCEnumValueIndex message_type__enum_values_by_name[255] =
   { "", 31 },
   { "", 106 },
   { "", 107 },
-  { "", 199 },
-  { "", 200 },
+  { "", 197 },
+  { "", 198 },
   { "", 149 },
   { "", 150 },
   { "", 147 },
   { "", 148 },
   { "", 123 },
   { "", 124 },
-  { "", 197 },
-  { "", 198 },
-  { "", 179 },
-  { "", 180 },
-  { "", 227 },
-  { "", 228 },
+  { "", 195 },
+  { "", 196 },
+  { "", 177 },
+  { "", 178 },
+  { "", 225 },
+  { "", 226 },
 };
 const ProtobufCEnumDescriptor message_type__descriptor =
 {
@@ -533,9 +529,9 @@ const ProtobufCEnumDescriptor message_type__descriptor =
   "",
   "",
   "",
-  255,
+  253,
   message_type__enum_values_by_number,
-  255,
+  253,
   message_type__enum_values_by_name,
   13,
   message_type__value_ranges,
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 236d9dfdd..14b49cd6c 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
@@ -126,8 +126,8 @@ typedef enum _MessageType {
   MESSAGE_TYPE__StubMidTankPressureSensorResponse = 104,
   MESSAGE_TYPE__StubDispenserEEpromRequest = 105,
   MESSAGE_TYPE__StubDispenserEEpromResponse = 106,
-  MESSAGE_TYPE__StubWHSEEpromRequest = 107,
-  MESSAGE_TYPE__StubWHSEEpromResponse = 108,
+  MESSAGE_TYPE__StubWhsEEpromRequest = 107,
+  MESSAGE_TYPE__StubWhsEEpromResponse = 108,
   MESSAGE_TYPE__ExternalBridgeUdpDiscoveryPacket = 1000,
   MESSAGE_TYPE__ExternalBridgeLoginRequest = 1001,
   MESSAGE_TYPE__ExternalBridgeLoginResponse = 1002,
@@ -193,8 +193,6 @@ typedef enum _MessageType {
   MESSAGE_TYPE__StopCartridgesUpdateResponse = 2043,
   MESSAGE_TYPE__CartridgeValidationRequest = 2044,
   MESSAGE_TYPE__CartridgeValidationResponse = 2045,
-  MESSAGE_TYPE__DispenserEEpromRequest = 2046,
-  MESSAGE_TYPE__DispenserEEpromResponse = 2047,
   MESSAGE_TYPE__JobRequest = 3000,
   MESSAGE_TYPE__JobResponse = 3001,
   MESSAGE_TYPE__AbortJobRequest = 3002,
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 bf37bfed9..f8b36e663 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[85] =
+static const ProtobufCFieldDescriptor diagnostics_monitors__field_descriptors[88] =
 {
   {
     "",
@@ -1074,6 +1074,42 @@ static const ProtobufCFieldDescriptor diagnostics_monitors__field_descriptors[85
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "",
+    86,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(DiagnosticsMonitors, n_gassensor),
+    offsetof(DiagnosticsMonitors, gassensor),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "",
+    87,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(DiagnosticsMonitors, n_incomingvoltage),
+    offsetof(DiagnosticsMonitors, incomingvoltage),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "",
+    88,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(DiagnosticsMonitors, n_wastelevel),
+    offsetof(DiagnosticsMonitors, wastelevel),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned diagnostics_monitors__field_indices_by_name[] = {
   38,   /* field[38] = BlowerVoltage */
@@ -1112,6 +1148,7 @@ static const unsigned diagnostics_monitors__field_indices_by_name[] = {
   3,   /* field[3] = FeederMotorFrequency */
   14,   /* field[14] = FeederTension */
   25,   /* field[25] = FilterDeltaPressure */
+  85,   /* field[85] = GasSensor */
   13,   /* field[13] = HeadAirFlow */
   78,   /* field[78] = HeadBlowerVoltage1 */
   79,   /* field[79] = HeadBlowerVoltage2 */
@@ -1142,6 +1179,7 @@ static const unsigned diagnostics_monitors__field_indices_by_name[] = {
   69,   /* field[69] = HeadZone8Temperature */
   70,   /* field[70] = HeadZone9HeaterCurrent */
   71,   /* field[71] = HeadZone9Temperature */
+  86,   /* field[86] = IncomingVoltage */
   47,   /* field[47] = MidTank1Level */
   48,   /* field[48] = MidTank2Level */
   49,   /* field[49] = MidTank3Level */
@@ -1159,13 +1197,14 @@ static const unsigned diagnostics_monitors__field_indices_by_name[] = {
   7,   /* field[7] = ScrewMotor */
   8,   /* field[8] = ThreadSpeed */
   84,   /* field[84] = WHSBlower2Voltage */
+  87,   /* field[87] = WasteLevel */
   6,   /* field[6] = WinderMotor */
   20,   /* field[20] = WinderTension */
 };
 static const ProtobufCIntRange diagnostics_monitors__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 85 }
+  { 0, 88 }
 };
 const ProtobufCMessageDescriptor diagnostics_monitors__descriptor =
 {
@@ -1175,7 +1214,7 @@ const ProtobufCMessageDescriptor diagnostics_monitors__descriptor =
   "",
   "",
   sizeof(DiagnosticsMonitors),
-  85,
+  88,
   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 38ee1ce97..172fb5e24 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
@@ -197,10 +197,16 @@ struct  _DiagnosticsMonitors
   double *headcoverheater2temperature;
   size_t n_whsblower2voltage;
   double *whsblower2voltage;
+  size_t n_gassensor;
+  double *gassensor;
+  size_t n_incomingvoltage;
+  double *incomingvoltage;
+  size_t n_wastelevel;
+  double *wastelevel;
 };
 #define DIAGNOSTICS_MONITORS__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&diagnostics_monitors__descriptor) \
-    , 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL }
+    , 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 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/DispenserEEpromRequest.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEpromRequest.pb-c.c
deleted file mode 100644
index 8e98891a0..000000000
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEpromRequest.pb-c.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: DispenserEEpromRequest.proto */
-
-/* Do not generate deprecated warnings for self */
-#ifndef PROTOBUF_C__NO_DEPRECATED
-#define PROTOBUF_C__NO_DEPRECATED
-#endif
-
-#include "DispenserEEpromRequest.pb-c.h"
-void   dispenser_eeprom_request__init
-                     (DispenserEEpromRequest         *message)
-{
-  static const DispenserEEpromRequest init_value = DISPENSER_EEPROM_REQUEST__INIT;
-  *message = init_value;
-}
-size_t dispenser_eeprom_request__get_packed_size
-                     (const DispenserEEpromRequest *message)
-{
-  assert(message->base.descriptor == &dispenser_eeprom_request__descriptor);
-  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t dispenser_eeprom_request__pack
-                     (const DispenserEEpromRequest *message,
-                      uint8_t       *out)
-{
-  assert(message->base.descriptor == &dispenser_eeprom_request__descriptor);
-  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t dispenser_eeprom_request__pack_to_buffer
-                     (const DispenserEEpromRequest *message,
-                      ProtobufCBuffer *buffer)
-{
-  assert(message->base.descriptor == &dispenser_eeprom_request__descriptor);
-  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-DispenserEEpromRequest *
-       dispenser_eeprom_request__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data)
-{
-  return (DispenserEEpromRequest *)
-     protobuf_c_message_unpack (&dispenser_eeprom_request__descriptor,
-                                allocator, len, data);
-}
-void   dispenser_eeprom_request__free_unpacked
-                     (DispenserEEpromRequest *message,
-                      ProtobufCAllocator *allocator)
-{
-  if(!message)
-    return;
-  assert(message->base.descriptor == &dispenser_eeprom_request__descriptor);
-  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-static const ProtobufCFieldDescriptor dispenser_eeprom_request__field_descriptors[3] =
-{
-  {
-    "",
-    1,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromRequest, has_dispenserid),
-    offsetof(DispenserEEpromRequest, dispenserid),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    2,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_BOOL,
-    offsetof(DispenserEEpromRequest, has_burnrequest),
-    offsetof(DispenserEEpromRequest, burnrequest),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    3,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_MESSAGE,
-    0,   /* quantifier_offset */
-    offsetof(DispenserEEpromRequest, dispensereeprom),
-    &dispenser_eeprom_info__descriptor,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-};
-static const unsigned dispenser_eeprom_request__field_indices_by_name[] = {
-  1,   /* field[1] = BurnRequest */
-  2,   /* field[2] = DispenserEEprom */
-  0,   /* field[0] = DispenserId */
-};
-static const ProtobufCIntRange dispenser_eeprom_request__number_ranges[1 + 1] =
-{
-  { 1, 0 },
-  { 0, 3 }
-};
-const ProtobufCMessageDescriptor dispenser_eeprom_request__descriptor =
-{
-  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "",
-  "",
-  "",
-  "",
-  sizeof(DispenserEEpromRequest),
-  3,
-  dispenser_eeprom_request__field_descriptors,
-  dispenser_eeprom_request__field_indices_by_name,
-  1,  dispenser_eeprom_request__number_ranges,
-  (ProtobufCMessageInit) dispenser_eeprom_request__init,
-  NULL,NULL,NULL    /* reserved[123] */
-};
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEpromRequest.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEpromRequest.pb-c.h
deleted file mode 100644
index d0d2dda4f..000000000
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEpromRequest.pb-c.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: DispenserEEpromRequest.proto */
-
-#ifndef PROTOBUF_C_DispenserEEpromRequest_2eproto__INCLUDED
-#define PROTOBUF_C_DispenserEEpromRequest_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 "DispenserEEPROM.pb-c.h"
-
-typedef struct _DispenserEEpromRequest DispenserEEpromRequest;
-
-
-/* --- enums --- */
-
-
-/* --- messages --- */
-
-struct  _DispenserEEpromRequest
-{
-  ProtobufCMessage base;
-  protobuf_c_boolean has_dispenserid;
-  uint32_t dispenserid;
-  protobuf_c_boolean has_burnrequest;
-  protobuf_c_boolean burnrequest;
-  DispenserEEpromInfo *dispensereeprom;
-};
-#define DISPENSER_EEPROM_REQUEST__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&dispenser_eeprom_request__descriptor) \
-    , 0, 0, 0, 0, NULL }
-
-
-/* DispenserEEpromRequest methods */
-void   dispenser_eeprom_request__init
-                     (DispenserEEpromRequest         *message);
-size_t dispenser_eeprom_request__get_packed_size
-                     (const DispenserEEpromRequest   *message);
-size_t dispenser_eeprom_request__pack
-                     (const DispenserEEpromRequest   *message,
-                      uint8_t             *out);
-size_t dispenser_eeprom_request__pack_to_buffer
-                     (const DispenserEEpromRequest   *message,
-                      ProtobufCBuffer     *buffer);
-DispenserEEpromRequest *
-       dispenser_eeprom_request__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   dispenser_eeprom_request__free_unpacked
-                     (DispenserEEpromRequest *message,
-                      ProtobufCAllocator *allocator);
-/* --- per-message closures --- */
-
-typedef void (*DispenserEEpromRequest_Closure)
-                 (const DispenserEEpromRequest *message,
-                  void *closure_data);
-
-/* --- services --- */
-
-
-/* --- descriptors --- */
-
-extern const ProtobufCMessageDescriptor dispenser_eeprom_request__descriptor;
-
-PROTOBUF_C__END_DECLS
-
-
-#endif  /* PROTOBUF_C_DispenserEEpromRequest_2eproto__INCLUDED */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEpromResponse.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEpromResponse.pb-c.c
deleted file mode 100644
index c86c01ad6..000000000
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEpromResponse.pb-c.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: DispenserEEpromResponse.proto */
-
-/* Do not generate deprecated warnings for self */
-#ifndef PROTOBUF_C__NO_DEPRECATED
-#define PROTOBUF_C__NO_DEPRECATED
-#endif
-
-#include "DispenserEEpromResponse.pb-c.h"
-void   dispenser_eeprom_response__init
-                     (DispenserEEpromResponse         *message)
-{
-  static const DispenserEEpromResponse init_value = DISPENSER_EEPROM_RESPONSE__INIT;
-  *message = init_value;
-}
-size_t dispenser_eeprom_response__get_packed_size
-                     (const DispenserEEpromResponse *message)
-{
-  assert(message->base.descriptor == &dispenser_eeprom_response__descriptor);
-  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t dispenser_eeprom_response__pack
-                     (const DispenserEEpromResponse *message,
-                      uint8_t       *out)
-{
-  assert(message->base.descriptor == &dispenser_eeprom_response__descriptor);
-  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t dispenser_eeprom_response__pack_to_buffer
-                     (const DispenserEEpromResponse *message,
-                      ProtobufCBuffer *buffer)
-{
-  assert(message->base.descriptor == &dispenser_eeprom_response__descriptor);
-  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-DispenserEEpromResponse *
-       dispenser_eeprom_response__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data)
-{
-  return (DispenserEEpromResponse *)
-     protobuf_c_message_unpack (&dispenser_eeprom_response__descriptor,
-                                allocator, len, data);
-}
-void   dispenser_eeprom_response__free_unpacked
-                     (DispenserEEpromResponse *message,
-                      ProtobufCAllocator *allocator)
-{
-  if(!message)
-    return;
-  assert(message->base.descriptor == &dispenser_eeprom_response__descriptor);
-  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-static const ProtobufCFieldDescriptor dispenser_eeprom_response__field_descriptors[2] =
-{
-  {
-    "",
-    1,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromResponse, has_dispenserid),
-    offsetof(DispenserEEpromResponse, dispenserid),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    2,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_MESSAGE,
-    0,   /* quantifier_offset */
-    offsetof(DispenserEEpromResponse, dispensereeprom),
-    &dispenser_eeprom_info__descriptor,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-};
-static const unsigned dispenser_eeprom_response__field_indices_by_name[] = {
-  1,   /* field[1] = DispenserEEprom */
-  0,   /* field[0] = DispenserId */
-};
-static const ProtobufCIntRange dispenser_eeprom_response__number_ranges[1 + 1] =
-{
-  { 1, 0 },
-  { 0, 2 }
-};
-const ProtobufCMessageDescriptor dispenser_eeprom_response__descriptor =
-{
-  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "",
-  "",
-  "",
-  "",
-  sizeof(DispenserEEpromResponse),
-  2,
-  dispenser_eeprom_response__field_descriptors,
-  dispenser_eeprom_response__field_indices_by_name,
-  1,  dispenser_eeprom_response__number_ranges,
-  (ProtobufCMessageInit) dispenser_eeprom_response__init,
-  NULL,NULL,NULL    /* reserved[123] */
-};
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEpromResponse.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEpromResponse.pb-c.h
deleted file mode 100644
index a9186f5ef..000000000
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEpromResponse.pb-c.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: DispenserEEpromResponse.proto */
-
-#ifndef PROTOBUF_C_DispenserEEpromResponse_2eproto__INCLUDED
-#define PROTOBUF_C_DispenserEEpromResponse_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 "DispenserEEprom.pb-c.h"
-
-typedef struct _DispenserEEpromResponse DispenserEEpromResponse;
-
-
-/* --- enums --- */
-
-
-/* --- messages --- */
-
-struct  _DispenserEEpromResponse
-{
-  ProtobufCMessage base;
-  protobuf_c_boolean has_dispenserid;
-  uint32_t dispenserid;
-  DispenserEEpromInfo *dispensereeprom;
-};
-#define DISPENSER_EEPROM_RESPONSE__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&dispenser_eeprom_response__descriptor) \
-    , 0, 0, NULL }
-
-
-/* DispenserEEpromResponse methods */
-void   dispenser_eeprom_response__init
-                     (DispenserEEpromResponse         *message);
-size_t dispenser_eeprom_response__get_packed_size
-                     (const DispenserEEpromResponse   *message);
-size_t dispenser_eeprom_response__pack
-                     (const DispenserEEpromResponse   *message,
-                      uint8_t             *out);
-size_t dispenser_eeprom_response__pack_to_buffer
-                     (const DispenserEEpromResponse   *message,
-                      ProtobufCBuffer     *buffer);
-DispenserEEpromResponse *
-       dispenser_eeprom_response__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   dispenser_eeprom_response__free_unpacked
-                     (DispenserEEpromResponse *message,
-                      ProtobufCAllocator *allocator);
-/* --- per-message closures --- */
-
-typedef void (*DispenserEEpromResponse_Closure)
-                 (const DispenserEEpromResponse *message,
-                  void *closure_data);
-
-/* --- services --- */
-
-
-/* --- descriptors --- */
-
-extern const ProtobufCMessageDescriptor dispenser_eeprom_response__descriptor;
-
-PROTOBUF_C__END_DECLS
-
-
-#endif  /* PROTOBUF_C_DispenserEEpromResponse_2eproto__INCLUDED */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEPROM.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEPROM.pb-c.c
deleted file mode 100644
index 88ef38caf..000000000
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEPROM.pb-c.c
+++ /dev/null
@@ -1,495 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: StubDispenserEEPROM.proto */
-
-/* Do not generate deprecated warnings for self */
-#ifndef PROTOBUF_C__NO_DEPRECATED
-#define PROTOBUF_C__NO_DEPRECATED
-#endif
-
-#include "StubDispenserEEPROM.pb-c.h"
-void   dispenser_eeprom_data__init
-                     (DispenserEEpromData         *message)
-{
-  static const DispenserEEpromData init_value = DISPENSER_EEPROM_DATA__INIT;
-  *message = init_value;
-}
-size_t dispenser_eeprom_data__get_packed_size
-                     (const DispenserEEpromData *message)
-{
-  assert(message->base.descriptor == &dispenser_eeprom_data__descriptor);
-  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t dispenser_eeprom_data__pack
-                     (const DispenserEEpromData *message,
-                      uint8_t       *out)
-{
-  assert(message->base.descriptor == &dispenser_eeprom_data__descriptor);
-  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t dispenser_eeprom_data__pack_to_buffer
-                     (const DispenserEEpromData *message,
-                      ProtobufCBuffer *buffer)
-{
-  assert(message->base.descriptor == &dispenser_eeprom_data__descriptor);
-  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-DispenserEEpromData *
-       dispenser_eeprom_data__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data)
-{
-  return (DispenserEEpromData *)
-     protobuf_c_message_unpack (&dispenser_eeprom_data__descriptor,
-                                allocator, len, data);
-}
-void   dispenser_eeprom_data__free_unpacked
-                     (DispenserEEpromData *message,
-                      ProtobufCAllocator *allocator)
-{
-  if(!message)
-    return;
-  assert(message->base.descriptor == &dispenser_eeprom_data__descriptor);
-  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-static const ProtobufCFieldDescriptor dispenser_eeprom_data__field_descriptors[32] =
-{
-  {
-    "",
-    1,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromData, has_header),
-    offsetof(DispenserEEpromData, header),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    2,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromData, has_tablelength),
-    offsetof(DispenserEEpromData, tablelength),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    3,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromData, has_tableversion),
-    offsetof(DispenserEEpromData, tableversion),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    4,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_STRING,
-    0,   /* quantifier_offset */
-    offsetof(DispenserEEpromData, dispenserp_n),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    5,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_STRING,
-    0,   /* quantifier_offset */
-    offsetof(DispenserEEpromData, pcbs_n),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    6,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_STRING,
-    0,   /* quantifier_offset */
-    offsetof(DispenserEEpromData, pcbpartnumber),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    7,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_STRING,
-    0,   /* quantifier_offset */
-    offsetof(DispenserEEpromData, dispensers_n),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    8,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromData, has_minimalpressure),
-    offsetof(DispenserEEpromData, minimalpressure),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    9,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromData, has_maximalpressure),
-    offsetof(DispenserEEpromData, maximalpressure),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    10,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromData, has_minimalmv),
-    offsetof(DispenserEEpromData, minimalmv),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    11,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromData, has_maximalmv),
-    offsetof(DispenserEEpromData, maximalmv),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    12,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromData, has_totalcycles),
-    offsetof(DispenserEEpromData, totalcycles),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    13,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromData, has_bubblesize),
-    offsetof(DispenserEEpromData, bubblesize),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    14,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromData, has_avg_nl_stepvalue_1_4),
-    offsetof(DispenserEEpromData, avg_nl_stepvalue_1_4),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    15,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromData, has_avg_nl_stepvalue_2_4),
-    offsetof(DispenserEEpromData, avg_nl_stepvalue_2_4),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    16,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromData, has_avg_nl_stepvalue_3_4),
-    offsetof(DispenserEEpromData, avg_nl_stepvalue_3_4),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    17,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromData, has_avg_nl_stepvalue_4_4),
-    offsetof(DispenserEEpromData, avg_nl_stepvalue_4_4),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    18,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromData, has_sw_reserve),
-    offsetof(DispenserEEpromData, sw_reserve),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    19,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_INT32,
-    offsetof(DispenserEEpromData, has_spare1_pressure),
-    offsetof(DispenserEEpromData, spare1_pressure),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    20,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_INT32,
-    offsetof(DispenserEEpromData, has_spare2_pressure),
-    offsetof(DispenserEEpromData, spare2_pressure),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    21,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromData, has_motorpulsespercycle),
-    offsetof(DispenserEEpromData, motorpulsespercycle),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    22,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromData, has_color),
-    offsetof(DispenserEEpromData, color),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    23,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromData, has_pressureslope),
-    offsetof(DispenserEEpromData, pressureslope),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    24,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_STRING,
-    0,   /* quantifier_offset */
-    offsetof(DispenserEEpromData, productiondate),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    25,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromData, has_atslocation),
-    offsetof(DispenserEEpromData, atslocation),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    26,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromData, has_spare1),
-    offsetof(DispenserEEpromData, spare1),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    27,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromData, has_spare2),
-    offsetof(DispenserEEpromData, spare2),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    28,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromData, has_atschannel),
-    offsetof(DispenserEEpromData, atschannel),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    29,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_BOOL,
-    offsetof(DispenserEEpromData, has_unitempty),
-    offsetof(DispenserEEpromData, unitempty),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    30,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_BOOL,
-    offsetof(DispenserEEpromData, has_dryrunpass_fail),
-    offsetof(DispenserEEpromData, dryrunpass_fail),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    31,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_BOOL,
-    offsetof(DispenserEEpromData, has_flowpass_fail),
-    offsetof(DispenserEEpromData, flowpass_fail),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    32,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromData, has_checksum),
-    offsetof(DispenserEEpromData, checksum),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-};
-static const unsigned dispenser_eeprom_data__field_indices_by_name[] = {
-  27,   /* field[27] = ATSChannel */
-  24,   /* field[24] = ATSlocation */
-  13,   /* field[13] = AVG_Nl_stepValue_1_4 */
-  14,   /* field[14] = AVG_Nl_stepValue_2_4 */
-  15,   /* field[15] = AVG_Nl_stepValue_3_4 */
-  16,   /* field[16] = AVG_Nl_stepValue_4_4 */
-  12,   /* field[12] = BubbleSize */
-  31,   /* field[31] = CheckSum */
-  21,   /* field[21] = Color */
-  3,   /* field[3] = DispenserP_N */
-  6,   /* field[6] = DispenserS_N */
-  29,   /* field[29] = DryRunPass_Fail */
-  30,   /* field[30] = FlowPass_Fail */
-  0,   /* field[0] = Header */
-  10,   /* field[10] = MaximalMV */
-  8,   /* field[8] = MaximalPressure */
-  9,   /* field[9] = MinimalMV */
-  7,   /* field[7] = MinimalPressure */
-  20,   /* field[20] = MotorPulsesPerCycle */
-  5,   /* field[5] = PCBPartNumber */
-  4,   /* field[4] = PCBS_N */
-  22,   /* field[22] = PressureSlope */
-  23,   /* field[23] = ProductionDate */
-  17,   /* field[17] = SW_Reserve */
-  25,   /* field[25] = Spare1 */
-  18,   /* field[18] = Spare1_pressure */
-  26,   /* field[26] = Spare2 */
-  19,   /* field[19] = Spare2_pressure */
-  1,   /* field[1] = TableLength */
-  2,   /* field[2] = Tableversion */
-  11,   /* field[11] = TotalCycles */
-  28,   /* field[28] = UnitEmpty */
-};
-static const ProtobufCIntRange dispenser_eeprom_data__number_ranges[1 + 1] =
-{
-  { 1, 0 },
-  { 0, 32 }
-};
-const ProtobufCMessageDescriptor dispenser_eeprom_data__descriptor =
-{
-  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "",
-  "",
-  "",
-  "",
-  sizeof(DispenserEEpromData),
-  32,
-  dispenser_eeprom_data__field_descriptors,
-  dispenser_eeprom_data__field_indices_by_name,
-  1,  dispenser_eeprom_data__number_ranges,
-  (ProtobufCMessageInit) dispenser_eeprom_data__init,
-  NULL,NULL,NULL    /* reserved[123] */
-};
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEPROM.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEPROM.pb-c.h
deleted file mode 100644
index d07cd3006..000000000
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEPROM.pb-c.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: StubDispenserEEPROM.proto */
-
-#ifndef PROTOBUF_C_StubDispenserEEPROM_2eproto__INCLUDED
-#define PROTOBUF_C_StubDispenserEEPROM_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 _DispenserEEpromData DispenserEEpromData;
-
-
-/* --- enums --- */
-
-
-/* --- messages --- */
-
-struct  _DispenserEEpromData
-{
-  ProtobufCMessage base;
-  protobuf_c_boolean has_header;
-  uint32_t header;
-  protobuf_c_boolean has_tablelength;
-  uint32_t tablelength;
-  protobuf_c_boolean has_tableversion;
-  uint32_t tableversion;
-  char *dispenserp_n;
-  char *pcbs_n;
-  char *pcbpartnumber;
-  char *dispensers_n;
-  protobuf_c_boolean has_minimalpressure;
-  uint32_t minimalpressure;
-  protobuf_c_boolean has_maximalpressure;
-  uint32_t maximalpressure;
-  protobuf_c_boolean has_minimalmv;
-  uint32_t minimalmv;
-  protobuf_c_boolean has_maximalmv;
-  uint32_t maximalmv;
-  protobuf_c_boolean has_totalcycles;
-  uint32_t totalcycles;
-  protobuf_c_boolean has_bubblesize;
-  uint32_t bubblesize;
-  protobuf_c_boolean has_avg_nl_stepvalue_1_4;
-  uint32_t avg_nl_stepvalue_1_4;
-  protobuf_c_boolean has_avg_nl_stepvalue_2_4;
-  uint32_t avg_nl_stepvalue_2_4;
-  protobuf_c_boolean has_avg_nl_stepvalue_3_4;
-  uint32_t avg_nl_stepvalue_3_4;
-  protobuf_c_boolean has_avg_nl_stepvalue_4_4;
-  uint32_t avg_nl_stepvalue_4_4;
-  protobuf_c_boolean has_sw_reserve;
-  uint32_t sw_reserve;
-  protobuf_c_boolean has_spare1_pressure;
-  int32_t spare1_pressure;
-  protobuf_c_boolean has_spare2_pressure;
-  int32_t spare2_pressure;
-  protobuf_c_boolean has_motorpulsespercycle;
-  uint32_t motorpulsespercycle;
-  protobuf_c_boolean has_color;
-  uint32_t color;
-  protobuf_c_boolean has_pressureslope;
-  uint32_t pressureslope;
-  char *productiondate;
-  protobuf_c_boolean has_atslocation;
-  uint32_t atslocation;
-  protobuf_c_boolean has_spare1;
-  uint32_t spare1;
-  protobuf_c_boolean has_spare2;
-  uint32_t spare2;
-  protobuf_c_boolean has_atschannel;
-  uint32_t atschannel;
-  protobuf_c_boolean has_unitempty;
-  protobuf_c_boolean unitempty;
-  protobuf_c_boolean has_dryrunpass_fail;
-  protobuf_c_boolean dryrunpass_fail;
-  protobuf_c_boolean has_flowpass_fail;
-  protobuf_c_boolean flowpass_fail;
-  protobuf_c_boolean has_checksum;
-  uint32_t checksum;
-};
-#define DISPENSER_EEPROM_DATA__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&dispenser_eeprom_data__descriptor) \
-    , 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
-
-
-/* DispenserEEpromData methods */
-void   dispenser_eeprom_data__init
-                     (DispenserEEpromData         *message);
-size_t dispenser_eeprom_data__get_packed_size
-                     (const DispenserEEpromData   *message);
-size_t dispenser_eeprom_data__pack
-                     (const DispenserEEpromData   *message,
-                      uint8_t             *out);
-size_t dispenser_eeprom_data__pack_to_buffer
-                     (const DispenserEEpromData   *message,
-                      ProtobufCBuffer     *buffer);
-DispenserEEpromData *
-       dispenser_eeprom_data__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   dispenser_eeprom_data__free_unpacked
-                     (DispenserEEpromData *message,
-                      ProtobufCAllocator *allocator);
-/* --- per-message closures --- */
-
-typedef void (*DispenserEEpromData_Closure)
-                 (const DispenserEEpromData *message,
-                  void *closure_data);
-
-/* --- services --- */
-
-
-/* --- descriptors --- */
-
-extern const ProtobufCMessageDescriptor dispenser_eeprom_data__descriptor;
-
-PROTOBUF_C__END_DECLS
-
-
-#endif  /* PROTOBUF_C_StubDispenserEEPROM_2eproto__INCLUDED */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEPROM.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEpromData.pb-c.c
index 490336ab8..26e3d8b31 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEPROM.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEpromData.pb-c.c
@@ -1,66 +1,66 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: DispenserEEPROM.proto */
+/* Generated from: StubDispenserEEpromData.proto */
 
 /* Do not generate deprecated warnings for self */
 #ifndef PROTOBUF_C__NO_DEPRECATED
 #define PROTOBUF_C__NO_DEPRECATED
 #endif
 
-#include "DispenserEEPROM.pb-c.h"
-void   dispenser_eeprom_info__init
-                     (DispenserEEpromInfo         *message)
+#include "StubDispenserEEpromData.pb-c.h"
+void   stub_dispenser_eeprom_data__init
+                     (StubDispenserEEpromData         *message)
 {
-  static const DispenserEEpromInfo init_value = DISPENSER_EEPROM_INFO__INIT;
+  static const StubDispenserEEpromData init_value = STUB_DISPENSER_EEPROM_DATA__INIT;
   *message = init_value;
 }
-size_t dispenser_eeprom_info__get_packed_size
-                     (const DispenserEEpromInfo *message)
+size_t stub_dispenser_eeprom_data__get_packed_size
+                     (const StubDispenserEEpromData *message)
 {
-  assert(message->base.descriptor == &dispenser_eeprom_info__descriptor);
+  assert(message->base.descriptor == &stub_dispenser_eeprom_data__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t dispenser_eeprom_info__pack
-                     (const DispenserEEpromInfo *message,
+size_t stub_dispenser_eeprom_data__pack
+                     (const StubDispenserEEpromData *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &dispenser_eeprom_info__descriptor);
+  assert(message->base.descriptor == &stub_dispenser_eeprom_data__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t dispenser_eeprom_info__pack_to_buffer
-                     (const DispenserEEpromInfo *message,
+size_t stub_dispenser_eeprom_data__pack_to_buffer
+                     (const StubDispenserEEpromData *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &dispenser_eeprom_info__descriptor);
+  assert(message->base.descriptor == &stub_dispenser_eeprom_data__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
-DispenserEEpromInfo *
-       dispenser_eeprom_info__unpack
+StubDispenserEEpromData *
+       stub_dispenser_eeprom_data__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
-  return (DispenserEEpromInfo *)
-     protobuf_c_message_unpack (&dispenser_eeprom_info__descriptor,
+  return (StubDispenserEEpromData *)
+     protobuf_c_message_unpack (&stub_dispenser_eeprom_data__descriptor,
                                 allocator, len, data);
 }
-void   dispenser_eeprom_info__free_unpacked
-                     (DispenserEEpromInfo *message,
+void   stub_dispenser_eeprom_data__free_unpacked
+                     (StubDispenserEEpromData *message,
                       ProtobufCAllocator *allocator)
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &dispenser_eeprom_info__descriptor);
+  assert(message->base.descriptor == &stub_dispenser_eeprom_data__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[32] =
+static const ProtobufCFieldDescriptor stub_dispenser_eeprom_data__field_descriptors[32] =
 {
   {
     "",
     1,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromInfo, has_header),
-    offsetof(DispenserEEpromInfo, header),
+    offsetof(StubDispenserEEpromData, has_header),
+    offsetof(StubDispenserEEpromData, header),
     NULL,
     NULL,
     0,             /* flags */
@@ -71,8 +71,8 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     2,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromInfo, has_tablelength),
-    offsetof(DispenserEEpromInfo, tablelength),
+    offsetof(StubDispenserEEpromData, has_tablelength),
+    offsetof(StubDispenserEEpromData, tablelength),
     NULL,
     NULL,
     0,             /* flags */
@@ -83,8 +83,8 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     3,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromInfo, has_tableversion),
-    offsetof(DispenserEEpromInfo, tableversion),
+    offsetof(StubDispenserEEpromData, has_tableversion),
+    offsetof(StubDispenserEEpromData, tableversion),
     NULL,
     NULL,
     0,             /* flags */
@@ -96,7 +96,7 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_STRING,
     0,   /* quantifier_offset */
-    offsetof(DispenserEEpromInfo, dispenserp_n),
+    offsetof(StubDispenserEEpromData, dispenserp_n),
     NULL,
     NULL,
     0,             /* flags */
@@ -108,7 +108,7 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_STRING,
     0,   /* quantifier_offset */
-    offsetof(DispenserEEpromInfo, pcbs_n),
+    offsetof(StubDispenserEEpromData, pcbs_n),
     NULL,
     NULL,
     0,             /* flags */
@@ -120,7 +120,7 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_STRING,
     0,   /* quantifier_offset */
-    offsetof(DispenserEEpromInfo, pcbpartnumber),
+    offsetof(StubDispenserEEpromData, pcbpartnumber),
     NULL,
     NULL,
     0,             /* flags */
@@ -132,7 +132,7 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_STRING,
     0,   /* quantifier_offset */
-    offsetof(DispenserEEpromInfo, dispensers_n),
+    offsetof(StubDispenserEEpromData, dispensers_n),
     NULL,
     NULL,
     0,             /* flags */
@@ -143,8 +143,8 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     8,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromInfo, has_minimalpressure),
-    offsetof(DispenserEEpromInfo, minimalpressure),
+    offsetof(StubDispenserEEpromData, has_minimalpressure),
+    offsetof(StubDispenserEEpromData, minimalpressure),
     NULL,
     NULL,
     0,             /* flags */
@@ -155,8 +155,8 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     9,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromInfo, has_maximalpressure),
-    offsetof(DispenserEEpromInfo, maximalpressure),
+    offsetof(StubDispenserEEpromData, has_maximalpressure),
+    offsetof(StubDispenserEEpromData, maximalpressure),
     NULL,
     NULL,
     0,             /* flags */
@@ -167,8 +167,8 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     10,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromInfo, has_minimalmv),
-    offsetof(DispenserEEpromInfo, minimalmv),
+    offsetof(StubDispenserEEpromData, has_minimalmv),
+    offsetof(StubDispenserEEpromData, minimalmv),
     NULL,
     NULL,
     0,             /* flags */
@@ -179,8 +179,8 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     11,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromInfo, has_maximalmv),
-    offsetof(DispenserEEpromInfo, maximalmv),
+    offsetof(StubDispenserEEpromData, has_maximalmv),
+    offsetof(StubDispenserEEpromData, maximalmv),
     NULL,
     NULL,
     0,             /* flags */
@@ -191,8 +191,8 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     12,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromInfo, has_totalcycles),
-    offsetof(DispenserEEpromInfo, totalcycles),
+    offsetof(StubDispenserEEpromData, has_totalcycles),
+    offsetof(StubDispenserEEpromData, totalcycles),
     NULL,
     NULL,
     0,             /* flags */
@@ -203,8 +203,8 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     13,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromInfo, has_bubblesize),
-    offsetof(DispenserEEpromInfo, bubblesize),
+    offsetof(StubDispenserEEpromData, has_bubblesize),
+    offsetof(StubDispenserEEpromData, bubblesize),
     NULL,
     NULL,
     0,             /* flags */
@@ -215,8 +215,8 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     14,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromInfo, has_avg_nl_stepvalue_1_4),
-    offsetof(DispenserEEpromInfo, avg_nl_stepvalue_1_4),
+    offsetof(StubDispenserEEpromData, has_avg_nl_stepvalue_1_4),
+    offsetof(StubDispenserEEpromData, avg_nl_stepvalue_1_4),
     NULL,
     NULL,
     0,             /* flags */
@@ -227,8 +227,8 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     15,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromInfo, has_avg_nl_stepvalue_2_4),
-    offsetof(DispenserEEpromInfo, avg_nl_stepvalue_2_4),
+    offsetof(StubDispenserEEpromData, has_avg_nl_stepvalue_2_4),
+    offsetof(StubDispenserEEpromData, avg_nl_stepvalue_2_4),
     NULL,
     NULL,
     0,             /* flags */
@@ -239,8 +239,8 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     16,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromInfo, has_avg_nl_stepvalue_3_4),
-    offsetof(DispenserEEpromInfo, avg_nl_stepvalue_3_4),
+    offsetof(StubDispenserEEpromData, has_avg_nl_stepvalue_3_4),
+    offsetof(StubDispenserEEpromData, avg_nl_stepvalue_3_4),
     NULL,
     NULL,
     0,             /* flags */
@@ -251,8 +251,8 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     17,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromInfo, has_avg_nl_stepvalue_4_4),
-    offsetof(DispenserEEpromInfo, avg_nl_stepvalue_4_4),
+    offsetof(StubDispenserEEpromData, has_avg_nl_stepvalue_4_4),
+    offsetof(StubDispenserEEpromData, avg_nl_stepvalue_4_4),
     NULL,
     NULL,
     0,             /* flags */
@@ -263,8 +263,8 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     18,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromInfo, has_sw_reserve),
-    offsetof(DispenserEEpromInfo, sw_reserve),
+    offsetof(StubDispenserEEpromData, has_sw_reserve),
+    offsetof(StubDispenserEEpromData, sw_reserve),
     NULL,
     NULL,
     0,             /* flags */
@@ -275,8 +275,8 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     19,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_INT32,
-    offsetof(DispenserEEpromInfo, has_spare1_pressure),
-    offsetof(DispenserEEpromInfo, spare1_pressure),
+    offsetof(StubDispenserEEpromData, has_spare1_pressure),
+    offsetof(StubDispenserEEpromData, spare1_pressure),
     NULL,
     NULL,
     0,             /* flags */
@@ -287,8 +287,8 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     20,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_INT32,
-    offsetof(DispenserEEpromInfo, has_spare2_pressure),
-    offsetof(DispenserEEpromInfo, spare2_pressure),
+    offsetof(StubDispenserEEpromData, has_spare2_pressure),
+    offsetof(StubDispenserEEpromData, spare2_pressure),
     NULL,
     NULL,
     0,             /* flags */
@@ -299,8 +299,8 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     21,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromInfo, has_motorpulsespercycle),
-    offsetof(DispenserEEpromInfo, motorpulsespercycle),
+    offsetof(StubDispenserEEpromData, has_motorpulsespercycle),
+    offsetof(StubDispenserEEpromData, motorpulsespercycle),
     NULL,
     NULL,
     0,             /* flags */
@@ -311,8 +311,8 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     22,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromInfo, has_color),
-    offsetof(DispenserEEpromInfo, color),
+    offsetof(StubDispenserEEpromData, has_color),
+    offsetof(StubDispenserEEpromData, color),
     NULL,
     NULL,
     0,             /* flags */
@@ -323,8 +323,8 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     23,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromInfo, has_pressureslope),
-    offsetof(DispenserEEpromInfo, pressureslope),
+    offsetof(StubDispenserEEpromData, has_pressureslope),
+    offsetof(StubDispenserEEpromData, pressureslope),
     NULL,
     NULL,
     0,             /* flags */
@@ -336,7 +336,7 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_STRING,
     0,   /* quantifier_offset */
-    offsetof(DispenserEEpromInfo, productiondate),
+    offsetof(StubDispenserEEpromData, productiondate),
     NULL,
     NULL,
     0,             /* flags */
@@ -347,8 +347,8 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     25,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromInfo, has_atslocation),
-    offsetof(DispenserEEpromInfo, atslocation),
+    offsetof(StubDispenserEEpromData, has_atslocation),
+    offsetof(StubDispenserEEpromData, atslocation),
     NULL,
     NULL,
     0,             /* flags */
@@ -359,8 +359,8 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     26,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromInfo, has_spare1),
-    offsetof(DispenserEEpromInfo, spare1),
+    offsetof(StubDispenserEEpromData, has_spare1),
+    offsetof(StubDispenserEEpromData, spare1),
     NULL,
     NULL,
     0,             /* flags */
@@ -371,8 +371,8 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     27,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromInfo, has_spare2),
-    offsetof(DispenserEEpromInfo, spare2),
+    offsetof(StubDispenserEEpromData, has_spare2),
+    offsetof(StubDispenserEEpromData, spare2),
     NULL,
     NULL,
     0,             /* flags */
@@ -383,8 +383,8 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     28,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromInfo, has_atschannel),
-    offsetof(DispenserEEpromInfo, atschannel),
+    offsetof(StubDispenserEEpromData, has_atschannel),
+    offsetof(StubDispenserEEpromData, atschannel),
     NULL,
     NULL,
     0,             /* flags */
@@ -395,8 +395,8 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     29,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_BOOL,
-    offsetof(DispenserEEpromInfo, has_unitempty),
-    offsetof(DispenserEEpromInfo, unitempty),
+    offsetof(StubDispenserEEpromData, has_unitempty),
+    offsetof(StubDispenserEEpromData, unitempty),
     NULL,
     NULL,
     0,             /* flags */
@@ -407,8 +407,8 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     30,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_BOOL,
-    offsetof(DispenserEEpromInfo, has_dryrunpass_fail),
-    offsetof(DispenserEEpromInfo, dryrunpass_fail),
+    offsetof(StubDispenserEEpromData, has_dryrunpass_fail),
+    offsetof(StubDispenserEEpromData, dryrunpass_fail),
     NULL,
     NULL,
     0,             /* flags */
@@ -419,8 +419,8 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     31,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_BOOL,
-    offsetof(DispenserEEpromInfo, has_flowpass_fail),
-    offsetof(DispenserEEpromInfo, flowpass_fail),
+    offsetof(StubDispenserEEpromData, has_flowpass_fail),
+    offsetof(StubDispenserEEpromData, flowpass_fail),
     NULL,
     NULL,
     0,             /* flags */
@@ -431,15 +431,15 @@ static const ProtobufCFieldDescriptor dispenser_eeprom_info__field_descriptors[3
     32,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    offsetof(DispenserEEpromInfo, has_checksum),
-    offsetof(DispenserEEpromInfo, checksum),
+    offsetof(StubDispenserEEpromData, has_checksum),
+    offsetof(StubDispenserEEpromData, checksum),
     NULL,
     NULL,
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned dispenser_eeprom_info__field_indices_by_name[] = {
+static const unsigned stub_dispenser_eeprom_data__field_indices_by_name[] = {
   27,   /* field[27] = ATSChannel */
   24,   /* field[24] = ATSlocation */
   13,   /* field[13] = AVG_Nl_stepValue_1_4 */
@@ -473,23 +473,23 @@ static const unsigned dispenser_eeprom_info__field_indices_by_name[] = {
   11,   /* field[11] = TotalCycles */
   28,   /* field[28] = UnitEmpty */
 };
-static const ProtobufCIntRange dispenser_eeprom_info__number_ranges[1 + 1] =
+static const ProtobufCIntRange stub_dispenser_eeprom_data__number_ranges[1 + 1] =
 {
   { 1, 0 },
   { 0, 32 }
 };
-const ProtobufCMessageDescriptor dispenser_eeprom_info__descriptor =
+const ProtobufCMessageDescriptor stub_dispenser_eeprom_data__descriptor =
 {
   PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
   "",
   "",
   "",
   "",
-  sizeof(DispenserEEpromInfo),
+  sizeof(StubDispenserEEpromData),
   32,
-  dispenser_eeprom_info__field_descriptors,
-  dispenser_eeprom_info__field_indices_by_name,
-  1,  dispenser_eeprom_info__number_ranges,
-  (ProtobufCMessageInit) dispenser_eeprom_info__init,
+  stub_dispenser_eeprom_data__field_descriptors,
+  stub_dispenser_eeprom_data__field_indices_by_name,
+  1,  stub_dispenser_eeprom_data__number_ranges,
+  (ProtobufCMessageInit) stub_dispenser_eeprom_data__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEPROM.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEpromData.pb-c.h
index 4791f24f8..8b1a70fd5 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DispenserEEPROM.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEpromData.pb-c.h
@@ -1,8 +1,8 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: DispenserEEPROM.proto */
+/* Generated from: StubDispenserEEpromData.proto */
 
-#ifndef PROTOBUF_C_DispenserEEPROM_2eproto__INCLUDED
-#define PROTOBUF_C_DispenserEEPROM_2eproto__INCLUDED
+#ifndef PROTOBUF_C_StubDispenserEEpromData_2eproto__INCLUDED
+#define PROTOBUF_C_StubDispenserEEpromData_2eproto__INCLUDED
 
 #include <protobuf-c/protobuf-c.h>
 
@@ -15,7 +15,7 @@ PROTOBUF_C__BEGIN_DECLS
 #endif
 
 
-typedef struct _DispenserEEpromInfo DispenserEEpromInfo;
+typedef struct _StubDispenserEEpromData StubDispenserEEpromData;
 
 
 /* --- enums --- */
@@ -23,7 +23,7 @@ typedef struct _DispenserEEpromInfo DispenserEEpromInfo;
 
 /* --- messages --- */
 
-struct  _DispenserEEpromInfo
+struct  _StubDispenserEEpromData
 {
   ProtobufCMessage base;
   protobuf_c_boolean has_header;
@@ -86,34 +86,34 @@ struct  _DispenserEEpromInfo
   protobuf_c_boolean has_checksum;
   uint32_t checksum;
 };
-#define DISPENSER_EEPROM_INFO__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&dispenser_eeprom_info__descriptor) \
+#define STUB_DISPENSER_EEPROM_DATA__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stub_dispenser_eeprom_data__descriptor) \
     , 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 
 
-/* DispenserEEpromInfo methods */
-void   dispenser_eeprom_info__init
-                     (DispenserEEpromInfo         *message);
-size_t dispenser_eeprom_info__get_packed_size
-                     (const DispenserEEpromInfo   *message);
-size_t dispenser_eeprom_info__pack
-                     (const DispenserEEpromInfo   *message,
+/* StubDispenserEEpromData methods */
+void   stub_dispenser_eeprom_data__init
+                     (StubDispenserEEpromData         *message);
+size_t stub_dispenser_eeprom_data__get_packed_size
+                     (const StubDispenserEEpromData   *message);
+size_t stub_dispenser_eeprom_data__pack
+                     (const StubDispenserEEpromData   *message,
                       uint8_t             *out);
-size_t dispenser_eeprom_info__pack_to_buffer
-                     (const DispenserEEpromInfo   *message,
+size_t stub_dispenser_eeprom_data__pack_to_buffer
+                     (const StubDispenserEEpromData   *message,
                       ProtobufCBuffer     *buffer);
-DispenserEEpromInfo *
-       dispenser_eeprom_info__unpack
+StubDispenserEEpromData *
+       stub_dispenser_eeprom_data__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   dispenser_eeprom_info__free_unpacked
-                     (DispenserEEpromInfo *message,
+void   stub_dispenser_eeprom_data__free_unpacked
+                     (StubDispenserEEpromData *message,
                       ProtobufCAllocator *allocator);
 /* --- per-message closures --- */
 
-typedef void (*DispenserEEpromInfo_Closure)
-                 (const DispenserEEpromInfo *message,
+typedef void (*StubDispenserEEpromData_Closure)
+                 (const StubDispenserEEpromData *message,
                   void *closure_data);
 
 /* --- services --- */
@@ -121,9 +121,9 @@ typedef void (*DispenserEEpromInfo_Closure)
 
 /* --- descriptors --- */
 
-extern const ProtobufCMessageDescriptor dispenser_eeprom_info__descriptor;
+extern const ProtobufCMessageDescriptor stub_dispenser_eeprom_data__descriptor;
 
 PROTOBUF_C__END_DECLS
 
 
-#endif  /* PROTOBUF_C_DispenserEEPROM_2eproto__INCLUDED */
+#endif  /* PROTOBUF_C_StubDispenserEEpromData_2eproto__INCLUDED */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEpromRequest.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEpromRequest.pb-c.c
index 5abadc030..480a7a077 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEpromRequest.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEpromRequest.pb-c.c
@@ -85,7 +85,7 @@ static const ProtobufCFieldDescriptor stub_dispenser_eeprom_request__field_descr
     PROTOBUF_C_TYPE_MESSAGE,
     0,   /* quantifier_offset */
     offsetof(StubDispenserEEpromRequest, dispensereeprom),
-    &dispenser_eeprom_data__descriptor,
+    &stub_dispenser_eeprom_data__descriptor,
     NULL,
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEpromRequest.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEpromRequest.pb-c.h
index 043ee459b..0911e3ed1 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEpromRequest.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEpromRequest.pb-c.h
@@ -14,7 +14,7 @@ PROTOBUF_C__BEGIN_DECLS
 # 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 "StubDispenserEEPROM.pb-c.h"
+#include "StubDispenserEEpromData.pb-c.h"
 
 typedef struct _StubDispenserEEpromRequest StubDispenserEEpromRequest;
 
@@ -31,7 +31,7 @@ struct  _StubDispenserEEpromRequest
   uint32_t dispenserid;
   protobuf_c_boolean has_burnrequest;
   protobuf_c_boolean burnrequest;
-  DispenserEEpromData *dispensereeprom;
+  StubDispenserEEpromData *dispensereeprom;
 };
 #define STUB_DISPENSER_EEPROM_REQUEST__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&stub_dispenser_eeprom_request__descriptor) \
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEpromResponse.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEpromResponse.pb-c.c
index 8400576fa..3c54b1e41 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEpromResponse.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEpromResponse.pb-c.c
@@ -73,7 +73,7 @@ static const ProtobufCFieldDescriptor stub_dispenser_eeprom_response__field_desc
     PROTOBUF_C_TYPE_MESSAGE,
     0,   /* quantifier_offset */
     offsetof(StubDispenserEEpromResponse, dispensereeprom),
-    &dispenser_eeprom_data__descriptor,
+    &stub_dispenser_eeprom_data__descriptor,
     NULL,
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEpromResponse.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEpromResponse.pb-c.h
index 7529a41f0..f9d346aba 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEpromResponse.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubDispenserEEpromResponse.pb-c.h
@@ -14,7 +14,7 @@ PROTOBUF_C__BEGIN_DECLS
 # 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 "StubDispenserEEprom.pb-c.h"
+#include "StubDispenserEEpromData.pb-c.h"
 
 typedef struct _StubDispenserEEpromResponse StubDispenserEEpromResponse;
 
@@ -29,7 +29,7 @@ struct  _StubDispenserEEpromResponse
   ProtobufCMessage base;
   protobuf_c_boolean has_dispenserid;
   uint32_t dispenserid;
-  DispenserEEpromData *dispensereeprom;
+  StubDispenserEEpromData *dispensereeprom;
 };
 #define STUB_DISPENSER_EEPROM_RESPONSE__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&stub_dispenser_eeprom_response__descriptor) \
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubWhsEEPROM.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubWhsEEpromData.pb-c.c
index 919b17543..3a27bf9bf 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubWhsEEPROM.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubWhsEEpromData.pb-c.c
@@ -1,66 +1,66 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: StubWhsEEPROM.proto */
+/* Generated from: StubWhsEEpromData.proto */
 
 /* Do not generate deprecated warnings for self */
 #ifndef PROTOBUF_C__NO_DEPRECATED
 #define PROTOBUF_C__NO_DEPRECATED
 #endif
 
-#include "StubWhsEEPROM.pb-c.h"
-void   whs_eeprom_data__init
-                     (WhsEEpromData         *message)
+#include "StubWhsEEpromData.pb-c.h"
+void   stub_whs_eeprom_data__init
+                     (StubWhsEEpromData         *message)
 {
-  static const WhsEEpromData init_value = WHS_EEPROM_DATA__INIT;
+  static const StubWhsEEpromData init_value = STUB_WHS_EEPROM_DATA__INIT;
   *message = init_value;
 }
-size_t whs_eeprom_data__get_packed_size
-                     (const WhsEEpromData *message)
+size_t stub_whs_eeprom_data__get_packed_size
+                     (const StubWhsEEpromData *message)
 {
-  assert(message->base.descriptor == &whs_eeprom_data__descriptor);
+  assert(message->base.descriptor == &stub_whs_eeprom_data__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t whs_eeprom_data__pack
-                     (const WhsEEpromData *message,
+size_t stub_whs_eeprom_data__pack
+                     (const StubWhsEEpromData *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &whs_eeprom_data__descriptor);
+  assert(message->base.descriptor == &stub_whs_eeprom_data__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t whs_eeprom_data__pack_to_buffer
-                     (const WhsEEpromData *message,
+size_t stub_whs_eeprom_data__pack_to_buffer
+                     (const StubWhsEEpromData *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &whs_eeprom_data__descriptor);
+  assert(message->base.descriptor == &stub_whs_eeprom_data__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
-WhsEEpromData *
-       whs_eeprom_data__unpack
+StubWhsEEpromData *
+       stub_whs_eeprom_data__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
-  return (WhsEEpromData *)
-     protobuf_c_message_unpack (&whs_eeprom_data__descriptor,
+  return (StubWhsEEpromData *)
+     protobuf_c_message_unpack (&stub_whs_eeprom_data__descriptor,
                                 allocator, len, data);
 }
-void   whs_eeprom_data__free_unpacked
-                     (WhsEEpromData *message,
+void   stub_whs_eeprom_data__free_unpacked
+                     (StubWhsEEpromData *message,
                       ProtobufCAllocator *allocator)
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &whs_eeprom_data__descriptor);
+  assert(message->base.descriptor == &stub_whs_eeprom_data__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor whs_eeprom_data__field_descriptors[19] =
+static const ProtobufCFieldDescriptor stub_whs_eeprom_data__field_descriptors[19] =
 {
   {
     "",
     1,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    offsetof(WhsEEpromData, has_header),
-    offsetof(WhsEEpromData, header),
+    offsetof(StubWhsEEpromData, has_header),
+    offsetof(StubWhsEEpromData, header),
     NULL,
     NULL,
     0,             /* flags */
@@ -71,8 +71,8 @@ static const ProtobufCFieldDescriptor whs_eeprom_data__field_descriptors[19] =
     2,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    offsetof(WhsEEpromData, has_tablelength),
-    offsetof(WhsEEpromData, tablelength),
+    offsetof(StubWhsEEpromData, has_tablelength),
+    offsetof(StubWhsEEpromData, tablelength),
     NULL,
     NULL,
     0,             /* flags */
@@ -83,8 +83,8 @@ static const ProtobufCFieldDescriptor whs_eeprom_data__field_descriptors[19] =
     3,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    offsetof(WhsEEpromData, has_tableversion),
-    offsetof(WhsEEpromData, tableversion),
+    offsetof(StubWhsEEpromData, has_tableversion),
+    offsetof(StubWhsEEpromData, tableversion),
     NULL,
     NULL,
     0,             /* flags */
@@ -96,7 +96,7 @@ static const ProtobufCFieldDescriptor whs_eeprom_data__field_descriptors[19] =
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_STRING,
     0,   /* quantifier_offset */
-    offsetof(WhsEEpromData, whsp_n),
+    offsetof(StubWhsEEpromData, whsp_n),
     NULL,
     NULL,
     0,             /* flags */
@@ -108,7 +108,7 @@ static const ProtobufCFieldDescriptor whs_eeprom_data__field_descriptors[19] =
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_STRING,
     0,   /* quantifier_offset */
-    offsetof(WhsEEpromData, pcbs_n),
+    offsetof(StubWhsEEpromData, pcbs_n),
     NULL,
     NULL,
     0,             /* flags */
@@ -120,7 +120,7 @@ static const ProtobufCFieldDescriptor whs_eeprom_data__field_descriptors[19] =
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_STRING,
     0,   /* quantifier_offset */
-    offsetof(WhsEEpromData, pcbpartnumber),
+    offsetof(StubWhsEEpromData, pcbpartnumber),
     NULL,
     NULL,
     0,             /* flags */
@@ -132,7 +132,7 @@ static const ProtobufCFieldDescriptor whs_eeprom_data__field_descriptors[19] =
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_STRING,
     0,   /* quantifier_offset */
-    offsetof(WhsEEpromData, whss_n),
+    offsetof(StubWhsEEpromData, whss_n),
     NULL,
     NULL,
     0,             /* flags */
@@ -143,8 +143,8 @@ static const ProtobufCFieldDescriptor whs_eeprom_data__field_descriptors[19] =
     8,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(WhsEEpromData, has_orifice1flow),
-    offsetof(WhsEEpromData, orifice1flow),
+    offsetof(StubWhsEEpromData, has_orifice1flow),
+    offsetof(StubWhsEEpromData, orifice1flow),
     NULL,
     NULL,
     0,             /* flags */
@@ -155,8 +155,8 @@ static const ProtobufCFieldDescriptor whs_eeprom_data__field_descriptors[19] =
     9,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(WhsEEpromData, has_orifice1slope),
-    offsetof(WhsEEpromData, orifice1slope),
+    offsetof(StubWhsEEpromData, has_orifice1slope),
+    offsetof(StubWhsEEpromData, orifice1slope),
     NULL,
     NULL,
     0,             /* flags */
@@ -167,8 +167,8 @@ static const ProtobufCFieldDescriptor whs_eeprom_data__field_descriptors[19] =
     10,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(WhsEEpromData, has_orifice2flow),
-    offsetof(WhsEEpromData, orifice2flow),
+    offsetof(StubWhsEEpromData, has_orifice2flow),
+    offsetof(StubWhsEEpromData, orifice2flow),
     NULL,
     NULL,
     0,             /* flags */
@@ -179,8 +179,8 @@ static const ProtobufCFieldDescriptor whs_eeprom_data__field_descriptors[19] =
     11,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(WhsEEpromData, has_orifice2slope),
-    offsetof(WhsEEpromData, orifice2slope),
+    offsetof(StubWhsEEpromData, has_orifice2slope),
+    offsetof(StubWhsEEpromData, orifice2slope),
     NULL,
     NULL,
     0,             /* flags */
@@ -191,8 +191,8 @@ static const ProtobufCFieldDescriptor whs_eeprom_data__field_descriptors[19] =
     12,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(WhsEEpromData, has_orifice3flow),
-    offsetof(WhsEEpromData, orifice3flow),
+    offsetof(StubWhsEEpromData, has_orifice3flow),
+    offsetof(StubWhsEEpromData, orifice3flow),
     NULL,
     NULL,
     0,             /* flags */
@@ -203,8 +203,8 @@ static const ProtobufCFieldDescriptor whs_eeprom_data__field_descriptors[19] =
     13,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(WhsEEpromData, has_orifice3slope),
-    offsetof(WhsEEpromData, orifice3slope),
+    offsetof(StubWhsEEpromData, has_orifice3slope),
+    offsetof(StubWhsEEpromData, orifice3slope),
     NULL,
     NULL,
     0,             /* flags */
@@ -215,8 +215,8 @@ static const ProtobufCFieldDescriptor whs_eeprom_data__field_descriptors[19] =
     14,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(WhsEEpromData, has_orificevalveflow),
-    offsetof(WhsEEpromData, orificevalveflow),
+    offsetof(StubWhsEEpromData, has_orificevalveflow),
+    offsetof(StubWhsEEpromData, orificevalveflow),
     NULL,
     NULL,
     0,             /* flags */
@@ -227,8 +227,8 @@ static const ProtobufCFieldDescriptor whs_eeprom_data__field_descriptors[19] =
     15,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(WhsEEpromData, has_orificevalveslope),
-    offsetof(WhsEEpromData, orificevalveslope),
+    offsetof(StubWhsEEpromData, has_orificevalveslope),
+    offsetof(StubWhsEEpromData, orificevalveslope),
     NULL,
     NULL,
     0,             /* flags */
@@ -240,7 +240,7 @@ static const ProtobufCFieldDescriptor whs_eeprom_data__field_descriptors[19] =
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_STRING,
     0,   /* quantifier_offset */
-    offsetof(WhsEEpromData, vocinstallationdate),
+    offsetof(StubWhsEEpromData, vocinstallationdate),
     NULL,
     NULL,
     0,             /* flags */
@@ -252,7 +252,7 @@ static const ProtobufCFieldDescriptor whs_eeprom_data__field_descriptors[19] =
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_STRING,
     0,   /* quantifier_offset */
-    offsetof(WhsEEpromData, filterinstallationdate),
+    offsetof(StubWhsEEpromData, filterinstallationdate),
     NULL,
     NULL,
     0,             /* flags */
@@ -264,7 +264,7 @@ static const ProtobufCFieldDescriptor whs_eeprom_data__field_descriptors[19] =
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_STRING,
     0,   /* quantifier_offset */
-    offsetof(WhsEEpromData, productiondate),
+    offsetof(StubWhsEEpromData, productiondate),
     NULL,
     NULL,
     0,             /* flags */
@@ -275,15 +275,15 @@ static const ProtobufCFieldDescriptor whs_eeprom_data__field_descriptors[19] =
     19,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    offsetof(WhsEEpromData, has_checksum),
-    offsetof(WhsEEpromData, checksum),
+    offsetof(StubWhsEEpromData, has_checksum),
+    offsetof(StubWhsEEpromData, checksum),
     NULL,
     NULL,
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned whs_eeprom_data__field_indices_by_name[] = {
+static const unsigned stub_whs_eeprom_data__field_indices_by_name[] = {
   18,   /* field[18] = CheckSum */
   16,   /* field[16] = FilterInstallationDate */
   0,   /* field[0] = Header */
@@ -304,23 +304,23 @@ static const unsigned whs_eeprom_data__field_indices_by_name[] = {
   3,   /* field[3] = WhsP_N */
   6,   /* field[6] = WhsS_N */
 };
-static const ProtobufCIntRange whs_eeprom_data__number_ranges[1 + 1] =
+static const ProtobufCIntRange stub_whs_eeprom_data__number_ranges[1 + 1] =
 {
   { 1, 0 },
   { 0, 19 }
 };
-const ProtobufCMessageDescriptor whs_eeprom_data__descriptor =
+const ProtobufCMessageDescriptor stub_whs_eeprom_data__descriptor =
 {
   PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
   "",
   "",
   "",
   "",
-  sizeof(WhsEEpromData),
+  sizeof(StubWhsEEpromData),
   19,
-  whs_eeprom_data__field_descriptors,
-  whs_eeprom_data__field_indices_by_name,
-  1,  whs_eeprom_data__number_ranges,
-  (ProtobufCMessageInit) whs_eeprom_data__init,
+  stub_whs_eeprom_data__field_descriptors,
+  stub_whs_eeprom_data__field_indices_by_name,
+  1,  stub_whs_eeprom_data__number_ranges,
+  (ProtobufCMessageInit) stub_whs_eeprom_data__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubWhsEEPROM.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubWhsEEpromData.pb-c.h
index a140ecf81..61db1cc92 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubWhsEEPROM.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubWhsEEpromData.pb-c.h
@@ -1,8 +1,8 @@
 /* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: StubWhsEEPROM.proto */
+/* Generated from: StubWhsEEpromData.proto */
 
-#ifndef PROTOBUF_C_StubWhsEEPROM_2eproto__INCLUDED
-#define PROTOBUF_C_StubWhsEEPROM_2eproto__INCLUDED
+#ifndef PROTOBUF_C_StubWhsEEpromData_2eproto__INCLUDED
+#define PROTOBUF_C_StubWhsEEpromData_2eproto__INCLUDED
 
 #include <protobuf-c/protobuf-c.h>
 
@@ -15,7 +15,7 @@ PROTOBUF_C__BEGIN_DECLS
 #endif
 
 
-typedef struct _WhsEEpromData WhsEEpromData;
+typedef struct _StubWhsEEpromData StubWhsEEpromData;
 
 
 /* --- enums --- */
@@ -23,7 +23,7 @@ typedef struct _WhsEEpromData WhsEEpromData;
 
 /* --- messages --- */
 
-struct  _WhsEEpromData
+struct  _StubWhsEEpromData
 {
   ProtobufCMessage base;
   protobuf_c_boolean has_header;
@@ -58,34 +58,34 @@ struct  _WhsEEpromData
   protobuf_c_boolean has_checksum;
   uint32_t checksum;
 };
-#define WHS_EEPROM_DATA__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&whs_eeprom_data__descriptor) \
+#define STUB_WHS_EEPROM_DATA__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stub_whs_eeprom_data__descriptor) \
     , 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, NULL, 0, 0 }
 
 
-/* WhsEEpromData methods */
-void   whs_eeprom_data__init
-                     (WhsEEpromData         *message);
-size_t whs_eeprom_data__get_packed_size
-                     (const WhsEEpromData   *message);
-size_t whs_eeprom_data__pack
-                     (const WhsEEpromData   *message,
+/* StubWhsEEpromData methods */
+void   stub_whs_eeprom_data__init
+                     (StubWhsEEpromData         *message);
+size_t stub_whs_eeprom_data__get_packed_size
+                     (const StubWhsEEpromData   *message);
+size_t stub_whs_eeprom_data__pack
+                     (const StubWhsEEpromData   *message,
                       uint8_t             *out);
-size_t whs_eeprom_data__pack_to_buffer
-                     (const WhsEEpromData   *message,
+size_t stub_whs_eeprom_data__pack_to_buffer
+                     (const StubWhsEEpromData   *message,
                       ProtobufCBuffer     *buffer);
-WhsEEpromData *
-       whs_eeprom_data__unpack
+StubWhsEEpromData *
+       stub_whs_eeprom_data__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   whs_eeprom_data__free_unpacked
-                     (WhsEEpromData *message,
+void   stub_whs_eeprom_data__free_unpacked
+                     (StubWhsEEpromData *message,
                       ProtobufCAllocator *allocator);
 /* --- per-message closures --- */
 
-typedef void (*WhsEEpromData_Closure)
-                 (const WhsEEpromData *message,
+typedef void (*StubWhsEEpromData_Closure)
+                 (const StubWhsEEpromData *message,
                   void *closure_data);
 
 /* --- services --- */
@@ -93,9 +93,9 @@ typedef void (*WhsEEpromData_Closure)
 
 /* --- descriptors --- */
 
-extern const ProtobufCMessageDescriptor whs_eeprom_data__descriptor;
+extern const ProtobufCMessageDescriptor stub_whs_eeprom_data__descriptor;
 
 PROTOBUF_C__END_DECLS
 
 
-#endif  /* PROTOBUF_C_StubWhsEEPROM_2eproto__INCLUDED */
+#endif  /* PROTOBUF_C_StubWhsEEpromData_2eproto__INCLUDED */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubWhsEEpromRequest.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubWhsEEpromRequest.pb-c.c
index 9596486c7..e328d7bfc 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubWhsEEpromRequest.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubWhsEEpromRequest.pb-c.c
@@ -7,60 +7,60 @@
 #endif
 
 #include "StubWhsEEpromRequest.pb-c.h"
-void   whs_eeprom_request__init
-                     (WhsEEpromRequest         *message)
+void   stub_whs_eeprom_request__init
+                     (StubWhsEEpromRequest         *message)
 {
-  static const WhsEEpromRequest init_value = WHS_EEPROM_REQUEST__INIT;
+  static const StubWhsEEpromRequest init_value = STUB_WHS_EEPROM_REQUEST__INIT;
   *message = init_value;
 }
-size_t whs_eeprom_request__get_packed_size
-                     (const WhsEEpromRequest *message)
+size_t stub_whs_eeprom_request__get_packed_size
+                     (const StubWhsEEpromRequest *message)
 {
-  assert(message->base.descriptor == &whs_eeprom_request__descriptor);
+  assert(message->base.descriptor == &stub_whs_eeprom_request__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t whs_eeprom_request__pack
-                     (const WhsEEpromRequest *message,
+size_t stub_whs_eeprom_request__pack
+                     (const StubWhsEEpromRequest *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &whs_eeprom_request__descriptor);
+  assert(message->base.descriptor == &stub_whs_eeprom_request__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t whs_eeprom_request__pack_to_buffer
-                     (const WhsEEpromRequest *message,
+size_t stub_whs_eeprom_request__pack_to_buffer
+                     (const StubWhsEEpromRequest *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &whs_eeprom_request__descriptor);
+  assert(message->base.descriptor == &stub_whs_eeprom_request__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
-WhsEEpromRequest *
-       whs_eeprom_request__unpack
+StubWhsEEpromRequest *
+       stub_whs_eeprom_request__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
-  return (WhsEEpromRequest *)
-     protobuf_c_message_unpack (&whs_eeprom_request__descriptor,
+  return (StubWhsEEpromRequest *)
+     protobuf_c_message_unpack (&stub_whs_eeprom_request__descriptor,
                                 allocator, len, data);
 }
-void   whs_eeprom_request__free_unpacked
-                     (WhsEEpromRequest *message,
+void   stub_whs_eeprom_request__free_unpacked
+                     (StubWhsEEpromRequest *message,
                       ProtobufCAllocator *allocator)
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &whs_eeprom_request__descriptor);
+  assert(message->base.descriptor == &stub_whs_eeprom_request__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor whs_eeprom_request__field_descriptors[2] =
+static const ProtobufCFieldDescriptor stub_whs_eeprom_request__field_descriptors[2] =
 {
   {
     "",
     1,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_BOOL,
-    offsetof(WhsEEpromRequest, has_burnrequest),
-    offsetof(WhsEEpromRequest, burnrequest),
+    offsetof(StubWhsEEpromRequest, has_burnrequest),
+    offsetof(StubWhsEEpromRequest, burnrequest),
     NULL,
     NULL,
     0,             /* flags */
@@ -72,34 +72,34 @@ static const ProtobufCFieldDescriptor whs_eeprom_request__field_descriptors[2] =
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_MESSAGE,
     0,   /* quantifier_offset */
-    offsetof(WhsEEpromRequest, whseeprom),
-    &whs_eeprom_data__descriptor,
+    offsetof(StubWhsEEpromRequest, whseeprom),
+    &stub_whs_eeprom_data__descriptor,
     NULL,
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned whs_eeprom_request__field_indices_by_name[] = {
+static const unsigned stub_whs_eeprom_request__field_indices_by_name[] = {
   0,   /* field[0] = BurnRequest */
   1,   /* field[1] = WhsEEprom */
 };
-static const ProtobufCIntRange whs_eeprom_request__number_ranges[1 + 1] =
+static const ProtobufCIntRange stub_whs_eeprom_request__number_ranges[1 + 1] =
 {
   { 1, 0 },
   { 0, 2 }
 };
-const ProtobufCMessageDescriptor whs_eeprom_request__descriptor =
+const ProtobufCMessageDescriptor stub_whs_eeprom_request__descriptor =
 {
   PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
   "",
   "",
   "",
   "",
-  sizeof(WhsEEpromRequest),
+  sizeof(StubWhsEEpromRequest),
   2,
-  whs_eeprom_request__field_descriptors,
-  whs_eeprom_request__field_indices_by_name,
-  1,  whs_eeprom_request__number_ranges,
-  (ProtobufCMessageInit) whs_eeprom_request__init,
+  stub_whs_eeprom_request__field_descriptors,
+  stub_whs_eeprom_request__field_indices_by_name,
+  1,  stub_whs_eeprom_request__number_ranges,
+  (ProtobufCMessageInit) stub_whs_eeprom_request__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubWhsEEpromRequest.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubWhsEEpromRequest.pb-c.h
index a54021c93..3951b72f5 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubWhsEEpromRequest.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubWhsEEpromRequest.pb-c.h
@@ -14,9 +14,9 @@ PROTOBUF_C__BEGIN_DECLS
 # 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 "StubWhsEEPROM.pb-c.h"
+#include "StubWhsEEpromData.pb-c.h"
 
-typedef struct _WhsEEpromRequest WhsEEpromRequest;
+typedef struct _StubWhsEEpromRequest StubWhsEEpromRequest;
 
 
 /* --- enums --- */
@@ -24,41 +24,41 @@ typedef struct _WhsEEpromRequest WhsEEpromRequest;
 
 /* --- messages --- */
 
-struct  _WhsEEpromRequest
+struct  _StubWhsEEpromRequest
 {
   ProtobufCMessage base;
   protobuf_c_boolean has_burnrequest;
   protobuf_c_boolean burnrequest;
-  WhsEEpromData *whseeprom;
+  StubWhsEEpromData *whseeprom;
 };
-#define WHS_EEPROM_REQUEST__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&whs_eeprom_request__descriptor) \
+#define STUB_WHS_EEPROM_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stub_whs_eeprom_request__descriptor) \
     , 0, 0, NULL }
 
 
-/* WhsEEpromRequest methods */
-void   whs_eeprom_request__init
-                     (WhsEEpromRequest         *message);
-size_t whs_eeprom_request__get_packed_size
-                     (const WhsEEpromRequest   *message);
-size_t whs_eeprom_request__pack
-                     (const WhsEEpromRequest   *message,
+/* StubWhsEEpromRequest methods */
+void   stub_whs_eeprom_request__init
+                     (StubWhsEEpromRequest         *message);
+size_t stub_whs_eeprom_request__get_packed_size
+                     (const StubWhsEEpromRequest   *message);
+size_t stub_whs_eeprom_request__pack
+                     (const StubWhsEEpromRequest   *message,
                       uint8_t             *out);
-size_t whs_eeprom_request__pack_to_buffer
-                     (const WhsEEpromRequest   *message,
+size_t stub_whs_eeprom_request__pack_to_buffer
+                     (const StubWhsEEpromRequest   *message,
                       ProtobufCBuffer     *buffer);
-WhsEEpromRequest *
-       whs_eeprom_request__unpack
+StubWhsEEpromRequest *
+       stub_whs_eeprom_request__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   whs_eeprom_request__free_unpacked
-                     (WhsEEpromRequest *message,
+void   stub_whs_eeprom_request__free_unpacked
+                     (StubWhsEEpromRequest *message,
                       ProtobufCAllocator *allocator);
 /* --- per-message closures --- */
 
-typedef void (*WhsEEpromRequest_Closure)
-                 (const WhsEEpromRequest *message,
+typedef void (*StubWhsEEpromRequest_Closure)
+                 (const StubWhsEEpromRequest *message,
                   void *closure_data);
 
 /* --- services --- */
@@ -66,7 +66,7 @@ typedef void (*WhsEEpromRequest_Closure)
 
 /* --- descriptors --- */
 
-extern const ProtobufCMessageDescriptor whs_eeprom_request__descriptor;
+extern const ProtobufCMessageDescriptor stub_whs_eeprom_request__descriptor;
 
 PROTOBUF_C__END_DECLS
 
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubWhsEEpromResponse.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubWhsEEpromResponse.pb-c.c
index 85a138a6a..58465a831 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubWhsEEpromResponse.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubWhsEEpromResponse.pb-c.c
@@ -7,52 +7,52 @@
 #endif
 
 #include "StubWhsEEpromResponse.pb-c.h"
-void   whs_eeprom_response__init
-                     (WhsEEpromResponse         *message)
+void   stub_whs_eeprom_response__init
+                     (StubWhsEEpromResponse         *message)
 {
-  static const WhsEEpromResponse init_value = WHS_EEPROM_RESPONSE__INIT;
+  static const StubWhsEEpromResponse init_value = STUB_WHS_EEPROM_RESPONSE__INIT;
   *message = init_value;
 }
-size_t whs_eeprom_response__get_packed_size
-                     (const WhsEEpromResponse *message)
+size_t stub_whs_eeprom_response__get_packed_size
+                     (const StubWhsEEpromResponse *message)
 {
-  assert(message->base.descriptor == &whs_eeprom_response__descriptor);
+  assert(message->base.descriptor == &stub_whs_eeprom_response__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t whs_eeprom_response__pack
-                     (const WhsEEpromResponse *message,
+size_t stub_whs_eeprom_response__pack
+                     (const StubWhsEEpromResponse *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &whs_eeprom_response__descriptor);
+  assert(message->base.descriptor == &stub_whs_eeprom_response__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t whs_eeprom_response__pack_to_buffer
-                     (const WhsEEpromResponse *message,
+size_t stub_whs_eeprom_response__pack_to_buffer
+                     (const StubWhsEEpromResponse *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &whs_eeprom_response__descriptor);
+  assert(message->base.descriptor == &stub_whs_eeprom_response__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
-WhsEEpromResponse *
-       whs_eeprom_response__unpack
+StubWhsEEpromResponse *
+       stub_whs_eeprom_response__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
-  return (WhsEEpromResponse *)
-     protobuf_c_message_unpack (&whs_eeprom_response__descriptor,
+  return (StubWhsEEpromResponse *)
+     protobuf_c_message_unpack (&stub_whs_eeprom_response__descriptor,
                                 allocator, len, data);
 }
-void   whs_eeprom_response__free_unpacked
-                     (WhsEEpromResponse *message,
+void   stub_whs_eeprom_response__free_unpacked
+                     (StubWhsEEpromResponse *message,
                       ProtobufCAllocator *allocator)
 {
   if(!message)
     return;
-  assert(message->base.descriptor == &whs_eeprom_response__descriptor);
+  assert(message->base.descriptor == &stub_whs_eeprom_response__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor whs_eeprom_response__field_descriptors[1] =
+static const ProtobufCFieldDescriptor stub_whs_eeprom_response__field_descriptors[1] =
 {
   {
     "",
@@ -60,33 +60,33 @@ static const ProtobufCFieldDescriptor whs_eeprom_response__field_descriptors[1]
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_MESSAGE,
     0,   /* quantifier_offset */
-    offsetof(WhsEEpromResponse, whseeprom),
-    &whs_eeprom_data__descriptor,
+    offsetof(StubWhsEEpromResponse, whseeprom),
+    &stub_whs_eeprom_data__descriptor,
     NULL,
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned whs_eeprom_response__field_indices_by_name[] = {
+static const unsigned stub_whs_eeprom_response__field_indices_by_name[] = {
   0,   /* field[0] = WhsEEprom */
 };
-static const ProtobufCIntRange whs_eeprom_response__number_ranges[1 + 1] =
+static const ProtobufCIntRange stub_whs_eeprom_response__number_ranges[1 + 1] =
 {
   { 1, 0 },
   { 0, 1 }
 };
-const ProtobufCMessageDescriptor whs_eeprom_response__descriptor =
+const ProtobufCMessageDescriptor stub_whs_eeprom_response__descriptor =
 {
   PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
   "",
   "",
   "",
   "",
-  sizeof(WhsEEpromResponse),
+  sizeof(StubWhsEEpromResponse),
   1,
-  whs_eeprom_response__field_descriptors,
-  whs_eeprom_response__field_indices_by_name,
-  1,  whs_eeprom_response__number_ranges,
-  (ProtobufCMessageInit) whs_eeprom_response__init,
+  stub_whs_eeprom_response__field_descriptors,
+  stub_whs_eeprom_response__field_indices_by_name,
+  1,  stub_whs_eeprom_response__number_ranges,
+  (ProtobufCMessageInit) stub_whs_eeprom_response__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubWhsEEpromResponse.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubWhsEEpromResponse.pb-c.h
index 84c529277..d3a8d491b 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubWhsEEpromResponse.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/StubWhsEEpromResponse.pb-c.h
@@ -14,9 +14,9 @@ PROTOBUF_C__BEGIN_DECLS
 # 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 "StubWhsEEprom.pb-c.h"
+#include "StubWhsEEpromData.pb-c.h"
 
-typedef struct _WhsEEpromResponse WhsEEpromResponse;
+typedef struct _StubWhsEEpromResponse StubWhsEEpromResponse;
 
 
 /* --- enums --- */
@@ -24,39 +24,39 @@ typedef struct _WhsEEpromResponse WhsEEpromResponse;
 
 /* --- messages --- */
 
-struct  _WhsEEpromResponse
+struct  _StubWhsEEpromResponse
 {
   ProtobufCMessage base;
-  WhsEEpromData *whseeprom;
+  StubWhsEEpromData *whseeprom;
 };
-#define WHS_EEPROM_RESPONSE__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&whs_eeprom_response__descriptor) \
+#define STUB_WHS_EEPROM_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&stub_whs_eeprom_response__descriptor) \
     , NULL }
 
 
-/* WhsEEpromResponse methods */
-void   whs_eeprom_response__init
-                     (WhsEEpromResponse         *message);
-size_t whs_eeprom_response__get_packed_size
-                     (const WhsEEpromResponse   *message);
-size_t whs_eeprom_response__pack
-                     (const WhsEEpromResponse   *message,
+/* StubWhsEEpromResponse methods */
+void   stub_whs_eeprom_response__init
+                     (StubWhsEEpromResponse         *message);
+size_t stub_whs_eeprom_response__get_packed_size
+                     (const StubWhsEEpromResponse   *message);
+size_t stub_whs_eeprom_response__pack
+                     (const StubWhsEEpromResponse   *message,
                       uint8_t             *out);
-size_t whs_eeprom_response__pack_to_buffer
-                     (const WhsEEpromResponse   *message,
+size_t stub_whs_eeprom_response__pack_to_buffer
+                     (const StubWhsEEpromResponse   *message,
                       ProtobufCBuffer     *buffer);
-WhsEEpromResponse *
-       whs_eeprom_response__unpack
+StubWhsEEpromResponse *
+       stub_whs_eeprom_response__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data);
-void   whs_eeprom_response__free_unpacked
-                     (WhsEEpromResponse *message,
+void   stub_whs_eeprom_response__free_unpacked
+                     (StubWhsEEpromResponse *message,
                       ProtobufCAllocator *allocator);
 /* --- per-message closures --- */
 
-typedef void (*WhsEEpromResponse_Closure)
-                 (const WhsEEpromResponse *message,
+typedef void (*StubWhsEEpromResponse_Closure)
+                 (const StubWhsEEpromResponse *message,
                   void *closure_data);
 
 /* --- services --- */
@@ -64,7 +64,7 @@ typedef void (*WhsEEpromResponse_Closure)
 
 /* --- descriptors --- */
 
-extern const ProtobufCMessageDescriptor whs_eeprom_response__descriptor;
+extern const ProtobufCMessageDescriptor stub_whs_eeprom_response__descriptor;
 
 PROTOBUF_C__END_DECLS
 
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Dispenser_Card/EEPROM/Dispenser_EEPROM.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Dispenser_Card/EEPROM/Dispenser_EEPROM.c
index 97e4311b6..ae277ebd5 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Dispenser_Card/EEPROM/Dispenser_EEPROM.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Dispenser_Card/EEPROM/Dispenser_EEPROM.c
@@ -21,12 +21,9 @@
 #include <drivers/FPGA/FPGA_Comm.h>
 #include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h"
 
-#include "PMR/stubs/StubDispenserEEprom.pb-c.h"
+#include "PMR/stubs/StubDispenserEEpromData.pb-c.h"
 #include "PMR/stubs/StubDispenserEEpromRequest.pb-c.h"
 #include "PMR/stubs/StubDispenserEEpromResponse.pb-c.h"
-#include "PMR/Diagnostics/DispenserEEprom.pb-c.h"
-#include "PMR/Diagnostics/DispenserEEpromRequest.pb-c.h"
-#include "PMR/Diagnostics/DispenserEEpromResponse.pb-c.h"
 
 
 
@@ -242,7 +239,7 @@ uint8_t Check_Dispenser_Type(uint8_t Dispenser_ID)
 
     return Dispenser_struct[Dispenser_ID].Status;
 }
-uint32_t Get_EEPROM_DATA_From_Dispenser(int Dispenser_ID,DispenserEEpromData *dispensereeprom)
+uint32_t Get_EEPROM_DATA_From_Dispenser(int Dispenser_ID,StubDispenserEEpromData *dispensereeprom)
 {
     uint32_t status = OK;
     status |= I2C_EEprom_Set_for_Read_Ch(Dispenser_ID, 0xA0);
@@ -323,7 +320,7 @@ uint32_t Get_EEPROM_DATA_From_Dispenser(int Dispenser_ID,DispenserEEpromData *di
     }
     return status;
 }
-uint32_t Prepare_EEPROM_DATA_For_Burning(int Dispenser_ID,DispenserEEpromData *dispensereeprom)
+uint32_t Prepare_EEPROM_DATA_For_Burning(int Dispenser_ID,StubDispenserEEpromData *dispensereeprom)
 {
     uint32_t status = OK;
     Dispenser_struct[Dispenser_ID].Write_Disp_EEPROM.bytes.Header = dispensereeprom->header;
@@ -367,7 +364,7 @@ uint32_t Prepare_EEPROM_DATA_For_Burning(int Dispenser_ID,DispenserEEpromData *d
     SysCtlDelay(5000000);//Must delay for at least 5 milli. !!!  (See data sheet )
     return status;
 }
-uint32_t DispenserEEpromRequestFunc(MessageContainer* requestContainer)
+/*uint32_t DispenserEEpromRequestFunc(MessageContainer* requestContainer)
 {
     DispenserEEpromRequest *request = dispenser_eeprom_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
     DispenserEEpromResponse Cresponse = DISPENSER_EEPROM_RESPONSE__INIT;
@@ -416,15 +413,15 @@ uint32_t DispenserEEpromRequestFunc(MessageContainer* requestContainer)
     SendChars((char*)container_buffer, container_size);
     return OK;
 
-}
+}*/
 uint32_t StubDispenserEEpromRequestFunc(MessageContainer* requestContainer)
 {
-    DispenserEEpromRequest *request = dispenser_eeprom_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
-    DispenserEEpromResponse Cresponse = DISPENSER_EEPROM_RESPONSE__INIT;
+    StubDispenserEEpromRequest *request = stub_dispenser_eeprom_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
+    StubDispenserEEpromResponse Cresponse = STUB_DISPENSER_EEPROM_RESPONSE__INIT;
     MessageContainer responseContainer;
 
     uint32_t status = OK;
-    DispenserEEpromData *DispenserEEpromInstance;
+    StubDispenserEEpromData *DispenserEEpromInstance;
     Report("StubDispenserEEpromRequestFunc",__FILE__,__LINE__,request->dispenserid,RpWarning,(int)request->burnrequest,0);
 
     if (request->burnrequest == true)
@@ -433,10 +430,10 @@ uint32_t StubDispenserEEpromRequestFunc(MessageContainer* requestContainer)
     }
     else
     {
-        DispenserEEpromInstance = my_malloc(sizeof(DispenserEEpromData));
+        DispenserEEpromInstance = my_malloc(sizeof(StubDispenserEEpromData));
         if (DispenserEEpromInstance)
         {
-            dispenser_eeprom_data__init(DispenserEEpromInstance);
+            stub_dispenser_eeprom_data__init(DispenserEEpromInstance);
             status = Get_EEPROM_DATA_From_Dispenser(request->dispenserid,DispenserEEpromInstance);
         }
         else
@@ -451,7 +448,7 @@ uint32_t StubDispenserEEpromRequestFunc(MessageContainer* requestContainer)
     }
     Cresponse.has_dispenserid = true;
     Cresponse.dispenserid = request->dispenserid;
-    responseContainer = createContainer(MESSAGE_TYPE__StubDispenserEEpromResponse, requestContainer->token, true, &Cresponse, &dispenser_eeprom_response__pack, &dispenser_eeprom_response__get_packed_size);
+    responseContainer = createContainer(MESSAGE_TYPE__StubDispenserEEpromResponse, requestContainer->token, true, &Cresponse, &stub_dispenser_eeprom_response__pack, &stub_dispenser_eeprom_response__get_packed_size);
     responseContainer.continuous = false;
     if (status != OK)
     {
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Head_IO.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Head_IO.c
index 3b45515cf..5a21a3853 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Head_IO.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Head_IO.c
@@ -271,9 +271,12 @@ uint32_t HeadCard_ActivateHeadMagnet()
 {
     uint32_t status = OK;
 
-    Head_I2C_EXP2_0x42.bits.OUTPUT_MAG_EN = ENABLE;
-    Head_I2C_EXP2_0x42.bits.OUTPUT_MAG_DIR = 0x01;
-    status |= Head_Write_IO_Reg(0x42,LOW_AND_HIGH);
+    if(Head_Type == HEAD_TYPE_SYLKO)
+    {
+        Head_I2C_EXP2_0x42.bits.OUTPUT_MAG_EN = ENABLE;
+        Head_I2C_EXP2_0x42.bits.OUTPUT_MAG_DIR = 0x01;//?
+        status |= Head_Write_IO_Reg(0x42,LOW_AND_HIGH);
+    }
 
     return status;
 }
@@ -282,9 +285,12 @@ uint32_t HeadCard_DeActivateHeadMagnet()
 {
     uint32_t status = OK;
 
-    Head_I2C_EXP2_0x42.bits.OUTPUT_MAG_EN = ENABLE;
-    Head_I2C_EXP2_0x42.bits.OUTPUT_MAG_DIR = 0x00;
-    status |= Head_Write_IO_Reg(0x42,LOW_AND_HIGH);
+    if(Head_Type == HEAD_TYPE_SYLKO)
+    {
+        Head_I2C_EXP2_0x42.bits.OUTPUT_MAG_EN = ENABLE;
+        Head_I2C_EXP2_0x42.bits.OUTPUT_MAG_DIR = 0x00;//?
+        status |= Head_Write_IO_Reg(0x42,LOW_AND_HIGH);
+    }
 
     return status;
 }
@@ -303,10 +309,12 @@ uint32_t HeadCard_ActivateHeadPressureArcBlowers()
 {
     uint32_t status = OK;
     //MAG_EN<=’1’, MAG_DIR<=’0’  - Board is powered by 24V.
-    Head_I2C_EXP2_0x42.bits.OUTPUT_MAG_EN = ENABLE;
-    Head_I2C_EXP2_0x42.bits.OUTPUT_MAG_DIR = 0x00;
-    status |= Head_Write_IO_Reg(0x42,LOW_AND_HIGH);
-
+    if(Head_Type == HEAD_TYPE_STAPLE_SPUN)
+    {
+        Head_I2C_EXP2_0x42.bits.OUTPUT_MAG_EN = ENABLE;
+        Head_I2C_EXP2_0x42.bits.OUTPUT_MAG_DIR = 0x00;
+        status |= Head_Write_IO_Reg(0x42,LOW_AND_HIGH);
+    }
     return status;
 }
 
@@ -314,10 +322,12 @@ uint32_t HeadCard_DeActivateHeadPressureArcBlowers()
 {
     uint32_t status = OK;
     //MAG_EN<=’0’, MAG_DIR<=’0’  -- no 24V on the board
-    Head_I2C_EXP2_0x42.bits.OUTPUT_MAG_EN = DISABLE;
-    Head_I2C_EXP2_0x42.bits.OUTPUT_MAG_DIR = 0x00;
-    status |= Head_Write_IO_Reg(0x42,LOW_AND_HIGH);
-
+    if(Head_Type == HEAD_TYPE_STAPLE_SPUN)
+    {
+        Head_I2C_EXP2_0x42.bits.OUTPUT_MAG_EN = DISABLE;
+        Head_I2C_EXP2_0x42.bits.OUTPUT_MAG_DIR = 0x00;
+        status |= Head_Write_IO_Reg(0x42,LOW_AND_HIGH);
+    }
     return status;
 }
 //--------------------------------------------------
@@ -364,10 +374,6 @@ uint32_t HeadCard_ActuatorsCallBackFunction(uint32_t IfIndex, uint32_t BusyFlag)
 
     ACTUATORS Act_ID = (ACTUATORS) IfIndex;
 
-    if (SafeRemoveControlCallback(ActControlId, HeadCard_ActuatorsCallBackFunction )==OK)
-        ActControlId = 0xFF;
-    else
-        Report("Remove control callback failed",__FILE__,__LINE__,(int)ActControlId,RpWarning,(int)HeadCard_ActuatorsCallBackFunction,0);
 
    //Read movement status
     Motion_Status = HeadCard_Actuators_Status(Act_ID);
@@ -375,16 +381,17 @@ uint32_t HeadCard_ActuatorsCallBackFunction(uint32_t IfIndex, uint32_t BusyFlag)
     if((Motion_Status == MOVING) && (Global_Act_Cmd_flag == Act_Cmd_flag))
     {
         //RST
-        Head_I2C_EXP2_0x42.bits.OUTPUT_ACTLOW_ACT_RST = 0x00;//Disable movement
-        status |= Head_Write_IO_Reg(0x42,HIGH);
-
-        Task_sleep(5);
-
-        Head_I2C_EXP2_0x42.bits.OUTPUT_ACTLOW_ACT_RST = 0x01;//Enable movement
-        status |= Head_Write_IO_Reg(0x42,HIGH);
-
+        Trigger_Head_Actuators_Disable();
         Counter = Counter++;
     }
+    else
+    {
+        ReportWithPackageFilter(ThreadFilter,"actuators stopped",__FILE__,__LINE__,Act_ID,RpMessage,Counter,0);
+        if (SafeRemoveControlCallback(ActControlId, HeadCard_ActuatorsCallBackFunction )==OK)
+            ActControlId = 0xFF;
+        else
+            Report("Remove control callback failed",__FILE__,__LINE__,(int)ActControlId,RpWarning,(int)HeadCard_ActuatorsCallBackFunction,0);
+    }
 
     if(Counter > 2)
     {
@@ -396,7 +403,19 @@ uint32_t HeadCard_ActuatorsCallBackFunction(uint32_t IfIndex, uint32_t BusyFlag)
 
     return status;
 }
+uint32_t HeadCard_Actuators_Disable(void)
+{
+    uint32_t status = OK;
+    //RST
+    Head_I2C_EXP2_0x42.bits.OUTPUT_ACTLOW_ACT_RST = 0x00;//Disable movement
+    status |= Head_Write_IO_Reg(0x42,HIGH);
+
+    Task_sleep(5);
 
+    Head_I2C_EXP2_0x42.bits.OUTPUT_ACTLOW_ACT_RST = 0x01;//Enable movement
+    status |= Head_Write_IO_Reg(0x42,HIGH);
+
+}
 uint32_t HeadCard_Actuators_Control(ACTUATORS Act_ID, bool Direction)
 {
     uint32_t status = OK;
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Head_IO.h b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Head_IO.h
index c431ae0df..a3a35d5d3 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Head_IO.h
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/Head_Card/IO_Ports/Head_IO.h
@@ -179,7 +179,8 @@ uint32_t Head_IO_Init();
 uint32_t Head_Write_IO_Reg(uint8_t TCA9555_ADDRESS, uint8_t Byte); //LOW/HIGH/LOW_AND_HIGH
 uint32_t Head_Read_IO_Reg(uint8_t TCA9555_ADDRESS, uint8_t Byte); //LOW/HIGH/LOW_AND_HIGH
 uint32_t HeadCard_Toggle_PT100_SEL(uint8_t HEAD_CONFIG_PT100_PT_SEL);
-;
+
+uint32_t HeadCard_Actuators_Disable(void);
 
 uint32_t HeadCard_Actuators_Control(ACTUATORS Act_ID, bool Direction);
 uint32_t HeadCard_Actuators_Status(ACTUATORS Act_ID);
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c
index 81460c3ba..64dfc0166 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.c
@@ -42,6 +42,7 @@ typedef enum
     Head_Outputs_Writing,
     Head_Init_PT100,
     Actuators_Control,
+    Actuators_Disable,
     HeadFanControl,
     HeadMagnetAction,
     HeadValveAction,
@@ -147,6 +148,16 @@ void Trigger_Head_Actuators_Control(uint32_t Act_ID, bool Active_Low_Pwr, bool D
     return;
 }
 
+void Trigger_Head_Actuators_Disable(void)
+{
+    I2C_ReadingMessageStruc I2C_ReadingMessage;
+    //uint8_t Midtank_i;
+
+    I2C_ReadingMessage.messageId = Actuators_Disable;
+    if (I2C_ReadingMsgQ != NULL)
+        Mailbox_post(I2C_ReadingMsgQ , &I2C_ReadingMessage, BIOS_NO_WAIT);
+    return;
+}
 void Trigger_Head_Fan_Control(uint32_t Fan_ID, uint16_t PWM)
 {
     I2C_ReadingMessageStruc I2C_ReadingMessage;
@@ -524,6 +535,9 @@ void I2C_ReadingTask(UArg arg0, UArg arg1)
         case Actuators_Control:
             HeadCard_Actuators_Control(I2C_ReadingMessage.parameter, /*(bool)I2C_ReadingMessage.parameter2,*/(bool)I2C_ReadingMessage.parameter3);
             break;
+        case Actuators_Disable:
+            HeadCard_Actuators_Disable();
+            break;
         case HeadFanControl:
             Head_Fan_PWM_Control(I2C_ReadingMessage.parameter, I2C_ReadingMessage.parameter2);
             break;
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.h b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.h
index d8f8e2273..244f31799 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.h
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/I2C_Task.h
@@ -44,6 +44,7 @@ void Trigger_PT100_Read(void);
 void Trigger_HeaterWriting(void);
 void Trigger_Head_Init_PT100(void);
 void Trigger_Head_Actuators_Control(uint32_t Act_ID, bool Active_Low_Pwr, bool Direction);
+void Trigger_Head_Actuators_Disable(void);
 void Trigger_Head_Fan_Control(uint32_t Fan_ID, uint16_t PWM);
 void Trigger_InputsReading(void);
 void Trigger_Head_Magnet(int direction);
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.c
index 7f5e7a341..3c5d15123 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.c
@@ -217,7 +217,11 @@ bool Test_WHS_max11614()
 //    ReportWithPackageFilter(WasteFilter,"------------ calc Q value (calc)-----------------", __FILE__,__LINE__, calc, RpMessage, num, 0);
 //    return calc;
 //}
-
+double CurrentQ[DRIER_FLOW_METER+1];
+double get_CurrentQ(WHS_Flow_Meter num)
+{
+    return CurrentQ[num];
+}
 double get_Q(WHS_Flow_Meter num)
 {
     double Sqrt = 0;
@@ -249,6 +253,7 @@ double get_Q(WHS_Flow_Meter num)
     {
         calc = 0;
     }
+    CurrentQ[num] = calc;
     ReportWithPackageFilter(WasteFilter,"------------ calc Q value (calc) (flow num)-----------------", __FILE__,__LINE__, (int)(calc*100), RpMessage, num, 0);
     return calc;
 }
@@ -357,7 +362,7 @@ double GetWHSAirFlow(uint8_t OR_Id)
             {
                 //get_orf_3(&value);
                 //Q_value =  get_Q(value-orf3V0Value);
-                Q_value =  get_Q(DRIER_FLOW_METER);
+                Q_value =  get_CurrentQ(DRIER_FLOW_METER);
             }
             break;
         case NU_FLOW_METER:
@@ -370,8 +375,8 @@ double GetWHSAirFlow(uint8_t OR_Id)
             }
             else //CURRENT
             {
-                get_orf_1(&value);
-                Q_value = get_Q(HEAD_FLOW_METER);
+                //get_orf_1(&value);
+                Q_value = get_CurrentQ(HEAD_FLOW_METER);
             }
             break;
         default:
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c
index 9beda2e48..8e8c5dacf 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.c
@@ -418,6 +418,7 @@ void WHS_Set_SetPoint_Q_value(double value)
     SetPoint_Q = value;
     CofigurationFlow = 0;
     WHS_Start_Blower_Control_Closed_Loop();
+    Report("------------ SetPoint_Q_value :-----------------", __FILE__,__LINE__, (int)(SetPoint_Q*100), RpMessage, (int)CofigurationFlow, 0);
 }
 
 void WHS_enable_control_loop(bool value)  // 0=disable 1= enable
@@ -430,7 +431,7 @@ void WHS_Start_Blower_Control_Closed_Loop ()
 
     static uint8_t count = 0;
 
-    if (GetMachineState()<MACHINE_STATE_NO_PROCESS_PARAMS)
+    if (GetMachineState()<MACHINE_STATE_WAIT_FOR_COOLER)
         return; //do not start before controller is initialized and running
     if (EnableControlLoop == false)
         return; //do not start loop
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/EEPROM/WHS_EEPROM.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/EEPROM/WHS_EEPROM.c
index 485a224f6..fbf118024 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/EEPROM/WHS_EEPROM.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/EEPROM/WHS_EEPROM.c
@@ -12,7 +12,7 @@
 #include "Drivers/I2C_Communication/WHS_Card/WHS_data.h"
 #include "driverlib/i2c.h"
 
-#include "PMR/stubs/StubWhsEEprom.pb-c.h"
+#include "PMR/stubs/StubWhsEEpromData.pb-c.h"
 #include "PMR/stubs/StubWhsEEpromRequest.pb-c.h"
 #include "PMR/stubs/StubWhsEEpromResponse.pb-c.h"
 
@@ -123,7 +123,7 @@ uint32_t WHS_I2C_EEprom_Write_Ch()
 
     for(i=0;i<Max_WHS_buf_size;i++)
     {
-        WHS_Write_Buf[i+2] = WHS_struct.Write_WHS_EEPROM.Buf[i];
+        WHS_Write_Buf[i+2] = WHS_Eeprom.Buf[i];
     }
 
     status |= I2C_Write(I2C_ID_WHS_CARD, I2CEEPROM_ADDRESS, WHS_Write_Buf, Max_WHS_buf_size+2);
@@ -161,19 +161,19 @@ uint32_t Test_WHS_EEPROM()
     uint32_t status= OK;
     uint32_t i;
 
-    WHS_struct.Write_WHS_EEPROM.bytes.SN = 0x12345678;
+    WHS_Eeprom.bytes.SN = 0x12345678;
 
-    WHS_struct.Write_WHS_EEPROM.bytes.Uint32_Spare[0] = 0xA123456A;
-    WHS_struct.Write_WHS_EEPROM.bytes.Uint32_Spare[1] = 0xB123456B;
-    WHS_struct.Write_WHS_EEPROM.bytes.Uint32_Spare[2] = 0xC123456C;
-    WHS_struct.Write_WHS_EEPROM.bytes.Uint32_Spare[3] = 0xD123456D;
-    WHS_struct.Write_WHS_EEPROM.bytes.Uint32_Spare[4] = 0xE123456E;
+    WHS_Eeprom.bytes.Uint32_Spare[0] = 0xA123456A;
+    WHS_Eeprom.bytes.Uint32_Spare[1] = 0xB123456B;
+    WHS_Eeprom.bytes.Uint32_Spare[2] = 0xC123456C;
+    WHS_Eeprom.bytes.Uint32_Spare[3] = 0xD123456D;
+    WHS_Eeprom.bytes.Uint32_Spare[4] = 0xE123456E;
 
-    WHS_struct.Write_WHS_EEPROM.bytes.Double_Spare[0] = 0xA789012A;
-    WHS_struct.Write_WHS_EEPROM.bytes.Double_Spare[1] = 0xB789012B;
-    WHS_struct.Write_WHS_EEPROM.bytes.Double_Spare[2] = 0xC789012C;
-    WHS_struct.Write_WHS_EEPROM.bytes.Double_Spare[3] = 0xD789012D;
-    WHS_struct.Write_WHS_EEPROM.bytes.Double_Spare[4] = 0xE789012E;
+    WHS_Eeprom.bytes.Double_Spare[0] = 0xA789012A;
+    WHS_Eeprom.bytes.Double_Spare[1] = 0xB789012B;
+    WHS_Eeprom.bytes.Double_Spare[2] = 0xC789012C;
+    WHS_Eeprom.bytes.Double_Spare[3] = 0xD789012D;
+    WHS_Eeprom.bytes.Double_Spare[4] = 0xE789012E;
 
     status |=  WHS_I2C_EEprom_Write_Ch();
     SysCtlDelay(5000000);//Must delay for at least 5 milli. !!!  (See data sheet )
@@ -184,7 +184,7 @@ uint32_t Test_WHS_EEPROM()
    {
        for(i=0;i<Max_WHS_buf_size;i++)
        {
-           if(WHS_struct.Read_WHS_EEPROM.Buf[i]!=WHS_struct.Write_WHS_EEPROM.Buf[i])
+           if(WHS_struct.Read_WHS_EEPROM.Buf[i]!=WHS_Eeprom.Buf[i])
                status |= ERROR;
        }
    }
@@ -192,8 +192,38 @@ uint32_t Test_WHS_EEPROM()
     return status;
 }
 */
+/**
+ *     /*  ProtobufCMessage base;   uint8_t  PCB_SN[20];
+  uint32_t header;                  uint8_t  Module_SN[20];
+  uint32_t tablelength;             double   Orifice_Pressure_V0[3]; // (meas
+  uint32_t tableversion;            double   Orifice_Waste_Level_V0; // (meas
+  char *whsp_n;                     double   flow_calc_coefficient_C; // C (f
+  char *pcbs_n;                     uint32_t Header;
+  char *pcbpartnumber;              uint32_t Table_Length;
+  char *whss_n;                     uint32_t Table_version;
+  double orifice1flow;              uint8_t  WHS_Part_Number[20];//String
+  double orifice1slope;          //   uint8_t  PCB_SN[20];//String
+  double orifice2flow;              uint8_t  PCB_Part_Number[20];//String
+  double orifice2slope;             uint8_t  WHS_SN[20];//String
+  double orifice3flow;              double Orifice1Flow;
+  double orifice3slope;             double Orifice1Slope;
+  double orificevalveflow;          double Orifice2Flow;
+  double orificevalveslope;         double Orifice2Slope;
+  char *vocinstallationdate;        double Orifice3Flow;
+  char *filterinstallationdate;     double Orifice3Slope;
+  char *productiondate;             double OrificeValveFlow;
+  uint32_t checksum;                double OrificeValveSlope;
+     *                              uint8_t VOCInstallationDate[8];
+     *                              uint8_t FilterInstallationDate[8];
+                                    uint8_t ProductionDate[8];
+                                    uint32_t CheckSum;
+ured orifice sensor voltage with     out flow) value for each orifice sensor
+ured orifice sensor voltage without flow) value for each orifice sensor
+low calculation coefficient) value (=0.239)
+ *
 
-uint32_t Get_EEPROM_DATA_From_WHS(WhsEEpromData *Whseeprom)
+ * */
+uint32_t Get_EEPROM_DATA_From_WHS(StubWhsEEpromData *Whseeprom)
 {
     uint32_t status = OK;
 /*    status |= I2C_EEprom_Set_for_Read_Ch(Whs_ID, 0xA0);
@@ -202,133 +232,132 @@ uint32_t Get_EEPROM_DATA_From_WHS(WhsEEpromData *Whseeprom)
     if (status == OK)
     {
         Whseeprom->has_header = true;
-        Whseeprom->header = Whs_struct.Read_Disp_EEPROM.bytes.Header;
+        Whseeprom->header = WHS_Eeprom.bytes.Header;
         Whseeprom->has_tablelength = true;
-        Whseeprom->tablelength = Whs_struct.Read_Disp_EEPROM.bytes.Table_Length;
+        Whseeprom->tablelength = WHS_Eeprom.bytes.Table_Length;
         Whseeprom->has_tableversion = true;
-        Whseeprom->tableversion = Whs_struct.Read_Disp_EEPROM.bytes.Table_version;
-        Whseeprom->Whsp_n = my_malloc(sizeof(Whs_struct.Read_Disp_EEPROM.bytes.Whs_Part_Number));
+        Whseeprom->tableversion = WHS_Eeprom.bytes.Table_version;
+        Whseeprom->Whsp_n = my_malloc(sizeof(WHS_Eeprom.bytes.Whs_Part_Number));
         if (Whseeprom->Whsp_n)
-            memcpy(Whseeprom->Whsp_n,Whs_struct.Read_Disp_EEPROM.bytes.Whs_Part_Number,sizeof(Whs_struct.Read_Disp_EEPROM.bytes.Whs_Part_Number));
-        Whseeprom->pcbs_n = my_malloc(sizeof(Whs_struct.Read_Disp_EEPROM.bytes.PCB_SN));
+            memcpy(Whseeprom->Whsp_n,WHS_Eeprom.bytes.Whs_Part_Number,sizeof(WHS_Eeprom.bytes.Whs_Part_Number));
+        Whseeprom->pcbs_n = my_malloc(sizeof(WHS_Eeprom.bytes.PCB_SN));
         if (Whseeprom->pcbs_n)
-        memcpy(Whseeprom->pcbs_n,Whs_struct.Read_Disp_EEPROM.bytes.PCB_SN,sizeof(Whs_struct.Read_Disp_EEPROM.bytes.PCB_SN));
-        Whseeprom->pcbpartnumber = my_malloc(sizeof(Whs_struct.Read_Disp_EEPROM.bytes.PCB_Part_Number));
+        memcpy(Whseeprom->pcbs_n,WHS_Eeprom.bytes.PCB_SN,sizeof(WHS_Eeprom.bytes.PCB_SN));
+        Whseeprom->pcbpartnumber = my_malloc(sizeof(WHS_Eeprom.bytes.PCB_Part_Number));
         if (Whseeprom->pcbpartnumber)
-        memcpy(Whseeprom->pcbpartnumber,Whs_struct.Read_Disp_EEPROM.bytes.PCB_Part_Number,sizeof(Whs_struct.Read_Disp_EEPROM.bytes.PCB_Part_Number));
-        Whseeprom->Whss_n = my_malloc(sizeof(Whs_struct.Read_Disp_EEPROM.bytes.Whs_SN));
+        memcpy(Whseeprom->pcbpartnumber,WHS_Eeprom.bytes.PCB_Part_Number,sizeof(WHS_Eeprom.bytes.PCB_Part_Number));
+        Whseeprom->Whss_n = my_malloc(sizeof(WHS_Eeprom.bytes.Whs_SN));
         if (Whseeprom->Whss_n)
-        memcpy(Whseeprom->Whss_n,Whs_struct.Read_Disp_EEPROM.bytes.Whs_SN,sizeof(Whs_struct.Read_Disp_EEPROM.bytes.Whs_SN));
+        memcpy(Whseeprom->Whss_n,WHS_Eeprom.bytes.Whs_SN,sizeof(WHS_Eeprom.bytes.Whs_SN));
         Whseeprom->has_minimalpressure = true;
-        Whseeprom->minimalpressure = Whs_struct.Read_Disp_EEPROM.bytes.Maximal_Pressure;
+        Whseeprom->minimalpressure = WHS_Eeprom.bytes.Maximal_Pressure;
         Whseeprom->has_maximalpressure = true;
-        Whseeprom->maximalpressure = Whs_struct.Read_Disp_EEPROM.bytes.Maximal_Pressure;
+        Whseeprom->maximalpressure = WHS_Eeprom.bytes.Maximal_Pressure;
         Whseeprom->has_minimalmv = true;
-        Whseeprom->minimalmv = Whs_struct.Read_Disp_EEPROM.bytes.Minimal_MV;
+        Whseeprom->minimalmv = WHS_Eeprom.bytes.Minimal_MV;
         Whseeprom->has_maximalmv = true;
-        Whseeprom->maximalmv = Whs_struct.Read_Disp_EEPROM.bytes.Maximal_MV;
+        Whseeprom->maximalmv = WHS_Eeprom.bytes.Maximal_MV;
         Whseeprom->has_totalcycles = true;
-        Whseeprom->totalcycles = Whs_struct.Read_Disp_EEPROM.bytes.Total_Cycles;
+        Whseeprom->totalcycles = WHS_Eeprom.bytes.Total_Cycles;
         Whseeprom->has_bubblesize = true;
-        Whseeprom->bubblesize = Whs_struct.Read_Disp_EEPROM.bytes.Bubble_Size;
+        Whseeprom->bubblesize = WHS_Eeprom.bytes.Bubble_Size;
         Whseeprom->has_avg_nl_stepvalue_1_4 = true;
-        Whseeprom->avg_nl_stepvalue_1_4 = Whs_struct.Read_Disp_EEPROM.bytes.AVG_Nl_Step_Value_1_4;
+        Whseeprom->avg_nl_stepvalue_1_4 = WHS_Eeprom.bytes.AVG_Nl_Step_Value_1_4;
         Whseeprom->has_avg_nl_stepvalue_2_4 = true;
-        Whseeprom->avg_nl_stepvalue_2_4 = Whs_struct.Read_Disp_EEPROM.bytes.AVG_Nl_Step_Value_2_4;
+        Whseeprom->avg_nl_stepvalue_2_4 = WHS_Eeprom.bytes.AVG_Nl_Step_Value_2_4;
         Whseeprom->has_avg_nl_stepvalue_3_4 = true;
-        Whseeprom->avg_nl_stepvalue_3_4 = Whs_struct.Read_Disp_EEPROM.bytes.AVG_Nl_Step_Value_3_4;
+        Whseeprom->avg_nl_stepvalue_3_4 = WHS_Eeprom.bytes.AVG_Nl_Step_Value_3_4;
         Whseeprom->has_avg_nl_stepvalue_4_4 = true;
-        Whseeprom->avg_nl_stepvalue_4_4 = Whs_struct.Read_Disp_EEPROM.bytes.AVG_Nl_Step_Value_4_4;
+        Whseeprom->avg_nl_stepvalue_4_4 = WHS_Eeprom.bytes.AVG_Nl_Step_Value_4_4;
         Whseeprom->has_sw_reserve = true;
-        Whseeprom->sw_reserve = Whs_struct.Read_Disp_EEPROM.bytes.SW_Reserve;
+        Whseeprom->sw_reserve = WHS_Eeprom.bytes.SW_Reserve;
         Whseeprom->has_spare1_pressure = true;
-        Whseeprom->spare1_pressure = Whs_struct.Read_Disp_EEPROM.bytes.Spare1_pressure;
+        Whseeprom->spare1_pressure = WHS_Eeprom.bytes.Spare1_pressure;
         Whseeprom->has_spare2_pressure = true;
-        Whseeprom->spare2_pressure = Whs_struct.Read_Disp_EEPROM.bytes.Spare2_pressure;
+        Whseeprom->spare2_pressure = WHS_Eeprom.bytes.Spare2_pressure;
         Whseeprom->has_motorpulsespercycle = true;
-        Whseeprom->motorpulsespercycle = Whs_struct.Read_Disp_EEPROM.bytes.Motor_PPC;
+        Whseeprom->motorpulsespercycle = WHS_Eeprom.bytes.Motor_PPC;
         Whseeprom->has_color = true;
-        Whseeprom->color = Whs_struct.Read_Disp_EEPROM.bytes.color;
+        Whseeprom->color = WHS_Eeprom.bytes.color;
         Whseeprom->has_pressureslope = true;
-        Whseeprom->pressureslope = Whs_struct.Read_Disp_EEPROM.bytes.Pressure_Slope;
-        Whseeprom->productiondate = my_malloc(sizeof(Whs_struct.Read_Disp_EEPROM.bytes.Production_Test_Date)+1);
+        Whseeprom->pressureslope = WHS_Eeprom.bytes.Pressure_Slope;
+        Whseeprom->productiondate = my_malloc(sizeof(WHS_Eeprom.bytes.Production_Test_Date)+1);
         if (Whseeprom->productiondate)
-            memcpy(Whseeprom->productiondate,Whs_struct.Read_Disp_EEPROM.bytes.Production_Test_Date,sizeof(Whs_struct.Read_Disp_EEPROM.bytes.Production_Test_Date));
+            memcpy(Whseeprom->productiondate,WHS_Eeprom.bytes.Production_Test_Date,sizeof(WHS_Eeprom.bytes.Production_Test_Date));
         Whseeprom->has_atslocation = true;
-        Whseeprom->atslocation = Whs_struct.Read_Disp_EEPROM.bytes.ATS_Location;
+        Whseeprom->atslocation = WHS_Eeprom.bytes.ATS_Location;
         Whseeprom->has_spare1 = true;
-        Whseeprom->spare1 = Whs_struct.Read_Disp_EEPROM.bytes.Spare1;
+        Whseeprom->spare1 = WHS_Eeprom.bytes.Spare1;
         Whseeprom->has_spare2 = true;
-        Whseeprom->spare2 = Whs_struct.Read_Disp_EEPROM.bytes.Spare2;
+        Whseeprom->spare2 = WHS_Eeprom.bytes.Spare2;
         Whseeprom->has_atschannel = true;
-        Whseeprom->atschannel = Whs_struct.Read_Disp_EEPROM.bytes.ATS_Channel;
+        Whseeprom->atschannel = WHS_Eeprom.bytes.ATS_Channel;
         Whseeprom->has_unitempty = true;
-        Whseeprom->unitempty = Whs_struct.Read_Disp_EEPROM.bytes.Unit_Empty;
+        Whseeprom->unitempty = WHS_Eeprom.bytes.Unit_Empty;
         Whseeprom->has_dryrunpass_fail = true;
-        Whseeprom->dryrunpass_fail = Whs_struct.Read_Disp_EEPROM.bytes.Dry_Run_Status;
+        Whseeprom->dryrunpass_fail = WHS_Eeprom.bytes.Dry_Run_Status;
         Whseeprom->has_flowpass_fail = true;
-        Whseeprom->flowpass_fail = Whs_struct.Read_Disp_EEPROM.bytes.Flow_Status;
+        Whseeprom->flowpass_fail = WHS_Eeprom.bytes.Flow_Status;
         Whseeprom->has_checksum = true;
-        Whseeprom->checksum = Whs_struct.Read_Disp_EEPROM.bytes.CheckSum;
+        Whseeprom->checksum = WHS_Eeprom.bytes.CheckSum;
 
     }
     */
     return status;
 }
-uint32_t Prepare_WHS_DATA_For_Burning(WhsEEpromData *Whseeprom)
+uint32_t Prepare_WHS_DATA_For_Burning(StubWhsEEpromData *Whseeprom)
 {
     uint32_t status = OK;
-    /*
-    Whs_struct.Write_Disp_EEPROM.bytes.Header = Whseeprom->header;
-    Whs_struct.Write_Disp_EEPROM.bytes.Table_Length = Whseeprom->tablelength;
-    Whs_struct.Write_Disp_EEPROM.bytes.Table_version = Whseeprom->tableversion;
-    Whs_struct.Write_Disp_EEPROM.bytes.Maximal_Pressure = Whseeprom->minimalpressure;
-    Whs_struct.Write_Disp_EEPROM.bytes.Maximal_Pressure = Whseeprom->maximalpressure;
-    Whs_struct.Write_Disp_EEPROM.bytes.Minimal_MV = Whseeprom->minimalmv;
-    Whs_struct.Write_Disp_EEPROM.bytes.Maximal_MV = Whseeprom->maximalmv;
-    Whs_struct.Write_Disp_EEPROM.bytes.Total_Cycles = Whseeprom->totalcycles;
-    Whs_struct.Write_Disp_EEPROM.bytes.Bubble_Size = Whseeprom->bubblesize;
-    Whs_struct.Write_Disp_EEPROM.bytes.AVG_Nl_Step_Value_1_4 = Whseeprom->avg_nl_stepvalue_1_4;
-    Whs_struct.Write_Disp_EEPROM.bytes.AVG_Nl_Step_Value_2_4 = Whseeprom->avg_nl_stepvalue_2_4;
-    Whs_struct.Write_Disp_EEPROM.bytes.AVG_Nl_Step_Value_3_4 = Whseeprom->avg_nl_stepvalue_3_4;
-    Whs_struct.Write_Disp_EEPROM.bytes.AVG_Nl_Step_Value_4_4 = Whseeprom->avg_nl_stepvalue_4_4;
-    Whs_struct.Write_Disp_EEPROM.bytes.SW_Reserve = Whseeprom->sw_reserve;
-    Whs_struct.Write_Disp_EEPROM.bytes.Spare1_pressure = Whseeprom->spare1_pressure;
-    Whs_struct.Write_Disp_EEPROM.bytes.Spare2_pressure = Whseeprom->spare2_pressure;
-    Whs_struct.Write_Disp_EEPROM.bytes.Motor_PPC = Whseeprom->motorpulsespercycle;
-    Whs_struct.Write_Disp_EEPROM.bytes.color = Whseeprom->color;
-    Whs_struct.Write_Disp_EEPROM.bytes.Pressure_Slope = Whseeprom->pressureslope;
-    Whs_struct.Write_Disp_EEPROM.bytes.ATS_Location = Whseeprom->atslocation;
-    Whs_struct.Write_Disp_EEPROM.bytes.Spare1 = Whseeprom->spare1;
-    Whs_struct.Write_Disp_EEPROM.bytes.Spare2 = Whseeprom->spare2;
-    Whs_struct.Write_Disp_EEPROM.bytes.ATS_Channel = Whseeprom->atschannel;
-    Whs_struct.Write_Disp_EEPROM.bytes.Unit_Empty = Whseeprom->unitempty;
-    Whs_struct.Write_Disp_EEPROM.bytes.Dry_Run_Status = Whseeprom->dryrunpass_fail;
-    Whs_struct.Write_Disp_EEPROM.bytes.Flow_Status = Whseeprom->flowpass_fail;
-    Whs_struct.Write_Disp_EEPROM.bytes.CheckSum = Whseeprom->checksum;
+/*    WHS_Eeprom.bytes.Header = Whseeprom->header;
+    WHS_Eeprom.bytes.Table_Length = Whseeprom->tablelength;
+    WHS_Eeprom.bytes.Table_version = Whseeprom->tableversion;
+    WHS_Eeprom.bytes.Maximal_Pressure = Whseeprom->minimalpressure;
+    WHS_Eeprom.bytes.Maximal_Pressure = Whseeprom->maximalpressure;
+    WHS_Eeprom.bytes.Minimal_MV = Whseeprom->minimalmv;
+    WHS_Eeprom.bytes.Maximal_MV = Whseeprom->maximalmv;
+    WHS_Eeprom.bytes.Total_Cycles = Whseeprom->totalcycles;
+    WHS_Eeprom.bytes.Bubble_Size = Whseeprom->bubblesize;
+    WHS_Eeprom.bytes.AVG_Nl_Step_Value_1_4 = Whseeprom->avg_nl_stepvalue_1_4;
+    WHS_Eeprom.bytes.AVG_Nl_Step_Value_2_4 = Whseeprom->avg_nl_stepvalue_2_4;
+    WHS_Eeprom.bytes.AVG_Nl_Step_Value_3_4 = Whseeprom->avg_nl_stepvalue_3_4;
+    WHS_Eeprom.bytes.AVG_Nl_Step_Value_4_4 = Whseeprom->avg_nl_stepvalue_4_4;
+    WHS_Eeprom.bytes.SW_Reserve = Whseeprom->sw_reserve;
+    WHS_Eeprom.bytes.Spare1_pressure = Whseeprom->spare1_pressure;
+    WHS_Eeprom.bytes.Spare2_pressure = Whseeprom->spare2_pressure;
+    WHS_Eeprom.bytes.Motor_PPC = Whseeprom->motorpulsespercycle;
+    WHS_Eeprom.bytes.color = Whseeprom->color;
+    WHS_Eeprom.bytes.Pressure_Slope = Whseeprom->pressureslope;
+    WHS_Eeprom.bytes.ATS_Location = Whseeprom->atslocation;
+    WHS_Eeprom.bytes.Spare1 = Whseeprom->spare1;
+    WHS_Eeprom.bytes.Spare2 = Whseeprom->spare2;
+    WHS_Eeprom.bytes.ATS_Channel = Whseeprom->atschannel;
+    WHS_Eeprom.bytes.Unit_Empty = Whseeprom->unitempty;
+    WHS_Eeprom.bytes.Dry_Run_Status = Whseeprom->dryrunpass_fail;
+    WHS_Eeprom.bytes.Flow_Status = Whseeprom->flowpass_fail;
+    WHS_Eeprom.bytes.CheckSum = Whseeprom->checksum;
     if (Whseeprom->Whsp_n)
-        strncpy(Whs_struct.Write_Disp_EEPROM.bytes.Whs_Part_Number,Whseeprom->Whsp_n,sizeof(Whs_struct.Write_Disp_EEPROM.bytes.Whs_Part_Number));
+        strncpy(WHS_Eeprom.bytes.Whs_Part_Number,Whseeprom->Whsp_n,sizeof(WHS_Eeprom.bytes.Whs_Part_Number));
     if (Whseeprom->pcbs_n)
-        strncpy(Whs_struct.Write_Disp_EEPROM.bytes.PCB_SN,Whseeprom->pcbs_n,sizeof(Whs_struct.Write_Disp_EEPROM.bytes.PCB_SN));
+        strncpy(WHS_Eeprom.bytes.PCB_SN,Whseeprom->pcbs_n,sizeof(WHS_Eeprom.bytes.PCB_SN));
     if (Whseeprom->pcbpartnumber)
-        strncpy(Whs_struct.Write_Disp_EEPROM.bytes.PCB_Part_Number,Whseeprom->pcbpartnumber,sizeof(Whs_struct.Write_Disp_EEPROM.bytes.PCB_Part_Number));
+        strncpy(WHS_Eeprom.bytes.PCB_Part_Number,Whseeprom->pcbpartnumber,sizeof(WHS_Eeprom.bytes.PCB_Part_Number));
     if (Whseeprom->Whss_n)
-        strncpy(Whs_struct.Write_Disp_EEPROM.bytes.Whs_SN,Whseeprom->Whss_n,sizeof(Whs_struct.Write_Disp_EEPROM.bytes.Whs_SN));
+        strncpy(WHS_Eeprom.bytes.Whs_SN,Whseeprom->Whss_n,sizeof(WHS_Eeprom.bytes.Whs_SN));
     if (Whseeprom->productiondate)
-        strncpy(Whs_struct.Write_Disp_EEPROM.bytes.Production_Test_Date,Whseeprom->productiondate,sizeof(Whs_struct.Write_Disp_EEPROM.bytes.Production_Test_Date));
+        strncpy(WHS_Eeprom.bytes.Production_Test_Date,Whseeprom->productiondate,sizeof(WHS_Eeprom.bytes.Production_Test_Date));
     status = I2C_EEprom_Write_Ch(Whs_ID, 0xA0);
     SysCtlDelay(5000000);//Must delay for at least 5 milli. !!!  (See data sheet )
-    */
+*/
     return status;
 }
 uint32_t WhsEEpromRequestFunc(MessageContainer* requestContainer)
 {
-    WhsEEpromRequest *request = whs_eeprom_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
-    WhsEEpromResponse Cresponse = WHS_EEPROM_RESPONSE__INIT;
+    StubWhsEEpromRequest *request = stub_whs_eeprom_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
+    StubWhsEEpromResponse Cresponse = STUB_WHS_EEPROM_RESPONSE__INIT;
     MessageContainer responseContainer;
 
     uint32_t status = OK;
-    WhsEEpromData *WhsEEpromInstance;
+    StubWhsEEpromData *WhsEEpromInstance;
     Report("StubWhsEEpromRequestFunc",__FILE__,__LINE__,1,RpWarning,(int)request->burnrequest,0);
 
     if (request->burnrequest == true)
@@ -337,10 +366,10 @@ uint32_t WhsEEpromRequestFunc(MessageContainer* requestContainer)
     }
     else
     {
-        WhsEEpromInstance = my_malloc(sizeof(WhsEEpromData));
+        WhsEEpromInstance = my_malloc(sizeof(StubWhsEEpromData));
         if (WhsEEpromInstance)
         {
-            whs_eeprom_data__init(WhsEEpromInstance);
+            stub_whs_eeprom_data__init(WhsEEpromInstance);
             status = Get_EEPROM_DATA_From_WHS(WhsEEpromInstance);
         }
         else
@@ -353,7 +382,7 @@ uint32_t WhsEEpromRequestFunc(MessageContainer* requestContainer)
     {
         Cresponse.whseeprom = WhsEEpromInstance;
     }
-    responseContainer = createContainer(MESSAGE_TYPE__StubWHSEEpromResponse, requestContainer->token, true, &Cresponse, &whs_eeprom_response__pack, &whs_eeprom_response__get_packed_size);
+    responseContainer = createContainer(MESSAGE_TYPE__StubWhsEEpromResponse, requestContainer->token, true, &Cresponse, &stub_whs_eeprom_response__pack, &stub_whs_eeprom_response__get_packed_size);
     responseContainer.continuous = false;
     if (status != OK)
     {
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/EEPROM/WHS_EEPROM.h b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/EEPROM/WHS_EEPROM.h
index 41445f368..9bfd69463 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/EEPROM/WHS_EEPROM.h
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/WHS_Card/EEPROM/WHS_EEPROM.h
@@ -80,6 +80,6 @@ uint32_t Check_WHS_Type_Via_EEPROM();
 bool WHS_I2C_EEprom_Write_Byte(uint32_t address, uint8_t data);
 bool WHS_I2C_EEprom_Read_Byte (uint32_t address, uint8_t* p_data);
 
-uint32_t DispenserEEpromRequestFunc(MessageContainer* requestContainer);
+uint32_t WhsEEpromRequestFunc(MessageContainer* requestContainer);
 
 #endif /* DRIVERS_I2C_COMMUNICATION_WHS_CARD_EEPROM_WHS_EEPROM_H_ */
diff --git a/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c b/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c
index 7ffa0325a..c1a5bcc9f 100644
--- a/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c
+++ b/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.c
@@ -131,10 +131,10 @@ uint32_t ReadAppAndProgram(uint32_t ui32FlashStart,uint32_t ui32FileSize,void* b
     //
     return(1);
 }
-uint32_t EraseFlashSection(uint32_t ui32FlashStart,uint32_t ui32FileSize)
+uint32_t EraseFlashSection(uint32_t ui32FlashStart)
 {
-    volatile uint32_t ui32Idx;
-    //uint32_t status;
+    volatile uint32_t ui32Idx = ui32FlashStart;
+    uint32_t status;
 #ifdef FLASH_DEBUG
     Address[RxIndex] = ui32FlashStart;
     Size[RxIndex] = ui32FileSize;
@@ -142,11 +142,8 @@ uint32_t EraseFlashSection(uint32_t ui32FlashStart,uint32_t ui32FileSize)
     if (RxIndex++>=MAX_CONT_LOG)
         RxIndex = 0;
 #endif
-    for(ui32Idx = ui32FlashStart; ui32Idx < ui32FlashStart+ui32FileSize; ui32Idx += 1024)
-    {
-        //status = FlashErase(ui32Idx);
-    }
-    return OK;
+    status = FlashErase(ui32Idx);
+    return status;
 
 }
 //Each word may not be subject to more than a specific number of programming cycles before an
diff --git a/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h b/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h
index ae0ca32e9..983c3954c 100644
--- a/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h
+++ b/Software/Embedded_SW/Embedded/Drivers/flash_ram/FlashProgram.h
@@ -10,13 +10,19 @@
 
 #define FLASH_RAM_BASE 0x000F0000
 
+#define EMBEDDED_PARAMETERS_SECTION_FLASH  (FLASH_RAM_BASE + 0X0000 )
+#define PROCESS_PARAMETERS_SECTION_FLASH   (FLASH_RAM_BASE + 0X0000 )
+#define DANCERS_SECTION_FLASH  (FLASH_RAM_BASE + 0X0000)
+#define DISPENSERS_SECTION_FLASH (FLASH_RAM_BASE + 0X4000)
+#define ALARM_SECTION_FLASH    (FLASH_RAM_BASE + 0XC000 )
+#define GENHWCFG_SECTION_FLASH (FLASH_RAM_BASE + 0X8000)
+
 #define EMBEDDED_PARAMETERS_MAP_IN_FLASH  (FLASH_RAM_BASE + 0X0000 )
 #define PROCESS_PARAMETERS_MAP_IN_FLASH   (FLASH_RAM_BASE + 0X0400 )
 #define DANCERS_MAP_IN_FLASH  (FLASH_RAM_BASE + 0X0500)
-#define DISPENSERS_MAP_IN_FLASH (FLASH_RAM_BASE + 0X1000)
-#define ALARM_MAP_IN_FLASH    (FLASH_RAM_BASE + 0X2000 )
-#define GENHWCFG_MAP_IN_FLASH (FLASH_RAM_BASE + 0X6000)
-#define OTHER_MAP_IN_FLASH    (FLASH_RAM_BASE + 0X8000)
+#define DISPENSERS_MAP_IN_FLASH (FLASH_RAM_BASE + 0X4000)
+#define ALARM_MAP_IN_FLASH    (FLASH_RAM_BASE + 0XC000 )
+#define GENHWCFG_MAP_IN_FLASH (FLASH_RAM_BASE + 0X8000)
 
 #define FLASH_SIZE 0X10000
 
@@ -30,7 +36,7 @@
 //*****************************************************************************
 uint32_t ReadAppAndProgram(uint32_t ui32FlashStart,uint32_t ui32FileSize,void* buffer);
 void FlashInit(void);
-uint32_t EraseFlashSection(uint32_t ui32FlashStart,uint32_t ui32FileSize);
+uint32_t EraseFlashSection(uint32_t ui32FlashStart);
 
 
 
diff --git a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
index 72da194e0..a8e0c3138 100644
--- a/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
+++ b/Software/Embedded_SW/Embedded/Modules/AlarmHandling/AlarmHandling.c
@@ -472,7 +472,7 @@ uint32_t AlarmHandlingLoadFile(void)
                 maxAlarms = AlarmParametersTable->n_alarmitem;
                 p_size = AlarmParametersTable->n_alarmitem*sizeof(AlarmHandlingItemStruc);
                 ReportWithPackageFilter(AlarmFilter,"Writing alarm size", __FILE__,pAlarmItemSize,AlarmParametersTable->n_alarmitem, RpMessage, p_size, 0);
-                EraseFlashSection(pAlarmItemSize,p_size+4);
+                EraseFlashSection(ALARM_SECTION_FLASH);
                 ReadAppAndProgram(pAlarmItemSize, 4,&p_size);
                 AlarmPtr = (int)pAlarmItemSize+4;
                 p_size = 0;
@@ -810,7 +810,16 @@ JobEndReasonEnum AlarmHandlingPrepareJob(void *CurrentJob)
     //    DispenserInUse[Dispenser_i] = false;
     //}
     JobEndReasonEnum status = JOB_OK;
+    Task_Handle TaskHandle1 = Task_self();
+    int pri = Task_getPri(TaskHandle1);
+
+    ACTIVITY_GREEN_LED_ON;
+    Task_setPri(TaskHandle1, 3);
+    Report("Task_setPri", __FILE__, pri, 3, RpWarning,   (int)TaskHandle1, 0);
     IDS_MapDispenserUsedinJob(CurrentJob);
+    Task_setPri(TaskHandle1, pri);
+    Report("Task_setPri", __FILE__, __LINE__, pri, RpWarning,   (int)Task_self(), 0);
+    ACTIVITY_GREEN_LED_OFF;
     if (n_segments == 0)
         return JOB_OK;
     if (AlarmItem == NULL)
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 1e597e453..e0d1e38de 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -773,6 +773,8 @@ uint32_t MillisecLowLoop(uint32_t tick)
         midtankDisplay = 1-midtankDisplay;
         /*if (WHS_Type == WHS_TYPE_UNKNOWN)
             Gas_PPM_Info = Calculate_Gas_Power_Consumption();*/
+        if (WHS_Type == WHS_TYPE_NEW)
+            ReportWithPackageFilter(ThreadFilter,"waste tank calculate level",__FILE__,__LINE__,(int)(GetWHSWasteTankLevelMiliLiter()*1000),RpWarning,(int) msec_millisecondCounter,0);
         //Trigger_WHS_MAX11614_Read_allADC();
 #ifdef CONTROL_DEBUG
         ResetControlTime();
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
index dee07827f..7758ebd8b 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
@@ -115,6 +115,7 @@ double HeadFlowMeter;
 double tempFlow = 0.0;
 double DrierFlowMeter;
 double AcVoltage;
+double WasteLevel = 0.0;
 double HeatersCurrent[NUM_OF_CURRENT_HEATERS][1];
 double HeadCurrent[MAX_FLAT_HEAD_HEATERS][1];
 double VOC_Sensor;
@@ -668,6 +669,8 @@ void DiagnosticOneMinuteCollection(void)
     VOC_Sensor = (double) getGasReading();
     DiagnosticsMonitor.n_filterdeltapressure = 1;
     DiagnosticsMonitor.filterdeltapressure = &VOC_Sensor;
+    DiagnosticsMonitor.n_gassensor = 1;
+    DiagnosticsMonitor.gassensor = &VOC_Sensor;
 
     DiagnosticsMonitor.n_blowervoltage = 1;
     diagvoltage = getBlowerState();
@@ -680,22 +683,12 @@ void DiagnosticOneMinuteCollection(void)
     HeadFlowMeter = GetWHSAirFlow(HEAD_FLOW_METER);
     if (fabs(tempFlow - HeadFlowMeter)>0.05)
     {
-        Report("Head flow change 1s",__FILE__,(int)diagvoltage,(int)tempFlow,RpWarning,(int)HeadFlowMeter,0);
+        Report("Head flow change 1m",__FILE__,(int)diagvoltage,(int)(tempFlow*1000),RpWarning,(int)(HeadFlowMeter*1000),0);
         tempFlow = HeadFlowMeter;
     }
     DiagnosticsMonitor.n_headairflow = 1;
     DiagnosticsMonitor.headairflow = &HeadFlowMeter;
 
-/*    if (Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD) //rapid/pp machines
-    {
-        AcVoltage = ReadVAC();
-        DiagnosticsMonitor.whsblower2voltage = &AcVoltage;
-        DiagnosticsMonitor.n_whsblower2voltage = 1;
-    }
-*/
-
-
-
 }
 void DiaglosticChangeBlowerData()
 {
@@ -713,6 +706,8 @@ void DiagnosticOneSecCollection(void)
         AcVoltage = ReadVAC();
         DiagnosticsMonitor.whsblower2voltage = &AcVoltage;
         DiagnosticsMonitor.n_whsblower2voltage = 1;
+        DiagnosticsMonitor.incomingvoltage = &AcVoltage;
+        DiagnosticsMonitor.n_incomingvoltage = 1;
     }
     if (WHS_Type == WHS_TYPE_NEW) //rapid/pp machines
     {
@@ -725,10 +720,15 @@ void DiagnosticOneSecCollection(void)
         DiagnosticsMonitor.headairflow = &HeadFlowMeter;
         if (fabs(tempFlow - HeadFlowMeter)>0.25)
         {
-            Report("Head flow change 1m",__FILE__,(int)diagvoltage,(int)tempFlow,RpWarning,(int)HeadFlowMeter,0);
+            Report("Head flow change 1s",__FILE__,(int)diagvoltage,(int)(tempFlow*1000),RpWarning,(int)(HeadFlowMeter*1000),0);
             tempFlow = HeadFlowMeter;
         }
-    }
+        WasteLevel = GetWHSWasteTankLevelMiliLiter();
+        DiagnosticsMonitor.n_chillertemperature = 1;
+        DiagnosticsMonitor.chillertemperature = &WasteLevel;
+        DiagnosticsMonitor.n_wastelevel = 1;
+        DiagnosticsMonitor.wastelevel = &WasteLevel;
+   }
     HeatersCurrent[HEATER_DRYER_CURRENT_1][0] = Get_Heaters_Current(HEATER_DRYER_CURRENT_1);
     HeatersCurrent[HEATER_DRYER_CURRENT_2][0] = Get_Heaters_Current(HEATER_DRYER_CURRENT_2);
     DiagnosticsMonitor.n_drierzone1heatercurrent = 1;
@@ -1071,6 +1071,8 @@ void SendDiagnostics(void)
     VOC_Sensor = (double) getGasReading();
     DiagnosticsMonitor.n_filterdeltapressure = 1;
     DiagnosticsMonitor.filterdeltapressure = &VOC_Sensor;
+    DiagnosticsMonitor.n_gassensor = 1;
+    DiagnosticsMonitor.gassensor = &VOC_Sensor;
 
     response.monitors = &DiagnosticsMonitor;
     //response.digitalpins = DigitalPinArray;
diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
index b86f602af..e2ee53645 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
@@ -116,7 +116,7 @@ uint32_t HWConfigurationInit(void)
         buffer = HWConfigurationLoadFromFile(&Bytes); //load hardware config
         if (buffer)
         {
-           EraseFlashSection(GENHWCFG_MAP_IN_FLASH,Bytes+4);
+           EraseFlashSection(GENHWCFG_SECTION_FLASH);
            ReadAppAndProgram(GENHWCFG_MAP_IN_FLASH, 4,&Bytes);
            ReadAppAndProgram(GENHWCFG_MAP_IN_FLASH+4, Bytes, buffer);
            UploadRequest = upload_hardware_configuration_request__unpack(NULL, Bytes, buffer);
@@ -263,11 +263,11 @@ void LoadConfigurationParameters(ConfigurationParameters *Params)
             size_t response_size = 0;
             if (response_buffer)
             {
-                response_size = configuration_parameters__pack(EmbeddedParameters, response_buffer);
+                /*response_size = configuration_parameters__pack(EmbeddedParameters, response_buffer);
                 //FileWrite(response_buffer,response_size,EmbeddedParametersPath);
-                EraseFlashSection(EMBEDDED_PARAMETERS_MAP_IN_FLASH,response_size+4);
+                EraseFlashSection(EMBEDDED_PARAMETERS_SECTION_FLASH);
                 ReadAppAndProgram(EMBEDDED_PARAMETERS_MAP_IN_FLASH, 4,&response_size);
-                ReadAppAndProgram(EMBEDDED_PARAMETERS_MAP_IN_FLASH+4, response_size, response_buffer);
+                ReadAppAndProgram(EMBEDDED_PARAMETERS_MAP_IN_FLASH+4, response_size, response_buffer);*/
                 my_free(response_buffer);
             }
         }
@@ -632,8 +632,8 @@ uint32_t HWConfigurationFunc(MessageContainer* requestContainer)
     MessageContainer responseContainer;
     UploadHardwareConfigurationResponse response = UPLOAD_HARDWARE_CONFIGURATION_RESPONSE__INIT;
 
-    EraseFlashSection(GENHWCFG_MAP_IN_FLASH,requestContainer->data.len+4);
     DataLen = requestContainer->data.len;
+    EraseFlashSection(GENHWCFG_SECTION_FLASH);
     ReadAppAndProgram(GENHWCFG_MAP_IN_FLASH, 4,&DataLen);
     ReadAppAndProgram(GENHWCFG_MAP_IN_FLASH+4, DataLen, requestContainer->data.data);
 
@@ -720,7 +720,7 @@ uint32_t LoadConfigurationParamsFromFile(bool Initialize)
         //configuration_parameters__free_unpacked(Params,NULL);
         FlashInitResults[1] = true;
         Report("Parameters Initialized from file", __FILE__,__LINE__,Bytes, RpMessage, EMBEDDED_PARAMETERS_MAP_IN_FLASH, 0);
-        EraseFlashSection(EMBEDDED_PARAMETERS_MAP_IN_FLASH,Bytes+4);
+        EraseFlashSection(EMBEDDED_PARAMETERS_SECTION_FLASH);
         ReadAppAndProgram(EMBEDDED_PARAMETERS_MAP_IN_FLASH, 4,&Bytes);
         ReadAppAndProgram(EMBEDDED_PARAMETERS_MAP_IN_FLASH+4, Bytes, buffer);
         if (Initialize)
@@ -735,6 +735,7 @@ void HWConfigurationLoadFile(void)
     buffer = HWConfigurationLoadFromFile(&Bytes); //load hardware config
     if (buffer)
     {
+       EraseFlashSection(GENHWCFG_SECTION_FLASH);
        ReadAppAndProgram(GENHWCFG_MAP_IN_FLASH, 4,&Bytes);
        ReadAppAndProgram(GENHWCFG_MAP_IN_FLASH+4, Bytes, buffer);
        free (buffer);
@@ -765,7 +766,8 @@ void FlashInitAndLoad(void)
     buffer = HWConfigurationLoadFromFile(&Bytes); //load hardware config
     if (buffer)
     {
-       ReadAppAndProgram(GENHWCFG_MAP_IN_FLASH, 4,&Bytes);
+        EraseFlashSection(GENHWCFG_SECTION_FLASH);
+        ReadAppAndProgram(GENHWCFG_MAP_IN_FLASH, 4,&Bytes);
        ReadAppAndProgram(GENHWCFG_MAP_IN_FLASH+4, Bytes, buffer);
        free (buffer);
        FlashInitResults[0] = true;
@@ -779,6 +781,7 @@ void FlashInitAndLoad(void)
     {
         Report("Alarm Initialized from file", __FILE__,__LINE__,Bytes, RpMessage, ALARM_MAP_IN_FLASH, 0);
     }
+    EraseFlashSection(EMBEDDED_PARAMETERS_SECTION_FLASH);
 
     Fresult = FileRead(EmbeddedParametersPath, &Bytes, &buffer);
     if (Fresult == FR_OK)
diff --git a/Software/Embedded_SW/Embedded/Modules/General/process.c b/Software/Embedded_SW/Embedded/Modules/General/process.c
index 6d04f2f59..ab4c6daac 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/process.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/process.c
@@ -120,7 +120,7 @@ uint32_t HandleProcessParameters(ProcessParameters* ProcessParams,bool saveData)
         {
             Bytes = sizeof(ProcessParameters);
             FileWrite(ProcessParams,Bytes,ProcessParamsConfigPath,BIOS_WAIT_FOREVER);
-            EraseFlashSection(PROCESS_PARAMETERS_MAP_IN_FLASH,Bytes+4);
+            EraseFlashSection(EMBEDDED_PARAMETERS_SECTION_FLASH);
             ReadAppAndProgram(PROCESS_PARAMETERS_MAP_IN_FLASH, 4,&Bytes);
             ReadAppAndProgram(PROCESS_PARAMETERS_MAP_IN_FLASH+4, Bytes, ProcessParams);
             REPORT_MSG(Bytes,"Bytes write to flash");
@@ -358,7 +358,7 @@ uint32_t LoadProcessParamsFromFile(void)
             if ((ProcessParams->dryerzone1temp > 0.1)&&(ProcessParams->headzone2temp > 0.1)&&(ProcessParams->headzone3temp > 0.1)&&(ProcessParams->headzone4temp > 0.1))//NOT turning off heaters
             {
                 Bytes = sizeof(ProcessParameters);
-                EraseFlashSection(PROCESS_PARAMETERS_MAP_IN_FLASH,Bytes+4);
+                EraseFlashSection(EMBEDDED_PARAMETERS_SECTION_FLASH);
                 ReadAppAndProgram(PROCESS_PARAMETERS_MAP_IN_FLASH, 4,&Bytes);
                 ReadAppAndProgram(PROCESS_PARAMETERS_MAP_IN_FLASH+4, Bytes, ProcessParams);
                 REPORT_MSG(Bytes,"ProcessParameters Bytes write to flash");
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
index c44043a12..89bdcc66b 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
@@ -611,7 +611,7 @@ uint32_t  HeaterCommandRequestMessage(int HeaterNum, bool OnOff, int Temperature
         else
         {
             //HeaterPreviousRead[HeaterId] = MillisecGetTemperatures(HeaterId);//
-            ReportWithPackageFilter(HeatersFilter,"Restarting same temperature Heater Temp",__FILE__,HeaterId,ControlIdtoHeaterId [HeaterId],RpWarning,HeaterPreviousRead[HeaterId],  0);
+            ReportWithPackageFilter(HeatersFilter,"Restarting same temperature Heater Temp",__FILE__,HeaterId,HeaterPIDConfig[HeaterId].m_calculatedError,RpWarning,HeaterPreviousRead[HeaterId],  0);
             HeaterRestarted[HeaterId] = true;
         }
         //PrepareHeater(HeaterId,Temperature);  //prepare the heaters control info
@@ -704,12 +704,18 @@ void PrepareACHeater(int HeaterId,uint32_t Frequency, uint32_t SetTemperatue)
     HeaterAtTemp[HeaterId] = false;
     if (BlowerCfg.enabled == true)
     {
-        Turn_the_Blower_On();//Turn on with the Default_Voltage
-        if (BlowerCfg.heatingvoltage)
-            Control_Voltage_To_Blower(BlowerCfg.heatingvoltage);
+        if(Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD)
+        {
+            WHS_Set_SetPoint_Q_value(headairflow/2);
+        }
         else
-            Control_Voltage_To_Blower(BlowerCfg.voltage-500);
-        WHS_Set_SetPoint_Q_value(headairflow/2);
+        {
+            Turn_the_Blower_On();//Turn on with the Default_Voltage
+            if (BlowerCfg.heatingvoltage)
+                Control_Voltage_To_Blower(BlowerCfg.heatingvoltage);
+            else
+                Control_Voltage_To_Blower(BlowerCfg.voltage-500);
+        }
     }
     if (SetTemperatue)
     {
@@ -939,7 +945,7 @@ uint32_t HeaterMaxTempCBFunction(uint32_t IfIndex, uint32_t readValue)
         if (HeaterMaxTempFlag[index] == false)
         {
             //LOG_ERROR (MaxreadValue/100, "Heater Over the max temperature, turned off");
-            //ReportWithPackageFilter(HeatersFilter," AC Heater Over the max temperature, turned off",__FILE__,index,HeaterReady[index],RpWarning,HeaterControl[index].sensormaxvalue, 0);
+            ReportWithPackageFilter(HeatersFilter," AC Heater Over the max temperature, turned off",__FILE__,index,HeaterReady[index],RpWarning,HeaterControl[index].sensormaxvalue, 0);
         }
         DeActivateHeater(HEATER_TYPE__DryerMainHeater);
         HeaterMaxTempFlag[index] = true;
@@ -983,7 +989,6 @@ uint32_t DcHeaterMaxTempCBFunction(uint32_t IfIndex, uint32_t readValue)
         return OK;
     if ((HeaterPreviousRead[index]) >= HeaterControl[index].sensormaxvalue)
     {
-        ReportWithPackageFilter(HeatersFilter,"Heater over the max temperature",__FILE__,index,OverHeatCounter[index],RpWarning,HeaterControl[index].sensormaxvalue,  0);
         if(OverHeatCounter[index]++ >=Overheat_Count_Limit)
         {
             OverHeatCounter[index] = Overheat_Count_Limit;
@@ -1002,9 +1007,12 @@ uint32_t DcHeaterMaxTempCBFunction(uint32_t IfIndex, uint32_t readValue)
         HeaterRecalculateHeaterParams(index, 0);
         HeaterMaxTempFlag[index] = true;
         //ReportWithPackageFilter(HeatersFilter,(MinreadValue/100), "Heater Over the max temperature, turned off");
-        ReportWithPackageFilter(HeatersFilter,"DC Heater Over the max temperature, turned off",__FILE__,index,HeaterPreviousRead[index],RpWarning,  HeaterReady[index],0);
         if (getIdleState() == false)
+        {
+            ReportWithPackageFilter(HeatersFilter,"DC Heater Over the max temperature, turned off",__FILE__,index,HeaterPreviousRead[index],RpWarning,  HeaterReady[index],0);
+            ReportWithPackageFilter(HeatersFilter,"Heater over the max temperature",__FILE__,index,OverHeatCounter[index],RpWarning,HeaterControl[index].sensormaxvalue,  0);
             AlarmHandlingSetAlarm(HeaterEventType[index], true);
+        }
         return OK;
     }
     else if ((HeaterPreviousRead[index]) < (HeaterControl[index].sensorminvalue))
@@ -1120,7 +1128,7 @@ uint32_t HeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue)
     HeaterPreviousRead[index] = readValue;
     //ReportWithPackageFilter(HeatersFilter, "AC Heating in progress",__FILE__,readValue,HeaterReady[index],RpError, HeaterAtTemp[index],0);
 
-    if (readValue>(HeaterCmd[index].targettemperatue+800))
+    if ((readValue>(HeaterCmd[index].targettemperatue+800))&&(getIdleState() == false))
     {
         ReportWithPackageFilter(HeatersFilter, "AC OverHeating in progress",__FILE__,readValue,HeaterReady[index],RpError, HeaterAtTemp[index],0);
     }
@@ -1183,11 +1191,16 @@ uint32_t HeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue)
             AlarmHandlingSetAlarm(HeaterUnderEventType[index], false);
             if (BlowerCfg.enabled == true)
             {
-                Turn_the_Blower_On();//Turn on with the Default_Voltage
-                if (BlowerCfg.voltage)
-                    //Gradual_Increase_Blower(BlowerCfg.heatingvoltage,BlowerCfg.voltage);
-                    Control_Voltage_To_Blower(BlowerCfg.voltage);
-                WHS_Set_SetPoint_Q_value(headairflow);
+                if(Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD)
+                {
+                    WHS_Set_SetPoint_Q_value(headairflow);
+                }
+                else
+                {
+                    Turn_the_Blower_On();//Turn on with the Default_Voltage
+                    if (BlowerCfg.voltage)
+                        Control_Voltage_To_Blower(BlowerCfg.voltage);
+                }
             }
             HeaterReady[index] = true;
             //Disable_Reading_Heaters_Current(HeaterId2CurrentId[HEATER_TYPE__DryerMainHeater]);
@@ -1321,10 +1334,14 @@ uint32_t DCHeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue)
         HeaterRecalculateHeaterParams(index, 0);
         return ERROR;
     }
-    if (readValue>(HeaterCmd[index].targettemperatue+500))
+    if ((readValue>(HeaterCmd[index].targettemperatue+300))&&(getIdleState() == false))
     {
-        ReportWithPackageFilter(HeatersFilter, "DC OverHeating in progress",__FILE__,index,readValue,RpError, HeaterReady[index],0);
+        ReportWithPackageFilter(HeatersFilter, "DC OverHeating in progress",__FILE__,index,readValue,RpError, HeaterPIDConfig[index].m_calculatedError,0);
     }
+    /*if (index == 4)
+    {
+        ReportWithPackageFilter(HeatersFilter, "DC Heating info head 2",__FILE__,GetControlLowDevice_i(),readValue,RpError, HeaterPIDConfig[index].m_calculatedError,0);
+    }*/
 
     // check if the read value is within the proportional band
     if (HeaterReady[index]==false)
@@ -1335,7 +1352,8 @@ uint32_t DCHeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue)
                     DeActivateHeater(index);
                     HeaterRecalculateHeaterParams(index, 0);
                     //Heaters OFF until coming into the proportional band
-                    ReportWithPackageFilter(HeatersFilter,"HEATER Over temperature ", __FILE__,index,HeaterCmd[index].targettemperatue, RpMessage, readValue, 0);
+                    if (getIdleState() == false)
+                        ReportWithPackageFilter(HeatersFilter,"HEATER Over temperature ", __FILE__,index,HeaterCmd[index].targettemperatue, RpMessage, readValue, 0);
                     return OK;
                 }
         if (readValue < ((HeaterCmd[index].targettemperatue * (100-HeaterControl[index].outputproportionalband))/100))
@@ -1423,7 +1441,7 @@ uint32_t DCHeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue)
             //        #warning PID is now only proportional (above)
             if (HeaterRestarted[index] == true)
             {
-                ReportWithPackageFilter(HeatersFilter,"Restarting same temperature Heater Temp",__FILE__,index,HeaterPIDConfig[index].m_calculatedError,RpWarning,readValue,  0);
+                ReportWithPackageFilter(HeatersFilter,"Restarted same temperature Heater ",__FILE__,index,HeaterPIDConfig[index].m_calculatedError,RpWarning,readValue,  0);
                 HeaterRestarted[index] = false;
             }
             HeaterRecalculateHeaterParams(index, (int)(HeaterPIDConfig[index].m_calculatedError/100));
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c
index 98b3704ce..bb9f0616e 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_dispenser.c
@@ -323,7 +323,7 @@ uint32_t IDS_Dispenser_Store_Data (void)
     if (JobIsActive()==false)
     {
         response_size = dispenser_data__pack(&StoreDispenserData, dispensers_container_buffer);
-        EraseFlashSection(DISPENSERS_MAP_IN_FLASH,response_size+4);
+        EraseFlashSection(DISPENSERS_SECTION_FLASH);
         ReadAppAndProgram(DISPENSERS_MAP_IN_FLASH, 4,&response_size);
         ReadAppAndProgram(DISPENSERS_MAP_IN_FLASH+4, response_size, dispensers_container_buffer);
         //Report("IDS_Dispenser_Store ",__FILE__,__LINE__,(int)response_size,RpWarning,(int)StoreDispenserData.dispenserinfo[4]->nanolitterperpulse *100,0);
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
index 5ca59a434..ae6751693 100644
--- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c
@@ -1491,6 +1491,7 @@ uint32_t IDSBrushStopRestartCallback(uint32_t IfIndex, uint32_t readValue)
         Report("JobEndSequence",__FILE__,__LINE__,(int)JobBrushStopId,RpWarning,(int)SegmentNumOfBrushStops,0);
         SafeRemoveControlCallback(BrushStopControlId,IDSBrushStopRestartCallback);
         BrushStopControlId = 0Xff;
+        return OK;
     }
     if (uploadstrategy == JOB_UPLOAD_STRATEGY__Default)
     {
@@ -1506,7 +1507,7 @@ uint32_t IDSBrushStopRestartCallback(uint32_t IfIndex, uint32_t readValue)
         {
             Task_stat(Control_Task_Handle,&statbuf);
             //REPORT_MSG(FileBrushStop->index,"BrushStopRead Index");
-            Report("BrushStopRead Index",__FILE__,__LINE__,(int)FileBrushStop->index,RpWarning,(int)statbuf.used,0);
+            Report("BrushStopRead Index",__FILE__,BrushStopTime,(int)FileBrushStop->index,RpWarning,(int)BrushStopStartTime,0);
             Dispensers = FileBrushStop->dispensers;
             n_dispensers = FileBrushStop->n_dispensers;
         }
diff --git a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c
index a98cc173e..572d16bb4 100644
--- a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c
+++ b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c
@@ -67,25 +67,28 @@ void IFS_Init(void)
  *  the INK cartridge is empty
  * @return bool ret OK = 0 , CartridgeFinished = 1
  */
+#define CARTRIDGE_EMPTY_QUANTITY_LIMIT 10
+#define CARTRIDGE_EMPTY_CALCULATION_TIME 6
 bool DetectIfCartridgeFinished(int int_MidTank_Pressure_1000)
 {
 
 #define CartridgeFinished 1
 
     bool ret = OK;
-    static int measure_midtank[5] ;
+    static int measure_midtank[CARTRIDGE_EMPTY_CALCULATION_TIME] ;
     static int count_measure_midtank = 0;
     int i=0;
     int sum = 0;
     int average = 0;
 
-    if ( count_measure_midtank == 5) count_measure_midtank = 0;
+    if ( count_measure_midtank == CARTRIDGE_EMPTY_CALCULATION_TIME)
+        count_measure_midtank = 0;
     measure_midtank[count_measure_midtank] = int_MidTank_Pressure_1000;
     count_measure_midtank += 1;
-    for (i=0;i<5;i++)
+    for (i=0;i<CARTRIDGE_EMPTY_CALCULATION_TIME;i++)
         sum += measure_midtank[i];
-    average = sum/5;
-    if (abs(average - int_MidTank_Pressure_1000)<10)  ret = CartridgeFinished;
+    average = sum/CARTRIDGE_EMPTY_CALCULATION_TIME;
+    if (abs(average - int_MidTank_Pressure_1000)<CARTRIDGE_EMPTY_QUANTITY_LIMIT)  ret = CartridgeFinished;
     //if (average > (int_MidTank_Pressure_1000 * 0.98) )  ret = CartridgeFinished;
 
     return ret;
@@ -110,7 +113,7 @@ WHS_sensor CartridgeInkCallBackFunction()
     {
         WHS_info.event = IFS_INK_presence_sensor;
         IFS_info.IFS_Ink_precense_sensor = !IFS_info.IFS_Ink_precense_sensor;
-        ReportWithPackageFilter(WasteFilter,"------------ find  : IFS_Ink_presence_sensor event  -----------------", __FILE__,__LINE__, IFS_info.IFS_Ink_precense_sensor, RpMessage, 0, 0);
+        Report("------------ find  : IFS_Ink_presence_sensor event  -----------------", __FILE__,__LINE__, IFS_info.IFS_Ink_precense_sensor, RpMessage, 0, 0);
         ret = IFS_INK_presence_sensor;
     }
     return ret;
@@ -143,7 +146,7 @@ WHS_sensor CartridgeInkTimeOutCallBackFunction()
     MidTank_Pressure = Read_MidTank_Pressure_Sensor(IFS_info.Ink.cart_color);// Get_MidTank_Pressure_Sensor(IFS_info.Ink.cart_color);
     //Disable_MidTank_Pressure_Reading(IFS_info.Ink.cart_color);
     int_MidTank_Pressure_1000 =  ((int)(MidTank_Pressure*1000));
-    ReportWithPackageFilter(WasteFilter,"------------ IFS_info.Ink.time_out and Pressure  -----------------", __FILE__,__LINE__,(IFS_info.Ink.time_out * SECONDS_5), RpMessage, (int_MidTank_Pressure_1000), 0);
+    Report("------------ IFS_info.Ink.time_out and Pressure  -----------------", __FILE__,__LINE__,(IFS_info.Ink.time_out * SECONDS_5), RpMessage, (int_MidTank_Pressure_1000), 0);
 
     if (IFS_info.Ink.time_out) IFS_info.Ink.time_out += 1; /*** counter  ***/
 
@@ -160,18 +163,24 @@ WHS_sensor CartridgeInkTimeOutCallBackFunction()
     /**** detect if the MidTank_Pressure is the same, 5 times   ****/
     if (DetectIfCartridgeFinished(int_MidTank_Pressure_1000))
     {
-        ReportWithPackageFilter(WasteFilter,"------------ INK Cartrigde is empty (by average)  -----------------", __FILE__,__LINE__,(IFS_info.Ink.time_out * SECONDS_5), RpMessage, (int_MidTank_Pressure_1000), 0);
+        Report("------------ INK Cartrigde is empty (by average)  -----------------", __FILE__,__LINE__,(IFS_info.Ink.time_out * SECONDS_5), RpMessage, (int_MidTank_Pressure_1000), 0);
         IFS_info.Ink.time_out = 0;
         WHS_info.event = IFS_MidTankFull;
         return IFS_MidTankFull;
     }
 
 
-
+    int timeout = CARTRIDGE_INK_TIMEOUT;
+    int secondtimeout = CARTRIDGE_INK_TIMEOUTx2;
+    if (IFS_info.Ink.cart_color == MIDTANK_8)//lubricant
+    {
+        timeout = CARTRIDGE_INK_TIMEOUT*3;
+        secondtimeout = CARTRIDGE_INK_TIMEOUTx2 * 3;
+    }
     /*** first TimeOut  ***/
-    if (IFS_info.Ink.time_out == CARTRIDGE_INK_TIMEOUT)
+    if (IFS_info.Ink.time_out == timeout)
     {
-        ReportWithPackageFilter(WasteFilter,"------------ first IFS_info.Ink.time_out, close valves  -----------------", __FILE__, __LINE__, (IFS_info.Ink.time_out * SECONDS_5), RpMessage, (int_MidTank_Pressure_1000), 0);
+        Report("------------ first IFS_info.Ink.time_out, close valves  -----------------", __FILE__, __LINE__, (IFS_info.Ink.time_out * SECONDS_5), RpMessage, (int_MidTank_Pressure_1000), 0);
         //IFS_info.Ink.time_out = 0;
         //return IFS_info.event = IFS_Timeout;
 
@@ -179,20 +188,21 @@ WHS_sensor CartridgeInkTimeOutCallBackFunction()
         // start timeout
         // close and open the correct valves
 
-       IFS_info.Ink.time_out = 0;
+        IFS_info.Ink.time_out = 0;
         MidTankValvesAction(Cartridge_MidTank_OFF);
-        IFS_info.Ink.time_out = CARTRIDGE_INK_TIMEOUT;
+        IFS_info.Ink.time_out = timeout;
     }
 
-    if (IFS_info.Ink.time_out == (CARTRIDGE_INK_TIMEOUT + 1)) //need to open the valve for second chance
+    if (IFS_info.Ink.time_out == (timeout + 1)) //need to open the valve for second chance
         {
-        ReportWithPackageFilter(WasteFilter,"------------ IFS_Timeout open valves for second timeout  -----------------", __FILE__, __LINE__, (IFS_info.Ink.time_out * SECONDS_5), RpMessage, (int_MidTank_Pressure_1000), 0);
+        Report("------------ IFS_Timeout open valves for second timeout  -----------------", __FILE__, __LINE__, (IFS_info.Ink.time_out * SECONDS_5), RpMessage, (int_MidTank_Pressure_1000), 0);
         MidTankValvesAction(Cartridge_MidTank_ON);
+        IFS_info.Ink.time_out = timeout;
         }
 
-    if (IFS_info.Ink.time_out >= (CARTRIDGE_INK_TIMEOUTx2 + 1))
+    if (IFS_info.Ink.time_out >= (secondtimeout + 1))
         {
-            ReportWithPackageFilter(WasteFilter,"------------ IFS_Timeout_Second_Time  -----------------", __FILE__, __LINE__, (IFS_info.Ink.time_out * SECONDS_5), RpMessage, (int_MidTank_Pressure_1000), 0);
+            Report("------------ IFS_Timeout_Second_Time  -----------------", __FILE__, __LINE__, (IFS_info.Ink.time_out * SECONDS_5), RpMessage, (int_MidTank_Pressure_1000), 0);
             IFS_info.Ink.time_out = 0;
             MidTankValvesAction(Cartridge_MidTank_OFF);
             WHS_info.event = IFS_Timeout_Second;
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
index cdcecaa2a..19392c754 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/ThreadLoad.c
@@ -197,12 +197,18 @@
         }
         else
         {
-            WHS_Set_SetPoint_Q_value(headairflow/2);
-            Turn_the_Blower_On();//Turn on with the Default_Voltage
-            if (BlowerCfg.heatingvoltage)
-                Control_Voltage_To_Blower(BlowerCfg.heatingvoltage);
+            if(Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD)
+            {
+                WHS_Set_SetPoint_Q_value(headairflow/2);
+            }
             else
-                Control_Voltage_To_Blower(BlowerCfg.voltage-500);
+            {
+                Turn_the_Blower_On();//Turn on with the Default_Voltage
+                if (BlowerCfg.heatingvoltage)
+                    Control_Voltage_To_Blower(BlowerCfg.heatingvoltage);
+                else
+                    Control_Voltage_To_Blower(BlowerCfg.voltage-500);
+            }
             Control_Dryer_Fan(STOP,75);//use START or STOP,  0 - 100%
             LoadStages++;
             ThreadLoadStateMachine(LoadStages);
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
index 9698f1ea3..41ef9e480 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c
@@ -657,7 +657,7 @@ void ScrewTimerInterrupt(int ARG0)
         TimerDisable(Screw_timerBase, TIMER_A);
     }
     ROM_IntMasterEnable();
-    //Report("ScrewsStartControlTimer direction,speed ", __FILE__,__LINE__,ScrewCurrentDirection, RpMessage, ScrewSpeed, 0);
+    //Report("ScrewsStartControlTimer time direction,speed ", __FILE__,msec_millisecondCounter,ScrewCurrentDirection, RpMessage, ScrewSpeed, 0);
     //MotorSetSpeed(HARDWARE_MOTOR_TYPE__MOTO_SCREW,ScrewSpeed);
     //Rotations+=0.03;
 
diff --git a/Software/Embedded_SW/Embedded/Software Release Notes.txt b/Software/Embedded_SW/Embedded/Software Release Notes.txt
index 20bf32db7..389d0a790 100644
--- a/Software/Embedded_SW/Embedded/Software Release Notes.txt
+++ b/Software/Embedded_SW/Embedded/Software Release Notes.txt
@@ -1,3 +1,18 @@
+Embedded SW Release note - Version 1.4.6.25 - Pack 2 
+=============================================================
+dispenser EEPROM read/write from stub
+power up interface - progress report and error codes
+job preparation (file analysis) in lower priority to avoid overheating in large files
+bug fix in millisec task
+diagnostics - waste level(in chiller temperature)
+dispenser/motor homing real progress report
+fix bugs in hw version support (discovered by Ori)
+improve heaters tracking
+improve thread loading error handling
+integrate new waste tank level info in the WHS module
+drivers: bug fixes, waste level and gas sensor, head type identification according to EEPROM, fix blower flow and control, whs gpio, 
+
+
 Embedded SW Release note - Version 1.4.6.21 - Pack 1++ 
 =============================================================
 File system improved
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c
index eeec890e4..8089a3b29 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c
+++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c
@@ -216,10 +216,12 @@ uint32_t InitSequenceBlowerCallBackFunction(uint32_t IfIndex, uint32_t BusyFlag)
         HWControlId = 0xFF;
     else
         Report("Remove control callback failed",__FILE__,__LINE__,(int)HWControlId,RpWarning,(int)InitSequenceBlowerCallBackFunction,0);
+    Turn_the_Blower_On();//Turn on with the Default_Voltage
     if (BlowerCfg.heatingvoltage)
         Control_Voltage_To_Blower(BlowerCfg.heatingvoltage);
     else
         Control_Voltage_To_Blower(3000);
+
     WHS_enable_control_loop(true);
     WHS_Set_SetPoint_Q_value(headairflow/2);
     AlarmHandlingSetAlarm (EVENT_TYPE__MACHINE_STATE_INITIAL_BLOWER_FAILED,OFF);  //handle alarm detection and operation
@@ -502,7 +504,8 @@ uint32_t InitSequenceWaitForCooler(void)
     }
     else
     {
-        SetMachineStatus(MACHINE_STATE__Error); //prevent job while waiting for the cooler
+        SetMachineState(MACHINE_STATE_WAIT_FOR_COOLER);
+        //SetMachineStatus(MACHINE_STATE__Error); //prevent job while waiting for the cooler
         Report("AddControlCallback INIT",__FILE__,__LINE__,(int)HWControlId,RpWarning,(int)InitStages,0);
         //cold reset, wait 2 minutes for cooler start
 //        HWControlId = AddControlCallback("Init Cooler", InitSequenceWaitForCoolerCallBackFunction, 2*eOneMinute, TemplateDataReadCBFunction,0,0, 0 );