Skip to content

Commit 478a5c6

Browse files
quantum-leapsquantum-leaps
committed
6.9.2
Upgraded to QP/C++ 6.9.2 / Removed QP-nano
1 parent a0b9cc0 commit 478a5c6

Some content is hidden

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

64 files changed

+909
-5771
lines changed

‎QP-Arduino-Playground.url

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎README.md

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@ the whole `qp-<ver>_arduino-1.8.x.zip` archive to this folder.
2121
----
2222
# Provided Libraries and Tools
2323

24-
The archive `qp-<ver>_arduino-1.8.x.zip` contains two external libraries
25-
for Arduino:
24+
The archive `qp-<ver>_arduino-1.8.x.zip` contains one external library
25+
for SAM-based Arduinos:
2626

2727
- `qpcpp_sam` -- QP/C++ framework for SAM-based Arduinos
28-
- `qpn_avr` -- QP-nano framework for AVR-based Arduinos
2928

3029
The archive also contains the QM modeling tool for Windows
3130

@@ -47,30 +46,13 @@ as follows:
4746
| | | +-... - QP/C++ library sources
4847
| | +-library.properties - QP/C++ library properties
4948
| |
50-
| +-qpn_avr/ - QP-nano library for AVR-based Arduinos
51-
| | +-examples/ - QP-nano library examples
52-
| | | +-blinky/ - Blinky example
53-
| | | | +-blinky.ino - Blinky code (generated)
54-
| | | | +-blinky.qm - Blinky model (for QM tool)
55-
| | | +-dpp/ - Dining Philosophers Problem (DPP)
56-
| | | | +-dpp.ino - DPP code (generated)
57-
| | | | +-dpp.qm - DPP model (for QM tool)
58-
| | | +-pelican/ - PEdestrian LIghtr CONtrolled crossing
59-
| | | | +-pelican.ino - PELICAN code (generated)
60-
| | | | +-pelican.qm - PELICAN model (for QM tool)
61-
| | +-src/ - QP-nano library source code
62-
| | | +-qpn.h - QP-nano library header file
63-
| | | +-... - QP-nano library sources
64-
| | +-library.properties - QP-nano library properties
65-
| |
6649
| +-qm/ - QM modeling tool for Windows
6750
| | +-bin/ - QM binaries (executable and DLLs)
6851
| | | +-qm.exe - QM executable for Windows
6952
| | +-Resources/ - QM resources
7053
| | | +-...
7154
|
7255
+-README.md - this file
73-
+-QP-Arduino-Playground - web link to QP on Arduino Playground
7456
+-QP-Arduino_GPL_Exception.txt - GPL exception for QP on Arduino
7557

7658

@@ -83,15 +65,15 @@ https://www.state-machine.com/qm/gs.html
8365
----
8466
# Working with the Examples
8567

86-
Assumming that you have installed the QP libraries in your `<Sketchbook>`
68+
Assumming that you have installed the QP library in your `<Sketchbook>`
8769
folder, the examples provided in each QP library show up in the Arduino
8870
IDE under the menu:
8971

9072
`File|Examples|Examples from Custom Libraries`
9173

9274
The intended way of working with the examples is to use the
93-
[QM modeling tool](https://www.state-machine.com/qm/) to modify the
94-
**models** (`.qm` files) and then to **generate code** from these
75+
[QM modeling tool](https://www.state-machine.com/products/qm/) to modify
76+
the **models** (`.qm` files) and then to **generate code** from these
9577
models. In this scenario, the Arduino IDE is used only to build and
9678
upload the code to the Arduino board(s).
9779

@@ -111,8 +93,8 @@ is active.
11193
----
11294
# Licensing
11395

114-
The QP real-time embedded frameworks for Arduino are licensed under the
115-
modified GPLv3 license with the
96+
The QP/C++ real-time embedded framework (RTEF) for Arduino are licensed
97+
under the modified GPLv3 license with the
11698
[QP-Arduino Exception](https://www.state-machine.com/licensing/QP-Arduino_GPL_Exception.txt)
11799
(see also the file QP-Arduino_GPL_Exception.txt in the root of the archive).
118100
Specifically, the Exception removes the requirement to expose your

‎libraries/qpcpp_sam/examples/blinky/blinky.ino

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Model: blinky.qm
44
// File: ${.::blinky.ino}
55
//
6-
// This code has been generated by QM 5.0.0 <www.state-machine.com/qm/>.
6+
// This code has been generated by QM 5.1.0 <www.state-machine.com/qm/>.
77
// DO NOT EDIT THIS FILE MANUALLY. All your changes will be lost.
88
//
99
// This program is open source software: you can redistribute it and/or
@@ -144,8 +144,8 @@ protected:
144144
//.$enddecl${AOs::Blinky} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
145145
//.$skip${QP_VERSION} vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
146146
//. Check for the minimum required QP version
147-
#if (QP_VERSION < 670U) || (QP_VERSION != ((QP_RELEASE^4294967295U) % 0x3E8U))
148-
#error qpcpp version 6.7.0 or higher required
147+
#if (QP_VERSION < 680U) || (QP_VERSION != ((QP_RELEASE^4294967295U) % 0x3E8U))
148+
#error qpcpp version 6.8.0 or higher required
149149
#endif
150150
//.$endskip${QP_VERSION} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
151151
//.$define${AOs::Blinky} vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv

‎libraries/qpcpp_sam/examples/blinky/blinky.qm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<model version="5.0.0" links="0">
2+
<model version="5.1.0" links="0">
33
<documentation>This is the simple Blinky example for the Arduino DUE board. The example demonstrates:
44

55
1. One active object class &quot;Blinky&quot; (inside the package &quot;AOs&quot;)

‎libraries/qpcpp_sam/examples/blinky_bsp/blinky.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Model: blinky_bsp.qm
44
// File: ${.::blinky.hpp}
55
//
6-
// This code has been generated by QM 5.0.0 <www.state-machine.com/qm/>.
6+
// This code has been generated by QM 5.1.0 <www.state-machine.com/qm/>.
77
// DO NOT EDIT THIS FILE MANUALLY. All your changes will be lost.
88
//
99
// This program is open source software: you can redistribute it and/or

‎libraries/qpcpp_sam/examples/blinky_bsp/blinky_bsp.ino

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Model: blinky_bsp.qm
44
// File: ${.::blinky_bsp.ino}
55
//
6-
// This code has been generated by QM 5.0.0 <www.state-machine.com/qm/>.
6+
// This code has been generated by QM 5.1.0 <www.state-machine.com/qm/>.
77
// DO NOT EDIT THIS FILE MANUALLY. All your changes will be lost.
88
//
99
// This program is open source software: you can redistribute it and/or
@@ -62,8 +62,8 @@ protected:
6262
//.$enddecl${AOs::Blinky} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6363
//.$skip${QP_VERSION} vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
6464
//. Check for the minimum required QP version
65-
#if (QP_VERSION < 670U) || (QP_VERSION != ((QP_RELEASE^4294967295U) % 0x3E8U))
66-
#error qpcpp version 6.7.0 or higher required
65+
#if (QP_VERSION < 680U) || (QP_VERSION != ((QP_RELEASE^4294967295U) % 0x3E8U))
66+
#error qpcpp version 6.8.0 or higher required
6767
#endif
6868
//.$endskip${QP_VERSION} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
6969
//.$define${AOs::Blinky} vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv

‎libraries/qpcpp_sam/examples/blinky_bsp/blinky_bsp.qm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<model version="5.0.0" links="0">
2+
<model version="5.1.0" links="0">
33
<documentation>This is a little more advanced Blinky example for the Arduino DUE board. The example demonstrates:
44

55
1. One active object class &quot;Blinky&quot; (inside the package &quot;AOs&quot;)

‎libraries/qpcpp_sam/examples/blinky_bsp/bsp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Model: blinky_bsp.qm
44
// File: ${.::bsp.cpp}
55
//
6-
// This code has been generated by QM 5.0.0 <www.state-machine.com/qm/>.
6+
// This code has been generated by QM 5.1.0 <www.state-machine.com/qm/>.
77
// DO NOT EDIT THIS FILE MANUALLY. All your changes will be lost.
88
//
99
// This program is open source software: you can redistribute it and/or

‎libraries/qpcpp_sam/examples/blinky_bsp/bsp.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Model: blinky_bsp.qm
44
// File: ${.::bsp.hpp}
55
//
6-
// This code has been generated by QM 5.0.0 <www.state-machine.com/qm/>.
6+
// This code has been generated by QM 5.1.0 <www.state-machine.com/qm/>.
77
// DO NOT EDIT THIS FILE MANUALLY. All your changes will be lost.
88
//
99
// This program is open source software: you can redistribute it and/or

‎libraries/qpcpp_sam/examples/dpp_bsp/bsp.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Model: dpp_bsp.qm
44
// File: ${.::bsp.cpp}
55
//
6-
// This code has been generated by QM 5.0.0 <www.state-machine.com/qm/>.
6+
// This code has been generated by QM 5.1.0 <www.state-machine.com/qm/>.
77
// DO NOT EDIT THIS FILE MANUALLY. All your changes will be lost.
88
//
99
// This program is open source software: you can redistribute it and/or

‎libraries/qpcpp_sam/examples/dpp_bsp/bsp.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Model: dpp_bsp.qm
44
// File: ${.::bsp.hpp}
55
//
6-
// This code has been generated by QM 5.0.0 <www.state-machine.com/qm/>.
6+
// This code has been generated by QM 5.1.0 <www.state-machine.com/qm/>.
77
// DO NOT EDIT THIS FILE MANUALLY. All your changes will be lost.
88
//
99
// This program is open source software: you can redistribute it and/or

‎libraries/qpcpp_sam/examples/dpp_bsp/dpp.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Model: dpp_bsp.qm
44
// File: ${.::dpp.hpp}
55
//
6-
// This code has been generated by QM 5.0.0 <www.state-machine.com/qm/>.
6+
// This code has been generated by QM 5.1.0 <www.state-machine.com/qm/>.
77
// DO NOT EDIT THIS FILE MANUALLY. All your changes will be lost.
88
//
99
// This program is open source software: you can redistribute it and/or

‎libraries/qpcpp_sam/examples/dpp_bsp/dpp_bsp.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Model: dpp_bsp.qm
44
// File: ${.::dpp_bsp.ino}
55
//
6-
// This code has been generated by QM 5.0.0 <www.state-machine.com/qm/>.
6+
// This code has been generated by QM 5.1.0 <www.state-machine.com/qm/>.
77
// DO NOT EDIT THIS FILE MANUALLY. All your changes will be lost.
88
//
99
// This program is open source software: you can redistribute it and/or

‎libraries/qpcpp_sam/examples/dpp_bsp/dpp_bsp.qm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<model version="5.0.0" links="1">
2+
<model version="5.1.0" links="1">
33
<documentation>This is the Dining Philosopher Problem (DPP) example for the Arduino-DUE board. The example demonstrates:
44

55
1. Multiple active objects (5 Philosophers and 1 Table AO)

‎libraries/qpcpp_sam/examples/dpp_bsp/philo.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Model: dpp_bsp.qm
44
// File: ${.::philo.cpp}
55
//
6-
// This code has been generated by QM 5.0.0 <www.state-machine.com/qm/>.
6+
// This code has been generated by QM 5.1.0 <www.state-machine.com/qm/>.
77
// DO NOT EDIT THIS FILE MANUALLY. All your changes will be lost.
88
//
99
// This program is open source software: you can redistribute it and/or
@@ -46,8 +46,8 @@ class Philo : public QP::QActive {
4646
// generate definition of the opaque pointer to the AO -----------------------
4747
//.$skip${QP_VERSION} vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
4848
//. Check for the minimum required QP version
49-
#if (QP_VERSION < 670U) || (QP_VERSION != ((QP_RELEASE^4294967295U) % 0x3E8U))
50-
#error qpcpp version 6.7.0 or higher required
49+
#if (QP_VERSION < 680U) || (QP_VERSION != ((QP_RELEASE^4294967295U) % 0x3E8U))
50+
#error qpcpp version 6.8.0 or higher required
5151
#endif
5252
//.$endskip${QP_VERSION} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5353
//.$define${AOs::AO_Philo[N_PHILO]} vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv

‎libraries/qpcpp_sam/examples/dpp_bsp/table.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
// Model: dpp_bsp.qm
44
// File: ${.::table.cpp}
55
//
6-
// This code has been generated by QM 5.0.0 <www.state-machine.com/qm/>.
6+
// This code has been generated by QM 5.1.0 <www.state-machine.com/qm/>.
77
// DO NOT EDIT THIS FILE MANUALLY. All your changes will be lost.
88
//
99
// This program is open source software: you can redistribute it and/or
@@ -47,8 +47,8 @@ class Table : public QP::QActive {
4747
// generate definition of the opaque pointer to the AO -----------------------
4848
//.$skip${QP_VERSION} vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
4949
//. Check for the minimum required QP version
50-
#if (QP_VERSION < 670U) || (QP_VERSION != ((QP_RELEASE^4294967295U) % 0x3E8U))
51-
#error qpcpp version 6.7.0 or higher required
50+
#if (QP_VERSION < 680U) || (QP_VERSION != ((QP_RELEASE^4294967295U) % 0x3E8U))
51+
#error qpcpp version 6.8.0 or higher required
5252
#endif
5353
//.$endskip${QP_VERSION} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
5454
//.$define${AOs::AO_Table} vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv

‎libraries/qpcpp_sam/library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=QP-C++
2-
version=6.8.1
2+
version=6.9.2
33
author=Quantum Leaps
44
maintainer=Quantum Leaps <info@state-machine.com>
55
sentence=QP/C++ Real-Time Embedded Framework for Arduino.

‎libraries/qpcpp_sam/src/qassert.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
* @brief Customizable and memory-efficient assertions for embedded systems
44
* @cond
55
******************************************************************************
6-
* Last updated for version 6.8.0
7-
* Last updated on 2020-03-03
6+
* Last updated for version 6.8.2
7+
* Last updated on 2020-07-07
88
*
99
* Q u a n t u m L e a P s
1010
* ------------------------
@@ -334,7 +334,7 @@ Q_NORETURN Q_onAssert(char_t const * const module, int_t const location);
334334
#define Q_ASSERT_COMPILE(test_) Q_ASSERT_STATIC(test_)
335335

336336
/*! Helper macro to calculate static dimension of a 1-dim @p array_ */
337-
#define Q_DIM(array_) (sizeof(array_) / sizeof((array_)[0]))
337+
#define Q_DIM(array_) (sizeof(array_) / sizeof((array_)[0U]))
338338

339339
#endif /* QASSERT_H */
340340

0 commit comments

Comments
 (0)