diff --git a/BSB_LAN/BSB_LAN.ino b/BSB_LAN/BSB_LAN.ino
index 57529956..c6b4893c 100644
--- a/BSB_LAN/BSB_LAN.ino
+++ b/BSB_LAN/BSB_LAN.ino
@@ -4894,7 +4894,6 @@ void loop() {
if (!strcmp_P(cLineBuffer, PSTR("/favicon.svg"))) {
printHTTPheader(HTTP_OK, MIME_TYPE_IMAGE_SVG, HTTP_DO_NOT_ADD_CHARSET_TO_HEADER, HTTP_FILE_NOT_GZIPPED, HTTP_NO_DOWNLOAD, HTTP_AUTO_CACHE_AGE);
printToWebClient(PSTR("\r\n"));
- printPStr(svg_favicon_header, sizeof(svg_favicon_header));
printPStr(svg_favicon, sizeof(svg_favicon));
flushToWebClient();
break;
@@ -6866,7 +6865,7 @@ next_parameter:
lastAvgTime = millis() / 60000;
// write averages to SD card to protect from power off
- if ((LoggingMode && CF_LOGMODE_SD_CARD) && avg_parameters[0].number > 0) { //write averages if at least one value is set
+ if ((LoggingMode & CF_LOGMODE_SD_CARD) && avg_parameters[0].number > 0) { //write averages if at least one value is set
File avgfile = SDCard.open(averagesFileName, FILE_WRITE);
if (avgfile) {
avgfile.seek(0);
@@ -7643,7 +7642,7 @@ void setup() {
pps_values[PPS_RTI] = 0;
}
- if (LoggingMode && CF_LOGMODE_SD_CARD) {
+ if (LoggingMode & CF_LOGMODE_SD_CARD) {
startLoggingDevice();
} else {
#ifndef ESP32
@@ -7786,7 +7785,7 @@ void setup() {
if (save_debug_mode == 2) telnetServer = new ComServer(23);
#ifndef ESP32
- if (!(LoggingMode && CF_LOGMODE_SD_CARD)) {
+ if (!(LoggingMode & CF_LOGMODE_SD_CARD)) {
digitalWrite(10,HIGH);
}
#endif
@@ -7819,7 +7818,7 @@ void setup() {
}
}
- if (LoggingMode && CF_LOGMODE_SD_CARD) {
+ if (LoggingMode & CF_LOGMODE_SD_CARD) {
printToDebug(PSTR("Calculating free space on SDCard..."));
uint32_t m = millis();
#if !defined(ESP32)
@@ -7910,7 +7909,7 @@ void setup() {
#endif
// restore average
- if (LoggingMode && CF_LOGMODE_24AVG && CF_LOGMODE_SD_CARD) {
+ if (LoggingMode & CF_LOGMODE_24AVG || LoggingMode & CF_LOGMODE_SD_CARD) {
if (SDCard.exists(averagesFileName)) {
File avgfile = SDCard.open(averagesFileName, FILE_READ);
if (avgfile) {
diff --git a/BSB_LAN/html_strings.h b/BSB_LAN/html_strings.h
index ce1a44e7..f29df63a 100644
--- a/BSB_LAN/html_strings.h
+++ b/BSB_LAN/html_strings.h
@@ -1,24 +1,22 @@
#define NEWLINE "" // set to "\n" to aid javascript debugging, set to "" to save space in transfer to client
-const char svg_favicon_header[] PROGMEM_LATE =
- ""
- "";
-const char svg_favicon[] PROGMEM_LATE =
- "";
-
// The following strings contain html/css/javascript code that has been manually indented; don't let automatic indent break this!
// *INDENT-OFF*
+const char svg_favicon[] PROGMEM_LATE =
+ "";
+
const char favicon[] PROGMEM_LATE = {
0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A, 0x00, 0x00, 0x00, 0x0D, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1F, 0xF3, 0xFF,