kingkevin
/
esp32-s2_dfu
1
0
Fork 0
Code Issues Releases Activity

(and update the example to match)

This commit is contained in:
Nathan Conrad 2019-09-14 16:56:53 -04:00
parent e74c6b0874
commit acd8fa7650
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
examples/device/usbtmc/src/usbtmc_app.c
View File

@ -49,7 +49,7 @@ usbtmcd_app_capabilities =
.bcdUSB488 = USBTMC_488_VERSION, .bcdUSB488 = USBTMC_488_VERSION,
.bmIntfcCapabilities488 = .bmIntfcCapabilities488 =
{ {
.supportsTrigger = 0, .supportsTrigger = 1,
.supportsREN_GTL_LLO = 0, .supportsREN_GTL_LLO = 0,
.is488_2 = 1 .is488_2 = 1
}, },
@ -68,15 +68,21 @@ static uint8_t status;
static bool queryReceived = false; static bool queryReceived = false;
bool usbtmcd_app_msgBulkOut_start(usbtmc_msg_request_dev_dep_out const * msgHeader) bool usbtmcd_app_msgBulkOut_start(uint8_t rhport, usbtmc_msg_request_dev_dep_out const * msgHeader)
{ {
(void)rhport;
(void)msgHeader; (void)msgHeader;
return true; return true;
} }
bool usbtmcd_app_msg_trigger(uint8_t rhport, usbtmc_msg_generic_t* msg) {
(void)rhport;
(void)msg;
return true;
}
bool usbtmcd_app_msg_data(uint8_t rhport, void *data, size_t len, bool transfer_complete)
bool usbtmcd_app_msg_data(void *data, size_t len, bool transfer_complete)
{ {
(void)rhport;
(void)transfer_complete; (void)transfer_complete;
if(transfer_complete && (len >=4) && !strncasecmp("*idn?",data,4)) { if(transfer_complete && (len >=4) && !strncasecmp("*idn?",data,4)) {
queryReceived = true; queryReceived = true;
@ -121,7 +127,7 @@ bool usbtmcd_app_msgBulkIn_request(uint8_t rhport, usbtmc_msg_request_dev_dep_in
} }
// Return status byte, but put the transfer result status code in the rspResult argument. // Return status byte, but put the transfer result status code in the rspResult argument.
uint8_t usbtmcd_app_get_stb(uint8_t rhport, uint8_t *rspResult) uint8_t usbtmcd_app_get_stb(uint8_t rhport, usbtmc_status_enum *rspResult)
{ {
(void)rhport; (void)rhport;
*rspResult = USBTMC_STATUS_SUCCESS; *rspResult = USBTMC_STATUS_SUCCESS;