diff options
| author | Avi Levkovich <avi@twine-s.com> | 2019-01-24 17:29:39 +0200 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2019-01-24 17:29:39 +0200 |
| commit | 5af9cb60feeda4b1dd781c3358418798d828d086 (patch) | |
| tree | 10d76fda2812077022d4ba459652f16fd08daafa /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | d1807ee5a17bada69c8062d7e218c006fe654a24 (diff) | |
| parent | 6f56066c9d7bca42857792a43063b7eb5a9f47ef (diff) | |
| download | Tango-5af9cb60feeda4b1dd781c3358418798d828d086.tar.gz Tango-5af9cb60feeda4b1dd781c3358418798d828d086.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 2 | ||||
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/control.c | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index e22125a81..59591769b 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -45,7 +45,7 @@ Task_Handle Millisecond_Task_Handle; /******************** Definitions ********************************************/ #define INVALID_MSG_ID 0xFFFF -#define MAX_TANGO_CONTROL_DEVICES 200 + /******************** STRUCTURES AND ENUMs ********************************************/ typedef struct MillisecMotorData { diff --git a/Software/Embedded_SW/Embedded/Modules/Control/control.c b/Software/Embedded_SW/Embedded/Modules/Control/control.c index 37b3ff943..fc843b78b 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/control.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/control.c @@ -262,7 +262,7 @@ uint32_t millisecondCounter = 0; void OneMilliSecondControlInterrupt(UArg arg0) { ControlMessageStruc Message; - uint32_t TenmillisecondCounter = 0; + //uint32_t TenmillisecondCounter = 0; ROM_IntMasterDisable(); ROM_TimerIntClear(Control_timerBase, TIMER_TIMA_TIMEOUT); // Clear the timer interrupt @@ -278,10 +278,6 @@ void OneMilliSecondControlInterrupt(UArg arg0) //ROM_TimerDisable(Control_timerBase, TIMER_A); return; } - if (millisecondCounter%10 == 0) - { - TenmillisecondCounter = millisecondCounter; - } //send message to the control task Message.messageId = OneMillisec; |