Add Guition JC1060P470CIWY and update other Guition device IDs (#447)
This commit contains @josemalm32 's implementation for the Guition JC1060P470CIWY (see https://github.com/ByteWelder/Tactility/issues/427) I've added these changes: - Updated the branch for the new logging method - Updated the branch for the PR that I mentioned in the above linked issue - Replaced the manually pasted in esp_lcd_jd9165 driver with the one from the component registry - Updated Spanish to English - Updated all drivers' mutexes/locks - Fixed the display color format - Fixed bug in power deinit - Renamed I2C bus in config - Added device to continuous integration - Renamed several Guition devices from CYD to Guition - Fix for `EspLcdDisplayV2` init for when features are not supported - Pin esp_wifi_remote to version 1.2.3 - Fix in `WifiManage` logging - Fix for `WifiEsp.cpp`'s check for wifi presence - Fix for `WifiEsp`'s scan list logging - Fix for `gcc_soft_float_symbols` in TactiltyC
This commit is contained in:
Ken Van Hoeylandt
committed by
GitHub
GitHub
parent
f620255c41
commit
c98cb2bf10
@@ -0,0 +1,8 @@
|
||||
file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
|
||||
|
||||
idf_component_register(
|
||||
SRCS ${SOURCE_FILES}
|
||||
INCLUDE_DIRS "Source"
|
||||
REQUIRES Tactility esp_lvgl_port esp_lcd EspLcdCompat esp_lcd_jd9165 GT911 PwmBacklight driver vfs fatfs
|
||||
PRIV_REQUIRES esp_adc EstimatedPower
|
||||
)
|
||||
@@ -0,0 +1,38 @@
|
||||
#include "devices/Display.h"
|
||||
#include "devices/Power.h"
|
||||
#include "devices/SdCard.h"
|
||||
|
||||
#include <Tactility/hal/Configuration.h>
|
||||
|
||||
using namespace tt::hal;
|
||||
|
||||
static DeviceVector createDevices() {
|
||||
return {
|
||||
createDisplay(),
|
||||
createSdCard(),
|
||||
createPower()
|
||||
};
|
||||
}
|
||||
|
||||
extern const Configuration hardwareConfiguration = {
|
||||
.createDevices = createDevices,
|
||||
.i2c = {
|
||||
i2c::Configuration {
|
||||
.name = "Internal",
|
||||
.port = I2C_NUM_0,
|
||||
.initMode = i2c::InitMode::ByTactility,
|
||||
.isMutable = false,
|
||||
.config = (i2c_config_t) {
|
||||
.mode = I2C_MODE_MASTER,
|
||||
.sda_io_num = GPIO_NUM_7,
|
||||
.scl_io_num = GPIO_NUM_8,
|
||||
.sda_pullup_en = true,
|
||||
.scl_pullup_en = true,
|
||||
.master = {
|
||||
.clk_speed = 400000
|
||||
},
|
||||
.clk_flags = 0
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1,65 @@
|
||||
#include "Display.h"
|
||||
#include "Jd9165Display.h"
|
||||
|
||||
#include <Gt911Touch.h>
|
||||
#include <PwmBacklight.h>
|
||||
#include <Tactility/Logger.h>
|
||||
#include <Tactility/Mutex.h>
|
||||
|
||||
constexpr auto LCD_PIN_RESET = GPIO_NUM_0; // Match P4 EV board reset line
|
||||
constexpr auto LCD_PIN_BACKLIGHT = GPIO_NUM_23;
|
||||
constexpr auto LCD_HORIZONTAL_RESOLUTION = 1024;
|
||||
constexpr auto LCD_VERTICAL_RESOLUTION = 600;
|
||||
|
||||
constexpr auto TOUCH_I2C_PORT = I2C_NUM_0;
|
||||
constexpr auto TOUCH_I2C_SDA = GPIO_NUM_7;
|
||||
constexpr auto TOUCH_I2C_SCL = GPIO_NUM_8;
|
||||
constexpr auto TOUCH_PIN_RESET = GPIO_NUM_NC;
|
||||
constexpr auto TOUCH_PIN_INTERRUPT = GPIO_NUM_NC;
|
||||
|
||||
static std::shared_ptr<tt::hal::touch::TouchDevice> createTouch() {
|
||||
auto configuration = std::make_unique<Gt911Touch::Configuration>(
|
||||
TOUCH_I2C_PORT,
|
||||
LCD_HORIZONTAL_RESOLUTION,
|
||||
LCD_VERTICAL_RESOLUTION,
|
||||
false, // swapXY
|
||||
false, // mirrorX
|
||||
false, // mirrorY
|
||||
TOUCH_PIN_RESET,
|
||||
TOUCH_PIN_INTERRUPT
|
||||
);
|
||||
|
||||
return std::make_shared<Gt911Touch>(std::move(configuration));
|
||||
}
|
||||
|
||||
std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
|
||||
// Initialize PWM backlight
|
||||
if (!driver::pwmbacklight::init(LCD_PIN_BACKLIGHT, 20000, LEDC_TIMER_1, LEDC_CHANNEL_0)) {
|
||||
tt::Logger("jc1060p470ciwy").warn("Failed to initialize backlight");
|
||||
}
|
||||
|
||||
auto touch = createTouch();
|
||||
|
||||
auto configuration = std::make_shared<EspLcdConfiguration>(EspLcdConfiguration {
|
||||
.horizontalResolution = LCD_HORIZONTAL_RESOLUTION,
|
||||
.verticalResolution = LCD_VERTICAL_RESOLUTION,
|
||||
.gapX = 0,
|
||||
.gapY = 0,
|
||||
.monochrome = false,
|
||||
.swapXY = false,
|
||||
.mirrorX = false,
|
||||
.mirrorY = false,
|
||||
.invertColor = false,
|
||||
.bufferSize = 0, // 0 = default (1/10 of screen)
|
||||
.touch = touch,
|
||||
.backlightDutyFunction = driver::pwmbacklight::setBacklightDuty,
|
||||
.resetPin = LCD_PIN_RESET,
|
||||
.lvglColorFormat = LV_COLOR_FORMAT_RGB565,
|
||||
.lvglSwapBytes = false,
|
||||
.rgbElementOrder = LCD_RGB_ELEMENT_ORDER_RGB,
|
||||
.bitsPerPixel = 16
|
||||
});
|
||||
|
||||
const auto display = std::make_shared<Jd9165Display>(configuration);
|
||||
return std::reinterpret_pointer_cast<tt::hal::display::DisplayDevice>(display);
|
||||
}
|
||||
@@ -0,0 +1,203 @@
|
||||
#include "Jd9165Display.h"
|
||||
|
||||
#include <Tactility/Logger.h>
|
||||
|
||||
#include <esp_lcd_jd9165.h>
|
||||
|
||||
static const auto LOGGER = tt::Logger("JD9165");
|
||||
|
||||
// MIPI DSI PHY power configuration
|
||||
#define MIPI_DSI_PHY_PWR_LDO_CHAN 3 // LDO_VO3 connects to VDD_MIPI_DPHY
|
||||
#define MIPI_DSI_PHY_PWR_LDO_VOLTAGE_MV 2500
|
||||
|
||||
// JD9165 initialization commands from ESP32-P4 Function EV Board
|
||||
// Delays set to match the reference sequence exactly.
|
||||
static const jd9165_lcd_init_cmd_t jd9165_init_cmds[] = {
|
||||
{0x30, (uint8_t[]){0x00}, 1, 0},
|
||||
{0xF7, (uint8_t[]){0x49,0x61,0x02,0x00}, 4, 0},
|
||||
{0x30, (uint8_t[]){0x01}, 1, 0},
|
||||
{0x04, (uint8_t[]){0x0C}, 1, 0},
|
||||
{0x05, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x06, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x0B, (uint8_t[]){0x11}, 1, 0},
|
||||
{0x17, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x20, (uint8_t[]){0x04}, 1, 0},
|
||||
{0x1F, (uint8_t[]){0x05}, 1, 0},
|
||||
{0x23, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x25, (uint8_t[]){0x19}, 1, 0},
|
||||
{0x28, (uint8_t[]){0x18}, 1, 0},
|
||||
{0x29, (uint8_t[]){0x04}, 1, 0},
|
||||
{0x2A, (uint8_t[]){0x01}, 1, 0},
|
||||
{0x2B, (uint8_t[]){0x04}, 1, 0},
|
||||
{0x2C, (uint8_t[]){0x01}, 1, 0},
|
||||
{0x30, (uint8_t[]){0x02}, 1, 0},
|
||||
{0x01, (uint8_t[]){0x22}, 1, 0},
|
||||
{0x03, (uint8_t[]){0x12}, 1, 0},
|
||||
{0x04, (uint8_t[]){0x00}, 1, 0},
|
||||
{0x05, (uint8_t[]){0x64}, 1, 0},
|
||||
{0x0A, (uint8_t[]){0x08}, 1, 0},
|
||||
{0x0B, (uint8_t[]){0x0A,0x1A,0x0B,0x0D,0x0D,0x11,0x10,0x06,0x08,0x1F,0x1D}, 11, 0},
|
||||
{0x0C, (uint8_t[]){0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,0x0D}, 11, 0},
|
||||
{0x0D, (uint8_t[]){0x16,0x1B,0x0B,0x0D,0x0D,0x11,0x10,0x07,0x09,0x1E,0x1C}, 11, 0},
|
||||
{0x0E, (uint8_t[]){0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,0x0D}, 11, 0},
|
||||
{0x0F, (uint8_t[]){0x16,0x1B,0x0D,0x0B,0x0D,0x11,0x10,0x1C,0x1E,0x09,0x07}, 11, 0},
|
||||
{0x10, (uint8_t[]){0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,0x0D}, 11, 0},
|
||||
{0x11, (uint8_t[]){0x0A,0x1A,0x0D,0x0B,0x0D,0x11,0x10,0x1D,0x1F,0x08,0x06}, 11, 0},
|
||||
{0x12, (uint8_t[]){0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,0x0D,0x0D}, 11, 0},
|
||||
{0x14, (uint8_t[]){0x00,0x00,0x11,0x11}, 4, 0},
|
||||
{0x18, (uint8_t[]){0x99}, 1, 0},
|
||||
{0x30, (uint8_t[]){0x06}, 1, 0},
|
||||
{0x12, (uint8_t[]){0x36,0x2C,0x2E,0x3C,0x38,0x35,0x35,0x32,0x2E,0x1D,0x2B,0x21,0x16,0x29}, 14, 0},
|
||||
{0x13, (uint8_t[]){0x36,0x2C,0x2E,0x3C,0x38,0x35,0x35,0x32,0x2E,0x1D,0x2B,0x21,0x16,0x29}, 14, 0},
|
||||
{0x30, (uint8_t[]){0x0A}, 1, 0},
|
||||
{0x02, (uint8_t[]){0x4F}, 1, 0},
|
||||
{0x0B, (uint8_t[]){0x40}, 1, 0},
|
||||
{0x12, (uint8_t[]){0x3E}, 1, 0},
|
||||
{0x13, (uint8_t[]){0x78}, 1, 0},
|
||||
{0x30, (uint8_t[]){0x0D}, 1, 0},
|
||||
{0x0D, (uint8_t[]){0x04}, 1, 0},
|
||||
{0x10, (uint8_t[]){0x0C}, 1, 0},
|
||||
{0x11, (uint8_t[]){0x0C}, 1, 0},
|
||||
{0x12, (uint8_t[]){0x0C}, 1, 0},
|
||||
{0x13, (uint8_t[]){0x0C}, 1, 0},
|
||||
{0x30, (uint8_t[]){0x00}, 1, 0},
|
||||
{0X3A, (uint8_t[]){0x55}, 1, 0},
|
||||
{0x11, (uint8_t[]){0x00}, 1, 120},
|
||||
{0x29, (uint8_t[]){0x00}, 1, 20},
|
||||
};
|
||||
|
||||
Jd9165Display::~Jd9165Display() {
|
||||
// TODO: This should happen during ::stop(), but this isn't currently exposed
|
||||
if (mipiDsiBus != nullptr) {
|
||||
esp_lcd_del_dsi_bus(mipiDsiBus);
|
||||
mipiDsiBus = nullptr;
|
||||
}
|
||||
if (ldoChannel != nullptr) {
|
||||
esp_ldo_release_channel(ldoChannel);
|
||||
ldoChannel = nullptr;
|
||||
}
|
||||
}
|
||||
|
||||
bool Jd9165Display::createMipiDsiBus() {
|
||||
// Enable MIPI DSI PHY power (transition from "no power" to "shutdown" state)
|
||||
esp_ldo_channel_config_t ldo_mipi_phy_config = {
|
||||
.chan_id = MIPI_DSI_PHY_PWR_LDO_CHAN,
|
||||
.voltage_mv = MIPI_DSI_PHY_PWR_LDO_VOLTAGE_MV,
|
||||
.flags = {}
|
||||
};
|
||||
|
||||
if (esp_ldo_acquire_channel(&ldo_mipi_phy_config, &ldoChannel) != ESP_OK) {
|
||||
LOGGER.error("Failed to acquire LDO channel for MIPI DSI PHY");
|
||||
return false;
|
||||
}
|
||||
|
||||
LOGGER.info("MIPI DSI PHY powered on");
|
||||
|
||||
// Create MIPI DSI bus
|
||||
// TODO: use MIPI_DSI_PHY_CLK_SRC_DEFAULT() in future ESP-IDF 6.0.0 update with esp_lcd_jd9165 library version 2.x
|
||||
const esp_lcd_dsi_bus_config_t bus_config = {
|
||||
.bus_id = 0,
|
||||
.num_data_lanes = 2,
|
||||
.phy_clk_src = MIPI_DSI_PHY_CLK_SRC_DEFAULT,
|
||||
.lane_bit_rate_mbps = 750
|
||||
};
|
||||
|
||||
if (esp_lcd_new_dsi_bus(&bus_config, &mipiDsiBus) != ESP_OK) {
|
||||
LOGGER.error("Failed to create MIPI DSI bus");
|
||||
return false;
|
||||
}
|
||||
|
||||
LOGGER.info("MIPI DSI bus created");
|
||||
return true;
|
||||
}
|
||||
|
||||
bool Jd9165Display::createIoHandle(esp_lcd_panel_io_handle_t& ioHandle) {
|
||||
// Initialize MIPI DSI bus if not already done
|
||||
if (mipiDsiBus == nullptr) {
|
||||
if (!createMipiDsiBus()) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// Use DBI interface to send LCD commands and parameters
|
||||
esp_lcd_dbi_io_config_t dbi_config = JD9165_PANEL_IO_DBI_CONFIG();
|
||||
|
||||
if (esp_lcd_new_panel_io_dbi(mipiDsiBus, &dbi_config, &ioHandle) != ESP_OK) {
|
||||
LOGGER.error("Failed to create panel IO");
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
esp_lcd_panel_dev_config_t Jd9165Display::createPanelConfig(std::shared_ptr<EspLcdConfiguration> espLcdConfiguration, gpio_num_t resetPin) {
|
||||
return {
|
||||
.reset_gpio_num = resetPin,
|
||||
.rgb_ele_order = espLcdConfiguration->rgbElementOrder,
|
||||
.data_endian = LCD_RGB_DATA_ENDIAN_LITTLE,
|
||||
.bits_per_pixel = static_cast<uint8_t>(espLcdConfiguration->bitsPerPixel),
|
||||
.flags = {
|
||||
.reset_active_high = 0
|
||||
},
|
||||
.vendor_config = nullptr // Will be set in createPanelHandle
|
||||
};
|
||||
}
|
||||
|
||||
bool Jd9165Display::createPanelHandle(esp_lcd_panel_io_handle_t ioHandle, const esp_lcd_panel_dev_config_t& panelConfig, esp_lcd_panel_handle_t& panelHandle) {
|
||||
// Create DPI panel configuration
|
||||
// Override default timings
|
||||
const esp_lcd_dpi_panel_config_t dpi_config = {
|
||||
.virtual_channel = 0,
|
||||
.dpi_clk_src = MIPI_DSI_DPI_CLK_SRC_DEFAULT,
|
||||
.dpi_clock_freq_mhz = 50,
|
||||
.pixel_format = LCD_COLOR_PIXEL_FORMAT_RGB565,
|
||||
.in_color_format = LCD_COLOR_FMT_RGB565,
|
||||
.out_color_format = LCD_COLOR_FMT_RGB565,
|
||||
.num_fbs = 1,
|
||||
.video_timing = {
|
||||
.h_size = 1024,
|
||||
.v_size = 600,
|
||||
.hsync_pulse_width = 20,
|
||||
.hsync_back_porch = 160,
|
||||
.hsync_front_porch = 160,
|
||||
.vsync_pulse_width = 2,
|
||||
.vsync_back_porch = 21,
|
||||
.vsync_front_porch = 12,
|
||||
},
|
||||
.flags = {
|
||||
.use_dma2d = 1,
|
||||
.disable_lp = 0
|
||||
}
|
||||
};
|
||||
|
||||
jd9165_vendor_config_t vendor_config = {
|
||||
.init_cmds = jd9165_init_cmds,
|
||||
.init_cmds_size = sizeof(jd9165_init_cmds) / sizeof(jd9165_lcd_init_cmd_t),
|
||||
.mipi_config = {
|
||||
.dsi_bus = mipiDsiBus,
|
||||
.dpi_config = &dpi_config,
|
||||
},
|
||||
};
|
||||
|
||||
// Create a mutable copy of panelConfig to set vendor_config
|
||||
esp_lcd_panel_dev_config_t mutable_panel_config = panelConfig;
|
||||
mutable_panel_config.vendor_config = &vendor_config;
|
||||
|
||||
if (esp_lcd_new_panel_jd9165(ioHandle, &mutable_panel_config, &panelHandle) != ESP_OK) {
|
||||
LOGGER.error("Failed to create panel");
|
||||
return false;
|
||||
}
|
||||
|
||||
LOGGER.info("JD9165 panel created successfully");
|
||||
// Defer reset/init to base class applyConfiguration to avoid double initialization
|
||||
return true;
|
||||
}
|
||||
|
||||
lvgl_port_display_dsi_cfg_t Jd9165Display::getLvglPortDisplayDsiConfig(esp_lcd_panel_io_handle_t /*ioHandle*/, esp_lcd_panel_handle_t /*panelHandle*/) {
|
||||
// Disable avoid_tearing to prevent stalls/blank flashes when other tasks (e.g. flash writes) block timing
|
||||
return lvgl_port_display_dsi_cfg_t{
|
||||
.flags = {
|
||||
.avoid_tearing = 0,
|
||||
},
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
#pragma once
|
||||
|
||||
#include <EspLcdDisplayV2.h>
|
||||
#include <Tactility/RecursiveMutex.h>
|
||||
|
||||
#include <esp_lcd_mipi_dsi.h>
|
||||
#include <esp_ldo_regulator.h>
|
||||
|
||||
class Jd9165Display final : public EspLcdDisplayV2 {
|
||||
|
||||
class NoLock final : public tt::Lock {
|
||||
bool lock(TickType_t timeout) const override { return true; }
|
||||
void unlock() const override { /* NO-OP */ }
|
||||
};
|
||||
|
||||
esp_lcd_dsi_bus_handle_t mipiDsiBus = nullptr;
|
||||
esp_ldo_channel_handle_t ldoChannel = nullptr;
|
||||
|
||||
bool createMipiDsiBus();
|
||||
|
||||
protected:
|
||||
|
||||
bool createIoHandle(esp_lcd_panel_io_handle_t& ioHandle) override;
|
||||
|
||||
esp_lcd_panel_dev_config_t createPanelConfig(std::shared_ptr<EspLcdConfiguration> espLcdConfiguration, gpio_num_t resetPin) override;
|
||||
|
||||
bool createPanelHandle(esp_lcd_panel_io_handle_t ioHandle, const esp_lcd_panel_dev_config_t& panelConfig, esp_lcd_panel_handle_t& panelHandle) override;
|
||||
|
||||
bool useDsiPanel() const override { return true; }
|
||||
|
||||
lvgl_port_display_dsi_cfg_t getLvglPortDisplayDsiConfig(esp_lcd_panel_io_handle_t /*ioHandle*/, esp_lcd_panel_handle_t /*panelHandle*/) override;
|
||||
|
||||
public:
|
||||
|
||||
Jd9165Display(
|
||||
const std::shared_ptr<EspLcdConfiguration>& configuration
|
||||
) : EspLcdDisplayV2(configuration, std::make_shared<NoLock>()) {}
|
||||
|
||||
~Jd9165Display() override;
|
||||
|
||||
std::string getName() const override { return "JD9165"; }
|
||||
|
||||
std::string getDescription() const override { return "JD9165 MIPI-DSI 1024x600 display"; }
|
||||
};
|
||||
@@ -0,0 +1,180 @@
|
||||
#include "Power.h"
|
||||
|
||||
#include <Tactility/Logger.h>
|
||||
#include <ChargeFromVoltage.h>
|
||||
#include <esp_adc/adc_oneshot.h>
|
||||
#include <esp_adc/adc_cali.h>
|
||||
#include <esp_adc/adc_cali_scheme.h>
|
||||
|
||||
using tt::hal::power::PowerDevice;
|
||||
|
||||
static const auto LOGGER = tt::Logger("JcPower");
|
||||
|
||||
namespace {
|
||||
|
||||
constexpr adc_unit_t ADC_UNIT = ADC_UNIT_2;
|
||||
constexpr adc_channel_t ADC_CHANNEL = ADC_CHANNEL_4; // matches ADC2 CH4 used in brookesia config
|
||||
constexpr adc_atten_t ADC_ATTEN = ADC_ATTEN_DB_12;
|
||||
constexpr int32_t UPPER_RESISTOR_OHM = 85'000; // per brookesia settings
|
||||
constexpr int32_t LOWER_RESISTOR_OHM = 100'000; // per brookesia settings
|
||||
|
||||
class JcPower final : public PowerDevice {
|
||||
public:
|
||||
JcPower() : chargeEstimator(3.3f, 4.2f) {}
|
||||
~JcPower() override { deinit(); }
|
||||
|
||||
std::string getName() const override { return "JC Power"; }
|
||||
std::string getDescription() const override { return "Battery voltage via ADC"; }
|
||||
|
||||
bool supportsMetric(MetricType type) const override {
|
||||
switch (type) {
|
||||
using enum MetricType;
|
||||
case BatteryVoltage:
|
||||
case ChargeLevel:
|
||||
return true;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
bool getMetric(MetricType type, MetricData& data) override {
|
||||
if (!ensureInit()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
uint32_t batteryMv = 0;
|
||||
if (!readBatteryMilliVolt(batteryMv)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
switch (type) {
|
||||
case MetricType::BatteryVoltage:
|
||||
data.valueAsUint32 = batteryMv;
|
||||
return true;
|
||||
case MetricType::ChargeLevel:
|
||||
data.valueAsUint8 = chargeEstimator.estimateCharge(batteryMv);
|
||||
return true;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private:
|
||||
bool ensureInit() {
|
||||
if (initialized) {
|
||||
return true;
|
||||
}
|
||||
|
||||
adc_oneshot_unit_init_cfg_t init_cfg = {
|
||||
.unit_id = ADC_UNIT,
|
||||
.clk_src = ADC_RTC_CLK_SRC_DEFAULT,
|
||||
.ulp_mode = ADC_ULP_MODE_DISABLE,
|
||||
};
|
||||
if (adc_oneshot_new_unit(&init_cfg, &adcHandle) != ESP_OK) {
|
||||
LOGGER.error("ADC unit init failed");
|
||||
return false;
|
||||
}
|
||||
|
||||
adc_oneshot_chan_cfg_t chan_cfg = {
|
||||
.atten = ADC_ATTEN,
|
||||
.bitwidth = ADC_BITWIDTH_DEFAULT,
|
||||
};
|
||||
if (adc_oneshot_config_channel(adcHandle, ADC_CHANNEL, &chan_cfg) != ESP_OK) {
|
||||
LOGGER.error("ADC channel config failed");
|
||||
adc_oneshot_del_unit(adcHandle);
|
||||
adcHandle = nullptr;
|
||||
return false;
|
||||
}
|
||||
|
||||
calibrated = tryInitCalibration();
|
||||
initialized = true;
|
||||
return true;
|
||||
}
|
||||
|
||||
bool tryInitCalibration() {
|
||||
#if ADC_CALI_SCHEME_LINE_FITTING_SUPPORTED
|
||||
adc_cali_line_fitting_config_t cali_config = {
|
||||
.unit_id = ADC_UNIT,
|
||||
.atten = ADC_ATTEN,
|
||||
.bitwidth = ADC_BITWIDTH_DEFAULT,
|
||||
};
|
||||
if (adc_cali_create_scheme_line_fitting(&cali_config, &caliHandle) == ESP_OK) {
|
||||
calScheme = CaliScheme::Line;
|
||||
LOGGER.info("ADC calibration (line fitting) enabled");
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
#if ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED
|
||||
adc_cali_curve_fitting_config_t curve_cfg = {
|
||||
.unit_id = ADC_UNIT,
|
||||
.chan = ADC_CHANNEL,
|
||||
.atten = ADC_ATTEN,
|
||||
.bitwidth = ADC_BITWIDTH_DEFAULT,
|
||||
};
|
||||
if (adc_cali_create_scheme_curve_fitting(&curve_cfg, &caliHandle) == ESP_OK) {
|
||||
calScheme = CaliScheme::Curve;
|
||||
LOGGER.info("ADC calibration (curve fitting) enabled");
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
||||
LOGGER.warn("ADC calibration not available, using raw scaling");
|
||||
return false;
|
||||
}
|
||||
|
||||
bool readBatteryMilliVolt(uint32_t& outMv) {
|
||||
int raw = 0;
|
||||
if (adc_oneshot_read(adcHandle, ADC_CHANNEL, &raw) != ESP_OK) {
|
||||
LOGGER.error("ADC read failed");
|
||||
return false;
|
||||
}
|
||||
|
||||
int mv = 0;
|
||||
if (calibrated && adc_cali_raw_to_voltage(caliHandle, raw, &mv) == ESP_OK) {
|
||||
// ok
|
||||
} else {
|
||||
// Fallback: approximate assuming 12-bit full scale 3.3V
|
||||
mv = (raw * 3300) / 4095;
|
||||
}
|
||||
|
||||
const int64_t numerator = static_cast<int64_t>(UPPER_RESISTOR_OHM + LOWER_RESISTOR_OHM) * mv;
|
||||
const int64_t denominator = LOWER_RESISTOR_OHM;
|
||||
outMv = static_cast<uint32_t>(numerator / denominator);
|
||||
return true;
|
||||
}
|
||||
|
||||
void deinit() {
|
||||
if (adcHandle) {
|
||||
adc_oneshot_del_unit(adcHandle);
|
||||
adcHandle = nullptr;
|
||||
}
|
||||
if (caliHandle) {
|
||||
if (calScheme == CaliScheme::Line) {
|
||||
#if ADC_CALI_SCHEME_LINE_FITTING_SUPPORTED
|
||||
adc_cali_delete_scheme_line_fitting(caliHandle);
|
||||
#endif
|
||||
#if ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED
|
||||
} else if (calScheme == CaliScheme::Curve) {
|
||||
adc_cali_delete_scheme_curve_fitting(caliHandle);
|
||||
#endif
|
||||
}
|
||||
caliHandle = nullptr;
|
||||
calibrated = false;
|
||||
}
|
||||
}
|
||||
|
||||
enum class CaliScheme { None, Line, Curve };
|
||||
|
||||
bool initialized = false;
|
||||
bool calibrated = false;
|
||||
CaliScheme calScheme = CaliScheme::None;
|
||||
adc_oneshot_unit_handle_t adcHandle = nullptr;
|
||||
adc_cali_handle_t caliHandle = nullptr;
|
||||
ChargeFromVoltage chargeEstimator;
|
||||
};
|
||||
} // namespace
|
||||
|
||||
std::shared_ptr<PowerDevice> createPower() {
|
||||
return std::make_shared<JcPower>();
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <memory>
|
||||
#include <Tactility/hal/power/PowerDevice.h>
|
||||
|
||||
// Battery measurement via ADC2 channel 4 with 85k/100k divider
|
||||
std::shared_ptr<tt::hal::power::PowerDevice> createPower();
|
||||
@@ -0,0 +1,127 @@
|
||||
#include "SdCard.h"
|
||||
|
||||
#include <Tactility/Logger.h>
|
||||
#include <Tactility/Mutex.h>
|
||||
#include <Tactility/hal/sdcard/SdCardDevice.h>
|
||||
|
||||
#include <driver/sdmmc_defs.h>
|
||||
#include <driver/sdmmc_host.h>
|
||||
#include <esp_check.h>
|
||||
#include <esp_ldo_regulator.h>
|
||||
#include <esp_vfs_fat.h>
|
||||
#include <sdmmc_cmd.h>
|
||||
|
||||
using tt::hal::sdcard::SdCardDevice;
|
||||
|
||||
static const auto LOGGER = tt::Logger("JcSdCard");
|
||||
|
||||
// ESP32-P4 Slot 0 uses IO MUX (fixed pins, not manually configurable)
|
||||
// CLK=43, CMD=44, D0=39, D1=40, D2=41, D3=42 (defined automatically by hardware)
|
||||
|
||||
class SdCardDeviceImpl final : public SdCardDevice {
|
||||
|
||||
class NoLock final : public tt::Lock {
|
||||
bool lock(TickType_t timeout) const override { return true; }
|
||||
void unlock() const override { /* NO-OP */ }
|
||||
};
|
||||
|
||||
std::shared_ptr<tt::Lock> lock = std::make_shared<NoLock>();
|
||||
sdmmc_card_t* card = nullptr;
|
||||
bool mounted = false;
|
||||
std::string mountPath;
|
||||
|
||||
public:
|
||||
SdCardDeviceImpl() : SdCardDevice(MountBehaviour::AtBoot) {}
|
||||
~SdCardDeviceImpl() override {
|
||||
if (mounted) {
|
||||
unmount();
|
||||
}
|
||||
}
|
||||
|
||||
std::string getName() const override { return "SD Card"; }
|
||||
std::string getDescription() const override { return "SD card via SDMMC host"; }
|
||||
|
||||
bool mount(const std::string& newMountPath) override {
|
||||
if (mounted) {
|
||||
return true;
|
||||
}
|
||||
|
||||
esp_vfs_fat_sdmmc_mount_config_t mount_config = {
|
||||
.format_if_mount_failed = false,
|
||||
.max_files = 5,
|
||||
.allocation_unit_size = 64 * 1024,
|
||||
.disk_status_check_enable = false,
|
||||
.use_one_fat = false,
|
||||
};
|
||||
|
||||
sdmmc_host_t host = SDMMC_HOST_DEFAULT();
|
||||
host.slot = SDMMC_HOST_SLOT_0;
|
||||
host.max_freq_khz = SDMMC_FREQ_DEFAULT; // 20MHz - more stable for initialization
|
||||
host.flags = SDMMC_HOST_FLAG_4BIT; // Force 4-bit mode
|
||||
// Configure LDO power supply for SD card (critical on ESP32-P4)
|
||||
esp_ldo_channel_handle_t ldo_handle = nullptr;
|
||||
esp_ldo_channel_config_t ldo_config = {
|
||||
.chan_id = 4, // LDO channel 4 for SD power
|
||||
.voltage_mv = 3300, // 3.3V
|
||||
.flags {
|
||||
.adjustable = 0,
|
||||
.owned_by_hw = 0,
|
||||
.bypass = 0
|
||||
}
|
||||
};
|
||||
|
||||
esp_err_t ldo_ret = esp_ldo_acquire_channel(&ldo_config, &ldo_handle);
|
||||
if (ldo_ret != ESP_OK) {
|
||||
LOGGER.warn("Failed to acquire LDO for SD power: {} (continuing anyway)", esp_err_to_name(ldo_ret));
|
||||
}
|
||||
|
||||
// Slot 0 uses IO MUX - pins are fixed and not specified
|
||||
sdmmc_slot_config_t slot_config = SDMMC_SLOT_CONFIG_DEFAULT();
|
||||
slot_config.width = 4;
|
||||
slot_config.cd = SDMMC_SLOT_NO_CD; // No card detect
|
||||
slot_config.wp = SDMMC_SLOT_NO_WP; // No write protect
|
||||
slot_config.flags = 0;
|
||||
|
||||
esp_err_t ret = esp_vfs_fat_sdmmc_mount(newMountPath.c_str(), &host, &slot_config, &mount_config, &card);
|
||||
if (ret != ESP_OK) {
|
||||
LOGGER.error("Failed to mount SD card: {}", esp_err_to_name(ret));
|
||||
card = nullptr;
|
||||
return false;
|
||||
}
|
||||
|
||||
mountPath = newMountPath;
|
||||
mounted = true;
|
||||
LOGGER.info("SD card mounted at {}", mountPath);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool unmount() override {
|
||||
if (!mounted) {
|
||||
return true;
|
||||
}
|
||||
|
||||
esp_err_t ret = esp_vfs_fat_sdcard_unmount(mountPath.c_str(), card);
|
||||
if (ret != ESP_OK) {
|
||||
LOGGER.error("Failed to unmount SD card: {}", esp_err_to_name(ret));
|
||||
return false;
|
||||
}
|
||||
card = nullptr;
|
||||
mounted = false;
|
||||
LOGGER.info("SD card unmounted");
|
||||
return true;
|
||||
}
|
||||
|
||||
std::string getMountPath() const override {
|
||||
return mountPath;
|
||||
}
|
||||
|
||||
std::shared_ptr<tt::Lock> getLock() const override { return lock; }
|
||||
|
||||
State getState(TickType_t /*timeout*/) const override {
|
||||
return mounted ? State::Mounted : State::Unmounted;
|
||||
}
|
||||
};
|
||||
|
||||
std::shared_ptr<SdCardDevice> createSdCard() {
|
||||
return std::make_shared<SdCardDeviceImpl>();
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
#pragma once
|
||||
|
||||
#include <Tactility/hal/sdcard/SdCardDevice.h>
|
||||
|
||||
// Create SD card device for jc1060p470ciwy using SDMMC slot 0 (4-bit)
|
||||
std::shared_ptr<tt::hal::sdcard::SdCardDevice> createSdCard();
|
||||
@@ -0,0 +1,28 @@
|
||||
[general]
|
||||
vendor=Guition
|
||||
name=JC1060P470CIWY
|
||||
|
||||
[hardware]
|
||||
target=ESP32P4
|
||||
flashSize=16MB
|
||||
spiRam=true
|
||||
spiRamMode=OCT
|
||||
spiRamSpeed=200M
|
||||
esptoolFlashFreq=80M
|
||||
|
||||
[display]
|
||||
size=7"
|
||||
shape=rectangle
|
||||
dpi=187
|
||||
|
||||
[lvgl]
|
||||
colorDepth=16
|
||||
|
||||
[sdkconfig]
|
||||
CONFIG_WIFI_PROV_SCAN_MAX_ENTRIES=16
|
||||
CONFIG_WIFI_PROV_AUTOSTOP_TIMEOUT=30
|
||||
CONFIG_WIFI_PROV_STA_ALL_CHANNEL_SCAN=y
|
||||
CONFIG_ESP_HOSTED_ENABLED=y
|
||||
CONFIG_ESP_HOSTED_P4_DEV_BOARD_FUNC_BOARD=y
|
||||
CONFIG_ESP_HOSTED_SDIO_HOST_INTERFACE=y
|
||||
CONFIG_SLAVE_IDF_TARGET_ESP32C6=y
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
[general]
|
||||
vendor=CYD
|
||||
vendor=Guition
|
||||
name=JC2432W328C
|
||||
|
||||
[hardware]
|
||||
@@ -0,0 +1,5 @@
|
||||
#pragma once
|
||||
|
||||
#include <Tactility/hal/display/DisplayDevice.h>
|
||||
|
||||
std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();
|
||||
+1
-1
@@ -1,5 +1,5 @@
|
||||
[general]
|
||||
vendor=CYD
|
||||
vendor=Guition
|
||||
name=JC8048W550C
|
||||
|
||||
[hardware]
|
||||
Reference in New Issue
Block a user