Skip to content

Commit 236258b

Browse files
authored
Merge pull request #3546 from bcostm/dev_can_nucleo-f412zg
NUCLEO-F412ZG - Add CAN peripheral
2 parents 63601df + f6c93d3 commit 236258b

File tree

6 files changed

+17
-5
lines changed

6 files changed

+17
-5
lines changed

features/unsupported/tests/mbed/can/main.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ CAN can1(PD_0, PD_1);
2020
defined(TARGET_NUCLEO_F302R8) || defined(TARGET_NUCLEO_F446RE) || \
2121
defined(TARGET_DISCO_F429ZI) || defined(TARGET_NUCLEO_F103RB) || \
2222
defined(TARGET_NUCLEO_F746ZG) || defined(TARGET_NUCLEO_L476RG) || \
23+
defined(TARGET_NUCLEO_F412ZG) || \
2324
defined(TARGET_NUCLEO_L432KC) || defined(TARGET_DISCO_F303VC)
2425
CAN can1(PA_11, PA_12);
2526
#elif defined(TARGET_DISCO_F469NI) ||defined(TARGET_DISCO_F746NG)
@@ -34,6 +35,7 @@ CAN can2(p34, p33);
3435
CAN can2(p30, p29);
3536
#elif defined(TARGET_NUCLEO_F446RE) || defined(TARGET_DISCO_F469NI) || \
3637
defined(TARGET_DISCO_F429ZI) || defined(TARGET_NUCLEO_F746ZG) || \
38+
defined(TARGET_NUCLEO_F412ZG) || \
3739
defined(TARGET_DISCO_F746NG)
3840
CAN can2(PB_5, PB_6);
3941
#endif

features/unsupported/tests/mbed/can_interrupt/main.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ CAN can1(PD_0, PD_1);
2020
defined(TARGET_NUCLEO_F302R8) || defined(TARGET_NUCLEO_F446RE) || \
2121
defined(TARGET_DISCO_F429ZI) || defined(TARGET_NUCLEO_F103RB) || \
2222
defined(TARGET_NUCLEO_F746ZG) || defined(TARGET_NUCLEO_L476RG) || \
23+
defined(TARGET_NUCLEO_F412ZG) || \
2324
defined(TARGET_NUCLEO_L432KC) || defined(TARGET_DISCO_F303VC)
2425
CAN can1(PA_11, PA_12);
2526
#elif defined(TARGET_DISCO_F469NI) || defined(TARGET_DISCO_F746NG)
@@ -34,6 +35,7 @@ CAN can2(p34, p33);
3435
CAN can2(p30, p29);
3536
#elif defined(TARGET_NUCLEO_F446RE) || defined(TARGET_DISCO_F469NI) || \
3637
defined(TARGET_DISCO_F429ZI) || defined(TARGET_NUCLEO_F746ZG) || \
38+
defined(TARGET_NUCLEO_F412ZG) || \
3739
defined(TARGET_DISCO_F746NG)
3840
CAN can2(PB_5, PB_6);
3941
#endif

features/unsupported/tests/mbed/can_loopback/main.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,14 @@ CAN can1(P5_9, P5_10);
1919
defined(TARGET_NUCLEO_F302R8) || defined(TARGET_NUCLEO_F446RE) || \
2020
defined(TARGET_DISCO_F429ZI) || \
2121
defined(TARGET_NUCLEO_F746ZG) || defined(TARGET_DISCO_L476VG) || \
22+
defined(TARGET_NUCLEO_F412ZG) || \
2223
defined(TARGET_NUCLEO_L476RG) || defined(TARGET_NUCLEO_L432KC)
2324
CAN can1(PA_11, PA_12);
2425
#elif defined(TARGET_DISCO_F469NI) || defined(TARGET_DISCO_F746NG) || \
2526
defined(TARGET_NUCLEO_F446ZE) || defined(TARGET_NUCLEO_F103RB) || \
2627
defined(TARGET_NUCLEO_F207ZG) || defined(TARGET_NUCLEO_F303ZE) || \
2728
defined(TARGET_DISCO_F769NI) || defined(TARGET_NUCLEO_F767ZI) || \
29+
defined(TARGET_NUCLEO_F412ZG) || \
2830
defined(TARGET_DISCO_F303VC)
2931
CAN can1(PB_8, PB_9);
3032
#endif

targets/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F412ZG/objects.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@ struct analogin_s {
4646
uint8_t channel;
4747
};
4848

49+
struct can_s {
50+
CANName can;
51+
int index;
52+
};
53+
4954
struct trng_s {
5055
RNG_HandleTypeDef handle;
5156
};

targets/targets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -856,7 +856,7 @@
856856
"inherits": ["Target"],
857857
"detect_code": ["0826"],
858858
"macros": ["TRANSACTION_QUEUE_SIZE_SPI=2"],
859-
"device_has": ["ANALOGIN", "ERROR_RED", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES", "TRNG"],
859+
"device_has": ["ANALOGIN", "CAN", "ERROR_RED", "I2C", "I2CSLAVE", "I2C_ASYNCH", "INTERRUPTIN", "LOWPOWERTIMER", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_ASYNCH", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "SPI_ASYNCH", "STDIO_MESSAGES", "TRNG"],
860860
"release_versions": ["2", "5"],
861861
"device_name": "STM32F412ZG"
862862
},

tools/tests.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@
120120
* NUCLEO_L476RG: (RX=PA_11, TX=PA_12)
121121
* NUCLEO_L432KC: (RX=PA_11, TX=PA_12)
122122
* DISCO_F303VC: (RX=PA_11, TX=PA_12)
123+
* NUCLEO_F412ZG: (RX=PA_11, TX=PA_12)
123124
124125
"""
125126
TESTS = [
@@ -324,7 +325,7 @@
324325
"NUCLEO_F303RE", "NUCLEO_F303K8", "NUCLEO_F302R8", "NUCLEO_F446RE","NUCLEO_F446ZE",
325326
"DISCO_F469NI", "DISCO_F429ZI", "NUCLEO_F103RB", "NUCLEO_F746ZG",
326327
"DISCO_F746NG", "DISCO_L476VG", "NUCLEO_L476RG", "NUCLEO_L432KC",
327-
"DISCO_F769NI", "NUCLEO_F767ZI", "DISCO_F303VC"]
328+
"DISCO_F769NI", "NUCLEO_F767ZI", "DISCO_F303VC", "NUCLEO_F412ZG"]
328329
},
329330
{
330331
"id": "MBED_A28", "description": "CAN loopback test",
@@ -336,7 +337,7 @@
336337
"NUCLEO_F303RE", "NUCLEO_F303K8", "NUCLEO_F302R8", "NUCLEO_F303ZE", "NUCLEO_F446RE","NUCLEO_F446ZE",
337338
"DISCO_F469NI", "DISCO_F429ZI", "NUCLEO_F103RB", "NUCLEO_F746ZG",
338339
"DISCO_F746NG", "DISCO_L476VG", "NUCLEO_L476RG", "NUCLEO_L432KC",
339-
"DISCO_F769NI", "NUCLEO_F767ZI", "DISCO_F303VC"]
340+
"DISCO_F769NI", "NUCLEO_F767ZI", "DISCO_F303VC", "NUCLEO_F412ZG"]
340341
},
341342
{
342343
"id": "MBED_A29", "description": "i2c_master_slave_asynch",
@@ -606,7 +607,7 @@
606607
"NUCLEO_F072RB", "NUCLEO_F042K6", "NUCLEO_F334R8", "NUCLEO_F303RE",
607608
"NUCLEO_F303K8", "NUCLEO_F302R8", "NUCLEO_F446RE","NUCLEO_F446ZE", "DISCO_F469NI", "NUCLEO_F207ZG",
608609
"DISCO_F429ZI", "NUCLEO_F103RB", "NUCLEO_F746ZG", "DISCO_F746NG",
609-
"NUCLEO_L476RG", "NUCLEO_L432KC", "DISCO_F303VC"]
610+
"NUCLEO_L476RG", "NUCLEO_L432KC", "DISCO_F303VC", "NUCLEO_F412ZG"]
610611
},
611612
{
612613
"id": "MBED_30", "description": "CAN network test using interrupts",
@@ -616,7 +617,7 @@
616617
"NUCLEO_F072RB", "NUCLEO_F042K6", "NUCLEO_F334R8", "NUCLEO_F303RE",
617618
"NUCLEO_F303K8", "NUCLEO_F302R8", "NUCLEO_F446RE", "NUCLEO_F446ZE", "DISCO_F469NI",
618619
"DISCO_F429ZI", "NUCLEO_F103RB", "NUCLEO_F746ZG", "DISCO_F746NG",
619-
"NUCLEO_L476RG", "NUCLEO_L432KC", "DISCO_F303VC"]
620+
"NUCLEO_L476RG", "NUCLEO_L432KC", "DISCO_F303VC", "NUCLEO_F412ZG"]
620621
},
621622
{
622623
"id": "MBED_31", "description": "PWM LED test",

0 commit comments

Comments
 (0)