aixiao/wiringPi_Blueberry
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改引脚的编号、状态、功能和物理引脚号

Browse Source
This commit is contained in:
aixiao 2023-12-25 13:23:24 +08:00
parent 8238f46ccf
commit c9f90ff906
3 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gpio/OrangePi.c
View File

@ -821,26 +821,26 @@ int pinToGpioOrangePi [64] =
char *physNames[64] = char *physNames[64] =
{ {
NULL, NULL,
" 3.3V", "5V ", "3.3V ", "5V ",
" PI10", "5V ", "PI10 TWI2-SDA", "5V ",
" PI15", "GND ", "PI15 ", "GND ",
" PI12", "PI11 ", "PI12 ", "PI11 ",
" GND", "PI5 ", "GND ", "PI5 TX2 ",
" PI4", "PI6 ", "PI4 I2S0-DOUT", "PI6 RX2 ",
" PI7", "GND ", "PI7 TWI1-SCK ", "GND ",
" PI16", "PI14 ", "PI16 ", "PI14 RX4/PWM4",
" 3.3V", "PI0 ", "3.3V ", "PI0 I2S0-MCLK",
" PI2", "GND ", "PI2 I2S0-LRCK", "GND ",
" PH8", "PH1 ", "PH8 SPI1-MISO", "PH1 RX0 ",
" PH0", "PH7 ", "PH0 TX0 ", "PH7 SPI1-MOSI",
" GND", "PH10 ", "GND ", "PH10 ",
" PH5", "PH9 ", "PH5 SPI1-CS0 ", "PH9 SPI1-CS1 ",
" PI3", "GND ", "PI3 I2S0-DIN ", "GND ",
" PI9", "PI1 ", "PI9 TWI2-SCK ", "PI1 I2S0-BCLK",
" PI13", "GND ", "PI13 TX4/PWM3", "GND ",
" PH4", "PI8 ", "PH4 ", "PI8 TWI1-SDA ",
" PH2", "PH6 ", "PH2 TX5 ", "PH6 SPI1-CLK ",
" GND", "PH3 ", "GND ", "PH3 RX5 ",
NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL,
@ -1311,7 +1311,7 @@ void OrangePiReadAll(void)
#elif CONFIG_ORANGEPI_ZERO2 #elif CONFIG_ORANGEPI_ZERO2
printf (" +------+-----+----------+------+---+ H616 +---+------+----------+-----+------+\n"); printf (" +------+-----+----------+------+---+ H616 +---+------+----------+-----+------+\n");
#elif CONFIG_BLUEBERRY #elif CONFIG_BLUEBERRY
printf (" +------+-----+----------+------+---+ BLUEBERRY +---+------+----------+-----+------+\n"); printf (" ----------------------------------------- BLUEBERRY ----------------------------------------\n");
#elif CONFIG_ORANGEPI_RK3399 #elif CONFIG_ORANGEPI_RK3399
printf (" +------+-----+----------+------+---+OPi RK3399+---+------+----------+-----+------+\n"); printf (" +------+-----+----------+------+---+OPi RK3399+---+------+----------+-----+------+\n");
#elif CONFIG_ORANGEPI_4 #elif CONFIG_ORANGEPI_4
@ -1325,7 +1325,7 @@ void OrangePiReadAll(void)
#endif #endif
printf (" | GPIO | wPi | Name | Mode | V | Physical | V | Mode | Name | wPi | GPIO |\n"); printf (" | GPIO | wPi | Name | Mode | V | Physical | V | Mode | Name | wPi | GPIO |\n");
printf (" +------+-----+----------+------+---+----++----+---+------+----------+-----+------+\n"); printf (" +------+-----+---------------+------+---+----++----+---+------+---------------+-----+------+\n");
#if defined CONFIG_ORANGEPI_H3 || defined CONFIG_ORANGEPI_RK3399 || CONFIG_ORANGEPI_4 || CONFIG_ORANGEPI_PC2 || CONFIG_ORANGEPI_PRIME || CONFIG_ORANGEPI_WIN #if defined CONFIG_ORANGEPI_H3 || defined CONFIG_ORANGEPI_RK3399 || CONFIG_ORANGEPI_4 || CONFIG_ORANGEPI_PC2 || CONFIG_ORANGEPI_PRIME || CONFIG_ORANGEPI_WIN
for (pin = 1 ; pin <= 40; pin += 2) for (pin = 1 ; pin <= 40; pin += 2)
@ -1343,7 +1343,7 @@ void OrangePiReadAll(void)
#endif #endif
readallPhys(pin); readallPhys(pin);
printf (" +------+-----+----------+------+---+----++----+---+------+----------+-----+------+\n"); printf (" +------+-----+---------------+------+---+----++----+---+------+---------------+-----+------+\n");
printf (" | GPIO | wPi | Name | Mode | V | Physical | V | Mode | Name | wPi | GPIO |\n"); printf (" | GPIO | wPi | Name | Mode | V | Physical | V | Mode | Name | wPi | GPIO |\n");
#ifdef CONFIG_ORANGEPI_PC2 #ifdef CONFIG_ORANGEPI_PC2
@ -1381,7 +1381,7 @@ void OrangePiReadAll(void)
#elif CONFIG_ORANGEPI_R1PLUS #elif CONFIG_ORANGEPI_R1PLUS
printf (" +------+-----+----------+------+---+ R1 Plus +---+---+--+----------+-----+------+\n"); printf (" +------+-----+----------+------+---+ R1 Plus +---+---+--+----------+-----+------+\n");
#elif CONFIG_BLUEBERRY #elif CONFIG_BLUEBERRY
printf (" +------+-----+----------+------+---+ BLUEBERRY +---+------+----------+-----+------+\n"); printf (" ----------------------------------------- BLUEBERRY ----------------------------------------\n");
#endif #endif
wiringPiDebug = tmp; wiringPiDebug = tmp;

2
wiringPi/OrangePi.c
View File

@ -2627,7 +2627,7 @@ int isOrangePi(void)
/* Support: OrangePi zero */ /* Support: OrangePi zero */
char *OrangePi_string = "sun50iw9"; char *OrangePi_string = "sun50iw9";
#elif CONFIG_BLUEBERRY #elif CONFIG_BLUEBERRY
/* Support: OrangePi zero */ /* Support: Blueberry */
char *OrangePi_string = "sun50iw9"; char *OrangePi_string = "sun50iw9";
#elif (defined CONFIG_ORANGEPI_RK3399 || defined CONFIG_ORANGEPI_4 || defined CONFIG_ORANGEPI_4_LTS || defined CONFIG_ORANGEPI_800) #elif (defined CONFIG_ORANGEPI_RK3399 || defined CONFIG_ORANGEPI_4 || defined CONFIG_ORANGEPI_4_LTS || defined CONFIG_ORANGEPI_800)
/* Support: OrangePi RK3399 */ /* Support: OrangePi RK3399 */

2
wiringPi/OrangePi.h
View File

@ -90,7 +90,7 @@
#define GPIO_PWM_OP (0x0300A000) #define GPIO_PWM_OP (0x0300A000)
#endif #endif
/*********** OrangePi H616 *************/ /*********** BLUEBERRY H616 *************/
#if CONFIG_BLUEBERRY #if CONFIG_BLUEBERRY
#define GPIOA_BASE (0x0300B000) #define GPIOA_BASE (0x0300B000)
#define GPIO_NUM (0x40) #define GPIO_NUM (0x40)