developer
/
xiuos
forked from xuos/xiuos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'set E220-400T22S M0 and M1 pin for xidatong' (#33) from ok1052 into prepare_for_master 

ok
This commit is contained in:
wgzAIIT 2022-04-11 15:39:11 +08:00
parent ea58273811 e78af7f85b
commit 098ace4b9d
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/imxrt_gpio.c
View File

@ -110,10 +110,8 @@ static const struct gpio_operations_s gpout_ops =
static const uint32_t g_gpiooutputs[BOARD_NGPIOOUT] = static const uint32_t g_gpiooutputs[BOARD_NGPIOOUT] =
{ {
GPIO_GOUT1, GPIO_E220_M0,
GPIO_GOUT2, GPIO_E220_M1,
GPIO_GOUT3,
GPIO_GOUT4,
}; };
static struct imxrtgpio_dev_s g_gpout[BOARD_NGPIOOUT]; static struct imxrtgpio_dev_s g_gpout[BOARD_NGPIOOUT];
@ -177,10 +175,11 @@ static int gpout_write(FAR struct gpio_dev_s *dev, bool value)
int imxrt_gpio_initialize(void) int imxrt_gpio_initialize(void)
{ {
int pincount = 0; int pincount;
int i; int i;
#if BOARD_NGPIOIN > 0 #if BOARD_NGPIOIN > 0
pincount = 0;
for (i = 0; i < BOARD_NGPIOIN; i++) for (i = 0; i < BOARD_NGPIOIN; i++)
{ {
/* Setup and register the GPIO pin */ /* Setup and register the GPIO pin */
@ -200,6 +199,7 @@ int imxrt_gpio_initialize(void)
#endif #endif
#if BOARD_NGPIOOUT > 0 #if BOARD_NGPIOOUT > 0
pincount = 0;
for (i = 0; i < BOARD_NGPIOOUT; i++) for (i = 0; i < BOARD_NGPIOOUT; i++)
{ {
/* Setup and register the GPIO pin */ /* Setup and register the GPIO pin */

16
Ubiquitous/Nuttx_Fusion_XiUOS/aiit_board/xidatong/src/xidatong.h
View File

@ -67,21 +67,15 @@
/* Test Pins ****************************************************************/ /* Test Pins ****************************************************************/
#define BOARD_NGPIOIN 0 /* Amount of GPIO Input pins */ #define BOARD_NGPIOIN 0 /* Amount of GPIO Input pins */
#define BOARD_NGPIOOUT 4 /* Amount of GPIO Output pins */ #define BOARD_NGPIOOUT 2 /* Amount of GPIO Output pins */
#define BOARD_NGPIOINT 0 /* Amount of GPIO Input w/ Interruption pins */ #define BOARD_NGPIOINT 0 /* Amount of GPIO Input w/ Interruption pins */
#define GPIO_GOUT1 (GPIO_OUTPUT | GPIO_OUTPUT_ZERO | IOMUX_GOUT_DEFAULT | \ #define GPIO_E220_M0 (GPIO_OUTPUT | GPIO_OUTPUT_ZERO | IOMUX_GOUT_DEFAULT | \
GPIO_PORT1 | GPIO_PIN19)
#define GPIO_GOUT2 (GPIO_OUTPUT | GPIO_OUTPUT_ZERO | IOMUX_GOUT_DEFAULT | \
GPIO_PIN18 | GPIO_PORT1)
#define GPIO_GOUT3 (GPIO_OUTPUT | GPIO_OUTPUT_ZERO | IOMUX_GOUT_DEFAULT | \
GPIO_PIN10 | GPIO_PORT1)
#define GPIO_GOUT4 (GPIO_OUTPUT | GPIO_OUTPUT_ZERO | IOMUX_GOUT_DEFAULT | \
GPIO_PIN9 | GPIO_PORT1) GPIO_PIN9 | GPIO_PORT1)
#define GPIO_E220_M1 (GPIO_OUTPUT | GPIO_OUTPUT_ZERO | IOMUX_GOUT_DEFAULT | \
GPIO_PIN11 | GPIO_PORT1)
/* Backlight */ /* Backlight */
#define GPIO_LCD_BL (GPIO_OUTPUT | GPIO_OUTPUT_ZERO | GPIO_PORT2 | \ #define GPIO_LCD_BL (GPIO_OUTPUT | GPIO_OUTPUT_ZERO | GPIO_PORT2 | \

2
Ubiquitous/Nuttx_Fusion_XiUOS/app_match_nuttx/apps/nshlib/Kconfig
View File

@ -652,7 +652,7 @@ config NSH_DISABLE_RECVZIGBEE
default n default n
config NSH_DISABLE_ADAPTER_LORATEST config NSH_DISABLE_ADAPTER_LORATEST
bool "Disable sx128 AdapterLoraTest." bool "Disable sx1278 AdapterLoraTest."
default n default n
config NSH_DISABLE_K210_FFT config NSH_DISABLE_K210_FFT