aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2019-08-12 09:04:41 +0300
committerShlomo Hecht <shlomo@twine-s.com>2019-08-12 09:04:41 +0300
commit4bd5548dd7ee677001abdc6f4b19a4944918b6eb (patch)
tree2efe2db1977b5e191b236c37f029ebb49cc95a97 /Software/Embedded_SW/Embedded/Modules
parent111684728db118e40f05efc01287ea91ea295502 (diff)
downloadTango-4bd5548dd7ee677001abdc6f4b19a4944918b6eb.tar.gz
Tango-4bd5548dd7ee677001abdc6f4b19a4944918b6eb.zip
small diagnostics changes
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
index 116988720..5d1781e2f 100644
--- a/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
+++ b/Software/Embedded_SW/Embedded/Modules/Diagnostics/Diagnostics.c
@@ -81,7 +81,7 @@ int DiagnosticLimit =eOneSecond; //frequency of data collection
int DiagnosticLimit =eHundredMillisecond; //frequency of data collection
#endif
int DiagnosticFastLimit = eTenMillisecond; //frequency of data collection
-#define TEN_MSEC_COLLECTION
+//#define TEN_MSEC_COLLECTION
//DigitalPin DigitalPinArray[1][DIAGNOSTICS_LIMIT+1];
double dancer1angle[DIAGNOSTICS_LIMIT+1];
double dancer2angle[DIAGNOSTICS_LIMIT+1];
@@ -338,7 +338,7 @@ void DiagnosticTenMsecCollection(void)
{
if (DiagnosticsActive == false)
return;
-#ifdef TEN_MSEC_COLLECTION
+//#ifdef TEN_MSEC_COLLECTION
/*if (JobIsActive()== false)
return;*/
DiagnosticLoadDancer(WINDER_DANCER,Control_Read_Dancer_Position(WINDER_DANCER, 0,0));
@@ -350,7 +350,7 @@ void DiagnosticTenMsecCollection(void)
DiagnosticLoadDancerError(FEEDER_DANCER,ThreadGetMotorCalculatedError(FEEDER_DANCER));
//DiagnosticLoadSpeedSensor(getSensorSpeedData());
-#endif
+//#endif
}
void Diagnostic100msecCollection(void)
{
@@ -358,7 +358,7 @@ void Diagnostic100msecCollection(void)
if (DiagnosticsActive == false)
return;
- DiagnosticLoadSpeedSensor(getSensorSpeedData());
+ //DiagnosticLoadSpeedSensor(getSensorSpeedData());
#ifndef REDUCED_DIAGNOSTICS
#ifndef TEN_MSEC_COLLECTION
DiagnosticTenMsecCollection(); //call the 10msec function every 100 msec to reduce transport
@@ -817,7 +817,9 @@ void DiagnosticsTask(UArg arg0, UArg arg1)
Diagnostic100msecCollection();
break;
case DiagnosticsTenMiliTrigger:
+#ifdef TEN_MSEC_COLLECTION
DiagnosticTenMsecCollection();
+#endif
break;
default:
break;