From aeacbdabd448b2e7455e16460b996c8090731d9d Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Thu, 15 Nov 2018 14:54:51 +0200 Subject: many logs. improve job handling and IDS. NEW WINDER ALGORITHM (Interrupts) --- .../Embedded/Modules/Thread/Thread_Winder.c | 194 +++++++++++++-------- 1 file changed, 121 insertions(+), 73 deletions(-) (limited to 'Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c') diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c index ce4395e0f..305c0e767 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c @@ -21,23 +21,35 @@ #include "drivers/FPGA/FPGA_SPI_Comm.h" #include "drivers/FPGA/FPGA_GPIO/FPGA_GPIO.h" +#include +#include +#include + + bool Winder_ScrewHoming = false; -bool Winder_Active = false; uint32_t Winder_ScrewAtOffsetCallback(uint32_t deviceID, uint32_t BusyFlag); uint32_t Winder_PrepareStage2(uint32_t deviceID, uint32_t ReadValue); bool ScrewCurrentDirection = false; //holds current screw direction bool BusyfirstCall = true; //Ignores first call after activating the screw - too early -double ScrewSpeed = 0; //ScrewSpeed +double ScrewSpeed = 0; +double ScrewRunningTime = 0; +bool ScrewDirection = false; +bool SCREW_TimerActivated = false; +//ScrewSpeed uint32_t ScrewControlId = 0xFF; uint32_t ScrewNumberOfSteps = 0; //holds the current number of steps for the next screw run - will be used to build the cone uint32_t DirectionChangeCounter = 0; //holds the current number of runs of the screw - will be used to build the cone InternalWinderConfigStruc InternalWinderCfg = {0}; +void ScrewTimerInterruptInit(void); +void ScrewsStopControlTimer (void); +void ScrewsStartControlTimer (void); uint32_t Winder_Init(void) { + ScrewTimerInterruptInit(); return OK; } @@ -73,9 +85,9 @@ uint32_t Winder_Prepare(void) { uint32_t status = 0; //JobTicket* JobTicket = JobDetails; - Winder_Active = true; //float process_speed = JobTicket->processparameters->dyeingspeed; - double ScrewSpeed = 1000;//(process_speed*MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_SCREW].pulleyradius); // we will use pulley radius of the screw for this purpose, as of now + double ScrewSpeed = 1500;//(process_speed*MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_SCREW].pulleyradius); // we will use pulley radius of the screw for this purpose, as of now + //MotorSetMaxSpeed (HARDWARE_MOTOR_TYPE__MOTO_SCREW,InternalWinderCfg.segmentoffsetpulses); //REPORT_MSG(ScrewSpeed, "Winder_Prepare"); /* * 1. move home to the limit switch (check that the cart is clear from the limit switch, start moving, with acceleration to maximal speed. enable interrupt on the limit switch, upon interrupt stop. @@ -84,12 +96,12 @@ uint32_t Winder_Prepare(void) */ if (FPGA_Read_limit_Switches(GPI_LS_SCREW_RIGHT)==LIMIT) { - REPORT_MSG(LIMIT, "Winder_Prepare at limit"); + //REPORT_MSG(LIMIT, "Winder_Prepare at limit"); Winder_PrepareStage2(0,0); } else { - REPORT_MSG(ScrewSpeed, "Winder_Prepare"); + //REPORT_MSG(ScrewSpeed, "Winder_Prepare"); Winder_ScrewHoming = true; //REPORT_MSG(MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_SCREW].directionthreadwize, "Winder_Prepare move to limit"); status = MotorMovetoLimitSwitch (HARDWARE_MOTOR_TYPE__MOTO_SCREW,MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_SCREW].directionthreadwize, ScrewSpeed, GPI_LS_SCREW_RIGHT, Winder_PrepareStage2); @@ -107,7 +119,7 @@ uint32_t Winder_PrepareStage2(uint32_t deviceID, uint32_t ReadValue) uint32_t status=OK; uint32_t numOfSteps = InternalWinderCfg.startoffsetpulses*MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_SCREW].microstep; - MotorSetMaxSpeed (HARDWARE_MOTOR_TYPE__MOTO_SCREW,InternalWinderCfg.segmentoffsetpulses); + //MotorSetMaxSpeed (HARDWARE_MOTOR_TYPE__MOTO_SCREW,InternalWinderCfg.segmentoffsetpulses); //REPORT_MSG(numOfSteps, "Winder_PrepareStage2"); REPORT_MSG(MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_SCREW].maxfrequency, "Winder_PrepareStage2"); @@ -119,16 +131,15 @@ uint32_t Winder_PrepareStage2(uint32_t deviceID, uint32_t ReadValue) uint32_t Winder_ScrewAtOffsetCallback(uint32_t deviceID, uint32_t BusyFlag) { - SetMotHome(HARDWARE_MOTOR_TYPE__MOTO_SCREW); //set this point as the spool home + //SetMotHome(HARDWARE_MOTOR_TYPE__MOTO_SCREW); //set this point as the spool home + //MotorSetMaxSpeed (HARDWARE_MOTOR_TYPE__MOTO_SCREW,temp_MaxFrequency); ScrewCurrentDirection = false; - BusyfirstCall = true; ScrewSpeed = 0; ScrewControlId = 0xFF; ScrewNumberOfSteps = 0; DirectionChangeCounter = 0; REPORT_MSG(BusyFlag, "Winder_ScrewAtOffsetCallback"); - PrepareReady(Module_Winder, ModuleDone); return OK; } @@ -136,15 +147,6 @@ uint32_t Winder_ScrewAtOffsetCallback(uint32_t deviceID, uint32_t BusyFlag) /* * this is the main operational function of the screw - run back and forth until stopped */ -/* - -bool ScrewCurrentDirection = false; -bool BusyfirstCall = true; -double ScrewSpeed = 0; -uint32_t ScrewControlId = 0xFF; -uint32_t ScrewNumberOfSteps = 0; -uint32_t DirectionChangeCounter = 0; -*/ /* InternalWinderCfg.segmentoffsetpulses = request->segmentoffsetpulses; InternalWinderCfg.spoolbackingrate = request->backingrate; @@ -171,80 +173,55 @@ numOfSteps = InternalWinderCfg.startoffsetpulses*MotorsCfg[HARDWARE_MOTOR_TYPE__ */ uint32_t CalculateNumberOfSteps (uint32_t Counter, bool direction) { - uint32_t NumberOfSteps = InternalWinderCfg.segmentoffsetpulses*MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_SCREW].microstep; + uint32_t NumberOfSteps = InternalWinderCfg.segmentoffsetpulses;//*MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_SCREW].microstep; float screw_horizontal_speed = 0; float RotationsPerSecond; - if (Counter) - { - if (Counter%InternalWinderCfg.spoolbackingrate == 1) + if (Counter%InternalWinderCfg.spoolbackingrate == 0) { NumberOfSteps -= (Counter/InternalWinderCfg.spoolbackingrate); - REPORT_MSG(ScrewNumberOfSteps, "Head Backing"); + REPORT_MSG(ScrewNumberOfSteps, "Head Backing ScrewNumberOfSteps"); ScrewNumberOfSteps--; - /* - screw_horizontal_speed = InternalWinderCfg.segmentoffsetpulses / InternalWinderCfg.NumberOfRotationPerPassage; + screw_horizontal_speed = ScrewNumberOfSteps / InternalWinderCfg.NumberOfRotationPerPassage; // calculation input#2: number of rotations per second - (basically: speed/winder perimeter. later - according to winder actual speed - calculate according to winder position accumulation in the last second. - RotationsPerSecond = dyeingspeed / (InternalWinderCfg.diameter * PI); - RotationsPerSecond = CurrentControlledSpeed[WINDER_MOTOR] / MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_WINDER].pulseperround; + RotationsPerSecond = OriginalMotorSpd_2PPS[WINDER_MOTOR] / MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_WINDER].pulseperround; // calculation input#3: speed = rotation per second * traverse per rotation = traverse per second. speed set: traverse per second (mm) * pulses per mm. ScrewSpeed = screw_horizontal_speed*RotationsPerSecond; - MotorSetMaxSpeed (HARDWARE_MOTOR_TYPE__MOTO_SCREW,ScrewSpeed); - REPORT_MSG(ScrewSpeed, "CalculateNumberOfSteps"); + //MotorSetMaxSpeed (HARDWARE_MOTOR_TYPE__MOTO_SCREW,ScrewSpeed); + //REPORT_MSG(ScrewSpeed, "CalculateNumberOfSteps ScrewSpeed"); + //REPORT_MSG(CurrentControlledSpeed[WINDER_MOTOR], "CalculateNumberOfSteps Winder speed"); CurrentControlledSpeed[SCREW_MOTOR] = ScrewSpeed; - */ + } if ((Counter%InternalWinderCfg.SpoolBottomBackingRate == 0)||(Counter%InternalWinderCfg.SpoolBottomBackingRate == 1)) { - if (direction != MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_SCREW].directionthreadwize) + if (direction == MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_SCREW].directionthreadwize)//because the direction is already reversed at the interrupt { NumberOfSteps += (Counter/InternalWinderCfg.SpoolBottomBackingRate); ScrewNumberOfSteps++; - REPORT_MSG(ScrewNumberOfSteps, "Bottom Backing"); + REPORT_MSG(ScrewNumberOfSteps, "Bottom Backing ScrewNumberOfSteps"); } } - } return NumberOfSteps; } -uint32_t wtick=0,prevwtick = 0; -uint32_t wgap[100]; -uint32_t wgap_counter=0; uint32_t ScrewDirectionChange(uint32_t deviceID, uint32_t BusyFlag) { uint32_t Steps; + double temp; if (BusyfirstCall) { BusyfirstCall = false; + DirectionChangeCounter++; return OK; } -// if (Winder_Active == false) -// return OK; - wtick++; //ScrewCurrentDirection: false moves out, true moves home if (BusyFlag == NOTBUSY) { - if (wtick-prevwtick>10) - { - wgap[wgap_counter++] = wtick-prevwtick; - prevwtick = wtick; - if (wgap_counter >=99) - wgap_counter = 0; - } - else - return OK; CalculateNumberOfSteps (DirectionChangeCounter++, ScrewCurrentDirection); Steps = ScrewNumberOfSteps; - if (ScrewCurrentDirection == false) - { - ScrewCurrentDirection = true; - } - else - { - ScrewCurrentDirection = false; - } /* if (FPGA_Read_limit_Switches(GPI_LS_SCREW_RIGHT)==LIMIT) { ScrewCurrentDirection = (1-MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_SCREW].directionthreadwize); @@ -257,8 +234,17 @@ uint32_t ScrewDirectionChange(uint32_t deviceID, uint32_t BusyFlag) REPORT_MSG(LIMIT, "Winder at left limit"); } */ - MotorMove (HARDWARE_MOTOR_TYPE__MOTO_SCREW,ScrewCurrentDirection,Steps); //process: set point 0, set max speed, move to the specified length, return back. - REPORT_MSG(ScrewCurrentDirection, "ScrewDirectionChange"); + temp = SYS_CLK_FREQ; + temp *= Steps; + temp /= ScrewSpeed; + //LOG_ERROR(Steps,"ScrewDirectionChange - ScrewNumberOfSteps"); + + /*if (ScrewRunningTime != temp) + { + REPORT_MSG(temp, "ScrewDirectionChange ScrewRunningTime changed"); + }*/ + ScrewRunningTime = temp;//(SYS_CLK_FREQ*Steps)/ScrewSpeed; + //MotorMove (HARDWARE_MOTOR_TYPE__MOTO_SCREW,ScrewCurrentDirection,Steps); //process: set point 0, set max speed, move to the specified length, return back. } return OK; @@ -275,7 +261,7 @@ uint32_t Winder_Presegment(void *JobDetails, uint32_t SegmentId) float screw_horizontal_speed = 0; float RotationsPerSecond; char Message[80]; - + double temp = 0; if (dyeingspeed == 0) { LOG_ERROR (dyeingspeed," job speed zero"); @@ -292,31 +278,36 @@ uint32_t Winder_Presegment(void *JobDetails, uint32_t SegmentId) // * calculation input: traverse length in milimeters/pulses, number of rotations per traverse ==> length of traverse per rotation. screw_horizontal_speed = InternalWinderCfg.segmentoffsetpulses / InternalWinderCfg.NumberOfRotationPerPassage; // calculation input#2: number of rotations per second - (basically: speed/winder perimeter. later - according to winder actual speed - calculate according to winder position accumulation in the last second. - RotationsPerSecond = dyeingspeed / (InternalWinderCfg.diameter * PI); - RotationsPerSecond = CurrentControlledSpeed[WINDER_MOTOR] / MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_WINDER].pulseperround; + //RotationsPerSecond = dyeingspeed / (MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_WINDER].pulleyradius * PI); + RotationsPerSecond = OriginalMotorSpd_2PPS[WINDER_MOTOR] / MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_WINDER].pulseperround; // calculation input#3: speed = rotation per second * traverse per rotation = traverse per second. speed set: traverse per second (mm) * pulses per mm. ScrewSpeed = screw_horizontal_speed*RotationsPerSecond; - MotorSetMaxSpeed (HARDWARE_MOTOR_TYPE__MOTO_SCREW,ScrewSpeed); + //MotorSetMaxSpeed (HARDWARE_MOTOR_TYPE__MOTO_SCREW,ScrewSpeed); usnprintf(Message, 80, "SCREW speed Rot/sec %d horizon %d pulses %d",(int)RotationsPerSecond,(int)screw_horizontal_speed,(int)ScrewSpeed); //LOG_ERROR(segmentfirst_speed,Message); //Report(Message,__FILE__,__LINE__,Dispenser_i,RpWarning,segmentfirst_speed,0); SendJobProgress(0.0,0,false, Message); CurrentControlledSpeed[SCREW_MOTOR] = ScrewSpeed; + OriginalMotorSpd_2PPS[SCREW_MOTOR] = ScrewSpeed; //screw_horizontal_speed = InternalWinderCfg.milimetersperrotation // * 2. determine optimal micro-step setting // * 3. calculate cart travel length from winding parameters // * 4. start move of travel length // * 5. register motor nBusy callback. this callback will flip between move(traverse length, hardstop) and goto(0), with handline og the coneshape and adjusting maxspeed - ScrewNumberOfSteps = InternalWinderCfg.segmentoffsetpulses*MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_SCREW].microstep; - MotorMove (HARDWARE_MOTOR_TYPE__MOTO_SCREW,ScrewCurrentDirection,ScrewNumberOfSteps); //process: set point 0, set max speed, move to the specified length, return back. - wtick = 0;prevwtick = 0; - ScrewControlId = AddControlCallback(ScrewDirectionChange, eOneMillisecond,MotorControlGetnBusyState,(IfTypeMotors*0x100+HARDWARE_MOTOR_TYPE__MOTO_SCREW), HARDWARE_MOTOR_TYPE__MOTO_SCREW, 0); - - // MotorSetSpeedWithCallback (HARDWARE_MOTOR_TYPE__MOTO_SCREW, screw_horizontal_speed,WinderPresegmentReady); - //in a callback: calculate backing rate for top and bottom, update point 0, update passing length, call the appropriate move to 0 / move; - + ScrewNumberOfSteps = InternalWinderCfg.segmentoffsetpulses;//*MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_SCREW].microstep; + temp = SYS_CLK_FREQ; + temp *= InternalWinderCfg.segmentoffsetpulses; + temp /= ScrewSpeed; + ScrewRunningTime = temp;//(SYS_CLK_FREQ*InternalWinderCfg.segmentoffsetpulses)/ScrewSpeed; + LOG_ERROR(ScrewNumberOfSteps,"Winder pre segment - ScrewNumberOfSteps"); + LOG_ERROR(ScrewRunningTime,"Winder pre segment - ScrewRunningTime"); +// MotorSetDirection (HARDWARE_MOTOR_TYPE__MOTO_SCREW, ScrewCurrentDirection); + //ScrewDirection = 1-ScrewDirection; + LOG_ERROR(ScrewSpeed,"Winder pre segment - ScrewSpeed"); + //MotorSetSpeedDirect(HARDWARE_MOTOR_TYPE__MOTO_SCREW,ScrewSpeed); + ScrewsStartControlTimer (); } PreSegmentReady(Module_Winder,ModuleDone); @@ -327,11 +318,11 @@ uint32_t Winder_End(void) int pend; //stop screw ScrewNumberOfSteps = 0; -// Winder_Active = false; if (ScrewControlId != 0xFF) RemoveControlCallback(ScrewControlId,ScrewDirectionChange); CurrentControlledSpeed[SCREW_MOTOR] = 0; - pend = MillisecFlushMsgQ(HARDWARE_MOTOR_TYPE__MOTO_SCREW); + ScrewsStopControlTimer(); + return MotorStop (HARDWARE_MOTOR_TYPE__MOTO_SCREW,Hard_Hiz); } void Winder_ScrewHomeLimitSwitchInterrupt(void) @@ -351,3 +342,60 @@ void Winder_ScrewOutLimitSwitchInterrupt(void) MotorSetDirection(HARDWARE_MOTOR_TYPE__MOTO_SCREW,1-MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_SCREW].directionthreadwize);//make sure to move the cart out } +uint32_t Screw_timerBase = TIMER3_BASE; //Timer handle + +bool Screw_Restart = false; +void ScrewTimerInterruptInit(void) +{ + ROM_TimerConfigure(Screw_timerBase, TIMER_CFG_PERIODIC); // 32 bits Timer + ROM_TimerEnable(Screw_timerBase, TIMER_A); + ROM_IntEnable(INT_TIMER3A); + ROM_TimerIntEnable(Screw_timerBase, TIMER_TIMA_TIMEOUT); + Screw_Restart = false; + +} +void ScrewsStopControlTimer (void) +{ + SCREW_TimerActivated = false; + ROM_TimerDisable(Screw_timerBase, TIMER_A); + //ROM_IntDisable(INT_TIMER3A); + //ROM_TimerIntDisable(Screw_timerBase, TIMER_TIMA_TIMEOUT); +} +void ScrewsStartControlTimer (void) +{ + if (SCREW_TimerActivated == true) + return; + SCREW_TimerActivated = true; + //ROM_TimerConfigure(Screw_timerBase, TIMER_CFG_PERIODIC); // 32 bits Timer + TimerEnable(Screw_timerBase, TIMER_A); + ROM_IntEnable(INT_TIMER3A); + ROM_TimerIntEnable(Screw_timerBase, TIMER_TIMA_TIMEOUT); + ROM_TimerLoadSet(Screw_timerBase, TIMER_A,(int)1200000/*10 millisec*/ ); + Report("ScrewsStartControlTimer direction,speed ", __FILE__,__LINE__,ScrewCurrentDirection, RpMessage, ScrewSpeed, 0); + return; +} +void ScrewTimerInterrupt(int ARG0) +{ + bool dir = ScrewCurrentDirection; + ROM_TimerIntClear(Screw_timerBase, TIMER_TIMA_TIMEOUT); // Clear the timer interrupt + ROM_IntMasterDisable(); + ScrewDirectionChange(0,NOTBUSY); + if (SCREW_TimerActivated == true) + { + MotorSetDirection (HARDWARE_MOTOR_TYPE__MOTO_SCREW, ScrewCurrentDirection); + ScrewCurrentDirection = 1-ScrewCurrentDirection; + MotorSetSpeedDirect(HARDWARE_MOTOR_TYPE__MOTO_SCREW,ScrewSpeed); + ROM_TimerLoadSet(Screw_timerBase, TIMER_A,(int)ScrewRunningTime); + } + else + { + TimerDisable(Screw_timerBase, TIMER_A); + } + //Report("ScrewTimerInterrupt duration, speed", __FILE__,__LINE__,ScrewRunningTime, RpMessage, ScrewSpeed, 0); + // + // Enable all interrupts. + // + ROM_IntMasterEnable(); + return ; + +} -- cgit v1.3.1