mirror of
https://github.com/eez-open/eez-flow-template-stm32f469i-disco.git
synced 2025-01-06 03:40:07 +01:00
update eez-framework
This commit is contained in:
parent
bec4330d62
commit
4d4faf0ef6
.settings
Middlewares
Src
@ -5,7 +5,7 @@
|
||||
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
|
||||
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
|
||||
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
|
||||
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-1859414262172794157" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD "${INPUTS}"" prefer-non-shared="true">
|
||||
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1439177708679103535" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD "${INPUTS}"" prefer-non-shared="true">
|
||||
<language-scope id="org.eclipse.cdt.core.gcc"/>
|
||||
<language-scope id="org.eclipse.cdt.core.g++"/>
|
||||
</provider>
|
||||
@ -16,7 +16,7 @@
|
||||
<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
|
||||
<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
|
||||
<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
|
||||
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-1859414262172794157" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD "${INPUTS}"" prefer-non-shared="true">
|
||||
<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="1439177708679103535" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD "${INPUTS}"" prefer-non-shared="true">
|
||||
<language-scope id="org.eclipse.cdt.core.gcc"/>
|
||||
<language-scope id="org.eclipse.cdt.core.g++"/>
|
||||
</provider>
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit 2edb39ab875d205586be6634dd64d4d0457c3344
|
||||
Subproject commit 685d30a732b31582cfb9db5841589600eee210f0
|
File diff suppressed because it is too large
Load Diff
16537
Src/gui/document.cpp
16537
Src/gui/document.cpp
File diff suppressed because it is too large
Load Diff
@ -93,8 +93,8 @@ enum FontsEnum {
|
||||
FONT_ID_SHADOW = 2,
|
||||
FONT_ID_TEXT_M = 3,
|
||||
FONT_ID_TEXT_L = 4,
|
||||
FONT_ID_TEXT_XXL = 5,
|
||||
FONT_ID_TEXT_XL = 6
|
||||
FONT_ID_TEXT_XL = 5,
|
||||
FONT_ID_TEXT_XXL = 6
|
||||
};
|
||||
|
||||
enum BitmapsEnum {
|
||||
@ -117,16 +117,16 @@ enum StylesEnum {
|
||||
STYLE_ID_MENU_WITH_BUTTONS_CONTAINER = 12,
|
||||
STYLE_ID_MENU_WITH_BUTTONS_BUTTON = 13,
|
||||
STYLE_ID_FPS_GRAPH = 14,
|
||||
STYLE_ID_SLIDER_WIDGET = 15,
|
||||
STYLE_ID_SWITCH_WIDGET = 16,
|
||||
STYLE_ID_SLIDER = 15,
|
||||
STYLE_ID_SWITCH = 16,
|
||||
STYLE_ID_BACKGROUND = 17,
|
||||
STYLE_ID_BUTTON = 18,
|
||||
STYLE_ID_BUTTON_DISABLED = 19,
|
||||
STYLE_ID_NOTE_M = 20,
|
||||
STYLE_ID_DROP_DOWN_LIST = 21,
|
||||
STYLE_ID_ROLLER_WIDGET = 22,
|
||||
STYLE_ID_ROLLER_WIDGET_SELECTED_VALUE = 23,
|
||||
STYLE_ID_ROLLER_WIDGET_UNSELECTED_VALUE = 24
|
||||
STYLE_ID_ROLLER = 22,
|
||||
STYLE_ID_ROLLER_SELECTED_VALUE = 23,
|
||||
STYLE_ID_ROLLER_UNSELECTED_VALUE = 24
|
||||
};
|
||||
|
||||
enum ThemesEnum {
|
||||
@ -167,8 +167,8 @@ enum ColorsEnum {
|
||||
COLOR_ID_TEXT_INPUT_BACKGROUND = 29,
|
||||
COLOR_ID_TEXT_INPUT_ACTIVE_BACKGROUND = 30,
|
||||
COLOR_ID_TEXT_INPUT_BORDER = 31,
|
||||
COLOR_ID_CUSTOM_UNDEFINED = 32,
|
||||
COLOR_ID_CUSTOM_000000 = 33,
|
||||
COLOR_ID_CUSTOM_000000 = 32,
|
||||
COLOR_ID_CUSTOM_FFFFFF = 33,
|
||||
COLOR_ID_CUSTOM_00FF1E = 34,
|
||||
COLOR_ID_CUSTOM_C0C0C0 = 35,
|
||||
COLOR_ID_CUSTOM_808080 = 36
|
||||
@ -181,7 +181,7 @@ enum PagesEnum {
|
||||
PAGE_ID_KEYBOARD = 3
|
||||
};
|
||||
|
||||
extern const uint8_t assets[59082];
|
||||
extern const uint8_t assets[59128];
|
||||
|
||||
#elif defined(EEZ_PLATFORM_SIMULATOR)
|
||||
|
||||
@ -272,8 +272,8 @@ enum FontsEnum {
|
||||
FONT_ID_SHADOW = 2,
|
||||
FONT_ID_TEXT_M = 3,
|
||||
FONT_ID_TEXT_L = 4,
|
||||
FONT_ID_TEXT_XXL = 5,
|
||||
FONT_ID_TEXT_XL = 6
|
||||
FONT_ID_TEXT_XL = 5,
|
||||
FONT_ID_TEXT_XXL = 6
|
||||
};
|
||||
|
||||
enum BitmapsEnum {
|
||||
@ -297,16 +297,16 @@ enum StylesEnum {
|
||||
STYLE_ID_MENU_WITH_BUTTONS_CONTAINER = 12,
|
||||
STYLE_ID_MENU_WITH_BUTTONS_BUTTON = 13,
|
||||
STYLE_ID_FPS_GRAPH = 14,
|
||||
STYLE_ID_SLIDER_WIDGET = 15,
|
||||
STYLE_ID_SWITCH_WIDGET = 16,
|
||||
STYLE_ID_SLIDER = 15,
|
||||
STYLE_ID_SWITCH = 16,
|
||||
STYLE_ID_BACKGROUND = 17,
|
||||
STYLE_ID_BUTTON = 18,
|
||||
STYLE_ID_BUTTON_DISABLED = 19,
|
||||
STYLE_ID_NOTE_M = 20,
|
||||
STYLE_ID_DROP_DOWN_LIST = 21,
|
||||
STYLE_ID_ROLLER_WIDGET = 22,
|
||||
STYLE_ID_ROLLER_WIDGET_SELECTED_VALUE = 23,
|
||||
STYLE_ID_ROLLER_WIDGET_UNSELECTED_VALUE = 24
|
||||
STYLE_ID_ROLLER = 22,
|
||||
STYLE_ID_ROLLER_SELECTED_VALUE = 23,
|
||||
STYLE_ID_ROLLER_UNSELECTED_VALUE = 24
|
||||
};
|
||||
|
||||
enum ThemesEnum {
|
||||
@ -347,12 +347,11 @@ enum ColorsEnum {
|
||||
COLOR_ID_TEXT_INPUT_BACKGROUND = 29,
|
||||
COLOR_ID_TEXT_INPUT_ACTIVE_BACKGROUND = 30,
|
||||
COLOR_ID_TEXT_INPUT_BORDER = 31,
|
||||
COLOR_ID_CUSTOM_UNDEFINED = 32,
|
||||
COLOR_ID_CUSTOM_000000 = 33,
|
||||
COLOR_ID_CUSTOM_000000 = 32,
|
||||
COLOR_ID_CUSTOM_FFFFFF = 33,
|
||||
COLOR_ID_CUSTOM_00FF1E = 34,
|
||||
COLOR_ID_CUSTOM_C0C0C0 = 35,
|
||||
COLOR_ID_CUSTOM_808080 = 36,
|
||||
COLOR_ID_CUSTOM_FFFFFF = 37
|
||||
COLOR_ID_CUSTOM_808080 = 36
|
||||
};
|
||||
|
||||
enum PagesEnum {
|
||||
@ -363,7 +362,7 @@ enum PagesEnum {
|
||||
PAGE_ID_FRONT_PANEL = 4
|
||||
};
|
||||
|
||||
extern const uint8_t assets[75482];
|
||||
extern const uint8_t assets[75517];
|
||||
|
||||
#endif
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user