update protobuf to latest

12 files changed, 168 insertions, 128 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 0cc98181a..81d8fe973 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[225] =
+static const ProtobufCEnumValue message_type__enum_values_by_number[227] =
 {
   { "None", "MESSAGE_TYPE__None", 0 },
   { "ErrorResponse", "MESSAGE_TYPE__ErrorResponse", 1 },
@@ -128,6 +128,8 @@ static const ProtobufCEnumValue message_type__enum_values_by_number[225] =
   { "StopApplicationLogsResponse", "MESSAGE_TYPE__StopApplicationLogsResponse", 1012 },
   { "ColorProfileRequest", "MESSAGE_TYPE__ColorProfileRequest", 1013 },
   { "ColorProfileResponse", "MESSAGE_TYPE__ColorProfileResponse", 1014 },
+  { "UpdateStatusRequest", "MESSAGE_TYPE__UpdateStatusRequest", 1015 },
+  { "UpdateStatusResponse", "MESSAGE_TYPE__UpdateStatusResponse", 1016 },
   { "StartDiagnosticsRequest", "MESSAGE_TYPE__StartDiagnosticsRequest", 2000 },
   { "StartDiagnosticsResponse", "MESSAGE_TYPE__StartDiagnosticsResponse", 2001 },
   { "MotorAbortHomingRequest", "MESSAGE_TYPE__MotorAbortHomingRequest", 2002 },
@@ -236,125 +238,125 @@ static const ProtobufCEnumValue message_type__enum_values_by_number[225] =
   { "StopMachineStatusUpdateResponse", "MESSAGE_TYPE__StopMachineStatusUpdateResponse", 9003 },
 };
 static const ProtobufCIntRange message_type__value_ranges[] = {
-{0, 0},{3, 2},{1000, 104},{2000, 119},{3000, 165},{4000, 175},{5000, 181},{6000, 185},{7000, 191},{8000, 215},{9000, 221},{0, 225}
+{0, 0},{3, 2},{1000, 104},{2000, 121},{3000, 167},{4000, 177},{5000, 183},{6000, 187},{7000, 193},{8000, 217},{9000, 223},{0, 227}
 };
-static const ProtobufCEnumValueIndex message_type__enum_values_by_name[225] =
+static const ProtobufCEnumValueIndex message_type__enum_values_by_name[227] =
 {
-  { "AbortJobRequest", 167 },
-  { "AbortJobResponse", 168 },
-  { "ActivateVersionRequest", 213 },
-  { "ActivateVersionResponse", 214 },
+  { "AbortJobRequest", 169 },
+  { "AbortJobResponse", 170 },
+  { "ActivateVersionRequest", 215 },
+  { "ActivateVersionResponse", 216 },
   { "CalculateRequest", 2 },
   { "CalculateResponse", 3 },
-  { "CartridgeValidationRequest", 163 },
-  { "CartridgeValidationResponse", 164 },
+  { "CartridgeValidationRequest", 165 },
+  { "CartridgeValidationResponse", 166 },
   { "ColorProfileRequest", 117 },
   { "ColorProfileResponse", 118 },
-  { "ConnectRequest", 187 },
-  { "ConnectResponse", 188 },
-  { "CreateRequest", 199 },
-  { "CreateResponse", 200 },
-  { "CurrentJobRequest", 171 },
-  { "CurrentJobResponse", 172 },
-  { "DeleteRequest", 201 },
-  { "DeleteResponse", 202 },
+  { "ConnectRequest", 189 },
+  { "ConnectResponse", 190 },
+  { "CreateRequest", 201 },
+  { "CreateResponse", 202 },
+  { "CurrentJobRequest", 173 },
+  { "CurrentJobResponse", 174 },
+  { "DeleteRequest", 203 },
+  { "DeleteResponse", 204 },
   { "DirectSynchronizationRequest", 109 },
   { "DirectSynchronizationResponse", 110 },
-  { "DisconnectRequest", 189 },
-  { "DisconnectResponse", 190 },
-  { "DispenserAbortHomingRequest", 129 },
-  { "DispenserAbortHomingResponse", 130 },
-  { "DispenserAbortJoggingRequest", 135 },
-  { "DispenserAbortJoggingResponse", 136 },
-  { "DispenserDataRequest", 215 },
-  { "DispenserDataResponse", 216 },
-  { "DispenserHomingRequest", 131 },
-  { "DispenserHomingResponse", 132 },
-  { "DispenserJoggingRequest", 133 },
-  { "DispenserJoggingResponse", 134 },
+  { "DisconnectRequest", 191 },
+  { "DisconnectResponse", 192 },
+  { "DispenserAbortHomingRequest", 131 },
+  { "DispenserAbortHomingResponse", 132 },
+  { "DispenserAbortJoggingRequest", 137 },
+  { "DispenserAbortJoggingResponse", 138 },
+  { "DispenserDataRequest", 217 },
+  { "DispenserDataResponse", 218 },
+  { "DispenserHomingRequest", 133 },
+  { "DispenserHomingResponse", 134 },
+  { "DispenserJoggingRequest", 135 },
+  { "DispenserJoggingResponse", 136 },
   { "ErrorResponse", 1 },
-  { "ExecuteProcessRequest", 195 },
-  { "ExecuteProcessResponse", 196 },
+  { "ExecuteProcessRequest", 197 },
+  { "ExecuteProcessResponse", 198 },
   { "ExternalBridgeLoginRequest", 105 },
   { "ExternalBridgeLoginResponse", 106 },
   { "ExternalBridgeLogoutRequest", 107 },
   { "ExternalBridgeLogoutResponse", 108 },
   { "ExternalBridgeUdpDiscoveryPacket", 104 },
-  { "FileChunkDownloadRequest", 209 },
-  { "FileChunkDownloadResponse", 210 },
-  { "FileChunkUploadRequest", 193 },
-  { "FileChunkUploadResponse", 194 },
-  { "FileDownloadRequest", 207 },
-  { "FileDownloadResponse", 208 },
-  { "FileUploadRequest", 191 },
-  { "FileUploadResponse", 192 },
-  { "GetFilesRequest", 205 },
-  { "GetFilesResponse", 206 },
-  { "GetStorageInfoRequest", 203 },
-  { "GetStorageInfoResponse", 204 },
-  { "JobRequest", 165 },
-  { "JobResponse", 166 },
-  { "KeepAliveRequest", 185 },
-  { "KeepAliveResponse", 186 },
-  { "KillProcessRequest", 197 },
-  { "KillProcessResponse", 198 },
-  { "MachineCalibrationDataRequest", 219 },
-  { "MachineCalibrationDataResponse", 220 },
-  { "MidTankDataSetupRequest", 217 },
-  { "MidTankDataSetupResponse", 218 },
-  { "MotorAbortHomingRequest", 121 },
-  { "MotorAbortHomingResponse", 122 },
-  { "MotorAbortJoggingRequest", 127 },
-  { "MotorAbortJoggingResponse", 128 },
-  { "MotorHomingRequest", 123 },
-  { "MotorHomingResponse", 124 },
-  { "MotorJoggingRequest", 125 },
-  { "MotorJoggingResponse", 126 },
+  { "FileChunkDownloadRequest", 211 },
+  { "FileChunkDownloadResponse", 212 },
+  { "FileChunkUploadRequest", 195 },
+  { "FileChunkUploadResponse", 196 },
+  { "FileDownloadRequest", 209 },
+  { "FileDownloadResponse", 210 },
+  { "FileUploadRequest", 193 },
+  { "FileUploadResponse", 194 },
+  { "GetFilesRequest", 207 },
+  { "GetFilesResponse", 208 },
+  { "GetStorageInfoRequest", 205 },
+  { "GetStorageInfoResponse", 206 },
+  { "JobRequest", 167 },
+  { "JobResponse", 168 },
+  { "KeepAliveRequest", 187 },
+  { "KeepAliveResponse", 188 },
+  { "KillProcessRequest", 199 },
+  { "KillProcessResponse", 200 },
+  { "MachineCalibrationDataRequest", 221 },
+  { "MachineCalibrationDataResponse", 222 },
+  { "MidTankDataSetupRequest", 219 },
+  { "MidTankDataSetupResponse", 220 },
+  { "MotorAbortHomingRequest", 123 },
+  { "MotorAbortHomingResponse", 124 },
+  { "MotorAbortJoggingRequest", 129 },
+  { "MotorAbortJoggingResponse", 130 },
+  { "MotorHomingRequest", 125 },
+  { "MotorHomingResponse", 126 },
+  { "MotorJoggingRequest", 127 },
+  { "MotorJoggingResponse", 128 },
   { "None", 0 },
   { "OverrideDataBaseRequest", 111 },
   { "OverrideDataBaseResponse", 112 },
   { "ProgressRequest", 4 },
   { "ProgressResponse", 5 },
-  { "ResolveEventRequest", 145 },
-  { "ResolveEventResponse", 146 },
-  { "ResumeCurrentJobRequest", 173 },
-  { "ResumeCurrentJobResponse", 174 },
-  { "SetBlowerStateRequest", 155 },
-  { "SetBlowerStateResponse", 156 },
-  { "SetComponentValueRequest", 143 },
-  { "SetComponentValueResponse", 144 },
-  { "SetDebugLogCategoryRequest", 179 },
-  { "SetDebugLogCategoryResponse", 180 },
-  { "SetDigitalOutRequest", 137 },
-  { "SetDigitalOutResponse", 138 },
-  { "SetHeaterStateRequest", 153 },
-  { "SetHeaterStateResponse", 154 },
-  { "SetValveStateRequest", 157 },
-  { "SetValveStateResponse", 158 },
+  { "ResolveEventRequest", 147 },
+  { "ResolveEventResponse", 148 },
+  { "ResumeCurrentJobRequest", 175 },
+  { "ResumeCurrentJobResponse", 176 },
+  { "SetBlowerStateRequest", 157 },
+  { "SetBlowerStateResponse", 158 },
+  { "SetComponentValueRequest", 145 },
+  { "SetComponentValueResponse", 146 },
+  { "SetDebugLogCategoryRequest", 181 },
+  { "SetDebugLogCategoryResponse", 182 },
+  { "SetDigitalOutRequest", 139 },
+  { "SetDigitalOutResponse", 140 },
+  { "SetHeaterStateRequest", 155 },
+  { "SetHeaterStateResponse", 156 },
+  { "SetValveStateRequest", 159 },
+  { "SetValveStateResponse", 160 },
   { "StartApplicationLogsRequest", 113 },
   { "StartApplicationLogsResponse", 114 },
-  { "StartCartridgesUpdateRequest", 159 },
-  { "StartCartridgesUpdateResponse", 160 },
-  { "StartDebugLogRequest", 175 },
-  { "StartDebugLogResponse", 176 },
-  { "StartDiagnosticsRequest", 119 },
-  { "StartDiagnosticsResponse", 120 },
-  { "StartEventsNotificationRequest", 149 },
-  { "StartEventsNotificationResponse", 150 },
-  { "StartMachineStatusUpdateRequest", 221 },
-  { "StartMachineStatusUpdateResponse", 222 },
+  { "StartCartridgesUpdateRequest", 161 },
+  { "StartCartridgesUpdateResponse", 162 },
+  { "StartDebugLogRequest", 177 },
+  { "StartDebugLogResponse", 178 },
+  { "StartDiagnosticsRequest", 121 },
+  { "StartDiagnosticsResponse", 122 },
+  { "StartEventsNotificationRequest", 151 },
+  { "StartEventsNotificationResponse", 152 },
+  { "StartMachineStatusUpdateRequest", 223 },
+  { "StartMachineStatusUpdateResponse", 224 },
   { "StopApplicationLogsRequest", 115 },
   { "StopApplicationLogsResponse", 116 },
-  { "StopCartridgesUpdateRequest", 161 },
-  { "StopCartridgesUpdateResponse", 162 },
-  { "StopDebugLogRequest", 177 },
-  { "StopDebugLogResponse", 178 },
-  { "StopDiagnosticsRequest", 147 },
-  { "StopDiagnosticsResponse", 148 },
-  { "StopEventsNotificationRequest", 151 },
-  { "StopEventsNotificationResponse", 152 },
-  { "StopMachineStatusUpdateRequest", 223 },
-  { "StopMachineStatusUpdateResponse", 224 },
+  { "StopCartridgesUpdateRequest", 163 },
+  { "StopCartridgesUpdateResponse", 164 },
+  { "StopDebugLogRequest", 179 },
+  { "StopDebugLogResponse", 180 },
+  { "StopDiagnosticsRequest", 149 },
+  { "StopDiagnosticsResponse", 150 },
+  { "StopEventsNotificationRequest", 153 },
+  { "StopEventsNotificationResponse", 154 },
+  { "StopMachineStatusUpdateRequest", 225 },
+  { "StopMachineStatusUpdateResponse", 226 },
   { "StubAbortJobRequest", 100 },
   { "StubAbortJobResponse", 101 },
   { "StubCartridgeReadRequest", 6 },
@@ -453,18 +455,20 @@ static const ProtobufCEnumValueIndex message_type__enum_values_by_name[225] =
   { "StubTivaWriteRegResponse", 79 },
   { "StubValveRequest", 30 },
   { "StubValveResponse", 31 },
-  { "SystemResetRequest", 183 },
-  { "SystemResetResponse", 184 },
-  { "ThreadAbortJoggingRequest", 141 },
-  { "ThreadAbortJoggingResponse", 142 },
-  { "ThreadJoggingRequest", 139 },
-  { "ThreadJoggingResponse", 140 },
-  { "UploadHardwareConfigurationRequest", 181 },
-  { "UploadHardwareConfigurationResponse", 182 },
-  { "UploadProcessParametersRequest", 169 },
-  { "UploadProcessParametersResponse", 170 },
-  { "ValidateVersionRequest", 211 },
-  { "ValidateVersionResponse", 212 },
+  { "SystemResetRequest", 185 },
+  { "SystemResetResponse", 186 },
+  { "ThreadAbortJoggingRequest", 143 },
+  { "ThreadAbortJoggingResponse", 144 },
+  { "ThreadJoggingRequest", 141 },
+  { "ThreadJoggingResponse", 142 },
+  { "UpdateStatusRequest", 119 },
+  { "UpdateStatusResponse", 120 },
+  { "UploadHardwareConfigurationRequest", 183 },
+  { "UploadHardwareConfigurationResponse", 184 },
+  { "UploadProcessParametersRequest", 171 },
+  { "UploadProcessParametersResponse", 172 },
+  { "ValidateVersionRequest", 213 },
+  { "ValidateVersionResponse", 214 },
 };
 const ProtobufCEnumDescriptor message_type__descriptor =
 {
@@ -473,9 +477,9 @@ const ProtobufCEnumDescriptor message_type__descriptor =
   "MessageType",
   "MessageType",
   "",
-  225,
+  227,
   message_type__enum_values_by_number,
-  225,
+  227,
   message_type__enum_values_by_name,
   11,
   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 eebad14ca..90461900a 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
@@ -139,6 +139,8 @@ typedef enum _MessageType {
   MESSAGE_TYPE__StopApplicationLogsResponse = 1012,
   MESSAGE_TYPE__ColorProfileRequest = 1013,
   MESSAGE_TYPE__ColorProfileResponse = 1014,
+  MESSAGE_TYPE__UpdateStatusRequest = 1015,
+  MESSAGE_TYPE__UpdateStatusResponse = 1016,
   MESSAGE_TYPE__StartDiagnosticsRequest = 2000,
   MESSAGE_TYPE__StartDiagnosticsResponse = 2001,
   MESSAGE_TYPE__MotorAbortHomingRequest = 2002,
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DiagnosticsMonitors.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DiagnosticsMonitors.pb-c.c
index dfa72d2db..ae8c238a9 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DiagnosticsMonitors.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DiagnosticsMonitors.pb-c.c
@@ -52,7 +52,7 @@ void   diagnostics_monitors__free_unpacked
   assert(message->base.descriptor == &diagnostics_monitors__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-static const ProtobufCFieldDescriptor diagnostics_monitors__field_descriptors[65] =
+static const ProtobufCFieldDescriptor diagnostics_monitors__field_descriptors[66] =
 {
   {
     "Dancer1Angle",
@@ -834,6 +834,18 @@ static const ProtobufCFieldDescriptor diagnostics_monitors__field_descriptors[65
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "OverallTemperature",
+    66,
+    PROTOBUF_C_LABEL_REPEATED,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(DiagnosticsMonitors, n_overalltemperature),
+    offsetof(DiagnosticsMonitors, overalltemperature),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned diagnostics_monitors__field_indices_by_name[] = {
   38,   /* field[38] = BlowerVoltage */
@@ -895,6 +907,7 @@ static const unsigned diagnostics_monitors__field_indices_by_name[] = {
   64,   /* field[64] = MidTanksInkLevel */
   62,   /* field[62] = Mixer1HeaterCurrent */
   9,   /* field[9] = MixerTemperature */
+  65,   /* field[65] = OverallTemperature */
   5,   /* field[5] = PollerMotor */
   15,   /* field[15] = PullerTension */
   7,   /* field[7] = ScrewMotor */
@@ -905,7 +918,7 @@ static const unsigned diagnostics_monitors__field_indices_by_name[] = {
 static const ProtobufCIntRange diagnostics_monitors__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 65 }
+  { 0, 66 }
 };
 const ProtobufCMessageDescriptor diagnostics_monitors__descriptor =
 {
@@ -915,7 +928,7 @@ const ProtobufCMessageDescriptor diagnostics_monitors__descriptor =
   "DiagnosticsMonitors",
   "",
   sizeof(DiagnosticsMonitors),
-  65,
+  66,
   diagnostics_monitors__field_descriptors,
   diagnostics_monitors__field_indices_by_name,
   1,  diagnostics_monitors__number_ranges,
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DiagnosticsMonitors.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DiagnosticsMonitors.pb-c.h
index ef860a31f..203c1d92c 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DiagnosticsMonitors.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/Diagnostics/DiagnosticsMonitors.pb-c.h
@@ -157,10 +157,12 @@ struct  _DiagnosticsMonitors
   DoubleArray **dispensersinklevel;
   size_t n_midtanksinklevel;
   DoubleArray **midtanksinklevel;
+  size_t n_overalltemperature;
+  double *overalltemperature;
 };
 #define DIAGNOSTICS_MONITORS__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&diagnostics_monitors__descriptor) \
-    , 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL }
+    , 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL }
 
 
 /* DiagnosticsMonitors methods */
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/IDSPackLevel.pb-c.c b/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/IDSPackLevel.pb-c.c
index 1af875afe..79d0e31a4 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/IDSPackLevel.pb-c.c
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/IDSPackLevel.pb-c.c
@@ -82,7 +82,7 @@ static const ProtobufCFieldDescriptor idspack_level__field_descriptors[3] =
     "MidTankLevel",
     3,
     PROTOBUF_C_LABEL_OPTIONAL,
-    PROTOBUF_C_TYPE_INT32,
+    PROTOBUF_C_TYPE_DOUBLE,
     offsetof(IDSPackLevel, has_midtanklevel),
     offsetof(IDSPackLevel, midtanklevel),
     NULL,
diff --git a/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/IDSPackLevel.pb-c.h b/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/IDSPackLevel.pb-c.h
index 985f5b685..01b8a89cb 100644
--- a/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/IDSPackLevel.pb-c.h
+++ b/Software/Embedded_SW/Embedded/Communication/PMR/MachineStatus/IDSPackLevel.pb-c.h
@@ -31,7 +31,7 @@ struct  _IDSPackLevel
   protobuf_c_boolean has_dispenserlevel;
   int32_t dispenserlevel;
   protobuf_c_boolean has_midtanklevel;
-  int32_t midtanklevel;
+  double midtanklevel;
 };
 #define IDSPACK_LEVEL__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&idspack_level__descriptor) \
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 ff017e5c6..ea7cd9e35 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[2] =
+static const ProtobufCFieldDescriptor machine_status__field_descriptors[3] =
 {
   {
     "State",
@@ -78,15 +78,28 @@ static const ProtobufCFieldDescriptor machine_status__field_descriptors[2] =
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
+  {
+    "OverallTemperature",
+    3,
+    PROTOBUF_C_LABEL_OPTIONAL,
+    PROTOBUF_C_TYPE_DOUBLE,
+    offsetof(MachineStatus, has_overalltemperature),
+    offsetof(MachineStatus, overalltemperature),
+    NULL,
+    NULL,
+    0,             /* flags */
+    0,NULL,NULL    /* reserved1,reserved2, etc */
+  },
 };
 static const unsigned machine_status__field_indices_by_name[] = {
   1,   /* field[1] = IDSPacksLevels */
+  2,   /* field[2] = OverallTemperature */
   0,   /* field[0] = State */
 };
 static const ProtobufCIntRange machine_status__number_ranges[1 + 1] =
 {
   { 1, 0 },
-  { 0, 2 }
+  { 0, 3 }
 };
 const ProtobufCMessageDescriptor machine_status__descriptor =
 {
@@ -96,7 +109,7 @@ const ProtobufCMessageDescriptor machine_status__descriptor =
   "MachineStatus",
   "",
   sizeof(MachineStatus),
-  2,
+  3,
   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 cdda11d36..0777f8855 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
@@ -32,10 +32,12 @@ struct  _MachineStatus
   MachineState state;
   size_t n_idspackslevels;
   IDSPackLevel **idspackslevels;
+  protobuf_c_boolean has_overalltemperature;
+  double overalltemperature;
 };
 #define MACHINE_STATUS__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&machine_status__descriptor) \
-    , 0, MACHINE_STATE__Initializing, 0,NULL }
+    , 0, MACHINE_STATE__Initializing, 0,NULL, 0, 0 }
 
 
 /* MachineStatus methods */
diff --git a/Software/Embedded_SW/Embedded/DataDef.h b/Software/Embedded_SW/Embedded/DataDef.h
index df1a97e69..2d5a39909 100644
--- a/Software/Embedded_SW/Embedded/DataDef.h
+++ b/Software/Embedded_SW/Embedded/DataDef.h
@@ -527,5 +527,11 @@ extern PackageHandle LoadFilter;
 extern PackageHandle InitFilter;
 extern PackageHandle MaintFilter;
 
+#ifndef max
+    #define max(a,b) ((a) > (b) ? (a) : (b))
+#endif
+#ifndef min
+    #define min(a,b) ((a) < (b) ? (a) : (b))
+#endif
 
 #endif /* DATADEF_H */
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
index d4e1636a5..ccf5455d4 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
@@ -415,6 +415,8 @@ void DiagnosticOneMinuteCollection(void)
         }
 
     }
+    DiagnosticsMonitor.n_overalltemperature = 1;
+    DiagnosticsMonitor.overalltemperature = max(MillisecGetTemperatures(TEMP_SENSE_AN_ENCLOSURETEMP1),MillisecGetTemperatures(TEMP_SENSE_AN_ENCLOSURETEMP2));
 
     DiagnosticsMonitor.n_midtank1level = 1;
     DiagnosticsMonitor.midtank1level = MidTankpressure[0];
diff --git a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c
index 2a4800b77..e1a516e95 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c
@@ -20,6 +20,7 @@
 #include "PMR/MachineStatus/IDSPackLevel.pb-c.h"
 
 #include "drivers/I2C_Communication/ADC_MUX/ADC_MUX.h"
+#include "Drivers/Heater/TemperatureSensor.h"
 #include "drivers/Motors/Motor.h"
 
 #include "Modules/General/MachineStatus.h"
@@ -70,9 +71,10 @@ int MachineUpdateResponseFunc(void)
             double dispcapacity = (1.00-(IDS_Dispenser_Data[i].consumedinnanolitter/5800000))*130*1000*1000;
             IDS_Level[i].dispenserlevel = (int32_t)dispcapacity;
             IDS_Level[i].has_midtanklevel = true;
-            IDS_Level[i].midtanklevel = Get_MidTank_Int1000_Sensor(i);
+            IDS_Level[i].midtanklevel = Get_MidTank_Pressure_Sensor(i);
             MachineStatus.idspackslevels[MachineStatus.n_idspackslevels] = &IDS_Level[i];
             MachineStatus.n_idspackslevels++;
+            MachineStatus.overalltemperature = max(MillisecGetTemperatures(TEMP_SENSE_AN_ENCLOSURETEMP1),MillisecGetTemperatures(TEMP_SENSE_AN_ENCLOSURETEMP2));
         }
     }
     else
diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
index 4d1fbddba..564df6862 100644
--- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c
@@ -766,12 +766,6 @@ bool HeaterGetOverTemperatureState(uint8_t HeaterId)
     return HeaterMaxTempFlag[HeaterId];
 }
 uint32_t MainPT100Read = 0,SecondaryPT100Read = 0;
-#ifndef max
-    #define max(a,b) ((a) > (b) ? (a) : (b))
-#endif
-#ifndef min
-    #define min(a,b) ((a) < (b) ? (a) : (b))
-#endif
 uint32_t HeaterMaxTempCBFunction(uint32_t IfIndex, uint32_t readValue)
 {
     int index=MAX_HEATERS_NUM;