diff options
| author | Shlomo Hecht <shlomo@twine-s.com> | 2018-07-17 11:30:32 +0300 |
|---|---|---|
| committer | Shlomo Hecht <shlomo@twine-s.com> | 2018-07-17 11:30:32 +0300 |
| commit | f4aad3bc7f9d4c457805a233f969938ef341b22c (patch) | |
| tree | d1af6b700027fcbbf460ce716f1255735729f996 /Software/Embedded_SW/Embedded/Modules/Thread | |
| parent | 887df057375e75f739e5995fc380f02a966af7f3 (diff) | |
| parent | 722e58ecf23a9d08ff645741fb9644e443639a03 (diff) | |
| download | Tango-f4aad3bc7f9d4c457805a233f969938ef341b22c.tar.gz Tango-f4aad3bc7f9d4c457805a233f969938ef341b22c.zip | |
merge
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Thread')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c index 8bf43282d..5bf666383 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -297,7 +297,6 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue) //read value is the dancer angle int i,index=MAX_THREAD_MOTORS_NUM; int DancerId; - static int pooler_counter = 0; int32_t TranslatedReadValue, avreageSampleValue = 0; //double tempcalcspeed = 0; uint32_t calculated_speed; @@ -396,30 +395,6 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue) MotorSetSpeed(ThreadMotorIdToMotorId[index], calculated_speed); } } - if (index == FEEDER_MOTOR) - { - pooler_counter++; - if (pooler_counter>=1000) - { - //float error_integered = MotorControlConfig[index].m_calculatedError*1000; - /*{ - "HeaterGroupId": 0, - "Zone1Temp": 80, - "Zone2Temp": 2641, - "Heater1Active": false, - "Heater2Active": false, - "Heater1Percentage": 3, - "Heater2Percentage": 4000, - "InfoMessage": "Standard DC" -} void HeatingTestSendResonse(uint32_t status, bool last,bool heater1Active,bool heater2Active, int temperature1, int temperature2,int Heater1Percentage,int Heater2Percentage, char* Message) - -}*/ - //HeatingTestSendResonse(0, false,true,true, MotorDriverRequest[22].Speed,MotorDriverRequest[18].Speed,MotorDriverRequest[15].Speed,MotorDriverRequest[3].Speed, "MotorSpeed"); - - //HeatingTestSendResonse(0, false,true,true, /*OriginalMotorSpd_2PPS[index]*/_speed,OriginalMotorSpd_2PPS[index]/*(int)error_integered*/,MotorControlConfig[index].m_calculatedError,ReadValue, "FeederSpeed"); - // pooler_counter = 0; - } - } return OK; } |
