Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 15:58:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

board: LCD: fix wrong number of parameters to lcderr() macro

Browse Source 
Signed-off-by: Juha Niskanen <juha.niskanen@haltian.com>
This commit is contained in:
Juha Niskanen
2020-10-23 13:32:18 +03:00
committed by Alan Carvalho de Assis
parent 59faf8d8f4
commit 0cea0f5cd4
18 changed files with 33 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
boards/arm/lc823450/lc823450-xgevk/src/lc823450_st7565.c
+1 -1
View File
@@ -179,7 +179,7 @@ FAR struct lcd_dev_s *board_lcd_getdev(int lcddev)
g_lcddev = st7565_initialize(&g_st7565_dev, lcddev); g_lcddev = st7565_initialize(&g_st7565_dev, lcddev);
if (!g_lcddev) if (!g_lcddev)
{ {
lcderr("ERROR: Failed to bind SPI port 1 to LCD %d: %d\n", lcddev); lcderr("ERROR: Failed to bind SPI port 1 to LCD %d\n", lcddev);
} }
else else
{ {
boards/arm/lpc214x/zp214xpa/src/lpc2148_ug2864ambag01.c
+1 -1
View File
@@ -162,7 +162,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
dev = ug2864ambag01_initialize(spi, devno); dev = ug2864ambag01_initialize(spi, devno);
if (!dev) if (!dev)
{ {
lcderr("ERROR: Failed to bind SPI port 1 to OLED %d: %d\n", devno); lcderr("ERROR: Failed to bind SPI port 1 to OLED %d\n", devno);
} }
else else
{ {
boards/arm/sam34/flipnclick-sam3x/src/sam_ssd1306.c
+1 -1
View File
@@ -129,7 +129,7 @@ FAR struct lcd_dev_s *sam_graphics_setup(unsigned int devno)
dev = ssd1306_initialize(spi, NULL, devno); dev = ssd1306_initialize(spi, NULL, devno);
if (!dev) if (!dev)
{ {
lcderr("ERROR: Failed to bind SPI port 1 to OLED %d: %d\n", devno); lcderr("ERROR: Failed to bind SPI port 1 to OLED %d\n", devno);
} }
else else
{ {
boards/arm/sam34/sam4l-xplained/src/sam_ug2832hsweg04.c
+4 -23
View File
@@ -35,28 +35,7 @@
/* OLED1 Connector: /* OLED1 Connector:
* *
* OLED1 EXT1 EXT2 Other use of either pin * See the board README file for connector pin-out.
* ----------------- -------------------- -------------------- ------------------------------------
* 1 ID 1 1
* 2 GND 2 GND 2
* 3 BUTTON2 3 PA04 ADCIFE/AD0 3 PA07 ADCIFE/AD2
* 4 BUTTON3 4 PA05 ADCIFE/AD1 4 PB02 ADCIFE/AD3
* 5 DATA_CMD_SEL 5 PB12 GPIO 5 PC08 GPIO PB12 and PC8 on EXT5
* 6 LED3 6 PC02 GPIO 6 PB10 GPIO PB10 on EXT5
* 7 LED1 7 PC00 TC/1/A0 7 PC04 TC/1/A2
* 8 LED2 8 PC01 TC/1/B0 8 PC05 TC/1/B2 PC05 on EXT5
* 9 BUTTON1 9 PC25 EIC/EXTINT2 9 PC06 EIC/EXTINT8 PC25 on EXT5
* 10 DISPLAY_RESET 10 PB13 SPI/NPCS1 10 PC09 GPIO PB13 on EXT5
* 11 N/C 11 PA23 TWIMS/0/TWD 11 PB14 TWIMS/3/TWD PB14 on EXT3&4, PA23 and PB14 on EXT5
* 12 N/C 12 PA24 TWIMS/0/TWCK 12 PB15 TWIMS/3/TWCK PB15 on EXT3&4, PA24 and PB15 on EXT5
* 13 N/C 13 PB00 USART/0/RXD 13 PC26 USART/1/RXD PB00 on EXT4, PC26 on EXT3&5
* 14 N/C 14 PB01 USART/0/TXD 14 PC27 USART/1/TXD PB01 on EXT4, PC27 on EXT3&5
* 15 DISPLAY_SS 15 PC03 SPI/NPCS0 15 PB11 SPI/NPCS2 PB11 on EXT5
* 16 SPI_MOSI 16 PA22 SPI/MOSI 16 PA22 SPI/MOSI PA22 on EXT5
* 17 N/C 17 PA21 SPI/MISO 17 PA21 SPI/MISO PA21 on EXT5
* 18 SPI_SCK 18 PC30 SPI/SCK 18 PC30 SPI/SCK PC30 on EXT5
* 19 GND 19 GND GND
* 20 VCC 20 VCC VCC
* *
* OLED1 signals * OLED1 signals
* *
@@ -95,7 +74,9 @@
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* Configuration ************************************************************/ /* Configuration ************************************************************/
/* The pin configurations here require that SPI1 is selected */ /* The pin configurations here require that SPI1 is selected */
#ifndef CONFIG_LCD_SSD1306 #ifndef CONFIG_LCD_SSD1306
@@ -156,7 +137,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
dev = ssd1306_initialize(spi, NULL, devno); dev = ssd1306_initialize(spi, NULL, devno);
if (!dev) if (!dev)
{ {
lcderr("ERROR: Failed to bind SPI port 1 to OLED %d: %d\n", devno); lcderr("ERROR: Failed to bind SPI port 1 to OLED %d\n", devno);
} }
else else
{ {
boards/arm/samd2l2/samd20-xplained/src/sam_ug2832hsweg04.c
+1 -1
View File
@@ -188,7 +188,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
dev = ssd1306_initialize(spi, NULL, devno); dev = ssd1306_initialize(spi, NULL, devno);
if (!dev) if (!dev)
{ {
lcderr("ERROR: Failed to bind SPI port 1 to OLED %d: %d\n", devno); lcderr("ERROR: Failed to bind SPI port 1 to OLED %d\n", devno);
} }
else else
{ {
boards/arm/samd2l2/samd21-xplained/src/sam_ug2832hsweg04.c
+1 -1
View File
@@ -188,7 +188,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
dev = ssd1306_initialize(spi, NULL, devno); dev = ssd1306_initialize(spi, NULL, devno);
if (!dev) if (!dev)
{ {
lcderr("ERROR: Failed to bind SPI port 1 to OLED %d: %d\n", devno); lcderr("ERROR: Failed to bind SPI port 1 to OLED %d\n", devno);
} }
else else
{ {
boards/arm/samd2l2/saml21-xplained/src/sam_ug2832hsweg04.c
+1 -1
View File
@@ -188,7 +188,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
dev = ssd1306_initialize(spi, NULL, devno); dev = ssd1306_initialize(spi, NULL, devno);
if (!dev) if (!dev)
{ {
lcderr("ERROR: Failed to bind SPI port 1 to OLED %d: %d\n", devno); lcderr("ERROR: Failed to bind SPI port 1 to OLED %d\n", devno);
} }
else else
{ {
boards/arm/stm32/nucleo-f303re/src/stm32_ssd1351.c
+2 -1
View File
@@ -61,6 +61,7 @@
****************************************************************************/ ****************************************************************************/
/* Configuration ************************************************************/ /* Configuration ************************************************************/
/* The pin configurations here require that SPI1 is selected */ /* The pin configurations here require that SPI1 is selected */
#ifndef CONFIG_STM32_SPI1 #ifndef CONFIG_STM32_SPI1
@@ -113,7 +114,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
dev = ssd1351_initialize(spi, devno); dev = ssd1351_initialize(spi, devno);
if (dev == NULL) if (dev == NULL)
{ {
lcderr("ERROR: Failed to bind SPI port 1 to OLED %d: %d\n", devno); lcderr("ERROR: Failed to bind SPI port 1 to OLED %d\n", devno);
} }
else else
{ {
boards/arm/stm32/stm32f103-minimum/src/stm32_lcd_st7567.c
+1 -1
View File
@@ -121,7 +121,7 @@ FAR struct lcd_dev_s *board_lcd_getdev(int lcddev)
g_lcddev = st7567_initialize(g_spidev, lcddev); g_lcddev = st7567_initialize(g_spidev, lcddev);
if (!g_lcddev) if (!g_lcddev)
{ {
lcderr("ERROR: Failed to bind SPI port 1 to LCD %d: %d\n", lcddev); lcderr("ERROR: Failed to bind SPI port 1 to LCD %d\n", lcddev);
} }
else else
{ {
boards/arm/stm32/stm32f103-minimum/src/stm32_max7219.c
+1 -1
View File
@@ -103,7 +103,7 @@ FAR struct lcd_dev_s *board_lcd_getdev(int lcddev)
g_lcddev = max7219_initialize(g_spidev, lcddev); g_lcddev = max7219_initialize(g_spidev, lcddev);
if (!g_lcddev) if (!g_lcddev)
{ {
lcderr("ERROR: Failed to bind SPI port 1 to LCD %d: %d\n", lcddev); lcderr("ERROR: Failed to bind SPI port 1 to LCD %d\n", lcddev);
} }
else else
{ {
boards/arm/stm32/stm32f103-minimum/src/stm32_pcd8544.c
+1 -1
View File
@@ -113,7 +113,7 @@ FAR struct lcd_dev_s *board_lcd_getdev(int lcddev)
g_lcddev = pcd8544_initialize(g_spidev, lcddev); g_lcddev = pcd8544_initialize(g_spidev, lcddev);
if (!g_lcddev) if (!g_lcddev)
{ {
lcderr("ERROR: Failed to bind SPI port 1 to LCD %d: %d\n", lcddev); lcderr("ERROR: Failed to bind SPI port 1 to LCD %d\n", lcddev);
} }
else else
{ {
boards/arm/stm32/stm32f4discovery/src/stm32_max7219.c
+1 -1
View File
@@ -103,7 +103,7 @@ FAR struct lcd_dev_s *board_lcd_getdev(int lcddev)
g_lcddev = max7219_initialize(g_spidev, lcddev); g_lcddev = max7219_initialize(g_spidev, lcddev);
if (!g_lcddev) if (!g_lcddev)
{ {
lcderr("ERROR: Failed to bind SPI port 1 to LCD %d: %d\n", lcddev); lcderr("ERROR: Failed to bind SPI port 1 to LCD %d\n", lcddev);
} }
else else
{ {
boards/arm/stm32/stm32f4discovery/src/stm32_ssd1351.c
+2 -1
View File
@@ -61,6 +61,7 @@
****************************************************************************/ ****************************************************************************/
/* Configuration ************************************************************/ /* Configuration ************************************************************/
/* The pin configurations here require that SPI1 is selected */ /* The pin configurations here require that SPI1 is selected */
#ifndef CONFIG_STM32_SPI1 #ifndef CONFIG_STM32_SPI1
@@ -113,7 +114,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
dev = ssd1351_initialize(spi, devno); dev = ssd1351_initialize(spi, devno);
if (dev == NULL) if (dev == NULL)
{ {
lcderr("ERROR: Failed to bind SPI port 1 to OLED %d: %d\n", devno); lcderr("ERROR: Failed to bind SPI port 1 to OLED %d\n", devno);
} }
else else
{ {
boards/arm/stm32/stm32f4discovery/src/stm32_st7567.c
+1 -1
View File
@@ -121,7 +121,7 @@ FAR struct lcd_dev_s *board_lcd_getdev(int lcddev)
g_lcddev = st7567_initialize(g_spidev, lcddev); g_lcddev = st7567_initialize(g_spidev, lcddev);
if (!g_lcddev) if (!g_lcddev)
{ {
lcderr("ERROR: Failed to bind SPI port 1 to LCD %d: %d\n", lcddev); lcderr("ERROR: Failed to bind SPI port 1 to LCD %d\n", lcddev);
} }
else else
{ {
boards/arm/stm32/stm32f4discovery/src/stm32_ug2864ambag01.c
+6 -3
View File
@@ -56,7 +56,9 @@
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* Configuration ************************************************************/ /* Configuration ************************************************************/
/* The pin configurations here require that SPI1 is selected */ /* The pin configurations here require that SPI1 is selected */
#ifndef CONFIG_STM32_SPI1 #ifndef CONFIG_STM32_SPI1
@@ -68,6 +70,7 @@
#endif #endif
/* Pin Configuration ********************************************************/ /* Pin Configuration ********************************************************/
/* UG-2864AMBAG01 OLED Display (SPI 4-wire): /* UG-2864AMBAG01 OLED Display (SPI 4-wire):
* *
* --------------------------+---------------------------------------------- * --------------------------+----------------------------------------------
@@ -81,8 +84,8 @@
* 7 A0 | 9 A0 | P2 PB8 (Arbitrary selection)(2) * 7 A0 | 9 A0 | P2 PB8 (Arbitrary selection)(2)
* 9 LED+ (N/C) | ----- | ----- * 9 LED+ (N/C) | ----- | -----
* 2 5V Vcc | 1,2 Vcc | P2 5V * 2 5V Vcc | 1,2 Vcc | P2 5V
* 4 DI | 18 D1/SI | P1 PA7 (GPIO_SPI1_MOSI == GPIO_SPI1_MOSI_1 (1)) * 4 DI | 18 D1/SI | P1 PA7 (GPIO_SPI1_MOSI==GPIO_SPI1_MOSI_1 (1))
* 6 SCLK | 19 D0/SCL | P1 PA5 (GPIO_SPI1_SCK == GPIO_SPI1_SCK_1 (2)) * 6 SCLK | 19 D0/SCL | P1 PA5 (GPIO_SPI1_SCK==GPIO_SPI1_SCK_1 (2))
* 8 LED- (N/C) | ----- | ------ * 8 LED- (N/C) | ----- | ------
* 10 GND | 20 GND | P2 GND * 10 GND | 20 GND | P2 GND
* --------------+-----------+---------------------------------------------- * --------------+-----------+----------------------------------------------
@@ -135,7 +138,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
dev = ug2864ambag01_initialize(spi, devno); dev = ug2864ambag01_initialize(spi, devno);
if (!dev) if (!dev)
{ {
lcderr("ERROR: Failed to bind SPI port 1 to OLED %d: %d\n", devno); lcderr("ERROR: Failed to bind SPI port 1 to OLED %d\n", devno);
} }
else else
{ {
boards/arm/stm32/stm32f4discovery/src/stm32_ug2864hsweg01.c
+6 -3
View File
@@ -56,7 +56,9 @@
/**************************************************************************** /****************************************************************************
* Pre-processor Definitions * Pre-processor Definitions
****************************************************************************/ ****************************************************************************/
/* Configuration ************************************************************/ /* Configuration ************************************************************/
/* The pin configurations here require that SPI1 is selected */ /* The pin configurations here require that SPI1 is selected */
#ifndef CONFIG_STM32_SPI1 #ifndef CONFIG_STM32_SPI1
@@ -68,6 +70,7 @@
#endif #endif
/* Pin Configuration ********************************************************/ /* Pin Configuration ********************************************************/
/* UG-2864HSWEG01 OLED Display (SPI 4-wire): /* UG-2864HSWEG01 OLED Display (SPI 4-wire):
* *
* --------------------------+---------------------------------------------- * --------------------------+----------------------------------------------
@@ -81,8 +84,8 @@
* 7 D/C | 9 D/C | P2 PB8 (Arbitrary selection)(2) * 7 D/C | 9 D/C | P2 PB8 (Arbitrary selection)(2)
* 9 LED+ (N/C) | ----- | ----- * 9 LED+ (N/C) | ----- | -----
* 2 5V Vcc | 1,2 Vcc | P2 5V * 2 5V Vcc | 1,2 Vcc | P2 5V
* 4 DI | 18 D1/SI | P1 PA7 (GPIO_SPI1_MOSI == GPIO_SPI1_MOSI_1 (1)) * 4 DI | 18 D1/SI | P1 PA7 (GPIO_SPI1_MOSI==GPIO_SPI1_MOSI_1 (1))
* 6 SCLK | 19 D0/SCL | P1 PA5 (GPIO_SPI1_SCK == GPIO_SPI1_SCK_1 (2)) * 6 SCLK | 19 D0/SCL | P1 PA5 (GPIO_SPI1_SCK==GPIO_SPI1_SCK_1 (2))
* 8 LED- (N/C) | ----- | ------ * 8 LED- (N/C) | ----- | ------
* 10 GND | 20 GND | P2 GND * 10 GND | 20 GND | P2 GND
* --------------+-----------+---------------------------------------------- * --------------+-----------+----------------------------------------------
@@ -135,7 +138,7 @@ FAR struct lcd_dev_s *board_graphics_setup(unsigned int devno)
dev = ssd1306_initialize(spi, NULL, devno); dev = ssd1306_initialize(spi, NULL, devno);
if (!dev) if (!dev)
{ {
lcderr("ERROR: Failed to bind SPI port 1 to OLED %d: %d\n", devno); lcderr("ERROR: Failed to bind SPI port 1 to OLED %d\n", devno);
} }
else else
{ {
boards/arm/stm32l4/nucleo-l476rg/src/stm32_pcd8544.c
+1 -1
View File
@@ -113,7 +113,7 @@ FAR struct lcd_dev_s *board_lcd_getdev(int lcddev)
g_lcddev = pcd8544_initialize(g_spidev, lcddev); g_lcddev = pcd8544_initialize(g_spidev, lcddev);
if (!g_lcddev) if (!g_lcddev)
{ {
lcderr("ERROR: Failed to bind SPI port 1 to LCD %d: %d\n", lcddev); lcderr("ERROR: Failed to bind SPI port 1 to LCD %d\n", lcddev);
} }
else else
{ {
boards/mips/pic32mz/flipnclick-pic32mz/src/pic32mz_ssd1306.c
+1 -1
View File
@@ -128,7 +128,7 @@ FAR struct lcd_dev_s *pic32mz_graphics_setup(unsigned int devno)
dev = ssd1306_initialize(spi, NULL, devno); dev = ssd1306_initialize(spi, NULL, devno);
if (!dev) if (!dev)
{ {
lcderr("ERROR: Failed to bind SPI port 1 to OLED %d: %d\n", devno); lcderr("ERROR: Failed to bind SPI port 1 to OLED %d\n", devno);
} }
else else
{ {