From d31ad49fdc654352322da85da921e6e0423d98bd Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Tue, 14 May 2019 11:33:54 +0300 Subject: Version 1.3.10.1 Support for lubricant valve in tech board. double reporting bug, winding - small change. keepalive failure restarts usb driver. some traces. --- Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Software/Embedded_SW/Embedded/Modules/Thread') diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c index 06597ee84..e0350935a 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c @@ -237,6 +237,7 @@ uint32_t Screw100msecDirectionChange(uint32_t deviceID, uint32_t BusyFlag) if (WinderMotorSpeedRollOver == false) { Add100 = true; + LOG_ERROR(Add100, "Add100 = true"); } WinderMotorSpeedCounter=0; WinderMotorSpeedRollOver=true; @@ -387,6 +388,7 @@ uint32_t Winder_Presegment(void *SegmentDetails, uint32_t SegmentId) TotalWinderSpeed = 0; WinderMotorSpeedRollOver=false; Add100 = false; + LOG_ERROR(Add100, "Add100 = false"); } PreSegmentReady(Module_Winder,ModuleDone); -- cgit v1.3.1 From a870370b6034c62c6aeb15c1b29c55b22d935364 Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Tue, 14 May 2019 19:22:33 +0300 Subject: Version 1.3.10.1 fix winding, kee alive, messages. --- Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 2 +- Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c | 4 ++-- Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'Software/Embedded_SW/Embedded/Modules/Thread') diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index 4cd56df56..cb1be7fa5 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -562,7 +562,7 @@ uint32_t MillisecLowLoop(uint32_t tick) temp = Read_Fans_Tacho(); DrawerFansStatus = temp & 0x1F; SystemFansStatus = temp & 0xE0; - KeepAliveOneSecondCall(); + //KeepAliveOneSecondCall(); for (Motor_i = 0;Motor_i < NUM_OF_MOTORS;Motor_i++) { if (Motor_i == HARDWARE_MOTOR_TYPE__MOTO_SCREW) diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c index e0350935a..f8b0efb17 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_Winder.c @@ -290,7 +290,7 @@ uint32_t Screw100msecDirectionChange(uint32_t deviceID, uint32_t BusyFlag) WinderReferenceSpeed = Averagewinderspeed; } screw_horizontal_speed = ScrewNumberOfSteps / Rotations;//InternalWinderCfg.NumberOfRotationPerPassage; - if (Rotations > 6.4)//7.0) + if (Rotations > 6.6)//7.0) Rotations = 6.0; RotationsPerSecond = WinderReferenceSpeed / (double)MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_WINDER].pulseperround; tempScrewSpeed = screw_horizontal_speed*RotationsPerSecond; @@ -481,7 +481,7 @@ void ScrewTimerInterrupt(int ARG0) TimerDisable(Screw_timerBase, TIMER_A); } ROM_IntMasterEnable(); - Rotations+=0.005; + Rotations+=0.01; return ; diff --git a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c index dc0ce3116..416be7edc 100644 --- a/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c +++ b/Software/Embedded_SW/Embedded/StateMachines/Printing/JobSTM.c @@ -739,6 +739,7 @@ void SendJobProgress(double ProcessedLength, int SegmentId, bool done, char *Mes strcpy (infomsg,Message); Report(infomsg,__FILE__,__LINE__,55,RpWarning,33, 44); }*/ + UInt Key = Task_disable(); if (JobToken[0] != 0) { @@ -831,6 +832,8 @@ void SendJobProgress(double ProcessedLength, int SegmentId, bool done, char *Mes } // if (responseContainer.data.data) // my_free(responseContainer.data.data); + Task_restore(Key); + } void JobStopReporting(void) { -- cgit v1.3.1