浏览代码

Set outputs to 0 on initialization and F0 package update to v1113

Garth Seale 3 年之前
父节点
当前提交
8d37563a6d
共有 3 个文件被更改,包括 8 次插入7 次删除
  1. 4 3
      APP/maincpp.cpp
  2. 2 2
      Core/Src/tim.c
  3. 2 2
      STM32F030_2CH_PULSEGEN.ioc

+ 4 - 3
APP/maincpp.cpp

@@ -81,8 +81,8 @@ void maincpp()
 	//	HAL_TIM_PWM_Start(&htim1, TIM_CHANNEL_1);
 	//	HAL_TIM_PWM_Start(&htim3, TIM_CHANNEL_4);
 
-	port1freq.setupoutput(0);
-	port2freq.setupoutput(100000);
+//	port1freq.setupoutput(0);
+//	port2freq.setupoutput(0);
 
 //	port1freq.freq = (360000/10)-1;
 //	port1freq.duty = port1freq.freq/2;
@@ -108,6 +108,7 @@ void PWMOUT::Init(TIM_HandleTypeDef *port, uint32_t tchan) {
 	timport = *port;
 	timchan = tchan;
 	HAL_TIM_PWM_Start(&timport, timchan);
+	setupoutput(0);
 }
 
 uint32_t PWMOUT::setupoutput(uint32_t pwmfreq) {
@@ -166,7 +167,7 @@ uint8_t txdata(uint8_t * data) {
 
 uint8_t chsum(uint8_t * data) {
 	uint8_t result = 0;
-	for(int i = 0; i < STREAMLENTH-1; i++)
+	for(int i = 0; i < (int)strlen((char*)data); i++)
 	{
 		result ^= data[i];
 	}

+ 2 - 2
Core/Src/tim.c

@@ -70,7 +70,7 @@ void MX_TIM1_Init(void)
     Error_Handler();
   }
   sConfigOC.OCMode = TIM_OCMODE_PWM1;
-  sConfigOC.Pulse = 1800;
+  sConfigOC.Pulse = 0;
   sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
   sConfigOC.OCNPolarity = TIM_OCNPOLARITY_HIGH;
   sConfigOC.OCFastMode = TIM_OCFAST_ENABLE;
@@ -138,7 +138,7 @@ void MX_TIM3_Init(void)
     Error_Handler();
   }
   sConfigOC.OCMode = TIM_OCMODE_PWM1;
-  sConfigOC.Pulse = 1800;
+  sConfigOC.Pulse = 0;
   sConfigOC.OCPolarity = TIM_OCPOLARITY_HIGH;
   sConfigOC.OCFastMode = TIM_OCFAST_ENABLE;
   if (HAL_TIM_PWM_ConfigChannel(&htim3, &sConfigOC, TIM_CHANNEL_4) != HAL_OK)

+ 2 - 2
STM32F030_2CH_PULSEGEN.ioc

@@ -139,7 +139,7 @@ TIM1.IPParameters=Channel-PWM Generation1 CH1,Period,Pulse-PWM Generation1 CH1,O
 TIM1.OCFastMode_PWM-PWM\ Generation1\ CH1=TIM_OCFAST_ENABLE
 TIM1.Period=3600
 TIM1.Prescaler=100-1
-TIM1.Pulse-PWM\ Generation1\ CH1=1800
+TIM1.Pulse-PWM\ Generation1\ CH1=0
 TIM3.AutoReloadPreload=TIM_AUTORELOAD_PRELOAD_ENABLE
 TIM3.Channel-PWM\ Generation4\ CH4=TIM_CHANNEL_4
 TIM3.IPParameters=Channel-PWM Generation4 CH4,OCPolarity_4,Prescaler,Period,OCFastMode_PWM-PWM Generation4 CH4,Pulse-PWM Generation4 CH4,AutoReloadPreload
@@ -147,7 +147,7 @@ TIM3.OCFastMode_PWM-PWM\ Generation4\ CH4=TIM_OCFAST_ENABLE
 TIM3.OCPolarity_4=TIM_OCPOLARITY_HIGH
 TIM3.Period=3600
 TIM3.Prescaler=100-1
-TIM3.Pulse-PWM\ Generation4\ CH4=1800
+TIM3.Pulse-PWM\ Generation4\ CH4=0
 USART1.BaudRate=115200
 USART1.IPParameters=VirtualMode-Asynchronous,BaudRate
 USART1.VirtualMode-Asynchronous=VM_ASYNC