SW info FPGA version fixed

4 files changed, 19 insertions, 14 deletions

diff --git a/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c b/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c
index 11be30b2b..b896e168c 100644
--- a/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c
+++ b/Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c
@@ -20,7 +20,7 @@ typedef struct
 } TangoVersion_t;
 
 
-TangoVersion_t _gTangoVersion = {1,3,5,4};
+TangoVersion_t _gTangoVersion = {1,3,5,5};
 #define BUILD_DATE __DATE__
 char Dat[50] = BUILD_DATE; 
  char _gTangoName [MAX_STRING_LEN] = "Tango01 ";//d
diff --git a/Software/Embedded_SW/Embedded/Communication/Connection.c b/Software/Embedded_SW/Embedded/Communication/Connection.c
index 1669dd6a3..b1ee3bda3 100644
--- a/Software/Embedded_SW/Embedded/Communication/Connection.c
+++ b/Software/Embedded_SW/Embedded/Communication/Connection.c
@@ -29,7 +29,12 @@
 #include "Modules/AlarmHandling/AlarmHandling.h"
 #include "Modules/Stubs_Handler/Stub_HW_Version.h"
 
-
+char HexToDecimal(char hex)
+{
+    int i = hex % 0x10;
+    int j = hex / 0x10;
+    return j*10+i;
+}
 void ConnectionRequest(MessageContainer* requestContainer)
 {
     MessageContainer responseContainer;
@@ -43,12 +48,12 @@ void ConnectionRequest(MessageContainer* requestContainer)
     unsigned char Month = 0;
     unsigned char Day = 0;
 
-    char Version[20] = {0};
-    char FPGA1Version[20] = {0};
-    char FPGA2Version[20] = {0};
-    char FPGA3Version[20] = {0};
-    char BoardVersion[20] = {0};
-    char AssyVersion[20] = {0};
+	char Version[30] = {0};
+	char FPGA1Version[30] = {0};
+	char FPGA2Version[30] = {0};
+	char FPGA3Version[30] = {0};
+	char BoardVersion[30] = {0};
+	char AssyVersion[30] = {0};
     response.deviceinformation = &DevInfo;
     /*
     extern TangoVersion_t _gTangoVersion;
@@ -57,19 +62,19 @@ void ConnectionRequest(MessageContainer* requestContainer)
       */
     DevInfo.builddate = Dat;
     DevInfo.name = _gTangoName;
-    usnprintf(Version, 20, "%d.%d.%d.%d",_gTangoVersion.m_major,_gTangoVersion.m_minor,_gTangoVersion.m_patch,_gTangoVersion.m_build);
+    usnprintf(Version, 30, "%d.%d.%d.%d",_gTangoVersion.m_major,_gTangoVersion.m_minor,_gTangoVersion.m_patch,_gTangoVersion.m_build);
     DevInfo.version = Version;
 
     FPGA_ReadVersion(1, &Major, &Year, &Month, &Day);
-    usnprintf(FPGA1Version, 20, "%d.%d.%d.%d",Major,Year, Month, Day);
+    usnprintf(FPGA1Version, 30, "FPGA1: Ver %d %d/%d/20%d",HexToDecimal(Major), HexToDecimal(Day),HexToDecimal(Month),HexToDecimal(Year));
     DevInfo.fpga1version = FPGA1Version;
 
     FPGA_ReadVersion(2, &Major, &Year, &Month, &Day);
-    usnprintf(FPGA2Version, 20, "%d.%d.%d.%d",Major,Year, Month, Day);
+    usnprintf(FPGA2Version, 30, "FPGA2: Ver %d %d/%d/20%d",HexToDecimal(Major), HexToDecimal(Day),HexToDecimal(Month),HexToDecimal(Year));
     DevInfo.fpga2version = FPGA2Version;
 
     FPGA_ReadVersion(3, &Major, &Year, &Month, &Day);
-    usnprintf(FPGA3Version, 20, "%d.%d.%d.%d",Major,Year, Month, Day);
+    usnprintf(FPGA3Version, 30, "FPGA3: Ver %d %d/%d/20%d",HexToDecimal(Major), HexToDecimal(Day),HexToDecimal(Month),HexToDecimal(Year));
     DevInfo.fpga3version = FPGA3Version;
 
     Read_HW_Version(BoardVersion, AssyVersion);
diff --git a/Software/Embedded_SW/Embedded/Embedded.cfg b/Software/Embedded_SW/Embedded/Embedded.cfg
index 7ef48ea1c..97c95a452 100644
--- a/Software/Embedded_SW/Embedded/Embedded.cfg
+++ b/Software/Embedded_SW/Embedded/Embedded.cfg
@@ -124,7 +124,7 @@ Program.global.control = Task.create("&controlTask", ControlTaskParams);
 
 var AlarmHandlingTaskParams = new Task.Params();
 AlarmHandlingTaskParams.instance.name = "AlarmHandling";
-AlarmHandlingTaskParams.stackSize = 1024;
+AlarmHandlingTaskParams.stackSize = 2048;
 AlarmHandlingTaskParams.priority = 10;
 Program.global.AlarmHandling = Task.create("&AlarmHandlingTask", AlarmHandlingTaskParams);
 
diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
index 0e600fb5f..f44ee39cd 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
@@ -136,7 +136,7 @@ uint32_t EmbeddedParametersInit(void)
     }
     IDS_Dispenser_SetTimeOutValues(EmbeddedParameters.closevalvetimeout, EmbeddedParameters.openvalvetimeout);
     IDS_Dispenser_SetBackLashValues(EmbeddedParameters.initialdispenserpressure, EmbeddedParameters.initialdispensertimeout, EmbeddedParameters.initialdispensertimelag);
-    //IDS_Dispenser_SetPrepareValues(EmbeddedParameters.dispenserbuildpressurespeed,   EmbeddedParameters.dispenserbuildpressurelimit, EmbeddedParameters.dispenserbuildpressuretimeout, EmbeddedParameters.dispenserbuildpressurelag);
+    IDS_Dispenser_SetPrepareValues(EmbeddedParameters.dispenserbuildpressurespeed,   EmbeddedParameters.dispenserbuildpressurelimit, EmbeddedParameters.dispenserbuildpressuretimeout, EmbeddedParameters.dispenserbuildpressurelag);
     Heaters_SetOverHeatTimeOutValues( EmbeddedParameters.overheatcountlimit,  EmbeddedParameters.underheatcountlimit);
     SetDiagnosticCollectionLimit(EmbeddedParameters.diagnosticcollectionlimit);
     ThreadSetBreakSensorLimit(EmbeddedParameters.breaksensorlimit);