Permalink
Browse files

Updated missing commit after merge

  • Loading branch information...
1 parent 907a8fd commit c7c9cc125a2288e3dae07dbde91bf5831526a8cb @markusk committed Mar 4, 2012
Showing with 0 additions and 32 deletions.
  1. +0 −32 direcsstm/code/main.h
View
@@ -51,37 +51,6 @@
#define LEDBLUE GPIO_Pin_15
#define LEDCLOCK RCC_AHB1Periph_GPIOD
-<<<<<<< HEAD
-#define MOTORPORT GPIOB
-#define MOTOR1A GPIO_Pin_0
-#define MOTOR1B GPIO_Pin_1
-#define MOTOR2A GPIO_Pin_2
-#define MOTOR2B GPIO_Pin_4
-#define MOTOR3A GPIO_Pin_5
-#define MOTOR3B GPIO_Pin_7
-#define MOTOR4A GPIO_Pin_8
-#define MOTOR4B GPIO_Pin_14
-#define MOTORCLOCK RCC_AHB1Periph_GPIOB
-
-// TIM4, PB7, Channel 2 for motor speed (PWM)
-#define MOTORPWMPORT GPIOE
-#define MOTOR1PWMBIT GPIO_Pin_9
-#define MOTOR2PWMBIT GPIO_Pin_11
-#define MOTOR3PWMBIT GPIO_Pin_13
-#define MOTOR4PWMBIT GPIO_Pin_14
-#define MOTOR1PWMTIMBIT GPIO_PinSource9
-#define MOTOR2PWMTIMBIT GPIO_PinSource11
-#define MOTOR3PWMTIMBIT GPIO_PinSource13
-#define MOTOR4PWMTIMBIT GPIO_PinSource14
-#define MOTORPWMPORTCLOCK RCC_AHB1Periph_GPIOE
-#define MOTORPWMTIMER TIM1
-#define MOTORPWMCHANNEL1 ON
-#define MOTORPWMCHANNEL2 ON
-#define MOTORPWMCHANNEL3 ON
-#define MOTORPWMCHANNEL4 ON
-#define MOTORPWMTIMCLOCK RCC_APB2Periph_TIM1
-#define MOTORPWMAF GPIO_AF_TIM1
-=======
// the motor control bits (go to the motor driver board)
#define MOTORPORT GPIOE
#define MOTOR1BITA GPIO_Pin_8
@@ -139,7 +108,6 @@
#define MOTOR4PWMCHANNEL 3
#define MOTORPWMINITIALSPEED 90 // this defines the itial speed when the ARM is powered on
->>>>>>> 8e1d6c67c2f7bbfe77a4920942e4a049ba0def63
// ADC and DMA for battery / voltage sensors
#define SENSORPORT GPIOC

0 comments on commit c7c9cc1

Please sign in to comment.