ESP8266-based WiFi serial modem emulator ROM

AT: Rename at$sb -> at$baud, at$tts -> at$naws, at$tty -> at$ttype

There's no point in trying to stay compatible with WiFi232, and
these are easier to remember/guess.

+71 -71
+71 -71
wifippp.ino
··· 614 614 break; 615 615 case '$': 616 616 /* wifi232 commands, all consume the rest of the input string */ 617 - if (strcmp(lcmd, "led?") == 0) { 617 + if (strncmp(lcmd, "baud=", 5) == 0) { 618 + uint32_t baud = 0; 619 + int chars = 0; 620 + 621 + /* AT$BAUD=...: set baud rate */ 622 + if (sscanf(lcmd, "baud=%d%n", &baud, &chars) != 1 || 623 + chars == 0) { 624 + errstr = strdup("invalid baud rate"); 625 + goto error; 626 + } 627 + 628 + switch (baud) { 629 + case 110: 630 + case 300: 631 + case 1200: 632 + case 2400: 633 + case 4800: 634 + case 9600: 635 + case 19200: 636 + case 38400: 637 + case 57600: 638 + case 115200: 639 + settings->baud = baud; 640 + if (!settings->quiet) { 641 + if (settings->verbal) 642 + outputf("\nOK switching to " 643 + "%d\r\n", settings->baud); 644 + else 645 + output("0\r"); 646 + } 647 + serial_flush(); 648 + serial_start(settings->baud); 649 + break; 650 + default: 651 + errstr = strdup("unsupported baud rate"); 652 + goto error; 653 + } 654 + } else if (strcmp(lcmd, "baud?") == 0) { 655 + /* AT$BAUD?: print default baud rate */ 656 + outputf("\n%d\r\n", settings->baud); 657 + did_nl = true; 658 + } else if (strcmp(lcmd, "led?") == 0) { 618 659 /* AT$LED?: show pixel brightness setting */ 619 660 outputf("\n%d\r\n", settings->pixel_brightness); 620 661 did_nl = true; ··· 629 670 } 630 671 settings->pixel_brightness = br; 631 672 pixel_adjust_brightness(); 673 + } else if (strncmp(lcmd, "naws=", 5) == 0) { 674 + /* AT$NAWS=: set telnet NAWS */ 675 + int w, h, chars; 676 + if (sscanf(lcmd + 5, "%dx%d%n", &w, &h, &chars) == 2 && 677 + chars > 0) { 678 + if (w < 1 || w > 255) { 679 + errstr = strdup("invalid width"); 680 + goto error; 681 + } 682 + if (h < 1 || h > 255) { 683 + errstr = strdup("invalid height"); 684 + goto error; 685 + } 686 + 687 + settings->telnet_tts_w = w; 688 + settings->telnet_tts_h = h; 689 + } else { 690 + errstr = strdup("must be WxH"); 691 + goto error; 692 + } 693 + } else if (strcmp(lcmd, "naws?") == 0) { 694 + /* AT$NAWS?: show telnet NAWS setting */ 695 + outputf("\n%dx%d\r\n", settings->telnet_tts_w, 696 + settings->telnet_tts_h); 697 + did_nl = true; 632 698 } else if (strcmp(lcmd, "net=0") == 0) { 633 699 /* AT$NET=0: disable telnet setting */ 634 700 settings->telnet = 0; ··· 688 754 ip_addr_copy(t_addr, settings->ppp_server_ip); 689 755 outputf("\n%s\r\n", ipaddr_ntoa(&t_addr)); 690 756 did_nl = true; 691 - } else if (strncmp(lcmd, "sb=", 3) == 0) { 692 - uint32_t baud = 0; 693 - int chars = 0; 694 - 695 - /* AT$SB=...: set baud rate */ 696 - if (sscanf(lcmd, "sb=%d%n", &baud, &chars) != 1 || 697 - chars == 0) { 698 - errstr = strdup("invalid baud rate"); 699 - goto error; 700 - } 701 - 702 - switch (baud) { 703 - case 110: 704 - case 300: 705 - case 1200: 706 - case 2400: 707 - case 4800: 708 - case 9600: 709 - case 19200: 710 - case 38400: 711 - case 57600: 712 - case 115200: 713 - settings->baud = baud; 714 - if (!settings->quiet) { 715 - if (settings->verbal) 716 - outputf("\nOK switching to " 717 - "%d\r\n", settings->baud); 718 - else 719 - output("0\r"); 720 - } 721 - serial_flush(); 722 - serial_start(settings->baud); 723 - break; 724 - default: 725 - errstr = strdup("unsupported baud rate"); 726 - goto error; 727 - } 728 - } else if (strcmp(lcmd, "sb?") == 0) { 729 - /* AT$SB?: print baud rate */ 730 - outputf("\n%d\r\n", settings->baud); 731 - did_nl = true; 732 757 } else if (strncmp(lcmd, "ssid=", 5) == 0) { 733 758 /* AT$SSID=...: set wifi ssid */ 734 759 memset(settings->wifi_ssid, 0, ··· 757 782 /* AT$SYSLOG?: print syslog server */ 758 783 outputf("\n%s\r\n", settings->syslog_server); 759 784 did_nl = true; 760 - } else if (strncmp(lcmd, "tts=", 4) == 0) { 761 - /* AT$TTS=: set telnet NAWS */ 762 - int w, h, chars; 763 - if (sscanf(lcmd + 4, "%dx%d%n", &w, &h, &chars) == 2 && 764 - chars > 0) { 765 - if (w < 1 || w > 255) { 766 - errstr = strdup("invalid width"); 767 - goto error; 768 - } 769 - if (h < 1 || h > 255) { 770 - errstr = strdup("invalid height"); 771 - goto error; 772 - } 773 - 774 - settings->telnet_tts_w = w; 775 - settings->telnet_tts_h = h; 776 - } else { 777 - errstr = strdup("must be WxH"); 778 - goto error; 779 - } 780 - } else if (strcmp(lcmd, "tts?") == 0) { 781 - /* AT$TTS?: show telnet NAWS setting */ 782 - outputf("\n%dx%d\r\n", settings->telnet_tts_w, 783 - settings->telnet_tts_h); 784 - did_nl = true; 785 - } else if (strncmp(lcmd, "tty=", 4) == 0) { 786 - /* AT$TTY=: set telnet TTYPE */ 785 + } else if (strncmp(lcmd, "ttype=", 6) == 0) { 786 + /* AT$TTYPE=: set telnet TTYPE */ 787 787 memset(settings->telnet_tterm, 0, 788 788 sizeof(settings->telnet_tterm)); 789 789 strncpy(settings->telnet_tterm, cmd + 4, 790 790 sizeof(settings->telnet_tterm)); 791 - } else if (strcmp(lcmd, "tty?") == 0) { 792 - /* AT$TTY?: show telnet TTYPE setting */ 791 + } else if (strcmp(lcmd, "ttype?") == 0) { 792 + /* AT$TTYPE?: show telnet TTYPE setting */ 793 793 outputf("\n%s\r\n", settings->telnet_tterm); 794 794 did_nl = true; 795 795 } else if (strncmp(lcmd, "update?", 7) == 0) {