From 48561099b141773d71438dcdf09c65ace4138b8b Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Thu, 10 Oct 2019 13:26:40 +0300 Subject: motor testing --- Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c') diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 8e67de0f1..84ab1388d 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -548,7 +548,7 @@ uint32_t MillisecLowLoop(uint32_t tick) { if (watchdogCriticalAlarm == false) { - Control_WD(ENABLE,5); //activate heaters/dispenser watchdog, 0.5 seconds + Control_WD(ENABLE,10); //activate heaters/dispenser watchdog, 0.5 seconds //LOG_ERROR (1111, "Control_WD"); } } -- cgit v1.3.1 From 80070a6ae7db28ab30321922ca354f7c1e087412 Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Wed, 23 Oct 2019 00:40:47 +0300 Subject: Version 1.4.5.8 - fix job length problem when there is no procees params, secondary pump after 4 hours, --- Software/Embedded_SW/Embedded/Common/SW_Info/SW_Info.c | 2 +- Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 2 +- Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c | 2 +- Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c') 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 ff1cf995f..dece387cb 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,4,5,7}; +TangoVersion_t _gTangoVersion = {1,4,5,8}; #define BUILD_DATE __DATE__ char Dat[50] = BUILD_DATE; char _gTangoName [MAX_STRING_LEN] = "Tango01 ";//d diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 84ab1388d..5a1cb5543 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -623,7 +623,7 @@ uint32_t MillisecLowLoop(uint32_t tick) } if (OneHourTick) { -#define PUMP_LIMIT 8 +#define PUMP_LIMIT 4 PumpCounter++; if (PumpCounter>=PUMP_LIMIT) { diff --git a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c index 71e6cc5de..e12d108ef 100644 --- a/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Heaters/Heaters_print.c @@ -1183,7 +1183,7 @@ uint32_t DCHeaterControlCBFunction(uint32_t IfIndex, uint32_t readValue) HeaterRecalculateHeaterParams(index, 0); return ERROR; } - if (readValue>(HeaterCmd[index].targettemperatue+200)) + if (readValue>(HeaterCmd[index].targettemperatue+500)) { ReportWithPackageFilter(HeatersFilter, "DC OverHeating in progress",__FILE__,readValue,HeaterReady[index],RpError, HeaterAtTemp[index],0); } diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c index 33438d3a2..4355a4581 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c +++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c @@ -749,8 +749,6 @@ void JobRequestFunc(MessageContainer* requestContainer) JobEndReason = JOB_OK; TotalProcessedLength = 0.0; PoolerTotalProcessedLength = 0.0; - job_length = CurrentJob->length + dryerbufferMeters; - Report("job length ",__FILE__,job_length,(int)CurrentJob->length,RpWarning,(int)dryerbufferCentimeters, 0); JobAlarmReason = AlarmHandlingPrepareJob(CurrentJob); if (JobAlarmReason ==OK) { @@ -774,6 +772,8 @@ void JobRequestFunc(MessageContainer* requestContainer) } } //REPORT_MSG(0,"Process parameters in job request are not handled. push separately for now"); + job_length = CurrentJob->length + dryerbufferMeters; + Report("job length ",__FILE__,job_length,(int)CurrentJob->length,RpWarning,(int)dryerbufferCentimeters, 0); if (Ticket->spool) { if (InternalWindingConfigMessage(Ticket->spool)!= OK) -- cgit v1.3.1 From 6f3f322a569da4b0a6e27975a0fe3ad58f7bf428 Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Wed, 23 Oct 2019 12:41:35 +0300 Subject: small changes in milisec init --- Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 4 ++-- Software/Embedded_SW/Embedded/Modules/Control/control.c | 3 ++- Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) (limited to 'Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c') diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 5a1cb5543..0a7024112 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -586,8 +586,8 @@ uint32_t MillisecLowLoop(uint32_t tick) //KeepAliveOneSecondCall(); for (Motor_i = 0;Motor_i < NUM_OF_MOTORS;Motor_i++) { - // if (Motor_i == HARDWARE_MOTOR_TYPE__MOTO_SCREW) - // continue; // + if (Motor_i == HARDWARE_MOTOR_TYPE__MOTO_SCREW) + continue; // if (isMotorConfigured(Motor_i)) MotorGetStatusFromFPGA(Motor_i); } diff --git a/Software/Embedded_SW/Embedded/Modules/Control/control.c b/Software/Embedded_SW/Embedded/Modules/Control/control.c index 07214d240..4a111779f 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/control.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/control.c @@ -288,13 +288,14 @@ void ControlStart(void) if (ControlRestart == false) { ControlRestart = true; - MillisecStart(); ROM_TimerLoadSet(Control_timerBase, TIMER_A,120000+(ControlPhaseDelay*120)/*one millisecond*/); TimerEnable(Control_timerBase, TIMER_A); ADCAcquireStart(0,1); AddControlCallback( ControlEmptyCBFunction, eHundredMillisecond, ControlActivityLed,0, 0, 0 ); + Task_sleep(100); + MillisecStart(); } } diff --git a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c index f510ce924..c2451118d 100644 --- a/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c +++ b/Software/Embedded_SW/Embedded/Modules/Waste/Waste_init.c @@ -446,14 +446,14 @@ bool SetValveDirection() * VALVE_WASTE_TANK * * */ - bool ret = notOK; + bool ret = OK; //if (WHS_info.WHS_valve != no_waste_cartridge) if (WHS_info.active_cartridge == waste_cartridge1) WHS_info.WHS_valve = VALVE_DIR_WASTE_CARTRIDGE1; else WHS_info.WHS_valve = VALVE_DIR_WASTE_CARTRIDGE2; ReportWithPackageFilter(WasteFilter,"------------WHS_info.WHS_valve -----------------", __FILE__,__LINE__,WHS_info.WHS_valve, RpMessage, 0 ,0); - Valve_Set(VALVE_WASTE_TANK, WHS_info.WHS_valve); - ret = OK; + Valve_Set(VALVE_WASTE_TANK, WHS_info.WHS_valve); + //ret = OK; return ret; } -- cgit v1.3.1 From 31096fb03e434d52738b07acd881b87516c3c3d5 Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Thu, 24 Oct 2019 12:48:54 +0300 Subject: disable current reading. fix thread loading. fix power off cleaning job --- .../Drivers/I2C_Communication/ADC_MUX/ADC_MUX.c | 2 +- .../Embedded/Modules/Control/MillisecTask.c | 2 +- .../Embedded_SW/Embedded/Modules/General/buttons.c | 1 + .../Embedded/Modules/Thread/ThreadLoad.c | 33 +++++++++++----------- .../Embedded/Modules/Thread/Thread_ex.h | 25 ++++++++-------- .../Embedded/StateMachines/Printing/JobSTM.c | 2 +- .../Embedded/embeddedparametersbuild.cs | 2 +- Software/Stubs Collection/stubs/ThreadLoad.cs | 27 +++++++++--------- 8 files changed, 46 insertions(+), 48 deletions(-) (limited to 'Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c') diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.c index 34a68667c..331913816 100644 --- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.c +++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/ADC_MUX/ADC_MUX.c @@ -406,7 +406,7 @@ uint32_t Heaters_Current_Bits[9];//just for debug void Enable_Reading_Heaters_Current(HEATERS_CURRENT Heater_ID) //0-8 { assert (Heater_IDlength = 200.0; + TSegment->length = 10.0; TSegment->n_brushstops = 1; TSegment->brushstops = my_malloc(sizeof(TSegment->brushstops)); TSegment->brushstops[0] = TbrushStop; diff --git a/Software/Embedded_SW/Embedded/embeddedparametersbuild.cs b/Software/Embedded_SW/Embedded/embeddedparametersbuild.cs index 3b2ff042b..4aad16764 100644 --- a/Software/Embedded_SW/Embedded/embeddedparametersbuild.cs +++ b/Software/Embedded_SW/Embedded/embeddedparametersbuild.cs @@ -81,7 +81,7 @@ configurationParameters.SwitchToIdleTimeinSeconds = 3600; configurationParameters.IdleDrierTemperature = 80; configurationParameters.IdleHeadTemperature = 80; configurationParameters.IdleMixerTemperature = 0; -configurationParameters.PowerOffTemperatureLimit = 50; +configurationParameters.PowerOffTemperatureLimit = 100; //general parameters, ORDER MUST BE PRESERVED!!!! //check the dispensers hard limit alarms diff --git a/Software/Stubs Collection/stubs/ThreadLoad.cs b/Software/Stubs Collection/stubs/ThreadLoad.cs index 428734f33..00d307224 100644 --- a/Software/Stubs Collection/stubs/ThreadLoad.cs +++ b/Software/Stubs Collection/stubs/ThreadLoad.cs @@ -17,24 +17,23 @@ public void OnExecute(StubManager stubManager) 0 THREAD_LOAD_INIT, 1 THREAD_LOAD_REDUCE_HEAT, //HEATERS OFF, DRYER BLOWER OFF, BLOWER LOW, 2 THREAD_LOAD_SET_LOAD_ARM_TO_START_POSITION, //USE NOTATION HOW MANY ROTATIONS IN THE DRYER, OR CHECK AGAINST STOPPER. MOVE SLOWLY - 3 THREAD_LOAD_CENTER_HEAD_ROCKERS, //puthead cleaning rockers to middle position - 4 THREAD_LOAD_OPEN_COVERS, //OPEN DYEING HEAD COVER AND DRYER LID - 5 THREAD_LOAD_LIFT_DANCERS, - 6 THREAD_LOAD_LIFT_ROCKERS, //MACHINE IS READY. SEND MESSAGE, START TIMER TO CLOSE LIDS, WAIT FOR OPERATOR RESPONSE - 7 THREAD_LOAD_INITIAL_TENSION, //CHECK SPOOL PRESENCERUN WINDER UNTIL BREAK SENSOR IS IDENTIFIEING MOVEMENT FOR A SECOND - 8 THREAD_LOAD_CLOSE_ROCKERS, - 9 THREAD_LOAD_CLOSE_DANCERS, //SEND DANCER MOTORS TO PRESET LOCATION, CHECK THAT THE DANCERS ARE ON THE THREAD - 10 THREAD_LOAD_CLOSE_LIDS, - 11 THREAD_LOAD_JOG_FEEDER_TO_MIDDLE_POINT, //JOG THE FEEDER MOTOR UNTIL THE FEEDER DANCER IS AT MIDDLE POSITION - 12 THREAD_LOAD_DRYER_LOADING, //START FEEDER PID, ROTATE LOADING ARM COUNTER THREAD DIRECTION X CIRCLES ACCORDING TO RML. FEEDER SPEED IS 40 + 3 THREAD_LOAD_OPEN_COVERS, //OPEN DYEING HEAD COVER AND DRYER LID + 4 THREAD_LOAD_LIFT_DANCERS, + 5 THREAD_LOAD_LIFT_ROCKERS, //MACHINE IS READY. SEND MESSAGE, START TIMER TO CLOSE LIDS, WAIT FOR OPERATOR RESPONSE + 6 THREAD_LOAD_INITIAL_TENSION, //CHECK SPOOL PRESENCERUN WINDER UNTIL BREAK SENSOR IS IDENTIFIEING MOVEMENT FOR A SECOND + 7 THREAD_LOAD_CLOSE_ROCKERS, + 8 THREAD_LOAD_CLOSE_DANCERS, //SEND DANCER MOTORS TO PRESET LOCATION, CHECK THAT THE DANCERS ARE ON THE THREAD + 9 THREAD_LOAD_CLOSE_LIDS, + 10 THREAD_LOAD_JOG_FEEDER_TO_MIDDLE_POINT, //JOG THE FEEDER MOTOR UNTIL THE FEEDER DANCER IS AT MIDDLE POSITION + 11 THREAD_LOAD_DRYER_LOADING, //START FEEDER PID, ROTATE LOADING ARM COUNTER THREAD DIRECTION X CIRCLES ACCORDING TO RML. FEEDER SPEED IS 40 //KEEP NOTATION HOW MANY ROTATIONS IN THE DRYER - 13 THREAD_LOAD_RESUME_HEATING, - 14 THREAD_LOAD_JOG_THREAD, //JOG THREAD SHORTLY TO MAKE SURE SPOOL IS RUNNING. REPORT END OF LOADING - 15 THREAD_LOAD_END + 12 THREAD_LOAD_RESUME_HEATING, + 13 THREAD_LOAD_JOG_THREAD, //JOG THREAD SHORTLY TO MAKE SURE SPOOL IS RUNNING. REPORT END OF LOADING + 14 THREAD_LOAD_END }THREAD_LOAD_STAGES_ENUM;*/ StubHeatingTestRequest stubHeatingTestRequest = new StubHeatingTestRequest(); -stubHeatingTestRequest.DryerZone1Temp = 12; +stubHeatingTestRequest.DryerZone1Temp = 7; StubHeatingTestPollRequest stubHeatingTestPollRequest = new StubHeatingTestPollRequest(); -- cgit v1.3.1