Skip to content

Commit b5bdbea

Browse files
quantum-leapsquantum-leaps
committed
2.0.1
2.0.1 2.0.1 changed STM32 GPIO code in BSPs
1 parent 54a4cd3 commit b5bdbea

File tree

12 files changed

+142
-590
lines changed

12 files changed

+142
-590
lines changed

‎README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
[![Quantum Leaps](https://www.state-machine.com/attachments/logo_ql_400.png)](https://www.state-machine.com)
33
<hr>
44

5-
[![GitHub release (latest by date)](https://img.shields.io/github/v/release/QuantumLeaps/Super-Simple-Tasker)](https://github.com/QuantumLeaps/ET/releases/latest)
6-
[![GitHub](https://img.shields.io/github/license/QuantumLeaps/Super-Simple-Tasker)](https://github.com/QuantumLeaps/Super-Simple-Tasker/blob/master/LICENSE.md)
5+
[![GitHub release (latest by date)](https://img.shields.io/github/v/release/QuantumLeaps/Super-Simple-Tasker)](https://github.com/QuantumLeaps/Super-Simple-Tasker/releases/latest)
6+
[![GitHub](https://img.shields.io/github/license/QuantumLeaps/Super-Simple-Tasker)](https://github.com/QuantumLeaps/Super-Simple-Tasker/blob/master/LICENSE)
77

88
# Super-Simple Tasker (SST)
99
Super-Simple Tasker (SST) is an event-driven, preemptive, priority-based

‎img/blinky_button.pvs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
[General]
2+
decode_signals=0
3+
generated_signals=0
4+
views=1
5+
meta_objs=1
6+
17
[D0]
28
name=PB1
39
enabled=true
@@ -6,7 +12,7 @@ conversion_type=0
612
conv_options=0
713

814
[D1]
9-
name=ISR
15+
name=SysTick
1016
enabled=true
1117
color=4287582722
1218
conversion_type=0
@@ -54,18 +60,12 @@ color=4285878395
5460
conversion_type=0
5561
conv_options=0
5662

57-
[General]
58-
decode_signals=0
59-
generated_signals=0
60-
views=1
61-
meta_objs=1
62-
6363
[view0]
64-
scale=2.5453064548971696e-5
65-
v_offset=-10
66-
splitter_state=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\0^\0\0\x6W\x1\0\0\0\x1\x1\0\0\0\x1\0)
64+
scale=3.183091418385535e-5
65+
v_offset=0
66+
splitter_state=@ByteArray(\0\0\0\xff\0\0\0\x1\0\0\0\x2\0\0\0^\0\0\x5.\x1\0\0\0\x1\x1\0\0\0\x1\0)
6767
segment_display_mode=3
68-
offset=22 serialization::archive 14 0 0 0 0 0 0 0 0 0 0 0 0 0 6
68+
offset=22 serialization::archive 14 0 0 0 0 416495 94118729 95485619 43701371 90132099 12637656 -8 0 0 6
6969
zero_offset=22 serialization::archive 14 0 0 0 0 0 0 0 0 0 0 0 0 0 6
7070
D0\trace_height=80
7171
D1\trace_height=80
@@ -79,5 +79,5 @@ D7\trace_height=80
7979
[meta_obj0]
8080
type=selection
8181
assoc_view=0
82-
start_time=22 serialization::archive 14 0 0 0 0 1666404 16666666 67279583 79112806 14207498 32936046 -8 0 0 6
83-
end_time=22 serialization::archive 14 0 0 0 0 1667245 83333333 34268289 14980433 18279087 18666778 -8 0 0 6
82+
start_time=22 serialization::archive 14 0 0 0 0 1146079 16666666 66002716 29050666 88836086 13335114 -8 0 0 6
83+
end_time=22 serialization::archive 14 0 0 0 0 1146558 33333333 32835546 33652556 73124920 20470248 -8 0 0 6

‎sst0_c/examples/blinky_button/bsp_nucleo-h743zi.c

Lines changed: 12 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -146,103 +146,51 @@ static void exerciseFPU(double x) {
146146

147147
/*..........................................................................*/
148148
void BSP_d1on(void) { /* LED1-Green */
149-
SST_PORT_CRIT_STAT
150-
SST_PORT_CRIT_ENTRY();
151-
GPIOB->BSRR |= (1U << TST1_PIN);
152-
SST_PORT_CRIT_EXIT();
149+
GPIOB->BSRR = (1U << TST1_PIN);
153150
/* don't use the FPU in the ISR */
154151
}
155152
void BSP_d1off(void) {
156-
SST_PORT_CRIT_STAT
157-
SST_PORT_CRIT_ENTRY();
158-
GPIOB->BSRR |= (1U << (TST1_PIN + 16U));
159-
SST_PORT_CRIT_EXIT();
160-
/* don't use the FPU in the ISR */
153+
GPIOB->BSRR = (1U << (TST1_PIN + 16U));
161154
}
162155
/*..........................................................................*/
163156
void BSP_d2on(void) { /* LED3-Red */
164-
SST_PORT_CRIT_STAT
165-
SST_PORT_CRIT_ENTRY();
166-
GPIOB->BSRR |= (1U << TST2_PIN);
167-
SST_PORT_CRIT_EXIT();
168-
157+
GPIOB->BSRR = (1U << TST2_PIN);
169158
exerciseFPU(-1.2345);
170159
}
171160
void BSP_d2off(void) {
172-
SST_PORT_CRIT_STAT
173-
SST_PORT_CRIT_ENTRY();
174-
GPIOB->BSRR |= (1U << (TST2_PIN + 16U));
175-
SST_PORT_CRIT_EXIT();
176-
177-
exerciseFPU(1.2345);
161+
GPIOB->BSRR = (1U << (TST2_PIN + 16U));
178162
}
179163
/*..........................................................................*/
180164
void BSP_d3on(void) {
181-
SST_PORT_CRIT_STAT
182-
SST_PORT_CRIT_ENTRY();
183-
GPIOB->BSRR |= (1U << TST3_PIN);
184-
SST_PORT_CRIT_EXIT();
185-
165+
GPIOB->BSRR = (1U << TST3_PIN);
186166
exerciseFPU(-12.345);
187167
}
188168
void BSP_d3off(void) {
189-
SST_PORT_CRIT_STAT
190-
SST_PORT_CRIT_ENTRY();
191-
GPIOB->BSRR |= (1U << (TST3_PIN + 16U));
192-
SST_PORT_CRIT_EXIT();
193-
194-
exerciseFPU(12.345);
169+
GPIOB->BSRR = (1U << (TST3_PIN + 16U));
195170
}
196171
/*..........................................................................*/
197172
void BSP_d4on(void) {
198-
SST_PORT_CRIT_STAT
199-
SST_PORT_CRIT_ENTRY();
200-
GPIOB->BSRR |= (1U << TST4_PIN);
201-
SST_PORT_CRIT_EXIT();
202-
173+
GPIOB->BSRR = (1U << TST4_PIN);
203174
exerciseFPU(3.456);
204175
}
205176
void BSP_d4off(void) {
206-
SST_PORT_CRIT_STAT
207-
SST_PORT_CRIT_ENTRY();
208-
GPIOB->BSRR |= (1U << (TST4_PIN + 16U));
209-
SST_PORT_CRIT_EXIT();
210-
211-
exerciseFPU(-3.456);
177+
GPIOB->BSRR = (1U << (TST4_PIN + 16U));
212178
}
213179
/*..........................................................................*/
214180
void BSP_d5on(void) {
215-
SST_PORT_CRIT_STAT
216-
SST_PORT_CRIT_ENTRY();
217-
GPIOB->BSRR |= (1U << TST5_PIN);
218-
SST_PORT_CRIT_EXIT();
219-
181+
GPIOB->BSRR = (1U << TST5_PIN);
220182
exerciseFPU(4.567);
221183
}
222184
void BSP_d5off(void) {
223-
SST_PORT_CRIT_STAT
224-
SST_PORT_CRIT_ENTRY();
225-
GPIOB->BSRR |= (1U << (TST5_PIN + 16U));
226-
SST_PORT_CRIT_EXIT();
227-
228-
exerciseFPU(-4.567);
185+
GPIOB->BSRR = (1U << (TST5_PIN + 16U));
229186
}
230187
/*..........................................................................*/
231188
void BSP_d6on(void) { /* LED2-Blue */
232-
SST_PORT_CRIT_STAT
233-
SST_PORT_CRIT_ENTRY();
234-
GPIOB->BSRR |= (1U << TST6_PIN);
235-
SST_PORT_CRIT_EXIT();
236-
189+
GPIOB->BSRR = (1U << TST6_PIN);
237190
exerciseFPU(1.2345);
238191
}
239192
void BSP_d6off(void) {
240-
SST_PORT_CRIT_STAT
241-
SST_PORT_CRIT_ENTRY();
242-
GPIOB->BSRR |= (1U << (TST6_PIN + 16U));
243-
SST_PORT_CRIT_EXIT();
244-
245-
exerciseFPU(-1.2345);
193+
GPIOB->BSRR = (1U << (TST6_PIN + 16U));
246194
}
247195

248196
/*..........................................................................*/

‎sst0_c/examples/blinky_button/bsp_nucleo-l053r8.c

Lines changed: 12 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -134,83 +134,23 @@ void BSP_init(void) {
134134
}
135135

136136
/*..........................................................................*/
137-
void BSP_d1on(void) {
138-
SST_PORT_CRIT_STAT
139-
SST_PORT_CRIT_ENTRY();
140-
GPIOA->BSRR |= (1U << TST1_PIN);
141-
SST_PORT_CRIT_EXIT();
142-
}
143-
void BSP_d1off(void) {
144-
SST_PORT_CRIT_STAT
145-
SST_PORT_CRIT_ENTRY();
146-
GPIOA->BSRR |= (1U << (TST1_PIN + 16U));
147-
SST_PORT_CRIT_EXIT();
148-
}
137+
void BSP_d1on(void) { GPIOA->BSRR = (1U << TST1_PIN); }
138+
void BSP_d1off(void) { GPIOA->BSRR = (1U << (TST1_PIN + 16U)); }
149139
/*..........................................................................*/
150-
void BSP_d2on(void) {
151-
SST_PORT_CRIT_STAT
152-
SST_PORT_CRIT_ENTRY();
153-
GPIOA->BSRR |= (1U << TST2_PIN);
154-
SST_PORT_CRIT_EXIT();
155-
}
156-
void BSP_d2off(void) {
157-
SST_PORT_CRIT_STAT
158-
SST_PORT_CRIT_ENTRY();
159-
GPIOA->BSRR |= (1U << (TST2_PIN + 16U));
160-
SST_PORT_CRIT_EXIT();
161-
}
140+
void BSP_d2on(void) { GPIOA->BSRR = (1U << TST2_PIN); }
141+
void BSP_d2off(void) { GPIOA->BSRR = (1U << (TST2_PIN + 16U)); }
162142
/*..........................................................................*/
163-
void BSP_d3on(void) {
164-
SST_PORT_CRIT_STAT
165-
SST_PORT_CRIT_ENTRY();
166-
GPIOA->BSRR |= (1U << TST3_PIN);
167-
SST_PORT_CRIT_EXIT();
168-
}
169-
void BSP_d3off(void) {
170-
SST_PORT_CRIT_STAT
171-
SST_PORT_CRIT_ENTRY();
172-
GPIOA->BSRR |= (1U << (TST3_PIN + 16U));
173-
SST_PORT_CRIT_EXIT();
174-
}
143+
void BSP_d3on(void) { GPIOA->BSRR = (1U << TST3_PIN); }
144+
void BSP_d3off(void) { GPIOA->BSRR = (1U << (TST3_PIN + 16U)); }
175145
/*..........................................................................*/
176-
void BSP_d4on(void) {
177-
SST_PORT_CRIT_STAT
178-
SST_PORT_CRIT_ENTRY();
179-
GPIOA->BSRR |= (1U << TST4_PIN);
180-
SST_PORT_CRIT_EXIT();
181-
}
182-
void BSP_d4off(void) {
183-
SST_PORT_CRIT_STAT
184-
SST_PORT_CRIT_ENTRY();
185-
GPIOA->BSRR |= (1U << (TST4_PIN + 16U));
186-
SST_PORT_CRIT_EXIT();
187-
}
146+
void BSP_d4on(void) { GPIOA->BSRR = (1U << TST4_PIN); }
147+
void BSP_d4off(void) { GPIOA->BSRR = (1U << (TST4_PIN + 16U)); }
188148
/*..........................................................................*/
189-
void BSP_d5on(void) {
190-
SST_PORT_CRIT_STAT
191-
SST_PORT_CRIT_ENTRY();
192-
GPIOA->BSRR |= (1U << TST5_PIN);
193-
SST_PORT_CRIT_EXIT();
194-
}
195-
void BSP_d5off(void) {
196-
SST_PORT_CRIT_STAT
197-
SST_PORT_CRIT_ENTRY();
198-
GPIOA->BSRR |= (1U << (TST5_PIN + 16U));
199-
SST_PORT_CRIT_EXIT();
200-
}
149+
void BSP_d5on(void) { GPIOA->BSRR = (1U << TST5_PIN); }
150+
void BSP_d5off(void) { GPIOA->BSRR = (1U << (TST5_PIN + 16U)); }
201151
/*..........................................................................*/
202-
void BSP_d6on(void) { /* LED2 */
203-
SST_PORT_CRIT_STAT
204-
SST_PORT_CRIT_ENTRY();
205-
GPIOA->BSRR |= (1U << TST6_PIN);
206-
SST_PORT_CRIT_EXIT();
207-
}
208-
void BSP_d6off(void) {
209-
SST_PORT_CRIT_STAT
210-
SST_PORT_CRIT_ENTRY();
211-
GPIOA->BSRR |= (1U << (TST6_PIN + 16U));
212-
SST_PORT_CRIT_EXIT();
213-
}
152+
void BSP_d6on(void) { GPIOA->BSRR = (1U << TST6_PIN); } /* LED2 */
153+
void BSP_d6off(void) { GPIOA->BSRR = (1U << (TST6_PIN + 16U)); }
214154

215155
/*..........................................................................*/
216156
SST_Evt const *BSP_getWorkEvtBlinky1(uint8_t num) {

0 commit comments

Comments
 (0)