Skip to content

Commit fcdd8b3

Browse files
committed
simplify epd model defs
1 parent eba2246 commit fcdd8b3

File tree

2 files changed

+12
-94
lines changed

2 files changed

+12
-94
lines changed

EPD/SSD16xx.c

Lines changed: 4 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -141,37 +141,10 @@ static epd_driver_t epd_drv_ssd1677 = {
141141
};
142142

143143
// SSD1619 400x300 Black/White/Red
144-
const epd_model_t epd_ssd1619_420_bwr = {
145-
.id = EPD_SSD1619_420_BWR,
146-
.color = BWR,
147-
.drv = &epd_drv_ssd1619,
148-
.width = 400,
149-
.height = 300,
150-
};
151-
144+
const epd_model_t epd_ssd1619_420_bwr = {EPD_SSD1619_420_BWR, BWR, &epd_drv_ssd1619, 400, 300};
152145
// SSD1619 400x300 Black/White
153-
const epd_model_t epd_ssd1619_420_bw = {
154-
.id = EPD_SSD1619_420_BW,
155-
.color = BW,
156-
.drv = &epd_drv_ssd1619,
157-
.width = 400,
158-
.height = 300,
159-
};
160-
146+
const epd_model_t epd_ssd1619_420_bw = {EPD_SSD1619_420_BW, BW, &epd_drv_ssd1619, 400, 300};
161147
// SSD1677 880x528 Black/White/Red
162-
const epd_model_t epd_ssd1677_750_bwr = {
163-
.id = EPD_SSD1677_750_HD_BWR,
164-
.color = BWR,
165-
.drv = &epd_drv_ssd1677,
166-
.width = 880,
167-
.height = 528,
168-
};
169-
148+
const epd_model_t epd_ssd1677_750_bwr = {EPD_SSD1677_750_HD_BWR, BWR, &epd_drv_ssd1677, 880, 528};
170149
// SSD1677 880x528 Black/White
171-
const epd_model_t epd_ssd1677_750_bw = {
172-
.id = EPD_SSD1677_750_HD_BW,
173-
.color = BW,
174-
.drv = &epd_drv_ssd1677,
175-
.width = 880,
176-
.height = 528,
177-
};
150+
const epd_model_t epd_ssd1677_750_bw = {EPD_SSD1677_750_HD_BW, BW, &epd_drv_ssd1677, 880, 528};

EPD/UC81xx.c

Lines changed: 8 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -323,73 +323,18 @@ static epd_driver_t epd_drv_jd79665 = {
323323
};
324324

325325
// UC8176 400x300 Black/White
326-
const epd_model_t epd_uc8176_420_bw = {
327-
.id = EPD_UC8176_420_BW,
328-
.color = BW,
329-
.drv = &epd_drv_uc8176,
330-
.width = 400,
331-
.height = 300,
332-
};
333-
326+
const epd_model_t epd_uc8176_420_bw = {EPD_UC8176_420_BW, BW, &epd_drv_uc8176, 400, 300};
334327
// UC8176 400x300 Black/White/Red
335-
const epd_model_t epd_uc8176_420_bwr = {
336-
.id = EPD_UC8176_420_BWR,
337-
.color = BWR,
338-
.drv = &epd_drv_uc8176,
339-
.width = 400,
340-
.height = 300,
341-
};
342-
328+
const epd_model_t epd_uc8176_420_bwr = {EPD_UC8176_420_BWR, BWR, &epd_drv_uc8176, 400, 300};
343329
// UC8159 640x384 Black/White
344-
const epd_model_t epd_uc8159_750_bw = {
345-
.id = EPD_UC8159_750_LOW_BW,
346-
.color = BW,
347-
.drv = &epd_drv_uc8159,
348-
.width = 640,
349-
.height = 384,
350-
};
351-
330+
const epd_model_t epd_uc8159_750_bw = {EPD_UC8159_750_LOW_BW, BW, &epd_drv_uc8159, 640, 384};
352331
// UC8159 640x384 Black/White/Red
353-
const epd_model_t epd_uc8159_750_bwr = {
354-
.id = EPD_UC8159_750_LOW_BWR,
355-
.color = BWR,
356-
.drv = &epd_drv_uc8159,
357-
.width = 640,
358-
.height = 384,
359-
};
360-
332+
const epd_model_t epd_uc8159_750_bwr = {EPD_UC8159_750_LOW_BWR, BWR, &epd_drv_uc8159, 640, 384};
361333
// UC8179 800x480 Black/White/Red
362-
const epd_model_t epd_uc8179_750_bw = {
363-
.id = EPD_UC8179_750_BW,
364-
.color = BW,
365-
.drv = &epd_drv_uc8179,
366-
.width = 800,
367-
.height = 480,
368-
};
369-
334+
const epd_model_t epd_uc8179_750_bw = {EPD_UC8179_750_BW, BW, &epd_drv_uc8179, 800, 480};
370335
// UC8179 800x480 Black/White/Red
371-
const epd_model_t epd_uc8179_750_bwr = {
372-
.id = EPD_UC8179_750_BWR,
373-
.color = BWR,
374-
.drv = &epd_drv_uc8179,
375-
.width = 800,
376-
.height = 480,
377-
};
378-
336+
const epd_model_t epd_uc8179_750_bwr = {EPD_UC8179_750_BWR, BWR, &epd_drv_uc8179, 800, 480};
379337
// JD79668 400x300 Black/White/Red/Yellow
380-
const epd_model_t epd_jd79668_420_bwry = {
381-
.id = EPD_JD79668_420_BWRY,
382-
.color = BWRY,
383-
.drv = &epd_drv_jd79668,
384-
.width = 400,
385-
.height = 300,
386-
};
387-
338+
const epd_model_t epd_jd79668_420_bwry = {EPD_JD79668_420_BWRY, BWRY, &epd_drv_jd79668, 400, 300};
388339
// JD79665 800x480 Black/White/Red/Yellow
389-
const epd_model_t epd_jd79668_750_bwry = {
390-
.id = EPD_JD79668_750_BWRY,
391-
.color = BWRY,
392-
.drv = &epd_drv_jd79665,
393-
.width = 800,
394-
.height = 480,
395-
};
340+
const epd_model_t epd_jd79668_750_bwry = {EPD_JD79668_750_BWRY, BWRY, &epd_drv_jd79665, 800, 480};

0 commit comments

Comments
 (0)