Merge pull request iNavFlight#7058 from bkleiner/bkleiner_h7_tidy_target

MATEKH743: fix target id, enable pinio & osd
b14ckyy · Jun 2, 2021 · fccf358 · fccf358
2 parents 6b03a98 + 662296f
commit fccf358
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 26 deletions.
diff --git a/src/main/target/MATEKH743/target.c b/src/main/target/MATEKH743/target.c
@@ -29,9 +29,6 @@
 BUSDEV_REGISTER_SPI_TAG(busdev_imu1_6000,   DEVHW_MPU6000,  IMU1_SPI_BUS,   IMU1_CS_PIN,    IMU1_EXTI_PIN,  0,  DEVFLAGS_NONE,  IMU1_ALIGN);
 BUSDEV_REGISTER_SPI_TAG(busdev_imu2_6500,   DEVHW_MPU6500,  IMU2_SPI_BUS,   IMU2_CS_PIN,    IMU2_EXTI_PIN,  1,  DEVFLAGS_NONE,  IMU2_ALIGN);
 
-//BUSDEV_REGISTER_SPI_TAG(busdev_imu1_6500,   DEVHW_MPU6500,  IMU1_SPI_BUS,   IMU1_CS_PIN,    IMU1_EXTI_PIN,  0,  DEVFLAGS_NONE,  IMU1_ALIGN);
-//BUSDEV_REGISTER_SPI_TAG(busdev_imu2_6000,   DEVHW_MPU6000,  IMU2_SPI_BUS,   IMU2_CS_PIN,    IMU2_EXTI_PIN,  1,  DEVFLAGS_NONE,  IMU2_ALIGN);
-
 const timerHardware_t timerHardware[] = {
     DEF_TIM(TIM3, CH3, PB0, TIM_USE_MC_MOTOR | TIM_USE_FW_MOTOR, 0, 2),   // S1
     DEF_TIM(TIM3, CH4, PB1, TIM_USE_MC_MOTOR | TIM_USE_FW_MOTOR, 0, 2),   // S2

diff --git a/src/main/target/MATEKH743/target.h b/src/main/target/MATEKH743/target.h
@@ -18,8 +18,8 @@
 
 #pragma once
 
-#define TARGET_BOARD_IDENTIFIER "H765"
-#define USBD_PRODUCT_STRING     "MATEKH765"
+#define TARGET_BOARD_IDENTIFIER "H743"
+#define USBD_PRODUCT_STRING     "MATEKH743"
 
 #define LED0                    PE3
 #define LED1                    PE4
@@ -68,6 +68,9 @@
 #define USE_DUAL_GYRO
 #define USE_TARGET_IMU_HARDWARE_DESCRIPTORS
 
+#define USE_EXTI
+#define USE_MPU_DATA_READY_SIGNAL
+
 // *************** SPI1 IMU1 *************************
 #define USE_SPI
 #define USE_SPI_DEVICE_1
@@ -89,12 +92,10 @@
 #define SPI2_MISO_PIN           PB14
 #define SPI2_MOSI_PIN           PB15
 
-/*
 #define USE_OSD
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI2
 #define MAX7456_CS_PIN          PB12
-*/
 
 // *************** SPI3 SD BLACKBOX*******************
 /*
@@ -164,6 +165,17 @@
 #define RSSI_ADC_CHANNEL            ADC_CHN_3
 #define AIRSPEED_ADC_CHANNEL        ADC_CHN_4
 
+// *************** PINIO ***************************
+#define USE_PINIO
+#define USE_PINIOBOX
+#define PINIO1_PIN                  PE4  // VTX power switcher
+#define PINIO2_PIN                  PE15 // 2xCamera switcher
+
+// *************** LEDSTRIP ************************
+#define USE_LED_STRIP
+#define WS2811_PIN                  PA8
+
+#define DEFAULT_FEATURES            (FEATURE_OSD | FEATURE_TELEMETRY | FEATURE_CURRENT_METER | FEATURE_VBAT | FEATURE_TX_PROF_SEL | FEATURE_BLACKBOX)
 #define CURRENT_METER_SCALE         250
 
 #define USE_SERIAL_4WAY_BLHELI_INTERFACE
@@ -177,22 +189,4 @@
 #define MAX_PWM_OUTPUT_PORTS        15
 #define USE_DSHOT
 #define USE_ESC_SENSOR
-#define USE_SERIALSHOT
-
-#define USE_EXTI
-#define USE_MPU_DATA_READY_SIGNAL
-
-#if 0
-// *************** PINIO ***************************
-#define USE_PINIO
-#define USE_PINIOBOX
-#define PINIO1_PIN                  PE4  // VTX power switcher
-#define PINIO2_PIN                  PE15 // 2xCamera switcher
-
-// *************** LEDSTRIP ************************
-#define USE_LED_STRIP
-#define WS2811_PIN                  PA8
-
-#define DEFAULT_FEATURES            (FEATURE_OSD | FEATURE_TELEMETRY | FEATURE_CURRENT_METER | FEATURE_VBAT | FEATURE_TX_PROF_SEL | FEATURE_BLACKBOX)
-
-#endif
+#define USE_SERIALSHOT