Merge branch 'dev' into testing

Homegear · Jul 11, 2018 · 38585b0 · 38585b0
2 parents 5e5a967 + 04b52a5
commit 38585b0
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 20 deletions.
diff --git a/basic-logic/fallingedge/MyNode.cpp b/basic-logic/fallingedge/MyNode.cpp
@@ -66,9 +66,7 @@ void MyNode::input(Flows::PNodeInfo info, uint32_t index, Flows::PVariable messa
 		Flows::PVariable& input = message->structValue->at("payload");
 		if(!*input && _lastInput)
 		{
-			Flows::PVariable outputMessage = std::make_shared<Flows::Variable>(Flows::VariableType::tStruct);
-			outputMessage->structValue->emplace("payload", std::make_shared<Flows::Variable>(true));
-			output(0, outputMessage);
+			output(0, message);
 		}
 		_lastInput = *input;
 

diff --git a/basic-logic/fallingedge/fallingedge.hni b/basic-logic/fallingedge/fallingedge.hni
@@ -24,13 +24,13 @@
         inputInfo: [
         	{
         		label: "in",
-        		types: ["bool"]
+        		types: ["any"]
         	}
         ],
         outputs:1,
         outputInfo: [
         	{
-        		types: ["bool"]
+        		types: ["any"]
         	}
         ],
         icon: "function.png",

diff --git a/basic-logic/fallingedge/locales/en-US/fallingedge b/basic-logic/fallingedge/locales/en-US/fallingedge
@@ -4,10 +4,10 @@
       "label": {
         "name": "Name"
       },
-      "paletteHelp": "The output is set to <code>true</code> when the input is set to <code>false</code>. An input of <code>true</code> is ignored.",
-      "help": "<p>The output is set to <code>true</code> when the input is set to <code>false</code>.</p><p>An input of <code>true</code> is ignored.</p>",
-      "input1Description": "The boolean value.",
-      "output1Description": "<code>true</code> on input of <code>false</code>."
+      "paletteHelp": "The input message is forwarded when the input is evaluated to <code>false</code>. An input evaluated to <code>true</code> is ignored.",
+      "help": "<p>The input message is forwarded when the input is evaluated to <code>false</code>.</p><p>An input evaluated to <code>true</code> is ignored.</p>",
+      "input1Description": "The value to check.",
+      "output1Description": "The input message when the input is evaluated to <code>false</code>."
     }
   }
 }
diff --git a/basic-logic/risingedge/MyNode.cpp b/basic-logic/risingedge/MyNode.cpp
@@ -66,9 +66,7 @@ void MyNode::input(const Flows::PNodeInfo info, uint32_t index, const Flows::PVa
 		Flows::PVariable& input = message->structValue->at("payload");
 		if(*input)
 		{
-			Flows::PVariable outputMessage = std::make_shared<Flows::Variable>(Flows::VariableType::tStruct);
-			outputMessage->structValue->emplace("payload", std::make_shared<Flows::Variable>(true));
-			output(0, outputMessage);
+			output(0, message);
 		}
 	}
 	catch(const std::exception& ex)

diff --git a/basic-logic/risingedge/locales/en-US/risingedge b/basic-logic/risingedge/locales/en-US/risingedge
@@ -4,10 +4,10 @@
       "label": {
         "name": "Name"
       },
-      "paletteHelp": "The output is set to <code>true</code> when the input is set to <code>true</code>. An input of <code>false</code> is ignored.",
-      "help": "<p>The output is set to <code>true</code> when the input is set to <code>true</code>.</p><p>An input of <code>false</code> is ignored.</p>",
-      "input1Description": "The boolean value.",
-      "output1Description": "<code>true</code> on input of <code>true</code>."
+      "paletteHelp": "The input message is forwarded when the input is evaluated to <code>true</code>. An input evaluated to <code>false</code> is ignored.",
+      "help": "<p>The input message is forwarded when the input is evaluated to <code>true</code>.</p><p>An input evaluated to <code>false</code> is ignored.</p>",
+      "input1Description": "The value to check.",
+      "output1Description": "The input message when the input is evaluated to <code>true</code>."
     }
   }
 }
diff --git a/basic-logic/risingedge/risingedge.hni b/basic-logic/risingedge/risingedge.hni
@@ -24,13 +24,13 @@
         inputInfo: [
         	{
         		label: "in",
-        		types: ["bool"]
+        		types: ["any"]
         	}
         ],
         outputs:1,
         outputInfo: [
         	{
-        		types: ["bool"]
+        		types: ["any"]
         	}
         ],
         icon: "function.png",

diff --git a/variable/variable-in/MyNode.cpp b/variable/variable-in/MyNode.cpp
@@ -130,14 +130,15 @@ void MyNode::startUpComplete()
 	}
 }
 
-void MyNode::variableEvent(uint64_t peerId, int32_t channel, std::string variable, Flows::PVariable value)
+void MyNode::variableEvent(std::string source, uint64_t peerId, int32_t channel, std::string variable, Flows::PVariable value)
 {
 	try
 	{
 		if(Flows::HelperFunctions::getTime() - _lastInput < _refractionPeriod) return;
 		_lastInput = Flows::HelperFunctions::getTime();
 
 		Flows::PVariable message = std::make_shared<Flows::Variable>(Flows::VariableType::tStruct);
+		message->structValue->emplace("eventSource", std::make_shared<Flows::Variable>(source));
 		message->structValue->emplace("peerId", std::make_shared<Flows::Variable>(peerId));
 		message->structValue->emplace("channel", std::make_shared<Flows::Variable>(channel));
 		message->structValue->emplace("variable", std::make_shared<Flows::Variable>(variable));

diff --git a/variable/variable-in/MyNode.h b/variable/variable-in/MyNode.h
@@ -54,7 +54,7 @@ class MyNode: public Flows::INode
 	std::string _loopPreventionGroup;
 	bool _loopPrevention = false;
 
-	virtual void variableEvent(uint64_t peerId, int32_t channel, std::string variable, Flows::PVariable value);
+	virtual void variableEvent(std::string source, uint64_t peerId, int32_t channel, std::string variable, Flows::PVariable value);
 };
 
 }