From 9e57a93b0278fb7205214ab8a486dcccf307f548 Mon Sep 17 00:00:00 2001
From: Shlomo Hecht <shlomo@twine-s.com>
Date: Tue, 19 Nov 2019 17:57:43 +0200
Subject: update protobuf to latest

---
 Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c | 2 ++
 Software/Embedded_SW/Embedded/Modules/General/MachineStatus.c   | 4 +++-
 Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c   | 6 ------
 3 files changed, 5 insertions(+), 7 deletions(-)

(limited to 'Software/Embedded_SW/Embedded/Modules')

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;
-- 
cgit v1.3.1