diff --git a/.cproject b/.cproject index e54f5ab..668e04a 100644 --- a/.cproject +++ b/.cproject @@ -1,476 +1,285 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.settings/language.settings.xml b/.settings/language.settings.xml index 5ed5d92..29b9bf6 100644 --- a/.settings/language.settings.xml +++ b/.settings/language.settings.xml @@ -1,22 +1,22 @@ - + - + - + - + diff --git a/.settings/org.eclipse.cdt.codan.core.prefs b/.settings/org.eclipse.cdt.codan.core.prefs index 2e279ce..3e86936 100644 --- a/.settings/org.eclipse.cdt.codan.core.prefs +++ b/.settings/org.eclipse.cdt.codan.core.prefs @@ -59,6 +59,8 @@ org.eclipse.cdt.codan.internal.checkers.ShallowCopyProblem.params={launchModes\= org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Statement has no effect\\")",macro\=>true,exceptions\=>()} org.eclipse.cdt.codan.internal.checkers.StaticVariableInHeaderProblem=-Warning org.eclipse.cdt.codan.internal.checkers.StaticVariableInHeaderProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Static variable in header file\\")"} +org.eclipse.cdt.codan.internal.checkers.StructuredBindingDeclarationProblem=Error +org.eclipse.cdt.codan.internal.checkers.StructuredBindingDeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Invalid structured binding declaration\\")"} org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Suggested parenthesis around expression\\")",paramNot\=>false} org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>true,RUN_ON_INC_BUILD\=>true,RUN_ON_FILE_OPEN\=>false,RUN_ON_FILE_SAVE\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true},suppression_comment\=>"@suppress(\\"Suspicious semicolon\\")",else\=>false,afterelse\=>false} org.eclipse.cdt.codan.internal.checkers.SymbolShadowingProblem=-Warning diff --git a/Src/eez-flow-template-stm32f746g-disco.eez-project b/Src/eez-flow-template-stm32f746g-disco.eez-project index 2dba544..19f4bf6 100644 --- a/Src/eez-flow-template-stm32f746g-disco.eez-project +++ b/Src/eez-flow-template-stm32f746g-disco.eez-project @@ -6,10 +6,12 @@ "objID": "fd434352-2277-c4a8-e87e-e96cfcbf2305", "projectVersion": "v3", "projectType": "firmware", + "extensions": [], "imports": [], "flowSupport": true, "displayWidth": 480, - "displayHeight": 272 + "displayHeight": 272, + "resourceFiles": [] }, "build": { "objID": "72794a43-a0fc-13c2-7eb5-67dd952141a4", @@ -35,7 +37,8 @@ "template": "#include \"document.h\"\n\nnamespace eez {\nnamespace gui {\n\n#if defined(EEZ_PLATFORM_STM32)\n\n//${eez-studio DATA_ARRAY_DEF stm32}\n\n//${eez-studio ACTIONS_ARRAY_DEF stm32}\n\n//${eez-studio GUI_ASSETS_DEF_COMPRESSED stm32}\n\n#elif defined(EEZ_PLATFORM_SIMULATOR)\n\n//${eez-studio DATA_ARRAY_DEF simulator}\n\n//${eez-studio ACTIONS_ARRAY_DEF simulator}\n\n//${eez-studio GUI_ASSETS_DEF_COMPRESSED simulator}\n\n#endif\n\n} // namespace gui\n} // namespace eez\n" } ], - "destinationFolder": "." + "destinationFolder": ".", + "lvglInclude": "lvgl/lvgl.h" } }, "variables": { @@ -177,8 +180,6 @@ "name": "btn_color", "type": "integer", "defaultValue": "0", - "defaultMinValue": 0, - "defaultMaxValue": 1, "persistent": false, "native": true } @@ -333,7 +334,7 @@ "implementationType": "native" } ], - "pages": [ + "userPages": [ { "objID": "dc8c5e32-a2aa-9d2d-a70b-4d971f3c2b8d", "components": [ @@ -349,9 +350,16 @@ "data": "\"Hello, world!\"", "style": { "objID": "759e70f7-0da0-ee89-4fb3-c9fe64b200c5", - "inheritFrom": "default_XL" + "useStyle": "default_XL", + "childStyles": [] }, - "timeline": [] + "timeline": [], + "eventHandlers": [], + "focusStyle": { + "objID": "1809b9e5-7d40-01d5-cfaa-3a6763f22a1b", + "useStyle": "default", + "childStyles": [] + } }, { "objID": "70d0c5d1-81cf-4013-ef6d-841ed1a83748", @@ -365,9 +373,16 @@ "data": "\"STM32F746G-DISCO\"", "style": { "objID": "385c5427-0e29-4d48-b266-3b6afa8a50f8", - "inheritFrom": "default_XL" + "useStyle": "default_XL", + "childStyles": [] }, - "timeline": [] + "timeline": [], + "eventHandlers": [], + "focusStyle": { + "objID": "0a599c6e-40dc-a537-729d-76d72cb4e404", + "useStyle": "default", + "childStyles": [] + } }, { "objID": "b8a2f421-4b76-4295-f350-3ef14f86714d", @@ -378,9 +393,6 @@ "height": 40, "customInputs": [], "customOutputs": [], - "asOutputProperties": [ - "action" - ], "data": "\"Next\"", "resizing": { "pinToEdge": 0, @@ -388,13 +400,22 @@ }, "style": { "objID": "88090903-67a2-42ba-f82e-dcbec9eaf05c", - "inheritFrom": "button" + "useStyle": "button", + "childStyles": [] }, "timeline": [], + "eventHandlers": [ + { + "objID": "67221ed0-75d0-a8e5-1c2b-39a2479158f0", + "eventName": "CLICKED", + "handlerType": "flow" + } + ], "text": "", "disabledStyle": { "objID": "bb0ffd13-534b-4610-f2a0-916a32fc98b1", - "inheritFrom": "button_disabled" + "useStyle": "button_disabled", + "childStyles": [] } }, { @@ -402,8 +423,8 @@ "type": "ShowPageActionComponent", "left": 562, "top": 308, - "width": 105, - "height": 53, + "width": 94, + "height": 54, "customInputs": [], "customOutputs": [], "page": "page1" @@ -413,7 +434,7 @@ { "objID": "c547d4b4-2c35-4ba3-8112-00ed48923ecc", "source": "b8a2f421-4b76-4295-f350-3ef14f86714d", - "output": "action", + "output": "CLICKED", "target": "d76c7722-9cf1-4b8e-a569-6474302f6798", "input": "@seqin" } @@ -425,7 +446,10 @@ "top": 0, "width": 480, "height": 272, - "scaleToFit": true + "scaleToFit": true, + "lvglLocalStyles": { + "objID": "f0cb1a7c-b303-7aea-67cd-4de551a9530d" + } }, { "objID": "95226fb4-690b-140a-f393-7e5d01950ad7", @@ -442,9 +466,16 @@ "data": "keypad_text", "style": { "objID": "9a7eeabb-69a9-c5cf-20cd-9b9d8792a155", - "inheritFrom": "default_XXL" + "useStyle": "default_XXL", + "childStyles": [] }, "timeline": [], + "eventHandlers": [], + "focusStyle": { + "objID": "ea3ffa4d-aa7d-4c3f-1544-759b76864476", + "useStyle": "default", + "childStyles": [] + }, "displayOption": 0 }, { @@ -457,12 +488,25 @@ "customInputs": [], "customOutputs": [], "data": "\"1\"", - "action": "keypad_key", "style": { "objID": "a7d5472f-6dc7-f53e-f1a2-5a4a008bb2de", - "inheritFrom": "text_button" + "useStyle": "text_button", + "childStyles": [] }, - "timeline": [] + "timeline": [], + "eventHandlers": [ + { + "objID": "fc189ecd-1c69-6d20-5623-e6a5deaed8ad", + "eventName": "CLICKED", + "handlerType": "action", + "action": "keypad_key" + } + ], + "focusStyle": { + "objID": "e6a8bd2a-dcb3-396a-e28b-6e5c339d6a33", + "useStyle": "default", + "childStyles": [] + } }, { "objID": "e4b91b93-db34-4f2f-dfea-ea9d98ef1dd4", @@ -474,12 +518,25 @@ "customInputs": [], "customOutputs": [], "data": "\"2\"", - "action": "keypad_key", "style": { "objID": "4c5c9d40-f79b-c5e1-c9f5-008f146cfb6f", - "inheritFrom": "text_button" + "useStyle": "text_button", + "childStyles": [] }, - "timeline": [] + "timeline": [], + "eventHandlers": [ + { + "objID": "01997e4e-291c-6820-f607-61cd406538a5", + "eventName": "CLICKED", + "handlerType": "action", + "action": "keypad_key" + } + ], + "focusStyle": { + "objID": "9e1b8b79-7acd-b4e9-1f2d-038725dbbc06", + "useStyle": "default", + "childStyles": [] + } }, { "objID": "2d460edd-f4d1-4960-fbff-6fdae001c110", @@ -491,12 +548,25 @@ "customInputs": [], "customOutputs": [], "data": "\"3\"", - "action": "keypad_key", "style": { "objID": "bd257e64-3739-9b0d-d69f-d83d328b0638", - "inheritFrom": "text_button" + "useStyle": "text_button", + "childStyles": [] }, - "timeline": [] + "timeline": [], + "eventHandlers": [ + { + "objID": "df19cd55-7c7c-96f3-4970-973b6f7858f1", + "eventName": "CLICKED", + "handlerType": "action", + "action": "keypad_key" + } + ], + "focusStyle": { + "objID": "f2e55f0d-e020-b56b-db13-2d57ab988714", + "useStyle": "default", + "childStyles": [] + } }, { "objID": "b436b6d8-01ba-476a-9cec-731b15fec5a5", @@ -508,12 +578,25 @@ "customInputs": [], "customOutputs": [], "data": "\"4\"", - "action": "keypad_key", "style": { "objID": "0e7aa274-b474-9c2a-b16a-e4c3fb97ff39", - "inheritFrom": "text_button" + "useStyle": "text_button", + "childStyles": [] }, - "timeline": [] + "timeline": [], + "eventHandlers": [ + { + "objID": "85f0bce4-d91a-fecc-f617-f7c3a3303c53", + "eventName": "CLICKED", + "handlerType": "action", + "action": "keypad_key" + } + ], + "focusStyle": { + "objID": "04842378-520e-0219-8d0e-e7ffb1bc7cf3", + "useStyle": "default", + "childStyles": [] + } }, { "objID": "dd0e99f9-a269-4abc-b727-a685d4801c49", @@ -525,12 +608,25 @@ "customInputs": [], "customOutputs": [], "data": "\"5\"", - "action": "keypad_key", "style": { "objID": "4545afb7-aba1-4479-32b5-f386d4f2f9b1", - "inheritFrom": "text_button" + "useStyle": "text_button", + "childStyles": [] }, - "timeline": [] + "timeline": [], + "eventHandlers": [ + { + "objID": "7170891c-4ba4-c021-b306-768c7b8bafb4", + "eventName": "CLICKED", + "handlerType": "action", + "action": "keypad_key" + } + ], + "focusStyle": { + "objID": "8901bd1d-57d1-ff0c-73a4-0676a71f6b4d", + "useStyle": "default", + "childStyles": [] + } }, { "objID": "0631f0ec-5112-4166-e00f-74533d31ab49", @@ -542,12 +638,25 @@ "customInputs": [], "customOutputs": [], "data": "\"6\"", - "action": "keypad_key", "style": { "objID": "71cdabc7-e915-cc98-03c4-77814b0deada", - "inheritFrom": "text_button" + "useStyle": "text_button", + "childStyles": [] }, - "timeline": [] + "timeline": [], + "eventHandlers": [ + { + "objID": "193590c1-c894-1f18-f8bc-65c80e8e5cad", + "eventName": "CLICKED", + "handlerType": "action", + "action": "keypad_key" + } + ], + "focusStyle": { + "objID": "9f8cbb98-0841-faf2-a3fd-b647437b50cf", + "useStyle": "default", + "childStyles": [] + } }, { "objID": "ac774321-cb76-4660-989c-e13806374f6e", @@ -559,12 +668,25 @@ "customInputs": [], "customOutputs": [], "data": "\"7\"", - "action": "keypad_key", "style": { "objID": "2b5aa24f-9ecc-b32b-a912-5709d9668cb5", - "inheritFrom": "text_button" + "useStyle": "text_button", + "childStyles": [] }, - "timeline": [] + "timeline": [], + "eventHandlers": [ + { + "objID": "b9b6cdec-0cd2-7a8a-fb3b-bf84f21020e0", + "eventName": "CLICKED", + "handlerType": "action", + "action": "keypad_key" + } + ], + "focusStyle": { + "objID": "c33b55c8-76ef-c616-312d-c476b609a470", + "useStyle": "default", + "childStyles": [] + } }, { "objID": "5a5086da-50d0-4794-e03e-d1476892fc5a", @@ -576,12 +698,25 @@ "customInputs": [], "customOutputs": [], "data": "\"8\"", - "action": "keypad_key", "style": { "objID": "5b5a0ebb-2f16-4f8a-74a6-c3303b948a15", - "inheritFrom": "text_button" + "useStyle": "text_button", + "childStyles": [] }, - "timeline": [] + "timeline": [], + "eventHandlers": [ + { + "objID": "b66785a0-cc39-b2ae-6b04-5a0b4b5062a6", + "eventName": "CLICKED", + "handlerType": "action", + "action": "keypad_key" + } + ], + "focusStyle": { + "objID": "fd6c42ba-c10a-3002-0dff-5ecea9cda02f", + "useStyle": "default", + "childStyles": [] + } }, { "objID": "1ee52ded-910a-4844-f4bd-a4795124bdea", @@ -593,12 +728,25 @@ "customInputs": [], "customOutputs": [], "data": "\"9\"", - "action": "keypad_key", "style": { "objID": "a83842a4-aeeb-dab1-0586-d97d97ebf73d", - "inheritFrom": "text_button" + "useStyle": "text_button", + "childStyles": [] }, - "timeline": [] + "timeline": [], + "eventHandlers": [ + { + "objID": "2c0ab87d-302f-0c21-32f4-83cce26a5e1c", + "eventName": "CLICKED", + "handlerType": "action", + "action": "keypad_key" + } + ], + "focusStyle": { + "objID": "0713aab4-4dc9-820d-ef87-b0498935fe26", + "useStyle": "default", + "childStyles": [] + } }, { "objID": "869a4233-3a77-415c-afd0-e799d95dd70a", @@ -610,12 +758,25 @@ "customInputs": [], "customOutputs": [], "data": "\"0\"", - "action": "keypad_key", "style": { "objID": "76a3044f-be61-7916-3005-d1786ee371d1", - "inheritFrom": "text_button" + "useStyle": "text_button", + "childStyles": [] }, - "timeline": [] + "timeline": [], + "eventHandlers": [ + { + "objID": "f6f8fca9-9014-a704-3fee-7ecf0a53cf15", + "eventName": "CLICKED", + "handlerType": "action", + "action": "keypad_key" + } + ], + "focusStyle": { + "objID": "352bd3be-7a9b-fc0a-e0a4-7121b03e2434", + "useStyle": "default", + "childStyles": [] + } }, { "objID": "abd73c1b-0256-47ad-a13d-954fe9dcb095", @@ -627,16 +788,25 @@ "customInputs": [], "customOutputs": [], "data": "\".\"", - "action": "keypad_key", "style": { "objID": "48cd363b-3ac4-1f48-b0d5-20d8ebcf3f6c", - "inheritFrom": "text_button" + "useStyle": "text_button", + "childStyles": [] }, "timeline": [], + "eventHandlers": [ + { + "objID": "9a27d260-da96-11a5-6ce1-78f47d469f74", + "eventName": "CLICKED", + "handlerType": "action", + "action": "keypad_key" + } + ], "enabled": "keypad_dot_enabled", "disabledStyle": { "objID": "999825db-c222-0005-e090-e51ab4736647", - "inheritFrom": "text_button_disabled" + "useStyle": "text_button_disabled", + "childStyles": [] } }, { @@ -649,12 +819,25 @@ "customInputs": [], "customOutputs": [], "data": "\"\\u0020\"", - "action": "keypad_back", "style": { "objID": "952965f9-3b7c-da6d-78e5-1a5ba18cd8ac", - "inheritFrom": "button_icon" + "useStyle": "button_icon", + "childStyles": [] }, - "timeline": [] + "timeline": [], + "eventHandlers": [ + { + "objID": "b5945e9a-e6c9-ee03-4704-1898390523e2", + "eventName": "CLICKED", + "handlerType": "action", + "action": "keypad_back" + } + ], + "focusStyle": { + "objID": "8cc1aadc-5aa5-6c55-1121-96a59f03c5a6", + "useStyle": "default", + "childStyles": [] + } }, { "objID": "801ca594-78e7-4648-a8d9-ae84c729cdb7", @@ -666,12 +849,25 @@ "customInputs": [], "customOutputs": [], "data": "\"\\u0022\"", - "action": "keypad_cancel", "style": { "objID": "975f706d-3001-62ba-f7d7-20b2463ad9e9", - "inheritFrom": "button_icon" + "useStyle": "button_icon", + "childStyles": [] }, - "timeline": [] + "timeline": [], + "eventHandlers": [ + { + "objID": "62c60a0e-6de9-37d5-5a3b-5d60ea7f6373", + "eventName": "CLICKED", + "handlerType": "action", + "action": "keypad_cancel" + } + ], + "focusStyle": { + "objID": "366351e0-bd02-abee-3d6f-010d721d1416", + "useStyle": "default", + "childStyles": [] + } }, { "objID": "ade7f838-a0d6-41a1-fa8c-3099e9cdfa37", @@ -683,12 +879,25 @@ "customInputs": [], "customOutputs": [], "data": "\"\\u0021\"", - "action": "keypad_ok", "style": { "objID": "311a99ae-6136-548d-a563-06763e7f216e", - "inheritFrom": "button_icon" + "useStyle": "button_icon", + "childStyles": [] }, - "timeline": [] + "timeline": [], + "eventHandlers": [ + { + "objID": "835f63bb-6ad5-9e60-51f9-65b83aeced7b", + "eventName": "CLICKED", + "handlerType": "action", + "action": "keypad_ok" + } + ], + "focusStyle": { + "objID": "21ca19aa-a5d2-f25f-092d-549e582b7190", + "useStyle": "default", + "childStyles": [] + } } ], "connectionLines": [], @@ -698,7 +907,10 @@ "top": 0, "width": 480, "height": 272, - "scaleToFit": false + "scaleToFit": false, + "lvglLocalStyles": { + "objID": "bfcd5319-71a3-cf03-350c-59bace0a15e7" + } }, { "objID": "6d840b90-20d8-2a4b-d9d2-acb0cc8a40ba", @@ -712,14 +924,15 @@ "height": 680, "customInputs": [], "customOutputs": [], - "action": "", "style": { "objID": "a2b15f79-a3dc-53a1-8f19-0ce6c7876c93", - "inheritFrom": "default", + "useStyle": "default", + "childStyles": [], "backgroundColor": "#ffffff", "activeColor": "#ffffff" }, "timeline": [], + "eventHandlers": [], "bitmap": "front_panel" }, { @@ -734,9 +947,11 @@ "data": "main_app_view", "style": { "objID": "a258e106-99f1-7538-91bc-15e634c23925", - "inheritFrom": "background" + "useStyle": "background", + "childStyles": [] }, - "timeline": [] + "timeline": [], + "eventHandlers": [] } ], "connectionLines": [], @@ -749,7 +964,10 @@ "left": 0, "top": 0, "width": 1000, - "height": 680 + "height": 680, + "lvglLocalStyles": { + "objID": "9c6f87ad-a06e-04be-4089-2ece0bf94e2e" + } }, { "objID": "2a2b4561-23c6-4b99-8ce9-35b54f251dfc", @@ -766,9 +984,16 @@ "data": "\"EEZ flow template\"", "style": { "objID": "759e70f7-0da0-ee89-4fb3-c9fe64b200c5", - "inheritFrom": "default_XL" + "useStyle": "default_XL", + "childStyles": [] }, - "timeline": [] + "timeline": [], + "eventHandlers": [], + "focusStyle": { + "objID": "863ff8af-b8f7-c354-64eb-8a42ff5d1374", + "useStyle": "default", + "childStyles": [] + } }, { "objID": "04666a7a-9454-43a8-8edb-88d987d01e28", @@ -779,9 +1004,6 @@ "height": 40, "customInputs": [], "customOutputs": [], - "asOutputProperties": [ - "action" - ], "data": "\"Back\"", "resizing": { "pinToEdge": 0, @@ -789,13 +1011,22 @@ }, "style": { "objID": "88090903-67a2-42ba-f82e-dcbec9eaf05c", - "inheritFrom": "button" + "useStyle": "button", + "childStyles": [] }, "timeline": [], + "eventHandlers": [ + { + "objID": "416ac7a2-4bad-e11e-3ba1-b1dff202232d", + "eventName": "CLICKED", + "handlerType": "flow" + } + ], "text": "", "disabledStyle": { "objID": "bb0ffd13-534b-4610-f2a0-916a32fc98b1", - "inheritFrom": "button_disabled" + "useStyle": "button_disabled", + "childStyles": [] } }, { @@ -803,8 +1034,8 @@ "type": "ShowPageActionComponent", "left": 205, "top": 322, - "width": 105, - "height": 53, + "width": 94, + "height": 54, "customInputs": [], "customOutputs": [], "page": "main" @@ -821,9 +1052,16 @@ "data": "\"STM32F746G-DISCO\"", "style": { "objID": "385c5427-0e29-4d48-b266-3b6afa8a50f8", - "inheritFrom": "default_XL" + "useStyle": "default_XL", + "childStyles": [] }, - "timeline": [] + "timeline": [], + "eventHandlers": [], + "focusStyle": { + "objID": "c95e683d-62bf-cf27-32ba-0177228e1a49", + "useStyle": "default", + "childStyles": [] + } }, { "objID": "c14b1d9d-6b5d-4455-888b-dba24641c393", @@ -837,9 +1075,16 @@ "data": "\"Envox EEZ Studio\"", "style": { "objID": "385c5427-0e29-4d48-b266-3b6afa8a50f8", - "inheritFrom": "default_XL" + "useStyle": "default_XL", + "childStyles": [] }, - "timeline": [] + "timeline": [], + "eventHandlers": [], + "focusStyle": { + "objID": "1697bd81-b313-c61c-3634-ae649d5c26e4", + "useStyle": "default", + "childStyles": [] + } }, { "objID": "465d0ac2-a3cc-473d-9ded-5a17fd767f73", @@ -850,9 +1095,6 @@ "height": 40, "customInputs": [], "customOutputs": [], - "asOutputProperties": [ - "action" - ], "data": "\"Next\"", "resizing": { "pinToEdge": 0, @@ -860,13 +1102,22 @@ }, "style": { "objID": "88090903-67a2-42ba-f82e-dcbec9eaf05c", - "inheritFrom": "button" + "useStyle": "button", + "childStyles": [] }, "timeline": [], + "eventHandlers": [ + { + "objID": "5c201833-b8f4-22f8-facb-76f1506be235", + "eventName": "CLICKED", + "handlerType": "flow" + } + ], "text": "", "disabledStyle": { "objID": "bb0ffd13-534b-4610-f2a0-916a32fc98b1", - "inheritFrom": "button_disabled" + "useStyle": "button_disabled", + "childStyles": [] } }, { @@ -874,8 +1125,8 @@ "type": "ShowPageActionComponent", "left": 541, "top": 322, - "width": 105, - "height": 53, + "width": 94, + "height": 54, "customInputs": [], "customOutputs": [], "page": "page2" @@ -885,14 +1136,14 @@ { "objID": "c547d4b4-2c35-4ba3-8112-00ed48923ecc", "source": "04666a7a-9454-43a8-8edb-88d987d01e28", - "output": "action", + "output": "CLICKED", "target": "32ae425b-6e97-4746-cadf-54a7166fb17e", "input": "@seqin" }, { "objID": "6abfff83-3d3c-4791-820d-9c0035d6d8d1", "source": "465d0ac2-a3cc-473d-9ded-5a17fd767f73", - "output": "action", + "output": "CLICKED", "target": "9cf5ec28-775c-4f90-b682-deb56aa83540", "input": "@seqin" } @@ -904,7 +1155,10 @@ "top": 0, "width": 480, "height": 272, - "scaleToFit": true + "scaleToFit": true, + "lvglLocalStyles": { + "objID": "3c0f6e19-39c3-0471-3290-916271366f46" + } }, { "objID": "a33e7ca9-b075-429a-a461-4b72758020b8", @@ -918,9 +1172,6 @@ "height": 40, "customInputs": [], "customOutputs": [], - "asOutputProperties": [ - "action" - ], "data": "\"Back\"", "resizing": { "pinToEdge": 0, @@ -928,13 +1179,22 @@ }, "style": { "objID": "88090903-67a2-42ba-f82e-dcbec9eaf05c", - "inheritFrom": "button" + "useStyle": "button", + "childStyles": [] }, "timeline": [], + "eventHandlers": [ + { + "objID": "3d1b1cc0-3e1e-7a37-9139-438583a384c3", + "eventName": "CLICKED", + "handlerType": "flow" + } + ], "text": "", "disabledStyle": { "objID": "bb0ffd13-534b-4610-f2a0-916a32fc98b1", - "inheritFrom": "button_disabled" + "useStyle": "button_disabled", + "childStyles": [] } }, { @@ -942,8 +1202,8 @@ "type": "ShowPageActionComponent", "left": 205, "top": 322, - "width": 105, - "height": 53, + "width": 94, + "height": 54, "customInputs": [], "customOutputs": [], "page": "page2" @@ -960,9 +1220,16 @@ "data": "\"B1 user btn status\"", "style": { "objID": "5c1fac69-801c-4cf8-fc1d-893983a6833d", - "inheritFrom": "default" + "useStyle": "default", + "childStyles": [] }, - "timeline": [] + "timeline": [], + "eventHandlers": [], + "focusStyle": { + "objID": "883204ee-8ace-7dd9-9e26-3c9f5c3cf28a", + "useStyle": "default", + "childStyles": [] + } }, { "objID": "8f404b3f-4f54-4632-e462-a4d109de296c", @@ -976,9 +1243,16 @@ "data": "\"EEZ flow BTN input\"", "style": { "objID": "385c5427-0e29-4d48-b266-3b6afa8a50f8", - "inheritFrom": "default_XL" + "useStyle": "default_XL", + "childStyles": [] }, - "timeline": [] + "timeline": [], + "eventHandlers": [], + "focusStyle": { + "objID": "64e1b613-0fb1-8da0-6413-d4f2a690beda", + "useStyle": "default", + "childStyles": [] + } }, { "objID": "901b888a-2af5-4c6f-db87-7f85abfacb69", @@ -992,9 +1266,16 @@ "data": "\"Envox EEZ Studio\"", "style": { "objID": "385c5427-0e29-4d48-b266-3b6afa8a50f8", - "inheritFrom": "default_XL" + "useStyle": "default_XL", + "childStyles": [] }, - "timeline": [] + "timeline": [], + "eventHandlers": [], + "focusStyle": { + "objID": "59ba825a-eb74-95d9-f3cd-eee67581ca13", + "useStyle": "default", + "childStyles": [] + } }, { "objID": "bfec1e00-637b-4e10-edc2-074e2aaaecea", @@ -1008,9 +1289,11 @@ "data": "btn_color", "style": { "objID": "22e8bb71-24a8-4fe6-d46e-0b3c72d184da", - "inheritFrom": "default" + "useStyle": "default", + "childStyles": [] }, "timeline": [], + "eventHandlers": [], "widgets": [ { "objID": "0feaed51-f0ab-42ac-f8a4-be5481686a59", @@ -1021,7 +1304,6 @@ "height": 40, "customInputs": [], "customOutputs": [], - "asOutputProperties": [], "data": "\"Off\"", "resizing": { "pinToEdge": 0, @@ -1029,15 +1311,18 @@ }, "style": { "objID": "e842f742-5f69-4de3-e1ca-adb505d0ae11", - "inheritFrom": "button", + "useStyle": "button", + "childStyles": [], "color": "#000000", "backgroundColor": "#ff0000" }, "timeline": [], + "eventHandlers": [], "text": "", "disabledStyle": { "objID": "f88f18d9-e049-439c-ae60-37100567ce0c", - "inheritFrom": "button_disabled" + "useStyle": "button_disabled", + "childStyles": [] } }, { @@ -1049,20 +1334,22 @@ "height": 40, "customInputs": [], "customOutputs": [], - "asOutputProperties": [], "data": "\"On\"", "style": { "objID": "e842f742-5f69-4de3-e1ca-adb505d0ae11", - "inheritFrom": "button", + "useStyle": "button", + "childStyles": [], "color": "#000000", "backgroundColor": "#00ff00", "backgroundImage": "" }, "timeline": [], + "eventHandlers": [], "text": "", "disabledStyle": { "objID": "f88f18d9-e049-439c-ae60-37100567ce0c", - "inheritFrom": "button_disabled" + "useStyle": "button_disabled", + "childStyles": [] } } ] @@ -1072,7 +1359,7 @@ { "objID": "c547d4b4-2c35-4ba3-8112-00ed48923ecc", "source": "925d4f01-0172-475d-a6fa-9966e19542de", - "output": "action", + "output": "CLICKED", "target": "8deadb65-f411-4138-850f-eae36153fe75", "input": "@seqin" } @@ -1084,7 +1371,10 @@ "top": 0, "width": 480, "height": 272, - "scaleToFit": true + "scaleToFit": true, + "lvglLocalStyles": { + "objID": "315560ab-064d-c628-081b-c16461dbd018" + } }, { "objID": "e8ee1744-64c7-4d89-f8fc-12d4b36b9485", @@ -1098,9 +1388,6 @@ "height": 40, "customInputs": [], "customOutputs": [], - "asOutputProperties": [ - "action" - ], "data": "\"Back\"", "resizing": { "pinToEdge": 0, @@ -1108,13 +1395,22 @@ }, "style": { "objID": "88090903-67a2-42ba-f82e-dcbec9eaf05c", - "inheritFrom": "button" + "useStyle": "button", + "childStyles": [] }, "timeline": [], + "eventHandlers": [ + { + "objID": "626dd953-732f-d7c7-b16f-f2a5cdd5745a", + "eventName": "CLICKED", + "handlerType": "flow" + } + ], "text": "", "disabledStyle": { "objID": "bb0ffd13-534b-4610-f2a0-916a32fc98b1", - "inheritFrom": "button_disabled" + "useStyle": "button_disabled", + "childStyles": [] } }, { @@ -1122,8 +1418,8 @@ "type": "ShowPageActionComponent", "left": 205, "top": 322, - "width": 105, - "height": 53, + "width": 94, + "height": 54, "customInputs": [], "customOutputs": [], "page": "page1" @@ -1145,14 +1441,22 @@ ], "data": "ARDUINO_PWM_D3_Pin_status", "visible": "", - "action": "SetPinStatus", "style": { "objID": "5627b037-2394-4799-b6af-b6f83ccc967f", - "inheritFrom": "switch_widget" + "useStyle": "switch_widget", + "childStyles": [] }, "allowOutside": false, "hiddenInEditor": false, - "timeline": [] + "timeline": [], + "eventHandlers": [ + { + "objID": "55358e87-5b36-5fc8-f650-44d5511f4e03", + "eventName": "CLICKED", + "handlerType": "action", + "action": "SetPinStatus" + } + ] }, { "objID": "e69cce4f-5737-414d-d313-b90a3223c6ca", @@ -1166,16 +1470,23 @@ "data": "\"LED_D3\"", "style": { "objID": "5c1fac69-801c-4cf8-fc1d-893983a6833d", - "inheritFrom": "default" + "useStyle": "default", + "childStyles": [] }, - "timeline": [] + "timeline": [], + "eventHandlers": [], + "focusStyle": { + "objID": "21dda680-cc96-0338-9677-dcff3cff25b4", + "useStyle": "default", + "childStyles": [] + } }, { "objID": "9071c5e6-655b-4c83-9c7c-b0db38d95267", "type": "SetVariableActionComponent", "left": 127, "top": -75, - "width": 339, + "width": 314, "height": 55, "customInputs": [ { @@ -1205,9 +1516,16 @@ "data": "\"EEZ flow LED output\"", "style": { "objID": "385c5427-0e29-4d48-b266-3b6afa8a50f8", - "inheritFrom": "default_XL" + "useStyle": "default_XL", + "childStyles": [] }, - "timeline": [] + "timeline": [], + "eventHandlers": [], + "focusStyle": { + "objID": "09db0b72-1140-d600-da0c-e1f76b388bd3", + "useStyle": "default", + "childStyles": [] + } }, { "objID": "c402b762-9ed0-48ad-e94a-083fd05fc7c0", @@ -1221,9 +1539,16 @@ "data": "\"Envox EEZ Studio\"", "style": { "objID": "385c5427-0e29-4d48-b266-3b6afa8a50f8", - "inheritFrom": "default_XL" + "useStyle": "default_XL", + "childStyles": [] }, - "timeline": [] + "timeline": [], + "eventHandlers": [], + "focusStyle": { + "objID": "72e997f3-006d-e257-a384-2c5daa041337", + "useStyle": "default", + "childStyles": [] + } }, { "objID": "e1f0a256-9538-475c-d715-a5ac9f5f6fb5", @@ -1234,9 +1559,6 @@ "height": 40, "customInputs": [], "customOutputs": [], - "asOutputProperties": [ - "action" - ], "data": "\"Next\"", "resizing": { "pinToEdge": 0, @@ -1244,13 +1566,22 @@ }, "style": { "objID": "88090903-67a2-42ba-f82e-dcbec9eaf05c", - "inheritFrom": "button" + "useStyle": "button", + "childStyles": [] }, "timeline": [], + "eventHandlers": [ + { + "objID": "dbe8e396-a69c-199c-c8c4-e649627e719c", + "eventName": "CLICKED", + "handlerType": "flow" + } + ], "text": "", "disabledStyle": { "objID": "bb0ffd13-534b-4610-f2a0-916a32fc98b1", - "inheritFrom": "button_disabled" + "useStyle": "button_disabled", + "childStyles": [] } }, { @@ -1258,8 +1589,8 @@ "type": "ShowPageActionComponent", "left": 521, "top": 309, - "width": 105, - "height": 53, + "width": 94, + "height": 54, "customInputs": [], "customOutputs": [], "page": "page3" @@ -1269,7 +1600,7 @@ { "objID": "c547d4b4-2c35-4ba3-8112-00ed48923ecc", "source": "0fba1953-fc88-4a9d-f544-dbda11b5f393", - "output": "action", + "output": "CLICKED", "target": "468dabc6-fa1a-45a2-a4b1-08dd2f7790ee", "input": "@seqin" }, @@ -1283,7 +1614,7 @@ { "objID": "92745750-5167-43e6-a10f-fb5c9c67e934", "source": "e1f0a256-9538-475c-d715-a5ac9f5f6fb5", - "output": "action", + "output": "CLICKED", "target": "6cc1650c-e0a8-45d7-bdd5-29d66fe244f7", "input": "@seqin" } @@ -1295,79 +1626,25 @@ "top": 0, "width": 480, "height": 272, - "scaleToFit": true + "scaleToFit": true, + "lvglLocalStyles": { + "objID": "5eb24d29-d478-fc65-d336-16fda1f52443" + } } ], + "userWidgets": [], "styles": [ { - "objID": "61d144a6-aa0b-0380-12be-a3ba9a3eca5a", - "name": "quote", - "inheritFrom": "default_L" - }, - { - "objID": "750ffa5d-b570-569b-df50-29dff86462d7", - "name": "tab", - "inheritFrom": "default_L" - }, - { - "objID": "6552f7e4-f8d4-ec0a-e94c-fc7dc04d0902", - "name": "block", - "inheritFrom": "default", - "backgroundColor": "#c8c8c8" - }, - { - "objID": "668bacd5-6736-4b23-9849-169026dbc9cc", - "name": "default_L", - "description": "", - "inheritFrom": "default", - "font": "text_L" - }, - { - "objID": "deede560-5303-2738-3566-445c3597625c", - "name": "default_XL", - "description": "", - "inheritFrom": "default", - "font": "text_XL" - }, - { - "objID": "1a3fcde1-d486-81c7-79a6-4d87dedf7134", - "name": "default_XXL", - "description": "", - "inheritFrom": "default", - "font": "text_XXL" - }, - { - "objID": "2eef6d5a-c282-f977-914d-4f4d2c4227cd", - "name": "label_left_aligned", - "inheritFrom": "default", - "font": "text_L", - "alignHorizontal": "left", - "padding": "0 0 0 6" - }, - { - "objID": "db556364-b406-9720-be0d-4d6a6b65ad22", - "name": "button_large", - "inheritFrom": "button", - "font": "text_XXL" - }, - { - "objID": "2f6ed8c6-6417-7757-a26c-ddb79035d02e", - "name": "button_icon", - "inheritFrom": "button", - "font": "icons" - }, - { - "objID": "eca3b102-1986-5942-1d01-406f94512c0d", - "name": "disabled_button", - "description": "", - "inheritFrom": "button", - "color": "button_disabled_text", - "backgroundColor": "button_disabled_background", - "borderColor": "button_disabled_border" - }, - { "objID": "776573b3-3569-c348-c82a-4ebed65248ad", "name": "text_input", + "childStyles": [ + { + "objID": "6186c81b-912c-52f9-abf9-57361b42a929", + "name": "text_input_small", + "childStyles": [], + "font": "text_M" + } + ], "font": "text_L", "alignHorizontal": "left", "color": "text_input_color", @@ -1378,43 +1655,310 @@ "padding": "0 0 0 4" }, { - "objID": "6186c81b-912c-52f9-abf9-57361b42a929", - "name": "text_input_small", - "inheritFrom": "text_input", - "font": "text_M" - }, - { - "objID": "76cba2bc-caa7-3e53-842e-184bc05728ab", - "name": "text_button", - "description": "", - "inheritFrom": "button", - "font": "text_L" - }, - { - "objID": "de683720-4908-81c9-8537-941b785f673c", - "name": "text_button_disabled", - "description": "", - "inheritFrom": "text_button", - "color": "button_disabled_text", - "backgroundColor": "button_disabled_background" - }, - { - "objID": "ee40532d-e010-05df-32c8-d192071a8f88", - "name": "text_button_icon", - "inheritFrom": "text_button", - "font": "icons" - }, - { - "objID": "2a84bf81-a523-5cfe-3e54-0797ef033a39", - "name": "text_button_icon_disabled", - "inheritFrom": "text_button_disabled", - "font": "icons" - }, - { "objID": "04157789-da53-2f4a-e658-4ca10aa5fbef", "name": "default", "description": "", - "inheritFrom": "", + "childStyles": [ + { + "objID": "6552f7e4-f8d4-ec0a-e94c-fc7dc04d0902", + "name": "block", + "childStyles": [], + "backgroundColor": "#c8c8c8" + }, + { + "objID": "668bacd5-6736-4b23-9849-169026dbc9cc", + "name": "default_L", + "description": "", + "childStyles": [ + { + "objID": "61d144a6-aa0b-0380-12be-a3ba9a3eca5a", + "name": "quote", + "childStyles": [] + }, + { + "objID": "750ffa5d-b570-569b-df50-29dff86462d7", + "name": "tab", + "childStyles": [] + } + ], + "font": "text_L" + }, + { + "objID": "deede560-5303-2738-3566-445c3597625c", + "name": "default_XL", + "description": "", + "childStyles": [ + { + "objID": "4a89fd1f-824b-fb95-1575-dfe95862c657", + "name": "roller_widget_unselected_value", + "childStyles": [], + "color": "#808080" + } + ], + "font": "text_XL" + }, + { + "objID": "1a3fcde1-d486-81c7-79a6-4d87dedf7134", + "name": "default_XXL", + "description": "", + "childStyles": [ + { + "objID": "2dccf1f1-b94e-8c75-87b8-e7fd053491d7", + "name": "roller_widget_selected_value", + "childStyles": [], + "borderSize": "2", + "borderRadius": "4", + "borderColor": "#c0c0c0" + } + ], + "font": "text_XXL" + }, + { + "objID": "2eef6d5a-c282-f977-914d-4f4d2c4227cd", + "name": "label_left_aligned", + "childStyles": [], + "font": "text_L", + "alignHorizontal": "left", + "padding": "0 0 0 6" + }, + { + "objID": "d9630995-549b-27a2-06c2-a2794496b85a", + "name": "info_alert", + "childStyles": [], + "alwaysBuild": true, + "padding": "20", + "margin": "20" + }, + { + "objID": "596e02a3-c281-63d5-74de-a9f10915ecad", + "name": "error_alert", + "childStyles": [], + "alwaysBuild": true, + "color": "dark_text", + "backgroundColor": "error", + "activeColor": "error", + "activeBackgroundColor": "dark_text", + "padding": "20", + "margin": "20" + }, + { + "objID": "99524f6d-f187-67b3-070c-f68da187ac56", + "name": "select_enum_item_popup_container", + "childStyles": [ + { + "objID": "451ff6d3-0da3-8dd3-54cc-5630b8a68c1f", + "name": "select_enum_item_popup_container_S", + "childStyles": [ + { + "objID": "eccd5f27-3959-bf9b-36e6-401768a0cbd2", + "name": "select_enum_item_popup_item_S", + "childStyles": [ + { + "objID": "32fc2d2f-db93-8b71-6883-195f498d5977", + "name": "select_enum_item_popup_disabled_item_S", + "childStyles": [], + "alwaysBuild": true, + "color": "drop_down_list_color_disabled" + } + ], + "alwaysBuild": true, + "alignHorizontal": "left", + "padding": "6" + } + ], + "alwaysBuild": true, + "font": "text_M" + }, + { + "objID": "0d0344fa-33c2-0b11-7d16-e298ad85df1a", + "name": "select_enum_item_popup_item", + "childStyles": [ + { + "objID": "15c183e7-e541-10d2-dc96-701adca53473", + "name": "select_enum_item_popup_disabled_item", + "childStyles": [], + "alwaysBuild": true, + "color": "drop_down_list_color_disabled" + } + ], + "alwaysBuild": true, + "padding": "6" + } + ], + "alwaysBuild": true, + "font": "text_L", + "color": "drop_down_list_color", + "backgroundColor": "drop_down_list_background", + "activeColor": "drop_down_list_background", + "activeBackgroundColor": "drop_down_list_color", + "padding": "12" + }, + { + "objID": "896bb373-355d-40b9-8386-4332390ce115", + "name": "menu_with_buttons_message", + "childStyles": [], + "alwaysBuild": true, + "alignVertical": "top", + "color": "text", + "backgroundColor": "background", + "activeColor": "background", + "activeBackgroundColor": "text", + "padding": "0 0 10 0", + "margin": "0" + }, + { + "objID": "c8203187-878b-1452-d8ff-9425dede499b", + "name": "menu_with_buttons_container", + "childStyles": [], + "alwaysBuild": true, + "padding": "20", + "margin": "20" + }, + { + "objID": "b250a172-d01b-d54f-3d84-891f3c6c48ab", + "name": "fps_graph", + "childStyles": [], + "alwaysBuild": true, + "color": "#00ff1e", + "backgroundColor": "#000000", + "borderSize": "1", + "borderColor": "backdrop" + }, + { + "objID": "196d3137-46d6-a552-f1bc-80c98098e3ce", + "name": "slider_widget", + "childStyles": [], + "color": "slider_widget_color", + "backgroundColor": "slider_widget_background" + }, + { + "objID": "4d239458-1686-00b4-e6d6-551070c8e0c6", + "name": "switch_widget", + "childStyles": [], + "color": "switch_widget_color", + "backgroundColor": "switch_widget_background_off", + "activeColor": "switch_widget_color", + "activeBackgroundColor": "switch_widget_background_on", + "focusColor": "switch_widget_color", + "borderSize": "2", + "borderColor": "switch_widget_border", + "padding": "3 0" + }, + { + "objID": "b1aa1e30-6a2d-4fe1-8880-b4fecf686ed2", + "name": "background", + "childStyles": [], + "backgroundColor": "background" + }, + { + "objID": "07d83b2f-14da-b1c3-ea6e-d277fb3355be", + "name": "button", + "childStyles": [ + { + "objID": "db556364-b406-9720-be0d-4d6a6b65ad22", + "name": "button_large", + "childStyles": [], + "font": "text_XXL" + }, + { + "objID": "2f6ed8c6-6417-7757-a26c-ddb79035d02e", + "name": "button_icon", + "childStyles": [], + "font": "icons" + }, + { + "objID": "eca3b102-1986-5942-1d01-406f94512c0d", + "name": "disabled_button", + "description": "", + "childStyles": [], + "color": "button_disabled_text", + "backgroundColor": "button_disabled_background", + "borderColor": "button_disabled_border" + }, + { + "objID": "76cba2bc-caa7-3e53-842e-184bc05728ab", + "name": "text_button", + "description": "", + "childStyles": [ + { + "objID": "de683720-4908-81c9-8537-941b785f673c", + "name": "text_button_disabled", + "description": "", + "childStyles": [ + { + "objID": "2a84bf81-a523-5cfe-3e54-0797ef033a39", + "name": "text_button_icon_disabled", + "childStyles": [], + "font": "icons" + } + ], + "color": "button_disabled_text", + "backgroundColor": "button_disabled_background" + }, + { + "objID": "ee40532d-e010-05df-32c8-d192071a8f88", + "name": "text_button_icon", + "childStyles": [], + "font": "icons" + } + ], + "font": "text_L" + }, + { + "objID": "47f65ab6-cfa3-09b2-b3b4-4260adc98ef5", + "name": "error_alert_button", + "childStyles": [], + "alwaysBuild": true, + "padding": "8 16 8 16" + }, + { + "objID": "85f44e5f-3da1-407e-57a2-aee66a4c68aa", + "name": "menu_with_buttons_button", + "childStyles": [], + "alwaysBuild": true, + "padding": "0 4", + "margin": "0" + }, + { + "objID": "fa680b00-5a77-f63a-7aad-b774279a1c8c", + "name": "button_disabled", + "childStyles": [], + "color": "button_disabled_text", + "backgroundColor": "button_disabled_background", + "activeColor": "button_disabled_text", + "activeBackgroundColor": "button_disabled_background", + "borderColor": "button_disabled_border" + } + ], + "color": "button_text", + "backgroundColor": "button_background", + "activeColor": "button_text", + "activeBackgroundColor": "button_active_background", + "borderColor": "button_border" + }, + { + "objID": "00947574-0f82-d1c9-419a-ee1680384ec4", + "name": "note_M", + "childStyles": [], + "color": "dark_text", + "backgroundColor": "note" + }, + { + "objID": "54647aad-d4fe-9b42-6da6-1bb8452131c0", + "name": "drop_down_list", + "childStyles": [], + "color": "drop_down_list_color", + "backgroundColor": "drop_down_list_background", + "activeColor": "drop_down_list_color", + "activeBackgroundColor": "drop_down_list_active_background", + "borderColor": "drop_down_list_border" + }, + { + "objID": "72d784b2-e693-7b06-cc0d-18e32a5ccd25", + "name": "roller_widget", + "childStyles": [] + } + ], "font": "text_M", "alignHorizontal": "center", "alignVertical": "center", @@ -1424,202 +1968,6 @@ "activeBackgroundColor": "text", "borderColor": "border", "padding": "0" - }, - { - "objID": "d9630995-549b-27a2-06c2-a2794496b85a", - "name": "info_alert", - "inheritFrom": "default", - "alwaysBuild": true, - "padding": "20", - "margin": "20" - }, - { - "objID": "596e02a3-c281-63d5-74de-a9f10915ecad", - "name": "error_alert", - "inheritFrom": "default", - "alwaysBuild": true, - "color": "dark_text", - "backgroundColor": "error", - "activeColor": "error", - "activeBackgroundColor": "dark_text", - "padding": "20", - "margin": "20" - }, - { - "objID": "47f65ab6-cfa3-09b2-b3b4-4260adc98ef5", - "name": "error_alert_button", - "inheritFrom": "button", - "alwaysBuild": true, - "padding": "8 16 8 16" - }, - { - "objID": "99524f6d-f187-67b3-070c-f68da187ac56", - "name": "select_enum_item_popup_container", - "inheritFrom": "default", - "alwaysBuild": true, - "font": "text_L", - "color": "drop_down_list_color", - "backgroundColor": "drop_down_list_background", - "activeColor": "drop_down_list_background", - "activeBackgroundColor": "drop_down_list_color", - "padding": "12" - }, - { - "objID": "451ff6d3-0da3-8dd3-54cc-5630b8a68c1f", - "name": "select_enum_item_popup_container_S", - "inheritFrom": "select_enum_item_popup_container", - "alwaysBuild": true, - "font": "text_M" - }, - { - "objID": "0d0344fa-33c2-0b11-7d16-e298ad85df1a", - "name": "select_enum_item_popup_item", - "inheritFrom": "select_enum_item_popup_container", - "alwaysBuild": true, - "padding": "6" - }, - { - "objID": "eccd5f27-3959-bf9b-36e6-401768a0cbd2", - "name": "select_enum_item_popup_item_S", - "inheritFrom": "select_enum_item_popup_container_S", - "alwaysBuild": true, - "alignHorizontal": "left", - "padding": "6" - }, - { - "objID": "15c183e7-e541-10d2-dc96-701adca53473", - "name": "select_enum_item_popup_disabled_item", - "inheritFrom": "select_enum_item_popup_item", - "alwaysBuild": true, - "color": "drop_down_list_color_disabled" - }, - { - "objID": "32fc2d2f-db93-8b71-6883-195f498d5977", - "name": "select_enum_item_popup_disabled_item_S", - "inheritFrom": "select_enum_item_popup_item_S", - "alwaysBuild": true, - "color": "drop_down_list_color_disabled" - }, - { - "objID": "896bb373-355d-40b9-8386-4332390ce115", - "name": "menu_with_buttons_message", - "inheritFrom": "default", - "alwaysBuild": true, - "alignVertical": "top", - "color": "text", - "backgroundColor": "background", - "activeColor": "background", - "activeBackgroundColor": "text", - "padding": "0 0 10 0", - "margin": "0" - }, - { - "objID": "c8203187-878b-1452-d8ff-9425dede499b", - "name": "menu_with_buttons_container", - "inheritFrom": "default", - "alwaysBuild": true, - "padding": "20", - "margin": "20" - }, - { - "objID": "85f44e5f-3da1-407e-57a2-aee66a4c68aa", - "name": "menu_with_buttons_button", - "inheritFrom": "button", - "alwaysBuild": true, - "padding": "0 4", - "margin": "0" - }, - { - "objID": "b250a172-d01b-d54f-3d84-891f3c6c48ab", - "name": "fps_graph", - "inheritFrom": "default", - "alwaysBuild": true, - "color": "#00ff1e", - "backgroundColor": "#000000", - "borderSize": "1", - "borderColor": "backdrop" - }, - { - "objID": "196d3137-46d6-a552-f1bc-80c98098e3ce", - "name": "slider_widget", - "inheritFrom": "default", - "color": "slider_widget_color", - "backgroundColor": "slider_widget_background" - }, - { - "objID": "4d239458-1686-00b4-e6d6-551070c8e0c6", - "name": "switch_widget", - "inheritFrom": "default", - "color": "switch_widget_color", - "backgroundColor": "switch_widget_background_off", - "activeColor": "switch_widget_color", - "activeBackgroundColor": "switch_widget_background_on", - "focusColor": "switch_widget_color", - "borderSize": "2", - "borderColor": "switch_widget_border", - "padding": "3 0" - }, - { - "objID": "b1aa1e30-6a2d-4fe1-8880-b4fecf686ed2", - "name": "background", - "inheritFrom": "default", - "backgroundColor": "background" - }, - { - "objID": "07d83b2f-14da-b1c3-ea6e-d277fb3355be", - "name": "button", - "inheritFrom": "default", - "color": "button_text", - "backgroundColor": "button_background", - "activeColor": "button_text", - "activeBackgroundColor": "button_active_background", - "borderColor": "button_border" - }, - { - "objID": "fa680b00-5a77-f63a-7aad-b774279a1c8c", - "name": "button_disabled", - "inheritFrom": "button", - "color": "button_disabled_text", - "backgroundColor": "button_disabled_background", - "activeColor": "button_disabled_text", - "activeBackgroundColor": "button_disabled_background", - "borderColor": "button_disabled_border" - }, - { - "objID": "00947574-0f82-d1c9-419a-ee1680384ec4", - "name": "note_M", - "inheritFrom": "default", - "color": "dark_text", - "backgroundColor": "note" - }, - { - "objID": "54647aad-d4fe-9b42-6da6-1bb8452131c0", - "name": "drop_down_list", - "inheritFrom": "default", - "color": "drop_down_list_color", - "backgroundColor": "drop_down_list_background", - "activeColor": "drop_down_list_color", - "activeBackgroundColor": "drop_down_list_active_background", - "borderColor": "drop_down_list_border" - }, - { - "objID": "72d784b2-e693-7b06-cc0d-18e32a5ccd25", - "name": "roller_widget", - "inheritFrom": "default" - }, - { - "objID": "2dccf1f1-b94e-8c75-87b8-e7fd053491d7", - "name": "roller_widget_selected_value", - "inheritFrom": "default_XXL", - "borderSize": "2", - "borderRadius": "4", - "borderColor": "#c0c0c0" - }, - { - "objID": "4a89fd1f-824b-fb95-1575-dfe95862c657", - "name": "roller_widget_unselected_value", - "inheritFrom": "default_XL", - "color": "#808080" } ], "fonts": [ diff --git a/Src/eez-framework-conf.h b/Src/eez-framework-conf.h new file mode 100644 index 0000000..63857dc --- /dev/null +++ b/Src/eez-framework-conf.h @@ -0,0 +1,42 @@ +#pragma once + +#include + +#if defined(EEZ_PLATFORM_STM32) +static const uint32_t DISPLAY_WIDTH = 800; +static const uint32_t DISPLAY_HEIGHT = 480; +static const uint32_t DISPLAY_BPP = 16; // RGB565 +#endif + +#if defined(EEZ_PLATFORM_SIMULATOR) +static const uint32_t DISPLAY_WIDTH = 1000; +static const uint32_t DISPLAY_HEIGHT = 680; +static const uint32_t DISPLAY_BPP = 32; // RGBA8888 + +static const char *TITLE = "STM32F469I-DISCO Template"; +static const char *ICON = "icon.png"; +#endif + + +#define MAX_NUM_OF_Y_AXES 18 +#define MAX_NUM_OF_Y_VALUES MAX_NUM_OF_Y_AXES + +#define OPTION_KEYBOARD 0 +#define OPTION_MOUSE 0 + +#define CUSTOM_VALUE_TYPES + +#define DISPLAY_BACKGROUND_LUMINOSITY_STEP_MIN 0 +#define DISPLAY_BACKGROUND_LUMINOSITY_STEP_MAX 20 +#define DISPLAY_BACKGROUND_LUMINOSITY_STEP_DEFAULT 10 + +#define UTF8_SUPPORT 0 + +#if defined(EEZ_PLATFORM_STM32) +static const uint32_t GUI_STATE_BUFFER_SIZE = 64 * 1024; +#endif +#if defined(EEZ_PLATFORM_SIMULATOR) +static const uint32_t GUI_STATE_BUFFER_SIZE = 128 * 1024; +#endif + +#define OPTION_KEYPAD 1 \ No newline at end of file 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/lcd.cpp b/Src/lcd.cpp index 642b0e5..b133130 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