diff options
Diffstat (limited to 'Stickman-Costume.ino')
-rw-r--r-- | Stickman-Costume.ino | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/Stickman-Costume.ino b/Stickman-Costume.ino index dfc7ad8..4edf99b 100644 --- a/Stickman-Costume.ino +++ b/Stickman-Costume.ino @@ -7,23 +7,23 @@ * 3 Fast Strobe */ #define OUT_PWM 1 // The LED-strip is connected to PB1 -#define IN_MODE 2 // Pressing this increments 'mode' by one +#define IN_MODE 4 // Pressing this increments 'mode' by one #define IN_ADJ 3 // This button adjusts the brightness -int CMode = 0; // This is just the current mode +int CMode = 2; // This is just the current mode int ExistingModes = 4; // This is the number of modes that are implemented // Used for saving button state bool IN_ADJ_STATE = false; // bool IN_MODE_STATE = false; // // These are for the general pwm-frequency (not all modes care) -int CBrightness = 50; // The brightness of the strip, between '0' and '255' +int CBrightness = 255; // The brightness of the strip, between '0' and '255' int CDimDirection = 0; // Used to know if the brightness should be increasing or decreasing based on the button press // These are used by the strobe-effect int CStrobeRevs = 0; // A running counter for the strobe-light int StrobeState = 0; // '0' or '1' for saving the state of the output -int StrobeSlowFreq = 1024; -int StrobeMedFreq = 600; -int StrobeFastFreq = 200; +int StrobeSlowFreq = 70; +int StrobeMedFreq = 30; +int StrobeFastFreq = 5; void setup() { @@ -35,7 +35,7 @@ void setup() { /* loop * * it takes aprox. ?ms to run through the loop once, whitout changing pwm freq - */ + */ void loop() { delay(1); @@ -47,17 +47,17 @@ void loop() { } } // If 'Adjust-button' is pressed - if (digitalRead(DIMPIN) == HIGH) { + if (digitalRead(IN_ADJ) == HIGH) { if (CDimDirection == 1) { CBrightness++; } if (CDimDirection == 0) { CBrightness--; } if (CBrightness >= 255) { CDimDirection = 0; } if (CBrightness <= 0) { CDimDirection = 1; } } - + // Do animation-things - switch (var) { + switch (CMode) { case 0: // Static - analogWrite(OUT_PWM, CBrightness); + analogWrite(OUT_PWM, CBrightness); break; case 1: // Slow Strobe @@ -100,9 +100,8 @@ void strobe() { if (StrobeState == 1) { StrobeState = 0; setOutPwm(0); - } - if (StrobeState == 0) { + } else if (StrobeState == 0) { StrobeState = 1; setOutPwm(CBrightness); } -}
\ No newline at end of file +} |