Small tweaks

Quirkbot · Nov 24, 2015 · 1939c30 · 1939c30
1 parent cd3a7aa
commit 1939c30
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/src/Event.cpp b/src/Event.cpp
@@ -24,4 +24,4 @@ void Event::dispatch(float &value){
 	for(int i=0; i<typedInputHandlers.size(); i++){
 		(typedInputs[i]->*(typedInputHandlers[i]))(value);
 	}
-}
+}
diff --git a/src/Input.cpp b/src/Input.cpp
@@ -1,6 +1,7 @@
 #include "Input.h"
 
 Input::Input(){
+	node = NULL;
 	output = NULL;
 	value = 0;
 }
@@ -36,7 +37,9 @@ void Input::handleOutputConnection(const Output &output){
 }
 void Input::onOutputChange(float value){
 	this->value = value;
-	if(node) node->onInternalInputChange(*this);
+	if(node != NULL){
+		node->onInternalInputChange(*this);
+	}
 }
 void Input::clearOutput(){
 	if(output){

diff --git a/src/Input.h b/src/Input.h
@@ -11,7 +11,7 @@ class Input : public BaseInput{
 
 	Input();
 	~Input();
-	
+
 	/**
 	 * Handle for primitives connections.
 	 **/
@@ -29,7 +29,7 @@ class Input : public BaseInput{
 
 	/**
 	 * Getter
-	 **/	
+	 **/
 	float get();
 
 	protected:
@@ -41,4 +41,4 @@ class Input : public BaseInput{
 	float value;
 	Output * output;
 };
-#endif
+#endif
diff --git a/src/Led.cpp b/src/Led.cpp
@@ -55,8 +55,9 @@ void Led::onInternalInputChange(BaseInput &internalInput){
 		}
 		isOn = false;
 	}
-
-	pwmCompare = (int)((float)Bot::INTERUPT_COUNT_OVERFLOW * pow(light.get(), 1.5));
+	else if(&internalInput == &light){
+		pwmCompare = (int)((float)Bot::INTERUPT_COUNT_OVERFLOW * pow(light.get(), 1.5));
+	}
 }
 volatile void Led::interruptUpdate(){
 	if(Bot::interruptCount < pwmCompare && !isOn){