Merge pull request #1355 from proddy/dev

minor changes
emsesp · Oct 22, 2023 · 4c789a6 · 4c789a6
2 parents be93627 + 2f6edfd
commit 4c789a6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,7 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Power entities
 - Optional input of BSSID for AP connection
-- Return empty json if no entries in scheduler/custom/analogsnesor/temperaturesensor
+- Return empty json if no entries in scheduler/custom/analogsensor/temperaturesensor
 
 ## Fixed
 

diff --git a/src/console.cpp b/src/console.cpp
@@ -360,37 +360,19 @@ static void setup_commands(std::shared_ptr<Commands> & commands) {
 
     commands->add_command(ShellContext::MAIN,
                           CommandFlags::ADMIN,
-                          string_vector{F_(scan), F_(devices)},
+                          string_vector{F_(scan)},
                           string_vector{F_(deep_optional)},
                           [](Shell & shell, const std::vector<std::string> & arguments) {
                               if (arguments.size() == 0) {
                                   to_app(shell).scan_devices();
                               } else {
                                   shell.printfln("Performing a deep scan...");
                                   to_app(shell).clear_all_devices();
-                                  std::vector<uint8_t> Device_Ids;
-
-                                  Device_Ids.push_back(0x08); // Boilers - 0x08
-                                  Device_Ids.push_back(0x38); // HeatPump - 0x38
-                                  Device_Ids.push_back(0x30); // Solar Module - 0x30
-                                  Device_Ids.push_back(0x09); // Controllers - 0x09
-                                  Device_Ids.push_back(0x02); // Connect - 0x02
-                                  Device_Ids.push_back(0x48); // Gateway - 0x48
-                                  Device_Ids.push_back(0x20); // Mixer Devices - 0x20
-                                  Device_Ids.push_back(0x21); // Mixer Devices - 0x21
-                                  Device_Ids.push_back(0x22); // Mixer Devices - 0x22
-                                  Device_Ids.push_back(0x23); // Mixer Devices - 0x23
-                                  Device_Ids.push_back(0x28); // Mixer Devices WW- 0x28
-                                  Device_Ids.push_back(0x29); // Mixer Devices WW- 0x29
-                                  Device_Ids.push_back(0x10); // Thermostats - 0x10
-                                  Device_Ids.push_back(0x17); // Thermostats - 0x17
-                                  Device_Ids.push_back(0x18); // Thermostat remote - 0x18
-                                  Device_Ids.push_back(0x19); // Thermostat remote - 0x19
-                                  Device_Ids.push_back(0x1A); // Thermostat remote - 0x1A
-                                  Device_Ids.push_back(0x1B); // Thermostat remote - 0x1B
-                                  Device_Ids.push_back(0x11); // Switches - 0x11
-
+                                  // device IDs taken from device_library.h
                                   // send the read command with Version command
+                                  const std::vector<uint8_t> Device_Ids = {0x02, 0x08, 0x09, 0x10, 0x11, 0x12, 0x15, 0x17, 0x18, 0x19, 0x1A,
+                                                                           0x1B, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29,
+                                                                           0x2A, 0x30, 0x38, 0x40, 0x41, 0x48, 0x50, 0x51, 0x60};
                                   for (const uint8_t device_id : Device_Ids) {
                                       to_app(shell).send_read_request(EMSdevice::EMS_TYPE_VERSION, device_id);
                                   }

diff --git a/src/mqtt.cpp b/src/mqtt.cpp
@@ -633,10 +633,12 @@ bool Mqtt::queue_message(const uint8_t operation, const std::string & topic, con
         packet_id = mqttClient_->unsubscribe(fulltopic);
         LOG_DEBUG("Unsubscribing to topic '%s', pid %d", fulltopic, packet_id);
     }
+#ifndef EMSESP_STANDALONE
     if (packet_id == 0) {
         LOG_WARNING("%s failed: %s", operation == Operation::PUBLISH ? "Publish" : operation == Operation::SUBSCRIBE ? "Subscribe" : "Unsubscribe", fulltopic);
         mqtt_publish_fails_++;
     }
+#endif
     return (packet_id != 0);
 }