diff --git a/main.c b/main.c index 2f1f305..3253233 100644 --- a/main.c +++ b/main.c @@ -2160,9 +2160,9 @@ VNA_SHELL_FUNCTION(cmd_help) (void)argc; (void)argv; const VNAShellCommand *scp = commands; -#ifdef TINYSA4 - shell_printf("config.ini commands:"); -#endif +//#ifdef TINYSA4 + shell_printf("commands:"); +//#endif while (scp->sc_name != NULL #ifdef __SINGLE_LETTER__ && scp->sc_function != cmd_y diff --git a/usbcfg.c b/usbcfg.c index a57ed3f..398e3cb 100644 --- a/usbcfg.c +++ b/usbcfg.c @@ -181,7 +181,15 @@ static const uint8_t vcom_string2[] = { * 01234567890123456789012 * skip last two 'xx' char due to 'tinySA4_v1.3-n-gxxxxxxx' */ -static const uint8_t vcom_string3[] = { +static const uint8_t vcom_string3[] = +{ +#if 1 + USB_DESC_BYTE(8), /* bLength. */ + USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType. */ + '0' + CH_KERNEL_MAJOR, 0, + '0' + CH_KERNEL_MINOR, 0, + '0' + CH_KERNEL_PATCH, 0 +#else USB_DESC_BYTE(32), /* bLength. */ USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType. */ VERSION[8], 0, /* 'v' */ @@ -199,6 +207,7 @@ static const uint8_t vcom_string3[] = { VERSION[20], 0, /* 'x' */ VERSION[21], 0, /* 'x' */ VERSION[22], 0, /* 'x' */ +#endif }; #else /* @@ -207,7 +216,14 @@ static const uint8_t vcom_string3[] = { * skip last two 'xx' char due to 'tinySA_v1.3-n-gxxxxxxx' */ static const uint8_t vcom_string3[] = { - USB_DESC_BYTE(32), /* bLength. */ +#if 1 + USB_DESC_BYTE(8), /* bLength. */ + USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType. */ + '0' + CH_KERNEL_MAJOR, 0, + '0' + CH_KERNEL_MINOR, 0, + '0' + CH_KERNEL_PATCH, 0 +#else + USB_DESC_BYTE(32), /* bLength. */ USB_DESC_BYTE(USB_DESCRIPTOR_STRING), /* bDescriptorType. */ VERSION[7], 0, /* 'v' */ VERSION[8], 0, /* '1' */ @@ -224,6 +240,7 @@ static const uint8_t vcom_string3[] = { VERSION[19], 0, /* 'x' */ VERSION[20], 0, /* 'x' */ VERSION[21], 0, /* 'x' */ +#endif }; #endif