sundp
/
YHGW
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aq数据完善,h2s校准

This commit is contained in:
fish 2019-06-24 12:11:57 +08:00
parent 12ad11b528
commit 737abf6f2b
2 changed files with 35 additions and 21 deletions

50
router.go
View File

@ -362,6 +362,8 @@ func dealDatav3(data []byte) string{
// log.Println("data[9]",int64(data[9])) // log.Println("data[9]",int64(data[9]))
// log.Println("data[10]",int64(data[10])) // log.Println("data[10]",int64(data[10]))
log.Println("aqdata|all:",data)
if data[6] == 0{ if data[6] == 0{
buffer.WriteString("-") buffer.WriteString("-")
} }
@ -376,10 +378,10 @@ func dealDatav3(data []byte) string{
} }
buffer.WriteString(wdint2) buffer.WriteString(wdint2)
log.Println("wdfh",data[6]) log.Println("aqdata|wdfh",data[6])
wddata := buffer.String() wddata := buffer.String()
log.Println("wddata",wddata) log.Println("aqdata|wddata",wddata)
buffer = new(bytes.Buffer) buffer = new(bytes.Buffer)
@ -393,7 +395,7 @@ func dealDatav3(data []byte) string{
buffer.WriteString(sdint2) buffer.WriteString(sdint2)
sddata := buffer.String() sddata := buffer.String()
log.Println("sddata",sddata) log.Println("aqdata|sddata",sddata)
buffer = new(bytes.Buffer) buffer = new(bytes.Buffer)
@ -407,38 +409,50 @@ func dealDatav3(data []byte) string{
buffer.WriteString(nh3int2) buffer.WriteString(nh3int2)
nh3data := buffer.String() nh3data := buffer.String()
log.Println("nh3",nh3data) log.Println("aqdata|nh3",nh3data)
log.Println("h2s",data[13])
buffer = new(bytes.Buffer) buffer = new(bytes.Buffer)
ch2o1 := strconv.Itoa(int(data[14])) h2sint1 := strconv.Itoa(int(data[13]))
buffer.WriteString(nh3int1)
buffer.WriteString(".")
h2sint2 := strconv.Itoa(int(data[14]))
if int64(data[14])<10{
buffer.WriteString("0")
}
buffer.WriteString(h2sint2)
h2sdata := buffer.String()
log.Println("aqdata|h2s",h2sdata)
buffer = new(bytes.Buffer)
ch2o1 := strconv.Itoa(int(data[15]))
buffer.WriteString(ch2o1) buffer.WriteString(ch2o1)
buffer.WriteString(".") buffer.WriteString(".")
ch2o2 := strconv.Itoa(int(data[15])) ch2o2 := strconv.Itoa(int(data[16]))
if int64(data[15])<10{ if int64(data[16])<10{
buffer.WriteString("0") buffer.WriteString("0")
} }
buffer.WriteString(ch2o2) buffer.WriteString(ch2o2)
ch2o := buffer.String() ch2o := buffer.String()
// ch2o := uint32(data[14])*256+uint32(data[15]) // ch2o := uint32(data[14])*256+uint32(data[15])
log.Println("ch2o",ch2o) log.Println("aqdata|ch2o",ch2o)
co2data := uint32(data[16])*256+uint32(data[17]) co2data := uint32(data[17])*256+uint32(data[18])
log.Println("co2data",co2data) log.Println("aqdata|co2data",co2data)
tvocdata := data[18] tvocdata := data[19]
log.Println("tvocdata",tvocdata) log.Println("aqdata|tvocdata",tvocdata)
// log.Println("pm25data1",data[19]) // log.Println("pm25data1",data[19])
// log.Println("pm25data2",data[20]) // log.Println("pm25data2",data[20])
pm25data := uint32(data[19])*256+uint32(data[20]) pm25data := uint32(data[20])*256+uint32(data[21])
log.Println("pm25data",pm25data) log.Println("aqdata|pm25data",pm25data)
// log.Println("pm10data1",data[21]) // log.Println("pm10data1",data[21])
// log.Println("pm10data2",data[22]) // log.Println("pm10data2",data[22])
pm10data := uint32(data[21])*256+uint32(data[22]) pm10data := uint32(data[22])*256+uint32(data[23])
log.Println("pm10data",pm10data) log.Println("aqdata|pm10data",pm10data)
var R_data P1004_6 var R_data P1004_6
R_data.CODE = 1005 R_data.CODE = 1005
@ -452,7 +466,7 @@ func dealDatav3(data []byte) string{
R_data.DATA["humidity"]=sddata R_data.DATA["humidity"]=sddata
R_data.DATA["nh3"]=nh3data R_data.DATA["nh3"]=nh3data
R_data.DATA["h2s"]=data[13] R_data.DATA["h2s"]=h2sdata
R_data.DATA["ch2o"]=ch2o R_data.DATA["ch2o"]=ch2o
R_data.DATA["co2"]=co2data R_data.DATA["co2"]=co2data
R_data.DATA["tvoc"]=tvocdata R_data.DATA["tvoc"]=tvocdata

6
tcpserver.go
View File

@ -150,8 +150,8 @@ func readConn(conn net.Conn, readChan chan<- []byte, stopChan chan<- bool) {
values = data[i+2:i+3] values = data[i+2:i+3]
}else if dataType ==4 { }else if dataType ==4 {
//空气质量 //空气质量
continueCount = 18 continueCount = 19
end = 19 end = 20
if i+end >reqLen{ if i+end >reqLen{
log.Println("yunhorndeug.push.data.tcp.fq",buffer.String(),addrs,dataType) log.Println("yunhorndeug.push.data.tcp.fq",buffer.String(),addrs,dataType)
continue continue
@ -217,7 +217,7 @@ func readConn(conn net.Conn, readChan chan<- []byte, stopChan chan<- bool) {
_,ok := loraNodeMap.Load(buffer.String()) _,ok := loraNodeMap.Load(buffer.String())
if !ok{ if !ok{
log.Println("yunhorndeug.push.data.tcp.dev not exist:",buffer.String()) log.Println("yunhorndeug.push.data.tcp.dev not exist:",buffer.String(),dataType,values)
buffer = new(bytes.Buffer) buffer = new(bytes.Buffer)
continue continue
} }