Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit b2da07f

Browse files
tiriadDzikuVx
tiriad
authored and
DzikuVx
committedNov 15, 2019
Baro fix SPI, probably blackbox, PPM on all targets SS, orientation issue in some targets and other minor changes in OmnibusF4 (#5187)
* Update target.h * Invert function * malformulated function * PPM on all Omnibus f4 targets * function reversal & explicit functions without ! * Update target.c * Update target.c * Update target.h * This should repair the faulty orientation #4976 * Update target.c * Update target.h * Baro fix spi (#2) * Update target.h * Allow override of stm32f7xx UART AFs (#5184) * Invert function * Led strip now working on new softserial targets on m5 m6 pin Omnibus F4v3 (#5186) * Led Strip 2 SS Correct this #4968 * Update timer Led strip new Soft Serials * Update target.c * Update target.h * malformulated function * PPM on all Omnibus f4 targets * function reversal & explicit functions without ! * Update target.c * Update target.c * Update target.h * This should repair the faulty orientation #4976 * Update target.c * Update target.h * Baro fix spi (#3) * Allow override of stm32f7xx UART AFs (#5184) * Led strip now working on new softserial targets on m5 m6 pin Omnibus F4v3 (#5186) * Led Strip 2 SS Correct this #4968 * Update timer Led strip new Soft Serials * PPM on all Omnibus f4 targets * function reversal & explicit functions without ! * This should repair the faulty orientation #4976 * Specific timers
1 parent 30c994e commit b2da07f

File tree

2 files changed

+51
-40
lines changed

2 files changed

+51
-40
lines changed
 

‎src/main/target/OMNIBUSF4/target.c

+18-7
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#include "drivers/bus.h"
2525

2626
const timerHardware_t timerHardware[] = {
27-
#if defined(OMNIBUSF4PRO) || defined(OMNIBUSF4V3)
27+
#if defined(OMNIBUSF4PRO) || defined(OMNIBUSF4PRO_LEDSTRIPM5) || defined(OMNIBUSF4V3) || defined(OMNIBUSF4V3_S6_SS) || defined(OMNIBUSF4V3_S5S6_SS) || defined(OMNIBUSF4V3_S5_S6_2SS)
2828
DEF_TIM(TIM10, CH1, PB8, TIM_USE_PPM, 0, 0), // PPM
2929
DEF_TIM(TIM4, CH4, PB9, TIM_USE_ANY, 0, 0), // S2_IN
3030
#else
@@ -42,14 +42,25 @@ const timerHardware_t timerHardware[] = {
4242
DEF_TIM(TIM2, CH3, PA2, TIM_USE_MC_MOTOR | TIM_USE_FW_SERVO, 0, 0), // S4_OUT D1_ST1
4343

4444
// { TIM9, IO_TAG(PA3), TIM_Channel_2, 1, IOCFG_AF_PP_PD, GPIO_AF_TIM9, TIM_USE_MC_MOTOR | TIM_USE_FW_SERVO }, // MOTOR_3
45-
#if (defined(OMNIBUSF4PRO) || defined(OMNIBUSF4V3)) && !defined(OMNIBUSF4PRO_LEDSTRIPM5)
46-
DEF_TIM(TIM5, CH2, PA1, TIM_USE_MC_MOTOR | TIM_USE_MC_SERVO | TIM_USE_FW_SERVO, 0, 0), // S5_OUT
45+
#if defined(OMNIBUSF4PRO) || defined(OMNIBUSF4V3)
46+
DEF_TIM(TIM5, CH2, PA1, TIM_USE_MC_MOTOR | TIM_USE_MC_SERVO | TIM_USE_FW_SERVO, 0, 0), // S5_OUT
47+
DEF_TIM(TIM1, CH1, PA8, TIM_USE_MC_MOTOR | TIM_USE_MC_SERVO | TIM_USE_FW_SERVO, 0, 0), // S6_OUT
48+
#elif defined(OMNIBUSF4V3_S5S6_SS) || defined(OMNIBUSF4V3_S5_S6_2SS)
49+
DEF_TIM(TIM5, CH2, PA1, TIM_USE_ANY, 0, 0), // S5_OUT SOFTSERIAL
50+
DEF_TIM(TIM1, CH1, PA8, TIM_USE_ANY, 0, 0), // S6_OUT SOFTSERIAL
51+
#elif defined(OMNIBUSF4V3_S6_SS)
52+
DEF_TIM(TIM5, CH2, PA1, TIM_USE_MC_MOTOR | TIM_USE_MC_SERVO | TIM_USE_FW_SERVO, 0, 0), // S5_OUT
53+
DEF_TIM(TIM1, CH1, PA8, TIM_USE_ANY, 0, 0), // S6_OUT SOFTSERIAL
54+
#elif defined(OMNIBUSF4PRO_LEDSTRIPM5)
55+
DEF_TIM(TIM5, CH2, PA1, TIM_USE_LED, 0, 0), // S5_OUT LED strip
56+
DEF_TIM(TIM1, CH1, PA8, TIM_USE_MC_MOTOR | TIM_USE_MC_SERVO | TIM_USE_FW_SERVO, 0, 0), // S6_OUT
4757
#else
48-
DEF_TIM(TIM5, CH2, PA1, TIM_USE_MC_MOTOR | TIM_USE_MC_SERVO | TIM_USE_FW_SERVO, 0, 0), // S5_OUT
58+
DEF_TIM(TIM5, CH2, PA1, TIM_USE_MC_MOTOR | TIM_USE_MC_SERVO | TIM_USE_FW_SERVO | TIM_USE_LED, 0, 0), // S5_OUT MOTOR, SERVO or LED
59+
DEF_TIM(TIM1, CH1, PA8, TIM_USE_MC_MOTOR | TIM_USE_MC_SERVO | TIM_USE_FW_SERVO, 0, 0), // S6_OUT
4960
#endif
50-
DEF_TIM(TIM1, CH1, PA8, TIM_USE_MC_MOTOR | TIM_USE_MC_SERVO | TIM_USE_FW_SERVO, 0, 0), // S6_OUT
51-
#if (defined(OMNIBUSF4PRO) || defined(OMNIBUSF4V3) || defined(OMNIBUSF4V3_S6_SS) || defined(OMNIBUSF4V3_S5S6_SS) || defined(OMNIBUSF4V3_S5_S6_2SS)) && !defined(OMNIBUSF4PRO_LEDSTRIPM5)
52-
DEF_TIM(TIM4, CH1, PB6, TIM_USE_LED, 0, 0), // LED strip for F4 V2 / F4-Pro-0X and later (RCD_CS for F4)
61+
62+
#if (defined(OMNIBUSF4PRO) || defined(OMNIBUSF4V3) || defined(OMNIBUSF4V3_S6_SS) || defined(OMNIBUSF4V3_S5S6_SS) || defined(OMNIBUSF4V3_S5_S6_2SS))
63+
DEF_TIM(TIM4, CH1, PB6, TIM_USE_LED, 0, 0), // LED strip for F4 V2 / F4-Pro-0X and later (RCD_CS for F4)
5364
#endif
5465
};
5566

‎src/main/target/OMNIBUSF4/target.h

+33-33
Original file line numberDiff line numberDiff line change
@@ -69,22 +69,23 @@
6969
#define MPU6000_CS_PIN PA4
7070
#define MPU6000_SPI_BUS BUS_SPI1
7171

72-
#if defined(DYSF4PRO) || defined(DYSF4PROV2)
72+
// Long sentence, OMNIBUSF4 always defined
73+
#if defined(OMNIBUSF4PRO) || defined(OMNIBUSF4PRO_LEDSTRIPM5) || defined(OMNIBUSF4V3) || defined(OMNIBUSF4V3_S6_SS) || defined(OMNIBUSF4V3_S5S6_SS) || defined(OMNIBUSF4V3_S5_S6_2SS)
7374
#define USE_GYRO_MPU6000
74-
#define GYRO_MPU6000_ALIGN CW180_DEG
75+
#define GYRO_MPU6000_ALIGN CW270_DEG
7576

7677
#define USE_ACC_MPU6000
77-
#define ACC_MPU6000_ALIGN CW180_DEG
78+
#define ACC_MPU6000_ALIGN CW270_DEG
7879
#else
7980
#define USE_GYRO_MPU6000
80-
#define GYRO_MPU6000_ALIGN CW270_DEG
81+
#define GYRO_MPU6000_ALIGN CW180_DEG
8182

8283
#define USE_ACC_MPU6000
83-
#define ACC_MPU6000_ALIGN CW270_DEG
84+
#define ACC_MPU6000_ALIGN CW180_DEG
8485
#endif
8586

8687
// Support for OMNIBUS F4 PRO CORNER - it has ICM20608 instead of MPU6000
87-
#if !defined(DYSF4PRO) && !defined(DYSF4PROV2)
88+
#if defined(OMNIBUSF4PRO) || defined(OMNIBUSF4PRO_LEDSTRIPM5) || defined(OMNIBUSF4V3) || defined(OMNIBUSF4V3_S6_SS) || defined(OMNIBUSF4V3_S5S6_SS) || defined(OMNIBUSF4V3_S5_S6_2SS)
8889
#define MPU6500_CS_PIN MPU6000_CS_PIN
8990
#define MPU6500_SPI_BUS MPU6000_SPI_BUS
9091

@@ -110,20 +111,19 @@
110111

111112
#define USE_BARO
112113

113-
#if defined(DYSF4PRO) || defined(DYSF4PROV2) || defined(OMNIBUSF4)
114-
#define BARO_I2C_BUS I2C_EXT_BUS
115-
#define USE_BARO_BMP085
116-
#define USE_BARO_BMP280
117-
#define USE_BARO_MS5611
118-
#else
114+
#if defined(OMNIBUSF4PRO) || defined(OMNIBUSF4PRO_LEDSTRIPM5) || defined(OMNIBUSF4V3) || defined(OMNIBUSF4V3_S6_SS) || defined(OMNIBUSF4V3_S5S6_SS) || defined(OMNIBUSF4V3_S5_S6_2SS)
119115
#define USE_BARO_BMP280
120116
#define BMP280_SPI_BUS BUS_SPI3
121117
#define BMP280_CS_PIN PB3 // v1
122-
123118
// Support external barometers
124119
#define BARO_I2C_BUS I2C_EXT_BUS
125120
#define USE_BARO_BMP085
126121
#define USE_BARO_MS5611
122+
#else
123+
#define BARO_I2C_BUS I2C_EXT_BUS
124+
#define USE_BARO_BMP085
125+
#define USE_BARO_BMP280
126+
#define USE_BARO_MS5611
127127
#endif
128128

129129
#define PITOT_I2C_BUS I2C_EXT_BUS
@@ -166,26 +166,26 @@
166166

167167
#elif defined(OMNIBUSF4V3_S6_SS) // one softserial on S6
168168
#define USE_SOFTSERIAL1
169-
#define SOFTSERIAL_1_RX_PIN PA8 // shared with S6 output
170-
#define SOFTSERIAL_1_TX_PIN PA8 // shared with S6 output
169+
#define SOFTSERIAL_1_RX_PIN PA8 // S6 output
170+
#define SOFTSERIAL_1_TX_PIN PA8 // S6 output
171171

172172
#define SERIAL_PORT_COUNT 5 // VCP, USART1, USART3, USART6, SOFTSERIAL1
173173

174174
#elif defined(OMNIBUSF4V3_S5S6_SS) // one softserial on S5/RX S6/TX
175175
#define USE_SOFTSERIAL1
176-
#define SOFTSERIAL_1_RX_PIN PA1 // shared with S5 output
177-
#define SOFTSERIAL_1_TX_PIN PA8 // shared with S6 output
176+
#define SOFTSERIAL_1_RX_PIN PA1 // S5 output
177+
#define SOFTSERIAL_1_TX_PIN PA8 // S6 output
178178

179179
#define SERIAL_PORT_COUNT 5 // VCP, USART1, USART3, USART6, SOFTSERIAL1
180180

181181
#elif defined(OMNIBUSF4V3_S5_S6_2SS) // two softserials, one on S5 and one on S6
182182
#define USE_SOFTSERIAL1
183-
#define SOFTSERIAL_1_RX_PIN PA1 // shared with S5 output
184-
#define SOFTSERIAL_1_TX_PIN PA1 // shared with S5 output
183+
#define SOFTSERIAL_1_RX_PIN PA1 // S5 output
184+
#define SOFTSERIAL_1_TX_PIN PA1 // S5 output
185185

186186
#define USE_SOFTSERIAL2
187-
#define SOFTSERIAL_2_RX_PIN PA8 // shared with S6 output
188-
#define SOFTSERIAL_2_TX_PIN PA8 // shared with S6 output
187+
#define SOFTSERIAL_2_RX_PIN PA8 // S6 output
188+
#define SOFTSERIAL_2_TX_PIN PA8 // S6 output
189189

190190
#define SERIAL_PORT_COUNT 6 // VCP, USART1, USART3, USART6, SOFTSERIAL1, SOFTSERIAL2
191191

@@ -201,7 +201,7 @@
201201

202202
#define USE_SPI_DEVICE_1
203203

204-
#if !defined(DYSF4PRO) && !defined(DYSF4PROV2) && !defined(OMNIBUSF4)
204+
#if defined(OMNIBUSF4PRO) || defined(OMNIBUSF4PRO_LEDSTRIPM5) || defined(OMNIBUSF4V3) || defined(OMNIBUSF4V3_S6_SS) || defined(OMNIBUSF4V3_S5S6_SS) || defined(OMNIBUSF4V3_S5_S6_2SS)
205205
#define USE_SPI_DEVICE_2
206206
#define SPI2_NSS_PIN PB12
207207
#define SPI2_SCK_PIN PB13
@@ -210,7 +210,7 @@
210210
#endif
211211

212212
#define USE_SPI_DEVICE_3
213-
#if !defined(DYSF4PRO) && !defined(DYSF4PROV2) && !defined(OMNIBUSF4)
213+
#if defined(OMNIBUSF4PRO) || defined(OMNIBUSF4PRO_LEDSTRIPM5) || defined(OMNIBUSF4V3) || defined(OMNIBUSF4V3_S6_SS) || defined(OMNIBUSF4V3_S5S6_SS) || defined(OMNIBUSF4V3_S5_S6_2SS)
214214
#define SPI3_NSS_PIN PA15
215215
#else
216216
#define SPI3_NSS_PIN PB3
@@ -224,13 +224,7 @@
224224
#define MAX7456_SPI_BUS BUS_SPI3
225225
#define MAX7456_CS_PIN PA15
226226

227-
#if defined(DYSF4PRO) || defined(DYSF4PROV2) || defined(OMNIBUSF4)
228-
#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
229-
#define M25P16_CS_PIN SPI3_NSS_PIN
230-
#define M25P16_SPI_BUS BUS_SPI3
231-
#define USE_FLASHFS
232-
#define USE_FLASH_M25P16
233-
#else
227+
#if defined(OMNIBUSF4PRO) || defined(OMNIBUSF4PRO_LEDSTRIPM5) || defined(OMNIBUSF4V3) || defined(OMNIBUSF4V3_S6_SS) || defined(OMNIBUSF4V3_S5S6_SS) || defined(OMNIBUSF4V3_S5_S6_2SS)
234228
#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
235229
#define USE_SDCARD
236230
#define USE_SDCARD_SPI
@@ -240,6 +234,12 @@
240234

241235
#define SDCARD_DETECT_PIN PB7
242236
#define SDCARD_DETECT_INVERTED
237+
#else
238+
#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
239+
#define M25P16_CS_PIN SPI3_NSS_PIN
240+
#define M25P16_SPI_BUS BUS_SPI3
241+
#define USE_FLASHFS
242+
#define USE_FLASH_M25P16
243243
#endif
244244

245245
#define USE_ADC
@@ -259,10 +259,10 @@
259259
#define SENSORS_SET (SENSOR_ACC|SENSOR_MAG|SENSOR_BARO)
260260

261261
#define USE_LED_STRIP
262-
#if (defined(OMNIBUSF4PRO) || defined(OMNIBUSF4V3) || defined(OMNIBUSF4V3_S6_SS) || defined(OMNIBUSF4V3_S5S6_SS) || defined(OMNIBUSF4V3_S5_S6_2SS)) && !defined(OMNIBUSF4PRO_LEDSTRIPM5)
263-
# define WS2811_PIN PB6
262+
#if (defined(OMNIBUSF4PRO) || defined(OMNIBUSF4V3) || defined(OMNIBUSF4V3_S6_SS) || defined(OMNIBUSF4V3_S5S6_SS) || defined(OMNIBUSF4V3_S5_S6_2SS))
263+
#define WS2811_PIN PB6
264264
#else
265-
# define WS2811_PIN PA1
265+
#define WS2811_PIN PA1
266266
#endif
267267

268268
#define DEFAULT_RX_TYPE RX_TYPE_PPM

0 commit comments

Comments
 (0)
Please sign in to comment.