Skip to content

Commit 7a6f117

Browse files
author
QL
committed
6.5.0
1 parent 833a8fd commit 7a6f117

File tree

12 files changed

+83
-83
lines changed

12 files changed

+83
-83
lines changed

‎.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ lint*.txt
3434
*.bak
3535
*.qlc
3636
JLink*.*
37+
version-*
3738

3839
eclipse/
3940
test/
@@ -53,7 +54,6 @@ lib/
5354
obj/
5455
output/
5556

56-
5757
doxygen/html/
5858
lint/*.txt
5959
lint/MISRA_Exemplar_Suite_test/*.txt

‎README.txt renamed to ‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,4 +114,4 @@ https://www.state-machine.com/doc/AN_Event-Driven_Arduino_QP-nano.pdf
114114
Support Questions
115115
=================
116116
Please submit any questions or comments to the free QP support forum at:
117-
http://sourceforge.net/p/qpc/discussion/668726
117+
https://sourceforge.net/p/qpc/discussion/668726

‎libraries/qpn_avr/examples/blinky/.blinky

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<session version="4.4.0">
2+
<session version="4.5.0">
33
<item name="license">GPL</item>
44
<group name="locked"/>
55
<group name="settings">
@@ -9,8 +9,8 @@
99
<item name="backups">0</item>
1010
</group>
1111
<group name="windows">
12-
<item id=".::blinky.ino">0,0,800,445</item>
13-
<item id="AOs::Blinky::SM">0,0,1105,359,*</item>
12+
<item id=".::blinky.ino">-406,0,800,445</item>
13+
<item id="AOs::Blinky::SM">0,0,1193,807,*</item>
1414
</group>
1515
<group name="search">
1616
<item name="options">4129280</item>

‎libraries/qpn_avr/examples/blinky/blinky.ino

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
/*$file${.::blinky.ino} ####################################################*/
1+
/*$file${.::blinky.ino} vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
22
/*
33
* Model: blinky.qm
44
* File: ${.::blinky.ino}
55
*
6-
* This code has been generated by QM 4.4.0 (https://www.state-machine.com/qm).
6+
* This code has been generated by QM 4.5.0 (https://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
@@ -15,13 +15,13 @@
1515
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
1616
* for more details.
1717
*/
18-
/*$endhead${.::blinky.ino} #################################################*/
18+
/*$endhead${.::blinky.ino} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
1919
#include "qpn.h" // QP-nano framework
2020
#include "Arduino.h" // Arduino API
2121

2222
//============================================================================
2323
// declare all AO classes...
24-
/*$declare${AOs::Blinky} ###################################################*/
24+
/*$declare${AOs::Blinky} vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
2525
/*${AOs::Blinky} ...........................................................*/
2626
typedef struct Blinky {
2727
/* protected: */
@@ -32,7 +32,7 @@ typedef struct Blinky {
3232
static QState Blinky_initial(Blinky * const me);
3333
static QState Blinky_off(Blinky * const me);
3434
static QState Blinky_on(Blinky * const me);
35-
/*$enddecl${AOs::Blinky} ###################################################*/
35+
/*$enddecl${AOs::Blinky} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
3636
//...
3737

3838
// AO instances and event queue buffers for them...
@@ -107,13 +107,13 @@ void Q_onAssert(char const Q_ROM * const file, int line) {
107107

108108
//============================================================================
109109
// define all AO classes (state machine)...
110-
/*$skip${QP_VERSION} #######################################################*/
110+
/*$skip${QP_VERSION} vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
111111
/* Check for the minimum required QP version */
112-
#if (QP_VERSION < 640U) || (QP_VERSION != ((QP_RELEASE^4294967295U) % 0x3E8U))
113-
#error qpn version 6.4.0 or higher required
112+
#if (QP_VERSION < 650U) || (QP_VERSION != ((QP_RELEASE^4294967295U) % 0x3E8U))
113+
#error qpn version 6.5.0 or higher required
114114
#endif
115-
/*$endskip${QP_VERSION} ####################################################*/
116-
/*$define${AOs::Blinky} ####################################################*/
115+
/*$endskip${QP_VERSION} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
116+
/*$define${AOs::Blinky} vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
117117
/*${AOs::Blinky} ...........................................................*/
118118
/*${AOs::Blinky::SM} .......................................................*/
119119
static QState Blinky_initial(Blinky * const me) {
@@ -166,5 +166,5 @@ static QState Blinky_on(Blinky * const me) {
166166
}
167167
return status_;
168168
}
169-
/*$enddef${AOs::Blinky} ####################################################*/
169+
/*$enddef${AOs::Blinky} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
170170
//...

‎libraries/qpn_avr/examples/dpp/.dpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<session version="4.4.0">
2+
<session version="4.5.0">
33
<item name="license">GPL</item>
44
<group name="locked"/>
55
<group name="settings">
@@ -10,8 +10,8 @@
1010
</group>
1111
<group name="windows">
1212
<item id=".::dpp.ino">0,0,1105,543</item>
13-
<item id="AOs::Philo::SM">0,0,1105,479,*</item>
14-
<item id="AOs::Table::SM">0,0,640,480</item>
13+
<item id="AOs::Philo::SM">0,0,1193,807,*</item>
14+
<item id="AOs::Table::SM">553,0,640,480</item>
1515
</group>
1616
<group name="search">
1717
<item name="options">4129280</item>

‎libraries/qpn_avr/examples/dpp/dpp.ino

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
/*$file${.::dpp.ino} #######################################################*/
1+
/*$file${.::dpp.ino} vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
22
/*
33
* Model: dpp.qm
44
* File: ${.::dpp.ino}
55
*
6-
* This code has been generated by QM 4.4.0 (https://www.state-machine.com/qm).
6+
* This code has been generated by QM 4.5.0 (https://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
@@ -15,7 +15,7 @@
1515
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
1616
* for more details.
1717
*/
18-
/*$endhead${.::dpp.ino} ####################################################*/
18+
/*$endhead${.::dpp.ino} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
1919
#include "qpn.h" // QP-nano framework
2020
#include "Arduino.h" // Arduino API
2121

@@ -37,7 +37,7 @@ enum {
3737

3838
//============================================================================
3939
// declare all AO classes...
40-
/*$declare${AOs::Philo} ####################################################*/
40+
/*$declare${AOs::Philo} vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
4141
/*${AOs::Philo} ............................................................*/
4242
typedef struct Philo {
4343
/* protected: */
@@ -49,8 +49,8 @@ static QState Philo_initial(Philo * const me);
4949
static QState Philo_thinking(Philo * const me);
5050
static QState Philo_hungry(Philo * const me);
5151
static QState Philo_eating(Philo * const me);
52-
/*$enddecl${AOs::Philo} ####################################################*/
53-
/*$declare${AOs::Table} ####################################################*/
52+
/*$enddecl${AOs::Philo} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
53+
/*$declare${AOs::Table} vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
5454
/*${AOs::Table} ............................................................*/
5555
typedef struct Table {
5656
/* protected: */
@@ -66,7 +66,7 @@ static QState Table_initial(Table * const me);
6666
static QState Table_active(Table * const me);
6767
static QState Table_serving(Table * const me);
6868
static QState Table_paused(Table * const me);
69-
/*$enddecl${AOs::Table} ####################################################*/
69+
/*$enddecl${AOs::Table} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
7070
//...
7171

7272
// define all AO instances and event queue buffers for them...
@@ -206,13 +206,13 @@ void Q_onAssert(char const Q_ROM * const file, int line) {
206206

207207
//============================================================================
208208
// define all AO classes...
209-
/*$skip${QP_VERSION} #######################################################*/
209+
/*$skip${QP_VERSION} vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
210210
/* Check for the minimum required QP version */
211-
#if (QP_VERSION < 640U) || (QP_VERSION != ((QP_RELEASE^4294967295U) % 0x3E8U))
212-
#error qpn version 6.4.0 or higher required
211+
#if (QP_VERSION < 650U) || (QP_VERSION != ((QP_RELEASE^4294967295U) % 0x3E8U))
212+
#error qpn version 6.5.0 or higher required
213213
#endif
214-
/*$endskip${QP_VERSION} ####################################################*/
215-
/*$define${AOs::Philo} #####################################################*/
214+
/*$endskip${QP_VERSION} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
215+
/*$define${AOs::Philo} vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
216216
/*${AOs::Philo} ............................................................*/
217217
/*${AOs::Philo::SM} ........................................................*/
218218
static QState Philo_initial(Philo * const me) {
@@ -318,7 +318,7 @@ static QState Philo_eating(Philo * const me) {
318318
}
319319
return status_;
320320
}
321-
/*$enddef${AOs::Philo} #####################################################*/
321+
/*$enddef${AOs::Philo} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
322322

323323
static inline uint8_t RIGHT(uint8_t n) {
324324
return (n + (N_PHILO - 1)) % N_PHILO;
@@ -331,7 +331,7 @@ enum {
331331
USED = 1
332332
};
333333

334-
/*$define${AOs::Table} #####################################################*/
334+
/*$define${AOs::Table} vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
335335
/*${AOs::Table} ............................................................*/
336336
/*${AOs::Table::SM} ........................................................*/
337337
static QState Table_initial(Table * const me) {
@@ -524,5 +524,5 @@ static QState Table_paused(Table * const me) {
524524
}
525525
return status_;
526526
}
527-
/*$enddef${AOs::Table} #####################################################*/
527+
/*$enddef${AOs::Table} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
528528
//...

‎libraries/qpn_avr/examples/dpp_comp/.dpp_comp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<session version="4.4.0">
2+
<session version="4.5.0">
33
<item name="license">GPL</item>
44
<group name="locked"/>
55
<group name="settings">
@@ -9,9 +9,9 @@
99
<item name="backups">0</item>
1010
</group>
1111
<group name="windows">
12-
<item id=".::dpp_comp.ino">0,0,1105,479,*</item>
13-
<item id="AOs::Philo::SM">0,0,892,660</item>
14-
<item id="AOs::Table::SM">0,0,1105,543</item>
12+
<item id=".::dpp_comp.ino">0,0,1193,807,*</item>
13+
<item id="AOs::Philo::SM">301,171,892,660</item>
14+
<item id="AOs::Table::SM">0,288,1105,543</item>
1515
</group>
1616
<group name="search">
1717
<item name="options">2032128</item>

‎libraries/qpn_avr/examples/dpp_comp/dpp_comp.ino

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
/*$file${.::dpp_comp.ino} ##################################################*/
1+
/*$file${.::dpp_comp.ino} vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
22
/*
33
* Model: dpp_comp.qm
44
* File: ${.::dpp_comp.ino}
55
*
6-
* This code has been generated by QM 4.4.0 (https://www.state-machine.com/qm).
6+
* This code has been generated by QM 4.5.0 (https://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
@@ -15,7 +15,7 @@
1515
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
1616
* for more details.
1717
*/
18-
/*$endhead${.::dpp_comp.ino} ###############################################*/
18+
/*$endhead${.::dpp_comp.ino} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
1919
#include "qpn.h" // QP-nano framework
2020
#include "Arduino.h" // Arduino API
2121

@@ -38,7 +38,7 @@ enum {
3838

3939
//============================================================================
4040
// declare the Philo components...
41-
/*$declare${AOs::Philo} ####################################################*/
41+
/*$declare${AOs::Philo} vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
4242
/*${AOs::Philo} ............................................................*/
4343
typedef struct Philo {
4444
/* protected: */
@@ -57,10 +57,10 @@ static QState Philo_initial(Philo * const me);
5757
static QState Philo_thinking(Philo * const me);
5858
static QState Philo_hungry(Philo * const me);
5959
static QState Philo_eating(Philo * const me);
60-
/*$enddecl${AOs::Philo} ####################################################*/
60+
/*$enddecl${AOs::Philo} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
6161

6262
// declare all AO classes...
63-
/*$declare${AOs::Table} ####################################################*/
63+
/*$declare${AOs::Table} vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
6464
/*${AOs::Table} ............................................................*/
6565
typedef struct Table {
6666
/* protected: */
@@ -77,11 +77,11 @@ static QState Table_initial(Table * const me);
7777
static QState Table_active(Table * const me);
7878
static QState Table_serving(Table * const me);
7979
static QState Table_paused(Table * const me);
80-
/*$enddecl${AOs::Table} ####################################################*/
81-
/*$declare${AOs::Table_ctor} ###############################################*/
80+
/*$enddecl${AOs::Table} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
81+
/*$declare${AOs::Table_ctor} vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
8282
/*${AOs::Table_ctor} .......................................................*/
8383
static void Table_ctor(void);
84-
/*$enddecl${AOs::Table_ctor} ###############################################*/
84+
/*$enddecl${AOs::Table_ctor} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
8585
//...
8686

8787
// define all AO instances and event queue buffers for them...
@@ -217,13 +217,13 @@ void Q_onAssert(char const Q_ROM * const module, int line) {
217217

218218
//============================================================================
219219
// define the components...
220-
/*$skip${QP_VERSION} #######################################################*/
220+
/*$skip${QP_VERSION} vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
221221
/* Check for the minimum required QP version */
222-
#if (QP_VERSION < 640U) || (QP_VERSION != ((QP_RELEASE^4294967295U) % 0x3E8U))
223-
#error qpn version 6.4.0 or higher required
222+
#if (QP_VERSION < 650U) || (QP_VERSION != ((QP_RELEASE^4294967295U) % 0x3E8U))
223+
#error qpn version 6.5.0 or higher required
224224
#endif
225-
/*$endskip${QP_VERSION} ####################################################*/
226-
/*$define${AOs::Philo} #####################################################*/
225+
/*$endskip${QP_VERSION} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
226+
/*$define${AOs::Philo} vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
227227
/*${AOs::Philo} ............................................................*/
228228
/*${AOs::Philo::ctor} ......................................................*/
229229
static void Philo_ctor(Philo * const me, uint8_t num) {
@@ -336,7 +336,7 @@ static QState Philo_eating(Philo * const me) {
336336
}
337337
return status_;
338338
}
339-
/*$enddef${AOs::Philo} #####################################################*/
339+
/*$enddef${AOs::Philo} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
340340

341341
//============================================================================
342342
// define all AO classes...
@@ -351,7 +351,7 @@ enum {
351351
USED = 1
352352
};
353353

354-
/*$define${AOs::Table} #####################################################*/
354+
/*$define${AOs::Table} vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
355355
/*${AOs::Table} ............................................................*/
356356
/*${AOs::Table::SM} ........................................................*/
357357
static QState Table_initial(Table * const me) {
@@ -580,8 +580,8 @@ static QState Table_paused(Table * const me) {
580580
}
581581
return status_;
582582
}
583-
/*$enddef${AOs::Table} #####################################################*/
584-
/*$define${AOs::Table_ctor} ################################################*/
583+
/*$enddef${AOs::Table} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
584+
/*$define${AOs::Table_ctor} vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv*/
585585
/*${AOs::Table_ctor} .......................................................*/
586586
static void Table_ctor(void) {
587587
uint8_t n;
@@ -594,6 +594,6 @@ static void Table_ctor(void) {
594594
me->isHungry[n] = 0U;
595595
}
596596
}
597-
/*$enddef${AOs::Table_ctor} ################################################*/
597+
/*$enddef${AOs::Table_ctor} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^*/
598598
//...
599599

‎libraries/qpn_avr/examples/pelican/.pelican

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<session version="4.4.0">
2+
<session version="4.5.0">
33
<item name="license">GPL</item>
44
<group name="locked"/>
55
<group name="settings">
@@ -10,7 +10,7 @@
1010
</group>
1111
<group name="windows">
1212
<item id=".::pelican.ino">0,0,800,445</item>
13-
<item id="AOs::Pelican::SM">0,0,1105,542,*</item>
13+
<item id="AOs::Pelican::SM">0,0,1193,807,*</item>
1414
</group>
1515
<group name="search">
1616
<item name="options">4129280</item>

0 commit comments

Comments
 (0)