From 8ade0b06f29cb94e6d500b75899fbc1e153cce2a Mon Sep 17 00:00:00 2001 From: starcalc Date: Wed, 10 Jan 2018 00:20:28 +0100 Subject: [PATCH] =?UTF-8?q?Boxanzahl=20korrigiert,=20Serial-Timeout=20eing?= =?UTF-8?q?ef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NeoPatterns.cpp | 6 ++---- esp-videoswitcher.ino | 10 ++++++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/NeoPatterns.cpp b/NeoPatterns.cpp index b45fb86..9973311 100644 --- a/NeoPatterns.cpp +++ b/NeoPatterns.cpp @@ -515,13 +515,10 @@ void NeoPatterns::RadarUpdate() if (angulardistance<0){ angulardistance+=32; } - } - if (angulardistance<=Radarfadelength){ uint8_t _brightness=(Radarfadelength-angulardistance)*255/Radarfadelength; - c= Color (int( pow( (_brightness/255.0),2)*255.0), _brightness ,int(pow( (_brightness/255.0),2)*200.0) ); } @@ -575,7 +572,8 @@ void NeoPatterns::colorBox(uint8_t boxid, uint32_t c){ //color a box // for (int i=boxid*3;i<(boxid+1)*3;i++) { // setPixelColor(i, c); // } - Serial.println("Coloring Box"); + Serial.print("Coloring Box "); + Serial.println(boxid); setPixelColor(boxs[boxid].left, c); setPixelColor(boxs[boxid].middle, c); setPixelColor(boxs[boxid].right, c); diff --git a/esp-videoswitcher.ino b/esp-videoswitcher.ino index 4aa88e7..f638761 100644 --- a/esp-videoswitcher.ino +++ b/esp-videoswitcher.ino @@ -7,7 +7,7 @@ #define PIN D7 // #define BIGPIXELS 20 #define NUMPIXELS 70 // 3 LEDs form one pixel -#define NUMBOXS 24 +#define NUMBOXS 25 // #define NUMPIXELS (BIGPIXELS * 3) // 3 LEDs form one pixel // #define NUMPIXELS 60 @@ -18,7 +18,7 @@ HomieNode homieNode("pixel", "commands"); #define TIMEOUT 500 #define FW_NAME "esp-videoswitcher" -#define FW_VERSION "1.0.2" +#define FW_VERSION "1.0.3" SoftwareSerial swSer(D2, D1); int currentnumber = 0; @@ -27,6 +27,7 @@ int commandbytes[4]; String output = ""; String output2 = ""; +unsigned long lastMillis = 0; /* @@ -337,6 +338,7 @@ void loop() { ArduinoOTA.handle(); while (swSer.available() > 0) { + lastMillis = millis(); int r1 = swSer.read(); Serial.print(currentnumber); Serial.print(": "); @@ -384,5 +386,9 @@ void loop() { Serial.print("<"); currentnumber++; } + if (millis() > lastMillis + 1000) + { + currentnumber = 0; + } } }