From 39f0ace8ad4ae2e097e0aa6a5908ad4f8fba0d10 Mon Sep 17 00:00:00 2001 From: 3djc Date: Wed, 17 Sep 2025 03:52:51 +0200 Subject: [PATCH] chore(tx15): avoid hardcoding magic numbers (#6586) --- radio/src/boards/rm-h750/bsp_io.cpp | 8 ++++---- radio/src/targets/tx15/bsp_io.h | 8 +++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/radio/src/boards/rm-h750/bsp_io.cpp b/radio/src/boards/rm-h750/bsp_io.cpp index e5e583399..a6b21c5b9 100644 --- a/radio/src/boards/rm-h750/bsp_io.cpp +++ b/radio/src/boards/rm-h750/bsp_io.cpp @@ -144,15 +144,15 @@ int bsp_io_init() _expanders_reset(); // configure expander 1 - _init_io_expander(&_io_fs_switches, EXP_1_MASK); - if (pca95xx_init(&_io_fs_switches.exp, IO_EXPANDER_I2C_BUS, 0x74) < 0) { + _init_io_expander(&_io_fs_switches, IO_EXPANDER1_MASK); + if (pca95xx_init(&_io_fs_switches.exp, IO_EXPANDER_I2C_BUS, IO_EXPANDER1_I2C_ADDR) < 0) { TRACE("EXP1 INIT ERROR"); return -1; } // configure expander 2 - _init_io_expander(&_io_switches, EXP_2_MASK); - if (pca95xx_init(&_io_switches.exp, IO_EXPANDER_I2C_BUS, 0x75) < 0) { + _init_io_expander(&_io_switches, IO_EXPANDER2_MASK); + if (pca95xx_init(&_io_switches.exp, IO_EXPANDER_I2C_BUS, IO_EXPANDER2_I2C_ADDR) < 0) { TRACE("EXP2 INIT ERROR"); return -1; } diff --git a/radio/src/targets/tx15/bsp_io.h b/radio/src/targets/tx15/bsp_io.h index 69a313117..73f191c3e 100644 --- a/radio/src/targets/tx15/bsp_io.h +++ b/radio/src/targets/tx15/bsp_io.h @@ -24,7 +24,9 @@ #include "drivers/pca95xx.h" #include "hal/switch_driver.h" -#define IO_EXPANDER_I2C_BUS I2C_Bus_1 +#define IO_EXPANDER_I2C_BUS I2C_Bus_1 +#define IO_EXPANDER1_I2C_ADDR 0x74 +#define IO_EXPANDER2_I2C_ADDR 0x75 // Port expander 2 (0x75) #define BSP_TR1U PCA95XX_PIN_13 @@ -50,5 +52,5 @@ uint16_t bsp_input_get(); struct stm32_switch_t; //TODO compute from json -constexpr uint32_t EXP_1_MASK = 0xFF3F; -constexpr uint32_t EXP_2_MASK = 0xFFF8; +constexpr uint32_t IO_EXPANDER1_MASK = 0xFF3F; +constexpr uint32_t IO_EXPANDER2_MASK = 0xFFF8;