Added sampled data CSV export button and SWD prog erase flash button

Author: vedderb

android/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<manifest package="vedder.vesctool" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.15" android:versionCode="24" android:installLocation="auto">
+<manifest package="vedder.vesctool" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.15" android:versionCode="22" android:installLocation="auto">
     <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="VESC Tool" android:icon="@drawable/icon">
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtproject.qt5.android.bindings.QtActivity" android:label="VESC Tool" android:screenOrientation="unspecified" android:launchMode="singleTop">
             <intent-filter>

pages/pagesampleddata.cpp

@@ -644,3 +644,56 @@ void PageSampledData::on_plotModeBox_currentIndexChanged(int index)
 {
     ui->currentStack->setCurrentIndex(index == 2 ? 1 : 0);
 }
+
+void PageSampledData::on_saveDataButton_clicked()
+{
+    QString fileName = QFileDialog::getSaveFileName(this,
+                                                    tr("Save CSV"), "",
+                                                    tr("CSV Files (*.csv)"));
+
+    if (!fileName.isEmpty()) {
+        if (!fileName.toLower().endsWith(".csv")) {
+            fileName.append(".csv");
+        }
+
+        QFile file(fileName);
+        if (!file.open(QIODevice::WriteOnly)) {
+            QMessageBox::critical(this, "Save CSV File",
+                                  "Could not open\n" + fileName + "\nfor writing");
+            return;
+        }
+
+        QTextStream stream(&file);
+        stream.setCodec("UTF-8");
+
+        // Generate Time axis
+        QVector<double> timeVec;
+        timeVec.resize(fSwVector.size());
+        double prev_t = 0.0;
+        for (int i = 0;i < timeVec.size();i++) {
+            timeVec[i] = prev_t;
+            prev_t += 1.0 / fSwVector[i];
+        }
+
+        stream << "T;I1;I2;I3;V1;V2;V3;I_tot;V_zero;Phase\n";
+
+        for (int i = 0;i < curr1Vector.size();i++) {
+            stream << timeVec.at(i) << ";";
+            stream << curr1Vector.at(i) << ";";
+            stream << curr2Vector.at(i) << ";";
+            stream << -(curr1Vector.at(i) + curr2Vector.at(i)) << ";";
+            stream << ph1Vector.at(i) << ";";
+            stream << ph2Vector.at(i) << ";";
+            stream << ph3Vector.at(i) << ";";
+            stream << currTotVector.at(i) << ";";
+            stream << vZeroVector.at(i) << ";";
+            stream << (double)((quint8)phaseArray.at(i)) / 250.0 * 360.0 << ";";
+
+            if (i < (curr1Vector.size() - 1)) {
+                stream << "\n";
+            }
+        }
+
+        file.close();
+    }
+}

pages/pagesampleddata.h

@@ -58,6 +58,7 @@ private slots:
     void on_rescaleButton_clicked();
     void on_filterLogScaleBox_toggled(bool checked);
     void on_plotModeBox_currentIndexChanged(int index);
+    void on_saveDataButton_clicked();
 
 private:
     Ui::PageSampledData *ui;

pages/pagesampleddata.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>591</width>
+    <width>613</width>
     <height>472</height>
    </rect>
   </property>
@@ -637,6 +637,26 @@
        </property>
       </spacer>
      </item>
+     <item>
+      <widget class="QPushButton" name="saveDataButton">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="toolTip">
+        <string>Save samples to CSV file...</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="../res.qrc">
+         <normaloff>:/res/icons/Save as-96.png</normaloff>:/res/icons/Save as-96.png</iconset>
+       </property>
+      </widget>
+     </item>
     </layout>
    </item>
    <item>

pages/pageswdprog.cpp

@@ -196,6 +196,7 @@ void PageSwdProg::fwUploadStatus(const QString &status, double progress, bool is
     ui->display->setValue(progress * 100.0);
 
     ui->connectButton->setEnabled(!isOngoing);
+    ui->eraseFlashButton->setEnabled(!isOngoing);
     ui->disconnectButton->setEnabled(!isOngoing);
     ui->uploadButton->setEnabled(!isOngoing);
 }
@@ -312,3 +313,21 @@ void PageSwdProg::addSwdFw(QString name, QString path, uint32_t addr, QString bl
     item->setData(Qt::UserRole, QVariant::fromValue(fw));
     ui->fwList->insertItem(ui->fwList->count(), item);
 }
+
+void PageSwdProg::on_eraseFlashButton_clicked()
+{
+    if (mVesc) {
+        if (!mVesc->isPortConnected()) {
+            QMessageBox::critical(this,
+                                  tr("Connection Error"),
+                                  tr("The VESC is not connected."));
+            return;
+        }
+
+        if (mVesc->swdEraseFlash()) {
+            QMessageBox::information(this,
+                                  tr("Erase Flash"),
+                                  tr("The flash memory on the target was erased successfully!"));
+        }
+    }
+}

pages/pageswdprog.h

@@ -62,6 +62,7 @@ private slots:
     void on_uploadButton_clicked();
     void on_disconnectButton_clicked();
     void on_cancelButton_clicked();
+    void on_eraseFlashButton_clicked();
 
 private:
     Ui::PageSwdProg *ui;

pages/pageswdprog.ui

@@ -170,10 +170,21 @@
        </property>
       </widget>
      </item>
+     <item>
+      <widget class="QPushButton" name="eraseFlashButton">
+       <property name="text">
+        <string>Erase Only</string>
+       </property>
+       <property name="icon">
+        <iconset resource="../res.qrc">
+         <normaloff>:/res/icons/Delete-96.png</normaloff>:/res/icons/Delete-96.png</iconset>
+       </property>
+      </widget>
+     </item>
      <item>
       <widget class="QPushButton" name="uploadButton">
        <property name="text">
-        <string>Upload</string>
+        <string>Erase &amp;&amp; Upload</string>
        </property>
        <property name="icon">
         <iconset resource="../res.qrc">

res/CHANGELOG

@@ -1,3 +1,7 @@
+== 1.16 ==
+* Added support to export sampled data as CSV.
+* Added erase only button to SWD prog.
+
 == 1.15 ==
 * Keep screen on setting on android.
 * Added support for imperial units.

vesc_tool.pro

@@ -5,7 +5,7 @@
 #-------------------------------------------------
 
 # Version
-VT_VERSION = 1.15
+VT_VERSION = 1.16
 VT_INTRO_VERSION = 1
 
 VT_ANDROID_VERSION_ARMV7 = 22