From c6a0bc8f103aeaccaee8ffcd83d8f0741e006bfc Mon Sep 17 00:00:00 2001
From: Shlomo Hecht <shlomo@twine-s.com>
Date: Wed, 6 Mar 2019 18:11:12 +0200
Subject: current added to the diagnostics data. added protobuf parameters
 compiled.

---
 .../Embedded/Modules/Diagnostics/Diagnostics.c     | 23 ++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(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 72dd92d54..45db83b83 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
@@ -92,6 +92,7 @@ double dryerzone3temperature[DIAGNOSTICS_LIMIT];
 double dispensermotorfrequency[MAX_SYSTEM_DISPENSERS][DIAGNOSTICS_LIMIT];
 double dispenserspressure[MAX_SYSTEM_DISPENSERS][DIAGNOSTICS_LIMIT];
 double MidTankpressure[MAX_SYSTEM_DISPENSERS][1];
+double HeatersCurrent[NUM_OF_HEATERS][1];
 
 DoubleArray DispenserFreq[MAX_SYSTEM_DISPENSERS];
 DoubleArray DiagnosticsDispenserPressure[MAX_SYSTEM_DISPENSERS];
@@ -347,6 +348,10 @@ void Diagnostic100msecCollection(void)
         dispenserspressure[i][DiagnosticsIndex] = GetDispenserPressure(i); //Read_MidTank_Pressure_Sensor
         MidTankpressure[i][0] = Get_MidTank_Pressure_Sensor(i);
     }
+    for (i=0;i<NUM_OF_HEATERS;i++)
+    {
+        HeatersCurrent[i][0] = Get_Heaters_Current(i);
+    }
 /*     dispenser1motorfrequency[DiagnosticsIndex] = MotorGetSpeed(HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_1);
      dispenser2motorfrequency[DiagnosticsIndex] = MotorGetSpeed(HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_2);
      dispenser3motorfrequency[DiagnosticsIndex] = MotorGetSpeed(HARDWARE_MOTOR_TYPE__MOTO_DISPENSER_3);
@@ -551,6 +556,24 @@ void SendDiagnostics(void)
     DiagnosticsMonitor.midtank7level = MidTankpressure[6];
     DiagnosticsMonitor.n_midtank8level = 1;
     DiagnosticsMonitor.midtank8level = MidTankpressure[7];
+
+    DiagnosticsMonitor.n_drierzone1heatercurrent = 1;
+    DiagnosticsMonitor.drierzone1heatercurrent = HeatersCurrent[DRYER_CURRENT_1];
+    DiagnosticsMonitor.n_drierzone2heatercurrent = 1;
+    DiagnosticsMonitor.drierzone2heatercurrent = HeatersCurrent[DRYER_CURRENT_2];
+    DiagnosticsMonitor.n_mixer1heatercurrent = 1;
+    DiagnosticsMonitor.mixer1heatercurrent = HeatersCurrent[MIXCHIP];
+    DiagnosticsMonitor.n_headzone1heatercurrent = 1;
+    DiagnosticsMonitor.headzone1heatercurrent = HeatersCurrent[HEAD_ZONE_1];
+    DiagnosticsMonitor.n_headzone2heatercurrent = 1;
+    DiagnosticsMonitor.headzone2heatercurrent = HeatersCurrent[HEAD_ZONE_2];
+    DiagnosticsMonitor.n_headzone3heatercurrent = 1;
+    DiagnosticsMonitor.headzone3heatercurrent = HeatersCurrent[HEAD_ZONE_3];
+    DiagnosticsMonitor.n_headzone4heatercurrent = 1;
+    DiagnosticsMonitor.headzone4heatercurrent = HeatersCurrent[HEAD_ZONE_4];
+    DiagnosticsMonitor.n_headzone5_6heatercurrent = 1;
+    DiagnosticsMonitor.headzone5_6heatercurrent = HeatersCurrent[HEAD_ZONE_5_6];
+
     response.monitors = &DiagnosticsMonitor;
     //response.digitalpins = DigitalPinArray;
     response.n_componentsstates = 0;
-- 
cgit v1.3.1