From 985034588a8825837d2d4e9534e62059a5f07184 Mon Sep 17 00:00:00 2001
From: Martin Vladic <martin.vladic@gmail.com>
Date: Fri, 25 Nov 2022 11:31:41 +0100
Subject: [PATCH] update eez-framework

---
 .cproject                                     | 58 +++++++++------------------
 .gitmodules                                   |  2 +-
 Middlewares/eez                               |  1 -
 Middlewares/eez-framework                     |  1 +
 Src/CMakeLists.txt                            | 23 +++++------
 Src/conf/eez/gui_conf.h                       |  3 --
 Src/{conf/eez/conf.h => eez-framework-conf.h} |  0
 Src/eez-framework-gui-conf.h                  |  3 ++
 Src/flow/hooks.cpp                            |  2 +
 Src/lcd.cpp                                   |  2 +-
 Src/platform/simulator/front_panel.cpp        |  4 +-
 11 files changed, 40 insertions(+), 59 deletions(-)
 delete mode 160000 Middlewares/eez
 create mode 160000 Middlewares/eez-framework
 delete mode 100644 Src/conf/eez/gui_conf.h
 rename Src/{conf/eez/conf.h => eez-framework-conf.h} (100%)
 create mode 100644 Src/eez-framework-gui-conf.h

diff --git a/.cproject b/.cproject
index 647007d..6edac77 100644
--- a/.cproject
+++ b/.cproject
@@ -60,9 +60,11 @@
 									<listOptionValue builtIn="false" value="../Drivers/BSP/Components/Common"/>
 									<listOptionValue builtIn="false" value="../Utilities/CPU"/>
 									<listOptionValue builtIn="false" value="../Utilities/Log"/>
-									<listOptionValue builtIn="false" value="../Src/conf"/>
+									<listOptionValue builtIn="false" value="../Src"/>
 									<listOptionValue builtIn="false" value="../Middlewares"/>
-									<listOptionValue builtIn="false" value="../Middlewares/eez/libs/agg"/>
+									<listOptionValue builtIn="false" value="../Middlewares/eez-framework/src"/>
+									<listOptionValue builtIn="false" value="../Middlewares/eez-framework/src/eez/libs/agg"/>
+									<listOptionValue builtIn="false" value="../Middlewares/eez-framework/src/eez/libs/libscpi/inc"/>
 									<listOptionValue builtIn="false" value="../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2"/>
 									<listOptionValue builtIn="false" value="../USB_DEVICE/App"/>
 									<listOptionValue builtIn="false" value="../USB_DEVICE/Target"/>
@@ -98,9 +100,11 @@
 									<listOptionValue builtIn="false" value="../Drivers/BSP/Components/Common"/>
 									<listOptionValue builtIn="false" value="../Utilities/CPU"/>
 									<listOptionValue builtIn="false" value="../Utilities/Log"/>
-									<listOptionValue builtIn="false" value="../Src/conf"/>
+									<listOptionValue builtIn="false" value="../Src"/>
 									<listOptionValue builtIn="false" value="../Middlewares"/>
-									<listOptionValue builtIn="false" value="../Middlewares/eez/libs/agg"/>
+									<listOptionValue builtIn="false" value="../Middlewares/eez-framework/src"/>
+									<listOptionValue builtIn="false" value="../Middlewares/eez-framework/src/eez/libs/agg"/>
+									<listOptionValue builtIn="false" value="../Middlewares/eez-framework/src/eez/libs/libscpi/inc"/>
 									<listOptionValue builtIn="false" value="../Middlewares/Third_Party/FreeRTOS/Source/CMSIS_RTOS_V2"/>
 									<listOptionValue builtIn="false" value="../USB_DEVICE/App"/>
 									<listOptionValue builtIn="false" value="../USB_DEVICE/Target"/>
@@ -136,9 +140,16 @@
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.floatabi.1004578780.1556204538" name="Floating-point ABI" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.floatabi.1004578780"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1428482885.595498848" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1428482885"/>
 							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.992922296.671979845" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.992922296"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.352456733" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1508774904"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1570245880" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.312266454"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1888279734" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1825023861"/>
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.352456733" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1508774904">
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.627794025" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1570245880" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.312266454">
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.1852896881" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
+							</tool>
+							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1888279734" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1825023861">
+								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp.1286104695" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp"/>
+							</tool>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1252215012" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1885412948"/>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1239770589" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1261659320"/>
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.343596301" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.435637738"/>
@@ -151,38 +162,6 @@
 							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.1288897884" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.913675658"/>
 						</toolChain>
 					</folderInfo>
-					<folderInfo id="com.st.stm32cube.ide.mcu.gnu.managedbuild.config.exe.debug.460065682.1605015768" name="/" resourcePath="Middlewares/eez/libs/agg">
-						<toolChain id="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug.1938270655" name="MCU ARM GCC" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.toolchain.exe.debug" unusedChildren="">
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1527339935.3852656" name="MCU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_mcu.1527339935"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.48540806.276722155" name="CPU" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_cpuid.48540806"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.25256515.1871238358" name="Core" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_coreid.25256515"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.fpu.540523005.696221060" name="Floating-point unit" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.fpu.540523005"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.floatabi.1004578780.1034234472" name="Floating-point ABI" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.floatabi.1004578780"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1428482885.1425183738" name="Board" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.target_board.1428482885"/>
-							<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.992922296.1233052445" name="Defaults" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.option.defaults.992922296"/>
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform" isAbstract="false" osList="all" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.targetplatform"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1906654642" name="MCU GCC Assembler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.1508774904">
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input.1332447329" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.assembler.input"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.1308403793" name="MCU GCC Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.312266454">
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c.2118535928" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.input.c"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.2142608260" name="MCU G++ Compiler" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.1825023861">
-								<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.all.2092689430" name="Enable all warnings about questionable constructions (-Wall)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.option.warnings.all" useByScannerDiscovery="false" value="false" valueType="boolean"/>
-								<inputType id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp.1392287484" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.compiler.input.cpp"/>
-							</tool>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1714227588" name="MCU GCC Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.linker.1885412948"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1737936247" name="MCU G++ Linker" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.cpp.linker.1261659320"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.73818771" name="MCU GCC Archiver" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.archiver.435637738"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.884028697" name="MCU Size" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.size.307560726"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.2095549512" name="MCU Output Converter list file" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objdump.listfile.552578781"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.76034628" name="MCU Output Converter Hex" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.hex.723982269"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.99635632" name="MCU Output Converter Binary" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.binary.1744086731"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.1558992878" name="MCU Output Converter Verilog" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.verilog.199907884"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1749303441" name="MCU Output Converter Motorola S-rec" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.srec.1615684565"/>
-							<tool id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.80293135" name="MCU Output Converter Motorola S-rec with symbols" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.objcopy.symbolsrec.913675658"/>
-						</toolChain>
-					</folderInfo>
 					<sourceEntries>
 						<entry excluding="Src/my_system_stm32f4xx.c|Src/my_stm32f4xx_it.c|Src/my_stm32f4xx_hal_msp.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Core"/>
 						<entry excluding="BSP/STM32469I-Discovery/stm32469i_discovery_sd.c|BSP/STM32469I-Discovery/stm32469i_discovery_audio.c" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Drivers"/>
@@ -328,4 +307,5 @@
 			<autodiscovery enabled="false" problemReportingEnabled="true" selectedProfileId=""/>
 		</scannerConfigBuildInfo>
 	</storageModule>
+	<storageModule moduleId="refreshScope"/>
 </cproject>
\ 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 <assert.h>
 
+#include <eez/conf-internal.h>
+
 #include <eez/flow/flow.h>
 #include <eez/flow/hooks.h>
 
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 <eez/gui/gui.h>
 
-#include "../gui/app_context.h"
-#include "../gui/document.h"
+#include "../../gui/app_context.h"
+#include "../../gui/document.h"
 
 #include "front_panel.h"