Skip to content

Commit 68293fd

Browse files
committed
update eez-framework
1 parent e53d1db commit 68293fd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+58048
-43860
lines changed

build/emscripten/modular-psu-firmware.js

Lines changed: 494 additions & 7 deletions
Large diffs are not rendered by default.
1.11 MB
Binary file not shown.

modular-psu-firmware.eez-project

Lines changed: 17257 additions & 3814 deletions
Large diffs are not rendered by default.

src/bb3/assets_V2.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ static uint32_t g_offsetAdjust;
8585
void convertV2toV3(Assets *assetsV2, Assets *assetsV3) {
8686
assetsV3->projectMajorVersion = PROJECT_VERSION_V3;
8787
assetsV3->projectMinorVersion = 0;
88-
assetsV3->reserved = assetsV2->reserved;
88+
assetsV3->assetsType = ASSETS_TYPE_FIRMWARE;
8989
assetsV3->external = assetsV2->external;
9090

9191
g_assetsV2 = (AssetsV2 *)&assetsV2->settings;

src/bb3/conf/eez/conf.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,3 +129,6 @@ static const uint32_t GUI_STATE_BUFFER_SIZE = 64 * 1024;
129129
#if defined(EEZ_PLATFORM_SIMULATOR)
130130
static const uint32_t GUI_STATE_BUFFER_SIZE = 128 * 1024;
131131
#endif
132+
133+
#define OPTION_TOUCH_CALIBRATION 1
134+
#define OPTION_KEYPAD 1

src/bb3/conf/eez/gui_conf.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,4 @@
2020

2121
#include <bb3/gui/document.h>
2222

23-
/// Maximum allowed length (including label) of the keypad text.
24-
#define MAX_KEYPAD_TEXT_LENGTH 128
25-
#define MAX_KEYPAD_LABEL_LENGTH 64
26-
27-
#define THEME_ID_DEFAULT THEME_ID_LEGACY
23+
#define THEME_ID_DEFAULT THEME_ID_LEGACY

src/bb3/gui/document.cpp

Lines changed: 39761 additions & 39775 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)