From 5af38d356388b5a47c6b4c1f90123193aa91297a Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Sun, 1 Feb 2026 20:58:41 -0500 Subject: [PATCH] NXDN: Revert Dibit Collection; NXDN: Minor Tweak to STD-T102 Message Types; --- src/nxdn_deperm.c | 8 ++++---- src/nxdn_frame.c | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/nxdn_deperm.c b/src/nxdn_deperm.c index e6b4ffc..2a4c968 100644 --- a/src/nxdn_deperm.c +++ b/src/nxdn_deperm.c @@ -114,10 +114,10 @@ void nxdn_message_type (dsd_opts * opts, dsd_state * state, uint8_t MessageType) //PROP_FORM handled by checkdown for ALIAS or other else if (MessageType == 0x3F) {} - //ARIB STD-T102 第 2 編 w/ F1 on, F2 off //NOTE: These three are handled by dcr_sacch internally - // else if (MessageType == 0x81) fprintf(stderr, " VCALL"); //音声通信 - // else if (MessageType == 0x88) fprintf(stderr, " TX_REL"); //終話 - // else if (MessageType == 0x90) fprintf(stderr, " IDLE"); //アイドル + //ARIB STD-T102 第 2 編 w/ F1 on, F2 off //NOTE: These three are handled by dcr_sacch internally, but idle may still hit on sacch + else if (MessageType == 0x81) {} //fprintf(stderr, " VCALL"); //音声通信 + else if (MessageType == 0x88) {} //fprintf(stderr, " TX_REL"); //終話 + else if (MessageType == 0x90) {} //fprintf(stderr, " IDLE"); //アイドル //observed from #318 and found in ARIB STD-B54, F1 and flags on (p. 22) listed in table order else if (MessageType == 0xE1) fprintf(stderr, " VCALL_STD_B54"); //選択呼出音声通信 diff --git a/src/nxdn_frame.c b/src/nxdn_frame.c index 566ee93..a24edb4 100644 --- a/src/nxdn_frame.c +++ b/src/nxdn_frame.c @@ -298,17 +298,17 @@ void nxdn_frame (dsd_opts * opts, dsd_state * state) break; } // end of switch(lich) - //collect remaining dibits at this point (before bad frame skip) - for (int i = 0; i < 174; i++) //192total-10FSW-8lich = 174 - dbuf[i+8] = getDibit(opts, state); + // //collect remaining dibits at this point (before bad frame skip) + // for (int i = 0; i < 174; i++) //192total-10FSW-8lich = 174 + // dbuf[i+8] = getDibit(opts, state); //go to end if bad returns from earlier if (state->lastsynctype == -1) goto END; - // //collect remaining dibits at this point (after bad frame skip) - // for (int i = 0; i < 174; i++) //192total-10FSW-8lich = 174 - // dbuf[i+8] = getDibit(opts, state); + //collect remaining dibits at this point (after bad frame skip) + for (int i = 0; i < 174; i++) //192total-10FSW-8lich = 174 + dbuf[i+8] = getDibit(opts, state); //enable these after good lich parity and known lich value state->carrier = 1;