Skip to content

Commit df9e66e

Browse files
Merge mesh apps, add log command, terminal and simulator fixes (#752)
1 parent d52646d commit df9e66e

27 files changed

Lines changed: 702 additions & 453 deletions

File tree

Lines changed: 1 addition & 1 deletion
Loading
Lines changed: 1 addition & 1 deletion
Loading
File renamed without changes.
File renamed without changes.

‎Devices/simulator/Source/SimulatorProfile.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ constexpr auto* DISPLAY_SETTINGS_PATH = "data/tactility/appdata/tactility.displa
2828
constexpr auto* ORIENTATION_KEY = "orientation=";
2929

3030
static const Profile PROFILES[PROFILE_COUNT] = {
31-
{ "Default", 640, 320, LV_DPI_DEF, false, false, false, true, true },
32-
{ "CL-32", 384, 168, 139, false, true, true, true, false },
33-
{ "LilyGO T-Deck", 320, 240, 143, false, false, false, true, true },
34-
{ "LilyGO T-Lora Pager", 480, 222, 150, false, false, false, true, false },
35-
{ "M5Stack Cardputer", 240, 135, 139, false, true, false, true, false },
36-
{ "M5Stack Tab5", 1280, 720, 250, true, false, false, true, true },
31+
{ "Default", 640, 320, LV_DPI_DEF, false, 100, 100, false, true, true },
32+
{ "CL-32", 384, 168, 139, false, 40, 0, true, true, false },
33+
{ "LilyGO T-Deck", 320, 240, 143, false, 40, 60, false, true, true },
34+
{ "LilyGO T-Lora Pager", 480, 222, 150, false, 40, 0, false, true, false },
35+
{ "M5Stack Cardputer", 240, 135, 139, false, 20, 0, false, true, false },
36+
{ "M5Stack Tab5", 1280, 720, 250, true, 100, 100, false, true, true },
3737
};
3838

3939
static size_t activeProfileIndex = 0;

‎Devices/simulator/Source/SimulatorProfile.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,10 @@ struct Profile {
1616
uint16_t dpi; // lvgl.dpi from device.properties (if set), otherwise display.dpi
1717
/** The default rotation: the display is taller than wide. The width and height values may be given in either order. */
1818
bool portrait;
19-
/** Compact UI density */
20-
bool compact;
19+
/** LVGL UI spacing, from lvgl.uiSpacing of the device */
20+
uint8_t uiSpacing;
21+
/** LVGL UI size, from lvgl.uiSize of the device */
22+
uint8_t uiSize;
2123
/** Greyscale display, which makes the monochrome theme apply */
2224
bool mono;
2325
bool keyboard;

‎Devices/simulator/Source/module.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,8 @@ extern "C" {
112112

113113
static error_t start() {
114114
simulator::initActiveProfile();
115-
const uint8_t density = simulator::getProfile(simulator::getActiveProfileIndex()).compact ? 0 : 100;
116-
lvgl_theme_set_default_density(density, density);
115+
const auto& profile = simulator::getProfile(simulator::getActiveProfileIndex());
116+
lvgl_theme_set_default_density(profile.uiSpacing, profile.uiSize);
117117
error_t error = app_manager_add(&simulator::profileAppManifest);
118118
if (error != ERROR_NONE) {
119119
return error;
-3.12 KB
Binary file not shown.
-3.97 KB
Binary file not shown.
-4.38 KB
Binary file not shown.

0 commit comments

Comments
 (0)