Change requset type parameter back to uint8_t (fix type cast), support USB indicator pulse

This commit is contained in:
Nathan Conrad
2019-09-14 18:07:12 -04:00
parent 6e00886ffb
commit 64bfec79b2
5 changed files with 68 additions and 22 deletions

View File

@@ -36,12 +36,12 @@
/* Blink pattern
* - 250 ms : device not mounted
* - 1000 ms : device mounted
* - 0 ms : device mounted
* - 2500 ms : device is suspended
*/
enum {
BLINK_NOT_MOUNTED = 250,
BLINK_MOUNTED = 1000,
BLINK_MOUNTED = 0,
BLINK_SUSPENDED = 2500,
};
@@ -97,17 +97,46 @@ void tud_resume_cb(void)
}
//--------------------------------------------------------------------+
// BLINKING TASK
// BLINKING TASK + Indicator pulse
//--------------------------------------------------------------------+
volatile uint8_t doPulse = false;
// called from USB context
void led_indicator_pulse(void) {
doPulse = true;
}
void led_blinking_task(void)
{
static uint32_t start_ms = 0;
static bool led_state = false;
if(blink_interval_ms == BLINK_MOUNTED) // Mounted
{
if(doPulse)
{
led_state = true;
board_led_write(true);
start_ms = board_millis();
doPulse = false;
}
else if (led_state == true)
{
if ( board_millis() - start_ms < 750) //Spec says blink must be between 500 and 1000 ms.
{
return; // not enough time
}
led_state = false;
board_led_write(false);
}
}
else
{
// Blink every interval ms
if ( board_millis() - start_ms < blink_interval_ms) return; // not enough time
start_ms += blink_interval_ms;
// Blink every interval ms
if ( board_millis() - start_ms < blink_interval_ms) return; // not enough time
start_ms += blink_interval_ms;
board_led_write(led_state);
led_state = 1 - led_state; // toggle
board_led_write(led_state);
led_state = 1 - led_state; // toggle
}
}

View File

@@ -0,0 +1,5 @@
#ifndef MAIN_H
#define MAIN_H
void led_indicator_pulse(void);
#endif

View File

@@ -25,6 +25,7 @@
#include <strings.h>
#include "class/usbtmc/usbtmc_device.h"
#include "main.h"
#if (USBTMC_CFG_ENABLE_488)
usbtmc_response_capabilities_488_t const
@@ -39,7 +40,7 @@ usbtmcd_app_capabilities =
{
.listenOnly = 0,
.talkOnly = 0,
.supportsIndicatorPulse = 0
.supportsIndicatorPulse = 1
},
.bmDevCapabilities = {
.canEndBulkInOnTermChar = 0
@@ -63,7 +64,7 @@ usbtmcd_app_capabilities =
#endif
};
static const char idn[] = "TinyUSB,ModelNumber,SerialNumber,FirmwareVer";
static const char idn[] = "TinyUSB,ModelNumber,SerialNumber,FirmwareVer\n";
static uint8_t status;
static bool queryReceived = false;
@@ -96,7 +97,7 @@ bool usbtmcd_app_msgBulkIn_complete(uint8_t rhport)
return true;
}
static uint8_t noQueryMsg[] = "ERR: No query";
static uint8_t noQueryMsg[] = "ERR: No query\n";
bool usbtmcd_app_msgBulkIn_request(uint8_t rhport, usbtmc_msg_request_dev_dep_in const * request)
{
usbtmc_msg_dev_dep_msg_in_header_t hdr = {
@@ -127,7 +128,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.
uint8_t usbtmcd_app_get_stb(uint8_t rhport, usbtmc_status_enum *rspResult)
uint8_t usbtmcd_app_get_stb(uint8_t rhport, uint8_t *rspResult)
{
(void)rhport;
*rspResult = USBTMC_STATUS_SUCCESS;
@@ -137,3 +138,7 @@ uint8_t usbtmcd_app_get_stb(uint8_t rhport, usbtmc_status_enum *rspResult)
return status;
}
bool usbtmcd_app_indicator_pluse(uint8_t rhport, tusb_control_request_t const * msg)
{
led_indicator_pulse();
}