Support Arduino boards setting DTR to true

alexmucde · May 16, 2022 · ad58ee6 · ad58ee6
1 parent e1459ed
commit ad58ee6
Show file tree

Hide file tree

Showing 6 changed files with 83 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -148,6 +148,7 @@ Github Sponsors:
 
 v0.1.4:
 
+* Support Arduino boards setting DTR to true
 * Cleanup current output
 * Support OWON XDM1041 Multimeter
 

diff --git a/dltmultimeter.cpp b/dltmultimeter.cpp
@@ -23,7 +23,6 @@ DLTMultimeter::DLTMultimeter(QObject *parent) : QObject(parent)
     clearSettings();
 
     value = 0;
-    type = 0;
     powerName = "Power";
     readVoltageOngoing = false;
 }

diff --git a/dltrelais.cpp b/dltrelais.cpp
@@ -20,7 +20,7 @@
 
 DLTRelais::DLTRelais(QObject *parent) : QObject(parent)
 {
-    clearSettings();
+    clearSettings();    
 }
 
 DLTRelais::~DLTRelais()
@@ -82,8 +82,11 @@ void DLTRelais::start()
     {
         // open with success
 
-        // prevent flash mode of Wemos D1 mini
-        serialPort.setDataTerminalReady(false);
+        // prevent flash mode of Wemos D1 mini and Wemos D1, not for Arduino boards
+        if(type==2) // Arduino Boards
+            serialPort.setDataTerminalReady(true);
+        else
+            serialPort.setDataTerminalReady(false);
 
         // connect slot to receive data from serial port
         connect(&serialPort, SIGNAL(readyRead()), this, SLOT(readyRead()));
@@ -212,9 +215,20 @@ void DLTRelais::timeout()
     }
 }
 
+int DLTRelais::getType() const
+{
+    return type;
+}
+
+void DLTRelais::setType(int newType)
+{
+    type = newType;
+}
+
 void DLTRelais::clearSettings()
 {
     // clear settings
+    type = 0;
     for(int num=0;num<4;num++)
         relaisName[num] = QString("Relais%1").arg(num+1);
 
@@ -237,6 +251,7 @@ void DLTRelais::writeSettings(QXmlStreamWriter &xml,int num)
         xml.writeTextElement("interfaceSerialNumber",QSerialPortInfo(interface).serialNumber());
         xml.writeTextElement("interfaceProductIdentifier",QString("%1").arg(QSerialPortInfo(interface).productIdentifier()));
         xml.writeTextElement("interfaceVendorIdentifier",QString("%1").arg(QSerialPortInfo(interface).vendorIdentifier()));
+        xml.writeTextElement("type",QString("%1").arg(type));
         xml.writeTextElement("active",QString("%1").arg(active));
     xml.writeEndElement(); // DLTRelais
 }
@@ -293,6 +308,10 @@ void DLTRelais::readSettings(const QString &filename,int num)
                   {
                       interfaceVendorIdentifier = xml.readElementText().toUShort();
                   }
+                  else if(xml.name() == QString("type"))
+                  {
+                      type = xml.readElementText().toInt();
+                  }
                   else if(xml.name() == QString("active"))
                   {
                       active = xml.readElementText().toInt();

diff --git a/dltrelais.h b/dltrelais.h
@@ -55,6 +55,9 @@ class DLTRelais : public QObject
     void writeSettings(QXmlStreamWriter &xml,int num);
     void readSettings(const QString &filename,int num);
 
+    int getType() const;
+    void setType(int newType);
+
 signals:
 
     // Called when status changed
@@ -76,6 +79,7 @@ private slots:
     unsigned int watchDogCounter,watchDogCounterLast;
 
     // Settings
+    int type;
     QString interface;
     QString interfaceSerialNumber;
     ushort interfaceProductIdentifier;

diff --git a/settingsdialog.cpp b/settingsdialog.cpp
@@ -89,6 +89,8 @@ void SettingsDialog::restoreSettings(DLTRelais *dltRelais1, DLTRelais *dltRelais
     ui->comboBoxSerialPort2->setCurrentText(dltRelais2->getInterface());
     ui->checkBoxRelais1Active->setChecked(dltRelais1->getActive());
     ui->checkBoxRelais2Active->setChecked(dltRelais2->getActive());
+    ui->comboBoxRelaisBoardType1->setCurrentIndex(dltRelais1->getType());
+    ui->comboBoxRelaisBoardType2->setCurrentIndex(dltRelais2->getType());
 
     /* DLTMultimeter */
     ui->comboBoxSerialPortMultimeter1->setCurrentText(dltMultimeter1->getInterface());
@@ -125,6 +127,8 @@ void SettingsDialog::backupSettings(DLTRelais *dltRelais1, DLTRelais *dltRelais2
     dltRelais2->setRelaisName(4,ui->lineEditRelaisName8->text());
     dltRelais1->setActive(ui->checkBoxRelais1Active->isChecked());
     dltRelais2->setActive(ui->checkBoxRelais2Active->isChecked());
+    dltRelais1->setType(ui->comboBoxRelaisBoardType1->currentIndex());
+    dltRelais2->setType(ui->comboBoxRelaisBoardType2->currentIndex());
 
     /* DLTMultimeter */
     dltMultimeter1->setInterface(ui->comboBoxSerialPortMultimeter1->currentText());

diff --git a/settingsdialog.ui b/settingsdialog.ui
@@ -98,6 +98,32 @@
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QLabel" name="label_22">
+         <property name="text">
+          <string>Type:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QComboBox" name="comboBoxRelaisBoardType1">
+         <item>
+          <property name="text">
+           <string>Wemos Mini D1 (3 Relais)</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Wemos D1 (4 Relais)</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Arduino Boards</string>
+          </property>
+         </item>
+        </widget>
+       </item>
        <item>
         <widget class="QLabel" name="label">
          <property name="text">
@@ -175,6 +201,32 @@
          </property>
         </widget>
        </item>
+       <item>
+        <widget class="QLabel" name="label_23">
+         <property name="text">
+          <string>Type:</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QComboBox" name="comboBoxRelaisBoardType2">
+         <item>
+          <property name="text">
+           <string>Wemos Mini D1 (3 Relais)</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Wemos D1 (4 Relais)</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Arduino Boards</string>
+          </property>
+         </item>
+        </widget>
+       </item>
        <item>
         <widget class="QLabel" name="label_8">
          <property name="text">
-Original file line number
+Diff line change
@@ Expand Up / @@ -148,6 +148,7 @@ Github Sponsors: @@
     v0.1.4:
+    * Support Arduino boards setting DTR to true
     * Cleanup current output
     * Support OWON XDM1041 Multimeter
@@ Expand Down @@