ESP8266 RTOSSDK3.0 的工程同步到3.4

一、为什么要用最新的3.4

  1. 因为ESP_IDF 4.4的 kconfig 和RTOS SDK的不兼容,我这里是想8266和32用同一个虚拟机,也不想各种折腾,所以就升级到3.4了

二、修改步骤

  1. 注意看对应的GCC,这里匹配到的是 8.4.0,3.0的用5.2,2.x的用4.8 ,nonos也用4.8
    在这里插入图片描述

  2. smartconfig的start函数的参数有区别,sc回调去掉了,直接放到event里面去了
    3.0的SDK:

    ESP_ERROR_CHECK( esp_smartconfig_start(sc_callback) );
    

    3.4的SDK:

    smartconfig_start_config_t cfg = SMARTCONFIG_START_CONFIG_DEFAULT();
    ESP_ERROR_CHECK(esp_smartconfig_start(&cfg));
    

    具体参考smartconfig例子,这里IP WIFI SC事件,都注册到同一个回调里面去

       ESP_ERROR_CHECK(esp_event_handler_register(WIFI_EVENT, ESP_EVENT_ANY_ID, &event_handler, NULL));
       ESP_ERROR_CHECK(esp_event_handler_register(IP_EVENT, IP_EVENT_STA_GOT_IP, &event_handler, NULL));
       ESP_ERROR_CHECK(esp_event_handler_register(SC_EVENT, ESP_EVENT_ANY_ID, &event_handler, NULL));
    
    /* Esptouch example
    
       This example code is in the Public Domain (or CC0 licensed, at your option.)
    
       Unless required by applicable law or agreed to in writing, this
       software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
       CONDITIONS OF ANY KIND, either express or implied.
    */
    
    #include 
    #include 
    #include "freertos/FreeRTOS.h"
    #include "freertos/task.h"
    #include "freertos/event_groups.h"
    #include "esp_wifi.h"
    #include "esp_event.h"
    #include "esp_log.h"
    #include "esp_system.h"
    #include "nvs_flash.h"
    #include "tcpip_adapter.h"
    #include "esp_smartconfig.h"
    #include "smartconfig_ack.h"
    
    /* The examples use smartconfig type that you can set via project configuration menu.
    
       If you'd rather not, just change the below entries to enum with
       the config you want - ie #define EXAMPLE_ESP_SMARTCOFNIG_TYPE SC_TYPE_ESPTOUCH
    */
    #define EXAMPLE_ESP_SMARTCOFNIG_TYPE      CONFIG_ESP_SMARTCONFIG_TYPE
    
    /* FreeRTOS event group to signal when we are connected & ready to make a request */
    static EventGroupHandle_t s_wifi_event_group;
    
    /* The event group allows multiple bits for each event,
       but we only care about one event - are we connected
       to the AP with an IP? */
    static const int CONNECTED_BIT = BIT0;
    static const int ESPTOUCH_DONE_BIT = BIT1;
    static const char* TAG = "smartconfig_example";
    
    static void smartconfig_example_task(void* parm);
    
    static void event_handler(void* arg, esp_event_base_t event_base,
                              int32_t event_id, void* event_data)
    {
        if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_START) {
            xTaskCreate(smartconfig_example_task, "smartconfig_example_task", 4096, NULL, 3, NULL);
        } else if (event_base == WIFI_EVENT && event_id == WIFI_EVENT_STA_DISCONNECTED) {
            esp_wifi_connect();
            xEventGroupClearBits(s_wifi_event_group, CONNECTED_BIT);
        } else if (event_base == IP_EVENT && event_id == IP_EVENT_STA_GOT_IP) {
            xEventGroupSetBits(s_wifi_event_group, CONNECTED_BIT);
        } else if (event_base == SC_EVENT && event_id == SC_EVENT_SCAN_DONE) {
            ESP_LOGI(TAG, "Scan done");
        } else if (event_base == SC_EVENT && event_id == SC_EVENT_FOUND_CHANNEL) {
            ESP_LOGI(TAG, "Found channel");
        } else if (event_base == SC_EVENT && event_id == SC_EVENT_GOT_SSID_PSWD) {
            ESP_LOGI(TAG, "Got SSID and password");
    
            smartconfig_event_got_ssid_pswd_t* evt = (smartconfig_event_got_ssid_pswd_t*)event_data;
            wifi_config_t wifi_config;
            uint8_t ssid[33] = { 0 };
            uint8_t password[65] = { 0 };
            uint8_t rvd_data[33] = { 0 };
    
            bzero(&wifi_config, sizeof(wifi_config_t));
            memcpy(wifi_config.sta.ssid, evt->ssid, sizeof(wifi_config.sta.ssid));
            memcpy(wifi_config.sta.password, evt->password, sizeof(wifi_config.sta.password));
            wifi_config.sta.bssid_set = evt->bssid_set;
    
            if (wifi_config.sta.bssid_set == true) {
                memcpy(wifi_config.sta.bssid, evt->bssid, sizeof(wifi_config.sta.bssid));
            }
    
            memcpy(ssid, evt->ssid, sizeof(evt->ssid));
            memcpy(password, evt->password, sizeof(evt->password));
            ESP_LOGI(TAG, "SSID:%s", ssid);
            ESP_LOGI(TAG, "PASSWORD:%s", password);
            if (evt->type == SC_TYPE_ESPTOUCH_V2) {
                ESP_ERROR_CHECK( esp_smartconfig_get_rvd_data(rvd_data, sizeof(rvd_data)) );
                ESP_LOGI(TAG, "RVD_DATA:%s", rvd_data);
            }
    
            ESP_ERROR_CHECK(esp_wifi_disconnect());
            ESP_ERROR_CHECK(esp_wifi_set_config(ESP_IF_WIFI_STA, &wifi_config));
            ESP_ERROR_CHECK(esp_wifi_connect());
        } else if (event_base == SC_EVENT && event_id == SC_EVENT_SEND_ACK_DONE) {
            xEventGroupSetBits(s_wifi_event_group, ESPTOUCH_DONE_BIT);
        }
    }
    
    static void initialise_wifi(void)
    {
        tcpip_adapter_init();
        s_wifi_event_group = xEventGroupCreate();
    
        ESP_ERROR_CHECK(esp_event_loop_create_default());
    
        wifi_init_config_t cfg = WIFI_INIT_CONFIG_DEFAULT();
    
        ESP_ERROR_CHECK(esp_wifi_init(&cfg));
        ESP_ERROR_CHECK(esp_wifi_set_ps(WIFI_PS_NONE));
        ESP_ERROR_CHECK(esp_event_handler_register(WIFI_EVENT, ESP_EVENT_ANY_ID, &event_handler, NULL));
        ESP_ERROR_CHECK(esp_event_handler_register(IP_EVENT, IP_EVENT_STA_GOT_IP, &event_handler, NULL));
        ESP_ERROR_CHECK(esp_event_handler_register(SC_EVENT, ESP_EVENT_ANY_ID, &event_handler, NULL));
    
        ESP_ERROR_CHECK(esp_wifi_set_mode(WIFI_MODE_STA));
        ESP_ERROR_CHECK(esp_wifi_start());
    }
    
    static void smartconfig_example_task(void* parm)
    {
        EventBits_t uxBits;
        ESP_ERROR_CHECK(esp_smartconfig_set_type(EXAMPLE_ESP_SMARTCOFNIG_TYPE));
        smartconfig_start_config_t cfg = SMARTCONFIG_START_CONFIG_DEFAULT();
        ESP_ERROR_CHECK(esp_smartconfig_start(&cfg));
    
        while (1) {
            uxBits = xEventGroupWaitBits(s_wifi_event_group, CONNECTED_BIT | ESPTOUCH_DONE_BIT, true, false, portMAX_DELAY);
    
            if (uxBits & CONNECTED_BIT) {
                ESP_LOGI(TAG, "WiFi Connected to ap");
            }
    
            if (uxBits & ESPTOUCH_DONE_BIT) {
                ESP_LOGI(TAG, "smartconfig over");
                esp_smartconfig_stop();
                vTaskDelete(NULL);
            }
        }
    }
    
    void app_main()
    {
        ESP_ERROR_CHECK(nvs_flash_init());
        initialise_wifi();
    }
    
    
  3. Cjson需要修改 pirnt_number函数

  4. mqtt需要使用url,不可以使用port和 host ,event handle可以和以前一样直接在config里面

    esp_mqtt_client_config_t mqtt_cfg = {

			//.uri = CONFIG_BROKER_URL,
    	    //.host = "xxxxxx",            //MQTT服务器IP
    		.uri = "mqtt://xxxxxxxxxx:1883",
    	    .event_handle = mqtt_event_handler, //MQTT事件
    	    //.port=1883,                         //端口
    	    .username = "3cXbC4LtLs21D3uHm77h",                //用户名
			.client_id = "4afd0a80-58cd-11ec-9209-b7aebb52f70b",
    	       // .password = "public",               //密码
        // .user_context = (void *)your_context
    };

    ESP_LOGI(TAG, "uri:%s\r\nusername:%s\r\nclient_id:%s\r\n",mqtt_cfg.uri,mqtt_cfg.username,mqtt_cfg.client_id);

    esp_mqtt_client_handle_t client = esp_mqtt_client_init(&mqtt_cfg);
    //esp_mqtt_client_start(client);
   // esp_mqtt_client_register_event(client, ESP_EVENT_ANY_ID, mqtt_event_handler, client);
    esp_mqtt_client_start(client);

你可能感兴趣的:(ESP8266,ESP8266)