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

2 files changed, 5 insertions, 4 deletions

diff --git a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c
index 05ad6bf74..1c6b7db8d 100644
--- a/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c
+++ b/Software/Embedded_SW/Embedded/Drivers/FPGA/FPGA_GPIO/FPGA_GPIO.c
@@ -507,9 +507,9 @@ uint32_t Control_WD(bool IsEnable, unsigned char SetTimer_Steps100mSec) // Contr
 
     if (IsEnable == DISABLE)
     {
-        F1_Watchdog_reg = 0;
-        F2_Watchdog_reg = 0;
-        F3_Watchdog_reg = 0;
+        F1_Watchdog_reg = 0xFF;//changed from 0 to 0xFF because if the WD expired 0 won't disable the WD must set  (0 <) number (< 0x4000)
+        F2_Watchdog_reg = 0xFF;
+        F3_Watchdog_reg = 0xFF;
     }
     else
     {
diff --git a/Software/Embedded_SW/Embedded/Main.c b/Software/Embedded_SW/Embedded/Main.c
index 9626537ae..699f1ad44 100644
--- a/Software/Embedded_SW/Embedded/Main.c
+++ b/Software/Embedded_SW/Embedded/Main.c
@@ -58,6 +58,7 @@
 
 #include "Drivers/I2C_Communication/I2C.h"
 
+#include "Drivers/I2C_Communication/Dispenser_Card/EEPROM/Dispenser_EEPROM.h"
 
 #include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h"
 
@@ -213,7 +214,7 @@ int main(void)
     //
     //test_avi(); //example for shai
 
-    Set_Speed_Sensor_TypeII_Registers(2,2);
+    Set_Speed_Sensor_TypeII_Registers(2,2);//set default values
     //Read_Speed_Sensor_TypeII();//must be delay between Set_Speed_Sensor_TypeII_Registers to Read_Speed_Sensor_TypeII
 
     //Test_ADS120_Internal_Temperature_Sensor(0);