diff --git a/src/main/target/FLYWOOF411/target.c b/src/main/target/FLYWOOF411/target.c
index ccb7e37ca1..ac130187d5 100644
--- a/src/main/target/FLYWOOF411/target.c
+++ b/src/main/target/FLYWOOF411/target.c
@@ -40,5 +40,5 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
DEF_TIM(TIM3, CH4, PB1, TIM_USE_ANY, 0, 0), // RSSI 1,2
DEF_TIM(TIM5, CH4, PA3, TIM_USE_ANY, 0, 1), // RX2 1,0
DEF_TIM(TIM2, CH3, PB10, TIM_USE_CAMERA_CONTROL, 0, 0), // CAM CC 1,1
- DEF_TIM(TIM2, CH4, PB11, TIM_USE_LED, 0, 0), // LED 1,6
+ DEF_TIM(TIM2, CH1, PA15, TIM_USE_LED, 0, 0), // LED 1,5
};
diff --git a/src/main/target/FLYWOOF411/target.h b/src/main/target/FLYWOOF411/target.h
index daaf71ba7c..2c1588263b 100644
--- a/src/main/target/FLYWOOF411/target.h
+++ b/src/main/target/FLYWOOF411/target.h
@@ -129,7 +129,7 @@
#define USE_PINIO
#define PINIO1_PIN PB5 // VTX switcher
-#define PINIO2_PIN PA15 // Camera switcher
+//#define PINIO2_PIN PA15 // Camera switcher
#define USE_PINIOBOX
#define DEFAULT_FEATURES (FEATURE_OSD | FEATURE_TELEMETRY | FEATURE_SOFTSERIAL | FEATURE_LED_STRIP)
diff --git a/src/main/target/FLYWOOF7DUAL/config.c b/src/main/target/FLYWOOF7DUAL/config.c
new file mode 100644
index 0000000000..975b094c39
--- /dev/null
+++ b/src/main/target/FLYWOOF7DUAL/config.c
@@ -0,0 +1,36 @@
+/*
+ * This file is part of Cleanflight and Betaflight.
+ *
+ * Cleanflight and Betaflight are 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.
+ *
+ * Cleanflight and Betaflight are distributed in the hope that they
+ * 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 .
+ */
+
+#include
+
+#include "platform.h"
+#include "io/serial.h"
+#include "pg/piniobox.h"
+#include "target.h"
+
+#define USE_TARGET_CONFIG
+
+void targetConfiguration(void)
+{
+ pinioBoxConfigMutable()->permanentId[0] = 40;
+ pinioBoxConfigMutable()->permanentId[1] = 41;
+
+}
+
diff --git a/src/main/target/FLYWOOF7DUAL/target.c b/src/main/target/FLYWOOF7DUAL/target.c
index 097fc8d1cc..865baa2fb2 100644
--- a/src/main/target/FLYWOOF7DUAL/target.c
+++ b/src/main/target/FLYWOOF7DUAL/target.c
@@ -29,7 +29,7 @@
const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
- DEF_TIM(TIM11, CH1, PB9, TIM_USE_PPM, 0, 0), // PPM
+ DEF_TIM(TIM8, CH1, PC6, TIM_USE_PPM, 0, 0), // PPM(2,2)-TX6
DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 0, 0), // S1 (1,2)
DEF_TIM(TIM3, CH1, PB4, TIM_USE_MOTOR, 0, 0), // S2 (1,4)
DEF_TIM(TIM2, CH2, PB3, TIM_USE_MOTOR, 0, 0), // S3 (1,6)
@@ -38,5 +38,8 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
DEF_TIM(TIM8, CH4, PC9, TIM_USE_MOTOR, 0, 0), // S6 (2,1)
DEF_TIM(TIM1, CH1, PA8, TIM_USE_LED, 0, 0), // LED STRIP(2,6)
DEF_TIM(TIM4, CH3, PB8, TIM_USE_CAMERA_CONTROL, 0, 0), // FC CAM(1,7)
+ DEF_TIM(TIM2, CH3, PB10, TIM_USE_ANY, 0, 0), // TX3-S7(1,1)
+ DEF_TIM(TIM5, CH3, PA2, TIM_USE_ANY, 0, 0), // TX2-S8(1,0)
+ DEF_TIM(TIM5, CH4, PA3, TIM_USE_ANY, 0, 1), // RX2(1,3)
};
diff --git a/src/main/target/FLYWOOF7DUAL/target.h b/src/main/target/FLYWOOF7DUAL/target.h
index 2bddd03473..478b6bb492 100644
--- a/src/main/target/FLYWOOF7DUAL/target.h
+++ b/src/main/target/FLYWOOF7DUAL/target.h
@@ -20,6 +20,7 @@
#pragma once
+#define USE_TARGET_CONFIG
#define TARGET_BOARD_IDENTIFIER "FWF7"
#define USBD_PRODUCT_STRING "FLYWOOF7DUAL"
@@ -51,11 +52,8 @@
#define USE_ACC
#define USE_ACC_SPI_MPU6000
#define USE_ACC_SPI_ICM20689
-
-#define GYRO_1_ALIGN CW270_DEG
-
+#define GYRO_1_ALIGN CW180_DEG_FLIP
#define GYRO_2_ALIGN CW270_DEG
-
#define GYRO_CONFIG_USE_GYRO_DEFAULT GYRO_CONFIG_USE_GYRO_2
#define USE_BARO
@@ -140,6 +138,11 @@
#define VBAT_ADC_PIN PC1
#define RSSI_ADC_PIN PC2
+#define USE_PINIO
+#define PINIO1_PIN PB0 // VTX power switcher
+#define PINIO2_PIN PB9 // 2xCamera switcher
+#define USE_PINIOBOX
+
#define CURRENT_METER_SCALE_DEFAULT 170
#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
@@ -158,7 +161,7 @@
#define TARGET_IO_PORTC 0xffff
#define TARGET_IO_PORTD (BIT(2))
-#define USABLE_TIMER_CHANNEL_COUNT 9
-#define USED_TIMERS (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(4) | TIM_N(8) |TIM_N(11) )
+#define USABLE_TIMER_CHANNEL_COUNT 12
+#define USED_TIMERS (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(4) | TIM_N(5) |TIM_N(8) )
diff --git a/src/main/target/KAKUTEF4/config.c b/src/main/target/KAKUTEF4/config.c
index af5f1eb63f..24d4b1efa5 100644
--- a/src/main/target/KAKUTEF4/config.c
+++ b/src/main/target/KAKUTEF4/config.c
@@ -23,6 +23,10 @@
#include "platform.h"
+#if defined(FLYWOOF405)
+#include "pg/piniobox.h"
+#endif
+
#ifdef USE_TARGET_CONFIG
#include "config_helper.h"
@@ -38,6 +42,10 @@ static targetSerialPortFunction_t targetSerialPortFunction[] = {
void targetConfiguration(void)
{
+#if defined(FLYWOOF405)
+ pinioBoxConfigMutable()->permanentId[0] = 40;
+ pinioBoxConfigMutable()->permanentId[1] = 41;
+#endif
targetSerialPortFunctionConfig(targetSerialPortFunction, ARRAYLEN(targetSerialPortFunction));
telemetryConfigMutable()->halfDuplex = 0;
telemetryConfigMutable()->telemetry_inverted = true;
diff --git a/src/main/target/KAKUTEF4/target.c b/src/main/target/KAKUTEF4/target.c
index 97f41b06fe..40539e0e71 100644
--- a/src/main/target/KAKUTEF4/target.c
+++ b/src/main/target/KAKUTEF4/target.c
@@ -48,7 +48,7 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
#if defined(KAKUTEF4V2)
DEF_TIM(TIM8, CH3, PC8, TIM_USE_LED, 0, 0), // LED_STRIP - DMA2_ST2
#elif defined(FLYWOOF405)
- DEF_TIM(TIM1, CH2, PA9, TIM_USE_PWM, 0, 0), // FC CAM
+ DEF_TIM(TIM1, CH2, PA9, TIM_USE_CAMERA_CONTROL, 0, 0), // FC CAM
#else
DEF_TIM(TIM5, CH1, PA0, TIM_USE_MOTOR, 0, 0), // S5_OUT - DMA1_ST2
DEF_TIM(TIM8, CH3, PC8, TIM_USE_MOTOR, 0, 1), // S6_OUT - DMA2_ST4
diff --git a/src/main/target/KAKUTEF4/target.h b/src/main/target/KAKUTEF4/target.h
index 4df7dcc3f5..564ace6fc0 100644
--- a/src/main/target/KAKUTEF4/target.h
+++ b/src/main/target/KAKUTEF4/target.h
@@ -149,7 +149,11 @@
#define USE_ESCSERIAL
#if defined(FLYWOOF405)
-#define ESCSERIAL_TIMER_TX_PIN PB8
+#define ESCSERIAL_TIMER_TX_PIN PB8
+#define USE_PINIO
+#define PINIO1_PIN PB12 // VTX power switcher
+#define PINIO2_PIN PB13 // 2xCamera switcher
+#define USE_PINIOBOX
#else
#define ESCSERIAL_TIMER_TX_PIN PC7 // (HARDARE=0,PPM)
#endif
@@ -191,7 +195,7 @@
#define USED_TIMERS ( TIM_N(2) | TIM_N(3) | TIM_N(8))
#elif defined(FLYWOOF405)
#define USABLE_TIMER_CHANNEL_COUNT 11
-#define USED_TIMERS ( TIM_N(2) | TIM_N(3) | TIM_N(4)| TIM_N(8))
+#define USED_TIMERS ( TIM_N(1) | TIM_N(2) | TIM_N(3)| TIM_N(4)| TIM_N(8)| TIM_N(10))
#else
#define USABLE_TIMER_CHANNEL_COUNT 8
#define USED_TIMERS ( TIM_N(2) | TIM_N(3) | TIM_N(5) | TIM_N(8))
diff --git a/unified_targets/configs/FLYWOOF405.config b/unified_targets/configs/FLYWOOF405.config
index 293a63988c..9962583350 100644
--- a/unified_targets/configs/FLYWOOF405.config
+++ b/unified_targets/configs/FLYWOOF405.config
@@ -39,6 +39,8 @@ resource CAMERA_CONTROL 1 A09
resource ADC_BATT 1 C03
resource ADC_RSSI 1 C01
resource ADC_CURR 1 C02
+resource PINIO 1 B12
+resource PINIO 2 B13
resource FLASH_CS 1 B03
resource OSD_CS 1 B14
resource GYRO_EXTI 1 C05
@@ -54,6 +56,16 @@ timer A03 AF1
# pin A03: TIM2 CH4 (AF1)
timer A02 AF1
# pin A02: TIM2 CH3 (AF1)
+timer PB5 AF2
+# pin PB5: TIM3 CH2 (AF2)
+timer PB7 AF2
+# pin PB7: TIM4 CH2 (AF2)
+timer PC9 AF3
+# pin PC9: TIM8 CH4 (AF3)
+timer PB4 AF2
+# pin PB4: TIM3 CH1 (AF2)
+timer PC8 AF3
+# pin PC8: TIM8 CH3 (AF3)
timer A09 AF1
# pin A09: TIM1 CH2 (AF1)
diff --git a/unified_targets/configs/FLYWOOF411.config b/unified_targets/configs/FLYWOOF411.config
index 34d8c8e7c0..43eb147da8 100644
--- a/unified_targets/configs/FLYWOOF411.config
+++ b/unified_targets/configs/FLYWOOF411.config
@@ -13,7 +13,7 @@ resource MOTOR 5 B04
resource PPM 1 A02
resource PWM 1 B01
resource PWM 2 A03
-resource LED_STRIP 1 B11
+resource LED_STRIP 1 A15
resource SERIAL_TX 1 B06
resource SERIAL_TX 2 A02
resource SERIAL_RX 1 B07
@@ -32,7 +32,6 @@ resource ADC_BATT 1 A00
resource ADC_RSSI 1 B01
resource ADC_CURR 1 A01
resource PINIO 1 B05
-resource PINIO 2 A15
resource FLASH_CS 1 B02
resource OSD_CS 1 B12
resource GYRO_EXTI 1 B03
@@ -50,14 +49,16 @@ timer A10 AF1
# pin A10: TIM1 CH3 (AF1)
timer B00 AF2
# pin B00: TIM3 CH3 (AF2)
+timer B04 AF2
+# pin B04: TIM3 CH1 (AF2)
timer B01 AF2
# pin B01: TIM3 CH4 (AF2)
timer A03 AF2
# pin A03: TIM5 CH4 (AF2)
timer B10 AF1
# pin B10: TIM2 CH3 (AF1)
-timer B11 AF1
-# pin B11: TIM2 CH4 (AF1)
+timer A15 AF1
+# pin A15: TIM2 CH1 (AF1)
# dma
dma ADC 1 0
@@ -78,8 +79,8 @@ dma pin A03 1
# pin A03: DMA1 Stream 3 Channel 6
dma pin B10 0
# pin B10: DMA1 Stream 1 Channel 3
-dma pin B11 1
-# pin B11: DMA1 Stream 6 Channel 3
+dma pin A15 0
+# pin A15: DMA1 Stream 5 Channel 3
# feature
feature SOFTSERIAL
diff --git a/unified_targets/configs/FLYWOOF7DUAL.config b/unified_targets/configs/FLYWOOF7DUAL.config
index 4f68b8ff3c..ccf4b05320 100644
--- a/unified_targets/configs/FLYWOOF7DUAL.config
+++ b/unified_targets/configs/FLYWOOF7DUAL.config
@@ -54,12 +54,20 @@ resource GYRO_CS 1 A04
resource GYRO_CS 2 B02
# timer
+timer C06 AF3
+# pin C06: TIM8 CH1 (AF3)
timer B01 AF2
# pin B01: TIM3 CH4 (AF2)
+timer B04 AF2
+# pin B04: TIM3 CH1 (AF2)
timer B03 AF1
# pin B03: TIM2 CH2 (AF1)
timer A15 AF1
# pin A15: TIM2 CH1 (AF1)
+timer C08 AF3
+# pin C08: TIM8 CH3 (AF3)
+timer PC9 AF3
+# pin PC9: TIM8 CH4 (AF3)
timer A08 AF1
# pin A08: TIM1 CH1 (AF1)
timer B08 AF3
@@ -130,6 +138,6 @@ set pinio_box = 40,41,255,255
set flash_spi_bus = 3
set gyro_1_bustype = SPI
set gyro_1_spibus = 1
-set gyro_1_sensor_align = CW270FLIP
+set gyro_1_sensor_align = CW180FLIP
set gyro_2_spibus = 1
set gyro_2_sensor_align = CW270