@@ -353,6 +353,9 @@ pub struct RxPk {
353
353
/// Concentrator board used for RX (unsigned integer).
354
354
#[ serde( default ) ]
355
355
pub brd : u32 ,
356
+ /// Antenna number on which signal has been received.
357
+ #[ serde( default ) ]
358
+ pub ant : u8 ,
356
359
/// CRC status: 1 = OK, -1 = fail, 0 = no CRC
357
360
pub stat : Crc ,
358
361
/// Modulation identifier "LORA" or "Fsk"
@@ -464,7 +467,7 @@ impl RxPk {
464
467
channel : self . chan ,
465
468
rf_chain : self . rfch ,
466
469
board : self . brd ,
467
- antenna : 0 ,
470
+ antenna : self . ant . into ( ) ,
468
471
location : None ,
469
472
context : self . tmst . to_be_bytes ( ) . to_vec ( ) ,
470
473
metadata : self . meta . as_ref ( ) . cloned ( ) . unwrap_or_default ( ) ,
@@ -1121,6 +1124,7 @@ mod test {
1121
1124
chan: 5 ,
1122
1125
rfch: 1 ,
1123
1126
brd: 3 ,
1127
+ ant: 1 ,
1124
1128
stat: Crc :: Ok ,
1125
1129
modu: Modulation :: Lora ,
1126
1130
datr: DataRate :: Lora ( 7 , 125000 ) ,
@@ -1163,6 +1167,7 @@ mod test {
1163
1167
channel: 5 ,
1164
1168
rf_chain: 1 ,
1165
1169
board: 3 ,
1170
+ antenna: 1 ,
1166
1171
context: vec![ 0 , 0 , 4 , 210 ] ,
1167
1172
crc_status: gw:: CrcStatus :: CrcOk . into( ) ,
1168
1173
..Default :: default ( )
@@ -1191,6 +1196,7 @@ mod test {
1191
1196
chan: 5 ,
1192
1197
rfch: 1 ,
1193
1198
brd: 3 ,
1199
+ ant: 1 ,
1194
1200
stat: Crc :: Ok ,
1195
1201
modu: Modulation :: Lora ,
1196
1202
datr: DataRate :: Lora ( 7 , 125000 ) ,
@@ -1236,6 +1242,7 @@ mod test {
1236
1242
channel: 5 ,
1237
1243
rf_chain: 1 ,
1238
1244
board: 3 ,
1245
+ antenna: 1 ,
1239
1246
context: vec![ 0 , 0 , 4 , 210 ] ,
1240
1247
crc_status: gw:: CrcStatus :: CrcOk . into( ) ,
1241
1248
..Default :: default ( )
@@ -1264,6 +1271,7 @@ mod test {
1264
1271
chan: 5 ,
1265
1272
rfch: 1 ,
1266
1273
brd: 3 ,
1274
+ ant: 1 ,
1267
1275
stat: Crc :: Ok ,
1268
1276
modu: Modulation :: Lora ,
1269
1277
datr: DataRate :: Lora ( 7 , 125000 ) ,
@@ -1312,6 +1320,7 @@ mod test {
1312
1320
channel: 5 ,
1313
1321
rf_chain: 1 ,
1314
1322
board: 3 ,
1323
+ antenna: 1 ,
1315
1324
context: vec![ 0 , 0 , 4 , 210 ] ,
1316
1325
crc_status: gw:: CrcStatus :: CrcOk . into( ) ,
1317
1326
..Default :: default ( )
@@ -1340,6 +1349,7 @@ mod test {
1340
1349
chan: 0 ,
1341
1350
rfch: 1 ,
1342
1351
brd: 3 ,
1352
+ ant: 0 ,
1343
1353
stat: Crc :: Ok ,
1344
1354
modu: Modulation :: Lora ,
1345
1355
datr: DataRate :: Lora ( 7 , 125000 ) ,
@@ -1456,6 +1466,7 @@ mod test {
1456
1466
chan: 5 ,
1457
1467
rfch: 1 ,
1458
1468
brd: 3 ,
1469
+ ant: 1 ,
1459
1470
stat: Crc :: Ok ,
1460
1471
modu: Modulation :: Fsk ,
1461
1472
datr: DataRate :: Fsk ( 50_000 ) ,
@@ -1493,6 +1504,7 @@ mod test {
1493
1504
channel: 5 ,
1494
1505
rf_chain: 1 ,
1495
1506
board: 3 ,
1507
+ antenna: 1 ,
1496
1508
context: vec![ 0 , 0 , 4 , 210 ] ,
1497
1509
crc_status: gw:: CrcStatus :: CrcOk . into( ) ,
1498
1510
..Default :: default ( )
@@ -1521,6 +1533,7 @@ mod test {
1521
1533
chan: 5 ,
1522
1534
rfch: 1 ,
1523
1535
brd: 3 ,
1536
+ ant: 1 ,
1524
1537
stat: Crc :: Ok ,
1525
1538
modu: Modulation :: LrFhss ,
1526
1539
datr: DataRate :: LrFhss ( 137_000 ) ,
@@ -1562,6 +1575,7 @@ mod test {
1562
1575
channel: 5 ,
1563
1576
rf_chain: 1 ,
1564
1577
board: 3 ,
1578
+ antenna: 1 ,
1565
1579
context: vec![ 0 , 0 , 4 , 210 ] ,
1566
1580
crc_status: gw:: CrcStatus :: CrcOk . into( ) ,
1567
1581
..Default :: default ( )
@@ -1590,6 +1604,7 @@ mod test {
1590
1604
chan: 5 ,
1591
1605
rfch: 1 ,
1592
1606
brd: 3 ,
1607
+ ant: 1 ,
1593
1608
stat: Crc :: Ok ,
1594
1609
modu: Modulation :: Lora ,
1595
1610
datr: DataRate :: Lora ( 7 , 125000 ) ,
@@ -1637,6 +1652,7 @@ mod test {
1637
1652
channel: 5 ,
1638
1653
rf_chain: 1 ,
1639
1654
board: 3 ,
1655
+ antenna: 1 ,
1640
1656
context: vec![ 0 , 0 , 4 , 210 ] ,
1641
1657
metadata: [ ( "gateway_name" . to_string( ) , "test-gateway" . to_string( ) ) ]
1642
1658
. iter( )
@@ -1667,6 +1683,7 @@ mod test {
1667
1683
chan: 5 ,
1668
1684
rfch: 1 ,
1669
1685
brd: 3 ,
1686
+ ant: 1 ,
1670
1687
stat: Crc :: Ok ,
1671
1688
modu: Modulation :: Lora ,
1672
1689
datr: DataRate :: Lora ( 7 , 125000 ) ,
@@ -1702,6 +1719,7 @@ mod test {
1702
1719
chan: 5 ,
1703
1720
rfch: 1 ,
1704
1721
brd: 3 ,
1722
+ ant: 1 ,
1705
1723
stat: Crc :: Ok ,
1706
1724
modu: Modulation :: Lora ,
1707
1725
datr: DataRate :: Lora ( 7 , 125000 ) ,
0 commit comments