Bugfixes

- Firmware update device reattachment - Disconnect/connect with multiple devices - udev rule extended
2020-09-15 14:41:24 +02:00 · 2020-09-15 14:41:24 +02:00 · 44124bc09e
commit 44124bc09e
parent 2d44201de7
14 changed files with 90 additions and 66 deletions
--- a/Software/PC_Application/51-vna.rules
+++ b/Software/PC_Application/51-vna.rules
@ -1 +1,2 @@
 SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="564e", MODE:="0666"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="4121", MODE:="0666"
--- a/Software/PC_Application/Application
+++ b/Software/PC_Application/Application
--- a/Software/PC_Application/Device/device.cpp
+++ b/Software/PC_Application/Device/device.cpp
@ -8,6 +8,15 @@

 using namespace std;

+using USBID = struct {
+    int VID;
+    int PID;
+};
+static constexpr USBID IDs[] = {
+    {0x0483, 0x564e},
+    {0x0483, 0x4121},
+};
+
 USBInBuffer::USBInBuffer(libusb_device_handle *handle, unsigned char endpoint, int buffer_size) :
    buffer_size(buffer_size),
    received_size(0),
@ -22,13 +31,11 @@ USBInBuffer::USBInBuffer(libusb_device_handle *handle, unsigned char endpoint, i
 USBInBuffer::~USBInBuffer()
 {
    if(transfer) {
-        qDebug() << "Start cancellation";
        libusb_cancel_transfer(transfer);
        // wait for cancellation to complete
        mutex mtx;
        unique_lock<mutex> lck(mtx);
        cv.wait(lck);
-        qDebug() << "Cancellation complete";
    }
    delete buffer;
 }
--- a/Software/PC_Application/Device/device.h
+++ b/Software/PC_Application/Device/device.h
@ -82,14 +82,6 @@ private slots:
    }

 private:
-    using USBID = struct {
-        int VID;
-        int PID;
-    };
-    static constexpr USBID IDs[] = {
-        {0x0483, 0x5640},
-        {0x0483, 0x4121},
-    };
    static constexpr int EP_Data_Out_Addr = 0x01;
    static constexpr int EP_Data_In_Addr = 0x81;
    static constexpr int EP_Log_In_Addr = 0x82;
--- a/Software/PC_Application/Device/devicelog.cpp
+++ b/Software/PC_Application/Device/devicelog.cpp
@ -26,9 +26,9 @@ void DeviceLog::addLine(QString line)
    if(line.contains(",CRT]")) {
        color = Qt::red;
    } else if(line.contains(",ERR]")) {
-        color = QColor("orange");
+        color = QColor(255, 94, 0);
    } else if(line.contains(",WRN]")) {
-        color = Qt::darkYellow;
+        color = QColor(255, 174, 26);
    } else if(line.contains(",DBG")) {
        color = Qt::gray;
    }
--- a/Software/PC_Application/Device/firmwareupdatedialog.cpp
+++ b/Software/PC_Application/Device/firmwareupdatedialog.cpp
@ -2,7 +2,7 @@
 #include "ui_firmwareupdatedialog.h"
 #include <QFileDialog>

-FirmwareUpdateDialog::FirmwareUpdateDialog(Device *&dev, QWidget *parent) :
+FirmwareUpdateDialog::FirmwareUpdateDialog(Device *dev, QWidget *parent) :
    QDialog(parent),
    ui(new Ui::FirmwareUpdateDialog),
    dev(dev),
@ -98,12 +98,9 @@ void FirmwareUpdateDialog::timerCallback()
        auto devices = Device::GetDevices();
        if(devices.find(serialnumber) != devices.end()) {
            // the device rebooted and is available again
-            dev = new Device(serialnumber);
-            addStatus("...device reattached, update complete");
+            addStatus("...device enumerated, update complete");
            timer.stop();
-            ui->bStart->setEnabled(true);
-            disconnect(dev, &Device::AckReceived, this, &FirmwareUpdateDialog::receivedAck);
-            disconnect(dev, &Device::NackReceived, this, &FirmwareUpdateDialog::receivedNack);
+            emit DeviceRebooted(serialnumber);
        }
    }
 }
@ -139,11 +136,10 @@ void FirmwareUpdateDialog::receivedAck()
    case State::TriggeringUpdate:
        addStatus("Rebooting device...");
        serialnumber = dev->serial();
-        delete dev;
-        dev = nullptr;
+        emit DeviceRebooting();
        state = State::WaitingForReboot;
        timer.setSingleShot(false);
-        timer.start(1000);
+        timer.start(2000);
        break;
    default:
        break;
--- a/Software/PC_Application/Device/firmwareupdatedialog.h
+++ b/Software/PC_Application/Device/firmwareupdatedialog.h
@ -22,9 +22,13 @@ public:
     * - If the update fails during device reboot, the device pointer is set to zero and the device deleted
     * - If the update succeeds, the device pointer will be set to the new device instance
     */
-    explicit FirmwareUpdateDialog(Device *&dev, QWidget *parent = nullptr);
+    explicit FirmwareUpdateDialog(Device *dev, QWidget *parent = nullptr);
    ~FirmwareUpdateDialog();

+signals:
+    void DeviceRebooting(); // emitted when the update process is triggered, the device should be disconnected
+    void DeviceRebooted(QString serial); // emitted when an updated device is enumerated after the update
+
 private slots:
    void on_bFile_clicked();
    void on_bStart_clicked();
@ -37,7 +41,7 @@ private:
    void abortWithError(QString error);
    void sendNextFirmwareChunk();
    Ui::FirmwareUpdateDialog *ui;
-    Device *&dev;
+    Device *dev;
    QFile *file;
    QTimer timer;

--- a/Software/PC_Application/Device/manualcontroldialog.ui
+++ b/Software/PC_Application/Device/manualcontroldialog.ui
@ -523,13 +523,13 @@
                  <number>128</number>
                 </property>
                 <property name="maximum">
-                  <number>131072</number>
+                  <number>130944</number>
                 </property>
                 <property name="singleStep">
                  <number>128</number>
                 </property>
                 <property name="value">
-                  <number>131072</number>
+                  <number>130944</number>
                 </property>
                </widget>
               </item>
--- a/Software/PC_Application/appwindow.cpp
+++ b/Software/PC_Application/appwindow.cpp
@ -99,6 +99,8 @@ AppWindow::AppWindow(QWidget *parent)
    connect(ui->actionFirmware_Update, &QAction::triggered, [=](){
        if(device) {
            auto fw_update = new FirmwareUpdateDialog(device);
+            connect(fw_update, &FirmwareUpdateDialog::DeviceRebooting, this, &AppWindow::DisconnectDevice);
+            connect(fw_update, &FirmwareUpdateDialog::DeviceRebooted, this, &AppWindow::ConnectToDevice);
            fw_update->exec();
        }
    });
@ -196,12 +198,16 @@ void AppWindow::DisconnectDevice()
    ui->actionDisconnect->setEnabled(false);
    ui->actionManual_Control->setEnabled(false);
    ui->actionFirmware_Update->setEnabled(false);
+    for(auto a : deviceActionGroup->actions()) {
+        a->setChecked(false);
+    }
    if(deviceActionGroup->checkedAction()) {
        deviceActionGroup->checkedAction()->setChecked(false);
    }
    lConnectionStatus.setText("No device connected");
    lDeviceInfo.setText("No device information available yet");
    Mode::getActiveMode()->deviceDisconnected();
+    qDebug() << "Disconnected device";
 }

 void AppWindow::DeviceConnectionLost()
@ -244,22 +250,19 @@ void AppWindow::CreateToolbars()

 int AppWindow::UpdateDeviceList()
 {
+    deviceActionGroup->setExclusive(true);
    ui->menuConnect_to->clear();
    auto devices = Device::GetDevices();
    if(devices.size()) {
        for(auto d : devices) {
            auto connectAction = ui->menuConnect_to->addAction(d);
-            deviceActionGroup->addAction(connectAction);
            connectAction->setCheckable(true);
+            connectAction->setActionGroup(deviceActionGroup);
            if(device && d == device->serial()) {
                connectAction->setChecked(true);
            }
-            connect(connectAction, &QAction::triggered, [this, connectAction, d]() {
+            connect(connectAction, &QAction::triggered, [this, d]() {
               ConnectToDevice(d);
-               if(device) {
-                   // connectAction might have been unchecked if it was a reconnect to the already connected device
-                   connectAction->setChecked(true);
-               }
            });
        }
        ui->menuConnect_to->setEnabled(true);
--- a/Software/VNA_embedded/.settings/language.settings.xml
+++ b/Software/VNA_embedded/.settings/language.settings.xml
@ -1,25 +1,48 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <project>
-	<configuration id="fr.ac6.managedbuild.config.gnu.cross.exe.debug.1502405410" name="Debug">
-		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
-			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
-			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
-			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="-866672051809137248" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
-				<language-scope id="org.eclipse.cdt.core.gcc"/>
-				<language-scope id="org.eclipse.cdt.core.g++"/>
-			</provider>
-		</extension>
-	</configuration>
-	<configuration id="fr.ac6.managedbuild.config.gnu.cross.exe.release.1788779437" name="Release">
-		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
-			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
-			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
-			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="-866672051809137248" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
-				<language-scope id="org.eclipse.cdt.core.gcc"/>
-				<language-scope id="org.eclipse.cdt.core.g++"/>
-			</provider>
-		</extension>
-	</configuration>
+    	
+    <configuration id="fr.ac6.managedbuild.config.gnu.cross.exe.debug.1502405410" name="Debug">
+        		
+        <extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
+            			
+            <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
+            			
+            <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
+            			
+            <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
+            			
+            <provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="1307432939745961523" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+                				
+                <language-scope id="org.eclipse.cdt.core.gcc"/>
+                				
+                <language-scope id="org.eclipse.cdt.core.g++"/>
+                			
+            </provider>
+            		
+        </extension>
+        	
+    </configuration>
+    	
+    <configuration id="fr.ac6.managedbuild.config.gnu.cross.exe.release.1788779437" name="Release">
+        		
+        <extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
+            			
+            <provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
+            			
+            <provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
+            			
+            <provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
+            			
+            <provider class="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" console="false" env-hash="1307432939745961523" id="fr.ac6.mcu.ide.build.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="Ac6 SW4 STM32 MCU Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+                				
+                <language-scope id="org.eclipse.cdt.core.gcc"/>
+                				
+                <language-scope id="org.eclipse.cdt.core.g++"/>
+                			
+            </provider>
+            		
+        </extension>
+        	
+    </configuration>
+    
 </project>
--- a/Software/VNA_embedded/Application/App.cpp
+++ b/Software/VNA_embedded/Application/App.cpp
@ -229,11 +229,9 @@ void App_Start() {
 					LOG_INFO("Firmware update process triggered");
 					auto fw_info = Firmware::GetFlashContentInfo(&flash);
 					if(fw_info.valid) {
-						Protocol::PacketInfo p;
-						p.type = Protocol::PacketType::Ack;
-						Communication::Send(p);
+						Communication::SendWithoutPayload(Protocol::PacketType::Ack);
 						// Some delay to allow communication to finish
-						vTaskDelay(1000);
+						vTaskDelay(100);
 						Firmware::PerformUpdate(&flash, fw_info);
 						// should never get here
 						Communication::SendWithoutPayload(Protocol::PacketType::Nack);
--- a/Software/VNA_embedded/Application/Drivers/FPGA/FPGA.cpp
+++ b/Software/VNA_embedded/Application/Drivers/FPGA/FPGA.cpp
@ -117,7 +117,9 @@ void FPGA::SetSamplesPerPoint(uint32_t nsamples) {
 	// register is in multiples of 128
 	nsamples /= 128;
 	// constrain to maximum value
-	nsamples &= 0x03FF;
+	if(nsamples >= 1024) {
+		nsamples = 1023;
+	}
 	WriteRegister(Reg::SamplesPerPoint, nsamples);
 }

--- a/Software/VNA_embedded/Application/Firmware.cpp
+++ b/Software/VNA_embedded/Application/Firmware.cpp
@ -57,7 +57,7 @@ Firmware::Info Firmware::GetFlashContentInfo(Flash *f) {
 		}
 		f->read(h.CPU_start + checked_size, read_size, buf);
 		if(memcmp(buf, (void*)(0x8000000+checked_size), read_size)) {
-			LOG_WARN("Difference to CPU firmware in external FLASH detected, update required");
+			LOG_INFO("Difference to CPU firmware in external FLASH detected, update required");
 			ret.CPU_need_update = true;
 			break;
 		}
--- a/Software/VNA_embedded/Application/VNA.cpp
+++ b/Software/VNA_embedded/Application/VNA.cpp
@ -493,6 +493,11 @@ bool VNA::Ref::applySettings(Protocol::ReferenceSettings s) {
 }

 bool VNA::ConfigureGenerator(Protocol::GeneratorSettings g) {
+	if(g.activePort == 0) {
+		// both ports disabled, no need to configure PLLs
+		SetIdle();
+		return true;
+	}
 	Protocol::ManualControl m;
 	// LOs not required
 	m.LO1CE = 0;
@ -533,13 +538,6 @@ bool VNA::ConfigureGenerator(Protocol::GeneratorSettings g) {
 		m.SourceHighband = true;
 	}
 	switch(g.activePort) {
-	case 0:
-		// no output signal, disable
-		m.AmplifierEN = 0;
-		m.SourceHighCE = 0;
-		m.SourceHighRFEN = 0;
-		m.SourceLowEN = 0;
-		break;
 	case 1:
 		m.AmplifierEN = 1;
 		m.PortSwitch = 0;