7.3.1

bin/Termite.ini

@@ -0,0 +1,28 @@
+[Settings]
+Port=COM16
+Baud=115200
+DataBits=8
+StopBits=1
+Parity=0
+Handshake=0
+ForwardPort=
+[Options]
+LocalEcho=1
+AppendLine=0
+Window=156 1460 639 504
+FontType=1
+Polling=100
+MaxLines=0
+WordWrap=1
+AutoComplete=1
+KeepHistory=0
+CloseOnCancel=1
+Topmost=0
+AutoClosePort=0
+Language=English (en)
+[History]
+cmd1=x
+cmd2=y
+cmd3=s
+cmd4=a
+cmd5=dfsdfa

bin/qspy_exit.bat

@@ -0,0 +1,2 @@
+@echo off
+@%~dp0..\Python3\python.exe %~dp0..\qspy\qspy_exit.py %1 %2 %3 %4

qspy/include/pal.h

@@ -23,8 +23,8 @@
 * <[email protected]>
 ============================================================================*/
 /*!
-* @date Last updated on: 2023-08-22
-* @version Last updated for version: 7.3.0
+* @date Last updated on: 2023-12-12
+* @version Last updated for version: 7.3.1
 *
 * @file
 * @brief Platform Abstraction Layer (PAL)
@@ -77,6 +77,7 @@ QSpyStatus PAL_openTargetFile(char const *fName);
 
 QSpyStatus PAL_openKbd(bool kbd_inp, bool color);
 void       PAL_closeKbd(void);
+void       PAL_exit(void);
 
 QSPYEvtType PAL_receiveBe (unsigned char *buf, uint32_t *pBytes);
 QSPYEvtType PAL_receiveKbd(unsigned char *buf, uint32_t *pBytes);

qspy/include/qspy.h

@@ -28,16 +28,16 @@
 * <[email protected]>
 ============================================================================*/
 /*!
-* @date Last updated on: 2023-09-26
-* @version Last updated for version: 7.3.0
+* @date Last updated on: 2023-12-12
+* @version Last updated for version: 7.3.1
 *
 * @file
 * @brief Host API
 */
 #ifndef QSPY_H_
 #define QSPY_H_
 
-#define QSPY_VER "7.3.0"
+#define QSPY_VER "7.3.1"
 
 #ifdef __cplusplus
 extern "C" {

qspy/posix/qspy_pal.c

@@ -152,7 +152,11 @@ void PAL_closeKbd(void) {
         l_kbd_inp = false;
     }
 }
-
+/*..........................................................................*/
+void PAL_exit(void) {
+    QSPY_cleanup();
+    exit(0);
+}
 /*==========================================================================*/
 /* POSIX serial communication with the Target */
 QSpyStatus PAL_openTargetSer(char const *comName, int baudRate) {

qspy/qspy_exit.py

@@ -0,0 +1,159 @@
+#=============================================================================
+# QUTest Python scripting support
+# Copyright (C) 2005 Quantum Leaps, LLC. All rights reserved.
+#
+# SPDX-License-Identifier: GPL-3.0-or-later OR LicenseRef-QL-commercial
+#
+# This software is dual-licensed under the terms of the open source GNU
+# General Public License version 3 (or any later version), or alternatively,
+# under the terms of one of the closed source Quantum Leaps commercial
+# licenses.
+#
+# The terms of the open source GNU General Public License version 3
+# can be found at: <www.gnu.org/licenses/gpl-3.0>
+#
+# The terms of the closed source Quantum Leaps commercial licenses
+# can be found at: <www.state-machine.com/licensing>
+#
+# Redistributions in source code must retain this top-level comment block.
+# Plagiarizing this software to sidestep the license obligations is illegal.
+#
+# Contact information:
+# <www.state-machine.com>
+# <[email protected]>
+#=============================================================================
+##
+# @date Last updated on: 2023-12-13
+# @version Last updated for version: 7.3.1
+#
+# @file
+# @brief QUTest Python scripting support (implementation)
+# @ingroup qutest
+
+import argparse
+import socket
+import struct
+import sys
+import os
+if os.name == "nt":
+    import msvcrt
+else:
+    import select
+
+from platform import python_version
+
+#=============================================================================
+# Helper class for communication with the QSpy front-end
+#
+class QSpy:
+    VERSION = 731
+
+    # private class variables...
+    _sock = None
+    _is_attached = False
+    _tx_seq = 0
+    _host_udp = ["localhost", 7701] # list, to be converted to a tuple
+    _local_port = 0 # let the OS decide the best local port
+
+    # timeout value [seconds]
+    _TOUT = 1.000
+
+    # packets to QSpy only...
+    _QSPY_ATTACH          = 128
+    _QSPY_DETACH          = 129
+    _QSPY_SAVE_DICT       = 130
+    _QSPY_TEXT_OUT        = 131
+    _QSPY_BIN_OUT         = 132
+    _QSPY_MATLAB_OUT      = 133
+    _QSPY_SEQUENCE_OUT    = 134
+    _QSPY_CLEAR_SCREEN    = 140
+    _QSPY_SHOW_NOTE       = 141
+
+    # packets to QSpy to be "massaged" and forwarded to the Target...
+    _QSPY_SEND_EVENT      = 135
+    _QSPY_SEND_AO_FILTER  = 136
+    _QSPY_SEND_CURR_OBJ   = 137
+    _QSPY_SEND_COMMAND    = 138
+    _QSPY_SEND_TEST_PROBE = 139
+
+    @staticmethod
+    def _init():
+        # Create socket
+        QSpy._sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+        QSpy._sock.settimeout(QSpy._TOUT) # timeout for blocking socket
+        #bufsize = QSpy._sock.getsockopt(socket.SOL_UDP, socket.SO_RCVBUF)
+        #print("SO_RCVBUF ", bufsize)
+        try:
+            QSpy._sock.bind(("0.0.0.0", QSpy._local_port))
+            #print("bind: ", ("0.0.0.0", QSpy._local_port))
+        except:
+            messagebox.showerror("UDP Socket Error",
+               "Can't bind the UDP socket\nto the specified local_host")
+            QSpyView._gui.destroy()
+            return -1
+        return 0
+
+    @staticmethod
+    def _sendTo(packet, str=None):
+        tx_packet = bytearray([QSpy._tx_seq])
+        tx_packet.extend(packet)
+        if str is not None:
+            tx_packet.extend(bytes(str, "utf-8"))
+            tx_packet.extend(b"\0") # zero-terminate
+        QSpy._sock.sendto(tx_packet, QSpy._host_udp)
+        QSpy._tx_seq = (QSpy._tx_seq + 1) & 0xFF
+        #print("sendTo", QSpy._tx_seq)
+
+#=============================================================================
+# main entry point to QUTest
+def main():
+    # parse command-line arguments...
+    parser = argparse.ArgumentParser(
+        prog="python qspy_exit.py",
+        description="QSPY-exit",
+        epilog="More info: https://www.state-machine.com/qspy.html#qspy_exit")
+    parser.add_argument('-v', '--version',
+        action='version',
+        version="QSPY-exit %d.%d.%d on Python %s"%(
+                    QSpy.VERSION//100, (QSpy.VERSION//10) % 10,
+                    QSpy.VERSION % 10,
+            python_version()),
+        help='Display QSPY-exit version')
+
+    parser.add_argument('-q', '--qspy', nargs='?', default='', const='',
+        help="optional qspy host, [:ud_port]")
+    args = parser.parse_args()
+    #print(args)
+
+    print("\nQSPY-exit %d.%d.%d running on Python %s"%(
+            QSpy.VERSION//100,
+            (QSpy.VERSION//10) % 10,
+             QSpy.VERSION % 10, python_version()))
+    print("Copyright (c) 2005-2023 Quantum Leaps, www.state-machine.com")
+
+    # process command-line argumens...
+    if args.qspy != '':
+        qspy_conf = args.qspy.split(":")
+        if len(qspy_conf) > 0 and not qspy_conf[0] == '':
+            QSpy._host_udp[0] = qspy_conf[0]
+        if len(qspy_conf) > 1 and not qspy_conf[1] == '':
+            QSpy._host_udp[1] = int(qspy_conf[1])
+
+    #print("host_udp:", QSpy._host_udp)
+    #return 0
+
+    # convert to immutable tuple
+    QSpy._host_udp = tuple(QSpy._host_udp)
+
+    # init QSpy socket
+    err = QSpy._init()
+    if err:
+        return sys.exit(err)
+
+    QSpy._sendTo(struct.pack("<BB", QSpy._QSPY_DETACH, 1))
+
+    return 0 # report to the caller (e.g., make)
+
+#=============================================================================
+if __name__ == "__main__":
+    main()

qspy/source/qspy.c

@@ -293,10 +293,6 @@ void QSPY_config(QSpyConfig const *config,
     l_userRec = ((QSPY_conf.version < 660U) ? OLD_QS_USER : QS_USER);
 }
 /*..........................................................................*/
-void QSPY_cleanup(void) {
-    QSPY_configMatFile((void*)0);
-}
-/*..........................................................................*/
 void QSPY_configTxReset(QSPY_resetFun txResetFun) {
     l_txResetFun = txResetFun;
 }

qspy/source/qspy_be.c

@@ -23,8 +23,8 @@
 * <[email protected]>
 ============================================================================*/
 /*!
-* @date Last updated on: 2022-12-15
-* @version Last updated for version: 7.2.0
+* @date Last updated on: 2023-12-13
+* @version Last updated for version: 7.3.1
 *
 * @file
 * @brief Back-End connection point for the external Front-Ends
@@ -170,10 +170,19 @@ void BE_parseRecFromFE(QSpyRecord * const qrec) {
         }
         case QSPY_DETACH: {   /* detach from the Front-End */
             PAL_detachFE();
-            l_channels = 0U; /* detached from a Front-End */
-            SNPRINTF_LINE("   <F-END> Detached %s",
-                          "######################################");
-            QSPY_printInfo();
+            l_channels = 0U; /* mark as detached from the Front-End */
+
+            if (qrec->tot_len > 2U) { /* payload contains exit request? */
+                SNPRINTF_LINE("   <F-END> Forced EXIT %s",
+                              "###################################");
+                QSPY_printInfo();
+                PAL_exit();
+            }
+            else { /* detach request without exit */
+                SNPRINTF_LINE("   <F-END> Detached %s",
+                              "######################################");
+                QSPY_printInfo();
+            }
             break;
         }
         case QSPY_SAVE_DICT: { /* save dictionaries collected so far */

qspy/source/qspy_main.c

@@ -23,8 +23,8 @@
 * <[email protected]>
 ============================================================================*/
 /*!
-* @date Last updated on: 2023-08-22
-* @version Last updated for version: 7.3.0
+* @date Last updated on: 2023-12-12
+* @version Last updated for version: 7.3.1
 *
 * @file
 * @brief main for QSPY host utility
@@ -143,7 +143,6 @@ static char const l_kbdHelpStr[] =
 
 /*..........................................................................*/
 static QSpyStatus configure(int argc, char *argv[]);
-static void cleanup(void);
 static void colorPrintLn(void);
 static uint8_t l_buf[8*1024]; /* process input in 8K chunks */
 
@@ -203,14 +202,12 @@ int main(int argc, char *argv[]) {
     }
 
     /* cleanup .............................................................*/
-    cleanup();
+    QSPY_cleanup();
     return status;
 }
 
 /*..........................................................................*/
-static void cleanup(void) {
-    QSPY_cleanup();
-
+void QSPY_cleanup(void) {
     PAL_closeKbd();  /* close the keyboard input (if open) */
 
     if (l_savFile != (FILE *)0) {
@@ -221,6 +218,7 @@ static void cleanup(void) {
     }
 
     QSEQ_configFile((void*)0);
+    QSPY_configMatFile((void*)0);
 
     if (l_bePort != 0) {
         PAL_closeBE();  /* close the Back-End connection */
@@ -237,7 +235,7 @@ static void cleanup(void) {
 void Q_onError(char const * const module, int const id) {
     PRINTF_S("\n   <ERROR> QSPY ASSERTION failed in Module=%s:%d\n",
            module, id);
-    cleanup();
+    QSPY_cleanup();
     exit(-1);
 }