FIX CONFIG and Add AOCODARCF722

betaflight · Mar 8, 2023 · efcf63a · efcf63a
1 parent e957f0d
commit efcf63a
Show file tree

Hide file tree

Showing 5 changed files with 245 additions and 45 deletions.
diff --git a/src/config/AOCODARCF722_AIO/config.h b/src/config/AOCODARCF722_AIO/config.h
@@ -0,0 +1,192 @@
+/*
+ * This file is part of Betaflight.
+ *
+ * Betaflight is free software. You can redistribute this software
+ * and/or modify this software under the terms of the GNU General
+ * Public License as published by the Free Software Foundation,
+ * either version 3 of the License, or (at your option) any later
+ * version.
+ *
+ * Betaflight is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this software.
+ *
+ * If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define FC_TARGET_MCU                   STM32F411
+
+#define BOARD_NAME                      AOCODARCF722_AIO
+#define MANUFACTURER_ID                 SJET
+
+#define USE_ACC
+#define USE_ACC_SPI_MPU6000
+#define USE_ACC_SPI_MPU6500
+#define USE_ACC_SPI_ICM42688P
+#define USE_ACCGYRO_BMI270
+#define USE_GYRO
+#define USE_GYRO_SPI_MPU6000
+#define USE_GYRO_SPI_MPU6500
+#define USE_GYRO_SPI_ICM42688P
+#define USE_BARO
+#define USE_BARO_DPS310
+#define USE_BARO_BMP280
+#define USE_FLASH_W25Q128FV
+#define USE_MAX7456
+
+#define BEEPER_PIN                      PC13
+#define MOTOR1_PIN                      PB4
+#define MOTOR2_PIN                      PB5
+#define MOTOR3_PIN                      PB0
+#define MOTOR4_PIN                      PB1
+#define MOTOR5_PIN                      PA15
+#define MOTOR6_PIN                      PB3
+#define MOTOR7_PIN                      PB6
+#define MOTOR8_PIN                      PB7
+#define RX_PPM_PIN                      PA3
+#define RX_PWM1_PIN                     PA2
+#define RX_PWM2_PIN                     PA1
+#define RX_PWM3_PIN                     PA0
+#define LED_STRIP_PIN                   PA8
+#define UART1_TX_PIN                    PA9
+#define UART1_RX_PIN                    PA10
+#define UART2_TX_PIN                    PA2
+#define UART2_RX_PIN                    PA3
+#define UART3_TX_PIN                    PB10
+#define UART3_RX_PIN                    PB11
+#define UART4_TX_PIN                    PA0
+#define UART4_RX_PIN                    PA1
+#define UART6_TX_PIN                    PC6
+#define UART6_RX_PIN                    PC7
+#define I2C1_SCL_PIN                    PB8
+#define I2C1_SDA_PIN                    PB9
+#define LED0_PIN                        PA4
+#define SPI1_SCK_PIN                    PA5
+#define SPI2_SCK_PIN                    PB13
+#define SPI3_SCK_PIN                    PC10
+#define SPI1_SDI_PIN                    PA6
+#define SPI2_SDI_PIN                    PB14
+#define SPI3_SDI_PIN                    PC11
+#define SPI1_SDO_PIN                    PA7
+#define SPI2_SDO_PIN                    PB15
+#define SPI3_SDO_PIN                    PC12
+#define ADC_VBAT_PIN                    PC2
+#define ADC_RSSI_PIN                    PC0
+#define ADC_CURR_PIN                    PC1
+#define ADC_EXTERNAL1_PIN               PA4
+#define PINIO1_PIN                      PC8
+#define PINIO2_PIN                      PC9
+#define FLASH_CS_PIN                    PD2
+#define MAX7456_SPI_CS_PIN              PB12
+#define GYRO_1_EXTI_PIN                 PC4
+#define GYRO_1_CS_PIN                   PB2
+#define USB_DETECT_PIN                  PC14
+
+//TODO #define TIMER_PIN_MAPPING
+
+#define ADC_INSTANCE                    ADC1
+#define ADC1_DMA_OPT                    0
+//TODO dma SPI_TX 3 0 # SPI_TX 3: DMA1 Stream 5 Channel 0
+
+#define BARO_I2C_INSTANCE               (I2CDEV_1)
+#define BEEPER_INVERTED
+#define DEFAULT_BLACKBOX_DEVICE         BLACKBOX_DEVICE_FLASH
+#define DEFAULT_CURRENT_METER_SOURCE    CURRENT_METER_ADC
+#define DEFAULT_VOLTAGE_METER_SOURCE    VOLTAGE_METER_ADC
+#define DEFAULT_CURRENT_METER_SCALE     650
+#define USE_SPI_GYRO
+#define GYRO_1_SPI_INSTANCE             SPI1
+#define GYRO_1_ALIGN                    CW0
+//TODO set mag_bustype = I2C
+//TODO #define MAG_BUSTYPE I2C
+#define MAG_I2C_INSTANCE                (I2CDEV_1)
+#define MAX7456_SPI_INSTANCE            SPI2
+#define PINIO1_BOX                      40
+#define PINIO2_BOX                      41
+#define FLASH_SPI_INSTANCE              SPI3
+//TODO #define ALIGN_BOARD_YAW 135
+//TODO set motor_pwm_protocol = DSHOT600
+
+
+/*
+
+TODO
+
+
+# timer
+timer B04 AF2
+# pin B04: TIM3 CH1 (AF2)
+timer B05 AF2
+# pin B05: TIM3 CH2 (AF2)
+timer B00 AF2
+# pin B00: TIM3 CH3 (AF2)
+timer B01 AF2
+# pin B01: TIM3 CH4 (AF2)
+timer A15 AF1
+# pin A15: TIM2 CH1 (AF1)
+timer B03 AF1
+# pin B03: TIM2 CH2 (AF1)
+timer B06 AF2
+# pin B06: TIM4 CH1 (AF2)
+timer B07 AF2
+# pin B07: TIM4 CH2 (AF2)
+timer A08 AF1
+# pin A08: TIM1 CH1 (AF1)
+timer A03 AF3
+# pin A03: TIM9 CH2 (AF3)
+timer A02 AF3
+# pin A02: TIM9 CH1 (AF3)
+timer A01 AF2
+# pin A01: TIM5 CH2 (AF2)
+timer A00 AF2
+# pin A00: TIM5 CH1 (AF2)
+timer B10 AF1
+# pin B10: TIM2 CH3 (AF1)
+
+# dma
+dma SPI_TX 3 0
+# SPI_TX 3: DMA1 Stream 5 Channel 0
+dma ADC 1 0
+# ADC 1: DMA2 Stream 0 Channel 0
+dma pin B04 0
+# pin B04: DMA1 Stream 4 Channel 5
+dma pin B05 0
+# pin B05: DMA1 Stream 5 Channel 5
+dma pin B00 0
+# pin B00: DMA1 Stream 7 Channel 5
+dma pin B01 0
+# pin B01: DMA1 Stream 2 Channel 5
+dma pin A15 0
+# pin A15: DMA1 Stream 5 Channel 3
+dma pin B03 0
+# pin B03: DMA1 Stream 6 Channel 3
+dma pin B06 0
+# pin B06: DMA1 Stream 0 Channel 2
+dma pin B07 0
+# pin B07: DMA1 Stream 3 Channel 2
+dma pin A08 2
+# pin A08: DMA2 Stream 3 Channel 6
+dma pin A01 0
+# pin A01: DMA1 Stream 4 Channel 6
+dma pin A00 0
+# pin A00: DMA1 Stream 2 Channel 6
+dma pin B10 0
+# pin B10: DMA1 Stream 1 Channel 3
+
+# feature
+feature RX_SERIAL
+feature TELEMETRY
+feature LED_STRIP
+feature OSD
+
+# serial
+serial 1 64 115200 57600 0 115200
+
+*/
diff --git a/src/config/MAMBAG4/config.h b/src/config/MAMBAG4/config.h
@@ -28,64 +28,72 @@
 
 #define USE_ACC
 #define USE_ACC_SPI_MPU6000
+#define USE_BARO
 #define USE_BARO_DPS310
 #define USE_GYRO
 #define USE_GYRO_SPI_MPU6000
 #define USE_FLASH_W25Q128FV
 #define USE_MAX7456
 
+#define ADC_VBAT_PIN         PB2
+#define ADC_CURR_PIN         PB1
 #define BEEPER_PIN           PA15
+#define FLASH_CS_PIN         PC6
+#define GYRO_1_EXTI_PIN      PC4
+#define GYRO_2_EXTI_PIN      PB12
+#define GYRO_1_CS_PIN        PA4
+#define GYRO_2_CS_PIN        PB0
+#define I2C1_SCL_PIN         PA13
+#define I2C1_SDA_PIN         PA14
+#define LED0_PIN             PC15
+#define LED1_PIN             PC14
+#define LED_STRIP_PIN        PB6
+#define MAX7456_SPI_CS_PIN   PA8
 #define MOTOR1_PIN           PA0
 #define MOTOR2_PIN           PA1
 #define MOTOR3_PIN           PA2
 #define MOTOR4_PIN           PA3
+#define SPI1_SCK_PIN         PA5
+#define SPI1_SDI_PIN         PA6
+#define SPI1_SDO_PIN         PA7
+#define SPI2_SCK_PIN         PB13
+#define SPI2_SDI_PIN         PB14
+#define SPI2_SDO_PIN         PB15
+#define UART1_RX_PIN         PA10
 #define UART1_TX_PIN         PA9
+#define UART2_RX_PIN         PB4
 #define UART2_TX_PIN         PB3
+#define UART3_RX_PIN         PB11
 #define UART3_TX_PIN         PB10
+#define UART4_RX_PIN         PC11
 #define UART4_TX_PIN         PC10
 #define UART11_TX_PIN        PB9
-#define UART1_RX_PIN         PA10
-#define UART2_RX_PIN         PB4
-#define UART3_RX_PIN         PB11
-#define UART4_RX_PIN         PC11
-#define I2C1_SCL_PIN         PA13
-#define I2C1_SDA_PIN         PA14
-#define LED0_PIN             PC15
-#define LED1_PIN             PC14
-#define ADC_VBAT_PIN         PB2
-#define ADC_CURR_PIN         PB1
-#define FLASH_CS_PIN         PC6
-#define MAX7456_SPI_CS_PIN   PA8
-#define GYRO_1_EXTI_PIN      PC4
-#define GYRO_2_EXTI_PIN      PB12
-#define GYRO_1_CS_PIN        PA4
-#define GYRO_2_CS_PIN        PB0
 
 #define TIMER_PIN_MAPPING \
-    TIMER_PIN_MAP( 0, PA0 , 1,  1) \
-    TIMER_PIN_MAP( 1, PA1 , 1,  2) \
-    TIMER_PIN_MAP( 2, PA2 , 1,  3) \
-    TIMER_PIN_MAP( 3, PA3 , 1,  4) \
-    TIMER_PIN_MAP( 4, PB6 , 3,  9)
+    TIMER_PIN_MAP( 0, MOTOR1_PIN, 1,  1) \
+    TIMER_PIN_MAP( 1, MOTOR2_PIN, 1,  2) \
+    TIMER_PIN_MAP( 2, MOTOR3_PIN, 1,  3) \
+    TIMER_PIN_MAP( 3, MOTOR4_PIN, 1,  4) \
+    TIMER_PIN_MAP( 4, LED_STRIP, 3,  9)
 
 
-#define ADC1_DMA_OPT        1
-#define TIMUP2_DMA_OPT      0
-#define TIMUP8_DMA_OPT      0
+#define ADC1_DMA_OPT                    1
+#define TIMUP2_DMA_OPT                  0
+#define TIMUP8_DMA_OPT                  0
 
-#define USE_BARO
-#define BARO_I2C_INSTANCE (I2CDEV_1)
-#define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH
-#define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON
-#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
-#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
+#define BARO_I2C_INSTANCE               (I2CDEV_1)
 #define BEEPER_INVERTED
+#define DEFAULT_BLACKBOX_DEVICE         BLACKBOX_DEVICE_FLASH
+#define DEFAULT_DSHOT_BURST             DSHOT_DMAR_ON
+#define DEFAULT_CURRENT_METER_SOURCE    CURRENT_METER_ADC
+#define DEFAULT_VOLTAGE_METER_SOURCE    VOLTAGE_METER_ADC
 //TODO #define PID_PROCESS_DENOM 2
-#define MAX7456_SPI_INSTANCE SPI2
-#define FLASH_SPI_INSTANCE SPI2
-#define GYRO_1_SPI_INSTANCE SPI1
-#define GYRO_1_ALIGN CW180_DEG
-#define GYRO_1_ALIGN_YAW 1800
-#define GYRO_2_SPI_INSTANCE SPI1
-#define GYRO_2_ALIGN CW270_DEG
-#define GYRO_2_ALIGN_YAW 2700
+#define MAX7456_SPI_INSTANCE            SPI2
+#define FLASH_SPI_INSTANCE              SPI2
+#define USE_SPI_GYRO
+#define GYRO_1_SPI_INSTANCE             SPI1
+#define GYRO_1_ALIGN                    CW180_DEG
+#define GYRO_1_ALIGN_YAW                1800
+#define GYRO_2_SPI_INSTANCE             SPI1
+#define GYRO_2_ALIGN                    CW270_DEG
+#define GYRO_2_ALIGN_YAW                2700
diff --git a/src/config/MATEKF405TE/config.h b/src/config/MATEKF405TE/config.h
@@ -113,7 +113,7 @@
 #define DEFAULT_CURRENT_METER_SCALE 150
 #define BEEPER_INVERTED
 #define SYSTEM_HSE_MHZ 8
-#define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_FLASH
+#define DEFAULT_BLACKBOX_DEVICE     BLACKBOX_DEVICE_SDCARD
 #define MAX7456_SPI_INSTANCE SPI1
 #define PINIO1_BOX 40
 #define PINIO2_BOX 41

diff --git a/src/config/MATEKH743/config.h b/src/config/MATEKH743/config.h
@@ -107,9 +107,9 @@
 #define GYRO_1_CS_PIN        PC15
 #define GYRO_2_CS_PIN        PE11
 #define USB_DETECT_PIN       PE2
-#define VBAT_ADC_PIN         PC0  //ADC123 VBAT1
-#define CURRENT_METER_ADC_PIN PC1  //ADC123 CURR1
-#define RSSI_ADC_PIN         PC5  //ADC12  RSSI
+#define ADC_VBAT_PIN         PC0  //ADC123 VBAT1
+#define ADC_CURR_PIN PC1  //ADC123 CURR1
+#define ADC_RSSI_PIN         PC5  //ADC12  RSSI
 
 
 #define TIMER_PIN_MAPPING \

diff --git a/src/config/SPRACINGH7RF/config.h b/src/config/SPRACINGH7RF/config.h
@@ -133,14 +133,14 @@
 #define CURRENT_METER_1_ADC_INSTANCE  ADC3
 #define ADC_EXTERNAL1_PIN             PC2
 #define ADC_EXTERNAL1_INSTANCE        ADC3
-#define VBAT_ADC_PIN                  PC3
+#define ADC_VBAT_PIN                  PC3
 #define VBAT_ADC_INSTANCE             ADC3
 #define VIDEO_IN_ADC_PIN              PC5
 #define VIDEO_OUT_ADC_PIN             PC4
 
-#define RSSI_ADC_PIN                  CURRENT_METER_2_ADC_PIN
+#define ADC_RSSI_PIN                  CURRENT_METER_2_ADC_PIN
 #define RSSI_ADC_INSTANCE             CURRENT_METER_2_ADC_INSTANCE
-#define CURRENT_METER_ADC_PIN         CURRENT_METER_1_ADC_PIN
+#define ADC_CURR_PIN         CURRENT_METER_1_ADC_PIN
 #define CURRENT_METER_ADC_INSTANCE    CURRENT_METER_1_ADC_INSTANCE
 #define DEFAULT_VOLTAGE_METER_SOURCE  VOLTAGE_METER_ADC
 #define DEFAULT_CURRENT_METER_SOURCE  CURRENT_METER_ADC