Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

1 files changed, 10 insertions, 12 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
index 1390e23e0..7758ebd8b 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
@@ -669,6 +669,8 @@ void DiagnosticOneMinuteCollection(void)
     VOC_Sensor = (double) getGasReading();
     DiagnosticsMonitor.n_filterdeltapressure = 1;
     DiagnosticsMonitor.filterdeltapressure = &VOC_Sensor;
+    DiagnosticsMonitor.n_gassensor = 1;
+    DiagnosticsMonitor.gassensor = &VOC_Sensor;
 
     DiagnosticsMonitor.n_blowervoltage = 1;
     diagvoltage = getBlowerState();
@@ -687,16 +689,6 @@ void DiagnosticOneMinuteCollection(void)
     DiagnosticsMonitor.n_headairflow = 1;
     DiagnosticsMonitor.headairflow = &HeadFlowMeter;
 
-/*    if (Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD) //rapid/pp machines
-    {
-        AcVoltage = ReadVAC();
-        DiagnosticsMonitor.whsblower2voltage = &AcVoltage;
-        DiagnosticsMonitor.n_whsblower2voltage = 1;
-    }
-*/
-
-
-
 }
 void DiaglosticChangeBlowerData()
 {
@@ -714,6 +706,8 @@ void DiagnosticOneSecCollection(void)
         AcVoltage = ReadVAC();
         DiagnosticsMonitor.whsblower2voltage = &AcVoltage;
         DiagnosticsMonitor.n_whsblower2voltage = 1;
+        DiagnosticsMonitor.incomingvoltage = &AcVoltage;
+        DiagnosticsMonitor.n_incomingvoltage = 1;
     }
     if (WHS_Type == WHS_TYPE_NEW) //rapid/pp machines
     {
@@ -729,10 +723,12 @@ void DiagnosticOneSecCollection(void)
             Report("Head flow change 1s",__FILE__,(int)diagvoltage,(int)(tempFlow*1000),RpWarning,(int)(HeadFlowMeter*1000),0);
             tempFlow = HeadFlowMeter;
         }
-        DiagnosticsMonitor.n_chillertemperature = 1;
         WasteLevel = GetWHSWasteTankLevelMiliLiter();
+        DiagnosticsMonitor.n_chillertemperature = 1;
         DiagnosticsMonitor.chillertemperature = &WasteLevel;
-    }
+        DiagnosticsMonitor.n_wastelevel = 1;
+        DiagnosticsMonitor.wastelevel = &WasteLevel;
+   }
     HeatersCurrent[HEATER_DRYER_CURRENT_1][0] = Get_Heaters_Current(HEATER_DRYER_CURRENT_1);
     HeatersCurrent[HEATER_DRYER_CURRENT_2][0] = Get_Heaters_Current(HEATER_DRYER_CURRENT_2);
     DiagnosticsMonitor.n_drierzone1heatercurrent = 1;
@@ -1075,6 +1071,8 @@ void SendDiagnostics(void)
     VOC_Sensor = (double) getGasReading();
     DiagnosticsMonitor.n_filterdeltapressure = 1;
     DiagnosticsMonitor.filterdeltapressure = &VOC_Sensor;
+    DiagnosticsMonitor.n_gassensor = 1;
+    DiagnosticsMonitor.gassensor = &VOC_Sensor;
 
     response.monitors = &DiagnosticsMonitor;
     //response.digitalpins = DigitalPinArray;