From cdcfdfc054aed8f5158bf12d9c4450b3c1ee8ae1 Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Wed, 8 Feb 2012 00:00:18 +0100 Subject: fix some merge mistakes --- AT91SAM7S256/Source/c_input.c | 4 +--- AT91SAM7S256/Source/c_ui.c | 3 ++- AT91SAM7S256/Source/d_loader.h | 2 +- AT91SAM7S256/Source/d_output.c | 10 ++++------ AT91SAM7S256/Source/d_output.h | 1 - 5 files changed, 8 insertions(+), 12 deletions(-) (limited to 'AT91SAM7S256') diff --git a/AT91SAM7S256/Source/c_input.c b/AT91SAM7S256/Source/c_input.c index 18a14c6..21f7626 100644 --- a/AT91SAM7S256/Source/c_input.c +++ b/AT91SAM7S256/Source/c_input.c @@ -171,7 +171,6 @@ void cInputCtrl(void) for (Tmp = 0; Tmp < NO_OF_INPUTS; Tmp++) { UBYTE sType = IOMapInput.Inputs[Tmp].SensorType; - UBYTE *pType = &IOMapInput.Inputs[Tmp].SensorType; UBYTE oldType = VarsInput.OldSensorType[Tmp]; if (sType != oldType) @@ -197,8 +196,7 @@ void cInputCtrl(void) sType = COLOREXIT; } /* Setup the pins for the new sensortype */ - cInputSetupType(Tmp, pType, oldType); - sType = *pType; + cInputSetupType(Tmp, sType, oldType); IOMapInput.Inputs[Tmp].InvalidData = INVALID_DATA; VarsInput.OldSensorType[Tmp] = sType; } diff --git a/AT91SAM7S256/Source/c_ui.c b/AT91SAM7S256/Source/c_ui.c index a9986f1..ac6b499 100644 --- a/AT91SAM7S256/Source/c_ui.c +++ b/AT91SAM7S256/Source/c_ui.c @@ -1329,7 +1329,7 @@ void cUiCtrl(void) pMapDisplay->EraseMask = SCREEN_BIT(SCREEN_BACKGROUND); #ifndef STRIPPED - pMapDisplay->pBitmaps[BITMAP_1] = (BMPMAP*)Intro[VarsUi.Pointer]; + pMapDisplay->pBitmaps[BITMAP_1] = CONFIG_INTRO ? (BMPMAP*)Intro[VarsUi.Pointer] : RCXintro_16; #endif pMapDisplay->UpdateMask = BITMAP_BIT(BITMAP_1); pMapDisplay->Flags |= DISPLAY_ON; @@ -1442,6 +1442,7 @@ void cUiCtrl(void) } break; #endif /* CONFIG_INTRO */ + #ifndef STRIPPED case INIT_WAIT : { diff --git a/AT91SAM7S256/Source/d_loader.h b/AT91SAM7S256/Source/d_loader.h index d550fa8..6a59c98 100644 --- a/AT91SAM7S256/Source/d_loader.h +++ b/AT91SAM7S256/Source/d_loader.h @@ -23,7 +23,7 @@ #define STARTOFUSERFLASH (0x125800L)//(0x124600L) 1.31 == (0x122100L) #else #define STARTOFUSERFLASH (0x122400L)//(0x124600L) 1.31 == (0x122100L) -#endif +#endif #define SIZEOFUSERFLASH_MAX SIZEOFUSERFLASH #else extern char __STARTOFUSERFLASH_FROM_LINKER; 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 diff --git a/AT91SAM7S256/Source/d_output.h b/AT91SAM7S256/Source/d_output.h index d06b1b5..86cbaf6 100644 --- a/AT91SAM7S256/Source/d_output.h +++ b/AT91SAM7S256/Source/d_output.h @@ -99,6 +99,5 @@ void dOutputMotorIdleControl(UBYTE MotorNr); void dOutputSyncTachoLimitControl(UBYTE MotorNr); void dOutputMotorSyncStatus(UBYTE MotorNr, UBYTE *SyncMotorOne, UBYTE *SyncMotorTwo); void dOutputResetSyncMotors(UBYTE MotorNr); -void dOutputUpdateRegulationTime(UBYTE rt); #endif -- cgit v1.2.3