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

Bugfix: race condition removed when changing settings on fast sweep

Browse Source
This commit is contained in:
Jan Käberich 2020-09-27 11:49:30 +02:00
parent 967d72c11e
commit eb64e042f4
5 changed files with 284 additions and 298 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Software/PC_Application/Application Executable file
View File

Binary file not shown.

554
Software/VNA_embedded/.cproject
View File

File diff suppressed because it is too large Load Diff

13
Software/VNA_embedded/Application/App.cpp
View File

@ -40,7 +40,6 @@ extern ADC_HandleTypeDef hadc1;
#define FLAG_USB_PACKET 0x01 #define FLAG_USB_PACKET 0x01
#define FLAG_DATAPOINT 0x02 #define FLAG_DATAPOINT 0x02
#define FLAG_WORK_REQUIRED 0x04
static void VNACallback(Protocol::Datapoint res) { static void VNACallback(Protocol::Datapoint res) {
result = res; result = res;
@ -54,11 +53,6 @@ static void USBPacketReceived(Protocol::PacketInfo p) {
xTaskNotifyFromISR(handle, FLAG_USB_PACKET, eSetBits, &woken); xTaskNotifyFromISR(handle, FLAG_USB_PACKET, eSetBits, &woken);
portYIELD_FROM_ISR(woken); portYIELD_FROM_ISR(woken);
} }
static void HardwareWorkRequired() {
BaseType_t woken = false;
xTaskNotifyFromISR(handle, FLAG_WORK_REQUIRED, eSetBits, &woken);
portYIELD_FROM_ISR(woken);
}
void App_Start() { void App_Start() {
STM::Init(); STM::Init();
@ -101,7 +95,7 @@ void App_Start() {
EN_6V_GPIO_Port->BSRR = EN_6V_Pin; EN_6V_GPIO_Port->BSRR = EN_6V_Pin;
#endif #endif
if (!HW::Init(HardwareWorkRequired)) { if (!HW::Init()) {
LOG_CRIT("Initialization failed, unable to start"); LOG_CRIT("Initialization failed, unable to start");
LED::Error(4); LED::Error(4);
} }
@ -119,9 +113,6 @@ void App_Start() {
uint32_t notification; uint32_t notification;
if(xTaskNotifyWait(0x00, UINT32_MAX, &notification, 100) == pdPASS) { if(xTaskNotifyWait(0x00, UINT32_MAX, &notification, 100) == pdPASS) {
// something happened // something happened
if(notification & FLAG_WORK_REQUIRED) {
HW::Work();
}
if(notification & FLAG_DATAPOINT) { if(notification & FLAG_DATAPOINT) {
Protocol::PacketInfo packet; Protocol::PacketInfo packet;
packet.type = Protocol::PacketType::Datapoint; packet.type = Protocol::PacketType::Datapoint;
@ -217,7 +208,7 @@ void App_Start() {
LOG_WARN("Timed out waiting for point, last received point was %d (Status 0x%04x)", result.pointNum, FPGA::GetStatus()); LOG_WARN("Timed out waiting for point, last received point was %d (Status 0x%04x)", result.pointNum, FPGA::GetStatus());
FPGA::AbortSweep(); FPGA::AbortSweep();
// restart the current sweep // restart the current sweep
HW::Init(HardwareWorkRequired); HW::Init();
HW::Ref::update(); HW::Ref::update();
VNA::Setup(settings, VNACallback); VNA::Setup(settings, VNACallback);
sweepActive = true; sweepActive = true;

11
Software/VNA_embedded/Application/Hardware.cpp
View File

@ -30,8 +30,6 @@ static void HaltedCallback() {
} }
} }
static HW::WorkRequest requestWork;
static void ReadComplete(FPGA::SamplingResult result) { static void ReadComplete(FPGA::SamplingResult result) {
bool needs_work = false; bool needs_work = false;
switch(activeMode) { switch(activeMode) {
@ -47,8 +45,8 @@ static void ReadComplete(FPGA::SamplingResult result) {
default: default:
break; break;
} }
if(needs_work && requestWork) { if(needs_work) {
STM::DispatchToInterrupt(requestWork); STM::DispatchToInterrupt(HW::Work);
} }
} }
@ -72,8 +70,7 @@ void HW::Work() {
} }
} }
bool HW::Init(WorkRequest wr) { bool HW::Init() {
requestWork = wr;
LOG_DEBUG("Initializing..."); LOG_DEBUG("Initializing...");
activeMode = Mode::Idle; activeMode = Mode::Idle;
@ -189,7 +186,7 @@ void HW::SetMode(Mode mode) {
} }
if(mode != Mode::Idle && activeMode != Mode::Idle) { if(mode != Mode::Idle && activeMode != Mode::Idle) {
// do a full initialization when switching directly between modes // do a full initialization when switching directly between modes
HW::Init(requestWork); HW::Init();
} }
SetIdle(); SetIdle();
activeMode = mode; activeMode = mode;

4
Software/VNA_embedded/Application/Hardware.hpp
View File

@ -33,9 +33,7 @@ enum class Mode {
SA, SA,
}; };
using WorkRequest = void (*)(void); bool Init();
bool Init(WorkRequest wr);
void SetMode(Mode mode); void SetMode(Mode mode);
void SetIdle(); void SetIdle();
void Work(); void Work();