Merge branch 'feature/add_set_factory_info_customer_in_wps_v3.1' into 'master'

wifi: add set factory information feature by customer in wps

See merge request idf/esp-idf!2412

components/esp32/include/esp_wps.h

@@ -56,14 +56,33 @@ typedef enum wps_type {
 
 extern const wps_crypto_funcs_t g_wifi_default_wps_crypto_funcs;
 
+#define WPS_MAX_MANUFACTURER_LEN 65
+#define WPS_MAX_MODEL_NUMBER_LEN 33
+#define WPS_MAX_MODEL_NAME_LEN   33
+#define WPS_MAX_DEVICE_NAME_LEN  33
+
+typedef struct {
+    char manufacturer[WPS_MAX_MANUFACTURER_LEN]; /*!< Manufacturer, null-terminated string. The default manufcturer is used if the string is empty */
+    char model_number[WPS_MAX_MODEL_NUMBER_LEN]; /*!< Model number, null-terminated string. The default model number is used if the string is empty */
+    char model_name[WPS_MAX_MODEL_NAME_LEN];     /*!< Model name, null-terminated string. The default model name is used if the string is empty */
+    char device_name[WPS_MAX_DEVICE_NAME_LEN];   /*!< Device name, null-terminated string. The default device name is used if the string is empty */
+} wps_factory_information_t;
+
 typedef struct {
     wps_type_t wps_type;
     const wps_crypto_funcs_t *crypto_funcs;
-}esp_wps_config_t;
+    wps_factory_information_t factory_info;
+} esp_wps_config_t;
 
 #define WPS_CONFIG_INIT_DEFAULT(type) { \
     .wps_type = type, \
     .crypto_funcs = &g_wifi_default_wps_crypto_funcs, \
+    .factory_info = {   \
+        .manufacturer = "ESPRESSIF",  \
+        .model_number = "ESP32",  \
+        .model_name = "ESPRESSIF IOT",  \
+        .device_name = "ESP STATION",  \
+    }  \
 }
 
 /**

components/esp32/lib

@@ -1 +1 @@
-Subproject commit 618fa4eb596c07521d9cdcc1ba019fe5cd42cec6
+Subproject commit 3b4ce03f4634ed8837868bb45094d0ec3ee1deb5