Browse Source

update eez-framework

master
Martin Vladic 2 years ago
parent
commit
7bb14a7d4f
  1. 2
      eez
  2. 6
      src/conf/eez/conf.h
  3. 1121
      src/gui/document.cpp
  4. 2
      src/gui/document.h
  5. 8
      src/main.cpp

2
eez

@ -1 +1 @@
Subproject commit 81bd86448f8bdb9ad13a6a3674de9efc203e4099
Subproject commit 5d390f64a2ec2b6e60cc1aa45f08137e58e4a638

6
src/conf/eez/conf.h

@ -2,8 +2,8 @@
#include <stdint.h>
static const uint32_t DISPLAY_WIDTH = 480;
static const uint32_t DISPLAY_HEIGHT = 272;
extern uint32_t DISPLAY_WIDTH;
extern uint32_t DISPLAY_HEIGHT;
static const uint32_t DISPLAY_BPP = 32; // RGBA8888
static const char *TITLE = "EEZ Flow App";
@ -20,3 +20,5 @@ static const char *ICON = "eez-flow-template-sdl.png";
#define DISPLAY_BACKGROUND_LUMINOSITY_STEP_MIN 0
#define DISPLAY_BACKGROUND_LUMINOSITY_STEP_MAX 20
#define DISPLAY_BACKGROUND_LUMINOSITY_STEP_DEFAULT 10
static const uint32_t GUI_STATE_BUFFER_SIZE = 128 * 1024;

1121
src/gui/document.cpp

File diff suppressed because it is too large Load Diff

2
src/gui/document.h

@ -173,7 +173,7 @@ enum PagesEnum {
PAGE_ID_TOUCH_CALIBRATION_YES_NO = 3
};
extern const uint8_t assets[9722];
extern const uint8_t assets[9773];
} // namespace gui
} // namespace eez

8
src/main.cpp

@ -5,9 +5,15 @@
void startEmscripten();
#endif
uint32_t DISPLAY_WIDTH = 480;
uint32_t DISPLAY_HEIGHT = 272;
void init() {
eez::initMemory();
eez::initAssetsMemory();
eez::gui::loadMainAssets(eez::gui::assets, sizeof(eez::gui::assets));
eez::initOtherMemory();
eez::initAllocHeap(eez::ALLOC_BUFFER, eez::ALLOC_BUFFER_SIZE);
eez::gui::display::turnOn();
eez::gui::startThread();
}

Loading…
Cancel
Save