diff options
| author | hathach <[email protected]> | 2023-03-17 23:53:38 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2023-03-17 23:53:38 +0700 |
| commit | bdfcd50b1b601f85389a09cdaf183b2f27c1d470 (patch) | |
| tree | 0ed9312b74a74c875fd17b86353ac02559ac7081 /examples/device/usbtmc/src | |
| parent | 73f22e31c7a31e9b974e27407b906bbc8cb05a7a (diff) | |
| parent | 65ee11ff630169c01a33860fbf8507d2d8f29a71 (diff) | |
Merge branch 'master' into portability
Diffstat (limited to 'examples/device/usbtmc/src')
| -rw-r--r-- | examples/device/usbtmc/src/main.c | 2 | ||||
| -rw-r--r-- | examples/device/usbtmc/src/usbtmc_app.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/examples/device/usbtmc/src/main.c b/examples/device/usbtmc/src/main.c index 8fc06b56c..2bba336f1 100644 --- a/examples/device/usbtmc/src/main.c +++ b/examples/device/usbtmc/src/main.c @@ -1,4 +1,4 @@ -/* +/* * The MIT License (MIT) * * Copyright (c) 2019 Ha Thach (tinyusb.org) diff --git a/examples/device/usbtmc/src/usbtmc_app.c b/examples/device/usbtmc/src/usbtmc_app.c index 0057a429f..f1596f6d0 100644 --- a/examples/device/usbtmc/src/usbtmc_app.c +++ b/examples/device/usbtmc/src/usbtmc_app.c @@ -23,11 +23,7 @@ * */ -#ifdef __ICCARM__ #include <string.h> -#else -#include <strings.h> -#endif #include <stdlib.h> /* atoi */ #include "tusb.h" #include "bsp/board.h" @@ -144,11 +140,14 @@ bool tud_usbtmc_msg_data_cb(void *data, size_t len, bool transfer_complete) queryState = transfer_complete; idnQuery = 0; - if(transfer_complete && (len >=4) && !strncasecmp("*idn?",data,4)) + if ( transfer_complete && (len >= 4) && + (!strncmp("*idn?", data, 4) || !strncmp("*IDN?", data, 4)) ) { idnQuery = 1; } - if(transfer_complete && !strncasecmp("delay ",data,5)) + + if ( transfer_complete && + (!strncmp("delay ", data, 5) || !strncmp("DELAY ", data, 5)) ) { queryState = 0; int d = atoi((char*)data + 5); @@ -243,6 +242,7 @@ void usbtmc_app_task_iter(void) { break; default: TU_ASSERT(false,); + return; } } |