From 75b413e75400739eacd5f51b6a012c6896e5a573 Mon Sep 17 00:00:00 2001
From: nerdCopter <56646290+nerdCopter@users.noreply.github.com>
Date: Mon, 18 Dec 2023 10:04:43 -0600
Subject: [PATCH 1/2] [target] RUSH BLADEF7 update/repair (#957)
---
src/main/target/RUSHBLADEF7/target.c | 50 +++---
src/main/target/RUSHBLADEF7/target.h | 219 +++++++++++++-------------
src/main/target/RUSHBLADEF7/target.mk | 21 ++-
3 files changed, 155 insertions(+), 135 deletions(-)
diff --git a/src/main/target/RUSHBLADEF7/target.c b/src/main/target/RUSHBLADEF7/target.c
index 5cd05775bc..fefead3d9e 100644
--- a/src/main/target/RUSHBLADEF7/target.c
+++ b/src/main/target/RUSHBLADEF7/target.c
@@ -1,41 +1,45 @@
/*
- * This file is part of Cleanflight and Betaflight.
+ * This file is part of EmuFlight. It is derived from 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.
+ * This 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.
+ *
+ * This software 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.
*
- * 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.
+ * You should have received a copy of the GNU General Public
+ * License along with this software.
*
* If not, see <http://www.gnu.org/licenses/>.
*/
-#include <stdint.h>
+// This resource file generated using https://github.com/nerdCopter/target-convert
+// Commit: c4eda1b
+#include <stdint.h>
#include "platform.h"
#include "drivers/io.h"
-
#include "drivers/dma.h"
#include "drivers/timer.h"
#include "drivers/timer_def.h"
const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
- DEF_TIM(TIM2, CH1, PA15, TIM_USE_LED, 0, 0), // PPM&SBUS
-
- DEF_TIM(TIM8, CH3, PC8, TIM_USE_MOTOR, 0, 0), // S1
- DEF_TIM(TIM8, CH4, PC9, TIM_USE_MOTOR, 0, 0), // S2
- DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 0, 0), // S3
- DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 0, 0), // S4
- DEF_TIM(TIM8, CH2, PC7, TIM_USE_MOTOR, 0, 0), // S5
- DEF_TIM(TIM8, CH1, PC6, TIM_USE_MOTOR, 0, 0), // S6
-
- DEF_TIM(TIM1, CH1, PA8, TIM_USE_ANY, 0, 0), // LED STRIP
+ DEF_TIM(TIM8, CH3, PC8, TIM_USE_MOTOR, 0, 0), // motor 1
+ DEF_TIM(TIM8, CH4, PC9, TIM_USE_MOTOR, 0, 0), // motor 2
+ DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 0, 0), // motor 3
+ DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 0, 0), // motor 4
+ DEF_TIM(TIM8, CH2, PC7, TIM_USE_MOTOR, 0, 0), // motor 5
+ DEF_TIM(TIM8, CH1, PC6, TIM_USE_MOTOR, 0, 0), // motor 6
+ DEF_TIM(TIM4, CH1, PB6, TIM_USE_MOTOR, 0, 0), // motor 7
+ DEF_TIM(TIM4, CH2, PB7, TIM_USE_MOTOR, 0, 0), // motor 8
+ DEF_TIM(TIM2, CH1, PA15, TIM_USE_LED, 0, 0), // led
+ DEF_TIM(TIM1, CH1, PA8, TIM_USE_ANY, 0, 0), // cam ctrl
};
+
+// notice - this file was programmatically generated and may be incomplete.
diff --git a/src/main/target/RUSHBLADEF7/target.h b/src/main/target/RUSHBLADEF7/target.h
index 8559f4f88d..102932a3df 100644
--- a/src/main/target/RUSHBLADEF7/target.h
+++ b/src/main/target/RUSHBLADEF7/target.h
@@ -1,148 +1,155 @@
/*
- * This file is part of Cleanflight and Betaflight.
+ * This file is part of EmuFlight. It is derived from 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.
+ * This 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.
+ *
+ * This software 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.
*
- * 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.
+ * You should have received a copy of the GNU General Public
+ * License along with this software.
*
* If not, see <http://www.gnu.org/licenses/>.
*/
+// This resource file generated using https://github.com/nerdCopter/target-convert
+// Commit: c4eda1b
+
#pragma once
-#define TARGET_BOARD_IDENTIFIER "RSF7"
-#define USBD_PRODUCT_STRING "RUSHBLADE F7"
+#define TARGET_MANUFACTURER_IDENTIFIER "RUSH"
+#define USBD_PRODUCT_STRING "BLADE_F7"
-#define ENABLE_DSHOT_DMAR true
+#define FC_TARGET_MCU STM32F7X2 // not used in EmuF
+#define TARGET_BOARD_IDENTIFIER "S7X2" // generic ID
-#define LED0_PIN PB10
+#define USE_ACC
+#define USE_ACC_SPI_MPU6000
+#define USE_GYRO
+#define USE_GYRO_SPI_MPU6000
+#define USE_GYRO_SPI_ICM42688P
+#define USE_ACC_SPI_ICM42688P
+#define USE_BARO
+#define USE_BARO_DPS310
+#define USE_BARO_BMP280
+#define USE_FLASH
+#define USE_FLASH_W25Q128FV
+#define USE_MAX7456
+#define USE_SPI_GYRO
+#define USE_BARO
+
+#define USE_VCP
+#define USE_FLASHFS
+#define USE_FLASH_M25P16 // 16MB Micron M25P16 and others (ref: https://github.com/betaflight/betaflight/blob/master/src/main/drivers/flash_m25p16.c)
+#define USE_OSD
+#define USE_LED
+#define LED0_PIN PB10
+#define LED_STRIP_PIN PA15
#define USE_BEEPER
-#define BEEPER_PIN PB2
+#define BEEPER_PIN PB2
#define BEEPER_INVERTED
-//#define BEEPER_PWM_HZ 1100
+#define BEEPER_PWM_HZ 1100
+#define CAMERA_CONTROL_PIN PA8
-#define USE_EXTI
-#define MPU_INT_EXTI PA4
-#define USE_MPU_DATA_READY_SIGNAL
+#define USE_SPI
+#define USE_SPI_DEVICE_1
+#define SPI1_SCK_PIN PA5
+#define SPI1_MISO_PIN PA6
+#define SPI1_MOSI_PIN PA7
+#define USE_SPI_DEVICE_2
+#define SPI2_SCK_PIN PB13
+#define SPI2_MISO_PIN PB14
+#define SPI2_MOSI_PIN PB15
+#define USE_SPI_DEVICE_3
+#define SPI3_SCK_PIN PB3
+#define SPI3_MISO_PIN PB4
+#define SPI3_MOSI_PIN PB5
-#define USE_ACC
-#define USE_GYRO
-//------MPU6000
-#define MPU6000_CS_PIN PC4
-#define MPU6000_SPI_INSTANCE SPI1
+#define USE_EXTI // notice - REQUIRED when USE_GYRO_EXTI
+#define USE_GYRO_EXTI
-#define USE_GYRO_SPI_MPU6000
-#define GYRO_MPU6000_ALIGN CW270_DEG
+#define USE_MPU_DATA_READY_SIGNAL
-#define USE_ACC_SPI_MPU6000
-#define ACC_MPU6000_ALIGN CW270_DEG
+#define GYRO_1_ALIGN CW270_DEG
+#define ACC_1_ALIGN CW270_DEG
+#define GYRO_1_CS_PIN PC4
+#define GYRO_1_EXTI_PIN PA4
+#define GYRO_1_SPI_INSTANCE SPI1
+#define MPU_INT_EXTI PA4
-#define USE_ACC_MPU6000
-#define USE_ACC_SPI_MPU6000
-#define USE_GYRO_MPU6000
-#define USE_GYRO_SPI_MPU6000
-
-#define USE_BARO
-#define USE_BARO_BMP280
-#define USE_BARO_MS5611
+#define ACC_MPU6000_ALIGN CW270_DEG
+#define GYRO_MPU6000_ALIGN CW270_DEG
+#define MPU6000_CS_PIN PC4
+#define MPU6000_SPI_INSTANCE SPI1
-#define USE_MAG
-#define USE_MAG_HMC5883
+#define ACC_ICM42688P_ALIGN CW270_DEG
+#define GYRO_ICM42688P_ALIGN CW270_DEG
+#define ICM42688P_CS_PIN PC4
+#define ICM42688P_SPI_INSTANCE SPI1
-#define USE_VCP
#define USE_UART1
+#define UART1_TX_PIN PA9
+#define UART1_RX_PIN PA10
#define USE_UART2
+#define UART2_TX_PIN PA2
+#define UART2_RX_PIN PA3
#define USE_UART3
+#define UART3_TX_PIN PC10
+#define UART3_RX_PIN PC11
#define USE_UART4
+#define UART4_TX_PIN PA0
+#define UART4_RX_PIN PA1
#define USE_UART5
-
-#define UART1_TX_PIN PA9
-#define UART1_RX_PIN PA10
-
-#define UART2_TX_PIN PA2
-#define UART2_RX_PIN PA3
-
-#define UART3_TX_PIN PC10
-#define UART3_RX_PIN PC11
-
-#define UART4_TX_PIN PA0
-#define UART4_RX_PIN PA1
-
-#define UART5_TX_PIN PC12
-#define UART5_RX_PIN PD2
-
-#define USE_SOFTSERIAL1
-#define USE_SOFTSERIAL2
-
-#define SERIAL_PORT_COUNT 8
+#define UART5_TX_PIN PC12
+#define UART5_RX_PIN PD2
+#define SERIAL_PORT_COUNT 6
+//#define USE_SOFTSERIAL1 //old defines had softserial, maybe in error
+//#define USE_SOFTSERIAL2
+//#define SERIAL_PORT_COUNT 8
#define USE_I2C
#define USE_I2C_DEVICE_1
-#define I2C_DEVICE I2CDEV_1
-#define I2C1_SCL PB8
-#define I2C1_SDA PB9
-
-#define USE_SPI
-#define USE_SPI_DEVICE_1 //GYRO/ACC
-#define SPI1_SCK_PIN PA5
-#define SPI1_MISO_PIN PA6
-#define SPI1_MOSI_PIN PA7
-
-#define USE_SPI_DEVICE_2 //MAX7456
-#define SPI2_SCK_PIN PB13
-#define SPI2_MISO_PIN PB14
-#define SPI2_MOSI_PIN PB15
-
-#define USE_SPI_DEVICE_3
-#define SPI3_SCK_PIN PB3
-#define SPI3_MISO_PIN PB4
-#define SPI3_MOSI_PIN PB5
-
-#define USE_MAX7456
-#define MAX7456_SPI_INSTANCE SPI2
-#define MAX7456_SPI_CS_PIN PB11
+#define I2C_DEVICE (I2CDEV_1)
+#define BARO_I2C_INSTANCE (I2CDEV_1)
+#define I2C1_SCL PB8
+#define I2C1_SDA PB9
+#define FLASH_CS_PIN PB12
+#define FLASH_SPI_INSTANCE SPI2
#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
-#define USE_FLASHFS
-#define USE_FLASH_M25P16
-#define FLASH_CS_PIN PB12
-#define FLASH_SPI_INSTANCE SPI2
-
-#define USE_ADC
-#define ADC_INSTANCE ADC1
-#define ADC3_DMA_STREAM DMA2_Stream0
-#define VBAT_ADC_PIN PC0
-#define CURRENT_METER_ADC_PIN PC1
+#define MAX7456_SPI_CS_PIN PB11
+#define MAX7456_SPI_INSTANCE SPI2
+#define USE_ADC
+#define VBAT_ADC_PIN PC0
+#define CURRENT_METER_ADC_PIN PC1
+#define ADC1_DMA_OPT 1
+#define ADC1_DMA_STREAM DMA2_Stream4 //# ADC 1: DMA2 Stream 4 Channel 0
#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC
#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC
+#define DEFAULT_CURRENT_METER_SCALE 179
-#define USE_OSD
-#define USE_LED_STRIP
+#define ENABLE_DSHOT_DMAR true
-#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
-#define DEFAULT_FEATURES FEATURE_OSD
-#define SERIALRX_UART SERIAL_PORT_USART2
-#define SERIALRX_PROVIDER SERIALRX_SBUS
+#define TARGET_IO_PORTA 0xffff
+#define TARGET_IO_PORTB 0xffff
+#define TARGET_IO_PORTC 0xffff
+#define TARGET_IO_PORTD 0xffff
+//#define TARGET_IO_PORTD (BIT(2)) //old defines used this instead
-#define USE_SERIAL_4WAY_BLHELI_INTERFACE
+#define DEFAULT_FEATURES (FEATURE_OSD | FEATURE_TELEMETRY | FEATURE_AIRMODE | FEATURE_RX_SERIAL)
+#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
-#define TARGET_IO_PORTA 0xffff
-#define TARGET_IO_PORTB 0xffff
-#define TARGET_IO_PORTC 0xffff
-#define TARGET_IO_PORTD (BIT(2))
+#define USABLE_TIMER_CHANNEL_COUNT 10
+#define USED_TIMERS ( TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(4) | TIM_N(8) )
-#define USABLE_TIMER_CHANNEL_COUNT 9
-#define USED_TIMERS (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(8) | TIM_N(9) )
+// notice - this file was programmatically generated and may be incomplete.
diff --git a/src/main/target/RUSHBLADEF7/target.mk b/src/main/target/RUSHBLADEF7/target.mk
index eb35ec20ee..512a00a52e 100644
--- a/src/main/target/RUSHBLADEF7/target.mk
+++ b/src/main/target/RUSHBLADEF7/target.mk
@@ -2,9 +2,18 @@ F7X2RE_TARGETS += $(TARGET)
FEATURES += VCP ONBOARDFLASH
TARGET_SRC = \
- drivers/accgyro/accgyro_mpu.c \
- drivers/accgyro/accgyro_spi_mpu6000.c \
- drivers/barometer/barometer_ms5611.c \
- drivers/barometer/barometer_bmp280.c \
- drivers/compass/compass_hmc5883l.c \
- drivers/max7456.c
+drivers/accgyro/accgyro_mpu.c \
+drivers/accgyro/accgyro_spi_mpu6000.c \
+drivers/accgyro/accgyro_spi_icm426xx.c \
+drivers/barometer/barometer_ms5611.c \
+drivers/barometer/barometer_bmp280.c \
+drivers/compass/compass_hmc5883l.c \
+drivers/light_led.h \
+drivers/light_ws2811strip.c \
+drivers/max7456.c \
+
+# notice - this file was programmatically generated and may be incomplete.
+# drivers for ms5611 & compass manually added
+
+# This resource file generated using https://github.com/nerdCopter/target-convert
+# Commit: c4eda1b
From d23611a5533790ffb6f96ef9d6709c1cd0d68378 Mon Sep 17 00:00:00 2001
From: nerdCopter <56646290+nerdCopter@users.noreply.github.com>
Date: Wed, 20 Dec 2023 08:20:58 -0600
Subject: [PATCH 2/2] [gh actions] use date as tag for dev-unstable dev-master
(#959)
---
.github/workflows/build.yml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ed938545a9..54922794f6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -159,6 +159,7 @@ jobs:
echo "outputs.shortsha: ${{ needs.build.outputs.shortsha }}"
echo "outputs.artfact: ${{ needs.build.outputs.artifact }}"
echo "outputs.artfact: ${{ needs.build.outputs.version }}"
+ echo "NOW=$(date +'%Y%m%d.%H%M%S')" >> $GITHUB_ENV
continue-on-error: true
- name: download artifacts
@@ -181,7 +182,7 @@ jobs:
repo: dev-unstable
owner: emuflight
token: ${{ secrets.NC_PAT_EMUF }}
- tag: "hex-${{ github.run_number }}"
+ tag: "${{ env.NOW }}-hex"
draft: true
prerelease: true
allowUpdates: true
@@ -213,7 +214,7 @@ jobs:
repo: dev-master
owner: emuflight
token: ${{ secrets.NC_PAT_EMUF }}
- tag: "hex-${{ github.run_number }}"
+ tag: "${{ env.NOW }}-hex"
draft: true
prerelease: true
allowUpdates: true