secondary pump monitoring

2 files changed, 9 insertions, 4 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
index aaa6f9a50..75d8aceca 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
@@ -109,8 +109,10 @@ DoubleArray DiagnosticsDispenserPressure[MAX_SYSTEM_DISPENSERS];
 
 HeaterState **heatersstates;
 HeaterState  HeaterInfo[HEATER_TYPE__MixerHeater+1];
+
+#define NUM_OF_INTERFACE_IOS 21
 DigitalInterfaceState **digitalinterfacestates;
-DigitalInterfaceState DigitalOutputState[MAX_HEATERS_NUM+10];
+DigitalInterfaceState DigitalOutputState[NUM_OF_INTERFACE_IOS];
 /*double dispenser1motorfrequency[DIAGNOSTICS_LIMIT+1];
 double dispenser2motorfrequency[DIAGNOSTICS_LIMIT+1];
 double dispenser3motorfrequency[DIAGNOSTICS_LIMIT+1];
@@ -178,7 +180,7 @@ void DiagnosticsInit(void)
         heatersstates[i] = &HeaterInfo[i];
     }
     digitalinterfacestates = (DigitalInterfaceState**)my_malloc(sizeof(DigitalInterfaceState *)*(MAX_HEATERS_NUM+8));
-    for (i = 0;i<(MAX_HEATERS_NUM+9);i++ )
+    for (i = 0;i<NUM_OF_INTERFACE_IOS;i++ )
     {
         digital_interface_state__init(&DigitalOutputState[i]);
         DigitalOutputState[i].has_interfaceio = true;
@@ -299,6 +301,9 @@ void DiagnosticsLoadDigitalValues(void)
     DigitalOutputState[16].interfaceio = INTERFACE_IOS__GPO_SPARE_SSR12_CTRL; /*lubricant valve*/
     DigitalOutputState[16].value = GetLubricantState();
 
+    DigitalOutputState[17].interfaceio = INTERFACE_IOS__GPO_TFEED_BREAK_1; /*Secondary Pump Active*/
+    DigitalOutputState[17].value = SecondaryPumpActive;
+
 }
 void DiagnosticLoadTemperature(int HeaterId, int temperature)
 {
diff --git a/Software/Embedded_SW/Embedded/Modules/General/buttons.c b/Software/Embedded_SW/Embedded/Modules/General/buttons.c
index 3cee7594d..2e6d7e3b5 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/buttons.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/buttons.c
@@ -217,7 +217,7 @@ uint32_t ButtonLoadCBFunction(uint32_t IfIndex, uint32_t ReadValue)
     {
         if (load.count == LOADLONGPRESS) // todo
         {
-            load.count = 0;
+            //load.count = 0;
             LoadLongPress( &load );
         }
         else load.count++;
@@ -670,7 +670,7 @@ void test_avi()
 
 uint32_t LoadLongPress( button *pBtn)
 {
-    REPORT_MSG(parameter," ------------ load.state = LoadLongPress    ----------------- ");
+    REPORT_MSG(load.count," ------------ load.state = LoadLongPress    ----------------- ");
     //Thread_Load_End();
     return OK;
 }