Fix #570: carry piggyback data for keep-alives, too

mcci-catena · May 11, 2020 · 23a1c84 · 23a1c84
1 parent 2928d4b
commit 23a1c84
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/lmic/lmic.c b/src/lmic/lmic.c
@@ -1855,7 +1855,8 @@ static bit_t buildDataFrame (void) {
  // highest importance are the ones in the pendMac buffer.
  int end = OFF_DAT_OPTS;
 
- if (LMIC.pendTxPort != 0 && LMIC.pendMacPiggyback && LMIC.pendMacLen != 0) {
+ // Send piggyback data if: !txdata or txport != 0
+ if ((! txdata || LMIC.pendTxPort != 0) && LMIC.pendMacPiggyback && LMIC.pendMacLen != 0) {
  os_copyMem(LMIC.frame + end, LMIC.pendMacData, LMIC.pendMacLen);
  end += LMIC.pendMacLen;
  }