Skip to content

Add M5Tab5X board support #334

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lovyan03 merged 1 commit into from
Aug 20, 2026
Merged

Add M5Tab5X board support #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 18 additions & 3 deletions src/M5Unified.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,10 @@ static constexpr const uint8_t _pin_table_mbus[][31] = {

void M5Unified::_setup_pinmap(board_t id)
{
if (id == board_t::board_M5Tab5X) {
id = board_t::board_M5Tab5;
}

constexpr const std::pair<const void*, size_t> tbl[] = {
{ _pin_table_i2c_ex_in, sizeof(_pin_table_i2c_ex_in[0]) },
{ _pin_table_port_bc, sizeof(_pin_table_port_bc[0]) },
Expand Down Expand Up @@ -1892,8 +1896,14 @@ static constexpr const uint8_t _pin_table_mbus[][31] = {
{
m5gfx::pinMode(GPIO_NUM_32, m5gfx::pin_mode_t::input_pulldown);
m5gfx::pinMode(GPIO_NUM_0, m5gfx::pin_mode_t::input_pulldown);
if (m5gfx::gpio_in(GPIO_NUM_32)) // M5Tab5 G32 always High
board = board_t::board_M5Tab5;
if (m5gfx::gpio_in(GPIO_NUM_32)) // M5Tab5 and M5Tab5X G32 always High
{
esp_chip_info_t chip_info;
esp_chip_info(&chip_info);
board = chip_info.revision >= 300
? board_t::board_M5Tab5X
: board_t::board_M5Tab5;
}
else if(m5gfx::gpio_in(GPIO_NUM_0)) // M5UnitPoEP4 G0 always High
board = board_t::board_M5UnitPoEP4;
else
Expand Down Expand Up @@ -1962,6 +1972,7 @@ static constexpr const uint8_t _pin_table_mbus[][31] = {
switch (board) {
#if defined (CONFIG_IDF_TARGET_ESP32P4)
case board_t::board_M5Tab5:
case board_t::board_M5Tab5X:
for (int i = 0; i < 2; ++i)
{
auto ioexp = new PI4IOE5V6408_Class(0x43 + i);
Expand Down Expand Up @@ -2370,6 +2381,7 @@ static constexpr const uint8_t _pin_table_mbus[][31] = {
#if defined (M5UNIFIED_PC_BUILD)
#elif defined (CONFIG_IDF_TARGET_ESP32P4)
case board_t::board_M5Tab5:
case board_t::board_M5Tab5X:
if (cfg.internal_mic)
{
mic_cfg.pin_mck = GPIO_NUM_30;
Expand Down Expand Up @@ -2576,6 +2588,7 @@ static constexpr const uint8_t _pin_table_mbus[][31] = {

#elif defined (CONFIG_IDF_TARGET_ESP32P4)
case board_t::board_M5Tab5:
case board_t::board_M5Tab5X:
if (cfg.internal_spk)
{
spk_cfg.pin_mck = GPIO_NUM_30;
Expand Down Expand Up @@ -2977,7 +2990,7 @@ static constexpr const uint8_t _pin_table_mbus[][31] = {
#if defined (M5UNIFIED_PC_BUILD)
#elif defined ( CONFIG_IDF_TARGET_ESP32P4 )
#define ENABLE_M5MODULE
if (_board == board_t::board_M5Tab5)
if (_board == board_t::board_M5Tab5 || _board == board_t::board_M5Tab5X)
#elif defined ( CONFIG_IDF_TARGET_ESP32S3 )
#define ENABLE_M5MODULE
if (_board == board_t::board_M5StackCoreS3
Expand Down Expand Up @@ -3162,6 +3175,7 @@ static constexpr const uint8_t _pin_table_mbus[][31] = {
tb_k = 364; // (65536*3/540)
break;
case board_t::board_M5Tab5:
case board_t::board_M5Tab5X:
tb_y = 1280;
tb_k = 273; // (65536*3/540)
break;
Expand Down Expand Up @@ -3517,6 +3531,7 @@ static constexpr const uint8_t _pin_table_mbus[][31] = {
height = 960;
break;
case board_t::board_M5Tab5:
case board_t::board_M5Tab5X:
height = 1280;
break;
default:
Expand Down
6 changes: 5 additions & 1 deletion src/M5Unified.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,11 @@ namespace m5
#elif defined (CONFIG_IDF_TARGET_ESP32C3)
= board_t::board_M5StampC3;
#elif defined (CONFIG_IDF_TARGET_ESP32P4)
#if defined (BOARD_ID) && BOARD_ID == 35
= board_t::board_M5Tab5X;
#else
= board_t::board_M5Tab5;
#endif
#elif defined (CONFIG_IDF_TARGET_ESP32C5)
= board_t::board_M5StampC5;
#elif defined (CONFIG_IDF_TARGET_ESP32) || !defined (CONFIG_IDF_TARGET)
Expand Down Expand Up @@ -406,7 +410,7 @@ namespace m5
#if defined ( __M5GFX_M5MODULEDISPLAY__ )
if (cfg.external_display.module_display) {
#if defined (CONFIG_IDF_TARGET_ESP32P4)
if (_board == board_t::board_M5Tab5)
if (_board == board_t::board_M5Tab5 || _board == board_t::board_M5Tab5X)
#elif defined (CONFIG_IDF_TARGET_ESP32S3)
if (_board == board_t::board_M5StackCoreS3 || _board == board_t::board_M5StackCoreS3SE
|| _board == board_t::board_M5StackChan)
Expand Down
29 changes: 28 additions & 1 deletion src/utility/Power_Class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ namespace m5
break;

case board_t::board_M5Tab5:
case board_t::board_M5Tab5X:
{
static constexpr std::uint8_t reg_array_0x43[] =
{ /// +--------- HP_DET : Headphone detect
Expand Down Expand Up @@ -154,6 +155,13 @@ namespace m5
};
M5.getIOExpander(0).writeRegister8Array(reg_array_0x43, sizeof(reg_array_0x43));
M5.getIOExpander(1).writeRegister8Array(reg_array_0x44, sizeof(reg_array_0x44));
if (M5.getBoard() == board_t::board_M5Tab5X)
{
auto& ioe = M5.getIOExpander(0); // PI4IOE 0x43, ADDR grounded, bottom Hat power
ioe.setHighImpedance(3, false);
ioe.setDirection(3, true);
ioe.digitalWrite(3, true);
}
Ina226.begin();
INA226_Class::config_t cfg;
cfg.sampling_rate = INA226_Class::Sampling::Rate16;
Expand Down Expand Up @@ -893,12 +901,21 @@ namespace m5
{
#if defined (CONFIG_IDF_TARGET_ESP32P4)
case board_t::board_M5Tab5:
case board_t::board_M5Tab5X:
if (port_mask & ext_port_mask_t::ext_PA)
{
auto& ioe = M5.getIOExpander(0);
ioe.setPullMode(2, enable ? IOExpander_Base::pull_up : IOExpander_Base::pull_down);
ioe.digitalWrite(2, enable);
}
if (M5.getBoard() == board_t::board_M5Tab5X
&& (port_mask & ext_port_mask_t::ext_EXT))
{
auto& ioe = M5.getIOExpander(0);
ioe.setHighImpedance(3, false);
ioe.setDirection(3, true);
ioe.digitalWrite(3, enable);
}
if (port_mask & ext_port_mask_t::ext_USB)
{
auto& ioe = M5.getIOExpander(1);
Expand Down Expand Up @@ -1061,6 +1078,8 @@ namespace m5
#elif defined (CONFIG_IDF_TARGET_ESP32P4)
case board_t::board_M5Tab5:
return M5.getIOExpander(0).getWriteValue(2);
case board_t::board_M5Tab5X:
return M5.getIOExpander(0).getWriteValue(3);

#elif defined (CONFIG_IDF_TARGET_ESP32C6)
case board_t::board_ArduinoNessoN1:
Expand Down Expand Up @@ -1442,6 +1461,7 @@ namespace m5
default: break;
#if defined (CONFIG_IDF_TARGET_ESP32P4)
case board_t::board_M5Tab5:
case board_t::board_M5Tab5X:
for (int i = 0; i < 10; ++i)
{
M5.getIOExpander(1).digitalWrite(4, i & 1); // io1.gpio4 == PWROFF_PLUSE
Expand Down Expand Up @@ -2148,6 +2168,7 @@ namespace m5
switch (M5.getBoard()) {
#if defined (CONFIG_IDF_TARGET_ESP32P4)
case board_t::board_M5Tab5:
case board_t::board_M5Tab5X:
return Ina226.getBusVoltage() * 1000;
#endif

Expand Down Expand Up @@ -2232,6 +2253,7 @@ namespace m5
switch (M5.getBoard()) {
#if defined (CONFIG_IDF_TARGET_ESP32P4)
case board_t::board_M5Tab5:
case board_t::board_M5Tab5X:
// 2S Li-Po ( * 1000 / 2 == * 500)
mv = Ina226.getBusVoltage() * 500;
break;
Expand Down Expand Up @@ -2321,6 +2343,7 @@ namespace m5
switch (M5.getBoard()) {
#if defined (CONFIG_IDF_TARGET_ESP32P4)
case board_t::board_M5Tab5:
case board_t::board_M5Tab5X:
M5.getIOExpander(1).digitalWrite(7, enable);
break;
#endif
Expand Down Expand Up @@ -2398,7 +2421,8 @@ namespace m5
default:
#if defined (CONFIG_IDF_TARGET_ESP32P4)
switch (M5.getBoard()) {
case board_t::board_M5Tab5: {
case board_t::board_M5Tab5:
case board_t::board_M5Tab5X: {
switch (max_mA) {
case 0:
// charge disable
Expand Down Expand Up @@ -2474,6 +2498,7 @@ namespace m5
switch (M5.getBoard()) {
#if defined (CONFIG_IDF_TARGET_ESP32P4)
case board_t::board_M5Tab5:
case board_t::board_M5Tab5X:
// The shunt is wired so that charge current reads negative; invert to
// match the documented convention (+ = charge / - = discharge).
return -1000.0f * Ina226.getShuntCurrent();
Expand Down Expand Up @@ -2523,6 +2548,7 @@ namespace m5
switch (M5.getBoard()) {
#if defined (CONFIG_IDF_TARGET_ESP32P4)
case board_t::board_M5Tab5:
case board_t::board_M5Tab5X:
// TODO:implement
#endif
default:
Expand Down Expand Up @@ -2638,6 +2664,7 @@ namespace m5
#endif
#if defined (CONFIG_IDF_TARGET_ESP32P4)
case board_t::board_M5Tab5:
case board_t::board_M5Tab5X:
return M5.getIOExpander(1).digitalRead(6) // io1.gpio6 == CHG_STAT
? is_charging_t::is_charging : is_charging_t::is_discharging;
#endif
Expand Down
1 change: 1 addition & 0 deletions src/utility/Power_Class.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ namespace m5
, ext_USB = 1 << 5 // M5Station external USB. ※ Not for CoreS3 main USB.
, ext_PWR485 = 1 << 6 // M5PowerHub external RS485.
, ext_PWRCAN = 1 << 7 // M5PowerHub external CAN.
, ext_EXT = 1 << 8 // M5Tab5X bottom Hat power.
, ext_MAIN = 1 << 15
};

Expand Down
1 change: 1 addition & 0 deletions src/utility/RTC_Class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ namespace m5
{
#if defined (CONFIG_IDF_TARGET_ESP32P4)
case board_t::board_M5Tab5:
case board_t::board_M5Tab5X:
instance.reset(new RX8130_Class(RX8130_Class::DEFAULT_ADDRESS, 400000, i2c));
break;
#endif
Expand Down
Loading