BLUEBERRYF405: Adjustments based on initial testing

Author: sensei-hacker

src/main/target/BLUEBERRYF405/CMakeLists.txt

@@ -1 +1 @@
-target_stm32f405xg(BLUEBERRYF405)
+target_stm32f405xg(BLUEBERRYF405)

src/main/target/BLUEBERRYF405/config.c

@@ -19,11 +19,15 @@
 #include "platform.h"
 #include "fc/fc_msp_box.h"
 #include "fc/config.h"
+#include "drivers/pwm_mapping.h"
 #include "io/piniobox.h"
 
 void targetConfiguration(void)
 {
     pinioBoxConfigMutable()->permanentId[0] = BOX_PERMANENT_ID_USER1;
     pinioBoxConfigMutable()->permanentId[1] = BOX_PERMANENT_ID_USER2;
-    beeperConfigMutable()->pwmMode = true;
+
+	// S1 and S2 are not as readily accessible
+    timerOverridesMutable(timer2id(TIM1))->outputMode = OUTPUT_MODE_MOTORS;
+    timerOverridesMutable(timer2id(TIM2))->outputMode = OUTPUT_MODE_SERVOS;
 }

src/main/target/BLUEBERRYF405/target.c

@@ -40,10 +40,8 @@ timerHardware_t timerHardware[] = {
     DEF_TIM(TIM4,  CH1,  PB6,  TIM_USE_OUTPUT_AUTO,   0, 0), // S11 D(1,0,2)
 
     DEF_TIM(TIM3,  CH4,  PB1,  TIM_USE_LED,    0, 0), // 2812LED  D(1,2,5)
-    DEF_TIM(TIM11, CH1,  PB9,  TIM_USE_BEEPER, 0, 0), // BEEPER PWM
-    
-    // DEF_TIM(TIM9,  CH2,  PA3,  TIM_USE_PPM,    0, 0), //RX2
-    DEF_TIM(TIM5,  CH3,  PA2,  TIM_USE_ANY,    0, 0), //TX2  softserial1_Tx
+
+    DEF_TIM(TIM5,  CH3,  PA2,  TIM_USE_ANY,    0, 0), // softserial1_TX (PA2 shared with UART2_TX)
 };
 
 const int timerHardwareCount = sizeof(timerHardware) / sizeof(timerHardware[0]);

src/main/target/BLUEBERRYF405/target.h

@@ -18,23 +18,22 @@
 #pragma once
 #define USE_TARGET_CONFIG
 
-#   define TARGET_BOARD_IDENTIFIER "BlueBerry"
-#   define USBD_PRODUCT_STRING  "BLUEBERRYF405"
+#define TARGET_BOARD_IDENTIFIER "BLF4"
+#define USBD_PRODUCT_STRING     "BLUEBERRYF405"
 
 #define LED0                    PA14  //Blue
 #define LED1                    PA13  //Green
 
 #define BEEPER                  PB9
 #define BEEPER_INVERTED
-#define BEEPER_PWM_FREQUENCY    2500
 
 // *************** SPI1 IMU & OSD *******************
 #define USE_SPI
 #define USE_SPI_DEVICE_1
 
 #define SPI1_SCK_PIN            PA5
-#define SPI1_MISO_PIN   	    PB4
-#define SPI1_MOSI_PIN   	    PA7
+#define SPI1_MISO_PIN           PB4
+#define SPI1_MOSI_PIN           PA7
 
 #define USE_IMU_ICM42605
 #define IMU_ICM42605_ALIGN      CW270_DEG_FLIP
@@ -46,23 +45,21 @@
 #define BMI270_SPI_BUS          BUS_SPI1
 #define BMI270_CS_PIN           PC14
 
-
-
 #define USE_MAX7456
 #define MAX7456_SPI_BUS         BUS_SPI1
 #define MAX7456_CS_PIN          PB12
 
 // *************** SPI2 Flash/SD Card  ****************
 #define USE_SPI_DEVICE_2
 #define SPI2_SCK_PIN            PB13
-#define SPI2_MISO_PIN   	    PC2
-#define SPI2_MOSI_PIN   	    PC3
+#define SPI2_MISO_PIN           PC2
+#define SPI2_MOSI_PIN           PC3
 
-#   define USE_SDCARD
-#   define USE_SDCARD_SPI
-#   define SDCARD_SPI_BUS          BUS_SPI2
-#   define SDCARD_CS_PIN           PC1
-#   define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
+#define USE_SDCARD
+#define USE_SDCARD_SPI
+#define SDCARD_SPI_BUS              BUS_SPI2
+#define SDCARD_CS_PIN               PC1
+#define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
 
 // *************** I2C /Baro/Mag *********************
 #define USE_I2C
@@ -141,13 +138,15 @@
 #define USE_PINIOBOX
 #define PINIO1_PIN                  PA4
 #define PINIO2_PIN                  PB5
+// TODO: Check if PINIO1 hardware is active-low; if so, add:
+// #define PINIO1_FLAGS PINIO_FLAGS_INVERTED
 
 // *************** LEDSTRIP ************************
 #define USE_LED_STRIP
 #define WS2811_PIN                  PB1
 
 // *************** others  ************************
-#define DEFAULT_FEATURES   (FEATURE_OSD | FEATURE_TELEMETRY | FEATURE_CURRENT_METER | FEATURE_VBAT | FEATURE_TX_PROF_SEL | FEATURE_BLACKBOX)
+#define DEFAULT_FEATURES   (FEATURE_OSD | FEATURE_TELEMETRY | FEATURE_CURRENT_METER | FEATURE_VBAT | FEATURE_TX_PROF_SEL | FEATURE_BLACKBOX | FEATURE_SOFTSERIAL)
 #define VBAT_SCALE_DEFAULT      2100
 #define CURRENT_METER_SCALE     150