Mercurial > brewboard / file comparison

comparison: main/task_wifi.c

main/task_wifi.c

changeset 54
7b134c27fadb
parent 53
cf91a3a20d0d
child 56
756d1a63d129
equal deleted inserted replaced
53:cf91a3a20d0d 54:7b134c27fadb
255 * delay because the hostname will not be found. 255 * delay because the hostname will not be found.
256 */ 256 */
257 sntp_stop(); 257 sntp_stop();
258 if (strlen(config.ntp_server)) 258 if (strlen(config.ntp_server))
259 sntp_setservername(0, config.ntp_server); 259 sntp_setservername(0, config.ntp_server);
260 sntp_setservername(1, "pool.ntp.org"); // Will get you servers nearby 260 sntp_setservername(1, (char *)"pool.ntp.org"); // Will get you servers nearby
261 sntp_set_sync_mode(SNTP_SYNC_MODE_IMMED); 261 sntp_set_sync_mode(SNTP_SYNC_MODE_IMMED);
262 sntp_set_time_sync_notification_cb(time_sync_notification_cb); 262 sntp_set_time_sync_notification_cb(time_sync_notification_cb);
263 sntp_init(); 263 sntp_init();
264 #if 0 264 #if 0
265 if (strlen(config.ntp_server)) 265 if (strlen(config.ntp_server))
608 { 608 {
609 char pwd[65], pmpt[32]; 609 char pwd[65], pmpt[32];
610 610
611 switch (Main_Screen) { 611 switch (Main_Screen) {
612 case MAIN_TOOLS_SETUP_WIFI: 612 case MAIN_TOOLS_SETUP_WIFI:
613 TopMessage("WiFi"); 613 TopMessage((char *)"WiFi");
614 TFT_setFont(DEJAVU24_FONT, NULL); 614 TFT_setFont(DEJAVU24_FONT, NULL);
615 _fg = TFT_WHITE; 615 _fg = TFT_WHITE;
616 TFT_print("Momentje ..", CENTER, CENTER); 616 TFT_print((char *)"Momentje ..", CENTER, CENTER);
617 _wifi_ScanAPs = true; 617 _wifi_ScanAPs = true;
618 _wifi_ScanDone = false; 618 _wifi_ScanDone = false;
619 Buttons_Add(260, 200, 60, 40, "Ok", 0); 619 Buttons_Add(260, 200, 60, 40, (char *)"Ok", 0);
620 Buttons[0].dark = true; 620 Buttons[0].dark = true;
621 Buttons_Show(); 621 Buttons_Show();
622 // Now add the buttons we draw manually. 622 // Now add the buttons we draw manually.
623 Buttons_Add( 0, 30, 250, 30, "", 1); 623 Buttons_Add( 0, 30, 250, 30, (char *)"", 1);
624 Buttons_Add( 0, 60, 250, 30, "", 2); 624 Buttons_Add( 0, 60, 250, 30, (char *)"", 2);
625 Buttons_Add( 0, 90, 250, 30, "", 3); 625 Buttons_Add( 0, 90, 250, 30, (char *)"", 3);
626 Buttons_Add( 0,120, 250, 30, "", 4); 626 Buttons_Add( 0,120, 250, 30, (char *)"", 4);
627 Buttons_Add( 0,150, 250, 30, "", 5); 627 Buttons_Add( 0,150, 250, 30, (char *)"", 5);
628 Buttons_Add( 0,180, 250, 30, "", 6); 628 Buttons_Add( 0,180, 250, 30, (char *)"", 6);
629 Buttons_Add( 0,210, 250, 30, "", 7); 629 Buttons_Add( 0,210, 250, 30, (char *)"", 7);
630 break; 630 break;
631 631
632 case MAIN_TOOLS_SETUP_WIFI_CUR: 632 case MAIN_TOOLS_SETUP_WIFI_CUR:
633 TopMessage("WiFi verbinding"); 633 TopMessage((char *)"WiFi verbinding");
634 // Get extra information. 634 // Get extra information.
635 wifi_ap_record_t ap_info; 635 wifi_ap_record_t ap_info;
636 esp_wifi_sta_get_ap_info(&ap_info); 636 esp_wifi_sta_get_ap_info(&ap_info);
637 637
638 wifi_config_t *wconfig = task_wifi_ConfigSTA /*task_wifi_GetWifiStaConfig( ) */; 638 wifi_config_t *wconfig = task_wifi_ConfigSTA /*task_wifi_GetWifiStaConfig( ) */;
646 strcpy(ip, ip4addr_ntoa(&ip_info.ip)); 646 strcpy(ip, ip4addr_ntoa(&ip_info.ip));
647 strcpy(netmask, ip4addr_ntoa(&ip_info.netmask)); 647 strcpy(netmask, ip4addr_ntoa(&ip_info.netmask));
648 strcpy(gw, ip4addr_ntoa(&ip_info.gw)); 648 strcpy(gw, ip4addr_ntoa(&ip_info.gw));
649 TFT_setFont(DEFAULT_FONT, NULL); 649 TFT_setFont(DEFAULT_FONT, NULL);
650 _fg = TFT_WHITE; 650 _fg = TFT_WHITE;
651 TFT_print("SSID", 155 - TFT_getStringWidth("SSID"), 40); 651 TFT_print((char *)"SSID", 155 - TFT_getStringWidth((char *)"SSID"), 40);
652 TFT_print("Kanaal", 155 - TFT_getStringWidth("Kanaal"), 60); 652 TFT_print((char *)"Kanaal", 155 - TFT_getStringWidth((char *)"Kanaal"), 60);
653 TFT_print("Rssi", 155 - TFT_getStringWidth("Rssi"), 80); 653 TFT_print((char *)"Rssi", 155 - TFT_getStringWidth((char *)"Rssi"), 80);
654 TFT_print("Mode", 155 - TFT_getStringWidth("Mode"), 100); 654 TFT_print((char *)"Mode", 155 - TFT_getStringWidth((char *)"Mode"), 100);
655 TFT_print("IP adres", 155 - TFT_getStringWidth("IP adres"), 120); 655 TFT_print((char *)"IP adres", 155 - TFT_getStringWidth((char *)"IP adres"), 120);
656 TFT_print("Netmask", 155 - TFT_getStringWidth("Netmask"), 140); 656 TFT_print((char *)"Netmask", 155 - TFT_getStringWidth((char *)"Netmask"), 140);
657 TFT_print("Gateway", 155 - TFT_getStringWidth("Gateway"), 160); 657 TFT_print((char *)"Gateway", 155 - TFT_getStringWidth((char *)"Gateway"), 160);
658 _fg = TFT_YELLOW; 658 _fg = TFT_YELLOW;
659 TFT_print((char*)wconfig->sta.ssid, 165, 40); 659 TFT_print((char*)wconfig->sta.ssid, 165, 40);
660 sprintf(pmpt, "%d", ap_info.primary); 660 sprintf(pmpt, "%d", ap_info.primary);
661 TFT_print(pmpt, 165, 60); 661 TFT_print(pmpt, 165, 60);
662 sprintf(pmpt, "%d", ap_info.rssi); 662 sprintf(pmpt, "%d", ap_info.rssi);
665 TFT_print(pmpt, 165, 100); 665 TFT_print(pmpt, 165, 100);
666 TFT_print((char*)ip, 165, 120); 666 TFT_print((char*)ip, 165, 120);
667 TFT_print((char*)netmask, 165, 140); 667 TFT_print((char*)netmask, 165, 140);
668 TFT_print((char*)gw, 165, 160); 668 TFT_print((char*)gw, 165, 160);
669 } 669 }
670 Buttons_Add(130, 200, 60, 40, "Ok", 0); 670 Buttons_Add(130, 200, 60, 40, (char *)"Ok", 0);
671 Buttons[0].dark = true; 671 Buttons[0].dark = true;
672 Buttons_Show(); 672 Buttons_Show();
673 break; 673 break;
674 674
675 case MAIN_TOOLS_SETUP_WIFI_CON: 675 case MAIN_TOOLS_SETUP_WIFI_CON:
676 TopMessage("WiFi verbinden"); 676 TopMessage((char *)"WiFi verbinden");
677 TFT_setFont(DEJAVU18_FONT, NULL); 677 TFT_setFont(DEJAVU18_FONT, NULL);
678 _fg = TFT_WHITE; 678 _fg = TFT_WHITE;
679 TFT_print("SSID", 155 - TFT_getStringWidth("SSID"), 70); 679 TFT_print((char *)"SSID", 155 - TFT_getStringWidth((char *)"SSID"), 70);
680 _fg = TFT_YELLOW; 680 _fg = TFT_YELLOW;
681 TFT_print((char*)_wifi_ssid, 165, 70); 681 TFT_print((char*)_wifi_ssid, 165, 70);
682 Buttons_Add( 0, 200, 100, 40, "Annuleer", 0); 682 Buttons_Add( 0, 200, 100, 40, (char *)"Annuleer", 0);
683 Buttons_Add(110, 200, 100, 40, "Vergeet", 1); 683 Buttons_Add(110, 200, 100, 40, (char *)"Vergeet", 1);
684 Buttons_Add(220, 200, 100, 40, "Verbind", 2); 684 Buttons_Add(220, 200, 100, 40, (char *)"Verbind", 2);
685 Buttons_Show(); 685 Buttons_Show();
686 Buttons[0].dark = true; 686 Buttons[0].dark = true;
687 break; 687 break;
688 688
689 case MAIN_TOOLS_SETUP_WIFI_NEW: 689 case MAIN_TOOLS_SETUP_WIFI_NEW:
690 TopMessage("WiFi nieuw"); 690 TopMessage((char *)"WiFi nieuw");
691 snprintf(pmpt, 32, "Password for %s", _wifi_ssid); 691 snprintf(pmpt, 32, "Password for %s", _wifi_ssid);
692 pwd[0] = '\0'; 692 pwd[0] = '\0';
693 EditTextMin(pmpt, pwd, 64, 8); 693 EditTextMin(pmpt, pwd, 64, 8);
694 /* 694 /*
695 * Disconnect first 695 * Disconnect first
696 */ 696 */
697 _bg = TFT_BLACK; 697 _bg = TFT_BLACK;
698 TFT_fillScreen(_bg); 698 TFT_fillScreen(_bg);
699 TFT_setFont(DEJAVU24_FONT, NULL); 699 TFT_setFont(DEJAVU24_FONT, NULL);
700 _fg = TFT_WHITE; 700 _fg = TFT_WHITE;
701 TFT_print("Momentje ..", CENTER, CENTER); 701 TFT_print((char *)"Momentje ..", CENTER, CENTER);
702 xEventGroupSetBits(xEventGroupWifi, TASK_WIFI_REQUEST_STA_DISCONNECT); 702 xEventGroupSetBits(xEventGroupWifi, TASK_WIFI_REQUEST_STA_DISCONNECT);
703 vTaskDelay(100 / portTICK_PERIOD_MS); 703 vTaskDelay(100 / portTICK_PERIOD_MS);
704 xEventGroupWaitBits(xEventGroupWifi, TASK_WIFI_STA_DISCONNECTED, pdFALSE, pdTRUE, portMAX_DELAY ); 704 xEventGroupWaitBits(xEventGroupWifi, TASK_WIFI_STA_DISCONNECTED, pdFALSE, pdTRUE, portMAX_DELAY );
705 705
706 /* 706 /*
849 case 2: // Connect 849 case 2: // Connect
850 _bg = TFT_BLACK; 850 _bg = TFT_BLACK;
851 TFT_fillScreen(_bg); 851 TFT_fillScreen(_bg);
852 TFT_setFont(DEJAVU24_FONT, NULL); 852 TFT_setFont(DEJAVU24_FONT, NULL);
853 _fg = TFT_WHITE; 853 _fg = TFT_WHITE;
854 TFT_print("Momentje ..", CENTER, CENTER); 854 TFT_print((char *)"Momentje ..", CENTER, CENTER);
855 /* 855 /*
856 * Disconnect old connections and wait until it's gone. 856 * Disconnect old connections and wait until it's gone.
857 */ 857 */
858 xEventGroupSetBits(xEventGroupWifi, TASK_WIFI_REQUEST_STA_DISCONNECT); 858 xEventGroupSetBits(xEventGroupWifi, TASK_WIFI_REQUEST_STA_DISCONNECT);
859 vTaskDelay(100 / portTICK_PERIOD_MS); 859 vTaskDelay(100 / portTICK_PERIOD_MS);

Mercurial Repository: brewboard

mercurial