按键1控制继电器开关

Project/RVMDK（uv5）/iSO-STM32.uvoptx

@@ -120,7 +120,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>CMSIS_AGDI</Key>
-          <Name>-X"Fire CMSIS-DAP" -UFS-00000000 -O206 -S8 -C0 -P00000000 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP20 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F103VE$Flash\STM32F10x_512.FLM)</Name>
+          <Name>-X"Fire CMSIS-DAP" -UFS-00000000 -O206 -S8 -C0 -P00000000 -N00("") -D00(00000000) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP20 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F103VE$Flash\STM32F10x_512.FLM)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -248,7 +248,7 @@
 
   <Group>
     <GroupName>DOC</GroupName>
-    <tvExp>0</tvExp>
+    <tvExp>1</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
@@ -259,8 +259,8 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\Doc\readme.txt</PathWithFileName>
+      <PathWithFileName>..\..\Doc\README.md</PathWithFileName>
-      <FilenameWithoutPath>readme.txt</FilenameWithoutPath>
+      <FilenameWithoutPath>README.md</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
@@ -780,7 +780,7 @@
       <GroupNumber>5</GroupNumber>
       <FileNumber>42</FileNumber>
       <FileType>1</FileType>
-      <tvExp>0</tvExp>
+      <tvExp>1</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
       <PathWithFileName>..\..\User\relay\bsp_relay.c</PathWithFileName>
@@ -876,7 +876,7 @@
 
   <Group>
     <GroupName>UTIL</GroupName>
-    <tvExp>1</tvExp>
+    <tvExp>0</tvExp>
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>

Project/RVMDK（uv5）/iSO-STM32.uvprojx

@@ -384,9 +384,9 @@
           <GroupName>DOC</GroupName>
           <Files>
             <File>
-              <FileName>readme.txt</FileName>
+              <FileName>README.md</FileName>
               <FileType>5</FileType>
-              <FilePath>..\..\Doc\readme.txt</FilePath>
+              <FilePath>..\..\Doc\README.md</FilePath>
             </File>
           </Files>
         </Group>

User/relay/bsp_relay.c

@@ -2,33 +2,15 @@
     
 void RELAY_GPIO_Config(void){
 	//
-	GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE);
-	RCC_APB2PeriphClockCmd(RELAY1_GPIO_CLK, ENABLE);
-	
 	GPIO_InitTypeDef GPIO_InitStructure;
-	GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP;
+	RCC_APB2PeriphClockCmd(RELAY1_GPIO_CLK, ENABLE ); //配置时钟
+	
 	GPIO_InitStructure.GPIO_Pin = RELAY1_GPIO_PIN;
 	GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
-	GPIO_Init(RELAY1_GPIO_PORT, &GPIO_InitStructure);
+	GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP;
-	
+	GPIO_Init(RELAY1_GPIO_PORT,&GPIO_InitStructure);
-	GPIO_ResetBits(RELAY1_GPIO_PORT, RELAY1_GPIO_PIN);
-}
 
-/**
+	RELAY1_OFF();
-  * @brief  控制继电器状态
-  * @param  state: 1-打开继电器, 0-关闭继电器
-  * @retval 无
-  */
-void RELAY1_Control(uint8_t state)
-{
-    if(state)
-    {
-        RELAY1_ON();
-    }
-    else
-    {
-        RELAY1_OFF();
-    }
 }
 
 /**

User/relay/bsp_relay.h

@@ -3,9 +3,9 @@
 
 #include "stm32f10x.h"
 
-#define RELAY1_GPIO_PORT    	GPIOB			              /* GPIO端口 */
+#define RELAY1_GPIO_PORT    	GPIOA			              /* GPIO端口 */
-#define RELAY1_GPIO_CLK 	    RCC_APB2Periph_GPIOB		/* GPIO端口时钟 */
+#define RELAY1_GPIO_CLK 	    RCC_APB2Periph_GPIOA		/* GPIO端口时钟 */
-#define RELAY1_GPIO_PIN				GPIO_Pin_5			        /* 连接到SCL时钟线的GPIO */
+#define RELAY1_GPIO_PIN			GPIO_Pin_4			        /* 连接到SCL时钟线的GPIO */
 
 /* 继电器控制宏定义 */
 #define RELAY1_ON()     GPIO_SetBits(RELAY1_GPIO_PORT, RELAY1_GPIO_PIN)