From f60df5aee0144fc34791e757c41444e85201840d Mon Sep 17 00:00:00 2001 From: BrotherHobby Date: Mon, 17 Jun 2024 08:37:17 +0800 Subject: [PATCH 1/5] Added Config for BROTHERHOBBYF722V3 (#461) * Added Config for BROTHERHOBBYF405V2 * Added Config for BROTHERHOBBYF722V3 * deleted Config for BROTHERHOBBYF722V3 * Added Config for BROTHERHOBBYF722V3 * Modified the Config of BROTHERHOBBYF722V3 --------- Co-authored-by: Ash <3090975109@qq.com> --- configs/BROTHERHOBBYF722V3/config.h | 117 ++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 configs/BROTHERHOBBYF722V3/config.h diff --git a/configs/BROTHERHOBBYF722V3/config.h b/configs/BROTHERHOBBYF722V3/config.h new file mode 100644 index 00000000..0a41b146 --- /dev/null +++ b/configs/BROTHERHOBBYF722V3/config.h @@ -0,0 +1,117 @@ +/* + * This file is part of Betaflight. + * + * Betaflight is 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. + * + * Betaflight is distributed in the hope that it 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 . + */ + +#pragma once + +#define FC_TARGET_MCU STM32F7X2 +#define BOARD_NAME BHF722V3 +#define MANUFACTURER_ID BROT + +#define USE_ACC +#define USE_ACC_SPI_ICM42688P +#define USE_GYRO +#define USE_GYRO_SPI_ICM42688P +#define USE_BARO +#define USE_BARO_BMP280 +#define USE_BARO_MS5611 +#define USE_BARO_DPS310 +#define USE_FLASH +#define USE_FLASH_W25N02K +#define USE_MAX7456 + +#define BEEPER_PIN PC3 +#define MOTOR1_PIN PB0 +#define MOTOR2_PIN PB1 +#define MOTOR3_PIN PB10 +#define MOTOR4_PIN PB11 +#define MOTOR5_PIN PB4 +#define MOTOR6_PIN PB5 +#define MOTOR7_PIN PC8 +#define MOTOR8_PIN PC9 +#define RX_PPM_PIN PA3 +#define LED_STRIP_PIN PA15 +#define UART1_TX_PIN PA9 +#define UART2_TX_PIN PA2 +#define UART3_TX_PIN PC10 +#define UART4_TX_PIN PA0 +#define UART5_TX_PIN PC12 +#define UART6_TX_PIN PC6 +#define UART1_RX_PIN PA10 +#define UART2_RX_PIN PA3 +#define UART3_RX_PIN PC11 +#define UART4_RX_PIN PA1 +#define UART5_RX_PIN PD2 +#define UART6_RX_PIN PC7 +#define I2C1_SCL_PIN PB8 +#define I2C1_SDA_PIN PB9 +#define LED0_PIN PA8 +#define SPI1_SCK_PIN PA5 +#define SPI2_SCK_PIN PB13 +#define SPI1_SDI_PIN PA6 +#define SPI2_SDI_PIN PB14 +#define SPI1_SDO_PIN PA7 +#define SPI2_SDO_PIN PB15 +#define CAMERA_CONTROL_PIN PB7 +#define ADC_VBAT_PIN PC2 +#define ADC_RSSI_PIN PC0 +#define ADC_CURR_PIN PC1 +#define FLASH_CS_PIN PB6 +#define MAX7456_SPI_CS_PIN PB12 +#define GYRO_1_EXTI_PIN PC4 +#define GYRO_1_CS_PIN PA4 + +#define TIMER_PIN_MAPPING \ + TIMER_PIN_MAP(0, PB6, 1, -1)\ + TIMER_PIN_MAP(1, PB7, 1, 0)\ + TIMER_PIN_MAP(2, PB8, 1, 0)\ + TIMER_PIN_MAP(3, PB9, 1, -1)\ + TIMER_PIN_MAP(4, PB0, 2, 0)\ + TIMER_PIN_MAP(5, PB1, 2, 0)\ + TIMER_PIN_MAP(6, PB5, 1, 0)\ + TIMER_PIN_MAP(7, PB4, 1, 0)\ + TIMER_PIN_MAP(8, PA8, 1, 0)\ + TIMER_PIN_MAP(9, PA3, 2, 0)\ + TIMER_PIN_MAP(10, PB3, 1, 0)\ + TIMER_PIN_MAP(11, PC9, 2, 0)\ + TIMER_PIN_MAP(12, PB10, 1, 0)\ + TIMER_PIN_MAP(13, PB11, 1, 0)\ + TIMER_PIN_MAP(14, PC8, 2, 0)\ + TIMER_PIN_MAP(15, PA15, 1, 0) + +#define ADC1_DMA_OPT 0 + +#define MAG_I2C_INSTANCE (I2CDEV_1) +#define BARO_I2C_INSTANCE (I2CDEV_1) +// #define SERIALRX_PROVIDER CRSF +#define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH +#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC +#define DEFAULT_CURRENT_METER_SCALE 386 +#define BEEPER_INVERTED +#define FLASH_SPI_INSTANCE SPI2 +#define MAX7456_SPI_INSTANCE SPI2 +#define GYRO_1_SPI_INSTANCE SPI1 +#define GYRO_1_ALIGN CW90_DEG +#define SYSTEM_HSE_MHZ 8 +#define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON +#define SERIALRX_UART SERIAL_PORT_USART2 +#define MSP_DISPLAYPORT_UART SERIAL_PORT_USART1 + From 1476da7ac1d63f692c3635a08646476b742c8421 Mon Sep 17 00:00:00 2001 From: BrotherHobby Date: Mon, 17 Jun 2024 08:38:02 +0800 Subject: [PATCH 2/5] Added Config for BROTHERHOBBYF405V2 (#459) * Added Config for BROTHERHOBBYF405V2 * Added Config for BROTHERHOBBYF722V3 * deleted Config for BROTHERHOBBYF722V3 --------- Co-authored-by: Ash <3090975109@qq.com> --- configs/BROTHERHOBBYF405V2/config.h | 111 ++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 configs/BROTHERHOBBYF405V2/config.h diff --git a/configs/BROTHERHOBBYF405V2/config.h b/configs/BROTHERHOBBYF405V2/config.h new file mode 100644 index 00000000..371eb35e --- /dev/null +++ b/configs/BROTHERHOBBYF405V2/config.h @@ -0,0 +1,111 @@ +/* + * This file is part of Betaflight. + * + * Betaflight is 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. + * + * Betaflight is distributed in the hope that it 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 . + */ + +#pragma once + +#define FC_TARGET_MCU STM32F405 +#define BOARD_NAME BHF405V2 +#define MANUFACTURER_ID BROT + +#define USE_ACC +#define USE_ACC_SPI_ICM42688P +#define USE_GYRO +#define USE_GYRO_SPI_ICM42688P +#define USE_BARO +#define USE_BARO_DPS310 +#define USE_BARO_BMP280 +#define USE_BARO_MS5611 +#define USE_FLASH +#define USE_FLASH_W25Q128FV +#define USE_MAX7456 + +#define BEEPER_PIN PC5 +#define MOTOR1_PIN PB6 +#define MOTOR2_PIN PB7 +#define MOTOR3_PIN PB8 +#define MOTOR4_PIN PB9 +#define MOTOR5_PIN PB0 +#define MOTOR6_PIN PB1 +#define MOTOR7_PIN PB5 +#define MOTOR8_PIN PB4 +#define SERVO1_PIN PA8 +#define RX_PPM_PIN PA3 +#define LED_STRIP_PIN PC9 +#define UART1_TX_PIN PA9 +#define UART2_TX_PIN PA2 +#define UART3_TX_PIN PC10 +#define UART6_TX_PIN PC6 +#define UART1_RX_PIN PA10 +#define UART2_RX_PIN PA3 +#define UART3_RX_PIN PC11 +#define UART4_RX_PIN PD2 +#define UART6_RX_PIN PC7 +#define I2C2_SCL_PIN PB10 +#define I2C2_SDA_PIN PB11 +#define LED0_PIN PC8 +#define SPI1_SCK_PIN PA5 +#define SPI2_SCK_PIN PB13 +#define SPI1_SDI_PIN PA6 +#define SPI2_SDI_PIN PB14 +#define SPI1_SDO_PIN PA7 +#define SPI2_SDO_PIN PB15 +#define CAMERA_CONTROL_PIN PB3 +#define ADC_VBAT_PIN PC0 +#define ADC_RSSI_PIN PC2 +#define ADC_CURR_PIN PC1 +#define FLASH_CS_PIN PA15 +#define MAX7456_SPI_CS_PIN PB12 +#define GYRO_1_EXTI_PIN PC4 +#define GYRO_1_CS_PIN PA4 + +#define TIMER_PIN_MAPPING \ + TIMER_PIN_MAP(0, PB6, 1, 0)\ + TIMER_PIN_MAP(1, PB7, 1, 0)\ + TIMER_PIN_MAP(2, PB8, 1, 0)\ + TIMER_PIN_MAP(3, PB9, 1, 0)\ + TIMER_PIN_MAP(4, PB0, 2, 0)\ + TIMER_PIN_MAP(5, PB1, 2, 0)\ + TIMER_PIN_MAP(6, PB5, 1, 0)\ + TIMER_PIN_MAP(7, PB4, 1, 0)\ + TIMER_PIN_MAP(8, PA8, 1, 0)\ + TIMER_PIN_MAP(9, PA3, 2, 0)\ + TIMER_PIN_MAP(10, PB3, 1, 0)\ + TIMER_PIN_MAP(11, PC9, 2, 0) + +#define SPI2_TX_DMA_OPT 0 +#define ADC1_DMA_OPT 0 + +#define MAG_I2C_INSTANCE (I2CDEV_2) +#define BARO_I2C_INSTANCE (I2CDEV_2) +// #define SERIALRX_PROVIDER CRSF +#define DEFAULT_BLACKBOX_DEVICE BLACKBOX_DEVICE_FLASH +#define DEFAULT_DSHOT_BURST DSHOT_DMAR_ON +#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC +#define DEFAULT_CURRENT_METER_SCALE 386 +#define BEEPER_INVERTED +#define FLASH_SPI_INSTANCE SPI2 +#define MAX7456_SPI_INSTANCE SPI2 +#define GYRO_1_SPI_INSTANCE SPI1 +#define GYRO_1_ALIGN CW90_DEG +#define SYSTEM_HSE_MHZ 8 +#define SERIALRX_UART SERIAL_PORT_USART2 +#define MSP_DISPLAYPORT_UART SERIAL_PORT_UART4 From be663f2cf57db07e11832f9af24f43bd9deebc31 Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Sun, 16 Jun 2024 19:38:27 -0500 Subject: [PATCH 3/5] [github] add PR template (#458) --- .github/pull_request_template.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 00000000..84baaf96 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,4 @@ +## Pull-Request requirements +- Adhere to https://betaflight.com/docs/development/manufacturer/requirements-for-submission-of-targets. +- Pull-Request only from a custom branch, not `master`. +- Replace this text with details of your own. \ No newline at end of file From 04d449b1c3746ea52114b150f93a4d4c14a365f9 Mon Sep 17 00:00:00 2001 From: Mark Haslinghuis Date: Mon, 17 Jun 2024 02:38:50 +0200 Subject: [PATCH 4/5] Add manufacturer ID for Zerodrag (#448) --- Manufacturers.md | 1 + 1 file changed, 1 insertion(+) diff --git a/Manufacturers.md b/Manufacturers.md index fef14376..0c66d488 100644 --- a/Manufacturers.md +++ b/Manufacturers.md @@ -108,3 +108,4 @@ This is the official list of manufacturer ids (`manufacturer_id` in the target c |WIZZ|WIZZ|https://wizz.store/| |YUPF|YuPiFc|https://www.yupifc.com/| |ZEEZ|Zeez RC|https://www.zeezrc.com/| +|ZERO|Zerodrag|https://zerodrag.in/| From f60b1173a6d20b46a40145aba2600accb6410d95 Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Sun, 16 Jun 2024 19:39:57 -0500 Subject: [PATCH 5/5] [github workflow] auto-close PR's with branch named 'master' (#433) * [github workflow] auto-close PR's with branch named 'master' * [github workflow] auto-close PR's with branch named 'master'; remove branch specifiers --- .github/workflows/auto-close.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 .github/workflows/auto-close.yml diff --git a/.github/workflows/auto-close.yml b/.github/workflows/auto-close.yml new file mode 100644 index 00000000..d0f3223b --- /dev/null +++ b/.github/workflows/auto-close.yml @@ -0,0 +1,22 @@ +name: Auto close bad PR +env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + +on: + pull_request_target: + +permissions: + pull-requests: write + issues: write + +jobs: + close-pr: + runs-on: ubuntu-22.04 + steps: + - name: Code Checkout + uses: actions/checkout@v4 + + - name: autoclose + shell: bash + if: github.head_ref == 'master' + run: gh pr close ${{github.event.pull_request.number}} --comment "Auto-closing pull request because the source branch is named 'master'. Please create a feature branch instead. https://betaflight.com/docs/development#using-git-and-github"