添加温度检测

TEST_Prj/dysys_prj/程序/HARDWARE/DS18B20/ds18b20.c

@@ -106,8 +106,12 @@ u8 DS18B20_Init(void)
 {
 	  GPIO_InitTypeDef GPIO_InitStructure;
 	
-    RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOB | RCC_APB2Periph_AFIO, ENABLE); 
-    GPIO_InitStructure.GPIO_Pin =  GPIO_Pin_9 ;
+  //打开PB口时钟,AFIO复用时钟
+  RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOB | RCC_APB2Periph_AFIO, ENABLE);
+	GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE); 
+  RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOB | RCC_APB2Periph_AFIO, ENABLE); 
+	
+    GPIO_InitStructure.GPIO_Pin =  DS18B20_PIN ;
     GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP;   
     /* Push-pill output, it can be other output types */
     GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; 
@@ -121,8 +125,9 @@ u8 DS18B20_Init(void)
 
 void Input_Mode(void)
 {
+	 
 		GPIO_InitTypeDef  GPIO_InitStructure;
-  	GPIO_InitStructure.GPIO_Pin = GPIO_Pin_9;				//PORTG.11 推挽输出
+  	GPIO_InitStructure.GPIO_Pin = DS18B20_PIN;				//PORTG.11 推挽输出
  	  GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPD; 		  
  	  GPIO_Init(GPIOB, &GPIO_InitStructure);
 }
@@ -130,7 +135,7 @@ void Input_Mode(void)
 void Output_Mode(void)
 {
 	GPIO_InitTypeDef  GPIO_InitStructure;
-	GPIO_InitStructure.GPIO_Pin = GPIO_Pin_9;				//PORTG.11 推挽输出
+	GPIO_InitStructure.GPIO_Pin = DS18B20_PIN;				//PORTG.11 推挽输出
  	GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP; 		  
  	GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
  	GPIO_Init(GPIOB, &GPIO_InitStructure);

TEST_Prj/dysys_prj/程序/HARDWARE/DS18B20/ds18b20.h

@@ -7,11 +7,14 @@
 //#define DS18B20_IO_OUT() {GPIOB->CRH&=0XFFFF0FFF;GPIOB->CRH|=3<<11;}
 void Input_Mode(void);
 void Output_Mode(void);
+
+#define DS18B20_PIN GPIO_Pin_1
+
 #define DS18B20_IO_IN()  {Input_Mode();}
 #define DS18B20_IO_OUT() {Output_Mode();}
 ////IO操作函数											   
-#define	DS18B20_DQ_OUT PBout(9) //数据端口
-#define	DS18B20_DQ_IN  PBin(9)  //数据端口	
+#define	DS18B20_DQ_OUT PBout(1) //数据端口
+#define	DS18B20_DQ_IN  PBin(1)  //数据端口	
    	
 u8 DS18B20_Init(void);//初始化DS18B20
 short DS18B20_Get_Temp(void);//获取温度

TEST_Prj/dysys_prj/程序/HARDWARE/LED/led.h

@@ -2,10 +2,10 @@
 #define __LED_H	 
 #include "sys.h"
 
-#define LED0 PCout(13)// PB5
+#define buzz PCout(13)// PB5
 #define out PBout(7)// PB7	
-#define buzz PBout(14)// PB5
-#define FM PCout(14)// PB6
+
+
 void LED_Init(void);//³õʼ»¯
 
 		 				    

TEST_Prj/dysys_prj/程序/HARDWARE/oled/oled.c

@@ -456,11 +456,11 @@ void OLED_Init(void)
 { 	
  	GPIO_InitTypeDef  GPIO_InitStructure;
 	RCC_APB2PeriphClockCmd(RCC_APB2Periph_GPIOB, ENABLE);	 //使能A端口时钟
-	GPIO_InitStructure.GPIO_Pin =OLED_SDA_PIN|OLED_SDA_PIN;	 
+	GPIO_InitStructure.GPIO_Pin =OLED_SDA_PIN|OLED_SCL_PIN;	 
  	GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP; 		 //推挽输出
 	GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;//速度50MHz
  	GPIO_Init(OLED_PROT, &GPIO_InitStructure);	  //初始化GPIOB
- 	GPIO_SetBits(OLED_PROT,OLED_SDA_PIN|OLED_SDA_PIN);	
+ 	GPIO_SetBits(OLED_PROT,OLED_SDA_PIN|OLED_SCL_PIN);	
   delay_ms(800);
   OLED_WR_Byte(0xAE,OLED_CMD);//--display off
 	OLED_WR_Byte(0x00,OLED_CMD);//---set low column address

TEST_Prj/dysys_prj/程序/HARDWARE/oled/oled.h

@@ -15,8 +15,8 @@
 #define X_WIDTH 	128
 #define Y_WIDTH 	64	    						  
 //-----------------OLED IIC¶Ë¿Ú¶¨Òå----------------  					   
-#define OLED_SDA_PIN GPIO_Pin_12
-#define OLED_SCL_PIN GPIO_Pin_13
+#define OLED_SDA_PIN GPIO_Pin_13
+#define OLED_SCL_PIN GPIO_Pin_12
 #define OLED_PROT 	 GPIOB
 
 #define OLED_SCLK_Clr() GPIO_ResetBits(OLED_PROT,OLED_SCL_PIN)//SCL
@@ -53,6 +53,7 @@ void IIC_Stop();
 void Write_IIC_Command(unsigned char IIC_Command);
 void Write_IIC_Data(unsigned char IIC_Data);
 void Write_IIC_Byte(unsigned char IIC_Byte);
+void OLED_ShowText(u8 x,u8 y,u8* str,u8 flag);
 
 void IIC_Wait_Ack();
 #endif  

TEST_Prj/dysys_prj/程序/HARDWARE/oled/oledfont.h

@@ -208,59 +208,22 @@ const unsigned char F8X16[]=
   0x00,0x06,0x01,0x01,0x02,0x02,0x04,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,//~ 94
 };
 chinese Hzk[]={
-	
-"中",
-{0x00,0x00,0xF0,0x10,0x10,0x10,0x10,0xFF,0x10,0x10,0x10,0x10,0xF0,0x00,0x00,0x00,0x00,0x00,0x0F,0x04,0x04,0x04,0x04,0xFF,0x04,0x04,0x04,0x04,0x0F,0x00,0x00,0x00},
-"景",
-{0x40,0x40,0x40,0x5F,0x55,0x55,0x55,0x75,0x55,0x55,0x55,0x5F,0x40,0x40,0x40,0x00,0x00,0x40,0x20,0x0F,0x09,0x49,0x89,0x79,0x09,0x09,0x09,0x0F,0x20,0x40,0x00,0x00},
-"园",
-{0x00,0xFE,0x02,0x42,0x4A,0xCA,0x4A,0x4A,0xCA,0x4A,0x4A,0x42,0x02,0xFE,0x00,0x00,0x00,0xFF,0x40,0x50,0x4C,0x43,0x40,0x40,0x4F,0x50,0x50,0x5C,0x40,0xFF,0x00,0x00},
-"电",
-{0x00,0x00,0xF8,0x88,0x88,0x88,0x88,0xFF,0x88,0x88,0x88,0x88,0xF8,0x00,0x00,0x00,0x00,0x00,0x1F,0x08,0x08,0x08,0x08,0x7F,0x88,0x88,0x88,0x88,0x9F,0x80,0xF0,0x00},
-"子",
-{0x80,0x82,0x82,0x82,0x82,0x82,0x82,0xE2,0xA2,0x92,0x8A,0x86,0x82,0x80,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x80,0x7F,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
-"苍",
-{0x04,0x04,0x04,0x04,0x9F,0x44,0x24,0x14,0x24,0x44,0x9F,0x04,0x04,0x04,0x04,0x00,0x02,0x02,0x01,0x01,0x7E,0x82,0x82,0x82,0x92,0xA2,0x9E,0x81,0xF1,0x02,0x02,0x00},/*"苍",0*/
-"穹",
-{0x10,0x0C,0x24,0x14,0x2C,0x24,0x25,0x26,0x24,0x24,0x2C,0xF4,0x24,0x14,0x0C,0x00,0x00,0x00,0x0C,0x0B,0x09,0x09,0x09,0x09,0x09,0x49,0x89,0x49,0x38,0x00,0x00,0x00},/*"穹",1*/
-"超",
-{0x40,0x48,0x48,0x48,0xFF,0x48,0x48,0x42,0xA2,0x9E,0x82,0xA2,0xC2,0xBE,0x00,0x00,0x80,0x60,0x1F,0x20,0x7F,0x44,0x44,0x40,0x4F,0x48,0x48,0x48,0x48,0x4F,0x40,0x00},/*"超",2*/
-"声",
-{0x04,0x14,0xD4,0x54,0x54,0x54,0x54,0xDF,0x54,0x54,0x54,0x54,0xD4,0x14,0x04,0x00,0x80,0x60,0x1F,0x02,0x02,0x02,0x02,0x03,0x02,0x02,0x02,0x02,0x03,0x00,0x00,0x00},/*"声",3*/
-"波",
-{0x10,0x60,0x02,0x0C,0xC0,0x00,0xF8,0x88,0x88,0x88,0xFF,0x88,0x88,0xA8,0x18,0x00,0x04,0x04,0x7C,0x03,0x80,0x60,0x1F,0x80,0x43,0x2C,0x10,0x28,0x46,0x81,0x80,0x00},/*"波",4*/
-"测",
-{0x10,0x60,0x02,0x8C,0x00,0xFE,0x02,0xF2,0x02,0xFE,0x00,0xF8,0x00,0xFF,0x00,0x00,0x04,0x04,0x7E,0x01,0x80,0x47,0x30,0x0F,0x10,0x27,0x00,0x47,0x80,0x7F,0x00,0x00},/*"测",5*/
-"距",
-{0x00,0x3E,0x22,0xE2,0x22,0x3E,0x00,0xFE,0x22,0x22,0x22,0x22,0x22,0xE2,0x02,0x00,0x20,0x3F,0x20,0x1F,0x11,0x11,0x00,0x7F,0x44,0x44,0x44,0x44,0x44,0x47,0x40,0x00},/*"距",6*/
-"仪",
-{0x00,0x80,0x60,0xF8,0x07,0x00,0x1C,0xE0,0x01,0x06,0x00,0xE0,0x1E,0x00,0x00,0x00,0x01,0x00,0x00,0xFF,0x00,0x80,0x40,0x20,0x13,0x0C,0x13,0x20,0x40,0x80,0x80,0x00},/*"仪",7*/
-"设",
-{0x40,0x40,0x42,0xCC,0x00,0x40,0xA0,0x9E,0x82,0x82,0x82,0x9E,0xA0,0x20,0x20,0x00,0x00,0x00,0x00,0x3F,0x90,0x88,0x40,0x43,0x2C,0x10,0x28,0x46,0x41,0x80,0x80,0x00},/*"设",0*/
-"置",
-{0x00,0x17,0x15,0xD5,0x55,0x57,0x55,0x7D,0x55,0x57,0x55,0xD5,0x15,0x17,0x00,0x00,0x40,0x40,0x40,0x7F,0x55,0x55,0x55,0x55,0x55,0x55,0x55,0x7F,0x40,0x40,0x40,0x00},/*"置",1*/
-"安",
-{0x80,0x90,0x8C,0x84,0x84,0x84,0xF5,0x86,0x84,0x84,0x84,0x84,0x94,0x8C,0x80,0x00,0x00,0x80,0x80,0x84,0x46,0x49,0x28,0x10,0x10,0x2C,0x23,0x40,0x80,0x00,0x00,0x00},/*"安",2*/
-"全",
-{0x80,0x80,0x40,0x20,0x50,0x48,0x44,0xC3,0x44,0x48,0x50,0x20,0x40,0x80,0x80,0x00,0x00,0x40,0x40,0x44,0x44,0x44,0x44,0x7F,0x44,0x44,0x44,0x44,0x40,0x40,0x00,0x00},/*"全",3*/
-"离",
-{0x04,0x04,0x04,0xF4,0x84,0xD4,0xA5,0xA6,0xA4,0xD4,0x84,0xF4,0x04,0x04,0x04,0x00,0x00,0xFE,0x02,0x02,0x12,0x3A,0x16,0x13,0x12,0x1A,0x32,0x42,0x82,0x7E,0x00,0x00},/*"离",5*/
-"←",
-{0x80,0x80,0xC0,0xC0,0xE0,0xA0,0x90,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x00,0x00,0x00,0x01,0x01,0x03,0x02,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},/*"←",0*/
-"〇",
-{0x00,0x80,0x60,0x10,0x08,0x08,0x04,0x04,0x04,0x04,0x08,0x08,0x10,0x60,0x80,0x00,0x00,0x03,0x0C,0x10,0x20,0x20,0x40,0x40,0x40,0x40,0x20,0x20,0x10,0x0C,0x03,0x00},/*"〇",1*/
-"→",
-{0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x90,0xA0,0xE0,0xC0,0xC0,0x80,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x02,0x03,0x01,0x01,0x00,0x00,0x00},/*"→",2*/
-"╲",
-{0xFD,0xF9,0xF3,0xE7,0xCF,0x9F,0x3F,0x7F,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFE,0xFC,0xF9,0xF3,0xE7,0xCF,0x9F,0x3F,0x7F},/*"╲",0*/
-"╳",
-{0xFD,0xF9,0xF3,0xE7,0xCF,0x9F,0x3F,0x7F,0x7F,0x3F,0x9F,0xCF,0xE7,0xF3,0xF9,0xFD,0x7F,0x3F,0x9F,0xCF,0xE7,0xF3,0xF9,0xFC,0xFC,0xF9,0xF3,0xE7,0xCF,0x9F,0x3F,0x7F},/*"╳",1*/
-"下",
-{0x02,0x02,0x02,0x02,0x02,0x02,0xFE,0x02,0x02,0x42,0x82,0x02,0x02,0x02,0x02,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x00,0x00,0x00,0x00,0x01,0x06,0x00,0x00,0x00},/*"下",0*/
-"限",
-{0x00,0xFE,0x22,0x5A,0x86,0x00,0xFE,0x92,0x92,0x92,0x92,0x92,0xFE,0x00,0x00,0x00,0x00,0xFF,0x04,0x08,0x07,0x00,0xFF,0x40,0x20,0x03,0x0C,0x14,0x22,0x41,0x40,0x00},/*"限",1*/
-"上",
-{0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0x40,0x40,0x40,0x40,0x40,0x40,0x00,0x00,0x00,0x40,0x40,0x40,0x40,0x40,0x40,0x7F,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x00},/*"上",2*/
+"和",
+{0x20,0x24,0x24,0xA4,0xFE,0x23,0x22,0x20,0x00,0xF8,0x08,0x08,0x08,0xF8,0x00,0x00,0x10,0x08,0x06,0x01,0xFF,0x01,0x06,0x00,0x00,0x3F,0x10,0x10,0x10,0x3F,0x00,0x00},
+"你",
+{0x00,0x80,0x60,0xF8,0x07,0x40,0x20,0x18,0x0F,0x08,0xC8,0x08,0x08,0x28,0x18,0x00,0x01,0x00,0x00,0xFF,0x00,0x10,0x0C,0x03,0x40,0x80,0x7F,0x00,0x01,0x06,0x18,0x00},
+"在",
+{0x08,0x08,0x88,0xC8,0x38,0x0C,0x0B,0x08,0x08,0xE8,0x08,0x08,0x08,0x08,0x08,0x00,0x02,0x01,0x00,0xFF,0x40,0x41,0x41,0x41,0x41,0x7F,0x41,0x41,0x41,0x41,0x40,0x00},
+"一",
+{0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x80,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00},
+"起",
+{0x40,0x48,0x48,0x48,0xFF,0x48,0x48,0x00,0xC4,0x44,0x44,0x44,0xFC,0x00,0x00,0x00,0x80,0x60,0x1F,0x20,0x7F,0x44,0x44,0x40,0x4F,0x50,0x50,0x50,0x50,0x5C,0x40,0x00},
+"好",
+{0x10,0x10,0xF0,0x1F,0x10,0xF0,0x00,0x80,0x82,0x82,0xE2,0x92,0x8A,0x86,0x80,0x00,0x40,0x22,0x15,0x08,0x16,0x61,0x00,0x00,0x40,0x80,0x7F,0x00,0x00,0x00,0x00,0x00},
+"快",
+{0x00,0xE0,0x00,0xFF,0x10,0x20,0x08,0x08,0x08,0xFF,0x08,0x08,0xF8,0x00,0x00,0x00,0x01,0x00,0x00,0xFF,0x00,0x81,0x41,0x31,0x0D,0x03,0x0D,0x31,0x41,0x81,0x81,0x00},
+"乐",
+{0x00,0x00,0xE0,0x9C,0x84,0x84,0x84,0xF4,0x82,0x82,0x83,0x82,0x80,0x80,0x00,0x00,0x00,0x20,0x10,0x08,0x06,0x40,0x80,0x7F,0x00,0x00,0x02,0x04,0x08,0x30,0x00,0x00},
 }; 
 
 #endif

TEST_Prj/dysys_prj/程序/SYSTEM/usart/usart.c

@@ -83,8 +83,6 @@ void UsartSendData(u8 *p,char len)
 				}
 }
 
-extern u8 jr_flag;
-extern u8 mode_flag; 
 
 void USART1_IRQHandler(void)                	//串口1中断服务程序
 {
@@ -107,23 +105,7 @@ void USART1_IRQHandler(void)                	//
 		//用读SR和DR的方法清除IDLE
 		rxes = USART1->SR;
 		rxes = USART1->DR;
-		if(Usart1ReadCnt>5)
-		{
-			if(strstr(Usart1ReadBuff,"open")!=NULL)
-			{
-			  jr_flag=1;
-			}else if(strstr(Usart1ReadBuff,"open")!=NULL)
-			{
-			   jr_flag=0;
-			}
-			else if(strstr(Usart1ReadBuff,"mode1")!=NULL)
-			{ 
-			   mode_flag=1;
-			}else if(strstr(Usart1ReadBuff,"mode0")!=NULL)
-			{
-			   mode_flag=0;
-			}
-		}
+
 		Usart1ReadCnt=0;
 		memset(Usart1ReadBuff,0,Usart1ReadLen-1);
 	}

TEST_Prj/dysys_prj/程序/USER/Demo.uvoptx

@@ -10,7 +10,7 @@
     <aExt>*.s*; *.src; *.a*</aExt>
     <oExt>*.obj; *.o</oExt>
     <lExt>*.lib</lExt>
-    <tExt>*.txt; *.h; *.inc</tExt>
+    <tExt>*.txt; *.h; *.inc; *.md</tExt>
     <pExt>*.plm</pExt>
     <CppX>*.cpp</CppX>
     <nMigrate>0</nMigrate>
@@ -103,7 +103,7 @@
         <bEvRecOn>1</bEvRecOn>
         <bSchkAxf>0</bSchkAxf>
         <bTchkAxf>0</bTchkAxf>
-        <nTsel>4</nTsel>
+        <nTsel>6</nTsel>
         <sDll></sDll>
         <sDllPa></sDllPa>
         <sDlgDll></sDlgDll>
@@ -114,13 +114,13 @@
         <tDlgDll></tDlgDll>
         <tDlgPa></tDlgPa>
         <tIfile></tIfile>
-        <pMon>Segger\JL2CM3.dll</pMon>
+        <pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
       </DebugOpt>
       <TargetDriverDllRegistry>
         <SetRegEntry>
           <Number>0</Number>
           <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U55FF6C064967535528180187 -O206 -S0 -C0 -A0 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_512.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F103ZE$Flash\STM32F10x_512.FLM)</Name>
+          <Name>-U55FF6C064967535528180187 -O206 -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 -FC1000 -FN1 -FF0STM32F10x_128 -FS08000000 -FL020000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>

TEST_Prj/dysys_prj/程序/USER/Demo.uvprojx

@@ -10,7 +10,7 @@
       <TargetName>demo</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>5060750::V5.06 update 6 (build 750)::ARMCC</pCCUsed>
+      <pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARMCC</pCCUsed>
       <uAC6>0</uAC6>
       <TargetOption>
         <TargetCommonOption>
@@ -185,6 +185,7 @@
             <uocXRam>0</uocXRam>
             <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
+            <RvdsCdeCp>0</RvdsCdeCp>
             <hadIRAM2>0</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
@@ -351,7 +352,7 @@
             <NoWarn>0</NoWarn>
             <uSurpInc>0</uSurpInc>
             <useXO>0</useXO>
-            <uClangAs>0</uClangAs>
+            <ClangAsOpt>4</ClangAsOpt>
             <VariousControls>
               <MiscControls></MiscControls>
               <Define></Define>

TEST_Prj/dysys_prj/程序/USER/main.c

@@ -36,17 +36,10 @@ void Hw_Init(void)
 //	}
 //}
 //测距
+int temp_val=0;
+u16 get_cnt=0;
 
-
-u8 jr_flag=0;
-u8 get_cnt=0;
-u8 hw_cnt=0;
-u8 cs_out_flag=0; //出水标志
-u16 sw_val=0;//水位值
-u8 cs_out_zs_flag=0;//出水自锁标志位
-char showbuff[16];
-short temp_val=0;
-u8 mode_flag=0; 
+char showbuff[16]={0};
 
 int main(void)
 {	 
@@ -54,11 +47,16 @@ int main(void)
 	delay_init();	    	 //延时函数初始化	  
  	LED_Init();		  			//初始化与LED连接的硬件接口
 	uart_init(9600);
-	ADC1_Init();
+//	ADC1_Init();
+	delay_ms(500);
 	OLED_Init();
 	OLED_Clear();
-	Hw_Init();
+	 OLED_ShowString(0,2,(u8*)"2322352",16); //显示 
 	DS18B20_Init();
+  OLED_ShowText(0,0,"和你在一起好快乐",0);
+		//	 sprintf(showbuff,"temp:%2d.%1d",temp_val/10,temp_val%10); //打印成字符串
+		//			 OLED_ShowString(0,2,(u8*)showbuff,16); //显示 
+	buzz=1;
  	while(1)
 	{	 		
 
@@ -68,7 +66,7 @@ int main(void)
 					 get_cnt=0;
 					 temp_val = DS18B20_Get_Temp();//采集温度值
 					 sprintf(showbuff,"temp:%2d.%1d",temp_val/10,temp_val%10); //打印成字符串
-					 OLED_ShowString(0,2,(u8*)showbuff,16); //显示 
+					 OLED_ShowString(0,4,(u8*)showbuff,16); //显示 
 				}		
 	
 	delay_ms(5);//延时