fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-05-01 13:54:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

removed last useless comments

Browse Source
This commit is contained in:
Phil-Engljaehringer 2025-10-30 16:28:42 +01:00 committed by Alexander Lerach
parent 57afb5817d
commit eebacc4f7b
3 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
platforms/nuttx/src/px4/common/gpio/mcp23017/mcp23017.cpp
View File

@ -133,11 +133,13 @@ static mcp23017_gpio_dev_s _gpio[NUM_GPIOS];
// ----------------------------------------------------------------------------
int mcp23017_register_gpios(uint8_t i2c_bus, uint8_t i2c_addr, int first_minor, uint16_t dir_mask)
{
for(int i=0; i<NUM_GPIOS; i++){
for (int i = 0; i < NUM_GPIOS; i++) {
uint16_t mask = 1u << i;
if(dir_mask & mask){
if (dir_mask & mask) {
_gpio[i] = { {GPIO_INPUT_PIN, {}, &mcp23017_gpio_ops}, mask };
}else{
} else {
_gpio[i] = { {GPIO_OUTPUT_PIN, {}, &mcp23017_gpio_ops}, mask };
}
}

26
src/drivers/gpio/mcp23017/mcp23017.cpp
View File

@ -55,13 +55,13 @@ int MCP23017::init(uint16_t direction, uint16_t state, uint16_t pull_up, uint16_
}
// buffer the new initial states
_iodirA = (uint8_t) (direction & 0x00FF);
_olatA = (uint8_t) (state & 0x00FF);
_gppuA = (uint8_t) (pull_up & 0x00FF);
_iodirA = (uint8_t)(direction & 0x00FF);
_olatA = (uint8_t)(state & 0x00FF);
_gppuA = (uint8_t)(pull_up & 0x00FF);
_iodirB = (uint8_t) (direction >> 8);
_olatB = (uint8_t) (state >> 8);
_gppuB = (uint8_t) (pull_up >> 8);
_iodirB = (uint8_t)(direction >> 8);
_olatB = (uint8_t)(state >> 8);
_gppuB = (uint8_t)(pull_up >> 8);
// Write the initial state to the device
ret = write_reg(Register::OLATA, _olatA);
@ -87,7 +87,7 @@ int MCP23017::init(uint16_t direction, uint16_t state, uint16_t pull_up, uint16_
ret |= write_reg(Register::INTCONA, 0xFF);
ret |= write_reg(Register::INTCONB, 0xFF);
if(!split_int){
if (!split_int) {
ret |= write_reg(Register::IOCONA, 0x40);
}
@ -122,11 +122,11 @@ int MCP23017::read(uint16_t *mask)
int MCP23017::write(uint16_t mask_set, uint16_t mask_clear)
{
// no need to read, we can use the buffered register value
uint8_t mask_setA = (uint8_t) (mask_set & 0x00FF);
uint8_t mask_clearA = (uint8_t) (mask_clear & 0x00FF);
uint8_t mask_setA = (uint8_t)(mask_set & 0x00FF);
uint8_t mask_clearA = (uint8_t)(mask_clear & 0x00FF);
uint8_t mask_setB = (uint8_t) (mask_set >> 8);
uint8_t mask_clearB = (uint8_t) (mask_clear >> 8);
uint8_t mask_setB = (uint8_t)(mask_set >> 8);
uint8_t mask_clearB = (uint8_t)(mask_clear >> 8);
_olatA = (_olatA & ~mask_clearA) | mask_setA;
_olatB = (_olatB & ~mask_clearB) | mask_setB;
@ -139,8 +139,8 @@ int MCP23017::write(uint16_t mask_set, uint16_t mask_clear)
int MCP23017::configure(uint16_t mask, PinType type)
{
uint8_t maskA = (uint8_t) (mask & 0x00FF);
uint8_t maskB = (uint8_t) (mask >> 8);
uint8_t maskA = (uint8_t)(mask & 0x00FF);
uint8_t maskB = (uint8_t)(mask >> 8);
// no need to read, we can use the buffered register values
switch (type) {

1
src/drivers/gpio/mcp23017/mcp23017_main.cpp
View File

@ -193,6 +193,7 @@ extern "C" int mcp23017_main(int argc, char *argv[])
case 'U':
config_data.interval = atoi(cli.optArg());
break;
case 'R':
config_data.int_en = (int)strtol(cli.optArg(), nullptr, 0);
break;