8.0.0

quantum-leaps · quantum-leaps · commit 24cd93e71ec1 · 2024-10-30T11:07:30.000-04:00
diff --git a/arm-cm/dpp_nucleo-l053r8/CMakeLists.txt b/arm-cm/dpp_nucleo-l053r8/CMakeLists.txt
@@ -64,6 +64,8 @@ if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.14")
     set_property(TARGET ${TGT} PROPERTY POSITION_INDEPENDENT_CODE FALSE)
 endif()
 
+# set the qpc include path to find our local `qp_config.h´
+set(QPC_CFG_QPCONFIG_H_INCLUDE_PATH ${CMAKE_CURRENT_LIST_DIR})
 # add the qpc library to the project
 qpc_sdk_init()
 
diff --git a/posix-win32-cmake/dpp/CMakeLists.txt b/posix-win32-cmake/dpp/CMakeLists.txt
@@ -141,6 +141,8 @@ if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.14")
     set_property(TARGET dpp PROPERTY POSITION_INDEPENDENT_CODE FALSE)
 endif()
 
+# set the qpc include path to find our local `qp_config.h´
+set(QPC_CFG_QPCONFIG_H_INCLUDE_PATH ${CMAKE_CURRENT_LIST_DIR})
 # add the qpc library to the project
 qpc_sdk_init()
 
diff --git a/posix-win32-cmake/dpp/CMakePresets.json b/posix-win32-cmake/dpp/CMakePresets.json
@@ -72,7 +72,7 @@
                 "gen",
                 "gtk"
             ],
-            "binaryDir": "${sourceDir}/Build/dppGui"
+            "binaryDir": "${sourceDir}/Build/dppGtk"
         },
         {
             "name": "mingw-gui",
diff --git a/posix-win32/dpp/CMakeLists.txt b/posix-win32/dpp/CMakeLists.txt
@@ -31,6 +31,8 @@ option(QPC_CFG_DEBUG     "set to ON, to enable debug settings. (default: ON)" ON
 # update CMAKE_MODULE_PATH
 list(PREPEND CMAKE_MODULE_PATH ${QPC_SDK_PATH}/3rd_party/cmake ${CMAKE_SOURCE_DIR}/Source/cmake ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_SOURCE_DIR} ${HOME_PATH}/cmake)
 
+# set the qpc include path to find our local `qp_config.h´
+set(QPC_CFG_QPCONFIG_H_INCLUDE_PATH ${CMAKE_CURRENT_LIST_DIR})
 # import QPC SDK; download from git, if necessary
 include(qpc_sdk_import)
 
diff --git a/qutest/start_seq/gizmo.qm b/qutest/start_seq/gizmo.qm
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<model version="5.3.0" links="1">
+<model version="7.0.0" links="1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://www.state-machine.com/qm/qm7.xsd">
  <documentation>Start sequence example</documentation>
  <!--${qpc}-->
  <framework name="qpc"/>
@@ -20,23 +20,23 @@
       <action box="1,0,6,2"/>
      </initial_glyph>
     </initial>
-    <!--${AOs::Gizmo::SM::init}-->
-    <state name="init">
+    <!--${AOs::Gizmo::SM::initialize}-->
+    <state name="initialize">
      <entry brief="self-post START">static QEvt const startEvt = QEVT_INITIALIZER(START_SIG);
 QACTIVE_POST(&amp;me-&gt;super, &amp;startEvt, me); // self-post</entry>
-     <!--${AOs::Gizmo::SM::init::START}-->
+     <!--${AOs::Gizmo::SM::initialize::START}-->
      <tran trig="START">
       <action>QS_BEGIN_ID(QS_USER1, me-&gt;super.prio)
    QS_STR(&quot;START&quot;);
 QS_END()</action>
-      <!--${AOs::Gizmo::SM::init::START::[BSP_getStatus()]}-->
+      <!--${AOs::Gizmo::SM::initialize::START::[BSP_getStatus()]}-->
       <choice target="../../../3">
        <guard>BSP_getStatus()</guard>
        <choice_glyph conn="26,14,5,0,16,8">
         <action box="1,0,16,3"/>
        </choice_glyph>
       </choice>
-      <!--${AOs::Gizmo::SM::init::START::[else]}-->
+      <!--${AOs::Gizmo::SM::initialize::START::[else]}-->
       <choice target="../../../2">
        <guard brief="else"/>
        <choice_glyph conn="26,14,4,1,10,-6">
@@ -48,7 +48,7 @@ QS_END()</action>
       </tran_glyph>
      </tran>
      <state_glyph node="2,6,18,12">
-      <entry box="1,2,15,2"/>
+      <entry box="0,3,15,2"/>
      </state_glyph>
     </state>
     <!--${AOs::Gizmo::SM::on_battery}-->
diff --git a/qutest/start_seq/src/gizmo.c b/qutest/start_seq/src/gizmo.c
@@ -3,27 +3,34 @@
 // Model: gizmo.qm
 // File:  ${src::gizmo.c}
 //
-// This code has been generated by QM 5.3.0 <www.state-machine.com/qm>.
+// This code has been generated by QM 7.0.0 <www.state-machine.com/qm>.
 // DO NOT EDIT THIS FILE MANUALLY. All your changes will be lost.
 //
-// SPDX-License-Identifier: GPL-3.0-or-later
+// Copyright (c) 2005 Quantum Leaps, LLC. All rights reserved.
+//
+//                 ____________________________________
+//                /                                   /
+//               /    GGGGGGG    PPPPPPPP   LL       /
+//              /   GG     GG   PP     PP  LL       /
+//             /   GG          PP     PP  LL       /
+//            /   GG   GGGGG  PPPPPPPP   LL       /
+//           /   GG      GG  PP         LL       /
+//          /     GGGGGGG   PP         LLLLLLL  /
+//         /___________________________________/
 //
-// This generated code is open source software: you can redistribute it under
-// the terms of the GNU General Public License as published by the Free
-// Software Foundation.
+// SPDX-License-Identifier: GPL-3.0-or-later
 //
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-// more details.
+// This generated code is open-source software licensed under the GNU
+// General Public License (GPL) as published by the Free Software Foundation
+// (see <https://www.gnu.org/licenses>).
 //
 // NOTE:
-// Alternatively, this generated code may be distributed under the terms
-// of Quantum Leaps commercial licenses, which expressly supersede the GNU
-// General Public License and are specifically designed for licensees
-// interested in retaining the proprietary status of their code.
+// The GPL does NOT permit the incorporation of this code into proprietary
+// programs. Please contact Quantum Leaps for commercial licensing options,
+// which expressly supersede the GPL and are designed explicitly for
+// closed-source distribution.
 //
-// Contact information:
+// Quantum Leaps contact information:
 // <www.state-machine.com/licensing>
 // <info@state-machine.com>
 //
@@ -47,18 +54,17 @@ extern Gizmo Gizmo_inst;
 
 // protected:
 static QState Gizmo_initial(Gizmo * const me, void const * const par);
-static QState Gizmo_init(Gizmo * const me, QEvt const * const e);
+static QState Gizmo_initialize(Gizmo * const me, QEvt const * const e);
 static QState Gizmo_on_battery(Gizmo * const me, QEvt const * const e);
 static QState Gizmo_on_mains(Gizmo * const me, QEvt const * const e);
 //$enddecl${AOs::Gizmo} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 //$skip${QP_VERSION} vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
 // Check for the minimum required QP version
-#if (QP_VERSION < 730U) || (QP_VERSION != ((QP_RELEASE^4294967295U) % 0x3E8U))
+#if (QP_VERSION < 730U) || (QP_VERSION != ((QP_RELEASE^4294967295U)%0x2710U))
 #error qpc version 7.3.0 or higher required
 #endif
 //$endskip${QP_VERSION} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
 //$define${AOs::AO_Gizmo} vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
 
 //${AOs::AO_Gizmo} ...........................................................
@@ -82,34 +88,34 @@ static QState Gizmo_initial(Gizmo * const me, void const * const par) {
     //${AOs::Gizmo::SM::initial}
     Q_UNUSED_PAR(par);
 
-    QS_FUN_DICTIONARY(&Gizmo_init);
+    QS_FUN_DICTIONARY(&Gizmo_initialize);
     QS_FUN_DICTIONARY(&Gizmo_on_battery);
     QS_FUN_DICTIONARY(&Gizmo_on_mains);
 
-    return Q_TRAN(&Gizmo_init);
+    return Q_TRAN(&Gizmo_initialize);
 }
 
-//${AOs::Gizmo::SM::init} ....................................................
-static QState Gizmo_init(Gizmo * const me, QEvt const * const e) {
+//${AOs::Gizmo::SM::initialize} ..............................................
+static QState Gizmo_initialize(Gizmo * const me, QEvt const * const e) {
     QState status_;
     switch (e->sig) {
-        //${AOs::Gizmo::SM::init}
+        //${AOs::Gizmo::SM::initialize}
         case Q_ENTRY_SIG: {
             static QEvt const startEvt = QEVT_INITIALIZER(START_SIG);
             QACTIVE_POST(&me->super, &startEvt, me); // self-post
             status_ = Q_HANDLED();
             break;
         }
-        //${AOs::Gizmo::SM::init::START}
+        //${AOs::Gizmo::SM::initialize::START}
         case START_SIG: {
             QS_BEGIN_ID(QS_USER1, me->super.prio)
                QS_STR("START");
             QS_END()
-            //${AOs::Gizmo::SM::init::START::[BSP_getStatus()]}
+            //${AOs::Gizmo::SM::initialize::START::[BSP_getStatus()]}
             if (BSP_getStatus()) {
                 status_ = Q_TRAN(&Gizmo_on_mains);
             }
-            //${AOs::Gizmo::SM::init::START::[else]}
+            //${AOs::Gizmo::SM::initialize::START::[else]}
             else {
                 status_ = Q_TRAN(&Gizmo_on_battery);
             }
diff --git a/qutest/start_seq/src/gizmo.h b/qutest/start_seq/src/gizmo.h
@@ -3,27 +3,34 @@
 // Model: gizmo.qm
 // File:  ${src::gizmo.h}
 //
-// This code has been generated by QM 5.3.0 <www.state-machine.com/qm>.
+// This code has been generated by QM 7.0.0 <www.state-machine.com/qm>.
 // DO NOT EDIT THIS FILE MANUALLY. All your changes will be lost.
 //
-// SPDX-License-Identifier: GPL-3.0-or-later
+// Copyright (c) 2005 Quantum Leaps, LLC. All rights reserved.
+//
+//                 ____________________________________
+//                /                                   /
+//               /    GGGGGGG    PPPPPPPP   LL       /
+//              /   GG     GG   PP     PP  LL       /
+//             /   GG          PP     PP  LL       /
+//            /   GG   GGGGG  PPPPPPPP   LL       /
+//           /   GG      GG  PP         LL       /
+//          /     GGGGGGG   PP         LLLLLLL  /
+//         /___________________________________/
 //
-// This generated code is open source software: you can redistribute it under
-// the terms of the GNU General Public License as published by the Free
-// Software Foundation.
+// SPDX-License-Identifier: GPL-3.0-or-later
 //
-// This code is distributed in the hope that it will be useful, but WITHOUT
-// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-// FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-// more details.
+// This generated code is open-source software licensed under the GNU
+// General Public License (GPL) as published by the Free Software Foundation
+// (see <https://www.gnu.org/licenses>).
 //
 // NOTE:
-// Alternatively, this generated code may be distributed under the terms
-// of Quantum Leaps commercial licenses, which expressly supersede the GNU
-// General Public License and are specifically designed for licensees
-// interested in retaining the proprietary status of their code.
+// The GPL does NOT permit the incorporation of this code into proprietary
+// programs. Please contact Quantum Leaps for commercial licensing options,
+// which expressly supersede the GPL and are designed explicitly for
+// closed-source distribution.
 //
-// Contact information:
+// Quantum Leaps contact information:
 // <www.state-machine.com/licensing>
 // <info@state-machine.com>
 //
diff --git a/qutest/start_seq/test/test_bdd1.py b/qutest/start_seq/test/test_bdd1.py
@@ -28,18 +28,18 @@ def on_reset():
 WHEN("Test sequence contunues AO_Gizmo is started")
 glb_filter(GRP_ALL)
 continue_test()
-expect("===RTC===> St-Init  Obj=AO_Gizmo,State=QHsm_top->Gizmo_init")
+expect("===RTC===> St-Init  Obj=AO_Gizmo,State=QHsm_top->Gizmo_initialize")
 expect("@timestamp AO-Post  Sdr=AO_Gizmo,Obj=AO_Gizmo,Evt<Sig=START_SIG,*")
-expect("===RTC===> St-Entry Obj=AO_Gizmo,State=Gizmo_init")
-expect("@timestamp Init===> Obj=AO_Gizmo,State=Gizmo_init")
+expect("===RTC===> St-Entry Obj=AO_Gizmo,State=Gizmo_initialize")
+expect("@timestamp Init===> Obj=AO_Gizmo,State=Gizmo_initialize")
 
 THEN('''After QF_run(), AO_Gizmo receives START event,
 which triggers transition to Gizmo_on_mains''')
 expect_run()
 expect("@timestamp AO-GetL  Obj=AO_Gizmo,Evt<Sig=START_SIG,*")
-expect("@timestamp Disp===> Obj=AO_Gizmo,Sig=START_SIG,State=Gizmo_init")
+expect("@timestamp Disp===> Obj=AO_Gizmo,Sig=START_SIG,State=Gizmo_initialize")
 expect("@timestamp USER+005 START")
-expect("@timestamp ===>Tran Obj=AO_Gizmo,Sig=START_SIG,State=Gizmo_init->Gizmo_on_mains")
+expect("@timestamp ===>Tran Obj=AO_Gizmo,Sig=START_SIG,State=Gizmo_initialize->Gizmo_on_mains")
 
 #------------------------------------------------------------------------------
 SCENARIO('''
@@ -53,15 +53,15 @@ def on_reset():
 WHEN("Test sequence contunues AO_Gizmo is started")
 glb_filter(GRP_ALL)
 continue_test()
-expect("===RTC===> St-Init  Obj=AO_Gizmo,State=QHsm_top->Gizmo_init")
+expect("===RTC===> St-Init  Obj=AO_Gizmo,State=QHsm_top->Gizmo_initialize")
 expect("@timestamp AO-Post  Sdr=AO_Gizmo,Obj=AO_Gizmo,Evt<Sig=START_SIG,*")
-expect("===RTC===> St-Entry Obj=AO_Gizmo,State=Gizmo_init")
-expect("@timestamp Init===> Obj=AO_Gizmo,State=Gizmo_init")
+expect("===RTC===> St-Entry Obj=AO_Gizmo,State=Gizmo_initialize")
+expect("@timestamp Init===> Obj=AO_Gizmo,State=Gizmo_initialize")
 
 THEN('''After QF_run(), AO_Gizmo receives START event,
 which triggers transition to Gizmo_on_battery''')
 expect_run()
 expect("@timestamp AO-GetL  Obj=AO_Gizmo,Evt<Sig=START_SIG,*")
-expect("@timestamp Disp===> Obj=AO_Gizmo,Sig=START_SIG,State=Gizmo_init")
+expect("@timestamp Disp===> Obj=AO_Gizmo,Sig=START_SIG,State=Gizmo_initialize")
 expect("@timestamp USER+005 START")
-expect("@timestamp ===>Tran Obj=AO_Gizmo,Sig=START_SIG,State=Gizmo_init->Gizmo_on_battery")
+expect("@timestamp ===>Tran Obj=AO_Gizmo,Sig=START_SIG,State=Gizmo_initialize->Gizmo_on_battery")
diff --git a/qwin-gui/dpp-gui/CMakeLists.txt b/qwin-gui/dpp-gui/CMakeLists.txt
@@ -66,6 +66,8 @@ if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.14")
     set_property(TARGET dpp PROPERTY POSITION_INDEPENDENT_CODE FALSE)
 endif()
 
+# set the qpc include path to find our local `qp_config.h´
+set(QPC_CFG_QPCONFIG_H_INCLUDE_PATH ${CMAKE_CURRENT_LIST_DIR})
 # add the qpc library to the project
 qpc_sdk_init()
 

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@`
`72`	`72`	`"gen",`
`73`	`73`	`"gtk"`
`74`	`74`	`],`
`75`		`- "binaryDir": "${sourceDir}/Build/dppGui"`
	`75`	`+ "binaryDir": "${sourceDir}/Build/dppGtk"`
`76`	`76`	`},`
`77`	`77`	`{`
`78`	`78`	`"name": "mingw-gui",`