Initial application of cartridge state protobuf

47 files changed, 917 insertions, 1829 deletions

diff --git a/Software/Embedded_SW/Embedded/Communication/Container.c b/Software/Embedded_SW/Embedded/Communication/Container.c
index 546f4bb58..aa7807d1b 100644
--- a/Software/Embedded_SW/Embedded/Communication/Container.c
+++ b/Software/Embedded_SW/Embedded/Communication/Container.c
@@ -461,20 +461,11 @@ void receive_callback(char* buffer, size_t length)
          case MESSAGE_TYPE__DispenserDataRequest:
              DispenserDataRequestFunc(requestContainer);
              break;
-         case MESSAGE_TYPE__StartCartridgesUpdateRequest:
-             LOG_ERROR (requestContainer->type,"MESSAGE_TYPE__StartCartridgesUpdateRequest");
-             break;
-         case MESSAGE_TYPE__StopCartridgesUpdateRequest:
-             LOG_ERROR (requestContainer->type,"MESSAGE_TYPE__StopCartridgesUpdateRequest");
-             break;
          case MESSAGE_TYPE__CartridgeValidationResponse:
              CartridgeValidationResponseFunc(requestContainer);
              break;
-         case MESSAGE_TYPE__StartWasteEmptyingRequest:
-             StartWasteEmptyingRequestFunc(requestContainer);
-             break;
-         case MESSAGE_TYPE__StartInkFillingRequest:
-             StartInkFillingRequestFunc(requestContainer);
+         case MESSAGE_TYPE__StartInkFillingStatusRequest:
+             StartInkFillingStatusRequestFunc(requestContainer);
              break;
          case MESSAGE_TYPE__MidTankDataSetupRequest:
              MidTankDataSetupFunc(requestContainer);
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 a59dccb97..fc3d91279 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[269] =
+static const ProtobufCEnumValue message_type__enum_values_by_number[263] =
 {
   { "", "", 0 },
   { "", "", 1 },
@@ -184,16 +184,8 @@ static const ProtobufCEnumValue message_type__enum_values_by_number[269] =
   { "", "", 2037 },
   { "", "", 2038 },
   { "", "", 2039 },
-  { "", "", 2040 },
-  { "", "", 2041 },
-  { "", "", 2042 },
-  { "", "", 2043 },
   { "", "", 2044 },
   { "", "", 2045 },
-  { "", "", 2046 },
-  { "", "", 2047 },
-  { "", "", 2048 },
-  { "", "", 2049 },
   { "", "", 3000 },
   { "", "", 3001 },
   { "", "", 3002 },
@@ -278,88 +270,90 @@ static const ProtobufCEnumValue message_type__enum_values_by_number[269] =
   { "", "", 11005 },
   { "", "", 11006 },
   { "", "", 11007 },
+  { "", "", 12000 },
+  { "", "", 12001 },
 };
 static const ProtobufCIntRange message_type__value_ranges[] = {
-{0, 0},{3, 2},{1000, 114},{2000, 135},{3000, 185},{4000, 199},{5000, 207},{6000, 211},{7000, 217},{8000, 241},{9000, 249},{10000, 253},{11000, 261},{0, 269}
+{0, 0},{3, 2},{1000, 114},{2000, 135},{2044, 175},{3000, 177},{4000, 191},{5000, 199},{6000, 203},{7000, 209},{8000, 233},{9000, 241},{10000, 245},{11000, 253},{12000, 261},{0, 263}
 };
-static const ProtobufCEnumValueIndex message_type__enum_values_by_name[269] =
+static const ProtobufCEnumValueIndex message_type__enum_values_by_name[263] =
 {
-  { "", 197 },
-  { "", 198 },
-  { "", 187 },
-  { "", 188 },
-  { "", 255 },
-  { "", 256 },
-  { "", 259 },
-  { "", 260 },
-  { "", 239 },
-  { "", 240 },
-  { "", 2 },
-  { "", 3 },
+  { "", 189 },
+  { "", 190 },
   { "", 179 },
   { "", 180 },
+  { "", 247 },
+  { "", 248 },
+  { "", 251 },
+  { "", 252 },
+  { "", 231 },
+  { "", 232 },
+  { "", 2 },
+  { "", 3 },
+  { "", 175 },
+  { "", 176 },
   { "", 127 },
   { "", 128 },
   { "", 133 },
   { "", 134 },
-  { "", 213 },
-  { "", 214 },
-  { "", 263 },
-  { "", 264 },
-  { "", 225 },
-  { "", 226 },
-  { "", 191 },
-  { "", 192 },
-  { "", 227 },
-  { "", 228 },
+  { "", 205 },
+  { "", 206 },
+  { "", 255 },
+  { "", 256 },
+  { "", 217 },
+  { "", 218 },
+  { "", 183 },
+  { "", 184 },
+  { "", 219 },
+  { "", 220 },
   { "", 119 },
   { "", 120 },
-  { "", 215 },
-  { "", 216 },
+  { "", 207 },
+  { "", 208 },
   { "", 145 },
   { "", 146 },
   { "", 151 },
   { "", 152 },
-  { "", 241 },
-  { "", 242 },
+  { "", 233 },
+  { "", 234 },
   { "", 147 },
   { "", 148 },
   { "", 149 },
   { "", 150 },
   { "", 1 },
-  { "", 221 },
-  { "", 222 },
+  { "", 213 },
+  { "", 214 },
   { "", 115 },
   { "", 116 },
   { "", 117 },
   { "", 118 },
   { "", 114 },
-  { "", 235 },
-  { "", 236 },
-  { "", 219 },
-  { "", 220 },
-  { "", 233 },
-  { "", 234 },
-  { "", 217 },
-  { "", 218 },
-  { "", 131 },
-  { "", 132 },
-  { "", 231 },
-  { "", 232 },
-  { "", 229 },
-  { "", 230 },
-  { "", 185 },
-  { "", 186 },
+  { "", 227 },
+  { "", 228 },
   { "", 211 },
   { "", 212 },
+  { "", 225 },
+  { "", 226 },
+  { "", 209 },
+  { "", 210 },
+  { "", 131 },
+  { "", 132 },
   { "", 223 },
   { "", 224 },
-  { "", 245 },
-  { "", 246 },
-  { "", 247 },
-  { "", 248 },
-  { "", 243 },
-  { "", 244 },
+  { "", 221 },
+  { "", 222 },
+  { "", 177 },
+  { "", 178 },
+  { "", 203 },
+  { "", 204 },
+  { "", 215 },
+  { "", 216 },
+  { "", 237 },
+  { "", 238 },
+  { "", 239 },
+  { "", 240 },
+  { "", 235 },
+  { "", 236 },
   { "", 137 },
   { "", 138 },
   { "", 143 },
@@ -375,60 +369,54 @@ static const ProtobufCEnumValueIndex message_type__enum_values_by_name[269] =
   { "", 5 },
   { "", 161 },
   { "", 162 },
-  { "", 193 },
-  { "", 194 },
+  { "", 185 },
+  { "", 186 },
   { "", 171 },
   { "", 172 },
   { "", 159 },
   { "", 160 },
-  { "", 203 },
-  { "", 204 },
+  { "", 195 },
+  { "", 196 },
   { "", 153 },
   { "", 154 },
   { "", 169 },
   { "", 170 },
   { "", 173 },
   { "", 174 },
-  { "", 205 },
-  { "", 206 },
+  { "", 197 },
+  { "", 198 },
   { "", 123 },
   { "", 124 },
-  { "", 175 },
-  { "", 176 },
-  { "", 199 },
-  { "", 200 },
+  { "", 191 },
+  { "", 192 },
   { "", 135 },
   { "", 136 },
   { "", 165 },
   { "", 166 },
-  { "", 195 },
-  { "", 196 },
-  { "", 183 },
-  { "", 184 },
+  { "", 187 },
+  { "", 188 },
+  { "", 261 },
+  { "", 262 },
+  { "", 241 },
+  { "", 242 },
+  { "", 245 },
+  { "", 246 },
   { "", 249 },
   { "", 250 },
   { "", 253 },
   { "", 254 },
-  { "", 257 },
-  { "", 258 },
-  { "", 261 },
-  { "", 262 },
-  { "", 181 },
-  { "", 182 },
   { "", 125 },
   { "", 126 },
-  { "", 177 },
-  { "", 178 },
-  { "", 201 },
-  { "", 202 },
+  { "", 193 },
+  { "", 194 },
   { "", 163 },
   { "", 164 },
   { "", 167 },
   { "", 168 },
-  { "", 251 },
-  { "", 252 },
-  { "", 265 },
-  { "", 266 },
+  { "", 243 },
+  { "", 244 },
+  { "", 257 },
+  { "", 258 },
   { "", 100 },
   { "", 101 },
   { "", 6 },
@@ -537,22 +525,22 @@ static const ProtobufCEnumValueIndex message_type__enum_values_by_name[269] =
   { "", 31 },
   { "", 106 },
   { "", 107 },
-  { "", 209 },
-  { "", 210 },
+  { "", 201 },
+  { "", 202 },
   { "", 157 },
   { "", 158 },
   { "", 155 },
   { "", 156 },
-  { "", 267 },
-  { "", 268 },
+  { "", 259 },
+  { "", 260 },
   { "", 129 },
   { "", 130 },
-  { "", 207 },
-  { "", 208 },
-  { "", 189 },
-  { "", 190 },
-  { "", 237 },
-  { "", 238 },
+  { "", 199 },
+  { "", 200 },
+  { "", 181 },
+  { "", 182 },
+  { "", 229 },
+  { "", 230 },
 };
 const ProtobufCEnumDescriptor message_type__descriptor =
 {
@@ -561,11 +549,11 @@ const ProtobufCEnumDescriptor message_type__descriptor =
   "",
   "",
   "",
-  269,
+  263,
   message_type__enum_values_by_number,
-  269,
+  263,
   message_type__enum_values_by_name,
-  13,
+  15,
   message_type__value_ranges,
   NULL,NULL,NULL,NULL   /* reserved[1234] */
 };
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.h
index 6df8fa5f9..a9dd51ca9 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
@@ -195,16 +195,8 @@ typedef enum _MessageType {
   MESSAGE_TYPE__SetBlowerStateResponse = 2037,
   MESSAGE_TYPE__SetValveStateRequest = 2038,
   MESSAGE_TYPE__SetValveStateResponse = 2039,
-  MESSAGE_TYPE__StartCartridgesUpdateRequest = 2040,
-  MESSAGE_TYPE__StartCartridgesUpdateResponse = 2041,
-  MESSAGE_TYPE__StopCartridgesUpdateRequest = 2042,
-  MESSAGE_TYPE__StopCartridgesUpdateResponse = 2043,
   MESSAGE_TYPE__CartridgeValidationRequest = 2044,
   MESSAGE_TYPE__CartridgeValidationResponse = 2045,
-  MESSAGE_TYPE__StartWasteEmptyingRequest = 2046,
-  MESSAGE_TYPE__StartWasteEmptyingResponse = 2047,
-  MESSAGE_TYPE__StartInkFillingRequest = 2048,
-  MESSAGE_TYPE__StartInkFillingResponse = 2049,
   MESSAGE_TYPE__JobRequest = 3000,
   MESSAGE_TYPE__JobResponse = 3001,
   MESSAGE_TYPE__AbortJobRequest = 3002,
@@ -288,7 +280,9 @@ typedef enum _MessageType {
   MESSAGE_TYPE__StopThreadLoadingRequest = 11004,
   MESSAGE_TYPE__StopThreadLoadingResponse = 11005,
   MESSAGE_TYPE__TryThreadLoadingRequest = 11006,
-  MESSAGE_TYPE__TryThreadLoadingResponse = 11007
+  MESSAGE_TYPE__TryThreadLoadingResponse = 11007,
+  MESSAGE_TYPE__StartInkFillingStatusRequest = 12000,
+  MESSAGE_TYPE__StartInkFillingStatusResponse = 12001
     PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(MESSAGE_TYPE)
 } MessageType;
 
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/FillingAction.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/FillingAction.pb-c.c
deleted file mode 100644
index 686c3c58f..000000000
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/FillingAction.pb-c.c
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: FillingAction.proto */
-
-/* Do not generate deprecated warnings for self */
-#ifndef PROTOBUF_C__NO_DEPRECATED
-#define PROTOBUF_C__NO_DEPRECATED
-#endif
-
-#include "FillingAction.pb-c.h"
-static const ProtobufCEnumValue filling_action__enum_values_by_number[6] =
-{
-  { "", "", 0 },
-  { "", "", 1 },
-  { "", "", 2 },
-  { "", "", 3 },
-  { "", "", 4 },
-  { "", "", 5 },
-};
-static const ProtobufCIntRange filling_action__value_ranges[] = {
-{0, 0},{0, 6}
-};
-static const ProtobufCEnumValueIndex filling_action__enum_values_by_name[6] =
-{
-  { "", 5 },
-  { "", 3 },
-  { "", 4 },
-  { "", 2 },
-  { "", 1 },
-  { "", 0 },
-};
-const ProtobufCEnumDescriptor filling_action__descriptor =
-{
-  PROTOBUF_C__ENUM_DESCRIPTOR_MAGIC,
-  "",
-  "",
-  "",
-  "",
-  6,
-  filling_action__enum_values_by_number,
-  6,
-  filling_action__enum_values_by_name,
-  1,
-  filling_action__value_ranges,
-  NULL,NULL,NULL,NULL   /* reserved[1234] */
-};
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/FillingAction.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/FillingAction.pb-c.h
deleted file mode 100644
index e48f99397..000000000
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/FillingAction.pb-c.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: FillingAction.proto */
-
-#ifndef PROTOBUF_C_FillingAction_2eproto__INCLUDED
-#define PROTOBUF_C_FillingAction_2eproto__INCLUDED
-
-#include <protobuf-c/protobuf-c.h>
-
-PROTOBUF_C__BEGIN_DECLS
-
-#if PROTOBUF_C_VERSION_NUMBER < 1003000
-# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
-#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
-# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c.
-#endif
-
-
-
-
-/* --- enums --- */
-
-typedef enum _FillingAction {
-  FILLING_ACTION__None = 0,
-  FILLING_ACTION__Inserted = 1,
-  FILLING_ACTION__Filling = 2,
-  FILLING_ACTION__End = 3,
-  FILLING_ACTION__Error = 4,
-  FILLING_ACTION__Ejected = 5
-    PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(FILLING_ACTION)
-} FillingAction;
-
-/* --- messages --- */
-
-/* --- per-message closures --- */
-
-
-/* --- services --- */
-
-
-/* --- descriptors --- */
-
-extern const ProtobufCEnumDescriptor    filling_action__descriptor;
-
-PROTOBUF_C__END_DECLS
-
-
-#endif  /* PROTOBUF_C_FillingAction_2eproto__INCLUDED */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartCartridgesUpdateRequest.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartCartridgesUpdateRequest.pb-c.c
deleted file mode 100644
index f6b0cfdee..000000000
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartCartridgesUpdateRequest.pb-c.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: StartCartridgesUpdateRequest.proto */
-
-/* Do not generate deprecated warnings for self */
-#ifndef PROTOBUF_C__NO_DEPRECATED
-#define PROTOBUF_C__NO_DEPRECATED
-#endif
-
-#include "StartCartridgesUpdateRequest.pb-c.h"
-void   start_cartridges_update_request__init
-                     (StartCartridgesUpdateRequest         *message)
-{
-  static const StartCartridgesUpdateRequest init_value = START_CARTRIDGES_UPDATE_REQUEST__INIT;
-  *message = init_value;
-}
-size_t start_cartridges_update_request__get_packed_size
-                     (const StartCartridgesUpdateRequest *message)
-{
-  assert(message->base.descriptor == &start_cartridges_update_request__descriptor);
-  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t start_cartridges_update_request__pack
-                     (const StartCartridgesUpdateRequest *message,
-                      uint8_t       *out)
-{
-  assert(message->base.descriptor == &start_cartridges_update_request__descriptor);
-  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t start_cartridges_update_request__pack_to_buffer
-                     (const StartCartridgesUpdateRequest *message,
-                      ProtobufCBuffer *buffer)
-{
-  assert(message->base.descriptor == &start_cartridges_update_request__descriptor);
-  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-StartCartridgesUpdateRequest *
-       start_cartridges_update_request__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data)
-{
-  return (StartCartridgesUpdateRequest *)
-     protobuf_c_message_unpack (&start_cartridges_update_request__descriptor,
-                                allocator, len, data);
-}
-void   start_cartridges_update_request__free_unpacked
-                     (StartCartridgesUpdateRequest *message,
-                      ProtobufCAllocator *allocator)
-{
-  if(!message)
-    return;
-  assert(message->base.descriptor == &start_cartridges_update_request__descriptor);
-  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-#define start_cartridges_update_request__field_descriptors NULL
-#define start_cartridges_update_request__field_indices_by_name NULL
-#define start_cartridges_update_request__number_ranges NULL
-const ProtobufCMessageDescriptor start_cartridges_update_request__descriptor =
-{
-  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "",
-  "",
-  "",
-  "",
-  sizeof(StartCartridgesUpdateRequest),
-  0,
-  start_cartridges_update_request__field_descriptors,
-  start_cartridges_update_request__field_indices_by_name,
-  0,  start_cartridges_update_request__number_ranges,
-  (ProtobufCMessageInit) start_cartridges_update_request__init,
-  NULL,NULL,NULL    /* reserved[123] */
-};
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartCartridgesUpdateRequest.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartCartridgesUpdateRequest.pb-c.h
deleted file mode 100644
index f8f2dcf3b..000000000
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartCartridgesUpdateRequest.pb-c.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: StartCartridgesUpdateRequest.proto */
-
-#ifndef PROTOBUF_C_StartCartridgesUpdateRequest_2eproto__INCLUDED
-#define PROTOBUF_C_StartCartridgesUpdateRequest_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 _StartCartridgesUpdateRequest StartCartridgesUpdateRequest;
-
-
-/* --- enums --- */
-
-
-/* --- messages --- */
-
-struct  _StartCartridgesUpdateRequest
-{
-  ProtobufCMessage base;
-};
-#define START_CARTRIDGES_UPDATE_REQUEST__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&start_cartridges_update_request__descriptor) \
-     }
-
-
-/* StartCartridgesUpdateRequest methods */
-void   start_cartridges_update_request__init
-                     (StartCartridgesUpdateRequest         *message);
-size_t start_cartridges_update_request__get_packed_size
-                     (const StartCartridgesUpdateRequest   *message);
-size_t start_cartridges_update_request__pack
-                     (const StartCartridgesUpdateRequest   *message,
-                      uint8_t             *out);
-size_t start_cartridges_update_request__pack_to_buffer
-                     (const StartCartridgesUpdateRequest   *message,
-                      ProtobufCBuffer     *buffer);
-StartCartridgesUpdateRequest *
-       start_cartridges_update_request__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   start_cartridges_update_request__free_unpacked
-                     (StartCartridgesUpdateRequest *message,
-                      ProtobufCAllocator *allocator);
-/* --- per-message closures --- */
-
-typedef void (*StartCartridgesUpdateRequest_Closure)
-                 (const StartCartridgesUpdateRequest *message,
-                  void *closure_data);
-
-/* --- services --- */
-
-
-/* --- descriptors --- */
-
-extern const ProtobufCMessageDescriptor start_cartridges_update_request__descriptor;
-
-PROTOBUF_C__END_DECLS
-
-
-#endif  /* PROTOBUF_C_StartCartridgesUpdateRequest_2eproto__INCLUDED */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartCartridgesUpdateResponse.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartCartridgesUpdateResponse.pb-c.c
deleted file mode 100644
index 0aa54e7ab..000000000
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartCartridgesUpdateResponse.pb-c.c
+++ /dev/null
@@ -1,105 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: StartCartridgesUpdateResponse.proto */
-
-/* Do not generate deprecated warnings for self */
-#ifndef PROTOBUF_C__NO_DEPRECATED
-#define PROTOBUF_C__NO_DEPRECATED
-#endif
-
-#include "StartCartridgesUpdateResponse.pb-c.h"
-void   start_cartridges_update_response__init
-                     (StartCartridgesUpdateResponse         *message)
-{
-  static const StartCartridgesUpdateResponse init_value = START_CARTRIDGES_UPDATE_RESPONSE__INIT;
-  *message = init_value;
-}
-size_t start_cartridges_update_response__get_packed_size
-                     (const StartCartridgesUpdateResponse *message)
-{
-  assert(message->base.descriptor == &start_cartridges_update_response__descriptor);
-  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t start_cartridges_update_response__pack
-                     (const StartCartridgesUpdateResponse *message,
-                      uint8_t       *out)
-{
-  assert(message->base.descriptor == &start_cartridges_update_response__descriptor);
-  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t start_cartridges_update_response__pack_to_buffer
-                     (const StartCartridgesUpdateResponse *message,
-                      ProtobufCBuffer *buffer)
-{
-  assert(message->base.descriptor == &start_cartridges_update_response__descriptor);
-  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-StartCartridgesUpdateResponse *
-       start_cartridges_update_response__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data)
-{
-  return (StartCartridgesUpdateResponse *)
-     protobuf_c_message_unpack (&start_cartridges_update_response__descriptor,
-                                allocator, len, data);
-}
-void   start_cartridges_update_response__free_unpacked
-                     (StartCartridgesUpdateResponse *message,
-                      ProtobufCAllocator *allocator)
-{
-  if(!message)
-    return;
-  assert(message->base.descriptor == &start_cartridges_update_response__descriptor);
-  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-static const ProtobufCFieldDescriptor start_cartridges_update_response__field_descriptors[2] =
-{
-  {
-    "",
-    1,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_MESSAGE,
-    0,   /* quantifier_offset */
-    offsetof(StartCartridgesUpdateResponse, cartridge),
-    &cartridge__descriptor,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    2,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_ENUM,
-    offsetof(StartCartridgesUpdateResponse, has_action),
-    offsetof(StartCartridgesUpdateResponse, action),
-    &cartridge_action__descriptor,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-};
-static const unsigned start_cartridges_update_response__field_indices_by_name[] = {
-  1,   /* field[1] = Action */
-  0,   /* field[0] = Cartridge */
-};
-static const ProtobufCIntRange start_cartridges_update_response__number_ranges[1 + 1] =
-{
-  { 1, 0 },
-  { 0, 2 }
-};
-const ProtobufCMessageDescriptor start_cartridges_update_response__descriptor =
-{
-  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "",
-  "",
-  "",
-  "",
-  sizeof(StartCartridgesUpdateResponse),
-  2,
-  start_cartridges_update_response__field_descriptors,
-  start_cartridges_update_response__field_indices_by_name,
-  1,  start_cartridges_update_response__number_ranges,
-  (ProtobufCMessageInit) start_cartridges_update_response__init,
-  NULL,NULL,NULL    /* reserved[123] */
-};
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartCartridgesUpdateResponse.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartCartridgesUpdateResponse.pb-c.h
deleted file mode 100644
index 409c8ff3f..000000000
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartCartridgesUpdateResponse.pb-c.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: StartCartridgesUpdateResponse.proto */
-
-#ifndef PROTOBUF_C_StartCartridgesUpdateResponse_2eproto__INCLUDED
-#define PROTOBUF_C_StartCartridgesUpdateResponse_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 "Cartridge.pb-c.h"
-#include "CartridgeAction.pb-c.h"
-
-typedef struct _StartCartridgesUpdateResponse StartCartridgesUpdateResponse;
-
-
-/* --- enums --- */
-
-
-/* --- messages --- */
-
-struct  _StartCartridgesUpdateResponse
-{
-  ProtobufCMessage base;
-  Cartridge *cartridge;
-  protobuf_c_boolean has_action;
-  CartridgeAction action;
-};
-#define START_CARTRIDGES_UPDATE_RESPONSE__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&start_cartridges_update_response__descriptor) \
-    , NULL, 0, CARTRIDGE_ACTION__Inserted }
-
-
-/* StartCartridgesUpdateResponse methods */
-void   start_cartridges_update_response__init
-                     (StartCartridgesUpdateResponse         *message);
-size_t start_cartridges_update_response__get_packed_size
-                     (const StartCartridgesUpdateResponse   *message);
-size_t start_cartridges_update_response__pack
-                     (const StartCartridgesUpdateResponse   *message,
-                      uint8_t             *out);
-size_t start_cartridges_update_response__pack_to_buffer
-                     (const StartCartridgesUpdateResponse   *message,
-                      ProtobufCBuffer     *buffer);
-StartCartridgesUpdateResponse *
-       start_cartridges_update_response__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   start_cartridges_update_response__free_unpacked
-                     (StartCartridgesUpdateResponse *message,
-                      ProtobufCAllocator *allocator);
-/* --- per-message closures --- */
-
-typedef void (*StartCartridgesUpdateResponse_Closure)
-                 (const StartCartridgesUpdateResponse *message,
-                  void *closure_data);
-
-/* --- services --- */
-
-
-/* --- descriptors --- */
-
-extern const ProtobufCMessageDescriptor start_cartridges_update_response__descriptor;
-
-PROTOBUF_C__END_DECLS
-
-
-#endif  /* PROTOBUF_C_StartCartridgesUpdateResponse_2eproto__INCLUDED */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingRequest.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingRequest.pb-c.c
deleted file mode 100644
index b56884185..000000000
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingRequest.pb-c.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: StartInkFillingRequest.proto */
-
-/* Do not generate deprecated warnings for self */
-#ifndef PROTOBUF_C__NO_DEPRECATED
-#define PROTOBUF_C__NO_DEPRECATED
-#endif
-
-#include "StartInkFillingRequest.pb-c.h"
-void   start_ink_filling_request__init
-                     (StartInkFillingRequest         *message)
-{
-  static const StartInkFillingRequest init_value = START_INK_FILLING_REQUEST__INIT;
-  *message = init_value;
-}
-size_t start_ink_filling_request__get_packed_size
-                     (const StartInkFillingRequest *message)
-{
-  assert(message->base.descriptor == &start_ink_filling_request__descriptor);
-  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t start_ink_filling_request__pack
-                     (const StartInkFillingRequest *message,
-                      uint8_t       *out)
-{
-  assert(message->base.descriptor == &start_ink_filling_request__descriptor);
-  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t start_ink_filling_request__pack_to_buffer
-                     (const StartInkFillingRequest *message,
-                      ProtobufCBuffer *buffer)
-{
-  assert(message->base.descriptor == &start_ink_filling_request__descriptor);
-  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-StartInkFillingRequest *
-       start_ink_filling_request__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data)
-{
-  return (StartInkFillingRequest *)
-     protobuf_c_message_unpack (&start_ink_filling_request__descriptor,
-                                allocator, len, data);
-}
-void   start_ink_filling_request__free_unpacked
-                     (StartInkFillingRequest *message,
-                      ProtobufCAllocator *allocator)
-{
-  if(!message)
-    return;
-  assert(message->base.descriptor == &start_ink_filling_request__descriptor);
-  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-#define start_ink_filling_request__field_descriptors NULL
-#define start_ink_filling_request__field_indices_by_name NULL
-#define start_ink_filling_request__number_ranges NULL
-const ProtobufCMessageDescriptor start_ink_filling_request__descriptor =
-{
-  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "",
-  "",
-  "",
-  "",
-  sizeof(StartInkFillingRequest),
-  0,
-  start_ink_filling_request__field_descriptors,
-  start_ink_filling_request__field_indices_by_name,
-  0,  start_ink_filling_request__number_ranges,
-  (ProtobufCMessageInit) start_ink_filling_request__init,
-  NULL,NULL,NULL    /* reserved[123] */
-};
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingRequest.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingRequest.pb-c.h
deleted file mode 100644
index bda7b4229..000000000
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingRequest.pb-c.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: StartInkFillingRequest.proto */
-
-#ifndef PROTOBUF_C_StartInkFillingRequest_2eproto__INCLUDED
-#define PROTOBUF_C_StartInkFillingRequest_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 _StartInkFillingRequest StartInkFillingRequest;
-
-
-/* --- enums --- */
-
-
-/* --- messages --- */
-
-struct  _StartInkFillingRequest
-{
-  ProtobufCMessage base;
-};
-#define START_INK_FILLING_REQUEST__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&start_ink_filling_request__descriptor) \
-     }
-
-
-/* StartInkFillingRequest methods */
-void   start_ink_filling_request__init
-                     (StartInkFillingRequest         *message);
-size_t start_ink_filling_request__get_packed_size
-                     (const StartInkFillingRequest   *message);
-size_t start_ink_filling_request__pack
-                     (const StartInkFillingRequest   *message,
-                      uint8_t             *out);
-size_t start_ink_filling_request__pack_to_buffer
-                     (const StartInkFillingRequest   *message,
-                      ProtobufCBuffer     *buffer);
-StartInkFillingRequest *
-       start_ink_filling_request__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   start_ink_filling_request__free_unpacked
-                     (StartInkFillingRequest *message,
-                      ProtobufCAllocator *allocator);
-/* --- per-message closures --- */
-
-typedef void (*StartInkFillingRequest_Closure)
-                 (const StartInkFillingRequest *message,
-                  void *closure_data);
-
-/* --- services --- */
-
-
-/* --- descriptors --- */
-
-extern const ProtobufCMessageDescriptor start_ink_filling_request__descriptor;
-
-PROTOBUF_C__END_DECLS
-
-
-#endif  /* PROTOBUF_C_StartInkFillingRequest_2eproto__INCLUDED */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingResponse.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingResponse.pb-c.c
deleted file mode 100644
index d68ad33e7..000000000
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingResponse.pb-c.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: StartInkFillingResponse.proto */
-
-/* Do not generate deprecated warnings for self */
-#ifndef PROTOBUF_C__NO_DEPRECATED
-#define PROTOBUF_C__NO_DEPRECATED
-#endif
-
-#include "StartInkFillingResponse.pb-c.h"
-void   start_ink_filling_response__init
-                     (StartInkFillingResponse         *message)
-{
-  static const StartInkFillingResponse init_value = START_INK_FILLING_RESPONSE__INIT;
-  *message = init_value;
-}
-size_t start_ink_filling_response__get_packed_size
-                     (const StartInkFillingResponse *message)
-{
-  assert(message->base.descriptor == &start_ink_filling_response__descriptor);
-  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t start_ink_filling_response__pack
-                     (const StartInkFillingResponse *message,
-                      uint8_t       *out)
-{
-  assert(message->base.descriptor == &start_ink_filling_response__descriptor);
-  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t start_ink_filling_response__pack_to_buffer
-                     (const StartInkFillingResponse *message,
-                      ProtobufCBuffer *buffer)
-{
-  assert(message->base.descriptor == &start_ink_filling_response__descriptor);
-  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-StartInkFillingResponse *
-       start_ink_filling_response__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data)
-{
-  return (StartInkFillingResponse *)
-     protobuf_c_message_unpack (&start_ink_filling_response__descriptor,
-                                allocator, len, data);
-}
-void   start_ink_filling_response__free_unpacked
-                     (StartInkFillingResponse *message,
-                      ProtobufCAllocator *allocator)
-{
-  if(!message)
-    return;
-  assert(message->base.descriptor == &start_ink_filling_response__descriptor);
-  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-static const ProtobufCFieldDescriptor start_ink_filling_response__field_descriptors[4] =
-{
-  {
-    "",
-    1,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_MESSAGE,
-    0,   /* quantifier_offset */
-    offsetof(StartInkFillingResponse, cartridge),
-    &cartridge__descriptor,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    2,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_ENUM,
-    offsetof(StartInkFillingResponse, has_action),
-    offsetof(StartInkFillingResponse, action),
-    &filling_action__descriptor,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    3,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(StartInkFillingResponse, has_progresspercentage),
-    offsetof(StartInkFillingResponse, progresspercentage),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    4,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_STRING,
-    0,   /* quantifier_offset */
-    offsetof(StartInkFillingResponse, message),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-};
-static const unsigned start_ink_filling_response__field_indices_by_name[] = {
-  1,   /* field[1] = Action */
-  0,   /* field[0] = Cartridge */
-  3,   /* field[3] = Message */
-  2,   /* field[2] = ProgressPercentage */
-};
-static const ProtobufCIntRange start_ink_filling_response__number_ranges[1 + 1] =
-{
-  { 1, 0 },
-  { 0, 4 }
-};
-const ProtobufCMessageDescriptor start_ink_filling_response__descriptor =
-{
-  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "",
-  "",
-  "",
-  "",
-  sizeof(StartInkFillingResponse),
-  4,
-  start_ink_filling_response__field_descriptors,
-  start_ink_filling_response__field_indices_by_name,
-  1,  start_ink_filling_response__number_ranges,
-  (ProtobufCMessageInit) start_ink_filling_response__init,
-  NULL,NULL,NULL    /* reserved[123] */
-};
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingResponse.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingResponse.pb-c.h
deleted file mode 100644
index 5c1c7ddb2..000000000
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartInkFillingResponse.pb-c.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: StartInkFillingResponse.proto */
-
-#ifndef PROTOBUF_C_StartInkFillingResponse_2eproto__INCLUDED
-#define PROTOBUF_C_StartInkFillingResponse_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 "Cartridge.pb-c.h"
-#include "FillingAction.pb-c.h"
-
-typedef struct _StartInkFillingResponse StartInkFillingResponse;
-
-
-/* --- enums --- */
-
-
-/* --- messages --- */
-
-struct  _StartInkFillingResponse
-{
-  ProtobufCMessage base;
-  Cartridge *cartridge;
-  protobuf_c_boolean has_action;
-  FillingAction action;
-  protobuf_c_boolean has_progresspercentage;
-  double progresspercentage;
-  char *message;
-};
-#define START_INK_FILLING_RESPONSE__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&start_ink_filling_response__descriptor) \
-    , NULL, 0, FILLING_ACTION__None, 0, 0, NULL }
-
-
-/* StartInkFillingResponse methods */
-void   start_ink_filling_response__init
-                     (StartInkFillingResponse         *message);
-size_t start_ink_filling_response__get_packed_size
-                     (const StartInkFillingResponse   *message);
-size_t start_ink_filling_response__pack
-                     (const StartInkFillingResponse   *message,
-                      uint8_t             *out);
-size_t start_ink_filling_response__pack_to_buffer
-                     (const StartInkFillingResponse   *message,
-                      ProtobufCBuffer     *buffer);
-StartInkFillingResponse *
-       start_ink_filling_response__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   start_ink_filling_response__free_unpacked
-                     (StartInkFillingResponse *message,
-                      ProtobufCAllocator *allocator);
-/* --- per-message closures --- */
-
-typedef void (*StartInkFillingResponse_Closure)
-                 (const StartInkFillingResponse *message,
-                  void *closure_data);
-
-/* --- services --- */
-
-
-/* --- descriptors --- */
-
-extern const ProtobufCMessageDescriptor start_ink_filling_response__descriptor;
-
-PROTOBUF_C__END_DECLS
-
-
-#endif  /* PROTOBUF_C_StartInkFillingResponse_2eproto__INCLUDED */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingRequest.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingRequest.pb-c.c
deleted file mode 100644
index 1b9c856fa..000000000
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingRequest.pb-c.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: StartWasteEmptyingRequest.proto */
-
-/* Do not generate deprecated warnings for self */
-#ifndef PROTOBUF_C__NO_DEPRECATED
-#define PROTOBUF_C__NO_DEPRECATED
-#endif
-
-#include "StartWasteEmptyingRequest.pb-c.h"
-void   start_waste_emptying_request__init
-                     (StartWasteEmptyingRequest         *message)
-{
-  static const StartWasteEmptyingRequest init_value = START_WASTE_EMPTYING_REQUEST__INIT;
-  *message = init_value;
-}
-size_t start_waste_emptying_request__get_packed_size
-                     (const StartWasteEmptyingRequest *message)
-{
-  assert(message->base.descriptor == &start_waste_emptying_request__descriptor);
-  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t start_waste_emptying_request__pack
-                     (const StartWasteEmptyingRequest *message,
-                      uint8_t       *out)
-{
-  assert(message->base.descriptor == &start_waste_emptying_request__descriptor);
-  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t start_waste_emptying_request__pack_to_buffer
-                     (const StartWasteEmptyingRequest *message,
-                      ProtobufCBuffer *buffer)
-{
-  assert(message->base.descriptor == &start_waste_emptying_request__descriptor);
-  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-StartWasteEmptyingRequest *
-       start_waste_emptying_request__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data)
-{
-  return (StartWasteEmptyingRequest *)
-     protobuf_c_message_unpack (&start_waste_emptying_request__descriptor,
-                                allocator, len, data);
-}
-void   start_waste_emptying_request__free_unpacked
-                     (StartWasteEmptyingRequest *message,
-                      ProtobufCAllocator *allocator)
-{
-  if(!message)
-    return;
-  assert(message->base.descriptor == &start_waste_emptying_request__descriptor);
-  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-#define start_waste_emptying_request__field_descriptors NULL
-#define start_waste_emptying_request__field_indices_by_name NULL
-#define start_waste_emptying_request__number_ranges NULL
-const ProtobufCMessageDescriptor start_waste_emptying_request__descriptor =
-{
-  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "",
-  "",
-  "",
-  "",
-  sizeof(StartWasteEmptyingRequest),
-  0,
-  start_waste_emptying_request__field_descriptors,
-  start_waste_emptying_request__field_indices_by_name,
-  0,  start_waste_emptying_request__number_ranges,
-  (ProtobufCMessageInit) start_waste_emptying_request__init,
-  NULL,NULL,NULL    /* reserved[123] */
-};
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingRequest.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingRequest.pb-c.h
deleted file mode 100644
index 44a104321..000000000
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingRequest.pb-c.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: StartWasteEmptyingRequest.proto */
-
-#ifndef PROTOBUF_C_StartWasteEmptyingRequest_2eproto__INCLUDED
-#define PROTOBUF_C_StartWasteEmptyingRequest_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 _StartWasteEmptyingRequest StartWasteEmptyingRequest;
-
-
-/* --- enums --- */
-
-
-/* --- messages --- */
-
-struct  _StartWasteEmptyingRequest
-{
-  ProtobufCMessage base;
-};
-#define START_WASTE_EMPTYING_REQUEST__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&start_waste_emptying_request__descriptor) \
-     }
-
-
-/* StartWasteEmptyingRequest methods */
-void   start_waste_emptying_request__init
-                     (StartWasteEmptyingRequest         *message);
-size_t start_waste_emptying_request__get_packed_size
-                     (const StartWasteEmptyingRequest   *message);
-size_t start_waste_emptying_request__pack
-                     (const StartWasteEmptyingRequest   *message,
-                      uint8_t             *out);
-size_t start_waste_emptying_request__pack_to_buffer
-                     (const StartWasteEmptyingRequest   *message,
-                      ProtobufCBuffer     *buffer);
-StartWasteEmptyingRequest *
-       start_waste_emptying_request__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   start_waste_emptying_request__free_unpacked
-                     (StartWasteEmptyingRequest *message,
-                      ProtobufCAllocator *allocator);
-/* --- per-message closures --- */
-
-typedef void (*StartWasteEmptyingRequest_Closure)
-                 (const StartWasteEmptyingRequest *message,
-                  void *closure_data);
-
-/* --- services --- */
-
-
-/* --- descriptors --- */
-
-extern const ProtobufCMessageDescriptor start_waste_emptying_request__descriptor;
-
-PROTOBUF_C__END_DECLS
-
-
-#endif  /* PROTOBUF_C_StartWasteEmptyingRequest_2eproto__INCLUDED */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingResponse.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingResponse.pb-c.c
deleted file mode 100644
index 55ca27102..000000000
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingResponse.pb-c.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: StartWasteEmptyingResponse.proto */
-
-/* Do not generate deprecated warnings for self */
-#ifndef PROTOBUF_C__NO_DEPRECATED
-#define PROTOBUF_C__NO_DEPRECATED
-#endif
-
-#include "StartWasteEmptyingResponse.pb-c.h"
-void   start_waste_emptying_response__init
-                     (StartWasteEmptyingResponse         *message)
-{
-  static const StartWasteEmptyingResponse init_value = START_WASTE_EMPTYING_RESPONSE__INIT;
-  *message = init_value;
-}
-size_t start_waste_emptying_response__get_packed_size
-                     (const StartWasteEmptyingResponse *message)
-{
-  assert(message->base.descriptor == &start_waste_emptying_response__descriptor);
-  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t start_waste_emptying_response__pack
-                     (const StartWasteEmptyingResponse *message,
-                      uint8_t       *out)
-{
-  assert(message->base.descriptor == &start_waste_emptying_response__descriptor);
-  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t start_waste_emptying_response__pack_to_buffer
-                     (const StartWasteEmptyingResponse *message,
-                      ProtobufCBuffer *buffer)
-{
-  assert(message->base.descriptor == &start_waste_emptying_response__descriptor);
-  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-StartWasteEmptyingResponse *
-       start_waste_emptying_response__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data)
-{
-  return (StartWasteEmptyingResponse *)
-     protobuf_c_message_unpack (&start_waste_emptying_response__descriptor,
-                                allocator, len, data);
-}
-void   start_waste_emptying_response__free_unpacked
-                     (StartWasteEmptyingResponse *message,
-                      ProtobufCAllocator *allocator)
-{
-  if(!message)
-    return;
-  assert(message->base.descriptor == &start_waste_emptying_response__descriptor);
-  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-static const ProtobufCFieldDescriptor start_waste_emptying_response__field_descriptors[4] =
-{
-  {
-    "",
-    1,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_MESSAGE,
-    0,   /* quantifier_offset */
-    offsetof(StartWasteEmptyingResponse, cartridge),
-    &cartridge__descriptor,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    2,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_ENUM,
-    offsetof(StartWasteEmptyingResponse, has_action),
-    offsetof(StartWasteEmptyingResponse, action),
-    &filling_action__descriptor,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    3,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_DOUBLE,
-    offsetof(StartWasteEmptyingResponse, has_progresspercentage),
-    offsetof(StartWasteEmptyingResponse, progresspercentage),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    4,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_STRING,
-    0,   /* quantifier_offset */
-    offsetof(StartWasteEmptyingResponse, message),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-};
-static const unsigned start_waste_emptying_response__field_indices_by_name[] = {
-  1,   /* field[1] = Action */
-  0,   /* field[0] = Cartridge */
-  3,   /* field[3] = Message */
-  2,   /* field[2] = ProgressPercentage */
-};
-static const ProtobufCIntRange start_waste_emptying_response__number_ranges[1 + 1] =
-{
-  { 1, 0 },
-  { 0, 4 }
-};
-const ProtobufCMessageDescriptor start_waste_emptying_response__descriptor =
-{
-  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "",
-  "",
-  "",
-  "",
-  sizeof(StartWasteEmptyingResponse),
-  4,
-  start_waste_emptying_response__field_descriptors,
-  start_waste_emptying_response__field_indices_by_name,
-  1,  start_waste_emptying_response__number_ranges,
-  (ProtobufCMessageInit) start_waste_emptying_response__init,
-  NULL,NULL,NULL    /* reserved[123] */
-};
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingResponse.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingResponse.pb-c.h
deleted file mode 100644
index 11254b220..000000000
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StartWasteEmptyingResponse.pb-c.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: StartWasteEmptyingResponse.proto */
-
-#ifndef PROTOBUF_C_StartWasteEmptyingResponse_2eproto__INCLUDED
-#define PROTOBUF_C_StartWasteEmptyingResponse_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 "Cartridge.pb-c.h"
-#include "FillingAction.pb-c.h"
-
-typedef struct _StartWasteEmptyingResponse StartWasteEmptyingResponse;
-
-
-/* --- enums --- */
-
-
-/* --- messages --- */
-
-struct  _StartWasteEmptyingResponse
-{
-  ProtobufCMessage base;
-  Cartridge *cartridge;
-  protobuf_c_boolean has_action;
-  FillingAction action;
-  protobuf_c_boolean has_progresspercentage;
-  double progresspercentage;
-  char *message;
-};
-#define START_WASTE_EMPTYING_RESPONSE__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&start_waste_emptying_response__descriptor) \
-    , NULL, 0, FILLING_ACTION__None, 0, 0, NULL }
-
-
-/* StartWasteEmptyingResponse methods */
-void   start_waste_emptying_response__init
-                     (StartWasteEmptyingResponse         *message);
-size_t start_waste_emptying_response__get_packed_size
-                     (const StartWasteEmptyingResponse   *message);
-size_t start_waste_emptying_response__pack
-                     (const StartWasteEmptyingResponse   *message,
-                      uint8_t             *out);
-size_t start_waste_emptying_response__pack_to_buffer
-                     (const StartWasteEmptyingResponse   *message,
-                      ProtobufCBuffer     *buffer);
-StartWasteEmptyingResponse *
-       start_waste_emptying_response__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   start_waste_emptying_response__free_unpacked
-                     (StartWasteEmptyingResponse *message,
-                      ProtobufCAllocator *allocator);
-/* --- per-message closures --- */
-
-typedef void (*StartWasteEmptyingResponse_Closure)
-                 (const StartWasteEmptyingResponse *message,
-                  void *closure_data);
-
-/* --- services --- */
-
-
-/* --- descriptors --- */
-
-extern const ProtobufCMessageDescriptor start_waste_emptying_response__descriptor;
-
-PROTOBUF_C__END_DECLS
-
-
-#endif  /* PROTOBUF_C_StartWasteEmptyingResponse_2eproto__INCLUDED */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StopCartridgesUpdateRequest.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StopCartridgesUpdateRequest.pb-c.c
deleted file mode 100644
index 729dd6298..000000000
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StopCartridgesUpdateRequest.pb-c.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: StopCartridgesUpdateRequest.proto */
-
-/* Do not generate deprecated warnings for self */
-#ifndef PROTOBUF_C__NO_DEPRECATED
-#define PROTOBUF_C__NO_DEPRECATED
-#endif
-
-#include "StopCartridgesUpdateRequest.pb-c.h"
-void   stop_cartridges_update_request__init
-                     (StopCartridgesUpdateRequest         *message)
-{
-  static const StopCartridgesUpdateRequest init_value = STOP_CARTRIDGES_UPDATE_REQUEST__INIT;
-  *message = init_value;
-}
-size_t stop_cartridges_update_request__get_packed_size
-                     (const StopCartridgesUpdateRequest *message)
-{
-  assert(message->base.descriptor == &stop_cartridges_update_request__descriptor);
-  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t stop_cartridges_update_request__pack
-                     (const StopCartridgesUpdateRequest *message,
-                      uint8_t       *out)
-{
-  assert(message->base.descriptor == &stop_cartridges_update_request__descriptor);
-  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t stop_cartridges_update_request__pack_to_buffer
-                     (const StopCartridgesUpdateRequest *message,
-                      ProtobufCBuffer *buffer)
-{
-  assert(message->base.descriptor == &stop_cartridges_update_request__descriptor);
-  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-StopCartridgesUpdateRequest *
-       stop_cartridges_update_request__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data)
-{
-  return (StopCartridgesUpdateRequest *)
-     protobuf_c_message_unpack (&stop_cartridges_update_request__descriptor,
-                                allocator, len, data);
-}
-void   stop_cartridges_update_request__free_unpacked
-                     (StopCartridgesUpdateRequest *message,
-                      ProtobufCAllocator *allocator)
-{
-  if(!message)
-    return;
-  assert(message->base.descriptor == &stop_cartridges_update_request__descriptor);
-  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-#define stop_cartridges_update_request__field_descriptors NULL
-#define stop_cartridges_update_request__field_indices_by_name NULL
-#define stop_cartridges_update_request__number_ranges NULL
-const ProtobufCMessageDescriptor stop_cartridges_update_request__descriptor =
-{
-  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "",
-  "",
-  "",
-  "",
-  sizeof(StopCartridgesUpdateRequest),
-  0,
-  stop_cartridges_update_request__field_descriptors,
-  stop_cartridges_update_request__field_indices_by_name,
-  0,  stop_cartridges_update_request__number_ranges,
-  (ProtobufCMessageInit) stop_cartridges_update_request__init,
-  NULL,NULL,NULL    /* reserved[123] */
-};
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StopCartridgesUpdateRequest.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StopCartridgesUpdateRequest.pb-c.h
deleted file mode 100644
index 5a1b486c9..000000000
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StopCartridgesUpdateRequest.pb-c.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: StopCartridgesUpdateRequest.proto */
-
-#ifndef PROTOBUF_C_StopCartridgesUpdateRequest_2eproto__INCLUDED
-#define PROTOBUF_C_StopCartridgesUpdateRequest_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 _StopCartridgesUpdateRequest StopCartridgesUpdateRequest;
-
-
-/* --- enums --- */
-
-
-/* --- messages --- */
-
-struct  _StopCartridgesUpdateRequest
-{
-  ProtobufCMessage base;
-};
-#define STOP_CARTRIDGES_UPDATE_REQUEST__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&stop_cartridges_update_request__descriptor) \
-     }
-
-
-/* StopCartridgesUpdateRequest methods */
-void   stop_cartridges_update_request__init
-                     (StopCartridgesUpdateRequest         *message);
-size_t stop_cartridges_update_request__get_packed_size
-                     (const StopCartridgesUpdateRequest   *message);
-size_t stop_cartridges_update_request__pack
-                     (const StopCartridgesUpdateRequest   *message,
-                      uint8_t             *out);
-size_t stop_cartridges_update_request__pack_to_buffer
-                     (const StopCartridgesUpdateRequest   *message,
-                      ProtobufCBuffer     *buffer);
-StopCartridgesUpdateRequest *
-       stop_cartridges_update_request__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   stop_cartridges_update_request__free_unpacked
-                     (StopCartridgesUpdateRequest *message,
-                      ProtobufCAllocator *allocator);
-/* --- per-message closures --- */
-
-typedef void (*StopCartridgesUpdateRequest_Closure)
-                 (const StopCartridgesUpdateRequest *message,
-                  void *closure_data);
-
-/* --- services --- */
-
-
-/* --- descriptors --- */
-
-extern const ProtobufCMessageDescriptor stop_cartridges_update_request__descriptor;
-
-PROTOBUF_C__END_DECLS
-
-
-#endif  /* PROTOBUF_C_StopCartridgesUpdateRequest_2eproto__INCLUDED */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StopCartridgesUpdateResponse.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StopCartridgesUpdateResponse.pb-c.c
deleted file mode 100644
index fc499aa79..000000000
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StopCartridgesUpdateResponse.pb-c.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: StopCartridgesUpdateResponse.proto */
-
-/* Do not generate deprecated warnings for self */
-#ifndef PROTOBUF_C__NO_DEPRECATED
-#define PROTOBUF_C__NO_DEPRECATED
-#endif
-
-#include "StopCartridgesUpdateResponse.pb-c.h"
-void   stop_cartridges_update_response__init
-                     (StopCartridgesUpdateResponse         *message)
-{
-  static const StopCartridgesUpdateResponse init_value = STOP_CARTRIDGES_UPDATE_RESPONSE__INIT;
-  *message = init_value;
-}
-size_t stop_cartridges_update_response__get_packed_size
-                     (const StopCartridgesUpdateResponse *message)
-{
-  assert(message->base.descriptor == &stop_cartridges_update_response__descriptor);
-  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
-}
-size_t stop_cartridges_update_response__pack
-                     (const StopCartridgesUpdateResponse *message,
-                      uint8_t       *out)
-{
-  assert(message->base.descriptor == &stop_cartridges_update_response__descriptor);
-  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
-}
-size_t stop_cartridges_update_response__pack_to_buffer
-                     (const StopCartridgesUpdateResponse *message,
-                      ProtobufCBuffer *buffer)
-{
-  assert(message->base.descriptor == &stop_cartridges_update_response__descriptor);
-  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
-}
-StopCartridgesUpdateResponse *
-       stop_cartridges_update_response__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data)
-{
-  return (StopCartridgesUpdateResponse *)
-     protobuf_c_message_unpack (&stop_cartridges_update_response__descriptor,
-                                allocator, len, data);
-}
-void   stop_cartridges_update_response__free_unpacked
-                     (StopCartridgesUpdateResponse *message,
-                      ProtobufCAllocator *allocator)
-{
-  if(!message)
-    return;
-  assert(message->base.descriptor == &stop_cartridges_update_response__descriptor);
-  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
-}
-#define stop_cartridges_update_response__field_descriptors NULL
-#define stop_cartridges_update_response__field_indices_by_name NULL
-#define stop_cartridges_update_response__number_ranges NULL
-const ProtobufCMessageDescriptor stop_cartridges_update_response__descriptor =
-{
-  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "",
-  "",
-  "",
-  "",
-  sizeof(StopCartridgesUpdateResponse),
-  0,
-  stop_cartridges_update_response__field_descriptors,
-  stop_cartridges_update_response__field_indices_by_name,
-  0,  stop_cartridges_update_response__number_ranges,
-  (ProtobufCMessageInit) stop_cartridges_update_response__init,
-  NULL,NULL,NULL    /* reserved[123] */
-};
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StopCartridgesUpdateResponse.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StopCartridgesUpdateResponse.pb-c.h
deleted file mode 100644
index f173eaa69..000000000
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/StopCartridgesUpdateResponse.pb-c.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: StopCartridgesUpdateResponse.proto */
-
-#ifndef PROTOBUF_C_StopCartridgesUpdateResponse_2eproto__INCLUDED
-#define PROTOBUF_C_StopCartridgesUpdateResponse_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 _StopCartridgesUpdateResponse StopCartridgesUpdateResponse;
-
-
-/* --- enums --- */
-
-
-/* --- messages --- */
-
-struct  _StopCartridgesUpdateResponse
-{
-  ProtobufCMessage base;
-};
-#define STOP_CARTRIDGES_UPDATE_RESPONSE__INIT \
- { PROTOBUF_C_MESSAGE_INIT (&stop_cartridges_update_response__descriptor) \
-     }
-
-
-/* StopCartridgesUpdateResponse methods */
-void   stop_cartridges_update_response__init
-                     (StopCartridgesUpdateResponse         *message);
-size_t stop_cartridges_update_response__get_packed_size
-                     (const StopCartridgesUpdateResponse   *message);
-size_t stop_cartridges_update_response__pack
-                     (const StopCartridgesUpdateResponse   *message,
-                      uint8_t             *out);
-size_t stop_cartridges_update_response__pack_to_buffer
-                     (const StopCartridgesUpdateResponse   *message,
-                      ProtobufCBuffer     *buffer);
-StopCartridgesUpdateResponse *
-       stop_cartridges_update_response__unpack
-                     (ProtobufCAllocator  *allocator,
-                      size_t               len,
-                      const uint8_t       *data);
-void   stop_cartridges_update_response__free_unpacked
-                     (StopCartridgesUpdateResponse *message,
-                      ProtobufCAllocator *allocator);
-/* --- per-message closures --- */
-
-typedef void (*StopCartridgesUpdateResponse_Closure)
-                 (const StopCartridgesUpdateResponse *message,
-                  void *closure_data);
-
-/* --- services --- */
-
-
-/* --- descriptors --- */
-
-extern const ProtobufCMessageDescriptor stop_cartridges_update_response__descriptor;
-
-PROTOBUF_C__END_DECLS
-
-
-#endif  /* PROTOBUF_C_StopCartridgesUpdateResponse_2eproto__INCLUDED */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeState.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeState.pb-c.c
new file mode 100644
index 000000000..3c228ede9
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeState.pb-c.c
@@ -0,0 +1,55 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: CartridgeState.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "CartridgeState.pb-c.h"
+static const ProtobufCEnumValue cartridge_state__enum_values_by_number[11] =
+{
+  { "", "", 0 },
+  { "", "", 1 },
+  { "", "", 2 },
+  { "", "", 3 },
+  { "", "", 4 },
+  { "", "", 5 },
+  { "", "", 6 },
+  { "", "", 7 },
+  { "", "", 8 },
+  { "", "", 9 },
+  { "", "", 10 },
+};
+static const ProtobufCIntRange cartridge_state__value_ranges[] = {
+{0, 0},{0, 11}
+};
+static const ProtobufCEnumValueIndex cartridge_state__enum_values_by_name[11] =
+{
+  { "", 1 },
+  { "", 8 },
+  { "", 6 },
+  { "", 7 },
+  { "", 10 },
+  { "", 2 },
+  { "", 4 },
+  { "", 5 },
+  { "", 9 },
+  { "", 3 },
+  { "", 0 },
+};
+const ProtobufCEnumDescriptor cartridge_state__descriptor =
+{
+  PROTOBUF_C__ENUM_DESCRIPTOR_MAGIC,
+  "",
+  "",
+  "",
+  "",
+  11,
+  cartridge_state__enum_values_by_number,
+  11,
+  cartridge_state__enum_values_by_name,
+  1,
+  cartridge_state__value_ranges,
+  NULL,NULL,NULL,NULL   /* reserved[1234] */
+};
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeState.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeState.pb-c.h
new file mode 100644
index 000000000..5d3cd4bb5
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeState.pb-c.h
@@ -0,0 +1,52 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: CartridgeState.proto */
+
+#ifndef PROTOBUF_C_CartridgeState_2eproto__INCLUDED
+#define PROTOBUF_C_CartridgeState_2eproto__INCLUDED
+
+#include <protobuf-c/protobuf-c.h>
+
+PROTOBUF_C__BEGIN_DECLS
+
+#if PROTOBUF_C_VERSION_NUMBER < 1003000
+# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
+#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
+# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c.
+#endif
+
+
+
+
+/* --- enums --- */
+
+typedef enum _CartridgeState {
+  CARTRIDGE_STATE__None = 0,
+  CARTRIDGE_STATE__Absent = 1,
+  CARTRIDGE_STATE__Exists = 2,
+  CARTRIDGE_STATE__Inserted = 3,
+  CARTRIDGE_STATE__Filling = 4,
+  CARTRIDGE_STATE__FillingCompleted = 5,
+  CARTRIDGE_STATE__Emptying = 6,
+  CARTRIDGE_STATE__EmptyingCompleted = 7,
+  CARTRIDGE_STATE__Empty = 8,
+  CARTRIDGE_STATE__Full = 9,
+  CARTRIDGE_STATE__Error = 10
+    PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(CARTRIDGE_STATE)
+} CartridgeState;
+
+/* --- messages --- */
+
+/* --- per-message closures --- */
+
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCEnumDescriptor    cartridge_state__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_CartridgeState_2eproto__INCLUDED */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeStatus.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeStatus.pb-c.c
new file mode 100644
index 000000000..4c4e67fb6
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeStatus.pb-c.c
@@ -0,0 +1,131 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: CartridgeStatus.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "CartridgeStatus.pb-c.h"
+void   cartridge_status__init
+                     (CartridgeStatus         *message)
+{
+  static const CartridgeStatus init_value = CARTRIDGE_STATUS__INIT;
+  *message = init_value;
+}
+size_t cartridge_status__get_packed_size
+                     (const CartridgeStatus *message)
+{
+  assert(message->base.descriptor == &cartridge_status__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t cartridge_status__pack
+                     (const CartridgeStatus *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &cartridge_status__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t cartridge_status__pack_to_buffer
+                     (const CartridgeStatus *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &cartridge_status__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+CartridgeStatus *
+       cartridge_status__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (CartridgeStatus *)
+     protobuf_c_message_unpack (&cartridge_status__descriptor,
+                                allocator, len, data);
+}
+void   cartridge_status__free_unpacked
+                     (CartridgeStatus *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &cartridge_status__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor cartridge_status__field_descriptors[4] =
+{
+  {
+    "",
+    1,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_MESSAGE,
+    0,   /* quantifier_offset */
+    offsetof(CartridgeStatus, cartridge),
+    &cartridge__descriptor,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "",
+    2,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_ENUM,
+    offsetof(CartridgeStatus, has_state),
+    offsetof(CartridgeStatus, state),
+    &cartridge_state__descriptor,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "",
+    3,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(CartridgeStatus, has_progresspercentage),
+    offsetof(CartridgeStatus, progresspercentage),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "",
+    4,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_STRING,
+    0,   /* quantifier_offset */
+    offsetof(CartridgeStatus, message),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned cartridge_status__field_indices_by_name[] = {
+  0,   /* field[0] = Cartridge */
+  3,   /* field[3] = Message */
+  2,   /* field[2] = ProgressPercentage */
+  1,   /* field[1] = State */
+};
+static const ProtobufCIntRange cartridge_status__number_ranges[1 + 1] =
+{
+  { 1, 0 },
+  { 0, 4 }
+};
+const ProtobufCMessageDescriptor cartridge_status__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "",
+  "",
+  "",
+  "",
+  sizeof(CartridgeStatus),
+  4,
+  cartridge_status__field_descriptors,
+  cartridge_status__field_indices_by_name,
+  1,  cartridge_status__number_ranges,
+  (ProtobufCMessageInit) cartridge_status__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeStatus.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeStatus.pb-c.h
new file mode 100644
index 000000000..e3e511e13
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/CartridgeStatus.pb-c.h
@@ -0,0 +1,78 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: CartridgeStatus.proto */
+
+#ifndef PROTOBUF_C_CartridgeStatus_2eproto__INCLUDED
+#define PROTOBUF_C_CartridgeStatus_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 "Cartridge.pb-c.h"
+#include "CartridgeState.pb-c.h"
+
+typedef struct _CartridgeStatus CartridgeStatus;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _CartridgeStatus
+{
+  ProtobufCMessage base;
+  Cartridge *cartridge;
+  protobuf_c_boolean has_state;
+  CartridgeState state;
+  protobuf_c_boolean has_progresspercentage;
+  double progresspercentage;
+  char *message;
+};
+#define CARTRIDGE_STATUS__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&cartridge_status__descriptor) \
+    , NULL, 0, CARTRIDGE_STATE__None, 0, 0, NULL }
+
+
+/* CartridgeStatus methods */
+void   cartridge_status__init
+                     (CartridgeStatus         *message);
+size_t cartridge_status__get_packed_size
+                     (const CartridgeStatus   *message);
+size_t cartridge_status__pack
+                     (const CartridgeStatus   *message,
+                      uint8_t             *out);
+size_t cartridge_status__pack_to_buffer
+                     (const CartridgeStatus   *message,
+                      ProtobufCBuffer     *buffer);
+CartridgeStatus *
+       cartridge_status__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   cartridge_status__free_unpacked
+                     (CartridgeStatus *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*CartridgeStatus_Closure)
+                 (const CartridgeStatus *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor cartridge_status__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_CartridgeStatus_2eproto__INCLUDED */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/IFS/InkFillingStatus.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/InkFillingStatus.pb-c.c
new file mode 100644
index 000000000..0054a4146
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/InkFillingStatus.pb-c.c
@@ -0,0 +1,92 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: InkFillingStatus.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "InkFillingStatus.pb-c.h"
+void   ink_filling_status__init
+                     (InkFillingStatus         *message)
+{
+  static const InkFillingStatus init_value = INK_FILLING_STATUS__INIT;
+  *message = init_value;
+}
+size_t ink_filling_status__get_packed_size
+                     (const InkFillingStatus *message)
+{
+  assert(message->base.descriptor == &ink_filling_status__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t ink_filling_status__pack
+                     (const InkFillingStatus *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &ink_filling_status__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t ink_filling_status__pack_to_buffer
+                     (const InkFillingStatus *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &ink_filling_status__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+InkFillingStatus *
+       ink_filling_status__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (InkFillingStatus *)
+     protobuf_c_message_unpack (&ink_filling_status__descriptor,
+                                allocator, len, data);
+}
+void   ink_filling_status__free_unpacked
+                     (InkFillingStatus *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &ink_filling_status__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor ink_filling_status__field_descriptors[1] =
+{
+  {
+    "",
+    1,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_MESSAGE,
+    offsetof(InkFillingStatus, n_cartridgesstatuses),
+    offsetof(InkFillingStatus, cartridgesstatuses),
+    &cartridge_status__descriptor,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned ink_filling_status__field_indices_by_name[] = {
+  0,   /* field[0] = CartridgesStatuses */
+};
+static const ProtobufCIntRange ink_filling_status__number_ranges[1 + 1] =
+{
+  { 1, 0 },
+  { 0, 1 }
+};
+const ProtobufCMessageDescriptor ink_filling_status__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "",
+  "",
+  "",
+  "",
+  sizeof(InkFillingStatus),
+  1,
+  ink_filling_status__field_descriptors,
+  ink_filling_status__field_indices_by_name,
+  1,  ink_filling_status__number_ranges,
+  (ProtobufCMessageInit) ink_filling_status__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/IFS/InkFillingStatus.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/InkFillingStatus.pb-c.h
new file mode 100644
index 000000000..61e9317a5
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/InkFillingStatus.pb-c.h
@@ -0,0 +1,73 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: InkFillingStatus.proto */
+
+#ifndef PROTOBUF_C_InkFillingStatus_2eproto__INCLUDED
+#define PROTOBUF_C_InkFillingStatus_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 "CartridgeStatus.pb-c.h"
+
+typedef struct _InkFillingStatus InkFillingStatus;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _InkFillingStatus
+{
+  ProtobufCMessage base;
+  size_t n_cartridgesstatuses;
+  CartridgeStatus **cartridgesstatuses;
+};
+#define INK_FILLING_STATUS__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&ink_filling_status__descriptor) \
+    , 0,NULL }
+
+
+/* InkFillingStatus methods */
+void   ink_filling_status__init
+                     (InkFillingStatus         *message);
+size_t ink_filling_status__get_packed_size
+                     (const InkFillingStatus   *message);
+size_t ink_filling_status__pack
+                     (const InkFillingStatus   *message,
+                      uint8_t             *out);
+size_t ink_filling_status__pack_to_buffer
+                     (const InkFillingStatus   *message,
+                      ProtobufCBuffer     *buffer);
+InkFillingStatus *
+       ink_filling_status__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   ink_filling_status__free_unpacked
+                     (InkFillingStatus *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*InkFillingStatus_Closure)
+                 (const InkFillingStatus *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor ink_filling_status__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_InkFillingStatus_2eproto__INCLUDED */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/IFS/StartInkFillingStatusRequest.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/StartInkFillingStatusRequest.pb-c.c
new file mode 100644
index 000000000..f0d651073
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/StartInkFillingStatusRequest.pb-c.c
@@ -0,0 +1,72 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: StartInkFillingStatusRequest.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "StartInkFillingStatusRequest.pb-c.h"
+void   start_ink_filling_status_request__init
+                     (StartInkFillingStatusRequest         *message)
+{
+  static const StartInkFillingStatusRequest init_value = START_INK_FILLING_STATUS_REQUEST__INIT;
+  *message = init_value;
+}
+size_t start_ink_filling_status_request__get_packed_size
+                     (const StartInkFillingStatusRequest *message)
+{
+  assert(message->base.descriptor == &start_ink_filling_status_request__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t start_ink_filling_status_request__pack
+                     (const StartInkFillingStatusRequest *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &start_ink_filling_status_request__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t start_ink_filling_status_request__pack_to_buffer
+                     (const StartInkFillingStatusRequest *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &start_ink_filling_status_request__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+StartInkFillingStatusRequest *
+       start_ink_filling_status_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (StartInkFillingStatusRequest *)
+     protobuf_c_message_unpack (&start_ink_filling_status_request__descriptor,
+                                allocator, len, data);
+}
+void   start_ink_filling_status_request__free_unpacked
+                     (StartInkFillingStatusRequest *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &start_ink_filling_status_request__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+#define start_ink_filling_status_request__field_descriptors NULL
+#define start_ink_filling_status_request__field_indices_by_name NULL
+#define start_ink_filling_status_request__number_ranges NULL
+const ProtobufCMessageDescriptor start_ink_filling_status_request__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "",
+  "",
+  "",
+  "",
+  sizeof(StartInkFillingStatusRequest),
+  0,
+  start_ink_filling_status_request__field_descriptors,
+  start_ink_filling_status_request__field_indices_by_name,
+  0,  start_ink_filling_status_request__number_ranges,
+  (ProtobufCMessageInit) start_ink_filling_status_request__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/IFS/StartInkFillingStatusRequest.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/StartInkFillingStatusRequest.pb-c.h
new file mode 100644
index 000000000..863a8df2f
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/StartInkFillingStatusRequest.pb-c.h
@@ -0,0 +1,70 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: StartInkFillingStatusRequest.proto */
+
+#ifndef PROTOBUF_C_StartInkFillingStatusRequest_2eproto__INCLUDED
+#define PROTOBUF_C_StartInkFillingStatusRequest_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 _StartInkFillingStatusRequest StartInkFillingStatusRequest;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _StartInkFillingStatusRequest
+{
+  ProtobufCMessage base;
+};
+#define START_INK_FILLING_STATUS_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&start_ink_filling_status_request__descriptor) \
+     }
+
+
+/* StartInkFillingStatusRequest methods */
+void   start_ink_filling_status_request__init
+                     (StartInkFillingStatusRequest         *message);
+size_t start_ink_filling_status_request__get_packed_size
+                     (const StartInkFillingStatusRequest   *message);
+size_t start_ink_filling_status_request__pack
+                     (const StartInkFillingStatusRequest   *message,
+                      uint8_t             *out);
+size_t start_ink_filling_status_request__pack_to_buffer
+                     (const StartInkFillingStatusRequest   *message,
+                      ProtobufCBuffer     *buffer);
+StartInkFillingStatusRequest *
+       start_ink_filling_status_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   start_ink_filling_status_request__free_unpacked
+                     (StartInkFillingStatusRequest *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*StartInkFillingStatusRequest_Closure)
+                 (const StartInkFillingStatusRequest *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor start_ink_filling_status_request__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_StartInkFillingStatusRequest_2eproto__INCLUDED */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/IFS/StartInkFillingStatusResponse.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/StartInkFillingStatusResponse.pb-c.c
new file mode 100644
index 000000000..e5d5c2303
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/StartInkFillingStatusResponse.pb-c.c
@@ -0,0 +1,92 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: StartInkFillingStatusResponse.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "StartInkFillingStatusResponse.pb-c.h"
+void   start_ink_filling_status_response__init
+                     (StartInkFillingStatusResponse         *message)
+{
+  static const StartInkFillingStatusResponse init_value = START_INK_FILLING_STATUS_RESPONSE__INIT;
+  *message = init_value;
+}
+size_t start_ink_filling_status_response__get_packed_size
+                     (const StartInkFillingStatusResponse *message)
+{
+  assert(message->base.descriptor == &start_ink_filling_status_response__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t start_ink_filling_status_response__pack
+                     (const StartInkFillingStatusResponse *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &start_ink_filling_status_response__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t start_ink_filling_status_response__pack_to_buffer
+                     (const StartInkFillingStatusResponse *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &start_ink_filling_status_response__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+StartInkFillingStatusResponse *
+       start_ink_filling_status_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (StartInkFillingStatusResponse *)
+     protobuf_c_message_unpack (&start_ink_filling_status_response__descriptor,
+                                allocator, len, data);
+}
+void   start_ink_filling_status_response__free_unpacked
+                     (StartInkFillingStatusResponse *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &start_ink_filling_status_response__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor start_ink_filling_status_response__field_descriptors[1] =
+{
+  {
+    "",
+    1,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_MESSAGE,
+    0,   /* quantifier_offset */
+    offsetof(StartInkFillingStatusResponse, status),
+    &ink_filling_status__descriptor,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned start_ink_filling_status_response__field_indices_by_name[] = {
+  0,   /* field[0] = Status */
+};
+static const ProtobufCIntRange start_ink_filling_status_response__number_ranges[1 + 1] =
+{
+  { 1, 0 },
+  { 0, 1 }
+};
+const ProtobufCMessageDescriptor start_ink_filling_status_response__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "",
+  "",
+  "",
+  "",
+  sizeof(StartInkFillingStatusResponse),
+  1,
+  start_ink_filling_status_response__field_descriptors,
+  start_ink_filling_status_response__field_indices_by_name,
+  1,  start_ink_filling_status_response__number_ranges,
+  (ProtobufCMessageInit) start_ink_filling_status_response__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/IFS/StartInkFillingStatusResponse.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/StartInkFillingStatusResponse.pb-c.h
new file mode 100644
index 000000000..f81547859
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/IFS/StartInkFillingStatusResponse.pb-c.h
@@ -0,0 +1,72 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: StartInkFillingStatusResponse.proto */
+
+#ifndef PROTOBUF_C_StartInkFillingStatusResponse_2eproto__INCLUDED
+#define PROTOBUF_C_StartInkFillingStatusResponse_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 "InkFillingStatus.pb-c.h"
+
+typedef struct _StartInkFillingStatusResponse StartInkFillingStatusResponse;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _StartInkFillingStatusResponse
+{
+  ProtobufCMessage base;
+  InkFillingStatus *status;
+};
+#define START_INK_FILLING_STATUS_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&start_ink_filling_status_response__descriptor) \
+    , NULL }
+
+
+/* StartInkFillingStatusResponse methods */
+void   start_ink_filling_status_response__init
+                     (StartInkFillingStatusResponse         *message);
+size_t start_ink_filling_status_response__get_packed_size
+                     (const StartInkFillingStatusResponse   *message);
+size_t start_ink_filling_status_response__pack
+                     (const StartInkFillingStatusResponse   *message,
+                      uint8_t             *out);
+size_t start_ink_filling_status_response__pack_to_buffer
+                     (const StartInkFillingStatusResponse   *message,
+                      ProtobufCBuffer     *buffer);
+StartInkFillingStatusResponse *
+       start_ink_filling_status_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   start_ink_filling_status_response__free_unpacked
+                     (StartInkFillingStatusResponse *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*StartInkFillingStatusResponse_Closure)
+                 (const StartInkFillingStatusResponse *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor start_ink_filling_status_response__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_StartInkFillingStatusResponse_2eproto__INCLUDED */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/MachineStatus.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/MachineStatus.pb-c.c
index 7b73b08b9..ad257ca79 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/MachineStatus.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/MachineStatus.pb-c.c
@@ -52,7 +52,7 @@ void   machine_status__free_unpacked
   assert(message->base.descriptor == &machine_status__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor machine_status__field_descriptors[6] =
+static const ProtobufCFieldDescriptor machine_status__field_descriptors[4] =
 {
   {
     "",
@@ -102,35 +102,9 @@ static const ProtobufCFieldDescriptor machine_status__field_descriptors[6] =
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
-  {
-    "",
-    5,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_ENUM,
-    offsetof(MachineStatus, has_middlecartridgestate),
-    offsetof(MachineStatus, middlecartridgestate),
-    &waste_cartridge_state__descriptor,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    6,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_ENUM,
-    offsetof(MachineStatus, has_lowercartridgestate),
-    offsetof(MachineStatus, lowercartridgestate),
-    &waste_cartridge_state__descriptor,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
 };
 static const unsigned machine_status__field_indices_by_name[] = {
   1,   /* field[1] = IDSPacksLevels */
-  5,   /* field[5] = LowerCartridgeState */
-  4,   /* field[4] = MiddleCartridgeState */
   2,   /* field[2] = OverallTemperature */
   3,   /* field[3] = SpoolState */
   0,   /* field[0] = State */
@@ -138,7 +112,7 @@ static const unsigned machine_status__field_indices_by_name[] = {
 static const ProtobufCIntRange machine_status__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 6 }
+  { 0, 4 }
 };
 const ProtobufCMessageDescriptor machine_status__descriptor =
 {
@@ -148,7 +122,7 @@ const ProtobufCMessageDescriptor machine_status__descriptor =
   "",
   "",
   sizeof(MachineStatus),
-  6,
+  4,
   machine_status__field_descriptors,
   machine_status__field_indices_by_name,
   1,  machine_status__number_ranges,
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/MachineStatus.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/MachineStatus.pb-c.h
index a8e12e87f..003fcd09c 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/MachineStatus.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/MachineStatus.pb-c.h
@@ -17,7 +17,6 @@ PROTOBUF_C__BEGIN_DECLS
 #include "MachineState.pb-c.h"
 #include "IDSPackLevel.pb-c.h"
 #include "SpoolState.pb-c.h"
-#include "WasteCartridgeState.pb-c.h"
 
 typedef struct _MachineStatus MachineStatus;
 
@@ -38,14 +37,10 @@ struct  _MachineStatus
   double overalltemperature;
   protobuf_c_boolean has_spoolstate;
   SpoolState spoolstate;
-  protobuf_c_boolean has_middlecartridgestate;
-  WasteCartridgeState middlecartridgestate;
-  protobuf_c_boolean has_lowercartridgestate;
-  WasteCartridgeState lowercartridgestate;
 };
 #define MACHINE_STATUS__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&machine_status__descriptor) \
-    , 0, MACHINE_STATE__PowerUp, 0,NULL, 0, 0, 0, SPOOL_STATE__Absent, 0, WASTE_CARTRIDGE_STATE__CartAbsent, 0, WASTE_CARTRIDGE_STATE__CartAbsent }
+    , 0, MACHINE_STATE__PowerUp, 0,NULL, 0, 0, 0, SPOOL_STATE__Absent }
 
 
 /* MachineStatus methods */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/WasteCartridgeState.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/WasteCartridgeState.pb-c.c
deleted file mode 100644
index f179ce199..000000000
--- a/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/WasteCartridgeState.pb-c.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: WasteCartridgeState.proto */
-
-/* Do not generate deprecated warnings for self */
-#ifndef PROTOBUF_C__NO_DEPRECATED
-#define PROTOBUF_C__NO_DEPRECATED
-#endif
-
-#include "WasteCartridgeState.pb-c.h"
-static const ProtobufCEnumValue waste_cartridge_state__enum_values_by_number[5] =
-{
-  { "", "", 0 },
-  { "", "", 1 },
-  { "", "", 2 },
-  { "", "", 3 },
-  { "", "", 4 },
-};
-static const ProtobufCIntRange waste_cartridge_state__value_ranges[] = {
-{0, 0},{0, 5}
-};
-static const ProtobufCEnumValueIndex waste_cartridge_state__enum_values_by_name[5] =
-{
-  { "", 0 },
-  { "", 1 },
-  { "", 4 },
-  { "", 2 },
-  { "", 3 },
-};
-const ProtobufCEnumDescriptor waste_cartridge_state__descriptor =
-{
-  PROTOBUF_C__ENUM_DESCRIPTOR_MAGIC,
-  "",
-  "",
-  "",
-  "",
-  5,
-  waste_cartridge_state__enum_values_by_number,
-  5,
-  waste_cartridge_state__enum_values_by_name,
-  1,
-  waste_cartridge_state__value_ranges,
-  NULL,NULL,NULL,NULL   /* reserved[1234] */
-};
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/WasteCartridgeState.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/WasteCartridgeState.pb-c.h
deleted file mode 100644
index c100d36d8..000000000
--- a/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/WasteCartridgeState.pb-c.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
-/* Generated from: WasteCartridgeState.proto */
-
-#ifndef PROTOBUF_C_WasteCartridgeState_2eproto__INCLUDED
-#define PROTOBUF_C_WasteCartridgeState_2eproto__INCLUDED
-
-#include <protobuf-c/protobuf-c.h>
-
-PROTOBUF_C__BEGIN_DECLS
-
-#if PROTOBUF_C_VERSION_NUMBER < 1003000
-# error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
-#elif 1003000 < PROTOBUF_C_MIN_COMPILER_VERSION
-# error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c.
-#endif
-
-
-
-
-/* --- enums --- */
-
-typedef enum _WasteCartridgeState {
-  WASTE_CARTRIDGE_STATE__CartAbsent = 0,
-  WASTE_CARTRIDGE_STATE__CartEmpty = 1,
-  WASTE_CARTRIDGE_STATE__CartFilling = 2,
-  WASTE_CARTRIDGE_STATE__CartFull = 3,
-  WASTE_CARTRIDGE_STATE__CartError = 4
-    PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(WASTE_CARTRIDGE_STATE)
-} WasteCartridgeState;
-
-/* --- messages --- */
-
-/* --- per-message closures --- */
-
-
-/* --- services --- */
-
-
-/* --- descriptors --- */
-
-extern const ProtobufCEnumDescriptor    waste_cartridge_state__descriptor;
-
-PROTOBUF_C__END_DECLS
-
-
-#endif  /* PROTOBUF_C_WasteCartridgeState_2eproto__INCLUDED */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressRequest.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressRequest.pb-c.c
index 3a3aadd3b..b151bea09 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressRequest.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressRequest.pb-c.c
@@ -52,7 +52,7 @@ void   progress_request__free_unpacked
   assert(message->base.descriptor == &progress_request__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor progress_request__field_descriptors[5] =
+static const ProtobufCFieldDescriptor progress_request__field_descriptors[2] =
 {
   {
     "",
@@ -78,54 +78,15 @@ static const ProtobufCFieldDescriptor progress_request__field_descriptors[5] =
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
-  {
-    "",
-    3,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(ProgressRequest, has_param1),
-    offsetof(ProgressRequest, param1),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    4,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(ProgressRequest, has_param2),
-    offsetof(ProgressRequest, param2),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    5,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(ProgressRequest, has_param3),
-    offsetof(ProgressRequest, param3),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
 };
 static const unsigned progress_request__field_indices_by_name[] = {
   0,   /* field[0] = Amount */
   1,   /* field[1] = Delay */
-  2,   /* field[2] = Param1 */
-  3,   /* field[3] = Param2 */
-  4,   /* field[4] = Param3 */
 };
 static const ProtobufCIntRange progress_request__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 5 }
+  { 0, 2 }
 };
 const ProtobufCMessageDescriptor progress_request__descriptor =
 {
@@ -135,7 +96,7 @@ const ProtobufCMessageDescriptor progress_request__descriptor =
   "",
   "",
   sizeof(ProgressRequest),
-  5,
+  2,
   progress_request__field_descriptors,
   progress_request__field_indices_by_name,
   1,  progress_request__number_ranges,
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressRequest.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressRequest.pb-c.h
index da8eac4f1..1ce2b6d6b 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressRequest.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressRequest.pb-c.h
@@ -30,16 +30,10 @@ struct  _ProgressRequest
   int32_t amount;
   protobuf_c_boolean has_delay;
   int32_t delay;
-  protobuf_c_boolean has_param1;
-  uint32_t param1;
-  protobuf_c_boolean has_param2;
-  uint32_t param2;
-  protobuf_c_boolean has_param3;
-  uint32_t param3;
 };
 #define PROGRESS_REQUEST__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&progress_request__descriptor) \
-    , 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+    , 0, 0, 0, 0 }
 
 
 /* ProgressRequest methods */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressResponse.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressResponse.pb-c.c
index ff0667e61..537f8e763 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressResponse.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressResponse.pb-c.c
@@ -52,7 +52,7 @@ void   progress_response__free_unpacked
   assert(message->base.descriptor == &progress_response__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor progress_response__field_descriptors[2] =
+static const ProtobufCFieldDescriptor progress_response__field_descriptors[1] =
 {
   {
     "",
@@ -66,27 +66,14 @@ static const ProtobufCFieldDescriptor progress_response__field_descriptors[2] =
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
-  {
-    "",
-    2,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(ProgressResponse, has_info),
-    offsetof(ProgressResponse, info),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
 };
 static const unsigned progress_response__field_indices_by_name[] = {
-  1,   /* field[1] = Info */
   0,   /* field[0] = Progress */
 };
 static const ProtobufCIntRange progress_response__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 2 }
+  { 0, 1 }
 };
 const ProtobufCMessageDescriptor progress_response__descriptor =
 {
@@ -96,7 +83,7 @@ const ProtobufCMessageDescriptor progress_response__descriptor =
   "",
   "",
   sizeof(ProgressResponse),
-  2,
+  1,
   progress_response__field_descriptors,
   progress_response__field_indices_by_name,
   1,  progress_response__number_ranges,
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressResponse.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressResponse.pb-c.h
index bd1a3141a..de5201ee5 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressResponse.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProgressResponse.pb-c.h
@@ -28,12 +28,10 @@ struct  _ProgressResponse
   ProtobufCMessage base;
   protobuf_c_boolean has_progress;
   double progress;
-  protobuf_c_boolean has_info;
-  uint32_t info;
 };
 #define PROGRESS_RESPONSE__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&progress_response__descriptor) \
-    , 0, 0, 0, 0 }
+    , 0, 0 }
 
 
 /* ProgressResponse methods */
diff --git a/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c b/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c
index 80f8280e0..f5c9c09b5 100644
--- a/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c
+++ b/Software/Embedded_SW/Embedded/Drivers/Valves/Valve.c
@@ -440,8 +440,8 @@ void Valve_Set(Valves_t Valve_Id, bool Direction)
                 MidtankMitigationControlId[Valve_Id] = 0xFF;
             }
         }
-    }
 #endif
+    }
     ValveRequest[Valve_Id].Direction = Direction;
     Valve_Command( Valve_Id);
 #endif
diff --git a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c
index b9bcc1624..ef6482a4f 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c
@@ -138,47 +138,6 @@ int MachineUpdateResponseFunc(void)
     }
     else
         return ERROR;
-    MachineStatus.has_middlecartridgestate = true;
-    switch (cartGetState(WasteCartridge_middle))
-    {
-        case CartridgeStateOUT:
-            MachineStatus.middlecartridgestate = WASTE_CARTRIDGE_STATE__CartAbsent;
-            break;
-        case CartridgeStateIN:
-        case CartridgeStateSELECTED:
-            MachineStatus.middlecartridgestate = WASTE_CARTRIDGE_STATE__CartEmpty;
-            break;
-        case CartridgeStateACTIVE:
-            MachineStatus.middlecartridgestate = WASTE_CARTRIDGE_STATE__CartFilling;
-            break;
-        case CartridgeStateFULL:
-            MachineStatus.middlecartridgestate = WASTE_CARTRIDGE_STATE__CartFull;
-            break;
-        default:
-            MachineStatus.middlecartridgestate = WASTE_CARTRIDGE_STATE__CartAbsent;
-            break;
-    }
-    MachineStatus.has_lowercartridgestate = true;
-    MachineStatus.lowercartridgestate = WASTE_CARTRIDGE_STATE__CartAbsent;
-    switch (cartGetState(WasteCartridge_lower))
-    {
-        case CartridgeStateOUT:
-            MachineStatus.lowercartridgestate = WASTE_CARTRIDGE_STATE__CartAbsent;
-            break;
-        case CartridgeStateIN:
-        case CartridgeStateSELECTED:
-            MachineStatus.lowercartridgestate = WASTE_CARTRIDGE_STATE__CartEmpty;
-            break;
-        case CartridgeStateACTIVE:
-            MachineStatus.lowercartridgestate = WASTE_CARTRIDGE_STATE__CartFilling;
-            break;
-        case CartridgeStateFULL:
-            MachineStatus.lowercartridgestate = WASTE_CARTRIDGE_STATE__CartFull;
-            break;
-        default:
-            MachineStatus.lowercartridgestate = WASTE_CARTRIDGE_STATE__CartAbsent;
-            break;
-    }
 
 
     responseContainer = /*MachineUpdate*/createContainer(MESSAGE_TYPE__StartMachineStatusUpdateResponse, MachineUpdateToken, false, &response, &start_machine_status_update_response__pack, &start_machine_status_update_response__get_packed_size);
diff --git a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c
index abad051cb..387d48d2b 100644
--- a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c
+++ b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c
@@ -11,9 +11,6 @@
 #include <DataDef.h>
 #include "PMR/Diagnostics/CartridgeSlot.pb-c.h"
 #include "PMR/Diagnostics/CartridgeTagContent.pb-c.h"
-#include "PMR/Diagnostics/StartInkFillingRequest.pb-c.h"
-#include "PMR/Diagnostics/StartInkFillingResponse.pb-c.h"
-#include "PMR/Diagnostics/FillingAction.pb-c.h"
 #include <Drivers/I2C_Communication/RFID_NFC/RFIDTagInfo.h>
 #include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h"//#include "FPGA_GPIO.h"  //  use for FPGA IO
 #include "drivers/I2C_Communication/ADC_MUX/ADC_MUX.h"
@@ -233,54 +230,6 @@ bool CartridgeValidationResponseFunc(MessageContainer* requestContainer)
     }
     return OK;
 }
-char InkFillingToken[36+1] = {0};
-uint32_t InkFillingUpdate(POWER_OFF_STAGES_ENUM stage)
-{
-    uint32_t status = NOT_SUPPORTED;
-    MessageContainer responseContainer;
-
-    StartInkFillingResponse response = START_INK_FILLING_RESPONSE__INIT;
-    Cartridge Cartridge = CARTRIDGE__INIT;
-    response.action = FILLING_ACTION__None;
-    response.has_action = true;
-    response.cartridge = LoadCartridgeData(CART_1,&Cartridge);
-
-    response.cartridge = NULL;
-    response.has_progresspercentage = true;
-    response.progresspercentage = 0.0;
-    response.message = NULL;
-
-    responseContainer = createContainer(MESSAGE_TYPE__StartInkFillingResponse, InkFillingToken, false, &response, &start_ink_filling_response__pack, &start_ink_filling_response__get_packed_size);
-    responseContainer.has_continuous = true;
-    responseContainer.continuous = true;
-    uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
-    size_t container_size = message_container__pack(&responseContainer, container_buffer);
-    my_free(responseContainer.data.data);
-    //USBCDCD_sendData(container_buffer, container_size,10);
-
-    SendChars((char*)container_buffer, container_size);
-    //MessageContainer responseContainer;
-
-    return status;
-}
-
-uint32_t StartInkFillingRequestFunc(MessageContainer* requestContainer)
-{
-    uint32_t status = NOT_SUPPORTED;
-    //MessageContainer responseContainer;
-
-//    MachineUpdateInitParams InitParams;
-
-    Report("StartInkFillingRequestFunc",__FILE__,__LINE__,(int)0,RpWarning,(int)0,0);
-    StartInkFillingRequest* request = start_ink_filling_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
-    ustrncpy (InkFillingToken, requestContainer->token,36);
-
-    InkFillingUpdate(POWER_OFF_INIT);
-    start_ink_filling_request__free_unpacked(request,NULL);
-    return status;
-//    case MESSAGE_TYPE__StartWasteEmptyingRequest:
-
-}
 void ResponseDemo(int MidtankId)
 {
     inkAuthenticationPass = true;
diff --git a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h
index dec1544ec..0f95fb2e2 100644
--- a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h
+++ b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.h
@@ -28,6 +28,5 @@ bool IFS_MidTankFilling(void);
 MidTank_t IFS_MidTankIsActive(void);
 bool IFS_CartridgeLowerPresent();
 bool CartridgeValidationResponseFunc(MessageContainer* requestContainer);
-uint32_t StartInkFillingRequestFunc(MessageContainer* requestContainer);
 
 #endif /* MODULES_IFS_IFS_H_ */
diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_ex.h b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_ex.h
index 38e3236cc..603e63ccc 100644
--- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_ex.h
+++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_ex.h
@@ -47,7 +47,7 @@ bool WHS_IsEmptying();
 uint32_t Waste_CheckState(void);
 uint32_t Waste_Prepare(void);
 bool WHS_IsVocPpmOverAlarmLimit();
-uint32_t StartWasteEmptyingRequestFunc(MessageContainer* requestContainer);
+uint32_t StartInkFillingStatusRequestFunc(MessageContainer* requestContainer);
 
 
 extern bool ReadingVocEverySec;
diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c
index 6d338cbf7..1a4403f32 100644
--- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c
+++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_maint.c
@@ -14,9 +14,10 @@
 #include <Utilities/RfidTagHandling.h>
 
 #include  <PMR/Diagnostics/EventType.pb-c.h>
-#include "PMR/Diagnostics/FillingAction.pb-c.h"
-#include "PMR/Diagnostics/StartWasteEmptyingRequest.pb-c.h"
-#include "PMR/Diagnostics/StartWasteEmptyingResponse.pb-c.h"
+#include "PMR/IFS/CartridgeStatus.pb-c.h"
+#include "PMR/IFS/InkFillingStatus.pb-c.h"
+#include "PMR/IFS/StartInkFillingStatusRequest.pb-c.h"
+#include "PMR/IFS/StartInkFillingStatusResponse.pb-c.h"
 #include "Modules/AlarmHandling/AlarmHandling.h"
 #include "StateMachines/Initialization/PowerOffSequence.h"
 #include "drivers/I2C_Communication/ADC_MUX/ADC_MUX.h"
@@ -506,22 +507,22 @@ void Waste_StateMachine(void)
     }
 }
 char WasteEmptyingToken[36+1] = {0};
-uint32_t WasteEmptyingUpdate(POWER_OFF_STAGES_ENUM stage)
+uint32_t WasteEmptyingUpdate(void)
 {
     uint32_t status = NOT_SUPPORTED;
     MessageContainer responseContainer;
 
-    StartWasteEmptyingResponse response = START_WASTE_EMPTYING_RESPONSE__INIT;
-    response.action = FILLING_ACTION__None;
+    StartInkFillingStatusResponse response = START_INK_FILLING_STATUS_RESPONSE__INIT;
+    /*response.action = FILLING_ACTION__None;
     response.has_action = true;
     //response.cartridge = LoadCartridgeData();    response.cartridge = LoadCartridgeData();
 
     response.cartridge = NULL;
     response.has_progresspercentage = true;
     response.progresspercentage = 0.0;
-    response.message = NULL;
+    response.message = NULL;*/
 
-    responseContainer = createContainer(MESSAGE_TYPE__StartWasteEmptyingResponse, WasteEmptyingToken, false, &response, &start_waste_emptying_response__pack, &start_waste_emptying_response__get_packed_size);
+    responseContainer = createContainer(MESSAGE_TYPE__StartInkFillingStatusResponse, WasteEmptyingToken, false, &response, &start_ink_filling_status_response__pack, &start_ink_filling_status_response__get_packed_size);
     responseContainer.has_continuous = true;
     responseContainer.continuous = true;
     uint8_t* container_buffer = my_malloc(message_container__get_packed_size(&responseContainer));
@@ -535,19 +536,19 @@ uint32_t WasteEmptyingUpdate(POWER_OFF_STAGES_ENUM stage)
     return status;
 }
 
-uint32_t StartWasteEmptyingRequestFunc(MessageContainer* requestContainer)
+uint32_t StartInkFillingStatusRequestFunc(MessageContainer* requestContainer)
 {
     uint32_t status = NOT_SUPPORTED;
     //MessageContainer responseContainer;
 
 //    MachineUpdateInitParams InitParams;
 
-    Report("StartWasteEmptyingRequestFunc",__FILE__,__LINE__,(int)0,RpWarning,(int)0,0);
-    StartWasteEmptyingRequest* request = start_waste_emptying_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
+    Report("StartInkFillingStatusRequestFunc",__FILE__,__LINE__,(int)0,RpWarning,(int)0,0);
+    StartInkFillingStatusRequest* request = start_ink_filling_status_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
     ustrncpy (WasteEmptyingToken, requestContainer->token,36);
 
-    WasteEmptyingUpdate(POWER_OFF_INIT);
-    start_waste_emptying_request__free_unpacked(request,NULL);
+    WasteEmptyingUpdate();
+    start_ink_filling_status_request__free_unpacked(request,NULL);
     return status;
 //    case MESSAGE_TYPE__StartWasteEmptyingRequest:
 
diff --git a/Software/PMR/Messages/Debugging/StartDebugLogResponse.proto b/Software/PMR/Messages/Debugging/StartDebugLogResponse.proto
index 3375b8887..b8aa1a3f1 100644
--- a/Software/PMR/Messages/Debugging/StartDebugLogResponse.proto
+++ b/Software/PMR/Messages/Debugging/StartDebugLogResponse.proto
@@ -12,6 +12,6 @@ message StartDebugLogResponse
 	int32 				LineNumber = 3;
 	int32  				Filter = 4;
 	string     			Message = 5;
-    int32      			ModuleId = 6;
+	int32      			ModuleId = 6;
 	int32				Parameter = 7;
 }
\ No newline at end of file
diff --git a/Software/Visual_Studio/SideChains/WebRtc.NET/WebRtc.NET.vcxproj b/Software/Visual_Studio/SideChains/WebRtc.NET/WebRtc.NET.vcxproj
index 661997d3f..609613a91 100644
--- a/Software/Visual_Studio/SideChains/WebRtc.NET/WebRtc.NET.vcxproj
+++ b/Software/Visual_Studio/SideChains/WebRtc.NET/WebRtc.NET.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -22,33 +22,33 @@
     <ProjectGuid>{A07E6CB4-0132-4EB1-9A38-C8C057884DC2}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>WebRtcLibDemo</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
     <ProjectName>WebRtc.NET</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>