Skip to content

Commit a169d6c

Browse files
0xc01700xc0170
committed
Merge pull request #1874 from BartSX/can-st-json
[STM32] Move CAN device.h defines to targets.json
2 parents 02bb0df + 5562f9a commit a169d6c

File tree

12 files changed

+11
-22
lines changed

12 files changed

+11
-22
lines changed

‎hal/targets.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,7 @@
669669
"inherits": ["Target"],
670670
"progen": {"target": "nucleo-f103rb"},
671671
"detect_code": ["0700"],
672-
"features": ["ANALOGIN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
672+
"features": ["ANALOGIN", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
673673
},
674674
"NUCLEO_F302R8": {
675675
"supported_form_factors": ["ARDUINO", "MORPHO"],
@@ -680,7 +680,7 @@
680680
"inherits": ["Target"],
681681
"progen": {"target": "nucleo-f302r8"},
682682
"detect_code": ["0705"],
683-
"features": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
683+
"features": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
684684
},
685685
"NUCLEO_F303K8": {
686686
"supported_form_factors": ["ARDUINO"],
@@ -691,7 +691,7 @@
691691
"inherits": ["Target"],
692692
"progen": {"target": "nucleo-f303k8"},
693693
"detect_code": ["0775"],
694-
"features": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
694+
"features": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
695695
},
696696
"NUCLEO_F303RE": {
697697
"supported_form_factors": ["ARDUINO", "MORPHO"],
@@ -702,7 +702,7 @@
702702
"inherits": ["Target"],
703703
"progen": {"target": "nucleo-f303re"},
704704
"detect_code": ["0745"],
705-
"features": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
705+
"features": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
706706
},
707707
"NUCLEO_F334R8": {
708708
"supported_form_factors": ["ARDUINO", "MORPHO"],
@@ -713,7 +713,7 @@
713713
"inherits": ["Target"],
714714
"progen": {"target": "nucleo-f334r8"},
715715
"detect_code": ["0735"],
716-
"features": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
716+
"features": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
717717
},
718718
"NUCLEO_F401RE": {
719719
"supported_form_factors": ["ARDUINO", "MORPHO"],
@@ -767,7 +767,7 @@
767767
"inherits": ["Target"],
768768
"progen": {"target": "nucleo-f446re"},
769769
"detect_code": ["0777"],
770-
"features": ["ANALOGIN", "ANALOGOUT", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
770+
"features": ["ANALOGIN", "ANALOGOUT", "CAN", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
771771
},
772772
"B96B_F446VE": {
773773
"supported_form_factors": ["ARDUINO", "MORPHO"],
@@ -791,7 +791,7 @@
791791
}
792792
},
793793
"detect_code": ["0816"],
794-
"features": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
794+
"features": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
795795
},
796796
"NUCLEO_L031K6": {
797797
"inherits": ["Target"],
@@ -846,7 +846,7 @@
846846
"inherits": ["Target"],
847847
"progen": {"target": "nucleo-l476rg"},
848848
"detect_code": ["0765"],
849-
"features": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
849+
"features": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SERIAL_FC", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
850850
},
851851
"STM32F3XX": {
852852
"inherits": ["Target"],
@@ -932,7 +932,7 @@
932932
"inherits": ["Target"],
933933
"progen": {"target": "disco-f469ni"},
934934
"detect_code": ["0788"],
935-
"features": ["ANALOGIN", "ANALOGOUT", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
935+
"features": ["ANALOGIN", "ANALOGOUT", "CAN", "ERROR_RED", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
936936
},
937937
"DISCO_L053C8": {
938938
"inherits": ["Target"],
@@ -950,7 +950,7 @@
950950
"supported_toolchains": ["ARM", "uARM", "GCC_ARM", "IAR"],
951951
"progen": {"target": "disco-f746ng"},
952952
"detect_code": ["0815"],
953-
"features": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
953+
"features": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
954954
},
955955
"DISCO_L476VG": {
956956
"inherits": ["Target"],
@@ -960,7 +960,7 @@
960960
"supported_toolchains": ["ARM", "uARM", "IAR", "GCC_ARM"],
961961
"progen": {"target": "disco-l476vg"},
962962
"detect_code": ["0820"],
963-
"features": ["ANALOGIN", "ANALOGOUT", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
963+
"features": ["ANALOGIN", "ANALOGOUT", "CAN", "I2C", "I2CSLAVE", "INTERRUPTIN", "PORTIN", "PORTINOUT", "PORTOUT", "PWMOUT", "RTC", "SERIAL", "SLEEP", "SPI", "SPISLAVE", "STDIO_MESSAGES"]
964964
},
965965
"MTS_MDOT_F405RG": {
966966
"inherits": ["Target"],

‎hal/targets/hal/TARGET_STM/TARGET_STM32F1/TARGET_NUCLEO_F103RB/device.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141

4242

4343

44-
#define DEVICE_CAN 1
4544

4645
//=======================================
4746

‎hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F302R8/device.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141

4242

4343

44-
#define DEVICE_CAN 1
4544

4645
//=======================================
4746

‎hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F303K8/device.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141

4242

4343

44-
#define DEVICE_CAN 1
4544

4645
//=======================================
4746

‎hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F303RE/device.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141

4242

4343

44-
#define DEVICE_CAN 1
4544

4645
//=======================================
4746

‎hal/targets/hal/TARGET_STM/TARGET_STM32F3/TARGET_NUCLEO_F334R8/device.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141

4242

4343

44-
#define DEVICE_CAN 1
4544

4645
//=======================================
4746

‎hal/targets/hal/TARGET_STM/TARGET_STM32F4/TARGET_DISCO_F469NI/device.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141

4242

4343

44-
#define DEVICE_CAN 1
4544

4645
//=======================================
4746

‎hal/targets/hal/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F446RE/device.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141

4242

4343

44-
#define DEVICE_CAN 1
4544

4645
//=======================================
4746

‎hal/targets/hal/TARGET_STM/TARGET_STM32F7/TARGET_DISCO_F746NG/device.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141

4242

4343

44-
#define DEVICE_CAN 1
4544

4645
//=======================================
4746

‎hal/targets/hal/TARGET_STM/TARGET_STM32F7/TARGET_NUCLEO_F746ZG/device.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141

4242

4343

44-
#define DEVICE_CAN 1
4544

4645
//=======================================
4746

‎hal/targets/hal/TARGET_STM/TARGET_STM32L4/TARGET_DISCO_L476VG/device.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141

4242

4343

44-
#define DEVICE_CAN 1
4544

4645
//=======================================
4746

‎hal/targets/hal/TARGET_STM/TARGET_STM32L4/TARGET_NUCLEO_L476RG/device.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141

4242

4343

44-
#define DEVICE_CAN 1
4544

4645
//=======================================
4746

0 commit comments

Comments
 (0)