|
@@ -126,11 +126,9 @@ void ICACHE_FLASH_ATTR IdeasX_Connect(void)
|
|
|
|
|
|
void ICACHE_FLASH_ATTR IdeasX_Disconnect(void)
|
|
|
{
|
|
|
- MQTT_Disconnect(&mqttClient);
|
|
|
-
|
|
|
-
|
|
|
if (ideasX_config.fail_cb != NULL)
|
|
|
ideasX_config.fail_cb();
|
|
|
+ MQTT_Disconnect(&mqttClient);
|
|
|
}
|
|
|
|
|
|
void ICACHE_FLASH_ATTR ideasX_system_config_init(void)
|
|
@@ -163,10 +161,8 @@ void ICACHE_FLASH_ATTR ideasX_command_array_init(void)
|
|
|
{
|
|
|
os_sprintf(command_array[SHUTDOWN_COMMAND_INDEX].topic, "%s", SHUTDOWN_COMMAND_TOPIC);
|
|
|
os_sprintf(command_array[RESTART_COMMAND_INDEX].topic, "%s", RESTART_COMMAND_TOPIC);
|
|
|
- os_sprintf(command_array[LOC_COMMAND_INDEX].topic, "%s", LOC_COMMAND_INDEX);
|
|
|
- command_array[SHUTDOWN_COMMAND_INDEX].function = &Encoder_Shutdown;
|
|
|
- command_array[RESTART_COMMAND_INDEX].function = &Encoder_Restart;
|
|
|
- command_array[LOC_COMMAND_INDEX].function = &Encoder_Find;
|
|
|
+ command_array[SHUTDOWN_COMMAND_INDEX].function = Encoder_Shutdown;
|
|
|
+ command_array[RESTART_COMMAND_INDEX].function = Encoder_Restart;
|
|
|
}
|
|
|
|
|
|
static void ICACHE_FLASH_ATTR ideasX_data_cb(uint32_t *args, const char* topic, uint32_t topic_len, const char *data, uint32_t data_len)
|
|
@@ -192,12 +188,10 @@ static void ICACHE_FLASH_ATTR ideasX_data_cb(uint32_t *args, const char* topic,
|
|
|
if (!strcmp(command_array[i].topic, command_topic))
|
|
|
{
|
|
|
ESP_LOGD(TAG, "Found the command: %s", command_array[i].topic);
|
|
|
- ideasX_function_t function = command_array[i].function;
|
|
|
- function();
|
|
|
+ command_array[i].function();
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- ESP_LOGD(TAG, "we made it out");
|
|
|
os_free(topicBuf);
|
|
|
os_free(dataBuf);
|
|
|
}
|