aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Thread
diff options
context:
space:
mode:
authorVictoria Plitt <Victoria.Plitt@twine-s.com>2019-07-02 18:28:59 +0300
committerVictoria Plitt <Victoria.Plitt@twine-s.com>2019-07-02 18:28:59 +0300
commitb5558dfb47c6f7e5ab78d1b650425b92e5919fb4 (patch)
tree5c79587b93171a4c517ef43b56e414f5112bedd2 /Software/Embedded_SW/Embedded/Modules/Thread
parent384d450a0e2b54b50700d012197b8b06978f5a8d (diff)
parentf64700dc57cbdd1d1ccceeeff9821e9809c50265 (diff)
downloadTango-b5558dfb47c6f7e5ab78d1b650425b92e5919fb4.tar.gz
Tango-b5558dfb47c6f7e5ab78d1b650425b92e5919fb4.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
index 5efc3798e..eb1b751bb 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
@@ -733,6 +733,7 @@ uint32_t ThreadInitialTestStub(HardwareMotor * request)
if (Motor_i == FEEDER_MOTOR) // dryer motor is speed controlled. later a speed sensor will be utilized, but for now it will not be controlled
{
+ Report("Feeder Control",__FILE__,Motor_i,MotorControlConfig[Motor_i].m_params.Kp,RpWarning,MotorControlConfig[Motor_i].m_params.Ki,0);
if (SpeedControlId != 0xFF)
{
RemoveControlCallback(SpeedControlId,ThreadLengthCBFunction);
@@ -744,6 +745,7 @@ uint32_t ThreadInitialTestStub(HardwareMotor * request)
}
if (Motor_i == POOLER_MOTOR) // dryer motor is speed controlled. later a speed sensor will be utilized, but for now it will not be controlled
{
+ Report("Puller Control",__FILE__,Motor_i,MotorControlConfig[Motor_i].m_params.Kp,RpWarning,MotorControlConfig[Motor_i].m_params.Ki,0);
if (PoolerSpeedControlId != 0xFF)
{
if (RemoveControlCallback(PoolerSpeedControlId,PoolerThreadLengthCBFunction)!=OK)
@@ -783,6 +785,7 @@ uint32_t ThreadInitialTestStub(HardwareMotor * request)
}
if (Motor_i == WINDER_MOTOR) // dryer motor is speed controlled. later a speed sensor will be utilized, but for now it will n//ot be controlled
{
+ Report("Winder Control",__FILE__,Motor_i,MotorControlConfig[Motor_i].m_params.Kp,RpWarning,MotorControlConfig[Motor_i].m_params.Ki,0);
if (ControlIdtoMotorId[Motor_i] != 0xFF)
{
if(RemoveControlCallback(ControlIdtoMotorId[Motor_i],ThreadControlCBFunction)!=OK)