Skip to content

Commit 1c5c1c7

Browse files
authored
Merge pull request #6027 from ithinuel/fix-target-names-for-murata-abz-and-adv-wise-1510
rename MURATA type ABZ & WISE 1510 to their expected name
2 parents f8cc426 + 6c9fcf3 commit 1c5c1c7

File tree

12 files changed

+16
-16
lines changed

12 files changed

+16
-16
lines changed

targets/targets.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1515,7 +1515,7 @@
15151515
"device_name": "STM32L433RC",
15161516
"bootloader_supported": true
15171517
},
1518-
"WISE_1510": {
1518+
"MTB_ADV_WISE_1510": {
15191519
"inherits": ["FAMILY_STM32"],
15201520
"supported_form_factors": ["ARDUINO"],
15211521
"core": "Cortex-M4F",
@@ -1779,7 +1779,7 @@
17791779
"release_versions": ["2", "5"],
17801780
"device_name": "STM32L072CZ"
17811781
},
1782-
"CMWX1ZZABZ_078": {
1782+
"MTB_MURATA_ABZ": {
17831783
"inherits": ["FAMILY_STM32"],
17841784
"core": "Cortex-M0+",
17851785
"extra_labels_add": ["STM32L0", "STM32L0x2xZ", "STM32L082CZ", "STM32L082xx"],

tools/build_travis.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
{ "target": "NUCLEO_F412ZG", "toolchains": "GCC_ARM", "libs": ["dsp"] },
5656
{ "target": "NUCLEO_F413ZH", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] },
5757
{ "target": "NUCLEO_L432KC", "toolchains": "GCC_ARM", "libs": ["dsp"] },
58-
{ "target": "WISE_1510", "toolchains": "GCC_ARM", "libs": ["dsp"] },
58+
{ "target": "MTB_ADV_WISE_1510", "toolchains": "GCC_ARM", "libs": ["dsp"] },
5959
{ "target": "NUCLEO_L476RG", "toolchains": "GCC_ARM", "libs": ["dsp"] },
6060
{ "target": "NUCLEO_L011K4", "toolchains": "GCC_ARM", "libs": ["dsp"] },
6161
{ "target": "NUCLEO_L031K6", "toolchains": "GCC_ARM", "libs": ["dsp"] },
@@ -92,7 +92,7 @@
9292
{ "target": "DISCO_L072CZ_LRWAN1", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] },
9393

9494
# module manufacturer : muRata
95-
{ "target": "CMWX1ZZABZ_078", "toolchains": "GCC_ARM", "libs": [] },
95+
{ "target": "MTB_MURATA_ABZ", "toolchains": "GCC_ARM", "libs": [] },
9696
),
9797
},
9898

@@ -156,7 +156,7 @@
156156
)
157157
},
158158

159-
{
159+
{
160160
"ATMEL":
161161
(
162162
{ "target": "SAMR21G18A", "toolchains": "GCC_ARM", "libs": ["dsp"] },
@@ -167,7 +167,7 @@
167167
},
168168

169169

170-
{
170+
{
171171
"NUVOTON":
172172
(
173173
{ "target": "NUMAKER_PFM_NUC472", "toolchains": "GCC_ARM", "libs": ["dsp", "usb"] },
@@ -236,7 +236,7 @@
236236
{"target": "NUCLEO_F401RE",
237237
"toolchains": "GCC_ARM",
238238
"tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"],
239-
"usb" : ["USB_1", "USB_2" ,"USB_3"],
239+
"usb" : ["USB_1", "USB_2" ,"USB_3"],
240240
}
241241
},
242242
{"target": "NUCLEO_F411RE",
@@ -324,7 +324,7 @@
324324
"tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"],
325325
}
326326
},
327-
{"target": "CMWX1ZZABZ_078",
327+
{"target": "MTB_MURATA_ABZ",
328328
"toolchains": "GCC_ARM",
329329
"tests": {"" : ["MBED_2", "MBED_10", "MBED_11", "MBED_16"],
330330
}
@@ -354,7 +354,7 @@
354354
)
355355
},
356356
{
357-
"RENESAS":
357+
"RENESAS":
358358
(
359359
{
360360
"target": "RZ_A1H",

tools/export/sw4stm32/__init__.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,10 @@ class Sw4STM32(GNUARMEclipse):
100100
'name': 'DISCO-L072CZ-LRWAN1',
101101
'mcuId': 'STM32L072CZTx'
102102
},
103-
'CMWX1ZZABZ_078':
103+
'MTB_MURATA_ABZ':
104104
{
105-
'name': 'CMWX1ZZABZ-078',
106-
'mcuId': 'CMWX1ZZABZ_078'
105+
'name': 'MTB-MURATA-ABZ',
106+
'mcuId': 'STM32L0x2xZ'
107107
},
108108
'DISCO_L475VG_IOT01A':
109109
{
@@ -255,10 +255,10 @@ class Sw4STM32(GNUARMEclipse):
255255
'name': 'NUCLEO-L432KC',
256256
'mcuId': 'STM32L432KCUx'
257257
},
258-
'WISE_1510':
258+
'MTB_ADV_WISE_1510':
259259
{
260-
'name': 'WISE-1510',
261-
'mcuId': 'STM32L433RCx'
260+
'name': 'MTB-ADV-WISE-1510',
261+
'mcuId': 'STM32L443xC'
262262
},
263263
'NUCLEO_L476RG':
264264
{
@@ -274,7 +274,7 @@ class Sw4STM32(GNUARMEclipse):
274274
{
275275
'name': 'NUCLEO-L496ZG',
276276
'mcuId': 'STM32L496ZGTx'
277-
},
277+
},
278278
'NUCLEO_L496ZG_P':
279279
{
280280
'name': 'NUCLEO-L496ZG',

0 commit comments

Comments
 (0)