aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/Thread
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2018-07-24 14:50:27 +0300
committerShlomo Hecht <shlomo@twine-s.com>2018-07-24 14:50:27 +0300
commit5745b53fecedff15275cc0369ddd090f81e13775 (patch)
tree8ebd94657daa108e898427a7229ed154b5e8bdba /Software/Embedded_SW/Embedded/Modules/Thread
parent7aaa8cb0c4b3c39c7583af89fcee5ea24e7b60ce (diff)
downloadTango-5745b53fecedff15275cc0369ddd090f81e13775.tar.gz
Tango-5745b53fecedff15275cc0369ddd090f81e13775.zip
dryer temp set by pt100-1. rockers and break sensor enabled
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
index 45ea660c3..4bc21773b 100644
--- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
+++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c
@@ -352,10 +352,10 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue)
for (i=0;i<MotorsControl[index].pvinputfilterfactormode;i++)
avreageSampleValue += MotorSamples[index][i];
avreageSampleValue = avreageSampleValue / MotorsControl[index].pvinputfilterfactormode;
- /*
+
if (index == POOLER_MOTOR)
{
- if (JobCounter > eOneSecond)
+ if (JobCounter > eHundredMillisecond)
{
if (ReadBreakSensor()==ERROR)
{
@@ -365,7 +365,7 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue)
}
}
}
- */
+
//Stop Execution if the dancer moves too much
if ((abs(avreageSampleValue)> DancerStopActivityLimit[index])&&(JobCounter > eOneSecond))
{
@@ -560,10 +560,10 @@ uint32_t ThreadPreSegmentState(void *JobDetails)
//#warning rocker disabled
if (MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_RLOADING].has_directionthreadwize)
MotorSetDirection((TimerMotors_t)HARDWARE_MOTOR_TYPE__MOTO_RLOADING,MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_RLOADING].directionthreadwize);
- MotorSetSpeed(HARDWARE_MOTOR_TYPE__MOTO_RLOADING, 5);
+ MotorSetSpeed(HARDWARE_MOTOR_TYPE__MOTO_RLOADING, 2);
if (MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_LLOADING].has_directionthreadwize)
MotorSetDirection((TimerMotors_t)HARDWARE_MOTOR_TYPE__MOTO_LLOADING,MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_LLOADING].directionthreadwize);
- MotorSetSpeed(HARDWARE_MOTOR_TYPE__MOTO_LLOADING, 5);
+ MotorSetSpeed(HARDWARE_MOTOR_TYPE__MOTO_LLOADING, 2);
//#warning rocker disabled
// MotorMovetoLimitSwitch (HARDWARE_MOTOR_TYPE__MOTO_RDRIVING,MotorsCfg[HARDWARE_MOTOR_TYPE__MOTO_RDRIVING].directionthreadwize, 0, GPI_LS_RLOADMOTOR_UP, EndState); //TODO