lihua
/
LoRaMoteMock
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

增加网关数据

master
lihua 5 years ago
parent
535067e115
commit
832498cac7
2 changed files with 76 additions and 52 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 95
      LoRaMoteMock.go
  2. 33
      model.go

95
LoRaMoteMock.go
View File

@ -79,6 +79,10 @@ func main() {
MinSize:Size{Width:maxWidth*3/5}, MinSize:Size{Width:maxWidth*3/5},
ColumnsOrderable: true, ColumnsOrderable: true,
MultiSelection: true, MultiSelection: true,
ContextMenuItems:[]MenuItem{
Action{Text:"查看终端数据", OnTriggered: mw.tvItemActivated},
Action{Text:"查看网关数据", OnTriggered: mw.tvItemGatewayActivated},
},
Columns: []TableViewColumn{ Columns: []TableViewColumn{
{Title: "序号"}, {Title: "序号"},
{Title: "数据方向"}, {Title: "数据方向"},
@ -613,15 +617,17 @@ func (mw *MoteMainWindow) HandleData(client paho.Client, message paho.Message){
var origData bytes.Buffer var origData bytes.Buffer
jsonData,_ := phy.MarshalJSON() jsonData,_ := phy.MarshalJSON()
_ = json.Indent(&origData, jsonData, "", " ") _ = json.Indent(&origData, jsonData, "", " ")
d,_ := json.MarshalIndent(&downlinkFrame,""," ")
dd := &Mote{ dd := &Mote{
Index: mw.model.Len() + 1, Index: mw.model.Len() + 1,
Direction:"downlink", Direction: "downlink",
DevEUI: mw.currentMoteConf.DevEui, DevEUI: mw.currentMoteConf.DevEui,
DevAddr: mw.currentMoteConf.DevAddr, DevAddr: mw.currentMoteConf.DevAddr,
MType: phy.MHDR.MType.String(), MType: phy.MHDR.MType.String(),
GatewayID: hex.EncodeToString(downlinkFrame.TxInfo.GatewayId), GatewayID: hex.EncodeToString(downlinkFrame.TxInfo.GatewayId),
Time:time.Now().Format("2006-01-02 15:04:05"), Time: time.Now().Format("2006-01-02 15:04:05"),
OrigData:origData.String(), MoteOrigData: origData.String(),
GatewayOrigData: string(d),
} }
if phy.MHDR.MType == lorawan.ConfirmedDataDown || phy.MHDR.MType == lorawan.UnconfirmedDataDown { if phy.MHDR.MType == lorawan.ConfirmedDataDown || phy.MHDR.MType == lorawan.UnconfirmedDataDown {
mpl := phy.MACPayload.(*lorawan.MACPayload) mpl := phy.MACPayload.(*lorawan.MACPayload)
@ -717,25 +723,28 @@ func (mw *MoteMainWindow) sendMsg() error{
walk.MsgBox(mw, "错误", msg, walk.MsgBoxIconError) walk.MsgBox(mw, "错误", msg, walk.MsgBoxIconError)
return err return err
} }
frames,_:= packet.GetUplinkFrames(true,false)
var origData bytes.Buffer var origData bytes.Buffer
jsonData,_ := phy.MarshalJSON() jsonData,_ := phy.MarshalJSON()
_ = json.Indent(&origData, jsonData, "", " ") _ = json.Indent(&origData, jsonData, "", " ")
d,_ := json.MarshalIndent(&frames[0],""," ")
du := &Mote{ du := &Mote{
Index:mw.model.Len() + 1, Index: mw.model.Len() + 1,
Direction:"uplink", Direction: "uplink",
DevEUI:mw.currentMoteConf.DevEui, DevEUI: mw.currentMoteConf.DevEui,
MType:phy.MHDR.MType.String(), MType: phy.MHDR.MType.String(),
GatewayID:mw.currentMoteConf.GatewayEui, GatewayID: mw.currentMoteConf.GatewayEui,
Rssi:packet.Payload.RXPK[0].RSSI, Rssi: packet.Payload.RXPK[0].RSSI,
LoRaSNR:packet.Payload.RXPK[0].LSNR, LoRaSNR: packet.Payload.RXPK[0].LSNR,
Frequency:packet.Payload.RXPK[0].Freq, Frequency: packet.Payload.RXPK[0].Freq,
Time:time.Now().Format("2006-01-02 15:04:05"), Time: time.Now().Format("2006-01-02 15:04:05"),
OrigData:origData.String(), MoteOrigData: origData.String(),
GatewayOrigData:string(d),
} }
mw.model.Items = append(mw.model.Items, du) mw.model.Items = append(mw.model.Items, du)
mw.model.PublishRowsReset() mw.model.PublishRowsReset()
_ = mw.tv.SetSelectedIndexes([]int{}) _ = mw.tv.SetSelectedIndexes([]int{})
frames,_:= packet.GetUplinkFrames(true,false)
for j := range frames { for j := range frames {
mw.PushData(mw.currentMoteConf.GatewayEui,"up",&frames[j]) mw.PushData(mw.currentMoteConf.GatewayEui,"up",&frames[j])
} }
@ -775,30 +784,32 @@ func (mw *MoteMainWindow) sendMsg() error{
walk.MsgBox(mw, "错误", msg, walk.MsgBoxIconError) walk.MsgBox(mw, "错误", msg, walk.MsgBoxIconError)
return err return err
} }
frames,_:= packet.GetUplinkFrames(true,false)
var origData bytes.Buffer var origData bytes.Buffer
jsonData,_ := phy.MarshalJSON() jsonData,_ := phy.MarshalJSON()
_ = json.Indent(&origData, jsonData, "", " ") _ = json.Indent(&origData, jsonData, "", " ")
d,_ := json.MarshalIndent(&frames[0],""," ")
du := &Mote{ du := &Mote{
Index:mw.model.Len() + 1, Index: mw.model.Len() + 1,
Direction:"uplink", Direction: "uplink",
DevEUI:mw.currentMoteConf.DevEui, DevEUI: mw.currentMoteConf.DevEui,
DevAddr:mw.currentMoteConf.DevAddr, DevAddr: mw.currentMoteConf.DevAddr,
MType:phy.MHDR.MType.String(), MType: phy.MHDR.MType.String(),
GatewayID:mw.currentMoteConf.GatewayEui, GatewayID: mw.currentMoteConf.GatewayEui,
Rssi:packet.Payload.RXPK[0].RSSI, Rssi: packet.Payload.RXPK[0].RSSI,
LoRaSNR:packet.Payload.RXPK[0].LSNR, LoRaSNR: packet.Payload.RXPK[0].LSNR,
Frequency:packet.Payload.RXPK[0].Freq, Frequency: packet.Payload.RXPK[0].Freq,
FCnt:mw.currentMoteConf.FCnt, FCnt: mw.currentMoteConf.FCnt,
FPort:mw.currentMoteConf.FPort, FPort: mw.currentMoteConf.FPort,
HexData:hex.EncodeToString(bmsg), HexData: hex.EncodeToString(bmsg),
AsciiData:BytesToString(bmsg), AsciiData: BytesToString(bmsg),
Time:time.Now().Format("2006-01-02 15:04:05"), Time: time.Now().Format("2006-01-02 15:04:05"),
OrigData:origData.String(), MoteOrigData: origData.String(),
GatewayOrigData:string(d),
} }
mw.model.Items = append(mw.model.Items, du) mw.model.Items = append(mw.model.Items, du)
mw.model.PublishRowsReset() mw.model.PublishRowsReset()
_ = mw.tv.SetSelectedIndexes([]int{}) _ = mw.tv.SetSelectedIndexes([]int{})
frames,_:= packet.GetUplinkFrames(true,false)
for j := range frames { for j := range frames {
mw.PushData(mw.currentMoteConf.GatewayEui,"up",&frames[j]) mw.PushData(mw.currentMoteConf.GatewayEui,"up",&frames[j])
} }
@ -849,7 +860,19 @@ func (mw *MoteMainWindow) TimeSend() {
func (mw *MoteMainWindow) tvItemActivated() { func (mw *MoteMainWindow) tvItemActivated() {
msg := "" msg := ""
for _, i := range mw.tv.SelectedIndexes() { for _, i := range mw.tv.SelectedIndexes() {
msg += mw.model.Items[i].OrigData + "\n" msg += mw.model.Items[i].MoteOrigData + "\n"
}
_ = mw.data.SetText(strings.Replace(msg, "\n", "\r\n", -1))
m := make(map[string]interface{})
if err := json.Unmarshal([]byte(msg), &m); err == nil {
_ = mw.jsonView.SetModel(NewJSONModel(m))
}
}
func (mw *MoteMainWindow) tvItemGatewayActivated() {
msg := ""
for _, i := range mw.tv.SelectedIndexes() {
msg += mw.model.Items[i].GatewayOrigData + "\n"
} }
_ = mw.data.SetText(strings.Replace(msg, "\n", "\r\n", -1)) _ = mw.data.SetText(strings.Replace(msg, "\n", "\r\n", -1))

33
model.go
View File

@ -47,22 +47,23 @@ type MotesConfig struct {
type Mote struct { type Mote struct {
Index int Index int
Direction string Direction string
DevEUI string DevEUI string
DevAddr string DevAddr string
MType string MType string
GatewayID string GatewayID string
Rssi int16 Rssi int16
LoRaSNR float64 LoRaSNR float64
Frequency float64 Frequency float64
FCnt uint32 FCnt uint32
FPort uint8 FPort uint8
HexData string HexData string
AsciiData string AsciiData string
Time string Time string
checked bool checked bool
OrigData string MoteOrigData string
GatewayOrigData string
} }
type MoteModel struct { type MoteModel struct {

Write Preview
Loading…
Cancel
Save