mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-21 13:15:40 -05:00
NXDN: Revert Dibit Collection;
NXDN: Minor Tweak to STD-T102 Message Types;
This commit is contained in:
@@ -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
|
//PROP_FORM handled by checkdown for ALIAS or other
|
||||||
else if (MessageType == 0x3F) {}
|
else if (MessageType == 0x3F) {}
|
||||||
|
|
||||||
//ARIB STD-T102 第 2 編 w/ F1 on, F2 off //NOTE: These three are handled by dcr_sacch internally
|
//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 == 0x81) {} //fprintf(stderr, " VCALL"); //音声通信
|
||||||
// else if (MessageType == 0x88) fprintf(stderr, " TX_REL"); //終話
|
else if (MessageType == 0x88) {} //fprintf(stderr, " TX_REL"); //終話
|
||||||
// else if (MessageType == 0x90) fprintf(stderr, " IDLE"); //アイドル
|
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
|
//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"); //選択呼出音声通信
|
else if (MessageType == 0xE1) fprintf(stderr, " VCALL_STD_B54"); //選択呼出音声通信
|
||||||
|
|||||||
@@ -298,17 +298,17 @@ void nxdn_frame (dsd_opts * opts, dsd_state * state)
|
|||||||
break;
|
break;
|
||||||
} // end of switch(lich)
|
} // end of switch(lich)
|
||||||
|
|
||||||
//collect remaining dibits at this point (before bad frame skip)
|
// //collect remaining dibits at this point (before bad frame skip)
|
||||||
for (int i = 0; i < 174; i++) //192total-10FSW-8lich = 174
|
// for (int i = 0; i < 174; i++) //192total-10FSW-8lich = 174
|
||||||
dbuf[i+8] = getDibit(opts, state);
|
// dbuf[i+8] = getDibit(opts, state);
|
||||||
|
|
||||||
//go to end if bad returns from earlier
|
//go to end if bad returns from earlier
|
||||||
if (state->lastsynctype == -1)
|
if (state->lastsynctype == -1)
|
||||||
goto END;
|
goto END;
|
||||||
|
|
||||||
// //collect remaining dibits at this point (after bad frame skip)
|
//collect remaining dibits at this point (after bad frame skip)
|
||||||
// for (int i = 0; i < 174; i++) //192total-10FSW-8lich = 174
|
for (int i = 0; i < 174; i++) //192total-10FSW-8lich = 174
|
||||||
// dbuf[i+8] = getDibit(opts, state);
|
dbuf[i+8] = getDibit(opts, state);
|
||||||
|
|
||||||
//enable these after good lich parity and known lich value
|
//enable these after good lich parity and known lich value
|
||||||
state->carrier = 1;
|
state->carrier = 1;
|
||||||
|
|||||||
Reference in New Issue
Block a user