New HardwareTimer for STM32 5.7.0 (#15655)
This commit is contained in:
		
				
					committed by
					
						 Scott Lahteine
						Scott Lahteine
					
				
			
			
				
	
			
			
			
						parent
						
							4762dfe797
						
					
				
				
					commit
					ac71cdc265
				
			| @@ -16,7 +16,7 @@ | ||||
|     ], | ||||
|     "ldscript": "stm32f407xg.ld", | ||||
|     "mcu": "stm32f407vet6", | ||||
|     "variant": "BIGTREE_GENERIC_STM32F407_5X" | ||||
|     "variant": "BIGTREE_TBD" | ||||
|   }, | ||||
|   "debug": { | ||||
|     "jlink_device": "STM32F407VE", | ||||
| @@ -24,9 +24,7 @@ | ||||
|     "svd_path": "STM32F40x.svd" | ||||
|   }, | ||||
|   "frameworks": [ | ||||
|     "arduino", | ||||
|     "cmsis", | ||||
|     "stm32cube" | ||||
|     "arduino" | ||||
|   ], | ||||
|   "name": "STM32F407VE (192k RAM. 512k Flash)", | ||||
|   "upload": { | ||||
|   | ||||
| @@ -16,7 +16,7 @@ | ||||
|     ], | ||||
|     "ldscript": "stm32f407xg.ld", | ||||
|     "mcu": "stm32f407zgt6", | ||||
|     "variant": "BIGTREE_GENERIC_STM32F407_5X" | ||||
|     "variant": "BIGTREE_SKR_PRO_1v1" | ||||
|   }, | ||||
|   "debug": { | ||||
|     "jlink_device": "STM32F407ZG", | ||||
| @@ -24,9 +24,7 @@ | ||||
|     "svd_path": "STM32F40x.svd" | ||||
|   }, | ||||
|   "frameworks": [ | ||||
|     "arduino", | ||||
|     "cmsis", | ||||
|     "stm32cube" | ||||
|     "arduino" | ||||
|   ], | ||||
|   "name": "STM32F407ZG (192k RAM. 1024k Flash)", | ||||
|   "upload": { | ||||
|   | ||||
| @@ -1,29 +0,0 @@ | ||||
| import os,shutil | ||||
| from SCons.Script import DefaultEnvironment | ||||
| from platformio import util | ||||
|  | ||||
| env = DefaultEnvironment() | ||||
| platform = env.PioPlatform() | ||||
| board = env.BoardConfig() | ||||
|  | ||||
| FRAMEWORK_DIR = platform.get_package_dir("framework-arduinoststm32") | ||||
| CMSIS_DIR = os.path.join(FRAMEWORK_DIR, "CMSIS", "CMSIS") | ||||
| assert os.path.isdir(FRAMEWORK_DIR) | ||||
| assert os.path.isdir(CMSIS_DIR) | ||||
| assert os.path.isdir("buildroot/share/PlatformIO/variants") | ||||
|  | ||||
| mcu_type = board.get("build.mcu")[:-2] | ||||
| variant = board.get("build.variant") | ||||
| series = mcu_type[:7].upper() + "xx" | ||||
| variant_dir = os.path.join(FRAMEWORK_DIR, "variants", variant) | ||||
|  | ||||
| source_dir = os.path.join("buildroot/share/PlatformIO/variants", variant) | ||||
| assert os.path.isdir(source_dir) | ||||
|  | ||||
| if not os.path.isdir(variant_dir): | ||||
|     os.mkdir(variant_dir) | ||||
|  | ||||
| for file_name in os.listdir(source_dir): | ||||
|     full_file_name = os.path.join(source_dir, file_name) | ||||
|     if os.path.isfile(full_file_name): | ||||
|         shutil.copy(full_file_name, variant_dir) | ||||
| @@ -7,9 +7,7 @@ platform = env.PioPlatform() | ||||
| board = env.BoardConfig() | ||||
|  | ||||
| FRAMEWORK_DIR = platform.get_package_dir("framework-arduinoststm32") | ||||
| CMSIS_DIR = os.path.join(FRAMEWORK_DIR, "CMSIS", "CMSIS") | ||||
| assert os.path.isdir(FRAMEWORK_DIR) | ||||
| assert os.path.isdir(CMSIS_DIR) | ||||
| assert os.path.isdir("buildroot/share/PlatformIO/variants") | ||||
|  | ||||
| mcu_type = board.get("build.mcu")[:-2] | ||||
|   | ||||
| @@ -41,56 +41,32 @@ | ||||
| 
 | ||||
| #ifdef HAL_ADC_MODULE_ENABLED | ||||
| const PinMap PinMap_ADC[] = { | ||||
|   {PA_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC1_IN0
 | ||||
|   //{PA_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC2_IN0
 | ||||
|   //{PA_0,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC3_IN0
 | ||||
|   {PA_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC1_IN1
 | ||||
|   //{PA_1,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC2_IN1
 | ||||
|   //{PA_1,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC3_IN1
 | ||||
|   {PA_2,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_IN2
 | ||||
|   //{PA_2,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC2_IN2
 | ||||
|   //{PA_2,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC3_IN2
 | ||||
|   {PA_3,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_IN3
 | ||||
|   //{PA_3,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC2_IN3
 | ||||
|   //{PA_3,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC3_IN3
 | ||||
|   {PA_4,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_IN4
 | ||||
|   //{PA_4,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC2_IN4
 | ||||
|   {PA_5,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_IN5
 | ||||
|   //{PA_5,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC2_IN5
 | ||||
|   {PA_6,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_IN6
 | ||||
|   //{PA_6,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC2_IN6
 | ||||
|   {PA_7,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_IN7
 | ||||
|   //{PA_7,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC2_IN7
 | ||||
|   {PB_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_IN8
 | ||||
|   //{PB_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC2_IN8
 | ||||
|   {PB_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_IN9
 | ||||
|   //{PB_1,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC2_IN9
 | ||||
|   {PC_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_IN10
 | ||||
|   //{PC_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC2_IN10
 | ||||
|   //{PC_0,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC3_IN10
 | ||||
|   {PC_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC1_IN11
 | ||||
|   //{PC_1,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC2_IN11
 | ||||
|   //{PC_1,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC3_IN11
 | ||||
|   {PC_2,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC1_IN12
 | ||||
|   //{PC_2,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC2_IN12
 | ||||
|   //{PC_2,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC3_IN12
 | ||||
|   {PC_3,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC1_IN13
 | ||||
|   //{PC_3,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC2_IN13
 | ||||
|   //{PC_3,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC3_IN13
 | ||||
|   {PC_4,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC1_IN14
 | ||||
|   //{PC_4,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC2_IN14
 | ||||
|   {PC_5,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_IN15
 | ||||
|   //{PC_5,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC2_IN15
 | ||||
|   {PA_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC1_IN0      E0_DIR
 | ||||
|   {PA_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC1_IN1      BLTOUCH_2
 | ||||
|   {PA_2,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_IN2      BLTOUCH_4
 | ||||
|   {PA_3,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_IN3      E1_EN
 | ||||
|   {PA_4,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_IN4      TF_SS
 | ||||
|   {PA_5,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_IN5      TF_SCLK
 | ||||
|   {PA_6,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_IN6      TF_MISO
 | ||||
|   {PA_7,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_IN7      LED
 | ||||
|   {PB_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_IN8      HEATER2
 | ||||
|   {PB_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_IN9      HEATER0
 | ||||
|   {PC_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_IN10    Z_EN
 | ||||
|   {PC_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC1_IN11    EXP_14
 | ||||
|   {PC_2,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC1_IN12    Z_DIR
 | ||||
|   {PC_3,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC1_IN13    E0_EN
 | ||||
|   {PC_4,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC1_IN14    EXP_8
 | ||||
|   {PC_5,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_IN15    EXP_7
 | ||||
| 
 | ||||
|   #if STM32F4X_PIN_NUM >= 144  //144 pins mcu, 114 gpio, 24 ADC
 | ||||
|     {PF_3,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC3_IN9
 | ||||
|     {PF_4,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC3_IN14
 | ||||
|     {PF_5,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC3_IN15
 | ||||
|     {PF_6,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC3_IN4
 | ||||
|     {PF_7,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC3_IN5
 | ||||
|     {PF_8,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC3_IN6
 | ||||
|     {PF_9,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC3_IN7
 | ||||
|     {PF_10, ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC3_IN8
 | ||||
|     {PF_3,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC3_IN9    TH_0
 | ||||
|     {PF_4,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC3_IN14  TH_1
 | ||||
|     {PF_5,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC3_IN15  TH_2
 | ||||
|     {PF_6,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC3_IN4    TH_3
 | ||||
|     {PF_7,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC3_IN5    EXP_13
 | ||||
|     {PF_8,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC3_IN6    EXP_3
 | ||||
|     {PF_9,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC3_IN7    EXP_6
 | ||||
|     {PF_10, ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC3_IN8    EXP_5
 | ||||
|   #endif | ||||
|   {NC,    NP,    0} | ||||
| }; | ||||
| @@ -138,79 +114,81 @@ const PinMap PinMap_I2C_SCL[] = { | ||||
| 
 | ||||
| #ifdef HAL_TIM_MODULE_ENABLED | ||||
| const PinMap PinMap_PWM[] = { | ||||
|   {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
 | ||||
|   {PB_1,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4    HEATER0
 | ||||
|   {PD_14, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3    HEATER1
 | ||||
|   {PB_0,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3    HEATER2
 | ||||
|   {PD_12, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1    BED
 | ||||
|   {PC_8,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3    FAN0
 | ||||
|   {PE_5,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1    FAN1
 | ||||
|   {PE_6,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 2, 0)}, // TIM9_CH2    FAN2
 | ||||
|   {PC_9,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 0)}, // TIM8_CH4    EXTENSION1-4
 | ||||
|    | ||||
|   //probably unused on SKR-Pro. confirmation needed, please.
 | ||||
|   //{PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
 | ||||
|   //{PA_0,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1
 | ||||
|   {PA_1,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
 | ||||
|   //{PA_1,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2 is bltouch analog?
 | ||||
|   //{PA_1,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2
 | ||||
|   {PA_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
 | ||||
|   //{PA_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3 is bltouch analog?
 | ||||
|   //{PA_2,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3
 | ||||
|   //{PA_2,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1
 | ||||
|   {PA_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
 | ||||
|   //{PA_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
 | ||||
|   //{PA_3,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4
 | ||||
|   //{PA_3,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 2, 0)}, // TIM9_CH2
 | ||||
|   {PA_5,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
 | ||||
|   //{PA_5,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
 | ||||
|   //{PA_5,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
 | ||||
|   {PA_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
 | ||||
|   //{PA_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
 | ||||
|   //{PA_6,  TIM13,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM13, 1, 0)}, // TIM13_CH1
 | ||||
|   //{PA_7,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
 | ||||
|   {PA_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
 | ||||
|   //{PA_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
 | ||||
|   //{PA_7,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N
 | ||||
|   //{PA_7,  TIM14,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM14, 1, 0)}, // TIM14_CH1
 | ||||
|   {PA_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
 | ||||
|   {PA_9,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
 | ||||
|   {PA_10, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
 | ||||
|   {PA_11, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
 | ||||
|   //{PA_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
 | ||||
|   //{PA_9,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
 | ||||
|   //{PA_10, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
 | ||||
|   //{PA_11, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
 | ||||
|   //{PA_15, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1
 | ||||
|   //{PB_0,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
 | ||||
|   {PB_0,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
 | ||||
|   //{PB_0,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
 | ||||
|   //{PB_1,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
 | ||||
|   {PB_1,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
 | ||||
|   //{PB_1,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
 | ||||
|   //{PB_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2
 | ||||
|   {PB_4,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
 | ||||
|   {PB_5,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
 | ||||
|   //{PB_4,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
 | ||||
|   //{PB_5,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
 | ||||
|   //{PB_6,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
 | ||||
|   //{PB_7,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
 | ||||
|   //{PB_8,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
 | ||||
|   {PB_8,  TIM10,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM10, 1, 0)}, // TIM10_CH1
 | ||||
|   //{PB_8,  TIM10,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM10, 1, 0)}, // TIM10_CH1
 | ||||
|   //{PB_9,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
 | ||||
|   {PB_9,  TIM11,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM11, 1, 0)}, // TIM11_CH1
 | ||||
|   {PB_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
 | ||||
|   {PB_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
 | ||||
|   {PB_13, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
 | ||||
|   {PB_14, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
 | ||||
|   {PB_14, TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
 | ||||
|   {PB_14, TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM12, 1, 0)}, // TIM12_CH1
 | ||||
|   {PB_15, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
 | ||||
|   {PB_15, TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
 | ||||
|   {PB_15, TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM12, 2, 0)}, // TIM12_CH2
 | ||||
|   {PC_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
 | ||||
|   {PC_6,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 0)}, // TIM8_CH1
 | ||||
|   {PC_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
 | ||||
|   {PC_7,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 0)}, // TIM8_CH2
 | ||||
|   {PC_8,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3
 | ||||
|   {PC_8,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 0)}, // TIM8_CH3
 | ||||
|   //{PB_9,  TIM11,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM11, 1, 0)}, // TIM11_CH1
 | ||||
|   //{PB_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3
 | ||||
|   //{PB_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4
 | ||||
|   //{PB_13, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
 | ||||
|   //{PB_14, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
 | ||||
|   //{PB_14, TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N
 | ||||
|   //{PB_14, TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM12, 1, 0)}, // TIM12_CH1
 | ||||
|   //{PB_15, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
 | ||||
|   //{PB_15, TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N
 | ||||
|   //{PB_15, TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM12, 2, 0)}, // TIM12_CH2
 | ||||
|   //{PC_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1
 | ||||
|   //{PC_6,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 0)}, // TIM8_CH1
 | ||||
|   //{PC_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2
 | ||||
|   //{PC_7,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 0)}, // TIM8_CH2
 | ||||
|   //{PC_8,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 0)}, // TIM8_CH3
 | ||||
|   //{PC_9,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4
 | ||||
|   //{PC_9,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 0)}, // TIM8_CH4
 | ||||
|   {PD_12, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1
 | ||||
|   {PD_13, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
 | ||||
|   {PD_14, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3
 | ||||
|   {PD_15, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
 | ||||
|   {PE_5,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1
 | ||||
|   {PE_6,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 2, 0)}, // TIM9_CH2
 | ||||
|   {PE_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
 | ||||
|   {PE_9,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
 | ||||
|   {PE_10, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
 | ||||
|   {PE_11, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
 | ||||
|   {PE_12, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
 | ||||
|   {PE_13, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
 | ||||
|   {PE_14, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
 | ||||
|   //{PD_13, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2
 | ||||
|   //{PD_15, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4
 | ||||
|   //{PE_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N
 | ||||
|   //{PE_9,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1
 | ||||
|   //{PE_10, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N
 | ||||
|   //{PE_11, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2
 | ||||
|   //{PE_12, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N
 | ||||
|   //{PE_13, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3
 | ||||
|   //{PE_14, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4
 | ||||
|   #if STM32F4X_PIN_NUM >= 144  //144 pins mcu, 114 gpio
 | ||||
|     {PF_6,  TIM10,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM10, 1, 0)}, // TIM10_CH1
 | ||||
|     {PF_7,  TIM11,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM11, 1, 0)}, // TIM11_CH1
 | ||||
|     {PF_8,  TIM13,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM13, 1, 0)}, // TIM13_CH1
 | ||||
|     {PF_9,  TIM14,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM14, 1, 0)}, // TIM14_CH1
 | ||||
|     //{PF_6,  TIM10,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM10, 1, 0)}, // TIM10_CH1
 | ||||
|     //{PF_7,  TIM11,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM11, 1, 0)}, // TIM11_CH1
 | ||||
|     //{PF_8,  TIM13,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM13, 1, 0)}, // TIM13_CH1
 | ||||
|     //{PF_9,  TIM14,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM14, 1, 0)}, // TIM14_CH1
 | ||||
|   #endif | ||||
|   {NC,    NP,    0} | ||||
| }; | ||||
| @@ -236,9 +214,7 @@ const PinMap PinMap_UART_TX[] = { | ||||
|   #endif | ||||
|   {NC,    NP,    0} | ||||
| }; | ||||
| #endif | ||||
| 
 | ||||
| #ifdef HAL_UART_MODULE_ENABLED | ||||
| const PinMap PinMap_UART_RX[] = { | ||||
|   {PA_1,  UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)}, | ||||
|   {PA_3,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, | ||||
| @@ -256,9 +232,7 @@ const PinMap PinMap_UART_RX[] = { | ||||
|   #endif | ||||
|   {NC,    NP,    0} | ||||
| }; | ||||
| #endif | ||||
| 
 | ||||
| #ifdef HAL_UART_MODULE_ENABLED | ||||
| const PinMap PinMap_UART_RTS[] = { | ||||
|   {PA_1,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, | ||||
|   {PA_12, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)}, | ||||
| @@ -271,9 +245,7 @@ const PinMap PinMap_UART_RTS[] = { | ||||
|   #endif | ||||
|   {NC,    NP,    0} | ||||
| }; | ||||
| #endif | ||||
| 
 | ||||
| #ifdef HAL_UART_MODULE_ENABLED | ||||
| const PinMap PinMap_UART_CTS[] = { | ||||
|   {PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, | ||||
|   {PA_11, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)}, | ||||
| @@ -292,48 +264,30 @@ const PinMap PinMap_UART_CTS[] = { | ||||
| 
 | ||||
| #ifdef HAL_SPI_MODULE_ENABLED | ||||
| const PinMap PinMap_SPI_MOSI[] = { | ||||
|   {PA_7,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, | ||||
|   {PB_5,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, | ||||
|   {PB_5,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, | ||||
|   {PB_5,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_SPI1)}, | ||||
|   {PB_15, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, | ||||
|   {PC_3,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, | ||||
|   {PC_12, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, | ||||
|   {NC,    NP,    0} | ||||
| }; | ||||
| #endif | ||||
| 
 | ||||
| #ifdef HAL_SPI_MODULE_ENABLED | ||||
| const PinMap PinMap_SPI_MISO[] = { | ||||
|   {PA_6,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, | ||||
|   {PB_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, | ||||
|   {PB_4,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, | ||||
|   {PA_6,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_SPI1)}, | ||||
|   {PB_14, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, | ||||
|   {PC_2,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, | ||||
|   {PC_11, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, | ||||
|   {NC,    NP,    0} | ||||
| }; | ||||
| #endif | ||||
| 
 | ||||
| #ifdef HAL_SPI_MODULE_ENABLED | ||||
| const PinMap PinMap_SPI_SCLK[] = { | ||||
|   {PA_5,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, | ||||
|   {PB_3,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, | ||||
|   {PB_3,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, | ||||
|   {PB_10, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, | ||||
|   {PA_5,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_SPI1)}, | ||||
|   {PB_13, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, | ||||
|   {PC_10, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, | ||||
|   {NC,    NP,    0} | ||||
| }; | ||||
| #endif | ||||
| 
 | ||||
| #ifdef HAL_SPI_MODULE_ENABLED | ||||
| const PinMap PinMap_SPI_SSEL[] = { | ||||
|   {PA_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, | ||||
|   {PA_4,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, | ||||
|   {PA_15, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, | ||||
|   {PA_15, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, | ||||
|   {PB_9,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, | ||||
|   {PA_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_SPI1)}, | ||||
|   {PB_12, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, | ||||
|   {PA_15, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, | ||||
|   {NC,    NP,    0} | ||||
| }; | ||||
| #endif | ||||
| @@ -341,91 +295,40 @@ const PinMap PinMap_SPI_SSEL[] = { | ||||
| //*** CAN ***
 | ||||
| 
 | ||||
| #ifdef HAL_CAN_MODULE_ENABLED | ||||
| 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)}, | ||||
|   {PB_8,  CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, | ||||
|   {PB_12, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)}, | ||||
|   {PD_0,  CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, | ||||
|   {NC,    NP,    0} | ||||
| }; | ||||
| #endif | ||||
| 
 | ||||
| #ifdef HAL_CAN_MODULE_ENABLED | ||||
| 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)}, | ||||
|   {PB_9,  CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, | ||||
|   {PB_13, CAN2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN2)}, | ||||
|   {PD_1,  CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, | ||||
|   {NC,    NP,    0} | ||||
| }; | ||||
| #error "CAN bus isn't available on this board. Driver should be disabled." | ||||
| #endif | ||||
| 
 | ||||
| //*** ETHERNET ***
 | ||||
| 
 | ||||
| #ifdef HAL_ETH_MODULE_ENABLED | ||||
| 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|ETH_RX_CLK
 | ||||
|   {PA_2,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_MDIO
 | ||||
|   {PA_3,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_COL
 | ||||
|   {PA_7,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_CRS_DV|ETH_RX_DV
 | ||||
|   {PB_0,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD2
 | ||||
|   {PB_1,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD3
 | ||||
|   {PB_5,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_PPS_OUT
 | ||||
|   {PB_8,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD3
 | ||||
|   {PB_10, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RX_ER
 | ||||
|   {PB_11, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_EN
 | ||||
|   {PB_12, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD0
 | ||||
|   {PB_13, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD1
 | ||||
|   {PC_1,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_MDC
 | ||||
|   {PC_2,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD2
 | ||||
|   {PC_3,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_CLK
 | ||||
|   {PC_4,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD0
 | ||||
|   {PC_5,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_RXD1
 | ||||
|   {PE_2,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD3
 | ||||
|   #if STM32F4X_PIN_NUM >= 144  //144 pins mcu, 114 gpio
 | ||||
|     {PG_8,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_PPS_OUT
 | ||||
|     {PG_11, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TX_EN
 | ||||
|     {PG_13, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD0
 | ||||
|     {PG_14, ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_TXD1
 | ||||
|   #endif | ||||
|   {NC,    NP,    0} | ||||
| }; | ||||
| #error "Ethernet port isn't available on this board. Driver should be disabled." | ||||
| #endif | ||||
| 
 | ||||
| //*** No QUADSPI ***
 | ||||
| 
 | ||||
| //*** USB ***
 | ||||
| 
 | ||||
| #ifdef HAL_PCD_MODULE_ENABLED | ||||
| const PinMap PinMap_USB_OTG_FS[] = { | ||||
|   //{PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF
 | ||||
|   //{PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS
 | ||||
|   //{PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID
 | ||||
|   //{PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF   used by LCD
 | ||||
|   //{PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)},     // USB_OTG_FS_VBUS  available on wifi port, if empty
 | ||||
|   //{PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID    available on UART1_RX if not used
 | ||||
|   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM
 | ||||
|   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP
 | ||||
|   {NC,    NP,    0} | ||||
| }; | ||||
| #endif | ||||
| 
 | ||||
| #ifdef HAL_PCD_MODULE_ENABLED | ||||
| const PinMap PinMap_USB_OTG_HS[] = { | ||||
| const PinMap PinMap_USB_OTG_HS[] = { /*
 | ||||
|   #ifdef USE_USB_HS_IN_FS | ||||
|     {PA_4,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_SOF
 | ||||
|     {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID
 | ||||
|     {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_HS_VBUS
 | ||||
|     {PB_14, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DM
 | ||||
|     {PB_15, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_DP
 | ||||
|   #else | ||||
|   #error "USB in HS mode isn't supported by the board" | ||||
|     {PA_3,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D0
 | ||||
|     {PA_5,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_CK
 | ||||
|     {PB_0,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D1
 | ||||
|     {PB_1,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D2
 | ||||
|     {PB_5,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D7
 | ||||
|     {PB_10, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D3
 | ||||
|     {PB_11, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D4
 | ||||
|     {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D5
 | ||||
|     {PB_13, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_D6
 | ||||
|     {PC_0,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_HS)}, // USB_OTG_HS_ULPI_STP
 | ||||
| @@ -0,0 +1,52 @@ | ||||
| #pragma once | ||||
|  | ||||
| #define HAL_MODULE_ENABLED | ||||
| #define HAL_ADC_MODULE_ENABLED | ||||
| #define HAL_CRC_MODULE_ENABLED | ||||
| #define HAL_DMA_MODULE_ENABLED | ||||
| #define HAL_GPIO_MODULE_ENABLED | ||||
| #define HAL_I2C_MODULE_ENABLED | ||||
| #define HAL_PWR_MODULE_ENABLED | ||||
| #define HAL_RCC_MODULE_ENABLED | ||||
| //#define HAL_RTC_MODULE_ENABLED Real Time Clock...do we use it? | ||||
| #define HAL_SPI_MODULE_ENABLED | ||||
| #define HAL_TIM_MODULE_ENABLED | ||||
| #define HAL_USART_MODULE_ENABLED | ||||
| #define HAL_CORTEX_MODULE_ENABLED | ||||
| //#define HAL_UART_MODULE_ENABLED // by default | ||||
| //#define HAL_PCD_MODULE_ENABLED  // Since STM32 v3.10700.191028 this is automatically added if any type of USB is enabled (as in Arduino IDE) | ||||
|  | ||||
| #undef HAL_SD_MODULE_ENABLED | ||||
| #undef HAL_DAC_MODULE_ENABLED | ||||
| #undef HAL_FLASH_MODULE_ENABLED | ||||
| #undef HAL_CAN_MODULE_ENABLED | ||||
| #undef HAL_CAN_LEGACY_MODULE_ENABLED | ||||
| #undef HAL_CEC_MODULE_ENABLED | ||||
| #undef HAL_CRYP_MODULE_ENABLED | ||||
| #undef HAL_DCMI_MODULE_ENABLED | ||||
| #undef HAL_DMA2D_MODULE_ENABLED | ||||
| #undef HAL_ETH_MODULE_ENABLED | ||||
| #undef HAL_NAND_MODULE_ENABLED | ||||
| #undef HAL_NOR_MODULE_ENABLED | ||||
| #undef HAL_PCCARD_MODULE_ENABLED | ||||
| #undef HAL_SRAM_MODULE_ENABLED | ||||
| #undef HAL_SDRAM_MODULE_ENABLED | ||||
| #undef HAL_HASH_MODULE_ENABLED | ||||
| #undef HAL_EXTI_MODULE_ENABLED | ||||
| #undef HAL_SMBUS_MODULE_ENABLED | ||||
| #undef HAL_I2S_MODULE_ENABLED | ||||
| #undef HAL_IWDG_MODULE_ENABLED | ||||
| #undef HAL_LTDC_MODULE_ENABLED | ||||
| #undef HAL_DSI_MODULE_ENABLED | ||||
| #undef HAL_QSPI_MODULE_ENABLED | ||||
| #undef HAL_RNG_MODULE_ENABLED | ||||
| #undef HAL_SAI_MODULE_ENABLED | ||||
| #undef HAL_IRDA_MODULE_ENABLED | ||||
| #undef HAL_SMARTCARD_MODULE_ENABLED | ||||
| #undef HAL_WWDG_MODULE_ENABLED | ||||
| #undef HAL_HCD_MODULE_ENABLED | ||||
| #undef HAL_FMPI2C_MODULE_ENABLED | ||||
| #undef HAL_SPDIFRX_MODULE_ENABLED | ||||
| #undef HAL_DFSDM_MODULE_ENABLED | ||||
| #undef HAL_LPTIM_MODULE_ENABLED | ||||
| #undef HAL_MMC_MODULE_ENABLED | ||||
| @@ -192,7 +192,6 @@ SECTIONS | ||||
|     . = ALIGN(4); | ||||
|   } >RAM | ||||
| 
 | ||||
| 
 | ||||
|   /* Remove information from the standard libraries */ | ||||
|   /DISCARD/ : | ||||
|   { | ||||
| @@ -203,5 +202,3 @@ SECTIONS | ||||
| 
 | ||||
|   .ARM.attributes 0 : { *(.ARM.attributes) } | ||||
| } | ||||
| 
 | ||||
| 
 | ||||
| @@ -222,9 +222,15 @@ extern "C" { | ||||
| //#define DACC_RESOLUTION         12
 | ||||
| 
 | ||||
| // PWM resolution
 | ||||
| #define PWM_RESOLUTION          8 | ||||
| #define PWM_FREQUENCY           20000 | ||||
| #define PWM_MAX_DUTY_CYCLE      255 | ||||
| /*
 | ||||
|  * BEWARE: | ||||
|  * Changing this value from the default (1000) will affect the PWM output value of analogWrite (to a PWM pin) | ||||
|  * Since the pin is toggled on capture, if you change the frequency of the timer you have to adapt the compare value (analogWrite thinks you did) | ||||
|  */ | ||||
| //#define PWM_FREQUENCY           20000
 | ||||
| //The bottom values are the default and don't need to be redefined
 | ||||
| //#define PWM_RESOLUTION          8
 | ||||
| //#define PWM_MAX_DUTY_CYCLE      255
 | ||||
| 
 | ||||
| // Below SPI and I2C definitions already done in the core
 | ||||
| // Could be redefined here if differs from the default one
 | ||||
| @@ -241,6 +247,7 @@ extern "C" { | ||||
| // Timer Definitions
 | ||||
| //Do not use timer used by PWM pins when possible. See PinMap_PWM in PeripheralPins.c
 | ||||
| #define TIMER_TONE              TIM6 | ||||
| #define TIMER_SERIAL            TIM7 | ||||
| 
 | ||||
| // Do not use basic timer: OC is required
 | ||||
| #define TIMER_SERVO             TIM2  //TODO: advanced-control timers don't work
 | ||||
| @@ -260,9 +267,6 @@ extern "C" { | ||||
| #define PIN_SERIAL_RX           PA10 | ||||
| #define PIN_SERIAL_TX           PA9 | ||||
| 
 | ||||
| /* Extra HAL modules */ | ||||
| #define HAL_PCD_MODULE_ENABLED | ||||
| 
 | ||||
| #ifdef __cplusplus | ||||
| } // extern "C"
 | ||||
| #endif | ||||
| @@ -3,8 +3,10 @@ | ||||
|  * Copyright (c) 2019, STMicroelectronics | ||||
|  * All rights reserved. | ||||
|  * | ||||
|  * Redistribution and use in source and binary forms, with or without | ||||
|  * modification, are permitted provided that the following conditions are met: | ||||
|  * This software component is licensed by ST under BSD 3-Clause license, | ||||
|  * the "License"; You may not use this file except in compliance with the | ||||
|  * License. You may obtain a copy of the License at: | ||||
|  *                        opensource.org/licenses/BSD-3-Clause | ||||
|  * | ||||
|  * 1. Redistributions of source code must retain the above copyright notice, | ||||
|  *    this list of conditions and the following disclaimer. | ||||
| @@ -28,8 +30,8 @@ | ||||
|  ******************************************************************************* | ||||
|  * Automatically generated from STM32F407Z(E-G)Tx.xml | ||||
|  */ | ||||
| #include <Arduino.h> | ||||
| #include <PeripheralPins.h> | ||||
| #include "Arduino.h" | ||||
| #include "PeripheralPins.h" | ||||
|  | ||||
| /* ===== | ||||
|  * Note: Commented lines are alternative possibilities which are not used per default. | ||||
| @@ -40,58 +42,58 @@ | ||||
| //*** ADC *** | ||||
|  | ||||
| #ifdef HAL_ADC_MODULE_ENABLED | ||||
| const PinMap PinMap_ADC[] = { | ||||
| WEAK const PinMap PinMap_ADC[] = { | ||||
|   {PA_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC1_IN0 | ||||
|   //  {PA_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC2_IN0 | ||||
|   //  {PA_0,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC3_IN0 | ||||
|   //{PA_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC2_IN0 | ||||
|   //{PA_0,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 0, 0)}, // ADC3_IN0 | ||||
|   {PA_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC1_IN1 | ||||
|   //  {PA_1,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC2_IN1 | ||||
|   //  {PA_1,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC3_IN1 | ||||
|   //  {PA_2,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_IN2 | ||||
|   //{PA_1,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC2_IN1 | ||||
|   //{PA_1,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // ADC3_IN1 | ||||
|   //{PA_2,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC1_IN2 | ||||
|   {PA_2,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC2_IN2 | ||||
|   //  {PA_2,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC3_IN2 | ||||
|   //  {PA_3,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_IN3 | ||||
|   //  {PA_3,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC2_IN3 | ||||
|   //{PA_2,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // ADC3_IN2 | ||||
|   //{PA_3,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC1_IN3 | ||||
|   //{PA_3,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC2_IN3 | ||||
|   {PA_3,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 3, 0)}, // ADC3_IN3 | ||||
|   {PA_4,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC1_IN4 | ||||
|   //  {PA_4,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC2_IN4 | ||||
|   //  {PA_5,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_IN5 | ||||
|   //{PA_4,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC2_IN4 | ||||
|   //{PA_5,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC1_IN5 | ||||
|   {PA_5,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC2_IN5 | ||||
| #if defined(ARDUINO_BLACK_F407ZE) || defined(ARDUINO_BLACK_F407ZG) | ||||
|   //  {PA_6,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_IN6 | ||||
|   //  {PA_6,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC2_IN6 | ||||
|   //  {PA_7,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_IN7 | ||||
|   //  {PA_7,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC2_IN7 | ||||
|   //  {PB_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_IN8 | ||||
|   //{PA_6,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC1_IN6 | ||||
|   //{PA_6,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC2_IN6 | ||||
|   //{PA_7,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC1_IN7 | ||||
|   //{PA_7,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC2_IN7 | ||||
|   //{PB_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC1_IN8 | ||||
| #endif | ||||
|   {PB_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC2_IN8 | ||||
|   {PB_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC1_IN9 | ||||
|   //  {PB_1,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC2_IN9 | ||||
|   //  {PC_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_IN10 | ||||
|   //  {PC_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC2_IN10 | ||||
|   //{PB_1,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC2_IN9 | ||||
|   //{PC_0,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC1_IN10 | ||||
|   //{PC_0,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC2_IN10 | ||||
|   {PC_0,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 10, 0)}, // ADC3_IN10 | ||||
|   {PC_1,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC1_IN11 | ||||
|   //  {PC_1,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC2_IN11 | ||||
|   //  {PC_1,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC3_IN11 | ||||
|   //  {PC_2,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC1_IN12 | ||||
|   //{PC_1,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC2_IN11 | ||||
|   //{PC_1,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 11, 0)}, // ADC3_IN11 | ||||
|   //{PC_2,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC1_IN12 | ||||
|   {PC_2,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC2_IN12 | ||||
|   //  {PC_2,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC3_IN12 | ||||
|   //  {PC_3,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC1_IN13 | ||||
|   //  {PC_3,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC2_IN13 | ||||
|   //{PC_2,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 12, 0)}, // ADC3_IN12 | ||||
|   //{PC_3,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC1_IN13 | ||||
|   //{PC_3,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC2_IN13 | ||||
|   {PC_3,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 13, 0)}, // ADC3_IN13 | ||||
|   //  {PC_4,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC1_IN14 | ||||
|   //{PC_4,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC1_IN14 | ||||
|   {PC_4,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC2_IN14 | ||||
|   //  {PC_5,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_IN15 | ||||
|   //{PC_5,  ADC1,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC1_IN15 | ||||
|   {PC_5,  ADC2,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC2_IN15 | ||||
| #if defined(ARDUINO_BLACK_F407ZE) || defined(ARDUINO_BLACK_F407ZG) | ||||
|   //  {PF_3,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC3_IN9 | ||||
|   //  {PF_4,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC3_IN14 | ||||
|   //  {PF_5,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC3_IN15 | ||||
|   //{PF_3,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 9, 0)}, // ADC3_IN9 | ||||
|   //{PF_4,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 14, 0)}, // ADC3_IN14 | ||||
|   //{PF_5,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 15, 0)}, // ADC3_IN15 | ||||
|   {PF_6,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 4, 0)}, // ADC3_IN4 | ||||
|   {PF_7,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 5, 0)}, // ADC3_IN5 | ||||
|   {PF_8,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 6, 0)}, // ADC3_IN6 | ||||
|   //  {PF_9,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC3_IN7 | ||||
|   //  {PF_10, ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC3_IN8 | ||||
|   //{PF_9,  ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 7, 0)}, // ADC3_IN7 | ||||
|   //{PF_10, ADC3,  STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 8, 0)}, // ADC3_IN8 | ||||
| #endif | ||||
|   {NC,    NP,    0} | ||||
| }; | ||||
| @@ -100,7 +102,7 @@ const PinMap PinMap_ADC[] = { | ||||
| //*** DAC *** | ||||
|  | ||||
| #ifdef HAL_DAC_MODULE_ENABLED | ||||
| const PinMap PinMap_DAC[] = { | ||||
| WEAK const PinMap PinMap_DAC[] = { | ||||
|   {PA_4,  DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 1, 0)}, // DAC_OUT1 | ||||
|   {PA_5,  DAC1, STM_PIN_DATA_EXT(STM_MODE_ANALOG, GPIO_NOPULL, 0, 2, 0)}, // DAC_OUT2 | ||||
|   {NC,    NP,    0} | ||||
| @@ -110,7 +112,7 @@ const PinMap PinMap_DAC[] = { | ||||
| //*** I2C *** | ||||
|  | ||||
| #ifdef HAL_I2C_MODULE_ENABLED | ||||
| const PinMap PinMap_I2C_SDA[] = { | ||||
| WEAK const PinMap PinMap_I2C_SDA[] = { | ||||
|   {PB_7,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)}, | ||||
|   {PB_9,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)}, | ||||
|   {PB_11, I2C2, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C2)}, | ||||
| @@ -123,7 +125,7 @@ const PinMap PinMap_I2C_SDA[] = { | ||||
| #endif | ||||
|  | ||||
| #ifdef HAL_I2C_MODULE_ENABLED | ||||
| const PinMap PinMap_I2C_SCL[] = { | ||||
| WEAK const PinMap PinMap_I2C_SCL[] = { | ||||
|   {PA_8,  I2C3, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C3)}, | ||||
|   {PB_6,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)}, | ||||
|   {PB_8,  I2C1, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_NOPULL, GPIO_AF4_I2C1)}, | ||||
| @@ -138,61 +140,61 @@ const PinMap PinMap_I2C_SCL[] = { | ||||
| //*** PWM *** | ||||
|  | ||||
| #ifdef HAL_TIM_MODULE_ENABLED | ||||
| const PinMap PinMap_PWM[] = { | ||||
| WEAK const PinMap PinMap_PWM[] = { | ||||
|   {PA_0,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1 | ||||
|   //  {PA_0,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1 | ||||
|   //{PA_0,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 1, 0)}, // TIM5_CH1 | ||||
|   {PA_1,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2 | ||||
|   //  {PA_1,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2 | ||||
|   //{PA_1,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 2, 0)}, // TIM5_CH2 | ||||
|   {PA_2,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3 | ||||
|   //  {PA_2,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3 | ||||
|   //  {PA_2,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1 | ||||
|   //{PA_2,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 3, 0)}, // TIM5_CH3 | ||||
|   //{PA_2,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 1, 0)}, // TIM9_CH1 | ||||
|   {PA_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4 | ||||
|   //  {PA_3,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4 | ||||
|   //  {PA_3,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 2, 0)}, // TIM9_CH2 | ||||
|   //{PA_3,  TIM5,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM5, 4, 0)}, // TIM5_CH4 | ||||
|   //{PA_3,  TIM9,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM9, 2, 0)}, // TIM9_CH2 | ||||
|   {PA_5,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1 | ||||
|   //  {PA_5,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N | ||||
|   //{PA_5,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N | ||||
|   {PA_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1 | ||||
|   //  {PA_6,  TIM13,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM13, 1, 0)}, // TIM13_CH1 | ||||
|   //  {PA_7,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N | ||||
|   //{PA_6,  TIM13,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM13, 1, 0)}, // TIM13_CH1 | ||||
|   //{PA_7,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N | ||||
|   {PA_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2 | ||||
|   //  {PA_7,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N | ||||
|   //  {PA_7,  TIM14,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM14, 1, 0)}, // TIM14_CH1 | ||||
|   //{PA_7,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 1)}, // TIM8_CH1N | ||||
|   //{PA_7,  TIM14,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM14, 1, 0)}, // TIM14_CH1 | ||||
|   {PA_8,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 0)}, // TIM1_CH1 | ||||
|   {PA_9,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 0)}, // TIM1_CH2 | ||||
|   {PA_10, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 0)}, // TIM1_CH3 | ||||
|   {PA_11, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 4, 0)}, // TIM1_CH4 | ||||
|   //  {PA_15, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1 | ||||
|   //  {PB_0,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N | ||||
|   //{PA_15, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 1, 0)}, // TIM2_CH1 | ||||
|   //{PB_0,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N | ||||
|   {PB_0,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3 | ||||
|   //  {PB_0,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N | ||||
|   //  {PB_1,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N | ||||
|   //{PB_0,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N | ||||
|   //{PB_1,  TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N | ||||
|   {PB_1,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4 | ||||
|   //  {PB_1,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N | ||||
|   //  {PB_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2 | ||||
|   //{PB_1,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N | ||||
|   //{PB_3,  TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 2, 0)}, // TIM2_CH2 | ||||
|   {PB_4,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1 | ||||
|   {PB_5,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2 | ||||
|   {PB_6,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1 | ||||
|   {PB_7,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2 | ||||
|   {PB_8,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3 | ||||
|   //{PB_8,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 3, 0)}, // TIM4_CH3 | ||||
|   {PB_8,  TIM10,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM10, 1, 0)}, // TIM10_CH1 | ||||
|   {PB_9,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4 | ||||
|   //{PB_9,  TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 4, 0)}, // TIM4_CH4 | ||||
|   {PB_9,  TIM11,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM11, 1, 0)}, // TIM11_CH1 | ||||
|   {PB_10, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 3, 0)}, // TIM2_CH3 | ||||
|   {PB_11, TIM2,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM2, 4, 0)}, // TIM2_CH4 | ||||
|   {PB_13, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 1, 1)}, // TIM1_CH1N | ||||
|   {PB_14, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N | ||||
|   {PB_14, TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N | ||||
|   //{PB_14, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 2, 1)}, // TIM1_CH2N | ||||
|   //{PB_14, TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 1)}, // TIM8_CH2N | ||||
|   {PB_14, TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM12, 1, 0)}, // TIM12_CH1 | ||||
|   {PB_15, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N | ||||
|   {PB_15, TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N | ||||
|   //{PB_15, TIM1,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM1, 3, 1)}, // TIM1_CH3N | ||||
|   //{PB_15, TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 1)}, // TIM8_CH3N | ||||
|   {PB_15, TIM12,  STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_TIM12, 2, 0)}, // TIM12_CH2 | ||||
|   {PC_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1 | ||||
|   //{PC_6,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 1, 0)}, // TIM3_CH1 | ||||
|   {PC_6,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 1, 0)}, // TIM8_CH1 | ||||
|   {PC_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2 | ||||
|   //{PC_7,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 2, 0)}, // TIM3_CH2 | ||||
|   {PC_7,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 2, 0)}, // TIM8_CH2 | ||||
|   {PC_8,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 3, 0)}, // TIM3_CH3 | ||||
|   {PC_8,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 0)}, // TIM8_CH3 | ||||
|   {PC_9,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4 | ||||
|   //{PC_8,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 3, 0)}, // TIM8_CH3 | ||||
|   //{PC_9,  TIM3,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM3, 4, 0)}, // TIM3_CH4 | ||||
|   {PC_9,  TIM8,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM8, 4, 0)}, // TIM8_CH4 | ||||
|   {PD_12, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 1, 0)}, // TIM4_CH1 | ||||
|   {PD_13, TIM4,   STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM4, 2, 0)}, // TIM4_CH2 | ||||
| @@ -220,47 +222,47 @@ const PinMap PinMap_PWM[] = { | ||||
| //*** SERIAL *** | ||||
|  | ||||
| #ifdef HAL_UART_MODULE_ENABLED | ||||
| const PinMap PinMap_UART_TX[] = { | ||||
| WEAK const PinMap PinMap_UART_TX[] = { | ||||
|   {PA_0,  UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)}, | ||||
|   {PA_2,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, | ||||
|   {PA_9,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)}, | ||||
|   {PB_6,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)}, | ||||
|   {PB_10, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, | ||||
|   {PC_6,  USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)}, | ||||
|   //  {PC_10, UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)}, | ||||
|   //{PC_10, UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)}, | ||||
|   {PC_10, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, | ||||
|   {PC_12, UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)}, | ||||
|   {PD_5,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, | ||||
|   {PD_8,  USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, | ||||
| #if defined(ARDUINO_BLACK_F407ZE) || defined(ARDUINO_BLACK_F407ZG) | ||||
|   //  {PG_14, USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)}, | ||||
|   //{PG_14, USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)}, | ||||
| #endif | ||||
|   {NC,    NP,    0} | ||||
| }; | ||||
| #endif | ||||
|  | ||||
| #ifdef HAL_UART_MODULE_ENABLED | ||||
| const PinMap PinMap_UART_RX[] = { | ||||
| WEAK const PinMap PinMap_UART_RX[] = { | ||||
|   {PA_1,  UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)}, | ||||
|   {PA_3,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, | ||||
|   {PA_10, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)}, | ||||
|   {PB_7,  USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)}, | ||||
|   {PB_11, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, | ||||
|   {PC_7,  USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)}, | ||||
|   //  {PC_11, UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)}, | ||||
|   //{PC_11, UART4,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART4)}, | ||||
|   {PC_11, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, | ||||
|   {PD_2,  UART5,   STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_UART5)}, | ||||
|   {PD_6,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, | ||||
|   {PD_9,  USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, | ||||
| #if defined(ARDUINO_BLACK_F407ZE) || defined(ARDUINO_BLACK_F407ZG) | ||||
|   //  {PG_9,  USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)}, | ||||
|   //{PG_9,  USART6,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF8_USART6)}, | ||||
| #endif | ||||
|   {NC,    NP,    0} | ||||
| }; | ||||
| #endif | ||||
|  | ||||
| #ifdef HAL_UART_MODULE_ENABLED | ||||
| const PinMap PinMap_UART_RTS[] = { | ||||
| WEAK const PinMap PinMap_UART_RTS[] = { | ||||
|   {PA_1,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, | ||||
|   {PA_12, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)}, | ||||
|   {PB_14, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, | ||||
| @@ -275,7 +277,7 @@ const PinMap PinMap_UART_RTS[] = { | ||||
| #endif | ||||
|  | ||||
| #ifdef HAL_UART_MODULE_ENABLED | ||||
| const PinMap PinMap_UART_CTS[] = { | ||||
| WEAK const PinMap PinMap_UART_CTS[] = { | ||||
|   {PA_0,  USART2,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART2)}, | ||||
|   {PA_11, USART1,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART1)}, | ||||
|   {PB_13, USART3,  STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF7_USART3)}, | ||||
| @@ -292,9 +294,9 @@ const PinMap PinMap_UART_CTS[] = { | ||||
| //*** SPI *** | ||||
|  | ||||
| #ifdef HAL_SPI_MODULE_ENABLED | ||||
| const PinMap PinMap_SPI_MOSI[] = { | ||||
| WEAK const PinMap PinMap_SPI_MOSI[] = { | ||||
|   {PA_7,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, | ||||
|   {PB_5,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, | ||||
|   //{PB_5,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, | ||||
|   {PB_5,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, | ||||
|   {PB_15, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, | ||||
|   {PC_3,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, | ||||
| @@ -304,9 +306,9 @@ const PinMap PinMap_SPI_MOSI[] = { | ||||
| #endif | ||||
|  | ||||
| #ifdef HAL_SPI_MODULE_ENABLED | ||||
| const PinMap PinMap_SPI_MISO[] = { | ||||
| WEAK const PinMap PinMap_SPI_MISO[] = { | ||||
|   {PA_6,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, | ||||
|   {PB_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, | ||||
|   //{PB_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, | ||||
|   {PB_4,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, | ||||
|   {PB_14, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, | ||||
|   {PC_2,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, | ||||
| @@ -316,9 +318,9 @@ const PinMap PinMap_SPI_MISO[] = { | ||||
| #endif | ||||
|  | ||||
| #ifdef HAL_SPI_MODULE_ENABLED | ||||
| const PinMap PinMap_SPI_SCLK[] = { | ||||
| WEAK const PinMap PinMap_SPI_SCLK[] = { | ||||
|   {PA_5,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, | ||||
|   {PB_3,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, | ||||
|   //{PB_3,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, | ||||
|   {PB_3,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, | ||||
|   {PB_10, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, | ||||
|   {PB_13, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, | ||||
| @@ -328,10 +330,10 @@ const PinMap PinMap_SPI_SCLK[] = { | ||||
| #endif | ||||
|  | ||||
| #ifdef HAL_SPI_MODULE_ENABLED | ||||
| const PinMap PinMap_SPI_SSEL[] = { | ||||
| WEAK const PinMap PinMap_SPI_SSEL[] = { | ||||
|   {PA_4,  SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, | ||||
|   {PA_4,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, | ||||
|   {PA_15, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, | ||||
|   //{PA_4,  SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, | ||||
|   //{PA_15, SPI1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI1)}, | ||||
|   {PA_15, SPI3, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF6_SPI3)}, | ||||
|   {PB_9,  SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, | ||||
|   {PB_12, SPI2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_SPI2)}, | ||||
| @@ -342,7 +344,7 @@ const PinMap PinMap_SPI_SSEL[] = { | ||||
| //*** CAN *** | ||||
|  | ||||
| #ifdef HAL_CAN_MODULE_ENABLED | ||||
| const PinMap PinMap_CAN_RD[] = { | ||||
| 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)}, | ||||
|   {PB_8,  CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, | ||||
| @@ -353,7 +355,7 @@ const PinMap PinMap_CAN_RD[] = { | ||||
| #endif | ||||
|  | ||||
| #ifdef HAL_CAN_MODULE_ENABLED | ||||
| const PinMap PinMap_CAN_TD[] = { | ||||
| 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)}, | ||||
|   {PB_9,  CAN1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)}, | ||||
| @@ -366,7 +368,7 @@ const PinMap PinMap_CAN_TD[] = { | ||||
| //*** ETHERNET *** | ||||
|  | ||||
| #ifdef HAL_ETH_MODULE_ENABLED | ||||
| const PinMap PinMap_Ethernet[] = { | ||||
| 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|ETH_RX_CLK | ||||
|   {PA_2,  ETH, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF11_ETH)}, // ETH_MDIO | ||||
| @@ -401,10 +403,10 @@ const PinMap PinMap_Ethernet[] = { | ||||
| //*** USB *** | ||||
|  | ||||
| #ifdef HAL_PCD_MODULE_ENABLED | ||||
| const PinMap PinMap_USB_OTG_FS[] = { | ||||
|   //  {PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF | ||||
|   //  {PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS | ||||
|   //  {PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID | ||||
| WEAK const PinMap PinMap_USB_OTG_FS[] = { | ||||
|   //{PA_8,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_SOF | ||||
|   //{PA_9,  USB_OTG_FS, STM_PIN_DATA(STM_MODE_INPUT, GPIO_NOPULL, GPIO_AF_NONE)}, // USB_OTG_FS_VBUS | ||||
|   //{PA_10, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_ID | ||||
|   {PA_11, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DM | ||||
|   {PA_12, USB_OTG_FS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OTG_FS)}, // USB_OTG_FS_DP | ||||
|   {NC,    NP,    0} | ||||
| @@ -412,7 +414,7 @@ const PinMap PinMap_USB_OTG_FS[] = { | ||||
| #endif | ||||
|  | ||||
| #ifdef HAL_PCD_MODULE_ENABLED | ||||
| const PinMap PinMap_USB_OTG_HS[] = { | ||||
| WEAK const PinMap PinMap_USB_OTG_HS[] = { | ||||
| #ifdef USE_USB_HS_IN_FS | ||||
|   {PA_4,  USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_SOF | ||||
|   {PB_12, USB_OTG_HS, STM_PIN_DATA(STM_MODE_AF_OD, GPIO_PULLUP, GPIO_AF12_OTG_HS_FS)}, // USB_OTG_HS_ID | ||||
| @@ -436,3 +438,21 @@ const PinMap PinMap_USB_OTG_HS[] = { | ||||
|   {NC,    NP,    0} | ||||
| }; | ||||
| #endif | ||||
|  | ||||
| //*** SD *** | ||||
|  | ||||
| #ifdef HAL_SD_MODULE_ENABLED | ||||
| WEAK const PinMap PinMap_SD[] = { | ||||
|   //{PB_8,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D4 | ||||
|   //{PB_9,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D5 | ||||
|   //{PC_6,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D6 | ||||
|   //{PC_7,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D7 | ||||
|   {PC_8,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D0 | ||||
|   {PC_9,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D1 | ||||
|   {PC_10, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D2 | ||||
|   {PC_11, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF12_SDIO)}, // SDIO_D3 | ||||
|   {PC_12, SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO)}, // SDIO_CK | ||||
|   {PD_2,  SDIO, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF12_SDIO)}, // SDIO_CMD | ||||
|   {NC,    NP,    0} | ||||
| }; | ||||
| #endif | ||||
|   | ||||
| @@ -17,8 +17,8 @@ | ||||
|   */ | ||||
| 
 | ||||
| /* Define to prevent recursive inclusion -------------------------------------*/ | ||||
| #ifndef __STM32F4xx_HAL_CONF_H | ||||
| #define __STM32F4xx_HAL_CONF_H | ||||
| #ifndef __STM32F4xx_HAL_CONF_CUSTOM | ||||
| #define __STM32F4xx_HAL_CONF_CUSTOM | ||||
| 
 | ||||
| #ifdef __cplusplus | ||||
| extern "C" { | ||||
| @@ -73,7 +73,9 @@ extern "C" { | ||||
| /* #define HAL_SMARTCARD_MODULE_ENABLED   */ | ||||
| /* #define HAL_WWDG_MODULE_ENABLED   */ | ||||
| #define HAL_CORTEX_MODULE_ENABLED | ||||
| #define HAL_PCD_MODULE_ENABLED | ||||
| #ifndef HAL_PCD_MODULE_ENABLED | ||||
|   #define HAL_PCD_MODULE_ENABLED //Since STM32 v3.10700.191028 this is automatically added if any type of USB is enabled (as in Arduino IDE)
 | ||||
| #endif | ||||
| /* #define HAL_HCD_MODULE_ENABLED   */ | ||||
| /* #define HAL_FMPI2C_MODULE_ENABLED   */ | ||||
| /* #define HAL_SPDIFRX_MODULE_ENABLED   */ | ||||
| @@ -82,69 +84,81 @@ extern "C" { | ||||
| /* #define HAL_MMC_MODULE_ENABLED   */ | ||||
| 
 | ||||
| /* ########################## HSE/HSI Values adaptation ##################### */ | ||||
|  /**
 | ||||
| /**
 | ||||
|   * @brief Adjust the value of External High Speed oscillator (HSE) used in your application. | ||||
|   *        This value is used by the RCC HAL module to compute the system frequency | ||||
|   *        (when HSE is used as system clock source, directly or through the PLL). | ||||
|   */ | ||||
| #ifndef HSE_VALUE | ||||
| #define HSE_VALUE    ((uint32_t)8000000U) /*!< Value of the External oscillator in Hz */ | ||||
| #define HSE_VALUE              8000000U /*!< Value of the External oscillator in Hz */ | ||||
| #endif /* HSE_VALUE */ | ||||
| 
 | ||||
| #ifndef HSE_STARTUP_TIMEOUT | ||||
| #define HSE_STARTUP_TIMEOUT    ((uint32_t)100U)   /*!< Time out for HSE start up, in ms */ | ||||
| #define HSE_STARTUP_TIMEOUT    100U      /*!< Time out for HSE start up, in ms */ | ||||
| #endif /* HSE_STARTUP_TIMEOUT */ | ||||
| 
 | ||||
|  /**
 | ||||
| /**
 | ||||
|   * @brief Internal High Speed oscillator (HSI) value. | ||||
|   *        This value is used by the RCC HAL module to compute the system frequency | ||||
|   *        (when HSI is used as system clock source, directly or through the PLL). | ||||
|   */ | ||||
| #ifndef HSI_VALUE | ||||
| #define HSI_VALUE    ((uint32_t)16000000U) /*!< Value of the Internal oscillator in Hz*/ | ||||
| #define HSI_VALUE              16000000U /*!< Value of the Internal oscillator in Hz */ | ||||
| #endif /* HSI_VALUE */ | ||||
| 
 | ||||
|  /**
 | ||||
| /**
 | ||||
|   * @brief Internal Low Speed oscillator (LSI) value. | ||||
|   */ | ||||
| #ifndef LSI_VALUE | ||||
| #define LSI_VALUE  ((uint32_t)32000U)       /*!< LSI Typical Value in Hz*/ | ||||
| #define LSI_VALUE               32000U    /*!< LSI Typical Value in Hz */ | ||||
| #endif /* LSI_VALUE */                      /*!< Value of the Internal Low Speed oscillator in Hz | ||||
| The real value may vary depending on the variations | ||||
| in voltage and temperature.*/ | ||||
|  /**
 | ||||
| in voltage and temperature. */ | ||||
| /**
 | ||||
|   * @brief External Low Speed oscillator (LSE) value. | ||||
|   */ | ||||
| #ifndef LSE_VALUE | ||||
| #define LSE_VALUE  ((uint32_t)32768U)    /*!< Value of the External Low Speed oscillator in Hz */ | ||||
| #define LSE_VALUE               32768U    /*!< Value of the External Low Speed oscillator in Hz */ | ||||
| #endif /* LSE_VALUE */ | ||||
| 
 | ||||
| #ifndef LSE_STARTUP_TIMEOUT | ||||
| #define LSE_STARTUP_TIMEOUT    ((uint32_t)5000U)   /*!< Time out for LSE start up, in ms */ | ||||
| #define LSE_STARTUP_TIMEOUT    5000U     /*!< Time out for LSE start up, in ms */ | ||||
| #endif /* LSE_STARTUP_TIMEOUT */ | ||||
| 
 | ||||
|  /**
 | ||||
| /**
 | ||||
|   * @brief External clock source for I2S peripheral | ||||
|   *        This value is used by the I2S HAL module to compute the I2S clock source | ||||
|   *        frequency, this source is inserted directly through I2S_CKIN pad. | ||||
|   */ | ||||
| #ifndef EXTERNAL_CLOCK_VALUE | ||||
| #define EXTERNAL_CLOCK_VALUE    ((uint32_t)12288000U) /*!< Value of the External audio frequency in Hz*/ | ||||
| #define EXTERNAL_CLOCK_VALUE     12288000U /*!< Value of the External oscillator in Hz*/ | ||||
| #endif /* EXTERNAL_CLOCK_VALUE */ | ||||
| 
 | ||||
| /* Tip: To avoid modifying this file each time you need to use different HSE,
 | ||||
|    ===  you can define the HSE value in your toolchain compiler preprocessor. */ | ||||
| 
 | ||||
| /* ########################### System Configuration ######################### */ | ||||
|  /**
 | ||||
| /**
 | ||||
|   * @brief This is the HAL system configuration section | ||||
|   */ | ||||
| #define  VDD_VALUE          ((uint32_t)3300U) /*!< Value of VDD in mv */ | ||||
| #define  TICK_INT_PRIORITY            ((uint32_t)0U)   /*!< tick interrupt priority */ | ||||
| #if !defined (VDD_VALUE) | ||||
| #define  VDD_VALUE                    3300U /*!< Value of VDD in mv */ | ||||
| #endif | ||||
| #if !defined (TICK_INT_PRIORITY) | ||||
| #define  TICK_INT_PRIORITY            0x00U /*!< tick interrupt priority */ | ||||
| #endif | ||||
| #if !defined (USE_RTOS) | ||||
| #define  USE_RTOS                     0U | ||||
| #endif | ||||
| #if !defined (PREFETCH_ENABLE) | ||||
| #define  PREFETCH_ENABLE              1U | ||||
| #endif | ||||
| #if !defined (INSTRUCTION_CACHE_ENABLE) | ||||
| #define  INSTRUCTION_CACHE_ENABLE     1U | ||||
| #endif | ||||
| #if !defined (DATA_CACHE_ENABLE) | ||||
| #define  DATA_CACHE_ENABLE            1U | ||||
| #endif | ||||
| 
 | ||||
| #define  USE_HAL_ADC_REGISTER_CALLBACKS         0U /* ADC register callback disabled       */ | ||||
| #define  USE_HAL_CAN_REGISTER_CALLBACKS         0U /* CAN register callback disabled       */ | ||||
| @@ -186,7 +200,7 @@ in voltage and temperature.*/ | ||||
| #define  USE_HAL_WWDG_REGISTER_CALLBACKS        0U /* WWDG register callback disabled      */ | ||||
| 
 | ||||
| /* ########################## Assert Selection ############################## */ | ||||
|  /**
 | ||||
| /**
 | ||||
|   * @brief Uncomment the line below to expanse the "assert_param" macro in the | ||||
|   *        HAL drivers code | ||||
|   */ | ||||
| @@ -215,32 +229,32 @@ in voltage and temperature.*/ | ||||
| /* DP83848_PHY_ADDRESS Address*/ | ||||
| #define DP83848_PHY_ADDRESS           0x01U | ||||
| /* PHY Reset delay these values are based on a 1 ms Systick interrupt*/ | ||||
| #define PHY_RESET_DELAY                 ((uint32_t)0x000000FFU) | ||||
| #define PHY_RESET_DELAY                 0x000000FFU | ||||
| /* PHY Configuration delay */ | ||||
| #define PHY_CONFIG_DELAY                ((uint32_t)0x00000FFFU) | ||||
| #define PHY_CONFIG_DELAY                0x00000FFFU | ||||
| 
 | ||||
| #define PHY_READ_TO                     ((uint32_t)0x0000FFFFU) | ||||
| #define PHY_WRITE_TO                    ((uint32_t)0x0000FFFFU) | ||||
| #define PHY_READ_TO                     0x0000FFFFU | ||||
| #define PHY_WRITE_TO                    0x0000FFFFU | ||||
| 
 | ||||
| /* Section 3: Common PHY Registers */ | ||||
| 
 | ||||
| #define PHY_BCR                         ((uint16_t)0x0000U)    /*!< Transceiver Basic Control Register   */ | ||||
| #define PHY_BSR                         ((uint16_t)0x0001U)    /*!< Transceiver Basic Status Register    */ | ||||
| #define PHY_BCR                         ((uint16_t)0x0000)  /*!< Transceiver Basic Control Register   */ | ||||
| #define PHY_BSR                         ((uint16_t)0x0001)  /*!< Transceiver Basic Status Register    */ | ||||
| 
 | ||||
| #define PHY_RESET                       ((uint16_t)0x8000U)  /*!< PHY Reset */ | ||||
| #define PHY_LOOPBACK                    ((uint16_t)0x4000U)  /*!< Select loop-back mode */ | ||||
| #define PHY_FULLDUPLEX_100M             ((uint16_t)0x2100U)  /*!< Set the full-duplex mode at 100 Mb/s */ | ||||
| #define PHY_HALFDUPLEX_100M             ((uint16_t)0x2000U)  /*!< Set the half-duplex mode at 100 Mb/s */ | ||||
| #define PHY_FULLDUPLEX_10M              ((uint16_t)0x0100U)  /*!< Set the full-duplex mode at 10 Mb/s  */ | ||||
| #define PHY_HALFDUPLEX_10M              ((uint16_t)0x0000U)  /*!< Set the half-duplex mode at 10 Mb/s  */ | ||||
| #define PHY_AUTONEGOTIATION             ((uint16_t)0x1000U)  /*!< Enable auto-negotiation function     */ | ||||
| #define PHY_RESTART_AUTONEGOTIATION     ((uint16_t)0x0200U)  /*!< Restart auto-negotiation function    */ | ||||
| #define PHY_POWERDOWN                   ((uint16_t)0x0800U)  /*!< Select the power down mode           */ | ||||
| #define PHY_ISOLATE                     ((uint16_t)0x0400U)  /*!< Isolate PHY from MII                 */ | ||||
| #define PHY_RESET                       ((uint16_t)0x8000)  /*!< PHY Reset */ | ||||
| #define PHY_LOOPBACK                    ((uint16_t)0x4000)  /*!< Select loop-back mode */ | ||||
| #define PHY_FULLDUPLEX_100M             ((uint16_t)0x2100)  /*!< Set the full-duplex mode at 100 Mb/s */ | ||||
| #define PHY_HALFDUPLEX_100M             ((uint16_t)0x2000)  /*!< Set the half-duplex mode at 100 Mb/s */ | ||||
| #define PHY_FULLDUPLEX_10M              ((uint16_t)0x0100)  /*!< Set the full-duplex mode at 10 Mb/s  */ | ||||
| #define PHY_HALFDUPLEX_10M              ((uint16_t)0x0000)  /*!< Set the half-duplex mode at 10 Mb/s  */ | ||||
| #define PHY_AUTONEGOTIATION             ((uint16_t)0x1000)  /*!< Enable auto-negotiation function     */ | ||||
| #define PHY_RESTART_AUTONEGOTIATION     ((uint16_t)0x0200)  /*!< Restart auto-negotiation function    */ | ||||
| #define PHY_POWERDOWN                   ((uint16_t)0x0800)  /*!< Select the power down mode           */ | ||||
| #define PHY_ISOLATE                     ((uint16_t)0x0400)  /*!< Isolate PHY from MII                 */ | ||||
| 
 | ||||
| #define PHY_AUTONEGO_COMPLETE           ((uint16_t)0x0020U)  /*!< Auto-Negotiation process completed   */ | ||||
| #define PHY_LINKED_STATUS               ((uint16_t)0x0004U)  /*!< Valid link established               */ | ||||
| #define PHY_JABBER_DETECTION            ((uint16_t)0x0002U)  /*!< Jabber condition detected            */ | ||||
| #define PHY_AUTONEGO_COMPLETE           ((uint16_t)0x0020)  /*!< Auto-Negotiation process completed   */ | ||||
| #define PHY_LINKED_STATUS               ((uint16_t)0x0004)  /*!< Valid link established               */ | ||||
| #define PHY_JABBER_DETECTION            ((uint16_t)0x0002)  /*!< Jabber condition detected            */ | ||||
| 
 | ||||
| /* Section 4: Extended PHY Registers */ | ||||
| #define PHY_SR                          ((uint16_t)0x10U)    /*!< PHY status register Offset                      */ | ||||
| @@ -251,14 +265,15 @@ in voltage and temperature.*/ | ||||
| /* ################## SPI peripheral configuration ########################## */ | ||||
| 
 | ||||
| /* CRC FEATURE: Use to activate CRC feature inside HAL SPI Driver
 | ||||
| * Activated: CRC code is present inside driver | ||||
| * Deactivated: CRC code cleaned from driver | ||||
| */ | ||||
| 
 | ||||
|  * Activated: CRC code is present inside driver | ||||
|  * Deactivated: CRC code cleaned from driver | ||||
|  */ | ||||
| #ifndef USE_SPI_CRC | ||||
| #define USE_SPI_CRC                     0U | ||||
| #endif | ||||
| 
 | ||||
| /* Includes ------------------------------------------------------------------*/ | ||||
|  /**
 | ||||
| /**
 | ||||
|   * @brief Include module's header file | ||||
|   */ | ||||
| 
 | ||||
| @@ -456,9 +471,9 @@ in voltage and temperature.*/ | ||||
| 
 | ||||
| /* Exported macro ------------------------------------------------------------*/ | ||||
| #ifdef USE_FULL_ASSERT | ||||
|  /**
 | ||||
| /**
 | ||||
|   * @brief  The assert_param macro is used for function's parameters check. | ||||
|   * @param  expr: If expr is false, it calls assert_failed function | ||||
|   * @param  expr If expr is false, it calls assert_failed function | ||||
|   *         which reports the name of the source file and the source | ||||
|   *         line number of the call that failed. | ||||
|   *         If expr is true, it returns no value. | ||||
| @@ -475,7 +490,7 @@ void assert_failed(uint8_t *file, uint32_t line); | ||||
| } | ||||
| #endif | ||||
| 
 | ||||
| #endif /* __STM32F4xx_HAL_CONF_H */ | ||||
| #endif /* __STM32F4xx_HAL_CONF_CUSTOM_H */ | ||||
| 
 | ||||
| 
 | ||||
| /************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/ | ||||
| @@ -1,10 +1,11 @@ | ||||
| /* | ||||
| ***************************************************************************** | ||||
| ** | ||||
| **  File        : LinkerScript.ld | ||||
|  | ||||
| **  File        : lscript.ld | ||||
| ** | ||||
| **  Abstract    : Linker script for STM32F407VETx Device with | ||||
| **                512KByte FLASH, 128KByte RAM | ||||
| **  Abstract    : Linker script for STM32F407(VZ)(EG)Tx Device with | ||||
| **                512/1024KByte FLASH, 128KByte RAM | ||||
| ** | ||||
| **                Set heap size, stack size and stack location according | ||||
| **                to application requirements. | ||||
| @@ -17,13 +18,32 @@ | ||||
| **  Distribution: The file is distributed as is, without any warranty | ||||
| **                of any kind. | ||||
| ** | ||||
| **  (c)Copyright Ac6. | ||||
| **  You may use this file as-is or modify it according to the needs of your | ||||
| **  project. Distribution of this file (unmodified or modified) is not | ||||
| **  permitted. Ac6 permit registered System Workbench for MCU users the | ||||
| **  rights to distribute the assembled, compiled & linked contents of this | ||||
| **  file as part of an application binary file, provided that it is built | ||||
| **  using the System Workbench for MCU toolchain. | ||||
| ***************************************************************************** | ||||
| ** @attention | ||||
| ** | ||||
| ** <h2><center>© COPYRIGHT(c) 2014 Ac6</center></h2> | ||||
| ** | ||||
| ** Redistribution and use in source and binary forms, with or without modification, | ||||
| ** are permitted provided that the following conditions are met: | ||||
| **   1. Redistributions of source code must retain the above copyright notice, | ||||
| **      this list of conditions and the following disclaimer. | ||||
| **   2. Redistributions in binary form must reproduce the above copyright notice, | ||||
| **      this list of conditions and the following disclaimer in the documentation | ||||
| **      and/or other materials provided with the distribution. | ||||
| **   3. Neither the name of Ac6 nor the names of its contributors | ||||
| **      may be used to endorse or promote products derived from this software | ||||
| **      without specific prior written permission. | ||||
| ** | ||||
| ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||||
| ** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||||
| ** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||||
| ** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE | ||||
| ** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||||
| ** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | ||||
| ** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER | ||||
| ** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, | ||||
| ** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||||
| ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||||
| ** | ||||
| ***************************************************************************** | ||||
| */ | ||||
| @@ -32,7 +52,7 @@ | ||||
| ENTRY(Reset_Handler) | ||||
|  | ||||
| /* Highest address of the user mode stack */ | ||||
| _estack = 0x20020000;    /* end of RAM */ | ||||
| _estack = 0x20000000 + LD_MAX_DATA_SIZE;    /* end of RAM */ | ||||
| /* Generate a link error if heap and stack don't fit into RAM */ | ||||
| _Min_Heap_Size = 0x200;      /* required amount of heap  */ | ||||
| _Min_Stack_Size = 0x400; /* required amount of stack */ | ||||
| @@ -40,9 +60,9 @@ _Min_Stack_Size = 0x400; /* required amount of stack */ | ||||
| /* Specify the memory areas */ | ||||
| MEMORY | ||||
| { | ||||
| RAM (xrw)      : ORIGIN = 0x20000000, LENGTH = 128K | ||||
| RAM (xrw)      : ORIGIN = 0x20000000, LENGTH = LD_MAX_DATA_SIZE | ||||
| CCMRAM (rw)      : ORIGIN = 0x10000000, LENGTH = 64K | ||||
| FLASH (rx)      : ORIGIN = 0x8000000, LENGTH = 512K | ||||
| FLASH (rx)      : ORIGIN = 0x8000000 + LD_FLASH_OFFSET, LENGTH = LD_MAX_SIZE - LD_FLASH_OFFSET | ||||
| } | ||||
|  | ||||
| /* Define output sections */ | ||||
| @@ -57,7 +77,7 @@ SECTIONS | ||||
|   } >FLASH | ||||
|  | ||||
|   /* The program code and other data goes into FLASH */ | ||||
|   .text ALIGN(8): | ||||
|   .text ALIGN(4): | ||||
|   { | ||||
|     . = ALIGN(4); | ||||
|     *(.text)           /* .text sections (code) */ | ||||
| @@ -164,12 +184,12 @@ SECTIONS | ||||
|   /* User_heap_stack section, used to check that there is enough RAM left */ | ||||
|   ._user_heap_stack : | ||||
|   { | ||||
|     . = ALIGN(8); | ||||
|     . = ALIGN(4); | ||||
|     PROVIDE ( end = . ); | ||||
|     PROVIDE ( _end = . ); | ||||
|     . = . + _Min_Heap_Size; | ||||
|     . = . + _Min_Stack_Size; | ||||
|     . = ALIGN(8); | ||||
|     . = ALIGN(4); | ||||
|   } >RAM | ||||
|  | ||||
|   /* Remove information from the standard libraries */ | ||||
|   | ||||
| @@ -28,12 +28,13 @@ | ||||
|  ******************************************************************************* | ||||
|  */ | ||||
|  | ||||
| #include "variant.h" | ||||
| #include "pins_arduino.h" | ||||
|  | ||||
| #ifdef __cplusplus | ||||
| extern "C" { | ||||
| #endif | ||||
|  | ||||
| #if defined(ARDUINO_BLACK_F407VE) || defined(ARDUINO_BLACK_F407VG) | ||||
| // Pin number | ||||
| // This array allows to wrap Arduino pin number(Dx or x) | ||||
| // to STM32 PinName (PX_n) | ||||
| @@ -93,23 +94,98 @@ const PinName digitalPin[] = { | ||||
|   PB_13,  PB_14, | ||||
|   PB_4, | ||||
| }; | ||||
| #endif // ARDUINO_BLACK_F407VE || ARDUINO_BLACK_F407VG | ||||
|  | ||||
| #if defined(ARDUINO_BLACK_F407ZE) || defined(ARDUINO_BLACK_F407ZG) | ||||
| const PinName digitalPin[] = { | ||||
|   // Left Side | ||||
|   //Ext   //Int | ||||
|   //GND   //5V | ||||
|   //GND   //3V3 | ||||
|   PB_12,  PB_13, | ||||
|   PB_14,  PB_15, | ||||
|   PD_8,   PD_9, | ||||
|   PD_10,  PD_11, | ||||
|   PD_12,  PD_13, | ||||
|   PD_14,  PD_15, | ||||
|   PG_2,   PG_3, | ||||
|   PG_4,   PG_5, | ||||
|   PG_6,   PG_7, | ||||
|   PG_8,   PC_6, | ||||
|   PC_7,   PC_8, | ||||
|   PC_9,   PA_8, | ||||
|   PA_9,   PA_10, | ||||
|   PA_11,  PA_12,   // PA_11: USB_DM, PA_12: USB_DP | ||||
|   PA_13,  PA_14, | ||||
|   PA_15,  PC_10, | ||||
|   PC_11,  PC_12, | ||||
|   PD_0,   PD_1, | ||||
|   PD_2,   PD_3, | ||||
|   PD_4,   PD_5, | ||||
|   PD_6,   PD_7, | ||||
|   PG_9,   PG_10, | ||||
|   PG_11,  PG_12, | ||||
|   PG_13,  PG_14, | ||||
|   PG_15,  PB_3, | ||||
|   PB_4,   PB_5, | ||||
|   PB_6,   PB_7, | ||||
|   PB_8,   PB_9, | ||||
|  | ||||
|   // Right Side | ||||
|   //Int   //Ext | ||||
|   //3V3   //3V3 | ||||
|   //BOOT1 //BOOT0 | ||||
|   //GND   //GND | ||||
|   //VREF+ //GND | ||||
|   PB_10,  PB_11, | ||||
|   PE_14,  PE_15, | ||||
|   PE_12,  PE_13, | ||||
|   PE_10,  PE_11, | ||||
|   PE_8,   PE_9, | ||||
|   PG_1,   PE_7, | ||||
|   PF_15,  PG_0, | ||||
|   PF_13,  PF_14, | ||||
|   PF_11,  PF_12, | ||||
|   PB_2,   // PB1 PB2 Inverted to allow contiguous analog pins | ||||
|   PB_1, | ||||
|   PC_5,   PB_0, | ||||
|   PA_7,   PC_4, | ||||
|   PA_5,   PA_6, | ||||
|   PA_3,   PA_4, | ||||
|   PA_1,   PA_2, | ||||
|   PC_3,   PA_0,   // PA_0(WK_UP): BUT K_UP) | ||||
|   PC_1,   PC_2, | ||||
|   /*PF_10,*/PC_0,   // PF_10: Moved to allow contiguous analog pins | ||||
|   PF_8, /*PF_9,*/ // PF_9: Moved to allow contiguous analog pins | ||||
|   PF_6,   PF_7, | ||||
|   PF_10,  PF_9,   // PF_10: LED D2, PF_9: LED D1 (active low) | ||||
|   PF_4,   PF_5, | ||||
|   PF_2,   PF_3, | ||||
|   PF_0,   PF_1, | ||||
|   PE_6,   PC_13, | ||||
|   PE_4,   PE_5,   // PE_4: BUT K0, PE_5: BUT K1 | ||||
|   PE_2,   PE_3, | ||||
|   PE_0,   PE_1, | ||||
| }; | ||||
| #endif // ARDUINO_BLACK_F407ZE || ARDUINO_BLACK_F407ZG | ||||
|  | ||||
| #ifdef __cplusplus | ||||
| } | ||||
| #endif | ||||
|  | ||||
| // ------------------------ | ||||
| // ---------------------------------------------------------------------------- | ||||
|  | ||||
| #ifdef __cplusplus | ||||
| extern "C" { | ||||
| #endif | ||||
|  | ||||
|  /** | ||||
| /** | ||||
|   * @brief  System Clock Configuration | ||||
|   * @param  None | ||||
|   * @retval None | ||||
|   */ | ||||
| WEAK void SystemClock_Config() { | ||||
| WEAK void SystemClock_Config(void) | ||||
| { | ||||
|  | ||||
|   RCC_OscInitTypeDef RCC_OscInitStruct; | ||||
|   RCC_ClkInitTypeDef RCC_ClkInitStruct; | ||||
|   | ||||
| @@ -27,12 +27,12 @@ | ||||
|  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||||
|  ******************************************************************************* | ||||
|  */ | ||||
| #pragma once | ||||
|  | ||||
| #ifndef _VARIANT_ARDUINO_STM32_ | ||||
| #define _VARIANT_ARDUINO_STM32_ | ||||
| /*---------------------------------------------------------------------------- | ||||
|  *        Headers | ||||
|  *----------------------------------------------------------------------------*/ | ||||
| #include <PeripheralPins.h> | ||||
|  | ||||
| #ifdef __cplusplus | ||||
| extern "C" { | ||||
| @@ -41,7 +41,7 @@ extern "C" { | ||||
| /*---------------------------------------------------------------------------- | ||||
|  *        Pins | ||||
|  *----------------------------------------------------------------------------*/ | ||||
| extern const PinName digitalPin[]; | ||||
| #if defined(ARDUINO_BLACK_F407VE) || defined(ARDUINO_BLACK_F407VG) | ||||
| // Right Side | ||||
| #define PE1  0 | ||||
| #define PE0  1 | ||||
| @@ -133,9 +133,9 @@ extern const PinName digitalPin[]; | ||||
| //#define DACC_RESOLUTION         12 | ||||
|  | ||||
| // PWM resolution | ||||
| #define PWM_RESOLUTION          8 | ||||
| #define PWM_FREQUENCY           20000 | ||||
| #define PWM_MAX_DUTY_CYCLE      255 | ||||
| //#define PWM_RESOLUTION          8 | ||||
| //#define PWM_FREQUENCY           20000 | ||||
| //#define PWM_MAX_DUTY_CYCLE      255 | ||||
|  | ||||
| // On-board LED pin number | ||||
| #define LED_D2                  PA6 | ||||
| @@ -144,6 +144,138 @@ extern const PinName digitalPin[]; | ||||
| // Board specific button | ||||
| #define BTN_K_UP                PA0 | ||||
|  | ||||
| #endif // ARDUINO_BLACK_F407VE || ARDUINO_BLACK_F407VG | ||||
|  | ||||
| #if defined(ARDUINO_BLACK_F407ZE) || defined(ARDUINO_BLACK_F407ZG) | ||||
| // Left Side | ||||
| #define PB12 0 | ||||
| #define PB13 1 | ||||
| #define PB14 2 | ||||
| #define PB15 3 | ||||
| #define PD8  4 | ||||
| #define PD9  5 | ||||
| #define PD10 6 | ||||
| #define PD11 7 | ||||
| #define PD12 8 | ||||
| #define PD13 9 | ||||
| #define PD14 10 | ||||
| #define PD15 11 | ||||
| #define PG2  12 | ||||
| #define PG3  13 | ||||
| #define PG4  14 | ||||
| #define PG5  15 | ||||
| #define PG6  16 | ||||
| #define PG7  17 | ||||
| #define PG8  18 | ||||
| #define PC6  19 | ||||
| #define PC7  20 | ||||
| #define PC8  21 | ||||
| #define PC9  22 | ||||
| #define PA8  23 | ||||
| #define PA9  24 | ||||
| #define PA10 25 | ||||
| #define PA11 26 // USB_DM | ||||
| #define PA12 27 // USB_DP | ||||
| #define PA13 28 | ||||
| #define PA14 29 | ||||
| #define PA15 30 | ||||
| #define PC10 31 | ||||
| #define PC11 32 | ||||
| #define PC12 33 | ||||
| #define PD0  34 | ||||
| #define PD1  35 | ||||
| #define PD2  36 | ||||
| #define PD3  37 | ||||
| #define PD4  38 | ||||
| #define PD5  39 | ||||
| #define PD6  40 | ||||
| #define PD7  41 | ||||
| #define PG9  42 | ||||
| #define PG10 43 | ||||
| #define PG11 44 | ||||
| #define PG12 45 | ||||
| #define PG13 46 | ||||
| #define PG14 47 | ||||
| #define PG15 48 | ||||
| #define PB3  49 | ||||
| #define PB4  50 | ||||
| #define PB5  51 | ||||
| #define PB6  52 | ||||
| #define PB7  53 | ||||
| #define PB8  54 | ||||
| #define PB9  55 | ||||
|  | ||||
| // Right Side | ||||
| #define PB10 56 | ||||
| #define PB11 57 | ||||
| #define PE14 58 | ||||
| #define PE15 59 | ||||
| #define PE12 60 | ||||
| #define PE13 61 | ||||
| #define PE10 62 | ||||
| #define PE11 63 | ||||
| #define PE8  64 | ||||
| #define PE9  65 | ||||
| #define PG1  66 | ||||
| #define PE7  67 | ||||
| #define PF15 68 | ||||
| #define PG0  69 | ||||
| #define PF13 70 | ||||
| #define PF14 71 | ||||
| #define PF11 72 | ||||
| #define PF12 73 | ||||
| #define PB2  74 | ||||
| #define PB1  75 // A0 | ||||
| #define PC5  76 // A1 | ||||
| #define PB0  77 // A2 | ||||
| #define PA7  78 // A3 | ||||
| #define PC4  79 // A4 | ||||
| #define PA5  80 // A5 | ||||
| #define PA6  81 // A6 | ||||
| #define PA3  82 // A7 | ||||
| #define PA4  83 // A8 | ||||
| #define PA1  84 // A9 | ||||
| #define PA2  85 // A10 | ||||
| #define PC3  86 // A11 | ||||
| #define PA0  87 // A12/PA_0(WK_UP): BUT K_UP) | ||||
| #define PC1  88 // A13 | ||||
| #define PC2  89 // A14 | ||||
| #define PC0  90 // A15 | ||||
| #define PF8  91 // A16 | ||||
| #define PF6  92 // A17 | ||||
| #define PF7  93 // A18 | ||||
| #define PF9  94 // LED D1 (active low) | ||||
| #define PF10 95 // LED D2 (active low) | ||||
| #define PF4  96 | ||||
| #define PF5  97 | ||||
| #define PF2  98 | ||||
| #define PF3  99 | ||||
| #define PF0  100 | ||||
| #define PF1  101 | ||||
| #define PE6  102 | ||||
| #define PC13 103 | ||||
| #define PE4  104 // BUT K0 | ||||
| #define PE5  105 // BUT K1 | ||||
| #define PE2  106 | ||||
| #define PE3  107 | ||||
| #define PE0  108 | ||||
| #define PE1  109 | ||||
|  | ||||
| // This must be a literal | ||||
| #define NUM_DIGITAL_PINS        110 | ||||
| // This must be a literal with a value less than or equal to MAX_ANALOG_INPUTS | ||||
| #define NUM_ANALOG_INPUTS       19 | ||||
| #define NUM_ANALOG_FIRST        75 | ||||
|  | ||||
| // On-board LED pin number | ||||
| #define LED_D2                  PF10 | ||||
| #define LED_D1                  PF9 | ||||
|  | ||||
| // Board specific button | ||||
| #define BTN_WK_UP                PA0 | ||||
|  | ||||
| #endif // ARDUINO_BLACK_F407ZE || ARDUINO_BLACK_F407ZG | ||||
|  | ||||
| #define LED_BUILTIN             LED_D2 | ||||
| #define LED_GREEN               LED_D2 | ||||
|  | ||||
| @@ -187,6 +319,10 @@ extern const PinName digitalPin[]; | ||||
| #define PIN_SERIAL_RX           PA10 | ||||
| #define PIN_SERIAL_TX           PA9 | ||||
|  | ||||
| /* Extra HAL modules */ | ||||
| #define HAL_DAC_MODULE_ENABLED | ||||
| #define HAL_SD_MODULE_ENABLED | ||||
|  | ||||
| #ifdef __cplusplus | ||||
| } // extern "C" | ||||
| #endif | ||||
| @@ -213,3 +349,5 @@ extern const PinName digitalPin[]; | ||||
| #define SERIAL_PORT_MONITOR     Serial | ||||
| #define SERIAL_PORT_HARDWARE    Serial1 | ||||
| #endif | ||||
|  | ||||
| #endif /* _VARIANT_ARDUINO_STM32_ */ | ||||
|   | ||||
		Reference in New Issue
	
	Block a user