Skip to content

O
onenet_LED_TEMP

starksdf / onenet_LED_TEMP

通知 1
Star 0
Fork 0
O
onenet_LED_TEMP

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 31e418e1 编写于 作者: starksdf's avatar starksdf
浏览文件
操作

添加了看门狗,与远程设置温度额值

上级 6979fcb5
展开全部 隐藏空白更改
内联 并排
Showing with 4707 addition and 6104 deletion
HARDWARE/KEY/key.c
浏览文件 @ 31e418e1
......@@ -24,11 +24,11 @@ void KEY_Init(void)
GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE);//关闭jtag，使能SWD，可以用SWD模式调试
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_1;//PA15
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_1;//PB1
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPU; //设置成上拉输入
GPIO_Init(GPIOB, &GPIO_InitStructure);//初始化GPIOA15
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_0;//PC5
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_0;//PB0
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IPU; //设置成上拉输入
GPIO_Init(GPIOB, &GPIO_InitStructure);//初始化GPIOC5
......
HARDWARE/LED/led.c
浏览文件 @ 31e418e1
......@@ -18,7 +18,7 @@ void LED_Init(void)
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_13;
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP; //推挽输出
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; //LED1-->PE.5 端口配置, 推挽输出
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; //LED1-->PE.5 端口配置, 推挽输出
GPIO_Init(GPIOC, &GPIO_InitStructure); //推挽输出 ，IO口速度为50MHz
GPIO_SetBits(GPIOC,GPIO_Pin_13); //PE.5 输出高
......@@ -28,4 +28,16 @@ void LED_Init(void)
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; //LED1-->PE.5 端口配置, 推挽输出
GPIO_Init(GPIOA, &GPIO_InitStructure); //推挽输出 ，IO口速度为50MHz
GPIO_SetBits(GPIOA,GPIO_Pin_1); //PE.5 输出高
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_15;
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP; //推挽输出
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; //LED3-->PE.5 端口配置, 推挽输出
GPIO_Init(GPIOC, &GPIO_InitStructure); //推挽输出 ，IO口速度为50MHz
GPIO_SetBits(GPIOC,GPIO_Pin_15);
GPIO_InitStructure.GPIO_Pin = GPIO_Pin_11;
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP; //推挽输出
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz; //LED2-->PE.5 端口配置, 推挽输出
GPIO_Init(GPIOA, &GPIO_InitStructure); //推挽输出 ，IO口速度为50MHz
GPIO_SetBits(GPIOA,GPIO_Pin_11);
}
HARDWARE/LED/led.h
浏览文件 @ 31e418e1
......@@ -16,6 +16,8 @@
#define LED0 PAout(4) // PA4
#define LED1 PCout(13) // PC13
#define beep PAout(1) // PA0
#define LED2 PAout(11) // PA0
#define LED3 PCout(15) // PA0
void LED_Init(void);//初始化
......
NET/ONENET/onenet.c
浏览文件 @ 31e418e1
/**
**********************************************************************
**********************************************************************
**********************************************************************
* 文件名： onenet.c
* 作者： zh
* 日期：
* 版本： V1.1
* 说明： 与onenet平台的数据交互接口层
* 修改记录：
*
**********************************************************************
**********************************************************************
**********************************************************************
**/
//单片机头文件
#include "stm32f10x.h"
......@@ -108,6 +93,8 @@ _Bool OneNet_DevLink(void)
extern bool ledst;
extern bool beepst;
extern double temperature;
u8 tempmax0 = 50;
u8 humimax0 = 50;
//访问ONENET需要提交JSON数据，就获取到的温湿度转换为JSON数据形式
//unsigned char MqttOnenet_Savedata(char *t_payload)
//{
......@@ -145,14 +132,20 @@ unsigned char OneNet_FillBuf(char *buf)
strcat(buf, text);
memset(text, 0, sizeof(text));
sprintf(text, "\"bee\":{\"value\":%s},", beepst ? "true" :"false");
sprintf(text, "\"humimax\":{\"value\":%d}," ,humimax0);
strcat(buf, text);
memset(text, 0, sizeof(text));
sprintf(text, "\"led\":{\"value\":%s}", ledst ? "true" :"false");
sprintf(text, "\"tempmax\":{\"value\":%d}," ,tempmax0);
strcat(buf, text);
memset(text, 0, sizeof(text));
sprintf(text, "\"bee\":{\"value\":%s},", beepst ? "true" :"false");
strcat(buf, text);
memset(text, 0, sizeof(text));
sprintf(text, "\"led\":{\"value\":%s}", ledst ? "true" :"false");
strcat(buf, text);
strcat(buf, "}}");
......@@ -169,7 +162,7 @@ void OneNet_SendData(void)
short body_len = 0, i = 0;
UsartPrintf(USART_DEBUG, "Tips: OneNet_SendData-MQTT\r\n");
// UsartPrintf(USART_DEBUG, "Tips: OneNet_SendData-MQTT\r\n");
memset(buf, 0, sizeof(buf));
......@@ -275,6 +268,9 @@ void OneNET_Subscribe(void)
//
// 说明：
//==========================================================
void OneNet_RevPro(unsigned char *cmd)
{
......@@ -282,7 +278,7 @@ void OneNet_RevPro(unsigned char *cmd)
char *req_payload = NULL;
char *cmdid_topic = NULL;
char *ptr;
unsigned char qos = 0;
static unsigned short pkt_id = 0;
......@@ -296,7 +292,7 @@ void OneNet_RevPro(unsigned char *cmd)
char *dataPtr = NULL;
char numBuf[10];
int num = 0;
cJSON *raw_json, *params_json, *led_json, *bee_json;
// cJSON *raw_json, *params_json, *led_json, *bee_json, *tempmax_json;
// cJSON *json , *json_value;
type = MQTT_UnPacketRecv(cmd);
......@@ -314,36 +310,109 @@ void OneNet_RevPro(unsigned char *cmd)
// UsartPrintf(USART_DEBUG,"尝试接受数据<<<<<<<------------->>>>>>");
UsartPrintf(USART_DEBUG,"req: %s",req_payload);
raw_json=cJSON_Parse(req_payload);
params_json=cJSON_GetObjectItem(raw_json,"params");
led_json=cJSON_GetObjectItem(params_json,"led");
bee_json=cJSON_GetObjectItem(params_json,"bee");
if(led_json != NULL){
if(led_json->type == cJSON_True)
{
LED0 = 0;
}
else
{
LED0 = 1;
}
}
if(bee_json != NULL){
if(bee_json->type == cJSON_True)
{
alarmflag = 1;
alarmisfree = 0;
}
else
{
alarmflag = 0;
}
}
// UsartPrintf(USART_DEBUG,"蜂鸣器1 : %d",alarmflag);
cJSON_Delete(raw_json);
ptr = strstr(req_payload, "\"humimax\":");
if (ptr != NULL) {
int humimax;
sscanf(ptr, "\"humimax\":%d", &humimax);
humimax0 = humimax;
UsartPrintf(USART_DEBUG,"humimax: %d\n", humimax);
}
// 查找 "tempmax" 字段
ptr = strstr(req_payload, "\"tempmax\":");
if (ptr != NULL) {
int tempmax;
sscanf(ptr, "\"tempmax\":%d", &tempmax);
tempmax0 = tempmax;
UsartPrintf(USART_DEBUG,"tempmax: %d\n", tempmax);
}
// 查找 "led" 字段
ptr = strstr(req_payload, "\"led\":");
if (ptr != NULL) {
bool led;
if (strstr(ptr, "true") != NULL)
{
led = true;
}
else
{
led = false;
}
if(led)
{
LED0 = 0;
}
else
{
LED0 = 1;
}
UsartPrintf(USART_DEBUG,"灯的--%s",led ? "true" :"false");
// LED0 = 0;
}
else
{
// LED0 = 1;
}
// 查找 "bee" 字段
ptr = strstr(req_payload, "\"bee\":");
if (ptr != NULL) {
bool bee;
if (strstr(ptr, "true") != NULL)
{
bee = true;
}
else
{
bee = false;
}
if(bee)
{
alarmflag = 1;
alarmisfree = 0;
}
else
{
alarmflag = 0;
}
UsartPrintf(USART_DEBUG,"报警器的--%s",bee ? "true" :"false");
}
else
{
}
// raw_json=cJSON_Parse(req_payload);
// params_json=cJSON_GetObjectItem(raw_json,"params");
// led_json=cJSON_GetObjectItem(params_json,"led");
// bee_json=cJSON_GetObjectItem(params_json,"bee");
// tempmax_json=cJSON_GetObjectItem(params_json,"tempmax");
// if(led_json != NULL){
// if(led_json->type == cJSON_True)
// {
// LED0 = 0;
// }
// else
// {
// LED0 = 1;
// }
// }
// if(bee_json != NULL){
// if(bee_json->type == cJSON_True)
// {
// alarmflag = 1;
// alarmisfree = 0;
// }
//
// else
// {
// alarmflag = 0;
// }
// }
// UsartPrintf(USART_DEBUG,"温度最大值 : %d\n",tempmax_json);
// cJSON_Delete(raw_json);
......
OBJ/DS18B20.axf
浏览文件 @ 31e418e1
无法预览此类型文件
OBJ/DS18B20.build_log.htm
浏览文件 @ 31e418e1
......@@ -27,10 +27,6 @@ Project File Date: 05/07/2024
<h2>Output:</h2>
*** Using Compiler 'V5.06 update 5 (build 528)', folder: 'D:\new app\keli_v5\ARM\ARMCC\Bin'
Build target 'Target 1'
compiling main.c...
linking...
Program Size: Code=38134 RO-data=8822 RW-data=92 ZI-data=2932
FromELF: creating hex file...
"..\OBJ\DS18B20.axf" - 0 Error(s), 0 Warning(s).
<h2>Software Packages used:</h2>
......@@ -45,7 +41,7 @@ Package Vendor: Keil
D:\new app\keli_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.2.0\Device\Include
<h2>Collection of Component Files used:</h2>
Build Time Elapsed: 00:00:00
Build Time Elapsed: 00:00:01
</pre>
</body>
</html>
OBJ/DS18B20.hex
浏览文件 @ 31e418e1
此差异已折叠。
OBJ/DS18B20.htm
浏览文件 @ 31e418e1
因为 它太大了无法显示 source diff 。你可以改为 查看blob。
OBJ/TEMP_Target 1.dep
浏览文件 @ 31e418e1
Dependencies for Project 'TEMP', Target 'Target 1': (DO NOT MODIFY !)
F (.\main.c)(0x663907A0)(-c --cpu Cortex-M3 -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\DHT11 -I ..\NET\ESP8266 -I ..\NET\MQTT -I ..\NET\ONENET -I ..\SYSTEM\TIMER -I ..\HARDWARE\OLED -I ..\HARDWARE\KEY -I ..\NET\CJSON -I.\RTE\_Target_1 -I"D:\new app\keli_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.2.0\Device\Include" -I"D:\new app\keli_v5\ARM\CMSIS\Include" -D__UVISION_VERSION="524" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -o ..\obj\main.o --omf_browse ..\obj\main.crf --depend ..\obj\main.d)
F (.\main.c)(0x663BADEA)(-c --cpu Cortex-M3 -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\DHT11 -I ..\NET\ESP8266 -I ..\NET\MQTT -I ..\NET\ONENET -I ..\SYSTEM\TIMER -I ..\HARDWARE\OLED -I ..\HARDWARE\KEY -I ..\NET\CJSON -I.\RTE\_Target_1 -I"D:\new app\keli_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.2.0\Device\Include" -I"D:\new app\keli_v5\ARM\CMSIS\Include" -D__UVISION_VERSION="524" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -o ..\obj\main.o --omf_browse ..\obj\main.crf --depend ..\obj\main.d)
I (..\SYSTEM\delay\delay.h)(0x661EA206)
I (..\SYSTEM\sys\sys.h)(0x550F951A)
I (..\USER\stm32f10x.h)(0x4D783CB5)
......@@ -33,7 +33,7 @@ I (..\STM32F10x_FWLib\inc\misc.h)(0x4D783BB4)
I (..\SYSTEM\usart\usart.h)(0x661E5045)
I (..\NET\ONENET\onenet.h)(0x663905EC)
I (..\NET\ESP8266\esp8266.h)(0x64EEAED9)
I (..\HARDWARE\LED\led.h)(0x661E9DF9)
I (..\HARDWARE\LED\led.h)(0x663BADB4)
I (..\HARDWARE\DHT11\DHT11.h)(0x661EA116)
I (..\SYSTEM\TIMER\timer.h)(0x663905EC)
I (..\HARDWARE\OLED\oled.h)(0x663905EC)
......@@ -132,8 +132,8 @@ I (..\STM32F10x_FWLib\inc\stm32f10x_tim.h)(0x4D783BB4)
I (..\STM32F10x_FWLib\inc\stm32f10x_usart.h)(0x504F415F)
I (..\STM32F10x_FWLib\inc\stm32f10x_wwdg.h)(0x4D783BB4)
I (..\STM32F10x_FWLib\inc\misc.h)(0x4D783BB4)
F (..\HARDWARE\LED\led.c)(0x661E9DF9)(-c --cpu Cortex-M3 -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\DHT11 -I ..\NET\ESP8266 -I ..\NET\MQTT -I ..\NET\ONENET -I ..\SYSTEM\TIMER -I ..\HARDWARE\OLED -I ..\HARDWARE\KEY -I ..\NET\CJSON -I.\RTE\_Target_1 -I"D:\new app\keli_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.2.0\Device\Include" -I"D:\new app\keli_v5\ARM\CMSIS\Include" -D__UVISION_VERSION="524" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -o ..\obj\led.o --omf_browse ..\obj\led.crf --depend ..\obj\led.d)
I (..\HARDWARE\LED\led.h)(0x661E9DF9)
F (..\HARDWARE\LED\led.c)(0x663BADB4)(-c --cpu Cortex-M3 -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\DHT11 -I ..\NET\ESP8266 -I ..\NET\MQTT -I ..\NET\ONENET -I ..\SYSTEM\TIMER -I ..\HARDWARE\OLED -I ..\HARDWARE\KEY -I ..\NET\CJSON -I.\RTE\_Target_1 -I"D:\new app\keli_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.2.0\Device\Include" -I"D:\new app\keli_v5\ARM\CMSIS\Include" -D__UVISION_VERSION="524" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -o ..\obj\led.o --omf_browse ..\obj\led.crf --depend ..\obj\led.d)
I (..\HARDWARE\LED\led.h)(0x663BADB4)
I (..\SYSTEM\sys\sys.h)(0x550F951A)
I (..\USER\stm32f10x.h)(0x4D783CB5)
I (..\CORE\core_cm3.h)(0x4D523B58)
......@@ -229,7 +229,7 @@ I (..\STM32F10x_FWLib\inc\misc.h)(0x4D783BB4)
I (D:\new app\keli_v5\ARM\ARMCC\include\stdlib.h)(0x588B8344)
I (..\HARDWARE\OLED\oledfont.h)(0x663905EC)
I (..\SYSTEM\delay\delay.h)(0x661EA206)
F (..\HARDWARE\KEY\key.c)(0x663905EC)(-c --cpu Cortex-M3 -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\DHT11 -I ..\NET\ESP8266 -I ..\NET\MQTT -I ..\NET\ONENET -I ..\SYSTEM\TIMER -I ..\HARDWARE\OLED -I ..\HARDWARE\KEY -I ..\NET\CJSON -I.\RTE\_Target_1 -I"D:\new app\keli_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.2.0\Device\Include" -I"D:\new app\keli_v5\ARM\CMSIS\Include" -D__UVISION_VERSION="524" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -o ..\obj\key.o --omf_browse ..\obj\key.crf --depend ..\obj\key.d)
F (..\HARDWARE\KEY\key.c)(0x663BAE7D)(-c --cpu Cortex-M3 -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\DHT11 -I ..\NET\ESP8266 -I ..\NET\MQTT -I ..\NET\ONENET -I ..\SYSTEM\TIMER -I ..\HARDWARE\OLED -I ..\HARDWARE\KEY -I ..\NET\CJSON -I.\RTE\_Target_1 -I"D:\new app\keli_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.2.0\Device\Include" -I"D:\new app\keli_v5\ARM\CMSIS\Include" -D__UVISION_VERSION="524" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -o ..\obj\key.o --omf_browse ..\obj\key.crf --depend ..\obj\key.d)
I (..\HARDWARE\KEY\key.h)(0x663905EC)
I (..\SYSTEM\sys\sys.h)(0x550F951A)
I (..\USER\stm32f10x.h)(0x4D783CB5)
......@@ -330,7 +330,7 @@ I (..\STM32F10x_FWLib\inc\stm32f10x_tim.h)(0x4D783BB4)
I (..\STM32F10x_FWLib\inc\stm32f10x_usart.h)(0x504F415F)
I (..\STM32F10x_FWLib\inc\stm32f10x_wwdg.h)(0x4D783BB4)
I (..\STM32F10x_FWLib\inc\misc.h)(0x4D783BB4)
F (..\NET\ONENET\onenet.c)(0x663905EC)(-c --cpu Cortex-M3 -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\DHT11 -I ..\NET\ESP8266 -I ..\NET\MQTT -I ..\NET\ONENET -I ..\SYSTEM\TIMER -I ..\HARDWARE\OLED -I ..\HARDWARE\KEY -I ..\NET\CJSON -I.\RTE\_Target_1 -I"D:\new app\keli_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.2.0\Device\Include" -I"D:\new app\keli_v5\ARM\CMSIS\Include" -D__UVISION_VERSION="524" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -o ..\obj\onenet.o --omf_browse ..\obj\onenet.crf --depend ..\obj\onenet.d)
F (..\NET\ONENET\onenet.c)(0x663B716A)(-c --cpu Cortex-M3 -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\DHT11 -I ..\NET\ESP8266 -I ..\NET\MQTT -I ..\NET\ONENET -I ..\SYSTEM\TIMER -I ..\HARDWARE\OLED -I ..\HARDWARE\KEY -I ..\NET\CJSON -I.\RTE\_Target_1 -I"D:\new app\keli_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.2.0\Device\Include" -I"D:\new app\keli_v5\ARM\CMSIS\Include" -D__UVISION_VERSION="524" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -o ..\obj\onenet.o --omf_browse ..\obj\onenet.crf --depend ..\obj\onenet.d)
I (..\USER\stm32f10x.h)(0x4D783CB5)
I (..\CORE\core_cm3.h)(0x4D523B58)
I (D:\new app\keli_v5\ARM\ARMCC\include\stdint.h)(0x588B8344)
......@@ -371,7 +371,7 @@ I (D:\new app\keli_v5\ARM\ARMCC\include\string.h)(0x588B8344)
I (D:\new app\keli_v5\ARM\ARMCC\include\stdio.h)(0x588B8344)
I (D:\new app\keli_v5\ARM\ARMCC\include\stdbool.h)(0x588B8344)
I (..\NET\CJSON\cJSON.h)(0x663905EC)
I (..\HARDWARE\LED\led.h)(0x661E9DF9)
I (..\HARDWARE\LED\led.h)(0x663BADB4)
F (..\SYSTEM\delay\delay.c)(0x661EA206)(-c --cpu Cortex-M3 -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\DHT11 -I ..\NET\ESP8266 -I ..\NET\MQTT -I ..\NET\ONENET -I ..\SYSTEM\TIMER -I ..\HARDWARE\OLED -I ..\HARDWARE\KEY -I ..\NET\CJSON -I.\RTE\_Target_1 -I"D:\new app\keli_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.2.0\Device\Include" -I"D:\new app\keli_v5\ARM\CMSIS\Include" -D__UVISION_VERSION="524" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -o ..\obj\delay.o --omf_browse ..\obj\delay.crf --depend ..\obj\delay.d)
I (..\SYSTEM\delay\delay.h)(0x661EA206)
I (..\SYSTEM\sys\sys.h)(0x550F951A)
......@@ -501,7 +501,7 @@ I (..\STM32F10x_FWLib\inc\stm32f10x_wwdg.h)(0x4D783BB4)
I (..\STM32F10x_FWLib\inc\misc.h)(0x4D783BB4)
I (..\HARDWARE\OLED\oled.h)(0x663905EC)
I (D:\new app\keli_v5\ARM\ARMCC\include\stdlib.h)(0x588B8344)
I (..\HARDWARE\LED\led.h)(0x661E9DF9)
I (..\HARDWARE\LED\led.h)(0x663BADB4)
I (D:\new app\keli_v5\ARM\ARMCC\include\stdio.h)(0x588B8344)
I (..\HARDWARE\DHT11\DHT11.h)(0x661EA116)
F (..\CORE\core_cm3.c)(0x4C0C587E)(-c --cpu Cortex-M3 -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\DHT11 -I ..\NET\ESP8266 -I ..\NET\MQTT -I ..\NET\ONENET -I ..\SYSTEM\TIMER -I ..\HARDWARE\OLED -I ..\HARDWARE\KEY -I ..\NET\CJSON -I.\RTE\_Target_1 -I"D:\new app\keli_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.2.0\Device\Include" -I"D:\new app\keli_v5\ARM\CMSIS\Include" -D__UVISION_VERSION="524" -DSTM32F10X_MD -DSTM32F10X_MD -DUSE_STDPERIPH_DRIVER -o ..\obj\core_cm3.o --omf_browse ..\obj\core_cm3.crf --depend ..\obj\core_cm3.d)
......
OBJ/cjson.o
浏览文件 @ 31e418e1
无法预览此类型文件
OBJ/core_cm3.o
浏览文件 @ 31e418e1
无法预览此类型文件
OBJ/delay.o
浏览文件 @ 31e418e1
无法预览此类型文件
OBJ/dht11.o
浏览文件 @ 31e418e1
无法预览此类型文件
OBJ/esp8266.crf
浏览文件 @ 31e418e1
无法预览此类型文件
OBJ/esp8266.o
浏览文件 @ 31e418e1
无法预览此类型文件
OBJ/key.crf
浏览文件 @ 31e418e1
无法预览此类型文件
OBJ/key.o
浏览文件 @ 31e418e1
无法预览此类型文件
OBJ/led.crf
浏览文件 @ 31e418e1
无法预览此类型文件
OBJ/led.o
浏览文件 @ 31e418e1
无法预览此类型文件
OBJ/main.crf
浏览文件 @ 31e418e1
无法预览此类型文件
OBJ/main.o
浏览文件 @ 31e418e1
无法预览此类型文件
OBJ/misc.o
浏览文件 @ 31e418e1
无法预览此类型文件
OBJ/mqttkit.o
浏览文件 @ 31e418e1
无法预览此类型文件
OBJ/oled.o
浏览文件 @ 31e418e1
无法预览此类型文件
OBJ/onenet.crf
浏览文件 @ 31e418e1
无法预览此类型文件
OBJ/onenet.o
浏览文件 @ 31e418e1
无法预览此类型文件
OBJ/stm32f10x_it.o
浏览文件 @ 31e418e1
无法预览此类型文件
OBJ/sys.o
浏览文件 @ 31e418e1
无法预览此类型文件
OBJ/timer.crf
浏览文件 @ 31e418e1
无法预览此类型文件
OBJ/timer.o
浏览文件 @ 31e418e1
无法预览此类型文件
OBJ/usart.o
浏览文件 @ 31e418e1
无法预览此类型文件
USER/DS18B20.map
浏览文件 @ 31e418e1
因为 它太大了无法显示 source diff 。你可以改为 查看blob。
USER/TEMP.uvguix.张铧
浏览文件 @ 31e418e1
此差异已折叠。
USER/TEMP.uvoptx
浏览文件 @ 31e418e1
......@@ -285,7 +285,7 @@
<GroupNumber>2</GroupNumber>
<FileNumber>8</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\HARDWARE\KEY\key.c</PathWithFileName>
......
USER/main.c
浏览文件 @ 31e418e1
......@@ -23,14 +23,17 @@ DHT11_Data_TypeDef DHT11_Data;
extern u8 alarmflag; //是否报警的标志1报警
extern u8 alarmisfree;
u8 humi_int; //湿度的整数部分
u8 humi_deci; //湿度的小数部分
u8 temp_int; //温度的整数部分
u8 temp_deci; //温度的小数部分
u8 check_sum; //校验和
u8 t=0;
u8 humi_int; //湿度的整数部分
u8 humi_deci; //湿度的小数部分
u8 temp_int; //温度的整数部分
u8 temp_deci; //温度的小数部分
u8 check_sum; //校验和
u8 t=0;
extern u8 tempmax0;
extern u8 humimax0;
extern char oledbuf[20];
bool ledst = false; // 全局定义一个布尔型变量isTrue，并初始化为true
......@@ -76,8 +79,8 @@ bool beepst = false;
//----------------------------------
/*IWDG初始化*/
IWDG_WriteAccessCmd(IWDG_WriteAccess_Enable); //独立看门狗写使能
IWDG_SetPrescaler(IWDG_Prescaler_16); //设置预分频为16
IWDG_SetReload(2499); //设置重装值为2499，独立看门狗的超时时间为1000ms
IWDG_SetPrescaler(IWDG_Prescaler_128); //设置预分频为16
IWDG_SetReload(3124); //设置重装值为2499，独立看门狗的超时时间为1000ms
IWDG_ReloadCounter(); //重装计数器，喂狗
IWDG_Enable(); //独立看门狗使能
//-----------------------------------------------
......@@ -93,6 +96,8 @@ t=KEY_Scan(0); //
{
case KEY0_PRES:
LED0=!LED0;
LED2=!LED2;
LED3=!LED3;
break;
case KEY1_PRES:
......@@ -138,7 +143,7 @@ t=KEY_Scan(0); //
}
if(alarmisfree == 100) //af==0为真
{
if(humi_int < 50 && temp_int < 40)alarmflag =0;
if (humi_int < humimax0 && temp_int < tempmax0)alarmflag =0;
else alarmflag = 1 ;//开始报警
}
if(alarmisfree < 100)alarmisfree++;
......@@ -155,7 +160,10 @@ if(timeCount % 10 == 0){
sprintf(oledbuf,"humi:%d.%d %%",humi_int,humi_deci);
OLED_ShowString(0,32,(u8*)oledbuf,16,1);//8*16 “ABC”
sprintf(oledbuf,"h:%d-t:%d",humimax0,tempmax0);
OLED_ShowString(0,48,(u8*)oledbuf,16,1);//8*16 “ABC”
OLED_Refresh();
}
......@@ -168,9 +176,9 @@ if(timeCount % 10 == 0){
if(++timeCount >= 20) //发送间隔5s
{
UsartPrintf(USART_DEBUG,"温度:%f",temperature);
// UsartPrintf(USART_DEBUG,"温度:%f",temperature);
UsartPrintf(USART_DEBUG,"上传数据:温度:%d 湿度: %d-------------",temp_int,humi_int);
// UsartPrintf(USART_DEBUG,"上传数据:温度:%f 湿度: %d-------------",temperature,humi_int);
// data_len=MqttOnenet_Savedata(send_jason,temperature, humidity);
OneNet_SendData(); //发送数据
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或