diff --git a/BluefruitConfig.h b/BluefruitConfig.h index 05599aa..12bf9ff 100644 --- a/BluefruitConfig.h +++ b/BluefruitConfig.h @@ -1,3 +1,21 @@ +#define GAMMA_CORRECTION { \ + 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, \ + 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, \ + 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, \ + 3, 4, 4, 4, 4, 4, 4, 4, 5, 5, 5, 5, 5, 6, 6, 6, \ + 6, 7, 7, 7, 7, 8, 8, 8, 8, 9, 9, 9, 10, 10, 10, 11, \ + 11, 11, 12, 12, 12, 13, 13, 14, 14, 14, 15, 15, 16, 16, 17, 17, \ + 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, 23, 23, 24, 25, 25, 26, \ + 26, 27, 28, 28, 29, 30, 30, 31, 32, 33, 33, 34, 35, 36, 36, 37, \ + 38, 39, 40, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 51, \ + 52, 53, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 67, 68, 69, \ + 70, 71, 73, 74, 75, 76, 78, 79, 80, 82, 83, 84, 86, 87, 88, 90, \ + 91, 93, 94, 96, 97, 99,100,102,103,105,106,108,110,111,113,115, \ +116,118,120,121,123,125,127,128,130,132,134,136,138,139,141,143, \ +145,147,149,151,153,155,157,159,161,163,165,168,170,172,174,176, \ +178,181,183,185,187,190,192,194,197,199,201,204,206,209,211,214, \ +216,219,221,224,226,229,232,234,237,240,242,245,248,250,253,255} + // COMMON SETTINGS // ---------------------------------------------------------------------------------------------- // These settings are used in both SW UART, HW UART and SPI mode diff --git a/suitleds-keiran.ino b/suitleds-keiran.ino index a4524b9..81377aa 100644 --- a/suitleds-keiran.ino +++ b/suitleds-keiran.ino @@ -10,16 +10,21 @@ #include "BluefruitConfig.h" +const uint8_t PROGMEM gamma[] = GAMMA_CORRECTION; + #define REQUIRE_SERIAL false #define BT_SCAN_MS 50 #define MIN_FIRMWARE "0.7.0" #define FACTORYRESET true -#define DIM_FACTOR 32 #define SHIFTING_STOPPED 0 #define SHIFTING_FORWARD 1 #define SHIFTING_REVERSE 2 +#define PATTERN_OFF 0 +#define PATTERN_RAINBOW 1 +#define PATTERN_RED 2 + // Updated with bluetooth connection state volatile bool conn = false; @@ -133,29 +138,22 @@ class Strip { unsigned long last; uint8_t offset = num_pixels; uint8_t shifting = SHIFTING_REVERSE; - Adafruit_NeoPixel pixel; public: + Adafruit_NeoPixel pixel; uint16_t wait; char pattern; uint8_t amplitude = 0; Strip(uint8_t led_pin, uint8_t strip_len) { - pattern = 'r'; + pattern = PATTERN_RED; pin = led_pin; num_pixels = strip_len; wait = 0; last = millis(); offset = 0; pixel = Adafruit_NeoPixel(num_pixels, pin, NEO_GRBW + NEO_KHZ800); - } - - void off(void){ pixel.begin(); - for(uint8_t i=0; i