Skip to content

Commit 61b14ec

Browse files
fpistmfpistm
authored
Merge pull request #1030 from fpistm/CleanUpRelease
Unified some Generic variant definition and update CI configuration
2 parents 088081d + 6942f69 commit 61b14ec

File tree

11 files changed

+184
-123
lines changed

11 files changed

+184
-123
lines changed

‎CI/build/arduino-cli.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -492,10 +492,11 @@ def check_status(status, build_conf, boardKo):
492492
elif status[1] == 1:
493493
# Check if failed due to a region overflowed
494494
logFile = os.path.join(build_conf[3], sketch_name + ".log")
495-
error_pattern = re.compile(":\\d+:\\d+:\\serror:\\s")
495+
# error or fatal error
496+
error_pattern = re.compile(r":\d+:\d+:\s.*error:\s")
496497
ld_pattern = re.compile("arm-none-eabi/bin/ld:")
497498
overflow_pattern = re.compile(
498-
"will not fit in region|region .+ overflowed by [\\d]+ bytes"
499+
r"will not fit in region|region .+ overflowed by [\d]+ bytes"
499500
)
500501
error_found = False
501502
for i, line in enumerate(open(logFile)):

‎CI/build/conf/cores_config.json‎

Lines changed: 56 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,56 @@
2323
],
2424
"sketches": [
2525
{
26+
"comment": "By default, ignore all those boards",
27+
"pattern": "^.*$",
28+
"applicable": false,
29+
"boards": [
30+
"AFROFLIGHT_F103CB_12M",
31+
"BLACKPILL_F103CB",
32+
"BLACK_F407VG",
33+
"BLACK_F407ZE",
34+
"BLACK_F407ZG",
35+
"BLUEPILL_F103C6",
36+
"BLUEPILL_F103CB",
37+
"DEMO_F030F4_16M",
38+
"DEMO_F030F4_HSI",
39+
"Generic_F103R8T6",
40+
"Generic_F103RBT6",
41+
"Generic_F103RCT6",
42+
"Generic_F103ZC",
43+
"Generic_F103ZD",
44+
"Generic_F103ZE",
45+
"Generic_F103ZF",
46+
"Generic_F401CB",
47+
"Generic_F401CC",
48+
"Generic_F401CD",
49+
"Generic_F401RB",
50+
"Generic_F401RC",
51+
"Generic_F401RD",
52+
"Generic_F405RG",
53+
"Generic_F407VE",
54+
"Generic_F410C8",
55+
"Generic_F410R8",
56+
"Generic_F411CC",
57+
"Generic_F411RE",
58+
"Generic_F412CE",
59+
"Generic_F412RE",
60+
"Generic_F413CG",
61+
"Generic_F413RG",
62+
"Generic_F417VE",
63+
"Generic_F423CH",
64+
"Generic_F446RC",
65+
"NUCLEO_H743ZI",
66+
"NUCLEO_L496ZG",
67+
"NUCLEO_L4R5ZI",
68+
"RAK811_TRACKERA"
69+
]
70+
},
71+
{
72+
"comment": "Ignore also those boards except for BareMinimum",
2673
"pattern": "^((?!BareMinimum).)*$",
2774
"applicable": false,
28-
"boards": [ "DEMO_F030F4", "DEMO_F030F4_16M", "DEMO_F030F4_HSI", "RHF76_052" ]
75+
"boards": [ "DEMO_F030F4", "RHF76_052" ]
2976
},
3077
{
3178
"pattern": "DISCO_IOT_|M24SR64-Y|MX25R6435F",
@@ -52,13 +99,9 @@
5299
"applicable": false,
53100
"boards": [
54101
"AFROFLIGHT_F103CB",
55-
"AFROFLIGHT_F103CB_12M",
56102
"ARMED_V1",
57103
"BLUE_F407VE_Mini",
58104
"BLACKPILL_F103C8",
59-
"BLACKPILL_F103CB",
60-
"BLUEPILL_F103C6",
61-
"BLUEPILL_F103C8",
62105
"BLUEPILL_F103CB",
63106
"BLACKPILL_F303CC",
64107
"BLACKPILL_F401CC",
@@ -67,9 +110,6 @@
67110
"EEXTR_F030_V1",
68111
"ELEKTOR_F072C8",
69112
"FEATHER_F405",
70-
"Generic_F103R8T6",
71-
"Generic_F103RBT6",
72-
"Generic_F103RCT6",
73113
"Generic_F103RET6",
74114
"HY_TinySTM103TB",
75115
"MALYANM200_F070CB",
@@ -85,7 +125,6 @@
85125
"PRNTR_V2",
86126
"RUMBA32",
87127
"RAK811_TRACKER",
88-
"RAK811_TRACKERA",
89128
"REMRAM_V1",
90129
"Sparky_V1",
91130
"Wraith32_V1"
@@ -105,14 +144,14 @@
105144
"pattern": "Firmata/",
106145
"applicable": false,
107146
"boards": [
108-
"BLUEPILL_F103C6", "EEXTR_F030_V1", "ELEKTOR_F072C8", "MALYANM200_F103CB",
109-
"PX_HER0", "STEVAL_MKSBOX1V1", "VAKE_F446VE", "Wraith32_V1"
147+
"EEXTR_F030_V1", "ELEKTOR_F072C8", "FYSETC_S6", "MALYANM200_F103CB",
148+
"PRNTR_V2", "PX_HER0", "STEVAL_MKSBOX1V1", "VAKE_F446VE", "Wraith32_V1"
110149
]
111150
},
112151
{
113152
"pattern": "Blink(WithoutDelay)?",
114153
"applicable": false,
115-
"boards": [ "EEXTR_F030_V1", "MALYANM200_F103CB", "PRNTR_V2" ]
154+
"boards": [ "EEXTR_F030_V1", "FYSETC_S6", "MALYANM200_F103CB", "PRNTR_V2" ]
116155
},
117156
{
118157
"pattern": "STM32SD",
@@ -123,7 +162,7 @@
123162
"pattern": "Ethernet/|STM32FreeRTOS",
124163
"applicable": false,
125164
"boards": [
126-
"BLUEPILL_F103C6", "EEXTR_F030_V1", "MALYANM200_F103CB", "NUCLEO_F030R8",
165+
"EEXTR_F030_V1", "FYSETC_S6", "MALYANM200_F103CB", "NUCLEO_F030R8",
127166
"NUCLEO_L031K6", "PRNTR_V2" ]
128167
},
129168
{
@@ -152,22 +191,15 @@
152191
"applicable": false,
153192
"boards": [
154193
"AFROFLIGHT_F103CB",
155-
"AFROFLIGHT_F103CB_12M",
156194
"ARMED_V1",
157195
"BLACKPILL_F103C8",
158-
"BLACKPILL_F103CB",
159-
"BLUEPILL_F103C6",
160196
"BLUEPILL_F103C8",
161-
"BLUEPILL_F103CB",
162197
"BLACKPILL_F303CC",
163198
"BLACKPILL_F401CC",
164199
"BLUE_F407VE_Mini",
165200
"CoreBoard_F401RC",
166201
"DIYMORE_F407VGT",
167202
"EEXTR_F030_V1",
168-
"Generic_F103R8T6",
169-
"Generic_F103RBT6",
170-
"Generic_F103RCT6",
171203
"Generic_F103RET6",
172204
"HY_TinySTM103TB",
173205
"MALYANM200_F070CB",
@@ -198,16 +230,15 @@
198230
"applicable": false,
199231
"boards": [
200232
"ARMED_V1",
201-
"BLUEPILL_F103C6",
202233
"EEXTR_F030_V1",
203234
"ELEKTOR_F072C8",
204235
"FEATHER_F405",
236+
"FYSETC_S6",
205237
"MALYANM200_F103CB",
206238
"NUCLEO_L031K6",
207239
"PRNTR_V2",
208240
"PX_HER0",
209241
"RAK811_TRACKER",
210-
"RAK811_TRACKERA",
211242
"REMRAM_V1",
212243
"STEVAL_MKSBOX1V1",
213244
"THUNDERPACK_F411",
@@ -223,7 +254,6 @@
223254
"EEXTR_F030_V1",
224255
"PX_HER0",
225256
"RAK811_TRACKER",
226-
"RAK811_TRACKERA",
227257
"REMRAM_V1",
228258
"STEVAL_MKSBOX1V1",
229259
"THUNDERPACK_F411",
@@ -237,19 +267,18 @@
237267
"ARMED_V1",
238268
"EEXTR_F030_V1",
239269
"RAK811_TRACKER",
240-
"RAK811_TRACKERA",
241270
"STEVAL_MKSBOX1V1"
242271
]
243272
},
244273
{
245274
"pattern": "SerialLoop|Tests_basic_functions",
246275
"applicable": false,
247-
"boards": [ "BLUEPILL_F103C6", "NUCLEO_L031K6", "Wraith32_V1" ]
276+
"boards": [ "NUCLEO_L031K6", "Wraith32_V1" ]
248277
},
249278
{
250279
"pattern": "(Alarm)?TimedWak(e)?up|SerialDeepSleep",
251280
"applicable": false,
252-
"boards": [ "EEXTR_F030_V1", "MALYANM200_F103CB", "PRNTR_V2", "STEVAL_MKSBOX1V1" ]
281+
"boards": [ "EEXTR_F030_V1", "FYSETC_S6", "MALYANM200_F103CB", "PRNTR_V2", "STEVAL_MKSBOX1V1" ]
253282
},
254283
{
255284
"pattern": "ArduinoISP",
@@ -278,8 +307,7 @@
278307
"pattern": "PWM_FullConfiguration",
279308
"applicable": false,
280309
"boards": [
281-
"GENERIC_F401RB", "GENERIC_F401RC", "GENERIC_F401RD", "GENERIC_F401RE",
282-
"HY_TinySTM103TB", "THUNDERPACK_F411", "THUNDERPACK_L072"
310+
"GENERIC_F401RE", "HY_TinySTM103TB", "THUNDERPACK_F411", "THUNDERPACK_L072"
283311
]
284312
},
285313
{

‎CI/build/conf/cores_config_ci.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
"BLUEPILL_F103C6",
3535
"BLUEPILL_F103CB",
3636
"DEMO_F030F4_16M",
37+
"DEMO_F030F4_HSI",
3738
"Generic_F103R8T6",
3839
"Generic_F103RBT6",
3940
"Generic_F103RCT6",
@@ -47,6 +48,7 @@
4748
"Generic_F401RB",
4849
"Generic_F401RC",
4950
"Generic_F401RD",
51+
"Generic_F405RG",
5052
"Generic_F407VE",
5153
"Generic_F410C8",
5254
"Generic_F410R8",

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
116116
| :---: | --- | :---: | :--- |
117117
| :green_heart: | [BluePill F103C(6-8-B)](https://stm32-base.org/boards/STM32F103C8T6-Blue-Pill) | *1.2.0* | USB CDC support since *1.5.0*, Maple bootloaders support since *1.6.0* |
118118
| :green_heart: | [BlackPill F103C(8-B)](https://stm32-base.org/boards/STM32F103C8T6-Black-Pill) | *1.5.0* | |
119-
| :green_heart: | [Generic F103R(8-B-C-E)T6](https://stm32-base.org/boards/STM32F103RET6-Generic-Board) | *1.7.0* | Blue Button |
119+
| :green_heart: | [Generic F103R(8-B-C-E)T6](https://stm32-base.org/boards/STM32F103RET6-Generic-Board) | *1.7.0* | |
120120
| :yellow_heart: | Generic F103Z(C-D-E-F-G) | **1.9.0** | |
121121
| :green_heart: | HY-TinySTM103T | *1.5.0* | |
122122
| :green_heart: | MapleMini F103CB | *1.2.0* | USB CDC support since *1.5.0*, Maple bootloaders support since *1.6.0* |

‎boards.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -873,29 +873,29 @@ GenF1.menu.pnum.BLACKPILL_F103CB.build.board=BLACKPILL_F103CB
873873
GenF1.menu.pnum.BLACKPILL_F103CB.build.product_line=STM32F103xB
874874
GenF1.menu.pnum.BLACKPILL_F103CB.build.variant=PILL_F103XX
875875

876-
# Generic STM32F103Rx boards (Blue button)
877-
GenF1.menu.pnum.Generic_F103R8T6=Generic F103R8T6 (Blue Button)
876+
# Generic STM32F103Rx boards
877+
GenF1.menu.pnum.Generic_F103R8T6=Generic F103R8T6
878878
GenF1.menu.pnum.Generic_F103R8T6.upload.maximum_size=65536
879879
GenF1.menu.pnum.Generic_F103R8T6.upload.maximum_data_size=20480
880880
GenF1.menu.pnum.Generic_F103R8T6.build.board=GENERIC_F103R8T6
881881
GenF1.menu.pnum.Generic_F103R8T6.build.product_line=STM32F103xB
882882
GenF1.menu.pnum.Generic_F103R8T6.build.variant=Generic_F103Rx
883883

884-
GenF1.menu.pnum.Generic_F103RBT6=Generic F103RBT6 (Blue Button)
884+
GenF1.menu.pnum.Generic_F103RBT6=Generic F103RBT6
885885
GenF1.menu.pnum.Generic_F103RBT6.upload.maximum_size=131072
886886
GenF1.menu.pnum.Generic_F103RBT6.upload.maximum_data_size=20480
887887
GenF1.menu.pnum.Generic_F103RBT6.build.board=GENERIC_F103RBT6
888888
GenF1.menu.pnum.Generic_F103RBT6.build.product_line=STM32F103xB
889889
GenF1.menu.pnum.Generic_F103RBT6.build.variant=Generic_F103Rx
890890

891-
GenF1.menu.pnum.Generic_F103RCT6=Generic F103RCT6 (Blue Button)
891+
GenF1.menu.pnum.Generic_F103RCT6=Generic F103RCT6
892892
GenF1.menu.pnum.Generic_F103RCT6.upload.maximum_size=262144
893893
GenF1.menu.pnum.Generic_F103RCT6.upload.maximum_data_size=49152
894894
GenF1.menu.pnum.Generic_F103RCT6.build.board=GENERIC_F103RCT6
895895
GenF1.menu.pnum.Generic_F103RCT6.build.product_line=STM32F103xE
896896
GenF1.menu.pnum.Generic_F103RCT6.build.variant=Generic_F103Rx
897897

898-
GenF1.menu.pnum.Generic_F103RET6=Generic F103RET6 (Blue Button)
898+
GenF1.menu.pnum.Generic_F103RET6=Generic F103RET6
899899
GenF1.menu.pnum.Generic_F103RET6.upload.maximum_size=524288
900900
GenF1.menu.pnum.Generic_F103RET6.upload.maximum_data_size=65536
901901
GenF1.menu.pnum.Generic_F103RET6.build.board=GENERIC_F103RET6

‎variants/BLACK_F407XX/variant.h‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -290,15 +290,9 @@ extern "C" {
290290

291291
// UART Definitions
292292
// Define here Serial instance number to map on Serial generic name
293-
#define SERIAL_UART_INSTANCE 1 //ex: 2 for Serial2 (USART2)
294-
// DEBUG_UART could be redefined to print on another instance than 'Serial'
295-
//#define DEBUG_UART ((USART_TypeDef *) U(S)ARTX) // ex: USART3
296-
// DEBUG_UART baudrate, default: 9600 if not defined
297-
//#define DEBUG_UART_BAUDRATE x
298-
// DEBUG_UART Tx pin name, default: the first one found in PinMap_UART_TX for DEBUG_UART
299-
//#define DEBUG_PINNAME_TX PX_n // PinName used for TX
293+
#define SERIAL_UART_INSTANCE 1
300294

301-
// Default pin used for 'Serial' instance (ex: ST-Link)
295+
// Default pin used for 'Serial' instance
302296
// Mandatory for Firmata
303297
#define PIN_SERIAL_RX PA10
304298
#define PIN_SERIAL_TX PA9

‎variants/Generic_F103Rx/variant.cpp‎

Lines changed: 40 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,14 @@ extern "C" {
2323
#endif
2424

2525
const PinName digitalPin[] = {
26+
PA_0,
27+
PA_1,
28+
PA_2,
29+
PA_3,
30+
PA_4,
31+
PA_5,
32+
PA_6,
33+
PA_7,
2634
PA_8,
2735
PA_9, // RXD
2836
PA_10, // TXD
@@ -31,6 +39,8 @@ const PinName digitalPin[] = {
3139
PA_13, // JTDI
3240
PA_14, // JTCK
3341
PA_15,
42+
PB_0,
43+
PB_1,
3444
PB_2,
3545
PB_3, // JTDO
3646
PB_4, // JTRST
@@ -45,6 +55,12 @@ const PinName digitalPin[] = {
4555
PB_13,
4656
PB_14,
4757
PB_15,
58+
PC_0,
59+
PC_1,
60+
PC_2,
61+
PC_3,
62+
PC_4,
63+
PC_5,
4864
PC_6,
4965
PC_7,
5066
PC_8,
@@ -53,28 +69,31 @@ const PinName digitalPin[] = {
5369
PC_11,
5470
PC_12,
5571
PC_13,
56-
NC, // PC_14 OSC32_1
57-
NC, // PC_15 OSC32_2
58-
NC, // PD_0 OSCIN
59-
NC, // PD_1 OSCOUT
60-
PD_2,
72+
PC_14, // OSC32_1
73+
PC_15, // OSC32_2
74+
PD_0, // OSCIN
75+
PD_1, // OSCOUT
76+
PD_2
77+
};
6178

62-
PA_0,
63-
PA_1,
64-
PA_2,
65-
PA_3,
66-
PA_4,
67-
PA_5,
68-
PA_6,
69-
PA_7,
70-
PB_0,
71-
PB_1,
72-
PC_0,
73-
PC_1,
74-
PC_2,
75-
PC_3,
76-
PC_4,
77-
PC_5
79+
// Analog (Ax) pin number array
80+
const uint32_t analogInputPin[] = {
81+
0, // A0, PA0
82+
1, // A1, PA1
83+
2, // A2, PA2
84+
3, // A3, PA3
85+
4, // A4, PA4
86+
5, // A5, PA5
87+
6, // A6, PA6
88+
7, // A7, PA7
89+
16, // A8, PB0
90+
17, // A9, PB1
91+
32, // A10, PC0
92+
33, // A11, PC1
93+
34, // A12, PC2
94+
35, // A13, PC3
95+
36, // A14, PC4
96+
37 // A15, PC5
7897
};
7998

8099
#ifdef __cplusplus

0 commit comments

Comments
 (0)