Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'fix/wifi_provisioning_uuid_v4.0' into 'release/v4.0'

Browse source 
Wifi_provisioning: Change service_uuid to non standard 128 bit UUID and add retries in test script (backport v4.0)

See merge request espressif/esp-idf!8163
This commit is contained in:
Mahavir Jain 2020-04-01 13:04:26 +08:00
commit 2cc9d28a35
4 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/wifi_provisioning/src/scheme_ble.c
View file

@ -72,8 +72,8 @@ static void *new_config(void)
const uint8_t service_uuid[16] = { const uint8_t service_uuid[16] = {
/* LSB <--------------------------------------- /* LSB <---------------------------------------
* ---------------------------------------> MSB */ * ---------------------------------------> MSB */
0xfb, 0x34, 0x9b, 0x5f, 0x80, 0x00, 0x00, 0x80, 0x07, 0xed, 0x9b, 0x2d, 0x0f, 0x06, 0x7c, 0x87,
0x00, 0x10, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x9b, 0x43, 0x43, 0x6b, 0x4d, 0x24, 0x75, 0x17,
}; };
memcpy(ble_config->service_uuid, service_uuid, sizeof(ble_config->service_uuid)); memcpy(ble_config->service_uuid, service_uuid, sizeof(ble_config->service_uuid));

4
examples/provisioning/manager/main/app_main.c
View file

@ -192,8 +192,8 @@ void app_main()
uint8_t custom_service_uuid[] = { uint8_t custom_service_uuid[] = {
/* LSB <--------------------------------------- /* LSB <---------------------------------------
* ---------------------------------------> MSB */ * ---------------------------------------> MSB */
0x21, 0x43, 0x65, 0x87, 0x09, 0xba, 0xdc, 0xfe, 0xb4, 0xdf, 0x5a, 0x1c, 0x3f, 0x6b, 0xf4, 0xbf,
0xef, 0xcd, 0xab, 0x90, 0x78, 0x56, 0x34, 0x12 0xea, 0x4a, 0x82, 0x03, 0x04, 0x90, 0x1a, 0x02,
}; };
wifi_prov_scheme_ble_set_service_uuid(custom_service_uuid); wifi_prov_scheme_ble_set_service_uuid(custom_service_uuid);

5
examples/provisioning/manager/wifi_prov_mgr_test.py
View file

@ -87,6 +87,7 @@ def test_examples_wifi_prov_mgr(env, extra_data):
raise RuntimeError("Failed to send apply config") raise RuntimeError("Failed to send apply config")
success = False success = False
retry = 0
while True: while True:
time.sleep(5) time.sleep(5)
print("Wi-Fi connection state") print("Wi-Fi connection state")
@ -96,6 +97,10 @@ def test_examples_wifi_prov_mgr(env, extra_data):
elif (ret == 0): elif (ret == 0):
print("Provisioning was successful") print("Provisioning was successful")
success = True success = True
elif (ret == 3 and retry < 3):
retry = retry + 1
print("Connection failed.. retry again...: ", ret)
continue
break break
if not success: if not success:

2
tools/esp_prov/esp_prov.py
View file

@ -77,7 +77,7 @@ def get_transport(sel_transport, service_name):
# will fallback to using the provided UUIDs instead # will fallback to using the provided UUIDs instead
nu_lookup = {'prov-session': 'ff51', 'prov-config': 'ff52', 'proto-ver': 'ff53'} nu_lookup = {'prov-session': 'ff51', 'prov-config': 'ff52', 'proto-ver': 'ff53'}
tp = transport.Transport_BLE(devname=service_name, tp = transport.Transport_BLE(devname=service_name,
service_uuid='0000ffff-0000-1000-8000-00805f9b34fb', service_uuid='021a9004-0382-4aea-bff4-6b3f1c5adfb4',
nu_lookup=nu_lookup) nu_lookup=nu_lookup)
elif (sel_transport == 'console'): elif (sel_transport == 'console'):
tp = transport.Transport_Console() tp = transport.Transport_Console()