@@ -2485,26 +2485,21 @@ class ESP_WiFiManager_Lite
2485
2485
root_html_template = FPSTR (ESP_WM_LITE_HTML_HEAD_START);
2486
2486
2487
2487
#if USING_CUSTOMS_STYLE
2488
-
2489
2488
// Using Customs style when not NULL
2490
2489
if (_CustomsHeadStyle)
2491
2490
root_html_template += FPSTR (_CustomsHeadStyle);
2492
2491
else
2493
2492
root_html_template += FPSTR (ESP_WM_LITE_HTML_HEAD_STYLE);
2494
-
2495
2493
#else
2496
2494
root_html_template += FPSTR (ESP_WM_LITE_HTML_HEAD_STYLE);
2497
2495
#endif
2498
2496
2499
2497
#if USING_CUSTOMS_HEAD_ELEMENT
2500
-
2501
2498
if (_CustomsHeadElement)
2502
2499
root_html_template += _CustomsHeadElement;
2503
-
2504
2500
#endif
2505
2501
2506
2502
#if SCAN_WIFI_NETWORKS
2507
-
2508
2503
ESP_WML_LOGDEBUG1 (WiFiNetworksFound, F (" SSIDs found, generating HTML now" ));
2509
2504
// Replace HTML <input...> with <select...>, based on WiFi network scan in startConfigurationMode()
2510
2505
@@ -2525,7 +2520,7 @@ class ESP_WiFiManager_Lite
2525
2520
ListOfSSIDs = String (FPSTR (ESP_WM_LITE_OPTION_START)) + String (FPSTR (ESP_WM_LITE_NO_NETWORKS_FOUND)) + String (FPSTR (ESP_WM_LITE_OPTION_END));
2526
2521
2527
2522
pitem = FPSTR (ESP_WM_LITE_HTML_HEAD_END);
2528
- ESP_WML_LOGERROR3 ( " 1 pitem.capacity(): " , String (pitem. capacity ()), " pitem.length(): " , String (pitem. length ())); // TODO del log
2523
+
2529
2524
#if MANUAL_SSID_INPUT_ALLOWED
2530
2525
pitem.replace (" [[input_id]]" , " <input id='id' list='SSIDs'>" + String (FPSTR (ESP_WM_LITE_DATALIST_START)) + " 'SSIDs'>" +
2531
2526
ListOfSSIDs + FPSTR (ESP_WM_LITE_DATALIST_END));
@@ -2535,58 +2530,41 @@ ESP_WML_LOGERROR3("1 pitem.capacity():", String(pitem.capacity()), " pitem.lengt
2535
2530
ESP_WML_LOGDEBUG1 (F (" pitem:" ), pitem);
2536
2531
#else
2537
2532
pitem.replace (F (" [[input_id]]" ), F (" <select id='id'>" ) + ListOfSSIDs + String (FPSTR (ESP_WM_LITE_SELECT_END)));
2538
- ESP_WML_LOGERROR3 (" 2 pitem.capacity():" , String (pitem.capacity ()), " pitem.length():" , String (pitem.length ())); // TODO del log
2539
2533
pitem.replace (F (" [[input_id1]]" ), F (" <select id='id1'>" ) + ListOfSSIDs + String (FPSTR (ESP_WM_LITE_SELECT_END)));
2540
- ESP_WML_LOGERROR3 (" 3 pitem.capacity():" , String (pitem.capacity ()), " pitem.length():" , String (pitem.length ())); // TODO del log
2541
2534
#endif
2542
2535
2543
2536
root_html_template += pitem + FPSTR (ESP_WM_LITE_FLDSET_START);
2544
2537
2545
2538
#else
2546
-
2547
2539
pitem = FPSTR (ESP_WM_LITE_HTML_HEAD_END);
2548
2540
pitem.replace (" [[input_id]]" , FPSTR (ESP_WM_LITE_HTML_INPUT_ID));
2549
2541
pitem.replace (" [[input_id1]]" , FPSTR (ESP_WM_LITE_HTML_INPUT_ID1));
2550
2542
root_html_template += pitem + FPSTR (ESP_WM_LITE_FLDSET_START);
2551
-
2552
2543
#endif // SCAN_WIFI_NETWORKS
2553
2544
2554
2545
#if USE_DYNAMIC_PARAMETERS
2555
-
2556
2546
for (uint16_t i = 0 ; i < NUM_MENU_ITEMS; i++)
2557
2547
{
2558
2548
pitem = FPSTR (ESP_WM_LITE_HTML_PARAM);
2559
- ESP_WML_LOGERROR3 (" 4 pitem.capacity():" , String (pitem.capacity ()), " pitem.length():" , String (pitem.length ())); // TODO del log
2560
-
2561
2549
pitem.replace (" {b}" , myMenuItems[i].displayName );
2562
2550
pitem.replace (" {v}" , myMenuItems[i].id );
2563
2551
pitem.replace (" {i}" , myMenuItems[i].id );
2564
- ESP_WML_LOGERROR3 (" 5 pitem.capacity():" , String (pitem.capacity ()), " pitem.length():" , String (pitem.length ())); // TODO del log
2565
-
2566
2552
root_html_template += pitem;
2567
2553
}
2568
-
2569
2554
#endif
2570
2555
2571
2556
root_html_template += String (FPSTR (ESP_WM_LITE_FLDSET_END)) + FPSTR (ESP_WM_LITE_HTML_BUTTON) + FPSTR (ESP_WM_LITE_HTML_SCRIPT);
2572
2557
2573
2558
#if USE_DYNAMIC_PARAMETERS
2574
-
2575
2559
for (uint16_t i = 0 ; i < NUM_MENU_ITEMS; i++)
2576
2560
{
2577
2561
pitem = FPSTR (ESP_WM_LITE_HTML_SCRIPT_ITEM);
2578
- ESP_WML_LOGERROR3 (" 6 pitem.capacity():" , String (pitem.capacity ()), " pitem.length():" , String (pitem.length ())); // TODO del log
2579
-
2580
2562
pitem.replace (" {d}" , myMenuItems[i].id );
2581
-
2582
2563
root_html_template += pitem;
2583
2564
}
2584
-
2585
2565
#endif
2586
2566
2587
- ESP_WML_LOGERROR3 (" 7 root_html_template.capacity():" , String (root_html_template.capacity ()), " root_html_template.length():" , String (root_html_template.length ())); // TODO del log
2588
2567
root_html_template += String (FPSTR (ESP_WM_LITE_HTML_SCRIPT_END)) + FPSTR (ESP_WM_LITE_HTML_END);
2589
- ESP_WML_LOGERROR3 (" 8 root_html_template.capacity():" , String (root_html_template.capacity ()), " root_html_template.length():" , String (root_html_template.length ())); // TODO del log
2590
2568
2591
2569
return ;
2592
2570
}
0 commit comments