diff --git a/UPP/Core/Inc/main.h b/UPP/Core/Inc/main.h index ef1b27f..95d128a 100644 --- a/UPP/Core/Inc/main.h +++ b/UPP/Core/Inc/main.h @@ -58,6 +58,10 @@ static UPP_PUI_Params_t *PARAM_PUI = &MB_DATA.HoldRegs.pui_params; static UPP_PUI_Error_t *ERR_PUI = &errors.pui.err; static UPP_PrvtErrors_t *ERR_PRIVATE = &errors.prvt.f.err; static UPP_ErrorsCnt_t *ERR_PRIVATE_CNT = &errors.prvt.cnt; + + +extern RS_HandleTypeDef hmodbus1; +extern RS_HandleTypeDef hmodbus_pui; /* USER CODE END EM */ /* Exported functions prototypes ---------------------------------------------*/ @@ -69,8 +73,8 @@ void Error_Handler(void); /* Private defines -----------------------------------------------------------*/ #define angletim htim2 -#define mb_huart huart3 -#define mbdbg_htim htim11 +#define mb_huart huart6 +#define mb_pui_htim htim11 #define PWM_CHANNEL_1 TIM_CHANNEL_1 #define PWM_CHANNEL_2 TIM_CHANNEL_2 #define PWM_CHANNEL_3 TIM_CHANNEL_3 @@ -85,7 +89,7 @@ void Error_Handler(void); #define adc_tim htim3 #define usTick ustim.Instance->CNT #define hpwm2 htim8 -#define mb_dbg_huart huart6 +#define mb_pui_huart huart3 #define ustim htim5 #define hpwm1 htim1 #define UM_LED_GREEN2_Pin GPIO_PIN_2 diff --git a/UPP/Core/Inc/stm32f4xx_it.h b/UPP/Core/Inc/stm32f4xx_it.h index 5f16a2f..d3b6a6c 100644 --- a/UPP/Core/Inc/stm32f4xx_it.h +++ b/UPP/Core/Inc/stm32f4xx_it.h @@ -55,7 +55,11 @@ void SVC_Handler(void); void DebugMon_Handler(void); void PendSV_Handler(void); void SysTick_Handler(void); +void CAN1_TX_IRQHandler(void); +void CAN1_RX0_IRQHandler(void); +void CAN1_SCE_IRQHandler(void); void TIM1_UP_TIM10_IRQHandler(void); +void TIM1_TRG_COM_TIM11_IRQHandler(void); void TIM2_IRQHandler(void); void USART3_IRQHandler(void); void TIM8_BRK_TIM12_IRQHandler(void); diff --git a/UPP/Core/Src/can.c b/UPP/Core/Src/can.c index d19efac..2144b16 100644 --- a/UPP/Core/Src/can.c +++ b/UPP/Core/Src/can.c @@ -31,7 +31,7 @@ void MX_CAN1_Init(void) { /* USER CODE BEGIN CAN1_Init 0 */ - + CAN_FilterTypeDef sFilterConfig; /* USER CODE END CAN1_Init 0 */ /* USER CODE BEGIN CAN1_Init 1 */ @@ -54,7 +54,20 @@ void MX_CAN1_Init(void) Error_Handler(); } /* USER CODE BEGIN CAN1_Init 2 */ - + sFilterConfig.FilterBank = 0; + sFilterConfig.FilterMode = CAN_FILTERMODE_IDMASK; + sFilterConfig.FilterScale = CAN_FILTERSCALE_32BIT; + sFilterConfig.FilterIdHigh = 0x0000; + sFilterConfig.FilterIdLow = 0x0000; + sFilterConfig.FilterMaskIdHigh = 0x0000; + sFilterConfig.FilterMaskIdLow = 0x0000; + sFilterConfig.FilterFIFOAssignment = CAN_RX_FIFO0; + sFilterConfig.FilterActivation = ENABLE; + + if(HAL_CAN_ConfigFilter(&hcan1, &sFilterConfig) != HAL_OK) + { + Error_Handler(); + } /* USER CODE END CAN1_Init 2 */ } @@ -83,6 +96,13 @@ void HAL_CAN_MspInit(CAN_HandleTypeDef* canHandle) GPIO_InitStruct.Alternate = GPIO_AF9_CAN1; HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); + /* CAN1 interrupt Init */ + HAL_NVIC_SetPriority(CAN1_TX_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(CAN1_TX_IRQn); + HAL_NVIC_SetPriority(CAN1_RX0_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(CAN1_RX0_IRQn); + HAL_NVIC_SetPriority(CAN1_SCE_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(CAN1_SCE_IRQn); /* USER CODE BEGIN CAN1_MspInit 1 */ /* USER CODE END CAN1_MspInit 1 */ @@ -106,6 +126,10 @@ void HAL_CAN_MspDeInit(CAN_HandleTypeDef* canHandle) */ HAL_GPIO_DeInit(GPIOB, CANR_Pin|CANT_Pin); + /* CAN1 interrupt Deinit */ + HAL_NVIC_DisableIRQ(CAN1_TX_IRQn); + HAL_NVIC_DisableIRQ(CAN1_RX0_IRQn); + HAL_NVIC_DisableIRQ(CAN1_SCE_IRQn); /* USER CODE BEGIN CAN1_MspDeInit 1 */ /* USER CODE END CAN1_MspDeInit 1 */ @@ -113,5 +137,19 @@ void HAL_CAN_MspDeInit(CAN_HandleTypeDef* canHandle) } /* USER CODE BEGIN 1 */ - +extern CAN_RxHeaderTypeDef RxHeader; +extern uint8_t RxData[8]; +uint32_t cnt_success; +uint32_t cnt_fail; +void HAL_CAN_RxFifo0MsgPendingCallback(CAN_HandleTypeDef *hcan) +{ + if(HAL_CAN_GetRxMessage(hcan, CAN_RX_FIFO0, &RxHeader, RxData) == HAL_OK) + { + cnt_success++; + } + else + { + cnt_fail++; + } +} /* USER CODE END 1 */ diff --git a/UPP/Core/Src/main.c b/UPP/Core/Src/main.c index f388401..6ba0496 100644 --- a/UPP/Core/Src/main.c +++ b/UPP/Core/Src/main.c @@ -50,7 +50,12 @@ /* Private variables ---------------------------------------------------------*/ /* USER CODE BEGIN PV */ - +CAN_TxHeaderTypeDef TxHeader; +CAN_RxHeaderTypeDef RxHeader; +uint8_t TxData[8] = {3}; +uint8_t RxData[8] = {0}; +int can_receive = 1; +uint32_t TxMailbox = 0; /* USER CODE END PV */ /* Private function prototypes -----------------------------------------------*/ @@ -108,7 +113,7 @@ int main(void) MX_DMA_Init(); MX_ADC3_Init(); MX_USART3_UART_Init(); - //MX_CAN1_Init(); + MX_CAN1_Init(); MX_IWDG_Init(); MX_TIM1_Init(); MX_TIM3_Init(); @@ -129,6 +134,14 @@ int main(void) #else //MATLAB #endif //MATLAB UPP_App_Init(); + + TxHeader.StdId = 0x0100 + 1; + TxHeader.ExtId = 0; + TxHeader.RTR = CAN_RTR_DATA; //CAN_RTR_REMOTE + TxHeader.IDE = CAN_ID_STD; // CAN_ID_EXT + TxHeader.DLC = 8; + TxHeader.TransmitGlobalTime = 0; + TxData[2] = 2; /* USER CODE END 2 */ /* Infinite loop */ @@ -137,6 +150,12 @@ int main(void) while (1) { UPP_While(); + static uint32_t poll_prev_tick = 0; + if (msDelayDone(100, &poll_prev_tick)) + { + msDelayStart(&poll_prev_tick); + HAL_CAN_AddTxMessage(&hcan1, &TxHeader, TxData, &TxMailbox); + } /* USER CODE END WHILE */ /* USER CODE BEGIN 3 */ diff --git a/UPP/Core/Src/stm32f4xx_it.c b/UPP/Core/Src/stm32f4xx_it.c index 3a19416..6a8a31a 100644 --- a/UPP/Core/Src/stm32f4xx_it.c +++ b/UPP/Core/Src/stm32f4xx_it.c @@ -57,9 +57,11 @@ /* External variables --------------------------------------------------------*/ extern DMA_HandleTypeDef hdma_adc3; +extern CAN_HandleTypeDef hcan1; extern TIM_HandleTypeDef htim1; extern TIM_HandleTypeDef htim2; extern TIM_HandleTypeDef htim8; +extern TIM_HandleTypeDef htim11; extern TIM_HandleTypeDef htim12; extern UART_HandleTypeDef huart3; extern UART_HandleTypeDef huart6; @@ -207,6 +209,48 @@ void SysTick_Handler(void) /* please refer to the startup file (startup_stm32f4xx.s). */ /******************************************************************************/ +/** + * @brief This function handles CAN1 TX interrupts. + */ +void CAN1_TX_IRQHandler(void) +{ + /* USER CODE BEGIN CAN1_TX_IRQn 0 */ + + /* USER CODE END CAN1_TX_IRQn 0 */ + HAL_CAN_IRQHandler(&hcan1); + /* USER CODE BEGIN CAN1_TX_IRQn 1 */ + + /* USER CODE END CAN1_TX_IRQn 1 */ +} + +/** + * @brief This function handles CAN1 RX0 interrupts. + */ +void CAN1_RX0_IRQHandler(void) +{ + /* USER CODE BEGIN CAN1_RX0_IRQn 0 */ + + /* USER CODE END CAN1_RX0_IRQn 0 */ + HAL_CAN_IRQHandler(&hcan1); + /* USER CODE BEGIN CAN1_RX0_IRQn 1 */ + + /* USER CODE END CAN1_RX0_IRQn 1 */ +} + +/** + * @brief This function handles CAN1 SCE interrupt. + */ +void CAN1_SCE_IRQHandler(void) +{ + /* USER CODE BEGIN CAN1_SCE_IRQn 0 */ + + /* USER CODE END CAN1_SCE_IRQn 0 */ + HAL_CAN_IRQHandler(&hcan1); + /* USER CODE BEGIN CAN1_SCE_IRQn 1 */ + + /* USER CODE END CAN1_SCE_IRQn 1 */ +} + /** * @brief This function handles TIM1 update interrupt and TIM10 global interrupt. */ @@ -221,6 +265,30 @@ void TIM1_UP_TIM10_IRQHandler(void) /* USER CODE END TIM1_UP_TIM10_IRQn 1 */ } +/** + * @brief This function handles TIM1 trigger and commutation interrupts and TIM11 global interrupt. + */ +void TIM1_TRG_COM_TIM11_IRQHandler(void) +{ + /* USER CODE BEGIN TIM1_TRG_COM_TIM11_IRQn 0 */ + uint32_t itsource = mb_htim.Instance->DIER; + uint32_t itflag = mb_htim.Instance->SR; + if ((itflag & (TIM_FLAG_UPDATE)) == (TIM_FLAG_UPDATE)) + { + if ((itsource & (TIM_IT_UPDATE)) == (TIM_IT_UPDATE)) + { + RS_TIM_Handler(&hmodbus_pui); + return; + } + } + /* USER CODE END TIM1_TRG_COM_TIM11_IRQn 0 */ + HAL_TIM_IRQHandler(&htim1); + HAL_TIM_IRQHandler(&htim11); + /* USER CODE BEGIN TIM1_TRG_COM_TIM11_IRQn 1 */ + + /* USER CODE END TIM1_TRG_COM_TIM11_IRQn 1 */ +} + /** * @brief This function handles TIM2 global interrupt. */ @@ -241,7 +309,7 @@ void TIM2_IRQHandler(void) void USART3_IRQHandler(void) { /* USER CODE BEGIN USART3_IRQn 0 */ - RS_UART_Handler(&hmodbus1); + RS_UART_Handler(&hmodbus_pui); return; /* USER CODE END USART3_IRQn 0 */ HAL_UART_IRQHandler(&huart3); diff --git a/UPP/Core/Src/tim.c b/UPP/Core/Src/tim.c index 099bbef..31f0dd1 100644 --- a/UPP/Core/Src/tim.c +++ b/UPP/Core/Src/tim.c @@ -418,6 +418,8 @@ void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* tim_baseHandle) /* TIM1 interrupt Init */ HAL_NVIC_SetPriority(TIM1_UP_TIM10_IRQn, 0, 0); HAL_NVIC_EnableIRQ(TIM1_UP_TIM10_IRQn); + HAL_NVIC_SetPriority(TIM1_TRG_COM_TIM11_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(TIM1_TRG_COM_TIM11_IRQn); /* USER CODE BEGIN TIM1_MspInit 1 */ /* USER CODE END TIM1_MspInit 1 */ @@ -485,6 +487,10 @@ void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* tim_baseHandle) /* USER CODE END TIM11_MspInit 0 */ /* TIM11 clock enable */ __HAL_RCC_TIM11_CLK_ENABLE(); + + /* TIM11 interrupt Init */ + HAL_NVIC_SetPriority(TIM1_TRG_COM_TIM11_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(TIM1_TRG_COM_TIM11_IRQn); /* USER CODE BEGIN TIM11_MspInit 1 */ /* USER CODE END TIM11_MspInit 1 */ @@ -570,6 +576,14 @@ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* tim_baseHandle) /* TIM1 interrupt Deinit */ HAL_NVIC_DisableIRQ(TIM1_UP_TIM10_IRQn); + /* USER CODE BEGIN TIM1:TIM1_TRG_COM_TIM11_IRQn disable */ + /** + * Uncomment the line below to disable the "TIM1_TRG_COM_TIM11_IRQn" interrupt + * Be aware, disabling shared interrupt may affect other IPs + */ + /* HAL_NVIC_DisableIRQ(TIM1_TRG_COM_TIM11_IRQn); */ + /* USER CODE END TIM1:TIM1_TRG_COM_TIM11_IRQn disable */ + /* USER CODE BEGIN TIM1_MspDeInit 1 */ /* USER CODE END TIM1_MspDeInit 1 */ @@ -640,6 +654,16 @@ void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* tim_baseHandle) /* USER CODE END TIM11_MspDeInit 0 */ /* Peripheral clock disable */ __HAL_RCC_TIM11_CLK_DISABLE(); + + /* TIM11 interrupt Deinit */ + /* USER CODE BEGIN TIM11:TIM1_TRG_COM_TIM11_IRQn disable */ + /** + * Uncomment the line below to disable the "TIM1_TRG_COM_TIM11_IRQn" interrupt + * Be aware, disabling shared interrupt may affect other IPs + */ + /* HAL_NVIC_DisableIRQ(TIM1_TRG_COM_TIM11_IRQn); */ + /* USER CODE END TIM11:TIM1_TRG_COM_TIM11_IRQn disable */ + /* USER CODE BEGIN TIM11_MspDeInit 1 */ /* USER CODE END TIM11_MspDeInit 1 */ diff --git a/UPP/Core/UPP/upp_main.c b/UPP/Core/UPP/upp_main.c index 1235f3c..5ba52be 100644 --- a/UPP/Core/UPP/upp_main.c +++ b/UPP/Core/UPP/upp_main.c @@ -11,10 +11,12 @@ ******************************************************************************/ #include "upp_main.h" // всё остальное по работе с УПП #include "usart.h" +#include "can.h" #include "tim.h" #include "iwdg.h" UPP_t upp; +RS_HandleTypeDef hmodbus_pui; HAL_StatusTypeDef res; // сюда сохраняется результат от выполения всяких функций int dbg_polarity = 1; @@ -35,7 +37,13 @@ int UPP_App_Init(void) upp.PUI.values = &MB_DATA.InRegs.pui; upp.call = &MB_INTERNAL.FuncCalls; - MODBUS_FirstInit(&hmodbus1, &huart6, &mb_htim, UPP_UART2_SetDirection); + MODBUS_FirstInit(&hmodbus1, &mb_huart, &mb_htim, UPP_UART2_SetDirection); + MODBUS_FirstInit(&hmodbus_pui, &mb_pui_huart, &mb_pui_htim, UPP_UART1_SetDirection); + + HAL_CAN_Start(&hcan1); + HAL_CAN_ActivateNotification(&hcan1, CAN_IT_RX_FIFO0_MSG_PENDING | CAN_IT_RX_FIFO1_MSG_PENDING | + CAN_IT_ERROR | CAN_IT_BUSOFF | CAN_IT_LAST_ERROR_CODE); + if(HAL_TIM_Base_Start(&ustim) != HAL_OK) { diff --git a/UPP/MDK-ARM/UPP.uvoptx b/UPP/MDK-ARM/UPP.uvoptx index fd32f05..9e21c7a 100644 --- a/UPP/MDK-ARM/UPP.uvoptx +++ b/UPP/MDK-ARM/UPP.uvoptx @@ -1,4 +1,4 @@ - + 1.0 @@ -45,7 +45,7 @@ 79 66 8 - + 1 @@ -104,16 +104,16 @@ 0 0 4 - - - - - - - - - - + + + + + + + + + + Segger\JL2CM3.dll @@ -130,7 +130,7 @@ 0 ARMDBGFLAGS - + 0 @@ -140,7 +140,7 @@ 0 DLGUARM - + 0 @@ -148,7 +148,56 @@ UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_1024 -FS08000000 -FL0100000 -FP0($$Device:STM32F427ZGTx$CMSIS\Flash\STM32F4xx_1024.FLM)) - + + + 0 + 0 + 351 + 1 +
134230342
+ 0 + 0 + 0 + 0 + 0 + 1 + ../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_can.c + + \\UPP\../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_can.c\351 + + + 1 + 0 + 62 + 1 +
34
+ 0 + 0 + 0 + 0 + 0 + 1 + C:\Users\I\AppData\Local\Arm\Packs\ARM\CMSIS-DSP\1.14.2\Source\ControllerFunctions\arm_pid_init_q31.c + + \\UPP\C:/Users/I/AppData/Local/Arm/Packs/ARM/CMSIS-DSP/1.14.2/Source/ControllerFunctions/ControllerFunctions.c\62 + + + 2 + 0 + 333 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + ../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_can.c + + + + 0 @@ -190,6 +239,21 @@ 1 test,0x0A + + 8 + 1 + TxHeader,0x0A + + + 9 + 1 + RxHeader + + + 10 + 1 + cnt_success + @@ -242,19 +306,19 @@ 0 0 - - + + 0 0 0 - - - - - - - - + + + + + + + + System Viewer\GPIOB @@ -295,7 +359,7 @@ 79 66 8 - + 1 @@ -354,16 +418,16 @@ 0 0 4 - - - - - - - - - - + + + + + + + + + + Segger\JL2CM3.dll @@ -380,7 +444,7 @@ 0 ARMDBGFLAGS - + 0 @@ -390,7 +454,7 @@ 0 DLGUARM - + 0 @@ -398,7 +462,7 @@ UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_1024 -FS08000000 -FL0100000 -FP0($$Device:STM32F417ZGTx$CMSIS\Flash\STM32F4xx_1024.FLM)) - + 0 @@ -475,19 +539,19 @@ 0 0 - - + + 0 0 0 - - - - - - - - + + + + + + + + System Viewer\GPIOB diff --git a/UPP/MDK-ARM/UPP.uvprojx b/UPP/MDK-ARM/UPP.uvprojx index 02d3e43..d18e0f0 100644 --- a/UPP/MDK-ARM/UPP.uvprojx +++ b/UPP/MDK-ARM/UPP.uvprojx @@ -1,7 +1,10 @@ - - + + + 2.1 +
### uVision Project, (C) Keil Software
+ UPP @@ -17,28 +20,28 @@ Keil.STM32F4xx_DFP.2.17.1 https://www.keil.com/pack/ IRAM(0x20000000-0x2002FFFF) IRAM2(0x10000000-0x1000FFFF) IROM(0x8000000-0x80FFFFF) CLOCK(25000000) FPU2 CPUTYPE("Cortex-M4") TZ - - - + + + 0 - - - - - - - - - - + + + + + + + + + + $$Device:STM32F427ZGTx$CMSIS\SVD\STM32F427x.svd 0 0 - - - - - + + + + + 0 0 @@ -53,15 +56,15 @@ 1 1 1 - + 1 0 0 0 0 - - + + 0 0 0 @@ -70,8 +73,8 @@ 0 0 - - + + 0 0 0 @@ -80,15 +83,15 @@ 0 1 - - + + 0 0 0 0 1 - + 0 @@ -102,8 +105,8 @@ 0 0 3 - - + + 0 @@ -136,11 +139,11 @@ 1 BIN\UL2CM3.DLL - - - - - + + + + + 0 @@ -173,7 +176,7 @@ 0 0 "Cortex-M4" - + 0 0 0 @@ -308,7 +311,7 @@ 0x10000 - + 1 @@ -335,9 +338,9 @@ 0 0 - + USE_HAL_DRIVER,STM32F427xx, ARM_MATH_CM4 - + ../Core/Inc;../Drivers/STM32F4xx_HAL_Driver/Inc;../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F4xx/Include;../Drivers/CMSIS/Include;../AllLibs/ExtMemory/Inc;../AllLibs/Modbus/Inc;../AllLibs/MyLibs/MyLibs/Inc;../AllLibs/MyLibs/RTT;../AllLibs/PeriphGeneral/Inc;../Core/Configs;../Core/PowerMonitor;../Core/Thyristors;../Core/UPP @@ -353,10 +356,10 @@ 0 1 - - - - + + + + @@ -366,15 +369,15 @@ 0 1 0 - - - - - - - - - + + + + + + + + + @@ -464,8 +467,8 @@ 2 2 11 - - + + 1 @@ -494,10 +497,10 @@ 2 2 - - - - + + + + @@ -565,8 +568,8 @@ 2 2 11 - - + + 1 @@ -595,10 +598,10 @@ 2 2 - - - - + + + + @@ -631,8 +634,8 @@ 2 2 11 - - + + 1 @@ -661,10 +664,10 @@ 2 2 - - - - + + + + @@ -692,8 +695,8 @@ 2 2 11 - - + + 1 @@ -722,10 +725,10 @@ 2 2 - - - - + + + + @@ -753,8 +756,8 @@ 2 2 11 - - + + 1 @@ -783,10 +786,10 @@ 2 2 - - - - + + + + @@ -814,8 +817,8 @@ 2 2 11 - - + + 1 @@ -844,10 +847,10 @@ 2 2 - - - - + + + + @@ -875,8 +878,8 @@ 2 2 11 - - + + 1 @@ -905,10 +908,10 @@ 2 2 - - - - + + + + @@ -1046,8 +1049,8 @@ 2 2 11 - - + + 1 @@ -1076,10 +1079,10 @@ 2 2 - - - - + + + + @@ -1357,8 +1360,8 @@ 2 2 11 - - + + 1 @@ -1374,10 +1377,10 @@ 2 0 - - - - + + + + @@ -1412,28 +1415,28 @@ Keil.STM32F4xx_DFP.2.17.1 https://www.keil.com/pack/ IRAM(0x20000000,0x00020000) IRAM2(0x10000000,0x00010000) IROM(0x08000000,0x00100000) CPUTYPE("Cortex-M4") FPU2 CLOCK(12000000) ELITTLE - - + + UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_1024 -FS08000000 -FL0100000 -FP0($$Device:STM32F417ZGTx$CMSIS\Flash\STM32F4xx_1024.FLM)) 0 $$Device:STM32F417ZGTx$Drivers\CMSIS\Device\ST\STM32F4xx\Include\stm32f4xx.h - - - - - - - - - + + + + + + + + + $$Device:STM32F417ZGTx$CMSIS\SVD\STM32F41x.svd 0 0 - - - - - + + + + + 0 0 @@ -1448,15 +1451,15 @@ 1 1 1 - + 1 0 0 0 0 - - + + 0 0 0 @@ -1465,8 +1468,8 @@ 0 0 - - + + 0 0 0 @@ -1475,15 +1478,15 @@ 0 0 - - + + 0 0 0 0 1 - + 0 @@ -1497,8 +1500,8 @@ 0 0 3 - - + + 0 @@ -1532,10 +1535,10 @@ 1 BIN\UL2CM3.DLL "" () - - - - + + + + 0 @@ -1568,7 +1571,7 @@ 0 0 "Cortex-M4" - + 0 0 0 @@ -1703,7 +1706,7 @@ 0x10000 - + 1 @@ -1730,9 +1733,9 @@ 0 0 - + USE_HAL_DRIVER,STM32F417xx, ARM_MATH_CM4 - + ../Core/Inc;../Drivers/STM32F4xx_HAL_Driver/Inc;../Drivers/STM32F4xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F4xx/Include;../Drivers/CMSIS/Include;../AllLibs/ExtMemory/Inc;../AllLibs/Modbus/Inc;../AllLibs/MyLibs/MyLibs/Inc;../AllLibs/MyLibs/RTT;../AllLibs/PeriphGeneral/Inc;../Core/Configs;../Core/PowerMonitor;../Core/Thyristors;../Core/UPP @@ -1748,10 +1751,10 @@ 0 1 - - - - + + + + @@ -1761,15 +1764,15 @@ 0 1 0 - - - - - - - - - + + + + + + + + + @@ -1924,8 +1927,8 @@ 2 2 11 - - + + 1 @@ -1954,10 +1957,10 @@ 2 2 - - - - + + + + @@ -1985,8 +1988,8 @@ 2 2 11 - - + + 1 @@ -2015,10 +2018,10 @@ 2 2 - - - - + + + + @@ -2046,8 +2049,8 @@ 2 2 11 - - + + 1 @@ -2076,10 +2079,10 @@ 2 2 - - - - + + + + @@ -2107,8 +2110,8 @@ 2 2 11 - - + + 1 @@ -2137,10 +2140,10 @@ 2 2 - - - - + + + + @@ -2168,8 +2171,8 @@ 2 2 11 - - + + 1 @@ -2198,10 +2201,10 @@ 2 2 - - - - + + + + @@ -2339,8 +2342,8 @@ 2 2 11 - - + + 1 @@ -2369,10 +2372,10 @@ 2 2 - - - - + + + + @@ -2655,8 +2658,8 @@ 2 2 11 - - + + 1 @@ -2672,10 +2675,10 @@ 2 0 - - - - + + + + @@ -2692,32 +2695,34 @@ + - + - + - + - + - - + + - + - - + + - + + @@ -2726,5 +2731,5 @@ - + diff --git a/UPP/UPP.ioc b/UPP/UPP.ioc index c4e63db..46b863a 100644 --- a/UPP/UPP.ioc +++ b/UPP/UPP.ioc @@ -147,11 +147,14 @@ Mcu.Pin8=PF6 Mcu.Pin9=PF7 Mcu.PinsNb=71 Mcu.ThirdPartyNb=0 -Mcu.UserConstants=angletim,htim2;mb_huart,huart3;mbdbg_htim,htim11;PWM_CHANNEL_1,TIM_CHANNEL_1;PWM_CHANNEL_2,TIM_CHANNEL_2;PWM_CHANNEL_3,TIM_CHANNEL_3;PWM_CHANNEL_4,TIM_CHANNEL_4;mem_hspi,hspi3;ANGLE_CHANNEL_2,TIM_CHANNEL_2;ANGLE_CHANNEL_3,TIM_CHANNEL_3;ANGLE_CHANNEL_1,TIM_CHANNEL_1;PWM_CHANNEL_5,TIM_CHANNEL_3;PWM_CHANNEL_6,TIM_CHANNEL_4;mb_htim,htim12;adc_tim,htim3;usTick,ustim.Instance->CNT;hpwm2,htim8;mb_dbg_huart,huart6;ustim,htim5;hpwm1,htim1 +Mcu.UserConstants=angletim,htim2;mb_huart,huart6;mb_pui_htim,htim11;PWM_CHANNEL_1,TIM_CHANNEL_1;PWM_CHANNEL_2,TIM_CHANNEL_2;PWM_CHANNEL_3,TIM_CHANNEL_3;PWM_CHANNEL_4,TIM_CHANNEL_4;mem_hspi,hspi3;ANGLE_CHANNEL_2,TIM_CHANNEL_2;ANGLE_CHANNEL_3,TIM_CHANNEL_3;ANGLE_CHANNEL_1,TIM_CHANNEL_1;PWM_CHANNEL_5,TIM_CHANNEL_3;PWM_CHANNEL_6,TIM_CHANNEL_4;mb_htim,htim12;adc_tim,htim3;usTick,ustim.Instance->CNT;hpwm2,htim8;mb_pui_huart,huart3;ustim,htim5;hpwm1,htim1 Mcu.UserName=STM32F427ZGTx MxCube.Version=6.12.1 MxDb.Version=DB.6.0.121 NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false +NVIC.CAN1_RX0_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true +NVIC.CAN1_SCE_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true +NVIC.CAN1_TX_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true NVIC.DMA2_Stream0_IRQn=true\:0\:0\:false\:false\:true\:false\:true\:true NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.ForceEnableDMAVector=true @@ -162,6 +165,7 @@ NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4 NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false NVIC.SysTick_IRQn=true\:15\:0\:true\:false\:true\:false\:true\:false +NVIC.TIM1_TRG_COM_TIM11_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true NVIC.TIM1_UP_TIM10_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true NVIC.TIM2_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true NVIC.TIM8_BRK_TIM12_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true