mirror of
https://github.com/MarekZegare4/MeshCore-Solo.git
synced 2026-09-14 15:16:40 +00:00
JakubandClaude Opus 5
05e57357d3
New M5Stack Cardputer ADV variant (ESP32-S3, ST7789 TFT, built-in TCA8418 QWERTY keyboard, PI4IOE5V6408 LoRa-cap IO-expander autodetect), and a KeyShield accessory variant for the existing LilyGO T-Echo Lite (external TCA8418 T9 keypad + AW21009 backlight driver). Both keyboards share one ENV_USE_TCA8418 polling block in UITask.cpp::loop(), coexisting with the unrelated CardKB support (different chip/address/flag). Fixes carried in from the contributed T-Echo Lite code: swapped GPS RX/TX pins, TX-LED hooks, TCXO voltage, missing GxEPD2_122_T61 panel include. Fixed during integration: I2C bus was probed for an RTC before Wire.begin() configured its pins on Cardputer ADV (silent RTC autodetect failure). Added dedicated *_solo_dual release envs for both boards (auto-picked up by the solo-firmware release workflow). Gave the T-Echo Lite KeyShield solo build -Os/-Ofast-unflag like every other nRF52 solo build (was missing, cut flash usage from 90.7% to 61.4%). Ported the shared misc-fixed 6x9 font (full Latin/Greek/Cyrillic, opt-in via OLED_MISC_FIXED_FONT) to ST7789Display for the Cardputer's on-screen keyboard. ST7789Spi isn't Adafruit_GFX-based like the other single-font drivers, and this panel's logical->physical scale is non-integer, so glyphs are re-packed to XBM and blitted through the existing drawXbm(), which already does correct fractional-scale boundary math, rather than duplicating that logic. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
162 lines
5.5 KiB
C
162 lines
5.5 KiB
C
/*
|
|
* variant.h
|
|
* Copyright (C) 2023 Seeed K.K.
|
|
* MIT License
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#define _PINNUM(port, pin) ((port) * 32 + (pin))
|
|
|
|
#include "WVariant.h"
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
// Low frequency clock source
|
|
|
|
#define USE_LFXO // 32.768 kHz crystal oscillator
|
|
#define VARIANT_MCK (64000000ul)
|
|
|
|
#define WIRE_INTERFACES_COUNT (1)
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
// Power
|
|
|
|
#define PIN_PWR_EN _PINNUM(0, 30) // RT9080_EN
|
|
|
|
#define BATTERY_PIN _PINNUM(0, 2)
|
|
#define ADC_MULTIPLIER (2.0F)
|
|
|
|
#define ADC_RESOLUTION (14)
|
|
#define BATTERY_SENSE_RES (12)
|
|
|
|
#define AREF_VOLTAGE (3.0)
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
// Number of pins
|
|
|
|
#define PINS_COUNT (48)
|
|
#define NUM_DIGITAL_PINS (48)
|
|
#define NUM_ANALOG_INPUTS (1)
|
|
#define NUM_ANALOG_OUTPUTS (0)
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
// UART pin definition
|
|
|
|
#define PIN_SERIAL1_RX PIN_GPS_TX
|
|
#define PIN_SERIAL1_TX PIN_GPS_RX
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
// I2C pin definition
|
|
|
|
#define PIN_WIRE_SDA _PINNUM(1, 4) // (SDA) - per LilyGo IIC_1_SDA
|
|
#define PIN_WIRE_SCL _PINNUM(1, 2) // (SCL) - per LilyGo IIC_1_SCL
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
// SPI pin definition
|
|
|
|
#define SPI_INTERFACES_COUNT (2)
|
|
|
|
#define PIN_SPI_MISO _PINNUM(0, 17) // (MISO)
|
|
#define PIN_SPI_MOSI _PINNUM(0, 15) // (MOSI)
|
|
#define PIN_SPI_SCK _PINNUM(0, 13) // (SCK)
|
|
#define PIN_SPI_NSS (-1)
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
// QSPI FLASH
|
|
|
|
#define PIN_QSPI_SCK _PINNUM(0, 4)
|
|
#define PIN_QSPI_CS _PINNUM(0, 12)
|
|
#define PIN_QSPI_IO0 _PINNUM(0, 6)
|
|
#define PIN_QSPI_IO1 _PINNUM(0, 8)
|
|
#define PIN_QSPI_IO2 _PINNUM(1, 9)
|
|
#define PIN_QSPI_IO3 _PINNUM(0, 26)
|
|
|
|
#define EXTERNAL_FLASH_DEVICES ZD25WQ32CEIGR
|
|
#define EXTERNAL_FLASH_USE_QSPI
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
// Builtin LEDs
|
|
|
|
#define LED_RED _PINNUM(1, 14) // LED_3
|
|
#define LED_BLUE _PINNUM(1, 5) // LED_2
|
|
#define LED_GREEN _PINNUM(1, 7) // LED_1
|
|
|
|
//#define PIN_STATUS_LED LED_BLUE
|
|
#define LED_BUILTIN (-1)
|
|
#define LED_PIN LED_BUILTIN
|
|
#define LED_STATE_ON LOW
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
// Builtin buttons
|
|
|
|
#define PIN_BUTTON1 _PINNUM(0, 24) // BOOT
|
|
#define BUTTON_PIN PIN_BUTTON1
|
|
#define PIN_USER_BTN BUTTON_PIN
|
|
|
|
#define PIN_BUTTON2 _PINNUM(0, 18)
|
|
#define BUTTON_PIN2 PIN_BUTTON2
|
|
|
|
#define EXTERNAL_FLASH_DEVICES MX25R1635F
|
|
#define EXTERNAL_FLASH_USE_QSPI
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
// Lora
|
|
|
|
#define USE_SX1262
|
|
#define LORA_CS _PINNUM(0, 11)
|
|
#define SX126X_POWER_EN _PINNUM(0, 30)
|
|
#define SX126X_DIO1 _PINNUM(1, 8)
|
|
#define SX1262_DIO2 _PINNUM(0, 5)
|
|
#define SX126X_BUSY _PINNUM(0, 14)
|
|
#define SX126X_RESET _PINNUM(0, 7)
|
|
#define SX126X_RXEN _PINNUM(1, 1)
|
|
#define SX126X_TXEN _PINNUM(0, 27)
|
|
|
|
#define P_LORA_DIO_1 SX126X_DIO1
|
|
#define P_LORA_NSS LORA_CS
|
|
#define P_LORA_RESET SX126X_RESET
|
|
#define P_LORA_BUSY SX126X_BUSY
|
|
#define P_LORA_SCLK PIN_SPI_SCK
|
|
#define P_LORA_MISO PIN_SPI_MISO
|
|
#define P_LORA_MOSI PIN_SPI_MOSI
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
// SPI1
|
|
|
|
#define PIN_SPI1_MISO (-1) // Not used for Display
|
|
#define PIN_SPI1_MOSI _PINNUM(0, 20)
|
|
#define PIN_SPI1_SCK _PINNUM(0, 19)
|
|
|
|
// GxEPD2 needs that for a panel that is not even used !
|
|
extern const int MISO;
|
|
extern const int MOSI;
|
|
extern const int SCK;
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
// Display
|
|
|
|
// #define DISP_MISO (-1) // Not used for Display
|
|
#define DISP_MOSI _PINNUM(0, 20)
|
|
#define DISP_SCLK _PINNUM(0, 19)
|
|
#define DISP_CS _PINNUM(0, 22)
|
|
#define DISP_DC _PINNUM(0, 21)
|
|
#define DISP_RST _PINNUM(0, 28)
|
|
#define DISP_BUSY _PINNUM(0, 3)
|
|
#define DISP_POWER _PINNUM(1, 12)
|
|
// #define DISP_BACKLIGHT (-1) // Display has no backlight
|
|
|
|
#define PIN_DISPLAY_CS DISP_CS
|
|
#define PIN_DISPLAY_DC DISP_DC
|
|
#define PIN_DISPLAY_RST DISP_RST
|
|
#define PIN_DISPLAY_BUSY DISP_BUSY
|
|
|
|
////////////////////////////////////////////////////////////////////////////////
|
|
// GPS — per LilyGo t_echo_lite_config.h
|
|
// PIN_GPS_TX/RX named from GPS module's perspective
|
|
|
|
//#define PIN_GPS_TX _PINNUM(0, 29) // GPS UART TX → MCU RX
|
|
//#define PIN_GPS_RX _PINNUM(1, 10) // GPS UART RX ← MCU TX
|
|
#define PIN_GPS_RX _PINNUM(0, 29) // GPS UART TX → MCU RX
|
|
#define PIN_GPS_TX _PINNUM(1, 10) // GPS UART RX ← MCU TX
|
|
#define GPS_EN _PINNUM(1, 11) // GPS RT9080 power enable
|
|
#define PIN_GPS_STANDBY _PINNUM(1, 13) // GPS wake-up
|
|
#define PIN_GPS_PPS _PINNUM(1, 15) // GPS 1PPS
|