Implement CardputerPower and improve EstimatedPower driver (#335)

- `FileBrowser` app now supports deleting directories (recursively)
- `DevelopmentService` and `tactility.py` now support the app `uninstall` action
- Fix crash for `File` app: implement file locking in several places (SPI SD cards need it)
- Remove I2C configuration from `M5stackCardputer.cpp` because we don't support the "Cardputer Adv" variant in that firmware.

.github/workflows/build-firmware.yml

@@ -207,3 +207,21 @@ jobs:
         with:
           board_id: waveshare-s3-touch-lcd-147
           arch: esp32s3
+  waveshare-s3-touch-lcd-128:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: "Build"
+      uses: ./.github/actions/build-firmware
+      with:
+        board_id: waveshare-s3-touch-lcd-128
+        arch: esp32s3
+  waveshare-s3-lcd-13:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: "Build"
+      uses: ./.github/actions/build-firmware
+      with:
+        board_id: waveshare-s3-lcd-13
+        arch: esp32s3

App/Kconfig

@@ -55,6 +55,10 @@ menu "Tactility App"
             bool "Waveshare ESP32 S3 Touch LCD 4.3"
         config TT_BOARD_WAVESHARE_S3_TOUCH_LCD_147
             bool "Waveshare ESP32 S3 Touch LCD 1.47"
+        config TT_BOARD_WAVESHARE_S3_TOUCH_LCD_128
+            bool "Waveshare ESP32 S3 Touch LCD 1.28"
+        config TT_BOARD_WAVESHARE_S3_LCD_13
+            bool "Waveshare ESP32 S3 LCD 1.3"
         help
             Select a board/hardware configuration.
             Use TT_BOARD_CUSTOM if you will manually configure the board in your project.

App/Source/Boards.h

@@ -71,6 +71,12 @@
 #elif defined(CONFIG_TT_BOARD_WAVESHARE_S3_TOUCH_LCD_147)
 #include "WaveshareS3TouchLcd147.h"
 #define TT_BOARD_HARDWARE &waveshare_s3_touch_lcd_147
+#elif defined(CONFIG_TT_BOARD_WAVESHARE_S3_TOUCH_LCD_128)
+#include "WaveshareS3TouchLcd128.h"
+#define TT_BOARD_HARDWARE &waveshare_s3_touch_lcd_128
+#elif defined(CONFIG_TT_BOARD_WAVESHARE_S3_LCD_13)
+#include "WaveshareS3Lcd13.h"
+#define TT_BOARD_HARDWARE &waveshare_s3_lcd_13
 #else
 #define TT_BOARD_HARDWARE NULL
 #error Replace TT_BOARD_HARDWARE in main.c with your own. Or copy one of the ./sdkconfig.board.* files into ./sdkconfig.

App/idf_component.yml

@@ -14,6 +14,7 @@ dependencies:
       - if: "target in [esp32s3, esp32p4]"
   espressif/esp_lcd_st7796:
     version: "1.3.4"
+  espressif/esp_lcd_gc9a01: "2.0.3"
   espressif/esp_lcd_panel_io_additions: "1.0.1"
   espressif/esp_tinyusb:
     version: "1.7.6~1"

Boards/M5stackCardputer/CMakeLists.txt

@@ -3,5 +3,5 @@ file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
 idf_component_register(
     SRCS ${SOURCE_FILES}
     INCLUDE_DIRS "Source"
-    REQUIRES Tactility esp_lvgl_port esp_lcd ST7789 PwmBacklight driver vfs fatfs
+    REQUIRES Tactility esp_lvgl_port esp_lcd ST7789 PwmBacklight driver esp_adc EstimatedPower vfs fatfs
 )

Boards/M5stackCardputer/Source/M5stackCardputer.cpp

@@ -4,6 +4,7 @@
 #include "devices/SdCard.h"
 #include "devices/CardputerEncoder.h"
 #include "devices/CardputerKeyboard.h"
+#include "devices/CardputerPower.h"
 
 #include <lvgl.h>
 #include <Tactility/lvgl/LvglSync.h>
@@ -17,33 +18,14 @@ static DeviceVector createDevices() {
         createSdCard(),
         createDisplay(),
         std::make_shared<CardputerKeyboard>(),
-        std::make_shared<CardputerEncoder>()
+        std::make_shared<CardputerEncoder>(),
+        std::make_shared<CardputerPower>()
     };
 }
 
 extern const Configuration m5stack_cardputer = {
     .initBoot = initBoot,
     .createDevices = createDevices,
-    .i2c = {
-        // Only available on Cardputer Adv (enabling it breaks the keyboard on a Cardputer v1.1)
-        i2c::Configuration {
-            .name = "Internal",
-            .port = I2C_NUM_0,
-            .initMode = i2c::InitMode::Disabled,
-            .isMutable = true,
-            .config = (i2c_config_t) {
-                .mode = I2C_MODE_MASTER,
-                .sda_io_num = GPIO_NUM_8,
-                .scl_io_num = GPIO_NUM_9,
-                .sda_pullup_en = true,
-                .scl_pullup_en = true,
-                .master = {
-                    .clk_speed = 400000
-                },
-                .clk_flags = 0
-            }
-        }
-    },
     .spi {
         // Display
         spi::Configuration {

Boards/M5stackCardputer/Source/devices/CardputerPower.cpp

@@ -0,0 +1,85 @@
+#include "CardputerPower.h"
+
+#include <Tactility/Log.h>
+#include <driver/adc.h>
+
+constexpr auto* TAG = "CardputerPower";
+
+bool CardputerPower::adcInitCalibration() {
+    bool calibrated = false;
+
+    esp_err_t efuse_read_result = esp_adc_cal_check_efuse(ESP_ADC_CAL_VAL_EFUSE_TP_FIT);
+    if (efuse_read_result == ESP_ERR_NOT_SUPPORTED) {
+        TT_LOG_W(TAG, "Calibration scheme not supported, skip software calibration");
+    } else if (efuse_read_result == ESP_ERR_INVALID_VERSION) {
+        TT_LOG_W(TAG, "eFuse not burnt, skip software calibration");
+    } else if (efuse_read_result == ESP_OK) {
+        calibrated = true;
+        TT_LOG_I(TAG, "Calibration success");
+        esp_adc_cal_characterize(ADC_UNIT_1, ADC_ATTEN_DB_11, static_cast<adc_bits_width_t>(ADC_WIDTH_BIT_DEFAULT), 0, &adcCharacteristics);
+    } else {
+        TT_LOG_W(TAG, "eFuse read failed, skipping calibration");
+    }
+
+    return calibrated;
+}
+
+uint32_t CardputerPower::adcReadValue() const {
+    int adc_raw = adc1_get_raw(ADC1_CHANNEL_9);
+    TT_LOG_D(TAG, "Raw  data: %d", adc_raw);
+    float voltage;
+    if (calibrated) {
+        voltage = esp_adc_cal_raw_to_voltage(adc_raw, &adcCharacteristics);
+        TT_LOG_D(TAG, "Calibrated data: %d mV", voltage);
+    } else {
+        voltage = 0.0f;
+    }
+    return voltage;
+}
+
+bool CardputerPower::ensureInitialized() {
+    if (!initialized) {
+        calibrated = adcInitCalibration();
+
+        if (adc1_config_width(static_cast<adc_bits_width_t>(ADC_WIDTH_BIT_DEFAULT)) != ESP_OK) {
+            TT_LOG_E(TAG, "ADC1 config width failed");
+            return false;
+        }
+        if (adc1_config_channel_atten(ADC1_CHANNEL_9, ADC_ATTEN_DB_11) != ESP_OK) {
+            TT_LOG_E(TAG, "ADC1 config attenuation failed");
+            return false;
+        }
+
+        initialized = true;
+    }
+
+    return true;
+}
+
+bool CardputerPower::supportsMetric(MetricType type) const {
+    switch (type) {
+        using enum MetricType;
+        case BatteryVoltage:
+        case ChargeLevel:
+            return true;
+        default:
+            return false;
+    }
+}
+
+bool CardputerPower::getMetric(MetricType type, MetricData& data) {
+    if (!ensureInitialized()) {
+        return false;
+    }
+
+    switch (type) {
+        case MetricType::BatteryVoltage:
+            data.valueAsUint32 = adcReadValue() * 2;
+            return true;
+        case MetricType::ChargeLevel:
+            data.valueAsUint8 = chargeFromAdcVoltage.estimateCharge(adcReadValue() * 2);
+            return true;
+        default:
+            return false;
+    }
+}

Boards/M5stackCardputer/Source/devices/CardputerPower.h

@@ -0,0 +1,28 @@
+#pragma once
+
+#include <Tactility/hal/power/PowerDevice.h>
+#include <ChargeFromVoltage.h>
+#include <esp_adc_cal.h>
+
+using tt::hal::power::PowerDevice;
+
+class CardputerPower final : public PowerDevice {
+
+    ChargeFromVoltage chargeFromAdcVoltage = ChargeFromVoltage(3.3f, 4.2f);
+    bool initialized = false;
+    esp_adc_cal_characteristics_t adcCharacteristics;
+    bool calibrated = false;
+
+    bool adcInitCalibration();
+    uint32_t adcReadValue() const;
+
+    bool ensureInitialized();
+
+public:
+
+    std::string getName() const override { return "Cardputer Power"; }
+    std::string getDescription() const override { return "Power measurement via ADC"; }
+
+    bool supportsMetric(MetricType type) const override;
+    bool getMetric(MetricType type, MetricData& data) override;
+};

Boards/WaveshareS3Lcd13/CMakeLists.txt

@@ -0,0 +1,7 @@
+file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
+
+idf_component_register(
+    SRCS ${SOURCE_FILES}
+    INCLUDE_DIRS "Source"
+    REQUIRES Tactility esp_lvgl_port ST7789 CST816S PwmBacklight driver
+)

Boards/WaveshareS3Lcd13/Source/WaveshareS3Lcd13.cpp

@@ -0,0 +1,94 @@
+#include "devices/Display.h"
+#include "devices/SdCard.h"
+
+#include <PwmBacklight.h>
+#include <Tactility/hal/Configuration.h>
+#include <Tactility/lvgl/LvglSync.h>
+
+using namespace tt::hal;
+
+static DeviceVector createDevices() {
+    return {
+        createDisplay(),
+        createSdCard()
+    };
+}
+
+static bool initBoot() {
+    return driver::pwmbacklight::init(GPIO_NUM_20, 256);
+}
+
+extern const Configuration waveshare_s3_lcd_13 = {
+    .initBoot = initBoot,
+    .createDevices = createDevices,
+    .i2c = {
+        //IMU
+        i2c::Configuration {
+            .name = "Main",
+            .port = I2C_NUM_0,
+            .initMode = i2c::InitMode::ByTactility,
+            .isMutable = false,
+            .config = (i2c_config_t) {
+                .mode = I2C_MODE_MASTER,
+                .sda_io_num = GPIO_NUM_47,
+                .scl_io_num = GPIO_NUM_48,
+                .sda_pullup_en = true,
+                .scl_pullup_en = true,
+                .master = {
+                    .clk_speed = 400000
+                },
+                .clk_flags = 0
+            }
+        }
+    },
+    .spi {
+        // Display
+        spi::Configuration {
+            .device = SPI2_HOST,
+            .dma = SPI_DMA_DISABLED,
+            .config = {
+                .mosi_io_num = GPIO_NUM_41,
+                .miso_io_num = GPIO_NUM_NC,
+                .sclk_io_num = GPIO_NUM_40,
+                .quadwp_io_num = GPIO_NUM_NC,
+                .quadhd_io_num = GPIO_NUM_NC,
+                .data4_io_num = GPIO_NUM_NC,
+                .data5_io_num = GPIO_NUM_NC,
+                .data6_io_num = GPIO_NUM_NC,
+                .data7_io_num = GPIO_NUM_NC,
+                .data_io_default_level = false,
+                .max_transfer_sz = ((240 * (240 / 10)) * LV_COLOR_DEPTH / 8),
+                .flags = 0,
+                .isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
+                .intr_flags = 0
+            },
+            .initMode = spi::InitMode::ByTactility,
+            .isMutable = false,
+            .lock = tt::lvgl::getSyncLock() // esp_lvgl_port owns the lock for the display
+        },
+        // SD card
+         spi::Configuration {
+            .device = SPI3_HOST,
+            .dma = SPI_DMA_CH_AUTO,
+            .config = {
+                .mosi_io_num = GPIO_NUM_18,
+                .miso_io_num = GPIO_NUM_16,
+                .sclk_io_num = GPIO_NUM_21,
+                .quadwp_io_num = GPIO_NUM_NC,
+                .quadhd_io_num = GPIO_NUM_NC,
+                .data4_io_num = GPIO_NUM_NC,
+                .data5_io_num = GPIO_NUM_NC,
+                .data6_io_num = GPIO_NUM_NC,
+                .data7_io_num = GPIO_NUM_NC,
+                .data_io_default_level = false,
+                .max_transfer_sz = 32768,
+                .flags = 0,
+                .isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
+                .intr_flags = 0
+            },
+            .initMode = spi::InitMode::ByTactility,
+            .isMutable = false,
+            .lock = nullptr // No custom lock needed
+        }
+    }
+};

Boards/WaveshareS3Lcd13/Source/WaveshareS3Lcd13.h

@@ -0,0 +1,5 @@
+#pragma once
+
+#include <Tactility/hal/Configuration.h>
+
+extern const tt::hal::Configuration waveshare_s3_lcd_13;

Boards/WaveshareS3Lcd13/Source/devices/Display.cpp

@@ -0,0 +1,27 @@
+#include "Display.h"
+
+#include <PwmBacklight.h>
+#include <St7789Display.h>
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
+
+    auto configuration = std::make_unique<St7789Display::Configuration>(
+        SPI2_HOST,
+        GPIO_NUM_39,
+        GPIO_NUM_38,
+        240,
+        240,
+        nullptr,
+        false,
+        false,
+        false,
+        true
+    );
+
+
+    configuration->resetPin = GPIO_NUM_42;
+    configuration->backlightDutyFunction = driver::pwmbacklight::setBacklightDuty;
+
+    auto display = std::make_shared<St7789Display>(std::move(configuration));
+    return std::reinterpret_pointer_cast<tt::hal::display::DisplayDevice>(display);
+}

Boards/WaveshareS3Lcd13/Source/devices/Display.h

@@ -0,0 +1,5 @@
+#pragma once
+
+#include "Tactility/hal/display/DisplayDevice.h"
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();

Boards/WaveshareS3Lcd13/Source/devices/SdCard.cpp

@@ -0,0 +1,23 @@
+#include "SdCard.h"
+
+#include <Tactility/lvgl/LvglSync.h>
+#include <Tactility/hal/sdcard/SpiSdCardDevice.h>
+
+using tt::hal::sdcard::SpiSdCardDevice;
+
+std::shared_ptr<SdCardDevice> createSdCard() {
+    auto configuration = std::make_unique<SpiSdCardDevice::Config>(
+        GPIO_NUM_17,
+        GPIO_NUM_NC,
+        GPIO_NUM_NC,
+        GPIO_NUM_NC,
+        SdCardDevice::MountBehaviour::AtBoot,
+        std::make_shared<tt::Mutex>(tt::Mutex::Type::Recursive),
+        std::vector<gpio_num_t>(),
+        SPI3_HOST
+    );
+
+    return std::make_shared<SpiSdCardDevice>(
+        std::move(configuration)
+    );
+}

Boards/WaveshareS3Lcd13/Source/devices/SdCard.h

@@ -0,0 +1,7 @@
+#pragma once
+
+#include "Tactility/hal/sdcard/SdCardDevice.h"
+
+using tt::hal::sdcard::SdCardDevice;
+
+std::shared_ptr<SdCardDevice> createSdCard();

Boards/WaveshareS3TouchLcd128/CMakeLists.txt

@@ -0,0 +1,7 @@
+file(GLOB_RECURSE SOURCE_FILES Source/*.c*)
+
+idf_component_register(
+    SRCS ${SOURCE_FILES}
+    INCLUDE_DIRS "Source"
+    REQUIRES Tactility esp_lvgl_port GC9A01 CST816S PwmBacklight driver
+)

Boards/WaveshareS3TouchLcd128/Source/WaveshareS3TouchLcd128.cpp

@@ -0,0 +1,97 @@
+#include "devices/Display.h"
+#include "devices/SdCard.h"
+
+#include <PwmBacklight.h>
+#include <Tactility/hal/Configuration.h>
+#include <Tactility/lvgl/LvglSync.h>
+
+using namespace tt::hal;
+
+constexpr auto* TAG = "Waveshare";
+
+static DeviceVector createDevices() {
+    return {
+        createDisplay(),
+        createSdCard()
+    };
+}
+
+static bool initBoot() {
+    return driver::pwmbacklight::init(GPIO_NUM_2, 256);
+}
+
+extern const Configuration waveshare_s3_touch_lcd_128 = {
+    .initBoot = initBoot,
+    .createDevices = createDevices,
+    .i2c = {
+        i2c::Configuration {
+            .name = "Main",
+            .port = I2C_NUM_0,
+            .initMode = i2c::InitMode::ByTactility,
+            .isMutable = false,
+            .config = (i2c_config_t) {
+                .mode = I2C_MODE_MASTER,
+                .sda_io_num = GPIO_NUM_6,
+                .scl_io_num = GPIO_NUM_7,
+                .sda_pullup_en = false,
+                .scl_pullup_en = false,
+                .master = {
+                    .clk_speed = 400000
+                },
+                .clk_flags = 0
+            }
+        }
+    },
+    .spi {
+        // Display
+        spi::Configuration {
+            .device = SPI2_HOST,
+            .dma = SPI_DMA_DISABLED,
+            .config = {
+                .mosi_io_num = GPIO_NUM_11,
+                .miso_io_num = GPIO_NUM_12,
+                .sclk_io_num = GPIO_NUM_10,
+                .quadwp_io_num = GPIO_NUM_NC,
+                .quadhd_io_num = GPIO_NUM_NC,
+                .data4_io_num = GPIO_NUM_NC,
+                .data5_io_num = GPIO_NUM_NC,
+                .data6_io_num = GPIO_NUM_NC,
+                .data7_io_num = GPIO_NUM_NC,
+                .data_io_default_level = false,
+                .max_transfer_sz = ((240 * (240 / 10)) * LV_COLOR_DEPTH / 8),
+                .flags = 0,
+                .isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
+                .intr_flags = 0
+            },
+            .initMode = spi::InitMode::ByTactility,
+            .isMutable = false,
+            .lock = tt::lvgl::getSyncLock() // esp_lvgl_port owns the lock for the display
+        },
+        // SD card available via external sd card module and uses VSYS (5V) / GND / IO15 / IO16 / IO17 / IO18 pins.
+        // Common micro sd card module you'd find on aliexpress with voltage regulator onboard. Others may work.
+        // JST SH 1.0 Header, GND / VSYS (5V) / RESET / BOOT / GND / 3.3V / IO15 / IO16 / IO17 / IO18 / IO21 / IO33
+         spi::Configuration {
+            .device = SPI3_HOST,
+            .dma = SPI_DMA_CH_AUTO,
+            .config = {
+                .mosi_io_num = GPIO_NUM_16,
+                .miso_io_num = GPIO_NUM_15,
+                .sclk_io_num = GPIO_NUM_17,
+                .quadwp_io_num = GPIO_NUM_NC,
+                .quadhd_io_num = GPIO_NUM_NC,
+                .data4_io_num = GPIO_NUM_NC,
+                .data5_io_num = GPIO_NUM_NC,
+                .data6_io_num = GPIO_NUM_NC,
+                .data7_io_num = GPIO_NUM_NC,
+                .data_io_default_level = false,
+                .max_transfer_sz = 32768,
+                .flags = 0,
+                .isr_cpu_id = ESP_INTR_CPU_AFFINITY_AUTO,
+                .intr_flags = 0
+            },
+            .initMode = spi::InitMode::ByTactility,
+            .isMutable = false,
+            .lock = nullptr // No custom lock needed
+        }
+    }
+};

Boards/WaveshareS3TouchLcd128/Source/WaveshareS3TouchLcd128.h

@@ -0,0 +1,5 @@
+#pragma once
+
+#include <Tactility/hal/Configuration.h>
+
+extern const tt::hal::Configuration waveshare_s3_touch_lcd_128;

Boards/WaveshareS3TouchLcd128/Source/devices/Display.cpp

@@ -0,0 +1,45 @@
+#include "Display.h"
+
+#include <Cst816Touch.h>
+#include <PwmBacklight.h>
+#include <Gc9a01Display.h>
+
+std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable createTouch() {
+    auto configuration = std::make_unique<Cst816sTouch::Configuration>(
+        I2C_NUM_0,
+        240,
+        240,
+        false,
+        true,
+        false,
+        GPIO_NUM_13,
+        GPIO_NUM_5
+    );
+
+    return std::make_shared<Cst816sTouch>(std::move(configuration));
+}
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay() {
+    auto touch = createTouch();
+
+    auto configuration = std::make_unique<Gc9a01Display::Configuration>(
+        SPI2_HOST,
+        GPIO_NUM_9,
+        GPIO_NUM_8,
+        240,
+        240,
+        touch,
+        false,
+        false,
+        true,
+        true,
+        0,
+        LCD_RGB_ELEMENT_ORDER_BGR
+    );
+
+    configuration->resetPin = GPIO_NUM_14;
+    configuration->backlightDutyFunction = driver::pwmbacklight::setBacklightDuty;
+
+    auto display = std::make_shared<Gc9a01Display>(std::move(configuration));
+    return std::reinterpret_pointer_cast<tt::hal::display::DisplayDevice>(display);
+}

Boards/WaveshareS3TouchLcd128/Source/devices/Display.h

@@ -0,0 +1,5 @@
+#pragma once
+
+#include "Tactility/hal/display/DisplayDevice.h"
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();

Boards/WaveshareS3TouchLcd128/Source/devices/SdCard.cpp

@@ -0,0 +1,23 @@
+#include "SdCard.h"
+
+#include <Tactility/lvgl/LvglSync.h>
+#include <Tactility/hal/sdcard/SpiSdCardDevice.h>
+
+using tt::hal::sdcard::SpiSdCardDevice;
+
+std::shared_ptr<SdCardDevice> createSdCard() {
+    auto configuration = std::make_unique<SpiSdCardDevice::Config>(
+        GPIO_NUM_18,
+        GPIO_NUM_NC,
+        GPIO_NUM_NC,
+        GPIO_NUM_NC,
+        SdCardDevice::MountBehaviour::AtBoot,
+        std::make_shared<tt::Mutex>(tt::Mutex::Type::Recursive),
+        std::vector<gpio_num_t>(),
+        SPI3_HOST
+    );
+
+    return std::make_shared<SpiSdCardDevice>(
+        std::move(configuration)
+    );
+}

Boards/WaveshareS3TouchLcd128/Source/devices/SdCard.h

@@ -0,0 +1,7 @@
+#pragma once
+
+#include "Tactility/hal/sdcard/SdCardDevice.h"
+
+using tt::hal::sdcard::SdCardDevice;
+
+std::shared_ptr<SdCardDevice> createSdCard();

Buildscripts/board.cmake

@@ -65,6 +65,10 @@ function(INIT_TACTILITY_GLOBALS SDKCONFIG_FILE)
         set(TACTILITY_BOARD_PROJECT WaveshareS3Touch43)
     elseif (board_id STREQUAL "waveshare-s3-touch-lcd-147")
         set(TACTILITY_BOARD_PROJECT WaveshareS3TouchLcd147)
+    elseif (board_id STREQUAL "waveshare-s3-touch-lcd-128")
+        set(TACTILITY_BOARD_PROJECT WaveshareS3TouchLcd128)
+    elseif (board_id STREQUAL "waveshare-s3-lcd-13")
+        set(TACTILITY_BOARD_PROJECT WaveshareS3Lcd13)
     else ()
         set(TACTILITY_BOARD_PROJECT "")
     endif ()

Buildscripts/build-and-release-all.sh

@@ -81,6 +81,12 @@ release waveshare-s3-touch-43
 build waveshare-s3-touch-lcd-147
 release waveshare-s3-touch-lcd-147
 
+build waveshare-s3-touch-lcd-128
+release waveshare-s3-touch-lcd-128
+
+build waveshare-s3-lcd-13
+release waveshare-s3-lcd-13
+
 build unphone
 release unphone
 

Documentation/ideas.md

@@ -31,6 +31,7 @@
 - Bug: Turn on WiFi (when testing it wasn't connected/connecting - just active). Open chat. Observe crash.
 - Toolbar: when the title doesn't fit, scroll the text instead of splitting it onto a new line (try on Waveshare 1.47")
 - UI: create UI size classification (e.g. "compact" for tiny screens without touch)
+- Bug: Crash handling app cannot be exited with an EncoderDevice. (current work-around is to manually reset the device)
 
 ## Lower Priority
 

Drivers/EstimatedPower/Source/ChargeFromAdcVoltage.cpp

@@ -2,19 +2,14 @@
 #include <Tactility/Log.h>
 #include <algorithm>
 
-constexpr auto TAG = "EstimatePower";
+constexpr auto TAG = "ChargeFromAdcV";
 constexpr auto MAX_VOLTAGE_SAMPLES = 15;
 
-uint8_t ChargeFromAdcVoltage::estimateChargeLevelFromVoltage(uint32_t milliVolt) const {
-    const float volts = std::min((float)milliVolt / 1000.f, configuration.batteryVoltageMax);
-    const float voltage_percentage = (volts - configuration.batteryVoltageMin) / (configuration.batteryVoltageMax - configuration.batteryVoltageMin);
-    const float voltage_factor = std::min(1.0f, voltage_percentage);
-    const auto charge_level = (uint8_t) (voltage_factor * 100.f);
-    TT_LOG_V(TAG, "mV = %lu, scaled = %.2f, factor = %.2f, result = %d", milliVolt, volts, voltage_factor, charge_level);
-    return charge_level;
-}
-
-ChargeFromAdcVoltage::ChargeFromAdcVoltage(const Configuration& configuration) : configuration(configuration) {
+ChargeFromAdcVoltage::ChargeFromAdcVoltage(
+    const Configuration& configuration,
+    float voltageMin,
+    float voltageMax
+) : configuration(configuration), chargeFromVoltage(voltageMin, voltageMax) {
     if (adc_oneshot_new_unit(&configuration.adcConfig, &adcHandle) != ESP_OK) {
         TT_LOG_E(TAG, "ADC config failed");
         return;

Drivers/EstimatedPower/Source/ChargeFromAdcVoltage.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <ChargeFromVoltage.h>
 #include <esp_adc/adc_oneshot.h>
 
 class ChargeFromAdcVoltage {
@@ -7,11 +8,9 @@ class ChargeFromAdcVoltage {
 public:
 
     struct Configuration {
-        adc_channel_t adcChannel = ADC_CHANNEL_3;
         float adcMultiplier = 1.0f;
         float adcRefVoltage = 3.3f;
-        float batteryVoltageMin = 3.2f;
-        float batteryVoltageMax = 4.2f;
+        adc_channel_t adcChannel = ADC_CHANNEL_3;
         adc_oneshot_unit_init_cfg_t adcConfig = {
             .unit_id = ADC_UNIT_1,
             .clk_src = ADC_RTC_CLK_SRC_DEFAULT,
@@ -27,16 +26,17 @@ private:
 
     adc_oneshot_unit_handle_t adcHandle = nullptr;
     Configuration configuration;
+    ChargeFromVoltage chargeFromVoltage;
 
 public:
 
-    explicit ChargeFromAdcVoltage(const Configuration& configuration);
+    explicit ChargeFromAdcVoltage(const Configuration& configuration, float voltageMin = 3.2f, float voltageMax = 4.2f);
 
     ~ChargeFromAdcVoltage();
 
-    uint8_t estimateChargeLevelFromVoltage(uint32_t milliVolt) const;
-
     bool readBatteryVoltageSampled(uint32_t& output) const;
 
     bool readBatteryVoltageOnce(uint32_t& output) const;
+
+    uint8_t estimateChargeLevelFromVoltage(uint32_t milliVolt) const { return chargeFromVoltage.estimateCharge(milliVolt); }
 };

Drivers/EstimatedPower/Source/ChargeFromVoltage.cpp

@@ -0,0 +1,16 @@
+#include "ChargeFromVoltage.h"
+#include <Tactility/Log.h>
+
+constexpr auto* TAG = "ChargeFromVoltage";
+
+uint8_t ChargeFromVoltage::estimateCharge(uint32_t milliVolt) const {
+    const float volts = std::min((float)milliVolt / 1000.f, batteryVoltageMax);
+    if (volts < batteryVoltageMin) {
+        return 0;
+    }
+    const float voltage_percentage = (volts - batteryVoltageMin) / (batteryVoltageMax - batteryVoltageMin);
+    const float voltage_factor = std::min(1.0f, voltage_percentage);
+    const auto charge_level = (uint8_t) (voltage_factor * 100.f);
+    TT_LOG_D(TAG, "mV = %lu, scaled = %.2f, factor = %.2f, result = %d", milliVolt, volts, voltage_factor, charge_level);
+    return charge_level;
+}

Drivers/EstimatedPower/Source/ChargeFromVoltage.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <cstdint>
+
+class ChargeFromVoltage {
+
+    float batteryVoltageMin;
+    float batteryVoltageMax;
+
+public:
+
+    explicit ChargeFromVoltage(float voltageMin = 3.2f, float voltageMax = 4.2f) :
+        batteryVoltageMin(voltageMin),
+        batteryVoltageMax(voltageMax)
+    {}
+
+    /**
+     * @param milliVolt
+     * @return a value in the rage of [0, 100] which represents [0%, 100%] charge
+     */
+    uint8_t estimateCharge(uint32_t milliVolt) const;
+};

Drivers/GC9A01/CMakeLists.txt

@@ -0,0 +1,5 @@
+idf_component_register(
+    SRC_DIRS "Source"
+    INCLUDE_DIRS "Source"
+    REQUIRES Tactility driver esp_lcd_gc9a01 EspLcdCompat
+)

Drivers/GC9A01/README.md

@@ -0,0 +1,3 @@
+# GC9A01
+
+A basic ESP32 LVGL driver for GC9A01 displays.

Drivers/GC9A01/Source/Gc9a01Display.cpp

@@ -0,0 +1,122 @@
+#include "Gc9a01Display.h"
+
+#include <Tactility/Log.h>
+
+#include <esp_lcd_gc9a01.h>
+#include <esp_lcd_panel_commands.h>
+#include <esp_lvgl_port.h>
+
+constexpr auto TAG = "GC9A01";
+
+bool Gc9a01Display::createIoHandle(esp_lcd_panel_io_handle_t& outHandle) {
+    TT_LOG_I(TAG, "Starting");
+
+    const esp_lcd_panel_io_spi_config_t panel_io_config = {
+        .cs_gpio_num = configuration->csPin,
+        .dc_gpio_num = configuration->dcPin,
+        .spi_mode = 0,
+        .pclk_hz = configuration->pixelClockFrequency,
+        .trans_queue_depth = configuration->transactionQueueDepth,
+        .on_color_trans_done = nullptr,
+        .user_ctx = nullptr,
+        .lcd_cmd_bits = 8,
+        .lcd_param_bits = 8,
+        .cs_ena_pretrans = 0,
+        .cs_ena_posttrans = 0,
+        .flags = {
+            .dc_high_on_cmd = 0,
+            .dc_low_on_data = 0,
+            .dc_low_on_param = 0,
+            .octal_mode = 0,
+            .quad_mode = 0,
+            .sio_mode = 0,
+            .lsb_first = 0,
+            .cs_high_active = 0
+        }
+    };
+
+    if (esp_lcd_new_panel_io_spi(configuration->spiHostDevice, &panel_io_config, &outHandle) != ESP_OK) {
+        TT_LOG_E(TAG, "Failed to create panel");
+        return false;
+    }
+
+    return true;
+}
+
+bool Gc9a01Display::createPanelHandle(esp_lcd_panel_io_handle_t ioHandle, esp_lcd_panel_handle_t& panelHandle) {
+    const esp_lcd_panel_dev_config_t panel_config = {
+        .reset_gpio_num = configuration->resetPin,
+        .rgb_ele_order = configuration->rgbElementOrder,
+        .data_endian = LCD_RGB_DATA_ENDIAN_LITTLE,
+        .bits_per_pixel = 16,
+        .flags = {
+            .reset_active_high = false
+        },
+        .vendor_config = nullptr
+    };
+
+    if (esp_lcd_new_panel_gc9a01(ioHandle, &panel_config, &panelHandle) != ESP_OK) {
+        TT_LOG_E(TAG, "Failed to create panel");
+        return false;
+    }
+
+    if (esp_lcd_panel_reset(panelHandle) != ESP_OK) {
+        TT_LOG_E(TAG, "Failed to reset panel");
+        return false;
+    }
+
+    if (esp_lcd_panel_init(panelHandle) != ESP_OK) {
+        TT_LOG_E(TAG, "Failed to init panel");
+        return false;
+    }
+
+    if (esp_lcd_panel_swap_xy(panelHandle, configuration->swapXY) != ESP_OK) {
+        TT_LOG_E(TAG, "Failed to swap XY ");
+        return false;
+    }
+
+    if (esp_lcd_panel_mirror(panelHandle, configuration->mirrorX, configuration->mirrorY) != ESP_OK) {
+        TT_LOG_E(TAG, "Failed to set panel to mirror");
+        return false;
+    }
+
+    if (esp_lcd_panel_invert_color(panelHandle, configuration->invertColor) != ESP_OK) {
+        TT_LOG_E(TAG, "Failed to set panel to invert");
+        return false;
+    }
+
+    if (esp_lcd_panel_disp_on_off(panelHandle, true) != ESP_OK) {
+        TT_LOG_E(TAG, "Failed to turn display on");
+        return false;
+    }
+
+    return true;
+}
+
+lvgl_port_display_cfg_t Gc9a01Display::getLvglPortDisplayConfig(esp_lcd_panel_io_handle_t ioHandle, esp_lcd_panel_handle_t panelHandle) {
+    return lvgl_port_display_cfg_t {
+        .io_handle = ioHandle,
+        .panel_handle = panelHandle,
+        .control_handle = nullptr,
+        .buffer_size = configuration->bufferSize,
+        .double_buffer = true,
+        .trans_size = 0,
+        .hres = configuration->horizontalResolution,
+        .vres = configuration->verticalResolution,
+        .monochrome = false,
+        .rotation = {
+            .swap_xy = configuration->swapXY,
+            .mirror_x = configuration->mirrorX,
+            .mirror_y = configuration->mirrorY,
+        },
+        .color_format = LV_COLOR_FORMAT_RGB565,
+        .flags = {
+            .buff_dma = true,
+            .buff_spiram = false,
+            .sw_rotate = false,
+            .swap_bytes = true,
+            .full_refresh = false,
+            .direct_mode = false
+        }
+    };
+}

Drivers/GC9A01/Source/Gc9a01Display.h

@@ -0,0 +1,108 @@
+#pragma once
+
+#include "Tactility/hal/spi/Spi.h"
+
+#include <EspLcdDisplay.h>
+#include <Tactility/hal/display/DisplayDevice.h>
+
+#include <driver/gpio.h>
+#include <esp_lcd_panel_io.h>
+#include <esp_lcd_types.h>
+#include <functional>
+#include <lvgl.h>
+
+class Gc9a01Display final : public EspLcdDisplay {
+
+    std::shared_ptr<tt::Lock> lock;
+
+public:
+
+    class Configuration {
+
+    public:
+
+        Configuration(
+            spi_host_device_t spiHostDevice,
+            gpio_num_t csPin,
+            gpio_num_t dcPin,
+            unsigned int horizontalResolution,
+            unsigned int verticalResolution,
+            std::shared_ptr<tt::hal::touch::TouchDevice> touch,
+            bool swapXY = false,
+            bool mirrorX = false,
+            bool mirrorY = false,
+            bool invertColor = false,
+            uint32_t bufferSize = 0, // Size in pixel count. 0 means default, which is 1/10 of the screen size
+            lcd_rgb_element_order_t rgbElementOrder = LCD_RGB_ELEMENT_ORDER_RGB
+        ) : spiHostDevice(spiHostDevice),
+            csPin(csPin),
+            dcPin(dcPin),
+            horizontalResolution(horizontalResolution),
+            verticalResolution(verticalResolution),
+            swapXY(swapXY),
+            mirrorX(mirrorX),
+            mirrorY(mirrorY),
+            invertColor(invertColor),
+            bufferSize(bufferSize),
+            rgbElementOrder(rgbElementOrder),
+            touch(std::move(touch))
+        {
+            if (this->bufferSize == 0) {
+                this->bufferSize = horizontalResolution * verticalResolution / 10;
+            }
+        }
+
+        spi_host_device_t spiHostDevice;
+        gpio_num_t csPin;
+        gpio_num_t dcPin;
+        gpio_num_t resetPin = GPIO_NUM_NC;
+        unsigned int pixelClockFrequency = 80'000'000; // Hertz
+        size_t transactionQueueDepth = 10;
+        unsigned int horizontalResolution;
+        unsigned int verticalResolution;
+        bool swapXY = false;
+        bool mirrorX = false;
+        bool mirrorY = false;
+        bool invertColor = false;
+        uint32_t bufferSize = 0; // Size in pixel count. 0 means default, which is 1/10 of the screen size
+        lcd_rgb_element_order_t rgbElementOrder;
+        std::shared_ptr<tt::hal::touch::TouchDevice> touch;
+        std::function<void(uint8_t)> _Nullable backlightDutyFunction = nullptr;
+    };
+
+private:
+
+    std::unique_ptr<Configuration> configuration;
+
+    bool createIoHandle(esp_lcd_panel_io_handle_t& ioHandle) override;
+
+    bool createPanelHandle(esp_lcd_panel_io_handle_t ioHandle, esp_lcd_panel_handle_t& panelHandle) override;
+
+    lvgl_port_display_cfg_t getLvglPortDisplayConfig(esp_lcd_panel_io_handle_t ioHandle, esp_lcd_panel_handle_t panelHandle) override;
+
+public:
+
+    explicit Gc9a01Display(std::unique_ptr<Configuration> inConfiguration) :
+        EspLcdDisplay(tt::hal::spi::getLock(inConfiguration->spiHostDevice)),
+        configuration(std::move(inConfiguration)
+    ) {
+        assert(configuration != nullptr);
+        assert(getLock() != nullptr);
+    }
+
+    std::string getName() const override { return "GC9A01"; }
+
+    std::string getDescription() const override { return "GC9A01 display"; }
+
+    std::shared_ptr<tt::hal::touch::TouchDevice> _Nullable getTouchDevice() override { return configuration->touch; }
+
+    void setBacklightDuty(uint8_t backlightDuty) override {
+        if (configuration->backlightDutyFunction != nullptr) {
+            configuration->backlightDutyFunction(backlightDuty);
+        }
+    }
+
+    bool supportsBacklightDuty() const override { return configuration->backlightDutyFunction != nullptr; }
+};
+
+std::shared_ptr<tt::hal::display::DisplayDevice> createDisplay();

ExternalApps/Calculator/tactility.py

@@ -14,7 +14,7 @@ import shutil
 import configparser
 
 ttbuild_path = ".tactility"
-ttbuild_version = "2.0.0"
+ttbuild_version = "2.1.0"
 ttbuild_cdn = "https://cdn.tactility.one"
 ttbuild_sdk_json_validity = 3600  # seconds
 ttport = 6666
@@ -60,8 +60,9 @@ def print_help():
     print("  clean                          Clean the build folders")
     print("  clearcache                     Clear the SDK cache")
     print("  updateself                     Update this tool")
-    print("  run [ip]                       Run an application")
-    print("  install [ip]                   Install an application")
+    print("  run [ip]                       Run the application")
+    print("  install [ip]                   Install the application")
+    print("  uninstall [ip]                 Uninstall the application")
     print("  bir [ip] [esp32,esp32s3]       Build, install then run. Optionally specify a platform.")
     print("  brrr [ip] [esp32,esp32s3]      Functionally the same as \"bir\", but \"app goes brrr\" meme variant.")
     print("")
@@ -544,6 +545,19 @@ def install_action(ip, platforms):
     except IOError as e:
         print_error(f"File error: {e}")
 
+def uninstall_action(manifest, ip):
+    app_id = manifest["app"]["id"]
+    print(f"Uninstalling {app_id} on {ip}")
+    url = get_url(ip, "/app/uninstall")
+    params = {'id': app_id}
+    try:
+        response = requests.put(url, params=params)
+        if response.status_code != 200:
+            print_error("Uninstall failed")
+        else:
+            print(f"{shell_color_green}Uninstall successful ✅{shell_color_reset}")
+    except requests.RequestException as e:
+        print(f"Request failed: {e}")
 #region Main
 
 if __name__ == "__main__":
@@ -599,6 +613,11 @@ if __name__ == "__main__":
             platform = sys.argv[3]
             platforms_to_install = [platform]
         install_action(sys.argv[2], platforms_to_install)
+    elif action_arg == "uninstall":
+        if len(sys.argv) < 3:
+            print_help()
+            exit_with_error("Commandline parameter missing")
+        uninstall_action(manifest, sys.argv[2])
     elif action_arg == "bir":
         if len(sys.argv) < 3:
             print_help()

ExternalApps/GraphicsDemo/tactility.py

@@ -14,7 +14,7 @@ import shutil
 import configparser
 
 ttbuild_path = ".tactility"
-ttbuild_version = "2.0.0"
+ttbuild_version = "2.1.0"
 ttbuild_cdn = "https://cdn.tactility.one"
 ttbuild_sdk_json_validity = 3600  # seconds
 ttport = 6666
@@ -60,8 +60,9 @@ def print_help():
     print("  clean                          Clean the build folders")
     print("  clearcache                     Clear the SDK cache")
     print("  updateself                     Update this tool")
-    print("  run [ip]                       Run an application")
-    print("  install [ip]                   Install an application")
+    print("  run [ip]                       Run the application")
+    print("  install [ip]                   Install the application")
+    print("  uninstall [ip]                 Uninstall the application")
     print("  bir [ip] [esp32,esp32s3]       Build, install then run. Optionally specify a platform.")
     print("  brrr [ip] [esp32,esp32s3]      Functionally the same as \"bir\", but \"app goes brrr\" meme variant.")
     print("")
@@ -544,6 +545,19 @@ def install_action(ip, platforms):
     except IOError as e:
         print_error(f"File error: {e}")
 
+def uninstall_action(manifest, ip):
+    app_id = manifest["app"]["id"]
+    print(f"Uninstalling {app_id} on {ip}")
+    url = get_url(ip, "/app/uninstall")
+    params = {'id': app_id}
+    try:
+        response = requests.put(url, params=params)
+        if response.status_code != 200:
+            print_error("Uninstall failed")
+        else:
+            print(f"{shell_color_green}Uninstall successful ✅{shell_color_reset}")
+    except requests.RequestException as e:
+        print(f"Request failed: {e}")
 #region Main
 
 if __name__ == "__main__":
@@ -599,6 +613,11 @@ if __name__ == "__main__":
             platform = sys.argv[3]
             platforms_to_install = [platform]
         install_action(sys.argv[2], platforms_to_install)
+    elif action_arg == "uninstall":
+        if len(sys.argv) < 3:
+            print_help()
+            exit_with_error("Commandline parameter missing")
+        uninstall_action(manifest, sys.argv[2])
     elif action_arg == "bir":
         if len(sys.argv) < 3:
             print_help()

ExternalApps/HelloWorld/tactility.py

@@ -14,7 +14,7 @@ import shutil
 import configparser
 
 ttbuild_path = ".tactility"
-ttbuild_version = "2.0.0"
+ttbuild_version = "2.1.0"
 ttbuild_cdn = "https://cdn.tactility.one"
 ttbuild_sdk_json_validity = 3600  # seconds
 ttport = 6666
@@ -60,8 +60,9 @@ def print_help():
     print("  clean                          Clean the build folders")
     print("  clearcache                     Clear the SDK cache")
     print("  updateself                     Update this tool")
-    print("  run [ip]                       Run an application")
-    print("  install [ip]                   Install an application")
+    print("  run [ip]                       Run the application")
+    print("  install [ip]                   Install the application")
+    print("  uninstall [ip]                 Uninstall the application")
     print("  bir [ip] [esp32,esp32s3]       Build, install then run. Optionally specify a platform.")
     print("  brrr [ip] [esp32,esp32s3]      Functionally the same as \"bir\", but \"app goes brrr\" meme variant.")
     print("")
@@ -544,6 +545,19 @@ def install_action(ip, platforms):
     except IOError as e:
         print_error(f"File error: {e}")
 
+def uninstall_action(manifest, ip):
+    app_id = manifest["app"]["id"]
+    print(f"Uninstalling {app_id} on {ip}")
+    url = get_url(ip, "/app/uninstall")
+    params = {'id': app_id}
+    try:
+        response = requests.put(url, params=params)
+        if response.status_code != 200:
+            print_error("Uninstall failed")
+        else:
+            print(f"{shell_color_green}Uninstall successful ✅{shell_color_reset}")
+    except requests.RequestException as e:
+        print(f"Request failed: {e}")
 #region Main
 
 if __name__ == "__main__":
@@ -599,6 +613,11 @@ if __name__ == "__main__":
             platform = sys.argv[3]
             platforms_to_install = [platform]
         install_action(sys.argv[2], platforms_to_install)
+    elif action_arg == "uninstall":
+        if len(sys.argv) < 3:
+            print_help()
+            exit_with_error("Commandline parameter missing")
+        uninstall_action(manifest, sys.argv[2])
     elif action_arg == "bir":
         if len(sys.argv) < 3:
             print_help()

Tactility/Include/Tactility/app/App.h

@@ -100,4 +100,6 @@ std::string getInstallPath();
 
 bool install(const std::string& path);
 
+bool uninstall(const std::string& appId);
+
 }

Tactility/Include/Tactility/app/AppRegistration.h

@@ -11,6 +11,9 @@ struct AppManifest;
 /** Register an application with its manifest */
 void addApp(const AppManifest& manifest);
 
+/** Remove an app from the registry */
+bool removeApp(const std::string& id);
+
 /** Find an application manifest by its id
  * @param[in] id the manifest id
  * @return the application manifest if it was found

Tactility/Private/Tactility/service/development/DevelopmentService.h

@@ -41,6 +41,13 @@ class DevelopmentService final : public Service {
         .user_ctx = this
     };
 
+    httpd_uri_t appUninstallEndpoint = {
+        .uri = "/app/uninstall",
+        .method = HTTP_PUT,
+        .handler = handleAppUninstall,
+        .user_ctx = this
+    };
+
     void onNetworkConnected();
     void onNetworkDisconnected();
 
@@ -50,6 +57,7 @@ class DevelopmentService final : public Service {
     static esp_err_t handleGetInfo(httpd_req_t* request);
     static esp_err_t handleAppRun(httpd_req_t* request);
     static esp_err_t handleAppInstall(httpd_req_t* request);
+    static esp_err_t handleAppUninstall(httpd_req_t* request);
 
 public:
 

Tactility/Source/app/AppInstall.cpp

@@ -223,4 +223,25 @@ bool install(const std::string& path) {
     return true;
 }
 
+bool uninstall(const std::string& appId) {
+    TT_LOG_I(TAG, "Uninstalling app %s", appId.c_str());
+    auto app_path = getInstallPath() + "/" + appId;
+    return file::withLock<bool>(app_path, [&app_path, &appId]() {
+        if (!file::isDirectory(app_path)) {
+            TT_LOG_E(TAG, "App %s not found at ", app_path.c_str());
+            return false;
+        }
+
+        if (!file::deleteRecursively(app_path)) {
+            return false;
+        }
+
+        if (!removeApp(appId)) {
+            TT_LOG_W(TAG, "Failed to remove app %d from registry", appId.c_str());
+        }
+
+        return true;
+    });
+}
+
 } // namespace

Tactility/Source/app/AppRegistration.cpp

@@ -29,6 +29,15 @@ void addApp(const AppManifest& manifest) {
     hash_mutex.unlock();
 }
 
+bool removeApp(const std::string& id) {
+    TT_LOG_I(TAG, "Removing manifest for  %s", id.c_str());
+
+    auto lock = hash_mutex.asScopedLock();
+    lock.lock();
+
+    return app_manifest_map.erase(id) == 1;
+}
+
 _Nullable std::shared_ptr<AppManifest> findAppById(const std::string& id) {
     hash_mutex.lock();
     auto result = app_manifest_map.find(id);

Tactility/Source/app/filebrowser/State.cpp

@@ -10,6 +10,7 @@
 #include <unistd.h>
 #include <vector>
 #include <dirent.h>
+#include <Tactility/file/FileLock.h>
 
 namespace tt::app::filebrowser {
 
@@ -56,18 +57,19 @@ bool State::setEntriesForPath(const std::string& path) {
         return true;
     } else {
         dir_entries.clear();
-        // TODO: file Lock
-        int count = file::scandir(path, dir_entries, &file::direntFilterDotEntries, file::direntSortAlphaAndType);
-        if (count >= 0) {
-            TT_LOG_I(TAG, "%s has %u entries", path.c_str(), count);
-            current_path = path;
-            selected_child_entry = "";
-            action = ActionNone;
-            return true;
-        } else {
-            TT_LOG_E(TAG, "Failed to fetch entries for %s", path.c_str());
-            return false;
-        }
+        return file::withLock<bool>(path, [this, &path] {
+            int count = file::scandir(path, dir_entries, &file::direntFilterDotEntries, file::direntSortAlphaAndType);
+            if (count >= 0) {
+                TT_LOG_I(TAG, "%s has %u entries", path.c_str(), count);
+                current_path = path;
+                selected_child_entry = "";
+                action = ActionNone;
+                return true;
+            } else {
+                TT_LOG_E(TAG, "Failed to fetch entries for %s", path.c_str());
+                return false;
+            }
+        });
     }
 }
 

Tactility/Source/app/filebrowser/View.cpp

@@ -16,6 +16,7 @@
 
 #include <cstring>
 #include <unistd.h>
+#include <Tactility/file/FileLock.h>
 
 #ifdef ESP_PLATFORM
 #include "Tactility/service/loader/Loader.h"
@@ -215,6 +216,8 @@ void View::showActionsForDirectory() {
 
     auto* rename_button = lv_list_add_button(action_list, LV_SYMBOL_EDIT, "Rename");
     lv_obj_add_event_cb(rename_button, onRenamePressedCallback, LV_EVENT_SHORT_CLICKED, this);
+    auto* delete_button = lv_list_add_button(action_list, LV_SYMBOL_TRASH, "Delete");
+    lv_obj_add_event_cb(delete_button, onDeletePressedCallback, LV_EVENT_SHORT_CLICKED, this);
 
     lv_obj_remove_flag(action_list, LV_OBJ_FLAG_HIDDEN);
 }
@@ -314,12 +317,18 @@ void View::onResult(LaunchId launchId, Result result, std::unique_ptr<Bundle> bu
     switch (state->getPendingAction()) {
         case State::ActionDelete: {
             if (alertdialog::getResultIndex(*bundle) == 0) {
-                int delete_count = remove(filepath.c_str());
-                if (delete_count > 0) {
-                    TT_LOG_I(TAG, "Deleted %d items", delete_count);
-                } else {
-                    TT_LOG_W(TAG, "Failed to delete %s", filepath.c_str());
-                }
+                file::withLock<void>(filepath, [&filepath] {
+                    if (file::isDirectory(filepath)) {
+                       if (!file::deleteRecursively(filepath)) {
+                           TT_LOG_W(TAG, "Failed to delete %s", filepath.c_str());
+                       }
+                   } else if (file::isFile(filepath)) {
+                       if (remove(filepath.c_str()) <= 0) {
+                           TT_LOG_W(TAG, "Failed to delete %s", filepath.c_str());
+                       }
+                   }
+                });
+
                 state->setEntriesForPath(state->getCurrentPath());
                 update();
             }
@@ -328,12 +337,15 @@ void View::onResult(LaunchId launchId, Result result, std::unique_ptr<Bundle> bu
         case State::ActionRename: {
             auto new_name = inputdialog::getResult(*bundle);
             if (!new_name.empty() && new_name != state->getSelectedChildEntry()) {
-                std::string rename_to = file::getChildPath(state->getCurrentPath(), new_name);
-                if (rename(filepath.c_str(), rename_to.c_str())) {
-                    TT_LOG_I(TAG, "Renamed \"%s\" to \"%s\"", filepath.c_str(), rename_to.c_str());
-                } else {
-                    TT_LOG_E(TAG, "Failed to rename \"%s\" to \"%s\"", filepath.c_str(), rename_to.c_str());
-                }
+                file::withLock<void>(filepath, [this, &filepath, &new_name] {
+                    std::string rename_to = file::getChildPath(state->getCurrentPath(), new_name);
+                   if (rename(filepath.c_str(), rename_to.c_str())) {
+                       TT_LOG_I(TAG, "Renamed \"%s\" to \"%s\"", filepath.c_str(), rename_to.c_str());
+                   } else {
+                       TT_LOG_E(TAG, "Failed to rename \"%s\" to \"%s\"", filepath.c_str(), rename_to.c_str());
+                   }
+                });
+
                 state->setEntriesForPath(state->getCurrentPath());
                 update();
             }

Tactility/Source/app/power/Power.cpp

@@ -31,8 +31,6 @@ std::shared_ptr<PowerApp> _Nullable optApp() {
 
 class PowerApp : public App {
 
-private:
-
     Timer update_timer = Timer(Timer::Type::Periodic, []() { onTimer(); });
 
     std::shared_ptr<hal::power::PowerDevice> power;

Tactility/Source/service/development/DevelopmentService.cpp

@@ -110,6 +110,7 @@ void DevelopmentService::startServer() {
         httpd_register_uri_handler(server, &handleGetInfoEndpoint);
         httpd_register_uri_handler(server, &appRunEndpoint);
         httpd_register_uri_handler(server, &appInstallEndpoint);
+        httpd_register_uri_handler(server, &appUninstallEndpoint);
         TT_LOG_I(TAG, "Started on port %d", config.server_port);
     } else {
         TT_LOG_E(TAG, "Failed to start");
@@ -297,6 +298,39 @@ esp_err_t DevelopmentService::handleAppInstall(httpd_req_t* request) {
     return ESP_OK;
 }
 
+esp_err_t DevelopmentService::handleAppUninstall(httpd_req_t* request) {
+    TT_LOG_I(TAG, "PUT /app/uninstall");
+
+    std::string query;
+    if (!network::getQueryOrSendError(request, query)) {
+        return ESP_FAIL;
+    }
+
+    auto parameters = network::parseUrlQuery(query);
+    auto id_key_pos = parameters.find("id");
+    if (id_key_pos == parameters.end()) {
+        TT_LOG_W(TAG, "[400] /app/uninstall id not specified");
+        httpd_resp_send_err(request, HTTPD_400_BAD_REQUEST, "id not specified");
+        return ESP_FAIL;
+    }
+
+    if (!app::findAppById(id_key_pos->second)) {
+        TT_LOG_I(TAG, "[200] /app/uninstall %s (app wasn't installed)", id_key_pos->second.c_str());
+        httpd_resp_send(request, nullptr, 0);
+        return ESP_OK;
+    }
+
+    if (app::uninstall(id_key_pos->second)) {
+        TT_LOG_I(TAG, "[200] /app/uninstall %s", id_key_pos->second.c_str());
+        httpd_resp_send(request, nullptr, 0);
+        return ESP_OK;
+    } else {
+        TT_LOG_W(TAG, "[500] /app/uninstall %s", id_key_pos->second.c_str());
+        httpd_resp_send_err(request, HTTPD_500_INTERNAL_SERVER_ERROR, "Failed to uninstall");
+        return ESP_FAIL;
+    }
+}
+
 // endregion
 
 std::shared_ptr<DevelopmentService> findService() {

sdkconfig.board.waveshare-s3-lcd-13

@@ -0,0 +1,56 @@
+# Software defaults
+# Increase stack size for WiFi (fixes crash after scan)
+CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=3072
+CONFIG_LV_FONT_MONTSERRAT_14=y
+CONFIG_LV_FONT_MONTSERRAT_18=y
+CONFIG_LV_USE_USER_DATA=y
+CONFIG_LV_USE_FS_STDIO=y
+CONFIG_LV_FS_STDIO_LETTER=65
+CONFIG_LV_FS_STDIO_PATH=""
+CONFIG_LV_FS_STDIO_CACHE_SIZE=4096
+CONFIG_LV_USE_LODEPNG=y
+CONFIG_LV_USE_BUILTIN_MALLOC=n
+CONFIG_LV_USE_CLIB_MALLOC=y
+CONFIG_LV_USE_MSGBOX=n
+CONFIG_LV_USE_SPINNER=n
+CONFIG_LV_USE_WIN=n
+CONFIG_LV_USE_SNAPSHOT=y
+CONFIG_FREERTOS_HZ=1000
+CONFIG_FREERTOS_TASK_NOTIFICATION_ARRAY_ENTRIES=2
+CONFIG_FREERTOS_SMP=n
+CONFIG_FREERTOS_UNICORE=n
+CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=5120
+CONFIG_FREERTOS_USE_TRACE_FACILITY=y
+CONFIG_FATFS_LFN_HEAP=y
+CONFIG_FATFS_VOLUME_COUNT=3
+CONFIG_FATFS_SECTOR_512=y
+CONFIG_WL_SECTOR_SIZE_512=y
+CONFIG_WL_SECTOR_SIZE=512
+CONFIG_WL_SECTOR_MODE_SAFE=y
+CONFIG_WL_SECTOR_MODE=1
+
+# Hardware: Main
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-16mb.csv"
+CONFIG_PARTITION_TABLE_FILENAME="partitions-16mb.csv"
+CONFIG_TT_BOARD_WAVESHARE_S3_LCD_13=y
+CONFIG_TT_BOARD_NAME="Waveshare ESP32 S3 LCD 1.3"
+CONFIG_TT_BOARD_ID="waveshare-s3-lcd-13"
+CONFIG_IDF_EXPERIMENTAL_FEATURES=y
+CONFIG_IDF_TARGET="esp32s3"
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
+CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
+CONFIG_FLASHMODE_QIO=y
+# Hardware: SPI RAM
+CONFIG_ESP32S3_SPIRAM_SUPPORT=y
+CONFIG_SPIRAM_MODE_OCT=y
+CONFIG_SPIRAM_SPEED_120M=y
+CONFIG_SPIRAM_USE_MALLOC=y
+CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
+# SPI Flash (can set back to 80MHz after ESP-IDF bug is resolved)
+CONFIG_ESPTOOLPY_FLASHFREQ_120M=y
+# LVGL
+# TODO: Update DPI
+CONFIG_LV_DPI_DEF=143
+CONFIG_LV_DISP_DEF_REFR_PERIOD=10

sdkconfig.board.waveshare-s3-touch-lcd-128

@@ -0,0 +1,56 @@
+# Software defaults
+# Increase stack size for WiFi (fixes crash after scan)
+CONFIG_ESP_SYSTEM_EVENT_TASK_STACK_SIZE=3072
+CONFIG_LV_FONT_MONTSERRAT_14=y
+CONFIG_LV_FONT_MONTSERRAT_18=y
+CONFIG_LV_USE_USER_DATA=y
+CONFIG_LV_USE_FS_STDIO=y
+CONFIG_LV_FS_STDIO_LETTER=65
+CONFIG_LV_FS_STDIO_PATH=""
+CONFIG_LV_FS_STDIO_CACHE_SIZE=4096
+CONFIG_LV_USE_LODEPNG=y
+CONFIG_LV_USE_BUILTIN_MALLOC=n
+CONFIG_LV_USE_CLIB_MALLOC=y
+CONFIG_LV_USE_MSGBOX=n
+CONFIG_LV_USE_SPINNER=n
+CONFIG_LV_USE_WIN=n
+CONFIG_LV_USE_SNAPSHOT=y
+CONFIG_FREERTOS_HZ=1000
+CONFIG_FREERTOS_TASK_NOTIFICATION_ARRAY_ENTRIES=2
+CONFIG_FREERTOS_SMP=n
+CONFIG_FREERTOS_UNICORE=n
+CONFIG_FREERTOS_TIMER_TASK_STACK_DEPTH=5120
+CONFIG_FREERTOS_USE_TRACE_FACILITY=y
+CONFIG_FATFS_LFN_HEAP=y
+CONFIG_FATFS_VOLUME_COUNT=3
+CONFIG_FATFS_SECTOR_512=y
+CONFIG_WL_SECTOR_SIZE_512=y
+CONFIG_WL_SECTOR_SIZE=512
+CONFIG_WL_SECTOR_MODE_SAFE=y
+CONFIG_WL_SECTOR_MODE=1
+
+# Hardware: Main
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions-16mb.csv"
+CONFIG_PARTITION_TABLE_FILENAME="partitions-16mb.csv"
+CONFIG_TT_BOARD_WAVESHARE_S3_TOUCH_LCD_128=y
+CONFIG_TT_BOARD_NAME="Waveshare ESP32 S3 Touch LCD 1.28"
+CONFIG_TT_BOARD_ID="waveshare-s3-touch-lcd-128"
+CONFIG_IDF_EXPERIMENTAL_FEATURES=y
+CONFIG_IDF_TARGET="esp32s3"
+CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
+CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
+CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
+CONFIG_FLASHMODE_QIO=y
+# Hardware: SPI RAM
+CONFIG_ESP32S3_SPIRAM_SUPPORT=y
+CONFIG_SPIRAM_MODE_QUAD=y
+CONFIG_SPIRAM_SPEED_120M=y
+CONFIG_SPIRAM_USE_MALLOC=y
+CONFIG_SPIRAM_TRY_ALLOCATE_WIFI_LWIP=y
+# SPI Flash (can set back to 80MHz after ESP-IDF bug is resolved)
+CONFIG_ESPTOOLPY_FLASHFREQ_120M=y
+# LVGL
+# TODO: Update DPI
+CONFIG_LV_DPI_DEF=143
+CONFIG_LV_DISP_DEF_REFR_PERIOD=10