Add ES3C35P board support

Devices/es3c28p/es3c28p.dts

@@ -91,7 +91,6 @@
 			compatible = "everest,es8311";
 			reg = <0x18>;
 			i2s = <&i2s0>;
-			input-gain-percent = <100>;
 		};
 	};
 

Devices/es3c35p/device.properties

@@ -7,8 +7,8 @@ hardware.target=ESP32S3
 hardware.flashSize=16MB
 hardware.spiRam=true
 hardware.spiRamMode=OCT
-hardware.spiRamSpeed=120M
-hardware.esptoolFlashFreq=120M
+hardware.spiRamSpeed=80M
+hardware.esptoolFlashFreq=80M
 hardware.tinyUsb=true
 hardware.bluetooth=true
 

Devices/es3c35p/es3c35p.dts

@@ -88,7 +88,6 @@
 			compatible = "everest,es8311";
 			reg = <0x18>;
 			i2s = <&i2s0>;
-			input-gain-percent = <100>;
 		};
 	};
 

Drivers/es8311-module/bindings/everest,es8311.yaml

@@ -9,7 +9,3 @@ properties:
     type: phandle
     required: true
     description: "I2S controller device that carries audio data"
-  input-gain-percent:
-    type: int
-    default: 100
-    description: "Extra digital gain multiplier applied by audio_stream on top of the ES8311's own 24dB hardware ADC gain, as an integer percentage (100 = 1.0x / no extra boost). For quiet MEMS mic capsules that are still quiet even at max hardware gain."

Drivers/es8311-module/include/drivers/es8311.h

@@ -25,14 +25,6 @@ struct Es8311Config {
     uint8_t address;
     /** I2S controller device that carries audio data */
     struct Device* i2s_device;
-    /**
-     * Extra fixed digital gain multiplier applied by audio_stream on top of the ES8311's
-     * own hardware ADC gain (0..24dB), as an integer percentage (100 = 1.0x / no extra boost).
-     * Small MEMS mic capsules can still sound quiet even near max hardware gain; this is for
-     * boards where 24dB hardware gain alone isn't enough. devicetree has no float property type,
-     * hence the x100 integer encoding.
-     */
-    uint16_t input_gain_percent;
 };
 
 #ifdef __cplusplus

Drivers/es8311-module/source/es8311.cpp

@@ -31,7 +31,6 @@ struct Es8311Data {
     bool is_open = false;
     AudioCodecDirection open_direction = AUDIO_CODEC_DIR_BOTH;
     esp_codec_dev_sample_info_t open_sample_info = {};
-    float input_gain = 1.0f;
 };
 
 #define GET_CONFIG(device) (static_cast<const Es8311Config*>((device)->config))
@@ -165,8 +164,8 @@ error_t set_volume(Device* device, AudioCodecDirection direction, float volume_p
     }
 
     if (direction == AUDIO_CODEC_DIR_INPUT) {
-        // ES8311 ADC gain supports 0..42dB (0,6,12,18,24,30,36,42) – max hardware to restore old +30dB+ behavior
-        float db = (volume_percent / 100.0f) * 42.0f;
+        // ES8311 ADC gain range is roughly 0..24 dB; map 0..100% linearly onto it.
+        float db = (volume_percent / 100.0f) * 24.0f;
         return (esp_codec_dev_set_in_gain(data->codec_device, db) == ESP_CODEC_DEV_OK) ? ERROR_NONE : ERROR_RESOURCE;
     }
 
@@ -193,8 +192,7 @@ error_t get_volume(Device* device, AudioCodecDirection direction, float* volume_
         if (esp_codec_dev_get_in_gain(data->codec_device, &db) != ESP_CODEC_DEV_OK) {
             return ERROR_RESOURCE;
         }
-        *volume_percent = (db / 42.0f) * 100.0f;
-        if (*volume_percent > 100.0f) *volume_percent = 100.0f;
+        *volume_percent = (db / 24.0f) * 100.0f;
         return ERROR_NONE;
     }
 
@@ -257,12 +255,6 @@ error_t get_capabilities(Device* device, AudioCodecDirection* supported_directio
     return ERROR_NONE;
 }
 
-error_t get_input_gain_multiplier(Device* device, float* gain) {
-    auto* data = GET_DATA(device);
-    *gain = data->input_gain;
-    return ERROR_NONE;
-}
-
 static const struct AudioCodecApi API = {
     .open = open,
     .close = close,
@@ -275,7 +267,7 @@ static const struct AudioCodecApi API = {
     .get_native_sample_rate = get_native_sample_rate,
     .get_native_channels = get_native_channels,
     .get_capabilities = get_capabilities,
-    .get_input_gain_multiplier = get_input_gain_multiplier,
+    .get_input_gain_multiplier = nullptr,
 };
 
 // endregion
@@ -285,11 +277,6 @@ static const struct AudioCodecApi API = {
 error_t start_device(Device* device) {
     const auto* config = GET_CONFIG(device);
 
-    if (config->input_gain_percent > 2000) {
-        LOG_E(TAG, "Invalid input_gain_percent %u (must be 0..2000)", config->input_gain_percent);
-        return ERROR_RESOURCE;
-    }
-
     auto* i2c_controller = device_get_parent(device);
     if (i2c_controller == nullptr || device_get_type(i2c_controller) != &I2C_CONTROLLER_TYPE) {
         LOG_E(TAG, "Parent is not an I2C controller");
@@ -303,9 +290,6 @@ error_t start_device(Device* device) {
     }
 
     auto* data = new Es8311Data();
-    data->input_gain = (float) config->input_gain_percent / 100.0f;
-    if (data->input_gain < 0.0f) data->input_gain = 1.0f;
-    if (config->input_gain_percent == 0) data->input_gain = 1.0f; // default when not set (devicetree default 100, but 0 means unset)
 
     data->ctrl_if = audio_codec_adapter_new_i2c_ctrl(i2c_controller, config->address);
     data->data_if = audio_codec_adapter_new_i2s_data(i2s_controller);

Modules/lvgl-module/include/tactility/lvgl_fonts.h

@@ -14,15 +14,6 @@ enum LvglFontSize {
     FONT_SIZE_LARGE,
 };
 
-enum LvglFontScale {
-    FONT_SCALE_SMALL,
-    FONT_SCALE_DEFAULT,
-    FONT_SCALE_LARGE,
-};
-
-void lvgl_set_text_font_scale(enum LvglFontScale font_scale);
-enum LvglFontScale lvgl_get_text_font_scale(void);
-
 const lv_font_t* lvgl_get_shared_icon_font();
 uint32_t lvgl_get_shared_icon_font_height();
 

Modules/lvgl-module/source/lvgl_fonts.c

@@ -13,30 +13,8 @@ extern const lv_font_t TT_LVGL_LAUNCHER_FONT_ICON_SYMBOL;
 extern const lv_font_t TT_LVGL_STATUSBAR_FONT_ICON_SYMBOL;
 extern const lv_font_t TT_LVGL_SHARED_FONT_ICON_SYMBOL;
 
-static enum LvglFontScale text_font_scale = FONT_SCALE_DEFAULT;
-
-void lvgl_set_text_font_scale(enum LvglFontScale font_scale) {
-    check(font_scale >= FONT_SCALE_SMALL && font_scale <= FONT_SCALE_LARGE);
-    text_font_scale = font_scale;
-}
-
-enum LvglFontScale lvgl_get_text_font_scale(void) {
-    return text_font_scale;
-}
-
-static enum LvglFontSize resolve_text_font_size(enum LvglFontSize font_size) {
-    int resolved = (int)font_size + (int)text_font_scale - (int)FONT_SCALE_DEFAULT;
-    if (resolved < FONT_SIZE_SMALL) {
-        return FONT_SIZE_SMALL;
-    }
-    if (resolved > FONT_SIZE_LARGE) {
-        return FONT_SIZE_LARGE;
-    }
-    return (enum LvglFontSize)resolved;
-}
-
 uint32_t lvgl_get_text_font_height(enum LvglFontSize font_size) {
-    switch (resolve_text_font_size(font_size)) {
+    switch (font_size) {
         case FONT_SIZE_SMALL: return TT_LVGL_TEXT_FONT_SMALL_SIZE;
         case FONT_SIZE_DEFAULT: return TT_LVGL_TEXT_FONT_DEFAULT_SIZE;
         case FONT_SIZE_LARGE: return TT_LVGL_TEXT_FONT_LARGE_SIZE;
@@ -44,7 +22,7 @@ uint32_t lvgl_get_text_font_height(enum LvglFontSize font_size) {
     }
 }
 const lv_font_t* lvgl_get_text_font(enum LvglFontSize font_size) {
-    switch (resolve_text_font_size(font_size)) {
+    switch (font_size) {
         case FONT_SIZE_SMALL: return &TT_LVGL_TEXT_FONT_SMALL_SYMBOL;
         case FONT_SIZE_DEFAULT: return &TT_LVGL_TEXT_FONT_DEFAULT_SYMBOL;
         case FONT_SIZE_LARGE: return &TT_LVGL_TEXT_FONT_LARGE_SYMBOL;

Modules/lvgl-module/source/symbols.c

@@ -13,8 +13,6 @@ const struct ModuleSymbol lvgl_module_symbols[] = {
     DEFINE_MODULE_SYMBOL(lvgl_is_running),
     DEFINE_MODULE_SYMBOL(lvgl_get_ui_density),
     // lvgl_fonts
-    DEFINE_MODULE_SYMBOL(lvgl_set_text_font_scale),
-    DEFINE_MODULE_SYMBOL(lvgl_get_text_font_scale),
     DEFINE_MODULE_SYMBOL(lvgl_get_shared_icon_font),
     DEFINE_MODULE_SYMBOL(lvgl_get_shared_icon_font_height),
     DEFINE_MODULE_SYMBOL(lvgl_get_text_font),
@@ -475,4 +473,4 @@ const struct ModuleSymbol lvgl_module_symbols[] = {
     DEFINE_MODULE_SYMBOL(lv_area_get_width),
     DEFINE_MODULE_SYMBOL(lv_area_get_height),
     MODULE_SYMBOL_TERMINATOR
-};
+};

Tactility/Include/Tactility/lvgl/Lvgl.h

@@ -1,9 +1,5 @@
 #pragma once
 
-namespace tt::settings::display {
-enum class FontSize;
-}
-
 namespace tt::lvgl {
 
 #ifdef ESP_PLATFORM
@@ -16,9 +12,6 @@ static constexpr auto* PATH_PREFIX = "A:/";
 
 bool isStarted();
 
-/** Applies the selected semantic text size to the LVGL theme and future widgets. */
-void applyFontSize(settings::display::FontSize fontSize);
-
 void start();
 
 void stop();

Tactility/Include/Tactility/settings/DisplaySettings.h

@@ -22,16 +22,8 @@ enum class ScreensaverType {
     Count           // Sentinel for bounds checking - must be last
 };
 
-enum class FontSize {
-    Small,
-    Default,
-    Large,
-    Count
-};
-
 struct DisplaySettings {
     Orientation orientation;
-    FontSize fontSize = FontSize::Default;
     uint8_t gammaCurve;
     uint8_t backlightDuty;
     bool backlightTimeoutEnabled;

Tactility/Source/app/display/Display.cpp

@@ -8,7 +8,6 @@
 
 #include <Tactility/app/App.h>
 #include <Tactility/hal/display/DisplayDevice.h>
-#include <Tactility/lvgl/Lvgl.h>
 #include <Tactility/lvgl/Toolbar.h>
 #include <Tactility/settings/DisplaySettings.h>
 
@@ -75,21 +74,6 @@ class HalDisplayApp final : public App {
         }
     }
 
-    static void onFontSizeChanged(lv_event_t* event) {
-        auto* app = static_cast<HalDisplayApp*>(lv_event_get_user_data(event));
-        auto* dropdown = static_cast<lv_obj_t*>(lv_event_get_target(event));
-        uint32_t selected_index = lv_dropdown_get_selected(dropdown);
-        if (selected_index >= static_cast<uint32_t>(settings::display::FontSize::Count)) {
-            return;
-        }
-        auto selected_size = static_cast<settings::display::FontSize>(selected_index);
-        if (selected_size != app->displaySettings.fontSize) {
-            app->displaySettings.fontSize = selected_size;
-            app->displaySettingsUpdated = true;
-            lvgl::applyFontSize(selected_size);
-        }
-    }
-
     static void onDisableWhenChargingChanged(lv_event_t* event) {
         auto* app = static_cast<HalDisplayApp*>(lv_event_get_user_data(event));
         auto* sw = static_cast<lv_obj_t*>(lv_event_get_target(event));
@@ -240,23 +224,6 @@ public:
         // Set the dropdown to match current orientation enum
         lv_dropdown_set_selected(orientation_dropdown, static_cast<uint16_t>(displaySettings.orientation));
 
-        // Font size
-
-        auto* font_size_wrapper = lv_obj_create(main_wrapper);
-        lv_obj_set_size(font_size_wrapper, LV_PCT(100), LV_SIZE_CONTENT);
-        lv_obj_set_style_pad_all(font_size_wrapper, 0, LV_STATE_DEFAULT);
-        lv_obj_set_style_border_width(font_size_wrapper, 0, LV_STATE_DEFAULT);
-
-        auto* font_size_label = lv_label_create(font_size_wrapper);
-        lv_label_set_text(font_size_label, "Font size");
-        lv_obj_align(font_size_label, LV_ALIGN_LEFT_MID, 0, 0);
-
-        auto* font_size_dropdown = lv_dropdown_create(font_size_wrapper);
-        lv_dropdown_set_options(font_size_dropdown, "Small\nDefault\nLarge");
-        lv_obj_align(font_size_dropdown, LV_ALIGN_RIGHT_MID, 0, 0);
-        lv_obj_add_event_cb(font_size_dropdown, onFontSizeChanged, LV_EVENT_VALUE_CHANGED, this);
-        lv_dropdown_set_selected(font_size_dropdown, static_cast<uint16_t>(displaySettings.fontSize));
-
         // Screen timeout
 
         if (hal_display->supportsBacklightDuty()) {

Tactility/Source/app/kerneldisplay/KernelDisplay.cpp

@@ -11,7 +11,6 @@
 #include <Tactility/service/displayidle/DisplayIdleService.h>
 #endif
 #include <Tactility/app/App.h>
-#include <Tactility/lvgl/Lvgl.h>
 #include <Tactility/lvgl/Toolbar.h>
 #include <Tactility/settings/DisplaySettings.h>
 
@@ -70,21 +69,6 @@ class KernelDisplayApp final : public App {
         }
     }
 
-    static void onFontSizeChanged(lv_event_t* event) {
-        auto* app = static_cast<KernelDisplayApp*>(lv_event_get_user_data(event));
-        auto* dropdown = static_cast<lv_obj_t*>(lv_event_get_target(event));
-        uint32_t selected_index = lv_dropdown_get_selected(dropdown);
-        if (selected_index >= static_cast<uint32_t>(settings::display::FontSize::Count)) {
-            return;
-        }
-        auto selected_size = static_cast<settings::display::FontSize>(selected_index);
-        if (selected_size != app->displaySettings.fontSize) {
-            app->displaySettings.fontSize = selected_size;
-            app->displaySettingsUpdated = true;
-            lvgl::applyFontSize(selected_size);
-        }
-    }
-
     static void onTimeoutSwitch(lv_event_t* event) {
         auto* app = static_cast<KernelDisplayApp*>(lv_event_get_user_data(event));
         auto* sw = static_cast<lv_obj_t*>(lv_event_get_target(event));
@@ -199,23 +183,6 @@ public:
         // Set the dropdown to match current orientation enum
         lv_dropdown_set_selected(orientation_dropdown, static_cast<uint16_t>(displaySettings.orientation));
 
-        // Font size
-
-        auto* font_size_wrapper = lv_obj_create(main_wrapper);
-        lv_obj_set_size(font_size_wrapper, LV_PCT(100), LV_SIZE_CONTENT);
-        lv_obj_set_style_pad_all(font_size_wrapper, 0, LV_STATE_DEFAULT);
-        lv_obj_set_style_border_width(font_size_wrapper, 0, LV_STATE_DEFAULT);
-
-        auto* font_size_label = lv_label_create(font_size_wrapper);
-        lv_label_set_text(font_size_label, "Font size");
-        lv_obj_align(font_size_label, LV_ALIGN_LEFT_MID, 0, 0);
-
-        auto* font_size_dropdown = lv_dropdown_create(font_size_wrapper);
-        lv_dropdown_set_options(font_size_dropdown, "Small\nDefault\nLarge");
-        lv_obj_align(font_size_dropdown, LV_ALIGN_RIGHT_MID, 0, 0);
-        lv_obj_add_event_cb(font_size_dropdown, onFontSizeChanged, LV_EVENT_VALUE_CHANGED, this);
-        lv_dropdown_set_selected(font_size_dropdown, static_cast<uint16_t>(displaySettings.fontSize));
-
         // Screen timeout
         // Note: DisplayIdleService doesn't act on these settings for kernel-driver displays yet
         // (it only looks up the deprecated tt::hal::display::DisplayDevice), so these currently

Tactility/Source/lvgl/Lvgl.cpp

@@ -13,7 +13,6 @@
 #include <tactility/device.h>
 #include <tactility/drivers/backlight.h>
 #include <tactility/log.h>
-#include <tactility/lvgl_fonts.h>
 #include <tactility/lvgl_module.h>
 #include <tactility/lvgl_pointer.h>
 #include <tactility/module.h>
@@ -28,49 +27,6 @@ bool isStarted() {
     return module_is_started(&lvgl_module);
 }
 
-void applyFontSize(settings::display::FontSize fontSize) {
-    LvglFontScale scale;
-    switch (fontSize) {
-        using enum settings::display::FontSize;
-        case Small:
-            scale = FONT_SCALE_SMALL;
-            break;
-        case Large:
-            scale = FONT_SCALE_LARGE;
-            break;
-        case Default:
-        default:
-            scale = FONT_SCALE_DEFAULT;
-            break;
-    }
-
-    lvgl_set_text_font_scale(scale);
-    const lv_font_t* font = lvgl_get_text_font(FONT_SIZE_DEFAULT);
-
-    for (lv_display_t* display = lv_display_get_next(nullptr);
-         display != nullptr;
-         display = lv_display_get_next(display)) {
-#if LV_USE_THEME_DEFAULT
-        if (lv_display_get_theme(display) == lv_theme_default_get()) {
-            lv_obj_t* screen = lv_display_get_screen_active(display);
-            lv_theme_default_init(
-                display,
-                lv_theme_get_color_primary(screen),
-                lv_theme_get_color_secondary(screen),
-                LV_THEME_DEFAULT_DARK,
-                font
-            );
-        }
-#endif
-        // The display layers are independent inheritance roots. Updating all of them makes
-        // the new size visible immediately in regular screens, overlays, and the status bar.
-        lv_obj_set_style_text_font(lv_display_get_screen_active(display), font, LV_PART_MAIN);
-        lv_obj_set_style_text_font(lv_display_get_layer_top(display), font, LV_PART_MAIN);
-        lv_obj_set_style_text_font(lv_display_get_layer_sys(display), font, LV_PART_MAIN);
-        lv_obj_set_style_text_font(lv_display_get_layer_bottom(display), font, LV_PART_MAIN);
-    }
-}
-
 void attachDevices() {
     LOG_I(TAG, "Adding devices");
 
@@ -99,7 +55,6 @@ void attachDevices() {
         if (rotation != lv_display_get_rotation(primary_lvgl_display)) {
             lv_display_set_rotation(primary_lvgl_display, rotation);
         }
-        applyFontSize(settings.fontSize);
     }
 
     // Start touch

Tactility/Source/settings/DisplaySettings.cpp

@@ -17,7 +17,6 @@ static std::string getSettingsFilePath() {
 }
 
 constexpr auto* SETTINGS_KEY_ORIENTATION = "orientation";
-constexpr auto* SETTINGS_KEY_FONT_SIZE = "fontSize";
 constexpr auto* SETTINGS_KEY_GAMMA_CURVE = "gammaCurve";
 constexpr auto* SETTINGS_KEY_BACKLIGHT_DUTY = "backlightDuty";
 constexpr auto* SETTINGS_KEY_TIMEOUT_ENABLED = "backlightTimeoutEnabled";
@@ -72,34 +71,6 @@ static bool fromString(const std::string& str, Orientation& orientation) {
     }
 }
 
-static std::string toString(FontSize font_size) {
-    switch (font_size) {
-        using enum FontSize;
-        case Small:
-            return "Small";
-        case Default:
-            return "Default";
-        case Large:
-            return "Large";
-        default:
-            std::unreachable();
-    }
-}
-
-static bool fromString(const std::string& str, FontSize& font_size) {
-    if (str == "Small") {
-        font_size = FontSize::Small;
-        return true;
-    } else if (str == "Default") {
-        font_size = FontSize::Default;
-        return true;
-    } else if (str == "Large") {
-        font_size = FontSize::Large;
-        return true;
-    }
-    return false;
-}
-
 static std::string toString(ScreensaverType type) {
     switch (type) {
         using enum ScreensaverType;
@@ -161,12 +132,6 @@ bool load(DisplaySettings& settings) {
         orientation = getDefaultOrientation();
     }
 
-    auto font_size_entry = map.find(SETTINGS_KEY_FONT_SIZE);
-    FontSize font_size = FontSize::Default;
-    if (font_size_entry != map.end()) {
-        fromString(font_size_entry->second, font_size);
-    }
-
     auto gamma_entry = map.find(SETTINGS_KEY_GAMMA_CURVE);
     int gamma_curve = 0;
     if (gamma_entry != map.end()) {
@@ -207,7 +172,6 @@ bool load(DisplaySettings& settings) {
     }
 
     settings.orientation = orientation;
-    settings.fontSize = font_size;
     settings.gammaCurve = gamma_curve;
     settings.backlightDuty = backlight_duty;
     settings.backlightTimeoutEnabled = timeout_enabled;
@@ -221,7 +185,6 @@ bool load(DisplaySettings& settings) {
 DisplaySettings getDefault() {
     return DisplaySettings {
         .orientation = getDefaultOrientation(),
-        .fontSize = FontSize::Default,
         .gammaCurve = 1,
         .backlightDuty = 200,
         .backlightTimeoutEnabled = false,
@@ -244,7 +207,6 @@ bool save(const DisplaySettings& settings) {
     map[SETTINGS_KEY_BACKLIGHT_DUTY] = std::to_string(settings.backlightDuty);
     map[SETTINGS_KEY_GAMMA_CURVE] = std::to_string(settings.gammaCurve);
     map[SETTINGS_KEY_ORIENTATION] = toString(settings.orientation);
-    map[SETTINGS_KEY_FONT_SIZE] = toString(settings.fontSize);
     map[SETTINGS_KEY_TIMEOUT_ENABLED] = settings.backlightTimeoutEnabled ? "1" : "0";
     map[SETTINGS_KEY_TIMEOUT_MS] = std::to_string(settings.backlightTimeoutMs);
     map[SETTINGS_KEY_SCREENSAVER_TYPE] = toString(settings.screensaverType);