Re-include color profiles

now you can select two ways of how to change color of your saber: either the Gravity Color or Color Profiles to walk you through pre-set color settings.

Author: Protonerd

Buttons.cpp

@@ -3,7 +3,8 @@
  *
  *  Created on: 21 Octber 2016
  * author: 		Sebastien CAPOU (neskweek@gmail.com) and Andras Kun (kun.andras@yahoo.de)
- * Source : 	https://github.com/neskweek/LightSaberOS
+ * Source :  https://github.com/Protonerd/FX-SaberOS
+://github.com/neskweek/LightSaberOS
  */
 
 #include "Buttons.h"
@@ -110,7 +111,11 @@ void ConfigMenuButtonEventHandler(bool SaturateColor, ButtonActionEnum ButtonAct
       #ifdef GRAVITY_COLOR
         ColorMixing(storage.sndProfile[storage.soundFont].mainColor,modification,MAX_BRIGHTNESS, SaturateColor);
       #else if COLOR_PROFILE
-
+        if (ButtonActionType==SINGLE_CLICK){
+          confParseValue(modification, 0, 14, incrementSign);
+          modification = value;
+          getColorFix(modification);
+        }
       #endif
       storage.sndProfile[storage.soundFont].mainColor.r=currentColor.r;
       storage.sndProfile[storage.soundFont].mainColor.g=currentColor.g;
@@ -120,15 +125,31 @@ void ConfigMenuButtonEventHandler(bool SaturateColor, ButtonActionEnum ButtonAct
 
       }
     else if (ConfigModeSubStates==CS_CLASHCOLOR) {
-      ColorMixing(storage.sndProfile[storage.soundFont].clashColor,modification,MAX_BRIGHTNESS, SaturateColor);
+      #ifdef GRAVITY_COLOR
+        ColorMixing(storage.sndProfile[storage.soundFont].clashColor,modification,MAX_BRIGHTNESS, SaturateColor);
+      #else if COLOR_PROFILE
+        if (ButtonActionType==SINGLE_CLICK){
+          confParseValue(modification, 0, 14, incrementSign);
+          modification = value;
+          getColorFix(modification);
+        }
+      #endif 
       storage.sndProfile[storage.soundFont].clashColor.r=currentColor.r;
       storage.sndProfile[storage.soundFont].clashColor.g=currentColor.g;
       storage.sndProfile[storage.soundFont].clashColor.b=currentColor.b;
       lightOn(ledPins, -1, currentColor, 1, NUMPIXELS/2-1);
       delay(50);
     }
     else if (ConfigModeSubStates==CS_BLASTCOLOR) {
-      ColorMixing(storage.sndProfile[storage.soundFont].blasterboltColor,modification,MAX_BRIGHTNESS, SaturateColor);
+      #ifdef GRAVITY_COLOR
+        ColorMixing(storage.sndProfile[storage.soundFont].blasterboltColor,modification,MAX_BRIGHTNESS, SaturateColor);
+      #else if COLOR_PROFILE
+        if (ButtonActionType==SINGLE_CLICK){
+          confParseValue(modification, 0, 14, incrementSign);
+          modification = value;
+          getColorFix(modification);
+        }
+      #endif 
       storage.sndProfile[storage.soundFont].blasterboltColor.r=currentColor.r;
       storage.sndProfile[storage.soundFont].blasterboltColor.g=currentColor.g;
       storage.sndProfile[storage.soundFont].blasterboltColor.b=currentColor.b;

Buttons.h

@@ -3,7 +3,7 @@
  *
  *  Created on: 21 Octber 2016
  *  author: 		Sebastien CAPOU (neskweek@gmail.com) and Andras Kun (kun.andras@yahoo.de)
- *  Source : 	https://github.com/neskweek/LightSaberOS
+ *  Source :   https://github.com/Protonerd/FX-SaberOS
  */
 #include <Arduino.h>
 #if not defined BUTTONS_H_

ConfigMenu.cpp

@@ -2,7 +2,7 @@
  * Config.cpp
  *
  * author: 		Sebastien CAPOU (neskweek@gmail.com) and Andras Kun (kun.andras@yahoo.de)
- * Source : 	https://github.com/neskweek/LightSaberOS
+ * Source :  https://github.com/Protonerd/FX-SaberOS
  *      Author: neskw
  */
 #include "ConfigMenu.h"

ConfigMenu.h

@@ -2,7 +2,7 @@
  * Config.h
  *
  * author: 		Sebastien CAPOU (neskweek@gmail.com) and Andras Kun (kun.andras@yahoo.de)
- * Source : 	https://github.com/neskweek/LightSaberOS
+ * Source :  https://github.com/Protonerd/FX-SaberOS
  */
 
 #include <Arduino.h>
@@ -25,7 +25,7 @@ enum ConfigModeSubStatesEnum {CS_SOUNDFONT, CS_FLICKERTYPE, CS_SLEEPINIT, CS_LAS
 enum ConfigModeSubStatesEnum {CS_SOUNDFONT, CS_SLEEPINIT, CS_FLICKERTYPE, CS_MAINCOLOR, CS_CLASHCOLOR, CS_BLASTCOLOR, CS_SWINGSENSITIVITY, CS_VOLUME, CS_LASTMEMBER, CS_BATTERYLEVEL, CS_POWERONOFFTYPE, CS_STORAGEACCESS, CS_UARTMODE}; // never delete CS_LASTMEMBER!!! Needed to calculate number of elements in the enum type!!!
 #endif
 #if defined PIXELBLADE
-enum ConfigModeSubStatesEnum {CS_SOUNDFONT, CS_VOLUME, CS_SWINGSENSITIVITY, CS_FLICKERTYPE, CS_MAINCOLOR, CS_CLASHCOLOR, CS_BLASTCOLOR, CS_SLEEPINIT, CS_LASTMEMBER, CS_POWERONOFFTYPE, CS_BATTERYLEVEL, CS_STORAGEACCESS, CS_UARTMODE}; // never delete CS_LASTMEMBER!!! Needed to calculate number of elements in the enum type!!!
+enum ConfigModeSubStatesEnum {CS_SOUNDFONT, CS_SWINGSENSITIVITY, CS_FLICKERTYPE, CS_MAINCOLOR, CS_CLASHCOLOR, CS_BLASTCOLOR, CS_SLEEPINIT, CS_LASTMEMBER, CS_VOLUME, CS_POWERONOFFTYPE, CS_BATTERYLEVEL, CS_STORAGEACCESS, CS_UARTMODE}; // never delete CS_LASTMEMBER!!! Needed to calculate number of elements in the enum type!!!
 #endif
 
 // ====================================================================================

Config_HW.h

@@ -3,7 +3,7 @@
  *
  * Created on: 30 March 2017
  * author:    Andras Kun (kun.andras@yahoo.de)
- * Source :   https://github.com/neskweek/LightSaberOS
+ * Source :  https://github.com/Protonerd/FX-SaberOS
  * This tab contains all settings necessary to define your saber board's electronic hardware configuration
  */
 

Config_SW.h

@@ -3,7 +3,7 @@
  *
  * Created on: 30 March 2017
  * author:    Andras Kun (kun.andras@yahoo.de)
- * Source :   https://github.com/neskweek/LightSaberOS
+ * Source :  https://github.com/Protonerd/FX-SaberOS
  * This tab contains all settings necessary to define your saber board's electronic software configuration
  */
 
@@ -138,7 +138,7 @@
  *  If instead you would like to work with pre-set color profiles (15 different, pre-defined colors)
  *  comment out the line with GRAVITY_COLOR, which will define COLOR_PROFILE to be used.
  *************************************/
-#define GRAVITY_COLOR
+//#define GRAVITY_COLOR
 #ifndef GRAVITY_COLOR
   #define COLOR_PROFILE
 #endif

Light.cpp

@@ -2,7 +2,7 @@
  * Light.cpp
  *
  * author: 		Sebastien CAPOU (neskweek@gmail.com) and Andras Kun (kun.andras@yahoo.de)lightClashEffect
- * Source : 	https://github.com/neskweek/LightSaberOS
+ * Source :  https://github.com/Protonerd/FX-SaberOS
  */
 #include "Light.h"
 #include "Config_HW.h"
@@ -932,16 +932,19 @@ void lightClashEffect(uint8_t ledPins[], cRGB color) {
     for (uint8_t i = 0; i <= 5; i++) {
       analogWrite(ledPins[i], 255);
     }
+    delay(CLASH_FX_DURATION);  // clash duration
   #endif
 
   #if defined STAR_LED
     getColor(color);
     lightOn(ledPins, -1, currentColor);
+    delay(CLASH_FX_DURATION);  // clash duration
   #endif
 
   #ifdef ADF_PIXIE_BLADE
     //getColor(storage.sndProfile[storage.soundFont].clashColor);
     lightOn(ledPins, -1, color);
+    delay(CLASH_FX_DURATION);  // clash duration
   #endif
 
   #if defined PIXELBLADE
@@ -957,11 +960,110 @@ void lightClashEffect(uint8_t ledPins[], cRGB color) {
     else { // #else
           getColor(storage.sndProfile[storage.soundFont].clashColor);
           lightOn(ledPins, -1, currentColor);
+          delay(CLASH_FX_DURATION);  // clash duration
     } // #endif
   #endif
 
 }
 
+#ifdef COLOR_PROFILE
+void getColorFix(uint8_t colorID) {
+  switch (colorID) {
+  case 0:
+//Red
+    currentColor.r = 200;
+    currentColor.g = 0;
+    currentColor.b = 0;
+    break;
+  case 1:
+//Yellow
+    currentColor.r = 200;
+    currentColor.g = 200;
+    currentColor.b = 0;
+    break;
+  case 2:
+//Green
+    currentColor.r = 0;
+    currentColor.g = 200;
+    currentColor.b = 0;
+    break;
+  case 3:
+//Aqua
+    currentColor.r = 0;
+    currentColor.g = 200;
+    currentColor.b = 200;
+    break;
+  case 4:
+//Blue
+    currentColor.r = 0;
+    currentColor.g = 0;
+    currentColor.b = 200;
+    break;
+  case 5:
+//Fuschia
+    currentColor.r = 200;
+    currentColor.g = 0;
+    currentColor.b = 200;
+    break;
+  case 6:
+//DarkGrey
+    currentColor.r = 150;
+    currentColor.g = 150;
+    currentColor.b = 150;
+    break;
+  case 7:
+//DarkOrange
+    currentColor.r = 200;
+    currentColor.g = 102;
+    currentColor.b = 0;
+    break;
+  case 8:
+//DarkViolet
+    currentColor.r = 116;
+    currentColor.g = 0;
+    currentColor.b = 166;
+    break;
+  case 9:
+//DodgerBlue
+    currentColor.r = 24;
+    currentColor.g = 112;
+    currentColor.b = 200;
+    break;
+  case 10:
+//Gold
+    currentColor.r = 200;
+    currentColor.g = 168;
+    currentColor.b = 0;
+    break;
+  case 11:
+//GoldenRod
+    currentColor.r = 170;
+    currentColor.g = 130;
+    currentColor.b = 24;
+    break;
+  case 12:
+//Indigo
+    currentColor.r = 116;
+    currentColor.g = 0;
+    currentColor.b = 204;
+    break;
+  case 13:
+//LightGreen
+    currentColor.r = 112;
+    currentColor.g = 186;
+    currentColor.b = 112;
+    break;
+
+  default:
+// White (if enough voltage)
+    currentColor.r = 200;
+    currentColor.g = 200;
+    currentColor.b = 200;
+    break;
+  }
+} //getColorFix
+#endif
+
 void BladeMeter (uint8_t ledPins[], int meterLevel) {  //expects input of 0-100
   //normalize data if to max and min if out of range
   if (meterLevel <= 0) { meterLevel = 0; } 

Light.h

@@ -3,7 +3,7 @@
  *
  *  Created on: 21 Octber 2016
  * author: 		Sebastien CAPOU (neskweek@gmail.com) and Andras Kun (kun.andras@yahoo.de)
- * Source : 	https://github.com/neskweek/LightSaberOS
+ * Source :  https://github.com/Protonerd/FX-SaberOS
  */
 
 #if not defined LIGHT_H_
@@ -53,6 +53,8 @@ void lightClashEffect(uint8_t ledPins[], cRGB color={0,0,0});
 void pixelblade_KillKey_Enable();
 void pixelblade_KillKey_Disable();
 
+void getColorFix(uint8_t colorID);
+
 void FoCOn (uint8_t pin);
 void FoCOff (uint8_t pin);
 

Soundfont.h

@@ -3,8 +3,8 @@
  *
  * Created on: 	21 Octber 2016
  * author: 		Sebastien CAPOU (neskweek@gmail.com) and Andras Kun (kun.andras@yahoo.de)
- * Source : 	https://github.com/neskweek/LightSaberOS
- * Description:	Soundfont Config file for LightSaberOS
+ * Source : 	Source :   https://github.com/Protonerd/FX-SaberOS
+ * Description:	Soundfont Config file for FX-SaberOS
  *
  * This work is licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International License.
  * To view a copy of this license, visit http://creativecommons.org/licenses/by-nc-sa/4.0/.