6.9.3

Version 6.9.3

Author: quantum-leaps

doxygen/history.dox

@@ -1,6 +1,9 @@
 /**
 @page history Revision History
 
+@section qtools_6_9_3 Version 6.9.3, 2021-04-09
+
+
 
 @section qtools_6_9_2 Version 6.9.2, 2021-01-18
 

doxygen/qutest.dox

@@ -78,7 +78,6 @@ Unlike other existing unit testing harnesses for embedded systems (e.g., <a href
 Even though QUTest&trade; is particularly suitable for running tests on deeply embedded targets, it also fully supports running *the same* tests on your **host computer** (Windows, Linux, and MacOS are supported). In fact, running the tests as much as possible on the host and thus avoiding the target-hardware bottleneck is the highly recommended best-practice of embedded TDD. QUTest&trade; supports **fully-automated** unit testing, both on the embedded target and on the host computer.
 
 
-
 @section qutest_use Installation &amp; Use
 The <span class="img file_py">qutest.py</span> script can be used standalone, without any installation in your Python system (see  @ref qutest_run below).
 
@@ -114,13 +113,18 @@ qutest [-x] [test-scripts] [host_exe] [qspy_host[:udp_port]] [qspy_tcp_port]
 
 - `test_scripts` - optional specification of the Python test scripts to run. If not specified, qutest will try to run all *.py files in the current directory as test scripts
 
-- `host_exe | DEBUG` - optional specification of the test-fixture compiled for the host (host executable) for testing on the host computer. The special value DEBUG means that qutest will run in the "debug mode", in which it will NOT launch the host executables and it will wait for the Target reset and other responses from the Target. If host_exe is not specified, an embedded target is assumed (which is loaded with the test fixture already).
+- `host_exe | "" | DEBUG` - optional specification of the test-fixture compiled for the host (host executable) for testing on the host computer. The placeholder value `""` (empty string) can be used for running test fixtures on an embedded Target. The special value DEBUG means that qutest will run in the "debug mode", in which it will NOT launch the host executables and it will wait for the Target reset and other responses from the Target. If host_exe is not specified, an embedded target is assumed (which is loaded with the test fixture already).
 
 - `qspy_host[:udp_port]` - optional host-name/IP-address:port for the host running the QSPY host utility. If not specified, the default is 'localhost:7701'.
 
 - `tcp_port`- optional the QSpy TCP port number for connecting host executables. If not specified, the default is `6601`.
 
 
+@note
+The command-line options for `qutest.py` are **positional**, meaning that an option must be at the specific position in the command-line to be parsed correctly. For example, if you wish to run QUTest on an embedded target at the specified `[qspy_host]` host-name, you still need to provide a placeholder for the host executable `[host_exe]` ("") option, to get to the right position for the `[qspy_host]` option.
+
+
+
 @subsection qutest_exa Examples
 
 <span class="logo logo_win">Windows Hosts</span>
@@ -143,6 +147,12 @@ python3 %QTOOLS%\qutest\qutest.py *.py build\dpp.exe
 
 runs the test scripts (`*.py`) in the current directory and uses the host executable: `build\dpp.exe`
 
+@verbatim
+python3 %QTOOLS%\qutest\qutest.py *.py "" 192.168.1.100:7705
+@endverbatim
+
+runs the test scripts (`*.py`) in the current directory, without a host executable: (`""`), and connects to QSPY at `192.168.1.100:7705`
+
 @verbatim
 qutest *.py build\dpp.exe 192.168.1.100:7705
 @endverbatim
@@ -176,6 +186,12 @@ python3 $(QTOOLS)/qutest/qutest.py *.py build/dpp
 
 runs the test scripts (`*.py`) in the current directory and uses the host executable: `build/dpp`
 
+@verbatim
+python3 $(QTOOLS)/qutest/utest.py *.py "" 192.168.1.100:7705
+@endverbatim
+
+runs the test scripts (`*.py`) in the current directory, without a host executable: (`""`), and connects to QSPY at `192.168.1.100:7705`
+
 @verbatim
 qutest *.py build/dpp 192.168.1.100:7705
 @endverbatim

qclean/source/main.c

@@ -313,7 +313,7 @@ int main(int argc, char *argv[]) {
     char const *rootDir = ".";
     int optChar;
 
-    PRINTF_S("%s", "QClean " VERSION " Copyright (c) 2005-2020 Quantum Leaps\n"
+    PRINTF_S("%s", "QClean " VERSION " Copyright (c) 2005-2021 Quantum Leaps\n"
            "Documentation: https://www.state-machine.com/qtools/qclean.html\n");
     PRINTF_S("%s", "Usage: qclean [root-dir] [options]\n"
     "       root-dir root directory for recursive cleanup (default is .)\n"

qspy/include/qspy.h

@@ -4,8 +4,8 @@
 * @ingroup qpspy
 * @cond
 ******************************************************************************
-* Last updated for version 6.9.2
-* Last updated on  2021-01-15
+* Last updated for version 6.9.3
+* Last updated on  2021-02-24
 *
 *                    Q u a n t u m  L e a P s
 *                    ------------------------
@@ -40,7 +40,7 @@
 #ifndef QSPY_H
 #define QSPY_H
 
-#define QSPY_VER "6.9.2"
+#define QSPY_VER "6.9.3"
 
 #ifdef __cplusplus
 extern "C" {
@@ -176,28 +176,28 @@ extern QSPY_LastOutput QSPY_output;
 
 void QSPY_onPrintLn(void); /* callback to print the last line of output */
 
-#define SNPRINTF_LINE(format_, ...) do {                         \
-    int n_ = SNPRINTF_S(&QSPY_output.buf[QS_LINE_OFFSET],        \
-                (QS_LINE_LEN_MAX - QS_LINE_OFFSET),           \
-                format_,  ##__VA_ARGS__);                        \
-    if ((0 < n_) && (n_ < QS_LINE_LEN_MAX - QS_LINE_OFFSET)) {\
-        QSPY_output.len = n_;                                    \
-    }                                                            \
-    else {                                                       \
-        QSPY_output.len = QS_LINE_LEN_MAX - QS_LINE_OFFSET;   \
-    }                                                            \
+#define SNPRINTF_LINE(format_, ...) do {                       \
+    int n_ = SNPRINTF_S(&QSPY_output.buf[QS_LINE_OFFSET],      \
+                (QS_LINE_LEN_MAX - QS_LINE_OFFSET),            \
+                format_,  ##__VA_ARGS__);                      \
+    if ((0 < n_) && (n_ < QS_LINE_LEN_MAX - QS_LINE_OFFSET)) { \
+        QSPY_output.len = n_;                                  \
+    }                                                          \
+    else {                                                     \
+        QSPY_output.len = QS_LINE_LEN_MAX - QS_LINE_OFFSET;    \
+    }                                                          \
 } while (0)
 
 #define SNPRINTF_APPEND(format_, ...) do {                                 \
     int n_ = SNPRINTF_S(&QSPY_output.buf[QS_LINE_OFFSET + QSPY_output.len],\
-                (QS_LINE_LEN_MAX - QS_LINE_OFFSET - QSPY_output.len),   \
+                (QS_LINE_LEN_MAX - QS_LINE_OFFSET - QSPY_output.len),      \
                 format_, ##__VA_ARGS__);                                   \
     if ((0 < n_)                                                           \
-        && (n_ < QS_LINE_LEN_MAX - QS_LINE_OFFSET - QSPY_output.len)) { \
+        && (n_ < QS_LINE_LEN_MAX - QS_LINE_OFFSET - QSPY_output.len)) {    \
         QSPY_output.len += n_;                                             \
     }                                                                      \
     else {                                                                 \
-        QSPY_output.len = QS_LINE_LEN_MAX - QS_LINE_OFFSET;             \
+        QSPY_output.len = QS_LINE_LEN_MAX - QS_LINE_OFFSET;                \
     }                                                                      \
 } while (0)
 

qspy/source/main.c

@@ -4,14 +4,14 @@
 * @ingroup qpspy
 * @cond
 ******************************************************************************
-* Last updated for version 6.9.1
-* Last updated on  2020-09-15
+* Last updated for version 6.9.3
+* Last updated on  2021-04-04
 *
 *                    Q u a n t u m  L e a P s
 *                    ------------------------
 *                    Modern Embedded Software
 *
-* Copyright (C) 2005-2020 Quantum Leaps, LLC. All rights reserved.
+* Copyright (C) 2005-2021 Quantum Leaps, LLC. All rights reserved.
 *
 * This program is open source software: you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as published
@@ -80,9 +80,10 @@ static int   l_bePort   = 7701;   /* default UDP port  */
 static int   l_tcpPort  = 6601;   /* default TCP port */
 static int   l_baudRate = 115200; /* default serial baudrate */
 
-#define INTRO_STR  "QSPY %s Copyright (c) 2005-2020 Quantum Leaps\n" \
+static char const l_introStr[] = \
+    "QSPY %s Copyright (c) 2005-2021 Quantum Leaps\n" \
     "Documentation: https://www.state-machine.com/qtools/qspy.html\n" \
-    "Current timestamp: %s\n"
+    "Current timestamp: %s\n";
 
 static char const l_helpStr[] =
     "Usage: qspy [options]     <arg> = required, [arg] = optional\n"
@@ -263,11 +264,6 @@ void QSPY_onPrintLn(void) {
 
     QSPY_output.type = REG_OUT; /* reset for the next time */
 }
-/*..........................................................................*/
-void QSPY_printInfo(void) {
-    QSPY_output.type = INF_OUT; /* this is an internal info message */
-    QSPY_onPrintLn();
-}
 
 /*..........................................................................*/
 static QSpyStatus configure(int argc, char *argv[]) {
@@ -278,9 +274,9 @@ static QSpyStatus configure(int argc, char *argv[]) {
     QSpyConfig config = {
         .version      = 660U,
         .endianness   = 0U,
-        .tstampSize   = 4U,
         .objPtrSize   = 4U,
         .funPtrSize   = 4U,
+        .tstampSize   = 4U,
         .sigSize      = 2U,
         .evtSize      = 2U,
         .queueCtrSize = 1U,
@@ -297,7 +293,7 @@ static QSpyStatus configure(int argc, char *argv[]) {
     STRNCPY_S(l_dicFileName, sizeof(l_dicFileName), "OFF");
 
     STRNCPY_S(l_tstampStr, sizeof(l_tstampStr), QSPY_tstampStr());
-    PRINTF_S(INTRO_STR, QSPY_VER, l_tstampStr);
+    PRINTF_S(l_introStr, QSPY_VER, l_tstampStr);
 
     STRNCPY_S(l_inpFileName, sizeof(l_inpFileName), "qs.bin");
 #ifdef _WIN32
@@ -539,7 +535,7 @@ static QSpyStatus configure(int argc, char *argv[]) {
     if (l_outFileName[0] != 'O') { /* "OFF" ? */
         FOPEN_S(l_outFile, l_outFileName, "w");
         if (l_outFile != (FILE *)0) {
-            FPRINTF_S(l_outFile, INTRO_STR, QSPY_VER, l_tstampStr);
+            FPRINTF_S(l_outFile, l_introStr, QSPY_VER, l_tstampStr);
         }
         else {
             PRINTF_S("   <QSPY-> Cannot open File=%s\n", l_outFileName);
@@ -670,7 +666,7 @@ bool QSPY_command(uint8_t cmdId) {
                            "qspy%s.txt", l_tstampStr);
                 FOPEN_S(l_outFile, l_outFileName, "w");
                 if (l_outFile != (FILE *)0) {
-                    FPRINTF_S(l_outFile, INTRO_STR, QSPY_VER,
+                    FPRINTF_S(l_outFile, l_introStr, QSPY_VER,
                               l_tstampStr);
                 }
                 else {

qspy/source/qspy.c

@@ -4,14 +4,14 @@
 * @ingroup qpspy
 * @cond
 ******************************************************************************
-* Last updated for version 6.9.1
-* Last updated on  2020-09-10
+* Last updated for version 6.9.3
+* Last updated on  2021-04-04
 *
 *                    Q u a n t u m  L e a P s
 *                    ------------------------
 *                    Modern Embedded Software
 *
-* Copyright (C) 2005-2020 Quantum Leaps, LLC. All rights reserved.
+* Copyright (C) 2005-2021 Quantum Leaps, LLC. All rights reserved.
 *
 * This program is open source software: you can redistribute it and/or
 * modify it under the terms of the GNU General Public License as published
@@ -2287,6 +2287,11 @@ void QSPY_stop(void) {
     QSPY_configSeqFile((void *)0);
 }
 /*..........................................................................*/
+void QSPY_printInfo(void) {
+    QSPY_output.type = INF_OUT; /* this is an internal info message */
+    QSPY_onPrintLn();
+}
+/*..........................................................................*/
 void QSPY_printError(void) {
     QSPY_output.type = ERR_OUT; /* this is an error message */
     QSPY_onPrintLn();

qwin/bsp_win32.c

@@ -1,14 +1,13 @@
 /*****************************************************************************
 * Product: BSP for QWIN GUI demo
-* Last updated for version 5.6.5
-* Last updated on  2016-06-04
+* Last updated for version: 6.9.3
+* Date of the Last Update:  2021-03-03
 *
+*                    Q u a n t u m  L e a P s
+*                    ------------------------
+*                    Modern Embedded Software
 *
-*                    Q u a n t u m     L e a P s
-*                    ---------------------------
-*                    innovating embedded systems
-*
-* Copyright (C) Quantum Leaps, LLC. All rights reserved.
+* Copyright (C) 2005-2021 Quantum Leaps, LLC. All rights reserved.
 *
 * This program is open source software: you can redistribute it and/or
 * modify it under the terms of the following MIT License (MIT).
@@ -32,8 +31,8 @@
 * DEALINGS IN THE SOFTWARE.
 *
 * Contact information:
-* https://state-machine.com
-* mailto:[email protected]
+* <www.state-machine.com/licensing>
+* <[email protected]>
 *****************************************************************************/
 #include <stdint.h>
 
@@ -172,21 +171,23 @@ static LRESULT CALLBACK WndProc(HWND hWnd, UINT iMsg,
             return 0;
         }
 
-        /* commands from regular buttons and menus... */
+        /* commands from child controls and menus... */
         case WM_COMMAND: {
-            SetFocus(hWnd);
             switch (wParam) {
                 case IDOK:
                 case IDCANCEL: {
                     PostQuitMessage(0);
-
+                    break;
+                }
+                case IDC_USER: { /* owner-drawn button(s) */
+                    SetFocus(hWnd);
                     break;
                 }
             }
             return 0;
         }
 
-        /* owner-drawn buttons... */
+        /* drawing of owner-drawn buttons... */
         case WM_DRAWITEM: {
             LPDRAWITEMSTRUCT pdis = (LPDRAWITEMSTRUCT)lParam;
             switch (pdis->CtlID) {