Add LUXR_RACE Target

src/main/target/LUX_RACE/LUXR_RACE.mk

@@ -0,0 +1 @@
+# LUXR_RACE is new version

src/main/target/LUX_RACE/target.c

@@ -29,11 +29,13 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
     { TIM8,  IO_TAG(PC7),  TIM_Channel_2, TIM8_CC_IRQn,            TIM_USE_MOTOR, 1, GPIO_AF_4, DMA2_Channel5, DMA2_CH5_HANDLER }, // PWM3 - PC7
     { TIM8,  IO_TAG(PC8),  TIM_Channel_3, TIM8_CC_IRQn,            TIM_USE_MOTOR, 1, GPIO_AF_4, DMA2_Channel1, DMA2_CH1_HANDLER }, // PMW4 - PC8
     { TIM8,  IO_TAG(PC9),  TIM_Channel_4, TIM8_CC_IRQn,            TIM_USE_MOTOR, 1, GPIO_AF_4, DMA2_Channel2, DMA2_CH2_HANDLER }, // PWM5 - PC9
+#ifndef LUXR_RACE
     { TIM2,  IO_TAG(PA0),  TIM_Channel_1, TIM2_IRQn,               TIM_USE_MOTOR, 1, GPIO_AF_1, NULL, 0 }, // PWM6 - PA0
     { TIM2,  IO_TAG(PA1),  TIM_Channel_2, TIM2_IRQn,               TIM_USE_MOTOR, 1, GPIO_AF_1, NULL, 0 }, // PWM7 - PA1
     { TIM2,  IO_TAG(PA2),  TIM_Channel_3, TIM2_IRQn,               TIM_USE_MOTOR, 1, GPIO_AF_1, NULL, 0 }, // PWM8 - PA2
     { TIM2,  IO_TAG(PA3),  TIM_Channel_4, TIM2_IRQn,               TIM_USE_MOTOR, 1, GPIO_AF_1, NULL, 0 }, // PWM9 - PA3
     { TIM15, IO_TAG(PB14), TIM_Channel_1, TIM1_BRK_TIM15_IRQn,     TIM_USE_MOTOR, 1, GPIO_AF_1, NULL, 0 }, // PWM10 - PB14
     { TIM15, IO_TAG(PB15), TIM_Channel_2, TIM1_BRK_TIM15_IRQn,     TIM_USE_MOTOR, 1, GPIO_AF_1, NULL, 0 }, // PWM11 - PB15
+#endif
 };
 

src/main/target/LUX_RACE/target.h

@@ -17,16 +17,26 @@
 
 #pragma once
 
+#ifdef LUXR_RACE
+#define TARGET_BOARD_IDENTIFIER "LUXR"
+#else
 #define TARGET_BOARD_IDENTIFIER "LUX"
+#endif
 #define BOARD_HAS_VOLTAGE_DIVIDER
 
 #define CONFIG_FASTLOOP_PREFERRED_ACC ACC_DEFAULT
 
 #define LED0                    PC15
 #define LED1                    PC14
+#ifndef LUXR_RACE
 #define LED2                    PC13
+#endif
 
+#ifdef LUXR_RACE
+#define BEEPER                  PB9
+#else
 #define BEEPER                  PB13
+#endif
 #define BEEPER_INVERTED
 
 // MPU6500 interrupt
@@ -40,24 +50,68 @@
 
 #define USE_SPI
 #define USE_SPI_DEVICE_1
+#ifdef LUXR_RACE
+#define USE_SPI_DEVICE_2
+#endif
 
 #define SPI1_SCK_PIN            PB3
 #define SPI1_MISO_PIN           PB4
 #define SPI1_MOSI_PIN           PB5
+//#ifndef LUXR_RACE
 #define SPI1_NSS_PIN            PA4
+//#endif
 
+#ifdef LUXR_RACE
+#define SPI2_NSS_PIN            PB12
+#define SPI2_SCK_PIN            PB13
+#define SPI2_MISO_PIN           PB14
+#define SPI2_MOSI_PIN           PB15
+
+#define USE_SDCARD
+#define USE_SDCARD_SPI2
+
+#define SDCARD_DETECT_INVERTED
+
+#define SDCARD_DETECT_PIN                   PC13
+#define SDCARD_SPI_INSTANCE                 SPI2
+#define SDCARD_SPI_CS_PIN                   SPI2_NSS_PIN
+
+// SPI2 is on the APB1 bus whose clock runs at 36MHz. Divide to under 400kHz for init:
+#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 128
+// Divide to under 25MHz for normal operation:
+#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER     2
+
+// Note, this is the same DMA channel as UART1_RX. Luckily we don't use DMA for USART Rx.
+#define SDCARD_DMA_CHANNEL_TX               DMA1_Channel5
+#define SDCARD_DMA_CHANNEL_TX_COMPLETE_FLAG DMA1_FLAG_TC5
+#endif
+
+#define MPU6000_CS_PIN          SPI1_NSS_PIN
+#define MPU6000_SPI_INSTANCE    SPI1
 #define MPU6500_CS_PIN          SPI1_NSS_PIN
 #define MPU6500_SPI_INSTANCE    SPI1
 
 #define GYRO
+#ifdef LUXR_RACE
+#define USE_GYRO_MPU6000
+#define USE_GYRO_SPI_MPU6000
+#define GYRO_MPU6000_ALIGN CW270_DEG
+#else
 #define USE_GYRO_MPU6500
 #define USE_GYRO_SPI_MPU6500
-#define GYRO_MPU6500_ALIGN      CW270_DEG
+#define GYRO_MPU6500_ALIGN CW270_DEG
+#endif
 
 #define ACC
+#ifdef LUXR_RACE
+#define USE_ACC_MPU6000
+#define USE_ACC_SPI_MPU6000
+#define ACC_MPU6000_ALIGN CW270_DEG
+#else
 #define USE_ACC_MPU6500
 #define USE_ACC_SPI_MPU6500
-#define ACC_MPU6500_ALIGN       CW270_DEG
+#define ACC_MPU6500_ALIGN CW270_DEG
+#endif
 
 #define USB_IO
 
@@ -65,7 +119,13 @@
 #define USE_UART1
 #define USE_UART2
 #define USE_UART3
+#ifdef LUXR_RACE
+#define USE_UART4
+#define USE_UART5
+#define SERIAL_PORT_COUNT       6
+#else
 #define SERIAL_PORT_COUNT       4
+#endif
 
 #define UART1_TX_PIN            PC4
 #define UART1_RX_PIN            PC5
@@ -76,8 +136,7 @@
 #define UART3_TX_PIN            PB10
 #define UART3_RX_PIN            PB11
 
-#define USE_I2C
+#undef USE_I2C
-#define I2C_DEVICE (I2CDEV_2)
 
 #define USE_ADC
 #define ADC_INSTANCE            ADC1
@@ -97,6 +156,11 @@
 
 #define DEFAULT_RX_FEATURE      FEATURE_RX_PPM
 
+#ifdef LUXR_RACE
+#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
+#define DEFAULT_FEATURES        FEATURE_BLACKBOX
+#endif
+
 #define SPEKTRUM_BIND
 // USART1, PC5
 #define BIND_PIN                PC5
@@ -110,6 +174,10 @@
 #define TARGET_IO_PORTD         (BIT(2))
 #define TARGET_IO_PORTF         (BIT(0)|BIT(1)|BIT(4))
 
+#ifdef LUXR_RACE
+#define USABLE_TIMER_CHANNEL_COUNT 5
+#else
 #define USABLE_TIMER_CHANNEL_COUNT 11
-#define USED_TIMERS             (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM(8) | TIM_N(15))
+#endif
+#define USED_TIMERS             (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(8) | TIM_N(15))
 

src/main/target/LUX_RACE/target.mk

@@ -1,9 +1,9 @@
 F3_TARGETS  += $(TARGET)
-FEATURES    = VCP 
+FEATURES    = VCP SDCARD
 
 TARGET_SRC = \
             drivers/accgyro_mpu.c \
             drivers/accgyro_mpu6500.c \
             drivers/accgyro_spi_mpu6500.c \
-            drivers/accgyro_mpu6500.c
+            drivers/accgyro_mpu6500.c \
-
+            drivers/accgyro_spi_mpu6000.c