some changes in spikes

5 files changed, 120 insertions, 10 deletions

diff --git a/Software/Embedded_SW/Embedded/Common/Utilities/RFIDTagHandling.c b/Software/Embedded_SW/Embedded/Common/Utilities/RFIDTagHandling.c
index 6465903fa..6d15afc6a 100644
--- a/Software/Embedded_SW/Embedded/Common/Utilities/RFIDTagHandling.c
+++ b/Software/Embedded_SW/Embedded/Common/Utilities/RFIDTagHandling.c
@@ -5,8 +5,6 @@
  *      Author: shlomo
  */
 #include "include.h"
-
-#include "Modules/Waste/Waste.h"
 #include "Modules/IFS/ifs.h"
 #include "Modules/AlarmHandling/AlarmHandling.h"
 #include "PMR/Diagnostics/CartridgeValidationRequest.pb-c.h"
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
index 8beab771d..3de362af9 100644
--- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
+++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c
@@ -524,11 +524,13 @@ int TemperatureSum[MAX_HEAD_CARD_TEMP_SENS_ID];
 int TemperatureMin[MAX_HEAD_CARD_TEMP_SENS_ID];
 int TemperatureMax[MAX_HEAD_CARD_TEMP_SENS_ID];
 int TemperatureCount[MAX_HEAD_CARD_TEMP_SENS_ID];
-int TemperatureCalc[MAX_HEAD_CARD_TEMP_SENS_ID];
+int TemperatureCalc[MAX_HEAD_CARD_TEMP_SENS_ID] = {2.1,2.1,2.1,2.1,2.1,2.1,2.1,2.1,2.1,2.1,2.1,2.1,2.1,2.1,2.1,2.1,2.1,2.1,2.1,2.1,2.1,2.1,2.1,2.1,2.1,2.1,2.1};
 void MillisecUpdateTemperatures (TEMPERATURE_SENSOR_ID_ENUM SensorId,int temperature)
 {
    //if(TemperatureCount[SensorId]++>=10)
    //    TemperatureCount[SensorId] = 0;
+    if ((temperature>28000)||(temperature<900))
+        return;
     TemperatureCount[SensorId]++;
     if (TemperatureMax[SensorId]<temperature) TemperatureMax[SensorId]=temperature;
     if (TemperatureMin[SensorId]>temperature) TemperatureMin[SensorId]=temperature;
@@ -540,8 +542,11 @@ int MillisecCalculateTemperatures (TEMPERATURE_SENSOR_ID_ENUM SensorId)
     TemperatureSum[SensorId]-=TemperatureMax[SensorId];
     TemperatureSum[SensorId]-=TemperatureMin[SensorId];
     calc = TemperatureSum[SensorId] / (TemperatureCount[SensorId]-2);
-    if (abs(TemperatureMax[SensorId]-TemperatureMin[SensorId])>2000)
-        Report("Millisec Temp spike",__FILE__,SensorId,(int)TemperatureMax[SensorId],RpWarning,(int) TemperatureMin[SensorId],0);
+    if (TemperatureSum[SensorId]>10)
+    {
+        if(abs(TemperatureMax[SensorId]-TemperatureMin[SensorId])>2000)
+                Report("Millisec Temp spike",__FILE__,SensorId,(int)TemperatureMax[SensorId],RpWarning,(int) TemperatureMin[SensorId],0);
+    }
     TemperatureSum[SensorId] = 0;
     TemperatureCount[SensorId] = 0;
     TemperatureMin[SensorId] = 30000;
diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
index c90b4fee9..6c4293f6f 100644
--- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
+++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c
@@ -452,6 +452,13 @@ uint32_t HWConfiguration(UploadHardwareConfigurationRequest* UploadRequest)
         AlarmHandlingSetAlarm (EVENT_TYPE__POWER_UP_BIT_FAILURE,ON);
         return ERROR;
     }
+    else
+    {
+        if (InitFailures > 2)
+        {
+            Report("HWConfigurationInit repeated failure going up",__FILE__,__LINE__,(int)InitFailures,RpWarning,(int)EEPROM_INIT_FAILURE_COUNTER,0);
+        }
+    }
 
     HardwareConfiguration *request =    UploadRequest->hardwareconfiguration;
 
diff --git a/Software/Stubs Collection/stubs/read and store main card data.cs b/Software/Stubs Collection/stubs/read and store main card data.cs
index 6655bcb5f..cf0cb7278 100644
--- a/Software/Stubs Collection/stubs/read and store main card data.cs
+++ b/Software/Stubs Collection/stubs/read and store main card data.cs
@@ -53,10 +53,9 @@ string[] Main_Card_EEpromAddress = {
 "EEPROM_DRIER_LOADING_ARM_ANGLE"};
 
 
-private const string JSON_FILE_PATH = "C:/temp/maineeprom.json";
-private const string CSV_FILE_PATH = "C:/temp/maineeprom.csv";
 public void OnExecute(StubManager stubManager)
 {
+	string FileName;
 	StubReadEmbeddedVersionRequest stubReadEmbeddedVersionRequest = new StubReadEmbeddedVersionRequest();
 	var response2 = stubManager.Run<StubReadEmbeddedVersionResponse>(stubReadEmbeddedVersionRequest);
 
@@ -64,11 +63,13 @@ public void OnExecute(StubManager stubManager)
 	{
 		MainCardStoredDataRequest mainCardStoredDataRequest = new MainCardStoredDataRequest();
 		var response3 = stubManager.Run<MainCardStoredDataResponse>(mainCardStoredDataRequest);
-		stubManager.AppendToFile(JSON_FILE_PATH, "MainCardStoredData: "+ response3);
+		FileName = "C:/temp/mainEEProm"/*+stubManager.ConnectedMachine.SerialNumber*/+".json";
+		stubManager.AppendToFile(FileName, "MainCardStoredData: "+ response3);
 	}
 	else
 	{
-		stubManager.AppendToFile(CSV_FILE_PATH, "Address,Name,Data");
+		FileName = "C:/temp/mainEEProm"/*+stubManager.ConnectedMachine.SerialNumber*/+".csv";
+		stubManager.AppendToFile(FileName, "Address,Name,Data");
 	    for (int i = 1; i < 36; i++)
 	    {
 			StubMainCardEEpromReadRequest stubMainCardEEpromReadRequest = new StubMainCardEEpromReadRequest();
@@ -76,7 +77,7 @@ public void OnExecute(StubManager stubManager)
 			stubMainCardEEpromReadRequest.Data = 0;
 	
 			var response = stubManager.Run<StubMainCardEEpromReadResponse>(stubMainCardEEpromReadRequest);
-			stubManager.AppendToFile(CSV_FILE_PATH, response.Address + "," + Main_Card_EEpromAddress[i] +","  + response.Data);
+			stubManager.AppendToFile(FileName, "\r\n"+response.Address + "," + Main_Card_EEpromAddress[i] +","  + response.Data);
 		}		
 	}
     
diff --git a/Software/Stubs Collection/stubs/reload main card EEPROM.cs b/Software/Stubs Collection/stubs/reload main card EEPROM.cs
new file mode 100644
index 000000000..d74874d98
--- /dev/null
+++ b/Software/Stubs Collection/stubs/reload main card EEPROM.cs
@@ -0,0 +1,99 @@
+using System;
+using System.Text;
+using System.Linq;
+using System.Drawing;
+using System.Diagnostics;
+using System.Windows.Forms;
+using System.Threading;
+using System.Threading.Tasks;
+using System.Collections.Generic;
+using Tango.PMR.Stubs;
+using Tango.PMR.EmbeddedParameters;
+using Tango.Stubs;
+using System.IO;
+using Tango.PMR.IO;
+using Google.Protobuf;
+
+int[] Main_Card_Data = 
+{9535,
+11923,
+8416,
+13851,
+0,
+1077829655,
+1064165718,
+1077627722,
+1063229233,
+1077936561,
+1063439315,
+1077366397,
+1063821827,
+1077794020,
+1063821827,
+-1,
+-1,
+1077758385,
+1062585679,
+1077516698,
+1066192077,
+-1,
+772146177,
+13,
+1067,
+1088,
+-1,
+5600,
+4000}
+
+string[] Main_Card_EEpromAddress = {
+"DATA_SIZE",
+"DANCER_0",
+"DANCER_1",
+"DANCER_2",
+"DRYER_CENTER",
+"DRYER_CYCLES",
+"MIDTANK_1_A",
+"MIDTANK_1_B",
+"MIDTANK_2_A",
+"MIDTANK_2_B",
+"MIDTANK_3_A",
+"MIDTANK_3_B",
+"MIDTANK_4_A",
+"MIDTANK_4_B",
+"MIDTANK_5_A",
+"MIDTANK_5_B",
+"MIDTANK_6_A",
+"MIDTANK_6_B",
+"MIDTANK_7_A",
+"MIDTANK_7_B",
+"MIDTANK_8_A",
+"MIDTANK_8_B",
+"WINDER_CALIBRATION",
+"EMBEDDED_VERSION",
+"EEPROM_ALARM_SUPPORT",
+"EEPROM_ORIFICE1_ZERO_VALUE",
+"EEPROM_ORIFICE3_ZERO_VALUE",
+"EEPROM_WASTE_TANK_ZERO_VALUE",
+"EEPROM_PULLER_TENSION_POSITION",
+"EEPROM_WINDER_TENSION_POSITION",
+"EEPROM_INIT_FAILURE_COUNTER",
+"DANCER_3",
+"DANCER_4",
+"EEPROM_PRESSURE_SENSOR_V0_0",
+"EEPROM_PRESSURE_SENSOR_V0_1",
+"EEPROM_DRIER_LOADING_ARM_ANGLE"};
+
+
+public void OnExecute(StubManager stubManager)
+{
+    for (int i = 1; i < 30; i++)
+    {
+		StubMainCardEEpromWriteRequest stubMainCardEEpromWriteRequest = new StubMainCardEEpromWriteRequest();
+		stubMainCardEEpromWriteRequest.Address = i;
+		stubMainCardEEpromWriteRequest.Data = Main_Card_Data[i];
+
+		var response = stubManager.Run<StubMainCardEEpromWriteResponse>(stubMainCardEEpromWriteRequest);
+		stubManager.Write("\r\nMain_Card_Data write \t"+ (i+1) + " address \t "+ Main_Card_EEpromAddress[i]+" data: \t" + Main_Card_Data[i]);	
+
+	}		
+}
\ No newline at end of file