Merge pull request #1651 from proddy/dev

minor text changes
emsesp · Mar 9, 2024 · c5f2dba · c5f2dba
2 parents a5ef1d1 + b94b3e7
commit c5f2dba
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/platformio.ini b/platformio.ini
@@ -188,7 +188,7 @@ platform = native
 build_flags =
   -DARDUINOJSON_ENABLE_STD_STRING=1 -DARDUINOJSON_ENABLE_PROGMEM=1 -DARDUINOJSON_ENABLE_ARDUINO_STRING -DARDUINOJSON_USE_DOUBLE=0
   -DEMSESP_DEBUG -DEMSESP_STANDALONE -DEMSESP_TEST
-  -DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_TX_MODE=8 -DEMSESP_DEFAULT_VERSION=\"3.6.5-dev\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32\"
+  -DEMSESP_DEFAULT_LOCALE=\"en\" -DEMSESP_DEFAULT_TX_MODE=8 -DEMSESP_DEFAULT_VERSION=\"3.6.5-dev.16\" -DEMSESP_DEFAULT_BOARD_PROFILE=\"S32\"
 	-lpthread
   -D__linux__
   -std=gnu++11 -Og -ggdb

diff --git a/scripts/dump_entities.sh b/scripts/dump_entities.sh
@@ -4,6 +4,6 @@
 # run from top folder like `sh ./scripts/dump_entities.sh`
 rm -f dump_entities.csv
 make clean
-make ARGS=-DEMSESP_STANDALONE_DUMP
+make ARGS=-DEMSESP_STANDALONE
 echo "test entity_dump" | ./emsesp | python3 ./scripts/dump_entities.py > dump_entities.csv
 cat dump_entities.csv
diff --git a/src/console.cpp b/src/console.cpp
@@ -594,13 +594,15 @@ void EMSESPShell::stopped() {
 // show welcome banner
 void EMSESPShell::display_banner() {
     println();
-    printfln("┌───────────────────────────────────────┐");
-    printfln("│ %sEMS-ESP version %-12s%s          │", COLOR_BOLD_ON, EMSESP_APP_VERSION, COLOR_BOLD_OFF);
-    printfln("│ %s%shttps://github.com/emsesp/EMS-ESP32%s   │", COLOR_BRIGHT_GREEN, COLOR_UNDERLINE, COLOR_RESET);
-    printfln("│                                       │");
-    printfln("│ type %shelp%s to show available commands  │", COLOR_UNDERLINE, COLOR_RESET);
-    printfln("│ use %ssu%s to access Admin commands       │", COLOR_UNDERLINE, COLOR_RESET);
-    printfln("└───────────────────────────────────────┘");
+    printfln("┌──────────────────────────────────────────┐");
+    printfln("│ %sEMS-ESP version %-12s%s             │", COLOR_BOLD_ON, EMSESP_APP_VERSION, COLOR_BOLD_OFF);
+    printfln("│                                          │");
+    printfln("│ %shelp%s to show available commands          │", COLOR_UNDERLINE, COLOR_RESET);
+    printfln("│ %ssu%s to access admin commands              │", COLOR_UNDERLINE, COLOR_RESET);
+    printfln("│                                          │");
+    printfln("│ %s%shttps://github.com/emsesp/EMS-ESP32%s      │", COLOR_BRIGHT_GREEN, COLOR_UNDERLINE, COLOR_RESET);
+    printfln("│                                          │");
+    printfln("└──────────────────────────────────────────┘");
     println();
 
     // set console name

diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp
@@ -233,7 +233,8 @@ std::shared_ptr<Thermostat::HeatingCircuit> Thermostat::heating_circuit(const ui
             return heating_circuit;
         }
     }
-    LOG_DEBUG("Heating circuit not fond on device 0x%02X", device_id());
+
+    LOG_DEBUG("Heating circuit not found on device 0x%02X", device_id());
     return nullptr; // not found
 }
 
@@ -4224,9 +4225,11 @@ void Thermostat::register_device_values() {
         break;
     }
 
-#if defined(EMSESP_STANDALONE_DUMP)
+#if defined(EMSESP_STANDALONE)
     // if we're just dumping out values, create a single dummy hc
-    register_device_values_hc(std::make_shared<Thermostat::HeatingCircuit>(1, this->model())); // hc=1
+    auto new_hc = std::make_shared<Thermostat::HeatingCircuit>(1, this->model()); // hc = 1
+    heating_circuits_.push_back(new_hc);
+    register_device_values_hc(new_hc);
 #endif
 }
 

diff --git a/src/test/test.cpp b/src/test/test.cpp
@@ -301,7 +301,7 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd, const
 
     if (command == "add") {
         shell.printfln("Testing Adding a device (product_id %d), with all values...", id2);
-        test("add", id1, id2); // e.g. 8 172
+        test("add", id1, id2); // e.g. "test add 0x8 172"
         shell.invoke_command("show values");
         ok = true;
     }