Skip to content

Commit 8074b6e

Browse files
quantum-leapsquantum-leaps
committed
8.0.3
1 parent a13acda commit 8074b6e

File tree

3 files changed

+184
-202
lines changed

3 files changed

+184
-202
lines changed

‎arm-cm/real-time_nucleo-c031c6/README.md‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ This example implements the "Periodic-Sporadic" application on the STM32 NUCLEO-
99
<b>STM32 NUCLEO-C031C6</b>
1010
</p>
1111

12-
> NOTE<br>
13-
The CPU is specifically clocked very slowly (only at 2 MHz) to better demonstrate all overheads and delays.
14-
1512
<p align="center">
1613
<img src="./real-time_trace.png"/><br>
1714
<b>Logic analyzer trace after pressing the button (QK kernel)</b>

‎posix-win32/calc2/calc2.c‎

Lines changed: 67 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ static QState Calc_ready(Calc * const me, QEvt const * const e);
8080
static QState Calc_result(Calc * const me, QEvt const * const e);
8181
static QState Calc_begin(Calc * const me, QEvt const * const e);
8282
static QState Calc_operand(Calc * const me, QEvt const * const e);
83-
static QState Calc_zero1(Calc * const me, QEvt const * const e);
84-
static QState Calc_int1(Calc * const me, QEvt const * const e);
85-
static QState Calc_frac1(Calc * const me, QEvt const * const e);
86-
static QState Calc_negated1(Calc * const me, QEvt const * const e);
83+
static QState Calc_zero(Calc * const me, QEvt const * const e);
84+
static QState Calc_intg(Calc * const me, QEvt const * const e);
85+
static QState Calc_frac(Calc * const me, QEvt const * const e);
86+
static QState Calc_neg(Calc * const me, QEvt const * const e);
8787
static QState Calc_opEntered(Calc * const me, QEvt const * const e);
8888
static QState Calc_final(Calc * const me, QEvt const * const e);
8989
//$enddecl${SMs::Calc} ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -307,22 +307,22 @@ static QState Calc_ready(Calc * const me, QEvt const * const e) {
307307
//${SMs::Calc::SM::on::ready::DIGIT_0}
308308
case DIGIT_0_SIG: {
309309
BSP_clear();
310-
status_ = Q_TRAN(&Calc_zero1);
310+
status_ = Q_TRAN(&Calc_zero);
311311
break;
312312
}
313313
//${SMs::Calc::SM::on::ready::DIGIT_1_9}
314314
case DIGIT_1_9_SIG: {
315315
BSP_clear();
316316
BSP_insert(Q_EVT_CAST(CalcEvt)->key_code);
317-
status_ = Q_TRAN(&Calc_int1);
317+
status_ = Q_TRAN(&Calc_intg);
318318
break;
319319
}
320320
//${SMs::Calc::SM::on::ready::POINT}
321321
case POINT_SIG: {
322322
BSP_clear();
323323
BSP_insert((int)'0');
324324
BSP_insert((int)'.');
325-
status_ = Q_TRAN(&Calc_frac1);
325+
status_ = Q_TRAN(&Calc_frac);
326326
break;
327327
}
328328
//${SMs::Calc::SM::on::ready::OPER}
@@ -384,7 +384,7 @@ static QState Calc_begin(Calc * const me, QEvt const * const e) {
384384
case OPER_SIG: {
385385
//${SMs::Calc::SM::on::ready::begin::OPER::[e->key=='-']}
386386
if (Q_EVT_CAST(CalcEvt)->key_code == KEY_MINUS) {
387-
status_ = Q_TRAN(&Calc_negated1);
387+
status_ = Q_TRAN(&Calc_neg);
388388
}
389389
//${SMs::Calc::SM::on::ready::begin::OPER::[else]}
390390
else {
@@ -424,7 +424,7 @@ static QState Calc_operand(Calc * const me, QEvt const * const e) {
424424
}
425425
//${SMs::Calc::SM::on::operand::EQUALS}
426426
case EQUALS_SIG: {
427-
//${SMs::Calc::SM::on::operand::EQUALS::[Calc_eval(me,BSP_get_value(),KE~}
427+
//${SMs::Calc::SM::on::operand::EQUALS::[Calc_eval()]}
428428
if (Calc_eval(me, BSP_get_value(), KEY_NULL)) {
429429
status_ = Q_TRAN(&Calc_result);
430430
}
@@ -436,7 +436,7 @@ static QState Calc_operand(Calc * const me, QEvt const * const e) {
436436
}
437437
//${SMs::Calc::SM::on::operand::OPER}
438438
case OPER_SIG: {
439-
//${SMs::Calc::SM::on::operand::OPER::[Calc_eval(me,BSP_get_value(),Q_~}
439+
//${SMs::Calc::SM::on::operand::OPER::[Calc_eval()]}
440440
if (Calc_eval(me, BSP_get_value(), Q_EVT_CAST(CalcEvt)->key_code)) {
441441
status_ = Q_TRAN(&Calc_opEntered);
442442
}
@@ -446,6 +446,24 @@ static QState Calc_operand(Calc * const me, QEvt const * const e) {
446446
}
447447
break;
448448
}
449+
//${SMs::Calc::SM::on::operand::POINT}
450+
case POINT_SIG: {
451+
BSP_insert(Q_EVT_CAST(CalcEvt)->key_code);
452+
status_ = Q_TRAN(&Calc_frac);
453+
break;
454+
}
455+
//${SMs::Calc::SM::on::operand::DIGIT_0}
456+
case DIGIT_0_SIG: {
457+
BSP_insert(Q_EVT_CAST(CalcEvt)->key_code);
458+
status_ = Q_TRAN(&Calc_zero);
459+
break;
460+
}
461+
//${SMs::Calc::SM::on::operand::DIGIT_1_9}
462+
case DIGIT_1_9_SIG: {
463+
BSP_insert(Q_EVT_CAST(CalcEvt)->key_code);
464+
status_ = Q_TRAN(&Calc_intg);
465+
break;
466+
}
449467
default: {
450468
status_ = Q_SUPER(&Calc_on);
451469
break;
@@ -454,39 +472,32 @@ static QState Calc_operand(Calc * const me, QEvt const * const e) {
454472
return status_;
455473
}
456474

457-
//${SMs::Calc::SM::on::operand::zero1} .......................................
458-
static QState Calc_zero1(Calc * const me, QEvt const * const e) {
475+
//${SMs::Calc::SM::on::operand::zero} ........................................
476+
static QState Calc_zero(Calc * const me, QEvt const * const e) {
459477
QState status_;
460478
switch (e->sig) {
461-
//${SMs::Calc::SM::on::operand::zero1}
479+
//${SMs::Calc::SM::on::operand::zero}
462480
case Q_ENTRY_SIG: {
463-
BSP_message("zero1-ENTRY;");
481+
BSP_message("zero-ENTRY;");
464482
status_ = Q_HANDLED();
465483
break;
466484
}
467-
//${SMs::Calc::SM::on::operand::zero1}
485+
//${SMs::Calc::SM::on::operand::zero}
468486
case Q_EXIT_SIG: {
469-
BSP_message("zero1-EXIT;");
487+
BSP_message("zero-EXIT;");
470488
status_ = Q_HANDLED();
471489
break;
472490
}
473-
//${SMs::Calc::SM::on::operand::zero1::DIGIT_0}
491+
//${SMs::Calc::SM::on::operand::zero::DIGIT_0}
474492
case DIGIT_0_SIG: {
475493
;
476494
status_ = Q_HANDLED();
477495
break;
478496
}
479-
//${SMs::Calc::SM::on::operand::zero1::DIGIT_1_9}
497+
//${SMs::Calc::SM::on::operand::zero::DIGIT_1_9}
480498
case DIGIT_1_9_SIG: {
481499
BSP_insert(Q_EVT_CAST(CalcEvt)->key_code);
482-
status_ = Q_TRAN(&Calc_int1);
483-
break;
484-
}
485-
//${SMs::Calc::SM::on::operand::zero1::POINT}
486-
case POINT_SIG: {
487-
BSP_insert((int)'0');
488-
BSP_insert((int)'.');
489-
status_ = Q_TRAN(&Calc_frac1);
500+
status_ = Q_TRAN(&Calc_intg);
490501
break;
491502
}
492503
default: {
@@ -497,29 +508,29 @@ static QState Calc_zero1(Calc * const me, QEvt const * const e) {
497508
return status_;
498509
}
499510

500-
//${SMs::Calc::SM::on::operand::int1} ........................................
501-
static QState Calc_int1(Calc * const me, QEvt const * const e) {
511+
//${SMs::Calc::SM::on::operand::intg} ........................................
512+
static QState Calc_intg(Calc * const me, QEvt const * const e) {
502513
QState status_;
503514
switch (e->sig) {
504-
//${SMs::Calc::SM::on::operand::int1}
515+
//${SMs::Calc::SM::on::operand::intg}
505516
case Q_ENTRY_SIG: {
506-
BSP_message("int1-ENTRY;");
517+
BSP_message("intg-ENTRY;");
507518
status_ = Q_HANDLED();
508519
break;
509520
}
510-
//${SMs::Calc::SM::on::operand::int1}
521+
//${SMs::Calc::SM::on::operand::intg}
511522
case Q_EXIT_SIG: {
512-
BSP_message("int1-EXIT;");
523+
BSP_message("intg-EXIT;");
513524
status_ = Q_HANDLED();
514525
break;
515526
}
516-
//${SMs::Calc::SM::on::operand::int1::POINT}
527+
//${SMs::Calc::SM::on::operand::intg::POINT}
517528
case POINT_SIG: {
518529
BSP_insert((int)'.');
519-
status_ = Q_TRAN(&Calc_frac1);
530+
status_ = Q_TRAN(&Calc_frac);
520531
break;
521532
}
522-
//${SMs::Calc::SM::on::operand::int1::DIGIT_0, DIGIT_1_9}
533+
//${SMs::Calc::SM::on::operand::intg::DIGIT_0, DIGIT_1_9}
523534
case DIGIT_0_SIG: // intentionally fall through
524535
case DIGIT_1_9_SIG: {
525536
BSP_insert(Q_EVT_CAST(CalcEvt)->key_code);
@@ -534,29 +545,29 @@ static QState Calc_int1(Calc * const me, QEvt const * const e) {
534545
return status_;
535546
}
536547

537-
//${SMs::Calc::SM::on::operand::frac1} .......................................
538-
static QState Calc_frac1(Calc * const me, QEvt const * const e) {
548+
//${SMs::Calc::SM::on::operand::frac} ........................................
549+
static QState Calc_frac(Calc * const me, QEvt const * const e) {
539550
QState status_;
540551
switch (e->sig) {
541-
//${SMs::Calc::SM::on::operand::frac1}
552+
//${SMs::Calc::SM::on::operand::frac}
542553
case Q_ENTRY_SIG: {
543-
BSP_message("frac1-ENTRY;");
554+
BSP_message("frac-ENTRY;");
544555
status_ = Q_HANDLED();
545556
break;
546557
}
547-
//${SMs::Calc::SM::on::operand::frac1}
558+
//${SMs::Calc::SM::on::operand::frac}
548559
case Q_EXIT_SIG: {
549-
BSP_message("frac1-EXIT;");
560+
BSP_message("frac-EXIT;");
550561
status_ = Q_HANDLED();
551562
break;
552563
}
553-
//${SMs::Calc::SM::on::operand::frac1::POINT}
564+
//${SMs::Calc::SM::on::operand::frac::POINT}
554565
case POINT_SIG: {
555566
;
556567
status_ = Q_HANDLED();
557568
break;
558569
}
559-
//${SMs::Calc::SM::on::operand::frac1::DIGIT_0, DIGIT_1_9}
570+
//${SMs::Calc::SM::on::operand::frac::DIGIT_0, DIGIT_1_9}
560571
case DIGIT_0_SIG: // intentionally fall through
561572
case DIGIT_1_9_SIG: {
562573
BSP_insert(Q_EVT_CAST(CalcEvt)->key_code);
@@ -571,49 +582,31 @@ static QState Calc_frac1(Calc * const me, QEvt const * const e) {
571582
return status_;
572583
}
573584

574-
//${SMs::Calc::SM::on::operand::negated1} ....................................
575-
static QState Calc_negated1(Calc * const me, QEvt const * const e) {
585+
//${SMs::Calc::SM::on::operand::neg} .........................................
586+
static QState Calc_neg(Calc * const me, QEvt const * const e) {
576587
QState status_;
577588
switch (e->sig) {
578-
//${SMs::Calc::SM::on::operand::negated1}
589+
//${SMs::Calc::SM::on::operand::neg}
579590
case Q_ENTRY_SIG: {
580-
BSP_message("negated1-ENTRY;");
591+
BSP_message("neg-ENTRY;");
581592
BSP_negate();
582593
status_ = Q_HANDLED();
583594
break;
584595
}
585-
//${SMs::Calc::SM::on::operand::negated1}
596+
//${SMs::Calc::SM::on::operand::neg}
586597
case Q_EXIT_SIG: {
587-
BSP_message("negated1-EXIT;");
598+
BSP_message("neg-EXIT;");
588599
status_ = Q_HANDLED();
589600
break;
590601
}
591-
//${SMs::Calc::SM::on::operand::negated1::DIGIT_0}
592-
case DIGIT_0_SIG: {
593-
BSP_insert(Q_EVT_CAST(CalcEvt)->key_code);
594-
status_ = Q_TRAN(&Calc_zero1);
595-
break;
596-
}
597-
//${SMs::Calc::SM::on::operand::negated1::DIGIT_1_9}
598-
case DIGIT_1_9_SIG: {
599-
BSP_insert(Q_EVT_CAST(CalcEvt)->key_code);
600-
status_ = Q_TRAN(&Calc_int1);
601-
break;
602-
}
603-
//${SMs::Calc::SM::on::operand::negated1::POINT}
604-
case POINT_SIG: {
605-
BSP_insert(Q_EVT_CAST(CalcEvt)->key_code);
606-
status_ = Q_TRAN(&Calc_frac1);
607-
break;
608-
}
609-
//${SMs::Calc::SM::on::operand::negated1::OPER}
602+
//${SMs::Calc::SM::on::operand::neg::OPER}
610603
case OPER_SIG: {
611-
//${SMs::Calc::SM::on::operand::negated1::OPER::[e->key=='-']}
604+
//${SMs::Calc::SM::on::operand::neg::OPER::[e->key=='-']}
612605
if (Q_EVT_CAST(CalcEvt)->key_code == KEY_MINUS) {
613606
;
614607
status_ = Q_HANDLED();
615608
}
616-
//${SMs::Calc::SM::on::operand::negated1::OPER::[else]}
609+
//${SMs::Calc::SM::on::operand::neg::OPER::[else]}
617610
else {
618611
status_ = Q_HANDLED();
619612
}
@@ -646,29 +639,29 @@ static QState Calc_opEntered(Calc * const me, QEvt const * const e) {
646639
//${SMs::Calc::SM::on::opEntered::DIGIT_0}
647640
case DIGIT_0_SIG: {
648641
BSP_clear();
649-
status_ = Q_TRAN(&Calc_zero1);
642+
status_ = Q_TRAN(&Calc_zero);
650643
break;
651644
}
652645
//${SMs::Calc::SM::on::opEntered::DIGIT_1_9}
653646
case DIGIT_1_9_SIG: {
654647
BSP_clear();
655648
BSP_insert(Q_EVT_CAST(CalcEvt)->key_code);
656-
status_ = Q_TRAN(&Calc_int1);
649+
status_ = Q_TRAN(&Calc_intg);
657650
break;
658651
}
659652
//${SMs::Calc::SM::on::opEntered::POINT}
660653
case POINT_SIG: {
661654
BSP_clear();
662655
BSP_insert((int)'0');
663656
BSP_insert((int)'.');
664-
status_ = Q_TRAN(&Calc_frac1);
657+
status_ = Q_TRAN(&Calc_frac);
665658
break;
666659
}
667660
//${SMs::Calc::SM::on::opEntered::OPER}
668661
case OPER_SIG: {
669662
//${SMs::Calc::SM::on::opEntered::OPER::[e->key=='-']}
670663
if (Q_EVT_CAST(CalcEvt)->key_code == KEY_MINUS) {
671-
status_ = Q_TRAN(&Calc_negated1);
664+
status_ = Q_TRAN(&Calc_neg);
672665
}
673666
//${SMs::Calc::SM::on::opEntered::OPER::[else]}
674667
else {

0 commit comments

Comments
 (0)