diff --git a/one_d_pong/Adafruit_NeoPixel.cpp b/1D_pongESP32/Adafruit_NeoPixel.cpp similarity index 100% rename from one_d_pong/Adafruit_NeoPixel.cpp rename to 1D_pongESP32/Adafruit_NeoPixel.cpp diff --git a/one_d_pong/Adafruit_NeoPixel.h b/1D_pongESP32/Adafruit_NeoPixel.h similarity index 51% rename from one_d_pong/Adafruit_NeoPixel.h rename to 1D_pongESP32/Adafruit_NeoPixel.h index a62ab9b..d53da1f 100644 --- a/one_d_pong/Adafruit_NeoPixel.h +++ b/1D_pongESP32/Adafruit_NeoPixel.h @@ -20,79 +20,78 @@ #define ADAFRUIT_NEOPIXEL_H #if (ARDUINO >= 100) - #include +#include #else - #include - #include +#include +#include #endif // 'type' flags for LED pixels (third parameter to constructor): -#define NEO_RGB 0x00 // Wired for RGB data order -#define NEO_GRB 0x01 // Wired for GRB data order -#define NEO_BRG 0x04 - +#define NEO_RGB 0x00 // Wired for RGB data order +#define NEO_GRB 0x01 // Wired for GRB data order +#define NEO_BRG 0x04 + #define NEO_COLMASK 0x01 -#define NEO_KHZ800 0x02 // 800 KHz datastream +#define NEO_KHZ800 0x02 // 800 KHz datastream #define NEO_SPDMASK 0x02 // Trinket flash space is tight, v1 NeoPixels aren't handled by default. // Remove the ifndef/endif to add support -- but code will be bigger. // Conversely, can comment out the #defines to save space on other MCUs. #ifndef __AVR_ATtiny85__ -#define NEO_KHZ400 0x00 // 400 KHz datastream +#define NEO_KHZ400 0x00 // 400 KHz datastream #endif -class Adafruit_NeoPixel { - - public: +class Adafruit_NeoPixel +{ +public: // Constructor: number of LEDs, pin number, LED type - Adafruit_NeoPixel(uint16_t n, uint8_t p=6, uint8_t t=NEO_GRB + NEO_KHZ800); + Adafruit_NeoPixel(uint16_t n, uint8_t p = 6, uint8_t t = NEO_GRB + NEO_KHZ800); ~Adafruit_NeoPixel(); void - begin(void), - show(void), - setPin(uint8_t p), - setPixelColor(uint16_t n, uint8_t r, uint8_t g, uint8_t b), - setPixelColor(uint16_t n, uint32_t c), - setPixelColorHsv(uint16_t n, uint16_t h, uint8_t s, uint8_t v), - setBrightness(uint8_t), - clear(); + begin(void), + show(void), + setPin(uint8_t p), + setPixelColor(uint16_t n, uint8_t r, uint8_t g, uint8_t b), + setPixelColor(uint16_t n, uint32_t c), + setPixelColorHsv(uint16_t n, uint16_t h, uint8_t s, uint8_t v), + setBrightness(uint8_t), + clear(); uint8_t - *getPixels(void) const, - getBrightness(void) const; + * + getPixels(void) const, + getBrightness(void) const; uint16_t - numPixels(void) const; + numPixels(void) const; static uint32_t - Color(uint8_t r, uint8_t g, uint8_t b); + Color(uint8_t r, uint8_t g, uint8_t b); uint32_t - getPixelColor(uint16_t n) const; + getPixelColor(uint16_t n) const; inline bool - canShow(void) { return (micros() - endTime) >= 50L; } - - private: + canShow(void) { return (micros() - endTime) >= 50L; } +private: const uint16_t - numLEDs, // Number of RGB LEDs in strip - numBytes; // Size of 'pixels' buffer below + numLEDs, // Number of RGB LEDs in strip + numBytes; // Size of 'pixels' buffer below uint8_t - pin, // Output pin number - brightness, - *pixels, // Holds LED color values (3 bytes each) - rOffset, // Index of red byte within each 3-byte pixel - gOffset, // Index of green byte - bOffset; // Index of blue byte + pin, // Output pin number + brightness, + *pixels, // Holds LED color values (3 bytes each) + rOffset, // Index of red byte within each 3-byte pixel + gOffset, // Index of green byte + bOffset; // Index of blue byte const uint8_t - type; // Pixel flags (400 vs 800 KHz, RGB vs GRB color) + type; // Pixel flags (400 vs 800 KHz, RGB vs GRB color) uint32_t - endTime; // Latch timing reference + endTime; // Latch timing reference #ifdef __AVR__ const volatile uint8_t - *port; // Output PORT register + *port; // Output PORT register uint8_t - pinMask; // Output PORT bitmask + pinMask; // Output PORT bitmask #endif - }; #endif // ADAFRUIT_NEOPIXEL_H diff --git a/one_d_pong/notes.h b/1D_pongESP32/notes.h similarity index 100% rename from one_d_pong/notes.h rename to 1D_pongESP32/notes.h diff --git a/one_d_pong/one_d_pong.ino b/1D_pongESP32/one_d_pong.ino similarity index 100% rename from one_d_pong/one_d_pong.ino rename to 1D_pongESP32/one_d_pong.ino