removed eval component

eez-open · Oct 5, 2021 · 36f2e9a · 36f2e9a
1 parent eff5acb
commit 36f2e9a
Show file tree

Hide file tree

Showing 7 changed files with 38,582 additions and 38,638 deletions.
diff --git a/scripts/DC Power App/DC Power.app b/scripts/DC Power App/DC Power.app
diff --git a/scripts/DC Power App/DC Power.eez-project b/scripts/DC Power App/DC Power.eez-project
@@ -499,8 +499,8 @@
         },
         {
           "type": "SwitchActionComponent",
-          "left": -81,
-          "top": -134,
+          "left": -80,
+          "top": -136,
           "width": 434,
           "height": 98,
           "wireID": "647469f9-dc20-48ca-dfd2-9a416417b36b",

diff --git a/src/eez/flow/components.cpp b/src/eez/flow/components.cpp
@@ -38,7 +38,6 @@ void executeOutputComponent(FlowState *flowState, unsigned componentIndex);
 void executeDelayComponent(FlowState *flowState, unsigned componentIndex);
 void executeConstantComponent(FlowState *flowState, unsigned componentIndex);
 void executeSetVariableComponent(FlowState *flowState, unsigned componentIndex);
-void executeEvalComponent(FlowState *flowState, unsigned componentIndex);
 void executeLoopComponent(FlowState *flowState, unsigned componentIndex);
 void executeSwitchComponent(FlowState *flowState, unsigned componentIndex);
 void executeLogComponent(FlowState *flowState, unsigned componentIndex);
@@ -62,8 +61,6 @@ void executeComponent(FlowState *flowState, unsigned componentIndex) {
 		executeConstantComponent(flowState, componentIndex);
 	} else if (component->type == defs_v3::COMPONENT_TYPE_SET_VARIABLE_ACTION) {
 		executeSetVariableComponent(flowState, componentIndex);
-    } else if (component->type == defs_v3::COMPONENT_TYPE_EVAL_ACTION) {
-		executeEvalComponent(flowState, componentIndex);
     } else if (component->type == defs_v3::COMPONENT_TYPE_LOOP_ACTION) {
 		executeLoopComponent(flowState, componentIndex);
     } else if (component->type == defs_v3::COMPONENT_TYPE_SWITCH_ACTION) {

diff --git a/src/eez/flow/components/eval.cpp b/src/eez/flow/components/eval.cpp
diff --git a/src/eez/flow/flow_defs_v3.h b/src/eez/flow/flow_defs_v3.h
@@ -185,10 +185,6 @@ enum Component_INPUT_EMBEDDED_WIDGET_Properties {
     INPUT_EMBEDDED_WIDGET_PROPERTY_UNIT = 4
 };
 
-enum Component_EVAL_ACTION_COMPONENT_Properties {
-    EVAL_ACTION_COMPONENT_PROPERTY_EXPRESSION = 0
-};
-
 enum Component_SET_VARIABLE_ACTION_COMPONENT_Properties {
     SET_VARIABLE_ACTION_COMPONENT_PROPERTY_VALUE = 0
 };
@@ -208,7 +204,8 @@ enum Component_READ_SETTING_ACTION_COMPONENT_Properties {
 };
 
 enum Component_WRITE_SETTINGS_ACTION_COMPONENT_Properties {
-    WRITE_SETTINGS_ACTION_COMPONENT_PROPERTY_KEY = 0
+    WRITE_SETTINGS_ACTION_COMPONENT_PROPERTY_KEY = 0,
+    WRITE_SETTINGS_ACTION_COMPONENT_PROPERTY_VALUE = 1
 };
 
 enum Component_LOG_ACTION_COMPONENT_Properties {