jankae/LibreVNA
1
0
Fork 0
mirror of https://github.com/jankae/LibreVNA.git synced 2026-04-05 06:25:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Speed improvements

Browse source
This commit is contained in:
Jan Käberich 2020-10-03 21:56:09 +02:00
parent 5e00b2a7f8
commit 6bc6b1d202
18 changed files with 130 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

59
Software/VNA_embedded/Application/Drivers/FPGA/FPGA.cpp
View file

@ -237,9 +237,7 @@ static inline int64_t sign_extend_64(int64_t x, uint16_t bits) {
}
static FPGA::ReadCallback callback;
static uint8_t raw[36];
static bool halted;
static bool new_sample;
static uint8_t raw[38];
static FPGA::SamplingResult result;
static bool busy_reading = false;
@ -249,38 +247,11 @@ bool FPGA::InitiateSampleRead(ReadCallback cb) {
return false;
}
callback = cb;
uint8_t cmd[2] = {0xC0, 0x00};
uint16_t status;
Low(CS);
HAL_SPI_TransmitReceive(&FPGA_SPI, cmd, (uint8_t*) &status, 2, 100);
SwitchBytes(status);
if (status & 0x0010) {
halted = true;
} else {
halted = false;
}
if (!(status & 0x0004)) {
// no new data available yet
High(CS);
if (halted) {
if (halted && halted_cb) {
halted_cb();
halted = false;
}
} else {
LOG_WARN("ISR without new data, status: 0x%04x", status);
}
return false;
}
uint8_t cmd[38] = {0xC0, 0x00};
// Start data read
Low(CS);
busy_reading = true;
HAL_SPI_Receive_DMA(&FPGA_SPI, raw, 36);
HAL_SPI_TransmitReceive_DMA(&FPGA_SPI, cmd, raw, 38);
return true;
}
@ -292,24 +263,22 @@ static int64_t assembleSampleResultValue(uint8_t *raw) {
}
extern "C" {
void HAL_SPI_RxCpltCallback(SPI_HandleTypeDef *hspi) {
void HAL_SPI_TxRxCpltCallback(SPI_HandleTypeDef *hspi) {
uint16_t status = (uint16_t) raw[0] << 8 | raw[1];
// Assemble data from words
result.P1I = assembleSampleResultValue(&raw[30]);
result.P1Q = assembleSampleResultValue(&raw[24]);
result.P2I = assembleSampleResultValue(&raw[18]);
result.P2Q = assembleSampleResultValue(&raw[12]);
result.RefI = assembleSampleResultValue(&raw[6]);
result.RefQ = assembleSampleResultValue(&raw[0]);
result.P1I = assembleSampleResultValue(&raw[32]);
result.P1Q = assembleSampleResultValue(&raw[26]);
result.P2I = assembleSampleResultValue(&raw[20]);
result.P2Q = assembleSampleResultValue(&raw[14]);
result.RefI = assembleSampleResultValue(&raw[8]);
result.RefQ = assembleSampleResultValue(&raw[2]);
High(CS);
busy_reading = false;
new_sample = true;
if (new_sample && callback) {
if ((status & 0x0004) && callback) {
callback(result);
new_sample = false;
}
if (halted && halted_cb) {
if ((status & 0x0010) && halted_cb) {
halted_cb();
halted = false;
}
}
}

2
Software/VNA_embedded/Application/Drivers/FPGA/FPGA.hpp
View file

@ -110,7 +110,7 @@ void DisableInterrupt(Interrupt i);
void WriteMAX2871Default(uint32_t *DefaultRegs);
void WriteSweepConfig(uint16_t pointnum, bool lowband, uint32_t *SourceRegs, uint32_t *LORegs,
uint8_t attenuation, uint64_t frequency, SettlingTime settling, Samples samples, bool halt = false, LowpassFilter filter = LowpassFilter::Auto);
using ReadCallback = void(*)(SamplingResult result);
using ReadCallback = void(*)(const SamplingResult &result);
bool InitiateSampleRead(ReadCallback cb);
ADCLimits GetADCLimits();
void ResetADCLimits();

5
Software/VNA_embedded/Application/Drivers/USB/usb.c
View file

@ -19,7 +19,7 @@ static uint8_t *USBD_Class_GetDeviceQualifierDescriptor (uint16_t *length);
static usbd_recv_callback_t cb;
static uint8_t usb_receive_buffer[1024];
static uint8_t usb_transmit_fifo[4096];
static uint8_t usb_transmit_fifo[4092];
static uint16_t usb_transmit_read_index = 0;
static uint16_t usb_transmit_fifo_level = 0;
static bool data_transmission_active = false;
@ -218,10 +218,9 @@ void usb_init(usbd_recv_callback_t receive_callback) {
USBD_Start(&hUsbDeviceFS);
HAL_NVIC_SetPriority(USB_HP_IRQn, 0, 0);
HAL_NVIC_EnableIRQ(USB_HP_IRQn);
HAL_NVIC_SetPriority(USB_LP_IRQn, 7, 0);
HAL_NVIC_SetPriority(USB_LP_IRQn, 5, 0);
HAL_NVIC_EnableIRQ(USB_LP_IRQn);
}
bool usb_transmit(const uint8_t *data, uint16_t length) {
// attempt to add data to fifo
if(usb_transmit_fifo_level + length > sizeof(usb_transmit_fifo)) {