caiyu/LibreVNA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix missing device log if USB connection is not established at power up

Browse Source
This commit is contained in:
Jan Käberich 2023-09-05 11:13:05 +02:00
parent 175cade3da
commit 70a0079f92
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Software/VNA_embedded/.settings/stm32cubeide.project.prefs
View File

@ -1,5 +1,5 @@
2F62501ED4689FB349E356AB974DBE57=6F84FD31C089E822CF61FFCABCD0B7D1
2F62501ED4689FB349E356AB974DBE57=EF826FD321FB312AEADE4DB74B81458C
66BE74F758C12D739921AEA421D593D3=2
8DF89ED150041C4CBC7CB9A9CAA90856=6F84FD31C089E822CF61FFCABCD0B7D1
8DF89ED150041C4CBC7CB9A9CAA90856=EF826FD321FB312AEADE4DB74B81458C
DC22A860405A8BF2F2C095E5B6529F12=A01929E06A3F8E0B7C263320E5AF494F
eclipse.preferences.version=1

10
Software/VNA_embedded/Application/Drivers/USB/usb.c
View File

@ -26,7 +26,7 @@ static bool data_transmission_active = false;
static bool log_transmission_active = true;
static uint32_t last_transmission = 0;
#define USB_TRANMISSION_TIMEOUT 100
#define USB_TRANSMISSION_TIMEOUT 100
USBD_ClassTypeDef USBD_ClassDriver =
{
@ -166,7 +166,7 @@ static bool trigger_next_fifo_transmission() {
}
static bool connection_okay() {
if(data_transmission_active && HAL_GetTick() - last_transmission > USB_TRANMISSION_TIMEOUT) {
if((data_transmission_active || log_transmission_active) && HAL_GetTick() - last_transmission > USB_TRANSMISSION_TIMEOUT) {
return false;
} else {
return true;
@ -237,6 +237,7 @@ bool usb_transmit(const uint8_t *data, uint16_t length) {
if(!connection_okay()) {
// clear buffer and attempt to restart the transfer
data_transmission_active = false;
log_transmission_active = false;
usb_transmit_fifo_level = 0;
}
// attempt to add data to fifo
@ -278,9 +279,10 @@ void usb_log(const char *log, uint16_t length) {
if(!log_transmission_active) {
static uint8_t buffer[256];
memcpy(buffer, log, length);
log_transmission_active = true;
hUsbDeviceFS.ep_in[EP_LOG_IN_ADDRESS & 0x7F].total_length = length;
USBD_LL_Transmit(&hUsbDeviceFS, EP_LOG_IN_ADDRESS, buffer, length);
if (USBD_LL_Transmit(&hUsbDeviceFS, EP_LOG_IN_ADDRESS, buffer, length) == USBD_OK) {
log_transmission_active = true;
}
} else {
// still busy, unable to send log
}