8.0.5

Author: quantum-leaps

3rd_party

@@ -0,0 +1,26 @@
+QP/C++ Real-Time Event Framework (RTEF)
+
+Copyright (C) 2005-2025 Quantum Leaps, LLC. All rights reserved.
+
+                   Q u a n t u m  L e a P s
+                   ------------------------
+                   Modern Embedded Software
+
+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 (GPLv3) or under the terms of one of the closed-
+source Quantum Leaps commercial licenses.
+
+Redistributions in source code must retain this top-level comment block.
+Plagiarizing this software to sidestep the license obligations is illegal.
+
+NOTE:
+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.
+
+Quantum Leaps contact information:
+<www.state-machine.com/licensing>
+<[email protected]>

LICENSE

@@ -102,7 +102,7 @@ class QMPool {
     }
 
 private:
-    QMPool(QEQueue const & other) = delete;
+    QMPool(QMPool const & other) = delete;
     QMPool & operator=(QMPool const & other) = delete;
 
     // friends...

examples

@@ -30,10 +30,10 @@
 #define QP_HPP_
 
 //============================================================================
-#define QP_VERSION_STR "8.0.4"
-#define QP_VERSION     804U
-// <VER>=804 <DATE>=250611
-#define QP_RELEASE     0x6A9FC8ABU
+#define QP_VERSION_STR "8.0.5"
+#define QP_VERSION     805U
+// <VER>=805 <DATE>=250811
+#define QP_RELEASE     0x6A81442A
 
 //============================================================================
 // default configuration settings
@@ -178,28 +178,25 @@ class QAsm {
     QAsmAttr m_state;
     QAsmAttr m_temp;
 
-    // All possible return values from state-handlers
+    // All possible values returned from state/action handlers...
     // NOTE: The ordering is important for algorithmic correctness.
+
+    // unhandled and needs to "bubble up"
     static constexpr QState Q_RET_SUPER     {0U};
     static constexpr QState Q_RET_UNHANDLED {1U};
 
-    // handled and do not need to "bubble up"
+// handled and does not need to "bubble up"
     static constexpr QState Q_RET_HANDLED   {2U};
     static constexpr QState Q_RET_IGNORED   {3U};
 
-    // entry/exit
+// entry/exit/initial
     static constexpr QState Q_RET_ENTRY     {4U};
     static constexpr QState Q_RET_EXIT      {5U};
+    static constexpr QState Q_RET_TRAN_INIT {6U};
 
-    // no side effects
-    static constexpr QState Q_RET_NULL      {6U};
-
-    // transitions need to execute transition-action table in QP::QMsm
+// regular tran./tran.-to-history
     static constexpr QState Q_RET_TRAN      {7U};
-    static constexpr QState Q_RET_TRAN_INIT {8U};
-
-    // transitions that additionally clobber QHsm.m_state
-    static constexpr QState Q_RET_TRAN_HIST {9U};
+    static constexpr QState Q_RET_TRAN_HIST {8U};
 
     // Reserved signals by the QP-framework
     static constexpr QSignal Q_EMPTY_SIG    {0U};
@@ -451,6 +448,9 @@ namespace QP {
 
 using QPrioSpec = std::uint16_t;
 
+class QEQueue; // forward declaration
+class QActive; // forward declaration
+
 #if (QF_TIMEEVT_CTR_SIZE == 1U)
     using QTimeEvtCtr = std::uint8_t;
 #elif (QF_TIMEEVT_CTR_SIZE == 2U)
@@ -556,9 +556,6 @@ class QSubscrList {
 
 //============================================================================
 
-class QEQueue; // forward declaration
-class QActive; // forward declaration
-
 //----------------------------------------------------------------------------
 // declarations for friendship with the QActive class
 

include/qmpool.hpp

@@ -47,7 +47,7 @@ class Attr {
 
 #if (QF_MAX_EPOOL > 0U)
     QF_EPOOL_TYPE_ ePool_[QF_MAX_EPOOL];
-    std::uint_fast8_t maxPool_;
+    std::uint8_t maxPool_;
 #else
     std::uint8_t dummy;
 #endif //  (QF_MAX_EPOOL == 0U)

include/qp.hpp

@@ -75,7 +75,7 @@ static void task_function(void *pvParameters) { // FreeRTOS task signature
 // xQUEUE.uxLength          == StaticQueue_t.uxDummy4[1];
 //
 #define FREERTOS_QUEUE_GET_FREE() \
-    (m_osObject.uxDummy4[1] - m_osObject.uxDummy4[0])
+    (m_osObject.m_queue.uxDummy4[1] - m_osObject.m_queue.uxDummy4[0])
 
 // namespace QP ==============================================================
 namespace QP {
@@ -156,9 +156,9 @@ void QActive::start(
             static_cast<UBaseType_t>(qLen),           // length of the queue
             static_cast<UBaseType_t>(sizeof(QEvt *)), // element size
             reinterpret_cast<std::uint8_t *>(qSto),   // queue buffer
-            &m_osObject);                             // static queue buffer
+            &m_osObject.m_queue);                     // static queue buffer
     QF_CRIT_ENTRY();
-    Q_ASSERT_INCRIT(110, m_eQueue != static_cast<QueueHandle_t>(0));
+    Q_ASSERT_INCRIT(110, m_eQueue != nullptr);
     QF_CRIT_EXIT();
 
     m_prio  = static_cast<std::uint8_t>(prioSpec & 0xFFU); // QF-priority
@@ -170,9 +170,9 @@ void QActive::start(
     QS_FLUSH(); // flush the trace buffer to the host
 
     // task name provided by the user in QActive::setAttr() or default name
-    char const *taskName = (m_thread.pxDummy1 != nullptr)
-                             ? static_cast<char const *>(m_thread.pxDummy1)
-                             : static_cast<char const *>("AO");
+    char const *taskName = (m_osObject.m_task.pxDummy1 != nullptr)
+        ? static_cast<char const *>(m_osObject.m_task.pxDummy1)
+        : static_cast<char const *>("AO");
 
     // The FreeRTOS priority of the AO thread can be specified in two ways:
     //
@@ -199,17 +199,17 @@ void QActive::start(
     }
 
     // statically create the FreeRTOS task for the AO
-    TaskHandle_t task = xTaskCreateStatic(
+    m_thread = xTaskCreateStatic(
         &task_function, // the task function
         taskName ,      // the name of the task
         stkSize/sizeof(portSTACK_TYPE), // stack length
         this,           // the 'pvParameters' parameter
         freertos_prio,  // FreeRTOS priority
         static_cast<StackType_t *>(stkSto), // stack storage
-        &m_thread);     // task buffer
+        &m_osObject.m_task); // task buffer
 
     QF_CRIT_ENTRY();
-    Q_ASSERT_INCRIT(120, task != static_cast<TaskHandle_t>(0));
+    Q_ASSERT_INCRIT(120, m_thread != nullptr);
     QF_CRIT_EXIT();
 
 #ifdef Q_UNSAFE
@@ -231,11 +231,11 @@ void QActive::setAttr(std::uint32_t attr1, void const *attr2) {
     QF_CRIT_ENTRY();
     // this function must be called before QACTIVE_START(),
     // which implies that m_thread.pxDummy1 must not be used yet;
-    Q_REQUIRE_INCRIT(150, m_thread.pxDummy1 == nullptr);
+    Q_REQUIRE_INCRIT(150, m_osObject.m_task.pxDummy1 == nullptr);
     switch (attr1) {
         case TASK_NAME_ATTR:
             // temporarily store the name, cast 'const' away
-            m_thread.pxDummy1 = const_cast<void *>(attr2);
+            m_osObject.m_task.pxDummy1 = const_cast<void *>(attr2);
             break;
         // ...
         default:

include/qp_pkg.hpp

@@ -38,8 +38,8 @@
 
 // QActive customization for FreeRTOS
 #define QACTIVE_EQUEUE_TYPE     QueueHandle_t
-#define QACTIVE_OS_OBJ_TYPE     StaticQueue_t
-#define QACTIVE_THREAD_TYPE     StaticTask_t
+#define QACTIVE_OS_OBJ_TYPE     OsObject
+#define QACTIVE_THREAD_TYPE     TaskHandle_t
 
 // FreeRTOS requires the "FromISR" API in QP/C++
 #define QF_ISR_API              1
@@ -59,11 +59,15 @@
 #include "task.h"      // FreeRTOS task management
 #include "queue.h"     // FreeRTOS queue management
 
+struct OsObject {
+    StaticQueue_t m_queue;
+    StaticTask_t  m_task;
+};
+
 #include "qequeue.hpp" // QP event queue (for deferring events)
 #include "qmpool.hpp"  // QP memory pool (for event pools)
 #include "qp.hpp"      // QP platform-independent public interface
 
-
 // the "FromISR" versions of the QF APIs, see NOTE3
 #ifdef Q_SPY
     #define PUBLISH_FROM_ISR(e_, pxHigherPrioTaskWoken_, sender_) \

ports/freertos/qf_port.cpp

@@ -1,25 +1,25 @@
 c13a351b39b423e6f1973787f7dd286e478a5bb8 *include/qequeue.hpp
 793692a6b18382bf007f214ef06dde27c6643b04 *include/qk.hpp
-4e14e378ebb4876cc472dfe7ef870de4787ec06c *include/qmpool.hpp
-a399defd0b9aaf1ca48ae06fb040ded4b25f2a42 *include/qp.hpp
-b7df71d79755d9ce7a8335e3fd14df481794f609 *include/qp_pkg.hpp
+d64630895002a281257f751b6c11797c6514ea9f *include/qmpool.hpp
+11a47dc94b01494bde3ef6a12defaee62ba0799c *include/qp.hpp
+d32dc8468cb6bf0692aa1eb4d11560bcffac9f2e *include/qp_pkg.hpp
 e37b577c4c0d127557801ed1f5b09ea61d9f6c8e *include/qpcpp.hpp
-d3183de500ed079ed8bcbebd31c9a38eba307feb *include/qs.hpp
+28d88acb39123604b6afca0b9c7323794cd9f1d5 *include/qs.hpp
 4f3d2c3aa8bced38a571cb0dc1e3ac4fc05940f7 *include/qs_dummy.hpp
-d30a5d7d12a00bb3329a401d66d62a59a28245a7 *include/qs_pkg.hpp
+2e7dc2fd0bdf7bcfdea8e80a2bdddf95ba7e4001 *include/qs_pkg.hpp
 fa866cf8f14f6c481e9f64a1cf48bcdcf7e81240 *include/qsafe.h
 3a24b92e458b3addc73af63ee66a6e51bd9ed8cc *include/qstamp.hpp
 20ef270dfc178e25927fc48d0230889824ee0d54 *include/qv.hpp
 d3d3e201835398744069a7b86a8a0624188e555c *include/qxk.hpp
 0199f3eeb6c02b8cc890ee4c6f6d344569a0858f *include/README.md
 71899ce74eeb04f333ed00d53f87719f722a39ab *src/qf/CMakeLists.txt
-e70d0cd8d54047fd854c4bf55da6a5ff2d571d4a *src/qf/qep_hsm.cpp
-a70891b7b65fef362c318bd2e0ffc396d4b63f23 *src/qf/qep_msm.cpp
+b85ff0dee3842c6db3f81899ce370f7248e2bee8 *src/qf/qep_hsm.cpp
+cd5e4cf38c54c117f639644f59fbfe9cba64d51b *src/qf/qep_msm.cpp
 03dd5b24ff8517608c2dfb7f85a22e71f8bb50ab *src/qf/qf_act.cpp
 bd21539d1962e9a00db653f10e8c241abee97119 *src/qf/qf_actq.cpp
 084e050639c4ccf28f5b93f57082ae00294f3a92 *src/qf/qf_defer.cpp
-94841287f4d771be7c891604a594208e4415a6c3 *src/qf/qf_dyn.cpp
-94a7a263b32f704f593a4782cbff2e422b2898c7 *src/qf/qf_mem.cpp
+9b2530890aa8a6ed68977c317de86e400af661d7 *src/qf/qf_dyn.cpp
+5e30caa815031dfc8c648faefb0faff720e21cae *src/qf/qf_mem.cpp
 0ec1869e8115d0b20e9b49b531f62adefde74d63 *src/qf/qf_ps.cpp
 f01358c88e2a45f04a1c8852d0efec19fce4fcc8 *src/qf/qf_qact.cpp
 4028fdfef72fca72fa232c77817b9e2b65f2ec39 *src/qf/qf_qeq.cpp
@@ -28,7 +28,7 @@ a727a1456a845d5e43b3c8684765b60197ace59c *src/qf/qf_time.cpp
 7cdab433e81612862fd27f0cf792d38e1197d064 *src/qk/CMakeLists.txt
 fca9b5540b12355da849669d0207d1d3cfbf710c *src/qk/qk.cpp
 eb28260d471fc752ca54b2c1e2d763f28432c2c1 *src/qs/CMakeLists.txt
-b63174df2803f946a244efa51579d06956ab72d5 *src/qs/qs.cpp
+027b77113fb8e43f23e2ffcbae22893a1c3d47a2 *src/qs/qs.cpp
 c4b431ecbed6961c4fc03777319bdb61008b2e9a *src/qs/qs_64bit.cpp
 256b098b03089aa724dcba23d33565fb7849c362 *src/qs/qs_fp.cpp
 d21cc2a0292a682a1ce1bfa0d5b3af7fbb2632a0 *src/qs/qs_rx.cpp
@@ -99,8 +99,8 @@ d20e40d3c828d1d9681c314528ca5e2f18cd772d *ports/embos/qp_port.hpp
 35fbee9e7492cf897f26b6686b3b650c6b8fabb8 *ports/embos/qs_port.hpp
 4e86718c62fd78bc866ffdf855aa1e5a186916b2 *ports/embos/syscalls.c
 e4f00894f86806af6d88d38e831a8fc0ad36059e *ports/freertos/CMakeLists.txt
-da5abb9a583d785cfe70ff4861e7469d3d8e8591 *ports/freertos/qf_port.cpp
-6498bc99657223bcc9e69a2bdd28863555609402 *ports/freertos/qp_port.hpp
+a16a6f1e499bc7fb91cdcdd73c7058eaa32e7d53 *ports/freertos/qf_port.cpp
+9f4ca9fff8327bc18348358a71d57c913649f740 *ports/freertos/qp_port.hpp
 35fbee9e7492cf897f26b6686b3b650c6b8fabb8 *ports/freertos/qs_port.hpp
 4e86718c62fd78bc866ffdf855aa1e5a186916b2 *ports/freertos/syscalls.c
 18df978f665338c757f1a2a284c2acc779bd59d3 *ports/threadx/CMakeLists.txt
@@ -162,8 +162,9 @@ f084c5b1e8f6a58679f3235a1c6f9eb0fcc02e97 *ports/win32-qutest/safe_std.h
 76dd9078dc4311d53d3862d44177a8660258da6d *zephyr/CMakeLists.txt
 36a0252cf0bfd6be0d345c48c00b2300f8917f05 *zephyr/Kconfig
 2eb2a922e18b4760a68151ebee1b6282d20b4692 *zephyr/module.yml
-3427e1e065cd1bbc7ce9c46749a8ecdefbf8143c *zephyr/qf_port.cpp
+9a9e5f0a8e48600f64ae98016b709da12beadeb2 *zephyr/qf_port.cpp
 109c291df50110f185adc17bcdf8becc0a79346c *zephyr/qp-zephyr.jpg
 12fda4da868f4b3d6be1120a220d0bf72fe51a65 *zephyr/qp_port.hpp
 0ddae999ce63eb39de7758fa7574d06188a89fbe *zephyr/qs_port.hpp
+680911bb9e5cd87a9954407d3c18fce7dbca4df8 *zephyr/qutest_port.cpp
 791248d57ce8dfa6497728c7c2d0734c2c581625 *zephyr/README.md

ports/freertos/qp_port.hpp

@@ -1,6 +1,6 @@
 @setlocal
 
-set VERSION=8.0.4
+set VERSION=8.0.5
 
 :: usage
 @echo Usage: qppcp_sha1 [gen]