Add 32MHz-based receive timestamp from hardware as "tm32".

helium · Oct 14, 2022 · 45a783b · 45a783b
1 parent 91a84ec
commit 45a783b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/libloragw/inc/loragw_hal.h b/libloragw/inc/loragw_hal.h
@@ -207,6 +207,7 @@ struct lgw_pkt_rx_s {
     uint8_t     if_chain;       /*!> by which IF chain was packet received */
     uint8_t     status;         /*!> status of the received packet */
     uint32_t    count_us;       /*!> internal concentrator counter for timestamping, 1 microsecond resolution */
+    uint32_t    count_32;       /*!> internal concentrator counter for timestamping, 1/32 microsecond resolution */
     uint8_t     rf_chain;       /*!> through which RF chain the packet was received */
     uint8_t     modem_id;
     uint8_t     modulation;     /*!> modulation used by the packet */

diff --git a/libloragw/src/loragw_sx1302.c b/libloragw/src/loragw_sx1302.c
@@ -1823,6 +1823,7 @@ int sx1302_parse(lgw_context_t * context, struct lgw_pkt_rx_s * p) {
 
     /* Packet timestamp corrected */
     p->count_us = p->count_us - timestamp_correction;
+    p->count_32 = p->count_us * 32 + pkt.timestamp_cnt % 32;
 
     /* Packet CRC status */
     p->crc = pkt.rx_crc16_value;

diff --git a/packet_forwarder/src/lora_pkt_fwd.c b/packet_forwarder/src/lora_pkt_fwd.c
@@ -109,7 +109,7 @@ License: Revised BSD License, see LICENSE.TXT file include in the project
 #define STD_FSK_PREAMB  5
 
 #define STATUS_SIZE     200
-#define TX_BUFF_SIZE    ((540 * NB_PKT_MAX) + 30 + STATUS_SIZE)
+#define TX_BUFF_SIZE    ((560 * NB_PKT_MAX) + 30 + STATUS_SIZE)
 #define ACK_BUFF_SIZE   80
 
 #define UNIX_GPS_EPOCH_OFFSET 315964800 /* Number of seconds ellapsed between 01.Jan.1970 00:00:00
@@ -1865,8 +1865,8 @@ void thread_up(void) {
                 exit(EXIT_FAILURE);
             }
 
-            /* RAW timestamp, 8-17 useful chars */
-            j = snprintf((char *)(buff_up + buff_index), TX_BUFF_SIZE-buff_index, ",\"tmst\":%u", p->count_us);
+            /* RAW timestamp, 18-36 useful chars */
+            j = snprintf((char *)(buff_up + buff_index), TX_BUFF_SIZE-buff_index, ",\"tmst\":%u,\"tm32\":%u", p->count_us, p->count_32);
             if (j > 0) {
                 buff_index += j;
             } else {