From 31476e863ec157682861d227ea0e23c7690cb65d Mon Sep 17 00:00:00 2001 From: Shlomo Hecht Date: Tue, 16 Oct 2018 08:45:20 +0300 Subject: small changes, remove debug data in thread_print --- .../Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c | 2 -- Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c | 13 +++++-------- 2 files changed, 5 insertions(+), 10 deletions(-) (limited to 'Software/Embedded_SW/Embedded/Modules') diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c index 67e0cf34b..1ab4f311a 100644 --- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c +++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c @@ -520,8 +520,6 @@ void SendDiagnostics(void) } } */ - response.n_digitalinterfacestates = 0; - DiagnosticsLoadDigitalValues(); response.n_digitalinterfacestates = MAX_HEATERS_NUM; response.digitalinterfacestates = digitalinterfacestates; diff --git a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c index 023e0dfc8..d2bbad72b 100644 --- a/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c +++ b/Software/Embedded_SW/Embedded/Modules/Thread/Thread_print.c @@ -14,7 +14,6 @@ #include "PMR/Hardware/HardwareDancerType.pb-c.h" #include "PMR/Printing/JobSegment.pb-c.h" #include "PMR/Printing/JobTicket.pb-c.h" -#include "PMR/common/ErrorCode.pb-c.h" #include #include @@ -311,14 +310,14 @@ uint32_t ThreadControlSpeedReadFunction(uint32_t IfIndex, uint32_t ReadValue) } return OK; } -double calculatedError[1000]; //double eNormalizedError[100]; +//int TranslatedreadValue[100]; +/*double calculatedError[1000]; int MotorId[1000]; int readValue[1000]; -//int TranslatedreadValue[100]; int AveragereadValue[1000]; int calculatedspeed[1000]; -int timestamp[1000]; +int timestamp[1000];*/ int controlIndex = 0; bool keepdata = true; /*int32_t KeepReadValue = 0; @@ -479,19 +478,17 @@ uint32_t ThreadControlCBFunction(uint32_t IfIndex, uint32_t ReadValue) }*/ if (abs(calculated_speed-CurrentControlledSpeed[index])>2) { - if (keepdata == true) + /*if (keepdata == true) { calculatedError[controlIndex] = MotorControlConfig[index].m_calculatedError; - //double eNormalizedError[100]; MotorId[controlIndex] = index; readValue[controlIndex] = ReadValue; - //int TranslatedreadValue[100]; AveragereadValue[controlIndex] = avreageSampleValue; calculatedspeed[controlIndex] = calculated_speed; timestamp[controlIndex] = HibernateRTCSSGet(); if (controlIndex++>=999) controlIndex = 0; - } + }*/ CurrentControlledSpeed[index] = calculated_speed; MotorSetSpeed(ThreadMotorIdToMotorId[index], calculated_speed); } -- cgit v1.3.1