diff options
author | Jason Reiss <jreiss@multitech.com> | 2020-03-20 09:28:44 -0500 |
---|---|---|
committer | Jason Reiss <jreiss@multitech.com> | 2020-03-20 09:28:44 -0500 |
commit | f259785d46443c4e7d2f71faa9314abfd9187e15 (patch) | |
tree | 5b9e09b2e3afa757a4170dd9c7e74e486c8eb59c | |
parent | 63b692fc8fb69352f96252d149ac21e42254221d (diff) | |
parent | 62db108e135bca33f6e2885698886a9b314fa105 (diff) | |
download | packet_forwarder_mtac_full-f259785d46443c4e7d2f71faa9314abfd9187e15.tar.gz packet_forwarder_mtac_full-f259785d46443c4e7d2f71faa9314abfd9187e15.tar.bz2 packet_forwarder_mtac_full-f259785d46443c4e7d2f71faa9314abfd9187e15.zip |
Merge branch 'revert-b41e94f6' into 'master'
Revert "Add LBT periodic restart and lgw_page monitor"
See merge request !1
-rw-r--r-- | lora_pkt_fwd/src/lora_pkt_fwd.c | 25 |
1 files changed, 2 insertions, 23 deletions
diff --git a/lora_pkt_fwd/src/lora_pkt_fwd.c b/lora_pkt_fwd/src/lora_pkt_fwd.c index 85f203f..0a3680e 100644 --- a/lora_pkt_fwd/src/lora_pkt_fwd.c +++ b/lora_pkt_fwd/src/lora_pkt_fwd.c @@ -3133,32 +3133,11 @@ static void gps_process_sync(void) { /* get timestamp captured on PPM pulse */ pthread_mutex_lock(&mx_concent); i = lgw_get_trigcnt(&trig_tstamp); - - uint8_t page = 0; - lgw_get_cur_page(&page); - - if (page != 2) { - //quit rather than reset the page. We don't know if this was on purpose or not. - exit_sig = true; - MSG("WARNING: lgw page was unexpectedly changed, process is exiting.\n"); - break; - } - pthread_mutex_unlock(&mx_concent); if (i != LGW_HAL_SUCCESS) { - printf("# SX1301 time (PPS): unknown\n"); - } else { - printf("# SX1301 time (PPS): %u %u\n", trig_tstamp, page); - } - - static uint32_t last_tstamp = 0; - if (lbt_enabled && trig_tstamp < last_tstamp) { - printf("# Restarting LBT\n"); - lgw_fpga_reg_w(LGW_FPGA_CTRL_FEATURE_START, 0); - wait_ms(5); - lgw_fpga_reg_w(LGW_FPGA_CTRL_FEATURE_START, 1); + MSG("WARNING: [gps] failed to read concentrator timestamp\n"); + return; } - last_tstamp = trig_tstamp; /* try to update time reference with the new GPS time & timestamp */ pthread_mutex_lock(&mx_timeref); |