sambuc/retrobsd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move ILI9341 defines to a separate include file.

Browse Source
This commit is contained in:
Serge Vakulenko
2015-11-28 00:44:40 -08:00
parent ac9ef0eee9
commit 09205046a4
4 changed files with 95 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
sys/pic32/gpanel-ili9341.c
View File

@@ -23,96 +23,7 @@
*/
#include <sys/param.h>
#include <sys/gpanel.h>
/*
* ILI9341 registers.
*/
#define ILI9341_No_Operation 0x00
#define ILI9341_Software_Reset 0x01
#define ILI9341_Read_Display_Identification_Information 0x04
#define ILI9341_Read_Display_Status 0x09
#define ILI9341_Read_Display_Power_Mode 0x0A
#define ILI9341_Read_Display_MADCTL 0x0B
#define ILI9341_Read_Display_Pixel_Format 0x0C
#define ILI9341_Read_Display_Image_Format 0x0D
#define ILI9341_Read_Display_Signal_Mode 0x0E
#define ILI9341_Read_Display_Self_Diagnostic_Result 0x0F
#define ILI9341_Enter_Sleep_Mode 0x10
#define ILI9341_Sleep_OUT 0x11
#define ILI9341_Partial_Mode_ON 0x12
#define ILI9341_Normal_Display_Mode_ON 0x13
#define ILI9341_Display_Inversion_OFF 0x20
#define ILI9341_Display_Inversion_ON 0x21
#define ILI9341_Gamma_Set 0x26
#define ILI9341_Display_OFF 0x28
#define ILI9341_Display_ON 0x29
#define ILI9341_Column_Address_Set 0x2A
#define ILI9341_Page_Address_Set 0x2B
#define ILI9341_Memory_Write 0x2C
#define ILI9341_Color_SET 0x2D
#define ILI9341_Memory_Read 0x2E
#define ILI9341_Partial_Area 0x30
#define ILI9341_Vertical_Scrolling_Definition 0x33
#define ILI9341_Tearing_Effect_Line_OFF 0x34
#define ILI9341_Tearing_Effect_Line_ON 0x35
#define ILI9341_Memory_Access_Control 0x36
#define ILI9341_Vertical_Scrolling_Start_Address 0x37
#define ILI9341_Idle_Mode_OFF 0x38
#define ILI9341_Idle_Mode_ON 0x39
#define ILI9341_Pixel_Format_Set 0x3A
#define ILI9341_Write_Memory_Continue 0x3C
#define ILI9341_Read_Memory_Continue 0x3E
#define ILI9341_Set_Tear_Scanline 0x44
#define ILI9341_Get_Scanline 0x45
#define ILI9341_Write_Display_Brightness 0x51
#define ILI9341_Read_Display_Brightness 0x52
#define ILI9341_Write_CTRL_Display 0x53
#define ILI9341_Read_CTRL_Display 0x54
#define ILI9341_Write_Content_Adaptive_Brightness_Control 0x55
#define ILI9341_Read_Content_Adaptive_Brightness_Control 0x56
#define ILI9341_Write_CABC_Minimum_Brightness 0x5E
#define ILI9341_Read_CABC_Minimum_Brightness 0x5F
#define ILI9341_Read_ID1 0xDA
#define ILI9341_Read_ID2 0xDB
#define ILI9341_Read_ID3 0xDC
#define ILI9341_RGB_Interface_Signal_Control 0xB0
#define ILI9341_Frame_Control_In_Normal_Mode 0xB1
#define ILI9341_Frame_Control_In_Idle_Mode 0xB2
#define ILI9341_Frame_Control_In_Partial_Mode 0xB3
#define ILI9341_Display_Inversion_Control 0xB4
#define ILI9341_Blanking_Porch_Control 0xB5
#define ILI9341_Display_Function_Control 0xB6
#define ILI9341_Entry_Mode_Set 0xB7
#define ILI9341_Backlight_Control_1 0xB8
#define ILI9341_Backlight_Control_2 0xB9
#define ILI9341_Backlight_Control_3 0xBA
#define ILI9341_Backlight_Control_4 0xBB
#define ILI9341_Backlight_Control_5 0xBC
#define ILI9341_Backlight_Control_7 0xBE
#define ILI9341_Backlight_Control_8 0xBF
#define ILI9341_Power_Control_1 0xC0
#define ILI9341_Power_Control_2 0xC1
#define ILI9341_VCOM_Control_1 0xC5
#define ILI9341_VCOM_Control_2 0xC7
#define ILI9341_NV_Memory_Write 0xD0
#define ILI9341_NV_Memory_Protection Key 0xD1
#define ILI9341_NV_Memory_Status Read 0xD2
#define ILI9341_Read_ID4 0xD3
#define ILI9341_Positive_Gamma_Correction 0xE0
#define ILI9341_Negative_Gamma_Correction 0xE1
#define ILI9341_Digital_Gamma_Control_1 0xE2
#define ILI9341_Digital_Gamma_Control_2 0xE3
#define ILI9341_Interface_Control 0xF6
/*
* Memory Access Control register
*/
#define MADCTL_MY 0x80 /* Row address order */
#define MADCTL_MX 0x40 /* Column address order */
#define MADCTL_MV 0x20 /* Row/column exchange */
#define MADCTL_ML 0x10 /* Vertical refresh order */
#define MADCTL_BGR 0x08 /* Color filter selector: 0=RGB, 1=BGR */
#define MADCTL_MH 0x04 /* Horisontal refresh direction: 1=left-to-right */
#include <machine/ili9341.h>
/*
* Write a 8-bit value to the ILI9341 Command register.

91
sys/pic32/gpanel-spi-ili9341.c
View File

@@ -23,96 +23,7 @@
*/
#include <sys/param.h>
#include <sys/gpanel.h>
/*
* ILI9341 registers.
*/
#define ILI9341_No_Operation 0x00
#define ILI9341_Software_Reset 0x01
#define ILI9341_Read_Display_Identification_Information 0x04
#define ILI9341_Read_Display_Status 0x09
#define ILI9341_Read_Display_Power_Mode 0x0A
#define ILI9341_Read_Display_MADCTL 0x0B
#define ILI9341_Read_Display_Pixel_Format 0x0C
#define ILI9341_Read_Display_Image_Format 0x0D
#define ILI9341_Read_Display_Signal_Mode 0x0E
#define ILI9341_Read_Display_Self_Diagnostic_Result 0x0F
#define ILI9341_Enter_Sleep_Mode 0x10
#define ILI9341_Sleep_OUT 0x11
#define ILI9341_Partial_Mode_ON 0x12
#define ILI9341_Normal_Display_Mode_ON 0x13
#define ILI9341_Display_Inversion_OFF 0x20
#define ILI9341_Display_Inversion_ON 0x21
#define ILI9341_Gamma_Set 0x26
#define ILI9341_Display_OFF 0x28
#define ILI9341_Display_ON 0x29
#define ILI9341_Column_Address_Set 0x2A
#define ILI9341_Page_Address_Set 0x2B
#define ILI9341_Memory_Write 0x2C
#define ILI9341_Color_SET 0x2D
#define ILI9341_Memory_Read 0x2E
#define ILI9341_Partial_Area 0x30
#define ILI9341_Vertical_Scrolling_Definition 0x33
#define ILI9341_Tearing_Effect_Line_OFF 0x34
#define ILI9341_Tearing_Effect_Line_ON 0x35
#define ILI9341_Memory_Access_Control 0x36
#define ILI9341_Vertical_Scrolling_Start_Address 0x37
#define ILI9341_Idle_Mode_OFF 0x38
#define ILI9341_Idle_Mode_ON 0x39
#define ILI9341_Pixel_Format_Set 0x3A
#define ILI9341_Write_Memory_Continue 0x3C
#define ILI9341_Read_Memory_Continue 0x3E
#define ILI9341_Set_Tear_Scanline 0x44
#define ILI9341_Get_Scanline 0x45
#define ILI9341_Write_Display_Brightness 0x51
#define ILI9341_Read_Display_Brightness 0x52
#define ILI9341_Write_CTRL_Display 0x53
#define ILI9341_Read_CTRL_Display 0x54
#define ILI9341_Write_Content_Adaptive_Brightness_Control 0x55
#define ILI9341_Read_Content_Adaptive_Brightness_Control 0x56
#define ILI9341_Write_CABC_Minimum_Brightness 0x5E
#define ILI9341_Read_CABC_Minimum_Brightness 0x5F
#define ILI9341_Read_ID1 0xDA
#define ILI9341_Read_ID2 0xDB
#define ILI9341_Read_ID3 0xDC
#define ILI9341_RGB_Interface_Signal_Control 0xB0
#define ILI9341_Frame_Control_In_Normal_Mode 0xB1
#define ILI9341_Frame_Control_In_Idle_Mode 0xB2
#define ILI9341_Frame_Control_In_Partial_Mode 0xB3
#define ILI9341_Display_Inversion_Control 0xB4
#define ILI9341_Blanking_Porch_Control 0xB5
#define ILI9341_Display_Function_Control 0xB6
#define ILI9341_Entry_Mode_Set 0xB7
#define ILI9341_Backlight_Control_1 0xB8
#define ILI9341_Backlight_Control_2 0xB9
#define ILI9341_Backlight_Control_3 0xBA
#define ILI9341_Backlight_Control_4 0xBB
#define ILI9341_Backlight_Control_5 0xBC
#define ILI9341_Backlight_Control_7 0xBE
#define ILI9341_Backlight_Control_8 0xBF
#define ILI9341_Power_Control_1 0xC0
#define ILI9341_Power_Control_2 0xC1
#define ILI9341_VCOM_Control_1 0xC5
#define ILI9341_VCOM_Control_2 0xC7
#define ILI9341_NV_Memory_Write 0xD0
#define ILI9341_NV_Memory_Protection Key 0xD1
#define ILI9341_NV_Memory_Status Read 0xD2
#define ILI9341_Read_ID4 0xD3
#define ILI9341_Positive_Gamma_Correction 0xE0
#define ILI9341_Negative_Gamma_Correction 0xE1
#define ILI9341_Digital_Gamma_Control_1 0xE2
#define ILI9341_Digital_Gamma_Control_2 0xE3
#define ILI9341_Interface_Control 0xF6
/*
* Memory Access Control register
*/
#define MADCTL_MY 0x80 /* Row address order */
#define MADCTL_MX 0x40 /* Column address order */
#define MADCTL_MV 0x20 /* Row/column exchange */
#define MADCTL_ML 0x10 /* Vertical refresh order */
#define MADCTL_BGR 0x08 /* Color filter selector: 0=RGB, 1=BGR */
#define MADCTL_MH 0x04 /* Horisontal refresh direction: 1=left-to-right */
#include <machine/ili9341.h>
/*
* Set address window.

40
sys/pic32/gpanel-spi.c
View File

@@ -45,11 +45,6 @@ static struct gpanel_hw hw;
*/
static int _col, _row;
/*
* ID of the LCD controller chip.
*/
static int _chip_id;
/*
* Data/command signal pin.
*/
@@ -93,23 +88,6 @@ int gpanel_send_data(int value)
return spi_transfer(&_spiio, value);
}
/*
* Read a 32-bit value from the specified chip register.
*/
static int read_reg32(int reg)
{
unsigned value;
spi_select(&_spiio);
gpanel_send_command(reg);
value = gpanel_send_data(0) << 24;
value |= gpanel_send_data(0) << 16;
value |= gpanel_send_data(0) << 8;
value |= gpanel_send_data(0);
spi_deselect(&_spiio);
return value;
}
/*
* Draw a line.
*/
@@ -467,31 +445,21 @@ static int probe(config)
}
spi_brg(io, SGPANEL_KHZ);
spi_set(io, PIC32_SPICON_CKE);
/* Enable outputs. */
gpio_set_output(_dc);
/* Read the the chip ID register. */
_chip_id = read_reg32(0xD3) & 0xffffff;
switch (_chip_id) {
default:
printf("sgpanel0: Unknown chip ID = 0x%04x\n", _chip_id);
goto failed;
/* Ilitek ILI9341. */
ili9341_init_display(&hw);
case 0x009341:
/* Ilitek ILI9341. */
ili9341_init_display(&hw);
break;
}
printf("gpanel0: <%s> display %ux%u\n", hw.name, gpanel_width, gpanel_height);
draw_logo();
return 1;
#if 0
failed:
/* Disable outputs. */
gpio_set_input(_dc);
gpio_set_input(cs);
return 0;
#endif
}
struct driver sgpaneldriver = {

89
sys/pic32/ili9341.h Normal file
View File

@@ -0,0 +1,89 @@
/*
* ILI9341 registers.
*/
#define ILI9341_No_Operation 0x00
#define ILI9341_Software_Reset 0x01
#define ILI9341_Read_Display_Identification_Information 0x04
#define ILI9341_Read_Display_Status 0x09
#define ILI9341_Read_Display_Power_Mode 0x0A
#define ILI9341_Read_Display_MADCTL 0x0B
#define ILI9341_Read_Display_Pixel_Format 0x0C
#define ILI9341_Read_Display_Image_Format 0x0D
#define ILI9341_Read_Display_Signal_Mode 0x0E
#define ILI9341_Read_Display_Self_Diagnostic_Result 0x0F
#define ILI9341_Enter_Sleep_Mode 0x10
#define ILI9341_Sleep_OUT 0x11
#define ILI9341_Partial_Mode_ON 0x12
#define ILI9341_Normal_Display_Mode_ON 0x13
#define ILI9341_Display_Inversion_OFF 0x20
#define ILI9341_Display_Inversion_ON 0x21
#define ILI9341_Gamma_Set 0x26
#define ILI9341_Display_OFF 0x28
#define ILI9341_Display_ON 0x29
#define ILI9341_Column_Address_Set 0x2A
#define ILI9341_Page_Address_Set 0x2B
#define ILI9341_Memory_Write 0x2C
#define ILI9341_Color_SET 0x2D
#define ILI9341_Memory_Read 0x2E
#define ILI9341_Partial_Area 0x30
#define ILI9341_Vertical_Scrolling_Definition 0x33
#define ILI9341_Tearing_Effect_Line_OFF 0x34
#define ILI9341_Tearing_Effect_Line_ON 0x35
#define ILI9341_Memory_Access_Control 0x36
#define ILI9341_Vertical_Scrolling_Start_Address 0x37
#define ILI9341_Idle_Mode_OFF 0x38
#define ILI9341_Idle_Mode_ON 0x39
#define ILI9341_Pixel_Format_Set 0x3A
#define ILI9341_Write_Memory_Continue 0x3C
#define ILI9341_Read_Memory_Continue 0x3E
#define ILI9341_Set_Tear_Scanline 0x44
#define ILI9341_Get_Scanline 0x45
#define ILI9341_Write_Display_Brightness 0x51
#define ILI9341_Read_Display_Brightness 0x52
#define ILI9341_Write_CTRL_Display 0x53
#define ILI9341_Read_CTRL_Display 0x54
#define ILI9341_Write_Content_Adaptive_Brightness_Control 0x55
#define ILI9341_Read_Content_Adaptive_Brightness_Control 0x56
#define ILI9341_Write_CABC_Minimum_Brightness 0x5E
#define ILI9341_Read_CABC_Minimum_Brightness 0x5F
#define ILI9341_Read_ID1 0xDA
#define ILI9341_Read_ID2 0xDB
#define ILI9341_Read_ID3 0xDC
#define ILI9341_RGB_Interface_Signal_Control 0xB0
#define ILI9341_Frame_Control_In_Normal_Mode 0xB1
#define ILI9341_Frame_Control_In_Idle_Mode 0xB2
#define ILI9341_Frame_Control_In_Partial_Mode 0xB3
#define ILI9341_Display_Inversion_Control 0xB4
#define ILI9341_Blanking_Porch_Control 0xB5
#define ILI9341_Display_Function_Control 0xB6
#define ILI9341_Entry_Mode_Set 0xB7
#define ILI9341_Backlight_Control_1 0xB8
#define ILI9341_Backlight_Control_2 0xB9
#define ILI9341_Backlight_Control_3 0xBA
#define ILI9341_Backlight_Control_4 0xBB
#define ILI9341_Backlight_Control_5 0xBC
#define ILI9341_Backlight_Control_7 0xBE
#define ILI9341_Backlight_Control_8 0xBF
#define ILI9341_Power_Control_1 0xC0
#define ILI9341_Power_Control_2 0xC1
#define ILI9341_VCOM_Control_1 0xC5
#define ILI9341_VCOM_Control_2 0xC7
#define ILI9341_NV_Memory_Write 0xD0
#define ILI9341_NV_Memory_Protection Key 0xD1
#define ILI9341_NV_Memory_Status Read 0xD2
#define ILI9341_Read_ID4 0xD3
#define ILI9341_Positive_Gamma_Correction 0xE0
#define ILI9341_Negative_Gamma_Correction 0xE1
#define ILI9341_Digital_Gamma_Control_1 0xE2
#define ILI9341_Digital_Gamma_Control_2 0xE3
#define ILI9341_Interface_Control 0xF6
/*
* Memory Access Control register
*/
#define MADCTL_MY 0x80 /* Row address order */
#define MADCTL_MX 0x40 /* Column address order */
#define MADCTL_MV 0x20 /* Row/column exchange */
#define MADCTL_ML 0x10 /* Vertical refresh order */
#define MADCTL_BGR 0x08 /* Color filter selector: 0=RGB, 1=BGR */
#define MADCTL_MH 0x04 /* Horisontal refresh direction: 1=left-to-right */