update waste volume measurment logic

2 files changed, 63 insertions, 25 deletions

diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index a5421e60a..84b31c322 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -61,6 +61,8 @@
 #include <Drivers/I2C_Communication/WHS_Card/D_Max5805_ADC_Blower/WHS_Blower.h>
 #include "Modules/Heaters/Heaters_ex.h"
 #include <Drivers/I2C_Communication/WHS_Card/D_EMC2302_Fan/WHS_Fan.h>
+#include <Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.h>
+
 Task_Handle Millisecond_Task_Handle;
 /******************** Definitions  ********************************************/
 
@@ -732,6 +734,20 @@ uint32_t MillisecLowLoop(uint32_t tick)
             WHS_Blower_Avarege(HEAD_FLOW_METER);
             WHS_Blower_Avarege(DRIER_FLOW_METER);
             WHS_Start_Blower_Control_Closed_Loop ();
+
+            static uint8_t Whs_emptying_cycle = 0;
+
+            // #warning TBD need to define the timing
+            if(Whs_emptying_cycle >= 2)
+            {
+                waste_seq_step1();// include 1Sec delay
+                Whs_emptying_cycle = 0;
+            }
+            else
+            {
+                Whs_emptying_cycle++;
+            }
+
         }
     }
     if (OneMinute_Tick)
diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/newWHS_init.c b/Software/Embedded_SW/Embedded/Modules/Waste/newWHS_init.c
index 99b96ddf3..485b28ccc 100644
--- a/Software/Embedded_SW/Embedded/Modules/Waste/newWHS_init.c
+++ b/Software/Embedded_SW/Embedded/Modules/Waste/newWHS_init.c
@@ -17,10 +17,34 @@
 #include <Drivers/I2C_Communication/WHS_Card/D_MAX11614_ADC/WHS_MAX11614_A2D.h>
 #include <Drivers/I2C_Communication/WHS_Card/EEPROM/D_EEPROM.h>
 #include <Drivers/I2C_Communication/WHS_Card/IO_Extender_Ports_TCA9555/WHS_IO.h>
+#include <Drivers/I2C_Communication/WHS_Card/EEPROM/WHS_EEPROM.h>
 
 bool test_9555(void);
 bool WHS_I2C_EEprom_Write_Ch_shai_taest(void);
 
+uint8_t WHS_Write_Buf[9];
+uint8_t WHS_Read_Buf[9];
+#define PAGE 256
+
+bool WHS_I2C_EEprom_Read_Buf()
+{
+    bool status= OK;
+
+    uint8_t address_high_byte = 0x00;
+    uint8_t address_low_byte  = 0x00;
+
+    status |= Select_Main_WHS_Mux_Channel();
+
+    //Set to read
+    WHS_Write_Buf[0] = address_high_byte;
+    WHS_Write_Buf[1] = address_low_byte;
+    status |= I2C_Write(I2C_ID_WHS_CARD, I2CEEPROM_ADDRESS, WHS_Write_Buf, 2);
+
+    status |= I2C_Read(I2C_ID_WHS_CARD, I2CEEPROM_ADDRESS + 1, WHS_Eeprom.Buf, sizeof(WHS_EEPROM_BYTES));
+
+    return status;
+}
+
 bool newWHS_init(void)
 {
     bool status = OK;
@@ -39,6 +63,7 @@ bool newWHS_init(void)
     Trigger_WHS_MAX11614_Init();
     Trigger_WHS_Rheostat_init();
 
+    status |= WHS_I2C_EEprom_Read_Buf();
     //status |= WHS_IO_Init();
     //status |= init_WHS_fan();
     //
@@ -62,7 +87,6 @@ bool newWHS_init(void)
     //Trigger_SetWHSBlowerVoltage (0x0C00);
 
 
-
 return status;
 }
 
@@ -76,9 +100,7 @@ bool test_9555(void)
     return status;
 }
 
-uint8_t WHS_Write_Buf[9];
-uint8_t WHS_Read_Buf[9];
-#define PAGE 256
+
 bool WHS_I2C_EEprom_Write_Ch_shai_taest()
 {
     bool status= OK;
@@ -104,24 +126,24 @@ bool WHS_I2C_EEprom_Write_Ch_shai_taest()
             address= i*256;
         }
 
-//    status |= Select_Main_WHS_Mux_Channel();
-//
-//    WHS_Write_Buf[0] = address_high_byte;
-//    WHS_Write_Buf[1] = address_low_byte;
-//    WHS_Write_Buf[2] = 0xAA;
-//    WHS_Write_Buf[4] = 0xAA;
-//    WHS_Write_Buf[6] = 0xAA;
-//    WHS_Write_Buf[8] = 0xAA;
-//    WHS_Write_Buf[3] = 0x55;
-//    WHS_Write_Buf[5] = 0x55;
-//    WHS_Write_Buf[7] = 0x55;
-//
-//
-//
-//
-//    status |= I2C_Write(I2C_ID_WHS_CARD, I2CEEPROM_ADDRESS, WHS_Write_Buf, 9);
-//    SysCtlDelay(5000000);//Must delay for at least 5 milli. !!!  (See data sheet )
-//    status |= I2C_Write(I2C_ID_WHS_CARD, I2CEEPROM_ADDRESS, WHS_Write_Buf, 2);
-//    status |= I2C_Read(I2C_ID_WHS_CARD, I2CEEPROM_ADDRESS + 1, WHS_Read_Buf, 7);
-    return status;
-}
+    //    status |= Select_Main_WHS_Mux_Channel();
+    //
+    //    WHS_Write_Buf[0] = address_high_byte;
+    //    WHS_Write_Buf[1] = address_low_byte;
+    //    WHS_Write_Buf[2] = 0xAA;
+    //    WHS_Write_Buf[4] = 0xAA;
+    //    WHS_Write_Buf[6] = 0xAA;
+    //    WHS_Write_Buf[8] = 0xAA;
+    //    WHS_Write_Buf[3] = 0x55;
+    //    WHS_Write_Buf[5] = 0x55;
+    //    WHS_Write_Buf[7] = 0x55;
+    //
+    //
+    //
+    //
+    //    status |= I2C_Write(I2C_ID_WHS_CARD, I2CEEPROM_ADDRESS, WHS_Write_Buf, 9);
+    //    SysCtlDelay(5000000);//Must delay for at least 5 milli. !!!  (See data sheet )
+    //    status |= I2C_Write(I2C_ID_WHS_CARD, I2CEEPROM_ADDRESS, WHS_Write_Buf, 2);
+    //    status |= I2C_Read(I2C_ID_WHS_CARD, I2CEEPROM_ADDRESS + 1, WHS_Read_Buf, 7);
+        return status;
+    }