diff --git a/conf/gateway.conf b/conf/gateway.conf index 575d3c2..132736b 100644 --- a/conf/gateway.conf +++ b/conf/gateway.conf @@ -90,6 +90,24 @@ } ] }, + "wireless_slave_devices":[ + { + "adrh":0, + "adrl":0, + "type":0, + "version":"yunhorn_ys_l_v1", + "flip":true, + "id":"15FC0975-BE31-42C4-9194-B5F552CC7255" + }, + { + "adrh":0, + "adrl":0, + "type":1, + "version":"yunhorn_ys_l_v1", + "flip":true, + "id":"1E18417B-E60D-44BA-B595-D0E85870BFF7" + } + ], "devices_list": [ ["4E5D52DD-EB81-43C0-A2B6-04E432412EBA", "loraport", "yunhorn_kgl_l_v1", "1"], ["EB5B0798-9B7F-474E-AAB8-467FD5FE1293", "loraport", "yunhorn_kgl_l_v1", "2"] diff --git a/do_send_data.go b/do_send_data.go index 044a987..7d1e641 100644 --- a/do_send_data.go +++ b/do_send_data.go @@ -41,9 +41,6 @@ func build_data(code int, data []Device) []byte { R_data.GATEWAY_INFO = conf.GATEWAY_INFO DEVICEDATAS.RLock() for _, i := range DEVICEDATAS.DATA { - log.Println("=========================================") - log.Println(i) - log.Println("=========================================") R_data.DEVICES = append(R_data.DEVICES, i) } DEVICEDATAS.RUnlock() diff --git a/loadconfig.go b/loadconfig.go index d8a6d10..544ccbc 100644 --- a/loadconfig.go +++ b/loadconfig.go @@ -28,6 +28,17 @@ type Conf struct { POST_TO_SERVER string `json:"post_to_server"` DEBUG bool `json:"debug"` OPENSERIAL bool `json:"openserial"` + WIRELESSSLAVEDEVICES []WirelessSlaveDevice `json:"wireless_slave_devices"` +} + +//无线 下位机 +type WirelessSlaveDevice struct{ + ADRH int `json:"adrh"` + ADRL int `json:"adrl"` + TYPE int `json:"type"` + VERSION string `json:"version"` + FLIP bool `json:"flip"` + ID string `json:"id"` } type Gateway_info struct { @@ -75,6 +86,13 @@ func init() { check(err) var device Device + log.Println("slaveDevices:",conf.WIRELESSSLAVEDEVICES) + + // for _,i := range conf.WIRELESSSLAVEDEVICES{ + // log.Println(conf.WIRELESSSLAVEDEVICES[k].ID) + // log.Println(i.ID) + // } + DEVICEDATAS.Lock() DEVICEDATAS.DATA = make(map[string]Device) //初始化设备,目前conf.DEVICES_LIST 指的是lora diff --git a/main.go b/main.go index 9d863c9..6858c76 100644 --- a/main.go +++ b/main.go @@ -17,8 +17,9 @@ func main() { c.AddFunc("0, *, *, *, *, *", func() { send_data(1001) }) - // devices := []Device{} + c.AddFunc("*/10, *, *, *, *, *", func() { + // devices := []Device{} // log.Println(string(build_data(1001,devices))) })