mxcory/Roller-Shade-Controller
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move settings to config.

Browse Source 
Added ability to set button debounce in config
This commit is contained in:
mrcory
2019-05-24 11:37:24 -04:00
parent e5f974fe5e
commit eca735a637
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shade_controller/config.h
+11 -4
View File
@@ -9,7 +9,7 @@ long shade[5] = {0,20500,41000,60000,0};
#define stepperSpeed 950.0 //Max Speed
#define stepperAccel 200.0 //Acceleration Rate
int connectTimeout = 100; // How many attempts can we make before giving up on Blynk
int connectTimeout = 100; // How many attempts can we make before giving up on Blynk
#define blynkRtcInterval = 30; //How often to sync the time
#include "blynk.h" //Contains Blynk login
@@ -39,7 +39,7 @@ const int stepPerRev = 4096; //Steps needed to make 1 revolution
//Button Config
#define buttonEnable true //True to enable button controls
#define buttonPin A0 //Analog pin for buttons
#define buttonPin A0 //Analog pin for buttons
//AnalogRead values for buttons
#define upVal 964
@@ -52,12 +52,13 @@ const int stepPerRev = 4096; //Steps needed to make 1 revolution
* values set above, this can be set larger.
*/
#define buttonMargin 30
#define buttonDebounce 3 //Debounce for buttons. Lower causes faster trigger.
#define ANALOGBUTTONS_SAMPLING_INTERVAL 10
//Feedback for button presses
#define lightEnable true //Allow control of LED
#define ledPin D4 //Feedback LED
#define ledPin D4 //Feedback LED
/* This will allow control of an accessory light via
* PWM or FastLED.
@@ -66,7 +67,7 @@ const int stepPerRev = 4096; //Steps needed to make 1 revolution
* power consumption and add a safety margin.
*/
#define alternateFunction false //Enable alternate use of the reset button
#define lightMode 1 //0-PWM 1-FastLED | PWM is currently not implemented.
#define lightMode 1 //0-PWM 1-FastLED | PWM is currently not implemented.
/* Light accessory settings (Not the feedback LED)
* Using FastLED to run some WS2812
@@ -76,6 +77,12 @@ const int stepPerRev = 4096; //Steps needed to make 1 revolution
int ledBrightness = 2; //Starting brightness
int ledButtonBrightness = 50; //Brightness to use when using rst button to turn on light.
//FastLED Settings
#define NUM_LEDS 9 //Number of attached LEDs
#define DATA_PIN D1 //Communication pin for the LEDs
#define LED_TYPE WS2812 //LED controller
#define COLOR_ORDER GRB //Order to send colors
//Extra Stuff
#define rtcBlynk false
shade_controller/shade_controller.ino
+3 -5
View File
@@ -26,11 +26,9 @@
//FastLED Setup
#include <FastLED.h>
FASTLED_USING_NAMESPACE
#define NUM_LEDS 9
#define DATA_PIN D1
#define LED_TYPE WS2812
#define COLOR_ORDER GRB
CRGB leds[NUM_LEDS];
@@ -127,7 +125,7 @@ int currentColor[3] = {255,255,255};
}
//Create tha actual buttons
AnalogButtons buttons(buttonPin, INPUT,4,buttonMargin);
AnalogButtons buttons(buttonPin, INPUT,buttonDebounce,buttonMargin);
Button up = Button(upVal, &upClick, &upHold, 1000, 5000);
Button down = Button(dnVal, &downClick, &downHold, 1000, 5000);
Button rst = Button(rsVal, &resetClick, &resetHold, 2500, 5000);