Rename USBTMC_CFG_ENABLE_488, and fix build with it off.

2019-09-19 19:59:44 -04:00
parent d742c3e15c
commit f3d6d0127b
4 changed files with 13 additions and 12 deletions
--- a/examples/device/usbtmc/src/tusb_config.h
+++ b/examples/device/usbtmc/src/tusb_config.h
@@ -57,7 +57,7 @@

 #define CFG_TUD_USBTMC           1
 #define CFG_TUD_USBTMC_ENABLE_INT_EP 1
-#define USBTMC_CFG_ENABLE_488    1
+#define CFG_USBTMC_CFG_ENABLE_488    1

 #ifdef __cplusplus
 }
--- a/examples/device/usbtmc/src/usbtmc_app.c
+++ b/examples/device/usbtmc/src/usbtmc_app.c
@@ -29,7 +29,7 @@
 #include "bsp/board.h"
 #include "main.h"

-#if (USBTMC_CFG_ENABLE_488)
+#if (CFG_USBTMC_CFG_ENABLE_488)
 usbtmc_response_capabilities_488_t const
 #else
 usbtmc_response_capabilities_t const
@@ -48,7 +48,7 @@ usbtmcd_app_capabilities  =
        .canEndBulkInOnTermChar = 0
    },

-#if (USBTMC_CFG_ENABLE_488)
+#if (CFG_USBTMC_CFG_ENABLE_488)
    .bcdUSB488 = USBTMC_488_VERSION,
    .bmIntfcCapabilities488 =
    {