Merge pull request #6 from GoWired/dev

Dev

Author: feanor-anglin

Software/MCU-Raw/Arduino/main/Configuration.h

@@ -63,10 +63,10 @@
 #define DIMMING_STEP 10                     // Size of dimming step, increase for faster, less smooth dimming (default 1)
 #define DIMMING_INTERVAL 1                  // Duration of dimming interval, increase for slower dimming (default 10)
 #define R_VALUE_OFF 255                     // 255 - OFF, 0 - Full ON
-#define G_VALUE_OFF 128
-#define B_VALUE_OFF 0
-#define R_VALUE_ON 0
-#define G_VALUE_ON 128
+#define G_VALUE_OFF 230
+#define B_VALUE_OFF 204
+#define R_VALUE_ON 153
+#define G_VALUE_ON 204
 #define B_VALUE_ON 255
 #define BRIGHTNESS_VALUE_OFF 100            // Global brightness value should always be set to 100
 #define BRIGHTNESS_VALUE_ON 100

Software/MCU/Arduino/main/Configuration.h

@@ -52,9 +52,8 @@
                     MySensors Definitions
  *  *******************************************************************************************/
 // Identification
-#define MY_NODE_ID AUTO                            // Set node ID
-#define SN "GoWired Touch Module"               // Set node name to present to a controller
-#define SV "1.0"                                // Set sensor version
+#define MY_NODE_ID AUTO                            // Set module ID
+#define SV "1.0"                                   // Set software version
 
 // Selecting transmission settings
 #define MY_RS485                              // Enable RS485 transport layer

Software/MCU/Arduino/main/Dimmer.cpp

@@ -9,7 +9,8 @@
  *  *******************************************************************************************/
 Dimmer::Dimmer()	{
 
-    NewState = 0;
+    NewDimmingLevel = 20;
+    CurrentState = false;
     _DimmingLevel = 20;
 
 }
@@ -22,7 +23,6 @@ void Dimmer::SetValues(uint8_t NumberOfChannels, uint8_t DimmingStep, uint8_t Di
 	_NumberOfChannels = NumberOfChannels;
 	_DimmingStep = DimmingStep;
 	_DimmingInterval = DimmingInterval;
-	_DimmerState = false;
 
   uint8_t Channels[4] = {Pin1, Pin2, Pin3, Pin4};
 
@@ -37,52 +37,54 @@ void Dimmer::UpdateDimmer()	{
 	bool AdjustDimming = true;
 	bool AdjustColors = true;
 	bool ColorStates[4] = {false, false, false, false};
-	int DeltaDimming = 0;
-	int DeltaColors = 0;
+	uint8_t DeltaDimming = 0;
+	uint8_t DeltaColors = 0;
 	uint32_t Time = millis() - _DimmingInterval;
 
-	do	{
-    if(millis() > Time + _DimmingInterval)	{
-		  if(_DimmingLevel != NewDimmingLevel)	{
-			  AdjustDimming = true;
-			  DeltaDimming = (NewDimmingLevel - _DimmingLevel) < 0 ? -_DimmingStep : _DimmingStep;
-			  _DimmingLevel += DeltaDimming;
-		  }
-		  else	{
-			  AdjustDimming = false;
-		  }
+  if(CurrentState) {
+	  do	{
+      if(millis() > Time + _DimmingInterval)	{
+		    if(_DimmingLevel != NewDimmingLevel)	{
+			    AdjustDimming = true;
+			    DeltaDimming = (NewDimmingLevel - _DimmingLevel) < 0 ? -_DimmingStep : _DimmingStep;
+			    _DimmingLevel += DeltaDimming;
+		    }
+		    else	{
+			    AdjustDimming = false;
+		    }
 
-		  for(int i=0; i<_NumberOfChannels; i++) {
-			  if(_Values[i] != NewValues[i])	{
-				  ColorStates[i] = true;
-				  DeltaColors = (_Values[i] - NewValues[i]) > 0 ? -_DimmingStep : _DimmingStep;
-				  _Values[i] += DeltaColors;
-			  }
-			  else	{
-				  ColorStates[i] = false;
-			  }
-		  }
+		    for(int i=0; i<_NumberOfChannels; i++) {
+			    if(_Values[i] != NewValues[i])	{
+				    ColorStates[i] = true;
+				    DeltaColors = (_Values[i] - NewValues[i]) > 0 ? -_DimmingStep : _DimmingStep;
+				    _Values[i] += DeltaColors;
+			    }
+			    else	{
+				    ColorStates[i] = false;
+			    }
+		    }
 
-		  for(int i=0; i<_NumberOfChannels; i++) {
-			  if(ColorStates[i])	{
-				  AdjustColors = true;
-				  break;
-			  }
-        else  {
-          AdjustColors = false;
-        }
-		  }
+		    for(int i=0; i<_NumberOfChannels; i++) {
+			    if(ColorStates[i] == true)	{
+				    AdjustColors = true;
+				    break;
+			    }
+          else  {
+            AdjustColors = false;
+          }
+		    }
 
-		  for(int i=0; i<_NumberOfChannels; i++) {
-			  analogWrite(_Channels[i], (int)(_DimmingLevel / 100.0 * _Values[i]));
-		  }
+		    for(int i=0; i<_NumberOfChannels; i++) {
+			    analogWrite(_Channels[i], (int)(_DimmingLevel / 100.0 * _Values[i]));
+		    }
 
-      Time = millis();
-    }
-    else if(millis() < Time) {
-      Time = millis();
-    }
-	} while(AdjustColors || AdjustDimming);
+        Time = millis();
+      }
+      else if(millis() < Time) {
+        Time = millis();
+      }
+	  } while(AdjustColors || AdjustDimming);
+  }
 }
 
 /*  *******************************************************************************************
@@ -133,24 +135,29 @@ void Dimmer::ChangeColors() {
 /*  *******************************************************************************************
  *                                      Change Status
  *  *******************************************************************************************/
-void Dimmer::ChangeState() {
+void Dimmer::ChangeState(bool NewState) {
 
-  _DimmerState = NewState;
+  uint8_t TempDimmingLevel = NewDimmingLevel;
+
+  if(NewState != CurrentState)  {
+    CurrentState = NewState;
 
-  if(!NewState) {
-    uint8_t TempLevel = _DimmingLevel;
-    NewDimmingLevel = 0;
+    if(!NewState) {
+      uint8_t TempLevel = _DimmingLevel;
+      NewDimmingLevel = 0;
 
-    ChangeLevel();
+      ChangeLevel();
 
-    _DimmingLevel = TempLevel;
-  }
-  else  {
-    NewDimmingLevel = _DimmingLevel;
-    _DimmingLevel = 0;
+      _DimmingLevel = TempLevel;
+    }
+    else  {
+      //NewDimmingLevel = _DimmingLevel;
+      _DimmingLevel = 0;
 
-    ChangeLevel();
+      ChangeLevel();
+    }
   }
+  NewDimmingLevel = TempDimmingLevel;
 }
 
 /*  *******************************************************************************************

Software/MCU/Arduino/main/Dimmer.h

@@ -16,22 +16,20 @@ class Dimmer
     void UpdateDimmer();
     void ChangeLevel();
     void ChangeColors();
-    void ChangeState();
+    void ChangeState(bool NewState);
     void NewColorValues(const char *input);
 
-    bool NewState = 0;
-    uint8_t NewDimmingLevel = 0;
+    bool CurrentState;
+    uint8_t NewDimmingLevel;
     uint8_t NewValues[4] = {255, 255, 255, 255};
 
   private:
-    bool _DimmerState;
     uint8_t _NumberOfChannels;
     uint8_t _DimmingStep;
     uint8_t _DimmingInterval;
     uint8_t _Channels[4];
     uint8_t _Values[4] = {0, 0, 0, 0};
     uint8_t _DimmingLevel;
-    //uint32_t _DimmerTime;
 
     byte fromhex(const char *str);
 };