diff --git a/UPP/AllLibs/Modbus b/UPP/AllLibs/Modbus index df3f71c..f03ffd5 160000 --- a/UPP/AllLibs/Modbus +++ b/UPP/AllLibs/Modbus @@ -1 +1 @@ -Subproject commit df3f71cdff442547c8606520a5342ebfc149e527 +Subproject commit f03ffd5bfcd1a1296ae4d02dfa8902fd15fe8400 diff --git a/UPP/Core/Configs/modbus_config.h b/UPP/Core/Configs/modbus_config.h index 365f71e..806e78d 100644 --- a/UPP/Core/Configs/modbus_config.h +++ b/UPP/Core/Configs/modbus_config.h @@ -40,8 +40,6 @@ // Периферия (опционально) //#define mb_huart huart1 ///< Удобный дефайн для модбасовского uart //#define mb_htim htim3 ///< Удобный дефайн для модбасовского таймера -#define RS_EnableReceive() UPP_UART1_SetDirection(GPIO_PIN_RESET) ///< Функция изменения направления передачи на ПРИЕМ для RS-485 -#define RS_EnableTransmit() UPP_UART1_SetDirection(GPIO_PIN_RESET) ///< Функция изменения направления передачи на ПЕРЕДАЧУ для RS-485 // Модули modbus diff --git a/UPP/Core/Configs/modbus_data.c b/UPP/Core/Configs/modbus_data.c index 79a3bc5..33c0103 100644 --- a/UPP/Core/Configs/modbus_data.c +++ b/UPP/Core/Configs/modbus_data.c @@ -70,7 +70,7 @@ MB_ExceptionTypeDef MB_Check_Address_For_Arr(uint16_t Addr, uint16_t Qnt, uint16 MB_ExceptionTypeDef MB_DefineRegistersAddress(uint16_t **pRegs, uint16_t Addr, uint16_t Qnt, uint8_t RegisterType, uint8_t WriteFlag) { /* В режиме работа ничего не записываем */ - if(upp.workmode == UPP_Work) + if((upp.workmode == UPP_Work) && WriteFlag) { return ET_ILLEGAL_FUNCTION; } @@ -133,7 +133,7 @@ MB_ExceptionTypeDef MB_DefineRegistersAddress(uint16_t **pRegs, uint16_t Addr, u MB_ExceptionTypeDef MB_DefineCoilsAddress(uint16_t **pCoils, uint16_t Addr, uint16_t Qnt, uint16_t *start_shift, uint8_t WriteFlag) { /* В режиме работа ничего не записываем */ - if(upp.workmode == UPP_Work) + if((upp.workmode == UPP_Work) && WriteFlag) { return ET_ILLEGAL_FUNCTION; } diff --git a/UPP/Core/Inc/stm32f4xx_it.h b/UPP/Core/Inc/stm32f4xx_it.h index fc9910e..5f16a2f 100644 --- a/UPP/Core/Inc/stm32f4xx_it.h +++ b/UPP/Core/Inc/stm32f4xx_it.h @@ -62,6 +62,7 @@ void TIM8_BRK_TIM12_IRQHandler(void); void TIM8_UP_TIM13_IRQHandler(void); void TIM8_TRG_COM_TIM14_IRQHandler(void); void DMA2_Stream0_IRQHandler(void); +void USART6_IRQHandler(void); /* USER CODE BEGIN EFP */ /* USER CODE END EFP */ diff --git a/UPP/Core/Src/main.c b/UPP/Core/Src/main.c index d9df347..f388401 100644 --- a/UPP/Core/Src/main.c +++ b/UPP/Core/Src/main.c @@ -107,7 +107,7 @@ int main(void) MX_GPIO_Init(); MX_DMA_Init(); MX_ADC3_Init(); - MX_USART3_UART_Init(); + MX_USART3_UART_Init(); //MX_CAN1_Init(); MX_IWDG_Init(); MX_TIM1_Init(); @@ -161,14 +161,13 @@ void SystemClock_Config(void) /** Initializes the RCC Oscillators according to the specified parameters * in the RCC_OscInitTypeDef structure. */ - RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI|RCC_OSCILLATORTYPE_LSI + RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_LSI|RCC_OSCILLATORTYPE_HSE |RCC_OSCILLATORTYPE_LSE; + RCC_OscInitStruct.HSEState = RCC_HSE_ON; RCC_OscInitStruct.LSEState = RCC_LSE_ON; - RCC_OscInitStruct.HSIState = RCC_HSI_ON; - RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT; RCC_OscInitStruct.LSIState = RCC_LSI_ON; RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON; - RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI; + RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE; RCC_OscInitStruct.PLL.PLLM = 8; RCC_OscInitStruct.PLL.PLLN = 180; RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2; diff --git a/UPP/Core/Src/stm32f4xx_it.c b/UPP/Core/Src/stm32f4xx_it.c index f2780ba..3a19416 100644 --- a/UPP/Core/Src/stm32f4xx_it.c +++ b/UPP/Core/Src/stm32f4xx_it.c @@ -62,6 +62,7 @@ extern TIM_HandleTypeDef htim2; extern TIM_HandleTypeDef htim8; extern TIM_HandleTypeDef htim12; extern UART_HandleTypeDef huart3; +extern UART_HandleTypeDef huart6; extern TIM_HandleTypeDef htim14; /* USER CODE BEGIN EV */ @@ -240,7 +241,6 @@ void TIM2_IRQHandler(void) void USART3_IRQHandler(void) { /* USER CODE BEGIN USART3_IRQn 0 */ - RS_UART_Handler(&hmodbus1); return; /* USER CODE END USART3_IRQn 0 */ @@ -321,6 +321,21 @@ void DMA2_Stream0_IRQHandler(void) /* USER CODE END DMA2_Stream0_IRQn 1 */ } +/** + * @brief This function handles USART6 global interrupt. + */ +void USART6_IRQHandler(void) +{ + /* USER CODE BEGIN USART6_IRQn 0 */ + RS_UART_Handler(&hmodbus1); + return; + /* USER CODE END USART6_IRQn 0 */ + HAL_UART_IRQHandler(&huart6); + /* USER CODE BEGIN USART6_IRQn 1 */ + + /* USER CODE END USART6_IRQn 1 */ +} + /* USER CODE BEGIN 1 */ /* USER CODE END 1 */ diff --git a/UPP/Core/Src/usart.c b/UPP/Core/Src/usart.c index f739e55..8b0b1a5 100644 --- a/UPP/Core/Src/usart.c +++ b/UPP/Core/Src/usart.c @@ -137,6 +137,9 @@ void HAL_UART_MspInit(UART_HandleTypeDef* uartHandle) GPIO_InitStruct.Alternate = GPIO_AF8_USART6; HAL_GPIO_Init(GPIOC, &GPIO_InitStruct); + /* USART6 interrupt Init */ + HAL_NVIC_SetPriority(USART6_IRQn, 0, 0); + HAL_NVIC_EnableIRQ(USART6_IRQn); /* USER CODE BEGIN USART6_MspInit 1 */ /* USER CODE END USART6_MspInit 1 */ @@ -180,6 +183,8 @@ void HAL_UART_MspDeInit(UART_HandleTypeDef* uartHandle) */ HAL_GPIO_DeInit(GPIOC, SCIT1C6_Pin|SCIR2_Pin); + /* USART6 interrupt Deinit */ + HAL_NVIC_DisableIRQ(USART6_IRQn); /* USER CODE BEGIN USART6_MspDeInit 1 */ /* USER CODE END USART6_MspDeInit 1 */ diff --git a/UPP/Core/UPP/upp_io.c b/UPP/Core/UPP/upp_io.c index 41aa5ce..dc174a3 100644 --- a/UPP/Core/UPP/upp_io.c +++ b/UPP/Core/UPP/upp_io.c @@ -48,9 +48,10 @@ void UPP_IO_Init(void) GPIO_Switch_Init(&UPP_DIN.MestDist, DIN2_GPIO_Port, DIN2_Pin, 0); UPP_DIN.MestDist.Sw_FilterDelay = 100; GPIO_Switch_Init(&UPP_DIN.DIN3, DIN3_GPIO_Port, DIN3_Pin, 0); + GPIO_Switch_Init(&UPP_DIN.err_24Vdio, ERR_24VDIO_GPIO_Port, ERR_24VDIO_Pin, 1); GPIO_Switch_Init(&UPP_DIN.err_24V, ERR_24V_GPIO_Port, ERR_24V_Pin, 1); - GPIO_Switch_Init(&UPP_DIN.err_5Vsi, ERR_5VSI_GPIO_Port, ERR_5VSI_Pin, 0); + GPIO_Switch_Init(&UPP_DIN.err_5Vsi, ERR_5VSI_GPIO_Port, ERR_5VSI_Pin, 1); /* Дискретные входы платы УМ */ GPIO_Switch_Init(&UPP_DIN.err_5Vd, UM_ERR_5VD_GPIO_Port, UM_ERR_5VD_Pin, 0); @@ -83,16 +84,16 @@ void UPP_IO_Init(void) /** * @brief Выставить направление UART1 (STM USART2) */ -void UPP_UART1_SetDirection(int state) +void UPP_UART1_SetDirection(int Tx) { - HAL_GPIO_WritePin(SCIDE1_GPIO_Port, SCIDE1_Pin, state); + HAL_GPIO_WritePin(SCIDE1_GPIO_Port, SCIDE1_Pin, !Tx); } /** * @brief Выставить направление UART2 (STM USART5) */ -void UPP_UART2_SetDirection(int state) +void UPP_UART2_SetDirection(int Tx) { - HAL_GPIO_WritePin(SCIDE2_GPIO_Port, SCIDE2_Pin, state); + HAL_GPIO_WritePin(SCIDE2_GPIO_Port, SCIDE2_Pin, !Tx); } diff --git a/UPP/Core/UPP/upp_io.h b/UPP/Core/UPP/upp_io.h index 3fecb4b..169d563 100644 --- a/UPP/Core/UPP/upp_io.h +++ b/UPP/Core/UPP/upp_io.h @@ -60,7 +60,7 @@ extern UPP_DiscreteOutputs_t UPP_DO; void UPP_IO_Init(void); /* Выставить направление UART1 (STM USART2) */ -void UPP_UART1_SetDirection(int state); +void UPP_UART1_SetDirection(int Tx); /* Выставить направление UART2 (STM USART5) */ -void UPP_UART2_SetDirection(int state); +void UPP_UART2_SetDirection(int Tx); #endif //_UPP_IO_H \ No newline at end of file diff --git a/UPP/Core/UPP/upp_main.c b/UPP/Core/UPP/upp_main.c index ad318a8..1235f3c 100644 --- a/UPP/Core/UPP/upp_main.c +++ b/UPP/Core/UPP/upp_main.c @@ -35,7 +35,7 @@ int UPP_App_Init(void) upp.PUI.values = &MB_DATA.InRegs.pui; upp.call = &MB_INTERNAL.FuncCalls; - MODBUS_FirstInit(&hmodbus1, &mb_huart, &mb_htim); + MODBUS_FirstInit(&hmodbus1, &huart6, &mb_htim, UPP_UART2_SetDirection); if(HAL_TIM_Base_Start(&ustim) != HAL_OK) { @@ -307,6 +307,7 @@ void UPP_ADC_Handle(void) PowerMonitor_FastCalc(&upp.pm); + int voltage_halfwave_period_ms_mean = 1.0f/(upp.pm.measured.final.Fmean*2)*1000; for(int phase = 0; phase < 3; phase++) { // Если произошел Zero Cross @@ -320,16 +321,13 @@ void UPP_ADC_Handle(void) UPP_HalfWave_t curr_halfwave = ZC_GetHalfWave(&upp.pm.zc, phase); res = PWM_SetHalfWave(&upp.hpwm, phase, curr_halfwave); // Начинаем отсчитывать угол - int voltage_halfwave_period_ms = 1.0f/(upp.pm.measured.final.F[phase]*2)*1000; - res = Angle_Start(&upp.hangle, phase, voltage_halfwave_period_ms); - if(res != HAL_OK) - __NOP(); +// int voltage_halfwave_period_ms = 1.0f/(upp.pm.measured.final.F[phase]*2)*1000; + res = Angle_Start(&upp.hangle, phase, voltage_halfwave_period_ms_mean); } } } // ШИМим ключи - int voltage_halfwave_period_ms_mean = 1.0f/(upp.pm.measured.final.Fmean*2)*1000; res = PWM_Handle(&upp.hpwm, voltage_halfwave_period_ms_mean); upp.Timings.isr_adc_us = BenchTime_End(BT_ADC, angletim.Instance->CNT)/ANGLE_TIM2_FREQ_MHZ; diff --git a/UPP/MDK-ARM/UPP.uvoptx b/UPP/MDK-ARM/UPP.uvoptx index 1f577c5..fd32f05 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,7 @@ UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_1024 -FS08000000 -FL0100000 -FP0($$Device:STM32F427ZGTx$CMSIS\Flash\STM32F4xx_1024.FLM)) - + 0 @@ -163,12 +163,12 @@ 2 1 - test_cen,0x0A + hmodbus1 3 1 - test_err,0x0A + RS_Buffer 4 @@ -180,7 +180,39 @@ 1 test_ready,0x0A + + 6 + 1 + UPP_DIN + + + 7 + 1 + test,0x0A + + + + 0 + 2 + uwTick,0x0A + + + 1 + 2 + hbt + + + 2 + 2 + retval + + + 3 + 2 + test_err + + 0 @@ -210,19 +242,25 @@ 0 0 - - + + 0 0 0 - - - - - - - - + + + + + + + + + + + System Viewer\GPIOB + 35905 + + 1 1 @@ -257,7 +295,7 @@ 79 66 8 - + 1 @@ -316,16 +354,16 @@ 0 0 4 - - - - - - - - - - + + + + + + + + + + Segger\JL2CM3.dll @@ -342,7 +380,7 @@ 0 ARMDBGFLAGS - + 0 @@ -352,7 +390,7 @@ 0 DLGUARM - + 0 @@ -360,7 +398,7 @@ UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_1024 -FS08000000 -FL0100000 -FP0($$Device:STM32F417ZGTx$CMSIS\Flash\STM32F4xx_1024.FLM)) - + 0 @@ -437,19 +475,19 @@ 0 0 - - + + 0 0 0 - - - - - - - - + + + + + + + + System Viewer\GPIOB @@ -1184,7 +1222,7 @@ Modbus - 0 + 1 0 0 0 @@ -1752,7 +1790,7 @@ Application/MDK-ARM - 0 + 1 0 0 0 @@ -1784,7 +1822,7 @@ ::CMSIS - 0 + 1 0 0 1 diff --git a/UPP/MDK-ARM/UPP.uvprojx b/UPP/MDK-ARM/UPP.uvprojx index eef2e93..02d3e43 100644 --- a/UPP/MDK-ARM/UPP.uvprojx +++ b/UPP/MDK-ARM/UPP.uvprojx @@ -1,10 +1,7 @@ - - - + + 2.1 -
### uVision Project, (C) Keil Software
- UPP @@ -20,28 +17,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 @@ -56,15 +53,15 @@ 1 1 1 - + 1 0 0 0 0 - - + + 0 0 0 @@ -73,8 +70,8 @@ 0 0 - - + + 0 0 0 @@ -83,15 +80,15 @@ 0 1 - - + + 0 0 0 0 1 - + 0 @@ -105,8 +102,8 @@ 0 0 3 - - + + 0 @@ -139,11 +136,11 @@ 1 BIN\UL2CM3.DLL - - - - - + + + + + 0 @@ -176,7 +173,7 @@ 0 0 "Cortex-M4" - + 0 0 0 @@ -311,7 +308,7 @@ 0x10000 - + 1 @@ -338,9 +335,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 @@ -356,10 +353,10 @@ 0 1 - - - - + + + + @@ -369,15 +366,15 @@ 0 1 0 - - - - - - - - - + + + + + + + + + @@ -454,6 +451,57 @@ angle_control.c 1 ..\Core\UPP\angle_control.c + + + 2 + 0 + 0 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 5 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + angle_control.h @@ -504,6 +552,57 @@ pwm_thyristors.c 1 ..\Core\UPP\pwm_thyristors.c + + + 2 + 0 + 0 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 5 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + pwm_thyristors.h @@ -519,6 +618,57 @@ power_monitor.c 1 ..\Core\PowerMonitor\power_monitor.c + + + 2 + 0 + 0 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 5 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 1 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + power_monitor.h @@ -529,6 +679,57 @@ zero_cross.c 1 ..\Core\PowerMonitor\zero_cross.c + + + 2 + 0 + 0 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 5 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + zero_cross.h @@ -539,6 +740,57 @@ adc_tools.c 1 ..\Core\PowerMonitor\adc_tools.c + + + 2 + 0 + 0 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 5 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + adc_tools.h @@ -549,6 +801,57 @@ phases_transform.c 1 ..\Core\PowerMonitor\phases_transform.c + + + 2 + 0 + 0 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 5 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + phases_transform.h @@ -559,6 +862,57 @@ power_protect.c 1 ..\Core\PowerMonitor\power_protect.c + + + 2 + 0 + 0 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 5 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + power_protect.h @@ -679,6 +1033,57 @@ filters.c 1 ..\AllLibs\MyLibs\MyLibs\Src\filters.c + + + 2 + 0 + 0 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + 11 + + + 1 + + + + 2 + 5 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 0 + 2 + 2 + 2 + 2 + 2 + 0 + 0 + 2 + 2 + 2 + 2 + 2 + + + + + + + + + filters.h @@ -952,8 +1357,8 @@ 2 2 11 - - + + 1 @@ -969,10 +1374,10 @@ 2 0 - - - - + + + + @@ -1007,28 +1412,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 @@ -1043,15 +1448,15 @@ 1 1 1 - + 1 0 0 0 0 - - + + 0 0 0 @@ -1060,8 +1465,8 @@ 0 0 - - + + 0 0 0 @@ -1070,15 +1475,15 @@ 0 0 - - + + 0 0 0 0 1 - + 0 @@ -1092,8 +1497,8 @@ 0 0 3 - - + + 0 @@ -1127,10 +1532,10 @@ 1 BIN\UL2CM3.DLL "" () - - - - + + + + 0 @@ -1163,7 +1568,7 @@ 0 0 "Cortex-M4" - + 0 0 0 @@ -1298,7 +1703,7 @@ 0x10000 - + 1 @@ -1325,9 +1730,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 @@ -1343,10 +1748,10 @@ 0 1 - - - - + + + + @@ -1356,15 +1761,15 @@ 0 1 0 - - - - - - - - - + + + + + + + + + @@ -1519,8 +1924,8 @@ 2 2 11 - - + + 1 @@ -1549,10 +1954,10 @@ 2 2 - - - - + + + + @@ -1580,8 +1985,8 @@ 2 2 11 - - + + 1 @@ -1610,10 +2015,10 @@ 2 2 - - - - + + + + @@ -1641,8 +2046,8 @@ 2 2 11 - - + + 1 @@ -1671,10 +2076,10 @@ 2 2 - - - - + + + + @@ -1702,8 +2107,8 @@ 2 2 11 - - + + 1 @@ -1732,10 +2137,10 @@ 2 2 - - - - + + + + @@ -1763,8 +2168,8 @@ 2 2 11 - - + + 1 @@ -1793,10 +2198,10 @@ 2 2 - - - - + + + + @@ -1934,8 +2339,8 @@ 2 2 11 - - + + 1 @@ -1964,10 +2369,10 @@ 2 2 - - - - + + + + @@ -2250,8 +2655,8 @@ 2 2 11 - - + + 1 @@ -2267,10 +2672,10 @@ 2 0 - - - - + + + + @@ -2287,34 +2692,32 @@ - - + - + - + - + - - + + - + - - + + - + - @@ -2323,5 +2726,5 @@ - + diff --git a/UPP/UPP.ioc b/UPP/UPP.ioc index f4e67db..c4e63db 100644 --- a/UPP/UPP.ioc +++ b/UPP/UPP.ioc @@ -161,7 +161,7 @@ NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false 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\:false\:false\:true\:false\:true\:false +NVIC.SysTick_IRQn=true\:15\:0\:true\:false\:true\:false\:true\:false 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 @@ -170,6 +170,7 @@ NVIC.TIM8_UP_TIM13_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true NVIC.TimeBase=TIM8_TRG_COM_TIM14_IRQn NVIC.TimeBaseIP=TIM14 NVIC.USART3_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true +NVIC.USART6_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true NVIC.UsageFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false PA10.GPIOParameters=GPIO_Label PA10.GPIO_Label=PWM3 @@ -408,7 +409,7 @@ ProjectManager.ToolChainLocation= ProjectManager.UAScriptAfterPath= ProjectManager.UAScriptBeforePath= ProjectManager.UnderRoot=false -ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_DMA_Init-DMA-false-HAL-true,4-MX_ADC3_Init-ADC3-false-HAL-true,5-MX_USART3_UART_Init-USART3-false-HAL-true,6-MX_CAN1_Init-CAN1-false-HAL-true,7-MX_IWDG_Init-IWDG-false-HAL-true,8-MX_RTC_Init-RTC-true-HAL-true,9-MX_TIM1_Init-TIM1-false-HAL-true,10-MX_TIM3_Init-TIM3-false-HAL-true,11-MX_USART6_UART_Init-USART6-false-HAL-true,12-MX_SPI3_Init-SPI3-false-HAL-true,13-MX_TIM11_Init-TIM11-false-HAL-true,14-MX_TIM12_Init-TIM12-false-HAL-true,15-MX_TIM8_Init-TIM8-false-HAL-true,16-MX_TIM5_Init-TIM5-false-HAL-true,17-MX_TIM2_Init-TIM2-false-HAL-true +ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_DMA_Init-DMA-false-HAL-true,4-MX_ADC3_Init-ADC3-false-HAL-true,5-MX_USART3_UART_Init-USART3-false-HAL-true,6-MX_CAN1_Init-CAN1-false-HAL-true,7-MX_IWDG_Init-IWDG-false-HAL-true,8-MX_RTC_Init-RTC-true-HAL-true,9-MX_TIM1_Init-TIM1-false-HAL-true,10-MX_TIM3_Init-TIM3-false-HAL-true,11-MX_USART6_UART_Init-USART6-false-HAL-true,12-MX_SPI3_Init-SPI3-false-HAL-true,13-MX_TIM11_Init-TIM11-false-HAL-true,14-MX_TIM12_Init-TIM12-false-HAL-true,15-MX_TIM8_Init-TIM8-false-HAL-true,16-MX_TIM5_Init-TIM5-false-HAL-true,17-MX_TIM2_Init-TIM2-false-HAL-true,18-MX_TIM6_Init-TIM6-false-HAL-true RCC.48MHZClocksFreq_Value=90000000 RCC.AHBFreq_Value=180000000 RCC.APB1CLKDivider=RCC_HCLK_DIV4 @@ -425,13 +426,14 @@ RCC.HCLKFreq_Value=180000000 RCC.HSE_VALUE=16000000 RCC.HSI_VALUE=16000000 RCC.I2SClocksFreq_Value=192000000 -RCC.IPParameters=48MHZClocksFreq_Value,AHBFreq_Value,APB1CLKDivider,APB1Freq_Value,APB1TimFreq_Value,APB2CLKDivider,APB2Freq_Value,APB2TimFreq_Value,CortexFreq_Value,EthernetFreq_Value,FCLKCortexFreq_Value,FamilyName,HCLKFreq_Value,HSE_VALUE,HSI_VALUE,I2SClocksFreq_Value,LSI_VALUE,MCO2PinFreq_Value,PLLCLKFreq_Value,PLLM,PLLN,PLLQCLKFreq_Value,RCC_RTC_Clock_Source,RCC_RTC_Clock_SourceVirtual,RTCFreq_Value,RTCHSEDivFreq_Value,SAI_AClocksFreq_Value,SAI_BClocksFreq_Value,SYSCLKFreq_VALUE,SYSCLKSource,VCOI2SOutputFreq_Value,VCOInputFreq_Value,VCOOutputFreq_Value,VCOSAIOutputFreq_Value,VCOSAIOutputFreq_ValueQ,VcooutputI2S,VcooutputI2SQ +RCC.IPParameters=48MHZClocksFreq_Value,AHBFreq_Value,APB1CLKDivider,APB1Freq_Value,APB1TimFreq_Value,APB2CLKDivider,APB2Freq_Value,APB2TimFreq_Value,CortexFreq_Value,EthernetFreq_Value,FCLKCortexFreq_Value,FamilyName,HCLKFreq_Value,HSE_VALUE,HSI_VALUE,I2SClocksFreq_Value,LSI_VALUE,MCO2PinFreq_Value,PLLCLKFreq_Value,PLLM,PLLN,PLLQCLKFreq_Value,PLLSourceVirtual,RCC_RTC_Clock_Source,RCC_RTC_Clock_SourceVirtual,RTCFreq_Value,RTCHSEDivFreq_Value,SAI_AClocksFreq_Value,SAI_BClocksFreq_Value,SYSCLKFreq_VALUE,SYSCLKSource,VCOI2SOutputFreq_Value,VCOInputFreq_Value,VCOOutputFreq_Value,VCOSAIOutputFreq_Value,VCOSAIOutputFreq_ValueQ,VcooutputI2S,VcooutputI2SQ RCC.LSI_VALUE=32000 RCC.MCO2PinFreq_Value=180000000 RCC.PLLCLKFreq_Value=180000000 RCC.PLLM=8 RCC.PLLN=180 RCC.PLLQCLKFreq_Value=90000000 +RCC.PLLSourceVirtual=RCC_PLLSOURCE_HSE RCC.RCC_RTC_Clock_Source=RCC_RTCCLKSOURCE_LSE RCC.RCC_RTC_Clock_SourceVirtual=RCC_RTCCLKSOURCE_LSE RCC.RTCFreq_Value=32768 diff --git a/Информация для программиста (УПП СП СЭД)/Описание работы с платой управления УПП.docx b/Информация для программиста (УПП СП СЭД)/Описание работы с платой управления УПП.docx index e8a97e2..5dd9ec2 100644 Binary files a/Информация для программиста (УПП СП СЭД)/Описание работы с платой управления УПП.docx and b/Информация для программиста (УПП СП СЭД)/Описание работы с платой управления УПП.docx differ