lishengyin
/
Smart_WaterHeater
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改adc比值

master
htujun 3 years ago
parent
a68eb0e1c1
commit
0ef47d6cf7
10 changed files with 1944 additions and 1944 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. BIN
      stm32/OBJ/Template.axf
  2. 2
      stm32/OBJ/Template.build_log.htm
  3. 2746
      stm32/OBJ/Template.hex
  4. 4
      stm32/OBJ/Template.htm
  5. 2
      stm32/OBJ/Template_Target 1.dep
  6. BIN
      stm32/OBJ/main.crf
  7. BIN
      stm32/OBJ/main.o
  8. 1074
      stm32/USER/Template.map
  9. 58
      stm32/USER/Template.uvguix.QY
  10. 2
      stm32/USER/main.c

BIN
stm32/OBJ/Template.axf
View File

Binary file not shown.

2
stm32/OBJ/Template.build_log.htm
Unescape View File

@ -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); 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 main.c: 9 warnings, 0 errors
linking... linking...
Program Size: Code=21836 RO-data=2440 RW-data=396 ZI-data=1468 Program Size: Code=21832 RO-data=2440 RW-data=396 ZI-data=1468
FromELF: creating hex file... FromELF: creating hex file...
"..\OBJ\Template.axf" - 0 Error(s), 9 Warning(s). "..\OBJ\Template.axf" - 0 Error(s), 9 Warning(s).

2746
stm32/OBJ/Template.hex
View File

File diff suppressed because it is too large Load Diff

4
stm32/OBJ/Template.htm
Unescape View File

@ -3,7 +3,7 @@
<title>Static Call Graph - [..\OBJ\Template.axf]</title></head> <title>Static Call Graph - [..\OBJ\Template.axf]</title></head>
<body><HR> <body><HR>
<H1>Static Call Graph for image ..\OBJ\Template.axf</H1><HR> <H1>Static Call Graph for image ..\OBJ\Template.axf</H1><HR>
<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060750: Last Updated: Wed Apr 27 19:18:01 2022 <BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060750: Last Updated: Thu May 12 21:55:22 2022
<BR><P> <BR><P>
<H3>Maximum Stack Usage = 200 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3> <H3>Maximum Stack Usage = 200 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3>
Call chain for Maximum Stack Depth:</H3> Call chain for Maximum Stack Depth:</H3>
@ -281,7 +281,7 @@ Global Symbols
<BR>[Called By]<UL><LI><a href="#[36]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main <BR>[Called By]<UL><LI><a href="#[36]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
</UL> </UL>
<P><STRONG><a name="[36]"></a>main</STRONG> (Thumb, 76 bytes, Stack size 0 bytes, main.o(.text)) <P><STRONG><a name="[36]"></a>main</STRONG> (Thumb, 72 bytes, Stack size 0 bytes, main.o(.text))
<BR><BR>[Stack]<UL><LI>Max Depth = 200<LI>Call Chain = main &rArr; DisplayTask &rArr; OLED_ShowString &rArr; OLED_ShowChar &rArr; OLED_Set_Pos &rArr; OLED_WR_Byte &rArr; Write_IIC_Data &rArr; Write_IIC_Byte <BR><BR>[Stack]<UL><LI>Max Depth = 200<LI>Call Chain = main &rArr; DisplayTask &rArr; OLED_ShowString &rArr; OLED_ShowChar &rArr; OLED_Set_Pos &rArr; OLED_WR_Byte &rArr; Write_IIC_Data &rArr; Write_IIC_Byte
</UL> </UL>
<BR>[Calls]<UL><LI><a href="#[4d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;delay_ms <BR>[Calls]<UL><LI><a href="#[4d]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;delay_ms

2
stm32/OBJ/Template_Target 1.dep
Unescape View File

@ -1,5 +1,5 @@
Dependencies for Project 'Template', Target 'Target 1': (DO NOT MODIFY !) Dependencies for Project 'Template', Target 'Target 1': (DO NOT MODIFY !)
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) F (.\main.c)(0x627D11C7)(-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 (..\HARDWARE\LED\led.h)(0x62599D88)
I (..\SYSTEM\sys\sys.h)(0x6256947A) I (..\SYSTEM\sys\sys.h)(0x6256947A)
I (..\USER\stm32f10x.h)(0x6256947A) I (..\USER\stm32f10x.h)(0x6256947A)

BIN
stm32/OBJ/main.crf
View File

Binary file not shown.

BIN
stm32/OBJ/main.o
View File

Binary file not shown.

1074
stm32/USER/Template.map
View File

File diff suppressed because it is too large Load Diff

58
stm32/USER/Template.uvguix.QY
View File

File diff suppressed because one or more lines are too long

2
stm32/USER/main.c
Unescape View File

@ -443,7 +443,7 @@ void TaskProcessing()
// 获取水温 // 获取水温
userInfo.water_temp = DS18B20_Get_Temp() / 10; userInfo.water_temp = DS18B20_Get_Temp() / 10;
num = Get_Adc_Average(ADC_Channel_1,10); num = Get_Adc_Average(ADC_Channel_1,10);
temp = (float)num * (4.0 / 4096); // 以最高水位10cm来算 temp = (float)num * (10 / 4096 / 3.3); // 以最高水位10cm来算
userInfo.water_level = temp; userInfo.water_level = temp;
// 获取加热棒状态 // 获取加热棒状态
userInfo.Heating_state = HOT; userInfo.Heating_state = HOT;

Write Preview
Loading…
Cancel
Save