+проверка на реал мк (шим как с компаратора на tim1)
вторая посылка ляшенко добавлен файл с схемами draw.io
This commit is contained in:
		
							parent
							
								
									334c1f74ba
								
							
						
					
					
						commit
						21f11324c4
					
				
							
								
								
									
										792
									
								
								diplom.drawio
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										792
									
								
								diplom.drawio
									
									
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							| @ -55,6 +55,9 @@ void SVC_Handler(void); | ||||
| void DebugMon_Handler(void); | ||||
| void PendSV_Handler(void); | ||||
| void SysTick_Handler(void); | ||||
| void EXTI0_IRQHandler(void); | ||||
| void EXTI1_IRQHandler(void); | ||||
| void EXTI2_IRQHandler(void); | ||||
| /* USER CODE BEGIN EFP */ | ||||
| 
 | ||||
| /* USER CODE END EFP */ | ||||
|  | ||||
| @ -32,14 +32,19 @@ extern "C" { | ||||
| 
 | ||||
| /* USER CODE END Includes */ | ||||
| 
 | ||||
| extern TIM_HandleTypeDef htim1; | ||||
| 
 | ||||
| extern TIM_HandleTypeDef htim2; | ||||
| 
 | ||||
| /* USER CODE BEGIN Private defines */ | ||||
| 
 | ||||
| /* USER CODE END Private defines */ | ||||
| 
 | ||||
| void MX_TIM1_Init(void); | ||||
| void MX_TIM2_Init(void); | ||||
| 
 | ||||
| void HAL_TIM_MspPostInit(TIM_HandleTypeDef *htim); | ||||
| 
 | ||||
| /* USER CODE BEGIN Prototypes */ | ||||
| 
 | ||||
| /* USER CODE END Prototypes */ | ||||
|  | ||||
| @ -42,10 +42,59 @@ | ||||
| void MX_GPIO_Init(void) | ||||
| { | ||||
| 
 | ||||
|   GPIO_InitTypeDef GPIO_InitStruct = {0}; | ||||
| 
 | ||||
|   /* GPIO Ports Clock Enable */ | ||||
|   __HAL_RCC_GPIOC_CLK_ENABLE(); | ||||
|   __HAL_RCC_GPIOD_CLK_ENABLE(); | ||||
|   __HAL_RCC_GPIOA_CLK_ENABLE(); | ||||
|   __HAL_RCC_GPIOB_CLK_ENABLE(); | ||||
| 
 | ||||
|   /*Configure GPIO pin Output Level */ | ||||
|   HAL_GPIO_WritePin(GPIOC, GPIO_PIN_13, GPIO_PIN_RESET); | ||||
| 
 | ||||
|   /*Configure GPIO pin Output Level */ | ||||
|   HAL_GPIO_WritePin(GPIOA, GPIO_PIN_5|GPIO_PIN_6|GPIO_PIN_7, GPIO_PIN_RESET); | ||||
| 
 | ||||
|   /*Configure GPIO pin Output Level */ | ||||
|   HAL_GPIO_WritePin(GPIOB, GPIO_PIN_12|GPIO_PIN_13|GPIO_PIN_14, GPIO_PIN_RESET); | ||||
| 
 | ||||
|   /*Configure GPIO pin : PC13 */ | ||||
|   GPIO_InitStruct.Pin = GPIO_PIN_13; | ||||
|   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; | ||||
|   GPIO_InitStruct.Pull = GPIO_NOPULL; | ||||
|   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; | ||||
|   HAL_GPIO_Init(GPIOC, &GPIO_InitStruct); | ||||
| 
 | ||||
|   /*Configure GPIO pins : PA5 PA6 PA7 */ | ||||
|   GPIO_InitStruct.Pin = GPIO_PIN_5|GPIO_PIN_6|GPIO_PIN_7; | ||||
|   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; | ||||
|   GPIO_InitStruct.Pull = GPIO_NOPULL; | ||||
|   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; | ||||
|   HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); | ||||
| 
 | ||||
|   /*Configure GPIO pins : PB0 PB1 PB2 */ | ||||
|   GPIO_InitStruct.Pin = GPIO_PIN_0|GPIO_PIN_1|GPIO_PIN_2; | ||||
|   GPIO_InitStruct.Mode = GPIO_MODE_IT_RISING_FALLING; | ||||
|   GPIO_InitStruct.Pull = GPIO_NOPULL; | ||||
|   HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); | ||||
| 
 | ||||
|   /*Configure GPIO pins : PB12 PB13 PB14 */ | ||||
|   GPIO_InitStruct.Pin = GPIO_PIN_12|GPIO_PIN_13|GPIO_PIN_14; | ||||
|   GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP; | ||||
|   GPIO_InitStruct.Pull = GPIO_NOPULL; | ||||
|   GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; | ||||
|   HAL_GPIO_Init(GPIOB, &GPIO_InitStruct); | ||||
| 
 | ||||
|   /* EXTI interrupt init*/ | ||||
|   HAL_NVIC_SetPriority(EXTI0_IRQn, 0, 0); | ||||
|   HAL_NVIC_EnableIRQ(EXTI0_IRQn); | ||||
| 
 | ||||
|   HAL_NVIC_SetPriority(EXTI1_IRQn, 0, 0); | ||||
|   HAL_NVIC_EnableIRQ(EXTI1_IRQn); | ||||
| 
 | ||||
|   HAL_NVIC_SetPriority(EXTI2_IRQn, 0, 0); | ||||
|   HAL_NVIC_EnableIRQ(EXTI2_IRQn); | ||||
| 
 | ||||
| } | ||||
| 
 | ||||
|  | ||||
| @ -92,8 +92,12 @@ int main(void) | ||||
|   MX_ADC1_Init(); | ||||
|   MX_TIM2_Init(); | ||||
|   MX_USART1_UART_Init(); | ||||
|   MX_TIM1_Init(); | ||||
|   /* USER CODE BEGIN 2 */ | ||||
| 	upp_init(); | ||||
| 	HAL_TIM_PWM_Start(&htim1, TIM_CHANNEL_1); | ||||
| 	Upp.Duration = 8; | ||||
| 	Upp.sine_freq = 50; | ||||
|   /* USER CODE END 2 */ | ||||
| 
 | ||||
|   /* Infinite loop */ | ||||
|  | ||||
| @ -22,6 +22,7 @@ | ||||
| #include "stm32f1xx_it.h" | ||||
| /* Private includes ----------------------------------------------------------*/ | ||||
| /* USER CODE BEGIN Includes */ | ||||
| #include "upp.h" | ||||
| /* USER CODE END Includes */ | ||||
| 
 | ||||
| /* Private typedef -----------------------------------------------------------*/ | ||||
| @ -198,6 +199,48 @@ void SysTick_Handler(void) | ||||
| /* please refer to the startup file (startup_stm32f1xx.s).                    */ | ||||
| /******************************************************************************/ | ||||
| 
 | ||||
| /**
 | ||||
|   * @brief This function handles EXTI line0 interrupt. | ||||
|   */ | ||||
| void EXTI0_IRQHandler(void) | ||||
| { | ||||
|   /* USER CODE BEGIN EXTI0_IRQn 0 */ | ||||
| 
 | ||||
|   /* USER CODE END EXTI0_IRQn 0 */ | ||||
|   HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_0); | ||||
|   /* USER CODE BEGIN EXTI0_IRQn 1 */ | ||||
| 	zero_cross_update_EXTI(&phase_A.zc_detector); | ||||
|   /* USER CODE END EXTI0_IRQn 1 */ | ||||
| } | ||||
| 
 | ||||
| /**
 | ||||
|   * @brief This function handles EXTI line1 interrupt. | ||||
|   */ | ||||
| void EXTI1_IRQHandler(void) | ||||
| { | ||||
|   /* USER CODE BEGIN EXTI1_IRQn 0 */ | ||||
| 
 | ||||
|   /* USER CODE END EXTI1_IRQn 0 */ | ||||
|   HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_1); | ||||
|   /* USER CODE BEGIN EXTI1_IRQn 1 */ | ||||
| 	zero_cross_update_EXTI(&phase_B.zc_detector); | ||||
|   /* USER CODE END EXTI1_IRQn 1 */ | ||||
| } | ||||
| 
 | ||||
| /**
 | ||||
|   * @brief This function handles EXTI line2 interrupt. | ||||
|   */ | ||||
| void EXTI2_IRQHandler(void) | ||||
| { | ||||
|   /* USER CODE BEGIN EXTI2_IRQn 0 */ | ||||
| 
 | ||||
|   /* USER CODE END EXTI2_IRQn 0 */ | ||||
|   HAL_GPIO_EXTI_IRQHandler(GPIO_PIN_2); | ||||
|   /* USER CODE BEGIN EXTI2_IRQn 1 */ | ||||
| 	zero_cross_update_EXTI(&phase_C.zc_detector); | ||||
|   /* USER CODE END EXTI2_IRQn 1 */ | ||||
| } | ||||
| 
 | ||||
| /* USER CODE BEGIN 1 */ | ||||
| 
 | ||||
| /* USER CODE END 1 */ | ||||
|  | ||||
| @ -24,8 +24,79 @@ | ||||
| 
 | ||||
| /* USER CODE END 0 */ | ||||
| 
 | ||||
| TIM_HandleTypeDef htim1; | ||||
| TIM_HandleTypeDef htim2; | ||||
| 
 | ||||
| /* TIM1 init function */ | ||||
| void MX_TIM1_Init(void) | ||||
| { | ||||
| 
 | ||||
|   /* USER CODE BEGIN TIM1_Init 0 */ | ||||
| 
 | ||||
|   /* USER CODE END TIM1_Init 0 */ | ||||
| 
 | ||||
|   TIM_ClockConfigTypeDef sClockSourceConfig = {0}; | ||||
|   TIM_MasterConfigTypeDef sMasterConfig = {0}; | ||||
|   TIM_OC_InitTypeDef sConfigOC = {0}; | ||||
|   TIM_BreakDeadTimeConfigTypeDef sBreakDeadTimeConfig = {0}; | ||||
| 
 | ||||
|   /* USER CODE BEGIN TIM1_Init 1 */ | ||||
| 
 | ||||
|   /* USER CODE END TIM1_Init 1 */ | ||||
|   htim1.Instance = TIM1; | ||||
|   htim1.Init.Prescaler = 72-1; | ||||
|   htim1.Init.CounterMode = TIM_COUNTERMODE_UP; | ||||
|   htim1.Init.Period = 20000; | ||||
|   htim1.Init.ClockDivision = TIM_CLOCKDIVISION_DIV1; | ||||
|   htim1.Init.RepetitionCounter = 0; | ||||
|   htim1.Init.AutoReloadPreload = TIM_AUTORELOAD_PRELOAD_DISABLE; | ||||
|   if (HAL_TIM_Base_Init(&htim1) != HAL_OK) | ||||
|   { | ||||
|     Error_Handler(); | ||||
|   } | ||||
|   sClockSourceConfig.ClockSource = TIM_CLOCKSOURCE_INTERNAL; | ||||
|   if (HAL_TIM_ConfigClockSource(&htim1, &sClockSourceConfig) != HAL_OK) | ||||
|   { | ||||
|     Error_Handler(); | ||||
|   } | ||||
|   if (HAL_TIM_PWM_Init(&htim1) != HAL_OK) | ||||
|   { | ||||
|     Error_Handler(); | ||||
|   } | ||||
|   sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET; | ||||
|   sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE; | ||||
|   if (HAL_TIMEx_MasterConfigSynchronization(&htim1, &sMasterConfig) != HAL_OK) | ||||
|   { | ||||
|     Error_Handler(); | ||||
|   } | ||||
|   sConfigOC.OCMode = TIM_OCMODE_PWM1; | ||||
|   sConfigOC.Pulse = 10000; | ||||
|   sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH; | ||||
|   sConfigOC.OCNPolarity = TIM_OCNPOLARITY_HIGH; | ||||
|   sConfigOC.OCFastMode = TIM_OCFAST_DISABLE; | ||||
|   sConfigOC.OCIdleState = TIM_OCIDLESTATE_RESET; | ||||
|   sConfigOC.OCNIdleState = TIM_OCNIDLESTATE_RESET; | ||||
|   if (HAL_TIM_PWM_ConfigChannel(&htim1, &sConfigOC, TIM_CHANNEL_1) != HAL_OK) | ||||
|   { | ||||
|     Error_Handler(); | ||||
|   } | ||||
|   sBreakDeadTimeConfig.OffStateRunMode = TIM_OSSR_DISABLE; | ||||
|   sBreakDeadTimeConfig.OffStateIDLEMode = TIM_OSSI_DISABLE; | ||||
|   sBreakDeadTimeConfig.LockLevel = TIM_LOCKLEVEL_OFF; | ||||
|   sBreakDeadTimeConfig.DeadTime = 0; | ||||
|   sBreakDeadTimeConfig.BreakState = TIM_BREAK_DISABLE; | ||||
|   sBreakDeadTimeConfig.BreakPolarity = TIM_BREAKPOLARITY_HIGH; | ||||
|   sBreakDeadTimeConfig.AutomaticOutput = TIM_AUTOMATICOUTPUT_DISABLE; | ||||
|   if (HAL_TIMEx_ConfigBreakDeadTime(&htim1, &sBreakDeadTimeConfig) != HAL_OK) | ||||
|   { | ||||
|     Error_Handler(); | ||||
|   } | ||||
|   /* USER CODE BEGIN TIM1_Init 2 */ | ||||
| 
 | ||||
|   /* USER CODE END TIM1_Init 2 */ | ||||
|   HAL_TIM_MspPostInit(&htim1); | ||||
| 
 | ||||
| } | ||||
| /* TIM2 init function */ | ||||
| void MX_TIM2_Init(void) | ||||
| { | ||||
| @ -70,7 +141,18 @@ void MX_TIM2_Init(void) | ||||
| void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* tim_baseHandle) | ||||
| { | ||||
| 
 | ||||
|   if(tim_baseHandle->Instance==TIM2) | ||||
|   if(tim_baseHandle->Instance==TIM1) | ||||
|   { | ||||
|   /* USER CODE BEGIN TIM1_MspInit 0 */ | ||||
| 
 | ||||
|   /* USER CODE END TIM1_MspInit 0 */ | ||||
|     /* TIM1 clock enable */ | ||||
|     __HAL_RCC_TIM1_CLK_ENABLE(); | ||||
|   /* USER CODE BEGIN TIM1_MspInit 1 */ | ||||
| 
 | ||||
|   /* USER CODE END TIM1_MspInit 1 */ | ||||
|   } | ||||
|   else if(tim_baseHandle->Instance==TIM2) | ||||
|   { | ||||
|   /* USER CODE BEGIN TIM2_MspInit 0 */ | ||||
| 
 | ||||
| @ -82,11 +164,47 @@ void HAL_TIM_Base_MspInit(TIM_HandleTypeDef* tim_baseHandle) | ||||
|   /* USER CODE END TIM2_MspInit 1 */ | ||||
|   } | ||||
| } | ||||
| void HAL_TIM_MspPostInit(TIM_HandleTypeDef* timHandle) | ||||
| { | ||||
| 
 | ||||
|   GPIO_InitTypeDef GPIO_InitStruct = {0}; | ||||
|   if(timHandle->Instance==TIM1) | ||||
|   { | ||||
|   /* USER CODE BEGIN TIM1_MspPostInit 0 */ | ||||
| 
 | ||||
|   /* USER CODE END TIM1_MspPostInit 0 */ | ||||
| 
 | ||||
|     __HAL_RCC_GPIOA_CLK_ENABLE(); | ||||
|     /**TIM1 GPIO Configuration
 | ||||
|     PA8     ------> TIM1_CH1 | ||||
|     */ | ||||
|     GPIO_InitStruct.Pin = GPIO_PIN_8; | ||||
|     GPIO_InitStruct.Mode = GPIO_MODE_AF_PP; | ||||
|     GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW; | ||||
|     HAL_GPIO_Init(GPIOA, &GPIO_InitStruct); | ||||
| 
 | ||||
|   /* USER CODE BEGIN TIM1_MspPostInit 1 */ | ||||
| 
 | ||||
|   /* USER CODE END TIM1_MspPostInit 1 */ | ||||
|   } | ||||
| 
 | ||||
| } | ||||
| 
 | ||||
| void HAL_TIM_Base_MspDeInit(TIM_HandleTypeDef* tim_baseHandle) | ||||
| { | ||||
| 
 | ||||
|   if(tim_baseHandle->Instance==TIM2) | ||||
|   if(tim_baseHandle->Instance==TIM1) | ||||
|   { | ||||
|   /* USER CODE BEGIN TIM1_MspDeInit 0 */ | ||||
| 
 | ||||
|   /* USER CODE END TIM1_MspDeInit 0 */ | ||||
|     /* Peripheral clock disable */ | ||||
|     __HAL_RCC_TIM1_CLK_DISABLE(); | ||||
|   /* USER CODE BEGIN TIM1_MspDeInit 1 */ | ||||
| 
 | ||||
|   /* USER CODE END TIM1_MspDeInit 1 */ | ||||
|   } | ||||
|   else if(tim_baseHandle->Instance==TIM2) | ||||
|   { | ||||
|   /* USER CODE BEGIN TIM2_MspDeInit 0 */ | ||||
| 
 | ||||
|  | ||||
| @ -136,6 +136,7 @@ void tiristor_angle_reset(TiristorControl_t *ctrl) | ||||
|  */ | ||||
| void tiristor_init(TiristorControl_t *ctrl, GPIO_TypeDef *gpiox, uint32_t gpio_pin) | ||||
| { | ||||
|     ctrl->open_time = 1;          // Сохраняем порт GPIO
 | ||||
|     ctrl->gpiox = gpiox;          // Сохраняем порт GPIO
 | ||||
|     ctrl->gpio_pin = gpio_pin;    // Сохраняем номер пина GPIO
 | ||||
|     tiristor_angle_reset(ctrl);   // Сбрасываем угол открытия тиристора на начальное значение
 | ||||
|  | ||||
							
								
								
									
										9
									
								
								mcu_project/upp/MDK-ARM/EventRecorderStub.scvd
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								mcu_project/upp/MDK-ARM/EventRecorderStub.scvd
									
									
									
									
									
										Normal file
									
								
							| @ -0,0 +1,9 @@ | ||||
| <?xml version="1.0" encoding="utf-8"?> | ||||
| 
 | ||||
| <component_viewer schemaVersion="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="Component_Viewer.xsd"> | ||||
| 
 | ||||
| <component name="EventRecorderStub" version="1.0.0"/>       <!--name and version of the component--> | ||||
|   <events> | ||||
|   </events> | ||||
| 
 | ||||
| </component_viewer> | ||||
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							| @ -117,6 +117,26 @@ | ||||
|         <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon> | ||||
|       </DebugOpt> | ||||
|       <TargetDriverDllRegistry> | ||||
|         <SetRegEntry> | ||||
|           <Number>0</Number> | ||||
|           <Key>ARMRTXEVENTFLAGS</Key> | ||||
|           <Name>-L70 -Z18 -C0 -M0 -T1</Name> | ||||
|         </SetRegEntry> | ||||
|         <SetRegEntry> | ||||
|           <Number>0</Number> | ||||
|           <Key>DLGTARM</Key> | ||||
|           <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)</Name> | ||||
|         </SetRegEntry> | ||||
|         <SetRegEntry> | ||||
|           <Number>0</Number> | ||||
|           <Key>ARMDBGFLAGS</Key> | ||||
|           <Name></Name> | ||||
|         </SetRegEntry> | ||||
|         <SetRegEntry> | ||||
|           <Number>0</Number> | ||||
|           <Key>DLGUARM</Key> | ||||
|           <Name>(105=-1,-1,-1,-1,0)</Name> | ||||
|         </SetRegEntry> | ||||
|         <SetRegEntry> | ||||
|           <Number>0</Number> | ||||
|           <Key>UL2CM3</Key> | ||||
| @ -125,27 +145,22 @@ | ||||
|         <SetRegEntry> | ||||
|           <Number>0</Number> | ||||
|           <Key>ST-LINKIII-KEIL_SWO</Key> | ||||
|           <Name>-U-O142 -O2254 -S0 -C0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F10x_128 -FS08000000 -FL08000 -FP0($$Device:STM32F103C6$Flash\STM32F10x_128.FLM)</Name> | ||||
|           <Name>-U-O142 -O2254 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(1BA01477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL08000 -FP0($$Device:STM32F103C6$Flash\STM32F10x_128.FLM) -WA0 -WE0 -WVCE4 -WS2710 -WM0 -WP2</Name> | ||||
|         </SetRegEntry> | ||||
|       </TargetDriverDllRegistry> | ||||
|       <Breakpoint> | ||||
|         <Bp> | ||||
|           <Number>0</Number> | ||||
|           <Type>0</Type> | ||||
|           <LineNumber>62</LineNumber> | ||||
|           <EnabledFlag>1</EnabledFlag> | ||||
|           <Address>0</Address> | ||||
|           <ByteObject>0</ByteObject> | ||||
|           <HtxType>0</HtxType> | ||||
|           <ManyObjects>0</ManyObjects> | ||||
|           <SizeOfObject>0</SizeOfObject> | ||||
|           <BreakByAccess>0</BreakByAccess> | ||||
|           <BreakIfRCount>0</BreakIfRCount> | ||||
|           <Filename>..\Core\upp\tiristor.c</Filename> | ||||
|           <ExecCommand></ExecCommand> | ||||
|           <Expression></Expression> | ||||
|         </Bp> | ||||
|       </Breakpoint> | ||||
|       <Breakpoint/> | ||||
|       <WatchWindow1> | ||||
|         <Ww> | ||||
|           <count>0</count> | ||||
|           <WinNumber>1</WinNumber> | ||||
|           <ItemText>Upp</ItemText> | ||||
|         </Ww> | ||||
|         <Ww> | ||||
|           <count>1</count> | ||||
|           <WinNumber>1</WinNumber> | ||||
|           <ItemText>phase_A</ItemText> | ||||
|         </Ww> | ||||
|       </WatchWindow1> | ||||
|       <Tracepoint> | ||||
|         <THDelay>0</THDelay> | ||||
|       </Tracepoint> | ||||
| @ -188,9 +203,15 @@ | ||||
|       <pszMrulep></pszMrulep> | ||||
|       <pSingCmdsp></pSingCmdsp> | ||||
|       <pMultCmdsp></pMultCmdsp> | ||||
|       <SystemViewers> | ||||
|         <Entry> | ||||
|           <Name>System Viewer\TIM1</Name> | ||||
|           <WinId>35905</WinId> | ||||
|         </Entry> | ||||
|       </SystemViewers> | ||||
|       <DebugDescription> | ||||
|         <Enable>1</Enable> | ||||
|         <EnableFlashSeq>1</EnableFlashSeq> | ||||
|         <EnableFlashSeq>0</EnableFlashSeq> | ||||
|         <EnableLog>0</EnableLog> | ||||
|         <Protocol>2</Protocol> | ||||
|         <DbgClock>10000000</DbgClock> | ||||
|  | ||||
| @ -82,7 +82,7 @@ | ||||
|           </BeforeMake> | ||||
|           <AfterMake> | ||||
|             <RunUserProg1>0</RunUserProg1> | ||||
|             <RunUserProg2>0</RunUserProg2> | ||||
|             <RunUserProg2>1</RunUserProg2> | ||||
|             <UserProg1Name></UserProg1Name> | ||||
|             <UserProg2Name></UserProg2Name> | ||||
|             <UserProg1Dos16Mode>0</UserProg1Dos16Mode> | ||||
| @ -315,7 +315,7 @@ | ||||
|           </ArmAdsMisc> | ||||
|           <Cads> | ||||
|             <interw>1</interw> | ||||
|             <Optim>4</Optim> | ||||
|             <Optim>1</Optim> | ||||
|             <oTime>0</oTime> | ||||
|             <SplitLS>0</SplitLS> | ||||
|             <OneElfS>1</OneElfS> | ||||
| @ -341,7 +341,7 @@ | ||||
|               <MiscControls></MiscControls> | ||||
|               <Define>USE_HAL_DRIVER,STM32F103x6</Define> | ||||
|               <Undefine></Undefine> | ||||
|               <IncludePath>../Core/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;../Drivers/CMSIS/Include;..\Core\upp</IncludePath> | ||||
|               <IncludePath>../Core/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc;../Drivers/STM32F1xx_HAL_Driver/Inc/Legacy;../Drivers/CMSIS/Device/ST/STM32F1xx/Include;../Drivers/CMSIS/Include;../Core/upp</IncludePath> | ||||
|             </VariousControls> | ||||
|           </Cads> | ||||
|           <Aads> | ||||
|  | ||||
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							| @ -30,4 +30,7 @@ upp/stm32f1xx_it.o: ..\Core\Src\stm32f1xx_it.c ..\Core\Inc\main.h \ | ||||
|   ..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim.h \ | ||||
|   ..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_tim_ex.h \ | ||||
|   ..\Drivers\STM32F1xx_HAL_Driver\Inc\stm32f1xx_hal_uart.h \ | ||||
|   ..\Core\Inc\stm32f1xx_it.h | ||||
|   ..\Core\Inc\stm32f1xx_it.h ..\Core\upp\upp.h ..\Core\Inc\adc.h \ | ||||
|   ..\Core\Inc\tim.h ..\Core\Inc\usart.h ..\Core\Inc\gpio.h \ | ||||
|   ..\Core\upp\zero_cross.h ..\Core\upp\adc_filter.h \ | ||||
|   ..\Core\upp\tiristor.h | ||||
|  | ||||
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											Binary file not shown.
										
									
								
							| @ -9,7 +9,7 @@ CAD.formats= | ||||
| CAD.pinconfig= | ||||
| CAD.provider= | ||||
| File.Version=6 | ||||
| GPIO.groupedBy= | ||||
| GPIO.groupedBy=Group By Peripherals | ||||
| KeepUserPlacement=false | ||||
| Mcu.CPN=STM32F103C6T6A | ||||
| Mcu.Family=STM32F1 | ||||
| @ -17,23 +17,36 @@ Mcu.IP0=ADC1 | ||||
| Mcu.IP1=NVIC | ||||
| Mcu.IP2=RCC | ||||
| Mcu.IP3=SYS | ||||
| Mcu.IP4=TIM2 | ||||
| Mcu.IP5=USART1 | ||||
| Mcu.IPNb=6 | ||||
| Mcu.IP4=TIM1 | ||||
| Mcu.IP5=TIM2 | ||||
| Mcu.IP6=USART1 | ||||
| Mcu.IPNb=7 | ||||
| Mcu.Name=STM32F103C(4-6)Tx | ||||
| Mcu.Package=LQFP48 | ||||
| Mcu.Pin0=PC14-OSC32_IN | ||||
| Mcu.Pin1=PC15-OSC32_OUT | ||||
| Mcu.Pin10=VP_TIM2_VS_ClockSourceINT | ||||
| Mcu.Pin2=PD0-OSC_IN | ||||
| Mcu.Pin3=PD1-OSC_OUT | ||||
| Mcu.Pin4=PA0-WKUP | ||||
| Mcu.Pin5=PA9 | ||||
| Mcu.Pin6=PA10 | ||||
| Mcu.Pin7=PA13 | ||||
| Mcu.Pin8=PA14 | ||||
| Mcu.Pin9=VP_SYS_VS_Systick | ||||
| Mcu.PinsNb=11 | ||||
| Mcu.Pin0=PC13-TAMPER-RTC | ||||
| Mcu.Pin1=PC14-OSC32_IN | ||||
| Mcu.Pin10=PB1 | ||||
| Mcu.Pin11=PB2 | ||||
| Mcu.Pin12=PB12 | ||||
| Mcu.Pin13=PB13 | ||||
| Mcu.Pin14=PB14 | ||||
| Mcu.Pin15=PA8 | ||||
| Mcu.Pin16=PA9 | ||||
| Mcu.Pin17=PA10 | ||||
| Mcu.Pin18=PA13 | ||||
| Mcu.Pin19=PA14 | ||||
| Mcu.Pin2=PC15-OSC32_OUT | ||||
| Mcu.Pin20=VP_SYS_VS_Systick | ||||
| Mcu.Pin21=VP_TIM1_VS_ClockSourceINT | ||||
| Mcu.Pin22=VP_TIM2_VS_ClockSourceINT | ||||
| Mcu.Pin3=PD0-OSC_IN | ||||
| Mcu.Pin4=PD1-OSC_OUT | ||||
| Mcu.Pin5=PA0-WKUP | ||||
| Mcu.Pin6=PA5 | ||||
| Mcu.Pin7=PA6 | ||||
| Mcu.Pin8=PA7 | ||||
| Mcu.Pin9=PB0 | ||||
| Mcu.PinsNb=23 | ||||
| Mcu.ThirdPartyNb=0 | ||||
| Mcu.UserConstants= | ||||
| Mcu.UserName=STM32F103C6Tx | ||||
| @ -41,6 +54,9 @@ MxCube.Version=6.12.1 | ||||
| MxDb.Version=DB.6.0.121 | ||||
| NVIC.BusFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false | ||||
| NVIC.DebugMonitor_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false | ||||
| NVIC.EXTI0_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true | ||||
| NVIC.EXTI1_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true | ||||
| NVIC.EXTI2_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true | ||||
| NVIC.ForceEnableDMAVector=true | ||||
| NVIC.HardFault_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false | ||||
| NVIC.MemoryManagement_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false | ||||
| @ -57,8 +73,35 @@ PA13.Mode=Serial_Wire | ||||
| PA13.Signal=SYS_JTMS-SWDIO | ||||
| PA14.Mode=Serial_Wire | ||||
| PA14.Signal=SYS_JTCK-SWCLK | ||||
| PA5.Locked=true | ||||
| PA5.Signal=GPIO_Output | ||||
| PA6.Locked=true | ||||
| PA6.Signal=GPIO_Output | ||||
| PA7.Locked=true | ||||
| PA7.Signal=GPIO_Output | ||||
| PA8.Signal=S_TIM1_CH1 | ||||
| PA9.Mode=Asynchronous | ||||
| PA9.Signal=USART1_TX | ||||
| PB0.GPIOParameters=GPIO_ModeDefaultEXTI | ||||
| PB0.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_RISING_FALLING | ||||
| PB0.Locked=true | ||||
| PB0.Signal=GPXTI0 | ||||
| PB1.GPIOParameters=GPIO_ModeDefaultEXTI | ||||
| PB1.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_RISING_FALLING | ||||
| PB1.Locked=true | ||||
| PB1.Signal=GPXTI1 | ||||
| PB12.Locked=true | ||||
| PB12.Signal=GPIO_Output | ||||
| PB13.Locked=true | ||||
| PB13.Signal=GPIO_Output | ||||
| PB14.Locked=true | ||||
| PB14.Signal=GPIO_Output | ||||
| PB2.GPIOParameters=GPIO_ModeDefaultEXTI | ||||
| PB2.GPIO_ModeDefaultEXTI=GPIO_MODE_IT_RISING_FALLING | ||||
| PB2.Locked=true | ||||
| PB2.Signal=GPXTI2 | ||||
| PC13-TAMPER-RTC.Locked=true | ||||
| PC13-TAMPER-RTC.Signal=GPIO_Output | ||||
| PC14-OSC32_IN.Mode=LSE-External-Oscillator | ||||
| PC14-OSC32_IN.Signal=RCC_OSC32_IN | ||||
| PC15-OSC32_OUT.Mode=LSE-External-Oscillator | ||||
| @ -98,7 +141,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_ADC1_Init-ADC1-false-HAL-true,4-MX_TIM2_Init-TIM2-false-HAL-true,5-MX_USART1_UART_Init-USART1-false-HAL-true | ||||
| ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_ADC1_Init-ADC1-false-HAL-true,4-MX_TIM2_Init-TIM2-false-HAL-true,5-MX_USART1_UART_Init-USART1-false-HAL-true,6-MX_TIM1_Init-TIM1-false-HAL-true | ||||
| RCC.ADCFreqValue=12000000 | ||||
| RCC.ADCPresc=RCC_ADCPCLK2_DIV6 | ||||
| RCC.AHBFreq_Value=72000000 | ||||
| @ -123,10 +166,27 @@ RCC.USBFreq_Value=72000000 | ||||
| RCC.VCOOutput2Freq_Value=8000000 | ||||
| SH.ADCx_IN0.0=ADC1_IN0,IN0 | ||||
| SH.ADCx_IN0.ConfNb=1 | ||||
| SH.GPXTI0.0=GPIO_EXTI0 | ||||
| SH.GPXTI0.ConfNb=1 | ||||
| SH.GPXTI1.0=GPIO_EXTI1 | ||||
| SH.GPXTI1.ConfNb=1 | ||||
| SH.GPXTI2.0=GPIO_EXTI2 | ||||
| SH.GPXTI2.ConfNb=1 | ||||
| SH.S_TIM1_CH1.0=TIM1_CH1,PWM Generation1 CH1 | ||||
| SH.S_TIM1_CH1.ConfNb=1 | ||||
| TIM1.Channel-PWM\ Generation1\ CH1=TIM_CHANNEL_1 | ||||
| TIM1.IPParameters=Channel-PWM Generation1 CH1,Prescaler,Period,Pulse-PWM Generation1 CH1 | ||||
| TIM1.Period=20000 | ||||
| TIM1.Prescaler=72-1 | ||||
| TIM1.Pulse-PWM\ Generation1\ CH1=10000 | ||||
| TIM2.IPParameters=Prescaler | ||||
| TIM2.Prescaler=72-1 | ||||
| USART1.IPParameters=VirtualMode | ||||
| USART1.VirtualMode=VM_ASYNC | ||||
| VP_SYS_VS_Systick.Mode=SysTick | ||||
| VP_SYS_VS_Systick.Signal=SYS_VS_Systick | ||||
| VP_TIM1_VS_ClockSourceINT.Mode=Internal | ||||
| VP_TIM1_VS_ClockSourceINT.Signal=TIM1_VS_ClockSourceINT | ||||
| VP_TIM2_VS_ClockSourceINT.Mode=Internal | ||||
| VP_TIM2_VS_ClockSourceINT.Signal=TIM2_VS_ClockSourceINT | ||||
| board=custom | ||||
|  | ||||
							
								
								
									
										
											BIN
										
									
								
								Диплом bare.docx
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Диплом bare.docx
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Диплом дополнения.docx
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Диплом дополнения.docx
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								Диплом.docx
									
									
									
									
									
								
							
							
						
						
									
										
											BIN
										
									
								
								Диплом.docx
									
									
									
									
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								итог/out/Диссертация Разваляев 2337М.docx
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								итог/out/Диссертация Разваляев 2337М.docx
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								итог/out/Диссертация Разваляев 2337М.pdf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								итог/out/Диссертация Разваляев 2337М.pdf
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								итог/out/Приложения.docx
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								итог/out/Приложения.docx
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								итог/out/диплом.docx
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								итог/out/диплом.docx
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								итог/out/диплом.pdf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								итог/out/диплом.pdf
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								итог/out/титулы.docx
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								итог/out/титулы.docx
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								итог/out/титулы.pdf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								итог/out/титулы.pdf
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								итог/Диссертация Разваляев 2337М.docx
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								итог/Диссертация Разваляев 2337М.docx
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
							
								
								
									
										
											BIN
										
									
								
								итог/Диссертация Разваляев 2337М.pdf
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								итог/Диссертация Разваляев 2337М.pdf
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							
		Loading…
	
		Reference in New Issue
	
	Block a user