diff --git a/.cproject b/.cproject
index 647007d..6edac77 100644
--- a/.cproject
+++ b/.cproject
@@ -60,9 +60,11 @@
-
+
-
+
+
+
@@ -98,9 +100,11 @@
-
+
-
+
+
+
@@ -136,9 +140,16 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -151,38 +162,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -328,4 +307,5 @@
+
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index bf91785..d034169 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "Middlewares/eez"]
- path = Middlewares/eez
+ path = Middlewares/eez-framework
url = https://github.com/eez-open/eez-framework
diff --git a/Middlewares/eez b/Middlewares/eez
deleted file mode 160000
index 3051f99..0000000
--- a/Middlewares/eez
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 3051f99c87634240d3e7af3c58d9f7594b267519
diff --git a/Middlewares/eez-framework b/Middlewares/eez-framework
new file mode 160000
index 0000000..e67a5a5
--- /dev/null
+++ b/Middlewares/eez-framework
@@ -0,0 +1 @@
+Subproject commit e67a5a5008f34d6d19b08131e0807438998dfdc5
diff --git a/Src/CMakeLists.txt b/Src/CMakeLists.txt
index ce38d4d..342c73e 100644
--- a/Src/CMakeLists.txt
+++ b/Src/CMakeLists.txt
@@ -56,12 +56,11 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Emscripten")
endif()
include_directories(
- ../Middlewares
- ../Middlewares/eez/libs/agg
- ../Middlewares/eez/libs/libscpi/inc
- ../Middlewares/eez/platform/simulator
- ../Src/scpi
- ../Src/conf
+ ../Middlewares/eez-framework/src
+ ../Middlewares/eez-framework/src/eez/libs/agg
+ ../Middlewares/eez-framework/src/eez/libs/libscpi/inc
+ ../Middlewares/eez-framework/src/eez/platform/simulator
+ ../Src
)
set(src_files)
@@ -71,15 +70,15 @@ set(header_files)
################################################################################
# EEZ Framework files
file(GLOB_RECURSE src_eez
- ../Middlewares/eez/*.cpp
- ../Middlewares/eez/*.c
+ ../Middlewares/eez-framework/src/eez/*.cpp
+ ../Middlewares/eez-framework/src/eez/*.c
)
file(GLOB_RECURSE header_eez
- ../Middlewares/eez/*.h
+ ../Middlewares/eez-framework/src/eez/*.h
)
# exclude STM32 platform specific files
-set (EXCLUDE_DIR "../Middlewares/eez/platform/stm32")
+set (EXCLUDE_DIR "../Middlewares/eez-framework/src/eez/platform/stm32")
foreach (TMP_PATH ${src_eez})
string (FIND ${TMP_PATH} ${EXCLUDE_DIR} EXCLUDE_DIR_FOUND)
if (NOT ${EXCLUDE_DIR_FOUND} EQUAL -1)
@@ -96,11 +95,11 @@ endforeach(TMP_PATH)
list (APPEND src_files ${src_eez})
list (APPEND header_files ${header_eez})
-source_group(TREE "../../../Middlewares/eez" PREFIX "eez" FILES ${src_eez} ${header_eez})
+source_group(TREE "../../../Middlewares/eez-framework/src/eez" PREFIX "eez" FILES ${src_eez} ${header_eez})
if(MSVC)
set(libscpi_src_files ${src_files})
- list(FILTER libscpi_src_files INCLUDE REGEX "${CMAKE_CURRENT_SOURCE_DIR}/../Middlewares/eez/libs/libscpi")
+ list(FILTER libscpi_src_files INCLUDE REGEX "${CMAKE_CURRENT_SOURCE_DIR}/../Middlewares/eez-framework/src/eez/libs/libscpi")
set_source_files_properties(${libscpi_src_files} PROPERTIES COMPILE_FLAGS /W0)
endif()
diff --git a/Src/conf/eez/gui_conf.h b/Src/conf/eez/gui_conf.h
deleted file mode 100644
index 3a191a9..0000000
--- a/Src/conf/eez/gui_conf.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#pragma once
-
-#include "../../gui/document.h"
diff --git a/Src/conf/eez/conf.h b/Src/eez-framework-conf.h
similarity index 100%
rename from Src/conf/eez/conf.h
rename to Src/eez-framework-conf.h
diff --git a/Src/eez-framework-gui-conf.h b/Src/eez-framework-gui-conf.h
new file mode 100644
index 0000000..0370915
--- /dev/null
+++ b/Src/eez-framework-gui-conf.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#include "gui/document.h"
diff --git a/Src/flow/hooks.cpp b/Src/flow/hooks.cpp
index 0b2c275..e9dec05 100644
--- a/Src/flow/hooks.cpp
+++ b/Src/flow/hooks.cpp
@@ -1,5 +1,7 @@
#include
+#include
+
#include
#include
diff --git a/Src/lcd.cpp b/Src/lcd.cpp
index d5a7308..390bd52 100644
--- a/Src/lcd.cpp
+++ b/Src/lcd.cpp
@@ -7,7 +7,7 @@
#endif
#include "firmware.h"
-#include "eez/conf.h"
+#include "eez/conf-internal.h"
#include "eez/core/memory.h"
#define MAX_BRIGHTNESS 20
diff --git a/Src/platform/simulator/front_panel.cpp b/Src/platform/simulator/front_panel.cpp
index c558c94..da8489a 100644
--- a/Src/platform/simulator/front_panel.cpp
+++ b/Src/platform/simulator/front_panel.cpp
@@ -1,7 +1,7 @@
#include
-#include "../gui/app_context.h"
-#include "../gui/document.h"
+#include "../../gui/app_context.h"
+#include "../../gui/document.h"
#include "front_panel.h"