aboutsummaryrefslogtreecommitdiffhomepage
path: root/AT91SAM7S256/Source/d_output.c
diff options
context:
space:
mode:
authorNicolas Schodet2012-02-08 00:00:18 +0100
committerNicolas Schodet2012-02-08 00:00:32 +0100
commitcdcfdfc054aed8f5158bf12d9c4450b3c1ee8ae1 (patch)
tree8dd17090cbf30771e48eaae531c054ec3d693854 /AT91SAM7S256/Source/d_output.c
parentc331530002825a86f12151266a9772167a3a49ce (diff)
fix some merge mistakes
Diffstat (limited to 'AT91SAM7S256/Source/d_output.c')
-rw-r--r--AT91SAM7S256/Source/d_output.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/AT91SAM7S256/Source/d_output.c b/AT91SAM7S256/Source/d_output.c
index 8e5c904..46c6441 100644
--- a/AT91SAM7S256/Source/d_output.c
+++ b/AT91SAM7S256/Source/d_output.c
@@ -126,8 +126,6 @@ void dOutputInit(void)
ENABLECaptureMotorA;
ENABLECaptureMotorB;
ENABLECaptureMotorC;
-
- RegulationTime = REGULATION_TIME;
for (Temp = 0; Temp < 3; Temp++)
{
@@ -1193,15 +1191,15 @@ void dOutputMotorReachedTachoLimit(UBYTE MotorNr)
pOne->MotorSetSpeed = 0;
pOne->MotorTargetSpeed = 0;
pOne->MotorActualSpeed = 0;
- pOne->MotorRunState = dOutputRunStateAtLimit(pOne);
- pOne->RegulationMode = dOutputRegModeAtLimit(pOne);
+ pOne->MotorRunState = dOutputRunStateAtLimit(pOne);
+ pOne->RegulationMode = dOutputRegModeAtLimit(pOne);
if (MotorTwo != 0xFF) {
MOTORDATA * pTwo = &(MotorData[MotorTwo]);
pTwo->MotorSetSpeed = 0;
pTwo->MotorTargetSpeed = 0;
pTwo->MotorActualSpeed = 0;
- pTwo->MotorRunState = dOutputRunStateAtLimit(pTwo);
- pTwo->RegulationMode = dOutputRegModeAtLimit(pTwo);
+ pTwo->MotorRunState = dOutputRunStateAtLimit(pTwo);
+ pTwo->RegulationMode = dOutputRegModeAtLimit(pTwo);
}
}
else