diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2020-11-22 11:36:49 +0200 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2020-11-22 11:36:49 +0200 |
| commit | 1ed217ed1b6f967a037311df662f811d3d39f15f (patch) | |
| tree | 72136671b525c06395ca5bac9560371dcea6adce /Software | |
| parent | a5776d0c00f131ec71b5e0300a0282b224530b0d (diff) | |
| download | Tango-1ed217ed1b6f967a037311df662f811d3d39f15f.tar.gz Tango-1ed217ed1b6f967a037311df662f811d3d39f15f.zip | |
init failures limit 10 instead of 3
Diffstat (limited to 'Software')
4 files changed, 12 insertions, 4 deletions
diff --git a/Software/Embedded_SW/Embedded/DataDef.h b/Software/Embedded_SW/Embedded/DataDef.h index 98fe87f32..88834ac94 100644 --- a/Software/Embedded_SW/Embedded/DataDef.h +++ b/Software/Embedded_SW/Embedded/DataDef.h @@ -58,6 +58,7 @@ extern bool Special_Dispensers; #define NFC_HARDWARE_RESET 0x01 +#define REPEATED_INIT_FAILURE_LIMIT 10 //#define RUN_AS_MAIN_JIG//(TEST_POWERSTEP01) send GATECFG parameters to work without sending parameters via machine studio + ADC + ADCINT #define ON 1 diff --git a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c index 6abf05539..c90b4fee9 100644 --- a/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c +++ b/Software/Embedded_SW/Embedded/Modules/General/GeneralHardware.c @@ -446,7 +446,7 @@ uint32_t HWConfiguration(UploadHardwareConfigurationRequest* UploadRequest) LOG_ERROR (0, "Wrong Data Allocation"); return ERROR; } - if (InitFailures > 3) + if (InitFailures > REPEATED_INIT_FAILURE_LIMIT) { Report("HWConfigurationInit repeated failure",__FILE__,__LINE__,(int)InitFailures,RpWarning,(int)EEPROM_INIT_FAILURE_COUNTER,0); AlarmHandlingSetAlarm (EVENT_TYPE__POWER_UP_BIT_FAILURE,ON); diff --git a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c index 5d97a0003..4e6a4b112 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c +++ b/Software/Embedded_SW/Embedded/StateMachines/Initialization/InitSequence.c @@ -112,12 +112,12 @@ uint32_t InitSequenceCallBackFunction(uint32_t IfIndex, uint32_t BusyFlag) MCU_E2PromProgram(EEPROM_INIT_FAILURE_COUNTER,InitFailures+1); - if (InitFailures > 6) + if (InitFailures >= REPEATED_INIT_FAILURE_LIMIT+3) { InitFailures = 0; MCU_E2PromProgram(EEPROM_INIT_FAILURE_COUNTER,0); } - if (InitFailures > 3) + if (InitFailures > REPEATED_INIT_FAILURE_LIMIT) { Report("HWConfigurationInit repeated failure",__FILE__,__LINE__,(int)InitFailures,RpWarning,(int)EEPROM_INIT_FAILURE_COUNTER,0); SetMachineState(MACHINE_STATE_HW_CONFIG_FAILED); diff --git a/Software/Stubs Collection/stubs/embeddedparametersbuild_w_cleaning.cs b/Software/Stubs Collection/stubs/embeddedparametersbuild_w_cleaning.cs index 9a4805843..9fa1676a6 100644 --- a/Software/Stubs Collection/stubs/embeddedparametersbuild_w_cleaning.cs +++ b/Software/Stubs Collection/stubs/embeddedparametersbuild_w_cleaning.cs @@ -18,9 +18,10 @@ using Tango.PMR.IO; public void OnExecute(StubManager stubManager) { - +string description = ""; ConfigurationParameters configurationParameters = new ConfigurationParameters(); +description += "Version 1.5.2.3"; configurationParameters.BreakSensorLimit = 10; //how many samples to collect in diagnostics before sending @@ -38,12 +39,14 @@ configurationParameters.OpenValveTimeout = 20; configurationParameters.InitialDispenserPressure = 3.85; //used for initial pre-run maximal pressure configurationParameters.InitialDispenserTimeout = 120000; ////used for initial pre-run target number of steps configurationParameters.InitialDispenserTimeLag = 100; +description = description+" "+configurationParameters.InitialDispenserPressure+"-"+configurationParameters.InitialDispenserTimeout; //job prepare - build pressure in dispensers - target pressure, timoeout, time staps, speed configurationParameters.DispenserBuildPressureSpeed = 950; //no more than 1000 configurationParameters.DispenserBuildPressureLimit = 0.85; configurationParameters.DispenserBuildPressureTimeout = 420000; // 7 minutes - long prepare for 5 cycles build configurationParameters.DispenserBuildPressureLag = 100; +description = description+" T "+configurationParameters.DispenserBuildPressureTimeout/1000; //temperature band 1000 = 100% - thresholds for job start around target temprature - AC configurationParameters.ACHeatersLowerOperationLimit = 995; @@ -58,6 +61,7 @@ configurationParameters.MidTankPressureCorrection = 0.0; //waste factor for intersegment pressure building configurationParameters.DispenserPresegmentWFCF = 40; +description = description+" WF"+configurationParameters.DispenserPresegmentWFCF; //how much time to start the WFCF process (pressure buildup) before segment start configurationParameters.IDSPreSegmentWFCFTimeBeforeSegment = 12000; @@ -75,6 +79,7 @@ configurationParameters.IDSPreSegmentBuildupTime = 5000; configurationParameters.IDSCleaningSpeed = 800; configurationParameters.IDSCleaningStopBeforeSegmentTime = 10000; //end of presegemnt configurationParameters.IDSCleaningStartSprayPreSegmentTime =2000; //beginning of presegment +description = description+" Cl"+configurationParameters.IDSCleaningStopBeforeSegmentTime+"-"+configurationParameters.IDSCleaningStartSprayPreSegmentTime; int Tup = 10,Tdelay1 = 98,Tdelay2 = 198; //350nsec up, 1 second delay, 2 seconds before up again // Tup = LeftRockerSpeed/100; @@ -85,6 +90,7 @@ int RightRockerSpeed = Tdelay2; configurationParameters.IDSLeftCleaningMotorSpeed = LeftRockerSpeed; configurationParameters.IDSRightCleaningMotorSpeed = RightRockerSpeed; +description = description+"-"+Tup+"."+Tdelay1+"."+Tdelay2; configurationParameters.SwitchToIdleTimeinSeconds = 3600; configurationParameters.IdleDrierTemperature = 80; @@ -156,6 +162,7 @@ double Voltage_Hysteresis = new Double(); Voltage_Hysteresis = 4; configurationParameters.GeneralParameters.Add(Voltage_Hysteresis); + File.WriteAllBytes("C:/temp/EmbParam.cfg",configurationParameters.ToBytes()); byte[] fileBytes = File.ReadAllBytes("C:/temp/EmbParam.cfg"); |
