Skip to content

Commit

Permalink
[email protected] + updated serial
Browse files Browse the repository at this point in the history
  • Loading branch information
sblantipodi committed Sep 10, 2024
1 parent 71e64fd commit 0e98261
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 34 deletions.
4 changes: 2 additions & 2 deletions include/Version.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@

// AUTO GENERATED FILE, DO NOT EDIT
#ifndef VERSION
#define VERSION "5.16.29"
#define VERSION "5.16.30"
#endif
#ifndef BUILD_TIMESTAMP
#define BUILD_TIMESTAMP "2024-09-07 17:11:31.698757"
#define BUILD_TIMESTAMP "2024-09-10 11:03:11.308266"
#endif

56 changes: 25 additions & 31 deletions src/Globals.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -246,51 +246,45 @@ void Globals::sendSerialInfo() {
if (currentMillisSendSerial > lastUdpMsgReceived + DELAY_1000) {
framerateSerial = framerateCounterSerial > 0 ? framerateCounterSerial / 10 : 0;
framerateCounterSerial = 0;
if (framerateSerial == 0) {
Serial.printf("framerate:%.1f\n", (framerateSerial > 1 ? framerateSerial : 0));
Serial.printf("framerate:%f\n", (framerateSerial > 0.5 ? framerateSerial : 0));
#ifdef TARGET_GLOWWORMLUCIFERINLIGHT
Serial.printf("firmware:%s\n", "LIGHT");
Serial.printf("firmware:%s\n", "LIGHT");
#else
Serial.printf("firmware:%s\n", "FULL");
Serial.printf("mqttopic:%s\n", netManager.topicInUse.c_str());
Serial.printf("firmware:%s\n", "FULL");
Serial.printf("mqttopic:%s\n", netManager.topicInUse.c_str());
#endif
Serial.printf("ver:%s\n", VERSION);
Serial.printf("lednum:%d\n", ledManager.dynamicLedNum);
Serial.printf("ver:%s\n", VERSION);
Serial.printf("lednum:%d\n", ledManager.dynamicLedNum);
#if defined(ESP8266)
Serial.printf("board:%s\n", "ESP8266");
Serial.printf("board:%s\n", "ESP8266");
#endif
#if CONFIG_IDF_TARGET_ESP32C3
Serial.printf("board:%s\n", "ESP32_C3_CDC");
Serial.printf("board:%s\n", "ESP32_C3_CDC");
#elif CONFIG_IDF_TARGET_ESP32S2
Serial.printf("board:%s\n", "ESP32_S2");
Serial.printf("board:%s\n", "ESP32_S2");
#elif CONFIG_IDF_TARGET_ESP32S3
#if ARDUINO_USB_MODE==1
Serial.printf("board:%s\n", "ESP32_S3_CDC");
Serial.printf("board:%s\n", "ESP32_S3_CDC");
#else
Serial.printf("board:%s\n", "ESP32_S3");
Serial.printf("board:%s\n", "ESP32_S3");
#endif
#elif CONFIG_IDF_TARGET_ESP32
Serial.printf("board:%s\n", "ESP32");
Serial.printf("board:%s\n", "ESP32");
#endif
Serial.printf("MAC:%s\n", MAC.c_str());
Serial.printf("gpio:%d\n", gpioInUse);
Serial.printf("gpioClock:%d\n", gpioClockInUse);
Serial.printf("baudrate:%d\n", baudRateInUse);
Serial.printf("effect:%d\n", Globals::effectToInt(effect));
Serial.printf("colorMode:%d\n", colorMode);
Serial.printf("colorOrder:%d\n", colorOrder);
Serial.printf("white:%d\n", whiteTempInUse);
if (ldrEnabled) {
Serial.printf("ldr:%d\n", ((ldrValue * 100) / ldrDivider));
}
Serial.printf("relayPin:%d\n", relayPin);
Serial.printf("sbPin:%d\n", sbPin);
Serial.printf("ldrPin:%d\n", ldrPin);
} else {
delay(1);
Serial.printf("framerate:%.1f\n", (framerateSerial > 1 ? framerateSerial : 0));
delay(1);
Serial.printf("MAC:%s\n", MAC.c_str());
Serial.printf("gpio:%d\n", gpioInUse);
Serial.printf("gpioClock:%d\n", gpioClockInUse);
Serial.printf("baudrate:%d\n", baudRateInUse);
Serial.printf("effect:%d\n", Globals::effectToInt(effect));
Serial.printf("colorMode:%d\n", colorMode);
Serial.printf("colorOrder:%d\n", colorOrder);
Serial.printf("white:%d\n", whiteTempInUse);
if (ldrEnabled) {
Serial.printf("ldr:%d\n", ((ldrValue * 100) / ldrDivider));
}
Serial.printf("relayPin:%d\n", relayPin);
Serial.printf("sbPin:%d\n", sbPin);
Serial.printf("ldrPin:%d\n", ldrPin);
Serial.flush();
}
}
Expand Down
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5.16.29
5.16.30

0 comments on commit 0e98261

Please sign in to comment.