diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-01-16 13:11:06 +0200 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2019-01-16 13:11:06 +0200 |
| commit | 1ee11bc9771c807c4d0ecb4d73e4bc33b307ae1e (patch) | |
| tree | 90fef091808c78bf8b87e0eabbee050eabb724c4 /Software/Embedded_SW/Embedded/Modules/Control/control.c | |
| parent | afe0b1e7abea7b1694ff0d197e045420df497ceb (diff) | |
| parent | fd181e6c3c9d0f67152243e4657b9e760d9f2c36 (diff) | |
| download | Tango-1ee11bc9771c807c4d0ecb4d73e4bc33b307ae1e.tar.gz Tango-1ee11bc9771c807c4d0ecb4d73e4bc33b307ae1e.zip | |
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control/control.c')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/control.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/control.c b/Software/Embedded_SW/Embedded/Modules/Control/control.c index a35b804e4..37b3ff943 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/control.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/control.c @@ -364,12 +364,12 @@ uint32_t ControlLowLoop(uint32_t tick) //test dancers and speed encoders //check all callback units (state machine waiting for completion of a change) //uint32_t Device_i; - bool Ten_msTick, Hundred_msTick, Onesecond_Tick,Tick98,Tick998; - Ten_msTick = (tick%eTenMillisecond == 0) ?true:false; - Hundred_msTick = (tick%eHundredMillisecond == 0) ?true:false; - Onesecond_Tick = (tick%eOneSecond == 0) ?true:false; - Tick98 = (tick%eHundredMillisecond == 98) ?true:false; - Tick998 = (tick%eOneSecond == 996) ?true:false; + //bool Ten_msTick, Hundred_msTick, Onesecond_Tick,Tick98,Tick998; + //Ten_msTick = (tick%eTenMillisecond == 0) ?true:false; + //Hundred_msTick = (tick%eHundredMillisecond == 0) ?true:false; + //Onesecond_Tick = (tick%eOneSecond == 0) ?true:false; + //Tick98 = (tick%eHundredMillisecond == 98) ?true:false; + //Tick998 = (tick%eOneSecond == 996) ?true:false; //ROM_IntMasterDisable(); for (ControlLowDevice_i = 0; ControlLowDevice_i < MAX_TANGO_CONTROL_DEVICES;ControlLowDevice_i++) |