Changed command topic from /set to /command

This commit is contained in:
2024-02-13 11:49:57 +11:00
parent 01f2e267a9
commit bbc54947b1

View File

@@ -30,7 +30,7 @@ EspMQTTClient client(
auto timer = Timer<10, millis, uint16_t>(); auto timer = Timer<10, millis, uint16_t>();
void processPacket(const Packet*); void processPacket(const Packet*);
void processSetMessage(const String& topic, const String &payload); void processCommandMessage(const String& topic, const String &payload);
void processSetPositionMessage(const String& topic, const String &payload); void processSetPositionMessage(const String& topic, const String &payload);
bool sendOpenPacket(uint16_t destination); bool sendOpenPacket(uint16_t destination);
@@ -149,7 +149,7 @@ void onConnectionEstablished() {
Serial.println("Connection established"); Serial.println("Connection established");
for (size_t i = 0; i < shades.size(); i++) { for (size_t i = 0; i < shades.size(); i++) {
client.subscribe("hotdog/" + shades[i].name + "/set", processSetMessage); client.subscribe("hotdog/" + shades[i].name + "/command", processCommandMessage);
client.subscribe("hotdog/" + shades[i].name + "/set_position", processSetPositionMessage); client.subscribe("hotdog/" + shades[i].name + "/set_position", processSetPositionMessage);
} }
@@ -244,7 +244,7 @@ bool sendPacket(Packet *packet) {
} }
} }
void processSetMessage(const String &topic, const String &payload) { void processCommandMessage(const String &topic, const String &payload) {
int startIndex = topic.indexOf("/") + 1; int startIndex = topic.indexOf("/") + 1;
int endIndex = topic.indexOf("/", startIndex); int endIndex = topic.indexOf("/", startIndex);
String shadeName = topic.substring(startIndex, endIndex); String shadeName = topic.substring(startIndex, endIndex);
@@ -370,7 +370,7 @@ void publishCoverDiscoveryTopic(const Shade& shade) {
doc["unique_id"] = entityID; doc["unique_id"] = entityID;
doc["availability_topic"] = "hotdog/availability"; doc["availability_topic"] = "hotdog/availability";
doc["state_topic"] = "hotdog/" + shade.name + "/state"; doc["state_topic"] = "hotdog/" + shade.name + "/state";
doc["command_topic"] = "hotdog/" + shade.name + "/set"; doc["command_topic"] = "hotdog/" + shade.name + "/command";
doc["position_topic"] = "hotdog/" + shade.name + "/position"; doc["position_topic"] = "hotdog/" + shade.name + "/position";
doc["set_position_topic"] = "hotdog/" + shade.name + "/set_position"; doc["set_position_topic"] = "hotdog/" + shade.name + "/set_position";
doc["position_open"] = 100; doc["position_open"] = 100;