Skip to content

Commit bbb7e00

Browse files
redchenjsredchenjs
committed
ssd1331: remove unused functions
1 parent 3b5dcd7 commit bbb7e00

File tree

8 files changed

+119
-1204
lines changed

8 files changed

+119
-1204
lines changed

‎components/ugfx/drivers/gdisp/SSD1331/board_SSD1331.h

+4-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@
1010

1111
#include "driver/ssd1331.h"
1212

13-
#define init_board(g) ssd1331_init()
14-
#define write_cmd(g, cmd) ssd1331_write_byte(cmd, 0)
15-
#define write_data(g, data) ssd1331_write_byte(data, 1)
13+
#define init_board(g) ssd1331_init_board()
14+
#define setpin_reset(g, rst) ssd1331_setpin_reset(rst)
15+
#define write_cmd(g, cmd) ssd1331_write_cmd(cmd)
16+
#define write_data(g, data) ssd1331_write_data(data)
1617
#define refresh_gram(g, gram) ssd1331_refresh_gram(gram)
1718

1819
#endif /* _GDISP_LLD_BOARD_H */

‎components/ugfx/drivers/gdisp/SSD1331/gdisp_lld_SSD1331.c

+55
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,47 @@
5757
/* Driver exported functions. */
5858
/*===========================================================================*/
5959

60+
static const uint8_t init_data[] = {
61+
SSD1331_DISPLAY_OFF,
62+
SSD1331_START_LINE, 0x00,
63+
SSD1331_COM_OFFSET, 0x00,
64+
SSD1331_PIXELS_NORMAL,
65+
SSD1331_MULTIPLEX, 0x3F,
66+
SSD1331_RESET, SSD1331_RESET_OFF,
67+
SSD1331_POWER, SSD1331_POWER_ON,
68+
SSD1331_PHASE_PERIOD, 0x31,
69+
SSD1331_CLOCKS, 0xF0,
70+
SSD1331_PRECHARGE_A, 0x64,
71+
SSD1331_PRECHARGE_B, 0x78,
72+
SSD1331_PRECHARGE_C, 0x64,
73+
SSD1331_PRECHARGE_VOLTAGE, 0x3A,
74+
SSD1331_DESELECT_VOLTAGE, 0x3E,
75+
SSD1331_CONTRAST_A, 0x91,
76+
SSD1331_CONTRAST_B, 0x50,
77+
SSD1331_CONTRAST_C, 0x7D,
78+
SSD1331_BRIGHTNESS, (GDISP_INITIAL_BACKLIGHT*10)/63,
79+
#if GDISP_LLD_PIXELFORMAT == GDISP_PIXELFORMAT_RGB565
80+
SSD1331_MODE, SSD1331_MODE_16_BIT|SSD1331_MODE_COM_SPLIT|SSD1331_MODE_COLUMN_REVERSE|SSD1331_MODE_COM_REVERSE,
81+
#elif GDISP_LLD_PIXELFORMAT == GDISP_PIXELFORMAT_BGR565
82+
SSD1331_MODE, SSD1331_MODE_16_BIT|SSD1331_MODE_COM_SPLIT|SSD1331_MODE_BGRSSD1331_MODE_COLUMN_REVERSE|SSD1331_MODE_COM_REVERSE,
83+
#elif GDISP_LLD_PIXELFORMAT == GDISP_PIXELFORMAT_RGB332
84+
SSD1331_MODE, SSD1331_MODE_8_BIT|SSD1331_MODE_COM_SPLITSSD1331_MODE_COLUMN_REVERSE|SSD1331_MODE_COM_REVERSE,
85+
#elif GDISP_LLD_PIXELFORMAT == GDISP_PIXELFORMAT_BGR332
86+
SSD1331_MODE, SSD1331_MODE_8_BIT|SSD1331_MODE_COM_SPLIT|SSD1331_MODE_BGRSSD1331_MODE_COLUMN_REVERSE|SSD1331_MODE_COM_REVERSE,
87+
#else
88+
#error "SSD1331: Invalid color format"
89+
#endif
90+
SSD1331_DRAW_MODE, SSD1331_DRAW_FILLRECT
91+
};
92+
93+
static const uint8_t gray_scale_table[] = {
94+
SSD1331_GRAYSCALE,
95+
0x02, 0x04, 0x06, 0x08, 0x0A, 0x0C, 0x0E, 0x10,
96+
0x12, 0x15, 0x19, 0x1D, 0x21, 0x25, 0x2A, 0x30,
97+
0x36, 0x3C, 0x42, 0x48, 0x50, 0x58, 0x60, 0x68,
98+
0x70, 0x78, 0x82, 0x8C, 0x96, 0xA0, 0xAA, 0xB4
99+
};
100+
60101
LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
61102
g->priv = gfxAlloc(GDISP_SCREEN_HEIGHT * GDISP_SCREEN_WIDTH * 2);
62103
if (g->priv == NULL) {
@@ -70,6 +111,20 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
70111
// Initialise the board interface
71112
init_board(g);
72113

114+
// Hardware reset
115+
setpin_reset(g, TRUE);
116+
gfxSleepMilliseconds(20);
117+
setpin_reset(g, FALSE);
118+
gfxSleepMilliseconds(20);
119+
120+
for(int i=0;i<sizeof(init_data);i++)
121+
write_cmd(g, init_data[i]);
122+
123+
for(int i=0;i<sizeof(gray_scale_table);i++)
124+
write_cmd(g, gray_scale_table[i]);
125+
126+
write_cmd(g, SSD1331_DISPLAY_ON);
127+
73128
/* Initialise the GDISP structure */
74129
g->g.Width = GDISP_SCREEN_WIDTH;
75130
g->g.Height = GDISP_SCREEN_HEIGHT;

‎main/inc/device/spi.h

-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include "driver/spi_master.h"
1212

1313
extern spi_device_handle_t spi1;
14-
extern spi_transaction_t spi1_t;
1514

1615
extern void spi1_init(void);
1716

‎main/inc/driver/ssd1331.h

+10-97
Original file line numberDiff line numberDiff line change
@@ -5,106 +5,19 @@
55
* Author: Jack Chen <[email protected]>
66
*/
77

8-
#ifndef SSD1331_H_
9-
#define SSD1331_H_
10-
11-
enum ssd1331_panel_value {
12-
SSD1331_WIDTH = 96,
13-
SSD1331_HEIGHT = 64
14-
};
15-
16-
enum ssd1331_data_type {
17-
SSD1331_CMD = 0,
18-
SSD1331_DATA = 1
19-
};
20-
21-
enum ssd1331_fundamental_command_table {
22-
SET_COLUMN_ADDRESS = 0x15,
23-
SET_ROW_ADDRESS = 0x75,
24-
25-
SET_CONTRAST_A = 0x81,
26-
SET_CONTRAST_B = 0x82,
27-
SET_CONTRAST_C = 0x83,
28-
SET_MASTER_CURRENT = 0x87,
29-
SET_PRECHARGE_SPEED_A = 0x8A,
30-
SET_PRECHARGE_SPEED_B = 0x8B,
31-
SET_PRECHARGE_SPEED_C = 0x8C,
32-
33-
SET_REMAP_COLOR_DEPTH = 0xA0,
34-
SET_DISPLAY_START_LINE = 0xA1,
35-
SET_DISPLAY_OFFSET = 0xA2,
36-
37-
SET_NORMAL_DISPLAY = 0xA4,
38-
SET_ENTIRE_DISPLAY_ON = 0xA5,
39-
SET_ENTIRE_DISPLAY_OFF = 0xA6,
40-
SET_INVERSE_DISPLAY = 0xA7,
41-
42-
SET_MULTIPLEX_RATIO = 0xA8,
43-
SET_DIM_MODE = 0xAB,
44-
SET_MASTER_CONFIG = 0xAD,
45-
46-
SET_DISPLAY_ON_DIM = 0xAC,
47-
SET_DISPLAY_OFF = 0xAE,
48-
SET_DISPLAY_ON_NORMAL = 0xAF,
49-
50-
SET_POWER_SAVE_MODE = 0xB0,
51-
SET_PHASE_PERIOD_ADJ = 0xB1,
52-
SET_DISPLAY_CLOCK_DIV = 0xB3,
53-
SET_GRAY_SCALE_TABLE = 0xB8,
54-
SET_BUILTIN_LINEAR_LUT = 0xB9,
55-
SET_PRECHARGE_LEVEL = 0xBB,
56-
SET_VCOMH_VOLTAGE = 0xBE,
57-
58-
SET_COMMAND_LOCK = 0xFD
59-
};
60-
61-
enum ssd1331_graphic_acceleration_command_table {
62-
DRAW_LINE = 0x21,
63-
DRAW_RECTANGLE = 0x22,
64-
COPY_WINDOW = 0x23,
65-
DIM_WINDOW = 0x24,
66-
CLEAR_WINDOW = 0x25,
67-
SET_FILL_MODE = 0x26,
68-
69-
CONTINUOUS_SCROLLING_SETUP = 0x27,
70-
DEACTIVATE_SCROLLING = 0x2E,
71-
ACTIVATE_SCROLLING = 0x2F
72-
};
8+
#ifndef INC_DRIVER_SSD1331_H_
9+
#define INC_DRIVER_SSD1331_H_
7310

7411
#include <stdint.h>
7512

76-
extern void ssd1331_refresh_gram(uint8_t *gram);
77-
78-
extern void ssd1331_write_byte(unsigned char chData, unsigned char chCmd);
79-
80-
extern void ssd1331_draw_point(unsigned char chXpos, unsigned char chYpos, unsigned int hwColor);
81-
extern void ssd1331_draw_line(unsigned char chXpos0, unsigned char chYpos0, unsigned char chXpos1, unsigned char chYpos1, unsigned int hwColor);
82-
extern void ssd1331_draw_v_line(unsigned char chXpos, unsigned char chYpos, unsigned char chHeight, unsigned int hwColor);
83-
extern void ssd1331_draw_h_line(unsigned char chXpos, unsigned char chYpos, unsigned char chWidth, unsigned int hwColor);
84-
extern void ssd1331_draw_rect(unsigned char chXpos, unsigned char chYpos, unsigned char chWidth, unsigned char chHeight, unsigned int hwColor);
85-
extern void ssd1331_draw_circle(unsigned char chXpos, unsigned char chYpos, unsigned char chRadius, unsigned int hwColor);
86-
87-
extern void ssd1331_draw_mono_bitmap(unsigned char chXpos, unsigned char chYpos, const unsigned char *pchBmp, unsigned char chWidth, unsigned char chHeight, unsigned int hwForeColor, unsigned int hwBackColor);
88-
extern void ssd1331_draw_64k_bitmap(unsigned char chXpos, unsigned char chYpos, const unsigned char *pchBmp, unsigned char chWidth, unsigned char chHeight);
89-
90-
extern void ssd1331_fill_rect(unsigned char chXpos, unsigned char chYpos, unsigned char chWidth, unsigned char chHeight, unsigned int hwColor);
91-
extern void ssd1331_fill_gram(unsigned int hwColor);
13+
#include "device/spi.h"
9214

93-
extern void ssd1331_clear_rect(unsigned char chXpos, unsigned char chYpos, unsigned char chWidth, unsigned char chHeight);
94-
extern void ssd1331_clear_gram(void);
15+
extern void ssd1331_init_board(void);
16+
extern void ssd1331_setpin_dc(spi_transaction_t *);
17+
extern void ssd1331_setpin_reset(uint8_t rst);
9518

96-
extern void ssd1331_display_char(unsigned char chXpos, unsigned char chYpos, unsigned char chChr, unsigned char chFontIndex, unsigned int hwForeColor, unsigned int hwBackColor);
97-
extern void ssd1331_display_num(unsigned char chXpos, unsigned char chYpos, unsigned long chNum, unsigned char chLen, unsigned char chFontIndex, unsigned int hwForeColor, unsigned int hwBackColor);
98-
extern void ssd1331_display_string(unsigned char chXpos, unsigned char chYpos, const char *pchString, unsigned char chFontIndex, unsigned int hwForeColor, unsigned int hwBackColor);
99-
100-
extern void ssd1331_continuous_scrolling(unsigned char chYpos, unsigned char chHeight, unsigned char chDirection, unsigned char chInterval);
101-
extern void ssd1331_deactivate_scrolling(void);
102-
103-
extern void ssd1331_show_checkerboard(void);
104-
extern void ssd1331_show_rainbow(void);
105-
106-
extern void ssd1331_set_gray_scale_table(void);
107-
108-
extern void ssd1331_init(void);
19+
extern void ssd1331_write_cmd(uint8_t cmd);
20+
extern void ssd1331_write_data(uint8_t data);
21+
extern void ssd1331_refresh_gram(uint8_t *gram);
10922

110-
#endif
23+
#endif /* INC_DRIVER_SSD1331_H_ */

‎main/inc/system/fonts.h

-175
This file was deleted.

0 commit comments

Comments
 (0)