wn/rgbled
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

code beautified

Browse Source
This commit is contained in:
Wolfgang Hottgenroth 2019-04-19 23:48:58 +02:00
parent 12f6197bf9
commit 902202963c
Signed by: wn
GPG Key ID: B586EAFCDF2F65F4
2 changed files with 40 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
defines.h
View File

@ -10,11 +10,24 @@
#define DEBUG #define DEBUG
// #define WS2811
#define PL9823
#define EEPROM_ADDR 0 #define EEPROM_ADDR 0
#define CONFIG_SWITCH 4 // Arduino numbering #define CONFIG_SWITCH 4 // Arduino numbering
#ifdef WS2811
#define PIXEL_PIN 1 // NODEMCU numbering #define PIXEL_PIN 1 // NODEMCU numbering
#endif
#ifdef PL9823
#define PIXEL_PIN D1
#endif
#define NUM_OF_LEDs 64 #define NUM_OF_LEDs 64
#endif /* DEFINES_H_ */ #endif /* DEFINES_H_ */

57
productionMode.cpp
View File

@ -7,9 +7,6 @@
// #define FASTLED
#define ADAFRUIT_NEOPIXEL
#include "defines.h" #include "defines.h"
#define MQTT_MAX_PACKET_SIZE 256 #define MQTT_MAX_PACKET_SIZE 256
@ -22,12 +19,12 @@
#include <ESP8266WebServer.h> #include <ESP8266WebServer.h>
#include <PubSubClient.h> #include <PubSubClient.h>
#ifdef FASTLED #ifdef WS2811
#define FASTLED_ESP8266_NODEMCU_PIN_ORDER #define FASTLED_ESP8266_NODEMCU_PIN_ORDER
#include <FastLED.h> #include <FastLED.h>
#endif #endif
#ifdef ADAFRUIT_NEOPIXEL #ifdef PL9823
#include <Adafruit_NeoPixel.h> #include <Adafruit_NeoPixel.h>
#endif #endif
@ -46,11 +43,11 @@ WiFiClientSecure espClient;
PubSubClient client(espClient); PubSubClient client(espClient);
#ifdef FASTLED #ifdef WS2811
CRGB leds[NUM_OF_LEDs]; CRGB leds[NUM_OF_LEDs];
#endif #endif
#ifdef ADAFRUIT_NEOPIXEL #ifdef PL9823
typedef struct { typedef struct {
uint8_t r; uint8_t r;
uint8_t g; uint8_t g;
@ -58,7 +55,7 @@ typedef struct {
} CRGB; } CRGB;
Adafruit_NeoPixel pixels(NUM_OF_LEDs, D1, NEO_RGB + NEO_KHZ400); Adafruit_NeoPixel pixels(NUM_OF_LEDs, PIXEL_PIN, NEO_RGB + NEO_KHZ400);
#endif #endif
void setup_wifi() { void setup_wifi() {
@ -192,19 +189,19 @@ void callback(char* topic, byte* payload, unsigned int length) {
// set brightness // set brightness
b = strtol(tokens[0], NULL, 10); b = strtol(tokens[0], NULL, 10);
for (uint8_t i = 0; i < NUM_OF_LEDs; i++) { for (uint8_t i = 0; i < NUM_OF_LEDs; i++) {
#ifdef FASTLED #ifdef WS2811
leds[i].r = b; leds[i].r = b;
leds[i].g = b; leds[i].g = b;
leds[i].b = b; leds[i].b = b;
#endif #endif
#ifdef ADAFRUIT_NEOPIXEL #ifdef PL9823
pixels.setPixelColor(i, pixels.Color(b, b, b)); pixels.setPixelColor(i, pixels.Color(b, b, b));
#endif #endif
} }
#ifdef FASTLED #ifdef WS2811
FastLED.show(); FastLED.show();
#endif #endif
#ifdef ADAFRUIT_NEOPIXEL #ifdef PL9823
pixels.show(); pixels.show();
#endif #endif
@ -214,13 +211,13 @@ void callback(char* topic, byte* payload, unsigned int length) {
n = strtol(tokens[0], NULL, 10); n = strtol(tokens[0], NULL, 10);
b = strtol(tokens[1], NULL, 10); b = strtol(tokens[1], NULL, 10);
if (n >= 0 && n < NUM_OF_LEDs) { if (n >= 0 && n < NUM_OF_LEDs) {
#ifdef FASTLED #ifdef WS2811
leds[n].r = b; leds[n].r = b;
leds[n].g = b; leds[n].g = b;
leds[n].b = b; leds[n].b = b;
FastLED.show(); FastLED.show();
#endif #endif
#ifdef ADAFRUIT_NEOPIXEL #ifdef PL9823
pixels.setPixelColor(n, pixels.Color(b, b, b)); pixels.setPixelColor(n, pixels.Color(b, b, b));
pixels.show(); pixels.show();
#endif #endif
@ -236,17 +233,17 @@ void callback(char* topic, byte* payload, unsigned int length) {
// on, off, color word for all LEDs // on, off, color word for all LEDs
colors = evaluationColorWord(tokens[0]); colors = evaluationColorWord(tokens[0]);
for (uint8_t i = 0; i < NUM_OF_LEDs; i++) { for (uint8_t i = 0; i < NUM_OF_LEDs; i++) {
#ifdef FASTLED #ifdef WS2811
leds[i] = colors; leds[i] = colors;
#endif #endif
#ifdef ADAFRUIT_NEOPIXEL #ifdef PL9823
pixels.setPixelColor(i, pixels.Color(colors.r, colors.g, colors.b)); pixels.setPixelColor(i, pixels.Color(colors.r, colors.g, colors.b));
#endif #endif
} }
#ifdef FASTLED #ifdef WS2811
FastLED.show(); FastLED.show();
#endif #endif
#ifdef ADAFRUIT_NEOPIXEL #ifdef PL9823
pixels.show(); pixels.show();
#endif #endif
break; break;
@ -255,11 +252,11 @@ void callback(char* topic, byte* payload, unsigned int length) {
n = strtol(tokens[0], NULL, 10); n = strtol(tokens[0], NULL, 10);
if (n >= 0 && n < NUM_OF_LEDs) { if (n >= 0 && n < NUM_OF_LEDs) {
colors = evaluationColorWord(tokens[1]); colors = evaluationColorWord(tokens[1]);
#ifdef FASTLED #ifdef WS2811
leds[n] = colors; leds[n] = colors;
FastLED.show(); FastLED.show();
#endif #endif
#ifdef ADAFRUIT_NEOPIXEL #ifdef PL9823
pixels.setPixelColor(n, pixels.Color(colors.r, colors.g, colors.b)); pixels.setPixelColor(n, pixels.Color(colors.r, colors.g, colors.b));
pixels.show(); pixels.show();
#endif #endif
@ -271,19 +268,19 @@ void callback(char* topic, byte* payload, unsigned int length) {
green = strtol(tokens[1], NULL, 10); green = strtol(tokens[1], NULL, 10);
blue = strtol(tokens[2], NULL, 10); blue = strtol(tokens[2], NULL, 10);
for (uint8_t i = 0; i < NUM_OF_LEDs; i++) { for (uint8_t i = 0; i < NUM_OF_LEDs; i++) {
#ifdef FASTLED #ifdef WS2811
leds[i].r = red; leds[i].r = red;
leds[i].g = green; leds[i].g = green;
leds[i].b = blue; leds[i].b = blue;
#endif #endif
#ifdef ADAFRUIT_NEOPIXEL #ifdef PL9823
pixels.setPixelColor(i, pixels.Color(red, green, blue)); pixels.setPixelColor(i, pixels.Color(red, green, blue));
#endif #endif
} }
#ifdef FASTLED #ifdef WS2811
FastLED.show(); FastLED.show();
#endif #endif
#ifdef ADAFRUIT_NEOPIXEL #ifdef PL9823
pixels.show(); pixels.show();
#endif #endif
break; break;
@ -294,13 +291,13 @@ void callback(char* topic, byte* payload, unsigned int length) {
red = strtol(tokens[1], NULL, 10); red = strtol(tokens[1], NULL, 10);
green = strtol(tokens[2], NULL, 10); green = strtol(tokens[2], NULL, 10);
blue = strtol(tokens[3], NULL, 10); blue = strtol(tokens[3], NULL, 10);
#ifdef FASTLED #ifdef WS2811
leds[n].r = red; leds[n].r = red;
leds[n].g = green; leds[n].g = green;
leds[n].b = blue; leds[n].b = blue;
FastLED.show(); FastLED.show();
#endif #endif
#ifdef ADAFRUIT_NEOPIXEL #ifdef PL9823
pixels.setPixelColor(n, pixels.Color(red, green, blue)); pixels.setPixelColor(n, pixels.Color(red, green, blue));
pixels.show(); pixels.show();
#endif #endif
@ -362,12 +359,12 @@ void setupProduction() {
setup_wifi(); setup_wifi();
client.setServer(configBlock.mqttBroker, configBlock.mqttPort); client.setServer(configBlock.mqttBroker, configBlock.mqttPort);
#ifdef FASTLED #ifdef WS2811
// FastLED.addLeds<NEOPIXEL, PIXEL_PIN>(leds, NUM_OF_LEDs); FastLED.addLeds<NEOPIXEL, PIXEL_PIN>(leds, NUM_OF_LEDs);
FastLED.addLeds<WS2812, PIXEL_PIN, GRB>(leds, NUM_OF_LEDs);
#endif #endif
#ifdef ADAFRUIT_NEOPIXEL #ifdef PL9823
pixels.begin(); pixels.begin();
pixels.clear();
#endif #endif
} }