Skip to content

Commit 303762e

Browse files
fpistmfpistm
authored
Merge pull request #1429 from fpistm/STM32WL
Introduce STM32WLxx
2 parents 7332ae2 + d198cba commit 303762e

File tree

308 files changed

+234236
-143
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

308 files changed

+234236
-143
lines changed

‎CI/utils/stm32wrapper.py‎

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import argparse
22
import re
3+
from itertools import groupby
34
from jinja2 import Environment, FileSystemLoader, Template
45
from pathlib import Path
56
from stm32common import createFolder, deleteFolder, genSTM32List
@@ -102,16 +103,29 @@ def checkConfig(arg_core, arg_cmsis):
102103

103104
def printCMSISStartup(log):
104105
filelist = sorted(CMSIS_Device_ST_path.glob("**/startup_*.s"))
106+
filelist = [pth.name for pth in filelist]
105107
if len(filelist):
106108
if log:
107109
print("Number of startup files: {}".format(len(filelist)))
110+
# Some mcu have two startup files
111+
# Ex: WL one for cm0plus and one for cm4
112+
# In that case this is the same value line so add an extra defined
113+
# to use the correct one.
114+
group_startup_list = [
115+
list(g) for _, g in groupby(filelist, lambda x: re.split("_|\\.", x)[1])
116+
]
108117
cmsis_list = []
109-
for fp in filelist:
110-
# File name
111-
fn = fp.name
112-
valueline = re.split("_|\\.", fn)
113-
vline = valueline[1].upper().replace("X", "x")
114-
cmsis_list.append({"vline": vline, "fn": fn})
118+
for fn_list in group_startup_list:
119+
if len(fn_list) == 1:
120+
valueline = re.split("_|\\.", fn_list[0])
121+
vline = valueline[1].upper().replace("X", "x")
122+
cmsis_list.append({"vline": vline, "fn": fn_list[0], "cm": ""})
123+
else:
124+
for fn in fn_list:
125+
valueline = re.split("_|\\.", fn)
126+
vline = valueline[1].upper().replace("X", "x")
127+
cm = valueline[2].upper()
128+
cmsis_list.append({"vline": vline, "fn": fn, "cm": cm})
115129
out_file = open(CMSIS_Startupfile, "w", newline="\n")
116130
out_file.write(stm32_def_build_template.render(cmsis_list=cmsis_list))
117131
out_file.close()

‎CI/utils/templates/stm32_def_build.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
#if !defined(CMSIS_STARTUP_FILE) && !defined(CUSTOM_STARTUP_FILE)
55
{% for cmsis in cmsis_list %}
66
{% if loop.first %}
7-
#if defined({{cmsis.vline}})
7+
#if defined({{ cmsis.vline }})
88
{% else %}
9-
#elif defined({{cmsis.vline}})
9+
#elif defined({{ cmsis.vline }}){{ " && defined(USE_{}_STARTUP_FILE)".format(cmsis.cm) if cmsis.cm }}
1010
{% endif %}
11-
#define CMSIS_STARTUP_FILE "{{cmsis.fn}}"
11+
#define CMSIS_STARTUP_FILE "{{ cmsis.fn }}"
1212
{% endfor %}
1313
#else
1414
#error UNKNOWN CHIP

‎README.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,14 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
407407
| :green_heart: | STM32WB55CC<br>STM32WB55CE<br>STM32WB55CG | Generic Board | *2.0.0* | |
408408
| :green_heart: | STM32WB55RC<br>STM32WB55RE<br>STM32WB55RG | Generic Board | *2.0.0* | |
409409

410+
### Generic STM32WL boards
411+
412+
| Status | Device(s) | Name | Release | Notes |
413+
| :----: | :-------: | ---- | :-----: | :---- |
414+
| :yellow_heart: | STM32WL55JC<br>STM32WL55JC | Generic Board | **2.1.0** | |
415+
| :yellow_heart: | STM32WLE4J8<br>STM32WLE4JB<br>STM32WLE4JC | Generic Board | **2.1.0** | |
416+
| :yellow_heart: | STM32WLE5J8<br>STM32WLE5JB<br>STM32WLE5JC | Generic Board | **2.1.0** | |
417+
410418
### 3D printer boards
411419

412420
| Status | Device(s) | Name | Release | Notes |

‎boards.txt‎

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4975,6 +4975,98 @@ GenWB.menu.upload_method.dfuMethod.upload.protocol=2
49754975
GenWB.menu.upload_method.dfuMethod.upload.options=-g
49764976
GenWB.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
49774977

4978+
################################################################################
4979+
# Generic WL
4980+
GenWL.name=Generic STM32WL series
4981+
4982+
GenWL.build.core=arduino
4983+
GenWL.build.board=GenWL
4984+
GenWL.build.extra_flags=-D{build.product_line} -DUSE_CM4_STARTUP_FILE {build.xSerial}
4985+
GenWL.build.mcu=cortex-m4
4986+
#GenWL.build.flags.fp=-mfpu=fpv4-sp-d16 -mfloat-abi=hard
4987+
GenWL.build.series=STM32WLxx
4988+
GenWL.build.cmsis_lib_gcc=arm_cortexM4lf_math
4989+
4990+
# Generic WL54JCIx
4991+
GenWL.menu.pnum.GENERIC_WL54JCIX=Generic WL54JCIx
4992+
GenWL.menu.pnum.GENERIC_WL54JCIX.upload.maximum_size=262144
4993+
GenWL.menu.pnum.GENERIC_WL54JCIX.upload.maximum_data_size=65536
4994+
GenWL.menu.pnum.GENERIC_WL54JCIX.build.board=GENERIC_WL54JCIX
4995+
GenWL.menu.pnum.GENERIC_WL54JCIX.build.product_line=STM32WL54xx
4996+
GenWL.menu.pnum.GENERIC_WL54JCIX.build.variant=STM32WLxx/WL54JCI_WL55JCI_WLE4J(8-B-C)I_WLE5J(8-B-C)I
4997+
4998+
# Generic WL55JCIx
4999+
GenWL.menu.pnum.GENERIC_WL55JCIX=Generic WL55JCIx
5000+
GenWL.menu.pnum.GENERIC_WL55JCIX.upload.maximum_size=262144
5001+
GenWL.menu.pnum.GENERIC_WL55JCIX.upload.maximum_data_size=65536
5002+
GenWL.menu.pnum.GENERIC_WL55JCIX.build.board=GENERIC_WL55JCIX
5003+
GenWL.menu.pnum.GENERIC_WL55JCIX.build.product_line=STM32WL55xx
5004+
GenWL.menu.pnum.GENERIC_WL55JCIX.build.variant=STM32WLxx/WL54JCI_WL55JCI_WLE4J(8-B-C)I_WLE5J(8-B-C)I
5005+
5006+
# Generic WLE4J8Ix
5007+
GenWL.menu.pnum.GENERIC_WLE4J8IX=Generic WLE4J8Ix
5008+
GenWL.menu.pnum.GENERIC_WLE4J8IX.upload.maximum_size=65536
5009+
GenWL.menu.pnum.GENERIC_WLE4J8IX.upload.maximum_data_size=20480
5010+
GenWL.menu.pnum.GENERIC_WLE4J8IX.build.board=GENERIC_WLE4J8IX
5011+
GenWL.menu.pnum.GENERIC_WLE4J8IX.build.product_line=STM32WLE4xx
5012+
GenWL.menu.pnum.GENERIC_WLE4J8IX.build.variant=STM32WLxx/WL54JCI_WL55JCI_WLE4J(8-B-C)I_WLE5J(8-B-C)I
5013+
5014+
# Generic WLE4JBIx
5015+
GenWL.menu.pnum.GENERIC_WLE4JBIX=Generic WLE4JBIx
5016+
GenWL.menu.pnum.GENERIC_WLE4JBIX.upload.maximum_size=131072
5017+
GenWL.menu.pnum.GENERIC_WLE4JBIX.upload.maximum_data_size=49152
5018+
GenWL.menu.pnum.GENERIC_WLE4JBIX.build.board=GENERIC_WLE4JBIX
5019+
GenWL.menu.pnum.GENERIC_WLE4JBIX.build.product_line=STM32WLE4xx
5020+
GenWL.menu.pnum.GENERIC_WLE4JBIX.build.variant=STM32WLxx/WL54JCI_WL55JCI_WLE4J(8-B-C)I_WLE5J(8-B-C)I
5021+
5022+
# Generic WLE4JCIx
5023+
GenWL.menu.pnum.GENERIC_WLE4JCIX=Generic WLE4JCIx
5024+
GenWL.menu.pnum.GENERIC_WLE4JCIX.upload.maximum_size=262144
5025+
GenWL.menu.pnum.GENERIC_WLE4JCIX.upload.maximum_data_size=65536
5026+
GenWL.menu.pnum.GENERIC_WLE4JCIX.build.board=GENERIC_WLE4JCIX
5027+
GenWL.menu.pnum.GENERIC_WLE4JCIX.build.product_line=STM32WLE4xx
5028+
GenWL.menu.pnum.GENERIC_WLE4JCIX.build.variant=STM32WLxx/WL54JCI_WL55JCI_WLE4J(8-B-C)I_WLE5J(8-B-C)I
5029+
5030+
# Generic WLE5J8Ix
5031+
GenWL.menu.pnum.GENERIC_WLE5J8IX=Generic WLE5J8Ix
5032+
GenWL.menu.pnum.GENERIC_WLE5J8IX.upload.maximum_size=65536
5033+
GenWL.menu.pnum.GENERIC_WLE5J8IX.upload.maximum_data_size=20480
5034+
GenWL.menu.pnum.GENERIC_WLE5J8IX.build.board=GENERIC_WLE5J8IX
5035+
GenWL.menu.pnum.GENERIC_WLE5J8IX.build.product_line=STM32WLE5xx
5036+
GenWL.menu.pnum.GENERIC_WLE5J8IX.build.variant=STM32WLxx/WL54JCI_WL55JCI_WLE4J(8-B-C)I_WLE5J(8-B-C)I
5037+
5038+
# Generic WLE5JBIx
5039+
GenWL.menu.pnum.GENERIC_WLE5JBIX=Generic WLE5JBIx
5040+
GenWL.menu.pnum.GENERIC_WLE5JBIX.upload.maximum_size=131072
5041+
GenWL.menu.pnum.GENERIC_WLE5JBIX.upload.maximum_data_size=49152
5042+
GenWL.menu.pnum.GENERIC_WLE5JBIX.build.board=GENERIC_WLE5JBIX
5043+
GenWL.menu.pnum.GENERIC_WLE5JBIX.build.product_line=STM32WLE5xx
5044+
GenWL.menu.pnum.GENERIC_WLE5JBIX.build.variant=STM32WLxx/WL54JCI_WL55JCI_WLE4J(8-B-C)I_WLE5J(8-B-C)I
5045+
5046+
# Generic WLE5JCIx
5047+
GenWL.menu.pnum.GENERIC_WLE5JCIX=Generic WLE5JCIx
5048+
GenWL.menu.pnum.GENERIC_WLE5JCIX.upload.maximum_size=262144
5049+
GenWL.menu.pnum.GENERIC_WLE5JCIX.upload.maximum_data_size=65536
5050+
GenWL.menu.pnum.GENERIC_WLE5JCIX.build.board=GENERIC_WLE5JCIX
5051+
GenWL.menu.pnum.GENERIC_WLE5JCIX.build.product_line=STM32WLE5xx
5052+
GenWL.menu.pnum.GENERIC_WLE5JCIX.build.variant=STM32WLxx/WL54JCI_WL55JCI_WLE4J(8-B-C)I_WLE5J(8-B-C)I
5053+
5054+
# Upload menu
5055+
GenWL.menu.upload_method.swdMethod=STM32CubeProgrammer (SWD)
5056+
GenWL.menu.upload_method.swdMethod.upload.protocol=0
5057+
GenWL.menu.upload_method.swdMethod.upload.options=-g
5058+
GenWL.menu.upload_method.swdMethod.upload.tool=stm32CubeProg
5059+
5060+
GenWL.menu.upload_method.serialMethod=STM32CubeProgrammer (Serial)
5061+
GenWL.menu.upload_method.serialMethod.upload.protocol=1
5062+
GenWL.menu.upload_method.serialMethod.upload.options={serial.port.file} -s
5063+
GenWL.menu.upload_method.serialMethod.upload.tool=stm32CubeProg
5064+
5065+
GenWL.menu.upload_method.dfuMethod=STM32CubeProgrammer (DFU)
5066+
GenWL.menu.upload_method.dfuMethod.upload.protocol=2
5067+
GenWL.menu.upload_method.dfuMethod.upload.options=-g
5068+
GenWL.menu.upload_method.dfuMethod.upload.tool=stm32CubeProg
5069+
49785070
################################################################################
49795071
# Electronic Speed Controller boards
49805072

@@ -5670,6 +5762,12 @@ GenWB.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
56705762
GenWB.menu.xserial.disabled=Disabled (no Serial support)
56715763
GenWB.menu.xserial.disabled.build.xSerial=
56725764

5765+
GenWL.menu.xserial.generic=Enabled (generic 'Serial')
5766+
GenWL.menu.xserial.none=Enabled (no generic 'Serial')
5767+
GenWL.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
5768+
GenWL.menu.xserial.disabled=Disabled (no Serial support)
5769+
GenWL.menu.xserial.disabled.build.xSerial=
5770+
56735771
ESC_board.menu.xserial.generic=Enabled (generic 'Serial')
56745772
ESC_board.menu.xserial.none=Enabled (no generic 'Serial')
56755773
ESC_board.menu.xserial.none.build.xSerial=-DHAL_UART_MODULE_ENABLED -DHWSERIAL_NONE
@@ -6376,6 +6474,25 @@ GenWB.menu.opt.o3lto.build.flags.optimize=-O3 -flto
63766474
GenWB.menu.opt.ogstd=Debug (-g)
63776475
GenWB.menu.opt.ogstd.build.flags.optimize=-g -Og
63786476

6477+
GenWL.menu.opt.osstd=Smallest (-Os default)
6478+
GenWL.menu.opt.osstd.build.flags.optimize=-Os
6479+
GenWL.menu.opt.oslto=Smallest (-Os) with LTO
6480+
GenWL.menu.opt.oslto.build.flags.optimize=-Os -flto
6481+
GenWL.menu.opt.o1std=Fast (-O1)
6482+
GenWL.menu.opt.o1std.build.flags.optimize=-O1
6483+
GenWL.menu.opt.o1lto=Fast (-O1) with LTO
6484+
GenWL.menu.opt.o1lto.build.flags.optimize=-O1 -flto
6485+
GenWL.menu.opt.o2std=Faster (-O2)
6486+
GenWL.menu.opt.o2std.build.flags.optimize=-O2
6487+
GenWL.menu.opt.o2lto=Faster (-O2) with LTO
6488+
GenWL.menu.opt.o2lto.build.flags.optimize=-O2 -flto
6489+
GenWL.menu.opt.o3std=Fastest (-O3)
6490+
GenWL.menu.opt.o3std.build.flags.optimize=-O3
6491+
GenWL.menu.opt.o3lto=Fastest (-O3) with LTO
6492+
GenWL.menu.opt.o3lto.build.flags.optimize=-O3 -flto
6493+
GenWL.menu.opt.ogstd=Debug (-g)
6494+
GenWL.menu.opt.ogstd.build.flags.optimize=-g -Og
6495+
63796496
ESC_board.menu.opt.osstd=Smallest (-Os default)
63806497
ESC_board.menu.opt.oslto=Smallest (-Os) with LTO
63816498
ESC_board.menu.opt.oslto.build.flags.optimize=-Os -flto
@@ -6704,6 +6821,16 @@ GenWB.menu.rtlib.nanofps.build.flags.ldspecs=--specs=nano.specs -u _printf_float
67046821
GenWB.menu.rtlib.full=Newlib Standard
67056822
GenWB.menu.rtlib.full.build.flags.ldspecs=
67066823

6824+
GenWL.menu.rtlib.nano=Newlib Nano (default)
6825+
GenWL.menu.rtlib.nanofp=Newlib Nano + Float Printf
6826+
GenWL.menu.rtlib.nanofp.build.flags.ldspecs=--specs=nano.specs -u _printf_float
6827+
GenWL.menu.rtlib.nanofs=Newlib Nano + Float Scanf
6828+
GenWL.menu.rtlib.nanofs.build.flags.ldspecs=--specs=nano.specs -u _scanf_float
6829+
GenWL.menu.rtlib.nanofps=Newlib Nano + Float Printf/Scanf
6830+
GenWL.menu.rtlib.nanofps.build.flags.ldspecs=--specs=nano.specs -u _printf_float -u _scanf_float
6831+
GenWL.menu.rtlib.full=Newlib Standard
6832+
GenWL.menu.rtlib.full.build.flags.ldspecs=
6833+
67076834
ESC_board.menu.rtlib.nano=Newlib Nano (default)
67086835
ESC_board.menu.rtlib.nanofp=Newlib Nano + Float Printf
67096836
ESC_board.menu.rtlib.nanofp.build.flags.ldspecs=--specs=nano.specs -u _printf_float

‎cores/arduino/stm32/LL/stm32yyxx_ll_adc.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
#include "stm32mp1xx_ll_adc.h"
3636
#elif STM32WBxx
3737
#include "stm32wbxx_ll_adc.h"
38+
#elif STM32WLxx
39+
#include "stm32wlxx_ll_adc.h"
3840
#endif
3941
#pragma GCC diagnostic pop
4042
#endif /* _STM32YYXX_LL_ADC_H_ */

‎cores/arduino/stm32/LL/stm32yyxx_ll_bus.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
#include "stm32mp1xx_ll_bus.h"
3636
#elif STM32WBxx
3737
#include "stm32wbxx_ll_bus.h"
38+
#elif STM32WLxx
39+
#include "stm32wlxx_ll_bus.h"
3840
#endif
3941
#pragma GCC diagnostic pop
4042
#endif /* _STM32YYXX_LL_BUS_H_ */

‎cores/arduino/stm32/LL/stm32yyxx_ll_comp.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
#include "stm32l5xx_ll_comp.h"
2626
#elif STM32WBxx
2727
#include "stm32wbxx_ll_comp.h"
28+
#elif STM32WLxx
29+
#include "stm32wlxx_ll_comp.h"
2830
#endif
2931
#pragma GCC diagnostic pop
3032
#endif /* _STM32YYXX_LL_COMP_H_ */

‎cores/arduino/stm32/LL/stm32yyxx_ll_cortex.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@
3535
#include "stm32mp1xx_ll_cortex.h"
3636
#elif STM32WBxx
3737
#include "stm32wbxx_ll_cortex.h"
38+
#elif STM32WLxx
39+
#include "stm32wlxx_ll_cortex.h"
3840
#endif
3941
#pragma GCC diagnostic pop
4042
#endif /* _STM32YYXX_LL_CORTEX_H_ */

‎cores/arduino/stm32/LL/stm32yyxx_ll_crc.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
#include "stm32l5xx_ll_crc.h"
3434
#elif STM32WBxx
3535
#include "stm32wbxx_ll_crc.h"
36+
#elif STM32WLxx
37+
#include "stm32wlxx_ll_crc.h"
3638
#endif
3739
#pragma GCC diagnostic pop
3840
#endif /* _STM32YYXX_LL_CRC_H_ */

‎cores/arduino/stm32/LL/stm32yyxx_ll_dac.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@
3131
#include "stm32l4xx_ll_dac.h"
3232
#elif STM32L5xx
3333
#include "stm32l5xx_ll_dac.h"
34+
#elif STM32WLxx
35+
#include "stm32wlxx_ll_dac.h"
3436
#endif
3537
#pragma GCC diagnostic pop
3638
#endif /* _STM32YYXX_LL_DAC_H_ */

0 commit comments

Comments
 (0)