From 87bea887659a34dec0fa01f87ed5b59e5ba701d7 Mon Sep 17 00:00:00 2001 From: tcsadmin Date: Wed, 25 Aug 2010 14:55:58 +0000 Subject: whitespace changes git-svn-id: https://mindboards.svn.sourceforge.net/svnroot/mindboards/lms_nbcnxc_128/trunk@16 c9361245-7fe8-9947-84e8-057757c4e366 --- AT91SAM7S256/Source/c_output.c | 110 ++++++++++++++++++++--------------------- 1 file changed, 55 insertions(+), 55 deletions(-) (limited to 'AT91SAM7S256/Source/c_output.c') diff --git a/AT91SAM7S256/Source/c_output.c b/AT91SAM7S256/Source/c_output.c index 23e0e28..ca3c494 100644 --- a/AT91SAM7S256/Source/c_output.c +++ b/AT91SAM7S256/Source/c_output.c @@ -48,10 +48,10 @@ void cOutputInit(void* pHeader) { OUTPUT * pOut = &(IOMapOutput.Outputs[Tmp]); pOut->Mode = 0x00; - pOut->Speed = 0x00; - pOut->ActualSpeed = 0x00; - pOut->TachoCnt = 0x00; - pOut->RunState = 0x00; + pOut->Speed = 0x00; + pOut->ActualSpeed = 0x00; + pOut->TachoCnt = 0x00; + pOut->RunState = 0x00; pOut->TachoLimit = 0x00; pOut->RegPParameter = DEFAULT_P_GAIN_FACTOR; pOut->RegIParameter = DEFAULT_I_GAIN_FACTOR; @@ -71,71 +71,71 @@ void cOutputCtrl(void) { OUTPUT * pOut = &(IOMapOutput.Outputs[Tmp]); if (pOut->Flags != 0) - { - if (pOut->Flags & UPDATE_RESET_ROTATION_COUNT) + { + if (pOut->Flags & UPDATE_RESET_ROTATION_COUNT) { pOut->Flags &= ~UPDATE_RESET_ROTATION_COUNT; dOutputResetRotationCaptureCount(Tmp); } if (pOut->Flags & UPDATE_RESET_COUNT) - { - pOut->Flags &= ~UPDATE_RESET_COUNT; - dOutputResetTachoLimit(Tmp); - } + { + pOut->Flags &= ~UPDATE_RESET_COUNT; + dOutputResetTachoLimit(Tmp); + } if (pOut->Flags & UPDATE_RESET_BLOCK_COUNT) { pOut->Flags &= ~UPDATE_RESET_BLOCK_COUNT; - dOutputResetBlockTachoLimit(Tmp); + dOutputResetBlockTachoLimit(Tmp); } if (pOut->Flags & UPDATE_SPEED) - { - pOut->Flags &= ~UPDATE_SPEED; - if (pOut->Mode & MOTORON) - { - dOutputSetSpeed(Tmp, pOut->RunState, pOut->Speed, pOut->SyncTurnParameter); - } - } + { + pOut->Flags &= ~UPDATE_SPEED; + if (pOut->Mode & MOTORON) + { + dOutputSetSpeed(Tmp, pOut->RunState, pOut->Speed, pOut->SyncTurnParameter); + } + } if (pOut->Flags & UPDATE_TACHO_LIMIT) - { - pOut->Flags &= ~UPDATE_TACHO_LIMIT; - dOutputSetTachoLimit(Tmp, pOut->TachoLimit, pOut->Options); - } - if (pOut->Flags & UPDATE_MODE) - { + { + pOut->Flags &= ~UPDATE_TACHO_LIMIT; + dOutputSetTachoLimit(Tmp, pOut->TachoLimit, pOut->Options); + } + if (pOut->Flags & UPDATE_MODE) + { pOut->Flags &= ~UPDATE_MODE; - if (pOut->Mode & BRAKE) + if (pOut->Mode & BRAKE) { // Motor is Braked dOutputSetMode(Tmp, BRAKE); - } + } else { // Motor is floated dOutputSetMode(Tmp, 0x00); } - if (pOut->Mode & MOTORON) + if (pOut->Mode & MOTORON) { - if (pOut->Mode & REGULATED) - { - dOutputEnableRegulation(Tmp, pOut->RegMode); - } - else - { - dOutputDisableRegulation(Tmp); - } - } - else - { - dOutputSetSpeed(Tmp, 0x00, 0x00, 0x00); + if (pOut->Mode & REGULATED) + { + dOutputEnableRegulation(Tmp, pOut->RegMode); + } + else + { + dOutputDisableRegulation(Tmp); + } + } + else + { + dOutputSetSpeed(Tmp, 0x00, 0x00, 0x00); dOutputDisableRegulation(Tmp); - } - } + } + } if (pOut->Flags & UPDATE_PID_VALUES) - { - pOut->Flags &= ~UPDATE_PID_VALUES; - dOutputSetPIDParameters(Tmp, pOut->RegPParameter, pOut->RegIParameter, pOut->RegDParameter); - } - } + { + pOut->Flags &= ~UPDATE_PID_VALUES; + dOutputSetPIDParameters(Tmp, pOut->RegPParameter, pOut->RegIParameter, pOut->RegDParameter); + } + } } dOutputCtrl(); cOutputUpdateIomap(); @@ -143,30 +143,30 @@ void cOutputCtrl(void) void cOutputUpdateIomap(void) { - UBYTE TempCurrentMotorSpeed[NO_OF_OUTPUTS]; - UBYTE TempRunState[NO_OF_OUTPUTS]; + UBYTE TempCurrentMotorSpeed[NO_OF_OUTPUTS]; + UBYTE TempRunState[NO_OF_OUTPUTS]; UBYTE TempMotorOverloaded[NO_OF_OUTPUTS]; - SLONG TempTachoCount[NO_OF_OUTPUTS]; + SLONG TempTachoCount[NO_OF_OUTPUTS]; SLONG TempBlockTachoCount[NO_OF_OUTPUTS]; SLONG TempRotationCount[NO_OF_OUTPUTS]; UBYTE Tmp; - dOutputGetMotorParameters(TempCurrentMotorSpeed, TempTachoCount, TempBlockTachoCount, TempRunState, TempMotorOverloaded,TempRotationCount); + dOutputGetMotorParameters(TempCurrentMotorSpeed, TempTachoCount, TempBlockTachoCount, TempRunState, TempMotorOverloaded,TempRotationCount); - for(Tmp = 0; Tmp < NO_OF_OUTPUTS; Tmp++) + for(Tmp = 0; Tmp < NO_OF_OUTPUTS; Tmp++) { - OUTPUT * pOut = &(IOMapOutput.Outputs[Tmp]); - pOut->ActualSpeed = TempCurrentMotorSpeed[Tmp]; + OUTPUT * pOut = &(IOMapOutput.Outputs[Tmp]); + pOut->ActualSpeed = TempCurrentMotorSpeed[Tmp]; pOut->TachoCnt = TempTachoCount[Tmp]; pOut->BlockTachoCount = TempBlockTachoCount[Tmp]; - pOut->RotationCount = TempRotationCount[Tmp]; + pOut->RotationCount = TempRotationCount[Tmp]; pOut->Overloaded = TempMotorOverloaded[Tmp]; if (!(pOut->Flags & PENDING_UPDATES)) { pOut->RunState = TempRunState[Tmp]; } - } + } } void cOutputExit(void) -- cgit v1.2.3