From c9f90ff906f3eadf0286a1ecf527e47cc4e7f72f Mon Sep 17 00:00:00 2001 From: aixiao Date: Mon, 25 Dec 2023 13:23:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=95=E8=84=9A=E7=9A=84?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E3=80=81=E7=8A=B6=E6=80=81=E3=80=81=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E5=92=8C=E7=89=A9=E7=90=86=E5=BC=95=E8=84=9A=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gpio/OrangePi.c | 52 ++++++++++++++++++++++----------------------- wiringPi/OrangePi.c | 2 +- wiringPi/OrangePi.h | 2 +- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/gpio/OrangePi.c b/gpio/OrangePi.c index f2c3b8d..b14162b 100644 --- a/gpio/OrangePi.c +++ b/gpio/OrangePi.c @@ -821,26 +821,26 @@ int pinToGpioOrangePi [64] = char *physNames[64] = { NULL, - " 3.3V", "5V ", - " PI10", "5V ", - " PI15", "GND ", - " PI12", "PI11 ", - " GND", "PI5 ", - " PI4", "PI6 ", - " PI7", "GND ", - " PI16", "PI14 ", - " 3.3V", "PI0 ", - " PI2", "GND ", - " PH8", "PH1 ", - " PH0", "PH7 ", - " GND", "PH10 ", - " PH5", "PH9 ", - " PI3", "GND ", - " PI9", "PI1 ", - " PI13", "GND ", - " PH4", "PI8 ", - " PH2", "PH6 ", - " GND", "PH3 ", + "3.3V ", "5V ", + "PI10 TWI2-SDA", "5V ", + "PI15 ", "GND ", + "PI12 ", "PI11 ", + "GND ", "PI5 TX2 ", + "PI4 I2S0-DOUT", "PI6 RX2 ", + "PI7 TWI1-SCK ", "GND ", + "PI16 ", "PI14 RX4/PWM4", + "3.3V ", "PI0 I2S0-MCLK", + "PI2 I2S0-LRCK", "GND ", + "PH8 SPI1-MISO", "PH1 RX0 ", + "PH0 TX0 ", "PH7 SPI1-MOSI", + "GND ", "PH10 ", + "PH5 SPI1-CS0 ", "PH9 SPI1-CS1 ", + "PI3 I2S0-DIN ", "GND ", + "PI9 TWI2-SCK ", "PI1 I2S0-BCLK", + "PI13 TX4/PWM3", "GND ", + "PH4 ", "PI8 TWI1-SDA ", + "PH2 TX5 ", "PH6 SPI1-CLK ", + "GND ", "PH3 RX5 ", NULL, NULL, NULL, NULL, NULL, NULL, @@ -1311,7 +1311,7 @@ void OrangePiReadAll(void) #elif CONFIG_ORANGEPI_ZERO2 printf (" +------+-----+----------+------+---+ H616 +---+------+----------+-----+------+\n"); #elif CONFIG_BLUEBERRY - printf (" +------+-----+----------+------+---+ BLUEBERRY +---+------+----------+-----+------+\n"); + printf (" ----------------------------------------- BLUEBERRY ----------------------------------------\n"); #elif CONFIG_ORANGEPI_RK3399 printf (" +------+-----+----------+------+---+OPi RK3399+---+------+----------+-----+------+\n"); #elif CONFIG_ORANGEPI_4 @@ -1324,8 +1324,8 @@ void OrangePiReadAll(void) printf (" +------+-----+----------+------+---+ R1 Plus +---+---+--+----------+-----+------+\n"); #endif - printf (" | GPIO | wPi | Name | Mode | V | Physical | V | Mode | Name | wPi | GPIO |\n"); - printf (" +------+-----+----------+------+---+----++----+---+------+----------+-----+------+\n"); + printf (" | GPIO | wPi | Name | Mode | V | Physical | V | Mode | Name | wPi | GPIO |\n"); + printf (" +------+-----+---------------+------+---+----++----+---+------+---------------+-----+------+\n"); #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) @@ -1343,8 +1343,8 @@ void OrangePiReadAll(void) #endif readallPhys(pin); - printf (" +------+-----+----------+------+---+----++----+---+------+----------+-----+------+\n"); - printf (" | GPIO | wPi | Name | Mode | V | Physical | V | Mode | Name | wPi | GPIO |\n"); + printf (" +------+-----+---------------+------+---+----++----+---+------+---------------+-----+------+\n"); + printf (" | GPIO | wPi | Name | Mode | V | Physical | V | Mode | Name | wPi | GPIO |\n"); #ifdef CONFIG_ORANGEPI_PC2 printf (" +------+-----+----------+------+---+ OPi PC2 +---+------+----------+-----+------+\n"); @@ -1381,7 +1381,7 @@ void OrangePiReadAll(void) #elif CONFIG_ORANGEPI_R1PLUS printf (" +------+-----+----------+------+---+ R1 Plus +---+---+--+----------+-----+------+\n"); #elif CONFIG_BLUEBERRY - printf (" +------+-----+----------+------+---+ BLUEBERRY +---+------+----------+-----+------+\n"); + printf (" ----------------------------------------- BLUEBERRY ----------------------------------------\n"); #endif wiringPiDebug = tmp; diff --git a/wiringPi/OrangePi.c b/wiringPi/OrangePi.c index dcfbef8..59a4f2c 100644 --- a/wiringPi/OrangePi.c +++ b/wiringPi/OrangePi.c @@ -2627,7 +2627,7 @@ int isOrangePi(void) /* Support: OrangePi zero */ char *OrangePi_string = "sun50iw9"; #elif CONFIG_BLUEBERRY - /* Support: OrangePi zero */ + /* Support: Blueberry */ char *OrangePi_string = "sun50iw9"; #elif (defined CONFIG_ORANGEPI_RK3399 || defined CONFIG_ORANGEPI_4 || defined CONFIG_ORANGEPI_4_LTS || defined CONFIG_ORANGEPI_800) /* Support: OrangePi RK3399 */ diff --git a/wiringPi/OrangePi.h b/wiringPi/OrangePi.h index 5ac6ea0..71e05c9 100644 --- a/wiringPi/OrangePi.h +++ b/wiringPi/OrangePi.h @@ -90,7 +90,7 @@ #define GPIO_PWM_OP (0x0300A000) #endif -/*********** OrangePi H616 *************/ +/*********** BLUEBERRY H616 *************/ #if CONFIG_BLUEBERRY #define GPIOA_BASE (0x0300B000) #define GPIO_NUM (0x40)