minor updates

guitarpicva · Dec 15, 2022 · fe7ef9a · fe7ef9a
1 parent 592e0b9
commit fe7ef9a
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 33 deletions.
diff --git a/picokeyer.cpp b/picokeyer.cpp
@@ -46,8 +46,8 @@ void PicoKeyer::on_lineEdit_returnPressed()
         for(int i = 0; i < out.length(); i++) {
             sport->putChar(out.at(i).toLatin1());
         }
-        ui->plainTextEdit->appendPlainText("SENDING: ");
         ui->plainTextEdit->moveCursor(QTextCursor::End);
+        ui->plainTextEdit->appendPlainText("SENDING: ");
         sport->putChar('\r');
         sport->flush();
     }
@@ -66,6 +66,8 @@ void PicoKeyer::connectToKeyer()
             ui->plainTextEdit->moveCursor(QTextCursor::End);
         }
     });
+    s_sport = s.value("serialPort", "ttyUSB0").toString();
+    s.setValue("serialPort", s_sport);
     sport->setPortName(s_sport);
     if(sport->open(QIODevice::ReadWrite)) {
         ui->plainTextEdit->appendPlainText("SERIAL PORT " + s_sport + " OPENED");
@@ -150,7 +152,7 @@ void PicoKeyer::on_timeout()
     if(inbytes.length() > 0) {
         //qDebug()<<"inbytes:"<<inbytes;
         QString out = inbytes;
-        out.replace('\0', '?');
+        out.replace('\0', '?').replace(">", "AR").replace("+", "KN");
         inbytes.clear();
         ui->plainTextEdit->insertPlainText(out);
         ui->plainTextEdit->moveCursor(QTextCursor::End);
@@ -177,15 +179,10 @@ void PicoKeyer::on_updateConversationButton_clicked()
     ui->plainTextEdit->moveCursor(QTextCursor::End);
 }
 
-void PicoKeyer::on_wpmDial_sliderReleased()
+void PicoKeyer::on_wpmDial_valueChanged(int value)
 {
     // send the new value to the keyer as WPM
     i_wpm = ui->wpmDial->value();
     setNewWPM();
-    wpmLabel->setText(QString::number(i_wpm) + " WPM");
-}
-
-void PicoKeyer::on_wpmDial_valueChanged(int value)
-{
-    wpmLabel->setText(QString::number(value) + " WPM");
+    wpmLabel->setText(QString::number(i_wpm) + " W");
 }
diff --git a/picokeyer.h b/picokeyer.h
@@ -31,7 +31,6 @@ private slots:
     void connectToKeyer();
     void setNewWPM();
     void on_updateConversationButton_clicked();
-    void on_wpmDial_sliderReleased();
     void on_wpmDial_valueChanged(int value);
 
 private:
@@ -45,6 +44,6 @@ private slots:
     int i_interval = 2000;
     int i_baudRate = 115200;
     int i_wpm = 20;
-    QString s_sport = "COM3";
+    QString s_sport = "ttyUSB0";
 };
 #endif // PICOKEYER_H
diff --git a/picokeyer.ui b/picokeyer.ui
@@ -76,31 +76,13 @@ padding:3px 3px;
         <number>3</number>
        </property>
        <item row="0" column="1">
-        <widget class="QSlider" name="wpmDial">
-         <property name="toolTip">
-          <string>Drag the slider to set the Words Per Minute value</string>
-         </property>
-         <property name="minimum">
-          <number>5</number>
-         </property>
+        <widget class="QSpinBox" name="wpmDial">
          <property name="maximum">
           <number>60</number>
          </property>
-         <property name="value">
-          <number>15</number>
-         </property>
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="tickPosition">
-          <enum>QSlider::NoTicks</enum>
-         </property>
-         <property name="tickInterval">
-          <number>5</number>
-         </property>
         </widget>
        </item>
-       <item row="0" column="2">
+       <item row="0" column="3">
         <widget class="QPushButton" name="updateConversationButton">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -122,7 +104,7 @@ padding:3px 3px;
          </property>
         </widget>
        </item>
-       <item row="0" column="3">
+       <item row="0" column="4">
         <widget class="QPushButton" name="clearButton">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -145,6 +127,19 @@ padding:3px 3px;
          </property>
         </widget>
        </item>
+       <item row="0" column="2">
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
     </item>
@@ -175,7 +170,7 @@ padding:3px 3px;
      <x>0</x>
      <y>0</y>
      <width>505</width>
-     <height>21</height>
+     <height>26</height>
     </rect>
    </property>
    <widget class="QMenu" name="menu_File">