v1.09c, Fix issue with end key not going to end character, allow ctrl…

…+left/right to jump to newlines, update UART speed text to specify 5M baud as maximum
LairdCP · Sep 8, 2017 · 9bbcd0a · 9bbcd0a
1 parent f7ddee0
commit 9bbcd0a
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/LrdScrollEdit.cpp b/LrdScrollEdit.cpp
@@ -175,9 +175,9 @@ LrdScrollEdit::eventFilter(
                     while (mintCurPos > 0)
                     {
                         --mintCurPos;
-                        if (mstrDatOut.at(mintCurPos) == ' ')
+                        if (mstrDatOut.at(mintCurPos) == ' ' || mstrDatOut.at(mintCurPos) == '\r' || mstrDatOut.at(mintCurPos) == '\n')
                         {
-                            //Found a space
+                            //Found a space or newline character
                             break;
                         }
                     }
@@ -200,9 +200,9 @@ LrdScrollEdit::eventFilter(
                     while (mintCurPos < mstrDatOut.length())
                     {
                         ++mintCurPos;
-                        if (mstrDatOut.at(mintCurPos) == ' ')
+                        if (mintCurPos < mstrDatOut.length() && (mstrDatOut.at(mintCurPos) == ' ' || mstrDatOut.at(mintCurPos) == '\r' || mstrDatOut.at(mintCurPos) == '\n'))
                         {
-                            //Found a space
+                            //Found a space or newline character
                             break;
                         }
                     }
@@ -233,7 +233,7 @@ LrdScrollEdit::eventFilter(
                 if (!(keyEvent->modifiers() & Qt::ControlModifier))
                 {
                     //Move to end of line
-                    mintCurPos = mstrDatOut.length()-1;
+                    mintCurPos = mstrDatOut.length();
                     this->UpdateCursor();
                 }
                 return true;

diff --git a/UwxMainWindow.cpp b/UwxMainWindow.cpp
@@ -8111,7 +8111,7 @@ MainWindow::on_check_EnableWeeklyUpdateCheck_stateChanged(
     int
     )
 {
-    //
+    //Update check checkbox has been toggled
     gpTermSettings->setValue("UpdateCheckEnable", ui->check_EnableWeeklyUpdateCheck->isChecked());
 }
 

diff --git a/UwxMainWindow.h b/UwxMainWindow.h
@@ -103,7 +103,7 @@ const qint8 MODE_UPDATE_ERROR_CODE            = 16;
 const qint8 MODE_CHECK_FIRMWARE_VERSIONS      = 17;
 const qint8 MODE_CHECK_FIRMWARE_SUPPORT       = 18;
 //Constants for version and functions
-const QString UwVersion                       = "1.09b"; //Version string
+const QString UwVersion                       = "1.09c"; //Version string
 //Constants for timeouts and streaming
 const qint16 FileReadBlock                    = 512;     //Number of bytes to read per block when streaming files
 const qint16 StreamProgress                   = 10000;   //Number of bytes between streaming progress updates

diff --git a/UwxMainWindow.ui b/UwxMainWindow.ui
@@ -3731,7 +3731,7 @@ COM=n
     Mac: /dev/[device] specifies a TTY device
 
 BAUD=n
-    [1200..921600] Could be limited to 115200 depending on PC hardware (limited to 230400 on most Macs)
+    [1200..5000000] Could be limited to 115200 depending on PC hardware (limited to 230400 on most Macs)
 
 STOP=n
     [1..2]
-Original file line number
+Diff line change
@@ Expand Up @@
         int
         )
     {
-        //
+        //Update check checkbox has been toggled
         gpTermSettings->setValue("UpdateCheckEnable", ui->check_EnableWeeklyUpdateCheck->isChecked());
     }
@@ Expand Down @@