Commit 4737d06b 刘韬

1

1 个父辈 4a5cc1c2
正在显示 1 个修改的文件 包含 6 行增加4 行删除
...@@ -12,7 +12,8 @@ ...@@ -12,7 +12,8 @@
#define ADDR 0 #define ADDR 0
#include <ArduinoJson.h> #include <ArduinoJson.h>
#include <HardwareSerial.h> #include <HardwareSerial.h>
long TIME_OUT = 45L; long _TIME_OUT = 45L;
long TIME_OUT = _TIME_OUT;
String in; String in;
void setup() void setup()
{ {
...@@ -97,12 +98,13 @@ void serial() ...@@ -97,12 +98,13 @@ void serial()
Serial.print ("Addr is : "); Serial.print ("Addr is : ");
Serial.println(addr);*/ Serial.println(addr);*/
bool quick_scan_flag = false; bool quick_scan_flag = false;
for (int g = 1; g < 16; g++) for (int g = 1; g < 20; g++)
{ {
String str = "A" + String(g); String str = "A" + String(g);
String str1 = "B" + String(g); String str1 = "B" + String(g);
if (bufferx == str || bufferx == str1) if (bufferx == str || bufferx == str1)
{ {
TIME_OUT = _TIME_OUT;
quick_scan_flag = true; quick_scan_flag = true;
Serial.print(bufferx); Serial.print(bufferx);
Serial2.print(str); Serial2.print(str);
...@@ -139,13 +141,13 @@ void serial() ...@@ -139,13 +141,13 @@ void serial()
if (bufferx == "report") if (bufferx == "report")
{ {
Serial2.println("{\"ADDR\":\"99\",\"action\":\"report\"}"); Serial2.println("{\"ADDR\":\"99\",\"action\":\"report\"}");
TIME_OUT = 1000; TIME_OUT = 2000;
sensortomain(); sensortomain();
quick_scan_flag = true; quick_scan_flag = true;
} }
if (quick_scan_flag == false) if (quick_scan_flag == false)
{ {
TIME_OUT = 500;
char json[320]; char json[320];
bufferx.toCharArray(json, 320); bufferx.toCharArray(json, 320);
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!