Version 0.16, made the following changes:

 - Fixed issue with partial UTF-8 receive showing as unicode
   replacement character
 - Fixed issue with large speed test data not sending any data
 - Reduced duplicate buffer data in scroll edit

Author: thedjnK

AuTerm/AutScrollEdit.cpp

@@ -22,13 +22,6 @@
 **
 *******************************************************************************/
 
-/******************************************************************************/
-// Defines
-/******************************************************************************/
-//Minimum number of characters present in the buffer before text sections are
-//appended instead of replacing the whole field
-#define TERM_SIZE_MIN_APPEND_TEXT 6
-
 /******************************************************************************/
 // Include Files
 /******************************************************************************/
@@ -37,6 +30,11 @@
 #include <QRegularExpression>
 #include <QDebug>
 
+/******************************************************************************/
+// Constants
+/******************************************************************************/
+const QChar unicode_replacement_char = QChar(0xfffd);
+
 /******************************************************************************/
 // Local Functions or Private Members
 /******************************************************************************/
@@ -59,7 +57,6 @@ AutScrollEdit::AutScrollEdit(QWidget *parent) : QPlainTextEdit(parent)
     nItemArraySize = 0;
     mbSliderShown = false;
     dat_out_updated = false;
-    dat_in_prev_check_len = 0;
     dat_in_new_len = 0;
 
     mstrDatIn.reserve(32768);
@@ -883,7 +880,6 @@ void AutScrollEdit::clear_dat_in()
     //Clears the DatIn buffer
     mstrDatIn.clear();
     mintPrevTextSize = 0;
-    dat_in_prev_check_len = 0;
     dat_in_new_len = 0;
     last_format = pre;
 
@@ -1021,15 +1017,14 @@ void AutScrollEdit::update_display()
 
         if (vt100_control_mode == VT100_MODE_STRIP)
         {
-            AutEscape::strip_vt100_formatting(&mstrDatIn, dat_in_prev_check_len);
+            AutEscape::strip_vt100_formatting(&mstrDatIn, 0);
         }
 
 //TODO: deal with partial VT100 escape codes
 
-#if 1
         //Replace unprintable characters with escape codes
         int32_t i = mstrDatIn.length() - 1;
-        while (i >= dat_in_prev_check_len)
+        while (i >= 0)
         {
             uint8_t current = (uint8_t)mstrDatIn.at(i);
 
@@ -1044,17 +1039,30 @@ void AutScrollEdit::update_display()
 
             --i;
         }
-#endif
 
-        if (dat_in_prev_check_len != mstrDatIn.length())
+        if (mstrDatIn.length() > 0)
         {
-            QString append_data = mstrDatIn.mid(dat_in_prev_check_len);
+            QString append_data = mstrDatIn;
             QList<vt100_format_code> format;
             int32_t end = 0;
 
+            //Check if we have unicode replacement characters, if so, wait for next chunk
+            i = append_data.length() - 1;
+            while (i >= 0 && append_data[i] == unicode_replacement_char && end < 3)
+            {
+                ++end;
+                --i;
+            }
+
+            if (end > 0)
+            {
+                cannot_parse_bytes += end;
+                append_data.remove((append_data.length() - end), end);
+            }
+
             if (vt100_control_mode == VT100_MODE_DECODE && vt100_process(&append_data, 0, &format, &end) == false)
             {
-                cannot_parse_bytes = append_data.length() - end;
+                cannot_parse_bytes += append_data.length() - end;
                 append_data.remove(end, (append_data.length() - end));
             }
 
@@ -1186,7 +1194,7 @@ void AutScrollEdit::update_display()
 
         //Update previous text size variables
         mintPrevTextSize = dat_in_new_len;
-        dat_in_prev_check_len = mstrDatIn.length() - cannot_parse_bytes;
+        mstrDatIn.remove(0, (mstrDatIn.length() - cannot_parse_bytes));
 
         //Update the cursor position
         this->update_cursor();

AuTerm/AutScrollEdit.h

@@ -50,7 +50,7 @@ enum vt100_format_type {
 };
 
 struct vt100_format_code {
-    uint32_t start;
+    int32_t start;
     QColor background_color;
     bool background_color_set;
     QColor foreground_color;
@@ -130,7 +130,6 @@ class AutScrollEdit : public QPlainTextEdit
     uint32_t mintPrevTextSize; //Holds a count of the previous text size
     bool mbSliderShown; //True if the slider moving to the bottom position upon appearing has been ran
     bool dat_out_updated; //True if mstrDatOut has been updated and needs redrawing
-    int32_t dat_in_prev_check_len; //Holds position of mstrDatIn where hex character escaping was last performed to
     int32_t dat_in_new_len; //Holds position of QString-version of mstrDatIn where the mstrDatIn ends
     QTextCharFormat last_format; //Last format applied to dat out data
     vt100_mode vt100_control_mode; //VT100 control code mode

AuTerm/UwxMainWindow.cpp

@@ -4980,24 +4980,30 @@ MainWindow::SendSpeedTestData(
     int intMaxLength
     )
 {
-    //Send string out. It's OK to send less than the maximum length but not more
-    int intSendTimes = (intMaxLength / gintSpeedTestMatchDataLength);
+    //Send string out. It's OK to send less than the maximum length but not more, unless none fit
+    int intSendTimes = 1;
+
+    if (intMaxLength > gintSpeedTestMatchDataLength)
+    {
+        intSendTimes = (intMaxLength / gintSpeedTestMatchDataLength);
+    }
+
     if (ui->check_SpeedShowTX->isChecked())
     {
         //Show TX data in terminal
-        while (intSendTimes > 0)
+        int print_times = intSendTimes;
+
+        while (print_times > 0)
         {
             //Append to buffer
             gbaSpeedDisplayBuffer.append(gbaSpeedMatchData);
-            --intSendTimes;
+            --print_times;
         }
+
         if (!gtmrSpeedUpdateTimer.isActive())
         {
             gtmrSpeedUpdateTimer.start();
         }
-
-        //Reset variable for actual sending
-        intSendTimes = (intMaxLength / gintSpeedTestMatchDataLength);
     }
 
     while (intSendTimes > 0)
@@ -5068,7 +5074,7 @@ MainWindow::SpeedTestReceive(
         if (ui->combo_SpeedDataType->currentIndex() != 0)
         {
             //Test data is OK
-            uint32_t remove_size = 0;
+            int32_t remove_size = 0;
             gbaSpeedReceivedData.append(gspSerialPort.read(received_bytes));
             while (remove_size < gbaSpeedReceivedData.length())
             {
@@ -5080,7 +5086,7 @@ MainWindow::SpeedTestReceive(
                 }
 
                 //Optimised search check function. for testing only
-                uint32_t i = 0;
+                int32_t i = 0;
                 bool good = true;
                 pointer_buf rec_buf;
                 pointer_buf match_buf;
@@ -5182,7 +5188,7 @@ MainWindow::SpeedTestReceive(
                         uint16_t new_offset = (i > 5 ? i - 5 : 0);
                         QString strFirst(gbaSpeedReceivedData.mid(remove_size + new_offset));
                         QString strSecond(gbaSpeedMatchData.mid(gintSpeedTestReceiveIndex + new_offset));
-                        uint32_t max_size = strFirst.length() > strSecond.length() ? strSecond.length() : strFirst.length();
+                        int32_t max_size = strFirst.length() > strSecond.length() ? strSecond.length() : strFirst.length();
                         quint16 iOffset = 0;
                         while (iOffset < max_size)
                         {

AuTerm/UwxMainWindow.h

@@ -103,7 +103,7 @@
 // Constants
 /******************************************************************************/
 //Constants for version and functions
-const QString UwVersion                         = "0.15"; //Version string
+const QString UwVersion                         = "0.16"; //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

AuTerm/version.rc

@@ -1,8 +1,8 @@
     #include <windows.h>
 
     VS_VERSION_INFO     VERSIONINFO
-    FILEVERSION         0, 1, 0, 0
-    PRODUCTVERSION      0, 1, 0, 0
+    FILEVERSION         0, 16, 0, 0
+    PRODUCTVERSION      0, 16, 0, 0
     FILEFLAGSMASK       0x3fL
     FILEFLAGS           0
     FILEOS              VOS_NT_WINDOWS32
@@ -19,12 +19,12 @@
             BEGIN
                 VALUE   "CompanyName",      "thedjnK\0"
                 VALUE   "FileDescription",  "AuTerm\0"
-                VALUE   "FileVersion",      "0.15.0.0\0"
+                VALUE   "FileVersion",      "0.16.0.0\0"
                 VALUE   "InternalName",     "AuTerm\0"
                 VALUE   "LegalCopyright",   "Copyright 2023 thedjnK\0"
                 VALUE   "OriginalFilename", "AuTerm.exe\0"
                 VALUE   "ProductName",      "AuTerm\0"
-                VALUE   "ProductVersion",   "0.15.0.0\0"
+                VALUE   "ProductVersion",   "0.16.0.0\0"
             END
         END
     END