Commit 5decf5ca authored by 方开's avatar 方开 🍔
Browse files

Merge branch 'dev' into 'master'

同步更新至云南主机版本

See merge request !2
parents 8cf2a5a0 1189b2d3
File mode changed from 100755 to 100644
......@@ -260,7 +260,7 @@
{
"channelId": "01",
"type": "water",
"subAddr": "05",
"subAddr": "0c",
"subId": "003",
"cerealsSpecies": "稻谷"
}
......@@ -395,7 +395,7 @@
{
"channelId": "01",
"type": "water",
"subAddr": "0c",
"subAddr": "05",
"subId": "003",
"cerealsSpecies": "稻谷"
}
......@@ -495,7 +495,7 @@
"subAddr": "25",
"subId": "001"
}, {
"channelId": "2e",
"channelId": "2c",
"type": "temphumi",
"subAddr": "25",
"subId": "002"
......@@ -985,27 +985,27 @@
}]
},
{
"type": "multi",
"ip": "10.20.1.22",
"type": "single",
"ip": "10.20.1.128",
"port": 8000,
"houseId": "765",
"name": "27",
"subMachine": [{
"channelId": "1d,1e,1f,20,50,51,52,53",
"channelId": "0d-14",
"type": "temp",
"pointNum": ["20", "20", "20", "20", "20", "20", "20", "20"],
"subAddr": "03",
"subAddr": "2d",
"subId": "001"
}, {
"channelId": "31",
"channelId": "19",
"type": "temphumi",
"subAddr": "03",
"subAddr": "2d",
"subId": "002"
}]
},
{
"type": "single",
"ip": "10.20.1.29",
"ip": "10.20.1.30",
"port": 8000,
"houseId": "766",
"name": "28",
......@@ -1013,12 +1013,12 @@
"channelId": "0d-14",
"type": "temp",
"pointNum": ["20", "20", "20", "20", "20", "20", "20", "20"],
"subAddr": "05",
"subAddr": "2e",
"subId": "001"
}, {
"channelId": "19",
"type": "temphumi",
"subAddr": "05",
"subAddr": "2e",
"subId": "002"
}]
},
......
This diff is collapsed.
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment