From 9f59cfd2ef6024c9222323095ab047ccb285ec34 Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Fri, 6 May 2022 11:26:50 +0200
Subject: [PATCH 01/16] ci(stm32wrapper): render files only once
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
CI/update/stm32wrapper.py | 56 ++++++++++++++++-----------------------
1 file changed, 23 insertions(+), 33 deletions(-)
diff --git a/CI/update/stm32wrapper.py b/CI/update/stm32wrapper.py
index 04d90a9e06..eb7b7799ef 100644
--- a/CI/update/stm32wrapper.py
+++ b/CI/update/stm32wrapper.py
@@ -219,39 +219,29 @@ def wrap(arg_core, arg_cmsis, log):
else:
ll_h_dict[peripheral] = [lower]
- # Generate stm32yyxx_hal_*.c file
- for key, value in hal_c_dict.items():
- if key == "hal":
- filepath = HALoutSrc_path / c_file.replace("zz", "hal").replace(
- "_ppp", ""
- )
- else:
- filepath = HALoutSrc_path / c_file.replace("zz", "hal").replace(
- "ppp", key
- )
- out_file = open(filepath, "w", newline="\n")
- out_file.write(
- c_file_template.render(periph=key, type="hal", serieslist=value)
- )
- out_file.close()
- # Generate stm32yyxx_ll_*.c file
- for key, value in ll_c_dict.items():
- filepath = LLoutSrc_path / c_file.replace("zz", "ll").replace(
- "ppp", key
- )
- out_file = open(filepath, "w", newline="\n")
- out_file.write(
- c_file_template.render(periph=key, type="ll", serieslist=value)
- )
- out_file.close()
- # Generate stm32yyxx_ll_*.h file
- for key, value in ll_h_dict.items():
- filepath = LLoutInc_path / ll_h_file.replace("ppp", key)
- out_file = open(filepath, "w", newline="\n")
- out_file.write(ll_h_file_template.render(periph=key, serieslist=value))
- out_file.close()
- if log:
- print("done")
+ # Generate stm32yyxx_hal_*.c file
+ for key, value in hal_c_dict.items():
+ if key == "hal":
+ filepath = HALoutSrc_path / c_file.replace("zz", "hal").replace("_ppp", "")
+ else:
+ filepath = HALoutSrc_path / c_file.replace("zz", "hal").replace("ppp", key)
+ out_file = open(filepath, "w", newline="\n")
+ out_file.write(c_file_template.render(periph=key, type="hal", serieslist=value))
+ out_file.close()
+ # Generate stm32yyxx_ll_*.c file
+ for key, value in ll_c_dict.items():
+ filepath = LLoutSrc_path / c_file.replace("zz", "ll").replace("ppp", key)
+ out_file = open(filepath, "w", newline="\n")
+ out_file.write(c_file_template.render(periph=key, type="ll", serieslist=value))
+ out_file.close()
+ # Generate stm32yyxx_ll_*.h file
+ for key, value in ll_h_dict.items():
+ filepath = LLoutInc_path / ll_h_file.replace("ppp", key)
+ out_file = open(filepath, "w", newline="\n")
+ out_file.write(ll_h_file_template.render(periph=key, serieslist=value))
+ out_file.close()
+ if log:
+ print("done")
# Filter all LL header file
all_ll_h_list = sorted(set(all_ll_h_list))
From 23bd92752f588773caae4ea6c02cebbc28b133aa Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Mon, 2 May 2022 14:53:23 +0200
Subject: [PATCH 02/16] ci(stm32wrapper): add HAL legacy support
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
CI/update/stm32wrapper.py | 27 +++++++++++++++++++++-----
CI/update/templates/stm32yyxx_zz_ppp.c | 5 ++++-
2 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/CI/update/stm32wrapper.py b/CI/update/stm32wrapper.py
index eb7b7799ef..8690ef7e11 100644
--- a/CI/update/stm32wrapper.py
+++ b/CI/update/stm32wrapper.py
@@ -184,8 +184,9 @@ def wrap(arg_core, arg_cmsis, log):
lower = serie.lower()
# Search stm32yyxx_[hal|ll]*.c file
- filelist = src.glob(f"stm32{lower}xx_*.c")
+ filelist = src.glob(f"**/stm32{lower}xx_*.c")
for fp in filelist:
+ legacy = True if fp.parent.name == "Legacy" else False
# File name
fn = fp.name
found = peripheral_c_regex.match(fn)
@@ -194,14 +195,30 @@ def wrap(arg_core, arg_cmsis, log):
peripheral = found.group(1) if found else "hal"
if "_ll_" in fn:
if peripheral in ll_c_dict:
- ll_c_dict[peripheral].append(lower)
+ if legacy:
+ # Change legacy value if exists
+ current_list = ll_c_dict.pop(peripheral)
+ if current_list[-1][0] == lower:
+ current_list.pop()
+ current_list.append((lower, legacy))
+ ll_c_dict[peripheral] = current_list
+ else:
+ ll_c_dict[peripheral].append((lower, legacy))
else:
- ll_c_dict[peripheral] = [lower]
+ ll_c_dict[peripheral] = [(lower, legacy)]
else:
if peripheral in hal_c_dict:
- hal_c_dict[peripheral].append(lower)
+ if legacy:
+ # Change legacy value if exists
+ current_list = hal_c_dict.pop(peripheral)
+ if current_list[-1][0] == lower:
+ current_list.pop()
+ current_list.append((lower, legacy))
+ hal_c_dict[peripheral] = current_list
+ else:
+ hal_c_dict[peripheral].append((lower, legacy))
else:
- hal_c_dict[peripheral] = [lower]
+ hal_c_dict[peripheral] = [(lower, legacy)]
# Search stm32yyxx_ll_*.h file
filelist = inc.glob(f"stm32{lower}xx_ll_*.h")
diff --git a/CI/update/templates/stm32yyxx_zz_ppp.c b/CI/update/templates/stm32yyxx_zz_ppp.c
index 4675a2170e..606cd43a47 100644
--- a/CI/update/templates/stm32yyxx_zz_ppp.c
+++ b/CI/update/templates/stm32yyxx_zz_ppp.c
@@ -2,7 +2,7 @@
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"
-{% for serie in serieslist %}
+{% for serie, legacy in serieslist %}
{% if loop.first %}
#ifdef STM32{{serie.upper()}}xx
{% else %}
@@ -11,6 +11,9 @@
{% if type == periph %}
#include "stm32{{serie}}xx_{{type}}.c"
{% else %}
+ {% if legacy %}
+ #include "Legacy/stm32{{serie}}xx_{{type}}_{{periph}}.c"
+ {% endif %}
#include "stm32{{serie}}xx_{{type}}_{{periph}}.c"
{% endif %}
{% if loop.last %}
From 4caa2c0b42c4586a6c3c3392f3cb7151036b5a4c Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Wed, 4 May 2022 09:34:14 +0200
Subject: [PATCH 03/16] ci(stm32variant): removed unused module
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
CI/update/stm32variant.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/CI/update/stm32variant.py b/CI/update/stm32variant.py
index 39426eaacc..79707a3699 100644
--- a/CI/update/stm32variant.py
+++ b/CI/update/stm32variant.py
@@ -1,5 +1,4 @@
import argparse
-import datetime
import json
import re
import subprocess
From dc55441cb1ebde4c95ecbe7a645fc10d98bc854a Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Wed, 4 May 2022 14:10:18 +0200
Subject: [PATCH 04/16] ci: rename pathlib_ext to common_ext
as functions are more than PathLib extension and new ones
will be added.
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
CI/utils/__init__.py | 2 +-
CI/utils/{pathlib_ext.py => common_ext.py} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename CI/utils/{pathlib_ext.py => common_ext.py} (100%)
diff --git a/CI/utils/__init__.py b/CI/utils/__init__.py
index 2f30247937..a2fb240d64 100644
--- a/CI/utils/__init__.py
+++ b/CI/utils/__init__.py
@@ -1 +1 @@
-from .pathlib_ext import *
+from .common_ext import *
diff --git a/CI/utils/pathlib_ext.py b/CI/utils/common_ext.py
similarity index 100%
rename from CI/utils/pathlib_ext.py
rename to CI/utils/common_ext.py
From 27639d3de9320677665da24903d6f209e623f63b Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Wed, 4 May 2022 14:13:31 +0200
Subject: [PATCH 05/16] ci: move common functions to common_ext library
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
CI/update/stm32cube.py | 27 +--------------------------
CI/utils/common_ext.py | 26 ++++++++++++++++++++++++++
2 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/CI/update/stm32cube.py b/CI/update/stm32cube.py
index 6238ab7d30..02cd1de324 100644
--- a/CI/update/stm32cube.py
+++ b/CI/update/stm32cube.py
@@ -15,6 +15,7 @@
script_path = Path(__file__).parent.resolve()
sys.path.append(str(script_path.parent))
from utils import copyFile, copyFolder, createFolder, deleteFolder, genSTM32List
+from utils import execute_cmd, getRepoBranchName
if sys.platform.startswith("win32"):
from colorama import init
@@ -74,16 +75,6 @@
out_separator = "-" * 70
-def execute_cmd(cmd, stderror):
- try:
- output = subprocess.check_output(cmd, stderr=stderror).decode("utf-8").strip()
- except subprocess.CalledProcessError as e:
- print("Failed command: ")
- print(e.cmd)
- exit(e.returncode)
- return output
-
-
def create_config(config_file_path):
global repo_local_path
@@ -238,22 +229,6 @@ def createSystemFiles(serie):
copyFile(hal_conf_file, hal_conf_default)
-def getRepoBranchName(repo_path):
- bname = ""
- rname = ""
- cmd = ["git", "-C", repo_path, "branch", "-r"]
- bnames = execute_cmd(cmd, None).split("\n")
- for b in bnames:
- name_match = re.match(r"\S+/\S+ -> (\S+)/(\S+)", b.strip())
- if name_match:
- rname = name_match.group(1)
- bname = name_match.group(2)
- if not bname:
- print(f"Could not find branch name for {repo_path}!")
- exit(1)
- return (rname, bname)
-
-
def updateCoreRepo():
# Handle core repo
repo_path = repo_local_path / repo_core_name
diff --git a/CI/utils/common_ext.py b/CI/utils/common_ext.py
index b1cf7dcda2..abdf14dc10 100644
--- a/CI/utils/common_ext.py
+++ b/CI/utils/common_ext.py
@@ -1,4 +1,5 @@
import re
+import subprocess
import shutil
import sys
@@ -52,6 +53,31 @@ def genSTM32List(path, pattern):
return stm32_list
+def execute_cmd(cmd, stderror):
+ try:
+ output = subprocess.check_output(cmd, stderr=stderror).decode("utf-8").strip()
+ except subprocess.CalledProcessError as e:
+ print(f"Command {e.cmd} failed with error code {e.returncode}")
+ exit(e.returncode)
+ return output
+
+
+def getRepoBranchName(repo_path):
+ bname = ""
+ rname = ""
+ cmd = ["git", "-C", repo_path, "branch", "-r"]
+ bnames = execute_cmd(cmd, None).split("\n")
+ for b in bnames:
+ name_match = re.match(r"\S+/\S+ -> (\S+)/(\S+)", b.strip())
+ if name_match:
+ rname = name_match.group(1)
+ bname = name_match.group(2)
+ if not bname:
+ print(f"Could not find branch name for {repo_path}!")
+ exit(1)
+ return (rname, bname)
+
+
if __name__ == "__main__":
print("This script is not intend to be called directly")
sys.exit()
From a1c2b5dca7033bdf3741bd59a00f874bad7009cd Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Wed, 4 May 2022 11:43:34 +0200
Subject: [PATCH 06/16] ci(stm32variant): ensure to use correct default branch
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
CI/update/stm32variant.py | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/CI/update/stm32variant.py b/CI/update/stm32variant.py
index 79707a3699..2806e8959c 100644
--- a/CI/update/stm32variant.py
+++ b/CI/update/stm32variant.py
@@ -12,6 +12,10 @@
from pathlib import Path
from xml.dom.minidom import parse, Node
+script_path = Path(__file__).parent.resolve()
+sys.path.append(str(script_path.parent))
+from utils import execute_cmd, getRepoBranchName
+
mcu_list = [] # 'name'
io_list = [] # 'PIN','name'
alt_list = [] # 'PIN','name'
@@ -2146,11 +2150,20 @@ def manage_repo():
if not args.skip:
print(f"Updating {repo_name}...")
if repo_path.is_dir():
+ rname, bname = getRepoBranchName(repo_path)
+
# Get new tags from the remote
git_cmds = [
["git", "-C", repo_path, "clean", "-fdx"],
["git", "-C", repo_path, "fetch"],
- ["git", "-C", repo_path, "reset", "--hard", "origin/main"],
+ [
+ "git",
+ "-C",
+ repo_path,
+ "reset",
+ "--hard",
+ f"{rname}/{bname}",
+ ],
]
else:
# Clone it as it does not exists yet
From db068f30b28f44341966c69f4da128967bd9ea94 Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Wed, 4 May 2022 14:26:08 +0200
Subject: [PATCH 07/16] ci(stm32variant): use common function
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
CI/update/stm32variant.py | 85 +++++++++++++++++----------------------
1 file changed, 37 insertions(+), 48 deletions(-)
diff --git a/CI/update/stm32variant.py b/CI/update/stm32variant.py
index 2806e8959c..aba7674f6d 100644
--- a/CI/update/stm32variant.py
+++ b/CI/update/stm32variant.py
@@ -2146,55 +2146,44 @@ def manage_repo():
global db_release
repo_local_path.mkdir(parents=True, exist_ok=True)
- try:
- if not args.skip:
- print(f"Updating {repo_name}...")
- if repo_path.is_dir():
- rname, bname = getRepoBranchName(repo_path)
-
- # Get new tags from the remote
- git_cmds = [
- ["git", "-C", repo_path, "clean", "-fdx"],
- ["git", "-C", repo_path, "fetch"],
- [
- "git",
- "-C",
- repo_path,
- "reset",
- "--hard",
- f"{rname}/{bname}",
- ],
- ]
- else:
- # Clone it as it does not exists yet
- git_cmds = [["git", "-C", repo_local_path, "clone", gh_url]]
-
- for cmd in git_cmds:
- subprocess.check_output(cmd).decode("utf-8")
+ if not args.skip:
+ print(f"Updating {repo_name}...")
if repo_path.is_dir():
- # Get tag
- sha1_id = (
- subprocess.check_output(
- ["git", "-C", repo_path, "rev-list", "--tags", "--max-count=1"]
- )
- .decode("utf-8")
- .strip()
- )
- version_tag = (
- subprocess.check_output(
- ["git", "-C", repo_path, "describe", "--tags", sha1_id]
- )
- .decode("utf-8")
- .strip()
- )
- subprocess.check_output(
- ["git", "-C", repo_path, "checkout", version_tag],
- stderr=subprocess.DEVNULL,
- )
- db_release = version_tag
- return True
- except subprocess.CalledProcessError as e:
- print(f"Command {e.cmd} failed with error code {e.returncode}")
+ rname, bname = getRepoBranchName(repo_path)
+
+ # Get new tags from the remote
+ git_cmds = [
+ ["git", "-C", repo_path, "clean", "-fdx"],
+ ["git", "-C", repo_path, "fetch"],
+ [
+ "git",
+ "-C",
+ repo_path,
+ "reset",
+ "--hard",
+ f"{rname}/{bname}",
+ ],
+ ]
+ else:
+ # Clone it as it does not exists yet
+ git_cmds = [["git", "-C", repo_local_path, "clone", gh_url]]
+
+ for cmd in git_cmds:
+ execute_cmd(cmd, None)
+ if repo_path.is_dir():
+ # Get tag
+ sha1_id = execute_cmd(
+ ["git", "-C", repo_path, "rev-list", "--tags", "--max-count=1"], None
+ )
+ version_tag = execute_cmd(
+ ["git", "-C", repo_path, "describe", "--tags", sha1_id], None
+ )
+ execute_cmd(
+ ["git", "-C", repo_path, "checkout", version_tag],
+ subprocess.DEVNULL,
+ )
+ db_release = version_tag
+ return True
return False
From f801f71dcec8f2d8019dda18b8885c4870fb2ed2 Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Wed, 4 May 2022 14:16:26 +0200
Subject: [PATCH 08/16] ci(stm32variant): add legacy HAL module management
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
CI/update/stm32variant.py | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/CI/update/stm32variant.py b/CI/update/stm32variant.py
index aba7674f6d..52cbecd864 100644
--- a/CI/update/stm32variant.py
+++ b/CI/update/stm32variant.py
@@ -61,7 +61,7 @@
mcu_refname = ""
mcu_flash = []
mcu_ram = []
-
+legacy_hal = {"CAN": ["F0", "F1", "F2", "F3", "F4", "F7", "L4"], "ETH": ["F4", "H7"]}
# Cube information
product_line_dict = {}
@@ -816,7 +816,9 @@ def can_pinmap(lst):
)
return dict(
name=name,
- hal=name,
+ hal=["CAN", "CAN_LEGACY"]
+ if name != "FDCAN" and any(mcu in mcu_family for mcu in legacy_hal["CAN"])
+ else name,
aname=aname,
data="",
wpin=max(wpin) + 1,
@@ -845,7 +847,9 @@ def eth_pinmap():
)
return dict(
name="ETHERNET",
- hal="ETH",
+ hal=["ETH", "ETH_LEGACY"]
+ if any(mcu in mcu_family for mcu in legacy_hal["ETH"])
+ else "ETH",
aname="Ethernet",
data="",
wpin=max(wpin) + 1,
From d7462b17e37af17f181573fa894a0d05a797a878 Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Wed, 4 May 2022 16:18:46 +0200
Subject: [PATCH 09/16] fix(stm32variant): ensure GPIO file is the correct one
Example for U5, file was the one for "LPBAMLPGPIO1"
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
CI/update/stm32variant.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CI/update/stm32variant.py b/CI/update/stm32variant.py
index 52cbecd864..a1ae7d113e 100644
--- a/CI/update/stm32variant.py
+++ b/CI/update/stm32variant.py
@@ -188,7 +188,7 @@ def parse_mcu_file():
else:
usb_inst["usb"] = inst.group(1)
else:
- if gpiofile == "" and "GPIO" in s.attributes["Name"].value:
+ if gpiofile == "" and s.attributes["Name"].value == "GPIO":
gpiofile = s.attributes["Version"].value
From 9ff28e6afc3cfa8cfac3ce678b92ec90f0a4e98d Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Wed, 4 May 2022 21:07:30 +0200
Subject: [PATCH 10/16] ci(stm32variant): list directories change
to warn user about new directories and ones to remove.
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
CI/update/stm32variant.py | 34 +++++++++++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/CI/update/stm32variant.py b/CI/update/stm32variant.py
index a1ae7d113e..5dc9090531 100644
--- a/CI/update/stm32variant.py
+++ b/CI/update/stm32variant.py
@@ -2014,7 +2014,9 @@ def aggregate_dir():
out_family_path = root_dir / "variants" / mcu_family.name
# Get all mcu_dir
mcu_dirs = sorted(mcu_family.glob("*/"))
-
+ # Get original directory list of current serie STM32YYxx
+ mcu_out_dirs_ori = sorted(out_family_path.glob("*/"))
+ mcu_out_dirs_up = []
# Group mcu directories when only expressions and xml file name are different
while mcu_dirs:
# Pop first item
@@ -2076,8 +2078,38 @@ def aggregate_dir():
fname.unlink()
else:
fname.replace(out_path / fname.name)
+ # Append updated directory to the list of current serie STM32YYxx
+ mcu_out_dirs_up.append(out_path)
del group_mcu_dir[:]
del mcu_dir1_files_list[:]
+ mcu_out_dirs_up.sort()
+ new_dirs = set(mcu_out_dirs_up) - set(mcu_out_dirs_ori)
+ if new_dirs:
+ nb_new = len(new_dirs)
+ dir_str = "directories" if nb_new > 1 else "directory"
+ print(f"\nNew {dir_str} for {mcu_family.name}:\n")
+ for d in new_dirs:
+ print(f" - {d.name}")
+ print("\n --> Please, check if it is a new directory or a renamed one.")
+ old_dirs = set(mcu_out_dirs_ori) - set(mcu_out_dirs_up)
+ if old_dirs:
+ nb_old = len(old_dirs)
+ dir_str = "Directories" if nb_old > 1 else "Directory"
+ print(f"\n{dir_str} not updated for {mcu_family.name}:\n")
+ for d in old_dirs:
+ print(f" - {d.name}")
+ print(
+ """
+ --> Please, check if it is due to directory name update (renamed), if true then:
+ - Move custom boards definition files, if any.
+ - Move linker script(s), if any.
+ - Copy 'SystemClock_Config(void)' function to the new generic clock config file.
+ --> Then remove it, update old path in boards.txt
+ (for custom board(s) as well as generic ones).
+"""
+ )
+ del mcu_out_dirs_ori[:]
+ del mcu_out_dirs_up[:]
def default_cubemxdir():
From e3d97bbec81f2f4a415c33f2159cdefeb640ee68 Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Mon, 2 May 2022 14:54:23 +0200
Subject: [PATCH 11/16] lib(SrcWrapper): update HAL wrapped files with legacy
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
libraries/SrcWrapper/src/HAL/stm32yyxx_hal_can.c | 7 +++++++
libraries/SrcWrapper/src/HAL/stm32yyxx_hal_eth.c | 2 ++
libraries/SrcWrapper/src/HAL/stm32yyxx_hal_eth_ex.c | 1 +
3 files changed, 10 insertions(+)
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_can.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_can.c
index 5df91f9e1f..c44b571fcb 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_can.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_can.c
@@ -3,18 +3,25 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#ifdef STM32F0xx
+ #include "Legacy/stm32f0xx_hal_can.c"
#include "stm32f0xx_hal_can.c"
#elif STM32F1xx
+ #include "Legacy/stm32f1xx_hal_can.c"
#include "stm32f1xx_hal_can.c"
#elif STM32F2xx
+ #include "Legacy/stm32f2xx_hal_can.c"
#include "stm32f2xx_hal_can.c"
#elif STM32F3xx
+ #include "Legacy/stm32f3xx_hal_can.c"
#include "stm32f3xx_hal_can.c"
#elif STM32F4xx
+ #include "Legacy/stm32f4xx_hal_can.c"
#include "stm32f4xx_hal_can.c"
#elif STM32F7xx
+ #include "Legacy/stm32f7xx_hal_can.c"
#include "stm32f7xx_hal_can.c"
#elif STM32L4xx
+ #include "Legacy/stm32l4xx_hal_can.c"
#include "stm32l4xx_hal_can.c"
#endif
#pragma GCC diagnostic pop
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_eth.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_eth.c
index 2a59125482..13b736390a 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_eth.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_eth.c
@@ -7,10 +7,12 @@
#elif STM32F2xx
#include "stm32f2xx_hal_eth.c"
#elif STM32F4xx
+ #include "Legacy/stm32f4xx_hal_eth.c"
#include "stm32f4xx_hal_eth.c"
#elif STM32F7xx
#include "stm32f7xx_hal_eth.c"
#elif STM32H7xx
+ #include "Legacy/stm32h7xx_hal_eth.c"
#include "stm32h7xx_hal_eth.c"
#endif
#pragma GCC diagnostic pop
diff --git a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_eth_ex.c b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_eth_ex.c
index ea32f779bc..0f7f9bcd5a 100644
--- a/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_eth_ex.c
+++ b/libraries/SrcWrapper/src/HAL/stm32yyxx_hal_eth_ex.c
@@ -3,6 +3,7 @@
#pragma GCC diagnostic ignored "-Wunused-parameter"
#ifdef STM32H7xx
+ #include "Legacy/stm32h7xx_hal_eth_ex.c"
#include "stm32h7xx_hal_eth_ex.c"
#endif
#pragma GCC diagnostic pop
From 1b75c2a7cc422c4b7490668b66b90c8f39e73fb5 Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Wed, 4 May 2022 21:08:46 +0200
Subject: [PATCH 12/16] variant(G4): update properly against open pin data DB
6.0.50
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
.../PeripheralPins.c | 10 +-
.../PinNamesVar.h | 0
.../boards_entry.txt | 96 ++++---------------
.../generic_clock.c | 22 ++---
.../variant_generic.cpp | 20 ++--
.../variant_generic.h | 0
6 files changed, 37 insertions(+), 111 deletions(-)
rename variants/STM32G4xx/{G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T) => G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)}/PeripheralPins.c (99%)
rename variants/STM32G4xx/{G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T) => G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)}/PinNamesVar.h (100%)
rename variants/STM32G4xx/{G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T) => G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)}/boards_entry.txt (58%)
rename variants/STM32G4xx/{G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T) => G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)}/generic_clock.c (61%)
rename variants/STM32G4xx/{G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T) => G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)}/variant_generic.cpp (84%)
rename variants/STM32G4xx/{G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T) => G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)}/variant_generic.h (100%)
diff --git a/variants/STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)/PeripheralPins.c b/variants/STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)/PeripheralPins.c
similarity index 99%
rename from variants/STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)/PeripheralPins.c
rename to variants/STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)/PeripheralPins.c
index 3a86cfb1e7..29e56800d0 100644
--- a/variants/STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)/PeripheralPins.c
+++ b/variants/STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)/PeripheralPins.c
@@ -11,12 +11,10 @@
*******************************************************************************
*/
/*
- * Automatically generated from STM32G473V(B-C-E)Hx.xml, STM32G473V(B-C-E)Ix.xml
- * STM32G473V(B-C-E)Tx.xml, STM32G474V(B-C-E)Hx.xml
- * STM32G474V(B-C-E)Ix.xml, STM32G474V(B-C-E)Tx.xml
- * STM32G483VEHx.xml, STM32G483VEIx.xml
- * STM32G483VETx.xml, STM32G484VEHx.xml
- * STM32G484VEIx.xml, STM32G484VETx.xml
+ * Automatically generated from STM32G473V(B-C-E)Hx.xml, STM32G473V(B-C-E)Tx.xml
+ * STM32G474V(B-C-E)Hx.xml, STM32G474V(B-C-E)Tx.xml
+ * STM32G483VEHx.xml, STM32G483VETx.xml
+ * STM32G484VEHx.xml, STM32G484VETx.xml
* CubeMX DB release 6.0.50
*/
#if !defined(CUSTOM_PERIPHERAL_PINS)
diff --git a/variants/STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)/PinNamesVar.h b/variants/STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)/PinNamesVar.h
similarity index 100%
rename from variants/STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)/PinNamesVar.h
rename to variants/STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)/PinNamesVar.h
diff --git a/variants/STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)/boards_entry.txt b/variants/STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)/boards_entry.txt
similarity index 58%
rename from variants/STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)/boards_entry.txt
rename to variants/STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)/boards_entry.txt
index 798a6d7c09..4e5e1223ad 100644
--- a/variants/STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)/boards_entry.txt
+++ b/variants/STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)/boards_entry.txt
@@ -9,7 +9,7 @@ GenG4.menu.pnum.GENERIC_G473VBHX.upload.maximum_size=131072
GenG4.menu.pnum.GENERIC_G473VBHX.upload.maximum_data_size=131072
GenG4.menu.pnum.GENERIC_G473VBHX.build.board=GENERIC_G473VBHX
GenG4.menu.pnum.GENERIC_G473VBHX.build.product_line=STM32G473xx
-GenG4.menu.pnum.GENERIC_G473VBHX.build.variant=STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)
+GenG4.menu.pnum.GENERIC_G473VBHX.build.variant=STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)
# Generic G473VCHx
GenG4.menu.pnum.GENERIC_G473VCHX=Generic G473VCHx
@@ -17,7 +17,7 @@ GenG4.menu.pnum.GENERIC_G473VCHX.upload.maximum_size=262144
GenG4.menu.pnum.GENERIC_G473VCHX.upload.maximum_data_size=131072
GenG4.menu.pnum.GENERIC_G473VCHX.build.board=GENERIC_G473VCHX
GenG4.menu.pnum.GENERIC_G473VCHX.build.product_line=STM32G473xx
-GenG4.menu.pnum.GENERIC_G473VCHX.build.variant=STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)
+GenG4.menu.pnum.GENERIC_G473VCHX.build.variant=STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)
# Generic G473VEHx
GenG4.menu.pnum.GENERIC_G473VEHX=Generic G473VEHx
@@ -25,31 +25,7 @@ GenG4.menu.pnum.GENERIC_G473VEHX.upload.maximum_size=524288
GenG4.menu.pnum.GENERIC_G473VEHX.upload.maximum_data_size=131072
GenG4.menu.pnum.GENERIC_G473VEHX.build.board=GENERIC_G473VEHX
GenG4.menu.pnum.GENERIC_G473VEHX.build.product_line=STM32G473xx
-GenG4.menu.pnum.GENERIC_G473VEHX.build.variant=STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)
-
-# Generic G473VBIx
-GenG4.menu.pnum.GENERIC_G473VBIX=Generic G473VBIx
-GenG4.menu.pnum.GENERIC_G473VBIX.upload.maximum_size=131072
-GenG4.menu.pnum.GENERIC_G473VBIX.upload.maximum_data_size=131072
-GenG4.menu.pnum.GENERIC_G473VBIX.build.board=GENERIC_G473VBIX
-GenG4.menu.pnum.GENERIC_G473VBIX.build.product_line=STM32G473xx
-GenG4.menu.pnum.GENERIC_G473VBIX.build.variant=STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)
-
-# Generic G473VCIx
-GenG4.menu.pnum.GENERIC_G473VCIX=Generic G473VCIx
-GenG4.menu.pnum.GENERIC_G473VCIX.upload.maximum_size=262144
-GenG4.menu.pnum.GENERIC_G473VCIX.upload.maximum_data_size=131072
-GenG4.menu.pnum.GENERIC_G473VCIX.build.board=GENERIC_G473VCIX
-GenG4.menu.pnum.GENERIC_G473VCIX.build.product_line=STM32G473xx
-GenG4.menu.pnum.GENERIC_G473VCIX.build.variant=STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)
-
-# Generic G473VEIx
-GenG4.menu.pnum.GENERIC_G473VEIX=Generic G473VEIx
-GenG4.menu.pnum.GENERIC_G473VEIX.upload.maximum_size=524288
-GenG4.menu.pnum.GENERIC_G473VEIX.upload.maximum_data_size=131072
-GenG4.menu.pnum.GENERIC_G473VEIX.build.board=GENERIC_G473VEIX
-GenG4.menu.pnum.GENERIC_G473VEIX.build.product_line=STM32G473xx
-GenG4.menu.pnum.GENERIC_G473VEIX.build.variant=STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)
+GenG4.menu.pnum.GENERIC_G473VEHX.build.variant=STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)
# Generic G473VBTx
GenG4.menu.pnum.GENERIC_G473VBTX=Generic G473VBTx
@@ -57,7 +33,7 @@ GenG4.menu.pnum.GENERIC_G473VBTX.upload.maximum_size=131072
GenG4.menu.pnum.GENERIC_G473VBTX.upload.maximum_data_size=131072
GenG4.menu.pnum.GENERIC_G473VBTX.build.board=GENERIC_G473VBTX
GenG4.menu.pnum.GENERIC_G473VBTX.build.product_line=STM32G473xx
-GenG4.menu.pnum.GENERIC_G473VBTX.build.variant=STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)
+GenG4.menu.pnum.GENERIC_G473VBTX.build.variant=STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)
# Generic G473VCTx
GenG4.menu.pnum.GENERIC_G473VCTX=Generic G473VCTx
@@ -65,7 +41,7 @@ GenG4.menu.pnum.GENERIC_G473VCTX.upload.maximum_size=262144
GenG4.menu.pnum.GENERIC_G473VCTX.upload.maximum_data_size=131072
GenG4.menu.pnum.GENERIC_G473VCTX.build.board=GENERIC_G473VCTX
GenG4.menu.pnum.GENERIC_G473VCTX.build.product_line=STM32G473xx
-GenG4.menu.pnum.GENERIC_G473VCTX.build.variant=STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)
+GenG4.menu.pnum.GENERIC_G473VCTX.build.variant=STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)
# Generic G473VETx
GenG4.menu.pnum.GENERIC_G473VETX=Generic G473VETx
@@ -73,7 +49,7 @@ GenG4.menu.pnum.GENERIC_G473VETX.upload.maximum_size=524288
GenG4.menu.pnum.GENERIC_G473VETX.upload.maximum_data_size=131072
GenG4.menu.pnum.GENERIC_G473VETX.build.board=GENERIC_G473VETX
GenG4.menu.pnum.GENERIC_G473VETX.build.product_line=STM32G473xx
-GenG4.menu.pnum.GENERIC_G473VETX.build.variant=STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)
+GenG4.menu.pnum.GENERIC_G473VETX.build.variant=STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)
# Generic G474VBHx
GenG4.menu.pnum.GENERIC_G474VBHX=Generic G474VBHx
@@ -81,7 +57,7 @@ GenG4.menu.pnum.GENERIC_G474VBHX.upload.maximum_size=131072
GenG4.menu.pnum.GENERIC_G474VBHX.upload.maximum_data_size=131072
GenG4.menu.pnum.GENERIC_G474VBHX.build.board=GENERIC_G474VBHX
GenG4.menu.pnum.GENERIC_G474VBHX.build.product_line=STM32G474xx
-GenG4.menu.pnum.GENERIC_G474VBHX.build.variant=STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)
+GenG4.menu.pnum.GENERIC_G474VBHX.build.variant=STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)
# Generic G474VCHx
GenG4.menu.pnum.GENERIC_G474VCHX=Generic G474VCHx
@@ -89,7 +65,7 @@ GenG4.menu.pnum.GENERIC_G474VCHX.upload.maximum_size=262144
GenG4.menu.pnum.GENERIC_G474VCHX.upload.maximum_data_size=131072
GenG4.menu.pnum.GENERIC_G474VCHX.build.board=GENERIC_G474VCHX
GenG4.menu.pnum.GENERIC_G474VCHX.build.product_line=STM32G474xx
-GenG4.menu.pnum.GENERIC_G474VCHX.build.variant=STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)
+GenG4.menu.pnum.GENERIC_G474VCHX.build.variant=STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)
# Generic G474VEHx
GenG4.menu.pnum.GENERIC_G474VEHX=Generic G474VEHx
@@ -97,31 +73,7 @@ GenG4.menu.pnum.GENERIC_G474VEHX.upload.maximum_size=524288
GenG4.menu.pnum.GENERIC_G474VEHX.upload.maximum_data_size=131072
GenG4.menu.pnum.GENERIC_G474VEHX.build.board=GENERIC_G474VEHX
GenG4.menu.pnum.GENERIC_G474VEHX.build.product_line=STM32G474xx
-GenG4.menu.pnum.GENERIC_G474VEHX.build.variant=STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)
-
-# Generic G474VBIx
-GenG4.menu.pnum.GENERIC_G474VBIX=Generic G474VBIx
-GenG4.menu.pnum.GENERIC_G474VBIX.upload.maximum_size=131072
-GenG4.menu.pnum.GENERIC_G474VBIX.upload.maximum_data_size=131072
-GenG4.menu.pnum.GENERIC_G474VBIX.build.board=GENERIC_G474VBIX
-GenG4.menu.pnum.GENERIC_G474VBIX.build.product_line=STM32G474xx
-GenG4.menu.pnum.GENERIC_G474VBIX.build.variant=STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)
-
-# Generic G474VCIx
-GenG4.menu.pnum.GENERIC_G474VCIX=Generic G474VCIx
-GenG4.menu.pnum.GENERIC_G474VCIX.upload.maximum_size=262144
-GenG4.menu.pnum.GENERIC_G474VCIX.upload.maximum_data_size=131072
-GenG4.menu.pnum.GENERIC_G474VCIX.build.board=GENERIC_G474VCIX
-GenG4.menu.pnum.GENERIC_G474VCIX.build.product_line=STM32G474xx
-GenG4.menu.pnum.GENERIC_G474VCIX.build.variant=STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)
-
-# Generic G474VEIx
-GenG4.menu.pnum.GENERIC_G474VEIX=Generic G474VEIx
-GenG4.menu.pnum.GENERIC_G474VEIX.upload.maximum_size=524288
-GenG4.menu.pnum.GENERIC_G474VEIX.upload.maximum_data_size=131072
-GenG4.menu.pnum.GENERIC_G474VEIX.build.board=GENERIC_G474VEIX
-GenG4.menu.pnum.GENERIC_G474VEIX.build.product_line=STM32G474xx
-GenG4.menu.pnum.GENERIC_G474VEIX.build.variant=STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)
+GenG4.menu.pnum.GENERIC_G474VEHX.build.variant=STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)
# Generic G474VBTx
GenG4.menu.pnum.GENERIC_G474VBTX=Generic G474VBTx
@@ -129,7 +81,7 @@ GenG4.menu.pnum.GENERIC_G474VBTX.upload.maximum_size=131072
GenG4.menu.pnum.GENERIC_G474VBTX.upload.maximum_data_size=131072
GenG4.menu.pnum.GENERIC_G474VBTX.build.board=GENERIC_G474VBTX
GenG4.menu.pnum.GENERIC_G474VBTX.build.product_line=STM32G474xx
-GenG4.menu.pnum.GENERIC_G474VBTX.build.variant=STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)
+GenG4.menu.pnum.GENERIC_G474VBTX.build.variant=STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)
# Generic G474VCTx
GenG4.menu.pnum.GENERIC_G474VCTX=Generic G474VCTx
@@ -137,7 +89,7 @@ GenG4.menu.pnum.GENERIC_G474VCTX.upload.maximum_size=262144
GenG4.menu.pnum.GENERIC_G474VCTX.upload.maximum_data_size=131072
GenG4.menu.pnum.GENERIC_G474VCTX.build.board=GENERIC_G474VCTX
GenG4.menu.pnum.GENERIC_G474VCTX.build.product_line=STM32G474xx
-GenG4.menu.pnum.GENERIC_G474VCTX.build.variant=STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)
+GenG4.menu.pnum.GENERIC_G474VCTX.build.variant=STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)
# Generic G474VETx
GenG4.menu.pnum.GENERIC_G474VETX=Generic G474VETx
@@ -145,7 +97,7 @@ GenG4.menu.pnum.GENERIC_G474VETX.upload.maximum_size=524288
GenG4.menu.pnum.GENERIC_G474VETX.upload.maximum_data_size=131072
GenG4.menu.pnum.GENERIC_G474VETX.build.board=GENERIC_G474VETX
GenG4.menu.pnum.GENERIC_G474VETX.build.product_line=STM32G474xx
-GenG4.menu.pnum.GENERIC_G474VETX.build.variant=STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)
+GenG4.menu.pnum.GENERIC_G474VETX.build.variant=STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)
# Generic G483VEHx
GenG4.menu.pnum.GENERIC_G483VEHX=Generic G483VEHx
@@ -153,15 +105,7 @@ GenG4.menu.pnum.GENERIC_G483VEHX.upload.maximum_size=524288
GenG4.menu.pnum.GENERIC_G483VEHX.upload.maximum_data_size=131072
GenG4.menu.pnum.GENERIC_G483VEHX.build.board=GENERIC_G483VEHX
GenG4.menu.pnum.GENERIC_G483VEHX.build.product_line=STM32G483xx
-GenG4.menu.pnum.GENERIC_G483VEHX.build.variant=STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)
-
-# Generic G483VEIx
-GenG4.menu.pnum.GENERIC_G483VEIX=Generic G483VEIx
-GenG4.menu.pnum.GENERIC_G483VEIX.upload.maximum_size=524288
-GenG4.menu.pnum.GENERIC_G483VEIX.upload.maximum_data_size=131072
-GenG4.menu.pnum.GENERIC_G483VEIX.build.board=GENERIC_G483VEIX
-GenG4.menu.pnum.GENERIC_G483VEIX.build.product_line=STM32G483xx
-GenG4.menu.pnum.GENERIC_G483VEIX.build.variant=STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)
+GenG4.menu.pnum.GENERIC_G483VEHX.build.variant=STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)
# Generic G483VETx
GenG4.menu.pnum.GENERIC_G483VETX=Generic G483VETx
@@ -169,7 +113,7 @@ GenG4.menu.pnum.GENERIC_G483VETX.upload.maximum_size=524288
GenG4.menu.pnum.GENERIC_G483VETX.upload.maximum_data_size=131072
GenG4.menu.pnum.GENERIC_G483VETX.build.board=GENERIC_G483VETX
GenG4.menu.pnum.GENERIC_G483VETX.build.product_line=STM32G483xx
-GenG4.menu.pnum.GENERIC_G483VETX.build.variant=STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)
+GenG4.menu.pnum.GENERIC_G483VETX.build.variant=STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)
# Generic G484VEHx
GenG4.menu.pnum.GENERIC_G484VEHX=Generic G484VEHx
@@ -177,15 +121,7 @@ GenG4.menu.pnum.GENERIC_G484VEHX.upload.maximum_size=524288
GenG4.menu.pnum.GENERIC_G484VEHX.upload.maximum_data_size=131072
GenG4.menu.pnum.GENERIC_G484VEHX.build.board=GENERIC_G484VEHX
GenG4.menu.pnum.GENERIC_G484VEHX.build.product_line=STM32G484xx
-GenG4.menu.pnum.GENERIC_G484VEHX.build.variant=STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)
-
-# Generic G484VEIx
-GenG4.menu.pnum.GENERIC_G484VEIX=Generic G484VEIx
-GenG4.menu.pnum.GENERIC_G484VEIX.upload.maximum_size=524288
-GenG4.menu.pnum.GENERIC_G484VEIX.upload.maximum_data_size=131072
-GenG4.menu.pnum.GENERIC_G484VEIX.build.board=GENERIC_G484VEIX
-GenG4.menu.pnum.GENERIC_G484VEIX.build.product_line=STM32G484xx
-GenG4.menu.pnum.GENERIC_G484VEIX.build.variant=STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)
+GenG4.menu.pnum.GENERIC_G484VEHX.build.variant=STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)
# Generic G484VETx
GenG4.menu.pnum.GENERIC_G484VETX=Generic G484VETx
@@ -193,5 +129,5 @@ GenG4.menu.pnum.GENERIC_G484VETX.upload.maximum_size=524288
GenG4.menu.pnum.GENERIC_G484VETX.upload.maximum_data_size=131072
GenG4.menu.pnum.GENERIC_G484VETX.build.board=GENERIC_G484VETX
GenG4.menu.pnum.GENERIC_G484VETX.build.product_line=STM32G484xx
-GenG4.menu.pnum.GENERIC_G484VETX.build.variant=STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)
+GenG4.menu.pnum.GENERIC_G484VETX.build.variant=STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)
diff --git a/variants/STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)/generic_clock.c b/variants/STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)/generic_clock.c
similarity index 61%
rename from variants/STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)/generic_clock.c
rename to variants/STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)/generic_clock.c
index 7c957f1293..f934bab798 100644
--- a/variants/STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)/generic_clock.c
+++ b/variants/STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)/generic_clock.c
@@ -1,6 +1,6 @@
/*
*******************************************************************************
- * Copyright (c) 2020-2021, STMicroelectronics
+ * Copyright (c) 2020, STMicroelectronics
* All rights reserved.
*
* This software component is licensed by ST under BSD 3-Clause license,
@@ -10,18 +10,14 @@
*
*******************************************************************************
*/
-#if defined(ARDUINO_GENERIC_G473VBHX) || defined(ARDUINO_GENERIC_G473VBIX) ||\
- defined(ARDUINO_GENERIC_G473VBTX) || defined(ARDUINO_GENERIC_G473VCHX) ||\
- defined(ARDUINO_GENERIC_G473VCIX) || defined(ARDUINO_GENERIC_G473VCTX) ||\
- defined(ARDUINO_GENERIC_G473VEHX) || defined(ARDUINO_GENERIC_G473VEIX) ||\
- defined(ARDUINO_GENERIC_G473VETX) || defined(ARDUINO_GENERIC_G474VBHX) ||\
- defined(ARDUINO_GENERIC_G474VBIX) || defined(ARDUINO_GENERIC_G474VBTX) ||\
- defined(ARDUINO_GENERIC_G474VCHX) || defined(ARDUINO_GENERIC_G474VCIX) ||\
- defined(ARDUINO_GENERIC_G474VCTX) || defined(ARDUINO_GENERIC_G474VEHX) ||\
- defined(ARDUINO_GENERIC_G474VEIX) || defined(ARDUINO_GENERIC_G474VETX) ||\
- defined(ARDUINO_GENERIC_G483VEHX) || defined(ARDUINO_GENERIC_G483VEIX) ||\
- defined(ARDUINO_GENERIC_G483VETX) || defined(ARDUINO_GENERIC_G484VEHX) ||\
- defined(ARDUINO_GENERIC_G484VEIX) || defined(ARDUINO_GENERIC_G484VETX)
+#if defined(ARDUINO_GENERIC_G473VBHX) || defined(ARDUINO_GENERIC_G473VBTX) ||\
+ defined(ARDUINO_GENERIC_G473VCHX) || defined(ARDUINO_GENERIC_G473VCTX) ||\
+ defined(ARDUINO_GENERIC_G473VEHX) || defined(ARDUINO_GENERIC_G473VETX) ||\
+ defined(ARDUINO_GENERIC_G474VBHX) || defined(ARDUINO_GENERIC_G474VBTX) ||\
+ defined(ARDUINO_GENERIC_G474VCHX) || defined(ARDUINO_GENERIC_G474VCTX) ||\
+ defined(ARDUINO_GENERIC_G474VEHX) || defined(ARDUINO_GENERIC_G474VETX) ||\
+ defined(ARDUINO_GENERIC_G483VEHX) || defined(ARDUINO_GENERIC_G483VETX) ||\
+ defined(ARDUINO_GENERIC_G484VEHX) || defined(ARDUINO_GENERIC_G484VETX)
#include "pins_arduino.h"
/**
diff --git a/variants/STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)/variant_generic.cpp b/variants/STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)/variant_generic.cpp
similarity index 84%
rename from variants/STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)/variant_generic.cpp
rename to variants/STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)/variant_generic.cpp
index a7d2e00c56..148cedac2d 100644
--- a/variants/STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)/variant_generic.cpp
+++ b/variants/STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)/variant_generic.cpp
@@ -10,18 +10,14 @@
*
*******************************************************************************
*/
-#if defined(ARDUINO_GENERIC_G473VBHX) || defined(ARDUINO_GENERIC_G473VBIX) ||\
- defined(ARDUINO_GENERIC_G473VBTX) || defined(ARDUINO_GENERIC_G473VCHX) ||\
- defined(ARDUINO_GENERIC_G473VCIX) || defined(ARDUINO_GENERIC_G473VCTX) ||\
- defined(ARDUINO_GENERIC_G473VEHX) || defined(ARDUINO_GENERIC_G473VEIX) ||\
- defined(ARDUINO_GENERIC_G473VETX) || defined(ARDUINO_GENERIC_G474VBHX) ||\
- defined(ARDUINO_GENERIC_G474VBIX) || defined(ARDUINO_GENERIC_G474VBTX) ||\
- defined(ARDUINO_GENERIC_G474VCHX) || defined(ARDUINO_GENERIC_G474VCIX) ||\
- defined(ARDUINO_GENERIC_G474VCTX) || defined(ARDUINO_GENERIC_G474VEHX) ||\
- defined(ARDUINO_GENERIC_G474VEIX) || defined(ARDUINO_GENERIC_G474VETX) ||\
- defined(ARDUINO_GENERIC_G483VEHX) || defined(ARDUINO_GENERIC_G483VEIX) ||\
- defined(ARDUINO_GENERIC_G483VETX) || defined(ARDUINO_GENERIC_G484VEHX) ||\
- defined(ARDUINO_GENERIC_G484VEIX) || defined(ARDUINO_GENERIC_G484VETX)
+#if defined(ARDUINO_GENERIC_G473VBHX) || defined(ARDUINO_GENERIC_G473VBTX) ||\
+ defined(ARDUINO_GENERIC_G473VCHX) || defined(ARDUINO_GENERIC_G473VCTX) ||\
+ defined(ARDUINO_GENERIC_G473VEHX) || defined(ARDUINO_GENERIC_G473VETX) ||\
+ defined(ARDUINO_GENERIC_G474VBHX) || defined(ARDUINO_GENERIC_G474VBTX) ||\
+ defined(ARDUINO_GENERIC_G474VCHX) || defined(ARDUINO_GENERIC_G474VCTX) ||\
+ defined(ARDUINO_GENERIC_G474VEHX) || defined(ARDUINO_GENERIC_G474VETX) ||\
+ defined(ARDUINO_GENERIC_G483VEHX) || defined(ARDUINO_GENERIC_G483VETX) ||\
+ defined(ARDUINO_GENERIC_G484VEHX) || defined(ARDUINO_GENERIC_G484VETX)
#include "pins_arduino.h"
// Digital PinName array
diff --git a/variants/STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)/variant_generic.h b/variants/STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)/variant_generic.h
similarity index 100%
rename from variants/STM32G4xx/G473V(B-C-E)(H-I-T)_G474V(B-C-E)(H-I-T)_G483VE(H-I-T)_G484VE(H-I-T)/variant_generic.h
rename to variants/STM32G4xx/G473V(B-C-E)(H-T)_G474V(B-C-E)(H-T)_G483VE(H-T)_G484VE(H-T)/variant_generic.h
From edfff68279f149221af0b855db323ed072989995 Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Thu, 5 May 2022 07:44:26 +0200
Subject: [PATCH 13/16] variant: update generated files with HAL legacy module
definitions
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
variants/STM32F0xx/F042C(4-6)(T-U)/PeripheralPins.c | 4 ++--
variants/STM32F0xx/F042F(4-6)P/PeripheralPins.c | 4 ++--
variants/STM32F0xx/F042G(4-6)U/PeripheralPins.c | 4 ++--
variants/STM32F0xx/F042K(4-6)T/PeripheralPins.c | 4 ++--
variants/STM32F0xx/F042K(4-6)U/PeripheralPins.c | 4 ++--
variants/STM32F0xx/F042T6Y/PeripheralPins.c | 4 ++--
.../STM32F0xx/F072C8(T-U)_F072CB(T-U-Y)/PeripheralPins.c | 4 ++--
variants/STM32F0xx/F072R8T_F072RB(H-I-T)/PeripheralPins.c | 4 ++--
variants/STM32F0xx/F072V(8-B)(H-T)/PeripheralPins.c | 4 ++--
variants/STM32F0xx/F091C(B-C)(T-U)/PeripheralPins.c | 4 ++--
variants/STM32F0xx/F091RBT_F091RC(H-T-Y)/PeripheralPins.c | 4 ++--
variants/STM32F0xx/F091VBT_F091VC(H-T)/PeripheralPins.c | 4 ++--
variants/STM32F0xx/F098CC(T-U)/PeripheralPins.c | 4 ++--
variants/STM32F0xx/F098RC(H-T-Y)/PeripheralPins.c | 4 ++--
variants/STM32F0xx/F098VC(H-T)/PeripheralPins.c | 4 ++--
variants/STM32F1xx/F103C4T_F103C6(T-U)/PeripheralPins.c | 4 ++--
variants/STM32F1xx/F103C8T_F103CB(T-U)/PeripheralPins.c | 4 ++--
variants/STM32F1xx/F103R(4-6)H/PeripheralPins.c | 4 ++--
variants/STM32F1xx/F103R(4-6)T/PeripheralPins.c | 4 ++--
variants/STM32F1xx/F103R(8-B)H/PeripheralPins.c | 4 ++--
variants/STM32F1xx/F103R(8-B)T/PeripheralPins.c | 4 ++--
variants/STM32F1xx/F103R(C-D-E)T/PeripheralPins.c | 4 ++--
variants/STM32F1xx/F103R(C-D-E)Y/PeripheralPins.c | 4 ++--
variants/STM32F1xx/F103R(F-G)T/PeripheralPins.c | 4 ++--
variants/STM32F1xx/F103T(4-6)U/PeripheralPins.c | 4 ++--
variants/STM32F1xx/F103T(8-B)U/PeripheralPins.c | 4 ++--
variants/STM32F1xx/F103V(C-D-E)(H-T)/PeripheralPins.c | 4 ++--
variants/STM32F1xx/F103V(F-G)T/PeripheralPins.c | 4 ++--
.../STM32F1xx/F103V8(H-T)_F103VB(H-I-T)/PeripheralPins.c | 4 ++--
variants/STM32F1xx/F103Z(C-D-E)(H-T)/PeripheralPins.c | 4 ++--
variants/STM32F1xx/F103Z(F-G)(H-T)/PeripheralPins.c | 4 ++--
variants/STM32F1xx/F105R(8-B-C)T/PeripheralPins.c | 4 ++--
variants/STM32F1xx/F105V(8-B)(H-T)_F105VCT/PeripheralPins.c | 4 ++--
variants/STM32F1xx/F107R(B-C)T/PeripheralPins.c | 4 ++--
variants/STM32F1xx/F107VBT_F107VC(H-T)/PeripheralPins.c | 4 ++--
.../PeripheralPins.c | 4 ++--
.../F205V(B-C-E-F-G)T_F215V(E-G)T/PeripheralPins.c | 4 ++--
.../STM32F2xx/F205Z(C-E-F-G)T_F215Z(E-G)T/PeripheralPins.c | 4 ++--
.../F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)/PeripheralPins.c | 4 ++--
.../STM32F2xx/F207V(C-E-F-G)T_F217V(E-G)T/PeripheralPins.c | 4 ++--
.../STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F302C(B-C)T/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F302C6T_F302C8(T-Y)/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F302K(6-8)U/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F302R(6-8)T/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F302R(B-C)T/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F302R(D-E)T/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F302V(B-C)T/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F302V(D-E)(H-T)/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F302VCY/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F302Z(D-E)T/PeripheralPins.c | 4 ++--
.../STM32F3xx/F303C(6-8)T_F334C(4-6-8)T/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F303C(B-C)T/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F303C8Y_F334C8Y/PeripheralPins.c | 4 ++--
.../STM32F3xx/F303K(6-8)T_F334K(4-6-8)T/PeripheralPins.c | 4 ++--
.../STM32F3xx/F303K(6-8)U_F334K(4-6-8)U/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F303R(6-8)T_F334R(6-8)T/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F303R(B-C)T/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F303R(D-E)T/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F303V(B-C)T/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F303V(D-E)(H-T)/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F303VCY/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F303VEY/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F303Z(D-E)T/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F328C8T/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F358CCT/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F358RCT/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F358VCT/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F373C(8-B-C)T/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F373R(8-B-C)T/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F373V(8-B-C)(H-T)/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F378CCT/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F378RC(T-Y)/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F378VC(H-T)/PeripheralPins.c | 4 ++--
variants/STM32F3xx/F398VET/PeripheralPins.c | 4 ++--
variants/STM32F4xx/F405O(E-G)Y_F415OGY/PeripheralPins.c | 4 ++--
variants/STM32F4xx/F405RGT_F415RGT/PeripheralPins.c | 4 ++--
variants/STM32F4xx/F405VGT_F415VGT/PeripheralPins.c | 4 ++--
variants/STM32F4xx/F405ZGT_F415ZGT/PeripheralPins.c | 4 ++--
.../F407I(E-G)(H-T)_F417I(E-G)(H-T)/PeripheralPins.c | 6 +++---
variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins.c | 6 +++---
variants/STM32F4xx/F407Z(E-G)T_F417Z(E-G)T/PeripheralPins.c | 6 +++---
variants/STM32F4xx/F412C(E-G)U/PeripheralPins.c | 4 ++--
variants/STM32F4xx/F412R(E-G)(T-Y)x(P)/PeripheralPins.c | 4 ++--
variants/STM32F4xx/F412V(E-G)H/PeripheralPins.c | 4 ++--
variants/STM32F4xx/F412V(E-G)T/PeripheralPins.c | 4 ++--
variants/STM32F4xx/F412Z(E-G)(J-T)/PeripheralPins.c | 4 ++--
variants/STM32F4xx/F413C(G-H)U_F423CHU/PeripheralPins.c | 4 ++--
variants/STM32F4xx/F413M(G-H)Y_F423MHY/PeripheralPins.c | 4 ++--
variants/STM32F4xx/F413R(G-H)T_F423RHT/PeripheralPins.c | 4 ++--
variants/STM32F4xx/F413V(G-H)H_F423VHH/PeripheralPins.c | 4 ++--
variants/STM32F4xx/F413V(G-H)T_F423VHT/PeripheralPins.c | 4 ++--
.../STM32F4xx/F413Z(G-H)(J-T)_F423ZH(J-T)/PeripheralPins.c | 4 ++--
.../PeripheralPins.c | 6 +++---
.../PeripheralPins.c | 6 +++---
.../PeripheralPins.c | 6 +++---
.../PeripheralPins.c | 6 +++---
.../PeripheralPins.c | 6 +++---
variants/STM32F4xx/F446M(C-E)Y/PeripheralPins.c | 4 ++--
variants/STM32F4xx/F446R(C-E)T/PeripheralPins.c | 4 ++--
variants/STM32F4xx/F446V(C-E)T/PeripheralPins.c | 4 ++--
variants/STM32F4xx/F446Z(C-E)(H-J-T)/PeripheralPins.c | 4 ++--
.../F469A(E-G-I)(H-Y)_F479A(G-I)(H-Y)/PeripheralPins.c | 4 ++--
.../PeripheralPins.c | 6 +++---
.../F469I(E-G-I)(H-T)_F479I(G-I)(H-T)/PeripheralPins.c | 6 +++---
.../STM32F4xx/F469V(E-G-I)T_F479V(G-I)T/PeripheralPins.c | 4 ++--
.../STM32F4xx/F469Z(E-G-I)T_F479Z(G-I)T/PeripheralPins.c | 4 ++--
.../STM32F7xx/F722I(C-E)(K-T)_F732IE(K-T)/PeripheralPins.c | 4 ++--
.../STM32F7xx/F722R(C-E)T_F730R8T_F732RET/PeripheralPins.c | 4 ++--
.../STM32F7xx/F722V(C-E)T_F730V8T_F732VET/PeripheralPins.c | 4 ++--
variants/STM32F7xx/F722Z(C-E)T_F732ZET/PeripheralPins.c | 4 ++--
.../F723I(C-E)(K-T)_F730I8K_F733IE(K-T)/PeripheralPins.c | 4 ++--
.../STM32F7xx/F723V(C-E)(T-Y)_F733VE(T-Y)/PeripheralPins.c | 4 ++--
.../F723Z(C-E)(I-T)_F730Z8T_F733ZE(I-T)/PeripheralPins.c | 4 ++--
.../PeripheralPins.c | 4 ++--
.../PeripheralPins.c | 4 ++--
.../PeripheralPins.c | 4 ++--
.../PeripheralPins.c | 4 ++--
.../PeripheralPins.c | 4 ++--
.../PeripheralPins.c | 4 ++--
.../PeripheralPins.c | 4 ++--
.../F765Z(G-I)T_F767Z(G-I)T_F777ZIT/PeripheralPins.c | 4 ++--
.../F768AIY_F769A(G-I)Y_F778AIY_F779AIY/PeripheralPins.c | 4 ++--
.../PeripheralPins.c | 4 ++--
variants/STM32F7xx/F769I(G-I)T_F779IIT/PeripheralPins.c | 4 ++--
.../PeripheralPins.c | 2 +-
.../STM32H7xx/H723Z(E-G)I_H730ZBI_H733ZGI/PeripheralPins.c | 2 +-
.../STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT/PeripheralPins.c | 2 +-
.../H725A(E-G)I_H730ABIxQ_H735AGI/PeripheralPins.c | 2 +-
.../H725I(E-G)K_H730IBKxQ_H735IGK/PeripheralPins.c | 2 +-
.../H725I(E-G)T_H730IBTxQ_H735IGT/PeripheralPins.c | 2 +-
variants/STM32H7xx/H725V(E-G)H_H735VGH/PeripheralPins.c | 2 +-
variants/STM32H7xx/H725V(E-G)T_H735VGT/PeripheralPins.c | 2 +-
variants/STM32H7xx/H725VGY_H735VGY/PeripheralPins.c | 2 +-
variants/STM32H7xx/H725Z(E-G)T_H735ZGT/PeripheralPins.c | 2 +-
.../H742A(G-I)I_H743A(G-I)I_H753AII/PeripheralPins.c | 2 +-
.../H742B(G-I)T_H743B(G-I)T_H753BIT/PeripheralPins.c | 2 +-
.../PeripheralPins.c | 2 +-
.../PeripheralPins.c | 2 +-
.../PeripheralPins.c | 2 +-
.../PeripheralPins.c | 2 +-
variants/STM32H7xx/H745B(G-I)T_H755BIT/PeripheralPins.c | 2 +-
variants/STM32H7xx/H745I(G-I)K_H755IIK/PeripheralPins.c | 2 +-
variants/STM32H7xx/H745I(G-I)T_H755IIT/PeripheralPins.c | 2 +-
variants/STM32H7xx/H745Z(G-I)T_H755ZIT/PeripheralPins.c | 2 +-
variants/STM32H7xx/H747B(G-I)T_H757BIT/PeripheralPins.c | 2 +-
variants/STM32H7xx/H747ZIY_H757ZIY/PeripheralPins.c | 2 +-
variants/STM32L4xx/L431C(B-C)(T-U)/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L431C(B-C)Y/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L431K(B-C)U/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L431R(B-C)(I-T-Y)/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L431VC(I-T)/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L432K(B-C)U_L442KCU/PeripheralPins.c | 4 ++--
.../STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L433C(B-C)Y_L443CC(F-Y)/PeripheralPins.c | 4 ++--
.../L433R(B-C)(I-T-Y)_L443RC(I-T-Y)/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L433RCTxP/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L433VC(I-T)_L443VC(I-T)/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L451CCU_L451CE(T-U)/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L451R(C-E)(I-T-Y)/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L451V(C-E)(I-T)/PeripheralPins.c | 4 ++--
.../L452CCU_L452CE(T-U)x(P)_L462CE(T-U)/PeripheralPins.c | 4 ++--
.../PeripheralPins.c | 4 ++--
variants/STM32L4xx/L452RETxP/PeripheralPins.c | 4 ++--
.../STM32L4xx/L452V(C-E)(I-T)_L462VE(I-T)/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L471Q(E-G)I/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L471R(E-G)T/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L471V(E-G)T/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L471Z(E-G)(J-T)/PeripheralPins.c | 4 ++--
.../L475R(C-E-G)T_L476R(C-E-G)T_L486RGT/PeripheralPins.c | 4 ++--
.../L475V(C-E-G)T_L476V(C-E-G)T_L486VGT/PeripheralPins.c | 4 ++--
.../L476J(E-G)Y_L485J(C-E)Y_L486JGY/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L476JGYxP/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L476M(E-G)Y/PeripheralPins.c | 4 ++--
.../STM32L4xx/L476QEI_L476QGIx(P)_L486QGI/PeripheralPins.c | 4 ++--
.../STM32L4xx/L476ZET_L476ZG(J-T)_L486ZGT/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L476ZGTxP/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L496A(E-G)I_L4A6AGI/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L496AGIxP_L4A6AGIxP/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L496Q(E-G)I_L4A6QGI/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L496QGIx(P-S)_L4A6QGIxP/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L496R(E-G)T_L4A6RGT/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L496RGTxP/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L496V(E-G)T_L4A6VGT/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L496VGTxP_L4A6VGTxP/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L496VGY_L4A6VGY/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L496VGYxP_L4A6VGYxP/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L496WGYxP/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L496Z(E-G)T_L4A6ZGT/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L496ZGTxP_L4A6ZGTxP/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L4A6RGTxP/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L4P5A(G-E)I_L4Q5AGI/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L4P5AGIxP_L4Q5AGIxP/PeripheralPins.c | 4 ++--
.../STM32L4xx/L4P5C(E-G)(T-U)_L4Q5CG(T-U)/PeripheralPins.c | 4 ++--
.../STM32L4xx/L4P5CG(T-U)xP_L4Q5CG(T-U)xP/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L4P5Q(G-E)I_L4Q5QGI/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L4P5QGIx(P-S)_L4Q5QGIxP/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L4P5R(G-E)T_L4Q5RGT/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L4P5RGTxP_L4Q5RGTxP/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L4P5V(G-E)T_L4Q5VGT/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L4P5V(G-E)Y_L4Q5VGY/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L4P5VGTxP_L4Q5VGTxP/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L4P5VGYxP_L4Q5VGYxP/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L4P5Z(G-E)T_L4Q5ZGT/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L4P5ZGTxP_L4Q5ZGTxP/PeripheralPins.c | 4 ++--
.../PeripheralPins.c | 4 ++--
.../L4R5QGIx(S)_L4R5QIIx(P)_L4S5QII/PeripheralPins.c | 4 ++--
.../L4R5V(G-I)T_L4R7VIT_L4S5VIT_L4S7VIT/PeripheralPins.c | 4 ++--
.../L4R5Z(G-I)T_L4R7ZIT_L4S5ZIT_L4S7ZIT/PeripheralPins.c | 4 ++--
.../PeripheralPins.c | 4 ++--
variants/STM32L4xx/L4R5ZITxP/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L4R9A(G-I)I_L4S9AII/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L4R9V(G-I)T_L4S9VIT/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L4R9Z(G-I)J_L4S9ZIJ/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L4R9Z(G-I)T_L4S9ZIT/PeripheralPins.c | 4 ++--
variants/STM32L4xx/L4R9ZIYxP/PeripheralPins.c | 4 ++--
216 files changed, 420 insertions(+), 420 deletions(-)
diff --git a/variants/STM32F0xx/F042C(4-6)(T-U)/PeripheralPins.c b/variants/STM32F0xx/F042C(4-6)(T-U)/PeripheralPins.c
index b97856b8b5..b5f02e656b 100644
--- a/variants/STM32F0xx/F042C(4-6)(T-U)/PeripheralPins.c
+++ b/variants/STM32F0xx/F042C(4-6)(T-U)/PeripheralPins.c
@@ -199,7 +199,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
@@ -207,7 +207,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
diff --git a/variants/STM32F0xx/F042F(4-6)P/PeripheralPins.c b/variants/STM32F0xx/F042F(4-6)P/PeripheralPins.c
index 52fe6e3f46..ce60bcb85a 100644
--- a/variants/STM32F0xx/F042F(4-6)P/PeripheralPins.c
+++ b/variants/STM32F0xx/F042F(4-6)P/PeripheralPins.c
@@ -160,7 +160,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11_R, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
@@ -168,7 +168,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12_R, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{NC, NP, 0}
diff --git a/variants/STM32F0xx/F042G(4-6)U/PeripheralPins.c b/variants/STM32F0xx/F042G(4-6)U/PeripheralPins.c
index 3df3198ab7..9ae5aacd59 100644
--- a/variants/STM32F0xx/F042G(4-6)U/PeripheralPins.c
+++ b/variants/STM32F0xx/F042G(4-6)U/PeripheralPins.c
@@ -180,7 +180,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11_R, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
@@ -188,7 +188,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12_R, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{NC, NP, 0}
diff --git a/variants/STM32F0xx/F042K(4-6)T/PeripheralPins.c b/variants/STM32F0xx/F042K(4-6)T/PeripheralPins.c
index 5160a37e52..c842608742 100644
--- a/variants/STM32F0xx/F042K(4-6)T/PeripheralPins.c
+++ b/variants/STM32F0xx/F042K(4-6)T/PeripheralPins.c
@@ -182,7 +182,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
@@ -190,7 +190,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{NC, NP, 0}
diff --git a/variants/STM32F0xx/F042K(4-6)U/PeripheralPins.c b/variants/STM32F0xx/F042K(4-6)U/PeripheralPins.c
index a4e8689cc8..d3c8802ec6 100644
--- a/variants/STM32F0xx/F042K(4-6)U/PeripheralPins.c
+++ b/variants/STM32F0xx/F042K(4-6)U/PeripheralPins.c
@@ -182,7 +182,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
@@ -190,7 +190,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{NC, NP, 0}
diff --git a/variants/STM32F0xx/F042T6Y/PeripheralPins.c b/variants/STM32F0xx/F042T6Y/PeripheralPins.c
index 924fd805a3..2a7db01f3a 100644
--- a/variants/STM32F0xx/F042T6Y/PeripheralPins.c
+++ b/variants/STM32F0xx/F042T6Y/PeripheralPins.c
@@ -182,7 +182,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
@@ -190,7 +190,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{NC, NP, 0}
diff --git a/variants/STM32F0xx/F072C8(T-U)_F072CB(T-U-Y)/PeripheralPins.c b/variants/STM32F0xx/F072C8(T-U)_F072CB(T-U-Y)/PeripheralPins.c
index 6dc0ca6091..8c11b0ee65 100644
--- a/variants/STM32F0xx/F072C8(T-U)_F072CB(T-U-Y)/PeripheralPins.c
+++ b/variants/STM32F0xx/F072C8(T-U)_F072CB(T-U-Y)/PeripheralPins.c
@@ -218,7 +218,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
@@ -226,7 +226,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
diff --git a/variants/STM32F0xx/F072R8T_F072RB(H-I-T)/PeripheralPins.c b/variants/STM32F0xx/F072R8T_F072RB(H-I-T)/PeripheralPins.c
index 84ba6dcb58..10cdea5105 100644
--- a/variants/STM32F0xx/F072R8T_F072RB(H-I-T)/PeripheralPins.c
+++ b/variants/STM32F0xx/F072R8T_F072RB(H-I-T)/PeripheralPins.c
@@ -237,7 +237,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
@@ -245,7 +245,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
diff --git a/variants/STM32F0xx/F072V(8-B)(H-T)/PeripheralPins.c b/variants/STM32F0xx/F072V(8-B)(H-T)/PeripheralPins.c
index 1e5454d6a6..d9d0a35f94 100644
--- a/variants/STM32F0xx/F072V(8-B)(H-T)/PeripheralPins.c
+++ b/variants/STM32F0xx/F072V(8-B)(H-T)/PeripheralPins.c
@@ -267,7 +267,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
@@ -276,7 +276,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
diff --git a/variants/STM32F0xx/F091C(B-C)(T-U)/PeripheralPins.c b/variants/STM32F0xx/F091C(B-C)(T-U)/PeripheralPins.c
index 83185a9947..04cd18448a 100644
--- a/variants/STM32F0xx/F091C(B-C)(T-U)/PeripheralPins.c
+++ b/variants/STM32F0xx/F091C(B-C)(T-U)/PeripheralPins.c
@@ -229,7 +229,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
@@ -237,7 +237,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
diff --git a/variants/STM32F0xx/F091RBT_F091RC(H-T-Y)/PeripheralPins.c b/variants/STM32F0xx/F091RBT_F091RC(H-T-Y)/PeripheralPins.c
index 05b238b739..fe6057f406 100644
--- a/variants/STM32F0xx/F091RBT_F091RC(H-T-Y)/PeripheralPins.c
+++ b/variants/STM32F0xx/F091RBT_F091RC(H-T-Y)/PeripheralPins.c
@@ -261,7 +261,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
@@ -269,7 +269,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
diff --git a/variants/STM32F0xx/F091VBT_F091VC(H-T)/PeripheralPins.c b/variants/STM32F0xx/F091VBT_F091VC(H-T)/PeripheralPins.c
index 6ed3c70d83..0d4e3e37f0 100644
--- a/variants/STM32F0xx/F091VBT_F091VC(H-T)/PeripheralPins.c
+++ b/variants/STM32F0xx/F091VBT_F091VC(H-T)/PeripheralPins.c
@@ -306,7 +306,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
@@ -315,7 +315,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
diff --git a/variants/STM32F0xx/F098CC(T-U)/PeripheralPins.c b/variants/STM32F0xx/F098CC(T-U)/PeripheralPins.c
index b5282efa00..d28b7c3489 100644
--- a/variants/STM32F0xx/F098CC(T-U)/PeripheralPins.c
+++ b/variants/STM32F0xx/F098CC(T-U)/PeripheralPins.c
@@ -228,7 +228,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
@@ -236,7 +236,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
diff --git a/variants/STM32F0xx/F098RC(H-T-Y)/PeripheralPins.c b/variants/STM32F0xx/F098RC(H-T-Y)/PeripheralPins.c
index 1188aa3bac..1c2b73e27a 100644
--- a/variants/STM32F0xx/F098RC(H-T-Y)/PeripheralPins.c
+++ b/variants/STM32F0xx/F098RC(H-T-Y)/PeripheralPins.c
@@ -260,7 +260,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
@@ -268,7 +268,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
diff --git a/variants/STM32F0xx/F098VC(H-T)/PeripheralPins.c b/variants/STM32F0xx/F098VC(H-T)/PeripheralPins.c
index 3a93d342d5..8df49d18cf 100644
--- a/variants/STM32F0xx/F098VC(H-T)/PeripheralPins.c
+++ b/variants/STM32F0xx/F098VC(H-T)/PeripheralPins.c
@@ -305,7 +305,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
@@ -314,7 +314,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
diff --git a/variants/STM32F1xx/F103C4T_F103C6(T-U)/PeripheralPins.c b/variants/STM32F1xx/F103C4T_F103C6(T-U)/PeripheralPins.c
index d910d36833..ab03be893b 100644
--- a/variants/STM32F1xx/F103C4T_F103C6(T-U)/PeripheralPins.c
+++ b/variants/STM32F1xx/F103C4T_F103C6(T-U)/PeripheralPins.c
@@ -195,7 +195,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_NONE)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_CAN1_2)},
@@ -203,7 +203,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_CAN1_2)},
diff --git a/variants/STM32F1xx/F103C8T_F103CB(T-U)/PeripheralPins.c b/variants/STM32F1xx/F103C8T_F103CB(T-U)/PeripheralPins.c
index 51dc22ce5d..67a83fa095 100644
--- a/variants/STM32F1xx/F103C8T_F103CB(T-U)/PeripheralPins.c
+++ b/variants/STM32F1xx/F103C8T_F103CB(T-U)/PeripheralPins.c
@@ -211,7 +211,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_NONE)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_CAN1_2)},
@@ -219,7 +219,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_CAN1_2)},
diff --git a/variants/STM32F1xx/F103R(4-6)H/PeripheralPins.c b/variants/STM32F1xx/F103R(4-6)H/PeripheralPins.c
index 0c084828b9..324b7c133d 100644
--- a/variants/STM32F1xx/F103R(4-6)H/PeripheralPins.c
+++ b/variants/STM32F1xx/F103R(4-6)H/PeripheralPins.c
@@ -209,7 +209,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_NONE)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_CAN1_2)},
@@ -217,7 +217,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_CAN1_2)},
diff --git a/variants/STM32F1xx/F103R(4-6)T/PeripheralPins.c b/variants/STM32F1xx/F103R(4-6)T/PeripheralPins.c
index 9294501060..38c08bbe06 100644
--- a/variants/STM32F1xx/F103R(4-6)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F103R(4-6)T/PeripheralPins.c
@@ -211,7 +211,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_NONE)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_CAN1_2)},
@@ -219,7 +219,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_CAN1_2)},
diff --git a/variants/STM32F1xx/F103R(8-B)H/PeripheralPins.c b/variants/STM32F1xx/F103R(8-B)H/PeripheralPins.c
index bbb8335e23..48ff97e483 100644
--- a/variants/STM32F1xx/F103R(8-B)H/PeripheralPins.c
+++ b/variants/STM32F1xx/F103R(8-B)H/PeripheralPins.c
@@ -227,7 +227,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_NONE)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_CAN1_2)},
@@ -235,7 +235,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_CAN1_2)},
diff --git a/variants/STM32F1xx/F103R(8-B)T/PeripheralPins.c b/variants/STM32F1xx/F103R(8-B)T/PeripheralPins.c
index ae1b68de92..f7dcfa5d53 100644
--- a/variants/STM32F1xx/F103R(8-B)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F103R(8-B)T/PeripheralPins.c
@@ -229,7 +229,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_NONE)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_CAN1_2)},
@@ -237,7 +237,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_CAN1_2)},
diff --git a/variants/STM32F1xx/F103R(C-D-E)T/PeripheralPins.c b/variants/STM32F1xx/F103R(C-D-E)T/PeripheralPins.c
index edd0fb59a1..3388d4a008 100644
--- a/variants/STM32F1xx/F103R(C-D-E)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F103R(C-D-E)T/PeripheralPins.c
@@ -264,7 +264,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_NONE)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_CAN1_2)},
@@ -272,7 +272,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_CAN1_2)},
diff --git a/variants/STM32F1xx/F103R(C-D-E)Y/PeripheralPins.c b/variants/STM32F1xx/F103R(C-D-E)Y/PeripheralPins.c
index bbb749bb59..fb55850aba 100644
--- a/variants/STM32F1xx/F103R(C-D-E)Y/PeripheralPins.c
+++ b/variants/STM32F1xx/F103R(C-D-E)Y/PeripheralPins.c
@@ -261,7 +261,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_NONE)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_CAN1_2)},
@@ -269,7 +269,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_CAN1_2)},
diff --git a/variants/STM32F1xx/F103R(F-G)T/PeripheralPins.c b/variants/STM32F1xx/F103R(F-G)T/PeripheralPins.c
index 2eb4c67842..e72d49b49b 100644
--- a/variants/STM32F1xx/F103R(F-G)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F103R(F-G)T/PeripheralPins.c
@@ -272,7 +272,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_NONE)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_CAN1_2)},
@@ -280,7 +280,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_CAN1_2)},
diff --git a/variants/STM32F1xx/F103T(4-6)U/PeripheralPins.c b/variants/STM32F1xx/F103T(4-6)U/PeripheralPins.c
index 38146d9e69..dccd7d4b93 100644
--- a/variants/STM32F1xx/F103T(4-6)U/PeripheralPins.c
+++ b/variants/STM32F1xx/F103T(4-6)U/PeripheralPins.c
@@ -186,14 +186,14 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_NONE)},
{NC, NP, 0}
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)},
{NC, NP, 0}
diff --git a/variants/STM32F1xx/F103T(8-B)U/PeripheralPins.c b/variants/STM32F1xx/F103T(8-B)U/PeripheralPins.c
index 55a44d05f3..a7554f4eb1 100644
--- a/variants/STM32F1xx/F103T(8-B)U/PeripheralPins.c
+++ b/variants/STM32F1xx/F103T(8-B)U/PeripheralPins.c
@@ -188,14 +188,14 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_NONE)},
{NC, NP, 0}
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)},
{NC, NP, 0}
diff --git a/variants/STM32F1xx/F103V(C-D-E)(H-T)/PeripheralPins.c b/variants/STM32F1xx/F103V(C-D-E)(H-T)/PeripheralPins.c
index 907898a2b9..6fb72e0cd9 100644
--- a/variants/STM32F1xx/F103V(C-D-E)(H-T)/PeripheralPins.c
+++ b/variants/STM32F1xx/F103V(C-D-E)(H-T)/PeripheralPins.c
@@ -283,7 +283,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_NONE)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_CAN1_2)},
@@ -292,7 +292,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_CAN1_2)},
diff --git a/variants/STM32F1xx/F103V(F-G)T/PeripheralPins.c b/variants/STM32F1xx/F103V(F-G)T/PeripheralPins.c
index 24a35b6833..8536778c1a 100644
--- a/variants/STM32F1xx/F103V(F-G)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F103V(F-G)T/PeripheralPins.c
@@ -293,7 +293,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_NONE)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_CAN1_2)},
@@ -302,7 +302,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_CAN1_2)},
diff --git a/variants/STM32F1xx/F103V8(H-T)_F103VB(H-I-T)/PeripheralPins.c b/variants/STM32F1xx/F103V8(H-T)_F103VB(H-I-T)/PeripheralPins.c
index 4655fe41ee..a2d787f37b 100644
--- a/variants/STM32F1xx/F103V8(H-T)_F103VB(H-I-T)/PeripheralPins.c
+++ b/variants/STM32F1xx/F103V8(H-T)_F103VB(H-I-T)/PeripheralPins.c
@@ -249,7 +249,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_NONE)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_CAN1_2)},
@@ -258,7 +258,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_CAN1_2)},
diff --git a/variants/STM32F1xx/F103Z(C-D-E)(H-T)/PeripheralPins.c b/variants/STM32F1xx/F103Z(C-D-E)(H-T)/PeripheralPins.c
index ab8b36960d..abaa630d63 100644
--- a/variants/STM32F1xx/F103Z(C-D-E)(H-T)/PeripheralPins.c
+++ b/variants/STM32F1xx/F103Z(C-D-E)(H-T)/PeripheralPins.c
@@ -288,7 +288,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_NONE)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_CAN1_2)},
@@ -297,7 +297,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_CAN1_2)},
diff --git a/variants/STM32F1xx/F103Z(F-G)(H-T)/PeripheralPins.c b/variants/STM32F1xx/F103Z(F-G)(H-T)/PeripheralPins.c
index 04027dd506..9f9d41b40a 100644
--- a/variants/STM32F1xx/F103Z(F-G)(H-T)/PeripheralPins.c
+++ b/variants/STM32F1xx/F103Z(F-G)(H-T)/PeripheralPins.c
@@ -302,7 +302,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_NONE)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_CAN1_2)},
@@ -311,7 +311,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_CAN1_2)},
diff --git a/variants/STM32F1xx/F105R(8-B-C)T/PeripheralPins.c b/variants/STM32F1xx/F105R(8-B-C)T/PeripheralPins.c
index a00078f729..aae4847051 100644
--- a/variants/STM32F1xx/F105R(8-B-C)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F105R(8-B-C)T/PeripheralPins.c
@@ -253,7 +253,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_CAN1_1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_CAN2_ENABLE)},
@@ -263,7 +263,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_CAN1_1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_CAN2_ENABLE)},
diff --git a/variants/STM32F1xx/F105V(8-B)(H-T)_F105VCT/PeripheralPins.c b/variants/STM32F1xx/F105V(8-B)(H-T)_F105VCT/PeripheralPins.c
index d07c335bca..372600f0fb 100644
--- a/variants/STM32F1xx/F105V(8-B)(H-T)_F105VCT/PeripheralPins.c
+++ b/variants/STM32F1xx/F105V(8-B)(H-T)_F105VCT/PeripheralPins.c
@@ -272,7 +272,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_CAN1_1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_CAN2_ENABLE)},
@@ -283,7 +283,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_CAN1_1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_CAN2_ENABLE)},
diff --git a/variants/STM32F1xx/F107R(B-C)T/PeripheralPins.c b/variants/STM32F1xx/F107R(B-C)T/PeripheralPins.c
index 6e3d5f00c1..e88b0c6e41 100644
--- a/variants/STM32F1xx/F107R(B-C)T/PeripheralPins.c
+++ b/variants/STM32F1xx/F107R(B-C)T/PeripheralPins.c
@@ -251,7 +251,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_CAN1_1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_CAN2_ENABLE)},
@@ -261,7 +261,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_CAN1_1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_CAN2_ENABLE)},
diff --git a/variants/STM32F1xx/F107VBT_F107VC(H-T)/PeripheralPins.c b/variants/STM32F1xx/F107VBT_F107VC(H-T)/PeripheralPins.c
index aefae9307f..57621612f3 100644
--- a/variants/STM32F1xx/F107VBT_F107VC(H-T)/PeripheralPins.c
+++ b/variants/STM32F1xx/F107VBT_F107VC(H-T)/PeripheralPins.c
@@ -270,7 +270,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_CAN1_1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_CAN2_ENABLE)},
@@ -281,7 +281,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_CAN1_1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_CAN2_ENABLE)},
diff --git a/variants/STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T/PeripheralPins.c b/variants/STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T/PeripheralPins.c
index 1f56b50577..3b14d32788 100644
--- a/variants/STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T/PeripheralPins.c
+++ b/variants/STM32F2xx/F205RE(T-Y)_F205R(B-C-F)T_F205RG(E-T-Y)_F215R(E-G)T/PeripheralPins.c
@@ -275,7 +275,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -285,7 +285,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F2xx/F205V(B-C-E-F-G)T_F215V(E-G)T/PeripheralPins.c b/variants/STM32F2xx/F205V(B-C-E-F-G)T_F215V(E-G)T/PeripheralPins.c
index bbdbf42536..7fd9e8377a 100644
--- a/variants/STM32F2xx/F205V(B-C-E-F-G)T_F215V(E-G)T/PeripheralPins.c
+++ b/variants/STM32F2xx/F205V(B-C-E-F-G)T_F215V(E-G)T/PeripheralPins.c
@@ -295,7 +295,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -306,7 +306,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F2xx/F205Z(C-E-F-G)T_F215Z(E-G)T/PeripheralPins.c b/variants/STM32F2xx/F205Z(C-E-F-G)T_F215Z(E-G)T/PeripheralPins.c
index 5f9bf2d83b..b9f9cccc29 100644
--- a/variants/STM32F2xx/F205Z(C-E-F-G)T_F215Z(E-G)T/PeripheralPins.c
+++ b/variants/STM32F2xx/F205Z(C-E-F-G)T_F215Z(E-G)T/PeripheralPins.c
@@ -315,7 +315,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -326,7 +326,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)/PeripheralPins.c b/variants/STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)/PeripheralPins.c
index d2508ed919..555458d7ab 100644
--- a/variants/STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)/PeripheralPins.c
+++ b/variants/STM32F2xx/F207I(C-E-F-G)(H-T)_F217I(E-G)(H-T)/PeripheralPins.c
@@ -337,7 +337,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -349,7 +349,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F2xx/F207V(C-E-F-G)T_F217V(E-G)T/PeripheralPins.c b/variants/STM32F2xx/F207V(C-E-F-G)T_F217V(E-G)T/PeripheralPins.c
index a541c63a15..705361e018 100644
--- a/variants/STM32F2xx/F207V(C-E-F-G)T_F217V(E-G)T/PeripheralPins.c
+++ b/variants/STM32F2xx/F207V(C-E-F-G)T_F217V(E-G)T/PeripheralPins.c
@@ -295,7 +295,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -306,7 +306,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T/PeripheralPins.c b/variants/STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T/PeripheralPins.c
index 729d8b947f..d092d0b236 100644
--- a/variants/STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T/PeripheralPins.c
+++ b/variants/STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T/PeripheralPins.c
@@ -315,7 +315,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -326,7 +326,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F3xx/F302C(B-C)T/PeripheralPins.c b/variants/STM32F3xx/F302C(B-C)T/PeripheralPins.c
index fea2b17045..a9794565af 100644
--- a/variants/STM32F3xx/F302C(B-C)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F302C(B-C)T/PeripheralPins.c
@@ -233,7 +233,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
@@ -241,7 +241,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
diff --git a/variants/STM32F3xx/F302C6T_F302C8(T-Y)/PeripheralPins.c b/variants/STM32F3xx/F302C6T_F302C8(T-Y)/PeripheralPins.c
index eb83fe9abb..32854fca61 100644
--- a/variants/STM32F3xx/F302C6T_F302C8(T-Y)/PeripheralPins.c
+++ b/variants/STM32F3xx/F302C6T_F302C8(T-Y)/PeripheralPins.c
@@ -220,7 +220,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_TIM1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_TIM1)},
@@ -228,7 +228,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_TIM1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_TIM1)},
diff --git a/variants/STM32F3xx/F302K(6-8)U/PeripheralPins.c b/variants/STM32F3xx/F302K(6-8)U/PeripheralPins.c
index 974d3328fb..5ed3405ff4 100644
--- a/variants/STM32F3xx/F302K(6-8)U/PeripheralPins.c
+++ b/variants/STM32F3xx/F302K(6-8)U/PeripheralPins.c
@@ -192,14 +192,14 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_TIM1)},
{NC, NP, 0}
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_TIM1)},
{NC, NP, 0}
diff --git a/variants/STM32F3xx/F302R(6-8)T/PeripheralPins.c b/variants/STM32F3xx/F302R(6-8)T/PeripheralPins.c
index ad048c177b..8576b3a7f5 100644
--- a/variants/STM32F3xx/F302R(6-8)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F302R(6-8)T/PeripheralPins.c
@@ -236,7 +236,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_TIM1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_TIM1)},
@@ -244,7 +244,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_TIM1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_TIM1)},
diff --git a/variants/STM32F3xx/F302R(B-C)T/PeripheralPins.c b/variants/STM32F3xx/F302R(B-C)T/PeripheralPins.c
index 24c736a8e5..a15871cbd0 100644
--- a/variants/STM32F3xx/F302R(B-C)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F302R(B-C)T/PeripheralPins.c
@@ -259,7 +259,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
@@ -267,7 +267,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
diff --git a/variants/STM32F3xx/F302R(D-E)T/PeripheralPins.c b/variants/STM32F3xx/F302R(D-E)T/PeripheralPins.c
index 96dc8352ff..49c5232052 100644
--- a/variants/STM32F3xx/F302R(D-E)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F302R(D-E)T/PeripheralPins.c
@@ -273,7 +273,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
@@ -281,7 +281,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
diff --git a/variants/STM32F3xx/F302V(B-C)T/PeripheralPins.c b/variants/STM32F3xx/F302V(B-C)T/PeripheralPins.c
index 8dfb5ec65c..76f286c6af 100644
--- a/variants/STM32F3xx/F302V(B-C)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F302V(B-C)T/PeripheralPins.c
@@ -301,7 +301,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
@@ -310,7 +310,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
diff --git a/variants/STM32F3xx/F302V(D-E)(H-T)/PeripheralPins.c b/variants/STM32F3xx/F302V(D-E)(H-T)/PeripheralPins.c
index 2f12b72ea3..b6f09d2840 100644
--- a/variants/STM32F3xx/F302V(D-E)(H-T)/PeripheralPins.c
+++ b/variants/STM32F3xx/F302V(D-E)(H-T)/PeripheralPins.c
@@ -324,7 +324,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
@@ -333,7 +333,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
diff --git a/variants/STM32F3xx/F302VCY/PeripheralPins.c b/variants/STM32F3xx/F302VCY/PeripheralPins.c
index a7237fc4c2..526c4e9ef3 100644
--- a/variants/STM32F3xx/F302VCY/PeripheralPins.c
+++ b/variants/STM32F3xx/F302VCY/PeripheralPins.c
@@ -291,7 +291,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
@@ -300,7 +300,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
diff --git a/variants/STM32F3xx/F302Z(D-E)T/PeripheralPins.c b/variants/STM32F3xx/F302Z(D-E)T/PeripheralPins.c
index 0839f02ad6..9b99876d7f 100644
--- a/variants/STM32F3xx/F302Z(D-E)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F302Z(D-E)T/PeripheralPins.c
@@ -325,7 +325,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
@@ -334,7 +334,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
diff --git a/variants/STM32F3xx/F303C(6-8)T_F334C(4-6-8)T/PeripheralPins.c b/variants/STM32F3xx/F303C(6-8)T_F334C(4-6-8)T/PeripheralPins.c
index d97eb31b7e..b0108cc697 100644
--- a/variants/STM32F3xx/F303C(6-8)T_F334C(4-6-8)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F303C(6-8)T_F334C(4-6-8)T/PeripheralPins.c
@@ -223,7 +223,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
@@ -231,7 +231,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
diff --git a/variants/STM32F3xx/F303C(B-C)T/PeripheralPins.c b/variants/STM32F3xx/F303C(B-C)T/PeripheralPins.c
index 5fb6c37baa..e3dc75a569 100644
--- a/variants/STM32F3xx/F303C(B-C)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F303C(B-C)T/PeripheralPins.c
@@ -251,7 +251,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
@@ -259,7 +259,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
diff --git a/variants/STM32F3xx/F303C8Y_F334C8Y/PeripheralPins.c b/variants/STM32F3xx/F303C8Y_F334C8Y/PeripheralPins.c
index 5e2578209c..07eed0b3da 100644
--- a/variants/STM32F3xx/F303C8Y_F334C8Y/PeripheralPins.c
+++ b/variants/STM32F3xx/F303C8Y_F334C8Y/PeripheralPins.c
@@ -230,7 +230,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
@@ -238,7 +238,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
diff --git a/variants/STM32F3xx/F303K(6-8)T_F334K(4-6-8)T/PeripheralPins.c b/variants/STM32F3xx/F303K(6-8)T_F334K(4-6-8)T/PeripheralPins.c
index 6ddd9ced0f..a3a935dba7 100644
--- a/variants/STM32F3xx/F303K(6-8)T_F334K(4-6-8)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F303K(6-8)T_F334K(4-6-8)T/PeripheralPins.c
@@ -198,14 +198,14 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{NC, NP, 0}
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{NC, NP, 0}
diff --git a/variants/STM32F3xx/F303K(6-8)U_F334K(4-6-8)U/PeripheralPins.c b/variants/STM32F3xx/F303K(6-8)U_F334K(4-6-8)U/PeripheralPins.c
index 5946f69e06..c8a2529376 100644
--- a/variants/STM32F3xx/F303K(6-8)U_F334K(4-6-8)U/PeripheralPins.c
+++ b/variants/STM32F3xx/F303K(6-8)U_F334K(4-6-8)U/PeripheralPins.c
@@ -195,14 +195,14 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{NC, NP, 0}
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{NC, NP, 0}
diff --git a/variants/STM32F3xx/F303R(6-8)T_F334R(6-8)T/PeripheralPins.c b/variants/STM32F3xx/F303R(6-8)T_F334R(6-8)T/PeripheralPins.c
index 62b65bb1a6..e949011cf6 100644
--- a/variants/STM32F3xx/F303R(6-8)T_F334R(6-8)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F303R(6-8)T_F334R(6-8)T/PeripheralPins.c
@@ -245,7 +245,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
@@ -253,7 +253,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
diff --git a/variants/STM32F3xx/F303R(B-C)T/PeripheralPins.c b/variants/STM32F3xx/F303R(B-C)T/PeripheralPins.c
index be502988f1..016b6a8589 100644
--- a/variants/STM32F3xx/F303R(B-C)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F303R(B-C)T/PeripheralPins.c
@@ -284,7 +284,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
@@ -292,7 +292,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
diff --git a/variants/STM32F3xx/F303R(D-E)T/PeripheralPins.c b/variants/STM32F3xx/F303R(D-E)T/PeripheralPins.c
index eb2b39ffe2..368bbd894e 100644
--- a/variants/STM32F3xx/F303R(D-E)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F303R(D-E)T/PeripheralPins.c
@@ -298,7 +298,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
@@ -306,7 +306,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
diff --git a/variants/STM32F3xx/F303V(B-C)T/PeripheralPins.c b/variants/STM32F3xx/F303V(B-C)T/PeripheralPins.c
index 9a07f7ec89..a89016c8a1 100644
--- a/variants/STM32F3xx/F303V(B-C)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F303V(B-C)T/PeripheralPins.c
@@ -349,7 +349,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
@@ -358,7 +358,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
diff --git a/variants/STM32F3xx/F303V(D-E)(H-T)/PeripheralPins.c b/variants/STM32F3xx/F303V(D-E)(H-T)/PeripheralPins.c
index ad369750a8..ab61e90b77 100644
--- a/variants/STM32F3xx/F303V(D-E)(H-T)/PeripheralPins.c
+++ b/variants/STM32F3xx/F303V(D-E)(H-T)/PeripheralPins.c
@@ -379,7 +379,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
@@ -388,7 +388,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
diff --git a/variants/STM32F3xx/F303VCY/PeripheralPins.c b/variants/STM32F3xx/F303VCY/PeripheralPins.c
index 6ceb2d9d51..74f5c4c970 100644
--- a/variants/STM32F3xx/F303VCY/PeripheralPins.c
+++ b/variants/STM32F3xx/F303VCY/PeripheralPins.c
@@ -333,7 +333,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
@@ -342,7 +342,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
diff --git a/variants/STM32F3xx/F303VEY/PeripheralPins.c b/variants/STM32F3xx/F303VEY/PeripheralPins.c
index f30ba9bdd7..1f213874eb 100644
--- a/variants/STM32F3xx/F303VEY/PeripheralPins.c
+++ b/variants/STM32F3xx/F303VEY/PeripheralPins.c
@@ -362,7 +362,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
@@ -371,7 +371,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
diff --git a/variants/STM32F3xx/F303Z(D-E)T/PeripheralPins.c b/variants/STM32F3xx/F303Z(D-E)T/PeripheralPins.c
index a586bec29a..4af9ba1688 100644
--- a/variants/STM32F3xx/F303Z(D-E)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F303Z(D-E)T/PeripheralPins.c
@@ -392,7 +392,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
@@ -401,7 +401,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
diff --git a/variants/STM32F3xx/F328C8T/PeripheralPins.c b/variants/STM32F3xx/F328C8T/PeripheralPins.c
index ba4e065132..00c7c12658 100644
--- a/variants/STM32F3xx/F328C8T/PeripheralPins.c
+++ b/variants/STM32F3xx/F328C8T/PeripheralPins.c
@@ -222,7 +222,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
@@ -230,7 +230,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
diff --git a/variants/STM32F3xx/F358CCT/PeripheralPins.c b/variants/STM32F3xx/F358CCT/PeripheralPins.c
index 2ae46a1a83..2113ff3f21 100644
--- a/variants/STM32F3xx/F358CCT/PeripheralPins.c
+++ b/variants/STM32F3xx/F358CCT/PeripheralPins.c
@@ -250,7 +250,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
@@ -258,7 +258,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
diff --git a/variants/STM32F3xx/F358RCT/PeripheralPins.c b/variants/STM32F3xx/F358RCT/PeripheralPins.c
index 25888e09b3..66ebc2b7cd 100644
--- a/variants/STM32F3xx/F358RCT/PeripheralPins.c
+++ b/variants/STM32F3xx/F358RCT/PeripheralPins.c
@@ -283,7 +283,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
@@ -291,7 +291,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
diff --git a/variants/STM32F3xx/F358VCT/PeripheralPins.c b/variants/STM32F3xx/F358VCT/PeripheralPins.c
index 5780c07798..3259df1787 100644
--- a/variants/STM32F3xx/F358VCT/PeripheralPins.c
+++ b/variants/STM32F3xx/F358VCT/PeripheralPins.c
@@ -348,7 +348,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
@@ -357,7 +357,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
diff --git a/variants/STM32F3xx/F373C(8-B-C)T/PeripheralPins.c b/variants/STM32F3xx/F373C(8-B-C)T/PeripheralPins.c
index ec01ebb5bd..e784011ca1 100644
--- a/variants/STM32F3xx/F373C(8-B-C)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F373C(8-B-C)T/PeripheralPins.c
@@ -263,7 +263,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
@@ -271,7 +271,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
diff --git a/variants/STM32F3xx/F373R(8-B-C)T/PeripheralPins.c b/variants/STM32F3xx/F373R(8-B-C)T/PeripheralPins.c
index c09cd20d6e..50a3baf41a 100644
--- a/variants/STM32F3xx/F373R(8-B-C)T/PeripheralPins.c
+++ b/variants/STM32F3xx/F373R(8-B-C)T/PeripheralPins.c
@@ -299,7 +299,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
@@ -307,7 +307,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
diff --git a/variants/STM32F3xx/F373V(8-B-C)(H-T)/PeripheralPins.c b/variants/STM32F3xx/F373V(8-B-C)(H-T)/PeripheralPins.c
index 166ba0f3af..d8a97c8d84 100644
--- a/variants/STM32F3xx/F373V(8-B-C)(H-T)/PeripheralPins.c
+++ b/variants/STM32F3xx/F373V(8-B-C)(H-T)/PeripheralPins.c
@@ -321,7 +321,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
@@ -330,7 +330,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
diff --git a/variants/STM32F3xx/F378CCT/PeripheralPins.c b/variants/STM32F3xx/F378CCT/PeripheralPins.c
index 18c6b1124b..ee43864b43 100644
--- a/variants/STM32F3xx/F378CCT/PeripheralPins.c
+++ b/variants/STM32F3xx/F378CCT/PeripheralPins.c
@@ -263,7 +263,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
@@ -271,7 +271,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
diff --git a/variants/STM32F3xx/F378RC(T-Y)/PeripheralPins.c b/variants/STM32F3xx/F378RC(T-Y)/PeripheralPins.c
index 93a7602b5c..a96d3c5fb5 100644
--- a/variants/STM32F3xx/F378RC(T-Y)/PeripheralPins.c
+++ b/variants/STM32F3xx/F378RC(T-Y)/PeripheralPins.c
@@ -299,7 +299,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
@@ -307,7 +307,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
diff --git a/variants/STM32F3xx/F378VC(H-T)/PeripheralPins.c b/variants/STM32F3xx/F378VC(H-T)/PeripheralPins.c
index 5ad380c69c..fb7d8b1dfc 100644
--- a/variants/STM32F3xx/F378VC(H-T)/PeripheralPins.c
+++ b/variants/STM32F3xx/F378VC(H-T)/PeripheralPins.c
@@ -321,7 +321,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
@@ -330,7 +330,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
diff --git a/variants/STM32F3xx/F398VET/PeripheralPins.c b/variants/STM32F3xx/F398VET/PeripheralPins.c
index ef1fec092b..80b0b7b19f 100644
--- a/variants/STM32F3xx/F398VET/PeripheralPins.c
+++ b/variants/STM32F3xx/F398VET/PeripheralPins.c
@@ -378,7 +378,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
@@ -387,7 +387,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
diff --git a/variants/STM32F4xx/F405O(E-G)Y_F415OGY/PeripheralPins.c b/variants/STM32F4xx/F405O(E-G)Y_F415OGY/PeripheralPins.c
index 4d9e855411..822ce461a6 100644
--- a/variants/STM32F4xx/F405O(E-G)Y_F415OGY/PeripheralPins.c
+++ b/variants/STM32F4xx/F405O(E-G)Y_F415OGY/PeripheralPins.c
@@ -287,7 +287,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -298,7 +298,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F4xx/F405RGT_F415RGT/PeripheralPins.c b/variants/STM32F4xx/F405RGT_F415RGT/PeripheralPins.c
index e0c22e0d85..63b79131a3 100644
--- a/variants/STM32F4xx/F405RGT_F415RGT/PeripheralPins.c
+++ b/variants/STM32F4xx/F405RGT_F415RGT/PeripheralPins.c
@@ -274,7 +274,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -284,7 +284,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F4xx/F405VGT_F415VGT/PeripheralPins.c b/variants/STM32F4xx/F405VGT_F415VGT/PeripheralPins.c
index 38cbbf7df2..1eede8bf6f 100644
--- a/variants/STM32F4xx/F405VGT_F415VGT/PeripheralPins.c
+++ b/variants/STM32F4xx/F405VGT_F415VGT/PeripheralPins.c
@@ -295,7 +295,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -306,7 +306,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F4xx/F405ZGT_F415ZGT/PeripheralPins.c b/variants/STM32F4xx/F405ZGT_F415ZGT/PeripheralPins.c
index 719a364379..1fab216bad 100644
--- a/variants/STM32F4xx/F405ZGT_F415ZGT/PeripheralPins.c
+++ b/variants/STM32F4xx/F405ZGT_F415ZGT/PeripheralPins.c
@@ -315,7 +315,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -326,7 +326,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F4xx/F407I(E-G)(H-T)_F417I(E-G)(H-T)/PeripheralPins.c b/variants/STM32F4xx/F407I(E-G)(H-T)_F417I(E-G)(H-T)/PeripheralPins.c
index d32965c9f4..05212e2630 100644
--- a/variants/STM32F4xx/F407I(E-G)(H-T)_F417I(E-G)(H-T)/PeripheralPins.c
+++ b/variants/STM32F4xx/F407I(E-G)(H-T)_F417I(E-G)(H-T)/PeripheralPins.c
@@ -337,7 +337,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -349,7 +349,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -363,7 +363,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins.c b/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins.c
index 86acd2fb08..5ebb98ba7c 100644
--- a/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins.c
+++ b/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins.c
@@ -295,7 +295,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -306,7 +306,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -319,7 +319,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32F4xx/F407Z(E-G)T_F417Z(E-G)T/PeripheralPins.c b/variants/STM32F4xx/F407Z(E-G)T_F417Z(E-G)T/PeripheralPins.c
index 18c785f239..1a4818ba42 100644
--- a/variants/STM32F4xx/F407Z(E-G)T_F417Z(E-G)T/PeripheralPins.c
+++ b/variants/STM32F4xx/F407Z(E-G)T_F417Z(E-G)T/PeripheralPins.c
@@ -315,7 +315,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -326,7 +326,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -339,7 +339,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32F4xx/F412C(E-G)U/PeripheralPins.c b/variants/STM32F4xx/F412C(E-G)U/PeripheralPins.c
index 6d8add1adc..63a46f879e 100644
--- a/variants/STM32F4xx/F412C(E-G)U/PeripheralPins.c
+++ b/variants/STM32F4xx/F412C(E-G)U/PeripheralPins.c
@@ -225,7 +225,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -235,7 +235,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F4xx/F412R(E-G)(T-Y)x(P)/PeripheralPins.c b/variants/STM32F4xx/F412R(E-G)(T-Y)x(P)/PeripheralPins.c
index 09c5eff60a..4fcb3d7fd6 100644
--- a/variants/STM32F4xx/F412R(E-G)(T-Y)x(P)/PeripheralPins.c
+++ b/variants/STM32F4xx/F412R(E-G)(T-Y)x(P)/PeripheralPins.c
@@ -254,7 +254,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -264,7 +264,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F4xx/F412V(E-G)H/PeripheralPins.c b/variants/STM32F4xx/F412V(E-G)H/PeripheralPins.c
index bed1a75a86..b9c2df2e7d 100644
--- a/variants/STM32F4xx/F412V(E-G)H/PeripheralPins.c
+++ b/variants/STM32F4xx/F412V(E-G)H/PeripheralPins.c
@@ -294,7 +294,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -305,7 +305,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F4xx/F412V(E-G)T/PeripheralPins.c b/variants/STM32F4xx/F412V(E-G)T/PeripheralPins.c
index 4c600d2992..48b46f87d7 100644
--- a/variants/STM32F4xx/F412V(E-G)T/PeripheralPins.c
+++ b/variants/STM32F4xx/F412V(E-G)T/PeripheralPins.c
@@ -292,7 +292,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -303,7 +303,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F4xx/F412Z(E-G)(J-T)/PeripheralPins.c b/variants/STM32F4xx/F412Z(E-G)(J-T)/PeripheralPins.c
index 3d36c8c5c6..50bd856aad 100644
--- a/variants/STM32F4xx/F412Z(E-G)(J-T)/PeripheralPins.c
+++ b/variants/STM32F4xx/F412Z(E-G)(J-T)/PeripheralPins.c
@@ -311,7 +311,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -324,7 +324,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F4xx/F413C(G-H)U_F423CHU/PeripheralPins.c b/variants/STM32F4xx/F413C(G-H)U_F423CHU/PeripheralPins.c
index e06d56c948..b7d918825c 100644
--- a/variants/STM32F4xx/F413C(G-H)U_F423CHU/PeripheralPins.c
+++ b/variants/STM32F4xx/F413C(G-H)U_F423CHU/PeripheralPins.c
@@ -250,7 +250,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_8, CAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_CAN3)},
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -262,7 +262,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PA_15, CAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_CAN3)},
diff --git a/variants/STM32F4xx/F413M(G-H)Y_F423MHY/PeripheralPins.c b/variants/STM32F4xx/F413M(G-H)Y_F423MHY/PeripheralPins.c
index 982f88191a..be121bd0fa 100644
--- a/variants/STM32F4xx/F413M(G-H)Y_F423MHY/PeripheralPins.c
+++ b/variants/STM32F4xx/F413M(G-H)Y_F423MHY/PeripheralPins.c
@@ -299,7 +299,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_8, CAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_CAN3)},
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -312,7 +312,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PA_15, CAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_CAN3)},
diff --git a/variants/STM32F4xx/F413R(G-H)T_F423RHT/PeripheralPins.c b/variants/STM32F4xx/F413R(G-H)T_F423RHT/PeripheralPins.c
index 408d962b9d..ec02b4cceb 100644
--- a/variants/STM32F4xx/F413R(G-H)T_F423RHT/PeripheralPins.c
+++ b/variants/STM32F4xx/F413R(G-H)T_F423RHT/PeripheralPins.c
@@ -282,7 +282,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_8, CAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_CAN3)},
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -294,7 +294,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PA_15, CAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_CAN3)},
diff --git a/variants/STM32F4xx/F413V(G-H)H_F423VHH/PeripheralPins.c b/variants/STM32F4xx/F413V(G-H)H_F423VHH/PeripheralPins.c
index d4d0f14e9c..f559d2343a 100644
--- a/variants/STM32F4xx/F413V(G-H)H_F423VHH/PeripheralPins.c
+++ b/variants/STM32F4xx/F413V(G-H)H_F423VHH/PeripheralPins.c
@@ -334,7 +334,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_8, CAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_CAN3)},
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -347,7 +347,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PA_15, CAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_CAN3)},
diff --git a/variants/STM32F4xx/F413V(G-H)T_F423VHT/PeripheralPins.c b/variants/STM32F4xx/F413V(G-H)T_F423VHT/PeripheralPins.c
index 0012843809..62f011137d 100644
--- a/variants/STM32F4xx/F413V(G-H)T_F423VHT/PeripheralPins.c
+++ b/variants/STM32F4xx/F413V(G-H)T_F423VHT/PeripheralPins.c
@@ -332,7 +332,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_8, CAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_CAN3)},
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -345,7 +345,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PA_15, CAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_CAN3)},
diff --git a/variants/STM32F4xx/F413Z(G-H)(J-T)_F423ZH(J-T)/PeripheralPins.c b/variants/STM32F4xx/F413Z(G-H)(J-T)_F423ZH(J-T)/PeripheralPins.c
index db8b1664a6..36be3062a6 100644
--- a/variants/STM32F4xx/F413Z(G-H)(J-T)_F423ZH(J-T)/PeripheralPins.c
+++ b/variants/STM32F4xx/F413Z(G-H)(J-T)_F423ZH(J-T)/PeripheralPins.c
@@ -360,7 +360,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_8, CAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_CAN3)},
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -375,7 +375,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PA_15, CAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_CAN3)},
diff --git a/variants/STM32F4xx/F427A(G-I)H_F429A(G-I)H_F437AIH_F439AIH/PeripheralPins.c b/variants/STM32F4xx/F427A(G-I)H_F429A(G-I)H_F437AIH_F439AIH/PeripheralPins.c
index 9261c6c955..b223863c89 100644
--- a/variants/STM32F4xx/F427A(G-I)H_F429A(G-I)H_F437AIH_F439AIH/PeripheralPins.c
+++ b/variants/STM32F4xx/F427A(G-I)H_F429A(G-I)H_F437AIH_F439AIH/PeripheralPins.c
@@ -344,7 +344,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -356,7 +356,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -370,7 +370,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32F4xx/F427I(G-I)(H-T)_F429I(E-G-I)(H-T)_F437I(G-I)(H-T)_F439I(G-I)(H-T)/PeripheralPins.c b/variants/STM32F4xx/F427I(G-I)(H-T)_F429I(E-G-I)(H-T)_F437I(G-I)(H-T)_F439I(G-I)(H-T)/PeripheralPins.c
index 661ded1d89..b0d637898d 100644
--- a/variants/STM32F4xx/F427I(G-I)(H-T)_F429I(E-G-I)(H-T)_F437I(G-I)(H-T)_F439I(G-I)(H-T)/PeripheralPins.c
+++ b/variants/STM32F4xx/F427I(G-I)(H-T)_F429I(E-G-I)(H-T)_F437I(G-I)(H-T)_F439I(G-I)(H-T)/PeripheralPins.c
@@ -370,7 +370,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -382,7 +382,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -396,7 +396,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32F4xx/F427V(G-I)T_F429V(E-G-I)T_F437V(G-I)T_F439V(G-I)T/PeripheralPins.c b/variants/STM32F4xx/F427V(G-I)T_F429V(E-G-I)T_F437V(G-I)T_F439V(G-I)T/PeripheralPins.c
index 527fc2f80f..4fcad97e45 100644
--- a/variants/STM32F4xx/F427V(G-I)T_F429V(E-G-I)T_F437V(G-I)T_F439V(G-I)T/PeripheralPins.c
+++ b/variants/STM32F4xx/F427V(G-I)T_F429V(E-G-I)T_F437V(G-I)T_F439V(G-I)T/PeripheralPins.c
@@ -311,7 +311,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -322,7 +322,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -335,7 +335,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32F4xx/F427Z(G-I)T_F429ZET_F429Z(G-I)(T-Y)_F437Z(G-I)T_F439Z(G-I)(T-Y)/PeripheralPins.c b/variants/STM32F4xx/F427Z(G-I)T_F429ZET_F429Z(G-I)(T-Y)_F437Z(G-I)T_F439Z(G-I)(T-Y)/PeripheralPins.c
index 3d718c2828..49b932beef 100644
--- a/variants/STM32F4xx/F427Z(G-I)T_F429ZET_F429Z(G-I)(T-Y)_F437Z(G-I)T_F439Z(G-I)(T-Y)/PeripheralPins.c
+++ b/variants/STM32F4xx/F427Z(G-I)T_F429ZET_F429Z(G-I)(T-Y)_F437Z(G-I)T_F439Z(G-I)(T-Y)/PeripheralPins.c
@@ -343,7 +343,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -354,7 +354,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -367,7 +367,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32F4xx/F429B(E-G-I)T_F429N(E-G-I)H_F439B(G-I)T_F439N(G-I)H/PeripheralPins.c b/variants/STM32F4xx/F429B(E-G-I)T_F429N(E-G-I)H_F439B(G-I)T_F439N(G-I)H/PeripheralPins.c
index c346423260..2031795631 100644
--- a/variants/STM32F4xx/F429B(E-G-I)T_F429N(E-G-I)H_F439B(G-I)T_F439N(G-I)H/PeripheralPins.c
+++ b/variants/STM32F4xx/F429B(E-G-I)T_F429N(E-G-I)H_F439B(G-I)T_F439N(G-I)H/PeripheralPins.c
@@ -366,7 +366,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -378,7 +378,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -392,7 +392,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32F4xx/F446M(C-E)Y/PeripheralPins.c b/variants/STM32F4xx/F446M(C-E)Y/PeripheralPins.c
index b7cbcd6f39..c2c3c6d12e 100644
--- a/variants/STM32F4xx/F446M(C-E)Y/PeripheralPins.c
+++ b/variants/STM32F4xx/F446M(C-E)Y/PeripheralPins.c
@@ -298,7 +298,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -309,7 +309,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F4xx/F446R(C-E)T/PeripheralPins.c b/variants/STM32F4xx/F446R(C-E)T/PeripheralPins.c
index c4f9ac935a..07ec618f13 100644
--- a/variants/STM32F4xx/F446R(C-E)T/PeripheralPins.c
+++ b/variants/STM32F4xx/F446R(C-E)T/PeripheralPins.c
@@ -289,7 +289,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -299,7 +299,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F4xx/F446V(C-E)T/PeripheralPins.c b/variants/STM32F4xx/F446V(C-E)T/PeripheralPins.c
index 669b6a2f4d..5698096efb 100644
--- a/variants/STM32F4xx/F446V(C-E)T/PeripheralPins.c
+++ b/variants/STM32F4xx/F446V(C-E)T/PeripheralPins.c
@@ -325,7 +325,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -336,7 +336,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F4xx/F446Z(C-E)(H-J-T)/PeripheralPins.c b/variants/STM32F4xx/F446Z(C-E)(H-J-T)/PeripheralPins.c
index ae04bfd24a..8ccc6459af 100644
--- a/variants/STM32F4xx/F446Z(C-E)(H-J-T)/PeripheralPins.c
+++ b/variants/STM32F4xx/F446Z(C-E)(H-J-T)/PeripheralPins.c
@@ -353,7 +353,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -364,7 +364,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F4xx/F469A(E-G-I)(H-Y)_F479A(G-I)(H-Y)/PeripheralPins.c b/variants/STM32F4xx/F469A(E-G-I)(H-Y)_F479A(G-I)(H-Y)/PeripheralPins.c
index b46b4e85bd..31559f0454 100644
--- a/variants/STM32F4xx/F469A(E-G-I)(H-Y)_F479A(G-I)(H-Y)/PeripheralPins.c
+++ b/variants/STM32F4xx/F469A(E-G-I)(H-Y)_F479A(G-I)(H-Y)/PeripheralPins.c
@@ -333,7 +333,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -345,7 +345,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F4xx/F469B(E-G-I)T_F469N(E-G-I)H_F479B(G-I)T_F479N(G-I)H/PeripheralPins.c b/variants/STM32F4xx/F469B(E-G-I)T_F469N(E-G-I)H_F479B(G-I)T_F479N(G-I)H/PeripheralPins.c
index 37f103303f..c30648d478 100644
--- a/variants/STM32F4xx/F469B(E-G-I)T_F469N(E-G-I)H_F479B(G-I)T_F479N(G-I)H/PeripheralPins.c
+++ b/variants/STM32F4xx/F469B(E-G-I)T_F469N(E-G-I)H_F479B(G-I)T_F479N(G-I)H/PeripheralPins.c
@@ -368,7 +368,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -380,7 +380,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -394,7 +394,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32F4xx/F469I(E-G-I)(H-T)_F479I(G-I)(H-T)/PeripheralPins.c b/variants/STM32F4xx/F469I(E-G-I)(H-T)_F479I(G-I)(H-T)/PeripheralPins.c
index d3c617c6df..7dae9f8137 100644
--- a/variants/STM32F4xx/F469I(E-G-I)(H-T)_F479I(G-I)(H-T)/PeripheralPins.c
+++ b/variants/STM32F4xx/F469I(E-G-I)(H-T)_F479I(G-I)(H-T)/PeripheralPins.c
@@ -358,7 +358,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -370,7 +370,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -383,7 +383,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32F4xx/F469V(E-G-I)T_F479V(G-I)T/PeripheralPins.c b/variants/STM32F4xx/F469V(E-G-I)T_F479V(G-I)T/PeripheralPins.c
index 653264d67f..00d60810a0 100644
--- a/variants/STM32F4xx/F469V(E-G-I)T_F479V(G-I)T/PeripheralPins.c
+++ b/variants/STM32F4xx/F469V(E-G-I)T_F479V(G-I)T/PeripheralPins.c
@@ -297,7 +297,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -308,7 +308,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F4xx/F469Z(E-G-I)T_F479Z(G-I)T/PeripheralPins.c b/variants/STM32F4xx/F469Z(E-G-I)T_F479Z(G-I)T/PeripheralPins.c
index b118015c10..2dbe3e2ff8 100644
--- a/variants/STM32F4xx/F469Z(E-G-I)T_F479Z(G-I)T/PeripheralPins.c
+++ b/variants/STM32F4xx/F469Z(E-G-I)T_F479Z(G-I)T/PeripheralPins.c
@@ -321,7 +321,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -332,7 +332,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F7xx/F722I(C-E)(K-T)_F732IE(K-T)/PeripheralPins.c b/variants/STM32F7xx/F722I(C-E)(K-T)_F732IE(K-T)/PeripheralPins.c
index 575bc760b3..daaed30dd7 100644
--- a/variants/STM32F7xx/F722I(C-E)(K-T)_F732IE(K-T)/PeripheralPins.c
+++ b/variants/STM32F7xx/F722I(C-E)(K-T)_F732IE(K-T)/PeripheralPins.c
@@ -378,7 +378,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -389,7 +389,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32F7xx/F722R(C-E)T_F730R8T_F732RET/PeripheralPins.c b/variants/STM32F7xx/F722R(C-E)T_F730R8T_F732RET/PeripheralPins.c
index d7b14d5088..c52e6b718d 100644
--- a/variants/STM32F7xx/F722R(C-E)T_F730R8T_F732RET/PeripheralPins.c
+++ b/variants/STM32F7xx/F722R(C-E)T_F730R8T_F732RET/PeripheralPins.c
@@ -281,7 +281,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -289,7 +289,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32F7xx/F722V(C-E)T_F730V8T_F732VET/PeripheralPins.c b/variants/STM32F7xx/F722V(C-E)T_F730V8T_F732VET/PeripheralPins.c
index 1ab8ab8b1d..38b33abaaa 100644
--- a/variants/STM32F7xx/F722V(C-E)T_F730V8T_F732VET/PeripheralPins.c
+++ b/variants/STM32F7xx/F722V(C-E)T_F730V8T_F732VET/PeripheralPins.c
@@ -322,7 +322,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -331,7 +331,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32F7xx/F722Z(C-E)T_F732ZET/PeripheralPins.c b/variants/STM32F7xx/F722Z(C-E)T_F732ZET/PeripheralPins.c
index 9900c16968..20660a857b 100644
--- a/variants/STM32F7xx/F722Z(C-E)T_F732ZET/PeripheralPins.c
+++ b/variants/STM32F7xx/F722Z(C-E)T_F732ZET/PeripheralPins.c
@@ -350,7 +350,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -359,7 +359,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32F7xx/F723I(C-E)(K-T)_F730I8K_F733IE(K-T)/PeripheralPins.c b/variants/STM32F7xx/F723I(C-E)(K-T)_F730I8K_F733IE(K-T)/PeripheralPins.c
index 2f7cdebdb6..3c71e57dd1 100644
--- a/variants/STM32F7xx/F723I(C-E)(K-T)_F730I8K_F733IE(K-T)/PeripheralPins.c
+++ b/variants/STM32F7xx/F723I(C-E)(K-T)_F730I8K_F733IE(K-T)/PeripheralPins.c
@@ -370,7 +370,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -381,7 +381,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32F7xx/F723V(C-E)(T-Y)_F733VE(T-Y)/PeripheralPins.c b/variants/STM32F7xx/F723V(C-E)(T-Y)_F733VE(T-Y)/PeripheralPins.c
index fc21c07b5a..868c6a7f9b 100644
--- a/variants/STM32F7xx/F723V(C-E)(T-Y)_F733VE(T-Y)/PeripheralPins.c
+++ b/variants/STM32F7xx/F723V(C-E)(T-Y)_F733VE(T-Y)/PeripheralPins.c
@@ -311,7 +311,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -320,7 +320,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32F7xx/F723Z(C-E)(I-T)_F730Z8T_F733ZE(I-T)/PeripheralPins.c b/variants/STM32F7xx/F723Z(C-E)(I-T)_F730Z8T_F733ZE(I-T)/PeripheralPins.c
index 8a60712ed3..5cdf314785 100644
--- a/variants/STM32F7xx/F723Z(C-E)(I-T)_F730Z8T_F733ZE(I-T)/PeripheralPins.c
+++ b/variants/STM32F7xx/F723Z(C-E)(I-T)_F730Z8T_F733ZE(I-T)/PeripheralPins.c
@@ -343,7 +343,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -352,7 +352,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32F7xx/F745I(E-G)(K-T)_F746I(E-G)(K-T)_F756IG(K-T)/PeripheralPins.c b/variants/STM32F7xx/F745I(E-G)(K-T)_F746I(E-G)(K-T)_F756IG(K-T)/PeripheralPins.c
index 1749fb4440..c8db6812fa 100644
--- a/variants/STM32F7xx/F745I(E-G)(K-T)_F746I(E-G)(K-T)_F756IG(K-T)/PeripheralPins.c
+++ b/variants/STM32F7xx/F745I(E-G)(K-T)_F746I(E-G)(K-T)_F756IG(K-T)/PeripheralPins.c
@@ -390,7 +390,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -402,7 +402,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F7xx/F745V(E-G)(H-T)_F746V(E-G)(H-T)_F750V8T_F756VG(H-T)/PeripheralPins.c b/variants/STM32F7xx/F745V(E-G)(H-T)_F746V(E-G)(H-T)_F750V8T_F756VG(H-T)/PeripheralPins.c
index d873aae77f..1d9b13ec79 100644
--- a/variants/STM32F7xx/F745V(E-G)(H-T)_F746V(E-G)(H-T)_F750V8T_F756VG(H-T)/PeripheralPins.c
+++ b/variants/STM32F7xx/F745V(E-G)(H-T)_F746V(E-G)(H-T)_F750V8T_F756VG(H-T)/PeripheralPins.c
@@ -326,7 +326,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -337,7 +337,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)/PeripheralPins.c b/variants/STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)/PeripheralPins.c
index b24ebf14ee..f301db29cf 100644
--- a/variants/STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)/PeripheralPins.c
+++ b/variants/STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)/PeripheralPins.c
@@ -361,7 +361,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -372,7 +372,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F7xx/F746B(E-G)T_F746N(E-G)H_F750N8H_F756BGT_F756NGH/PeripheralPins.c b/variants/STM32F7xx/F746B(E-G)T_F746N(E-G)H_F750N8H_F756BGT_F756NGH/PeripheralPins.c
index 04190aeec8..b4b90f6f1e 100644
--- a/variants/STM32F7xx/F746B(E-G)T_F746N(E-G)H_F750N8H_F756BGT_F756NGH/PeripheralPins.c
+++ b/variants/STM32F7xx/F746B(E-G)T_F746N(E-G)H_F750N8H_F756BGT_F756NGH/PeripheralPins.c
@@ -386,7 +386,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -398,7 +398,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F7xx/F765B(G-I)T_F765N(G-I)H_F767B(G-I)T_F767N(G-I)H_F777BIT_F777NIH/PeripheralPins.c b/variants/STM32F7xx/F765B(G-I)T_F765N(G-I)H_F767B(G-I)T_F767N(G-I)H_F777BIT_F777NIH/PeripheralPins.c
index 663aa861a4..33a8964bde 100644
--- a/variants/STM32F7xx/F765B(G-I)T_F765N(G-I)H_F767B(G-I)T_F767N(G-I)H_F777BIT_F777NIH/PeripheralPins.c
+++ b/variants/STM32F7xx/F765B(G-I)T_F765N(G-I)H_F767B(G-I)T_F767N(G-I)H_F777BIT_F777NIH/PeripheralPins.c
@@ -431,7 +431,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_8, CAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_CAN3)},
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -446,7 +446,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PA_15, CAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_CAN3)},
diff --git a/variants/STM32F7xx/F765I(G-I)(K-T)_F767I(G-I)(K-T)_F777II(K-T)/PeripheralPins.c b/variants/STM32F7xx/F765I(G-I)(K-T)_F767I(G-I)(K-T)_F777II(K-T)/PeripheralPins.c
index ce9d40fcad..45a9e38b1d 100644
--- a/variants/STM32F7xx/F765I(G-I)(K-T)_F767I(G-I)(K-T)_F777II(K-T)/PeripheralPins.c
+++ b/variants/STM32F7xx/F765I(G-I)(K-T)_F767I(G-I)(K-T)_F777II(K-T)/PeripheralPins.c
@@ -428,7 +428,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_8, CAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_CAN3)},
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -443,7 +443,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PA_15, CAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_CAN3)},
diff --git a/variants/STM32F7xx/F765V(G-I)(H-T)_F767V(G-I)(H-T)_F777VI(H-T)/PeripheralPins.c b/variants/STM32F7xx/F765V(G-I)(H-T)_F767V(G-I)(H-T)_F777VI(H-T)/PeripheralPins.c
index 4a0a9df6bf..cfedc8b12a 100644
--- a/variants/STM32F7xx/F765V(G-I)(H-T)_F767V(G-I)(H-T)_F777VI(H-T)/PeripheralPins.c
+++ b/variants/STM32F7xx/F765V(G-I)(H-T)_F767V(G-I)(H-T)_F777VI(H-T)/PeripheralPins.c
@@ -359,7 +359,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_8, CAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_CAN3)},
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -372,7 +372,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PA_15, CAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_CAN3)},
diff --git a/variants/STM32F7xx/F765Z(G-I)T_F767Z(G-I)T_F777ZIT/PeripheralPins.c b/variants/STM32F7xx/F765Z(G-I)T_F767Z(G-I)T_F777ZIT/PeripheralPins.c
index 92a6f1d755..61628ef0e5 100644
--- a/variants/STM32F7xx/F765Z(G-I)T_F767Z(G-I)T_F777ZIT/PeripheralPins.c
+++ b/variants/STM32F7xx/F765Z(G-I)T_F767Z(G-I)T_F777ZIT/PeripheralPins.c
@@ -395,7 +395,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_8, CAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_CAN3)},
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -408,7 +408,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PA_15, CAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_CAN3)},
diff --git a/variants/STM32F7xx/F768AIY_F769A(G-I)Y_F778AIY_F779AIY/PeripheralPins.c b/variants/STM32F7xx/F768AIY_F769A(G-I)Y_F778AIY_F779AIY/PeripheralPins.c
index 5cd5a18a28..36f6e73856 100644
--- a/variants/STM32F7xx/F768AIY_F769A(G-I)Y_F778AIY_F779AIY/PeripheralPins.c
+++ b/variants/STM32F7xx/F768AIY_F769A(G-I)Y_F778AIY_F779AIY/PeripheralPins.c
@@ -388,7 +388,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_8, CAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_CAN3)},
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -403,7 +403,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PA_15, CAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_CAN3)},
diff --git a/variants/STM32F7xx/F769B(G-I)T_F769N(G-I)H_F779BIT_F779NIH/PeripheralPins.c b/variants/STM32F7xx/F769B(G-I)T_F769N(G-I)H_F779BIT_F779NIH/PeripheralPins.c
index 24dbc7a6c5..b285a3d4c1 100644
--- a/variants/STM32F7xx/F769B(G-I)T_F769N(G-I)H_F779BIT_F779NIH/PeripheralPins.c
+++ b/variants/STM32F7xx/F769B(G-I)T_F769N(G-I)H_F779BIT_F779NIH/PeripheralPins.c
@@ -425,7 +425,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_8, CAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_CAN3)},
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -440,7 +440,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PA_15, CAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_CAN3)},
diff --git a/variants/STM32F7xx/F769I(G-I)T_F779IIT/PeripheralPins.c b/variants/STM32F7xx/F769I(G-I)T_F779IIT/PeripheralPins.c
index 727cdb9031..6e8856bfc3 100644
--- a/variants/STM32F7xx/F769I(G-I)T_F779IIT/PeripheralPins.c
+++ b/variants/STM32F7xx/F769I(G-I)T_F779IIT/PeripheralPins.c
@@ -410,7 +410,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_8, CAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_CAN3)},
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -424,7 +424,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PA_15, CAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_CAN3)},
diff --git a/variants/STM32H7xx/H723V(E-G)(H-T)_H730VB(H-T)_H733VG(H-T)/PeripheralPins.c b/variants/STM32H7xx/H723V(E-G)(H-T)_H730VB(H-T)_H733VG(H-T)/PeripheralPins.c
index 5753da2707..0eabc29833 100644
--- a/variants/STM32H7xx/H723V(E-G)(H-T)_H730VB(H-T)_H733VG(H-T)/PeripheralPins.c
+++ b/variants/STM32H7xx/H723V(E-G)(H-T)_H730VB(H-T)_H733VG(H-T)/PeripheralPins.c
@@ -398,7 +398,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32H7xx/H723Z(E-G)I_H730ZBI_H733ZGI/PeripheralPins.c b/variants/STM32H7xx/H723Z(E-G)I_H730ZBI_H733ZGI/PeripheralPins.c
index 3ff7d8b988..1b9ede0d04 100644
--- a/variants/STM32H7xx/H723Z(E-G)I_H730ZBI_H733ZGI/PeripheralPins.c
+++ b/variants/STM32H7xx/H723Z(E-G)I_H730ZBI_H733ZGI/PeripheralPins.c
@@ -470,7 +470,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT/PeripheralPins.c b/variants/STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT/PeripheralPins.c
index 54ef155dfc..415ca8e2d3 100644
--- a/variants/STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT/PeripheralPins.c
+++ b/variants/STM32H7xx/H723Z(E-G)T_H730ZBT_H733ZGT/PeripheralPins.c
@@ -467,7 +467,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32H7xx/H725A(E-G)I_H730ABIxQ_H735AGI/PeripheralPins.c b/variants/STM32H7xx/H725A(E-G)I_H730ABIxQ_H735AGI/PeripheralPins.c
index c087c09ef1..545a4c1b37 100644
--- a/variants/STM32H7xx/H725A(E-G)I_H730ABIxQ_H735AGI/PeripheralPins.c
+++ b/variants/STM32H7xx/H725A(E-G)I_H730ABIxQ_H735AGI/PeripheralPins.c
@@ -501,7 +501,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_0_C, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
diff --git a/variants/STM32H7xx/H725I(E-G)K_H730IBKxQ_H735IGK/PeripheralPins.c b/variants/STM32H7xx/H725I(E-G)K_H730IBKxQ_H735IGK/PeripheralPins.c
index 1b6f163c2f..bc441813a6 100644
--- a/variants/STM32H7xx/H725I(E-G)K_H730IBKxQ_H735IGK/PeripheralPins.c
+++ b/variants/STM32H7xx/H725I(E-G)K_H730IBKxQ_H735IGK/PeripheralPins.c
@@ -513,7 +513,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_0_C, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
diff --git a/variants/STM32H7xx/H725I(E-G)T_H730IBTxQ_H735IGT/PeripheralPins.c b/variants/STM32H7xx/H725I(E-G)T_H730IBTxQ_H735IGT/PeripheralPins.c
index 9e5aae5673..d31c6432fe 100644
--- a/variants/STM32H7xx/H725I(E-G)T_H730IBTxQ_H735IGT/PeripheralPins.c
+++ b/variants/STM32H7xx/H725I(E-G)T_H730IBTxQ_H735IGT/PeripheralPins.c
@@ -485,7 +485,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32H7xx/H725V(E-G)H_H735VGH/PeripheralPins.c b/variants/STM32H7xx/H725V(E-G)H_H735VGH/PeripheralPins.c
index d321bf31a5..f0d4f8f38a 100644
--- a/variants/STM32H7xx/H725V(E-G)H_H735VGH/PeripheralPins.c
+++ b/variants/STM32H7xx/H725V(E-G)H_H735VGH/PeripheralPins.c
@@ -388,7 +388,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32H7xx/H725V(E-G)T_H735VGT/PeripheralPins.c b/variants/STM32H7xx/H725V(E-G)T_H735VGT/PeripheralPins.c
index 72b24c9d1a..9c1ce71cb3 100644
--- a/variants/STM32H7xx/H725V(E-G)T_H735VGT/PeripheralPins.c
+++ b/variants/STM32H7xx/H725V(E-G)T_H735VGT/PeripheralPins.c
@@ -373,7 +373,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32H7xx/H725VGY_H735VGY/PeripheralPins.c b/variants/STM32H7xx/H725VGY_H735VGY/PeripheralPins.c
index 3807345db7..e6402b7997 100644
--- a/variants/STM32H7xx/H725VGY_H735VGY/PeripheralPins.c
+++ b/variants/STM32H7xx/H725VGY_H735VGY/PeripheralPins.c
@@ -364,7 +364,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32H7xx/H725Z(E-G)T_H735ZGT/PeripheralPins.c b/variants/STM32H7xx/H725Z(E-G)T_H735ZGT/PeripheralPins.c
index a3bd56a719..66b6a9d1d6 100644
--- a/variants/STM32H7xx/H725Z(E-G)T_H735ZGT/PeripheralPins.c
+++ b/variants/STM32H7xx/H725Z(E-G)T_H735ZGT/PeripheralPins.c
@@ -449,7 +449,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32H7xx/H742A(G-I)I_H743A(G-I)I_H753AII/PeripheralPins.c b/variants/STM32H7xx/H742A(G-I)I_H743A(G-I)I_H753AII/PeripheralPins.c
index 73573f4cad..c22b95a5a5 100644
--- a/variants/STM32H7xx/H742A(G-I)I_H743A(G-I)I_H753AII/PeripheralPins.c
+++ b/variants/STM32H7xx/H742A(G-I)I_H743A(G-I)I_H753AII/PeripheralPins.c
@@ -445,7 +445,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32H7xx/H742B(G-I)T_H743B(G-I)T_H753BIT/PeripheralPins.c b/variants/STM32H7xx/H742B(G-I)T_H743B(G-I)T_H753BIT/PeripheralPins.c
index c75d6e10d9..47b593bd97 100644
--- a/variants/STM32H7xx/H742B(G-I)T_H743B(G-I)T_H753BIT/PeripheralPins.c
+++ b/variants/STM32H7xx/H742B(G-I)T_H743B(G-I)T_H753BIT/PeripheralPins.c
@@ -483,7 +483,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)/PeripheralPins.c b/variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)/PeripheralPins.c
index 1bf71982f1..46823f9a53 100644
--- a/variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)/PeripheralPins.c
+++ b/variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)/PeripheralPins.c
@@ -466,7 +466,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32H7xx/H742V(G-I)(H-T)_H743V(G-I)(H-T)_H750VBT_H753VI(H-T)/PeripheralPins.c b/variants/STM32H7xx/H742V(G-I)(H-T)_H743V(G-I)(H-T)_H750VBT_H753VI(H-T)/PeripheralPins.c
index 4da7c36692..f59eee7e08 100644
--- a/variants/STM32H7xx/H742V(G-I)(H-T)_H743V(G-I)(H-T)_H750VBT_H753VI(H-T)/PeripheralPins.c
+++ b/variants/STM32H7xx/H742V(G-I)(H-T)_H743V(G-I)(H-T)_H750VBT_H753VI(H-T)/PeripheralPins.c
@@ -383,7 +383,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32H7xx/H742X(G-I)H_H743X(G-I)H_H745X(G-I)H_H747X(G-I)H_H750XBH_H753XIH_H755XIH_H757XIH/PeripheralPins.c b/variants/STM32H7xx/H742X(G-I)H_H743X(G-I)H_H745X(G-I)H_H747X(G-I)H_H750XBH_H753XIH_H755XIH_H757XIH/PeripheralPins.c
index 852bba06df..9f392c63e0 100644
--- a/variants/STM32H7xx/H742X(G-I)H_H743X(G-I)H_H745X(G-I)H_H747X(G-I)H_H750XBH_H753XIH_H755XIH_H757XIH/PeripheralPins.c
+++ b/variants/STM32H7xx/H742X(G-I)H_H743X(G-I)H_H745X(G-I)H_H747X(G-I)H_H750XBH_H753XIH_H755XIH_H757XIH/PeripheralPins.c
@@ -505,7 +505,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_0_C, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
diff --git a/variants/STM32H7xx/H742Z(G-I)T_H743Z(G-I)T_H747A(G-I)I_H747I(G-I)T_H750ZBT_H753ZIT_H757AII_H757IIT/PeripheralPins.c b/variants/STM32H7xx/H742Z(G-I)T_H743Z(G-I)T_H747A(G-I)I_H747I(G-I)T_H750ZBT_H753ZIT_H757AII_H757IIT/PeripheralPins.c
index 677fe8f4fe..bb1c60cb6a 100644
--- a/variants/STM32H7xx/H742Z(G-I)T_H743Z(G-I)T_H747A(G-I)I_H747I(G-I)T_H750ZBT_H753ZIT_H757AII_H757IIT/PeripheralPins.c
+++ b/variants/STM32H7xx/H742Z(G-I)T_H743Z(G-I)T_H747A(G-I)I_H747I(G-I)T_H750ZBT_H753ZIT_H757AII_H757IIT/PeripheralPins.c
@@ -428,7 +428,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32H7xx/H745B(G-I)T_H755BIT/PeripheralPins.c b/variants/STM32H7xx/H745B(G-I)T_H755BIT/PeripheralPins.c
index f4937d087e..e09292ba8d 100644
--- a/variants/STM32H7xx/H745B(G-I)T_H755BIT/PeripheralPins.c
+++ b/variants/STM32H7xx/H745B(G-I)T_H755BIT/PeripheralPins.c
@@ -481,7 +481,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32H7xx/H745I(G-I)K_H755IIK/PeripheralPins.c b/variants/STM32H7xx/H745I(G-I)K_H755IIK/PeripheralPins.c
index cff712cb1a..cafa23b305 100644
--- a/variants/STM32H7xx/H745I(G-I)K_H755IIK/PeripheralPins.c
+++ b/variants/STM32H7xx/H745I(G-I)K_H755IIK/PeripheralPins.c
@@ -470,7 +470,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_0_C, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
diff --git a/variants/STM32H7xx/H745I(G-I)T_H755IIT/PeripheralPins.c b/variants/STM32H7xx/H745I(G-I)T_H755IIT/PeripheralPins.c
index 1734c07a28..5e0a94e5eb 100644
--- a/variants/STM32H7xx/H745I(G-I)T_H755IIT/PeripheralPins.c
+++ b/variants/STM32H7xx/H745I(G-I)T_H755IIT/PeripheralPins.c
@@ -443,7 +443,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32H7xx/H745Z(G-I)T_H755ZIT/PeripheralPins.c b/variants/STM32H7xx/H745Z(G-I)T_H755ZIT/PeripheralPins.c
index a69760e3c6..aa54684687 100644
--- a/variants/STM32H7xx/H745Z(G-I)T_H755ZIT/PeripheralPins.c
+++ b/variants/STM32H7xx/H745Z(G-I)T_H755ZIT/PeripheralPins.c
@@ -417,7 +417,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32H7xx/H747B(G-I)T_H757BIT/PeripheralPins.c b/variants/STM32H7xx/H747B(G-I)T_H757BIT/PeripheralPins.c
index dfb0a4973a..5a22e7588d 100644
--- a/variants/STM32H7xx/H747B(G-I)T_H757BIT/PeripheralPins.c
+++ b/variants/STM32H7xx/H747B(G-I)T_H757BIT/PeripheralPins.c
@@ -461,7 +461,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32H7xx/H747ZIY_H757ZIY/PeripheralPins.c b/variants/STM32H7xx/H747ZIY_H757ZIY/PeripheralPins.c
index 8401a64dcf..b73a13fab4 100644
--- a/variants/STM32H7xx/H747ZIY_H757ZIY/PeripheralPins.c
+++ b/variants/STM32H7xx/H747ZIY_H757ZIY/PeripheralPins.c
@@ -394,7 +394,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32L4xx/L431C(B-C)(T-U)/PeripheralPins.c b/variants/STM32L4xx/L431C(B-C)(T-U)/PeripheralPins.c
index 8841dc6be3..5945c63682 100644
--- a/variants/STM32L4xx/L431C(B-C)(T-U)/PeripheralPins.c
+++ b/variants/STM32L4xx/L431C(B-C)(T-U)/PeripheralPins.c
@@ -224,7 +224,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -232,7 +232,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L431C(B-C)Y/PeripheralPins.c b/variants/STM32L4xx/L431C(B-C)Y/PeripheralPins.c
index 358337eaaf..bd77eca9ab 100644
--- a/variants/STM32L4xx/L431C(B-C)Y/PeripheralPins.c
+++ b/variants/STM32L4xx/L431C(B-C)Y/PeripheralPins.c
@@ -226,7 +226,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -234,7 +234,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L431K(B-C)U/PeripheralPins.c b/variants/STM32L4xx/L431K(B-C)U/PeripheralPins.c
index 5443855be1..d43c5be8be 100644
--- a/variants/STM32L4xx/L431K(B-C)U/PeripheralPins.c
+++ b/variants/STM32L4xx/L431K(B-C)U/PeripheralPins.c
@@ -192,14 +192,14 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{NC, NP, 0}
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{NC, NP, 0}
diff --git a/variants/STM32L4xx/L431R(B-C)(I-T-Y)/PeripheralPins.c b/variants/STM32L4xx/L431R(B-C)(I-T-Y)/PeripheralPins.c
index d3c41e8797..a22c9803f5 100644
--- a/variants/STM32L4xx/L431R(B-C)(I-T-Y)/PeripheralPins.c
+++ b/variants/STM32L4xx/L431R(B-C)(I-T-Y)/PeripheralPins.c
@@ -245,7 +245,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -253,7 +253,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L431VC(I-T)/PeripheralPins.c b/variants/STM32L4xx/L431VC(I-T)/PeripheralPins.c
index d4cc880e8e..09fc244acf 100644
--- a/variants/STM32L4xx/L431VC(I-T)/PeripheralPins.c
+++ b/variants/STM32L4xx/L431VC(I-T)/PeripheralPins.c
@@ -268,7 +268,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -277,7 +277,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L432K(B-C)U_L442KCU/PeripheralPins.c b/variants/STM32L4xx/L432K(B-C)U_L442KCU/PeripheralPins.c
index 2450fa10a2..15cbe05036 100644
--- a/variants/STM32L4xx/L432K(B-C)U_L442KCU/PeripheralPins.c
+++ b/variants/STM32L4xx/L432K(B-C)U_L442KCU/PeripheralPins.c
@@ -192,14 +192,14 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{NC, NP, 0}
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{NC, NP, 0}
diff --git a/variants/STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)/PeripheralPins.c b/variants/STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)/PeripheralPins.c
index ad10259984..2dc0307ea4 100644
--- a/variants/STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)/PeripheralPins.c
+++ b/variants/STM32L4xx/L433C(B-C)(T-U)_L443CC(T-U)/PeripheralPins.c
@@ -225,7 +225,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -233,7 +233,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L433C(B-C)Y_L443CC(F-Y)/PeripheralPins.c b/variants/STM32L4xx/L433C(B-C)Y_L443CC(F-Y)/PeripheralPins.c
index 992fd7ec27..be42518f3c 100644
--- a/variants/STM32L4xx/L433C(B-C)Y_L443CC(F-Y)/PeripheralPins.c
+++ b/variants/STM32L4xx/L433C(B-C)Y_L443CC(F-Y)/PeripheralPins.c
@@ -227,7 +227,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -235,7 +235,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)/PeripheralPins.c b/variants/STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)/PeripheralPins.c
index 3fbc3143d3..2cf4995220 100644
--- a/variants/STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)/PeripheralPins.c
+++ b/variants/STM32L4xx/L433R(B-C)(I-T-Y)_L443RC(I-T-Y)/PeripheralPins.c
@@ -246,7 +246,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -254,7 +254,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L433RCTxP/PeripheralPins.c b/variants/STM32L4xx/L433RCTxP/PeripheralPins.c
index a811e2d9ed..43f9c0f14a 100644
--- a/variants/STM32L4xx/L433RCTxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L433RCTxP/PeripheralPins.c
@@ -241,7 +241,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -249,7 +249,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L433VC(I-T)_L443VC(I-T)/PeripheralPins.c b/variants/STM32L4xx/L433VC(I-T)_L443VC(I-T)/PeripheralPins.c
index 8445880db1..6410673373 100644
--- a/variants/STM32L4xx/L433VC(I-T)_L443VC(I-T)/PeripheralPins.c
+++ b/variants/STM32L4xx/L433VC(I-T)_L443VC(I-T)/PeripheralPins.c
@@ -269,7 +269,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -278,7 +278,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L451CCU_L451CE(T-U)/PeripheralPins.c b/variants/STM32L4xx/L451CCU_L451CE(T-U)/PeripheralPins.c
index f9fe4ecfb5..f717a26a15 100644
--- a/variants/STM32L4xx/L451CCU_L451CE(T-U)/PeripheralPins.c
+++ b/variants/STM32L4xx/L451CCU_L451CE(T-U)/PeripheralPins.c
@@ -237,7 +237,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_CAN1)},
@@ -247,7 +247,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_CAN1)},
diff --git a/variants/STM32L4xx/L451R(C-E)(I-T-Y)/PeripheralPins.c b/variants/STM32L4xx/L451R(C-E)(I-T-Y)/PeripheralPins.c
index 51567f04fb..42b47d7007 100644
--- a/variants/STM32L4xx/L451R(C-E)(I-T-Y)/PeripheralPins.c
+++ b/variants/STM32L4xx/L451R(C-E)(I-T-Y)/PeripheralPins.c
@@ -266,7 +266,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_CAN1)},
@@ -276,7 +276,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_CAN1)},
diff --git a/variants/STM32L4xx/L451V(C-E)(I-T)/PeripheralPins.c b/variants/STM32L4xx/L451V(C-E)(I-T)/PeripheralPins.c
index f6052ca5b7..a2e754c80b 100644
--- a/variants/STM32L4xx/L451V(C-E)(I-T)/PeripheralPins.c
+++ b/variants/STM32L4xx/L451V(C-E)(I-T)/PeripheralPins.c
@@ -295,7 +295,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_CAN1)},
@@ -306,7 +306,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_CAN1)},
diff --git a/variants/STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)/PeripheralPins.c b/variants/STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)/PeripheralPins.c
index 41d92a3c76..63b9813087 100644
--- a/variants/STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)/PeripheralPins.c
+++ b/variants/STM32L4xx/L452CCU_L452CE(T-U)x(P)_L462CE(T-U)/PeripheralPins.c
@@ -239,7 +239,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_CAN1)},
@@ -249,7 +249,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_CAN1)},
diff --git a/variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/PeripheralPins.c b/variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/PeripheralPins.c
index 227efb3c73..0cdde61731 100644
--- a/variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/PeripheralPins.c
+++ b/variants/STM32L4xx/L452RC(I-T-Y)_L452RE(I-T-Y)x(P)_L462RE(I-T-Y)/PeripheralPins.c
@@ -268,7 +268,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_CAN1)},
@@ -278,7 +278,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_CAN1)},
diff --git a/variants/STM32L4xx/L452RETxP/PeripheralPins.c b/variants/STM32L4xx/L452RETxP/PeripheralPins.c
index cf9d015129..dd696f9998 100644
--- a/variants/STM32L4xx/L452RETxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L452RETxP/PeripheralPins.c
@@ -262,7 +262,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_CAN1)},
@@ -272,7 +272,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_CAN1)},
diff --git a/variants/STM32L4xx/L452V(C-E)(I-T)_L462VE(I-T)/PeripheralPins.c b/variants/STM32L4xx/L452V(C-E)(I-T)_L462VE(I-T)/PeripheralPins.c
index 8c0cebf536..37325ca987 100644
--- a/variants/STM32L4xx/L452V(C-E)(I-T)_L462VE(I-T)/PeripheralPins.c
+++ b/variants/STM32L4xx/L452V(C-E)(I-T)_L462VE(I-T)/PeripheralPins.c
@@ -296,7 +296,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_CAN1)},
@@ -307,7 +307,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_CAN1)},
diff --git a/variants/STM32L4xx/L471Q(E-G)I/PeripheralPins.c b/variants/STM32L4xx/L471Q(E-G)I/PeripheralPins.c
index fab8c9efe0..4fa3395939 100644
--- a/variants/STM32L4xx/L471Q(E-G)I/PeripheralPins.c
+++ b/variants/STM32L4xx/L471Q(E-G)I/PeripheralPins.c
@@ -352,7 +352,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -361,7 +361,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L471R(E-G)T/PeripheralPins.c b/variants/STM32L4xx/L471R(E-G)T/PeripheralPins.c
index 10145dd90f..cbff7f56b2 100644
--- a/variants/STM32L4xx/L471R(E-G)T/PeripheralPins.c
+++ b/variants/STM32L4xx/L471R(E-G)T/PeripheralPins.c
@@ -291,7 +291,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -299,7 +299,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L471V(E-G)T/PeripheralPins.c b/variants/STM32L4xx/L471V(E-G)T/PeripheralPins.c
index 0b1c8261fd..4537c618a6 100644
--- a/variants/STM32L4xx/L471V(E-G)T/PeripheralPins.c
+++ b/variants/STM32L4xx/L471V(E-G)T/PeripheralPins.c
@@ -324,7 +324,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -333,7 +333,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L471Z(E-G)(J-T)/PeripheralPins.c b/variants/STM32L4xx/L471Z(E-G)(J-T)/PeripheralPins.c
index 84ad4d4db5..d656799fee 100644
--- a/variants/STM32L4xx/L471Z(E-G)(J-T)/PeripheralPins.c
+++ b/variants/STM32L4xx/L471Z(E-G)(J-T)/PeripheralPins.c
@@ -363,7 +363,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -372,7 +372,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L475R(C-E-G)T_L476R(C-E-G)T_L486RGT/PeripheralPins.c b/variants/STM32L4xx/L475R(C-E-G)T_L476R(C-E-G)T_L486RGT/PeripheralPins.c
index 58488e603a..39b5e96497 100644
--- a/variants/STM32L4xx/L475R(C-E-G)T_L476R(C-E-G)T_L486RGT/PeripheralPins.c
+++ b/variants/STM32L4xx/L475R(C-E-G)T_L476R(C-E-G)T_L486RGT/PeripheralPins.c
@@ -292,7 +292,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -300,7 +300,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT/PeripheralPins.c b/variants/STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT/PeripheralPins.c
index 3f5fdd9142..379d2c8fbc 100644
--- a/variants/STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT/PeripheralPins.c
+++ b/variants/STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT/PeripheralPins.c
@@ -325,7 +325,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -334,7 +334,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L476J(E-G)Y_L485J(C-E)Y_L486JGY/PeripheralPins.c b/variants/STM32L4xx/L476J(E-G)Y_L485J(C-E)Y_L486JGY/PeripheralPins.c
index d6bef9e227..54ad3e441b 100644
--- a/variants/STM32L4xx/L476J(E-G)Y_L485J(C-E)Y_L486JGY/PeripheralPins.c
+++ b/variants/STM32L4xx/L476J(E-G)Y_L485J(C-E)Y_L486JGY/PeripheralPins.c
@@ -305,7 +305,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -313,7 +313,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L476JGYxP/PeripheralPins.c b/variants/STM32L4xx/L476JGYxP/PeripheralPins.c
index adcbc41784..fe341a02e1 100644
--- a/variants/STM32L4xx/L476JGYxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L476JGYxP/PeripheralPins.c
@@ -298,7 +298,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -306,7 +306,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L476M(E-G)Y/PeripheralPins.c b/variants/STM32L4xx/L476M(E-G)Y/PeripheralPins.c
index a84535df37..b3b6ed2fce 100644
--- a/variants/STM32L4xx/L476M(E-G)Y/PeripheralPins.c
+++ b/variants/STM32L4xx/L476M(E-G)Y/PeripheralPins.c
@@ -311,7 +311,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -319,7 +319,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L476QEI_L476QGIx(P)_L486QGI/PeripheralPins.c b/variants/STM32L4xx/L476QEI_L476QGIx(P)_L486QGI/PeripheralPins.c
index 80e849f0a1..4082f9c56b 100644
--- a/variants/STM32L4xx/L476QEI_L476QGIx(P)_L486QGI/PeripheralPins.c
+++ b/variants/STM32L4xx/L476QEI_L476QGIx(P)_L486QGI/PeripheralPins.c
@@ -353,7 +353,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -362,7 +362,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L476ZET_L476ZG(J-T)_L486ZGT/PeripheralPins.c b/variants/STM32L4xx/L476ZET_L476ZG(J-T)_L486ZGT/PeripheralPins.c
index 3176c94c3e..dd96db0df2 100644
--- a/variants/STM32L4xx/L476ZET_L476ZG(J-T)_L486ZGT/PeripheralPins.c
+++ b/variants/STM32L4xx/L476ZET_L476ZG(J-T)_L486ZGT/PeripheralPins.c
@@ -364,7 +364,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -373,7 +373,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L476ZGTxP/PeripheralPins.c b/variants/STM32L4xx/L476ZGTxP/PeripheralPins.c
index 6c3c625cc9..0d0eaed3fe 100644
--- a/variants/STM32L4xx/L476ZGTxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L476ZGTxP/PeripheralPins.c
@@ -359,7 +359,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -368,7 +368,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L496A(E-G)I_L4A6AGI/PeripheralPins.c b/variants/STM32L4xx/L496A(E-G)I_L4A6AGI/PeripheralPins.c
index ee472c9812..7f0f5db740 100644
--- a/variants/STM32L4xx/L496A(E-G)I_L4A6AGI/PeripheralPins.c
+++ b/variants/STM32L4xx/L496A(E-G)I_L4A6AGI/PeripheralPins.c
@@ -399,7 +399,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_CAN2)},
@@ -411,7 +411,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_CAN2)},
diff --git a/variants/STM32L4xx/L496AGIxP_L4A6AGIxP/PeripheralPins.c b/variants/STM32L4xx/L496AGIxP_L4A6AGIxP/PeripheralPins.c
index 7f629e652f..ac01b03cfd 100644
--- a/variants/STM32L4xx/L496AGIxP_L4A6AGIxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L496AGIxP_L4A6AGIxP/PeripheralPins.c
@@ -398,7 +398,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_CAN2)},
@@ -410,7 +410,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_CAN2)},
diff --git a/variants/STM32L4xx/L496Q(E-G)I_L4A6QGI/PeripheralPins.c b/variants/STM32L4xx/L496Q(E-G)I_L4A6QGI/PeripheralPins.c
index 72f0bf5fee..0f0622827c 100644
--- a/variants/STM32L4xx/L496Q(E-G)I_L4A6QGI/PeripheralPins.c
+++ b/variants/STM32L4xx/L496Q(E-G)I_L4A6QGI/PeripheralPins.c
@@ -378,7 +378,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_CAN2)},
@@ -389,7 +389,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_CAN2)},
diff --git a/variants/STM32L4xx/L496QGIx(P-S)_L4A6QGIxP/PeripheralPins.c b/variants/STM32L4xx/L496QGIx(P-S)_L4A6QGIxP/PeripheralPins.c
index 2ee60142e8..daf2d329eb 100644
--- a/variants/STM32L4xx/L496QGIx(P-S)_L4A6QGIxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L496QGIx(P-S)_L4A6QGIxP/PeripheralPins.c
@@ -373,7 +373,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_CAN2)},
@@ -384,7 +384,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_CAN2)},
diff --git a/variants/STM32L4xx/L496R(E-G)T_L4A6RGT/PeripheralPins.c b/variants/STM32L4xx/L496R(E-G)T_L4A6RGT/PeripheralPins.c
index 90bea73262..b1f0dde494 100644
--- a/variants/STM32L4xx/L496R(E-G)T_L4A6RGT/PeripheralPins.c
+++ b/variants/STM32L4xx/L496R(E-G)T_L4A6RGT/PeripheralPins.c
@@ -312,7 +312,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_CAN2)},
@@ -322,7 +322,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_CAN2)},
diff --git a/variants/STM32L4xx/L496RGTxP/PeripheralPins.c b/variants/STM32L4xx/L496RGTxP/PeripheralPins.c
index 76e56643e7..94b52239de 100644
--- a/variants/STM32L4xx/L496RGTxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L496RGTxP/PeripheralPins.c
@@ -307,7 +307,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_CAN2)},
@@ -317,7 +317,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_CAN2)},
diff --git a/variants/STM32L4xx/L496V(E-G)T_L4A6VGT/PeripheralPins.c b/variants/STM32L4xx/L496V(E-G)T_L4A6VGT/PeripheralPins.c
index 0946383fcb..9322a21167 100644
--- a/variants/STM32L4xx/L496V(E-G)T_L4A6VGT/PeripheralPins.c
+++ b/variants/STM32L4xx/L496V(E-G)T_L4A6VGT/PeripheralPins.c
@@ -348,7 +348,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_CAN2)},
@@ -359,7 +359,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_CAN2)},
diff --git a/variants/STM32L4xx/L496VGTxP_L4A6VGTxP/PeripheralPins.c b/variants/STM32L4xx/L496VGTxP_L4A6VGTxP/PeripheralPins.c
index 3f82e7d598..f5c50b5d5a 100644
--- a/variants/STM32L4xx/L496VGTxP_L4A6VGTxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L496VGTxP_L4A6VGTxP/PeripheralPins.c
@@ -342,7 +342,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_CAN2)},
@@ -353,7 +353,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_CAN2)},
diff --git a/variants/STM32L4xx/L496VGY_L4A6VGY/PeripheralPins.c b/variants/STM32L4xx/L496VGY_L4A6VGY/PeripheralPins.c
index 5f1526d22b..2f94316f4e 100644
--- a/variants/STM32L4xx/L496VGY_L4A6VGY/PeripheralPins.c
+++ b/variants/STM32L4xx/L496VGY_L4A6VGY/PeripheralPins.c
@@ -348,7 +348,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_CAN2)},
@@ -359,7 +359,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_CAN2)},
diff --git a/variants/STM32L4xx/L496VGYxP_L4A6VGYxP/PeripheralPins.c b/variants/STM32L4xx/L496VGYxP_L4A6VGYxP/PeripheralPins.c
index 484e0d900e..4fd5a7f379 100644
--- a/variants/STM32L4xx/L496VGYxP_L4A6VGYxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L496VGYxP_L4A6VGYxP/PeripheralPins.c
@@ -345,7 +345,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_CAN2)},
@@ -356,7 +356,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_CAN2)},
diff --git a/variants/STM32L4xx/L496WGYxP/PeripheralPins.c b/variants/STM32L4xx/L496WGYxP/PeripheralPins.c
index bc0525fe89..0481adfb8e 100644
--- a/variants/STM32L4xx/L496WGYxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L496WGYxP/PeripheralPins.c
@@ -353,7 +353,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_CAN2)},
@@ -363,7 +363,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_CAN2)},
diff --git a/variants/STM32L4xx/L496Z(E-G)T_L4A6ZGT/PeripheralPins.c b/variants/STM32L4xx/L496Z(E-G)T_L4A6ZGT/PeripheralPins.c
index de25513fdd..62883a179c 100644
--- a/variants/STM32L4xx/L496Z(E-G)T_L4A6ZGT/PeripheralPins.c
+++ b/variants/STM32L4xx/L496Z(E-G)T_L4A6ZGT/PeripheralPins.c
@@ -389,7 +389,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_CAN2)},
@@ -400,7 +400,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_CAN2)},
diff --git a/variants/STM32L4xx/L496ZGTxP_L4A6ZGTxP/PeripheralPins.c b/variants/STM32L4xx/L496ZGTxP_L4A6ZGTxP/PeripheralPins.c
index 263f0b0f32..ea9e9e1091 100644
--- a/variants/STM32L4xx/L496ZGTxP_L4A6ZGTxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L496ZGTxP_L4A6ZGTxP/PeripheralPins.c
@@ -384,7 +384,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_CAN2)},
@@ -395,7 +395,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_CAN2)},
diff --git a/variants/STM32L4xx/L4A6RGTxP/PeripheralPins.c b/variants/STM32L4xx/L4A6RGTxP/PeripheralPins.c
index c7b6a708fe..5ca32447a7 100644
--- a/variants/STM32L4xx/L4A6RGTxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L4A6RGTxP/PeripheralPins.c
@@ -307,7 +307,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF3_CAN2)},
@@ -317,7 +317,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF8_CAN2)},
diff --git a/variants/STM32L4xx/L4P5A(G-E)I_L4Q5AGI/PeripheralPins.c b/variants/STM32L4xx/L4P5A(G-E)I_L4Q5AGI/PeripheralPins.c
index 3dba0b71cb..1218191c57 100644
--- a/variants/STM32L4xx/L4P5A(G-E)I_L4Q5AGI/PeripheralPins.c
+++ b/variants/STM32L4xx/L4P5A(G-E)I_L4Q5AGI/PeripheralPins.c
@@ -390,7 +390,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -400,7 +400,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L4P5AGIxP_L4Q5AGIxP/PeripheralPins.c b/variants/STM32L4xx/L4P5AGIxP_L4Q5AGIxP/PeripheralPins.c
index ce760cbc0e..a85f8de307 100644
--- a/variants/STM32L4xx/L4P5AGIxP_L4Q5AGIxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L4P5AGIxP_L4Q5AGIxP/PeripheralPins.c
@@ -389,7 +389,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -399,7 +399,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L4P5C(E-G)(T-U)_L4Q5CG(T-U)/PeripheralPins.c b/variants/STM32L4xx/L4P5C(E-G)(T-U)_L4Q5CG(T-U)/PeripheralPins.c
index 1a1e47cf04..38ff20aa9d 100644
--- a/variants/STM32L4xx/L4P5C(E-G)(T-U)_L4Q5CG(T-U)/PeripheralPins.c
+++ b/variants/STM32L4xx/L4P5C(E-G)(T-U)_L4Q5CG(T-U)/PeripheralPins.c
@@ -265,7 +265,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -273,7 +273,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L4P5CG(T-U)xP_L4Q5CG(T-U)xP/PeripheralPins.c b/variants/STM32L4xx/L4P5CG(T-U)xP_L4Q5CG(T-U)xP/PeripheralPins.c
index 605a722de2..7020ac173f 100644
--- a/variants/STM32L4xx/L4P5CG(T-U)xP_L4Q5CG(T-U)xP/PeripheralPins.c
+++ b/variants/STM32L4xx/L4P5CG(T-U)xP_L4Q5CG(T-U)xP/PeripheralPins.c
@@ -257,14 +257,14 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{NC, NP, 0}
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L4P5Q(G-E)I_L4Q5QGI/PeripheralPins.c b/variants/STM32L4xx/L4P5Q(G-E)I_L4Q5QGI/PeripheralPins.c
index dbece32afc..a40667ab1d 100644
--- a/variants/STM32L4xx/L4P5Q(G-E)I_L4Q5QGI/PeripheralPins.c
+++ b/variants/STM32L4xx/L4P5Q(G-E)I_L4Q5QGI/PeripheralPins.c
@@ -370,7 +370,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -379,7 +379,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L4P5QGIx(P-S)_L4Q5QGIxP/PeripheralPins.c b/variants/STM32L4xx/L4P5QGIx(P-S)_L4Q5QGIxP/PeripheralPins.c
index fcc14f27fe..4531f7eb0b 100644
--- a/variants/STM32L4xx/L4P5QGIx(P-S)_L4Q5QGIxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L4P5QGIx(P-S)_L4Q5QGIxP/PeripheralPins.c
@@ -365,7 +365,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -374,7 +374,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L4P5R(G-E)T_L4Q5RGT/PeripheralPins.c b/variants/STM32L4xx/L4P5R(G-E)T_L4Q5RGT/PeripheralPins.c
index 67b03f2ba9..32b050047c 100644
--- a/variants/STM32L4xx/L4P5R(G-E)T_L4Q5RGT/PeripheralPins.c
+++ b/variants/STM32L4xx/L4P5R(G-E)T_L4Q5RGT/PeripheralPins.c
@@ -302,7 +302,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -310,7 +310,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L4P5RGTxP_L4Q5RGTxP/PeripheralPins.c b/variants/STM32L4xx/L4P5RGTxP_L4Q5RGTxP/PeripheralPins.c
index 52871f5423..0a139d6d76 100644
--- a/variants/STM32L4xx/L4P5RGTxP_L4Q5RGTxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L4P5RGTxP_L4Q5RGTxP/PeripheralPins.c
@@ -298,7 +298,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -306,7 +306,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L4P5V(G-E)T_L4Q5VGT/PeripheralPins.c b/variants/STM32L4xx/L4P5V(G-E)T_L4Q5VGT/PeripheralPins.c
index 7e998d1a8b..e3faa3ff10 100644
--- a/variants/STM32L4xx/L4P5V(G-E)T_L4Q5VGT/PeripheralPins.c
+++ b/variants/STM32L4xx/L4P5V(G-E)T_L4Q5VGT/PeripheralPins.c
@@ -343,7 +343,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -352,7 +352,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L4P5V(G-E)Y_L4Q5VGY/PeripheralPins.c b/variants/STM32L4xx/L4P5V(G-E)Y_L4Q5VGY/PeripheralPins.c
index cb13899ce7..c17315351f 100644
--- a/variants/STM32L4xx/L4P5V(G-E)Y_L4Q5VGY/PeripheralPins.c
+++ b/variants/STM32L4xx/L4P5V(G-E)Y_L4Q5VGY/PeripheralPins.c
@@ -343,7 +343,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -352,7 +352,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L4P5VGTxP_L4Q5VGTxP/PeripheralPins.c b/variants/STM32L4xx/L4P5VGTxP_L4Q5VGTxP/PeripheralPins.c
index 0684b50af8..28396a39e8 100644
--- a/variants/STM32L4xx/L4P5VGTxP_L4Q5VGTxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L4P5VGTxP_L4Q5VGTxP/PeripheralPins.c
@@ -337,7 +337,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -346,7 +346,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L4P5VGYxP_L4Q5VGYxP/PeripheralPins.c b/variants/STM32L4xx/L4P5VGYxP_L4Q5VGYxP/PeripheralPins.c
index e87126ea8d..cfe4db47da 100644
--- a/variants/STM32L4xx/L4P5VGYxP_L4Q5VGYxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L4P5VGYxP_L4Q5VGYxP/PeripheralPins.c
@@ -340,7 +340,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -349,7 +349,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L4P5Z(G-E)T_L4Q5ZGT/PeripheralPins.c b/variants/STM32L4xx/L4P5Z(G-E)T_L4Q5ZGT/PeripheralPins.c
index 283f90e898..e0e392854f 100644
--- a/variants/STM32L4xx/L4P5Z(G-E)T_L4Q5ZGT/PeripheralPins.c
+++ b/variants/STM32L4xx/L4P5Z(G-E)T_L4Q5ZGT/PeripheralPins.c
@@ -376,7 +376,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -385,7 +385,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L4P5ZGTxP_L4Q5ZGTxP/PeripheralPins.c b/variants/STM32L4xx/L4P5ZGTxP_L4Q5ZGTxP/PeripheralPins.c
index 307de1d0dd..faf91fa49b 100644
--- a/variants/STM32L4xx/L4P5ZGTxP_L4Q5ZGTxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L4P5ZGTxP_L4Q5ZGTxP/PeripheralPins.c
@@ -371,7 +371,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -380,7 +380,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L4R5AGI_L4R5AIIx(P)_L4R7AII_L4S5AII_L4S7AII/PeripheralPins.c b/variants/STM32L4xx/L4R5AGI_L4R5AIIx(P)_L4R7AII_L4S5AII_L4S7AII/PeripheralPins.c
index cb43bc7209..8255970b7b 100644
--- a/variants/STM32L4xx/L4R5AGI_L4R5AIIx(P)_L4R7AII_L4S5AII_L4S7AII/PeripheralPins.c
+++ b/variants/STM32L4xx/L4R5AGI_L4R5AIIx(P)_L4R7AII_L4S5AII_L4S7AII/PeripheralPins.c
@@ -376,7 +376,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -386,7 +386,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L4R5QGIx(S)_L4R5QIIx(P)_L4S5QII/PeripheralPins.c b/variants/STM32L4xx/L4R5QGIx(S)_L4R5QIIx(P)_L4S5QII/PeripheralPins.c
index 70585898c9..4b7a9e6004 100644
--- a/variants/STM32L4xx/L4R5QGIx(S)_L4R5QIIx(P)_L4S5QII/PeripheralPins.c
+++ b/variants/STM32L4xx/L4R5QGIx(S)_L4R5QIIx(P)_L4S5QII/PeripheralPins.c
@@ -355,7 +355,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -364,7 +364,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L4R5V(G-I)T_L4R7VIT_L4S5VIT_L4S7VIT/PeripheralPins.c b/variants/STM32L4xx/L4R5V(G-I)T_L4R7VIT_L4S5VIT_L4S7VIT/PeripheralPins.c
index a786bed078..2ab7d262c3 100644
--- a/variants/STM32L4xx/L4R5V(G-I)T_L4R7VIT_L4S5VIT_L4S7VIT/PeripheralPins.c
+++ b/variants/STM32L4xx/L4R5V(G-I)T_L4R7VIT_L4S5VIT_L4S7VIT/PeripheralPins.c
@@ -328,7 +328,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -337,7 +337,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L4R5Z(G-I)T_L4R7ZIT_L4S5ZIT_L4S7ZIT/PeripheralPins.c b/variants/STM32L4xx/L4R5Z(G-I)T_L4R7ZIT_L4S5ZIT_L4S7ZIT/PeripheralPins.c
index 0a025c5757..a5443030c8 100644
--- a/variants/STM32L4xx/L4R5Z(G-I)T_L4R7ZIT_L4S5ZIT_L4S7ZIT/PeripheralPins.c
+++ b/variants/STM32L4xx/L4R5Z(G-I)T_L4R7ZIT_L4S5ZIT_L4S7ZIT/PeripheralPins.c
@@ -361,7 +361,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -370,7 +370,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L4R5Z(G-I)Y_L4R9Z(G-I)Y_L4S5ZIY_L4S9ZIY/PeripheralPins.c b/variants/STM32L4xx/L4R5Z(G-I)Y_L4R9Z(G-I)Y_L4S5ZIY_L4S9ZIY/PeripheralPins.c
index 2b00cff111..e15bd251c8 100644
--- a/variants/STM32L4xx/L4R5Z(G-I)Y_L4R9Z(G-I)Y_L4S5ZIY_L4S9ZIY/PeripheralPins.c
+++ b/variants/STM32L4xx/L4R5Z(G-I)Y_L4R9Z(G-I)Y_L4S5ZIY_L4S9ZIY/PeripheralPins.c
@@ -354,7 +354,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -363,7 +363,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L4R5ZITxP/PeripheralPins.c b/variants/STM32L4xx/L4R5ZITxP/PeripheralPins.c
index 9b560f8148..47431c5630 100644
--- a/variants/STM32L4xx/L4R5ZITxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L4R5ZITxP/PeripheralPins.c
@@ -355,7 +355,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -364,7 +364,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L4R9A(G-I)I_L4S9AII/PeripheralPins.c b/variants/STM32L4xx/L4R9A(G-I)I_L4S9AII/PeripheralPins.c
index f7a403300f..836cb085d8 100644
--- a/variants/STM32L4xx/L4R9A(G-I)I_L4S9AII/PeripheralPins.c
+++ b/variants/STM32L4xx/L4R9A(G-I)I_L4S9AII/PeripheralPins.c
@@ -370,7 +370,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -380,7 +380,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L4R9V(G-I)T_L4S9VIT/PeripheralPins.c b/variants/STM32L4xx/L4R9V(G-I)T_L4S9VIT/PeripheralPins.c
index fc02b50616..7daa7d00a9 100644
--- a/variants/STM32L4xx/L4R9V(G-I)T_L4S9VIT/PeripheralPins.c
+++ b/variants/STM32L4xx/L4R9V(G-I)T_L4S9VIT/PeripheralPins.c
@@ -317,7 +317,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -326,7 +326,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L4R9Z(G-I)J_L4S9ZIJ/PeripheralPins.c b/variants/STM32L4xx/L4R9Z(G-I)J_L4S9ZIJ/PeripheralPins.c
index df56951435..cb573eaa59 100644
--- a/variants/STM32L4xx/L4R9Z(G-I)J_L4S9ZIJ/PeripheralPins.c
+++ b/variants/STM32L4xx/L4R9Z(G-I)J_L4S9ZIJ/PeripheralPins.c
@@ -356,7 +356,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -365,7 +365,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L4R9Z(G-I)T_L4S9ZIT/PeripheralPins.c b/variants/STM32L4xx/L4R9Z(G-I)T_L4S9ZIT/PeripheralPins.c
index 8acea3edef..99dd47f02d 100644
--- a/variants/STM32L4xx/L4R9Z(G-I)T_L4S9ZIT/PeripheralPins.c
+++ b/variants/STM32L4xx/L4R9Z(G-I)T_L4S9ZIT/PeripheralPins.c
@@ -353,7 +353,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -362,7 +362,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L4R9ZIYxP/PeripheralPins.c b/variants/STM32L4xx/L4R9ZIYxP/PeripheralPins.c
index 72a6eaecf8..166e237f04 100644
--- a/variants/STM32L4xx/L4R9ZIYxP/PeripheralPins.c
+++ b/variants/STM32L4xx/L4R9ZIYxP/PeripheralPins.c
@@ -347,7 +347,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -356,7 +356,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
From 72688189f11a3d197ca874b316c448bce5dc8859 Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Wed, 11 May 2022 17:49:31 +0200
Subject: [PATCH 14/16] variant: update custom files with HAL legacy module
definitions
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
.../F072C8(T-U)_F072CB(T-U-Y)/PeripheralPins_ELEKTOR_F072Cx.c | 4 ++--
.../F072R8T_F072RB(H-I-T)/PeripheralPins_PYBSTICK26_DUINO.c | 4 ++--
.../F103C8T_F103CB(T-U)/PeripheralPins_MALYANM200_F103CB.c | 4 ++--
.../STM32F1xx/F103R(C-D-E)T/PeripheralPins_STORM32_V1_31_RC.c | 4 ++--
.../PeripheralPins_NUCLEO_F207ZG.c | 4 ++--
variants/STM32F3xx/F303C(B-C)T/PeripheralPins_SPARKY_F303CC.c | 4 ++--
.../STM32F4xx/F405RGT_F415RGT/PeripheralPins_FEATHER_F405.c | 4 ++--
.../F407V(E-G)T_F417V(E-G)T/PeripheralPins_ARMED_V1.c | 4 ++--
.../F407V(E-G)T_F417V(E-G)T/PeripheralPins_BLACK_F407VX.c | 4 ++--
.../F407V(E-G)T_F417V(E-G)T/PeripheralPins_BLUE_F407VE_MINI.c | 4 ++--
.../F407V(E-G)T_F417V(E-G)T/PeripheralPins_FK407M1.c | 4 ++--
.../F407V(E-G)T_F417V(E-G)T/PeripheralPins_PRNTR_V1.c | 4 ++--
.../F407V(E-G)T_F417V(E-G)T/PeripheralPins_PRNTR_V2.c | 4 ++--
.../F407Z(E-G)T_F417Z(E-G)T/PeripheralPins_BLACK_F407ZX.c | 4 ++--
.../PeripheralPins_VCCGND_F407ZG_MINI.c | 4 ++--
.../F412R(E-G)(T-Y)x(P)/PeripheralPins_PYBSTICK26_PRO.c | 4 ++--
.../F413Z(G-H)(J-T)_F423ZH(J-T)/PeripheralPins_DISCO_F413ZH.c | 4 ++--
variants/STM32F4xx/F446V(C-E)T/PeripheralPins_FYSETC_S6.c | 4 ++--
variants/STM32F4xx/F446V(C-E)T/PeripheralPins_RUMBA32.c | 4 ++--
variants/STM32F4xx/F446V(C-E)T/PeripheralPins_VAKE_V1.c | 4 ++--
.../PeripheralPins_ETHERCAT_DUINO.c | 4 ++--
.../PeripheralPins_DISCO_F746NG.c | 4 ++--
.../PeripheralPins_REMRAM_V1.c | 4 ++--
.../PeripheralPins_DAISY_PATCH_SM.c | 2 +-
.../PeripheralPins_DAISY_PETAL_SM.c | 2 +-
.../PeripheralPins_DAISY_SEED.c | 2 +-
.../PeripheralPins_DevEBoxH7xx.c | 2 +-
.../PeripheralPins_WeActMiniH7xx.c | 2 +-
.../PeripheralPins_B_L475E_IOT01A.c | 4 ++--
.../PeripheralPins_B_L4S5I_IOT01A.c | 4 ++--
.../PeripheralPins_SWAN_R5.c | 4 ++--
.../L4R9Z(G-I)J_L4S9ZIJ/PeripheralPins_STEVAL_MKSBOX1V1.c | 4 ++--
32 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/variants/STM32F0xx/F072C8(T-U)_F072CB(T-U-Y)/PeripheralPins_ELEKTOR_F072Cx.c b/variants/STM32F0xx/F072C8(T-U)_F072CB(T-U-Y)/PeripheralPins_ELEKTOR_F072Cx.c
index dc58b129aa..4ba675939d 100644
--- a/variants/STM32F0xx/F072C8(T-U)_F072CB(T-U-Y)/PeripheralPins_ELEKTOR_F072Cx.c
+++ b/variants/STM32F0xx/F072C8(T-U)_F072CB(T-U-Y)/PeripheralPins_ELEKTOR_F072Cx.c
@@ -217,7 +217,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
@@ -225,7 +225,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
diff --git a/variants/STM32F0xx/F072R8T_F072RB(H-I-T)/PeripheralPins_PYBSTICK26_DUINO.c b/variants/STM32F0xx/F072R8T_F072RB(H-I-T)/PeripheralPins_PYBSTICK26_DUINO.c
index c4414eebf2..89dd93ba55 100644
--- a/variants/STM32F0xx/F072R8T_F072RB(H-I-T)/PeripheralPins_PYBSTICK26_DUINO.c
+++ b/variants/STM32F0xx/F072R8T_F072RB(H-I-T)/PeripheralPins_PYBSTICK26_DUINO.c
@@ -236,7 +236,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
@@ -244,7 +244,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF4_CAN)},
diff --git a/variants/STM32F1xx/F103C8T_F103CB(T-U)/PeripheralPins_MALYANM200_F103CB.c b/variants/STM32F1xx/F103C8T_F103CB(T-U)/PeripheralPins_MALYANM200_F103CB.c
index 0adc04d431..3a4a9a3455 100644
--- a/variants/STM32F1xx/F103C8T_F103CB(T-U)/PeripheralPins_MALYANM200_F103CB.c
+++ b/variants/STM32F1xx/F103C8T_F103CB(T-U)/PeripheralPins_MALYANM200_F103CB.c
@@ -211,7 +211,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_NONE)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_CAN1_2)},
@@ -219,7 +219,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_CAN1_2)},
diff --git a/variants/STM32F1xx/F103R(C-D-E)T/PeripheralPins_STORM32_V1_31_RC.c b/variants/STM32F1xx/F103R(C-D-E)T/PeripheralPins_STORM32_V1_31_RC.c
index 2a6becc626..dfe1eec1fa 100644
--- a/variants/STM32F1xx/F103R(C-D-E)T/PeripheralPins_STORM32_V1_31_RC.c
+++ b/variants/STM32F1xx/F103R(C-D-E)T/PeripheralPins_STORM32_V1_31_RC.c
@@ -264,7 +264,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_NONE)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, AFIO_CAN1_2)},
@@ -272,7 +272,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_NONE)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, AFIO_CAN1_2)},
diff --git a/variants/STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T/PeripheralPins_NUCLEO_F207ZG.c b/variants/STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T/PeripheralPins_NUCLEO_F207ZG.c
index 072bb45845..be3a171f50 100644
--- a/variants/STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T/PeripheralPins_NUCLEO_F207ZG.c
+++ b/variants/STM32F2xx/F207Z(C-E-F-G)T_F217Z(E-G)T/PeripheralPins_NUCLEO_F207ZG.c
@@ -315,7 +315,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -326,7 +326,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F3xx/F303C(B-C)T/PeripheralPins_SPARKY_F303CC.c b/variants/STM32F3xx/F303C(B-C)T/PeripheralPins_SPARKY_F303CC.c
index e8e879d447..4766626f6c 100644
--- a/variants/STM32F3xx/F303C(B-C)T/PeripheralPins_SPARKY_F303CC.c
+++ b/variants/STM32F3xx/F303C(B-C)T/PeripheralPins_SPARKY_F303CC.c
@@ -251,7 +251,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
// {PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)}, // USB_DM
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
@@ -259,7 +259,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
// {PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)}, // USB_DP
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN)},
diff --git a/variants/STM32F4xx/F405RGT_F415RGT/PeripheralPins_FEATHER_F405.c b/variants/STM32F4xx/F405RGT_F415RGT/PeripheralPins_FEATHER_F405.c
index 979a47e329..daeec18188 100644
--- a/variants/STM32F4xx/F405RGT_F415RGT/PeripheralPins_FEATHER_F405.c
+++ b/variants/STM32F4xx/F405RGT_F415RGT/PeripheralPins_FEATHER_F405.c
@@ -274,7 +274,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
// {PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
// {PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -284,7 +284,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
// {PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
// {PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins_ARMED_V1.c b/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins_ARMED_V1.c
index cea5a3ad7b..d8c701e2f2 100644
--- a/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins_ARMED_V1.c
+++ b/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins_ARMED_V1.c
@@ -295,7 +295,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
// {PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
// {PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -306,7 +306,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
// {PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
// {PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins_BLACK_F407VX.c b/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins_BLACK_F407VX.c
index 2d57251240..a10cce9c6f 100644
--- a/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins_BLACK_F407VX.c
+++ b/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins_BLACK_F407VX.c
@@ -295,7 +295,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -306,7 +306,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins_BLUE_F407VE_MINI.c b/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins_BLUE_F407VE_MINI.c
index dc6521eb53..ee72672614 100644
--- a/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins_BLUE_F407VE_MINI.c
+++ b/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins_BLUE_F407VE_MINI.c
@@ -295,7 +295,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -306,7 +306,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins_FK407M1.c b/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins_FK407M1.c
index 920e9f49b4..be1ecbe5d1 100644
--- a/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins_FK407M1.c
+++ b/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins_FK407M1.c
@@ -295,7 +295,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -306,7 +306,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins_PRNTR_V1.c b/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins_PRNTR_V1.c
index d3e2d5b69c..52e8f386b9 100644
--- a/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins_PRNTR_V1.c
+++ b/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins_PRNTR_V1.c
@@ -295,7 +295,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
// {PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, // USB
// {PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)}, // SPI
@@ -306,7 +306,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
// {PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, // USB
// {PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)}, // E0_PWM
diff --git a/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins_PRNTR_V2.c b/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins_PRNTR_V2.c
index 5c719f5686..7698e4bb4f 100644
--- a/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins_PRNTR_V2.c
+++ b/variants/STM32F4xx/F407V(E-G)T_F417V(E-G)T/PeripheralPins_PRNTR_V2.c
@@ -295,7 +295,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
// {PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, // USB
// {PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)}, // SPI
@@ -306,7 +306,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
// {PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, // USB
// {PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)}, // E0_PWM
diff --git a/variants/STM32F4xx/F407Z(E-G)T_F417Z(E-G)T/PeripheralPins_BLACK_F407ZX.c b/variants/STM32F4xx/F407Z(E-G)T_F417Z(E-G)T/PeripheralPins_BLACK_F407ZX.c
index b228025922..7af9089edb 100644
--- a/variants/STM32F4xx/F407Z(E-G)T_F417Z(E-G)T/PeripheralPins_BLACK_F407ZX.c
+++ b/variants/STM32F4xx/F407Z(E-G)T_F417Z(E-G)T/PeripheralPins_BLACK_F407ZX.c
@@ -315,7 +315,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -326,7 +326,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F4xx/F407Z(E-G)T_F417Z(E-G)T/PeripheralPins_VCCGND_F407ZG_MINI.c b/variants/STM32F4xx/F407Z(E-G)T_F417Z(E-G)T/PeripheralPins_VCCGND_F407ZG_MINI.c
index 165c3e0f62..c32fec045c 100644
--- a/variants/STM32F4xx/F407Z(E-G)T_F417Z(E-G)T/PeripheralPins_VCCGND_F407ZG_MINI.c
+++ b/variants/STM32F4xx/F407Z(E-G)T_F417Z(E-G)T/PeripheralPins_VCCGND_F407ZG_MINI.c
@@ -315,7 +315,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -326,7 +326,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F4xx/F412R(E-G)(T-Y)x(P)/PeripheralPins_PYBSTICK26_PRO.c b/variants/STM32F4xx/F412R(E-G)(T-Y)x(P)/PeripheralPins_PYBSTICK26_PRO.c
index 506730a648..70612011ae 100644
--- a/variants/STM32F4xx/F412R(E-G)(T-Y)x(P)/PeripheralPins_PYBSTICK26_PRO.c
+++ b/variants/STM32F4xx/F412R(E-G)(T-Y)x(P)/PeripheralPins_PYBSTICK26_PRO.c
@@ -254,7 +254,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
// {PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
// {PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -264,7 +264,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
// {PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
// {PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F4xx/F413Z(G-H)(J-T)_F423ZH(J-T)/PeripheralPins_DISCO_F413ZH.c b/variants/STM32F4xx/F413Z(G-H)(J-T)_F423ZH(J-T)/PeripheralPins_DISCO_F413ZH.c
index be5c3d4b9e..a3b43224cb 100644
--- a/variants/STM32F4xx/F413Z(G-H)(J-T)_F423ZH(J-T)/PeripheralPins_DISCO_F413ZH.c
+++ b/variants/STM32F4xx/F413Z(G-H)(J-T)_F423ZH(J-T)/PeripheralPins_DISCO_F413ZH.c
@@ -360,7 +360,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_8, CAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_CAN3)},
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -375,7 +375,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PA_15, CAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_CAN3)},
diff --git a/variants/STM32F4xx/F446V(C-E)T/PeripheralPins_FYSETC_S6.c b/variants/STM32F4xx/F446V(C-E)T/PeripheralPins_FYSETC_S6.c
index e3c5afe5e0..6993c1ae6c 100644
--- a/variants/STM32F4xx/F446V(C-E)T/PeripheralPins_FYSETC_S6.c
+++ b/variants/STM32F4xx/F446V(C-E)T/PeripheralPins_FYSETC_S6.c
@@ -325,7 +325,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
// {PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
// {PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -336,7 +336,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
// {PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
// {PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F4xx/F446V(C-E)T/PeripheralPins_RUMBA32.c b/variants/STM32F4xx/F446V(C-E)T/PeripheralPins_RUMBA32.c
index eec83ff478..cc51069b23 100644
--- a/variants/STM32F4xx/F446V(C-E)T/PeripheralPins_RUMBA32.c
+++ b/variants/STM32F4xx/F446V(C-E)T/PeripheralPins_RUMBA32.c
@@ -325,7 +325,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
// {PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
// {PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -336,7 +336,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
// {PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
// {PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F4xx/F446V(C-E)T/PeripheralPins_VAKE_V1.c b/variants/STM32F4xx/F446V(C-E)T/PeripheralPins_VAKE_V1.c
index 242ab28d34..93efd88148 100644
--- a/variants/STM32F4xx/F446V(C-E)T/PeripheralPins_VAKE_V1.c
+++ b/variants/STM32F4xx/F446V(C-E)T/PeripheralPins_VAKE_V1.c
@@ -353,7 +353,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
// {PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
// {PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -364,7 +364,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
// {PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
// {PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)/PeripheralPins_ETHERCAT_DUINO.c b/variants/STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)/PeripheralPins_ETHERCAT_DUINO.c
index 53f57a95f4..5afb4b190a 100644
--- a/variants/STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)/PeripheralPins_ETHERCAT_DUINO.c
+++ b/variants/STM32F7xx/F745Z(E-G)T_F746Z(E-G)(T-Y)_F750Z8T_F756ZG(T-Y)/PeripheralPins_ETHERCAT_DUINO.c
@@ -361,7 +361,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
// {PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
// {PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -372,7 +372,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
// {PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
// {PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F7xx/F746B(E-G)T_F746N(E-G)H_F750N8H_F756BGT_F756NGH/PeripheralPins_DISCO_F746NG.c b/variants/STM32F7xx/F746B(E-G)T_F746N(E-G)H_F750N8H_F756BGT_F756NGH/PeripheralPins_DISCO_F746NG.c
index 5bf6094df7..73d3197494 100644
--- a/variants/STM32F7xx/F746B(E-G)T_F746N(E-G)H_F750N8H_F756BGT_F756NGH/PeripheralPins_DISCO_F746NG.c
+++ b/variants/STM32F7xx/F746B(E-G)T_F746N(E-G)H_F750N8H_F756BGT_F756NGH/PeripheralPins_DISCO_F746NG.c
@@ -386,7 +386,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
{PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_5, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
@@ -398,7 +398,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
{PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_6, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)},
diff --git a/variants/STM32F7xx/F765V(G-I)(H-T)_F767V(G-I)(H-T)_F777VI(H-T)/PeripheralPins_REMRAM_V1.c b/variants/STM32F7xx/F765V(G-I)(H-T)_F767V(G-I)(H-T)_F777VI(H-T)/PeripheralPins_REMRAM_V1.c
index 64f860fa19..9e3bd843a5 100644
--- a/variants/STM32F7xx/F765V(G-I)(H-T)_F767V(G-I)(H-T)_F777VI(H-T)/PeripheralPins_REMRAM_V1.c
+++ b/variants/STM32F7xx/F765V(G-I)(H-T)_F767V(G-I)(H-T)_F777VI(H-T)/PeripheralPins_REMRAM_V1.c
@@ -359,7 +359,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
// {PA_8, CAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_CAN3)},
// {PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -372,7 +372,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
// {PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
// {PA_15, CAN3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF11_CAN3)},
diff --git a/variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)/PeripheralPins_DAISY_PATCH_SM.c b/variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)/PeripheralPins_DAISY_PATCH_SM.c
index 884de93fc1..65ad245811 100644
--- a/variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)/PeripheralPins_DAISY_PATCH_SM.c
+++ b/variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)/PeripheralPins_DAISY_PATCH_SM.c
@@ -467,7 +467,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)/PeripheralPins_DAISY_PETAL_SM.c b/variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)/PeripheralPins_DAISY_PETAL_SM.c
index a44e86c168..cd5049c2e4 100644
--- a/variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)/PeripheralPins_DAISY_PETAL_SM.c
+++ b/variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)/PeripheralPins_DAISY_PETAL_SM.c
@@ -435,7 +435,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)/PeripheralPins_DAISY_SEED.c b/variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)/PeripheralPins_DAISY_SEED.c
index ac02195ae7..f9f830b747 100644
--- a/variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)/PeripheralPins_DAISY_SEED.c
+++ b/variants/STM32H7xx/H742I(G-I)(K-T)_H743I(G-I)(K-T)_H750IB(K-T)_H753II(K-T)/PeripheralPins_DAISY_SEED.c
@@ -466,7 +466,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32H7xx/H742V(G-I)(H-T)_H743V(G-I)(H-T)_H750VBT_H753VI(H-T)/PeripheralPins_DevEBoxH7xx.c b/variants/STM32H7xx/H742V(G-I)(H-T)_H743V(G-I)(H-T)_H750VBT_H753VI(H-T)/PeripheralPins_DevEBoxH7xx.c
index 60834721eb..c80e05a32c 100644
--- a/variants/STM32H7xx/H742V(G-I)(H-T)_H743V(G-I)(H-T)_H750VBT_H753VI(H-T)/PeripheralPins_DevEBoxH7xx.c
+++ b/variants/STM32H7xx/H742V(G-I)(H-T)_H743V(G-I)(H-T)_H750VBT_H753VI(H-T)/PeripheralPins_DevEBoxH7xx.c
@@ -383,7 +383,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32H7xx/H742V(G-I)(H-T)_H743V(G-I)(H-T)_H750VBT_H753VI(H-T)/PeripheralPins_WeActMiniH7xx.c b/variants/STM32H7xx/H742V(G-I)(H-T)_H743V(G-I)(H-T)_H750VBT_H753VI(H-T)/PeripheralPins_WeActMiniH7xx.c
index b55afd7c22..043a355cb6 100644
--- a/variants/STM32H7xx/H742V(G-I)(H-T)_H743V(G-I)(H-T)_H750VBT_H753VI(H-T)/PeripheralPins_WeActMiniH7xx.c
+++ b/variants/STM32H7xx/H742V(G-I)(H-T)_H743V(G-I)(H-T)_H750VBT_H753VI(H-T)/PeripheralPins_WeActMiniH7xx.c
@@ -383,7 +383,7 @@ WEAK const PinMap PinMap_CAN_TD[] = {
//*** ETHERNET ***
-#ifdef HAL_ETH_MODULE_ENABLED
+#if defined(HAL_ETH_MODULE_ENABLED) || defined(HAL_ETH_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_Ethernet[] = {
{PA_0, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS
{PA_1, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_REF_CLK
diff --git a/variants/STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT/PeripheralPins_B_L475E_IOT01A.c b/variants/STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT/PeripheralPins_B_L475E_IOT01A.c
index 8be1efe95f..ef8dd87c1d 100644
--- a/variants/STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT/PeripheralPins_B_L475E_IOT01A.c
+++ b/variants/STM32L4xx/L475V(C-E-G)T_L476V(C-E-G)T_L486VGT/PeripheralPins_B_L475E_IOT01A.c
@@ -324,7 +324,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
// {PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, //USB_OTG_FS_DM
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, //D15/I2C1_SCL
@@ -333,7 +333,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
// {PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, //USB_OTG_FS_DP
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, //D14/I2C1_SDA
diff --git a/variants/STM32L4xx/L4R5V(G-I)T_L4R7VIT_L4S5VIT_L4S7VIT/PeripheralPins_B_L4S5I_IOT01A.c b/variants/STM32L4xx/L4R5V(G-I)T_L4R7VIT_L4S5VIT_L4S7VIT/PeripheralPins_B_L4S5I_IOT01A.c
index 66c7ad96b3..3a37d82b35 100644
--- a/variants/STM32L4xx/L4R5V(G-I)T_L4R7VIT_L4S5VIT_L4S7VIT/PeripheralPins_B_L4S5I_IOT01A.c
+++ b/variants/STM32L4xx/L4R5V(G-I)T_L4R7VIT_L4S5VIT_L4S7VIT/PeripheralPins_B_L4S5I_IOT01A.c
@@ -327,7 +327,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
// {PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -336,7 +336,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
// {PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L4R5Z(G-I)Y_L4R9Z(G-I)Y_L4S5ZIY_L4S9ZIY/PeripheralPins_SWAN_R5.c b/variants/STM32L4xx/L4R5Z(G-I)Y_L4R9Z(G-I)Y_L4S5ZIY_L4S9ZIY/PeripheralPins_SWAN_R5.c
index 72462148a6..eacc050fc8 100644
--- a/variants/STM32L4xx/L4R5Z(G-I)Y_L4R9Z(G-I)Y_L4S5ZIY_L4S9ZIY/PeripheralPins_SWAN_R5.c
+++ b/variants/STM32L4xx/L4R5Z(G-I)Y_L4R9Z(G-I)Y_L4S5ZIY_L4S9ZIY/PeripheralPins_SWAN_R5.c
@@ -354,7 +354,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
// {PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, // USB DM
// {PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, // NC
@@ -363,7 +363,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
// {PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, // USB DP
{PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
diff --git a/variants/STM32L4xx/L4R9Z(G-I)J_L4S9ZIJ/PeripheralPins_STEVAL_MKSBOX1V1.c b/variants/STM32L4xx/L4R9Z(G-I)J_L4S9ZIJ/PeripheralPins_STEVAL_MKSBOX1V1.c
index ac2d5cb0fa..671783be51 100644
--- a/variants/STM32L4xx/L4R9Z(G-I)J_L4S9ZIJ/PeripheralPins_STEVAL_MKSBOX1V1.c
+++ b/variants/STM32L4xx/L4R9Z(G-I)J_L4S9ZIJ/PeripheralPins_STEVAL_MKSBOX1V1.c
@@ -356,7 +356,7 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
//*** CAN ***
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_RD[] = {
// {PA_11, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
// {PB_8, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
@@ -365,7 +365,7 @@ WEAK const PinMap PinMap_CAN_RD[] = {
};
#endif
-#ifdef HAL_CAN_MODULE_ENABLED
+#if defined(HAL_CAN_MODULE_ENABLED) || defined(HAL_CAN_LEGACY_MODULE_ENABLED)
WEAK const PinMap PinMap_CAN_TD[] = {
// {PA_12, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
// {PB_9, CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
From 274cea02d620270ea18502b4b0e5d5cb58379371 Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Mon, 2 May 2022 14:55:31 +0200
Subject: [PATCH 15/16] feat(F4): enable HAL Ethernet legacy
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
system/STM32F4xx/stm32f4xx_hal_conf_default.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/system/STM32F4xx/stm32f4xx_hal_conf_default.h b/system/STM32F4xx/stm32f4xx_hal_conf_default.h
index 5469fc90ee..36a7e0e5ca 100644
--- a/system/STM32F4xx/stm32f4xx_hal_conf_default.h
+++ b/system/STM32F4xx/stm32f4xx_hal_conf_default.h
@@ -49,6 +49,7 @@ extern "C" {
#define HAL_DMA_MODULE_ENABLED
#define HAL_DMA2D_MODULE_ENABLED
#define HAL_ETH_MODULE_ENABLED
+/*#define HAL_ETH_LEGACY_MODULE_ENABLED*/
#define HAL_FLASH_MODULE_ENABLED
#define HAL_NAND_MODULE_ENABLED
#define HAL_NOR_MODULE_ENABLED
@@ -345,6 +346,10 @@ in voltage and temperature. */
#include "stm32f4xx_hal_eth.h"
#endif /* HAL_ETH_MODULE_ENABLED */
+#ifdef HAL_ETH_LEGACY_MODULE_ENABLED
+#include "Legacy/stm32f4xx_hal_eth_legacy.h"
+#endif /* HAL_ETH_LEGACY_MODULE_ENABLED */
+
#ifdef HAL_FLASH_MODULE_ENABLED
#include "stm32f4xx_hal_flash.h"
#endif /* HAL_FLASH_MODULE_ENABLED */
From a018a5ff5268d881d06b21fea2d5cb1144efa0fe Mon Sep 17 00:00:00 2001
From: Frederic Pillon <frederic.pillon@st.com>
Date: Thu, 5 May 2022 17:45:59 +0200
Subject: [PATCH 16/16] fix: use HAL ethernet legacy for Nucleo F429ZI
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
---
.../variant_NUCLEO_F429ZI.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/variants/STM32F4xx/F427Z(G-I)T_F429ZET_F429Z(G-I)(T-Y)_F437Z(G-I)T_F439Z(G-I)(T-Y)/variant_NUCLEO_F429ZI.h b/variants/STM32F4xx/F427Z(G-I)T_F429ZET_F429Z(G-I)(T-Y)_F437Z(G-I)T_F439Z(G-I)(T-Y)/variant_NUCLEO_F429ZI.h
index f42f8255e1..fef3a85d70 100644
--- a/variants/STM32F4xx/F427Z(G-I)T_F429ZET_F429Z(G-I)(T-Y)_F437Z(G-I)T_F439Z(G-I)(T-Y)/variant_NUCLEO_F429ZI.h
+++ b/variants/STM32F4xx/F427Z(G-I)T_F429ZET_F429Z(G-I)(T-Y)_F437Z(G-I)T_F439Z(G-I)(T-Y)/variant_NUCLEO_F429ZI.h
@@ -224,7 +224,9 @@
#define HAL_DAC_MODULE_ENABLED
#endif
#if !defined(HAL_ETH_MODULE_DISABLED)
- #define HAL_ETH_MODULE_ENABLED
+ /* #define HAL_ETH_MODULE_ENABLED */
+ /* For compatibility until STM32Ethernet library is updated */
+ #define HAL_ETH_LEGACY_MODULE_ENABLED
#endif
#if !defined(HAL_SD_MODULE_DISABLED)
#define HAL_SD_MODULE_ENABLED