Skip to content

Commit 0e98261

Browse files
committed
NeoPixelBus@2.8.2 + updated serial
1 parent 71e64fd commit 0e98261

File tree

3 files changed

+28
-34
lines changed

3 files changed

+28
-34
lines changed

include/Version.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

22
// AUTO GENERATED FILE, DO NOT EDIT
33
#ifndef VERSION
4-
#define VERSION "5.16.29"
4+
#define VERSION "5.16.30"
55
#endif
66
#ifndef BUILD_TIMESTAMP
7-
#define BUILD_TIMESTAMP "2024-09-07 17:11:31.698757"
7+
#define BUILD_TIMESTAMP "2024-09-10 11:03:11.308266"
88
#endif
99

src/Globals.cpp

Lines changed: 25 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -246,51 +246,45 @@ void Globals::sendSerialInfo() {
246246
if (currentMillisSendSerial > lastUdpMsgReceived + DELAY_1000) {
247247
framerateSerial = framerateCounterSerial > 0 ? framerateCounterSerial / 10 : 0;
248248
framerateCounterSerial = 0;
249-
if (framerateSerial == 0) {
250-
Serial.printf("framerate:%.1f\n", (framerateSerial > 1 ? framerateSerial : 0));
249+
Serial.printf("framerate:%f\n", (framerateSerial > 0.5 ? framerateSerial : 0));
251250
#ifdef TARGET_GLOWWORMLUCIFERINLIGHT
252-
Serial.printf("firmware:%s\n", "LIGHT");
251+
Serial.printf("firmware:%s\n", "LIGHT");
253252
#else
254-
Serial.printf("firmware:%s\n", "FULL");
255-
Serial.printf("mqttopic:%s\n", netManager.topicInUse.c_str());
253+
Serial.printf("firmware:%s\n", "FULL");
254+
Serial.printf("mqttopic:%s\n", netManager.topicInUse.c_str());
256255
#endif
257-
Serial.printf("ver:%s\n", VERSION);
258-
Serial.printf("lednum:%d\n", ledManager.dynamicLedNum);
256+
Serial.printf("ver:%s\n", VERSION);
257+
Serial.printf("lednum:%d\n", ledManager.dynamicLedNum);
259258
#if defined(ESP8266)
260-
Serial.printf("board:%s\n", "ESP8266");
259+
Serial.printf("board:%s\n", "ESP8266");
261260
#endif
262261
#if CONFIG_IDF_TARGET_ESP32C3
263-
Serial.printf("board:%s\n", "ESP32_C3_CDC");
262+
Serial.printf("board:%s\n", "ESP32_C3_CDC");
264263
#elif CONFIG_IDF_TARGET_ESP32S2
265-
Serial.printf("board:%s\n", "ESP32_S2");
264+
Serial.printf("board:%s\n", "ESP32_S2");
266265
#elif CONFIG_IDF_TARGET_ESP32S3
267266
#if ARDUINO_USB_MODE==1
268-
Serial.printf("board:%s\n", "ESP32_S3_CDC");
267+
Serial.printf("board:%s\n", "ESP32_S3_CDC");
269268
#else
270-
Serial.printf("board:%s\n", "ESP32_S3");
269+
Serial.printf("board:%s\n", "ESP32_S3");
271270
#endif
272271
#elif CONFIG_IDF_TARGET_ESP32
273-
Serial.printf("board:%s\n", "ESP32");
272+
Serial.printf("board:%s\n", "ESP32");
274273
#endif
275-
Serial.printf("MAC:%s\n", MAC.c_str());
276-
Serial.printf("gpio:%d\n", gpioInUse);
277-
Serial.printf("gpioClock:%d\n", gpioClockInUse);
278-
Serial.printf("baudrate:%d\n", baudRateInUse);
279-
Serial.printf("effect:%d\n", Globals::effectToInt(effect));
280-
Serial.printf("colorMode:%d\n", colorMode);
281-
Serial.printf("colorOrder:%d\n", colorOrder);
282-
Serial.printf("white:%d\n", whiteTempInUse);
283-
if (ldrEnabled) {
284-
Serial.printf("ldr:%d\n", ((ldrValue * 100) / ldrDivider));
285-
}
286-
Serial.printf("relayPin:%d\n", relayPin);
287-
Serial.printf("sbPin:%d\n", sbPin);
288-
Serial.printf("ldrPin:%d\n", ldrPin);
289-
} else {
290-
delay(1);
291-
Serial.printf("framerate:%.1f\n", (framerateSerial > 1 ? framerateSerial : 0));
292-
delay(1);
274+
Serial.printf("MAC:%s\n", MAC.c_str());
275+
Serial.printf("gpio:%d\n", gpioInUse);
276+
Serial.printf("gpioClock:%d\n", gpioClockInUse);
277+
Serial.printf("baudrate:%d\n", baudRateInUse);
278+
Serial.printf("effect:%d\n", Globals::effectToInt(effect));
279+
Serial.printf("colorMode:%d\n", colorMode);
280+
Serial.printf("colorOrder:%d\n", colorOrder);
281+
Serial.printf("white:%d\n", whiteTempInUse);
282+
if (ldrEnabled) {
283+
Serial.printf("ldr:%d\n", ((ldrValue * 100) / ldrDivider));
293284
}
285+
Serial.printf("relayPin:%d\n", relayPin);
286+
Serial.printf("sbPin:%d\n", sbPin);
287+
Serial.printf("ldrPin:%d\n", ldrPin);
294288
Serial.flush();
295289
}
296290
}

version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.16.29
1+
5.16.30

0 commit comments

Comments
 (0)