diff --git a/src/AIoTC_Config.h b/src/AIoTC_Config.h index 7fd515395..b4c6915a8 100644 --- a/src/AIoTC_Config.h +++ b/src/AIoTC_Config.h @@ -43,7 +43,7 @@ #endif #ifndef DBG_VERBOSE - #define DBG_VERBOSE(fmt, ...) //Debug.print(DBG_VERBOSE, fmt, ## __VA_ARGS__) + #define DBG_VERBOSE(fmt, ...) Debug.print(DBG_VERBOSE, fmt, ## __VA_ARGS__) #endif /****************************************************************************** diff --git a/src/ArduinoIoTCloudTCP.cpp b/src/ArduinoIoTCloudTCP.cpp index d84851bcc..a3f169016 100644 --- a/src/ArduinoIoTCloudTCP.cpp +++ b/src/ArduinoIoTCloudTCP.cpp @@ -65,8 +65,6 @@ ArduinoIoTCloudTCP::ArduinoIoTCloudTCP() , _password("") #endif , _mqttClient{nullptr} -, _stdinTopic("") -, _stdoutTopic("") , _shadowTopicOut("") , _shadowTopicIn("") , _dataTopicOut("") @@ -132,8 +130,6 @@ int ArduinoIoTCloudTCP::begin(String brokerAddress, uint16_t brokerPort) _mqttClient.setConnectionTimeout(1500); _mqttClient.setId(getDeviceId().c_str()); - _stdinTopic = getTopic_stdin(); - _stdoutTopic = getTopic_stdout(); _shadowTopicOut = getTopic_shadowout(); _shadowTopicIn = getTopic_shadowin(); _dataTopicOut = getTopic_dataout(); @@ -220,12 +216,6 @@ ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_ConnectMqttBroker() ArduinoIoTCloudTCP::State ArduinoIoTCloudTCP::handle_SubscribeMqttTopics() { - if (!_mqttClient.subscribe(_stdinTopic)) - { - DBG_ERROR("ArduinoIoTCloudTCP::%s could not subscribe to %s", __FUNCTION__, _stdinTopic.c_str()); - return State::SubscribeMqttTopics; - } - if (!_mqttClient.subscribe(_dataTopicIn)) { DBG_ERROR("ArduinoIoTCloudTCP::%s could not subscribe to %s", __FUNCTION__, _dataTopicIn.c_str()); diff --git a/src/ArduinoIoTCloudTCP.h b/src/ArduinoIoTCloudTCP.h index 3dc76dc61..dd99cfd7f 100644 --- a/src/ArduinoIoTCloudTCP.h +++ b/src/ArduinoIoTCloudTCP.h @@ -108,9 +108,6 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass MqttClient _mqttClient; - // Class attribute to define MTTQ topics 2 for stdIn/out and 2 for data, in order to avoid getting previous pupblished payload - String _stdinTopic; - String _stdoutTopic; String _shadowTopicOut; String _shadowTopicIn; String _dataTopicOut; @@ -123,8 +120,6 @@ class ArduinoIoTCloudTCP: public ArduinoIoTCloudClass bool _ota_req; #endif /* OTA_ENABLED */ - inline String getTopic_stdin () { return String("/a/d/" + getDeviceId() + "/s/i"); } - inline String getTopic_stdout () { return String("/a/d/" + getDeviceId() + "/s/o"); } inline String getTopic_shadowout() { return ( getThingId().length() == 0) ? String("") : String("/a/t/" + getThingId() + "/shadow/o"); } inline String getTopic_shadowin () { return ( getThingId().length() == 0) ? String("") : String("/a/t/" + getThingId() + "/shadow/i"); } inline String getTopic_dataout () { return ( getThingId().length() == 0) ? String("/a/d/" + getDeviceId() + "/e/o") : String("/a/t/" + getThingId() + "/e/o"); }