diff --git a/conf/airframes/OPENUAS/openuas_eflite_t28.xml b/conf/airframes/OPENUAS/openuas_eflite_t28.xml index f09d55ff10..f66ba5e9d4 100644 --- a/conf/airframes/OPENUAS/openuas_eflite_t28.xml +++ b/conf/airframes/OPENUAS/openuas_eflite_t28.xml @@ -289,7 +289,32 @@ NOTES: - + + + + diff --git a/conf/telemetry/OPENUAS/openuas_fixedwing_imu_rc.xml b/conf/telemetry/OPENUAS/openuas_fixedwing_imu_rc.xml index 12ffdee871..ea2fd26463 100644 --- a/conf/telemetry/OPENUAS/openuas_fixedwing_imu_rc.xml +++ b/conf/telemetry/OPENUAS/openuas_fixedwing_imu_rc.xml @@ -2,7 +2,7 @@ - + @@ -34,7 +34,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -66,22 +66,22 @@ - - - - - - - + + + + + + + - - - - - - + + + + + + - + @@ -99,14 +99,14 @@ - + - + diff --git a/sw/airborne/boards/px4fmu_4.0.h b/sw/airborne/boards/px4fmu_4.0.h index 8b57acda17..6f12336450 100644 --- a/sw/airborne/boards/px4fmu_4.0.h +++ b/sw/airborne/boards/px4fmu_4.0.h @@ -176,9 +176,9 @@ When a read-operation of an RTD resistance data register occurs, DRDY returns hi #define SPI_SELECT_SLAVE1_PIN GPIO15 /* MDL */ -// FIXME: Test n fix of not working +// FIXME: Test n fix or emoveal //#define SPI_SELECT_SLAVE1_PORT GPIOE -//#define SPI_SELECT_SLAVE1_PIN GPIO15 */ +//#define SPI_SELECT_SLAVE1_PIN GPIO15 /* MPU_9250_CS on SPI1 */ #define SPI_SELECT_SLAVE2_PORT GPIOC @@ -194,8 +194,8 @@ When a read-operation of an RTD resistance data register occurs, DRDY returns hi /* SPI3 NSS on microSD connector */ //FIXME: not tested -//#define SPI_SELECT_SLAVE4_PORT GPIOA -//#define SPI_SELECT_SLAVE4_PIN GPIO4 +//#define SPI_SELECT_SLAVE5_PORT GPIOA +//#define SPI_SELECT_SLAVE5_PIN GPIO4 /* SDIO to microSD card connector */ @@ -301,6 +301,10 @@ When a read-operation of an RTD resistance data register occurs, DRDY returns hi #define PWM_USE_TIM1 1 #define PWM_USE_TIM4 1 + +//TODO: ifdef USE_SERVO6 for PPM out to e.g. servo extender board ... +// Basically a inter mcu Extra device;) + #define USE_PWM1 1 #define USE_PWM2 1 #define USE_PWM3 1 diff --git a/sw/ext/opencv_bebop b/sw/ext/opencv_bebop index 365cf9fe2c..4e8ced8085 160000 --- a/sw/ext/opencv_bebop +++ b/sw/ext/opencv_bebop @@ -1 +1 @@ -Subproject commit 365cf9fe2cf4abc04c5b982feb54d04caa19fefd +Subproject commit 4e8ced80856b60d887b16c8211e34aebae581808