Skip to content

chore(fw): move more settings to JSON hw_defs files #7866

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

Merged
pfeerick merged 10 commits into from
Oct 6, 2026
+2,349 −746
Merged

chore(fw): move more settings to JSON hw_defs files #7866

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
263e258
Move ROTARY_ENCODER_GRANULARITY to JSON.
Aug 6, 2026
c45e56e
Fix xlite
philmoz Oct 5, 2026
7d54bd2
fix(t18): remove duplicate trainer section from hw_defs JSON
pfeerick Oct 6, 2026
792f95c
fix(st16): restore touch interrupt priority to 5
pfeerick Oct 6, 2026
cf0ee11
fix(tools): trainer_detect_inverted is a boolean in hwdef schema
pfeerick Oct 6, 2026
f106068
fix(fw): guard EXTI IRQ definitions in generated hal_settings.h
pfeerick Oct 6, 2026
4d611cb
chore(fw): only emit SPORT_MAX_BAUDRATE from hardware section
pfeerick Oct 6, 2026
7f4d4ab
fix: correct V12, NB4P and V16 hw_defs data
pfeerick Oct 6, 2026
072de91
chore(fw): define SURFACE_RADIO from hw_defs JSON
pfeerick Oct 6, 2026
99164f3
chore(t15h7): move USB, trainer and touch settings to hw_defs JSON
pfeerick Oct 6, 2026
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
44 changes: 44 additions & 0 deletions radio/src/boards/hw_defs/boxer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,31 @@
"mixer_scheduler_timer_irqn": "TIM8_BRK_TIM12_IRQn",
"mixer_scheduler_timer_irqhandler": "TIM8_BRK_TIM12_IRQHandler"
},
"rotenc": {
"rotary_encoder_inverted": true,
"rotary_encoder_gpio": "GPIOE",
"rotary_encoder_gpio_pin_a": "LL_GPIO_PIN_9",
"rotary_encoder_gpio_pin_b": "LL_GPIO_PIN_10",
"rotary_encoder_position": "((ROTARY_ENCODER_GPIO->IDR >> 9) & 0x03)",
"rotary_encoder_exti_line1": "LL_EXTI_LINE_9",
"rotary_encoder_exti_line2": "LL_EXTI_LINE_10",
"exti": [
{
"irq": "EXTI9_5_IRQ",
"priority": 5
},
{
"irq": "EXTI15_10_IRQ",
"priority": 5
}
],
"rotary_encoder_exti_port": "LL_SYSCFG_EXTI_PORTE",
"rotary_encoder_exti_sys_line1": "LL_SYSCFG_EXTI_LINE9",
"rotary_encoder_exti_sys_line2": "LL_SYSCFG_EXTI_LINE10",
"rotary_encoder_timer": "TIM5",
"rotary_encoder_timer_irqn": "TIM5_IRQn",
"rotary_encoder_timer_irqhandler": "TIM5_IRQHandler"
},
"haptic": {
"haptic_pwm": true,
"haptic_gpio": "GPIO_PIN(GPIOB, 3)",
Expand All @@ -361,6 +386,25 @@
"haptic_ccmr1": "TIM_CCMR1_OC2M_1 | TIM_CCMR1_OC2M_2",
"haptic_ccer": "TIM_CCER_CC2E"
},
"usb": {
"usb_gpio_vbus": "GPIO_PIN(GPIOA, 9)",
"usb_gpio_dm": "GPIO_PIN(GPIOA, 11)",
"usb_gpio_dp": "GPIO_PIN(GPIOA, 12)",
"usb_gpio_af": "GPIO_AF10"
},
"trainer": {
"trainer_in_gpio": "GPIO_PIN(GPIOC, 8)",
"trainer_in_timer_channel": "LL_TIM_CHANNEL_CH3",
"trainer_out_gpio": "GPIO_PIN(GPIOC, 9)",
"trainer_out_timer_channel": "LL_TIM_CHANNEL_CH4",
"trainer_timer": "TIM3",
"trainer_timer_irqn": "TIM3_IRQn",
"trainer_timer_irqhandler": "TIM3_IRQHandler",
"trainer_gpio_af": "LL_GPIO_AF_2",
"trainer_timer_freq": "(PERI1_FREQUENCY * TIMER_MULT_APB1)",
"trainer_detect_gpio": "GPIO_PIN(GPIOA, 8)",
"trainer_detect_inverted": true
},
"key_lock_combo": [
"KEY_SYS",
"KEY_MODEL"
Expand Down
44 changes: 44 additions & 0 deletions radio/src/boards/hw_defs/bumblebee.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,6 +422,31 @@
"mixer_scheduler_timer_irqn": "TIM8_BRK_TIM12_IRQn",
"mixer_scheduler_timer_irqhandler": "TIM8_BRK_TIM12_IRQHandler"
},
"rotenc": {
"rotary_encoder_gpio": "GPIOE",
"rotary_encoder_gpio_pin_a": "LL_GPIO_PIN_9",
"rotary_encoder_gpio_pin_b": "LL_GPIO_PIN_11",
"rotary_encoder_position": "(((ROTARY_ENCODER_GPIO->IDR >> 10) & 0x02) + ((ROTARY_ENCODER_GPIO->IDR >> 9) & 0x01))",
"rotary_encoder_exti_line1": "LL_EXTI_LINE_9",
"rotary_encoder_exti_line2": "LL_EXTI_LINE_11",
"exti": [
{
"irq": "EXTI9_5_IRQ",
"priority": 5
},
{
"irq": "EXTI15_10_IRQ",
"priority": 5
}
],
"rotary_encoder_exti_port": "LL_SYSCFG_EXTI_PORTE",
"rotary_encoder_exti_sys_line1": "LL_SYSCFG_EXTI_LINE9",
"rotary_encoder_exti_sys_line2": "LL_SYSCFG_EXTI_LINE11",
"rotary_encoder_timer": "TIM5",
"rotary_encoder_timer_irqn": "TIM5_IRQn",
"rotary_encoder_timer_irqhandler": "TIM5_IRQHandler",
"rotary_encoder_granularity": 4
},
"haptic": {
"haptic_pwm": true,
"haptic_gpio": "GPIO_PIN(GPIOB, 3)",
Expand All @@ -432,6 +457,25 @@
"haptic_ccmr1": "TIM_CCMR1_OC2M_1 | TIM_CCMR1_OC2M_2",
"haptic_ccer": "TIM_CCER_CC2E"
},
"usb": {
"usb_gpio_vbus": "GPIO_PIN(GPIOA, 9)",
"usb_gpio_dm": "GPIO_PIN(GPIOA, 11)",
"usb_gpio_dp": "GPIO_PIN(GPIOA, 12)",
"usb_gpio_af": "GPIO_AF10"
},
"trainer": {
"trainer_in_gpio": "GPIO_PIN(GPIOC, 8)",
"trainer_in_timer_channel": "LL_TIM_CHANNEL_CH3",
"trainer_out_gpio": "GPIO_PIN(GPIOC, 9)",
"trainer_out_timer_channel": "LL_TIM_CHANNEL_CH4",
"trainer_timer": "TIM3",
"trainer_timer_irqn": "TIM3_IRQn",
"trainer_timer_irqhandler": "TIM3_IRQHandler",
"trainer_gpio_af": "LL_GPIO_AF_2",
"trainer_timer_freq": "(PERI1_FREQUENCY * TIMER_MULT_APB1)",
"trainer_detect_gpio": "GPIO_PIN(GPIOE, 3)",
"trainer_detect_inverted": true
},
"key_lock_combo": [
"KEY_MENU",
"KEY_ENTER"
Expand Down
40 changes: 40 additions & 0 deletions radio/src/boards/hw_defs/c14.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,21 @@
"ltdc_irq_prio": 4,
"dma_screen_irq_prio": 6
},
"touch": {
"touch_i2c_bus": "I2C_Bus_1",
"touch_int_gpio": "GPIO_PIN(GPIOI, 3)",
"touch_rst_gpio": "GPIO_PIN(GPIOI, 11)",
"touch_int_exti_line": "LL_EXTI_LINE_3",
"touch_int_exti_port": "LL_SYSCFG_EXTI_PORTI",
"touch_int_exti_syscfgline": "LL_SYSCFG_EXTI_LINE3",
"gt911_rotation_mode": 180,
"exti": [
{
"irq": "EXTI3_IRQ",
"priority": 9
}
]
},
"leds": {
"status_leds": true,
"led_red_gpio": "GPIO_PIN(GPIOG, 10)",
Expand Down Expand Up @@ -351,6 +366,14 @@
{ "irq": "EXTI4_IRQ", "priority": 6 }
]
},
"rotenc": {
"rotary_encoder_gpio": "GPIOG",
"rotary_encoder_gpio_pin_a": "LL_GPIO_PIN_2",
"rotary_encoder_gpio_pin_b": "LL_GPIO_PIN_3",
"rotary_encoder_timer": "TIM17",
"rotary_encoder_timer_irqn": "TIM17_IRQn",
"rotary_encoder_timer_irqhandler": "TIM17_IRQHandler"
},
"haptic": {
"haptic_pwm": true,
"haptic_gpio": "GPIO_PIN(GPIOB, 5)",
Expand Down Expand Up @@ -381,6 +404,23 @@
"mixer_scheduler_timer_irqn": "TIM8_BRK_TIM12_IRQn",
"mixer_scheduler_timer_irqhandler": "TIM8_BRK_TIM12_IRQHandler"
},
"usb": {
"usb_gpio_vbus": "GPIO_PIN(GPIOC, 0)",
"usb_gpio_dm": "GPIO_PIN(GPIOA, 11)",
"usb_gpio_dp": "GPIO_PIN(GPIOA, 12)",
"usb_gpio_af": "GPIO_AF10"
},
"trainer": {
"trainer_in_gpio": "GPIO_PIN(GPIOE, 5)",
"trainer_in_timer_channel": "LL_TIM_CHANNEL_CH1",
"trainer_out_gpio": "GPIO_PIN(GPIOE, 6)",
"trainer_out_timer_channel": "LL_TIM_CHANNEL_CH2",
"trainer_timer": "TIM15",
"trainer_timer_irqn": "TIM15_IRQn",
"trainer_timer_irqhandler": "TIM15_IRQHandler",
"trainer_gpio_af": "LL_GPIO_AF_4",
"trainer_timer_freq": "(PERI1_FREQUENCY * TIMER_MULT_APB1)"
},
"key_lock_combo": [
"KEY_SYS",
"KEY_MODEL"
Expand Down
19 changes: 19 additions & 0 deletions radio/src/boards/hw_defs/commando8.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,25 @@
"haptic_ccmr1": "TIM_CCMR1_OC1M_1 | TIM_CCMR1_OC1M_2",
"haptic_ccer": "TIM_CCER_CC1E"
},
"usb": {
"usb_gpio_vbus": "GPIO_PIN(GPIOA, 9)",
"usb_gpio_dm": "GPIO_PIN(GPIOA, 11)",
"usb_gpio_dp": "GPIO_PIN(GPIOA, 12)",
"usb_gpio_af": "GPIO_AF10"
},
"trainer": {
"trainer_in_gpio": "GPIO_PIN(GPIOC, 8)",
"trainer_in_timer_channel": "LL_TIM_CHANNEL_CH3",
"trainer_out_gpio": "GPIO_PIN(GPIOC, 9)",
"trainer_out_timer_channel": "LL_TIM_CHANNEL_CH4",
"trainer_timer": "TIM3",
"trainer_timer_irqn": "TIM3_IRQn",
"trainer_timer_irqhandler": "TIM3_IRQHandler",
"trainer_gpio_af": "LL_GPIO_AF_2",
"trainer_timer_freq": "(PERI1_FREQUENCY * TIMER_MULT_APB1)",
"trainer_detect_gpio": "GPIO_PIN(GPIOA, 8)",
"trainer_detect_inverted": true
},
"key_lock_combo": [
"KEY_SYS",
"KEY_MODEL"
Expand Down
32 changes: 32 additions & 0 deletions radio/src/boards/hw_defs/el18.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,20 @@
"ltdc_irq_prio": 4,
"dma_screen_irq_prio": 6
},
"touch": {
"touch_i2c_bus": "I2C_Bus_1",
"touch_int_gpio": "GPIO_PIN(GPIOB, 9)",
"touch_rst_gpio": "GPIO_PIN(GPIOB, 12)",
"touch_int_exti_line": "LL_EXTI_LINE_9",
"touch_int_exti_port": "LL_SYSCFG_EXTI_PORTB",
"touch_int_exti_syscfgline": "LL_SYSCFG_EXTI_LINE9",
"exti": [
{
"irq": "EXTI9_5_IRQ",
"priority": 9
}
]
},
"backlight": {
"backlight_gpio": "GPIO_PIN(GPIOA, 15)",
"backlight_timer": "TIM2",
Expand Down Expand Up @@ -371,5 +385,23 @@
"haptic_timer_output_enable": "TIM_CCER_CC1E | TIM_CCER_CC1NE",
"haptic_timer_mode": "TIM_CCMR1_OC1M_1 | TIM_CCMR1_OC1M_2 | TIM_CCMR1_OC1PE",
"haptic_timer_compare_value": "HAPTIC_GPIO_TIMER->CCR1"
},
"usb": {
"usb_gpio_vbus": "GPIO_PIN(GPIOA, 9)",
"usb_gpio_dm": "GPIO_PIN(GPIOA, 11)",
"usb_gpio_dp": "GPIO_PIN(GPIOA, 12)",
"usb_gpio_af": "GPIO_AF10",
"usb_sw_gpio": "GPIO_PIN(GPIOI, 10)"
},
"trainer": {
"trainer_in_gpio": "GPIO_PIN(GPIOD, 12)",
"trainer_in_timer_channel": "LL_TIM_CHANNEL_CH1",
"trainer_out_gpio": "GPIO_PIN(GPIOD, 13)",
"trainer_out_timer_channel": "LL_TIM_CHANNEL_CH2",
"trainer_timer": "TIM4",
"trainer_timer_irqn": "TIM4_IRQn",
"trainer_timer_irqhandler": "TIM4_IRQHandler",
"trainer_gpio_af": "LL_GPIO_AF_2",
"trainer_timer_freq": "(PERI1_FREQUENCY * TIMER_MULT_APB1)"
}
}
53 changes: 53 additions & 0 deletions radio/src/boards/hw_defs/f16.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,20 @@
"ltdc_irq_prio": 4,
"dma_screen_irq_prio": 6
},
"touch": {
"touch_i2c_bus": "I2C_Bus_1",
"touch_int_gpio": "GPIO_PIN(GPIOH, 2)",
"touch_rst_gpio": "GPIO_PIN(GPIOF, 10)",
"touch_int_exti_line": "LL_EXTI_LINE_2",
"touch_int_exti_port": "LL_SYSCFG_EXTI_PORTH",
"touch_int_exti_syscfgline": "LL_SYSCFG_EXTI_LINE2",
"exti": [
{
"irq": "EXTI2_IRQ",
"priority": 9
}
]
},
"leds": {
"status_leds": true,
"led_red_gpio": "GPIO_PIN(GPIOE, 2)",
Expand Down Expand Up @@ -458,6 +472,26 @@
"mixer_scheduler_timer_irqn": "TIM8_UP_TIM13_IRQn",
"mixer_scheduler_timer_irqhandler": "TIM8_UP_TIM13_IRQHandler"
},
"rotenc": {
"rotary_encoder_gpio": "GPIOH",
"rotary_encoder_gpio_pin_a": "LL_GPIO_PIN_11",
"rotary_encoder_gpio_pin_b": "LL_GPIO_PIN_10",
"rotary_encoder_position": "((ROTARY_ENCODER_GPIO->IDR >> 10) & 0x03)",
"rotary_encoder_exti_line1": "LL_EXTI_LINE_11",
"rotary_encoder_exti_line2": "LL_EXTI_LINE_10",
"exti": [
{
"irq": "EXTI15_10_IRQ",
"priority": 5
}
],
"rotary_encoder_exti_port": "LL_SYSCFG_EXTI_PORTH",
"rotary_encoder_exti_sys_line1": "LL_SYSCFG_EXTI_LINE11",
"rotary_encoder_exti_sys_line2": "LL_SYSCFG_EXTI_LINE10",
"rotary_encoder_timer": "TIM12",
"rotary_encoder_timer_irqn": "TIM8_BRK_TIM12_IRQn",
"rotary_encoder_timer_irqhandler": "TIM8_BRK_TIM12_IRQHandler"
},
"haptic": {
"haptic_pwm": true,
"haptic_gpio": "GPIO_PIN(GPIOE, 6)",
Expand All @@ -467,6 +501,25 @@
"haptic_timer_mode": "TIM_CCMR1_OC2M_1 | TIM_CCMR1_OC2M_2",
"haptic_timer_compare_value": "HAPTIC_GPIO_TIMER->CCR2"
},
"usb": {
"usb_gpio_vbus": "GPIO_PIN(GPIOA, 9)",
"usb_gpio_dm": "GPIO_PIN(GPIOA, 11)",
"usb_gpio_dp": "GPIO_PIN(GPIOA, 12)",
"usb_gpio_af": "GPIO_AF10"
},
"trainer": {
"trainer_in_gpio": "GPIO_PIN(GPIOC, 6)",
"trainer_in_timer_channel": "LL_TIM_CHANNEL_CH1",
"trainer_out_gpio": "GPIO_PIN(GPIOC, 7)",
"trainer_out_timer_channel": "LL_TIM_CHANNEL_CH2",
"trainer_timer": "TIM3",
"trainer_timer_irqn": "TIM3_IRQn",
"trainer_timer_irqhandler": "TIM3_IRQHandler",
"trainer_gpio_af": "GPIO_AF2",
"trainer_timer_freq": "(PERI1_FREQUENCY * TIMER_MULT_APB1)",
"trainer_detect_gpio": "GPIO_PIN(GPIOB, 4)",
"trainer_detect_inverted": true
},
"key_lock_combo": [
"KEY_SYS",
"KEY_MODEL"
Expand Down
43 changes: 43 additions & 0 deletions radio/src/boards/hw_defs/gx12.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,30 @@
"mixer_scheduler_timer_irqn": "TIM8_BRK_TIM12_IRQn",
"mixer_scheduler_timer_irqhandler": "TIM8_BRK_TIM12_IRQHandler"
},
"rotenc": {
"rotary_encoder_gpio": "GPIOE",
"rotary_encoder_gpio_pin_a": "LL_GPIO_PIN_9",
"rotary_encoder_gpio_pin_b": "LL_GPIO_PIN_10",
"rotary_encoder_position": "((ROTARY_ENCODER_GPIO->IDR >> 9) & 0x03)",
"rotary_encoder_exti_line1": "LL_EXTI_LINE_9",
"rotary_encoder_exti_line2": "LL_EXTI_LINE_10",
"exti": [
{
"irq": "EXTI9_5_IRQ",
"priority": 5
},
{
"irq": "EXTI15_10_IRQ",
"priority": 5
}
],
"rotary_encoder_exti_port": "LL_SYSCFG_EXTI_PORTE",
"rotary_encoder_exti_sys_line1": "LL_SYSCFG_EXTI_LINE9",
"rotary_encoder_exti_sys_line2": "LL_SYSCFG_EXTI_LINE10",
"rotary_encoder_timer": "TIM5",
"rotary_encoder_timer_irqn": "TIM5_IRQn",
"rotary_encoder_timer_irqhandler": "TIM5_IRQHandler"
},
"haptic": {
"haptic_pwm": true,
"haptic_gpio": "GPIO_PIN(GPIOB, 3)",
Expand All @@ -489,6 +513,25 @@
"haptic_ccmr1": "TIM_CCMR1_OC2M_1 | TIM_CCMR1_OC2M_2",
"haptic_ccer": "TIM_CCER_CC2E"
},
"usb": {
"usb_gpio_vbus": "GPIO_PIN(GPIOA, 9)",
"usb_gpio_dm": "GPIO_PIN(GPIOA, 11)",
"usb_gpio_dp": "GPIO_PIN(GPIOA, 12)",
"usb_gpio_af": "GPIO_AF10"
},
"trainer": {
"trainer_in_gpio": "GPIO_PIN(GPIOC, 8)",
"trainer_in_timer_channel": "LL_TIM_CHANNEL_CH3",
"trainer_out_gpio": "GPIO_PIN(GPIOC, 9)",
"trainer_out_timer_channel": "LL_TIM_CHANNEL_CH4",
"trainer_timer": "TIM3",
"trainer_timer_irqn": "TIM3_IRQn",
"trainer_timer_irqhandler": "TIM3_IRQHandler",
"trainer_gpio_af": "LL_GPIO_AF_2",
"trainer_timer_freq": "(PERI1_FREQUENCY * TIMER_MULT_APB1)",
"trainer_detect_gpio": "GPIO_PIN(GPIOA, 8)",
"trainer_detect_inverted": true
},
"key_lock_combo": [
"KEY_SYS",
"KEY_MODEL"
Expand Down
Loading
Loading