default button and io set

benkuper · Oct 16, 2023 · ae6fb1d · ae6fb1d
1 parent 564100c
commit ae6fb1d
Show file tree

Hide file tree

Showing 10 changed files with 43 additions and 6 deletions.
diff --git a/Firmware/Bentuino/.vscode/c_cpp_properties.json b/Firmware/Bentuino/.vscode/c_cpp_properties.json
@@ -274,6 +274,8 @@
                 "BUTTON_DEFAULT_PIN=32",
                 "USE_IO",
                 "IO_MAX_COUNT=4",
+                "IO_DEFAULT_PIN=17",
+                "IO_DEFAULT_MODE=IOComponent::PinMode::A_OUTPUT",
                 "USE_BATTERY",
                 "BATTERY_DEFAULT_PIN=35",
                 "BATTERY_DEFAUT_RAW_MIN=222",

diff --git a/Firmware/Bentuino/platformio.ini b/Firmware/Bentuino/platformio.ini
@@ -94,6 +94,8 @@ build_flags =
 
 	-D USE_IO
 	-D IO_MAX_COUNT=4
+	-D IO_DEFAULT_PIN=17
+	-D IO_DEFAULT_MODE=IOComponent::PinMode::A_OUTPUT
 
 	-D USE_BATTERY
 	-D BATTERY_DEFAULT_PIN=35

diff --git a/Firmware/Bentuino/src/Common/Helpers.h b/Firmware/Bentuino/src/Common/Helpers.h
@@ -82,9 +82,11 @@
         {                                                     \
             String n = #itemName + String(i + 1);             \
             AddStaticOrDynamicComponent(n, Type, i == 0);     \
+            addItemInternal(i);                               \
         }                                                     \
         return true;                                          \
     }                                                         \
+                                                              \
     HandleSetParamInternalStart                               \
         CheckAndSetParam(count);                              \
     HandleSetParamInternalEnd;                                \

diff --git a/Firmware/Bentuino/src/Common/script/Script.cpp b/Firmware/Bentuino/src/Common/script/Script.cpp
@@ -1,3 +1,4 @@
+#include "Script.h"
 #define FATAL(func, msg)                  \
     {                                     \
         Serial.print("Fatal: " func " "); \
@@ -139,6 +140,10 @@ void Script::launchWasmTask()
     if (stopFunc != NULL)
         foundFunc += " / stop";
 
+    result = m3_FindFunction(&setScriptParamFunc, runtime, "setParam");
+    if (setScriptParamFunc != NULL)
+        foundFunc += " / setParam";
+
     DBG("Found functions : " + foundFunc);
 
     isRunning = true;
@@ -205,6 +210,12 @@ void Script::stop()
     }
 }
 
+void Script::setScriptParam(int index, float value)
+{
+    if (stopFunc != NULL)
+        m3_CallV(setScriptParamFunc, index, value);
+}
+
 void Script::shutdown()
 {
     stop();

diff --git a/Firmware/Bentuino/src/Common/script/Script.h b/Firmware/Bentuino/src/Common/script/Script.h
@@ -26,6 +26,7 @@ class Script
     IM3Function initFunc;
     IM3Function updateFunc;
     IM3Function stopFunc;
+    IM3Function setScriptParamFunc;
 
     static float timeAtLaunch;
 
@@ -40,6 +41,8 @@ class Script
     void shutdown();
     void stop();
 
+    void setScriptParam(int index, float value);
+
 #if WASM_ASYNC
     static void launchWasmTaskStatic(void *);
 #endif

diff --git a/Firmware/Bentuino/src/Component/components/behaviour/BehaviourComponent.h b/Firmware/Bentuino/src/Component/components/behaviour/BehaviourComponent.h
@@ -93,12 +93,13 @@ FillOSCQueryBoolParam(alwaysTrigger);
 FillOSCQueryBoolParamReadOnly(valid);
 FillOSCQueryEnumParam(triggerAction, triggerActionOptions, ActionMax);
 FillOSCQueryStringParam(triggerValue);
-FillOSCQueryInternalEnd
-}
-;
+FillOSCQueryInternalEnd;
+
+};
 
 DeclareComponentManager(Behaviour, BEHAVIOUR, behaviours, behaviour)
 
+      void addItemInternal(int index) {  };
     void onChildComponentEvent(const ComponentEvent &e) override;
 DeclareComponentEventTypes(CommandLaunched);
 DeclareComponentEventNames("CommandLaunched");

diff --git a/Firmware/Bentuino/src/Component/components/io/IOComponent.h b/Firmware/Bentuino/src/Component/components/io/IOComponent.h
@@ -49,7 +49,7 @@ CheckAndSetParam(inverted);
 HandleSetParamInternalEnd;
 
 CheckFeedbackParamInternalStart
-CheckAndSendParamFeedback(value);
+    CheckAndSendParamFeedback(value);
 CheckFeedbackParamInternalEnd;
 
 FillSettingsInternalStart
@@ -69,5 +69,15 @@ FillOSCQueryInternalEnd
 
 // Manager
 
-DeclareComponentManager(IO, IO, gpio, gpio)
-    EndDeclareComponent
+DeclareComponentManager(IO, IO, gpio, gpio) 
+
+void addItemInternal(int index)
+{
+    if (index == 0)
+    {
+        items[index]->pin = IO_DEFAULT_PIN;
+        items[index]->mode = IO_DEFAULT_MODE;
+    }
+};
+
+EndDeclareComponent
diff --git a/Firmware/Bentuino/src/Component/components/io/button/ButtonComponent.h b/Firmware/Bentuino/src/Component/components/io/button/ButtonComponent.h
@@ -65,4 +65,5 @@ class ButtonComponent : public IOComponent
 };
 
 DeclareComponentManager(Button, BUTTON, buttons, button)
+    void addItemInternal(int index) { if(index == 0) items[index]->pin = BUTTON_DEFAULT_PIN; };
     EndDeclareComponent
diff --git a/Firmware/Bentuino/src/Component/components/ledstrip/LedStripComponent.h b/Firmware/Bentuino/src/Component/components/ledstrip/LedStripComponent.h
@@ -169,6 +169,8 @@ DeclareScriptFunctionReturn1(LedStripManagerComponent, get, uint32_t, uint32_t)
 
 DeclareScriptFunctionVoid3(LedStripManagerComponent, setBlendMode, uint32_t, uint32_t, uint32_t) { return items[0]->userLayers[(int)arg2]->setBlendMode((LedStripLayer::BlendMode)arg3); }
 
+    void addItemInternal(int index) {  };
+
 #endif
 
 EndDeclareComponent
diff --git a/Firmware/Bentuino/src/Component/components/script/ScriptComponent.cpp b/Firmware/Bentuino/src/Component/components/script/ScriptComponent.cpp
@@ -25,6 +25,9 @@ bool ScriptComponent::handleCommandInternal(const String &command, var *data, in
     {
         script.stop();
         return true;
+    }else if(CheckCommand("setScriptParam", 2)){
+        script.setScriptParam(data[0].intValue(), (float)data[1]);
+        return true;
     }
 
     return false;