From d1efa0516449ee0c2b5e05ce6249c63b92840645 Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Fri, 11 Nov 2022 22:45:33 -0500 Subject: [PATCH] NXDN Permissed Data Conditional Check; --- src/nxdn_deperm.c | 3 ++- src/nxdn_element.c | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/nxdn_deperm.c b/src/nxdn_deperm.c index e932a66..35f0b89 100644 --- a/src/nxdn_deperm.c +++ b/src/nxdn_deperm.c @@ -95,7 +95,8 @@ void nxdn_deperm_facch(dsd_opts * opts, dsd_state * state, uint8_t bits[144]) } if (crc == check) NXDN_Elements_Content_decode(opts, state, 1, trellis_buf); - else NXDN_Elements_Content_decode(opts, state, 0, trellis_buf); + //only run data with bad CRC when payload is enabled and hide the ugly + else if (opts->payload == 1) NXDN_Elements_Content_decode(opts, state, 0, trellis_buf); } void nxdn_deperm_sacch(dsd_opts * opts, dsd_state * state, uint8_t bits[60]) diff --git a/src/nxdn_element.c b/src/nxdn_element.c index 731af80..a128605 100644 --- a/src/nxdn_element.c +++ b/src/nxdn_element.c @@ -78,9 +78,8 @@ void NXDN_SACCH_Full_decode(dsd_opts * opts, dsd_state * state) } /* Decodes the element content */ - //if (CrcCorrect == 1) NXDN_Elements_Content_decode(opts, state, CrcCorrect, SACCH); - //run it, and let each element handler decide what is okay for console, internal, and terminal assignment - if (1 == 1) NXDN_Elements_Content_decode(opts, state, CrcCorrect, SACCH); + //run it under crccorrect, or under payload (if incorrect, hide bad data unless payload enabled) + if (CrcCorrect == 1 || opts->payload == 1) NXDN_Elements_Content_decode(opts, state, CrcCorrect, SACCH); } /* End NXDN_SACCH_Full_decode() */