Skip to content

Commit

Permalink
tweak for ESP-IDF v5
Browse files Browse the repository at this point in the history
  • Loading branch information
@lovyan03
lovyan03 committed Nov 5, 2024
1 parent 655948c commit 33ce909
Show file tree
Hide file tree
Showing 6 changed files with 174 additions and 42 deletions.
2 changes: 1 addition & 1 deletion src/lgfx/v1/gitTagVersion.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#define LGFX_VERSION_MAJOR 1
#define LGFX_VERSION_MINOR 1
#define LGFX_VERSION_PATCH 16
#define LGFX_VERSION_PATCH 17
#define LOVYANGFX_VERSION F( LGFX_VERSION_MAJOR "." LGFX_VERSION_MINOR "." LGFX_VERSION_PATCH )
96 changes: 90 additions & 6 deletions src/lgfx/v1/panel/Panel_M5HDMI.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -347,29 +347,107 @@ namespace lgfx
return true;
}

void Panel_M5HDMI::HDMI_Trans::_i2c_backup(void)
{
int i2c_port = HDMI_Trans_config.i2c_port;
auto sda = lgfx::i2c::getPinSDA(i2c_port);
int prev_sda = -1;
if (sda.has_value())
{
prev_sda = sda.value();
}
_pin_backup[0].setPin(prev_sda);
_pin_backup[0].backup();

auto scl = lgfx::i2c::getPinSCL(i2c_port);
int prev_scl = -1;
if (scl.has_value())
{
prev_scl = scl.value();
}
_pin_backup[1].setPin(prev_scl);
_pin_backup[1].backup();

int new_sda = _pin_backup[2].getPin();
int new_scl = _pin_backup[3].getPin();
if (new_sda >= 0 && new_scl >= 0)
{
if (prev_sda != new_sda || prev_scl != new_scl)
{
// lgfx::i2c::setPins(i2c_port, new_sda, new_scl);
lgfx::i2c::init(i2c_port, new_sda, new_scl);
const uint8_t gpio_command[] = {
lgfx::gpio::command_mode_output, (uint8_t)new_scl,
lgfx::gpio::command_write_low , (uint8_t)new_scl,
lgfx::gpio::command_mode_output, (uint8_t)new_sda,
lgfx::gpio::command_write_low , (uint8_t)new_sda,
lgfx::gpio::command_write_high , (uint8_t)new_scl,
lgfx::gpio::command_write_high , (uint8_t)new_sda,
lgfx::gpio::command_write_low , (uint8_t)new_scl,
lgfx::gpio::command_write_low , (uint8_t)new_sda,
lgfx::gpio::command_write_high , (uint8_t)new_scl,
lgfx::gpio::command_write_high , (uint8_t)new_sda,
lgfx::gpio::command_end
};
lgfx::gpio::command(gpio_command);
_pin_backup[2].restore();
_pin_backup[3].restore();
}
}
}

void Panel_M5HDMI::HDMI_Trans::_i2c_restore(void)
{
lgfx::i2c::init(HDMI_Trans_config.i2c_port, _pin_backup[0].getPin(), _pin_backup[1].getPin());
_pin_backup[0].restore();
_pin_backup[1].restore();
}

Panel_M5HDMI::HDMI_Trans::ChipID Panel_M5HDMI::HDMI_Trans::readChipID(void)
{
ChipID chip_id = { 0,0,0 };

_i2c_backup();
if (this->writeRegister(0xff, 0x80)
&& this->writeRegister(0xee, 0x01))
{
chip_id.id[0] = this->readRegister(0x00);
chip_id.id[1] = this->readRegister(0x01);
chip_id.id[2] = this->readRegister(0x02);
}
_i2c_restore();

return chip_id;
}

void Panel_M5HDMI::HDMI_Trans::reset(void)
{
_i2c_backup();
static constexpr const uint8_t data[] = { 0xff, 0x81, 0x30, 0x00, 0x02, 0x66, 0x0a, 0x06, 0x15, 0x06, 0x4e, 0xa8, 0xff, 0x80, 0xee, 0x01, 0x11, 0x00, 0x13, 0xf1, 0x13, 0xf9, 0x0a, 0x80, 0xff, 0x82, 0x1b, 0x77, 0x1c, 0xec, 0x45, 0x00, 0x4f, 0x40, 0x50, 0x00, 0x47, 0x07 };
this->writeRegisterSet(data, sizeof(data));
_i2c_restore();
}

Panel_M5HDMI::HDMI_Trans::HDMI_Trans(const lgfx::Bus_I2C::config_t& i2c_config)
{
HDMI_Trans_config.i2c_port = i2c_config.i2c_port;
// _pin_backup[2].setPin(GPIO_NUM_NC);
// _pin_backup[3].setPin(GPIO_NUM_NC);
_i2c_backup();
HDMI_Trans_config = i2c_config;
lgfx::i2c::release(HDMI_Trans_config.i2c_port);
lgfx::i2c::init(HDMI_Trans_config.i2c_port, HDMI_Trans_config.pin_sda, HDMI_Trans_config.pin_scl);
_pin_backup[2].setPin(HDMI_Trans_config.pin_sda);
_pin_backup[3].setPin(HDMI_Trans_config.pin_scl);
_pin_backup[2].backup();
_pin_backup[3].backup();
_i2c_restore();
}

bool Panel_M5HDMI::HDMI_Trans::init(void)
{
auto id = this->readChipID();
_i2c_backup();
{
// 96kHz audio setting.
// static constexpr const uint8_t data_1[] = { 0xff, 0x82, 0xD6, 0x8E, 0xD7, 0x04, 0xff, 0x84, 0x06, 0x08, 0x07, 0x10, 0x09, 0x00, 0x0F, 0xAB, 0x34, 0xD5, 0x35, 0x00, 0x36, 0x30, 0x37, 0x00, 0x3C, 0x21,
Expand All @@ -393,6 +471,7 @@ namespace lgfx
this->writeRegisterSet(data_u3, sizeof(data_u3));
}

bool result = false;
for (int i = 0; i < 8; ++i)
{
static constexpr const uint8_t data_pll[] = { 0xff, 0x80, 0x16, 0xf1, 0x18, 0xdc, 0x18, 0xfc, 0x16, 0xf3, 0x16, 0xe3, 0x16, 0xf3, 0xff, 0x82 };
Expand All @@ -404,15 +483,21 @@ namespace lgfx
{
static constexpr const uint8_t data[] = { 0xb9, 0x00, 0xff, 0x84, 0x43, 0x31, 0x44, 0x10, 0x45, 0x2a, 0x47, 0x04, 0x10, 0x2c, 0x12, 0x64, 0x3d, 0x0a, 0xff, 0x80, 0x11, 0x00, 0x13, 0xf1, 0x13, 0xf9, 0xff, 0x81, 0x31, 0x44, 0x32, 0x4a, 0x33, 0x0b, 0x34, 0x00, 0x35, 0x00, 0x36, 0x00, 0x37, 0x44, 0x3f, 0x0f, 0x40, 0xa0, 0x41, 0xa0, 0x42, 0xa0, 0x43, 0xa0, 0x44, 0xa0, 0x30, 0xea };
this->writeRegisterSet(data, sizeof(data));
return true;
result = true;
break;
}
}
ESP_LOGE(TAG, "failed to initialize the HDMI transmitter.");
return false;
_i2c_restore();
if (!result) {
ESP_LOGE(TAG, "failed to initialize the HDMI transmitter.");
return false;
}
return true;
}

size_t Panel_M5HDMI::HDMI_Trans::readEDID(uint8_t* EDID, size_t len)
{
_i2c_backup();
static constexpr const uint8_t data[] = { 0xff, 0x85 ,0x03, 0xc9 ,0x04, 0xA0 ,0x06, 0x20 ,0x14, 0x7f };
this->writeRegisterSet(data, sizeof(data));

Expand Down Expand Up @@ -440,6 +525,7 @@ namespace lgfx
}
static constexpr const uint8_t data3[] = { 0x03, 0xc2 ,0x07, 0x1f };
this->writeRegisterSet(data3, sizeof(data3));
_i2c_restore();
return result;
}

Expand Down Expand Up @@ -467,10 +553,8 @@ namespace lgfx
{
ESP_LOGI(TAG, "i2c port:%d sda:%d scl:%d", _HDMI_Trans_config.i2c_port, _HDMI_Trans_config.pin_sda, _HDMI_Trans_config.pin_scl);

lgfx::i2c::init(_HDMI_Trans_config.i2c_port, _HDMI_Trans_config.pin_sda, _HDMI_Trans_config.pin_scl);

HDMI_Trans driver(_HDMI_Trans_config);

auto result = driver.readChipID();
ESP_LOGI(TAG, "Chip ID: %02x %02x %02x", result.id[0], result.id[1], result.id[2]);
if (result.id[0] == result.id[1] && result.id[0] == result.id[2])
Expand Down
5 changes: 4 additions & 1 deletion src/lgfx/v1/panel/Panel_M5HDMI.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,9 @@ namespace lgfx
typedef lgfx::Bus_I2C::config_t config_t;
private:
config_t HDMI_Trans_config;
gpio::pin_backup_t _pin_backup[4];
void _i2c_backup(void);
void _i2c_restore(void);

uint8_t readRegister(uint8_t register_address);
uint16_t readRegister16(uint8_t register_address);
Expand All @@ -227,7 +230,7 @@ namespace lgfx
uint8_t id[3];
};

HDMI_Trans(const lgfx::Bus_I2C::config_t& i2c_config) : HDMI_Trans_config(i2c_config) {}
HDMI_Trans(const lgfx::Bus_I2C::config_t& i2c_config);
HDMI_Trans(const HDMI_Trans&) = delete;
HDMI_Trans(HDMI_Trans&&) = delete;
ChipID readChipID(void);
Expand Down
8 changes: 2 additions & 6 deletions src/lgfx/v1/platforms/esp32/Bus_SPI.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,7 @@ Original Source:

#include "Bus_SPI.hpp"

/// ESP32-S3をターゲットにした際にREG_SPI_BASEが定義されていなかったので応急処置 ;
#if defined ( CONFIG_IDF_TARGET_ESP32S3 )
#if !defined( REG_SPI_BASE )
#define REG_SPI_BASE(i) (DR_REG_SPI1_BASE + (((i)>1) ? (((i)* 0x1000) + 0x20000) : (((~(i)) & 1)* 0x1000 )))
#endif
#elif defined ( CONFIG_IDF_TARGET_ESP32 ) || !defined ( CONFIG_IDF_TARGET )
#if defined ( CONFIG_IDF_TARGET_ESP32 ) || !defined ( CONFIG_IDF_TARGET )
#define LGFX_SPIDMA_WORKAROUND
#endif

Expand Down Expand Up @@ -613,6 +608,7 @@ namespace lgfx
goto label_start;
do
{
vTaskDelay(1 / portTICK_PERIOD_MS);
while (*cmd & SPI_USR) {}
label_start:
exec_spi();
Expand Down
81 changes: 60 additions & 21 deletions src/lgfx/v1/platforms/esp32/common.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -348,10 +348,17 @@ namespace lgfx
_gpio_pin_reg = *reinterpret_cast<uint32_t*>(GPIO_PIN0_REG + (pin_num * 4));
_gpio_func_out_reg = *reinterpret_cast<uint32_t*>(GPIO_FUNC0_OUT_SEL_CFG_REG + (pin_num * 4));
#if defined ( GPIO_ENABLE1_REG )
_gpio_enable = *reinterpret_cast<uint32_t*>(((_pin_num & 32) ? GPIO_ENABLE1_REG : GPIO_ENABLE_REG)) & (1 << (_pin_num & 31));
_gpio_enable = *reinterpret_cast<uint32_t*>(((pin_num & 32) ? GPIO_ENABLE1_REG : GPIO_ENABLE_REG)) & (1 << (pin_num & 31));
#else
_gpio_enable = *reinterpret_cast<uint32_t*>(GPIO_ENABLE_REG) & (1 << (_pin_num & 31));
#endif
_gpio_enable = *reinterpret_cast<uint32_t*>(GPIO_ENABLE_REG) & (1 << (pin_num & 31));
#endif
_in_func_num = -1;
size_t func_num = GPIO.func_out_sel_cfg[pin_num].func_sel;
if (func_num < 256 && pin_num == GPIO.func_in_sel_cfg[func_num].func_sel) {
_gpio_func_in_reg = GPIO.func_in_sel_cfg[func_num].val;
_in_func_num = func_num;
// ESP_LOGD("DEBUG","backup pin:%d : func_num:%d", pin_num, _in_func_num);
}
}
}

Expand All @@ -360,22 +367,28 @@ namespace lgfx
auto pin_num = (size_t)_pin_num;
if (pin_num < GPIO_NUM_MAX)
{
// ESP_LOGD("DEBUG","restore pin:%d ", _pin_num);
// ESP_LOGD("DEBUG","restore IO_MUX_GPIO0_REG :%08x -> %08x ", *reinterpret_cast<uint32_t*>(GPIO_PIN_MUX_REG[_pin_num] ), _io_mux_gpio_reg );
// ESP_LOGD("DEBUG","restore GPIO_PIN0_REG :%08x -> %08x ", *reinterpret_cast<uint32_t*>(GPIO_PIN0_REG + (_pin_num * 4)), _gpio_pin_reg );
// ESP_LOGD("DEBUG","restore GPIO_FUNC0_OUT_SEL_CFG_REG:%08x -> %08x ", *reinterpret_cast<uint32_t*>(GPIO_FUNC0_OUT_SEL_CFG_REG + (_pin_num * 4)), _gpio_func_out_reg );
if ((uint16_t)_in_func_num < 256) {
GPIO.func_in_sel_cfg[_in_func_num].val = _gpio_func_in_reg;
// ESP_LOGD("DEBUG","pin:%d in_func_num:%d", (int)pin_num, (int)_in_func_num);
}

// ESP_LOGD("DEBUG","restore pin:%d ", pin_num);
// ESP_LOGD("DEBUG","restore IO_MUX_GPIO0_REG :%08x -> %08x ", *reinterpret_cast<uint32_t*>(GPIO_PIN_MUX_REG[pin_num] ), _io_mux_gpio_reg );
// ESP_LOGD("DEBUG","restore GPIO_PIN0_REG :%08x -> %08x ", *reinterpret_cast<uint32_t*>(GPIO_PIN0_REG + (pin_num * 4)), _gpio_pin_reg );
// ESP_LOGD("DEBUG","restore GPIO_FUNC0_OUT_SEL_CFG_REG:%08x -> %08x ", *reinterpret_cast<uint32_t*>(GPIO_FUNC0_OUT_SEL_CFG_REG + (pin_num * 4)), _gpio_func_out_reg );
*reinterpret_cast<uint32_t*>(GPIO_PIN_MUX_REG[_pin_num]) = _io_mux_gpio_reg;
*reinterpret_cast<uint32_t*>(GPIO_PIN0_REG + (_pin_num * 4)) = _gpio_pin_reg;
*reinterpret_cast<uint32_t*>(GPIO_FUNC0_OUT_SEL_CFG_REG + (_pin_num * 4)) = _gpio_func_out_reg;
*reinterpret_cast<uint32_t*>(GPIO_PIN0_REG + (pin_num * 4)) = _gpio_pin_reg;
*reinterpret_cast<uint32_t*>(GPIO_FUNC0_OUT_SEL_CFG_REG + (pin_num * 4)) = _gpio_func_out_reg;

#if defined ( GPIO_ENABLE1_REG )
auto gpio_enable_reg = reinterpret_cast<uint32_t*>(((_pin_num & 32) ? GPIO_ENABLE1_REG : GPIO_ENABLE_REG));
auto gpio_enable_reg = reinterpret_cast<uint32_t*>(((pin_num & 32) ? GPIO_ENABLE1_REG : GPIO_ENABLE_REG));
#else
auto gpio_enable_reg = reinterpret_cast<uint32_t*>(GPIO_ENABLE_REG);
#endif

uint32_t pin_mask = 1 << (_pin_num & 31);
uint32_t pin_mask = 1 << (pin_num & 31);
uint32_t val = *gpio_enable_reg;
// ESP_LOGD("DEBUG","restore GPIO_ENABLE_REG:%08x", *gpio_enable_reg);
// ESP_LOGD("DEBUG","restore GPIO_ENABLE_REG:%08x", (int)*gpio_enable_reg);
if (_gpio_enable)
{
val |= pin_mask;
Expand All @@ -385,7 +398,6 @@ namespace lgfx
val &= ~pin_mask;
}
*gpio_enable_reg = val;
// ESP_LOGD("DEBUG","restore GPIO_ENABLE_REG:%08x", *gpio_enable_reg);
}
}

Expand Down Expand Up @@ -480,7 +492,12 @@ namespace lgfx
}
if (_spi_handle[spi_host] == nullptr)
{
_spi_handle[spi_host] = spiStartBus(spi_port, SPI_CLK_EQU_SYSCLK, 0, 0);
auto spi_num = spi_port;
#if defined ( CONFIG_IDF_TARGET_ESP32S3 )
spi_num = HSPI;
if (spi_host == SPI2_HOST) { spi_num = FSPI; }
#endif
_spi_handle[spi_host] = spiStartBus(spi_num, SPI_CLK_EQU_SYSCLK, 0, 0);
}

#endif
Expand Down Expand Up @@ -671,17 +688,10 @@ namespace lgfx
#define I2C_ACK_ERR_INT_RAW_M I2C_NACK_INT_RAW_M
#endif

#if __has_include(<soc/i2c_periph.h>)
static periph_module_t getPeriphModule(int num)
{
return i2c_periph_signal[num].module;
}
#else
static periph_module_t getPeriphModule(int num)
{
return num == 0 ? PERIPH_I2C0_MODULE : PERIPH_I2C1_MODULE;
}
#endif

static i2c_dev_t* getDev(int num)
{
Expand Down Expand Up @@ -808,7 +818,13 @@ namespace lgfx
#endif
#endif
#endif

#if SOC_I2C_NUM == 1 || defined CONFIG_IDF_TARGET_ESP32C6
auto twowire = &Wire;
#else
auto twowire = ((dev == &I2C0) ? &Wire : &Wire1);
#endif

#if defined ( USE_TWOWIRE_SETPINS )
twowire->setPins(sda, scl);
#else
Expand Down Expand Up @@ -1014,7 +1030,11 @@ namespace lgfx
#if ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(4, 0, 0)
#if defined ARDUINO_ESP32_GIT_VER
#if ARDUINO_ESP32_GIT_VER != 0x44c11981
#if SOC_I2C_NUM == 1 || defined CONFIG_IDF_TARGET_ESP32C6
auto twowire = &Wire;
#else
auto twowire = ((i2c_port == 1) ? &Wire1 : &Wire);
#endif
twowire->end();
#endif
#endif
Expand Down Expand Up @@ -1063,13 +1083,28 @@ namespace lgfx
#endif
#endif
#if defined ( USE_TWOWIRE_SETPINS )

#if SOC_I2C_NUM == 1 || defined CONFIG_IDF_TARGET_ESP32C6
auto twowire = &Wire;
#else
auto twowire = ((i2c_port == 1) ? &Wire1 : &Wire);
#endif
twowire->setPins(pin_sda, pin_scl);
#endif
#endif
return {};
}

cpp::result<int, error_t> getPinSDA(int i2c_port)
{
return i2c_context[i2c_port].pin_sda;
}

cpp::result<int, error_t> getPinSCL(int i2c_port)
{
return i2c_context[i2c_port].pin_scl;
}

cpp::result<void, error_t> init(int i2c_port)
{
if ((i2c_port >= I2C_NUM_MAX)
Expand All @@ -1085,7 +1120,11 @@ namespace lgfx
}

#if defined ( ARDUINO ) && __has_include (<Wire.h>)
#if SOC_I2C_NUM == 1 || defined CONFIG_IDF_TARGET_ESP32C6
auto twowire = &Wire;
#else
auto twowire = ((i2c_port == 1) ? &Wire1 : &Wire);
#endif
#if defined ( USE_TWOWIRE_SETPINS )
twowire->begin();
#else
Expand Down
Loading

0 comments on commit 33ce909

Please sign in to comment.