simongehrig/McLighting
1
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Merge with master, reformat

Browse Source
This commit is contained in:
Tobias Blum
2018-01-21 00:25:50 +01:00
parent 92a654b845
commit 1380fe8cac
5 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Arduino/McLighting/McLighting.ino
+1
View File
@@ -188,6 +188,7 @@ void setup() {
// Setup: Neopixel
// ***************************************************************************
strip.init();
strip.setBrightness(brightness);
strip.setSpeed(convertSpeed(ws2812fx_speed));
//strip.setMode(FX_MODE_RAINBOW_CYCLE);
strip.setColor(main_color.red, main_color.green, main_color.blue);
Arduino/McLighting/colormodes.h
-6
View File
@@ -2,8 +2,6 @@
// Color modes
// ***************************************************************************
///////////////////////
int dipInterval = 10;
int darkTime = 250;
unsigned long currentDipTime;
@@ -99,7 +97,3 @@ void tv() {
strip.show();
}
}
Arduino/McLighting/definitions.h
+5 -5
View File
@@ -1,10 +1,10 @@
// Neopixel
#define PIN D1 // PIN where neopixel / WS2811 strip is attached
#define NUMLEDS 7 // Number of leds in the strip
#define PIN 5 // PIN (5 / D1) where neopixel / WS2811 strip is attached
#define NUMLEDS 24 // Number of leds in the strip
//#define BUILTIN_LED 2 // ESP-12F has the built in LED on GPIO2, see https://github.com/esp8266/Arduino/issues/2192
#define BUTTON D2 // Input pin for switching the LED strip on / off, connect this PIN to ground to trigger button.
#define BUTTON 4 // Input pin (4 / D2) for switching the LED strip on / off, connect this PIN to ground to trigger button.
const char HOSTNAME[] = "ESP8266_VORONOI"; // Friedly hostname
const char HOSTNAME[] = "ESP8266_01"; // Friedly hostname
#define ENABLE_OTA // If defined, enable Arduino OTA code.
#define ENABLE_MQTT // If defined, enable MQTT client code.
@@ -26,7 +26,7 @@ uint32_t autoParams[][4] = { // color, speed, mode, duration (seconds)
char mqtt_intopic[strlen(HOSTNAME) + 4]; // Topic in will be: <HOSTNAME>/in
char mqtt_outtopic[strlen(HOSTNAME) + 5]; // Topic out will be: <HOSTNAME>/out
const char mqtt_clientid[] = "McLighting"; // MQTT ClientID
const char mqtt_clientid[] = "ESP8266Client"; // MQTT ClientID
char mqtt_host[64] = "";
char mqtt_port[6] = "";
Arduino/McLighting/request_handlers.h
-1
View File
@@ -1,7 +1,6 @@
// ***************************************************************************
// Request handlers
// ***************************************************************************
void getArgs() {
if (server.arg("rgb") != "") {
uint32_t rgb = (uint32_t) strtol(server.arg("rgb").c_str(), NULL, 16);
Arduino/McLighting/spiffs_webserver.h
-1
View File
@@ -155,4 +155,3 @@ void handleFileList() {
output += "]";
server.send(200, "text/json", output);
}