From a045799b044b9e77114718d4051ebb77e1a4e778 Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Wed, 18 Aug 2021 16:09:04 -0400 Subject: [PATCH] Add argument to AdvertiseCommissionableNode for M5Stack (#9114) * Add argument to AdvertiseCommissionableNode for M5Stack * Fix namespace, add basic and enhanced options for commisioning * Fix typo --- examples/all-clusters-app/esp32/main/main.cpp | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/examples/all-clusters-app/esp32/main/main.cpp b/examples/all-clusters-app/esp32/main/main.cpp index 1c4444d5819843..ef582b4bb97742 100644 --- a/examples/all-clusters-app/esp32/main/main.cpp +++ b/examples/all-clusters-app/esp32/main/main.cpp @@ -330,12 +330,14 @@ class SetupListModel : public ListScreen::Model public: SetupListModel() { - std::string resetWiFi = "Reset WiFi"; - std::string resetToFactory = "Reset to factory"; - std::string forceWifiCommissioning = "Force WiFi commissioning"; + std::string resetWiFi = "Reset WiFi"; + std::string resetToFactory = "Reset to factory"; + std::string forceWifiCommissioningBasic = "Force WiFi commissioning (basic)"; + std::string forceWifiCommissioningEnhanced = "Force WiFi commissioning (enhanced)"; options.emplace_back(resetWiFi); options.emplace_back(resetToFactory); - options.emplace_back(forceWifiCommissioning); + options.emplace_back(forceWifiCommissioningBasic); + options.emplace_back(forceWifiCommissioningEnhanced); } virtual std::string GetTitle() { return "Setup"; } virtual int GetItemCount() { return options.size(); } @@ -354,7 +356,12 @@ class SetupListModel : public ListScreen::Model } else if (i == 2) { - app::Mdns::AdvertiseCommissionableNode(); + app::Mdns::AdvertiseCommissionableNode(app::Mdns::CommissioningMode::kEnabledBasic); + OpenBasicCommissioningWindow(ResetFabrics::kYes, kNoCommissioningTimeout, PairingWindowAdvertisement::kMdns); + } + else if (i == 3) + { + app::Mdns::AdvertiseCommissionableNode(app::Mdns::CommissioningMode::kEnabledEnhanced); OpenBasicCommissioningWindow(ResetFabrics::kYes, kNoCommissioningTimeout, PairingWindowAdvertisement::kMdns); } }