From 6cf0bdcffede8b783b7255b19c0e31505c8a38db Mon Sep 17 00:00:00 2001
From: Brad Davis <bdavis@saintandreas.org>
Date: Thu, 22 Oct 2015 10:00:11 -0700
Subject: [PATCH] Testing function destination and fixing bug in rule ordering
 for multi-soure

---
 examples/tests/controllerInterfaceTest.js     | 14 ++++++++++++-
 .../src/controllers/UserInputMapper.cpp       | 21 +++++++++++++++----
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/examples/tests/controllerInterfaceTest.js b/examples/tests/controllerInterfaceTest.js
index a4e0557c78..0dccd1209a 100644
--- a/examples/tests/controllerInterfaceTest.js
+++ b/examples/tests/controllerInterfaceTest.js
@@ -1,11 +1,13 @@
 ControllerTest = function() {
     var standard = Controller.Standard;
     var actions = Controller.Actions;
+    var xbox = Controller.Hardware.GamePad;
     this.mappingEnabled = false;
     this.mapping = Controller.newMapping();
     this.mapping.from(standard.RX).to(actions.StepYaw);
     this.mapping.from(standard.RY).invert().to(actions.Pitch);
 
+
     var testMakeAxis = false;
     if (testMakeAxis) {
         this.mapping.makeAxis(standard.LB, standard.RB).pulse(0.25).scale(40.0).to(actions.StepYaw);
@@ -17,12 +19,22 @@ ControllerTest = function() {
         this.mapping.from(standard.RB).pulse(0.10).scale(15.0).to(actions.StepYaw);
     }
     
-    var testFunctionSource = true;
+    var testFunctionSource = false;
     if (testFunctionSource) {
         this.mapping.from(function(){
             return Math.sin(Date.now() / 250); 
         }).to(actions.Yaw);
     }
+    
+    var testFunctionDest = true;
+    if (testFunctionDest) {
+        this.mapping.from(standard.DU).pulse(1.0).to(function(value){
+            if (value != 0.0) {
+                print(value);
+            }
+        });
+
+    }
 
     this.mapping.enable();
     this.mappingEnabled = true;
diff --git a/libraries/controllers/src/controllers/UserInputMapper.cpp b/libraries/controllers/src/controllers/UserInputMapper.cpp
index f1138479bf..107b6f8192 100755
--- a/libraries/controllers/src/controllers/UserInputMapper.cpp
+++ b/libraries/controllers/src/controllers/UserInputMapper.cpp
@@ -195,7 +195,20 @@ class AnyEndpoint : public Endpoint {
     friend class UserInputMapper;
 public:
     using Pointer = std::shared_ptr<AnyEndpoint>;
-    AnyEndpoint() : Endpoint(Input::INVALID_INPUT) {}
+    AnyEndpoint(Endpoint::List children) : Endpoint(Input::INVALID_INPUT), _children(children) {
+        bool standard = true;
+        // Ensure if we're building a composite of standard devices the composite itself
+        // is treated as a standard device for rule processing order
+        for (auto endpoint : children) {
+            if (endpoint->getInput().device != UserInputMapper::STANDARD_DEVICE) {
+                standard = false;
+                break;
+            }
+        }
+        if (standard) {
+            this->_input = INVALID_STANDARD_INPUT;
+        }
+    }
 
     virtual float value() override {
         float result = 0;
@@ -1020,15 +1033,15 @@ Endpoint::Pointer UserInputMapper::parseDestination(const QJsonValue& value) {
 
 Endpoint::Pointer UserInputMapper::parseSource(const QJsonValue& value) {
     if (value.isArray()) {
-        AnyEndpoint::Pointer result = std::make_shared<AnyEndpoint>();
+        Endpoint::List children;
         for (auto arrayItem : value.toArray()) {
             Endpoint::Pointer destination = parseEndpoint(arrayItem);
             if (!destination) {
                 return Endpoint::Pointer();
             }
-            result->_children.push_back(destination);
+            children.push_back(destination);
         }
-        return result;
+        return std::make_shared<AnyEndpoint>(children);
     }
 
     return parseEndpoint(value);