Tab5 audio, I2C improvements, UiDensity moved to lvgl-module and cleanup (#506)
- UiDensity moved to lvgl-module - Deleted tt_hal and tt_hal_gpio (breaks apps, but will fix those right after merging) - Added I2C 8 bit register operations - Added device.properties to simulator - Improved Tab5 hardware init, implement audio - Add README.md to kernel
This commit is contained in:
committed by
GitHub
parent
3a24d058c9
commit
d860ba1f34
@@ -2,12 +2,14 @@
|
||||
#include "devices/SdCard.h"
|
||||
#include <driver/gpio.h>
|
||||
|
||||
#include <tactility/drivers/i2c_controller.h>
|
||||
|
||||
#include <Tactility/hal/Configuration.h>
|
||||
#include <Tactility/hal/i2c/I2c.h>
|
||||
|
||||
using namespace tt::hal;
|
||||
|
||||
static const auto LOGGER = tt::Logger("Tab5");
|
||||
static constexpr auto* TAG = "Tab5";
|
||||
|
||||
static DeviceVector createDevices() {
|
||||
return {
|
||||
@@ -16,7 +18,7 @@ static DeviceVector createDevices() {
|
||||
};
|
||||
}
|
||||
|
||||
static bool initBoot() {
|
||||
static error_t initPower(::Device* i2c_controller) {
|
||||
/*
|
||||
PI4IOE5V6408-1 (0x43)
|
||||
- Bit 0: RF internal/external switch
|
||||
@@ -63,26 +65,106 @@ static bool initBoot() {
|
||||
};
|
||||
|
||||
constexpr auto IO_EXPANDER1_ADDRESS = 0x43;
|
||||
if (!i2c::masterWriteRegisterArray(I2C_NUM_0, IO_EXPANDER1_ADDRESS, reg_data_io1_1, sizeof(reg_data_io1_1))) {
|
||||
LOGGER.error("IO expander 1 init failed in phase 1");
|
||||
return false;
|
||||
auto error = i2c_controller_write_register_array(i2c_controller, IO_EXPANDER1_ADDRESS, reg_data_io1_1, sizeof(reg_data_io1_1), pdMS_TO_TICKS(100));
|
||||
if (error != ERROR_NONE) {
|
||||
LOG_E(TAG, "IO expander 1 init failed in phase 1");
|
||||
return ERROR_UNDEFINED;
|
||||
}
|
||||
|
||||
constexpr auto IO_EXPANDER2_ADDRESS = 0x44;
|
||||
if (!i2c::masterWriteRegisterArray(I2C_NUM_0, IO_EXPANDER2_ADDRESS, reg_data_io2, sizeof(reg_data_io2))) {
|
||||
LOGGER.error("IO expander 2 init failed");
|
||||
return false;
|
||||
error = i2c_controller_write_register_array(i2c_controller, IO_EXPANDER2_ADDRESS, reg_data_io2, sizeof(reg_data_io2), pdMS_TO_TICKS(100));
|
||||
if (error != ERROR_NONE) {
|
||||
LOG_E(TAG, "IO expander 2 init failed");
|
||||
return ERROR_UNDEFINED;
|
||||
}
|
||||
|
||||
// The M5Stack code applies this, but it's not known why
|
||||
// TODO: Remove and test it extensively
|
||||
tt::kernel::delayTicks(10);
|
||||
|
||||
if (!i2c::masterWriteRegisterArray(I2C_NUM_0, IO_EXPANDER1_ADDRESS, reg_data_io1_2, sizeof(reg_data_io1_2))) {
|
||||
LOGGER.error("IO expander 1 init failed in phase 2");
|
||||
error = i2c_controller_write_register_array(i2c_controller, IO_EXPANDER1_ADDRESS, reg_data_io1_2, sizeof(reg_data_io1_2), pdMS_TO_TICKS(100));
|
||||
if (error != ERROR_NONE) {
|
||||
LOG_E(TAG, "IO expander 1 init failed in phase 2");
|
||||
return ERROR_UNDEFINED;
|
||||
}
|
||||
|
||||
return ERROR_NONE;
|
||||
}
|
||||
|
||||
static error_t initSound(::Device* i2c_controller) {
|
||||
// Init data from M5Unified:
|
||||
// https://github.com/m5stack/M5Unified/blob/master/src/M5Unified.cpp
|
||||
static constexpr uint8_t ES8388_I2C_ADDR = 0x10;
|
||||
static constexpr uint8_t ENABLED_BULK_DATA[] = {
|
||||
0, 0x80, // RESET/ CSM POWER ON
|
||||
0, 0x00,
|
||||
0, 0x00,
|
||||
0, 0x0E,
|
||||
1, 0x00,
|
||||
2, 0x0A, // CHIP POWER: power up all
|
||||
3, 0xFF, // ADC POWER: power down all
|
||||
4, 0x3C, // DAC POWER: power up and LOUT1/ROUT1/LOUT2/ROUT2 enable
|
||||
5, 0x00, // ChipLowPower1
|
||||
6, 0x00, // ChipLowPower2
|
||||
7, 0x7C, // VSEL
|
||||
8, 0x00, // set I2S slave mode
|
||||
// reg9-22 == adc
|
||||
23, 0x18, // I2S format (16bit)
|
||||
24, 0x00, // I2S MCLK ratio (128)
|
||||
25, 0x20, // DAC unmute
|
||||
26, 0x00, // LDACVOL 0x00~0xC0
|
||||
27, 0x00, // RDACVOL 0x00~0xC0
|
||||
28, 0x08, // enable digital click free power up and down
|
||||
29, 0x00,
|
||||
38, 0x00, // DAC CTRL16
|
||||
39, 0xB8, // LEFT Ch MIX
|
||||
42, 0xB8, // RIGHTCh MIX
|
||||
43, 0x08, // ADC and DAC separate
|
||||
45, 0x00, // 0x00=1.5k VREF analog output / 0x10=40kVREF analog output
|
||||
46, 0x21,
|
||||
47, 0x21,
|
||||
48, 0x21,
|
||||
49, 0x21
|
||||
};
|
||||
|
||||
error_t error = i2c_controller_write_register_array(
|
||||
i2c_controller,
|
||||
ES8388_I2C_ADDR,
|
||||
ENABLED_BULK_DATA,
|
||||
sizeof(ENABLED_BULK_DATA),
|
||||
pdMS_TO_TICKS(1000)
|
||||
);
|
||||
if (error != ERROR_NONE) {
|
||||
LOG_E(TAG, "Failed to enable ES8388: %s", error_to_string(error));
|
||||
return error;
|
||||
}
|
||||
|
||||
constexpr auto IO_EXPANDER1_ADDRESS = 0x43;
|
||||
constexpr auto AMP_REGISTER = 0x05;
|
||||
// Note: to disable the amplifier, reset the bits
|
||||
error = i2c_controller_register8_set_bits(i2c_controller, IO_EXPANDER1_ADDRESS, AMP_REGISTER, 0b00000010, pdMS_TO_TICKS(100));
|
||||
if (error != ERROR_NONE) {
|
||||
LOG_E(TAG, "Failed to enable amplifier: %s", error_to_string(error));
|
||||
return error;
|
||||
}
|
||||
|
||||
return ERROR_NONE;
|
||||
}
|
||||
|
||||
static bool initBoot() {
|
||||
auto* i2c0 = device_find_by_name("i2c0");
|
||||
check(i2c0, "i2c0 not found");
|
||||
|
||||
auto error = initPower(i2c0);
|
||||
if (error != ERROR_NONE) {
|
||||
return false;
|
||||
}
|
||||
|
||||
error = initSound(i2c0);
|
||||
if (error != ERROR_NONE) {
|
||||
LOG_E(TAG, "Failed to enable ES8388");
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user