Skip to content

Commit c852620

Browse files
quantum-leapsquantum-leaps
committed
7.1.2
1 parent b1fefda commit c852620

File tree

15 files changed

+155
-119
lines changed

15 files changed

+155
-119
lines changed

‎3rd_party‎

‎doxygen/snippets/qf_main.c‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
#include "qpc.h"
2+
#include "dpp.h"
3+
#include "bsp.h"
24

35
Q_DEFINE_THIS_FILE
46

@@ -21,10 +23,12 @@ int main(void) {
2123
static QEvt const *l_philoQueueSto[N_PHILO][N_PHILO];
2224
for (uint8_t n = 0U; n < N_PHILO; ++n) {
2325
QACTIVE_START(AO_Philo[n],
24-
Q_PRIO(n + 1U, N_PHILO), /* QF-priority/preemption-threshold */
25-
l_philoQueueSto[n], Q_DIM(l_philoQueueSto[n]),
26-
(void *)0, 0U,
27-
(void *)0);
26+
Q_PRIO(n + 1U, N_PHILO), /* QF-priority/preemption-threshold */
27+
l_philoQueueSto[n], /* event queue storage */
28+
Q_DIM(l_philoQueueSto[n]),/* event queue length [events] */
29+
(void *)0, /* stack storage (not used) */
30+
0U, /* stack size [bytes] (not used) */
31+
(void *)0); /* initialization parameter (not used) */
2832
}
2933

3034
Table_ctor(); /* instantiate the Table active object */

‎doxygen/snippets/qxk_start.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ int main() {
1616
/* start the active objects (basic threads)... */
1717
Table_ctor(); /* instantiate the Table AO */
1818
QACTIVE_START(AO_Table, /* AO to start */
19-
Q_PRIO(n + 1U, N_PHILO), /* QF-priority/preemption-threshold */
19+
n + 1U, /* QF-priority */
2020
tableQueueSto, /* event queue storage */
2121
Q_DIM(tableQueueSto), /* queue length [events] */
2222
tableStackSto, /* stack storage */
@@ -27,7 +27,7 @@ int main() {
2727
/* start the extended-threads... */
2828
Test_ctor(); /* instantiate the Test extended thread */
2929
QXTHREAD_START(XT_Test, /* Thread to start */
30-
10U, /* QF-priority/preemption-threshold */
30+
10U, /* QF-priority */
3131
testQueueSto, /* message queue storage */
3232
Q_DIM(testQueueSto), /* message length [events] */
3333
testStackSto, /* stack storage */

‎examples/arm-cm/dpp_efm32-slstk3401a/qv/main.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*****************************************************************************
22
* Product: DPP example
3-
* Last updated for version 7.1.1
3+
* Last updated for version 7.1.2
44
* Last updated on 2022-09-22
55
*
66
* Q u a n t u m L e a P s
@@ -71,7 +71,7 @@ int main() {
7171
for (uint8_t n = 0U; n < N_PHILO; ++n) {
7272
Philo_ctor(n); /* instantiate Philo[n] AO */
7373
QACTIVE_START(AO_Philo[n], /* AO to start */
74-
Q_PRIO(n + 2U, N_PHILO + 1U),/* QF-priority/preemption-thre. */
74+
n + 2U, /* QF-priority */
7575
philoQueueSto[n], /* event queue storage */
7676
Q_DIM(philoQueueSto[n]), /* queue length [events] */
7777
(void *)0, /* stack storage (not used) */
@@ -81,7 +81,7 @@ int main() {
8181

8282
Table_ctor(); /* instantiate the Table active object */
8383
QACTIVE_START(AO_Table, /* AO to start */
84-
N_PHILO + 2U, /* QF-priority/preemption-thre. */
84+
N_PHILO + 2U, /* QF-priority */
8585
tableQueueSto, /* event queue storage */
8686
Q_DIM(tableQueueSto), /* queue length [events] */
8787
(void *)0, /* stack storage (not used) */

‎examples/arm-cm/dpp_efm32-slstk3401a/qxk/bsp.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,8 @@ void BSP_init(void) {
206206
QS_USR_DICTIONARY(CONTEXT_SW);
207207
QS_USR_DICTIONARY(COMMAND_STAT);
208208

209+
QS_FUN_DICTIONARY(&QHsm_top);
210+
209211
/* setup the QS filters... */
210212
QS_GLB_FILTER(QS_ALL_RECORDS); /* all records */
211213
QS_GLB_FILTER(-QS_QF_TICK); /* exclude the clock tick */

‎examples/arm-cm/dpp_efm32-slstk3401a/win32-gui/main.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* Product: DPP example for Windows
3-
* Last updated for version 7.1.1
4-
* Last updated on 2022-09-22
3+
* Last updated for version 7.1.2
4+
* Last updated on 2022-10-06
55
*
66
* Q u a n t u m L e a P s
77
* ------------------------
@@ -71,15 +71,15 @@ int main() {
7171
/* start the active objects... */
7272
for (n = 0U; n < N_PHILO; ++n) {
7373
QACTIVE_START(AO_Philo[n], /* AO to start */
74-
Q_PRIO(n + 1U, N_PHILO), /* QF-priority/preemption-thre. */
74+
n + 1U, /* QF-priority */
7575
philoQueueSto[n], /* event queue storage */
7676
Q_DIM(philoQueueSto[n]), /* queue length [events] */
7777
(void *)0, /* stack storage (not used) */
7878
0U, /* size of the stack [bytes] */
7979
(void *)0); /* initialization param */
8080
}
8181
QACTIVE_START(AO_Table, /* AO to start */
82-
N_PHILO + 1U, /* QF-priority/preemption-thre. */
82+
N_PHILO + 1U, /* QF-priority */
8383
tableQueueSto, /* event queue storage */
8484
Q_DIM(tableQueueSto), /* queue length [events] */
8585
(void *)0, /* stack storage (not used) */

‎examples/arm-cm/dpp_ek-tm4c123gxl/qv/main.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* Product: DPP example
33
* Last updated for version 7.1.2
4-
* Last updated on 2022-09-22
4+
* Last updated on 2022-10-06
55
*
66
* Q u a n t u m L e a P s
77
* ------------------------
@@ -65,7 +65,7 @@ int main() {
6565
Philo_ctor(); /* instantiate all Philosopher active objects */
6666
for (uint8_t n = 0U; n < N_PHILO; ++n) {
6767
QACTIVE_START(AO_Philo[n], /* AO to start */
68-
Q_PRIO(n + 2U, N_PHILO + 1U), /* QF-prio/pre-thre. */
68+
n + 2U, /* QF-priority */
6969
philoQueueSto[n], /* event queue storage */
7070
Q_DIM(philoQueueSto[n]), /* queue length [events] */
7171
(void *)0, /* stack storage (not used) */
@@ -75,7 +75,7 @@ int main() {
7575

7676
Table_ctor(); /* instantiate the Table active object */
7777
QACTIVE_START(AO_Table, /* AO to start */
78-
N_PHILO + 2U, /* QF-prio/pre-thre. */
78+
N_PHILO + 2U, /* QF-priority */
7979
tableQueueSto, /* event queue storage */
8080
Q_DIM(tableQueueSto), /* queue length [events] */
8181
(void *)0, /* stack storage (not used) */

‎examples/arm-cm/dpp_mbed-lpc1768/main.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* Product: DPP example
3-
* Last updated for version 7.1.1
4-
* Last updated on 2022-09-22
3+
* Last updated for version 7.1.2
4+
* Last updated on 2022-10-06
55
*
66
* Q u a n t u m L e a P s
77
* ------------------------
@@ -68,15 +68,15 @@ int main() {
6868
/* start the active objects... */
6969
for (n = 0U; n < N_PHILO; ++n) {
7070
QACTIVE_START(AO_Philo[n], /* AO to start */
71-
Q_PRIO(n + 1U, N_PHILO), /* QF-prio/pre-thre. */
71+
n + 1U, /* QF-priority */
7272
philoQueueSto[n], /* event queue storage */
7373
Q_DIM(philoQueueSto[n]), /* queue length [events] */
7474
(void *)0, /* stack storage (not used) */
7575
0U, /* size of the stack [bytes] */
7676
(void *)0); /* initialization param */
7777
}
7878
QACTIVE_START(AO_Table, /* AO to start */
79-
N_PHILO + 1U, /* QF-prio/pre-thre. */
79+
N_PHILO + 1U, /* QF-priority */
8080
tableQueueSto, /* event queue storage */
8181
Q_DIM(tableQueueSto), /* queue length [events] */
8282
(void *)0, /* stack storage (not used) */

‎examples/arm-cm/dpp_nucleo-l053r8/qv/main.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* Product: DPP example
3-
* Last updated for version 7.1.1
4-
* Last updated on 2022-09-22
3+
* Last updated for version 7.1.2
4+
* Last updated on 2022-10-06
55
*
66
* Q u a n t u m L e a P s
77
* ------------------------
@@ -68,15 +68,15 @@ int main() {
6868
/* start the active objects... */
6969
for (n = 0U; n < N_PHILO; ++n) {
7070
QACTIVE_START(AO_Philo[n], /* AO to start */
71-
Q_PRIO(n + 1U, N_PHILO), /* QF-prio/pre-thre. */
71+
n + 1U, /* QF-priority */
7272
philoQueueSto[n], /* event queue storage */
7373
Q_DIM(philoQueueSto[n]), /* queue length [events] */
7474
(void *)0, /* stack storage (not used) */
7575
0U, /* size of the stack [bytes] */
7676
(void *)0); /* initialization param */
7777
}
7878
QACTIVE_START(AO_Table, /* AO to start */
79-
N_PHILO + 1U, /* QF-prio/pre-thre. */
79+
N_PHILO + 1U, /* QF-priority */
8080
tableQueueSto, /* event queue storage */
8181
Q_DIM(tableQueueSto), /* queue length [events] */
8282
(void *)0, /* stack storage (not used) */

‎examples/arm-cm/dpp_nucleo-l152re/qv/main.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*****************************************************************************
22
* Product: DPP example
3-
* Last updated for version 7.1.1
4-
* Last updated on 2022-09-22
3+
* Last updated for version 7.1.2
4+
* Last updated on 2022-10-06
55
*
66
* Q u a n t u m L e a P s
77
* ------------------------
@@ -68,15 +68,15 @@ int main() {
6868
/* start the active objects... */
6969
for (n = 0U; n < N_PHILO; ++n) {
7070
QACTIVE_START(AO_Philo[n], /* AO to start */
71-
Q_PRIO(n + 1U, N_PHILO), /* QF-prio/pre-thre. */
71+
n + 1U, /* QF-priority */
7272
philoQueueSto[n], /* event queue storage */
7373
Q_DIM(philoQueueSto[n]), /* queue length [events] */
7474
(void *)0, /* stack storage (not used) */
7575
0U, /* size of the stack [bytes] */
7676
(void *)0); /* initialization param */
7777
}
7878
QACTIVE_START(AO_Table, /* AO to start */
79-
N_PHILO + 1U, /* QF-prio/pre-thre. */
79+
N_PHILO + 1U, /* QF-priority */
8080
tableQueueSto, /* event queue storage */
8181
Q_DIM(tableQueueSto), /* queue length [events] */
8282
(void *)0, /* stack storage (not used) */

0 commit comments

Comments
 (0)