diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2018-08-08 12:28:42 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2018-08-08 12:28:42 +0300 |
| commit | 36d626ba28a5d889452b040ea01fc3b1a36f5da2 (patch) | |
| tree | 85c2d40471293316205979666690c1c44ca58070 /Software/Embedded_SW/Embedded/Modules | |
| parent | 8dac70e25c92eea8278c564615509386a1a0182d (diff) | |
| download | Tango-36d626ba28a5d889452b040ea01fc3b1a36f5da2.tar.gz Tango-36d626ba28a5d889452b040ea01fc3b1a36f5da2.zip | |
sending some initial job information (dispensers rate and screw speed)
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c | 6 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c index 84125c5e2..bb552211c 100644 --- a/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c +++ b/Software/Embedded_SW/Embedded/Modules/IDS/IDS_print.c @@ -233,11 +233,11 @@ uint32_t IDSPreSegmentState(void *JobDetails, int SegmentId) SegmentReady(Module_IDS,ModuleDone); return OK; // all configured heaters are ready } - char Message[80]; //******************************************************************************************************************** uint32_t IDSSegmentState(void *JobDetails, int SegmentId) { + char Message[80]; JobTicket* JobTicket = JobDetails; int Dispenser_i,n_dispensers,DispenserId; TimerMotors_t HW_Motor_Id; @@ -287,7 +287,9 @@ uint32_t IDSPreSegmentState(void *JobDetails, int SegmentId) usnprintf(Message, 80, "Dispenser %d nl/sec %f nl/pulse %f speed %d",Dispenser_i,JobTicket->segments[CurrentSegment]->brushstops[JobBrushStopId]->dispensers[Dispenser_i]->nanolitterpersecond, JobTicket->segments[CurrentSegment]->brushstops[JobBrushStopId]->dispensers[Dispenser_i]->nanoliterperpulse,segmentfirst_speed); //LOG_ERROR(segmentfirst_speed,Message); - Report(Message,__FILE__,__LINE__,Dispenser_i,RpWarning,segmentfirst_speed,0); + //Report(Message,__FILE__,__LINE__,Dispenser_i,RpWarning,segmentfirst_speed,0); + SendJobProgress(0.0,0,false, Message); + } } diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c index 486f8384f..f4242be2b 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c @@ -261,6 +261,7 @@ uint32_t Winder_Presegment(void *JobDetails, uint32_t SegmentId) //JobTicket* JobTicket = JobDetails; float screw_horizontal_speed = 0; float RotationsPerSecond; + char Message[80]; if (dyeingspeed == 0) { @@ -284,6 +285,11 @@ uint32_t Winder_Presegment(void *JobDetails, uint32_t SegmentId) ScrewSpeed = screw_horizontal_speed*RotationsPerSecond; MotorSetMaxSpeed (HARDWARE_MOTOR_TYPE__MOTO_SCREW,ScrewSpeed); + usnprintf(Message, 80, "SCREW speed Rot/sec %d horizon %d pulses %d",RotationsPerSecond,screw_horizontal_speed,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; //screw_horizontal_speed = InternalWinderCfg.milimetersperrotation // * 2. determine optimal micro-step setting |