Skip to content

Commit 4470078

Browse files
committed
7.4.0-rc.3
1 parent 950ab31 commit 4470078

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+551
-468
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
*.qms
12
*.obj
23
*.o
34
*.d
@@ -33,7 +34,6 @@
3334
*.Debug
3435
*.Release
3536
*.bak
36-
.qpcpp
3737
version-*
3838
JLink*.*
3939

LICENSES/LicenseRef-QL-dual.qlc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Any user of the QP/C++ real-time embedded framework
22
qpcpp
3-
2024-12-31
3+
2025-12-31
44

55
Copyright (C) 2005 Quantum Leaps, LLC <state-machine.com>.
66

@@ -27,4 +27,4 @@ Plagiarizing this software to sidestep the license obligations is illegal.
2727
Contact information:
2828
<www.state-machine.com/licensing>
2929
30-
#10EBA9166330240A6EE04F770591C48BE4545919
30+
#CEF384A62BD9270573AA82386A5BE6F6E36AD848

LICENSES/QP-Arduino_GPL_Exception.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ License, version 3 ("GPLv3"). It applies to the QP/C++ and QP-nano
1313
source code (the "QP Frameworks") that is distributed as part of the
1414
QP-Arduino Support Package.
1515

16-
When you use QP Frameworks inside your program, the QP Frameworks' code
17-
is combined with your code of the program. The purpose of this Exception
18-
is to allow non-GPL (including proprietary) programs to use, in this way,
19-
the QP Frameworks' code covered by this Exception.
16+
When you use QP/C++ or QP-nano Frameworks inside your program, the frameworks'
17+
code is combined with your code of the program. The purpose of this Exception
18+
is to allow non-GPL (including proprietary) programs to use, in this way, the
19+
QP Frameworks' code covered by this Exception.
2020

2121
0. Definitions.
2222
"QP Frameworks" are lightweight real-time embedded frameworks (RTEFs)

LICENSES/QP-RasPi_GPL_Exception.txt

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ Copyright (c) 2005-2021 Quantum Leaps, LLC. <https://www.state-machine.com/>
77
Everyone is permitted to copy and distribute verbatim copies of this
88
license document, but changing it is not allowed.
99

10-
This QP/C++ and QP-nano Framework Exception for Arduino ("Exception")
10+
This QP/C and QP/C++ Framework Exception for Raspberry Pi ("Exception")
1111
is an additional permission under section 7 of the GNU General Public
12-
License, version 3 ("GPLv3"). It applies to the QP/C++ and QP-nano
13-
source code (the "QP Frameworks") that is distributed as part of the
14-
QP-Arduino Support Package.
12+
License, version 3 ("GPLv3"). It applies to the QP/C and QP/C++ source
13+
code (the "QP Frameworks").
1514

1615
When you use QP Frameworks inside your program, the QP Frameworks' code
1716
is combined with your code of the program. The purpose of this Exception
@@ -24,23 +23,23 @@ as well as all supporting ports and examples, as distributed from:
2423
<https://www.state-machine.com> and
2524
<https://github.com/QuantumLeaps>
2625

27-
"Raspberry Pi" is a low cost, credit-card sized computer that is
28-
designed by the Raspberry Pi Foundation based in the UK and registered
29-
as UK educational charity under the number 1129409. For the purpose of
30-
this license, Raspberry Pi means only genuine Raspberry Pi computer
31-
bearing the Raspberry Pi logo, as described at
26+
"Raspberry Pi" is a low cost, credit-card sized computer that is designed
27+
by the Raspberry Pi Foundation based in the UK and registered as UK
28+
educational charity under the number 1129409. For the purpose of this
29+
license, Raspberry Pi means only genuine Raspberry Pi computer bearing
30+
the Raspberry Pi logo, as described at:
3231
<https://www.raspberrypi.com/trademark-rules>.
3332

34-
"Target Code" refers to output from any compiler and linker in
35-
executable form suitable for execution by Raspberry Pi.
33+
"Target Code" refers to output from any compiler and linker in executable
34+
form suitable for execution by Raspberry Pi.
3635

3736

3837
1. Grant of Additional Permission
3938
As a special Exception, the copyright holder of QP Frameworks gives you
40-
permission to propagate a work of Target Code formed by combining the QP
41-
Frameworks with your own source code without the requirement to expose
42-
your proprietary source code, provided that all Target Code will execute
43-
on a genuine Raspberry Pi computer(s).
39+
permission to propagate a work of Target Code formed by combining the
40+
QP/C or QP/C++ Frameworks with your own source code without the requirement
41+
to expose your propriatory source code, provided that all Target Code will
42+
execute on a genuine Raspberry Pi computer(s).
4443

4544
2. No Weakening of GPL
4645
The availability of this Exception does not imply any general

LICENSES/QP-mbed_GPL_Exception.txt

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,10 @@ Copyright (c) 2005-2014 Quantum Leaps, LLC. <https://www.state-machine.com/>
77
Everyone is permitted to copy and distribute verbatim copies of this
88
license document, but changing it is not allowed.
99

10-
This QP/C++ and QP-nano Framework Exception for Arduino ("Exception")
10+
This QP/C and QP/C++ Framework Exception for ARM mbed ("Exception")
1111
is an additional permission under section 7 of the GNU General Public
12-
License, version 3 ("GPLv3"). It applies to the QP/C++ and QP-nano
13-
source code (the "QP Frameworks") that is distributed as part of the
14-
QP-Arduino Support Package.
12+
License, version 3 ("GPLv3"). It applies to the QP/C and QP/C++ source
13+
code (the "QP Frameworks").
1514

1615
When you use QP Frameworks inside your program, the QP Frameworks' code
1716
is combined with your code of the program. The purpose of this Exception
@@ -24,16 +23,15 @@ as well as all supporting ports and examples, as distributed from:
2423
<https://www.state-machine.com> and
2524
<https://github.com/QuantumLeaps>
2625

27-
"mbed-Enabled Board" means any board with an ARM Cortex-M CPU that is
28-
listed on the official "mbed platforms" website
29-
<https://os.mbed.com/platforms>.
26+
"mbed-Enabled Board" means any board with an ARM Cortex-M CPU that is listed
27+
on the official "mbed platforms" website <https://os.mbed.com/platforms>.
3028

3129

3230
1. Grant of Additional Permission
3331
As a special Exception, the copyright holder of QP Frameworks gives you
34-
permission to propagate a work of Target Code formed by combining
35-
the QP Frameworks with your own source code without the requirement
36-
to expose your proprietary source code, provided that all Target Code will
32+
permission to propagate a work of Target Code formed by combining the
33+
QP/C or QP/C++ Frameworks with your own source code without the requirement
34+
to expose your propriatory source code, provided that all Target Code will
3735
execute on an "mbed-Enabled Board".
3836

3937
2. No Weakening of GPL

examples

Submodule examples updated 69 files

include/qequeue.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
// Model: qpcpp.qm
44
// File: ${include::qequeue.hpp}
55
//
6-
// This code has been generated by QM 6.1.1 <www.state-machine.com/qm>.
6+
// This code has been generated by QM 6.2.0 <www.state-machine.com/qm>.
77
// DO NOT EDIT THIS FILE MANUALLY. All your changes will be lost.
88
//
99
// This code is covered by the following QP license:
1010
// License # : LicenseRef-QL-dual
1111
// Issued to : Any user of the QP/C++ real-time embedded framework
1212
// Framework(s) : qpcpp
13-
// Support ends : 2024-12-31
13+
// Support ends : 2025-12-31
1414
// License scope:
1515
//
1616
// Copyright (C) 2005 Quantum Leaps, LLC <state-machine.com>.

include/qk.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
// Model: qpcpp.qm
44
// File: ${include::qk.hpp}
55
//
6-
// This code has been generated by QM 6.1.1 <www.state-machine.com/qm>.
6+
// This code has been generated by QM 6.2.0 <www.state-machine.com/qm>.
77
// DO NOT EDIT THIS FILE MANUALLY. All your changes will be lost.
88
//
99
// This code is covered by the following QP license:
1010
// License # : LicenseRef-QL-dual
1111
// Issued to : Any user of the QP/C++ real-time embedded framework
1212
// Framework(s) : qpcpp
13-
// Support ends : 2024-12-31
13+
// Support ends : 2025-12-31
1414
// License scope:
1515
//
1616
// Copyright (C) 2005 Quantum Leaps, LLC <state-machine.com>.

include/qmpool.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
// Model: qpcpp.qm
44
// File: ${include::qmpool.hpp}
55
//
6-
// This code has been generated by QM 6.1.1 <www.state-machine.com/qm>.
6+
// This code has been generated by QM 6.2.0 <www.state-machine.com/qm>.
77
// DO NOT EDIT THIS FILE MANUALLY. All your changes will be lost.
88
//
99
// This code is covered by the following QP license:
1010
// License # : LicenseRef-QL-dual
1111
// Issued to : Any user of the QP/C++ real-time embedded framework
1212
// Framework(s) : qpcpp
13-
// Support ends : 2024-12-31
13+
// Support ends : 2025-12-31
1414
// License scope:
1515
//
1616
// Copyright (C) 2005 Quantum Leaps, LLC <state-machine.com>.

include/qp.hpp

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
// Model: qpcpp.qm
44
// File: ${include::qp.hpp}
55
//
6-
// This code has been generated by QM 6.1.1 <www.state-machine.com/qm>.
6+
// This code has been generated by QM 6.2.0 <www.state-machine.com/qm>.
77
// DO NOT EDIT THIS FILE MANUALLY. All your changes will be lost.
88
//
99
// This code is covered by the following QP license:
1010
// License # : LicenseRef-QL-dual
1111
// Issued to : Any user of the QP/C++ real-time embedded framework
1212
// Framework(s) : qpcpp
13-
// Support ends : 2024-12-31
13+
// Support ends : 2025-12-31
1414
// License scope:
1515
//
1616
// Copyright (C) 2005 Quantum Leaps, LLC <state-machine.com>.
@@ -44,7 +44,7 @@
4444
#define QP_HPP_
4545

4646
//============================================================================
47-
#define QP_VERSION_STR "7.4.0-rc.1"
47+
#define QP_VERSION_STR "7.4.0-rc.3"
4848
#define QP_VERSION 740U
4949
#define QP_RELEASE 0x7092C3BBU
5050

@@ -388,9 +388,6 @@ class QAsm {
388388

389389
//${QEP::QHsm} ...............................................................
390390
class QHsm : public QP::QAsm {
391-
public:
392-
static constexpr std::int_fast8_t MAX_NEST_DEPTH_{6};
393-
394391
protected:
395392
explicit QHsm(QStateHandler const initial) noexcept;
396393

@@ -415,7 +412,7 @@ class QHsm : public QP::QAsm {
415412

416413
private:
417414
std::int_fast8_t hsm_tran(
418-
QStateHandler (&path)[MAX_NEST_DEPTH_],
415+
QStateHandler * const path,
419416
std::uint_fast8_t const qsId);
420417
}; // class QHsm
421418

0 commit comments

Comments
 (0)