Skip to content

Commit f2e911a

Browse files
ladyadaladyada
authored
Merge pull request #3680 from tannewt/magtag_builtin_display
Add board.DISPLAY to MagTag. Fix luma computation
2 parents 9169878 + bda3267 commit f2e911a

File tree

22 files changed

+191
-24
lines changed

22 files changed

+191
-24
lines changed

‎ports/atmel-samd/boards/metro_m0_express/mpconfigboard.h‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@
3333
#define DEFAULT_UART_BUS_RX (&pin_PA11)
3434
#define DEFAULT_UART_BUS_TX (&pin_PA10)
3535

36+
// These pins are connected to the external crystal.
37+
#define IGNORE_PIN_PA00 1
38+
#define IGNORE_PIN_PA01 1
39+
3640
// USB is always used internally so skip the pin objects for it.
3741
#define IGNORE_PIN_PA24 1
3842
#define IGNORE_PIN_PA25 1

‎ports/atmel-samd/common-hal/audiobusio/PDMIn.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ static void setup_dma(audiobusio_pdmin_obj_t* self, uint32_t length,
326326
// higher sample rate than specified. Then after the audio is
327327
// recorded, a more expensive filter non-real-time filter could be
328328
// used to down-sample and low-pass.
329-
uint16_t sinc_filter [OVERSAMPLING] = {
329+
const uint16_t sinc_filter [OVERSAMPLING] = {
330330
0, 2, 9, 21, 39, 63, 94, 132,
331331
179, 236, 302, 379, 467, 565, 674, 792,
332332
920, 1055, 1196, 1341, 1487, 1633, 1776, 1913,

‎ports/atmel-samd/common-hal/displayio/ParallelBus.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,8 @@ bool common_hal_displayio_parallelbus_begin_transaction(mp_obj_t obj) {
129129
return true;
130130
}
131131

132-
void common_hal_displayio_parallelbus_send(mp_obj_t obj, display_byte_type_t byte_type, display_chip_select_behavior_t chip_select, uint8_t *data, uint32_t data_length) {
132+
void common_hal_displayio_parallelbus_send(mp_obj_t obj, display_byte_type_t byte_type,
133+
display_chip_select_behavior_t chip_select, const uint8_t *data, uint32_t data_length) {
133134
displayio_parallelbus_obj_t* self = MP_OBJ_TO_PTR(obj);
134135
common_hal_digitalio_digitalinout_set_value(&self->command, byte_type == DISPLAY_DATA);
135136
uint32_t* clear_write = (uint32_t*) &self->write_group->OUTCLR.reg;

‎ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/board.c‎

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,83 @@
2626

2727
#include "boards/board.h"
2828
#include "mpconfigboard.h"
29+
#include "shared-bindings/busio/SPI.h"
30+
#include "shared-bindings/displayio/FourWire.h"
2931
#include "shared-bindings/microcontroller/Pin.h"
32+
#include "shared-module/displayio/__init__.h"
33+
#include "supervisor/shared/board.h"
34+
35+
#define DELAY 0x80
36+
37+
// This is an ILO373 control chip. The display is a 2.9" grayscale EInk.
38+
39+
const uint8_t display_start_sequence[] = {
40+
0x01, 5, 0x03, 0x00, 0x2b, 0x2b, 0x13, // power setting
41+
0x06, 3, 0x17, 0x17, 0x17, // booster soft start
42+
0x04, DELAY, 200, // power on and wait 200 ms
43+
0x00, 1, 0x7f, // panel setting
44+
0x50, 1, 0x97, // CDI setting
45+
0x30, 1, 0x3c, // PLL set to 50 Hx (M = 7, N = 4)
46+
0x61, 3, 0x80, 0x01, 0x28, // Resolution
47+
0x82, DELAY | 1, 0x12, 50, // VCM DC and delay 50ms
48+
49+
// Look up tables for voltage sequence for pixel transition
50+
// Common voltage
51+
0x20, 0x2a,
52+
0x00, 0x0a, 0x00, 0x00, 0x00, 0x01,
53+
0x60, 0x14, 0x14, 0x00, 0x00, 0x01,
54+
0x00, 0x14, 0x00, 0x00, 0x00, 0x01,
55+
0x00, 0x13, 0x0a, 0x01, 0x00, 0x01,
56+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
57+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
58+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
59+
60+
// White to white
61+
0x21, 0x2a,
62+
0x40, 0x0a, 0x00, 0x00, 0x00, 0x01,
63+
0x90, 0x14, 0x14, 0x00, 0x00, 0x01,
64+
0x10, 0x14, 0x0a, 0x00, 0x00, 0x01,
65+
0xa0, 0x13, 0x01, 0x00, 0x00, 0x01,
66+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
67+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
68+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
69+
70+
// Black to white
71+
0x22, 0x2a,
72+
0x40, 0x0a, 0x00, 0x00, 0x00, 0x01,
73+
0x90, 0x14, 0x14, 0x00, 0x00, 0x01,
74+
0x00, 0x14, 0x0a, 0x00, 0x00, 0x01,
75+
0x99, 0x0c, 0x01, 0x03, 0x04, 0x01,
76+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
77+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
78+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
79+
80+
// White to black
81+
0x23, 0x2a,
82+
0x40, 0x0a, 0x00, 0x00, 0x00, 0x01,
83+
0x90, 0x14, 0x14, 0x00, 0x00, 0x01,
84+
0x00, 0x14, 0x0a, 0x00, 0x00, 0x01,
85+
0x99, 0x0b, 0x04, 0x04, 0x01, 0x01,
86+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
87+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
88+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
89+
90+
// Black to black
91+
0x24, 0x2a,
92+
0x80, 0x0a, 0x00, 0x00, 0x00, 0x01,
93+
0x90, 0x14, 0x14, 0x00, 0x00, 0x01,
94+
0x20, 0x14, 0x0a, 0x00, 0x00, 0x01,
95+
0x50, 0x13, 0x01, 0x00, 0x00, 0x01,
96+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
97+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
98+
0x00, 0x00, 0x00, 0x00, 0x00, 0x00
99+
};
100+
101+
const uint8_t display_stop_sequence[] = {
102+
0x50, 0x01, 0x17, // CDI Setting
103+
0x82, 0x01, 0x00, // VCM DC to -0.1V
104+
0x02, 0x00 // Power off
105+
};
30106

31107
void board_init(void) {
32108
// USB
@@ -36,6 +112,52 @@ void board_init(void) {
36112
// Debug UART
37113
common_hal_never_reset_pin(&pin_GPIO43);
38114
common_hal_never_reset_pin(&pin_GPIO44);
115+
116+
busio_spi_obj_t* spi = &displays[0].fourwire_bus.inline_bus;
117+
common_hal_busio_spi_construct(spi, &pin_GPIO36, &pin_GPIO35, NULL);
118+
common_hal_busio_spi_never_reset(spi);
119+
120+
displayio_fourwire_obj_t* bus = &displays[0].fourwire_bus;
121+
bus->base.type = &displayio_fourwire_type;
122+
common_hal_displayio_fourwire_construct(bus,
123+
spi,
124+
&pin_GPIO7, // EPD_DC Command or data
125+
&pin_GPIO8, // EPD_CS Chip select
126+
&pin_GPIO6, // EPD_RST Reset
127+
4000000, // Baudrate
128+
0, // Polarity
129+
0); // Phase
130+
131+
displayio_epaperdisplay_obj_t* display = &displays[0].epaper_display;
132+
display->base.type = &displayio_epaperdisplay_type;
133+
common_hal_displayio_epaperdisplay_construct(
134+
display,
135+
bus,
136+
display_start_sequence, sizeof(display_start_sequence),
137+
display_stop_sequence, sizeof(display_stop_sequence),
138+
296, // width
139+
128, // height
140+
160, // ram_width
141+
296, // ram_height
142+
0, // colstart
143+
0, // rowstart
144+
270, // rotation
145+
NO_COMMAND, // set_column_window_command
146+
NO_COMMAND, // set_row_window_command
147+
NO_COMMAND, // set_current_column_command
148+
NO_COMMAND, // set_current_row_command
149+
0x10, // write_black_ram_command
150+
false, // black_bits_inverted
151+
0x13, // write_color_ram_command
152+
false, // color_bits_inverted
153+
0x000000, // highlight_color
154+
0x12, // refresh_display_command
155+
1.0, // refresh_time
156+
&pin_GPIO5, // busy_pin
157+
false, // busy_state
158+
5.0, // seconds_per_frame
159+
false, // always_toggle_chip_select
160+
true); // grayscale
39161
}
40162

41163
bool board_requests_safe_mode(void) {

‎ports/esp32s2/boards/adafruit_magtag_2.9_grayscale/pins.c‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#include "shared-bindings/board/__init__.h"
22

3+
#include "shared-module/displayio/__init__.h"
4+
35
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
46
{ MP_ROM_QSTR(MP_QSTR_D10), MP_ROM_PTR(&pin_GPIO10) },
57
{ MP_ROM_QSTR(MP_QSTR_AD1), MP_ROM_PTR(&pin_GPIO18) },
@@ -37,5 +39,7 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
3739

3840
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
3941
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
42+
43+
{ MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].epaper_display)}
4044
};
4145
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

‎ports/esp32s2/common-hal/displayio/ParallelBus.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ bool common_hal_displayio_parallelbus_begin_transaction(mp_obj_t obj) {
5757
return false;
5858
}
5959

60-
void common_hal_displayio_parallelbus_send(mp_obj_t obj, display_byte_type_t byte_type, display_chip_select_behavior_t chip_select, uint8_t *data, uint32_t data_length) {
60+
void common_hal_displayio_parallelbus_send(mp_obj_t obj, display_byte_type_t byte_type,
61+
display_chip_select_behavior_t chip_select, const uint8_t *data, uint32_t data_length) {
6162

6263
}
6364

‎ports/mimxrt10xx/common-hal/displayio/ParallelBus.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ bool common_hal_displayio_parallelbus_begin_transaction(mp_obj_t obj) {
5757
return false;
5858
}
5959

60-
void common_hal_displayio_parallelbus_send(mp_obj_t obj, display_byte_type_t byte_type, display_chip_select_behavior_t chip_select, uint8_t *data, uint32_t data_length) {
60+
void common_hal_displayio_parallelbus_send(mp_obj_t obj, display_byte_type_t byte_type,
61+
display_chip_select_behavior_t chip_select, const uint8_t *data, uint32_t data_length) {
6162

6263
}
6364

‎ports/nrf/common-hal/displayio/ParallelBus.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,8 @@ bool common_hal_displayio_parallelbus_begin_transaction(mp_obj_t obj) {
141141
}
142142

143143
// This ignores chip_select behaviour because data is clocked in by the write line toggling.
144-
void common_hal_displayio_parallelbus_send(mp_obj_t obj, display_byte_type_t byte_type, display_chip_select_behavior_t chip_select, uint8_t *data, uint32_t data_length) {
144+
void common_hal_displayio_parallelbus_send(mp_obj_t obj, display_byte_type_t byte_type,
145+
display_chip_select_behavior_t chip_select, const uint8_t *data, uint32_t data_length) {
145146
displayio_parallelbus_obj_t* self = MP_OBJ_TO_PTR(obj);
146147
common_hal_digitalio_digitalinout_set_value(&self->command, byte_type == DISPLAY_DATA);
147148
uint32_t* clear_write = (uint32_t*) &self->write_group->OUTCLR;

‎ports/stm/common-hal/displayio/ParallelBus.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ bool common_hal_displayio_parallelbus_begin_transaction(mp_obj_t obj) {
5757
return false;
5858
}
5959

60-
void common_hal_displayio_parallelbus_send(mp_obj_t obj, display_byte_type_t byte_type, display_chip_select_behavior_t chip_select, uint8_t *data, uint32_t data_length) {
60+
void common_hal_displayio_parallelbus_send(mp_obj_t obj, display_byte_type_t byte_type,
61+
display_chip_select_behavior_t chip_select, const uint8_t *data, uint32_t data_length) {
6162

6263
}
6364

‎py/circuitpy_mpconfig.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ typedef long mp_off_t;
186186
#define MICROPY_CPYTHON_COMPAT (CIRCUITPY_FULL_BUILD)
187187
#define MICROPY_PY_BUILTINS_POW3 (CIRCUITPY_FULL_BUILD)
188188
#define MICROPY_COMP_FSTRING_LITERAL (MICROPY_CPYTHON_COMPAT)
189-
#define MICROPY_MODULE_WEAK_LINKS (CIRCUITPY_FULL_BUILD)
189+
#define MICROPY_MODULE_WEAK_LINKS (0)
190190
#define MICROPY_PY_ALL_SPECIAL_METHODS (CIRCUITPY_FULL_BUILD)
191191
#define MICROPY_PY_BUILTINS_COMPLEX (CIRCUITPY_FULL_BUILD)
192192
#define MICROPY_PY_BUILTINS_FROZENSET (CIRCUITPY_FULL_BUILD)

0 commit comments

Comments
 (0)