结项

stm32/OBJ/Template.build_log.htm

@@ -21,7 +21,7 @@ Target DLL:      STLink\ST-LINKIII-KEIL_SWO.dll V3.0.1.0
 Dialog DLL:      TCM.DLL V1.35.1.0
  
 <h2>Project:</h2>
-e:\ÏîÄ¿\¼æÖ°ÏîÄ¿\20220418-smart_waterheater\stm32\USER\Template.uvprojx
+E:\ÏîÄ¿\¼æÖ°ÏîÄ¿\20220418-smart_waterheater\stm32\USER\Template.uvprojx
 Project File Date:  04/23/2022
 
 <h2>Output:</h2>
@@ -48,7 +48,7 @@ main.c(628): warning:  #870-D: invalid multibyte character sequence
   			printf("Water_temp:%0.1fâ„?, target:%dâ„?, setTemp:%d â„?, water_level:%0.2fcm, TimerFlag:%d , HotFlag:%d\r\n", userInfo.water_temp, userInfo.now_tager_temp,userInfo.water_target_temp, userInfo.water_level, userInfo.TimerFlag, userInfo.HotFlag);
 main.c: 9 warnings, 0 errors
 linking...
-Program Size: Code=21840 RO-data=2440 RW-data=396 ZI-data=1468  
+Program Size: Code=21836 RO-data=2440 RW-data=396 ZI-data=1468  
 FromELF: creating hex file...
 "..\OBJ\Template.axf" - 0 Error(s), 9 Warning(s).
 

stm32/OBJ/Template_Target 1.dep

@@ -1,5 +1,5 @@
 Dependencies for Project 'Template', Target 'Target 1': (DO NOT MODIFY !)
-F (.\main.c)(0x6263B64A)(-c --cpu Cortex-M3 -D__MICROLIB -g -O0 --apcs=interwork -I ..\HARDWARE\LED -I ..\SYSTEM\delay -I ..\SYSTEM\sys -I ..\SYSTEM\usart -I ..\USER -I ..\STM32F10x_FWLib\inc -I ..\CORE -I ..\HARDWARE\ESP8266 -I ..\HARDWARE\DHT11 -I ..\HARDWARE\LCD1602 -I ..\HARDWARE\ADC -I ..\HARDWARE\TIMER -I ..\HARDWARE\DS18B20 -I ..\HARDWARE\cJSON -I ..\HARDWARE\DCmotor -I ..\HARDWARE\DS1302 -I ..\HARDWARE\LCD -I ..\HARDWARE\OLED -I ..\HARDWARE\KEY

-I.\RTE\_Target_1

-ID:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.3.0\Device\Include

-ID:\Keil_v5\ARM\CMSIS\Include

-D__UVISION_VERSION="525" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER

-o ..\obj\main.o --omf_browse ..\obj\main.crf --depend ..\obj\main.d)
+F (.\main.c)(0x62692667)(-c --cpu Cortex-M3 -D__MICROLIB -g -O0 --apcs=interwork -I ..\HARDWARE\LED -I ..\SYSTEM\delay -I ..\SYSTEM\sys -I ..\SYSTEM\usart -I ..\USER -I ..\STM32F10x_FWLib\inc -I ..\CORE -I ..\HARDWARE\ESP8266 -I ..\HARDWARE\DHT11 -I ..\HARDWARE\LCD1602 -I ..\HARDWARE\ADC -I ..\HARDWARE\TIMER -I ..\HARDWARE\DS18B20 -I ..\HARDWARE\cJSON -I ..\HARDWARE\DCmotor -I ..\HARDWARE\DS1302 -I ..\HARDWARE\LCD -I ..\HARDWARE\OLED -I ..\HARDWARE\KEY

-I.\RTE\_Target_1

-ID:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.3.0\Device\Include

-ID:\Keil_v5\ARM\CMSIS\Include

-D__UVISION_VERSION="525" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER

-o ..\obj\main.o --omf_browse ..\obj\main.crf --depend ..\obj\main.d)
 I (..\HARDWARE\LED\led.h)(0x62599D88)
 I (..\SYSTEM\sys\sys.h)(0x6256947A)
 I (..\USER\stm32f10x.h)(0x6256947A)

stm32/USER/main.c

@@ -48,7 +48,7 @@ struct UserInfo userInfo;
 struct timing nowTime;
 
 
-u8 Settime[6]={0x22,0x03,0x27,0x22,0x34,0x00};  // 设置时间 22年 03月 27日 22：34：00 
+u8 Settime[6]={0x22,0x04,0x27,0x19,0x17,0x20};  // 设置时间 22年 03月 27日 22：34：00 
 
 int setModel = 0;
 int change = 0;
@@ -101,7 +101,7 @@ void Sys_Init(void)
 	OLED_Init();
 	Key4x4_GPIO_Config();
 	DS1302_init(Settime);
-	DS1302_SetTime(Settime);
+	//DS1302_SetTime(Settime);
 	OLED_Clear();
 } 
 
@@ -114,7 +114,7 @@ void DisplayTask(void)
 {
 	char str[30];
 	if(setModel == 0){
-		sprintf(str,"%2d-%2d %2d:%2d:%2d", nowTime.mon, nowTime.day, nowTime.hour, nowTime.min, nowTime.sec);
+		sprintf(str,"%2d-%2d %2d:%2d:%2d  ", nowTime.mon, nowTime.day, nowTime.hour, nowTime.min, nowTime.sec);
 		OLED_ShowString(0, 0, str, 16);
 		sprintf(str,"%0.2fC %dC %0.2fcm %d", userInfo.water_temp, userInfo.now_tager_temp,userInfo.water_level, userInfo.setLevel);
 		OLED_ShowString(0, 2, str, 16);
@@ -364,10 +364,10 @@ void DeleteValue()
 	if(setModel != 1) return;
 	switch(change){
 		case 0:
-			userInfo.setLevel /= 10;
+			userInfo.water_target_temp /= 10;
 			break;
 		case 1:
-			userInfo.water_target_temp /= 10;
+			userInfo.setLevel /= 10;
 			break;
 		case 2:
 			userInfo.SetTimer.year /= 10;