betaflight 3.5.8 merge

emuflight · Aug 9, 2019 · 5fae064 · 5fae064
1 parent ab068ea
commit 5fae064
Show file tree

Hide file tree

Showing 49 changed files with 950 additions and 45 deletions.
diff --git a/docs/boards/Board - ElinF405.md b/docs/boards/Board - ElinF405.md
@@ -1,28 +1,30 @@
 # Board - Elin F405
 
 ## Hardware Features
-* MCU 
+* MCU
     - STM32F405
-* IMU 
+* IMU
     - ICM-20602
-* Motor Outputs 
-    - 4~6 outputs
-* OSD 
-* VCP 
+* Motor Outputs
+    - 4 outputs
+* OSD
+* VCP
 * Hardware UARTS :
     - UART1 - Serial RX,
     - UART3 - Inverted Smart Port,
     - UART4 - General use
     - UART6 - General use
-* Black box 
+    - Soft Serial 1 - Smart Port
+    - Soft Serial 2 - ESC Telemetry
+* Black box
     - SPI 16MB
-* LED Strip 
-* Integrated Voltage Regulator 
+* LED Strip
+* Integrated Voltage Regulator
     - 5V , 3A
-* Include Load Switch (VTX Real Pit Mode) 
+* Include Load Switch (VTX Real Pit Mode)
     - -30V , -30A (VTX or LED On / Off)
 * Include Low Pass LC filter
-* Buttons 
+* Buttons
     - Boot
 
 ## Pinouts

diff --git a/docs/boards/Board - ElinF722.md b/docs/boards/Board - ElinF722.md
@@ -0,0 +1,31 @@
+# Board - Elin F405
+
+## Hardware Features
+* MCU
+    - STM32F722
+* IMU
+    - ICM-20602
+* Motor Outputs
+    - 4 outputs
+* OSD
+* VCP
+* Hardware UARTS :
+    - UART1 - Serial RX,
+    - UART3 - Inverted Smart Port,
+    - UART4 - General use
+    - UART6 - General use
+    - Soft Serial 1 - Smart Port
+    - Soft Serial 2 - ESC Telemetry
+* Black box
+    - SPI 16MB
+* LED Strip
+* Integrated Voltage Regulator
+    - 5V , 3A
+* Include Load Switch (VTX Real Pit Mode)
+    - -30V , -30A (VTX or LED On / Off)
+* Include Low Pass LC filter
+* Buttons
+    - Boot
+
+## Pinouts
+![Elin F722 Pinout](images/ElinF722_pinout.jpg)
diff --git a/docs/boards/Board - FLYWOOF411.md b/docs/boards/Board - FLYWOOF411.md
@@ -0,0 +1,96 @@
+# Board - FLYWOOF411
+
+This board use the STM32F411CEU6 microcontroller and have the following features:
+
+* The 16M byte SPI flash for data logging
+* USB VCP and boot select button on board(for DFU)
+* Stable voltage regulation,9V/1.5A DCDC BEC for VTX/camera etc.And could select 5v/9v with pad
+* Serial LED interface(LED_STRIP)
+* VBAT/CURR/RSSI sensors input
+* Suppose IRC Tramp/smart audio/FPV Camera Control/FPORT/telemetry
+* Supports SBus, Spektrum1024/2048, PPM. No external inverters required (built-in).
+* Supports I2C device extend(baro/compass/OLED etc)
+* Supports GPS 
+
+### All uarts have pad on board 
+| Value | Identifier   | RX   | TX   | Notes                                                                                       |
+| ----- | ------------ | -----| -----| ------------------------------------------------------------------------------------------- |
+| 1     | USART1       | PB7 |  PB6 | FOR SBUS IN(inverter build in)                                                      |
+| 2     | USART2       | PA3 |  PA2|  FOR VTX SM/IRC ETC                                                                                    |
+
+
+### I2C with GPS port together.Use for BARO or compass etc 
+| Value | Identifier   | function |  pin   | Notes                                                                                 |
+| ----- | ------------ | ---------| -------| ------------------------------------------------------------------------------------- |                                                                                      
+| 1     | I2C1         |    SDA   |  PB9   | with GPS outlet
+| 2     | I2C1         |    SCL   |  PB8   | with GPS outlet
+
+
+### Buzzer/LED output 
+| Value | Identifier   | function |  pin   | Notes                                                                                 |
+| ----- | ------------ | ---------| -------| ------------------------------------------------------------------------------------- |                                                                                      
+| 1     | LED0         |    LED   |  PC13  | 
+| 2     | BEEPER       |    BEE   |  PC14  | 
+
+
+### VBAT input with 1/10 divider ratio,Current signal input,Analog/digit RSSI input
+| Value | Identifier   | function  |  pin  | Notes                                                                                 |
+| ----- | ------------ | ----------| ------| ------------------------------------------------------------------------------------- |                                                                                       
+| 1     | ADC1         |    VBAT   |  PA0  |  DMA2_Stream0
+| 2     | ADC1         |    CURR   |  PA1  |  DMA2_Stream0
+| 3     | ADC1         |    RSSI   |  PB1  |  DMA2_Stream0
+
+
+### 8 Outputs, 1 PPM input 
+| Value | Identifier   | function  |  pin  | Notes                                                                                 |
+| ----- | ------------ | ----------| ------| ------------------------------------------------------------------------------------- |                                                                                       
+| 1     | TIM9_CH1     |    PPM    |  PA2  |  PPM
+| 2     | TIM1_CH1     |    OUPUT1 |  PA8  |  DMA2_Stream1
+| 3     | TIM1_CH2     |    OUPUT2 |  PA9  |  DMA2_Stream2
+| 4     | TIM1_CH3     |    OUPUT3 |  PA10 |  DMA2_Stream6
+| 5     | TIM3_CH3     |    OUPUT4 |  PB0  |  DMA1_Stream7
+| 6     | TIM3_CH1     |    OUPUT5 |  PB4  |  DMA1_Stream4
+| 7     | TIM3_CH4     |    ANY    |  PB1  |  DMA1_Stream2
+| 8     | TIM5_CH4     |    ANY    |  PA3  |  DMA1_Stream3   
+| 9     | TIM2_CH3     |    CAM_C  |  PB10 |  DMA1_Stream1   
+| 10    | TIM2_CH4     |    LED    |  PB11 |  DMA1_Stream6
+
+
+### Gyro & ACC  ICM20689
+| Value | Identifier   | function |  pin   | Notes                                                                                 |
+| ----- | ------------ | ---------| -------| ------------------------------------------------------------------------------------- |                                                                                      
+| 1     | SPI1         |    SCK   |  PA5   | 
+| 2     | SPI1         |    MISO  |  PA6   | 
+| 3     | SPI1         |    MOSI  |  PA7   | 
+| 4     | SPI1         |    CS    |  PA4   | 
+
+### OSD MAX7456
+| Value | Identifier   | function |  pin   | Notes                                                                                 |
+| ----- | ------------ | ---------| -------| ------------------------------------------------------------------------------------- |                                                                                      
+| 1     | SPI3         |    SCK   |  PB13  | 
+| 2     | SPI3         |    MISO  |  PB14  | 
+| 3     | SPI3         |    MOSI  |  PB15   | 
+| 4     | SPI3         |    CS    |  PB12  |
+
+### 16Mbyte flash
+| Value | Identifier   | function |  pin   | Notes                                                                                 |
+| ----- | ------------ | ---------| -------| ------------------------------------------------------------------------------------- |                                                                                      
+| 1     | SPI3         |    SCK   |  PB13  | 
+| 2     | SPI3         |    MISO  |  PB14  | 
+| 3     | SPI3         |    MOSI  |  PB15   | 
+| 4     | SPI3         |    CS    |  PB2  | 
+
+### SWD
+| Pin | Function       | Notes                                        |
+| --- | -------------- | -------------------------------------------- |
+| 1   | SWCLK          | PAD                                          |
+| 2   | Ground         | PAD                                          |
+| 3   | SWDIO          | PAD                                          |
+| 4   | 3V3            | PAD                                          |
+
+* FLYWOO TECH
+
+
+
+
+
diff --git a/docs/boards/Board - SYNERGYF4.md b/docs/boards/Board - SYNERGYF4.md
@@ -0,0 +1,49 @@
+### Specifications
+- Processor: STM32F405 (F4 processor)
+- Gyro: MPU6000
+- Loop: 8k/8k
+- Input: 2-6S (Max 28V)
+- Regulator: Filtered 5V 3A
+- Receiver: 3.3V or 5V selectable. Inverted and non-inverted selectable receiver input
+- Connectors: 8 pin JST-SH main connector.  2x 3 pin JST-SH Addressable LED connectors (mirrored output)
+- Telemetry: Current Sensor and ESC Telemetry Input
+- Blackbox: 128Mbit flash (16Megabytes)
+- Motor: 4 pwm motor outputs with D-Shot and Multishot support
+- Mounting: M3 30.5x30.5mm holes with soft mounting
+- Dimensions: 37x37mm
+- Weight: 7.5g
+- Camera: Filtered 5V output
+
+### Features
+- Direct mounting for Unify Pro (5V), Unify Nano, Unify Pro Nano32  (Nano VTXs use adapter board included)
+- Direct mounting for TBS CrossFire Nano RX, TBS CrossFire Nano Diversity  RX, FR Sky XM+, and FR Sky R9m Mini (R9m Mini Adapter Included From Tiny's LEDs)
+- Header holes for direct receiver installation.
+- Built in camera control via single wire (analog only)
+- Built in BetaFlight OSD
+- Buzzer: Dedicated pads for 5V (100mA max) buzzers
+- Onboard addressable LED
+- Built in Tiny’s LEDs RealPit VTX power switch (selectable between ON-OFF-Remote)
+- Receiver can be powered on via USB (VTX stays off)
+- SmartAudio: Selectable between internal (FC controlled) and external (receiver).
+
+### UART info
+- UART1: Receiver (FrSky, Spektrum, Crossfire, etc)
+- UART3: SmartAudio (or any other desired output if SmartAudio is selected to pull signal from the “external” pad, designated RX SA on the top of the FC)
+- UART6: ESC Telemetry (if applicable).
+
+### Top
+![Top](images/SYNERGYF4-top.png)
+
+### Bottom
+![Bottom](images/SYNERGYF4-bottom.png)
+
+### Photo
+![Main](images/SYNERGYF4-main.jpg)
+
+`*** The flight controller does not include a receiver or VTX. The picture is for illustration only!`
+### Installation
+- Video: https://www.facebook.com/kevinslee106/videos/10156338569116234
+
+### Where to get
+- WhitenoiseFPV: https://whitenoisefpv.com/products/synergyf4
+- Tiny's LEDs: https://tinysleds.com/products/synergy-f4-flight-controller
diff --git a/docs/boards/images/ElinF405_pinout.jpg b/docs/boards/images/ElinF405_pinout.jpg
diff --git a/docs/boards/images/ElinF722_pinout.jpg b/docs/boards/images/ElinF722_pinout.jpg
diff --git a/docs/boards/images/SYNERGYF4-bottom.png b/docs/boards/images/SYNERGYF4-bottom.png
diff --git a/docs/boards/images/SYNERGYF4-main.jpg b/docs/boards/images/SYNERGYF4-main.jpg
diff --git a/docs/boards/images/SYNERGYF4-top.png b/docs/boards/images/SYNERGYF4-top.png
diff --git a/lib/main/STM32F1/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h b/lib/main/STM32F1/Drivers/STM32F1xx_HAL_Driver/Inc/stm32f1xx_hal_def.h
@@ -85,7 +85,9 @@ typedef enum
                               (__DMA_HANDLE__).Parent = (__HANDLE__);             \
                           } while(0U)
 
+#if !defined(UNUSED)
 #define UNUSED(x) ((void)(x))
+#endif
 
 /** @brief Reset the Handle's State field.
   * @param __HANDLE__: specifies the Peripheral Handle.

diff --git a/lib/main/STM32F3/Drivers/STM32F3xx_HAL_Driver/Inc/stm32f3xx_hal_def.h b/lib/main/STM32F3/Drivers/STM32F3xx_HAL_Driver/Inc/stm32f3xx_hal_def.h
@@ -83,7 +83,9 @@ typedef enum
                               (__DMA_HANDLE_).Parent = (__HANDLE__);               \
                           } while(0U)
 
+#if !defined(UNUSED)
 #define UNUSED(x) ((void)(x))
+#endif
 
 /** @brief Reset the Handle's State field.
   * @param __HANDLE__ specifies the Peripheral Handle.

diff --git a/lib/main/STM32F4/Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_def.h b/lib/main/STM32F4/Drivers/STM32F4xx_HAL_Driver/Inc/stm32f4xx_hal_def.h
@@ -83,7 +83,9 @@ typedef enum
                               (__DMA_HANDLE__).Parent = (__HANDLE__);             \
                           } while(0)
 
+#if !defined(UNUSED)
 #define UNUSED(x) ((void)(x))
+#endif
 
 /** @brief Reset the Handle's State field.
   * @param __HANDLE__: specifies the Peripheral Handle.

diff --git a/lib/main/STM32F7/Drivers/STM32F7xx_HAL_Driver/Inc/stm32f7xx_hal_def.h b/lib/main/STM32F7/Drivers/STM32F7xx_HAL_Driver/Inc/stm32f7xx_hal_def.h
@@ -82,7 +82,9 @@ typedef enum
                               (__DMA_HANDLE__).Parent = (__HANDLE__);             \
                           } while(0)
 
+#if !defined(UNUSED)
 #define UNUSED(x) ((void)(x))
+#endif
 
 /** @brief Reset the Handle's State field.
   * @param __HANDLE__: specifies the Peripheral Handle.

diff --git a/lib/main/STM32_USB_Device_Library/Class/msc/src/usbd_msc_bot.c b/lib/main/STM32_USB_Device_Library/Class/msc/src/usbd_msc_bot.c
@@ -31,7 +31,9 @@
 #include "usbd_ioreq.h"
 #include "usbd_msc_mem.h"
 
+#if !defined(UNUSED)
 #define UNUSED(x) (void)(x)
+#endif
 
 /** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY
   * @{

diff --git a/lib/main/STM32_USB_Device_Library/Class/msc/src/usbd_msc_core.c b/lib/main/STM32_USB_Device_Library/Class/msc/src/usbd_msc_core.c
@@ -46,7 +46,9 @@
 #include "usbd_msc_bot.h"
 #include "usbd_req.h"
 
+#if !defined(UNUSED)
 #define UNUSED(x) (void)(x)
+#endif
 
 /** @addtogroup STM32_USB_OTG_DEVICE_LIBRARY
   * @{

diff --git a/lib/main/STM32_USB_Device_Library/Class/msc/src/usbd_msc_scsi.c b/lib/main/STM32_USB_Device_Library/Class/msc/src/usbd_msc_scsi.c
@@ -31,7 +31,9 @@
 #include "usbd_msc_mem.h"
 #include "usbd_msc_data.h"
 
+#if !defined(UNUSED)
 #define UNUSED(x) (void)(x)
+#endif
 
 
 

diff --git a/src/main/build/version.h b/src/main/build/version.h
@@ -25,7 +25,7 @@
 #define FC_FIRMWARE_NAME            "ButterFlight"
 #define FC_VERSION_MAJOR            3  // increment when a major release is made (big new feature, etc)
 #define FC_VERSION_MINOR            6  // increment when a minor release is made (small new feature, change etc)
-#define FC_VERSION_PATCH_LEVEL      7  // increment when a bug is fixed
+#define FC_VERSION_PATCH_LEVEL      8  // increment when a bug is fixed
 
 
 #define FC_VERSION_STRING STR(FC_VERSION_MAJOR) "." STR(FC_VERSION_MINOR) "." STR(FC_VERSION_PATCH_LEVEL)

diff --git a/src/main/drivers/adc.c b/src/main/drivers/adc.c
@@ -39,7 +39,12 @@
 //#define DEBUG_ADC_CHANNELS
 
 adcOperatingConfig_t adcOperatingConfig[ADC_CHANNEL_COUNT];
+
+#if defined(STM32F7)
+volatile FAST_RAM_ZERO_INIT uint16_t adcValues[ADC_CHANNEL_COUNT];
+#else
 volatile uint16_t adcValues[ADC_CHANNEL_COUNT];
+#endif
 
 #ifdef USE_ADC_INTERNAL
 uint16_t adcTSCAL1;

diff --git a/src/main/drivers/pwm_output.c b/src/main/drivers/pwm_output.c
@@ -467,7 +467,7 @@ void pwmWriteDshotCommand(uint8_t index, uint8_t motorCount, uint8_t command, bo
             if (index == i || index == ALL_MOTORS) {
                 dshotCommandControl.command[i] = command;
             } else {
-                dshotCommandControl.command[i] = command;
+                dshotCommandControl.command[i] = DSHOT_CMD_MOTOR_STOP;
             }
         }
 

diff --git a/src/main/drivers/usb_io.c b/src/main/drivers/usb_io.c
@@ -53,7 +53,7 @@ void usbCableDetectInit(void)
     usbDetectPin = IOGetByTag(IO_TAG(USB_DETECT_PIN));
 
     IOInit(usbDetectPin, OWNER_USB_DETECT, 0);
-    IOConfigGPIO(usbDetectPin, IOCFG_OUT_PP);
+    IOConfigGPIO(usbDetectPin, IOCFG_IPD);
 #endif
 }