espressif: Implement parallel display using i2s
This commit is contained in:
parent
2f1ac44d78
commit
4714861f38
@ -881,10 +881,6 @@ msgstr ""
|
|||||||
msgid "Data 0 pin must be byte aligned"
|
msgid "Data 0 pin must be byte aligned"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
|
|
||||||
msgid "Data 0 pin must be byte aligned."
|
|
||||||
msgstr ""
|
|
||||||
|
|
||||||
#: shared-module/audiocore/WaveFile.c
|
#: shared-module/audiocore/WaveFile.c
|
||||||
msgid "Data chunk must follow fmt chunk"
|
msgid "Data chunk must follow fmt chunk"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
@ -1238,6 +1234,10 @@ msgstr ""
|
|||||||
msgid "Internal define error"
|
msgid "Internal define error"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
|
||||||
|
msgid "Internal error"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: shared-module/rgbmatrix/RGBMatrix.c
|
#: shared-module/rgbmatrix/RGBMatrix.c
|
||||||
#, c-format
|
#, c-format
|
||||||
msgid "Internal error #%d"
|
msgid "Internal error #%d"
|
||||||
@ -1716,6 +1716,11 @@ msgstr ""
|
|||||||
msgid "Not settable"
|
msgid "Not settable"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
|
||||||
|
#, c-format
|
||||||
|
msgid "Number of data_pins must be 8 or 16, not %d"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: shared-bindings/util.c
|
#: shared-bindings/util.c
|
||||||
msgid ""
|
msgid ""
|
||||||
"Object has been deinitialized and can no longer be used. Create a new object."
|
"Object has been deinitialized and can no longer be used. Create a new object."
|
||||||
@ -2110,6 +2115,10 @@ msgstr ""
|
|||||||
msgid "Source and destination buffers must be the same length"
|
msgid "Source and destination buffers must be the same length"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
#: shared-bindings/paralleldisplay/ParallelBus.c
|
||||||
|
msgid "Specify exactly one of data0 or data_pins"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
#: extmod/modure.c
|
#: extmod/modure.c
|
||||||
msgid "Splitting with sub-captures"
|
msgid "Splitting with sub-captures"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
@ -181,6 +181,7 @@ CFLAGS += -DCFG_TUD_VENDOR_RX_BUFSIZE=128 -DCFG_TUD_VENDOR_TX_BUFSIZE=128
|
|||||||
SRC_C += \
|
SRC_C += \
|
||||||
background.c \
|
background.c \
|
||||||
cam.c \
|
cam.c \
|
||||||
|
i2s_lcd_esp32s2_driver.c \
|
||||||
fatfs_port.c \
|
fatfs_port.c \
|
||||||
mphalport.c \
|
mphalport.c \
|
||||||
bindings/espidf/__init__.c \
|
bindings/espidf/__init__.c \
|
||||||
@ -194,6 +195,8 @@ SRC_C += \
|
|||||||
peripherals/pins.c \
|
peripherals/pins.c \
|
||||||
peripherals/rmt.c
|
peripherals/rmt.c
|
||||||
|
|
||||||
|
$(BUILD)/i2s_lcd_esp32s2_driver.o: CFLAGS += -Wno-sign-compare
|
||||||
|
|
||||||
ifneq ($(CIRCUITPY_USB),0)
|
ifneq ($(CIRCUITPY_USB),0)
|
||||||
SRC_C += lib/tinyusb/src/portable/espressif/esp32sx/dcd_esp32sx.c
|
SRC_C += lib/tinyusb/src/portable/espressif/esp32sx/dcd_esp32sx.c
|
||||||
endif
|
endif
|
||||||
|
@ -24,138 +24,139 @@
|
|||||||
* THE SOFTWARE.
|
* THE SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "shared-bindings/paralleldisplay/ParallelBus.h"
|
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
#include <string.h>
|
||||||
|
|
||||||
#include "common-hal/microcontroller/Pin.h"
|
#include "shared-bindings/paralleldisplay/ParallelBus.h"
|
||||||
#include "py/runtime.h"
|
#include "shared-bindings/microcontroller/Pin.h"
|
||||||
#include "shared-bindings/digitalio/DigitalInOut.h"
|
#include "shared-bindings/digitalio/DigitalInOut.h"
|
||||||
#include "shared-bindings/microcontroller/__init__.h"
|
#include "shared-bindings/microcontroller/__init__.h"
|
||||||
|
|
||||||
|
#include "common-hal/audiobusio/__init__.h"
|
||||||
|
#include "common-hal/microcontroller/Pin.h"
|
||||||
|
#include "py/runtime.h"
|
||||||
|
|
||||||
|
#include "i2s_lcd_driver.h"
|
||||||
|
#include "driver/gpio.h"
|
||||||
/*
|
/*
|
||||||
* Current pin limitations for ESP32-S2 ParallelBus:
|
* Current pin limitations for ESP32-S2 ParallelBus:
|
||||||
* - data0 pin must be byte aligned
|
* - data0 pin must be byte aligned
|
||||||
*/
|
*/
|
||||||
|
|
||||||
void common_hal_paralleldisplay_parallelbus_construct(paralleldisplay_parallelbus_obj_t *self,
|
void common_hal_paralleldisplay_parallelbus_construct_nonsequential(paralleldisplay_parallelbus_obj_t *self,
|
||||||
const mcu_pin_obj_t *data0, const mcu_pin_obj_t *command, const mcu_pin_obj_t *chip_select,
|
uint8_t n_pins, mcu_pin_obj_t **data_pins,
|
||||||
|
const mcu_pin_obj_t *command, const mcu_pin_obj_t *chip_select,
|
||||||
const mcu_pin_obj_t *write, const mcu_pin_obj_t *read, const mcu_pin_obj_t *reset, uint32_t frequency) {
|
const mcu_pin_obj_t *write, const mcu_pin_obj_t *read, const mcu_pin_obj_t *reset, uint32_t frequency) {
|
||||||
|
|
||||||
uint8_t data_pin = data0->number;
|
if (n_pins != 8 && n_pins != 16) {
|
||||||
if (data_pin % 8 != 0) {
|
mp_raise_ValueError_varg(translate("Number of data_pins must be 8 or 16, not %d"), n_pins);
|
||||||
mp_raise_ValueError(translate("Data 0 pin must be byte aligned."));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
for (uint8_t i = 0; i < 8; i++) {
|
for (uint8_t i = 0; i < n_pins; i++) {
|
||||||
if (!pin_number_is_free(data_pin + i)) {
|
if (!common_hal_mcu_pin_is_free(data_pins[i])) {
|
||||||
mp_raise_ValueError_varg(translate("Bus pin %d is already in use"), i);
|
mp_raise_ValueError_varg(translate("Bus pin %d is already in use"), i);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
gpio_dev_t *g = &GPIO; // this is the GPIO registers, see "extern gpio_dev_t GPIO" from file:gpio_struct.h
|
// This will throw if unsuccessful. Everything following is guaranteed to succeed.
|
||||||
|
port_i2s_allocate_i2s0();
|
||||||
|
|
||||||
// Setup the pins as "Simple GPIO outputs" see section 19.3.3 of the ESP32-S2 Reference Manual
|
i2s_lcd_config_t config = {
|
||||||
// Enable pins with "enable_w1ts"
|
.data_width = n_pins,
|
||||||
|
.pin_num_cs = common_hal_mcu_pin_number(chip_select),
|
||||||
|
.pin_num_wr = common_hal_mcu_pin_number(write), // write strobe
|
||||||
|
.pin_num_rs = common_hal_mcu_pin_number(command), // The "register select" pin is called "command" by CircuitPython
|
||||||
|
.clk_freq = frequency,
|
||||||
|
.i2s_port = 0,
|
||||||
|
.swap_data = false,
|
||||||
|
.buffer_size = 512,
|
||||||
|
};
|
||||||
|
|
||||||
for (uint8_t i = 0; i < 8; i++) {
|
|
||||||
g->enable_w1ts = (0x1 << (data_pin + i));
|
|
||||||
g->func_out_sel_cfg[data_pin + i].val = 256; /* setup output pin for simple GPIO Output, (0x100 = 256) */
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
/* From my understanding, there is a limitation of the ESP32-S2 that does not allow single-byte writes
|
|
||||||
* into the GPIO registers. See section 10.3.3 regarding "non-aligned writes" into the registers.
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
if (data_pin < 31) {
|
|
||||||
self->bus = (uint32_t *)&g->out; // pointer to GPIO output register (for pins 0-31)
|
|
||||||
} else {
|
|
||||||
self->bus = (uint32_t *)&g->out1.val; // pointer to GPIO output register (for pins >= 32)
|
|
||||||
}
|
|
||||||
|
|
||||||
/* SNIP - common setup of command, chip select, write and read pins, same as from SAMD and NRF ports */
|
|
||||||
self->command.base.type = &digitalio_digitalinout_type;
|
|
||||||
common_hal_digitalio_digitalinout_construct(&self->command, command);
|
|
||||||
common_hal_digitalio_digitalinout_switch_to_output(&self->command, true, DRIVE_MODE_PUSH_PULL);
|
|
||||||
|
|
||||||
self->chip_select.base.type = &digitalio_digitalinout_type;
|
|
||||||
common_hal_digitalio_digitalinout_construct(&self->chip_select, chip_select);
|
|
||||||
common_hal_digitalio_digitalinout_switch_to_output(&self->chip_select, true, DRIVE_MODE_PUSH_PULL);
|
|
||||||
|
|
||||||
self->write.base.type = &digitalio_digitalinout_type;
|
|
||||||
common_hal_digitalio_digitalinout_construct(&self->write, write);
|
|
||||||
common_hal_digitalio_digitalinout_switch_to_output(&self->write, true, DRIVE_MODE_PUSH_PULL);
|
|
||||||
|
|
||||||
self->read.base.type = &digitalio_digitalinout_type;
|
|
||||||
common_hal_digitalio_digitalinout_construct(&self->read, read);
|
|
||||||
common_hal_digitalio_digitalinout_switch_to_output(&self->read, true, DRIVE_MODE_PUSH_PULL);
|
|
||||||
|
|
||||||
self->data0_pin = data_pin;
|
|
||||||
|
|
||||||
if (write->number < 32) {
|
|
||||||
self->write_clear_register = (uint32_t *)&g->out_w1tc;
|
|
||||||
self->write_set_register = (uint32_t *)&g->out_w1ts;
|
|
||||||
} else {
|
|
||||||
self->write_clear_register = (uint32_t *)&g->out1_w1tc.val;
|
|
||||||
self->write_set_register = (uint32_t *)&g->out1_w1ts.val;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Check to see if the data and write pins are on the same register:
|
|
||||||
if ((((self->data0_pin < 32) && (write->number < 32))) ||
|
|
||||||
(((self->data0_pin > 31) && (write->number > 31)))) {
|
|
||||||
self->data_write_same_register = true; // data pins and write pin are on the same register
|
|
||||||
} else {
|
|
||||||
self->data_write_same_register = false; // data pins and write pins are on different registers
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
self->write_mask = 1 << (write->number % 32); /* the write pin triggers the LCD to latch the data */
|
|
||||||
|
|
||||||
/* SNIP - common setup of the reset pin, same as from SAMD and NRF ports */
|
|
||||||
self->reset.base.type = &mp_type_NoneType;
|
|
||||||
if (reset != NULL) {
|
if (reset != NULL) {
|
||||||
self->reset.base.type = &digitalio_digitalinout_type;
|
common_hal_never_reset_pin(reset);
|
||||||
common_hal_digitalio_digitalinout_construct(&self->reset, reset);
|
self->reset_pin_number = reset->number;
|
||||||
common_hal_digitalio_digitalinout_switch_to_output(&self->reset, true, DRIVE_MODE_PUSH_PULL);
|
} else {
|
||||||
never_reset_pin_number(reset->number);
|
self->reset_pin_number = NO_PIN;
|
||||||
common_hal_paralleldisplay_parallelbus_reset(self);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
never_reset_pin_number(command->number);
|
for (uint8_t i = 0; i < n_pins; i++) {
|
||||||
never_reset_pin_number(chip_select->number);
|
common_hal_never_reset_pin(data_pins[i]);
|
||||||
never_reset_pin_number(write->number);
|
config.pin_data_num[i] = common_hal_mcu_pin_number(data_pins[i]);
|
||||||
never_reset_pin_number(read->number);
|
|
||||||
for (uint8_t i = 0; i < 8; i++) {
|
|
||||||
never_reset_pin_number(data_pin + i);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (read != NULL) {
|
||||||
|
common_hal_never_reset_pin(read);
|
||||||
|
gpio_config_t read_config = {
|
||||||
|
.pin_bit_mask = 1ull << read->number,
|
||||||
|
.mode = GPIO_MODE_OUTPUT,
|
||||||
|
.pull_up_en = GPIO_PULLUP_DISABLE,
|
||||||
|
.pull_down_en = GPIO_PULLDOWN_DISABLE,
|
||||||
|
.intr_type = GPIO_INTR_DISABLE,
|
||||||
|
};
|
||||||
|
gpio_config(&read_config);
|
||||||
|
self->read_pin_number = read->number;
|
||||||
|
gpio_set_level(read->number, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
common_hal_never_reset_pin(chip_select);
|
||||||
|
common_hal_never_reset_pin(command);
|
||||||
|
common_hal_never_reset_pin(read);
|
||||||
|
common_hal_never_reset_pin(reset);
|
||||||
|
common_hal_never_reset_pin(write);
|
||||||
|
|
||||||
|
self->config = config;
|
||||||
|
self->handle = i2s_lcd_driver_init(&config);
|
||||||
|
|
||||||
|
if (!self->handle) {
|
||||||
|
port_i2s_reset_instance(0);
|
||||||
|
mp_raise_RuntimeError(translate("Internal error"));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void common_hal_paralleldisplay_parallelbus_construct(paralleldisplay_parallelbus_obj_t *self,
|
||||||
|
const mcu_pin_obj_t *data0, const mcu_pin_obj_t *command, const mcu_pin_obj_t *chip_select,
|
||||||
|
const mcu_pin_obj_t *write, const mcu_pin_obj_t *read, const mcu_pin_obj_t *reset, uint32_t frequency) {
|
||||||
|
char buf[7];
|
||||||
|
mcu_pin_obj_t *data_pins[8];
|
||||||
|
for (int i = 0; i < 8; i++) {
|
||||||
|
snprintf(buf, sizeof(buf), "GPIO%d", data0->number + i);
|
||||||
|
data_pins[i] = validate_obj_is_free_pin(mp_obj_dict_get(MP_OBJ_FROM_PTR(&mcu_pin_globals), mp_obj_new_str(buf, strlen(buf))));
|
||||||
|
}
|
||||||
|
common_hal_paralleldisplay_parallelbus_construct_nonsequential(self, 8, data_pins, command, chip_select, write, read, reset, frequency);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
void common_hal_paralleldisplay_parallelbus_deinit(paralleldisplay_parallelbus_obj_t *self) {
|
void common_hal_paralleldisplay_parallelbus_deinit(paralleldisplay_parallelbus_obj_t *self) {
|
||||||
|
if (!self->handle) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
i2s_lcd_driver_deinit(self->handle);
|
||||||
|
self->handle = NULL;
|
||||||
/* SNIP - same as from SAMD and NRF ports */
|
/* SNIP - same as from SAMD and NRF ports */
|
||||||
for (uint8_t i = 0; i < 8; i++) {
|
for (uint8_t i = 0; i < self->config.data_width; i++) {
|
||||||
reset_pin_number(self->data0_pin + i);
|
reset_pin_number(self->config.pin_data_num[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
reset_pin_number(self->command.pin->number);
|
reset_pin_number(self->config.pin_num_cs);
|
||||||
reset_pin_number(self->chip_select.pin->number);
|
reset_pin_number(self->config.pin_num_wr);
|
||||||
reset_pin_number(self->write.pin->number);
|
reset_pin_number(self->read_pin_number);
|
||||||
reset_pin_number(self->read.pin->number);
|
reset_pin_number(self->config.pin_num_rs);
|
||||||
reset_pin_number(self->reset.pin->number);
|
reset_pin_number(self->reset_pin_number);
|
||||||
|
|
||||||
|
port_i2s_reset_instance(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool common_hal_paralleldisplay_parallelbus_reset(mp_obj_t obj) {
|
bool common_hal_paralleldisplay_parallelbus_reset(mp_obj_t obj) {
|
||||||
/* SNIP - same as from SAMD and NRF ports */
|
/* SNIP - same as from SAMD and NRF ports */
|
||||||
paralleldisplay_parallelbus_obj_t *self = MP_OBJ_TO_PTR(obj);
|
paralleldisplay_parallelbus_obj_t *self = MP_OBJ_TO_PTR(obj);
|
||||||
if (self->reset.base.type == &mp_type_NoneType) {
|
if (self->reset_pin_number == NO_PIN) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
common_hal_digitalio_digitalinout_set_value(&self->reset, false);
|
gpio_set_level(self->reset_pin_number, false);
|
||||||
common_hal_mcu_delay_us(4);
|
common_hal_mcu_delay_us(4);
|
||||||
common_hal_digitalio_digitalinout_set_value(&self->reset, true);
|
gpio_set_level(self->reset_pin_number, true);
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
}
|
}
|
||||||
@ -166,62 +167,25 @@ bool common_hal_paralleldisplay_parallelbus_bus_free(mp_obj_t obj) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool common_hal_paralleldisplay_parallelbus_begin_transaction(mp_obj_t obj) {
|
bool common_hal_paralleldisplay_parallelbus_begin_transaction(mp_obj_t obj) {
|
||||||
/* SNIP - same as from SAMD and NRF ports */
|
|
||||||
paralleldisplay_parallelbus_obj_t *self = MP_OBJ_TO_PTR(obj);
|
paralleldisplay_parallelbus_obj_t *self = MP_OBJ_TO_PTR(obj);
|
||||||
common_hal_digitalio_digitalinout_set_value(&self->chip_select, false);
|
bool r = i2s_lcd_acquire_nonblocking(self->handle, 1);
|
||||||
return true;
|
if (r) {
|
||||||
|
gpio_set_level(self->config.pin_num_cs, false);
|
||||||
|
}
|
||||||
|
return r;
|
||||||
}
|
}
|
||||||
|
|
||||||
void common_hal_paralleldisplay_parallelbus_send(mp_obj_t obj, display_byte_type_t byte_type,
|
void common_hal_paralleldisplay_parallelbus_send(mp_obj_t obj, display_byte_type_t byte_type,
|
||||||
display_chip_select_behavior_t chip_select, const uint8_t *data, uint32_t data_length) {
|
display_chip_select_behavior_t chip_select, const uint8_t *data, uint32_t data_length) {
|
||||||
paralleldisplay_parallelbus_obj_t *self = MP_OBJ_TO_PTR(obj);
|
paralleldisplay_parallelbus_obj_t *self = MP_OBJ_TO_PTR(obj);
|
||||||
common_hal_digitalio_digitalinout_set_value(&self->command, byte_type == DISPLAY_DATA);
|
if (data_length) {
|
||||||
|
gpio_set_level(self->config.pin_num_rs, byte_type == DISPLAY_DATA);
|
||||||
uint32_t *clear_write = self->write_clear_register;
|
i2s_lcd_write(self->handle, data, data_length);
|
||||||
uint32_t *set_write = self->write_set_register;
|
|
||||||
|
|
||||||
const uint32_t mask = self->write_mask;
|
|
||||||
|
|
||||||
/* Setup structures for data writing. The ESP32-S2 port differs from the SAMD and NRF ports
|
|
||||||
* because I have not found a way to write a single byte into the ESP32-S2 registers.
|
|
||||||
* For the ESP32-S2, I create a 32-bit data_buffer that is used to transfer the data bytes.
|
|
||||||
*/
|
|
||||||
|
|
||||||
*clear_write = mask; // Clear the write pin to prepare the registers before storing the
|
|
||||||
// register value into data_buffer
|
|
||||||
|
|
||||||
const uint32_t data_buffer = *self->bus; // store the initial output register values into the data output buffer
|
|
||||||
uint8_t *data_address = ((uint8_t *)&data_buffer) + (self->data0_pin / 8); /* address inside data_buffer where
|
|
||||||
* each data byte will be written to the data pin registers
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
if (self->data_write_same_register) { // data and write pins are on the same register
|
|
||||||
for (uint32_t i = 0; i < data_length; i++) {
|
|
||||||
|
|
||||||
/* Note: If the write pin and data pins are controlled by the same GPIO register, we can eliminate
|
|
||||||
* the "clear_write" step below, since the write pin is cleared when the data_buffer is written
|
|
||||||
* to the bus.
|
|
||||||
*/
|
|
||||||
|
|
||||||
*(data_address) = data[i]; // stuff the data byte into the data_buffer at the correct offset byte location
|
|
||||||
*self->bus = data_buffer; // write the data to the output register
|
|
||||||
*set_write = mask; // set the write pin
|
|
||||||
}
|
}
|
||||||
} else { // data and write pins are on different registers
|
|
||||||
for (uint32_t i = 0; i < data_length; i++) {
|
|
||||||
*clear_write = mask; // clear the write pin (See comment above, this may not be necessary).
|
|
||||||
*(data_address) = data[i]; // stuff the data byte into the data_buffer at the correct offset byte location
|
|
||||||
*self->bus = data_buffer; // write the data to the output register
|
|
||||||
*set_write = mask; // set the write pin
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void common_hal_paralleldisplay_parallelbus_end_transaction(mp_obj_t obj) {
|
void common_hal_paralleldisplay_parallelbus_end_transaction(mp_obj_t obj) {
|
||||||
/* SNIP - same as from SAMD and NRF ports */
|
|
||||||
paralleldisplay_parallelbus_obj_t *self = MP_OBJ_TO_PTR(obj);
|
paralleldisplay_parallelbus_obj_t *self = MP_OBJ_TO_PTR(obj);
|
||||||
common_hal_digitalio_digitalinout_set_value(&self->chip_select, true);
|
i2s_lcd_release(self->handle);
|
||||||
|
gpio_set_level(self->config.pin_num_cs, true);
|
||||||
}
|
}
|
||||||
|
@ -28,20 +28,14 @@
|
|||||||
#define MICROPY_INCLUDED_ESP32S2_COMMON_HAL_PARALLELDISPLAY_PARALLELBUS_H
|
#define MICROPY_INCLUDED_ESP32S2_COMMON_HAL_PARALLELDISPLAY_PARALLELBUS_H
|
||||||
|
|
||||||
#include "common-hal/digitalio/DigitalInOut.h"
|
#include "common-hal/digitalio/DigitalInOut.h"
|
||||||
|
#include "i2s_lcd_driver.h"
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
mp_obj_base_t base;
|
mp_obj_base_t base;
|
||||||
uint32_t *bus; // pointer where 8 bits of data are written to the display
|
uint8_t read_pin_number;
|
||||||
digitalio_digitalinout_obj_t command;
|
uint8_t reset_pin_number;
|
||||||
digitalio_digitalinout_obj_t chip_select;
|
i2s_lcd_config_t config;
|
||||||
digitalio_digitalinout_obj_t reset;
|
i2s_lcd_handle_t handle;
|
||||||
digitalio_digitalinout_obj_t write;
|
|
||||||
digitalio_digitalinout_obj_t read;
|
|
||||||
uint8_t data0_pin; // pin number for the lowest number data pin. Must be 8-bit aligned
|
|
||||||
bool data_write_same_register; // if data and write pins are in the sare
|
|
||||||
uint32_t *write_set_register; // pointer to the write group for setting the write bit to latch the data on the LCD
|
|
||||||
uint32_t *write_clear_register; // pointer to the write group for clearing the write bit to latch the data on the LCD
|
|
||||||
uint32_t write_mask; // bit mask for the single bit for the write pin register
|
|
||||||
} paralleldisplay_parallelbus_obj_t;
|
} paralleldisplay_parallelbus_obj_t;
|
||||||
|
|
||||||
#endif // MICROPY_INCLUDED_ESP32S2_COMMON_HAL_PARALLELDISPLAY_PARALLELBUS_H
|
#endif // MICROPY_INCLUDED_ESP32S2_COMMON_HAL_PARALLELDISPLAY_PARALLELBUS_H
|
||||||
|
@ -109,6 +109,15 @@ esp_err_t i2s_lcd_write(i2s_lcd_handle_t handle, const uint8_t *data, uint32_t l
|
|||||||
*/
|
*/
|
||||||
esp_err_t i2s_lcd_acquire(i2s_lcd_handle_t handle);
|
esp_err_t i2s_lcd_acquire(i2s_lcd_handle_t handle);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief acquire a lock, but only wait a certain period of time
|
||||||
|
*
|
||||||
|
* @param handle Handle of i2s lcd driver
|
||||||
|
*
|
||||||
|
* @return true if the lock was acquired, false otherwise
|
||||||
|
*/
|
||||||
|
bool i2s_lcd_acquire_nonblocking(i2s_lcd_handle_t handle, TickType_t ticks_to_wait);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief release a lock
|
* @brief release a lock
|
||||||
*
|
*
|
||||||
|
@ -456,9 +456,20 @@ esp_err_t i2s_lcd_acquire(i2s_lcd_handle_t handle) {
|
|||||||
return ESP_OK;
|
return ESP_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool i2s_lcd_acquire_nonblocking(i2s_lcd_handle_t handle, TickType_t ticks_to_wait) {
|
||||||
|
i2s_lcd_driver_t *i2s_lcd_drv = (i2s_lcd_driver_t *)handle;
|
||||||
|
return xSemaphoreTake(i2s_lcd_drv->mutex, ticks_to_wait);
|
||||||
|
}
|
||||||
|
|
||||||
esp_err_t i2s_lcd_release(i2s_lcd_handle_t handle) {
|
esp_err_t i2s_lcd_release(i2s_lcd_handle_t handle) {
|
||||||
i2s_lcd_driver_t *i2s_lcd_drv = (i2s_lcd_driver_t *)handle;
|
i2s_lcd_driver_t *i2s_lcd_drv = (i2s_lcd_driver_t *)handle;
|
||||||
I2S_CHECK(NULL != i2s_lcd_drv, "handle pointer invalid", ESP_ERR_INVALID_ARG);
|
I2S_CHECK(NULL != i2s_lcd_drv, "handle pointer invalid", ESP_ERR_INVALID_ARG);
|
||||||
|
i2s_dev_t *i2s_dev = &I2S0;
|
||||||
|
// at this point, the DMA is done but there could still be data in the FIFO. so we need
|
||||||
|
// to wait for I2S_TX_IDLE so that it's safe e.g., for calling code to deassert CS
|
||||||
|
while (!i2s_dev->state.tx_idle) {
|
||||||
|
;
|
||||||
|
}
|
||||||
BaseType_t ret = xSemaphoreGive(i2s_lcd_drv->mutex);
|
BaseType_t ret = xSemaphoreGive(i2s_lcd_drv->mutex);
|
||||||
I2S_CHECK(pdTRUE == ret, "Give semaphore failed", ESP_FAIL);
|
I2S_CHECK(pdTRUE == ret, "Give semaphore failed", ESP_FAIL);
|
||||||
return ESP_OK;
|
return ESP_OK;
|
||||||
|
@ -51,6 +51,7 @@
|
|||||||
//| code is done.) So, the first time you initialize a display bus in code.py you should call
|
//| code is done.) So, the first time you initialize a display bus in code.py you should call
|
||||||
//| :py:func:`displayio.release_displays` first, otherwise it will error after the first code.py run.
|
//| :py:func:`displayio.release_displays` first, otherwise it will error after the first code.py run.
|
||||||
//|
|
//|
|
||||||
|
//| :param microcontroller.Pin data_pins: A list of data pins. Specify exactly one of `data_pins` or `data0`.
|
||||||
//| :param microcontroller.Pin data0: The first data pin. The rest are implied
|
//| :param microcontroller.Pin data0: The first data pin. The rest are implied
|
||||||
//| :param microcontroller.Pin command: Data or command pin
|
//| :param microcontroller.Pin command: Data or command pin
|
||||||
//| :param microcontroller.Pin chip_select: Chip select pin
|
//| :param microcontroller.Pin chip_select: Chip select pin
|
||||||
@ -61,9 +62,10 @@
|
|||||||
//| ...
|
//| ...
|
||||||
//|
|
//|
|
||||||
STATIC mp_obj_t paralleldisplay_parallelbus_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
|
STATIC mp_obj_t paralleldisplay_parallelbus_make_new(const mp_obj_type_t *type, size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
|
||||||
enum { ARG_data0, ARG_command, ARG_chip_select, ARG_write, ARG_read, ARG_reset, ARG_frequency };
|
enum { ARG_data0, ARG_data_pins, ARG_command, ARG_chip_select, ARG_write, ARG_read, ARG_reset, ARG_frequency };
|
||||||
static const mp_arg_t allowed_args[] = {
|
static const mp_arg_t allowed_args[] = {
|
||||||
{ MP_QSTR_data0, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
|
{ MP_QSTR_data0, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none } },
|
||||||
|
{ MP_QSTR_data_pins, MP_ARG_OBJ | MP_ARG_KW_ONLY, {.u_obj = mp_const_none } },
|
||||||
{ MP_QSTR_command, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
|
{ MP_QSTR_command, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
|
||||||
{ MP_QSTR_chip_select, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
|
{ MP_QSTR_chip_select, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
|
||||||
{ MP_QSTR_write, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
|
{ MP_QSTR_write, MP_ARG_OBJ | MP_ARG_KW_ONLY | MP_ARG_REQUIRED },
|
||||||
@ -74,7 +76,6 @@ STATIC mp_obj_t paralleldisplay_parallelbus_make_new(const mp_obj_type_t *type,
|
|||||||
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
|
mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
|
||||||
mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
|
mp_arg_parse_all(n_args, pos_args, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
|
||||||
|
|
||||||
mcu_pin_obj_t *data0 = validate_obj_is_free_pin(args[ARG_data0].u_obj);
|
|
||||||
mcu_pin_obj_t *command = validate_obj_is_free_pin(args[ARG_command].u_obj);
|
mcu_pin_obj_t *command = validate_obj_is_free_pin(args[ARG_command].u_obj);
|
||||||
mcu_pin_obj_t *chip_select = validate_obj_is_free_pin(args[ARG_chip_select].u_obj);
|
mcu_pin_obj_t *chip_select = validate_obj_is_free_pin(args[ARG_chip_select].u_obj);
|
||||||
mcu_pin_obj_t *write = validate_obj_is_free_pin(args[ARG_write].u_obj);
|
mcu_pin_obj_t *write = validate_obj_is_free_pin(args[ARG_write].u_obj);
|
||||||
@ -84,7 +85,22 @@ STATIC mp_obj_t paralleldisplay_parallelbus_make_new(const mp_obj_type_t *type,
|
|||||||
paralleldisplay_parallelbus_obj_t *self = &allocate_display_bus_or_raise()->parallel_bus;
|
paralleldisplay_parallelbus_obj_t *self = &allocate_display_bus_or_raise()->parallel_bus;
|
||||||
self->base.type = ¶lleldisplay_parallelbus_type;
|
self->base.type = ¶lleldisplay_parallelbus_type;
|
||||||
|
|
||||||
|
bool specified_data0 = args[ARG_data0].u_obj != mp_const_none;
|
||||||
|
bool specified_data_pins = args[ARG_data_pins].u_obj != mp_const_none;
|
||||||
|
|
||||||
|
if (specified_data0 == specified_data_pins) {
|
||||||
|
mp_raise_ValueError(translate("Specify exactly one of data0 or data_pins"));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (specified_data0) {
|
||||||
|
mcu_pin_obj_t *data0 = validate_obj_is_free_pin(args[ARG_data0].u_obj);
|
||||||
common_hal_paralleldisplay_parallelbus_construct(self, data0, command, chip_select, write, read, reset, args[ARG_frequency].u_int);
|
common_hal_paralleldisplay_parallelbus_construct(self, data0, command, chip_select, write, read, reset, args[ARG_frequency].u_int);
|
||||||
|
} else {
|
||||||
|
uint8_t num_pins;
|
||||||
|
mcu_pin_obj_t *data_pins[16];
|
||||||
|
validate_list_is_free_pins(MP_QSTR_data_pins, data_pins, (mp_int_t)MP_ARRAY_SIZE(data_pins), args[ARG_data_pins].u_obj, &num_pins);
|
||||||
|
common_hal_paralleldisplay_parallelbus_construct_nonsequential(self, num_pins, data_pins, command, chip_select, write, read, reset, args[ARG_frequency].u_int);
|
||||||
|
}
|
||||||
return self;
|
return self;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -38,6 +38,10 @@ void common_hal_paralleldisplay_parallelbus_construct(paralleldisplay_parallelbu
|
|||||||
const mcu_pin_obj_t *data0, const mcu_pin_obj_t *command, const mcu_pin_obj_t *chip_select,
|
const mcu_pin_obj_t *data0, const mcu_pin_obj_t *command, const mcu_pin_obj_t *chip_select,
|
||||||
const mcu_pin_obj_t *write, const mcu_pin_obj_t *read, const mcu_pin_obj_t *reset, uint32_t frequency);
|
const mcu_pin_obj_t *write, const mcu_pin_obj_t *read, const mcu_pin_obj_t *reset, uint32_t frequency);
|
||||||
|
|
||||||
|
void common_hal_paralleldisplay_parallelbus_construct_nonsequential(paralleldisplay_parallelbus_obj_t *self,
|
||||||
|
uint8_t n_pins, mcu_pin_obj_t **data_pins, const mcu_pin_obj_t *command, const mcu_pin_obj_t *chip_select,
|
||||||
|
const mcu_pin_obj_t *write, const mcu_pin_obj_t *read, const mcu_pin_obj_t *reset, uint32_t frequency);
|
||||||
|
|
||||||
void common_hal_paralleldisplay_parallelbus_deinit(paralleldisplay_parallelbus_obj_t *self);
|
void common_hal_paralleldisplay_parallelbus_deinit(paralleldisplay_parallelbus_obj_t *self);
|
||||||
|
|
||||||
bool common_hal_paralleldisplay_parallelbus_reset(mp_obj_t self);
|
bool common_hal_paralleldisplay_parallelbus_reset(mp_obj_t self);
|
||||||
|
Loading…
Reference in New Issue
Block a user