remove unused led-pin; reduce strip-length

This commit is contained in:
dreamer 2020-09-09 16:01:37 +02:00
parent 769b323970
commit 206be3e6aa
2 changed files with 1 additions and 23 deletions

View File

@ -78,7 +78,7 @@ unsigned long paletteTimeout = 0;
#define LED_TYPE WS2812B #define LED_TYPE WS2812B
#define COLOR_ORDER GRB #define COLOR_ORDER GRB
#define NUM_STRIPS 4 #define NUM_STRIPS 4
#define NUM_LEDS_PER_STRIP 16 #define NUM_LEDS_PER_STRIP 15
#define NUM_LEDS NUM_LEDS_PER_STRIP * NUM_STRIPS #define NUM_LEDS NUM_LEDS_PER_STRIP * NUM_STRIPS
CRGB leds[NUM_LEDS]; CRGB leds[NUM_LEDS];
@ -147,17 +147,12 @@ void setupCam() {
} }
void setup() { void setup() {
pinMode(led, OUTPUT);
digitalWrite(led, 1);
// delay(3000); // 3 second delay for recovery // delay(3000); // 3 second delay for recovery
Serial.begin(115200); Serial.begin(115200);
SPIFFS.begin(); SPIFFS.begin();
listDir(SPIFFS, "/", 1); listDir(SPIFFS, "/", 1);
// loadFieldsFromEEPROM(fields, fieldCount);
setupWifi(); setupWifi();
setupWeb(); setupWeb();
setupCam(); setupCam();

View File

@ -24,27 +24,21 @@
void setupWeb() { void setupWeb() {
webServer.on("/all", HTTP_GET, []() { webServer.on("/all", HTTP_GET, []() {
digitalWrite(led, 0);
String json = getFieldsJson(fields, fieldCount); String json = getFieldsJson(fields, fieldCount);
webServer.send(200, "text/json", json); webServer.send(200, "text/json", json);
digitalWrite(led, 1);
}); });
webServer.on("/fieldValue", HTTP_GET, []() { webServer.on("/fieldValue", HTTP_GET, []() {
digitalWrite(led, 0);
String name = webServer.arg("name"); String name = webServer.arg("name");
String value = getFieldValue(name, fields, fieldCount); String value = getFieldValue(name, fields, fieldCount);
webServer.send(200, "text/json", value); webServer.send(200, "text/json", value);
digitalWrite(led, 1);
}); });
webServer.on("/fieldValue", HTTP_POST, []() { webServer.on("/fieldValue", HTTP_POST, []() {
digitalWrite(led, 0);
String name = webServer.arg("name"); String name = webServer.arg("name");
String value = webServer.arg("value"); String value = webServer.arg("value");
String newValue = setFieldValue(name, value, fields, fieldCount); String newValue = setFieldValue(name, value, fields, fieldCount);
webServer.send(200, "text/json", newValue); webServer.send(200, "text/json", newValue);
digitalWrite(led, 1);
}); });
webServer.serveStatic("/", SPIFFS, "/index.htm", "max-age=86400"); webServer.serveStatic("/", SPIFFS, "/index.htm", "max-age=86400");
@ -64,8 +58,6 @@ void handleWeb() {
// check for connection // check for connection
if ( WiFi.status() == WL_CONNECTED ) { if ( WiFi.status() == WL_CONNECTED ) {
if (!webServerStarted) { if (!webServerStarted) {
// turn off the board's LED when connected to wifi
digitalWrite(led, 1);
Serial.println(); Serial.println();
Serial.println("WiFi connected"); Serial.println("WiFi connected");
Serial.print("IP address: "); Serial.print("IP address: ");
@ -74,14 +66,5 @@ void handleWeb() {
setupWeb(); setupWeb();
} }
webServer.handleClient(); webServer.handleClient();
} else {
// blink the board's LED while connecting to wifi
static uint8_t ledState = 0;
EVERY_N_MILLIS(125) {
ledState = ledState == 0 ? 1 : 0;
digitalWrite(led, ledState);
Serial.print (".");
}
} }
} }