连接阿里云,上报环境参数
before_die
kafeijiaasamu 2 years ago
parent 368f181ebc
commit e5be2d536c

@ -135,7 +135,7 @@ void USART1_IRQHandler(void)
if(USART_GetITStatus(USART1, USART_IT_RXNE) != RESET) //接收到数据 if(USART_GetITStatus(USART1, USART_IT_RXNE) != RESET) //接收到数据
{ {
res =USART_ReceiveData(USART1); //读取接收到的数据 res =USART_ReceiveData(USART1); //读取接收到的数据
if(RS485_RX_CNT<64) if(RS485_RX_CNT<128)
{ {
RS485_RX_BUF[RS485_RX_CNT]=res; //记录接收到的值 RS485_RX_BUF[RS485_RX_CNT]=res; //记录接收到的值
RS485_RX_CNT++; //接收数据增加1 RS485_RX_CNT++; //接收数据增加1

@ -201,7 +201,7 @@ uint8 do_mqtt(SOCKET Socket,uint8 *sip,uint16 sport,uint16 lport){ //sportԴ
rlen=getSn_RX_RSR(Socket);//获取socketRX接收大小 rlen=getSn_RX_RSR(Socket);//获取socketRX接收大小
if(rlen>0){ if(rlen>0){
recv(Socket,buf,rlen); recv(Socket,buf,rlen);
switch(mqtt_decode_msg(buf)){ switch(mqtt_decode_msg(buf)){//解析收到的ACK报文
case PUBLISH: case PUBLISH:
dealPublish(Socket,buf,rlen); dealPublish(Socket,buf,rlen);
break; break;

Binary file not shown.

@ -27,9 +27,9 @@ Project File Date: 11/19/2023
<h2>Output:</h2> <h2>Output:</h2>
*** Using Compiler 'V5.06 update 7 (build 960)', folder: 'D:\MDK5\ARM\ARMCC\Bin' *** Using Compiler 'V5.06 update 7 (build 960)', folder: 'D:\MDK5\ARM\ARMCC\Bin'
Build target 'LED' Build target 'LED'
compiling main.c... compiling w5500api.c...
linking... linking...
Program Size: Code=26140 RO-data=368 RW-data=496 ZI-data=12824 Program Size: Code=38856 RO-data=676 RW-data=1680 ZI-data=16224
FromELF: creating hex file... FromELF: creating hex file...
"..\OBJ\LED.axf" - 0 Error(s), 0 Warning(s). "..\OBJ\LED.axf" - 0 Error(s), 0 Warning(s).

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -1,7 +1,7 @@
Dependencies for Project 'control', Target 'LED': (DO NOT MODIFY !) Dependencies for Project 'control', Target 'LED': (DO NOT MODIFY !)
CompilerVersion: 5060960::V5.06 update 7 (build 960)::.\ARMCC CompilerVersion: 5060960::V5.06 update 7 (build 960)::.\ARMCC
F (.\main.c)(0x656EE284)(--c99 -c --cpu Cortex-M3 -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\USER -I ..\CORE -I ..\STM32F10x_FWLib\inc -I ..\HARDWARE -I ..\SYSTEM -I ..\dhcp -I ..\dns -I ..\md5 -I ..\MQTT -I ..\MQTT\lib -I ..\w5500 -I ..\FreeRTOS\include -I ..\FreeRTOS\portable\RVDS\ARM_CM3 -I ..\myfreertos -ID:\MDK5\ARM\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="536" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -o ..\obj\main.o --omf_browse ..\obj\main.crf --depend ..\obj\main.d) F (.\main.c)(0x656FE907)(--c99 -c --cpu Cortex-M3 -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\USER -I ..\CORE -I ..\STM32F10x_FWLib\inc -I ..\HARDWARE -I ..\SYSTEM -I ..\dhcp -I ..\dns -I ..\md5 -I ..\MQTT -I ..\MQTT\lib -I ..\w5500 -I ..\FreeRTOS\include -I ..\FreeRTOS\portable\RVDS\ARM_CM3 -I ..\myfreertos -ID:\MDK5\ARM\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="536" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -o ..\obj\main.o --omf_browse ..\obj\main.crf --depend ..\obj\main.d)
I (..\myfreertos\myfreertos.h)(0x655DC049) I (..\myfreertos\myfreertos.h)(0x656FE939)
I (..\FreeRTOS\include\FreeRTOS.h)(0x652F9ABE) I (..\FreeRTOS\include\FreeRTOS.h)(0x652F9ABE)
I (D:\MDK5\ARM\ARMCC\include\stddef.h)(0x6025237E) I (D:\MDK5\ARM\ARMCC\include\stddef.h)(0x6025237E)
I (D:\MDK5\ARM\ARMCC\include\stdint.h)(0x6025237E) I (D:\MDK5\ARM\ARMCC\include\stdint.h)(0x6025237E)
@ -55,6 +55,15 @@ I (..\HARDWARE\bufcut.h)(0x6537353D)
I (..\HARDWARE\iwdg.h)(0x64FC32D3) I (..\HARDWARE\iwdg.h)(0x64FC32D3)
I (..\HARDWARE\PID.h)(0x6559C02A) I (..\HARDWARE\PID.h)(0x6559C02A)
I (..\HARDWARE\PWMOUT.h)(0x655DCACD) I (..\HARDWARE\PWMOUT.h)(0x655DCACD)
I (..\w5500\w5500api.h)(0x650BB944)
I (..\w5500\spi.h)(0x65093ED0)
I (..\w5500\w5500.h)(0x5F374D02)
I (..\w5500\Types.h)(0x5F374D02)
I (..\w5500\socket.h)(0x5F38BA1A)
I (..\dhcp\dhcp.h)(0x5F377F9A)
I (D:\MDK5\ARM\ARMCC\include\string.h)(0x6025237E)
I (..\dns\dns.h)(0x5F377DE4)
I (..\MQTT\mqtt_api.h)(0x5F3A0FBC)
F (.\stm32f10x_it.c)(0x6528F192)(--c99 -c --cpu Cortex-M3 -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\USER -I ..\CORE -I ..\STM32F10x_FWLib\inc -I ..\HARDWARE -I ..\SYSTEM -I ..\dhcp -I ..\dns -I ..\md5 -I ..\MQTT -I ..\MQTT\lib -I ..\w5500 -I ..\FreeRTOS\include -I ..\FreeRTOS\portable\RVDS\ARM_CM3 -I ..\myfreertos -ID:\MDK5\ARM\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="536" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -o ..\obj\stm32f10x_it.o --omf_browse ..\obj\stm32f10x_it.crf --depend ..\obj\stm32f10x_it.d) F (.\stm32f10x_it.c)(0x6528F192)(--c99 -c --cpu Cortex-M3 -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\USER -I ..\CORE -I ..\STM32F10x_FWLib\inc -I ..\HARDWARE -I ..\SYSTEM -I ..\dhcp -I ..\dns -I ..\md5 -I ..\MQTT -I ..\MQTT\lib -I ..\w5500 -I ..\FreeRTOS\include -I ..\FreeRTOS\portable\RVDS\ARM_CM3 -I ..\myfreertos -ID:\MDK5\ARM\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="536" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -o ..\obj\stm32f10x_it.o --omf_browse ..\obj\stm32f10x_it.crf --depend ..\obj\stm32f10x_it.d)
I (stm32f10x_it.h)(0x4D99A427) I (stm32f10x_it.h)(0x4D99A427)
I (stm32f10x.h)(0x4D783CB5) I (stm32f10x.h)(0x4D783CB5)
@ -301,7 +310,7 @@ I (..\SYSTEM\USART.h)(0x655DAB3D)
I (D:\MDK5\ARM\ARMCC\include\stdio.h)(0x60252374) I (D:\MDK5\ARM\ARMCC\include\stdio.h)(0x60252374)
I (..\HARDWARE\rtc.h)(0x656019C4) I (..\HARDWARE\rtc.h)(0x656019C4)
I (..\SYSTEM\SysTick.h)(0x6530E176) I (..\SYSTEM\SysTick.h)(0x6530E176)
I (..\myfreertos\myfreertos.h)(0x655DC049) I (..\myfreertos\myfreertos.h)(0x656FE939)
I (..\FreeRTOS\include\FreeRTOS.h)(0x652F9ABE) I (..\FreeRTOS\include\FreeRTOS.h)(0x652F9ABE)
I (D:\MDK5\ARM\ARMCC\include\stddef.h)(0x6025237E) I (D:\MDK5\ARM\ARMCC\include\stddef.h)(0x6025237E)
I (..\FreeRTOS\include\FreeRTOSConfig.h)(0x652FA69D) I (..\FreeRTOS\include\FreeRTOSConfig.h)(0x652FA69D)
@ -321,6 +330,15 @@ I (..\HARDWARE\bufcut.h)(0x6537353D)
I (..\HARDWARE\iwdg.h)(0x64FC32D3) I (..\HARDWARE\iwdg.h)(0x64FC32D3)
I (..\HARDWARE\PID.h)(0x6559C02A) I (..\HARDWARE\PID.h)(0x6559C02A)
I (..\HARDWARE\PWMOUT.h)(0x655DCACD) I (..\HARDWARE\PWMOUT.h)(0x655DCACD)
I (..\w5500\w5500api.h)(0x650BB944)
I (..\w5500\spi.h)(0x65093ED0)
I (..\w5500\w5500.h)(0x5F374D02)
I (..\w5500\Types.h)(0x5F374D02)
I (..\w5500\socket.h)(0x5F38BA1A)
I (..\dhcp\dhcp.h)(0x5F377F9A)
I (D:\MDK5\ARM\ARMCC\include\string.h)(0x6025237E)
I (..\dns\dns.h)(0x5F377DE4)
I (..\MQTT\mqtt_api.h)(0x5F3A0FBC)
F (..\HARDWARE\write.h)(0x6566B585)() F (..\HARDWARE\write.h)(0x6566B585)()
F (..\HARDWARE\OSC.c)(0x6530E183)(--c99 -c --cpu Cortex-M3 -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\USER -I ..\CORE -I ..\STM32F10x_FWLib\inc -I ..\HARDWARE -I ..\SYSTEM -I ..\dhcp -I ..\dns -I ..\md5 -I ..\MQTT -I ..\MQTT\lib -I ..\w5500 -I ..\FreeRTOS\include -I ..\FreeRTOS\portable\RVDS\ARM_CM3 -I ..\myfreertos -ID:\MDK5\ARM\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="536" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -o ..\obj\osc.o --omf_browse ..\obj\osc.crf --depend ..\obj\osc.d) F (..\HARDWARE\OSC.c)(0x6530E183)(--c99 -c --cpu Cortex-M3 -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\USER -I ..\CORE -I ..\STM32F10x_FWLib\inc -I ..\HARDWARE -I ..\SYSTEM -I ..\dhcp -I ..\dns -I ..\md5 -I ..\MQTT -I ..\MQTT\lib -I ..\w5500 -I ..\FreeRTOS\include -I ..\FreeRTOS\portable\RVDS\ARM_CM3 -I ..\myfreertos -ID:\MDK5\ARM\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="536" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -o ..\obj\osc.o --omf_browse ..\obj\osc.crf --depend ..\obj\osc.d)
I (..\USER\stm32f10x.h)(0x4D783CB5) I (..\USER\stm32f10x.h)(0x4D783CB5)
@ -356,7 +374,7 @@ I (..\SYSTEM\system.h)(0x64BC0671)
I (D:\MDK5\ARM\ARMCC\include\stdio.h)(0x60252374) I (D:\MDK5\ARM\ARMCC\include\stdio.h)(0x60252374)
I (..\SYSTEM\SysTick.h)(0x6530E176) I (..\SYSTEM\SysTick.h)(0x6530E176)
F (..\HARDWARE\OSC.h)(0x64E6C94A)() F (..\HARDWARE\OSC.h)(0x64E6C94A)()
F (..\HARDWARE\rs485.c)(0x656E9F55)(--c99 -c --cpu Cortex-M3 -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\USER -I ..\CORE -I ..\STM32F10x_FWLib\inc -I ..\HARDWARE -I ..\SYSTEM -I ..\dhcp -I ..\dns -I ..\md5 -I ..\MQTT -I ..\MQTT\lib -I ..\w5500 -I ..\FreeRTOS\include -I ..\FreeRTOS\portable\RVDS\ARM_CM3 -I ..\myfreertos -ID:\MDK5\ARM\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="536" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -o ..\obj\rs485.o --omf_browse ..\obj\rs485.crf --depend ..\obj\rs485.d) F (..\HARDWARE\rs485.c)(0x656FE31F)(--c99 -c --cpu Cortex-M3 -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\USER -I ..\CORE -I ..\STM32F10x_FWLib\inc -I ..\HARDWARE -I ..\SYSTEM -I ..\dhcp -I ..\dns -I ..\md5 -I ..\MQTT -I ..\MQTT\lib -I ..\w5500 -I ..\FreeRTOS\include -I ..\FreeRTOS\portable\RVDS\ARM_CM3 -I ..\myfreertos -ID:\MDK5\ARM\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="536" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -o ..\obj\rs485.o --omf_browse ..\obj\rs485.crf --depend ..\obj\rs485.d)
I (..\HARDWARE\rs485.h)(0x656565E2) I (..\HARDWARE\rs485.h)(0x656565E2)
I (..\USER\stm32f10x.h)(0x4D783CB5) I (..\USER\stm32f10x.h)(0x4D783CB5)
I (..\CORE\core_cm3.h)(0x4D523B58) I (..\CORE\core_cm3.h)(0x4D523B58)
@ -391,7 +409,7 @@ I (..\SYSTEM\system.h)(0x64BC0671)
I (..\SYSTEM\USART.h)(0x655DAB3D) I (..\SYSTEM\USART.h)(0x655DAB3D)
I (D:\MDK5\ARM\ARMCC\include\stdio.h)(0x60252374) I (D:\MDK5\ARM\ARMCC\include\stdio.h)(0x60252374)
I (..\HARDWARE\Relays.h)(0x6559CD68) I (..\HARDWARE\Relays.h)(0x6559CD68)
I (..\myfreertos\myfreertos.h)(0x655DC049) I (..\myfreertos\myfreertos.h)(0x656FE939)
I (..\FreeRTOS\include\FreeRTOS.h)(0x652F9ABE) I (..\FreeRTOS\include\FreeRTOS.h)(0x652F9ABE)
I (D:\MDK5\ARM\ARMCC\include\stddef.h)(0x6025237E) I (D:\MDK5\ARM\ARMCC\include\stddef.h)(0x6025237E)
I (..\FreeRTOS\include\FreeRTOSConfig.h)(0x652FA69D) I (..\FreeRTOS\include\FreeRTOSConfig.h)(0x652FA69D)
@ -411,6 +429,15 @@ I (..\HARDWARE\bufcut.h)(0x6537353D)
I (..\HARDWARE\iwdg.h)(0x64FC32D3) I (..\HARDWARE\iwdg.h)(0x64FC32D3)
I (..\HARDWARE\PID.h)(0x6559C02A) I (..\HARDWARE\PID.h)(0x6559C02A)
I (..\HARDWARE\PWMOUT.h)(0x655DCACD) I (..\HARDWARE\PWMOUT.h)(0x655DCACD)
I (..\w5500\w5500api.h)(0x650BB944)
I (..\w5500\spi.h)(0x65093ED0)
I (..\w5500\w5500.h)(0x5F374D02)
I (..\w5500\Types.h)(0x5F374D02)
I (..\w5500\socket.h)(0x5F38BA1A)
I (..\dhcp\dhcp.h)(0x5F377F9A)
I (D:\MDK5\ARM\ARMCC\include\string.h)(0x6025237E)
I (..\dns\dns.h)(0x5F377DE4)
I (..\MQTT\mqtt_api.h)(0x5F3A0FBC)
F (..\HARDWARE\rs485.h)(0x656565E2)() F (..\HARDWARE\rs485.h)(0x656565E2)()
F (..\HARDWARE\rtc.c)(0x656ECFB0)(--c99 -c --cpu Cortex-M3 -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\USER -I ..\CORE -I ..\STM32F10x_FWLib\inc -I ..\HARDWARE -I ..\SYSTEM -I ..\dhcp -I ..\dns -I ..\md5 -I ..\MQTT -I ..\MQTT\lib -I ..\w5500 -I ..\FreeRTOS\include -I ..\FreeRTOS\portable\RVDS\ARM_CM3 -I ..\myfreertos -ID:\MDK5\ARM\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="536" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -o ..\obj\rtc.o --omf_browse ..\obj\rtc.crf --depend ..\obj\rtc.d) F (..\HARDWARE\rtc.c)(0x656ECFB0)(--c99 -c --cpu Cortex-M3 -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\USER -I ..\CORE -I ..\STM32F10x_FWLib\inc -I ..\HARDWARE -I ..\SYSTEM -I ..\dhcp -I ..\dns -I ..\md5 -I ..\MQTT -I ..\MQTT\lib -I ..\w5500 -I ..\FreeRTOS\include -I ..\FreeRTOS\portable\RVDS\ARM_CM3 -I ..\myfreertos -ID:\MDK5\ARM\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="536" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -o ..\obj\rtc.o --omf_browse ..\obj\rtc.crf --depend ..\obj\rtc.d)
I (..\SYSTEM\system.h)(0x64BC0671) I (..\SYSTEM\system.h)(0x64BC0671)
@ -1480,7 +1507,7 @@ I (..\STM32F10x_FWLib\inc\stm32f10x_usart.h)(0x504F415F)
I (..\STM32F10x_FWLib\inc\stm32f10x_wwdg.h)(0x4D783BB4) I (..\STM32F10x_FWLib\inc\stm32f10x_wwdg.h)(0x4D783BB4)
I (..\STM32F10x_FWLib\inc\misc.h)(0x4D783BB4) I (..\STM32F10x_FWLib\inc\misc.h)(0x4D783BB4)
I (..\w5500\Types.h)(0x5F374D02) I (..\w5500\Types.h)(0x5F374D02)
F (..\w5500\w5500api.c)(0x65095A9E)(--c99 -c --cpu Cortex-M3 -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\USER -I ..\CORE -I ..\STM32F10x_FWLib\inc -I ..\HARDWARE -I ..\SYSTEM -I ..\dhcp -I ..\dns -I ..\md5 -I ..\MQTT -I ..\MQTT\lib -I ..\w5500 -I ..\FreeRTOS\include -I ..\FreeRTOS\portable\RVDS\ARM_CM3 -I ..\myfreertos -ID:\MDK5\ARM\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="536" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -o ..\obj\w5500api.o --omf_browse ..\obj\w5500api.crf --depend ..\obj\w5500api.d) F (..\w5500\w5500api.c)(0x65703ECA)(--c99 -c --cpu Cortex-M3 -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\USER -I ..\CORE -I ..\STM32F10x_FWLib\inc -I ..\HARDWARE -I ..\SYSTEM -I ..\dhcp -I ..\dns -I ..\md5 -I ..\MQTT -I ..\MQTT\lib -I ..\w5500 -I ..\FreeRTOS\include -I ..\FreeRTOS\portable\RVDS\ARM_CM3 -I ..\myfreertos -ID:\MDK5\ARM\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="536" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -o ..\obj\w5500api.o --omf_browse ..\obj\w5500api.crf --depend ..\obj\w5500api.d)
I (..\w5500\w5500api.h)(0x650BB944) I (..\w5500\w5500api.h)(0x650BB944)
I (..\SYSTEM\SysTick.h)(0x6530E176) I (..\SYSTEM\SysTick.h)(0x6530E176)
I (..\SYSTEM\system.h)(0x64BC0671) I (..\SYSTEM\system.h)(0x64BC0671)
@ -1517,6 +1544,10 @@ I (..\w5500\w5500.h)(0x5F374D02)
I (..\w5500\Types.h)(0x5F374D02) I (..\w5500\Types.h)(0x5F374D02)
I (..\w5500\socket.h)(0x5F38BA1A) I (..\w5500\socket.h)(0x5F38BA1A)
I (D:\MDK5\ARM\ARMCC\include\string.h)(0x6025237E) I (D:\MDK5\ARM\ARMCC\include\string.h)(0x6025237E)
I (..\dhcp\dhcp.h)(0x5F377F9A)
I (D:\MDK5\ARM\ARMCC\include\stdio.h)(0x60252374)
I (..\dns\dns.h)(0x5F377DE4)
I (..\MQTT\mqtt_api.h)(0x5F3A0FBC)
F (..\dns\dns.c)(0x5F37F046)(--c99 -c --cpu Cortex-M3 -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\USER -I ..\CORE -I ..\STM32F10x_FWLib\inc -I ..\HARDWARE -I ..\SYSTEM -I ..\dhcp -I ..\dns -I ..\md5 -I ..\MQTT -I ..\MQTT\lib -I ..\w5500 -I ..\FreeRTOS\include -I ..\FreeRTOS\portable\RVDS\ARM_CM3 -I ..\myfreertos -ID:\MDK5\ARM\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="536" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -o ..\obj\dns.o --omf_browse ..\obj\dns.crf --depend ..\obj\dns.d) F (..\dns\dns.c)(0x5F37F046)(--c99 -c --cpu Cortex-M3 -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\USER -I ..\CORE -I ..\STM32F10x_FWLib\inc -I ..\HARDWARE -I ..\SYSTEM -I ..\dhcp -I ..\dns -I ..\md5 -I ..\MQTT -I ..\MQTT\lib -I ..\w5500 -I ..\FreeRTOS\include -I ..\FreeRTOS\portable\RVDS\ARM_CM3 -I ..\myfreertos -ID:\MDK5\ARM\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="536" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -o ..\obj\dns.o --omf_browse ..\obj\dns.crf --depend ..\obj\dns.d)
I (D:\MDK5\ARM\ARMCC\include\stdio.h)(0x60252374) I (D:\MDK5\ARM\ARMCC\include\stdio.h)(0x60252374)
I (D:\MDK5\ARM\ARMCC\include\string.h)(0x6025237E) I (D:\MDK5\ARM\ARMCC\include\string.h)(0x6025237E)
@ -2029,7 +2060,7 @@ I (..\w5500\w5500.h)(0x5F374D02)
I (..\w5500\spi.h)(0x65093ED0) I (..\w5500\spi.h)(0x65093ED0)
I (..\w5500\Types.h)(0x5F374D02) I (..\w5500\Types.h)(0x5F374D02)
I (D:\MDK5\ARM\ARMCC\include\string.h)(0x6025237E) I (D:\MDK5\ARM\ARMCC\include\string.h)(0x6025237E)
F (..\MQTT\mqtt_api.c)(0x6511448E)(--c99 -c --cpu Cortex-M3 -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\USER -I ..\CORE -I ..\STM32F10x_FWLib\inc -I ..\HARDWARE -I ..\SYSTEM -I ..\dhcp -I ..\dns -I ..\md5 -I ..\MQTT -I ..\MQTT\lib -I ..\w5500 -I ..\FreeRTOS\include -I ..\FreeRTOS\portable\RVDS\ARM_CM3 -I ..\myfreertos -ID:\MDK5\ARM\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="536" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -o ..\obj\mqtt_api.o --omf_browse ..\obj\mqtt_api.crf --depend ..\obj\mqtt_api.d) F (..\MQTT\mqtt_api.c)(0x65703086)(--c99 -c --cpu Cortex-M3 -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\USER -I ..\CORE -I ..\STM32F10x_FWLib\inc -I ..\HARDWARE -I ..\SYSTEM -I ..\dhcp -I ..\dns -I ..\md5 -I ..\MQTT -I ..\MQTT\lib -I ..\w5500 -I ..\FreeRTOS\include -I ..\FreeRTOS\portable\RVDS\ARM_CM3 -I ..\myfreertos -ID:\MDK5\ARM\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="536" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -o ..\obj\mqtt_api.o --omf_browse ..\obj\mqtt_api.crf --depend ..\obj\mqtt_api.d)
I (..\MQTT\mqtt_api.h)(0x5F3A0FBC) I (..\MQTT\mqtt_api.h)(0x5F3A0FBC)
I (..\w5500\w5500api.h)(0x650BB944) I (..\w5500\w5500api.h)(0x650BB944)
I (..\SYSTEM\SysTick.h)(0x6530E176) I (..\SYSTEM\SysTick.h)(0x6530E176)
@ -2474,8 +2505,8 @@ I (..\FreeRTOS\portable\RVDS\ARM_CM3\portmacro.h)(0x573F3A17)
I (..\FreeRTOS\include\mpu_wrappers.h)(0x573F3A16) I (..\FreeRTOS\include\mpu_wrappers.h)(0x573F3A16)
I (..\FreeRTOS\include\task.h)(0x573F3A16) I (..\FreeRTOS\include\task.h)(0x573F3A16)
I (..\FreeRTOS\include\list.h)(0x573F3A16) I (..\FreeRTOS\include\list.h)(0x573F3A16)
F (..\myfreertos\myfreertos.c)(0x656EDFD6)(--c99 -c --cpu Cortex-M3 -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\USER -I ..\CORE -I ..\STM32F10x_FWLib\inc -I ..\HARDWARE -I ..\SYSTEM -I ..\dhcp -I ..\dns -I ..\md5 -I ..\MQTT -I ..\MQTT\lib -I ..\w5500 -I ..\FreeRTOS\include -I ..\FreeRTOS\portable\RVDS\ARM_CM3 -I ..\myfreertos -ID:\MDK5\ARM\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="536" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -o ..\obj\myfreertos.o --omf_browse ..\obj\myfreertos.crf --depend ..\obj\myfreertos.d) F (..\myfreertos\myfreertos.c)(0x656FECAF)(--c99 -c --cpu Cortex-M3 -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\USER -I ..\CORE -I ..\STM32F10x_FWLib\inc -I ..\HARDWARE -I ..\SYSTEM -I ..\dhcp -I ..\dns -I ..\md5 -I ..\MQTT -I ..\MQTT\lib -I ..\w5500 -I ..\FreeRTOS\include -I ..\FreeRTOS\portable\RVDS\ARM_CM3 -I ..\myfreertos -ID:\MDK5\ARM\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="536" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -o ..\obj\myfreertos.o --omf_browse ..\obj\myfreertos.crf --depend ..\obj\myfreertos.d)
I (..\myfreertos\myfreertos.h)(0x655DC049) I (..\myfreertos\myfreertos.h)(0x656FE939)
I (..\FreeRTOS\include\FreeRTOS.h)(0x652F9ABE) I (..\FreeRTOS\include\FreeRTOS.h)(0x652F9ABE)
I (D:\MDK5\ARM\ARMCC\include\stddef.h)(0x6025237E) I (D:\MDK5\ARM\ARMCC\include\stddef.h)(0x6025237E)
I (D:\MDK5\ARM\ARMCC\include\stdint.h)(0x6025237E) I (D:\MDK5\ARM\ARMCC\include\stdint.h)(0x6025237E)
@ -2529,4 +2560,13 @@ I (..\HARDWARE\bufcut.h)(0x6537353D)
I (..\HARDWARE\iwdg.h)(0x64FC32D3) I (..\HARDWARE\iwdg.h)(0x64FC32D3)
I (..\HARDWARE\PID.h)(0x6559C02A) I (..\HARDWARE\PID.h)(0x6559C02A)
I (..\HARDWARE\PWMOUT.h)(0x655DCACD) I (..\HARDWARE\PWMOUT.h)(0x655DCACD)
F (..\myfreertos\myfreertos.h)(0x655DC049)() I (..\w5500\w5500api.h)(0x650BB944)
I (..\w5500\spi.h)(0x65093ED0)
I (..\w5500\w5500.h)(0x5F374D02)
I (..\w5500\Types.h)(0x5F374D02)
I (..\w5500\socket.h)(0x5F38BA1A)
I (..\dhcp\dhcp.h)(0x5F377F9A)
I (D:\MDK5\ARM\ARMCC\include\string.h)(0x6025237E)
I (..\dns\dns.h)(0x5F377DE4)
I (..\MQTT\mqtt_api.h)(0x5F3A0FBC)
F (..\myfreertos\myfreertos.h)(0x656FE939)()

Binary file not shown.

@ -54,3 +54,12 @@
..\obj\main.o: ..\HARDWARE\iwdg.h ..\obj\main.o: ..\HARDWARE\iwdg.h
..\obj\main.o: ..\HARDWARE\PID.h ..\obj\main.o: ..\HARDWARE\PID.h
..\obj\main.o: ..\HARDWARE\PWMOUT.h ..\obj\main.o: ..\HARDWARE\PWMOUT.h
..\obj\main.o: ..\w5500\w5500api.h
..\obj\main.o: ..\w5500\spi.h
..\obj\main.o: ..\w5500\w5500.h
..\obj\main.o: ..\w5500\Types.h
..\obj\main.o: ..\w5500\socket.h
..\obj\main.o: ..\dhcp\dhcp.h
..\obj\main.o: D:\MDK5\ARM\ARMCC\Bin\..\include\string.h
..\obj\main.o: ..\dns\dns.h
..\obj\main.o: ..\MQTT\mqtt_api.h

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

@ -54,3 +54,12 @@
..\obj\myfreertos.o: ..\HARDWARE\iwdg.h ..\obj\myfreertos.o: ..\HARDWARE\iwdg.h
..\obj\myfreertos.o: ..\HARDWARE\PID.h ..\obj\myfreertos.o: ..\HARDWARE\PID.h
..\obj\myfreertos.o: ..\HARDWARE\PWMOUT.h ..\obj\myfreertos.o: ..\HARDWARE\PWMOUT.h
..\obj\myfreertos.o: ..\w5500\w5500api.h
..\obj\myfreertos.o: ..\w5500\spi.h
..\obj\myfreertos.o: ..\w5500\w5500.h
..\obj\myfreertos.o: ..\w5500\Types.h
..\obj\myfreertos.o: ..\w5500\socket.h
..\obj\myfreertos.o: ..\dhcp\dhcp.h
..\obj\myfreertos.o: D:\MDK5\ARM\ARMCC\Bin\..\include\string.h
..\obj\myfreertos.o: ..\dns\dns.h
..\obj\myfreertos.o: ..\MQTT\mqtt_api.h

Binary file not shown.

Binary file not shown.

@ -54,3 +54,12 @@
..\obj\rs485.o: ..\HARDWARE\iwdg.h ..\obj\rs485.o: ..\HARDWARE\iwdg.h
..\obj\rs485.o: ..\HARDWARE\PID.h ..\obj\rs485.o: ..\HARDWARE\PID.h
..\obj\rs485.o: ..\HARDWARE\PWMOUT.h ..\obj\rs485.o: ..\HARDWARE\PWMOUT.h
..\obj\rs485.o: ..\w5500\w5500api.h
..\obj\rs485.o: ..\w5500\spi.h
..\obj\rs485.o: ..\w5500\w5500.h
..\obj\rs485.o: ..\w5500\Types.h
..\obj\rs485.o: ..\w5500\socket.h
..\obj\rs485.o: ..\dhcp\dhcp.h
..\obj\rs485.o: D:\MDK5\ARM\ARMCC\Bin\..\include\string.h
..\obj\rs485.o: ..\dns\dns.h
..\obj\rs485.o: ..\MQTT\mqtt_api.h

Binary file not shown.

Binary file not shown.

@ -36,3 +36,7 @@
..\obj\w5500api.o: ..\w5500\Types.h ..\obj\w5500api.o: ..\w5500\Types.h
..\obj\w5500api.o: ..\w5500\socket.h ..\obj\w5500api.o: ..\w5500\socket.h
..\obj\w5500api.o: D:\MDK5\ARM\ARMCC\Bin\..\include\string.h ..\obj\w5500api.o: D:\MDK5\ARM\ARMCC\Bin\..\include\string.h
..\obj\w5500api.o: ..\dhcp\dhcp.h
..\obj\w5500api.o: D:\MDK5\ARM\ARMCC\Bin\..\include\stdio.h
..\obj\w5500api.o: ..\dns\dns.h
..\obj\w5500api.o: ..\MQTT\mqtt_api.h

Binary file not shown.

Binary file not shown.

@ -54,3 +54,12 @@
..\obj\write.o: ..\HARDWARE\iwdg.h ..\obj\write.o: ..\HARDWARE\iwdg.h
..\obj\write.o: ..\HARDWARE\PID.h ..\obj\write.o: ..\HARDWARE\PID.h
..\obj\write.o: ..\HARDWARE\PWMOUT.h ..\obj\write.o: ..\HARDWARE\PWMOUT.h
..\obj\write.o: ..\w5500\w5500api.h
..\obj\write.o: ..\w5500\spi.h
..\obj\write.o: ..\w5500\w5500.h
..\obj\write.o: ..\w5500\Types.h
..\obj\write.o: ..\w5500\socket.h
..\obj\write.o: ..\dhcp\dhcp.h
..\obj\write.o: D:\MDK5\ARM\ARMCC\Bin\..\include\string.h
..\obj\write.o: ..\dns\dns.h
..\obj\write.o: ..\MQTT\mqtt_api.h

Binary file not shown.

File diff suppressed because it is too large Load Diff

File diff suppressed because one or more lines are too long

@ -307,7 +307,7 @@
<Group> <Group>
<GroupName>HARDWARE</GroupName> <GroupName>HARDWARE</GroupName>
<tvExp>1</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
@ -603,7 +603,7 @@
<Group> <Group>
<GroupName>SYSTEM</GroupName> <GroupName>SYSTEM</GroupName>
<tvExp>1</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
@ -1287,7 +1287,7 @@
<Group> <Group>
<GroupName>W5500</GroupName> <GroupName>W5500</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
@ -1355,7 +1355,7 @@
<Group> <Group>
<GroupName>DNS</GroupName> <GroupName>DNS</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
@ -1375,7 +1375,7 @@
<Group> <Group>
<GroupName>DHCP</GroupName> <GroupName>DHCP</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
@ -1395,7 +1395,7 @@
<Group> <Group>
<GroupName>MQTT</GroupName> <GroupName>MQTT</GroupName>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel> <cbSel>0</cbSel>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>

@ -37,9 +37,9 @@ int main(void)
PWM_SetCompare2(30);//J12 PWM_SetCompare2(30);//J12
PWM_SetCompare4(30);//J11 PWM_SetCompare4(30);//J11
//init_Net();//网络初始化 init_Net();//网络初始化
//printf("init_Net OK"); printf("init_Net OK");
//while(!do_dns((u8 *)"hp8oQhMZJ67.iot-as-mqtt.cn-shanghai.aliyuncs.com"));//网域名称 while(!do_dns((u8 *)"hp8oQhMZJ67.iot-as-mqtt.cn-shanghai.aliyuncs.com"));//网域名称
os_init(); os_init();
while(1) while(1)
{ {

@ -1,13 +1,13 @@
#include "myfreertos.h" #include "myfreertos.h"
//char pubTopic[512]="/sys/hp8oQhMZJ67/Device1/thing/event/property/post";//发布的主题 char pubTopic[512]="/sys/hp8oQhMZJ67/Device1/thing/event/property/post";//发布的主题
//char subTopic[512]="/sys/hp8oQhMZJ67/Device1/thing/service/property/set";//订阅的主题 char subTopic[512]="/sys/hp8oQhMZJ67/Device1/thing/service/property/set";//订阅的主题
//#define MQTT_SOCK 5 #define MQTT_SOCK 5
//u8 cnt_flag=0,sub_flag=0,pub_flag=0;
//u16 time=0;//记录ping服务器的时间
u8 cnt_flag=0,sub_flag=0,pub_flag=0;
u16 time=0;//记录ping服务器的时间
char wet_temp[256];//订阅与发布消息的缓存区
u8 store_stage=1;//写入flash的阶段号断电重启后读取可以紧接着上次的阶段运行 u8 store_stage=1;//写入flash的阶段号断电重启后读取可以紧接着上次的阶段运行
extern PID pid; extern PID pid;
extern float kd; extern float kd;
@ -32,7 +32,6 @@ u8 change_stage_rev1=0;
u8 change_stage_rev2=0; u8 change_stage_rev2=0;
u8 change_stage_rev3=0; u8 change_stage_rev3=0;
u8 rs485buf[8]={0x01,0x03,0x00,0x01,0x00,0x09,0xD4,0x0C};//传感器交换数据 u8 rs485buf[8]={0x01,0x03,0x00,0x01,0x00,0x09,0xD4,0x0C};//传感器交换数据
//char temp[256];//订阅与发布消息的缓存区
int T=0,H=0,C=0,G=0, current_T=0; int T=0,H=0,C=0,G=0, current_T=0;
extern u8 total[]; extern u8 total[];
float Humidity=0; float Humidity=0;
@ -140,6 +139,19 @@ void Sensor_Communication_task(void *pvParameters)
while(1) while(1)
{ {
cnt_flag=do_mqtt(MQTT_SOCK,NET_CONFIG.rip,1883,5500);
Humidity=H*0.1;
temperature=T*0.1;
delay_ms(50);
sprintf(wet_temp,"{\"method\":\"thing.event.property.post\",\"params\":{\"Humidity\":%.2f,\"temperature\":%.2f,\"CO2\":%d},\"version\":\"1.0.0\"}",Humidity,temperature,C); //构建数据
if(cnt_flag==0){sub_flag=0;pub_flag=0;time=0;}
if(cnt_flag&&sub_flag==0)sub_flag=!subscribMqtt(MQTT_SOCK,subTopic);
if(cnt_flag&&sub_flag&&pub_flag==0)pub_flag=!publishMqtt(MQTT_SOCK,pubTopic,wet_temp);
if(cnt_flag)time++;
if(time==50){
time=0;
pingMqtt(MQTT_SOCK);
}
now_stage=timelong_Compare();// now_stage=timelong_Compare();//
printf("%d %d\r\n",chour,cminute); printf("%d %d\r\n",chour,cminute);
Array(&now_stage,&hour,&min,&tem,&hum,&red,&blue,&white);//更新对应阶段号的参数 Array(&now_stage,&hour,&min,&tem,&hum,&red,&blue,&white);//更新对应阶段号的参数

@ -18,10 +18,10 @@
#include "iwdg.h" #include "iwdg.h"
#include "PID.h" #include "PID.h"
#include "PWMOUT.h" #include "PWMOUT.h"
//#include "w5500api.h" #include "w5500api.h"
//#include "dhcp.h" #include "dhcp.h"
//#include "dns.h" #include "dns.h"
//#include "mqtt_api.h" #include "mqtt_api.h"
void os_init(void); void os_init(void);
#endif #endif

@ -1,6 +1,9 @@
#include "w5500api.h" #include "w5500api.h"
#include <string.h> #include <string.h>
#include "w5500api.h"
#include "dhcp.h"
#include "dns.h"
#include "mqtt_api.h"
W5500_CONFIG NET_CONFIG; W5500_CONFIG NET_CONFIG;
uint8 txsize[MAX_SOCK_NUM] = {2,2,2,2,2,2,2,2}; uint8 txsize[MAX_SOCK_NUM] = {2,2,2,2,2,2,2,2};
@ -18,7 +21,7 @@ void Reset_W5500(void){
GPIO_ResetBits(GPIOA, GPIO_Pin_15); GPIO_ResetBits(GPIOA, GPIO_Pin_15);
delay_us(500); delay_us(500);
GPIO_SetBits(GPIOA, GPIO_Pin_15); GPIO_SetBits(GPIOA, GPIO_Pin_15);
delay_ms(1600); delay_ms(500);
} }
void put_defaultNet(void){ void put_defaultNet(void){
@ -81,7 +84,23 @@ void init_W5500(void){
GPIO_Init(GPIOA, &GPIO_InitStructure); GPIO_Init(GPIOA, &GPIO_InitStructure);
GPIO_SetBits(GPIOA, GPIO_Pin_15); GPIO_SetBits(GPIOA, GPIO_Pin_15);
WIZ_SPI_Init(); WIZ_SPI_Init();
Reset_W5500();/*Ó²ÖØÆôW5500*/ //Reset_W5500();/*硬重启W5500*/
put_defaultNet(); put_defaultNet();
} }
void init_Net(void){
u8 try_times=0;
init_W5500();
//printf("reset\r\n");
init_dhcp_client();//初始化DHCP客户端
while(check_DHCP_state(SOCK_DHCP)!=DHCP_RET_UPDATE){
try_times++;
if(try_times==100){ //超时 重启芯片
Reset_W5500();
init_dhcp_client();
try_times=0;
}
delay_ms(5);
}
while(!set_Network());
}

Loading…
Cancel
Save