修改pwm函数名

q-iot · May 13, 2019 · 38b3f4e · 38b3f4e
1 parent 3d9ae7e
commit 38b3f4e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/src/Common/Hardware/IrOut.c b/src/Common/Hardware/IrOut.c
@@ -31,7 +31,7 @@ void IrPluseGen_ISR(void)
 //Val非零时发送ir
 void SetSendIrData(u8 Val) 
 {
-	IO7_PWM_CONFIG((Val)?26:0,1,13);//pa6,tim3
+	PWM1_CONFIG((Val)?26:0,1,13);//pa6,tim3
 }
 #endif
 
diff --git a/src/Common/Hardware/Time.c b/src/Common/Hardware/Time.c
@@ -230,9 +230,13 @@ void Tim4_Set(u16 Val, u16 uS_Base, bool AutoReload)
 }
 
 //PA6: TIM3_CH1
+//uS_Base 表示单位，为1时，单位是us；为100时，单位是100us；最小值1，最大值900
 //占空比=Pluse/Val
 //周期=Val*uS_Base
-void IO7_PWM_CONFIG(u16 Val, u16 uS_Base,u16 Pluse)
+//当Pluse大于等于Val时，IO口将置高
+//当任一参数为0时，IO口将置低
+//Val不能设置为1
+void PWM1_CONFIG(u16 Val, u16 uS_Base,u16 Pluse)
 {
 	static u16 Old_Val=0;
 	static u16 Old_uS_Base=0;
@@ -252,7 +256,7 @@ void IO7_PWM_CONFIG(u16 Val, u16 uS_Base,u16 Pluse)
 		Old_uS_Base=uS_Base;
 		Old_Pluse=Pluse;
 	}
-	Debug("IO7 %u %u %u\n\r",Val,Pluse,uS_Base);
+	Debug("PWM1 %u %u %u\n\r",Val,Pluse,uS_Base);
 
     RCC_APB1PeriphClockCmd(RCC_APB1Periph_TIM3, ENABLE);  
     TIM_DeInit(TIM3);
@@ -334,9 +338,13 @@ void IO7_PWM_CONFIG(u16 Val, u16 uS_Base,u16 Pluse)
 }
 
 //PA7: TIM1_CH1N
+//uS_Base 表示单位，为1时，单位是us；为100时，单位是100us；最小值1，最大值900
 //占空比=Pluse/Val
 //周期=Val*uS_Base
-void IO8_PWM_CONFIG(u16 Val, u16 uS_Base,u16 Pluse)
+//当Pluse大于等于Val时，IO口将置高
+//当任一参数为0时，IO口将置低
+//Val不能设置为1
+void PWM2_CONFIG(u16 Val, u16 uS_Base,u16 Pluse)
 {   
 	static u16 Old_Val=0;
 	static u16 Old_uS_Base=0;
@@ -356,7 +364,7 @@ void IO8_PWM_CONFIG(u16 Val, u16 uS_Base,u16 Pluse)
 		Old_uS_Base=uS_Base;
 		Old_Pluse=Pluse;
 	}
-   	Debug("IO8 %u %u %u\n\r",Val,Pluse,uS_Base);
+   	Debug("PWM2 %u %u %u\n\r",Val,Pluse,uS_Base);
 
     RCC_APB2PeriphClockCmd(RCC_APB2Periph_TIM1, ENABLE);  
     TIM_DeInit(TIM1);

diff --git a/src/Common/Hardware/Time.h b/src/Common/Hardware/Time.h
@@ -10,8 +10,8 @@ void Tim1_Set(u16 Val,u16 uS_Base,bool AutoReload);
 void Tim2_Set(u16 Val,u16 uS_Base,bool AutoReload);
 void Tim3_Set(u16 Val,u16 uS_Base,bool AutoReload);
 void Tim4_Set(u16 Val,u16 uS_Base,bool AutoReload);
-void IO7_PWM_CONFIG(u16 Val, u16 uS_Base,u16 Pluse);
-void IO8_PWM_CONFIG(u16 Val, u16 uS_Base,u16 Pluse);
+void PWM1_CONFIG(u16 Val, u16 uS_Base,u16 Pluse);
+void PWM2_CONFIG(u16 Val, u16 uS_Base,u16 Pluse);
 
 
 #endif
diff --git a/src/Core/User/SysCmdHandler.c b/src/Core/User/SysCmdHandler.c
@@ -414,7 +414,7 @@ static bool __inline SysCmdHandler_P(char **pCmd,const char *pStrCopy,char *pOut
 		u32 uS_Base=Str2Uint(pCmd[2]);
 		u32 Pluse=Str2Uint(pCmd[3]);
 
-		IO7_PWM_CONFIG(Val,uS_Base,Pluse);
+		PWM1_CONFIG(Val,uS_Base,Pluse);
 
 		return TRUE;
 	}
@@ -424,7 +424,7 @@ static bool __inline SysCmdHandler_P(char **pCmd,const char *pStrCopy,char *pOut
 		u32 uS_Base=Str2Uint(pCmd[2]);
 		u32 Pluse=Str2Uint(pCmd[3]);
 
-		IO8_PWM_CONFIG(Val,uS_Base,Pluse);
+		PWM2_CONFIG(Val,uS_Base,Pluse);
 
 		return TRUE;
 	}