Expose TX related fields for data up.

Author: brocaar

docs/mqtt-topics.md

@@ -29,6 +29,17 @@ Topic for payloads received from your nodes. Example payload:
             "loRaSNR": 10                              // signal to noise ratio
         }
     ],
+    "txInfo": {
+        "frequency": 868100000,    // frequency used for transmission
+        "dataRate": {
+            "modulation": "LORA",  // modulation (LORA or FSK)
+            "bandwidth": 250,      // used bandwidth
+            "spreadFactor": 5      // used SF (LORA)
+            // "bitrate": 50000    // used bitrate (FSK)
+        },
+        "adr": false,
+        "codeRate": "4/6"
+    },
     "fCnt": 10,                    // frame-counter
     "fPort": 5,                    // FPort
     "data": "..."                  // base64 encoded payload (decrypted)

internal/api/application_server.go

@@ -223,9 +223,20 @@ func (a *ApplicationServerAPI) HandleDataUp(ctx context.Context, req *as.HandleD
 	pl := handler.DataUpPayload{
 		DevEUI: devEUI,
 		RXInfo: []handler.RXInfo{},
-		FCnt:   req.FCnt,
-		FPort:  uint8(req.FPort),
-		Data:   b,
+		TXInfo: handler.TXInfo{
+			Frequency: int(req.TxInfo.Frequency),
+			DataRate: handler.DataRate{
+				Modulation:   req.TxInfo.DataRate.Modulation,
+				Bandwidth:    int(req.TxInfo.DataRate.BandWidth),
+				SpreadFactor: int(req.TxInfo.DataRate.SpreadFactor),
+				Bitrate:      int(req.TxInfo.DataRate.Bitrate),
+			},
+			ADR:      req.TxInfo.Adr,
+			CodeRate: req.TxInfo.CodeRate,
+		},
+		FCnt:  req.FCnt,
+		FPort: uint8(req.FPort),
+		Data:  b,
 	}
 
 	for _, rxInfo := range req.RxInfo {

internal/api/application_server_test.go

@@ -103,6 +103,17 @@ func TestApplicationServerAPI(t *testing.T) {
 							LoRaSNR: 5,
 						},
 					},
+					TxInfo: &as.TXInfo{
+						Frequency: 868100000,
+						DataRate: &as.DataRate{
+							Modulation:   "LORA",
+							BandWidth:    250,
+							SpreadFactor: 5,
+							Bitrate:      50000,
+						},
+						Adr:      true,
+						CodeRate: "4/6",
+					},
 				}
 				_, err := api.HandleDataUp(ctx, &req)
 				So(err, ShouldBeNil)
@@ -119,6 +130,17 @@ func TestApplicationServerAPI(t *testing.T) {
 								LoRaSNR: 5,
 							},
 						},
+						TXInfo: handler.TXInfo{
+							Frequency: 868100000,
+							DataRate: handler.DataRate{
+								Modulation:   "LORA",
+								Bandwidth:    250,
+								SpreadFactor: 5,
+								Bitrate:      50000,
+							},
+							ADR:      true,
+							CodeRate: "4/6",
+						},
 						FCnt:  10,
 						FPort: 3,
 						Data:  []byte{67, 216, 236, 205},

internal/handler/mqtt_handler.go

@@ -21,6 +21,14 @@ const downlinkLockTTL = time.Millisecond * 100
 
 var txTopicRegex = regexp.MustCompile(`application/(\w+)/node/(\w+)/tx`)
 
+// DataRate contains the data-rate related fields.
+type DataRate struct {
+	Modulation   string `json:"modulation"`
+	Bandwidth    int    `json:"bandwidth"`
+	SpreadFactor int    `json:"spreadFactor,omitempty"`
+	Bitrate      int    `json:"bitrate,omitempty"`
+}
+
 // RXInfo contains the RX information.
 type RXInfo struct {
 	MAC     lorawan.EUI64 `json:"mac"`
@@ -29,10 +37,19 @@ type RXInfo struct {
 	LoRaSNR float64       `json:"loRaSNR"`
 }
 
+// TXInfo contains the TX information.
+type TXInfo struct {
+	Frequency int      `json:"frequency"`
+	DataRate  DataRate `json:"dataRate"`
+	ADR       bool     `json:"adr"`
+	CodeRate  string   `json:"codeRate"`
+}
+
 // DataUpPayload represents a data-up payload.
 type DataUpPayload struct {
 	DevEUI lorawan.EUI64 `json:"devEUI"`
 	RXInfo []RXInfo      `json:"rxInfo"`
+	TXInfo TXInfo        `json:"txInfo"`
 	FCnt   uint32        `json:"fCnt"`
 	FPort  uint8         `json:"fPort"`
 	Data   []byte        `json:"data"`