Skip to content

new manufacturer WARPLABS and new config file WPLV2 #843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

new manufacturer WARPLABS and new config file WPLV2 #843

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 114 additions & 0 deletions configs/WPLV2/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
#pragma once

#define FC_TARGET_MCU STM32H743

#define BOARD_NAME WPLV2
#define MANUFACTURER_ID WRPL

#define USE_GYRO
#define USE_GYRO_SPI_ICM42688P
#define USE_GYRO_CLKIN
#define USE_ACC
#define USE_ACC_SPI_ICM42688P
#define USE_FLASH
#define USE_FLASH_W25Q128FV
#ifndef USE_OSD_HD
#define USE_OSD_HD
#endif

#define USE_LED_STRIP

Comment on lines +15 to +20
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LED_STRIP and OSD are user build options.

Suggested change
#ifndef USE_OSD_HD
#define USE_OSD_HD
#endif
#define USE_LED_STRIP
#define USE_BARO

#define USE_BARO_DPS310

#define USE_SERVOS
#define SERVO1_PIN PE5
#define SERVO2_PIN PE6

#define BEEPER_PIN PD12

#define MOTOR1_PIN PE9
#define MOTOR2_PIN PE11
#define MOTOR3_PIN PE13
#define MOTOR4_PIN PE14
#define MOTOR5_PIN PC6
#define MOTOR6_PIN PC7
#define MOTOR7_PIN PC8
#define MOTOR8_PIN PC9

#define LED_STRIP_PIN PA15

#define UART1_TX_PIN PB6
#define UART1_RX_PIN PB7
#define UART2_TX_PIN PD5
#define UART2_RX_PIN PD6
#define UART3_RX_PIN PD9
#define UART4_RX_PIN PD0
#define UART5_TX_PIN PC12
#define UART5_RX_PIN PD2
#define UART7_TX_PIN PE8
#define UART7_RX_PIN PE7
#define UART8_TX_PIN PE1
#define UART8_RX_PIN PE0

#define I2C1_SCL_PIN PB8
#define I2C1_SDA_PIN PB9

#define LED0_PIN PE2

#define SPI1_SCK_PIN PA5
#define SPI1_SDI_PIN PA6
#define SPI1_SDO_PIN PA7
#define GYRO_1_EXTI_PIN PC13
#define GYRO_1_CS_PIN PB4
#define GYRO_1_CLKIN_PIN PA0


#define SPI2_SCK_PIN PB13
#define SPI2_SDI_PIN PB14
#define SPI2_SDO_PIN PB15
#define FLASH_CS_PIN PB12


#define ADC_VBAT_PIN PC0
#define ADC_CURR_PIN PC2

#define VTX_ENABLE_PIN PE3
#define PINIO1_PIN VTX_ENABLE_PIN
#define PINIO1_BOX 40
#define PINIO1_CONFIG 129
#define PINIO2_PIN PE4
#define PINIO2_BOX 40
#define PINIO2_CONFIG 1

Comment on lines +75 to +82
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Duplicate BOX id for two distinct PINIOs

PINIO1_BOX and PINIO2_BOX are both set to 40.
Betaflight uses these IDs as array indices; duplicating them causes the second PINIO to be ignored at runtime.

Consider assigning the next free user-box (41) to PINIO2_BOX.

-#define PINIO2_BOX 40
+#define PINIO2_BOX 41
🤖 Prompt for AI Agents 
In configs/WPLV2/config.h around lines 75 to 82, the BOX ID for PINIO2_BOX is
duplicated as 40, the same as PINIO1_BOX, which causes runtime conflicts. Change
the value of PINIO2_BOX from 40 to 41 to assign a unique BOX ID and avoid the
array index collision.

#define DEFAULT_FEATURES (FEATURE_OSD | FEATURE_LED_STRIP)

#define MSP_DISPLAYPORT_UART SERIAL_PORT_USART2
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
#define MSP_DISPLAYPORT_UART SERIAL_PORT_USART2
#ifdef USE_OSD_HD
#define MSP_DISPLAYPORT_UART SERIAL_PORT_USART2
#endif

#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 100
#define FLASH_SPI_INSTANCE SPI2
#define GYRO_1_SPI_INSTANCE SPI1
#define GYRO_2_SPI_INSTANCE SPI1
#define BARO_I2C_INSTANCE I2CDEV_1

#define TIMER_PIN_MAPPING \
TIMER_PIN_MAP( 0, MOTOR1_PIN, 1, 0 ) /* TIM1 CH1 */ \
TIMER_PIN_MAP( 1, MOTOR2_PIN, 1, 1 ) /* TIM1 CH2 */ \
TIMER_PIN_MAP( 2, MOTOR3_PIN, 1, 2 ) /* TIM1 CH3 */ \
TIMER_PIN_MAP( 3, MOTOR4_PIN, 1, 3 ) /* TIM1 CH4 */ \
TIMER_PIN_MAP( 4, MOTOR5_PIN, 2, 4 ) /* TIM8 CH1 */ \
TIMER_PIN_MAP( 5, MOTOR6_PIN, 2, 5 ) /* TIM8 CH2 */ \
TIMER_PIN_MAP( 6, MOTOR7_PIN, 2, 6 ) /* TIM8 CH3 */ \
TIMER_PIN_MAP( 7, MOTOR8_PIN, 2, 7 ) /* TIM8 CH4 */ \
TIMER_PIN_MAP( 8, LED_STRIP_PIN, 1, 8 ) /* TIM2 CH1 */ \
TIMER_PIN_MAP( 9, BEEPER_PIN, 1, -1 ) /* TIM4 CH1 */ \
TIMER_PIN_MAP( 10, SERVO1_PIN, 1, -1 ) /* TIM15 CH1 */ \
TIMER_PIN_MAP( 11, SERVO2_PIN, 1, -1 ) /* TIM15 CH2 */
TIMER_PIN_MAP( 12, GYRO_1_CLKIN_PIN, 2, -1 ) /* TIM5 CH1 */
Comment on lines +95 to +108
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Missing back-slash breaks the TIMER_PIN_MAPPING macro

Line 107 lacks a trailing \, so the macro terminates before the TIM5 entry.
TIMER_PIN_MAP( 12 … ) (line 108) then appears as free-standing code and will trigger a preprocessing/compilation error.

-    TIMER_PIN_MAP( 11, SERVO2_PIN,    1, -1 ) /* TIM15 CH2 */
-    TIMER_PIN_MAP( 12, GYRO_1_CLKIN_PIN,    2, -1 ) /* TIM5 CH1 */
+    TIMER_PIN_MAP( 11, SERVO2_PIN,    1, -1 ) /* TIM15 CH2 */ \
+    TIMER_PIN_MAP( 12, GYRO_1_CLKIN_PIN,    2, -1 ) /* TIM5 CH1 */
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
#define TIMER_PIN_MAPPING \
TIMER_PIN_MAP( 0, MOTOR1_PIN, 1, 0 ) /* TIM1 CH1 */ \
TIMER_PIN_MAP( 1, MOTOR2_PIN, 1, 1 ) /* TIM1 CH2 */ \
TIMER_PIN_MAP( 2, MOTOR3_PIN, 1, 2 ) /* TIM1 CH3 */ \
TIMER_PIN_MAP( 3, MOTOR4_PIN, 1, 3 ) /* TIM1 CH4 */ \
TIMER_PIN_MAP( 4, MOTOR5_PIN, 2, 4 ) /* TIM8 CH1 */ \
TIMER_PIN_MAP( 5, MOTOR6_PIN, 2, 5 ) /* TIM8 CH2 */ \
TIMER_PIN_MAP( 6, MOTOR7_PIN, 2, 6 ) /* TIM8 CH3 */ \
TIMER_PIN_MAP( 7, MOTOR8_PIN, 2, 7 ) /* TIM8 CH4 */ \
TIMER_PIN_MAP( 8, LED_STRIP_PIN, 1, 8 ) /* TIM2 CH1 */ \
TIMER_PIN_MAP( 9, BEEPER_PIN, 1, -1 ) /* TIM4 CH1 */ \
TIMER_PIN_MAP( 10, SERVO1_PIN, 1, -1 ) /* TIM15 CH1 */ \
TIMER_PIN_MAP( 11, SERVO2_PIN, 1, -1 ) /* TIM15 CH2 */
TIMER_PIN_MAP( 12, GYRO_1_CLKIN_PIN, 2, -1 ) /* TIM5 CH1 */
#define TIMER_PIN_MAPPING \
TIMER_PIN_MAP( 0, MOTOR1_PIN, 1, 0 ) /* TIM1 CH1 */ \
TIMER_PIN_MAP( 1, MOTOR2_PIN, 1, 1 ) /* TIM1 CH2 */ \
TIMER_PIN_MAP( 2, MOTOR3_PIN, 1, 2 ) /* TIM1 CH3 */ \
TIMER_PIN_MAP( 3, MOTOR4_PIN, 1, 3 ) /* TIM1 CH4 */ \
TIMER_PIN_MAP( 4, MOTOR5_PIN, 2, 4 ) /* TIM8 CH1 */ \
TIMER_PIN_MAP( 5, MOTOR6_PIN, 2, 5 ) /* TIM8 CH2 */ \
TIMER_PIN_MAP( 6, MOTOR7_PIN, 2, 6 ) /* TIM8 CH3 */ \
TIMER_PIN_MAP( 7, MOTOR8_PIN, 2, 7 ) /* TIM8 CH4 */ \
TIMER_PIN_MAP( 8, LED_STRIP_PIN, 1, 8 ) /* TIM2 CH1 */ \
TIMER_PIN_MAP( 9, BEEPER_PIN, 1, -1 ) /* TIM4 CH1 */ \
TIMER_PIN_MAP( 10, SERVO1_PIN, 1, -1 ) /* TIM15 CH1 */ \
TIMER_PIN_MAP( 11, SERVO2_PIN, 1, -1 ) /* TIM15 CH2 */ \
TIMER_PIN_MAP( 12, GYRO_1_CLKIN_PIN, 2, -1 ) /* TIM5 CH1 */
🤖 Prompt for AI Agents 
In configs/WPLV2/config.h around lines 95 to 108, the TIMER_PIN_MAPPING macro is
broken because line 107 is missing a trailing backslash. Add a backslash at the
end of line 107 to properly continue the macro definition onto line 108 and
prevent preprocessing or compilation errors.


#define TIMUP1_DMA_OPT 9
#define TIMUP8_DMA_OPT 10

#define ADC1_DMA_OPT 11
#define ADC2_DMA_OPT 12