Decrease the delay in I2C communication from 5000 ticks to 100 + add wait until bus is not busy, add I2C task trigger to init the I/O extenders , move to 16 bit in I2C I/O extenders, remove unnecessary delays...

1 files changed, 13 insertions, 14 deletions

diff --git a/Software/Embedded_SW/Embedded/Main.c b/Software/Embedded_SW/Embedded/Main.c
index 3be36668d..5c6c13686 100644
--- a/Software/Embedded_SW/Embedded/Main.c
+++ b/Software/Embedded_SW/Embedded/Main.c
@@ -84,7 +84,7 @@
 #include "Drivers/I2C_Communication/Head_Card/IO_Ports/Head_IO.h"
 #include "Drivers/I2C_Communication/Head_Card/EEPROM/Head_EEPROM.h"
 #include "modules/AlarmHandling/AlarmHandling.h"
-//#include <Drivers/I2C_Communication/I2C_Task.h>
+#include <Drivers/I2C_Communication/I2C_Task.h>
 #include <Drivers/I2C_Communication/WHS_Card/EEPROM/WHS_EEPROM.h>
 #include <Drivers/I2C_Communication/RFID_NFC/I2C_IFS_Mux.h>
 //*****************************************************************************
@@ -265,21 +265,23 @@ int main(void)
 
    Init_All_I2C();
    Block_Main_MUX_TCA9548A_0xE4();//unused, same i2c as head and whs cards
-   Check_Head_Type_Via_EEPROM();
+   Check_Head_Type_Via_EEPROM();//without trigger
+   Check_WHS_Type_Via_EEPROM();//without trigger
+   if ((Head_Type >= HEAD_TYPE_UNKNOWN_WITH_CARD)&&(WHS_Type == WHS_TYPE_NEW))
+   {
+       PP_Machine = true;
+   }
+   if ((Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD)||(WHS_Type == WHS_TYPE_NEW))
+   {
+       I2C_ReadingTask_Init();
+   }
    if (Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD)
    {
-       Head_IO_Init();//moved to set 24 to pressure sensor in arc earlier
+       Trigger_Head_io_Init();//Head_IO_Init();//moved to set 24 to pressure sensor in arc earlier
    }
 
-   //Trigger_Check_WHS_Type_Via_EEPROM();
-   Check_WHS_Type_Via_EEPROM();
-
    Check_IFS_Availability();
 
-   if ((Head_Type >= HEAD_TYPE_UNKNOWN_WITH_CARD)&&(WHS_Type == WHS_TYPE_NEW))
-   {
-       PP_Machine = true;
-   }
    #ifndef EVALUATION_BOARD
    STATUS_RED_LED_ON;
    STATUS_GREEN_LED_ON;
@@ -290,8 +292,6 @@ int main(void)
 
     SysCtlUSBPLLEnable();
 
-
-
 #ifndef EVALUATION_BOARD
     DeActivateAllSSR();
     Control_Dryer_Fan(STOP,0);//Preventing unwanted movement at power up, since the default from FPGA is "0" (= START)
@@ -310,8 +310,7 @@ int main(void)
 	//ActivateHeadMagnet();
     Set_Speed_Sensor_TypeII_Registers(10,5);//set default values
 #endif
-    if ((Head_Type > HEAD_TYPE_SYLKO_WITHOUT_CARD)||(WHS_Type == WHS_TYPE_NEW))
-        I2C_ReadingTask_Init();
+
 	//EMAC_initEMAC();
     ControlInit();