procedure stub, read all hardware stub, some debug code (read addtional PT100 on ARC, change jog speed stub)

12 files changed, 677 insertions, 191 deletions

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 4b8277d75..8a0e37288 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[271] =
+static const ProtobufCEnumValue message_type__enum_values_by_number[275] =
 {
   { "", "", 0 },
   { "", "", 1 },
@@ -123,6 +123,10 @@ static const ProtobufCEnumValue message_type__enum_values_by_number[271] =
   { "", "", 112 },
   { "", "", 113 },
   { "", "", 114 },
+  { "", "", 115 },
+  { "", "", 116 },
+  { "", "", 117 },
+  { "", "", 118 },
   { "", "", 1000 },
   { "", "", 1001 },
   { "", "", 1002 },
@@ -282,159 +286,163 @@ static const ProtobufCEnumValue message_type__enum_values_by_number[271] =
   { "", "", 13003 },
 };
 static const ProtobufCIntRange message_type__value_ranges[] = {
-{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, 255},{12000, 265},{13000, 267},{0, 271}
+{0, 0},{3, 2},{1000, 118},{2000, 139},{2044, 179},{3000, 181},{4000, 195},{5000, 203},{6000, 207},{7000, 213},{8000, 237},{9000, 245},{10000, 249},{11000, 259},{12000, 269},{13000, 271},{0, 275}
 };
-static const ProtobufCEnumValueIndex message_type__enum_values_by_name[271] =
+static const ProtobufCEnumValueIndex message_type__enum_values_by_name[275] =
 {
-  { "", 189 },
-  { "", 190 },
-  { "", 179 },
-  { "", 180 },
-  { "", 247 },
-  { "", 248 },
+  { "", 193 },
+  { "", 194 },
+  { "", 183 },
+  { "", 184 },
   { "", 251 },
   { "", 252 },
-  { "", 231 },
-  { "", 232 },
-  { "", 263 },
-  { "", 264 },
+  { "", 255 },
+  { "", 256 },
+  { "", 235 },
+  { "", 236 },
+  { "", 267 },
+  { "", 268 },
   { "", 2 },
   { "", 3 },
-  { "", 175 },
-  { "", 176 },
-  { "", 127 },
-  { "", 128 },
-  { "", 133 },
-  { "", 134 },
-  { "", 205 },
-  { "", 206 },
-  { "", 257 },
-  { "", 258 },
+  { "", 179 },
+  { "", 180 },
+  { "", 131 },
+  { "", 132 },
+  { "", 137 },
+  { "", 138 },
+  { "", 209 },
+  { "", 210 },
+  { "", 261 },
+  { "", 262 },
+  { "", 221 },
+  { "", 222 },
+  { "", 187 },
+  { "", 188 },
+  { "", 223 },
+  { "", 224 },
+  { "", 123 },
+  { "", 124 },
+  { "", 211 },
+  { "", 212 },
+  { "", 149 },
+  { "", 150 },
+  { "", 155 },
+  { "", 156 },
+  { "", 237 },
+  { "", 238 },
+  { "", 151 },
+  { "", 152 },
+  { "", 153 },
+  { "", 154 },
+  { "", 1 },
   { "", 217 },
   { "", 218 },
-  { "", 183 },
-  { "", 184 },
-  { "", 219 },
-  { "", 220 },
   { "", 119 },
   { "", 120 },
-  { "", 207 },
-  { "", 208 },
-  { "", 145 },
-  { "", 146 },
-  { "", 151 },
-  { "", 152 },
-  { "", 233 },
-  { "", 234 },
-  { "", 147 },
-  { "", 148 },
-  { "", 149 },
-  { "", 150 },
-  { "", 1 },
+  { "", 121 },
+  { "", 122 },
+  { "", 118 },
+  { "", 231 },
+  { "", 232 },
+  { "", 215 },
+  { "", 216 },
+  { "", 229 },
+  { "", 230 },
   { "", 213 },
   { "", 214 },
-  { "", 115 },
-  { "", 116 },
-  { "", 117 },
-  { "", 118 },
-  { "", 114 },
+  { "", 135 },
+  { "", 136 },
+  { "", 273 },
+  { "", 274 },
   { "", 227 },
   { "", 228 },
-  { "", 211 },
-  { "", 212 },
   { "", 225 },
   { "", 226 },
-  { "", 209 },
-  { "", 210 },
-  { "", 131 },
-  { "", 132 },
-  { "", 269 },
-  { "", 270 },
-  { "", 223 },
-  { "", 224 },
-  { "", 221 },
-  { "", 222 },
-  { "", 177 },
-  { "", 178 },
-  { "", 203 },
-  { "", 204 },
-  { "", 215 },
-  { "", 216 },
-  { "", 237 },
-  { "", 238 },
+  { "", 181 },
+  { "", 182 },
+  { "", 207 },
+  { "", 208 },
+  { "", 219 },
+  { "", 220 },
+  { "", 241 },
+  { "", 242 },
+  { "", 243 },
+  { "", 244 },
   { "", 239 },
   { "", 240 },
-  { "", 235 },
-  { "", 236 },
-  { "", 137 },
-  { "", 138 },
-  { "", 143 },
-  { "", 144 },
-  { "", 139 },
-  { "", 140 },
   { "", 141 },
   { "", 142 },
+  { "", 147 },
+  { "", 148 },
+  { "", 143 },
+  { "", 144 },
+  { "", 145 },
+  { "", 146 },
   { "", 0 },
-  { "", 121 },
-  { "", 122 },
+  { "", 125 },
+  { "", 126 },
+  { "", 114 },
+  { "", 115 },
   { "", 4 },
   { "", 5 },
-  { "", 267 },
-  { "", 268 },
-  { "", 161 },
-  { "", 162 },
-  { "", 185 },
-  { "", 186 },
-  { "", 171 },
-  { "", 172 },
-  { "", 159 },
-  { "", 160 },
+  { "", 271 },
+  { "", 272 },
+  { "", 165 },
+  { "", 166 },
+  { "", 189 },
+  { "", 190 },
+  { "", 175 },
+  { "", 176 },
+  { "", 163 },
+  { "", 164 },
+  { "", 199 },
+  { "", 200 },
+  { "", 157 },
+  { "", 158 },
+  { "", 173 },
+  { "", 174 },
+  { "", 177 },
+  { "", 178 },
+  { "", 201 },
+  { "", 202 },
+  { "", 257 },
+  { "", 258 },
+  { "", 127 },
+  { "", 128 },
   { "", 195 },
   { "", 196 },
-  { "", 153 },
-  { "", 154 },
+  { "", 139 },
+  { "", 140 },
   { "", 169 },
   { "", 170 },
-  { "", 173 },
-  { "", 174 },
-  { "", 197 },
-  { "", 198 },
-  { "", 253 },
-  { "", 254 },
-  { "", 123 },
-  { "", 124 },
   { "", 191 },
   { "", 192 },
-  { "", 135 },
-  { "", 136 },
-  { "", 165 },
-  { "", 166 },
-  { "", 187 },
-  { "", 188 },
-  { "", 265 },
-  { "", 266 },
-  { "", 241 },
-  { "", 242 },
+  { "", 269 },
+  { "", 270 },
   { "", 245 },
   { "", 246 },
   { "", 249 },
   { "", 250 },
-  { "", 255 },
-  { "", 256 },
-  { "", 125 },
-  { "", 126 },
-  { "", 193 },
-  { "", 194 },
-  { "", 163 },
-  { "", 164 },
-  { "", 167 },
-  { "", 168 },
-  { "", 243 },
-  { "", 244 },
+  { "", 253 },
+  { "", 254 },
   { "", 259 },
   { "", 260 },
+  { "", 129 },
+  { "", 130 },
+  { "", 197 },
+  { "", 198 },
+  { "", 167 },
+  { "", 168 },
+  { "", 171 },
+  { "", 172 },
+  { "", 247 },
+  { "", 248 },
+  { "", 263 },
+  { "", 264 },
   { "", 100 },
   { "", 101 },
+  { "", 116 },
+  { "", 117 },
   { "", 6 },
   { "", 7 },
   { "", 8 },
@@ -541,22 +549,22 @@ static const ProtobufCEnumValueIndex message_type__enum_values_by_name[271] =
   { "", 31 },
   { "", 106 },
   { "", 107 },
-  { "", 201 },
-  { "", 202 },
-  { "", 157 },
-  { "", 158 },
-  { "", 155 },
-  { "", 156 },
-  { "", 261 },
-  { "", 262 },
-  { "", 129 },
-  { "", 130 },
-  { "", 199 },
-  { "", 200 },
-  { "", 181 },
-  { "", 182 },
-  { "", 229 },
-  { "", 230 },
+  { "", 205 },
+  { "", 206 },
+  { "", 161 },
+  { "", 162 },
+  { "", 159 },
+  { "", 160 },
+  { "", 265 },
+  { "", 266 },
+  { "", 133 },
+  { "", 134 },
+  { "", 203 },
+  { "", 204 },
+  { "", 185 },
+  { "", 186 },
+  { "", 233 },
+  { "", 234 },
 };
 const ProtobufCEnumDescriptor message_type__descriptor =
 {
@@ -565,9 +573,9 @@ const ProtobufCEnumDescriptor message_type__descriptor =
   "",
   "",
   "",
-  271,
+  275,
   message_type__enum_values_by_number,
-  271,
+  275,
   message_type__enum_values_by_name,
   16,
   message_type__value_ranges,
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Common/MessageType.pb-c.h
index 133d64f2d..ec3c02f49 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
@@ -134,6 +134,10 @@ typedef enum _MessageType {
   MESSAGE_TYPE__StubMainCardEEpromWriteResponse = 112,
   MESSAGE_TYPE__StubHeadEEpromRequest = 113,
   MESSAGE_TYPE__StubHeadEEpromResponse = 114,
+  MESSAGE_TYPE__ProcedureRequest = 115,
+  MESSAGE_TYPE__ProcedureResponse = 116,
+  MESSAGE_TYPE__StubAllHardwareRequest = 117,
+  MESSAGE_TYPE__StubAllHardwareResponse = 118,
   MESSAGE_TYPE__ExternalBridgeUdpDiscoveryPacket = 1000,
   MESSAGE_TYPE__ExternalBridgeLoginRequest = 1001,
   MESSAGE_TYPE__ExternalBridgeLoginResponse = 1002,
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/AlarmHandlingItem.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/AlarmHandlingItem.pb-c.c
index 2ed0ef818..7f25525ff 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/AlarmHandlingItem.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/AlarmHandlingItem.pb-c.c
@@ -52,7 +52,7 @@ void   alarm_handling_item__free_unpacked
   assert(message->base.descriptor == &alarm_handling_item__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor alarm_handling_item__field_descriptors[12] =
+static const ProtobufCFieldDescriptor alarm_handling_item__field_descriptors[10] =
 {
   {
     "",
@@ -71,18 +71,6 @@ static const ProtobufCFieldDescriptor alarm_handling_item__field_descriptors[12]
     2,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
-    offsetof(AlarmHandlingItem, has_frequency),
-    offsetof(AlarmHandlingItem, frequency),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    3,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
     offsetof(AlarmHandlingItem, has_deviceid),
     offsetof(AlarmHandlingItem, deviceid),
     NULL,
@@ -92,7 +80,7 @@ static const ProtobufCFieldDescriptor alarm_handling_item__field_descriptors[12]
   },
   {
     "",
-    4,
+    3,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
     offsetof(AlarmHandlingItem, has_moduledeviceid),
@@ -104,7 +92,7 @@ static const ProtobufCFieldDescriptor alarm_handling_item__field_descriptors[12]
   },
   {
     "",
-    5,
+    4,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
     offsetof(AlarmHandlingItem, has_alarmvalue),
@@ -116,7 +104,7 @@ static const ProtobufCFieldDescriptor alarm_handling_item__field_descriptors[12]
   },
   {
     "",
-    6,
+    5,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_BOOL,
     offsetof(AlarmHandlingItem, has_alarmdirection),
@@ -128,7 +116,7 @@ static const ProtobufCFieldDescriptor alarm_handling_item__field_descriptors[12]
   },
   {
     "",
-    7,
+    6,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_ENUM,
     offsetof(AlarmHandlingItem, has_severity),
@@ -140,19 +128,7 @@ static const ProtobufCFieldDescriptor alarm_handling_item__field_descriptors[12]
   },
   {
     "",
-    8,
-    PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_UINT32,
-    offsetof(AlarmHandlingItem, has_predecessor),
-    offsetof(AlarmHandlingItem, predecessor),
-    NULL,
-    NULL,
-    0,             /* flags */
-    0,NULL,NULL    /* reserved1,reserved2, etc */
-  },
-  {
-    "",
-    9,
+    7,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_UINT32,
     offsetof(AlarmHandlingItem, has_debouncevalue),
@@ -164,7 +140,7 @@ static const ProtobufCFieldDescriptor alarm_handling_item__field_descriptors[12]
   },
   {
     "",
-    10,
+    8,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_ENUM,
     offsetof(AlarmHandlingItem, has_eventtype),
@@ -176,7 +152,7 @@ static const ProtobufCFieldDescriptor alarm_handling_item__field_descriptors[12]
   },
   {
     "",
-    11,
+    9,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_STRING,
     0,   /* quantifier_offset */
@@ -188,7 +164,7 @@ static const ProtobufCFieldDescriptor alarm_handling_item__field_descriptors[12]
   },
   {
     "",
-    12,
+    10,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_BOOL,
     offsetof(AlarmHandlingItem, has_ispersistent),
@@ -200,23 +176,21 @@ static const ProtobufCFieldDescriptor alarm_handling_item__field_descriptors[12]
   },
 };
 static const unsigned alarm_handling_item__field_indices_by_name[] = {
-  5,   /* field[5] = AlarmDirection */
+  4,   /* field[4] = AlarmDirection */
   0,   /* field[0] = AlarmSource */
-  4,   /* field[4] = AlarmValue */
-  8,   /* field[8] = DebounceValue */
-  2,   /* field[2] = DeviceId */
-  10,   /* field[10] = EventName */
-  9,   /* field[9] = EventType */
-  1,   /* field[1] = Frequency */
-  11,   /* field[11] = IsPersistent */
-  3,   /* field[3] = ModuleDeviceId */
-  7,   /* field[7] = Predecessor */
-  6,   /* field[6] = Severity */
+  3,   /* field[3] = AlarmValue */
+  6,   /* field[6] = DebounceValue */
+  1,   /* field[1] = DeviceId */
+  8,   /* field[8] = EventName */
+  7,   /* field[7] = EventType */
+  9,   /* field[9] = IsPersistent */
+  2,   /* field[2] = ModuleDeviceId */
+  5,   /* field[5] = Severity */
 };
 static const ProtobufCIntRange alarm_handling_item__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 12 }
+  { 0, 10 }
 };
 const ProtobufCMessageDescriptor alarm_handling_item__descriptor =
 {
@@ -226,7 +200,7 @@ const ProtobufCMessageDescriptor alarm_handling_item__descriptor =
   "",
   "",
   sizeof(AlarmHandlingItem),
-  12,
+  10,
   alarm_handling_item__field_descriptors,
   alarm_handling_item__field_indices_by_name,
   1,  alarm_handling_item__number_ranges,
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/AlarmHandlingItem.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/AlarmHandlingItem.pb-c.h
index f69c7b96d..635c38544 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/AlarmHandlingItem.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/EmbeddedParameters/AlarmHandlingItem.pb-c.h
@@ -31,8 +31,6 @@ struct  _AlarmHandlingItem
   ProtobufCMessage base;
   protobuf_c_boolean has_alarmsource;
   AlarmSourceType alarmsource;
-  protobuf_c_boolean has_frequency;
-  uint32_t frequency;
   protobuf_c_boolean has_deviceid;
   uint32_t deviceid;
   protobuf_c_boolean has_moduledeviceid;
@@ -43,8 +41,6 @@ struct  _AlarmHandlingItem
   protobuf_c_boolean alarmdirection;
   protobuf_c_boolean has_severity;
   DebugLogCategory severity;
-  protobuf_c_boolean has_predecessor;
-  uint32_t predecessor;
   protobuf_c_boolean has_debouncevalue;
   uint32_t debouncevalue;
   protobuf_c_boolean has_eventtype;
@@ -55,7 +51,7 @@ struct  _AlarmHandlingItem
 };
 #define ALARM_HANDLING_ITEM__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&alarm_handling_item__descriptor) \
-    , 0, ALARM_SOURCE_TYPE__TemperatureAlarm, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, DEBUG_LOG_CATEGORY__Info, 0, 0, 0, 0, 0, EVENT_TYPE__None, NULL, 0, 0 }
+    , 0, ALARM_SOURCE_TYPE__TemperatureAlarm, 0, 0, 0, 0, 0, 0, 0, 0, 0, DEBUG_LOG_CATEGORY__Info, 0, 0, 0, EVENT_TYPE__None, NULL, 0, 0 }
 
 
 /* AlarmHandlingItem methods */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProcedureRequest.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProcedureRequest.pb-c.c
new file mode 100644
index 000000000..4b5a8018e
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProcedureRequest.pb-c.c
@@ -0,0 +1,157 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: ProcedureRequest.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "ProcedureRequest.pb-c.h"
+void   procedure_request__init
+                     (ProcedureRequest         *message)
+{
+  static const ProcedureRequest init_value = PROCEDURE_REQUEST__INIT;
+  *message = init_value;
+}
+size_t procedure_request__get_packed_size
+                     (const ProcedureRequest *message)
+{
+  assert(message->base.descriptor == &procedure_request__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t procedure_request__pack
+                     (const ProcedureRequest *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &procedure_request__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t procedure_request__pack_to_buffer
+                     (const ProcedureRequest *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &procedure_request__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+ProcedureRequest *
+       procedure_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (ProcedureRequest *)
+     protobuf_c_message_unpack (&procedure_request__descriptor,
+                                allocator, len, data);
+}
+void   procedure_request__free_unpacked
+                     (ProcedureRequest *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &procedure_request__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor procedure_request__field_descriptors[6] =
+{
+  {
+    "",
+    1,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_INT32,
+    offsetof(ProcedureRequest, has_type),
+    offsetof(ProcedureRequest, type),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "",
+    2,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_INT32,
+    offsetof(ProcedureRequest, has_timeout),
+    offsetof(ProcedureRequest, timeout),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "",
+    3,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_FLOAT,
+    offsetof(ProcedureRequest, has_param1),
+    offsetof(ProcedureRequest, param1),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "",
+    4,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_FLOAT,
+    offsetof(ProcedureRequest, has_param2),
+    offsetof(ProcedureRequest, param2),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "",
+    5,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_FLOAT,
+    offsetof(ProcedureRequest, has_param3),
+    offsetof(ProcedureRequest, param3),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "",
+    6,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_FLOAT,
+    offsetof(ProcedureRequest, has_param4),
+    offsetof(ProcedureRequest, param4),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned procedure_request__field_indices_by_name[] = {
+  2,   /* field[2] = Param1 */
+  3,   /* field[3] = Param2 */
+  4,   /* field[4] = Param3 */
+  5,   /* field[5] = Param4 */
+  1,   /* field[1] = Timeout */
+  0,   /* field[0] = Type */
+};
+static const ProtobufCIntRange procedure_request__number_ranges[1 + 1] =
+{
+  { 1, 0 },
+  { 0, 6 }
+};
+const ProtobufCMessageDescriptor procedure_request__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "",
+  "",
+  "",
+  "",
+  sizeof(ProcedureRequest),
+  6,
+  procedure_request__field_descriptors,
+  procedure_request__field_indices_by_name,
+  1,  procedure_request__number_ranges,
+  (ProtobufCMessageInit) procedure_request__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProcedureRequest.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProcedureRequest.pb-c.h
new file mode 100644
index 000000000..26740256c
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProcedureRequest.pb-c.h
@@ -0,0 +1,82 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: ProcedureRequest.proto */
+
+#ifndef PROTOBUF_C_ProcedureRequest_2eproto__INCLUDED
+#define PROTOBUF_C_ProcedureRequest_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 _ProcedureRequest ProcedureRequest;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _ProcedureRequest
+{
+  ProtobufCMessage base;
+  protobuf_c_boolean has_type;
+  int32_t type;
+  protobuf_c_boolean has_timeout;
+  int32_t timeout;
+  protobuf_c_boolean has_param1;
+  float param1;
+  protobuf_c_boolean has_param2;
+  float param2;
+  protobuf_c_boolean has_param3;
+  float param3;
+  protobuf_c_boolean has_param4;
+  float param4;
+};
+#define PROCEDURE_REQUEST__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&procedure_request__descriptor) \
+    , 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+
+
+/* ProcedureRequest methods */
+void   procedure_request__init
+                     (ProcedureRequest         *message);
+size_t procedure_request__get_packed_size
+                     (const ProcedureRequest   *message);
+size_t procedure_request__pack
+                     (const ProcedureRequest   *message,
+                      uint8_t             *out);
+size_t procedure_request__pack_to_buffer
+                     (const ProcedureRequest   *message,
+                      ProtobufCBuffer     *buffer);
+ProcedureRequest *
+       procedure_request__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   procedure_request__free_unpacked
+                     (ProcedureRequest *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*ProcedureRequest_Closure)
+                 (const ProcedureRequest *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor procedure_request__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_ProcedureRequest_2eproto__INCLUDED */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProcedureResponse.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProcedureResponse.pb-c.c
new file mode 100644
index 000000000..4de720698
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProcedureResponse.pb-c.c
@@ -0,0 +1,144 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: ProcedureResponse.proto */
+
+/* Do not generate deprecated warnings for self */
+#ifndef PROTOBUF_C__NO_DEPRECATED
+#define PROTOBUF_C__NO_DEPRECATED
+#endif
+
+#include "ProcedureResponse.pb-c.h"
+void   procedure_response__init
+                     (ProcedureResponse         *message)
+{
+  static const ProcedureResponse init_value = PROCEDURE_RESPONSE__INIT;
+  *message = init_value;
+}
+size_t procedure_response__get_packed_size
+                     (const ProcedureResponse *message)
+{
+  assert(message->base.descriptor == &procedure_response__descriptor);
+  return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
+}
+size_t procedure_response__pack
+                     (const ProcedureResponse *message,
+                      uint8_t       *out)
+{
+  assert(message->base.descriptor == &procedure_response__descriptor);
+  return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
+}
+size_t procedure_response__pack_to_buffer
+                     (const ProcedureResponse *message,
+                      ProtobufCBuffer *buffer)
+{
+  assert(message->base.descriptor == &procedure_response__descriptor);
+  return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
+}
+ProcedureResponse *
+       procedure_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data)
+{
+  return (ProcedureResponse *)
+     protobuf_c_message_unpack (&procedure_response__descriptor,
+                                allocator, len, data);
+}
+void   procedure_response__free_unpacked
+                     (ProcedureResponse *message,
+                      ProtobufCAllocator *allocator)
+{
+  if(!message)
+    return;
+  assert(message->base.descriptor == &procedure_response__descriptor);
+  protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
+}
+static const ProtobufCFieldDescriptor procedure_response__field_descriptors[5] =
+{
+  {
+    "",
+    1,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_INT32,
+    offsetof(ProcedureResponse, has_type),
+    offsetof(ProcedureResponse, type),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "",
+    2,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_INT32,
+    offsetof(ProcedureResponse, has_time),
+    offsetof(ProcedureResponse, time),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "",
+    3,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_FLOAT,
+    offsetof(ProcedureResponse, has_replyvalue1),
+    offsetof(ProcedureResponse, replyvalue1),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "",
+    4,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_FLOAT,
+    offsetof(ProcedureResponse, has_replyvalue2),
+    offsetof(ProcedureResponse, replyvalue2),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+  {
+    "",
+    5,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_FLOAT,
+    offsetof(ProcedureResponse, has_replyvalue3),
+    offsetof(ProcedureResponse, replyvalue3),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
+};
+static const unsigned procedure_response__field_indices_by_name[] = {
+  2,   /* field[2] = ReplyValue1 */
+  3,   /* field[3] = ReplyValue2 */
+  4,   /* field[4] = ReplyValue3 */
+  1,   /* field[1] = Time */
+  0,   /* field[0] = Type */
+};
+static const ProtobufCIntRange procedure_response__number_ranges[1 + 1] =
+{
+  { 1, 0 },
+  { 0, 5 }
+};
+const ProtobufCMessageDescriptor procedure_response__descriptor =
+{
+  PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
+  "",
+  "",
+  "",
+  "",
+  sizeof(ProcedureResponse),
+  5,
+  procedure_response__field_descriptors,
+  procedure_response__field_indices_by_name,
+  1,  procedure_response__number_ranges,
+  (ProtobufCMessageInit) procedure_response__init,
+  NULL,NULL,NULL    /* reserved[123] */
+};
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProcedureResponse.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProcedureResponse.pb-c.h
new file mode 100644
index 000000000..e06fda627
--- /dev/null
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Stubs/ProcedureResponse.pb-c.h
@@ -0,0 +1,80 @@
+/* Generated by the protocol buffer compiler.  DO NOT EDIT! */
+/* Generated from: ProcedureResponse.proto */
+
+#ifndef PROTOBUF_C_ProcedureResponse_2eproto__INCLUDED
+#define PROTOBUF_C_ProcedureResponse_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 _ProcedureResponse ProcedureResponse;
+
+
+/* --- enums --- */
+
+
+/* --- messages --- */
+
+struct  _ProcedureResponse
+{
+  ProtobufCMessage base;
+  protobuf_c_boolean has_type;
+  int32_t type;
+  protobuf_c_boolean has_time;
+  int32_t time;
+  protobuf_c_boolean has_replyvalue1;
+  float replyvalue1;
+  protobuf_c_boolean has_replyvalue2;
+  float replyvalue2;
+  protobuf_c_boolean has_replyvalue3;
+  float replyvalue3;
+};
+#define PROCEDURE_RESPONSE__INIT \
+ { PROTOBUF_C_MESSAGE_INIT (&procedure_response__descriptor) \
+    , 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
+
+
+/* ProcedureResponse methods */
+void   procedure_response__init
+                     (ProcedureResponse         *message);
+size_t procedure_response__get_packed_size
+                     (const ProcedureResponse   *message);
+size_t procedure_response__pack
+                     (const ProcedureResponse   *message,
+                      uint8_t             *out);
+size_t procedure_response__pack_to_buffer
+                     (const ProcedureResponse   *message,
+                      ProtobufCBuffer     *buffer);
+ProcedureResponse *
+       procedure_response__unpack
+                     (ProtobufCAllocator  *allocator,
+                      size_t               len,
+                      const uint8_t       *data);
+void   procedure_response__free_unpacked
+                     (ProcedureResponse *message,
+                      ProtobufCAllocator *allocator);
+/* --- per-message closures --- */
+
+typedef void (*ProcedureResponse_Closure)
+                 (const ProcedureResponse *message,
+                  void *closure_data);
+
+/* --- services --- */
+
+
+/* --- descriptors --- */
+
+extern const ProtobufCMessageDescriptor procedure_response__descriptor;
+
+PROTOBUF_C__END_DECLS
+
+
+#endif  /* PROTOBUF_C_ProcedureResponse_2eproto__INCLUDED */
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
index 9d9c36623..6d811bc2d 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
@@ -532,10 +532,10 @@ void CopyTemperaturesToMonitor(void)
         DiagnosticsMonitor.n_headzone12temperature =
                 HeaterCounterIndex[HEATER_TYPE__HeaterZone12];
 
-        DiagnosticsMonitor.n_headblower1airflow = HeaterCounterIndex[HEATER_TYPE__HeaterZone7];
-        DiagnosticsMonitor.n_headblower2airflow = HeaterCounterIndex[HEATER_TYPE__HeaterZone5];
-        headblower1airflow = PressureSensorGetPressure(HEAD_FAN_RIGHT);
-        headblower2airflow = PressureSensorGetPressure(HEAD_FAN_LEFT);
+        DiagnosticsMonitor.n_headblower1airflow = HeaterCounterIndex[HEATER_TYPE__HeaterZone5];
+        DiagnosticsMonitor.n_headblower2airflow = HeaterCounterIndex[HEATER_TYPE__HeaterZone7];
+        headblower1airflow = PressureSensorGetPressure(HEAD_PT100_ZONE_5_0X84_0);
+        headblower2airflow = PressureSensorGetPressure(HEAD_PT100_ZONE_7_0X86_0);
         DiagnosticsMonitor.headblower1airflow = &headblower1airflow;
         DiagnosticsMonitor.headblower2airflow = &headblower2airflow;
 
@@ -545,6 +545,28 @@ void CopyTemperaturesToMonitor(void)
         headblowervoltage2 = HeadBlowersGetRPM(HEAD_FAN_LEFT);
         DiagnosticsMonitor.headblowervoltage1 = &headblowervoltage1;
         DiagnosticsMonitor.headblowervoltage2 = &headblowervoltage2;
+#warning machine to machine test
+        DiagnosticsMonitor.headzone4temperature =
+                HeaterTemperature[HEATER_TYPE__HeaterZone4];
+        DiagnosticsMonitor.headzone6temperature =
+                HeaterTemperature[HEATER_TYPE__HeaterZone6];
+        DiagnosticsMonitor.headzone8temperature =
+                HeaterTemperature[HEATER_TYPE__HeaterZone8];
+        DiagnosticsMonitor.headzone9temperature =
+                HeaterTemperature[HEATER_TYPE__HeaterZone9];
+        DiagnosticsMonitor.headzone10temperature =
+                HeaterTemperature[HEATER_TYPE__HeaterZone10];
+        DiagnosticsMonitor.n_headzone4temperature =
+                HeaterCounterIndex[HEATER_TYPE__HeaterZone4];
+        DiagnosticsMonitor.n_headzone6temperature =
+                HeaterCounterIndex[HEATER_TYPE__HeaterZone6];
+        DiagnosticsMonitor.n_headzone8temperature =
+                HeaterCounterIndex[HEATER_TYPE__HeaterZone8];
+        DiagnosticsMonitor.n_headzone9temperature =
+                HeaterCounterIndex[HEATER_TYPE__HeaterZone9];
+        DiagnosticsMonitor.n_headzone10temperature =
+                HeaterCounterIndex[HEATER_TYPE__HeaterZone10];
+
     }
 #ifdef FOUR_WINDERS
 //    double dancer2,dancer3,dancer4;
@@ -989,6 +1011,13 @@ void DiagnosticOneSecCollection(void)
         //DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone8, MillisecGetTemperatures(HEAD_PT100_ZONE_8_0X86_1));
         DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone11, MillisecGetTemperatures(HEAD_PT100_ZONE_11_0X8A_0));
         DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone12, MillisecGetTemperatures(HEAD_PT100_ZONE_12_0X8A_1));
+#warning MACHINE TO MACHINE TEST
+        DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone4, MillisecGetTemperatures(HEAD_PT100_ZONE_4_0X82_1));
+        DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone6, MillisecGetTemperatures(HEAD_PT100_ZONE_6_0X84_1));
+        DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone8, MillisecGetTemperatures(HEAD_PT100_ZONE_8_0X86_1));
+        DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone9, MillisecGetTemperatures(HEAD_PT100_ZONE_9_0X88_0));
+        DiagnosticLoadTemperature(HEATER_TYPE__HeaterZone10, MillisecGetTemperatures(HEAD_PT100_ZONE_10_0X88_1));
+
     }
     DiagnosticLoadTemperature(HARDWARE_PID_CONTROL_TYPE__DryerAirTemperature, MillisecGetTemperatures(TEMP_SENSE_ANALOG_DRYER_TEMP1));
     DiagnosticLoadTemperature(HARDWARE_PID_CONTROL_TYPE__DryerHeaterMain, MillisecGetTemperatures(TEMP_SENSE_ANALOG_DRYER_TEMP2));
diff --git a/Software/Embedded_SW/Embedded/Modules/General/buttons.c b/Software/Embedded_SW/Embedded/Modules/General/buttons.c
index 0dda71d16..833530536 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/buttons.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/buttons.c
@@ -62,6 +62,7 @@ uint32_t ButtonLoadCBFunction(uint32_t IfIndex, uint32_t ReadValue);
 //uint32_t LoadLongPress( button *pBtn);
 bool get_pbAction ( button *pBtn, PB_Status ReadValue);
 
+int JogSpeed = 40;
 #define LOADLONGPRESS 3
 
 int PowerDown()
@@ -325,7 +326,7 @@ uint32_t ButtonJogCBFunction(uint32_t IfIndex, uint32_t ReadValue)
                     ReportWithPackageFilter(GeneralFilter,"------------ joggingMachine: Jogging is sttENABLE and  PRESS-----------------", __FILE__,__LINE__,jog.state, RpMessage, jog.Action, 0);
                     jog.color =  colorON;
                     jog.color =  BLINK;
-                    ThreadJoggingFunc(40);
+                    ThreadJoggingFunc(JogSpeed);
                     jog.state = sttJOGGING;
                 }
             }
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
index c6cfbb1d1..0ce6474cc 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Progress.c
@@ -1254,6 +1254,15 @@ void Stub_ProgressRequest(MessageContainer* requestContainer)
         response.has_progress = true;
     }
     else
+    if(request->amount == 0xB25)  //Set loading arm cycles
+    {
+        REPORT_MSG(request->delay,"Change jog speed");
+        if (request->delay<100)
+            JogSpeed = request->delay;
+        response.progress = JogSpeed;
+        response.has_progress = true;
+    }
+    else
     if(request->amount == 0xC3)  //suspend I2C task
     {
         if (request->delay == 0)
diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.h b/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.h
index dde582749..b27199aaf 100644
--- a/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.h
+++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/PrintingSTM.h
@@ -188,6 +188,8 @@ bool JobIsActive(void);
 
 extern bool SuspendLargeMessages;
 
+extern int JogSpeed;
+
 extern bool CopyConfigured[MAX_SYSTEM_MODULES];
 extern bool CleaningJobActive;
 extern bool JoggingJobActive;