mirror of
https://github.com/ByteWelder/Tactility.git
synced 2026-04-22 11:25:06 +00:00
Compare commits
2 Commits
819e3ac966
...
2d9ab70510
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2d9ab70510 | ||
|
|
95fd551cd6 |
@ -21,59 +21,3 @@ function(GET_PROPERTY_FILE_CONTENT PROPERTY_FILE RESULT_VAR)
|
|||||||
set(${RESULT_VAR} "${file_content}" PARENT_SCOPE)
|
set(${RESULT_VAR} "${file_content}" PARENT_SCOPE)
|
||||||
endfunction()
|
endfunction()
|
||||||
|
|
||||||
function(READ_PROPERTIES_TO_MAP PROPERTY_FILE RESULT_VAR)
|
|
||||||
get_filename_component(PROPERTY_FILE_ABS ${PROPERTY_FILE} ABSOLUTE)
|
|
||||||
if (NOT EXISTS ${PROPERTY_FILE_ABS})
|
|
||||||
message(FATAL_ERROR "Property file not found: ${PROPERTY_FILE}")
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
file(STRINGS ${PROPERTY_FILE_ABS} lines)
|
|
||||||
set(current_section "")
|
|
||||||
set(map_content "")
|
|
||||||
|
|
||||||
foreach(line IN LISTS lines)
|
|
||||||
string(STRIP "${line}" line)
|
|
||||||
if (line STREQUAL "" OR line MATCHES "^#")
|
|
||||||
continue()
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
if (line MATCHES "^\\[.*\\]$")
|
|
||||||
set(current_section "${line}")
|
|
||||||
elseif (line MATCHES "^([^=]+)=(.*)$")
|
|
||||||
set(key "${CMAKE_MATCH_1}")
|
|
||||||
set(value "${CMAKE_MATCH_2}")
|
|
||||||
string(STRIP "${key}" key)
|
|
||||||
string(STRIP "${value}" value)
|
|
||||||
# Remove optional quotes from value
|
|
||||||
if (value MATCHES "^\"(.*)\"$")
|
|
||||||
set(value "${CMAKE_MATCH_1}")
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
list(APPEND map_content "${current_section}${key}" "${value}")
|
|
||||||
endif ()
|
|
||||||
endforeach()
|
|
||||||
|
|
||||||
set(${RESULT_VAR} "${map_content}" PARENT_SCOPE)
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
function(GET_VALUE_FROM_MAP MAP_VAR KEY_NAME RESULT_VAR)
|
|
||||||
list(FIND ${MAP_VAR} "${KEY_NAME}" key_index)
|
|
||||||
if (key_index EQUAL -1)
|
|
||||||
set(${RESULT_VAR} "" PARENT_SCOPE)
|
|
||||||
return()
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
math(EXPR value_index "${key_index} + 1")
|
|
||||||
list(GET ${MAP_VAR} ${value_index} value)
|
|
||||||
set(${RESULT_VAR} "${value}" PARENT_SCOPE)
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
function(KEY_EXISTS_IN_MAP MAP_VAR KEY_NAME RESULT_VAR)
|
|
||||||
list(FIND ${MAP_VAR} "${KEY_NAME}" key_index)
|
|
||||||
if (key_index EQUAL -1)
|
|
||||||
set(${RESULT_VAR} FALSE PARENT_SCOPE)
|
|
||||||
else ()
|
|
||||||
set(${RESULT_VAR} TRUE PARENT_SCOPE)
|
|
||||||
endif ()
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
|
|||||||
@ -44,5 +44,6 @@ static std::vector<std::shared_ptr<tt::hal::Device>> createDevices() {
|
|||||||
|
|
||||||
extern const Configuration hardwareConfiguration = {
|
extern const Configuration hardwareConfiguration = {
|
||||||
.initBoot = initBoot,
|
.initBoot = initBoot,
|
||||||
|
.uiDensity = UiDensity::Compact,
|
||||||
.createDevices = createDevices
|
.createDevices = createDevices
|
||||||
};
|
};
|
||||||
|
|||||||
@ -26,4 +26,3 @@ infoMessage=Due to the small size of the screen, the icons don't render properly
|
|||||||
theme=Mono
|
theme=Mono
|
||||||
colorDepth=16
|
colorDepth=16
|
||||||
uiScale=70
|
uiScale=70
|
||||||
uiDensity=compact
|
|
||||||
|
|||||||
@ -19,5 +19,6 @@ static std::vector<std::shared_ptr<tt::hal::Device>> createDevices() {
|
|||||||
|
|
||||||
extern const Configuration hardwareConfiguration = {
|
extern const Configuration hardwareConfiguration = {
|
||||||
.initBoot = initBoot,
|
.initBoot = initBoot,
|
||||||
|
.uiDensity = UiDensity::Compact,
|
||||||
.createDevices = createDevices
|
.createDevices = createDevices
|
||||||
};
|
};
|
||||||
|
|||||||
@ -20,4 +20,4 @@ dpi=242
|
|||||||
|
|
||||||
[lvgl]
|
[lvgl]
|
||||||
colorDepth=16
|
colorDepth=16
|
||||||
uiDensity=compact
|
|
||||||
|
|||||||
@ -16,5 +16,6 @@ static std::vector<std::shared_ptr<tt::hal::Device>> createDevices() {
|
|||||||
|
|
||||||
extern const Configuration hardwareConfiguration = {
|
extern const Configuration hardwareConfiguration = {
|
||||||
.initBoot = initBoot,
|
.initBoot = initBoot,
|
||||||
|
.uiDensity = UiDensity::Compact,
|
||||||
.createDevices = createDevices
|
.createDevices = createDevices
|
||||||
};
|
};
|
||||||
|
|||||||
@ -21,4 +21,3 @@ dpi=186
|
|||||||
|
|
||||||
[lvgl]
|
[lvgl]
|
||||||
colorDepth=16
|
colorDepth=16
|
||||||
uiDensity=compact
|
|
||||||
|
|||||||
@ -28,5 +28,6 @@ static DeviceVector createDevices() {
|
|||||||
|
|
||||||
extern const Configuration hardwareConfiguration = {
|
extern const Configuration hardwareConfiguration = {
|
||||||
.initBoot = initBoot,
|
.initBoot = initBoot,
|
||||||
|
.uiDensity = UiDensity::Compact,
|
||||||
.createDevices = createDevices
|
.createDevices = createDevices
|
||||||
};
|
};
|
||||||
|
|||||||
@ -20,4 +20,3 @@ dpi=139
|
|||||||
|
|
||||||
[lvgl]
|
[lvgl]
|
||||||
colorDepth=16
|
colorDepth=16
|
||||||
uiDensity=compact
|
|
||||||
|
|||||||
@ -26,5 +26,6 @@ static DeviceVector createDevices() {
|
|||||||
|
|
||||||
extern const Configuration hardwareConfiguration = {
|
extern const Configuration hardwareConfiguration = {
|
||||||
.initBoot = initBoot,
|
.initBoot = initBoot,
|
||||||
|
.uiDensity = UiDensity::Compact,
|
||||||
.createDevices = createDevices
|
.createDevices = createDevices
|
||||||
};
|
};
|
||||||
|
|||||||
@ -20,4 +20,3 @@ dpi=139
|
|||||||
|
|
||||||
[lvgl]
|
[lvgl]
|
||||||
colorDepth=16
|
colorDepth=16
|
||||||
uiDensity=compact
|
|
||||||
|
|||||||
@ -25,5 +25,6 @@ static DeviceVector createDevices() {
|
|||||||
|
|
||||||
extern const Configuration hardwareConfiguration = {
|
extern const Configuration hardwareConfiguration = {
|
||||||
.initBoot = initBoot,
|
.initBoot = initBoot,
|
||||||
|
.uiDensity = UiDensity::Compact,
|
||||||
.createDevices = createDevices
|
.createDevices = createDevices
|
||||||
};
|
};
|
||||||
|
|||||||
@ -20,4 +20,3 @@ dpi=242
|
|||||||
|
|
||||||
[lvgl]
|
[lvgl]
|
||||||
colorDepth=16
|
colorDepth=16
|
||||||
uiDensity=compact
|
|
||||||
|
|||||||
@ -28,5 +28,6 @@ static DeviceVector createDevices() {
|
|||||||
|
|
||||||
extern const Configuration hardwareConfiguration = {
|
extern const Configuration hardwareConfiguration = {
|
||||||
.initBoot = initBoot,
|
.initBoot = initBoot,
|
||||||
|
.uiDensity = UiDensity::Compact,
|
||||||
.createDevices = createDevices
|
.createDevices = createDevices
|
||||||
};
|
};
|
||||||
|
|||||||
@ -22,4 +22,3 @@ dpi=242
|
|||||||
|
|
||||||
[lvgl]
|
[lvgl]
|
||||||
colorDepth=16
|
colorDepth=16
|
||||||
uiDensity=compact
|
|
||||||
|
|||||||
@ -2,14 +2,12 @@
|
|||||||
#include "devices/SdCard.h"
|
#include "devices/SdCard.h"
|
||||||
#include <driver/gpio.h>
|
#include <driver/gpio.h>
|
||||||
|
|
||||||
#include <tactility/drivers/i2c_controller.h>
|
|
||||||
|
|
||||||
#include <Tactility/hal/Configuration.h>
|
#include <Tactility/hal/Configuration.h>
|
||||||
#include <Tactility/hal/i2c/I2c.h>
|
#include <Tactility/hal/i2c/I2c.h>
|
||||||
|
|
||||||
using namespace tt::hal;
|
using namespace tt::hal;
|
||||||
|
|
||||||
static constexpr auto* TAG = "Tab5";
|
static const auto LOGGER = tt::Logger("Tab5");
|
||||||
|
|
||||||
static DeviceVector createDevices() {
|
static DeviceVector createDevices() {
|
||||||
return {
|
return {
|
||||||
@ -18,7 +16,7 @@ static DeviceVector createDevices() {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
static error_t initPower(::Device* i2c_controller) {
|
static bool initBoot() {
|
||||||
/*
|
/*
|
||||||
PI4IOE5V6408-1 (0x43)
|
PI4IOE5V6408-1 (0x43)
|
||||||
- Bit 0: RF internal/external switch
|
- Bit 0: RF internal/external switch
|
||||||
@ -65,106 +63,26 @@ static error_t initPower(::Device* i2c_controller) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
constexpr auto IO_EXPANDER1_ADDRESS = 0x43;
|
constexpr auto IO_EXPANDER1_ADDRESS = 0x43;
|
||||||
auto error = i2c_controller_write_register_array(i2c_controller, IO_EXPANDER1_ADDRESS, reg_data_io1_1, sizeof(reg_data_io1_1), pdMS_TO_TICKS(100));
|
if (!i2c::masterWriteRegisterArray(I2C_NUM_0, IO_EXPANDER1_ADDRESS, reg_data_io1_1, sizeof(reg_data_io1_1))) {
|
||||||
if (error != ERROR_NONE) {
|
LOGGER.error("IO expander 1 init failed in phase 1");
|
||||||
LOG_E(TAG, "IO expander 1 init failed in phase 1");
|
return false;
|
||||||
return ERROR_UNDEFINED;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
constexpr auto IO_EXPANDER2_ADDRESS = 0x44;
|
constexpr auto IO_EXPANDER2_ADDRESS = 0x44;
|
||||||
error = i2c_controller_write_register_array(i2c_controller, IO_EXPANDER2_ADDRESS, reg_data_io2, sizeof(reg_data_io2), pdMS_TO_TICKS(100));
|
if (!i2c::masterWriteRegisterArray(I2C_NUM_0, IO_EXPANDER2_ADDRESS, reg_data_io2, sizeof(reg_data_io2))) {
|
||||||
if (error != ERROR_NONE) {
|
LOGGER.error("IO expander 2 init failed");
|
||||||
LOG_E(TAG, "IO expander 2 init failed");
|
return false;
|
||||||
return ERROR_UNDEFINED;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// The M5Stack code applies this, but it's not known why
|
// The M5Stack code applies this, but it's not known why
|
||||||
// TODO: Remove and test it extensively
|
// TODO: Remove and test it extensively
|
||||||
tt::kernel::delayTicks(10);
|
tt::kernel::delayTicks(10);
|
||||||
|
|
||||||
error = i2c_controller_write_register_array(i2c_controller, IO_EXPANDER1_ADDRESS, reg_data_io1_2, sizeof(reg_data_io1_2), pdMS_TO_TICKS(100));
|
if (!i2c::masterWriteRegisterArray(I2C_NUM_0, IO_EXPANDER1_ADDRESS, reg_data_io1_2, sizeof(reg_data_io1_2))) {
|
||||||
if (error != ERROR_NONE) {
|
LOGGER.error("IO expander 1 init failed in phase 2");
|
||||||
LOG_E(TAG, "IO expander 1 init failed in phase 2");
|
|
||||||
return ERROR_UNDEFINED;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ERROR_NONE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static error_t initSound(::Device* i2c_controller) {
|
|
||||||
// Init data from M5Unified:
|
|
||||||
// https://github.com/m5stack/M5Unified/blob/master/src/M5Unified.cpp
|
|
||||||
static constexpr uint8_t ES8388_I2C_ADDR = 0x10;
|
|
||||||
static constexpr uint8_t ENABLED_BULK_DATA[] = {
|
|
||||||
0, 0x80, // RESET/ CSM POWER ON
|
|
||||||
0, 0x00,
|
|
||||||
0, 0x00,
|
|
||||||
0, 0x0E,
|
|
||||||
1, 0x00,
|
|
||||||
2, 0x0A, // CHIP POWER: power up all
|
|
||||||
3, 0xFF, // ADC POWER: power down all
|
|
||||||
4, 0x3C, // DAC POWER: power up and LOUT1/ROUT1/LOUT2/ROUT2 enable
|
|
||||||
5, 0x00, // ChipLowPower1
|
|
||||||
6, 0x00, // ChipLowPower2
|
|
||||||
7, 0x7C, // VSEL
|
|
||||||
8, 0x00, // set I2S slave mode
|
|
||||||
// reg9-22 == adc
|
|
||||||
23, 0x18, // I2S format (16bit)
|
|
||||||
24, 0x00, // I2S MCLK ratio (128)
|
|
||||||
25, 0x20, // DAC unmute
|
|
||||||
26, 0x00, // LDACVOL 0x00~0xC0
|
|
||||||
27, 0x00, // RDACVOL 0x00~0xC0
|
|
||||||
28, 0x08, // enable digital click free power up and down
|
|
||||||
29, 0x00,
|
|
||||||
38, 0x00, // DAC CTRL16
|
|
||||||
39, 0xB8, // LEFT Ch MIX
|
|
||||||
42, 0xB8, // RIGHTCh MIX
|
|
||||||
43, 0x08, // ADC and DAC separate
|
|
||||||
45, 0x00, // 0x00=1.5k VREF analog output / 0x10=40kVREF analog output
|
|
||||||
46, 0x21,
|
|
||||||
47, 0x21,
|
|
||||||
48, 0x21,
|
|
||||||
49, 0x21
|
|
||||||
};
|
|
||||||
|
|
||||||
error_t error = i2c_controller_write_register_array(
|
|
||||||
i2c_controller,
|
|
||||||
ES8388_I2C_ADDR,
|
|
||||||
ENABLED_BULK_DATA,
|
|
||||||
sizeof(ENABLED_BULK_DATA),
|
|
||||||
pdMS_TO_TICKS(1000)
|
|
||||||
);
|
|
||||||
if (error != ERROR_NONE) {
|
|
||||||
LOG_E(TAG, "Failed to enable ES8388: %s", error_to_string(error));
|
|
||||||
return error;
|
|
||||||
}
|
|
||||||
|
|
||||||
constexpr auto IO_EXPANDER1_ADDRESS = 0x43;
|
|
||||||
constexpr auto AMP_REGISTER = 0x05;
|
|
||||||
// Note: to disable the amplifier, reset the bits
|
|
||||||
error = i2c_controller_register8_set_bits(i2c_controller, IO_EXPANDER1_ADDRESS, AMP_REGISTER, 0b00000010, pdMS_TO_TICKS(100));
|
|
||||||
if (error != ERROR_NONE) {
|
|
||||||
LOG_E(TAG, "Failed to enable amplifier: %s", error_to_string(error));
|
|
||||||
return error;
|
|
||||||
}
|
|
||||||
|
|
||||||
return ERROR_NONE;
|
|
||||||
}
|
|
||||||
|
|
||||||
static bool initBoot() {
|
|
||||||
auto* i2c0 = device_find_by_name("i2c0");
|
|
||||||
check(i2c0, "i2c0 not found");
|
|
||||||
|
|
||||||
auto error = initPower(i2c0);
|
|
||||||
if (error != ERROR_NONE) {
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
error = initSound(i2c0);
|
|
||||||
if (error != ERROR_NONE) {
|
|
||||||
LOG_E(TAG, "Failed to enable ES8388");
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -3,7 +3,6 @@
|
|||||||
#include <tactility/bindings/root.h>
|
#include <tactility/bindings/root.h>
|
||||||
#include <tactility/bindings/esp32_gpio.h>
|
#include <tactility/bindings/esp32_gpio.h>
|
||||||
#include <tactility/bindings/esp32_i2c.h>
|
#include <tactility/bindings/esp32_i2c.h>
|
||||||
#include <tactility/bindings/esp32_i2s.h>
|
|
||||||
#include <tactility/bindings/esp32_spi.h>
|
#include <tactility/bindings/esp32_spi.h>
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
@ -15,7 +14,7 @@
|
|||||||
gpio-count = <57>;
|
gpio-count = <57>;
|
||||||
};
|
};
|
||||||
|
|
||||||
i2c_internal: i2c0 {
|
i2c_internal {
|
||||||
compatible = "espressif,esp32-i2c";
|
compatible = "espressif,esp32-i2c";
|
||||||
port = <I2C_NUM_0>;
|
port = <I2C_NUM_0>;
|
||||||
clock-frequency = <400000>;
|
clock-frequency = <400000>;
|
||||||
@ -23,7 +22,7 @@
|
|||||||
pin-scl = <&gpio0 32 GPIO_FLAG_NONE>;
|
pin-scl = <&gpio0 32 GPIO_FLAG_NONE>;
|
||||||
};
|
};
|
||||||
|
|
||||||
i2c_port_a: i2c1 {
|
i2c_port_a {
|
||||||
compatible = "espressif,esp32-i2c";
|
compatible = "espressif,esp32-i2c";
|
||||||
port = <I2C_NUM_1>;
|
port = <I2C_NUM_1>;
|
||||||
clock-frequency = <400000>;
|
clock-frequency = <400000>;
|
||||||
@ -38,15 +37,4 @@
|
|||||||
pin-miso = <&gpio0 39 GPIO_FLAG_NONE>;
|
pin-miso = <&gpio0 39 GPIO_FLAG_NONE>;
|
||||||
pin-sclk = <&gpio0 43 GPIO_FLAG_NONE>;
|
pin-sclk = <&gpio0 43 GPIO_FLAG_NONE>;
|
||||||
};
|
};
|
||||||
|
|
||||||
// ES8388 and ES7210
|
|
||||||
i2s0 {
|
|
||||||
compatible = "espressif,esp32-i2s";
|
|
||||||
port = <I2S_NUM_0>;
|
|
||||||
pin-bclk = <&gpio0 27 GPIO_FLAG_NONE>;
|
|
||||||
pin-ws = <&gpio0 29 GPIO_FLAG_NONE>;
|
|
||||||
pin-data-out = <&gpio0 26 GPIO_FLAG_NONE>;
|
|
||||||
pin-data-in = <&gpio0 28 GPIO_FLAG_NONE>;
|
|
||||||
pin-mclk = <&gpio0 30 GPIO_FLAG_NONE>;
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|||||||
@ -1,13 +0,0 @@
|
|||||||
[general]
|
|
||||||
vendor=Simulator
|
|
||||||
name=Tab5Simulator
|
|
||||||
|
|
||||||
[apps]
|
|
||||||
launcherAppId=Launcher
|
|
||||||
|
|
||||||
[hardware]
|
|
||||||
target=POSIX
|
|
||||||
|
|
||||||
[lvgl]
|
|
||||||
colorDepth=16
|
|
||||||
fontSize=14
|
|
||||||
@ -21,5 +21,6 @@ static bool initBoot() {
|
|||||||
|
|
||||||
extern const Configuration hardwareConfiguration = {
|
extern const Configuration hardwareConfiguration = {
|
||||||
.initBoot = initBoot,
|
.initBoot = initBoot,
|
||||||
|
.uiDensity = UiDensity::Compact,
|
||||||
.createDevices = createDevices
|
.createDevices = createDevices
|
||||||
};
|
};
|
||||||
@ -23,10 +23,3 @@ dpi=143
|
|||||||
|
|
||||||
[lvgl]
|
[lvgl]
|
||||||
colorDepth=16
|
colorDepth=16
|
||||||
uiDensity=compact
|
|
||||||
|
|
||||||
[sdkconfig]
|
|
||||||
# Fix error "PSRAM space not enough for the Flash instructions" on boot:
|
|
||||||
CONFIG_SPIRAM_FETCH_INSTRUCTIONS=n
|
|
||||||
CONFIG_SPIRAM_RODATA=n
|
|
||||||
CONFIG_SPIRAM_XIP_FROM_PSRAM=n
|
|
||||||
|
|||||||
@ -20,5 +20,6 @@ static bool initBoot() {
|
|||||||
|
|
||||||
extern const Configuration hardwareConfiguration = {
|
extern const Configuration hardwareConfiguration = {
|
||||||
.initBoot = initBoot,
|
.initBoot = initBoot,
|
||||||
|
.uiDensity = UiDensity::Compact,
|
||||||
.createDevices = createDevices
|
.createDevices = createDevices
|
||||||
};
|
};
|
||||||
|
|||||||
@ -23,4 +23,3 @@ dpi=261
|
|||||||
|
|
||||||
[lvgl]
|
[lvgl]
|
||||||
colorDepth=16
|
colorDepth=16
|
||||||
uiDensity=compact
|
|
||||||
|
|||||||
@ -20,5 +20,6 @@ static bool initBoot() {
|
|||||||
|
|
||||||
extern const Configuration hardwareConfiguration = {
|
extern const Configuration hardwareConfiguration = {
|
||||||
.initBoot = initBoot,
|
.initBoot = initBoot,
|
||||||
|
.uiDensity = UiDensity::Compact,
|
||||||
.createDevices = createDevices
|
.createDevices = createDevices
|
||||||
};
|
};
|
||||||
|
|||||||
@ -23,7 +23,6 @@ dpi=265
|
|||||||
|
|
||||||
[lvgl]
|
[lvgl]
|
||||||
colorDepth=16
|
colorDepth=16
|
||||||
uiDensity=compact
|
|
||||||
|
|
||||||
[sdkconfig]
|
[sdkconfig]
|
||||||
# Fix error "PSRAM space not enough for the Flash instructions" on boot:
|
# Fix error "PSRAM space not enough for the Flash instructions" on boot:
|
||||||
|
|||||||
@ -16,5 +16,6 @@ static std::vector<std::shared_ptr<tt::hal::Device>> createDevices() {
|
|||||||
|
|
||||||
extern const Configuration hardwareConfiguration = {
|
extern const Configuration hardwareConfiguration = {
|
||||||
.initBoot = initBoot,
|
.initBoot = initBoot,
|
||||||
|
.uiDensity = UiDensity::Compact,
|
||||||
.createDevices = createDevices
|
.createDevices = createDevices
|
||||||
};
|
};
|
||||||
|
|||||||
@ -26,4 +26,3 @@ warningMessage=Touch doesn't work yet
|
|||||||
|
|
||||||
[lvgl]
|
[lvgl]
|
||||||
colorDepth=16
|
colorDepth=16
|
||||||
uiDensity=compact
|
|
||||||
|
|||||||
@ -1,5 +1,3 @@
|
|||||||
# hal-device-module
|
|
||||||
|
|
||||||
**WARNING: This module contains deprecated code**
|
**WARNING: This module contains deprecated code**
|
||||||
|
|
||||||
This module is the basis for the old Tactility HAL.
|
This module is the basis for the old Tactility HAL.
|
||||||
@ -7,4 +5,4 @@ This HAL existed before TactilityKernel.
|
|||||||
|
|
||||||
The C++ `tt::hal::Device` class is replaced by `struct Device` from TactilityKernel.
|
The C++ `tt::hal::Device` class is replaced by `struct Device` from TactilityKernel.
|
||||||
|
|
||||||
License: [Apache v2.0](LICENSE-Apache-2.0.md)
|
License: Apache v2.0
|
||||||
@ -1,7 +1,7 @@
|
|||||||
cmake_minimum_required(VERSION 3.20)
|
cmake_minimum_required(VERSION 3.20)
|
||||||
|
|
||||||
# ####################################
|
# ####################################
|
||||||
# Read sdkconfig properties
|
# Read properties
|
||||||
# ####################################
|
# ####################################
|
||||||
|
|
||||||
include("${CMAKE_CURRENT_LIST_DIR}/../../Buildscripts/properties.cmake")
|
include("${CMAKE_CURRENT_LIST_DIR}/../../Buildscripts/properties.cmake")
|
||||||
@ -33,34 +33,6 @@ message(" - statusbar: ${statusbar_symbol_size}")
|
|||||||
message(" - launcher: ${launcher_symbol_size}")
|
message(" - launcher: ${launcher_symbol_size}")
|
||||||
message(" - shared: ${shared_symbol_size}")
|
message(" - shared: ${shared_symbol_size}")
|
||||||
|
|
||||||
# ####################################
|
|
||||||
# Read device properties
|
|
||||||
# ####################################
|
|
||||||
|
|
||||||
# Load device.properties as a map
|
|
||||||
get_property(TACTILITY_DEVICE_ID GLOBAL PROPERTY TACTILITY_DEVICE_ID)
|
|
||||||
READ_PROPERTIES_TO_MAP(
|
|
||||||
"${CMAKE_CURRENT_LIST_DIR}/../../Devices/${TACTILITY_DEVICE_ID}/device.properties"
|
|
||||||
device_properties
|
|
||||||
)
|
|
||||||
# Read UI density
|
|
||||||
GET_VALUE_FROM_MAP(device_properties "[lvgl]uiDensity" ui_density)
|
|
||||||
# Define UiDensity enum value
|
|
||||||
if (ui_density)
|
|
||||||
if (ui_density STREQUAL "default")
|
|
||||||
set(ui_density_variable "LVGL_UI_DENSITY_DEFAULT")
|
|
||||||
elseif (ui_density STREQUAL "compact")
|
|
||||||
set(ui_density_variable "LVGL_UI_DENSITY_COMPACT")
|
|
||||||
else ()
|
|
||||||
message(FATAL_ERROR "Invalid [lvgl]uiDensity: '${ui_density}'. Must be either 'default' or 'compact'")
|
|
||||||
endif ()
|
|
||||||
message("UI density set to '${ui_density}' via properties")
|
|
||||||
else ()
|
|
||||||
set(ui_density "default")
|
|
||||||
set(ui_density_variable "LVGL_UI_DENSITY_DEFAULT")
|
|
||||||
message("UI density set to default: ${ui_density}")
|
|
||||||
endif ()
|
|
||||||
|
|
||||||
# ####################################
|
# ####################################
|
||||||
# Create module
|
# Create module
|
||||||
# ####################################
|
# ####################################
|
||||||
@ -94,22 +66,17 @@ tactility_add_module(lvgl-module
|
|||||||
tactility_get_module_name("lvgl-module" MODULE_NAME)
|
tactility_get_module_name("lvgl-module" MODULE_NAME)
|
||||||
|
|
||||||
target_compile_definitions(${MODULE_NAME} PUBLIC
|
target_compile_definitions(${MODULE_NAME} PUBLIC
|
||||||
# Ensure it loads <lvgl.h>
|
|
||||||
"-DLV_LVGL_H_INCLUDE_SIMPLE"
|
"-DLV_LVGL_H_INCLUDE_SIMPLE"
|
||||||
# Text fonts
|
|
||||||
"-DTT_LVGL_TEXT_FONT_SMALL_SIZE=${font_size_small}"
|
"-DTT_LVGL_TEXT_FONT_SMALL_SIZE=${font_size_small}"
|
||||||
"-DTT_LVGL_TEXT_FONT_SMALL_SYMBOL=lv_font_montserrat_${font_size_small}"
|
"-DTT_LVGL_TEXT_FONT_SMALL_SYMBOL=lv_font_montserrat_${font_size_small}"
|
||||||
"-DTT_LVGL_TEXT_FONT_DEFAULT_SIZE=${font_size_default}"
|
"-DTT_LVGL_TEXT_FONT_DEFAULT_SIZE=${font_size_default}"
|
||||||
"-DTT_LVGL_TEXT_FONT_DEFAULT_SYMBOL=lv_font_montserrat_${font_size_default}"
|
"-DTT_LVGL_TEXT_FONT_DEFAULT_SYMBOL=lv_font_montserrat_${font_size_default}"
|
||||||
"-DTT_LVGL_TEXT_FONT_LARGE_SIZE=${font_size_large}"
|
"-DTT_LVGL_TEXT_FONT_LARGE_SIZE=${font_size_large}"
|
||||||
"-DTT_LVGL_TEXT_FONT_LARGE_SYMBOL=lv_font_montserrat_${font_size_large}"
|
"-DTT_LVGL_TEXT_FONT_LARGE_SYMBOL=lv_font_montserrat_${font_size_large}"
|
||||||
# Icon fonts
|
|
||||||
"-DTT_LVGL_STATUSBAR_FONT_ICON_SIZE=${statusbar_symbol_size}"
|
"-DTT_LVGL_STATUSBAR_FONT_ICON_SIZE=${statusbar_symbol_size}"
|
||||||
"-DTT_LVGL_STATUSBAR_FONT_ICON_SYMBOL=material_symbols_statusbar_${statusbar_symbol_size}"
|
"-DTT_LVGL_STATUSBAR_FONT_ICON_SYMBOL=material_symbols_statusbar_${statusbar_symbol_size}"
|
||||||
"-DTT_LVGL_LAUNCHER_FONT_ICON_SIZE=${launcher_symbol_size}"
|
"-DTT_LVGL_LAUNCHER_FONT_ICON_SIZE=${launcher_symbol_size}"
|
||||||
"-DTT_LVGL_LAUNCHER_FONT_ICON_SYMBOL=material_symbols_launcher_${launcher_symbol_size}"
|
"-DTT_LVGL_LAUNCHER_FONT_ICON_SYMBOL=material_symbols_launcher_${launcher_symbol_size}"
|
||||||
"-DTT_LVGL_SHARED_FONT_ICON_SIZE=${shared_symbol_size}"
|
"-DTT_LVGL_SHARED_FONT_ICON_SIZE=${shared_symbol_size}"
|
||||||
"-DTT_LVGL_SHARED_FONT_ICON_SYMBOL=material_symbols_shared_${shared_symbol_size}"
|
"-DTT_LVGL_SHARED_FONT_ICON_SYMBOL=material_symbols_shared_${shared_symbol_size}"
|
||||||
# UiDensity
|
|
||||||
"-DTT_LVGL_UI_DENSITY=${ui_density_variable}"
|
|
||||||
)
|
)
|
||||||
|
|||||||
@ -1,195 +0,0 @@
|
|||||||
Apache License
|
|
||||||
==============
|
|
||||||
|
|
||||||
_Version 2.0, January 2004_
|
|
||||||
_<<http://www.apache.org/licenses/>>_
|
|
||||||
|
|
||||||
### Terms and Conditions for use, reproduction, and distribution
|
|
||||||
|
|
||||||
#### 1. Definitions
|
|
||||||
|
|
||||||
“License” shall mean the terms and conditions for use, reproduction, and
|
|
||||||
distribution as defined by Sections 1 through 9 of this document.
|
|
||||||
|
|
||||||
“Licensor” shall mean the copyright owner or entity authorized by the copyright
|
|
||||||
owner that is granting the License.
|
|
||||||
|
|
||||||
“Legal Entity” shall mean the union of the acting entity and all other entities
|
|
||||||
that control, are controlled by, or are under common control with that entity.
|
|
||||||
For the purposes of this definition, “control” means **(i)** the power, direct or
|
|
||||||
indirect, to cause the direction or management of such entity, whether by
|
|
||||||
contract or otherwise, or **(ii)** ownership of fifty percent (50%) or more of the
|
|
||||||
outstanding shares, or **(iii)** beneficial ownership of such entity.
|
|
||||||
|
|
||||||
“You” (or “Your”) shall mean an individual or Legal Entity exercising
|
|
||||||
permissions granted by this License.
|
|
||||||
|
|
||||||
“Source” form shall mean the preferred form for making modifications, including
|
|
||||||
but not limited to software source code, documentation source, and configuration
|
|
||||||
files.
|
|
||||||
|
|
||||||
“Object” form shall mean any form resulting from mechanical transformation or
|
|
||||||
translation of a Source form, including but not limited to compiled object code,
|
|
||||||
generated documentation, and conversions to other media types.
|
|
||||||
|
|
||||||
“Work” shall mean the work of authorship, whether in Source or Object form, made
|
|
||||||
available under the License, as indicated by a copyright notice that is included
|
|
||||||
in or attached to the work (an example is provided in the Appendix below).
|
|
||||||
|
|
||||||
“Derivative Works” shall mean any work, whether in Source or Object form, that
|
|
||||||
is based on (or derived from) the Work and for which the editorial revisions,
|
|
||||||
annotations, elaborations, or other modifications represent, as a whole, an
|
|
||||||
original work of authorship. For the purposes of this License, Derivative Works
|
|
||||||
shall not include works that remain separable from, or merely link (or bind by
|
|
||||||
name) to the interfaces of, the Work and Derivative Works thereof.
|
|
||||||
|
|
||||||
“Contribution” shall mean any work of authorship, including the original version
|
|
||||||
of the Work and any modifications or additions to that Work or Derivative Works
|
|
||||||
thereof, that is intentionally submitted to Licensor for inclusion in the Work
|
|
||||||
by the copyright owner or by an individual or Legal Entity authorized to submit
|
|
||||||
on behalf of the copyright owner. For the purposes of this definition,
|
|
||||||
“submitted” means any form of electronic, verbal, or written communication sent
|
|
||||||
to the Licensor or its representatives, including but not limited to
|
|
||||||
communication on electronic mailing lists, source code control systems, and
|
|
||||||
issue tracking systems that are managed by, or on behalf of, the Licensor for
|
|
||||||
the purpose of discussing and improving the Work, but excluding communication
|
|
||||||
that is conspicuously marked or otherwise designated in writing by the copyright
|
|
||||||
owner as “Not a Contribution.”
|
|
||||||
|
|
||||||
“Contributor” shall mean Licensor and any individual or Legal Entity on behalf
|
|
||||||
of whom a Contribution has been received by Licensor and subsequently
|
|
||||||
incorporated within the Work.
|
|
||||||
|
|
||||||
#### 2. Grant of Copyright License
|
|
||||||
|
|
||||||
Subject to the terms and conditions of this License, each Contributor hereby
|
|
||||||
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
|
|
||||||
irrevocable copyright license to reproduce, prepare Derivative Works of,
|
|
||||||
publicly display, publicly perform, sublicense, and distribute the Work and such
|
|
||||||
Derivative Works in Source or Object form.
|
|
||||||
|
|
||||||
#### 3. Grant of Patent License
|
|
||||||
|
|
||||||
Subject to the terms and conditions of this License, each Contributor hereby
|
|
||||||
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
|
|
||||||
irrevocable (except as stated in this section) patent license to make, have
|
|
||||||
made, use, offer to sell, sell, import, and otherwise transfer the Work, where
|
|
||||||
such license applies only to those patent claims licensable by such Contributor
|
|
||||||
that are necessarily infringed by their Contribution(s) alone or by combination
|
|
||||||
of their Contribution(s) with the Work to which such Contribution(s) was
|
|
||||||
submitted. If You institute patent litigation against any entity (including a
|
|
||||||
cross-claim or counterclaim in a lawsuit) alleging that the Work or a
|
|
||||||
Contribution incorporated within the Work constitutes direct or contributory
|
|
||||||
patent infringement, then any patent licenses granted to You under this License
|
|
||||||
for that Work shall terminate as of the date such litigation is filed.
|
|
||||||
|
|
||||||
#### 4. Redistribution
|
|
||||||
|
|
||||||
You may reproduce and distribute copies of the Work or Derivative Works thereof
|
|
||||||
in any medium, with or without modifications, and in Source or Object form,
|
|
||||||
provided that You meet the following conditions:
|
|
||||||
|
|
||||||
* **(a)** You must give any other recipients of the Work or Derivative Works a copy of
|
|
||||||
this License; and
|
|
||||||
* **(b)** You must cause any modified files to carry prominent notices stating that You
|
|
||||||
changed the files; and
|
|
||||||
* **(c)** You must retain, in the Source form of any Derivative Works that You distribute,
|
|
||||||
all copyright, patent, trademark, and attribution notices from the Source form
|
|
||||||
of the Work, excluding those notices that do not pertain to any part of the
|
|
||||||
Derivative Works; and
|
|
||||||
* **(d)** If the Work includes a “NOTICE” text file as part of its distribution, then any
|
|
||||||
Derivative Works that You distribute must include a readable copy of the
|
|
||||||
attribution notices contained within such NOTICE file, excluding those notices
|
|
||||||
that do not pertain to any part of the Derivative Works, in at least one of the
|
|
||||||
following places: within a NOTICE text file distributed as part of the
|
|
||||||
Derivative Works; within the Source form or documentation, if provided along
|
|
||||||
with the Derivative Works; or, within a display generated by the Derivative
|
|
||||||
Works, if and wherever such third-party notices normally appear. The contents of
|
|
||||||
the NOTICE file are for informational purposes only and do not modify the
|
|
||||||
License. You may add Your own attribution notices within Derivative Works that
|
|
||||||
You distribute, alongside or as an addendum to the NOTICE text from the Work,
|
|
||||||
provided that such additional attribution notices cannot be construed as
|
|
||||||
modifying the License.
|
|
||||||
|
|
||||||
You may add Your own copyright statement to Your modifications and may provide
|
|
||||||
additional or different license terms and conditions for use, reproduction, or
|
|
||||||
distribution of Your modifications, or for any such Derivative Works as a whole,
|
|
||||||
provided Your use, reproduction, and distribution of the Work otherwise complies
|
|
||||||
with the conditions stated in this License.
|
|
||||||
|
|
||||||
#### 5. Submission of Contributions
|
|
||||||
|
|
||||||
Unless You explicitly state otherwise, any Contribution intentionally submitted
|
|
||||||
for inclusion in the Work by You to the Licensor shall be under the terms and
|
|
||||||
conditions of this License, without any additional terms or conditions.
|
|
||||||
Notwithstanding the above, nothing herein shall supersede or modify the terms of
|
|
||||||
any separate license agreement you may have executed with Licensor regarding
|
|
||||||
such Contributions.
|
|
||||||
|
|
||||||
#### 6. Trademarks
|
|
||||||
|
|
||||||
This License does not grant permission to use the trade names, trademarks,
|
|
||||||
service marks, or product names of the Licensor, except as required for
|
|
||||||
reasonable and customary use in describing the origin of the Work and
|
|
||||||
reproducing the content of the NOTICE file.
|
|
||||||
|
|
||||||
#### 7. Disclaimer of Warranty
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, Licensor provides the
|
|
||||||
Work (and each Contributor provides its Contributions) on an “AS IS” BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
|
|
||||||
including, without limitation, any warranties or conditions of TITLE,
|
|
||||||
NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
|
|
||||||
solely responsible for determining the appropriateness of using or
|
|
||||||
redistributing the Work and assume any risks associated with Your exercise of
|
|
||||||
permissions under this License.
|
|
||||||
|
|
||||||
#### 8. Limitation of Liability
|
|
||||||
|
|
||||||
In no event and under no legal theory, whether in tort (including negligence),
|
|
||||||
contract, or otherwise, unless required by applicable law (such as deliberate
|
|
||||||
and grossly negligent acts) or agreed to in writing, shall any Contributor be
|
|
||||||
liable to You for damages, including any direct, indirect, special, incidental,
|
|
||||||
or consequential damages of any character arising as a result of this License or
|
|
||||||
out of the use or inability to use the Work (including but not limited to
|
|
||||||
damages for loss of goodwill, work stoppage, computer failure or malfunction, or
|
|
||||||
any and all other commercial damages or losses), even if such Contributor has
|
|
||||||
been advised of the possibility of such damages.
|
|
||||||
|
|
||||||
#### 9. Accepting Warranty or Additional Liability
|
|
||||||
|
|
||||||
While redistributing the Work or Derivative Works thereof, You may choose to
|
|
||||||
offer, and charge a fee for, acceptance of support, warranty, indemnity, or
|
|
||||||
other liability obligations and/or rights consistent with this License. However,
|
|
||||||
in accepting such obligations, You may act only on Your own behalf and on Your
|
|
||||||
sole responsibility, not on behalf of any other Contributor, and only if You
|
|
||||||
agree to indemnify, defend, and hold each Contributor harmless for any liability
|
|
||||||
incurred by, or claims asserted against, such Contributor by reason of your
|
|
||||||
accepting any such warranty or additional liability.
|
|
||||||
|
|
||||||
_END OF TERMS AND CONDITIONS_
|
|
||||||
|
|
||||||
### APPENDIX: How to apply the Apache License to your work
|
|
||||||
|
|
||||||
To apply the Apache License to your work, attach the following boilerplate
|
|
||||||
notice, with the fields enclosed by brackets `[]` replaced with your own
|
|
||||||
identifying information. (Don't include the brackets!) The text should be
|
|
||||||
enclosed in the appropriate comment syntax for the file format. We also
|
|
||||||
recommend that a file or class name and description of purpose be included on
|
|
||||||
the same “printed page” as the copyright notice for easier identification within
|
|
||||||
third-party archives.
|
|
||||||
|
|
||||||
Copyright [yyyy] [name of copyright owner]
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
|
|
||||||
675
Modules/lvgl-module/LICENSE-GPL-3.0.md
Normal file
675
Modules/lvgl-module/LICENSE-GPL-3.0.md
Normal file
@ -0,0 +1,675 @@
|
|||||||
|
# GNU GENERAL PUBLIC LICENSE
|
||||||
|
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc.
|
||||||
|
<https://fsf.org/>
|
||||||
|
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies of this
|
||||||
|
license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
## Preamble
|
||||||
|
|
||||||
|
The GNU General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
the GNU General Public License is intended to guarantee your freedom
|
||||||
|
to share and change all versions of a program--to make sure it remains
|
||||||
|
free software for all its users. We, the Free Software Foundation, use
|
||||||
|
the GNU General Public License for most of our software; it applies
|
||||||
|
also to any other work released this way by its authors. You can apply
|
||||||
|
it to your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to prevent others from denying you
|
||||||
|
these rights or asking you to surrender the rights. Therefore, you
|
||||||
|
have certain responsibilities if you distribute copies of the
|
||||||
|
software, or if you modify it: responsibilities to respect the freedom
|
||||||
|
of others.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
|
freedoms that you received. You must make sure that they, too, receive
|
||||||
|
or can get the source code. And you must show them these terms so they
|
||||||
|
know their rights.
|
||||||
|
|
||||||
|
Developers that use the GNU GPL protect your rights with two steps:
|
||||||
|
(1) assert copyright on the software, and (2) offer you this License
|
||||||
|
giving you legal permission to copy, distribute and/or modify it.
|
||||||
|
|
||||||
|
For the developers' and authors' protection, the GPL clearly explains
|
||||||
|
that there is no warranty for this free software. For both users' and
|
||||||
|
authors' sake, the GPL requires that modified versions be marked as
|
||||||
|
changed, so that their problems will not be attributed erroneously to
|
||||||
|
authors of previous versions.
|
||||||
|
|
||||||
|
Some devices are designed to deny users access to install or run
|
||||||
|
modified versions of the software inside them, although the
|
||||||
|
manufacturer can do so. This is fundamentally incompatible with the
|
||||||
|
aim of protecting users' freedom to change the software. The
|
||||||
|
systematic pattern of such abuse occurs in the area of products for
|
||||||
|
individuals to use, which is precisely where it is most unacceptable.
|
||||||
|
Therefore, we have designed this version of the GPL to prohibit the
|
||||||
|
practice for those products. If such problems arise substantially in
|
||||||
|
other domains, we stand ready to extend this provision to those
|
||||||
|
domains in future versions of the GPL, as needed to protect the
|
||||||
|
freedom of users.
|
||||||
|
|
||||||
|
Finally, every program is threatened constantly by software patents.
|
||||||
|
States should not allow patents to restrict development and use of
|
||||||
|
software on general-purpose computers, but in those that do, we wish
|
||||||
|
to avoid the special danger that patents applied to a free program
|
||||||
|
could make it effectively proprietary. To prevent this, the GPL
|
||||||
|
assures that patents cannot be used to render the program non-free.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
## TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
### 0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds
|
||||||
|
of works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of
|
||||||
|
an exact copy. The resulting work is called a "modified version" of
|
||||||
|
the earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user
|
||||||
|
through a computer network, with no transfer of a copy, is not
|
||||||
|
conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices" to
|
||||||
|
the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
### 1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work for
|
||||||
|
making modifications to it. "Object code" means any non-source form of
|
||||||
|
a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users can
|
||||||
|
regenerate automatically from other parts of the Corresponding Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that same
|
||||||
|
work.
|
||||||
|
|
||||||
|
### 2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not convey,
|
||||||
|
without conditions so long as your license otherwise remains in force.
|
||||||
|
You may convey covered works to others for the sole purpose of having
|
||||||
|
them make modifications exclusively for you, or provide you with
|
||||||
|
facilities for running those works, provided that you comply with the
|
||||||
|
terms of this License in conveying all material for which you do not
|
||||||
|
control copyright. Those thus making or running the covered works for
|
||||||
|
you must do so exclusively on your behalf, under your direction and
|
||||||
|
control, on terms that prohibit them from making any copies of your
|
||||||
|
copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under the
|
||||||
|
conditions stated below. Sublicensing is not allowed; section 10 makes
|
||||||
|
it unnecessary.
|
||||||
|
|
||||||
|
### 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such
|
||||||
|
circumvention is effected by exercising rights under this License with
|
||||||
|
respect to the covered work, and you disclaim any intention to limit
|
||||||
|
operation or modification of the work as a means of enforcing, against
|
||||||
|
the work's users, your or third parties' legal rights to forbid
|
||||||
|
circumvention of technological measures.
|
||||||
|
|
||||||
|
### 4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
### 5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these
|
||||||
|
conditions:
|
||||||
|
|
||||||
|
- a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
- b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under
|
||||||
|
section 7. This requirement modifies the requirement in section 4
|
||||||
|
to "keep intact all notices".
|
||||||
|
- c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
- d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
### 6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms of
|
||||||
|
sections 4 and 5, provided that you also convey the machine-readable
|
||||||
|
Corresponding Source under the terms of this License, in one of these
|
||||||
|
ways:
|
||||||
|
|
||||||
|
- a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
- b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the Corresponding
|
||||||
|
Source from a network server at no charge.
|
||||||
|
- c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
- d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
- e) Convey the object code using peer-to-peer transmission,
|
||||||
|
provided you inform other peers where the object code and
|
||||||
|
Corresponding Source of the work are being offered to the general
|
||||||
|
public at no charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal,
|
||||||
|
family, or household purposes, or (2) anything designed or sold for
|
||||||
|
incorporation into a dwelling. In determining whether a product is a
|
||||||
|
consumer product, doubtful cases shall be resolved in favor of
|
||||||
|
coverage. For a particular product received by a particular user,
|
||||||
|
"normally used" refers to a typical or common use of that class of
|
||||||
|
product, regardless of the status of the particular user or of the way
|
||||||
|
in which the particular user actually uses, or expects or is expected
|
||||||
|
to use, the product. A product is a consumer product regardless of
|
||||||
|
whether the product has substantial commercial, industrial or
|
||||||
|
non-consumer uses, unless such uses represent the only significant
|
||||||
|
mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to
|
||||||
|
install and execute modified versions of a covered work in that User
|
||||||
|
Product from a modified version of its Corresponding Source. The
|
||||||
|
information must suffice to ensure that the continued functioning of
|
||||||
|
the modified object code is in no case prevented or interfered with
|
||||||
|
solely because modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or
|
||||||
|
updates for a work that has been modified or installed by the
|
||||||
|
recipient, or for the User Product in which it has been modified or
|
||||||
|
installed. Access to a network may be denied when the modification
|
||||||
|
itself materially and adversely affects the operation of the network
|
||||||
|
or violates the rules and protocols for communication across the
|
||||||
|
network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
### 7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders
|
||||||
|
of that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
- a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
- b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
- c) Prohibiting misrepresentation of the origin of that material,
|
||||||
|
or requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
- d) Limiting the use for publicity purposes of names of licensors
|
||||||
|
or authors of the material; or
|
||||||
|
- e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
- f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions
|
||||||
|
of it) with contractual assumptions of liability to the recipient,
|
||||||
|
for any liability that these contractual assumptions directly
|
||||||
|
impose on those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions; the
|
||||||
|
above requirements apply either way.
|
||||||
|
|
||||||
|
### 8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your license
|
||||||
|
from a particular copyright holder is reinstated (a) provisionally,
|
||||||
|
unless and until the copyright holder explicitly and finally
|
||||||
|
terminates your license, and (b) permanently, if the copyright holder
|
||||||
|
fails to notify you of the violation by some reasonable means prior to
|
||||||
|
60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
### 9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or run
|
||||||
|
a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
### 10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
### 11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims owned
|
||||||
|
or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within the
|
||||||
|
scope of its coverage, prohibits the exercise of, or is conditioned on
|
||||||
|
the non-exercise of one or more of the rights that are specifically
|
||||||
|
granted under this License. You may not convey a covered work if you
|
||||||
|
are a party to an arrangement with a third party that is in the
|
||||||
|
business of distributing software, under which you make payment to the
|
||||||
|
third party based on the extent of your activity of conveying the
|
||||||
|
work, and under which the third party grants, to any of the parties
|
||||||
|
who would receive the covered work from you, a discriminatory patent
|
||||||
|
license (a) in connection with copies of the covered work conveyed by
|
||||||
|
you (or copies made from those copies), or (b) primarily for and in
|
||||||
|
connection with specific products or compilations that contain the
|
||||||
|
covered work, unless you entered into that arrangement, or that patent
|
||||||
|
license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
### 12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under
|
||||||
|
this License and any other pertinent obligations, then as a
|
||||||
|
consequence you may not convey it at all. For example, if you agree to
|
||||||
|
terms that obligate you to collect a royalty for further conveying
|
||||||
|
from those to whom you convey the Program, the only way you could
|
||||||
|
satisfy both those terms and this License would be to refrain entirely
|
||||||
|
from conveying the Program.
|
||||||
|
|
||||||
|
### 13. Use with the GNU Affero General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU Affero General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the special requirements of the GNU Affero General Public License,
|
||||||
|
section 13, concerning interaction through a network will apply to the
|
||||||
|
combination as such.
|
||||||
|
|
||||||
|
### 14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions
|
||||||
|
of the GNU General Public License from time to time. Such new versions
|
||||||
|
will be similar in spirit to the present version, but may differ in
|
||||||
|
detail to address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the Program
|
||||||
|
specifies that a certain numbered version of the GNU General Public
|
||||||
|
License "or any later version" applies to it, you have the option of
|
||||||
|
following the terms and conditions either of that numbered version or
|
||||||
|
of any later version published by the Free Software Foundation. If the
|
||||||
|
Program does not specify a version number of the GNU General Public
|
||||||
|
License, you may choose any version ever published by the Free
|
||||||
|
Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future versions
|
||||||
|
of the GNU General Public License can be used, that proxy's public
|
||||||
|
statement of acceptance of a version permanently authorizes you to
|
||||||
|
choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
### 15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
|
||||||
|
WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT
|
||||||
|
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
|
A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
|
||||||
|
PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE
|
||||||
|
DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR
|
||||||
|
CORRECTION.
|
||||||
|
|
||||||
|
### 16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR
|
||||||
|
CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
||||||
|
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
|
||||||
|
ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT
|
||||||
|
NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR
|
||||||
|
LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM
|
||||||
|
TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER
|
||||||
|
PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
|
||||||
|
|
||||||
|
### 17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
## How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these
|
||||||
|
terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest to
|
||||||
|
attach them to the start of each source file to most effectively state
|
||||||
|
the exclusion of warranty; and each file should have at least the
|
||||||
|
"copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper
|
||||||
|
mail.
|
||||||
|
|
||||||
|
If the program does terminal interaction, make it output a short
|
||||||
|
notice like this when it starts in an interactive mode:
|
||||||
|
|
||||||
|
<program> Copyright (C) <year> <name of author>
|
||||||
|
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands \`show w' and \`show c' should show the
|
||||||
|
appropriate parts of the General Public License. Of course, your
|
||||||
|
program's commands might be different; for a GUI interface, you would
|
||||||
|
use an "about box".
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or
|
||||||
|
school, if any, to sign a "copyright disclaimer" for the program, if
|
||||||
|
necessary. For more information on this, and how to apply and follow
|
||||||
|
the GNU GPL, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
The GNU General Public License does not permit incorporating your
|
||||||
|
program into proprietary programs. If your program is a subroutine
|
||||||
|
library, you may consider it more useful to permit linking proprietary
|
||||||
|
applications with the library. If this is what you want to do, use the
|
||||||
|
GNU Lesser General Public License instead of this License. But first,
|
||||||
|
please read <https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||||
@ -1,42 +1,8 @@
|
|||||||
# lvgl-module
|
**WARNING: This module contains deprecated code**
|
||||||
|
|
||||||
This module manages the lifecycle of the [LVGL](https://lvgl.io/) library within the Tactility ecosystem.
|
This module is the basis for the old Tactility HAL.
|
||||||
|
This HAL existed before TactilityKernel.
|
||||||
|
|
||||||
## What the library does
|
The C++ `tt::hal::Device` class is replaced by `struct Device` from TactilityKernel.
|
||||||
|
|
||||||
The `lvgl-module` provides:
|
License: Apache v2.0
|
||||||
- **Lifecycle Management**: Handles initialization and termination of the LVGL library.
|
|
||||||
- **Task Management**: Manages the LVGL main loop task.
|
|
||||||
- **Thread-Safety**: Provides mutex-based locking mechanisms (`lvgl_lock`, `lvgl_unlock`) to ensure safe access to LVGL APIs from multiple tasks.
|
|
||||||
- **Font Access**: Provides a unified interface to access pre-configured text and icon fonts.
|
|
||||||
|
|
||||||
## Different types of fonts
|
|
||||||
|
|
||||||
The module supports two main categories of fonts:
|
|
||||||
|
|
||||||
### Text Fonts
|
|
||||||
|
|
||||||
Standard text rendering uses the **Montserrat** font. Three sizes are pre-configured:
|
|
||||||
- `FONT_SIZE_SMALL`
|
|
||||||
- `FONT_SIZE_DEFAULT`
|
|
||||||
- `FONT_SIZE_LARGE`
|
|
||||||
|
|
||||||
### Icon Fonts
|
|
||||||
|
|
||||||
Icons are provided by the **Material Symbols** font, divided into three usage-specific sets:
|
|
||||||
- **Statusbar Icons**: Optimized for the system status bar.
|
|
||||||
- **Launcher Icons**: Sized for application launchers.
|
|
||||||
- **Shared Icons**: General purpose icons used across the system.
|
|
||||||
|
|
||||||
## How to update the fonts
|
|
||||||
|
|
||||||
Font sizes and symbols are configurable:
|
|
||||||
|
|
||||||
- **On ESP32 (IDF)**: Sizes can be updated via `menuconfig` or by editing `sdkconfig`. Look for `CONFIG_TT_LVGL_FONT_SIZE_*` and `CONFIG_TT_LVGL_*_ICON_SIZE` parameters.
|
|
||||||
- **On Simulator/POSIX**: Default sizes are defined in `Modules/lvgl-module/CMakeLists.txt`.
|
|
||||||
|
|
||||||
If you change an icon font size, ensure that a corresponding C file exists in `source-fonts/` (e.g., `material_symbols_shared_24.c`). These files are generated from TTF/OTF fonts using the LVGL font converter.
|
|
||||||
|
|
||||||
## License
|
|
||||||
|
|
||||||
This module is licensed under the [Apache v2.0](LICENSE-Apache-2.0.md) license.
|
|
||||||
@ -1,4 +1,3 @@
|
|||||||
// SPDX-License-Identifier: Apache-2.0
|
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <lvgl.h>
|
#include <lvgl.h>
|
||||||
|
|||||||
@ -16,14 +16,6 @@ extern "C" {
|
|||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
|
|
||||||
/** Affects LVGL widget style */
|
|
||||||
enum UiDensity {
|
|
||||||
/** Ideal for very small non-touch screen devices (e.g. Waveshare S3 LCD 1.3") */
|
|
||||||
LVGL_UI_DENSITY_COMPACT,
|
|
||||||
/** Nothing was changed in the LVGL UI/UX */
|
|
||||||
LVGL_UI_DENSITY_DEFAULT
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief The LVGL module instance.
|
* @brief The LVGL module instance.
|
||||||
*/
|
*/
|
||||||
@ -80,7 +72,7 @@ bool lvgl_lock(void);
|
|||||||
* @param timeout Timeout in ticks
|
* @param timeout Timeout in ticks
|
||||||
* @return true if the lock was acquired, false otherwise.
|
* @return true if the lock was acquired, false otherwise.
|
||||||
*/
|
*/
|
||||||
bool lvgl_try_lock(uint32_t timeout);
|
bool lvgl_try_lock_timed(uint32_t timeout);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Unlocks the LVGL mutex.
|
* @brief Unlocks the LVGL mutex.
|
||||||
@ -94,14 +86,6 @@ void lvgl_unlock(void);
|
|||||||
*/
|
*/
|
||||||
bool lvgl_is_running(void);
|
bool lvgl_is_running(void);
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Gets the desired UI density for the target hardware.
|
|
||||||
* The density is defined in the `device.properties` of a hardware device.
|
|
||||||
* This setting is read by CMakeLists.txt and passed as a target compile definition of the LVGL module.
|
|
||||||
* @return the UI density
|
|
||||||
*/
|
|
||||||
enum UiDensity lvgl_get_ui_density(void);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
// SPDX-License-Identifier: Apache-2.0
|
// SPDX-License-Identifier: GPL-3.0-only
|
||||||
#ifdef ESP_PLATFORM
|
#ifdef ESP_PLATFORM
|
||||||
|
|
||||||
#include <esp_lvgl_port.h>
|
#include <esp_lvgl_port.h>
|
||||||
@ -16,7 +16,7 @@ bool lvgl_lock(void) {
|
|||||||
return lvgl_port_lock(portMAX_DELAY);
|
return lvgl_port_lock(portMAX_DELAY);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool lvgl_try_lock(uint32_t timeout) {
|
bool lvgl_try_lock_timed(uint32_t timeout) {
|
||||||
if (!initialized) return true; // We allow (fake) locking because it's safe to do so as LVGL is not running yet
|
if (!initialized) return true; // We allow (fake) locking because it's safe to do so as LVGL is not running yet
|
||||||
return lvgl_port_lock(millis_to_ticks(timeout));
|
return lvgl_port_lock(millis_to_ticks(timeout));
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
// SPDX-License-Identifier: Apache-2.0
|
// SPDX-License-Identifier: GPL-3.0-only
|
||||||
#ifndef ESP_PLATFORM
|
#ifndef ESP_PLATFORM
|
||||||
|
|
||||||
#include <tactility/check.h>
|
#include <tactility/check.h>
|
||||||
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
#include <lvgl.h>
|
#include <lvgl.h>
|
||||||
|
|
||||||
#include <tactility/lvgl_module.h>
|
#include "tactility/lvgl_module.h"
|
||||||
|
|
||||||
extern struct LvglModuleConfig lvgl_module_config;
|
extern struct LvglModuleConfig lvgl_module_config;
|
||||||
|
|
||||||
@ -43,7 +43,7 @@ bool lvgl_lock(void) {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool lvgl_try_lock(uint32_t timeout) {
|
bool lvgl_try_lock_timed(uint32_t timeout) {
|
||||||
if (!lvgl_mutex_initialised) return false;
|
if (!lvgl_mutex_initialised) return false;
|
||||||
return recursive_mutex_try_lock(&lvgl_mutex, millis_to_ticks(timeout));
|
return recursive_mutex_try_lock(&lvgl_mutex, millis_to_ticks(timeout));
|
||||||
}
|
}
|
||||||
@ -75,7 +75,7 @@ static void lvgl_task(void* arg) {
|
|||||||
if (lvgl_module_config.on_start) lvgl_module_config.on_start();
|
if (lvgl_module_config.on_start) lvgl_module_config.on_start();
|
||||||
|
|
||||||
while (!lvgl_task_is_interrupt_requested()) {
|
while (!lvgl_task_is_interrupt_requested()) {
|
||||||
if (lvgl_try_lock(10)) {
|
if (lvgl_try_lock_timed(10)) {
|
||||||
task_delay_ms = lv_timer_handler();
|
task_delay_ms = lv_timer_handler();
|
||||||
lvgl_unlock();
|
lvgl_unlock();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
// SPDX-License-Identifier: Apache-2.0
|
|
||||||
#include <lvgl.h>
|
#include <lvgl.h>
|
||||||
#include <tactility/lvgl_fonts.h>
|
#include <tactility/lvgl_fonts.h>
|
||||||
#include <tactility/check.h>
|
#include <tactility/check.h>
|
||||||
|
|||||||
@ -1,4 +1,4 @@
|
|||||||
// SPDX-License-Identifier: Apache-2.0
|
// SPDX-License-Identifier: GPL-3.0-only
|
||||||
#include <lvgl.h>
|
#include <lvgl.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <tactility/module.h>
|
#include <tactility/module.h>
|
||||||
@ -60,10 +60,6 @@ bool lvgl_is_running() {
|
|||||||
return is_running;
|
return is_running;
|
||||||
}
|
}
|
||||||
|
|
||||||
enum UiDensity lvgl_get_ui_density(void) {
|
|
||||||
return TT_LVGL_UI_DENSITY;
|
|
||||||
}
|
|
||||||
|
|
||||||
struct Module lvgl_module = {
|
struct Module lvgl_module = {
|
||||||
.name = "lvgl",
|
.name = "lvgl",
|
||||||
.start = start,
|
.start = start,
|
||||||
|
|||||||
@ -1,26 +1,7 @@
|
|||||||
// SPDX-License-Identifier: Apache-2.0
|
|
||||||
#include <tactility/lvgl_module.h>
|
|
||||||
#include <tactility/lvgl_fonts.h>
|
|
||||||
|
|
||||||
#include <lvgl.h>
|
|
||||||
#include <tactility/module.h>
|
#include <tactility/module.h>
|
||||||
|
#include <lvgl.h>
|
||||||
|
|
||||||
const struct ModuleSymbol lvgl_module_symbols[] = {
|
const struct ModuleSymbol lvgl_module_symbols[] = {
|
||||||
// lvgl_module
|
|
||||||
DEFINE_MODULE_SYMBOL(lvgl_lock),
|
|
||||||
DEFINE_MODULE_SYMBOL(lvgl_try_lock),
|
|
||||||
DEFINE_MODULE_SYMBOL(lvgl_unlock),
|
|
||||||
DEFINE_MODULE_SYMBOL(lvgl_is_running),
|
|
||||||
DEFINE_MODULE_SYMBOL(lvgl_get_ui_density),
|
|
||||||
// lvgl_fonts
|
|
||||||
DEFINE_MODULE_SYMBOL(lvgl_get_shared_icon_font),
|
|
||||||
DEFINE_MODULE_SYMBOL(lvgl_get_shared_icon_font_height),
|
|
||||||
DEFINE_MODULE_SYMBOL(lvgl_get_text_font),
|
|
||||||
DEFINE_MODULE_SYMBOL(lvgl_get_text_font_height),
|
|
||||||
DEFINE_MODULE_SYMBOL(lvgl_get_launcher_icon_font),
|
|
||||||
DEFINE_MODULE_SYMBOL(lvgl_get_launcher_icon_font_height),
|
|
||||||
DEFINE_MODULE_SYMBOL(lvgl_get_statusbar_icon_font),
|
|
||||||
DEFINE_MODULE_SYMBOL(lvgl_get_statusbar_icon_font_height),
|
|
||||||
// lv_event
|
// lv_event
|
||||||
DEFINE_MODULE_SYMBOL(lv_event_get_code),
|
DEFINE_MODULE_SYMBOL(lv_event_get_code),
|
||||||
DEFINE_MODULE_SYMBOL(lv_event_get_indev),
|
DEFINE_MODULE_SYMBOL(lv_event_get_indev),
|
||||||
|
|||||||
@ -237,7 +237,7 @@ static error_t stop(Device* device) {
|
|||||||
return ERROR_NONE;
|
return ERROR_NONE;
|
||||||
}
|
}
|
||||||
|
|
||||||
static constexpr I2cControllerApi ESP32_I2C_API = {
|
const static I2cControllerApi esp32_i2c_api = {
|
||||||
.read = read,
|
.read = read,
|
||||||
.write = write,
|
.write = write,
|
||||||
.write_read = write_read,
|
.write_read = write_read,
|
||||||
@ -245,14 +245,14 @@ static constexpr I2cControllerApi ESP32_I2C_API = {
|
|||||||
.write_register = write_register
|
.write_register = write_register
|
||||||
};
|
};
|
||||||
|
|
||||||
extern Module platform_module;
|
extern struct Module platform_module;
|
||||||
|
|
||||||
Driver esp32_i2c_driver = {
|
Driver esp32_i2c_driver = {
|
||||||
.name = "esp32_i2c",
|
.name = "esp32_i2c",
|
||||||
.compatible = (const char*[]) { "espressif,esp32-i2c", nullptr },
|
.compatible = (const char*[]) { "espressif,esp32-i2c", nullptr },
|
||||||
.start_device = start,
|
.start_device = start,
|
||||||
.stop_device = stop,
|
.stop_device = stop,
|
||||||
.api = &ESP32_I2C_API,
|
.api = (void*)&esp32_i2c_api,
|
||||||
.device_type = &I2C_CONTROLLER_TYPE,
|
.device_type = &I2C_CONTROLLER_TYPE,
|
||||||
.owner = &platform_module,
|
.owner = &platform_module,
|
||||||
.internal = nullptr
|
.internal = nullptr
|
||||||
|
|||||||
@ -12,12 +12,23 @@ typedef std::vector<std::shared_ptr<Device>> DeviceVector;
|
|||||||
|
|
||||||
typedef std::shared_ptr<Device> (*CreateDevice)();
|
typedef std::shared_ptr<Device> (*CreateDevice)();
|
||||||
|
|
||||||
|
/** Affects LVGL widget style */
|
||||||
|
enum class UiDensity {
|
||||||
|
/** Ideal for very small non-touch screen devices (e.g. Waveshare S3 LCD 1.3") */
|
||||||
|
Compact,
|
||||||
|
/** Nothing was changed in the LVGL UI/UX */
|
||||||
|
Default
|
||||||
|
};
|
||||||
|
|
||||||
struct Configuration {
|
struct Configuration {
|
||||||
/**
|
/**
|
||||||
* Used for powering on the peripherals manually.
|
* Used for powering on the peripherals manually.
|
||||||
*/
|
*/
|
||||||
const InitBoot initBoot = nullptr;
|
const InitBoot initBoot = nullptr;
|
||||||
|
|
||||||
|
/** Modify LVGL widget size */
|
||||||
|
const UiDensity uiDensity = UiDensity::Default;
|
||||||
|
|
||||||
const std::function<DeviceVector()> createDevices = [] { return DeviceVector(); };
|
const std::function<DeviceVector()> createDevices = [] { return DeviceVector(); };
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -181,7 +181,7 @@ void ChatApp::switchChannel(const std::string& chatChannel) {
|
|||||||
extern const AppManifest manifest = {
|
extern const AppManifest manifest = {
|
||||||
.appId = "Chat",
|
.appId = "Chat",
|
||||||
.appName = "Chat",
|
.appName = "Chat",
|
||||||
.appIcon = LVGL_ICON_SHARED_FORUM,
|
.appIcon = LVGL_ICON_FORUM,
|
||||||
.createApp = create<ChatApp>
|
.createApp = create<ChatApp>
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@ -12,7 +12,6 @@
|
|||||||
#include <Tactility/settings/DisplaySettings.h>
|
#include <Tactility/settings/DisplaySettings.h>
|
||||||
|
|
||||||
#include <lvgl.h>
|
#include <lvgl.h>
|
||||||
#include <tactility/lvgl_module.h>
|
|
||||||
|
|
||||||
namespace tt::app::display {
|
namespace tt::app::display {
|
||||||
|
|
||||||
@ -123,7 +122,7 @@ public:
|
|||||||
|
|
||||||
void onShow(AppContext& app, lv_obj_t* parent) override {
|
void onShow(AppContext& app, lv_obj_t* parent) override {
|
||||||
displaySettings = settings::display::loadOrGetDefault();
|
displaySettings = settings::display::loadOrGetDefault();
|
||||||
auto ui_density = lvgl_get_ui_density();
|
auto ui_density = hal::getConfiguration()->uiDensity;
|
||||||
|
|
||||||
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||||
lv_obj_set_style_pad_row(parent, 0, LV_STATE_DEFAULT);
|
lv_obj_set_style_pad_row(parent, 0, LV_STATE_DEFAULT);
|
||||||
@ -145,7 +144,7 @@ public:
|
|||||||
lv_obj_set_size(brightness_wrapper, LV_PCT(100), LV_SIZE_CONTENT);
|
lv_obj_set_size(brightness_wrapper, LV_PCT(100), LV_SIZE_CONTENT);
|
||||||
lv_obj_set_style_pad_hor(brightness_wrapper, 0, LV_STATE_DEFAULT);
|
lv_obj_set_style_pad_hor(brightness_wrapper, 0, LV_STATE_DEFAULT);
|
||||||
lv_obj_set_style_border_width(brightness_wrapper, 0, LV_STATE_DEFAULT);
|
lv_obj_set_style_border_width(brightness_wrapper, 0, LV_STATE_DEFAULT);
|
||||||
if (ui_density != LVGL_UI_DENSITY_COMPACT) {
|
if (ui_density != hal::UiDensity::Compact) {
|
||||||
lv_obj_set_style_pad_ver(brightness_wrapper, 4, LV_STATE_DEFAULT);
|
lv_obj_set_style_pad_ver(brightness_wrapper, 4, LV_STATE_DEFAULT);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -169,7 +168,7 @@ public:
|
|||||||
lv_obj_set_size(gamma_wrapper, LV_PCT(100), LV_SIZE_CONTENT);
|
lv_obj_set_size(gamma_wrapper, LV_PCT(100), LV_SIZE_CONTENT);
|
||||||
lv_obj_set_style_pad_hor(gamma_wrapper, 0, LV_STATE_DEFAULT);
|
lv_obj_set_style_pad_hor(gamma_wrapper, 0, LV_STATE_DEFAULT);
|
||||||
lv_obj_set_style_border_width(gamma_wrapper, 0, LV_STATE_DEFAULT);
|
lv_obj_set_style_border_width(gamma_wrapper, 0, LV_STATE_DEFAULT);
|
||||||
if (ui_density != LVGL_UI_DENSITY_COMPACT) {
|
if (ui_density != hal::UiDensity::Compact) {
|
||||||
lv_obj_set_style_pad_ver(gamma_wrapper, 4, LV_STATE_DEFAULT);
|
lv_obj_set_style_pad_ver(gamma_wrapper, 4, LV_STATE_DEFAULT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -12,14 +12,13 @@
|
|||||||
|
|
||||||
#include <tactility/lvgl_fonts.h>
|
#include <tactility/lvgl_fonts.h>
|
||||||
#include <tactility/lvgl_icon_launcher.h>
|
#include <tactility/lvgl_icon_launcher.h>
|
||||||
#include <tactility/lvgl_module.h>
|
|
||||||
|
|
||||||
namespace tt::app::launcher {
|
namespace tt::app::launcher {
|
||||||
|
|
||||||
static const auto LOGGER = Logger("Launcher");
|
static const auto LOGGER = Logger("Launcher");
|
||||||
|
|
||||||
static uint32_t getButtonPadding(UiDensity density, uint32_t buttonSize) {
|
static uint32_t getButtonPadding(hal::UiDensity density, uint32_t buttonSize) {
|
||||||
if (density == LVGL_UI_DENSITY_COMPACT) {
|
if (density == hal::UiDensity::Compact) {
|
||||||
return 0;
|
return 0;
|
||||||
} else {
|
} else {
|
||||||
return buttonSize / 8;
|
return buttonSize / 8;
|
||||||
@ -28,7 +27,7 @@ static uint32_t getButtonPadding(UiDensity density, uint32_t buttonSize) {
|
|||||||
|
|
||||||
class LauncherApp final : public App {
|
class LauncherApp final : public App {
|
||||||
|
|
||||||
static lv_obj_t* createAppButton(lv_obj_t* parent, UiDensity uiDensity, const char* imageFile, const char* appId, int32_t itemMargin, bool isLandscape) {
|
static lv_obj_t* createAppButton(lv_obj_t* parent, hal::UiDensity uiDensity, const char* imageFile, const char* appId, int32_t itemMargin, bool isLandscape) {
|
||||||
const auto button_size = lvgl_get_launcher_icon_font_height();
|
const auto button_size = lvgl_get_launcher_icon_font_height();
|
||||||
const auto button_padding = getButtonPadding(uiDensity, button_size);
|
const auto button_padding = getButtonPadding(uiDensity, button_size);
|
||||||
auto* apps_button = lv_button_create(parent);
|
auto* apps_button = lv_button_create(parent);
|
||||||
@ -120,7 +119,7 @@ public:
|
|||||||
void onShow(AppContext& app, lv_obj_t* parent) override {
|
void onShow(AppContext& app, lv_obj_t* parent) override {
|
||||||
auto* buttons_wrapper = lv_obj_create(parent);
|
auto* buttons_wrapper = lv_obj_create(parent);
|
||||||
|
|
||||||
auto ui_density = lvgl_get_ui_density();
|
auto ui_density = hal::getConfiguration()->uiDensity;
|
||||||
const auto button_size = lvgl_get_launcher_icon_font_height();
|
const auto button_size = lvgl_get_launcher_icon_font_height();
|
||||||
const auto button_padding = getButtonPadding(ui_density, button_size);
|
const auto button_padding = getButtonPadding(ui_density, button_size);
|
||||||
const auto total_button_size = button_size + (button_padding * 2);
|
const auto total_button_size = button_size + (button_padding * 2);
|
||||||
|
|||||||
@ -1,20 +1,19 @@
|
|||||||
#include <Tactility/TactilityConfig.h>
|
#include <Tactility/TactilityConfig.h>
|
||||||
#include <Tactility/lvgl/LvglSync.h>
|
#include <Tactility/lvgl/LvglSync.h>
|
||||||
#include <Tactility/lvgl/Toolbar.h>
|
#include <Tactility/lvgl/Toolbar.h>
|
||||||
|
|
||||||
#include <Tactility/hal/sdcard/SdCardDevice.h>
|
#include <Tactility/hal/sdcard/SdCardDevice.h>
|
||||||
#include <Tactility/Tactility.h>
|
#include <Tactility/Tactility.h>
|
||||||
#include <Tactility/Timer.h>
|
#include <Tactility/Timer.h>
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <cstring>
|
|
||||||
#include <format>
|
#include <format>
|
||||||
#include <lvgl.h>
|
#include <lvgl.h>
|
||||||
#include <utility>
|
|
||||||
|
|
||||||
#include <tactility/hal/Device.h>
|
|
||||||
#include <tactility/lvgl_fonts.h>
|
#include <tactility/lvgl_fonts.h>
|
||||||
|
#include <tactility/hal/Device.h>
|
||||||
#include <tactility/lvgl_icon_shared.h>
|
#include <tactility/lvgl_icon_shared.h>
|
||||||
#include <tactility/lvgl_module.h>
|
#include <utility>
|
||||||
|
#include <cstring>
|
||||||
|
|
||||||
#ifdef ESP_PLATFORM
|
#ifdef ESP_PLATFORM
|
||||||
#include <esp_vfs_fat.h>
|
#include <esp_vfs_fat.h>
|
||||||
@ -151,7 +150,7 @@ static MemoryBarWidgets createMemoryBar(lv_obj_t* parent, const char* label) {
|
|||||||
lv_obj_set_width(bottom_label, LV_PCT(100));
|
lv_obj_set_width(bottom_label, LV_PCT(100));
|
||||||
lv_obj_set_style_text_align(bottom_label, LV_TEXT_ALIGN_RIGHT, 0);
|
lv_obj_set_style_text_align(bottom_label, LV_TEXT_ALIGN_RIGHT, 0);
|
||||||
|
|
||||||
if (lvgl_get_ui_density() == LVGL_UI_DENSITY_COMPACT) {
|
if (hal::getConfiguration()->uiDensity == hal::UiDensity::Compact) {
|
||||||
lv_obj_set_style_pad_bottom(bottom_label, 2, LV_STATE_DEFAULT);
|
lv_obj_set_style_pad_bottom(bottom_label, 2, LV_STATE_DEFAULT);
|
||||||
} else {
|
} else {
|
||||||
lv_obj_set_style_pad_bottom(bottom_label, 12, LV_STATE_DEFAULT);
|
lv_obj_set_style_pad_bottom(bottom_label, 12, LV_STATE_DEFAULT);
|
||||||
|
|||||||
@ -1,13 +1,13 @@
|
|||||||
#ifdef ESP_PLATFORM
|
#ifdef ESP_PLATFORM
|
||||||
|
|
||||||
|
#include <Tactility/Tactility.h>
|
||||||
|
|
||||||
|
#include <Tactility/settings/TrackballSettings.h>
|
||||||
|
#include <Tactility/lvgl/Toolbar.h>
|
||||||
|
|
||||||
#include <lvgl.h>
|
#include <lvgl.h>
|
||||||
|
|
||||||
#include <tactility/lvgl_icon_shared.h>
|
#include <tactility/lvgl_icon_shared.h>
|
||||||
#include <tactility/lvgl_module.h>
|
|
||||||
|
|
||||||
#include <Tactility/Tactility.h>
|
|
||||||
#include <Tactility/settings/TrackballSettings.h>
|
|
||||||
#include <Tactility/lvgl/Toolbar.h>
|
|
||||||
|
|
||||||
// Forward declare driver functions
|
// Forward declare driver functions
|
||||||
namespace trackball {
|
namespace trackball {
|
||||||
@ -109,7 +109,7 @@ class TrackballSettingsApp final : public App {
|
|||||||
public:
|
public:
|
||||||
void onShow(AppContext& app, lv_obj_t* parent) override {
|
void onShow(AppContext& app, lv_obj_t* parent) override {
|
||||||
tbSettings = settings::trackball::loadOrGetDefault();
|
tbSettings = settings::trackball::loadOrGetDefault();
|
||||||
auto ui_density = lvgl_get_ui_density();
|
auto ui_density = hal::getConfiguration()->uiDensity;
|
||||||
updated = false;
|
updated = false;
|
||||||
|
|
||||||
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
lv_obj_set_flex_flow(parent, LV_FLEX_FLOW_COLUMN);
|
||||||
@ -154,7 +154,7 @@ public:
|
|||||||
lv_obj_set_size(enc_sens_wrapper, LV_PCT(100), LV_SIZE_CONTENT);
|
lv_obj_set_size(enc_sens_wrapper, LV_PCT(100), LV_SIZE_CONTENT);
|
||||||
lv_obj_set_style_pad_hor(enc_sens_wrapper, 0, LV_STATE_DEFAULT);
|
lv_obj_set_style_pad_hor(enc_sens_wrapper, 0, LV_STATE_DEFAULT);
|
||||||
lv_obj_set_style_border_width(enc_sens_wrapper, 0, LV_STATE_DEFAULT);
|
lv_obj_set_style_border_width(enc_sens_wrapper, 0, LV_STATE_DEFAULT);
|
||||||
if (ui_density != LVGL_UI_DENSITY_COMPACT) {
|
if (ui_density != hal::UiDensity::Compact) {
|
||||||
lv_obj_set_style_pad_ver(enc_sens_wrapper, 4, LV_STATE_DEFAULT);
|
lv_obj_set_style_pad_ver(enc_sens_wrapper, 4, LV_STATE_DEFAULT);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -178,7 +178,7 @@ public:
|
|||||||
lv_obj_set_size(ptr_sens_wrapper, LV_PCT(100), LV_SIZE_CONTENT);
|
lv_obj_set_size(ptr_sens_wrapper, LV_PCT(100), LV_SIZE_CONTENT);
|
||||||
lv_obj_set_style_pad_hor(ptr_sens_wrapper, 0, LV_STATE_DEFAULT);
|
lv_obj_set_style_pad_hor(ptr_sens_wrapper, 0, LV_STATE_DEFAULT);
|
||||||
lv_obj_set_style_border_width(ptr_sens_wrapper, 0, LV_STATE_DEFAULT);
|
lv_obj_set_style_border_width(ptr_sens_wrapper, 0, LV_STATE_DEFAULT);
|
||||||
if (ui_density != LVGL_UI_DENSITY_COMPACT) {
|
if (ui_density != hal::UiDensity::Compact) {
|
||||||
lv_obj_set_style_pad_ver(ptr_sens_wrapper, 4, LV_STATE_DEFAULT);
|
lv_obj_set_style_pad_ver(ptr_sens_wrapper, 4, LV_STATE_DEFAULT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,10 +1,5 @@
|
|||||||
#include <format>
|
|
||||||
#include <string>
|
|
||||||
#include <set>
|
|
||||||
|
|
||||||
#include <tactility/lvgl_module.h>
|
|
||||||
|
|
||||||
#include <Tactility/network/HttpdReq.h>
|
#include <Tactility/network/HttpdReq.h>
|
||||||
|
|
||||||
#include <Tactility/app/wifimanage/View.h>
|
#include <Tactility/app/wifimanage/View.h>
|
||||||
#include <Tactility/app/wifimanage/WifiManagePrivate.h>
|
#include <Tactility/app/wifimanage/WifiManagePrivate.h>
|
||||||
#include <Tactility/Logger.h>
|
#include <Tactility/Logger.h>
|
||||||
@ -14,6 +9,10 @@
|
|||||||
#include <Tactility/service/wifi/WifiSettings.h>
|
#include <Tactility/service/wifi/WifiSettings.h>
|
||||||
#include <Tactility/Tactility.h>
|
#include <Tactility/Tactility.h>
|
||||||
|
|
||||||
|
#include <format>
|
||||||
|
#include <string>
|
||||||
|
#include <set>
|
||||||
|
|
||||||
namespace tt::app::wifimanage {
|
namespace tt::app::wifimanage {
|
||||||
|
|
||||||
static const auto LOGGER = Logger("WifiManageView");
|
static const auto LOGGER = Logger("WifiManageView");
|
||||||
@ -163,7 +162,7 @@ void View::updateNetworkList() {
|
|||||||
lv_obj_add_event_cb(enable_on_boot_switch, onEnableOnBootSwitchChanged, LV_EVENT_VALUE_CHANGED, bindings);
|
lv_obj_add_event_cb(enable_on_boot_switch, onEnableOnBootSwitchChanged, LV_EVENT_VALUE_CHANGED, bindings);
|
||||||
lv_obj_add_event_cb(enable_on_boot_wrapper, onEnableOnBootParentClicked, LV_EVENT_SHORT_CLICKED, enable_on_boot_switch);
|
lv_obj_add_event_cb(enable_on_boot_wrapper, onEnableOnBootParentClicked, LV_EVENT_SHORT_CLICKED, enable_on_boot_switch);
|
||||||
|
|
||||||
if (lvgl_get_ui_density() == LVGL_UI_DENSITY_COMPACT) {
|
if (hal::getConfiguration()->uiDensity == hal::UiDensity::Compact) {
|
||||||
lv_obj_set_style_pad_ver(enable_on_boot_wrapper, 2, LV_STATE_DEFAULT);
|
lv_obj_set_style_pad_ver(enable_on_boot_wrapper, 2, LV_STATE_DEFAULT);
|
||||||
} else {
|
} else {
|
||||||
lv_obj_set_style_pad_ver(enable_on_boot_wrapper, 8, LV_STATE_DEFAULT);
|
lv_obj_set_style_pad_ver(enable_on_boot_wrapper, 8, LV_STATE_DEFAULT);
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
namespace tt::lvgl {
|
namespace tt::lvgl {
|
||||||
|
|
||||||
bool lock(TickType_t timeout) {
|
bool lock(TickType_t timeout) {
|
||||||
return lvgl_try_lock(timeout);
|
return lvgl_try_lock_timed(timeout);
|
||||||
}
|
}
|
||||||
|
|
||||||
void unlock() {
|
void unlock() {
|
||||||
@ -18,7 +18,7 @@ public:
|
|||||||
~LvglSync() override = default;
|
~LvglSync() override = default;
|
||||||
|
|
||||||
bool lock(TickType_t timeoutTicks) const override {
|
bool lock(TickType_t timeoutTicks) const override {
|
||||||
return lvgl_try_lock(timeoutTicks);
|
return lvgl_try_lock_timed(timeoutTicks);
|
||||||
}
|
}
|
||||||
|
|
||||||
void unlock() const override {
|
void unlock() const override {
|
||||||
|
|||||||
@ -14,7 +14,6 @@
|
|||||||
|
|
||||||
#include <tactility/check.h>
|
#include <tactility/check.h>
|
||||||
#include <tactility/lvgl_fonts.h>
|
#include <tactility/lvgl_fonts.h>
|
||||||
#include <tactility/lvgl_module.h>
|
|
||||||
|
|
||||||
#include <lvgl.h>
|
#include <lvgl.h>
|
||||||
|
|
||||||
@ -173,8 +172,8 @@ lv_obj_t* statusbar_create(lv_obj_t* parent) {
|
|||||||
lv_obj_set_flex_flow(obj, LV_FLEX_FLOW_ROW);
|
lv_obj_set_flex_flow(obj, LV_FLEX_FLOW_ROW);
|
||||||
lv_obj_set_flex_align(obj, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER);
|
lv_obj_set_flex_align(obj, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER);
|
||||||
auto icon_size = lvgl_get_statusbar_icon_font_height();
|
auto icon_size = lvgl_get_statusbar_icon_font_height();
|
||||||
auto ui_density = lvgl_get_ui_density();
|
auto ui_density = hal::getConfiguration()->uiDensity;
|
||||||
auto icon_padding = (ui_density != LVGL_UI_DENSITY_COMPACT) ? static_cast<uint32_t>(icon_size * 0.2f) : 2;
|
auto icon_padding = (ui_density != hal::UiDensity::Compact) ? static_cast<uint32_t>(icon_size * 0.2f) : 2;
|
||||||
lv_obj_set_style_pad_column(obj, icon_padding, LV_STATE_DEFAULT);
|
lv_obj_set_style_pad_column(obj, icon_padding, LV_STATE_DEFAULT);
|
||||||
|
|
||||||
statusbar->time = lv_label_create(obj);
|
statusbar->time = lv_label_create(obj);
|
||||||
|
|||||||
@ -2,43 +2,41 @@
|
|||||||
|
|
||||||
#include <Tactility/Tactility.h>
|
#include <Tactility/Tactility.h>
|
||||||
#include <Tactility/lvgl/Toolbar.h>
|
#include <Tactility/lvgl/Toolbar.h>
|
||||||
|
|
||||||
#include <Tactility/lvgl/Spinner.h>
|
#include <Tactility/lvgl/Spinner.h>
|
||||||
#include <Tactility/service/loader/Loader.h>
|
#include <Tactility/service/loader/Loader.h>
|
||||||
|
|
||||||
#include <tactility/check.h>
|
#include <tactility/check.h>
|
||||||
#include <tactility/lvgl_fonts.h>
|
#include <tactility/lvgl_fonts.h>
|
||||||
#include <tactility/lvgl_module.h>
|
|
||||||
|
|
||||||
namespace tt::lvgl {
|
namespace tt::lvgl {
|
||||||
|
|
||||||
static uint32_t getToolbarHeight(UiDensity uiDensity) {
|
static uint32_t getToolbarHeight(hal::UiDensity uiDensity) {
|
||||||
if (uiDensity == LVGL_UI_DENSITY_COMPACT) {
|
if (uiDensity == hal::UiDensity::Compact) {
|
||||||
return lvgl_get_text_font_height(FONT_SIZE_DEFAULT) * 1.4f;
|
return lvgl_get_text_font_height(FONT_SIZE_DEFAULT) * 1.4f;
|
||||||
} else {
|
} else {
|
||||||
return lvgl_get_text_font_height(FONT_SIZE_LARGE) * 2.2f;
|
return lvgl_get_text_font_height(FONT_SIZE_LARGE) * 2.2f;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static const _lv_font_t* getToolbarFont(UiDensity uiDensity) {
|
static const _lv_font_t* getToolbarFont(hal::UiDensity uiDensity) {
|
||||||
if (uiDensity == LVGL_UI_DENSITY_COMPACT) {
|
if (uiDensity == hal::UiDensity::Compact) {
|
||||||
return lvgl_get_text_font(FONT_SIZE_DEFAULT);
|
return lvgl_get_text_font(FONT_SIZE_DEFAULT);
|
||||||
} else {
|
} else {
|
||||||
return lvgl_get_text_font(FONT_SIZE_LARGE);
|
return lvgl_get_text_font(FONT_SIZE_LARGE);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static uint32_t getActionIconPadding(UiDensity uiDensity) {
|
static uint32_t getActionIconPadding(hal::UiDensity ui_density) {
|
||||||
auto toolbar_height = getToolbarHeight(uiDensity);
|
auto toolbar_height = getToolbarHeight(ui_density);
|
||||||
// Minimal 8 pixels total padding for selection/animation (4+4 pixels)
|
// Minimal 8 pixels total padding for selection/animation (4+4 pixels)
|
||||||
return (uiDensity != LVGL_UI_DENSITY_COMPACT) ? (uint32_t)(toolbar_height * 0.2f) : 8;
|
return (ui_density != hal::UiDensity::Compact) ? (uint32_t)(toolbar_height * 0.2f) : 8;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Helps with button expansion and also with vertical alignment of content,
|
* Helps with button expansion and also with vertical alignment of content,
|
||||||
* as the parent flex doesn't allow for vertical alignment
|
* as the parent flex doesn't allow for vertical alignment
|
||||||
*/
|
*/
|
||||||
static lv_obj_t* create_action_wrapper(lv_obj_t* parent, UiDensity ui_density) {
|
static lv_obj_t* create_action_wrapper(lv_obj_t* parent, hal::UiDensity ui_density) {
|
||||||
auto* wrapper = lv_obj_create(parent);
|
auto* wrapper = lv_obj_create(parent);
|
||||||
auto toolbar_height = getToolbarHeight(ui_density);
|
auto toolbar_height = getToolbarHeight(ui_density);
|
||||||
lv_obj_set_size(wrapper, LV_SIZE_CONTENT, toolbar_height);
|
lv_obj_set_size(wrapper, LV_SIZE_CONTENT, toolbar_height);
|
||||||
@ -91,7 +89,7 @@ static void toolbar_constructor(const lv_obj_class_t* class_p, lv_obj_t* obj) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
lv_obj_t* toolbar_create(lv_obj_t* parent, const std::string& title) {
|
lv_obj_t* toolbar_create(lv_obj_t* parent, const std::string& title) {
|
||||||
auto ui_density = lvgl_get_ui_density();
|
auto ui_density = hal::getConfiguration()->uiDensity;
|
||||||
auto toolbar_height = getToolbarHeight(ui_density);
|
auto toolbar_height = getToolbarHeight(ui_density);
|
||||||
toolbar_class.height_def = toolbar_height;
|
toolbar_class.height_def = toolbar_height;
|
||||||
lv_obj_t* obj = lv_obj_class_create_obj(&toolbar_class, parent);
|
lv_obj_t* obj = lv_obj_class_create_obj(&toolbar_class, parent);
|
||||||
@ -111,7 +109,7 @@ lv_obj_t* toolbar_create(lv_obj_t* parent, const std::string& title) {
|
|||||||
auto* close_button_wrapper = create_action_wrapper(obj, ui_density);
|
auto* close_button_wrapper = create_action_wrapper(obj, ui_density);
|
||||||
|
|
||||||
toolbar->close_button = lv_button_create(close_button_wrapper);
|
toolbar->close_button = lv_button_create(close_button_wrapper);
|
||||||
if (ui_density == LVGL_UI_DENSITY_COMPACT) {
|
if (ui_density == hal::UiDensity::Compact) {
|
||||||
lv_obj_set_style_bg_opa(toolbar->close_button, LV_OPA_TRANSP, LV_STATE_DEFAULT);
|
lv_obj_set_style_bg_opa(toolbar->close_button, LV_OPA_TRANSP, LV_STATE_DEFAULT);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -123,8 +121,8 @@ lv_obj_t* toolbar_create(lv_obj_t* parent, const std::string& title) {
|
|||||||
lv_obj_align(toolbar->close_button_image, LV_ALIGN_CENTER, 0, 0);
|
lv_obj_align(toolbar->close_button_image, LV_ALIGN_CENTER, 0, 0);
|
||||||
|
|
||||||
auto* title_wrapper = lv_obj_create(obj);
|
auto* title_wrapper = lv_obj_create(obj);
|
||||||
uint32_t title_left_padding = (ui_density != LVGL_UI_DENSITY_COMPACT) ? icon_padding : 2;
|
uint32_t title_left_padding = (ui_density != hal::UiDensity::Compact) ? icon_padding : 2;
|
||||||
uint32_t title_right_padding = (ui_density != LVGL_UI_DENSITY_COMPACT) ? (icon_padding / 2) : 2;
|
uint32_t title_right_padding = (ui_density != hal::UiDensity::Compact) ? (icon_padding / 2) : 2;
|
||||||
lv_obj_set_size(title_wrapper, LV_SIZE_CONTENT, LV_PCT(100));
|
lv_obj_set_size(title_wrapper, LV_SIZE_CONTENT, LV_PCT(100));
|
||||||
lv_obj_set_style_bg_opa(title_wrapper, 0, LV_STATE_DEFAULT);
|
lv_obj_set_style_bg_opa(title_wrapper, 0, LV_STATE_DEFAULT);
|
||||||
lv_obj_set_style_pad_left(title_wrapper, title_left_padding, LV_STATE_DEFAULT);
|
lv_obj_set_style_pad_left(title_wrapper, title_left_padding, LV_STATE_DEFAULT);
|
||||||
@ -181,7 +179,7 @@ lv_obj_t* toolbar_add_button_action(lv_obj_t* obj, const char* imageOrButton, bo
|
|||||||
check(toolbar->action_count < TOOLBAR_ACTION_LIMIT, "max actions reached");
|
check(toolbar->action_count < TOOLBAR_ACTION_LIMIT, "max actions reached");
|
||||||
toolbar->action_count++;
|
toolbar->action_count++;
|
||||||
|
|
||||||
auto ui_density = lvgl_get_ui_density();
|
auto ui_density = hal::getConfiguration()->uiDensity;
|
||||||
auto toolbar_height = getToolbarHeight(ui_density);
|
auto toolbar_height = getToolbarHeight(ui_density);
|
||||||
|
|
||||||
auto* wrapper = create_action_wrapper(toolbar->action_container, ui_density);
|
auto* wrapper = create_action_wrapper(toolbar->action_container, ui_density);
|
||||||
@ -192,7 +190,7 @@ lv_obj_t* toolbar_add_button_action(lv_obj_t* obj, const char* imageOrButton, bo
|
|||||||
lv_obj_set_size(action_button, toolbar_height - padding, toolbar_height - padding);
|
lv_obj_set_size(action_button, toolbar_height - padding, toolbar_height - padding);
|
||||||
lv_obj_set_style_pad_all(action_button, 0, LV_STATE_DEFAULT);
|
lv_obj_set_style_pad_all(action_button, 0, LV_STATE_DEFAULT);
|
||||||
lv_obj_align(action_button, LV_ALIGN_CENTER, 0, 0);
|
lv_obj_align(action_button, LV_ALIGN_CENTER, 0, 0);
|
||||||
if (ui_density == LVGL_UI_DENSITY_COMPACT) {
|
if (ui_density == hal::UiDensity::Compact) {
|
||||||
lv_obj_set_style_bg_opa(action_button, LV_OPA_TRANSP, LV_STATE_DEFAULT);
|
lv_obj_set_style_bg_opa(action_button, LV_OPA_TRANSP, LV_STATE_DEFAULT);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -221,7 +219,7 @@ lv_obj_t* toolbar_add_text_button_action(lv_obj_t* obj, const char* text, lv_eve
|
|||||||
lv_obj_t* toolbar_add_switch_action(lv_obj_t* obj) {
|
lv_obj_t* toolbar_add_switch_action(lv_obj_t* obj) {
|
||||||
auto* toolbar = reinterpret_cast<Toolbar*>(obj);
|
auto* toolbar = reinterpret_cast<Toolbar*>(obj);
|
||||||
|
|
||||||
auto ui_density = lvgl_get_ui_density();
|
auto ui_density = hal::getConfiguration()->uiDensity;
|
||||||
auto* wrapper = create_action_wrapper(toolbar->action_container, ui_density);
|
auto* wrapper = create_action_wrapper(toolbar->action_container, ui_density);
|
||||||
lv_obj_set_style_pad_hor(wrapper, 4, LV_STATE_DEFAULT);
|
lv_obj_set_style_pad_hor(wrapper, 4, LV_STATE_DEFAULT);
|
||||||
|
|
||||||
@ -233,7 +231,7 @@ lv_obj_t* toolbar_add_switch_action(lv_obj_t* obj) {
|
|||||||
lv_obj_t* toolbar_add_spinner_action(lv_obj_t* obj) {
|
lv_obj_t* toolbar_add_spinner_action(lv_obj_t* obj) {
|
||||||
auto* toolbar = reinterpret_cast<Toolbar*>(obj);
|
auto* toolbar = reinterpret_cast<Toolbar*>(obj);
|
||||||
|
|
||||||
auto ui_density = lvgl_get_ui_density();
|
auto ui_density = hal::getConfiguration()->uiDensity;
|
||||||
auto* wrapper = create_action_wrapper(toolbar->action_container, ui_density);
|
auto* wrapper = create_action_wrapper(toolbar->action_container, ui_density);
|
||||||
|
|
||||||
auto* spinner = spinner_create(wrapper);
|
auto* spinner = spinner_create(wrapper);
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
#ifdef ESP_PLATFORM
|
#ifdef ESP_PLATFORM
|
||||||
|
|
||||||
#include <lvgl.h>
|
#include <Tactility/Tactility.h>
|
||||||
|
|
||||||
#include <tactility/lvgl_module.h>
|
#include <lvgl.h>
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
|
||||||
@ -11,7 +11,7 @@ extern lv_obj_t* __real_lv_button_create(lv_obj_t* parent);
|
|||||||
lv_obj_t* __wrap_lv_button_create(lv_obj_t* parent) {
|
lv_obj_t* __wrap_lv_button_create(lv_obj_t* parent) {
|
||||||
auto button = __real_lv_button_create(parent);
|
auto button = __real_lv_button_create(parent);
|
||||||
|
|
||||||
if (lvgl_get_ui_density() == LVGL_UI_DENSITY_COMPACT) {
|
if (tt::hal::getConfiguration()->uiDensity == tt::hal::UiDensity::Compact) {
|
||||||
lv_obj_set_style_pad_all(button, 2, LV_STATE_DEFAULT);
|
lv_obj_set_style_pad_all(button, 2, LV_STATE_DEFAULT);
|
||||||
lv_obj_set_style_radius(button, 3, LV_STATE_DEFAULT);
|
lv_obj_set_style_radius(button, 3, LV_STATE_DEFAULT);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
#ifdef ESP_PLATFORM
|
#ifdef ESP_PLATFORM
|
||||||
|
|
||||||
#include <lvgl.h>
|
#include <Tactility/Tactility.h>
|
||||||
|
|
||||||
#include <tactility/lvgl_module.h>
|
#include <lvgl.h>
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
|
||||||
@ -11,7 +11,7 @@ extern lv_obj_t* __real_lv_dropdown_create(lv_obj_t* parent);
|
|||||||
lv_obj_t* __wrap_lv_dropdown_create(lv_obj_t* parent) {
|
lv_obj_t* __wrap_lv_dropdown_create(lv_obj_t* parent) {
|
||||||
auto dropdown = __real_lv_dropdown_create(parent);
|
auto dropdown = __real_lv_dropdown_create(parent);
|
||||||
|
|
||||||
if (lvgl_get_ui_density() == LVGL_UI_DENSITY_COMPACT) {
|
if (tt::hal::getConfiguration()->uiDensity == tt::hal::UiDensity::Compact) {
|
||||||
lv_obj_set_style_pad_all(dropdown, 2, LV_STATE_DEFAULT);
|
lv_obj_set_style_pad_all(dropdown, 2, LV_STATE_DEFAULT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
#ifdef ESP_PLATFORM
|
#ifdef ESP_PLATFORM
|
||||||
|
|
||||||
#include <lvgl.h>
|
#include <Tactility/Tactility.h>
|
||||||
|
|
||||||
#include <tactility/lvgl_module.h>
|
#include <lvgl.h>
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
|
||||||
@ -12,7 +12,7 @@ extern lv_obj_t* __real_lv_list_add_button(lv_obj_t* list, const void* icon, con
|
|||||||
lv_obj_t* __wrap_lv_list_create(lv_obj_t* parent) {
|
lv_obj_t* __wrap_lv_list_create(lv_obj_t* parent) {
|
||||||
auto* list = __real_lv_list_create(parent);
|
auto* list = __real_lv_list_create(parent);
|
||||||
|
|
||||||
if (lvgl_get_ui_density() == LVGL_UI_DENSITY_COMPACT) {
|
if (tt::hal::getConfiguration()->uiDensity == tt::hal::UiDensity::Compact) {
|
||||||
lv_obj_set_style_pad_row(list, 2, LV_STATE_DEFAULT);
|
lv_obj_set_style_pad_row(list, 2, LV_STATE_DEFAULT);
|
||||||
lv_obj_set_style_pad_column(list, 2, LV_STATE_DEFAULT);
|
lv_obj_set_style_pad_column(list, 2, LV_STATE_DEFAULT);
|
||||||
lv_obj_set_style_pad_all(list, 2, LV_STATE_DEFAULT);
|
lv_obj_set_style_pad_all(list, 2, LV_STATE_DEFAULT);
|
||||||
@ -24,7 +24,7 @@ lv_obj_t* __wrap_lv_list_create(lv_obj_t* parent) {
|
|||||||
lv_obj_t* __wrap_lv_list_add_button(lv_obj_t* list, const void* icon, const char* txt) {
|
lv_obj_t* __wrap_lv_list_add_button(lv_obj_t* list, const void* icon, const char* txt) {
|
||||||
auto* button = __real_lv_list_add_button(list, icon, txt);
|
auto* button = __real_lv_list_add_button(list, icon, txt);
|
||||||
|
|
||||||
if (lvgl_get_ui_density() == LVGL_UI_DENSITY_COMPACT) {
|
if (tt::hal::getConfiguration()->uiDensity == tt::hal::UiDensity::Compact) {
|
||||||
lv_obj_set_style_pad_ver(button, 2, LV_STATE_DEFAULT);
|
lv_obj_set_style_pad_ver(button, 2, LV_STATE_DEFAULT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
#ifdef ESP_PLATFORM
|
#ifdef ESP_PLATFORM
|
||||||
|
|
||||||
#include <lvgl.h>
|
#include <Tactility/Tactility.h>
|
||||||
|
|
||||||
#include <tactility/lvgl_module.h>
|
#include <lvgl.h>
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
|
||||||
@ -12,14 +12,14 @@ extern lv_obj_t* __real_lv_obj_create(lv_obj_t* parent);
|
|||||||
void __wrap_lv_obj_set_flex_flow(lv_obj_t* obj, lv_flex_flow_t flow) {
|
void __wrap_lv_obj_set_flex_flow(lv_obj_t* obj, lv_flex_flow_t flow) {
|
||||||
__real_lv_obj_set_flex_flow(obj, flow);
|
__real_lv_obj_set_flex_flow(obj, flow);
|
||||||
|
|
||||||
if (lvgl_get_ui_density() == LVGL_UI_DENSITY_COMPACT) {
|
if (tt::hal::getConfiguration()->uiDensity == tt::hal::UiDensity::Compact) {
|
||||||
lv_obj_set_style_pad_gap(obj, 4, LV_STATE_DEFAULT);
|
lv_obj_set_style_pad_gap(obj, 4, LV_STATE_DEFAULT);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
lv_obj_t* __wrap_lv_obj_create(lv_obj_t* parent) {
|
lv_obj_t* __wrap_lv_obj_create(lv_obj_t* parent) {
|
||||||
auto obj = __real_lv_obj_create(parent);
|
auto obj = __real_lv_obj_create(parent);
|
||||||
if (lvgl_get_ui_density() == LVGL_UI_DENSITY_COMPACT) {
|
if (tt::hal::getConfiguration()->uiDensity == tt::hal::UiDensity::Compact) {
|
||||||
lv_obj_set_style_pad_all(obj, 2, LV_STATE_DEFAULT);
|
lv_obj_set_style_pad_all(obj, 2, LV_STATE_DEFAULT);
|
||||||
lv_obj_set_style_pad_gap(obj, 2, LV_STATE_DEFAULT);
|
lv_obj_set_style_pad_gap(obj, 2, LV_STATE_DEFAULT);
|
||||||
lv_obj_set_style_radius(obj, 3, LV_STATE_DEFAULT);
|
lv_obj_set_style_radius(obj, 3, LV_STATE_DEFAULT);
|
||||||
|
|||||||
@ -1,8 +1,8 @@
|
|||||||
#ifdef ESP_PLATFORM
|
#ifdef ESP_PLATFORM
|
||||||
|
|
||||||
#include <lvgl.h>
|
#include <Tactility/Tactility.h>
|
||||||
|
|
||||||
#include <tactility/lvgl_module.h>
|
#include <lvgl.h>
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
|
||||||
@ -11,7 +11,7 @@ extern lv_obj_t* __real_lv_switch_create(lv_obj_t* parent);
|
|||||||
lv_obj_t* __wrap_lv_switch_create(lv_obj_t* parent) {
|
lv_obj_t* __wrap_lv_switch_create(lv_obj_t* parent) {
|
||||||
auto widget = __real_lv_switch_create(parent);
|
auto widget = __real_lv_switch_create(parent);
|
||||||
|
|
||||||
if (lvgl_get_ui_density() == LVGL_UI_DENSITY_COMPACT) {
|
if (tt::hal::getConfiguration()->uiDensity == tt::hal::UiDensity::Compact) {
|
||||||
lv_obj_set_style_size(widget, 25, 15, LV_STATE_DEFAULT);
|
lv_obj_set_style_size(widget, 25, 15, LV_STATE_DEFAULT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,10 +1,8 @@
|
|||||||
#ifdef ESP_PLATFORM
|
#ifdef ESP_PLATFORM
|
||||||
|
|
||||||
#include <lvgl.h>
|
#include <Tactility/app/App.h>
|
||||||
|
|
||||||
#include <tactility/lvgl_module.h>
|
|
||||||
|
|
||||||
#include <Tactility/service/gui/GuiService.h>
|
#include <Tactility/service/gui/GuiService.h>
|
||||||
|
#include <Tactility/Tactility.h>
|
||||||
|
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
|
||||||
@ -13,7 +11,7 @@ extern lv_obj_t* __real_lv_textarea_create(lv_obj_t* parent);
|
|||||||
lv_obj_t* __wrap_lv_textarea_create(lv_obj_t* parent) {
|
lv_obj_t* __wrap_lv_textarea_create(lv_obj_t* parent) {
|
||||||
auto textarea = __real_lv_textarea_create(parent);
|
auto textarea = __real_lv_textarea_create(parent);
|
||||||
|
|
||||||
if (lvgl_get_ui_density() == LVGL_UI_DENSITY_COMPACT) {
|
if (tt::hal::getConfiguration()->uiDensity == tt::hal::UiDensity::Compact) {
|
||||||
lv_obj_set_style_pad_all(textarea, 2, LV_STATE_DEFAULT);
|
lv_obj_set_style_pad_all(textarea, 2, LV_STATE_DEFAULT);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
32
TactilityC/Include/tt_hal.h
Normal file
32
TactilityC/Include/tt_hal.h
Normal file
@ -0,0 +1,32 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
/** Affects LVGL widget style */
|
||||||
|
typedef enum {
|
||||||
|
/** Ideal for very small non-touch screen devices (e.g. Waveshare S3 LCD 1.3") */
|
||||||
|
UiDensityCompact,
|
||||||
|
/** Nothing was changed in the LVGL UI/UX */
|
||||||
|
UiDensityDefault
|
||||||
|
} UiDensity;
|
||||||
|
|
||||||
|
/** @deprecated use UiDensity */
|
||||||
|
typedef enum {
|
||||||
|
UiScaleSmallest, // UiDensityCompact
|
||||||
|
UiScaleDefault // UiDensityDefault
|
||||||
|
} UiScale;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @deprecated Use UiDensity
|
||||||
|
* @return the UI scaling setting for this device.
|
||||||
|
*/
|
||||||
|
UiScale tt_hal_configuration_get_ui_scale();
|
||||||
|
|
||||||
|
/** @return the UI scaling setting for this device. */
|
||||||
|
UiDensity tt_hal_configuration_get_ui_density();
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
18
TactilityC/Source/tt_hal.cpp
Normal file
18
TactilityC/Source/tt_hal.cpp
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
#include "tt_hal.h"
|
||||||
|
|
||||||
|
#include <Tactility/Tactility.h>
|
||||||
|
#include <Tactility/hal/Configuration.h>
|
||||||
|
|
||||||
|
extern "C" {
|
||||||
|
|
||||||
|
UiDensity tt_hal_configuration_get_ui_density() {
|
||||||
|
auto density = tt::hal::getConfiguration()->uiDensity;
|
||||||
|
return static_cast<UiDensity>(density);
|
||||||
|
}
|
||||||
|
|
||||||
|
UiScale tt_hal_configuration_get_ui_scale() {
|
||||||
|
auto density = tt::hal::getConfiguration()->uiDensity;
|
||||||
|
return static_cast<UiScale>(density);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
18
TactilityC/Source/tt_hal_gpio.cpp
Normal file
18
TactilityC/Source/tt_hal_gpio.cpp
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
#include "tt_hal_gpio.h"
|
||||||
|
#include <Tactility/hal/gpio/Gpio.h>
|
||||||
|
#include <tactility/device.h>
|
||||||
|
#include <tactility/drivers/gpio_controller.h>
|
||||||
|
|
||||||
|
extern "C" {
|
||||||
|
|
||||||
|
using namespace tt::hal;
|
||||||
|
|
||||||
|
bool tt_hal_gpio_get_level(GpioPin pin) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
int tt_hal_gpio_get_pin_count() {
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@ -5,8 +5,10 @@
|
|||||||
#include "tt_app_selectiondialog.h"
|
#include "tt_app_selectiondialog.h"
|
||||||
#include "tt_bundle.h"
|
#include "tt_bundle.h"
|
||||||
#include "tt_gps.h"
|
#include "tt_gps.h"
|
||||||
|
#include "tt_hal.h"
|
||||||
#include "tt_hal_device.h"
|
#include "tt_hal_device.h"
|
||||||
#include "tt_hal_display.h"
|
#include "tt_hal_display.h"
|
||||||
|
#include "tt_hal_gpio.h"
|
||||||
#include "tt_hal_touch.h"
|
#include "tt_hal_touch.h"
|
||||||
#include "tt_hal_uart.h"
|
#include "tt_hal_uart.h"
|
||||||
#include <tt_lock.h>
|
#include <tt_lock.h>
|
||||||
@ -270,6 +272,8 @@ const esp_elfsym main_symbols[] {
|
|||||||
ESP_ELFSYM_EXPORT(tt_bundle_put_string),
|
ESP_ELFSYM_EXPORT(tt_bundle_put_string),
|
||||||
ESP_ELFSYM_EXPORT(tt_gps_has_coordinates),
|
ESP_ELFSYM_EXPORT(tt_gps_has_coordinates),
|
||||||
ESP_ELFSYM_EXPORT(tt_gps_get_coordinates),
|
ESP_ELFSYM_EXPORT(tt_gps_get_coordinates),
|
||||||
|
ESP_ELFSYM_EXPORT(tt_hal_configuration_get_ui_scale),
|
||||||
|
ESP_ELFSYM_EXPORT(tt_hal_configuration_get_ui_density),
|
||||||
ESP_ELFSYM_EXPORT(tt_hal_device_find),
|
ESP_ELFSYM_EXPORT(tt_hal_device_find),
|
||||||
ESP_ELFSYM_EXPORT(tt_hal_display_driver_alloc),
|
ESP_ELFSYM_EXPORT(tt_hal_display_driver_alloc),
|
||||||
ESP_ELFSYM_EXPORT(tt_hal_display_driver_draw_bitmap),
|
ESP_ELFSYM_EXPORT(tt_hal_display_driver_draw_bitmap),
|
||||||
@ -280,6 +284,8 @@ const esp_elfsym main_symbols[] {
|
|||||||
ESP_ELFSYM_EXPORT(tt_hal_display_driver_lock),
|
ESP_ELFSYM_EXPORT(tt_hal_display_driver_lock),
|
||||||
ESP_ELFSYM_EXPORT(tt_hal_display_driver_unlock),
|
ESP_ELFSYM_EXPORT(tt_hal_display_driver_unlock),
|
||||||
ESP_ELFSYM_EXPORT(tt_hal_display_driver_supported),
|
ESP_ELFSYM_EXPORT(tt_hal_display_driver_supported),
|
||||||
|
ESP_ELFSYM_EXPORT(tt_hal_gpio_get_level),
|
||||||
|
ESP_ELFSYM_EXPORT(tt_hal_gpio_get_pin_count),
|
||||||
ESP_ELFSYM_EXPORT(tt_hal_touch_driver_supported),
|
ESP_ELFSYM_EXPORT(tt_hal_touch_driver_supported),
|
||||||
ESP_ELFSYM_EXPORT(tt_hal_touch_driver_alloc),
|
ESP_ELFSYM_EXPORT(tt_hal_touch_driver_alloc),
|
||||||
ESP_ELFSYM_EXPORT(tt_hal_touch_driver_free),
|
ESP_ELFSYM_EXPORT(tt_hal_touch_driver_free),
|
||||||
|
|||||||
@ -1,21 +0,0 @@
|
|||||||
# TactilityKernel
|
|
||||||
|
|
||||||
TactilityKernel is the core component of the Tactility project, providing a hardware abstraction layer (HAL) and essential kernel services for embedded systems.
|
|
||||||
|
|
||||||
## Features
|
|
||||||
|
|
||||||
- **Device and Driver Model**: A flexible system for managing hardware devices and their corresponding drivers.
|
|
||||||
- **Peripheral Support**: Standard interfaces for common peripherals:
|
|
||||||
- GPIO (General Purpose Input/Output)
|
|
||||||
- I2C (Inter-Integrated Circuit)
|
|
||||||
- I2S (Inter-IC Sound)
|
|
||||||
- SPI (Serial Peripheral Interface)
|
|
||||||
- UART (Universal Asynchronous Receiver-Transmitter)
|
|
||||||
- **Concurrency Primitives**: Built-in support for multi-threaded environments, including:
|
|
||||||
- Threads and Dispatchers
|
|
||||||
- Mutexes and Recursive Mutexes
|
|
||||||
- Event Groups
|
|
||||||
- Timers
|
|
||||||
- **Module System**: Support for loadable modules that can export symbols and provide runtime-extensible functionality.
|
|
||||||
- **Device Tree Integration**: Utilizes a devicetree-like system for hardware configuration and initialization.
|
|
||||||
- **Cross-Platform**: Designed to run on both embedded platforms (such as ESP32) and desktop environments (Linux) for simulation and testing.
|
|
||||||
@ -163,50 +163,6 @@ error_t i2c_controller_write_register_array(struct Device* device, uint8_t addre
|
|||||||
*/
|
*/
|
||||||
error_t i2c_controller_has_device_at_address(struct Device* device, uint8_t address, TickType_t timeout);
|
error_t i2c_controller_has_device_at_address(struct Device* device, uint8_t address, TickType_t timeout);
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Sets the value of an 8-bit register of an I2C device.
|
|
||||||
* @param[in] device the I2C controller device
|
|
||||||
* @param[in] address the 7-bit I2C address of the slave device
|
|
||||||
* @param[in] reg the register address to set
|
|
||||||
* @param[in] value the value to set the register to
|
|
||||||
* @param[in] timeout the maximum time to wait for the operation to complete
|
|
||||||
* @retval ERROR_NONE when the write operation was successful
|
|
||||||
*/
|
|
||||||
error_t i2c_controller_register8_set(struct Device* device, uint8_t address, uint8_t reg, uint8_t value, TickType_t timeout);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Gets the value of an 8-bit register of an I2C device.
|
|
||||||
* @param[in] device the I2C controller device
|
|
||||||
* @param[in] address the 7-bit I2C address of the slave device
|
|
||||||
* @param[in] reg the register address to get
|
|
||||||
* @param[out] value a pointer to the variable to store the register value
|
|
||||||
* @param[in] timeout the maximum time to wait for the operation to complete
|
|
||||||
* @retval ERROR_NONE when the read operation was successful
|
|
||||||
*/
|
|
||||||
error_t i2c_controller_register8_get(struct Device* device, uint8_t address, uint8_t reg, uint8_t* value, TickType_t timeout);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Sets specific bits in an 8-bit register of an I2C device.
|
|
||||||
* @param[in] device the I2C controller device
|
|
||||||
* @param[in] address the 7-bit I2C address of the slave device
|
|
||||||
* @param[in] reg the register address
|
|
||||||
* @param[in] bits_to_set a bitmask of bits to set (set to 1)
|
|
||||||
* @param[in] timeout the maximum time to wait for the operation to complete
|
|
||||||
* @retval ERROR_NONE when the operation was successful
|
|
||||||
*/
|
|
||||||
error_t i2c_controller_register8_set_bits(struct Device* device, uint8_t address, uint8_t reg, uint8_t bits_to_set, TickType_t timeout);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* @brief Resets specific bits in an 8-bit register of an I2C device.
|
|
||||||
* @param[in] device the I2C controller device
|
|
||||||
* @param[in] address the 7-bit I2C address of the slave device
|
|
||||||
* @param[in] reg the register address
|
|
||||||
* @param[in] bits_to_reset a bitmask of bits to reset (set to 0)
|
|
||||||
* @param[in] timeout the maximum time to wait for the operation to complete
|
|
||||||
* @retval ERROR_NONE when the operation was successful
|
|
||||||
*/
|
|
||||||
error_t i2c_controller_register8_reset_bits(struct Device* device, uint8_t address, uint8_t reg, uint8_t bits_to_reset, TickType_t timeout);
|
|
||||||
|
|
||||||
extern const struct DeviceType I2C_CONTROLLER_TYPE;
|
extern const struct DeviceType I2C_CONTROLLER_TYPE;
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
|||||||
@ -31,34 +31,6 @@ error_t i2c_controller_write_register(Device* device, uint8_t address, uint8_t r
|
|||||||
return I2C_DRIVER_API(driver)->write_register(device, address, reg, data, dataSize, timeout);
|
return I2C_DRIVER_API(driver)->write_register(device, address, reg, data, dataSize, timeout);
|
||||||
}
|
}
|
||||||
|
|
||||||
error_t i2c_controller_register8_set(Device* device, uint8_t address, uint8_t reg, uint8_t value, TickType_t timeout) {
|
|
||||||
const auto* driver = device_get_driver(device);
|
|
||||||
return I2C_DRIVER_API(driver)->write_register(device, address, reg, &value, 1, timeout);
|
|
||||||
}
|
|
||||||
|
|
||||||
error_t i2c_controller_register8_get(Device* device, uint8_t address, uint8_t reg, uint8_t* value, TickType_t timeout) {
|
|
||||||
const auto* driver = device_get_driver(device);
|
|
||||||
return I2C_DRIVER_API(driver)->read_register(device, address, reg, value, 1, timeout);
|
|
||||||
}
|
|
||||||
|
|
||||||
error_t i2c_controller_register8_set_bits(Device* device, uint8_t address, uint8_t reg, uint8_t bits_to_set, TickType_t timeout) {
|
|
||||||
const auto* driver = device_get_driver(device);
|
|
||||||
uint8_t data = 0;
|
|
||||||
auto error = I2C_DRIVER_API(driver)->read_register(device, address, reg, &data, 1, timeout);
|
|
||||||
if (error != ERROR_NONE) return error;
|
|
||||||
data |= bits_to_set;
|
|
||||||
return I2C_DRIVER_API(driver)->write_register(device, address, reg, &data, 1, timeout);
|
|
||||||
}
|
|
||||||
|
|
||||||
error_t i2c_controller_register8_reset_bits(Device* device, uint8_t address, uint8_t reg, uint8_t bits_to_reset, TickType_t timeout) {
|
|
||||||
const auto* driver = device_get_driver(device);
|
|
||||||
uint8_t data = 0;
|
|
||||||
auto error = I2C_DRIVER_API(driver)->read_register(device, address, reg, &data, 1, timeout);
|
|
||||||
if (error != ERROR_NONE) return error;
|
|
||||||
data &= ~bits_to_reset;
|
|
||||||
return I2C_DRIVER_API(driver)->write_register(device, address, reg, &data, 1, timeout);
|
|
||||||
}
|
|
||||||
|
|
||||||
error_t i2c_controller_write_register_array(Device* device, uint8_t address, const uint8_t* data, uint16_t dataSize, TickType_t timeout) {
|
error_t i2c_controller_write_register_array(Device* device, uint8_t address, const uint8_t* data, uint16_t dataSize, TickType_t timeout) {
|
||||||
const auto* driver = device_get_driver(device);
|
const auto* driver = device_get_driver(device);
|
||||||
if (dataSize % 2 != 0) {
|
if (dataSize % 2 != 0) {
|
||||||
|
|||||||
@ -80,10 +80,6 @@ const struct ModuleSymbol KERNEL_SYMBOLS[] = {
|
|||||||
DEFINE_MODULE_SYMBOL(i2c_controller_write_register),
|
DEFINE_MODULE_SYMBOL(i2c_controller_write_register),
|
||||||
DEFINE_MODULE_SYMBOL(i2c_controller_write_register_array),
|
DEFINE_MODULE_SYMBOL(i2c_controller_write_register_array),
|
||||||
DEFINE_MODULE_SYMBOL(i2c_controller_has_device_at_address),
|
DEFINE_MODULE_SYMBOL(i2c_controller_has_device_at_address),
|
||||||
DEFINE_MODULE_SYMBOL(i2c_controller_register8_set),
|
|
||||||
DEFINE_MODULE_SYMBOL(i2c_controller_register8_get),
|
|
||||||
DEFINE_MODULE_SYMBOL(i2c_controller_register8_set_bits),
|
|
||||||
DEFINE_MODULE_SYMBOL(i2c_controller_register8_reset_bits),
|
|
||||||
DEFINE_MODULE_SYMBOL(I2C_CONTROLLER_TYPE),
|
DEFINE_MODULE_SYMBOL(I2C_CONTROLLER_TYPE),
|
||||||
// drivers/i2s_controller
|
// drivers/i2s_controller
|
||||||
DEFINE_MODULE_SYMBOL(i2s_controller_read),
|
DEFINE_MODULE_SYMBOL(i2s_controller_read),
|
||||||
@ -98,7 +94,6 @@ const struct ModuleSymbol KERNEL_SYMBOLS[] = {
|
|||||||
DEFINE_MODULE_SYMBOL(spi_controller_lock),
|
DEFINE_MODULE_SYMBOL(spi_controller_lock),
|
||||||
DEFINE_MODULE_SYMBOL(spi_controller_try_lock),
|
DEFINE_MODULE_SYMBOL(spi_controller_try_lock),
|
||||||
DEFINE_MODULE_SYMBOL(spi_controller_unlock),
|
DEFINE_MODULE_SYMBOL(spi_controller_unlock),
|
||||||
DEFINE_MODULE_SYMBOL(SPI_CONTROLLER_TYPE),
|
|
||||||
// drivers/uart_controller
|
// drivers/uart_controller
|
||||||
DEFINE_MODULE_SYMBOL(uart_controller_open),
|
DEFINE_MODULE_SYMBOL(uart_controller_open),
|
||||||
DEFINE_MODULE_SYMBOL(uart_controller_close),
|
DEFINE_MODULE_SYMBOL(uart_controller_close),
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user