mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-21 13:15:40 -05:00
M17 - Check Caps and Special CSD Values;
This commit is contained in:
@@ -2982,6 +2982,13 @@ main (int argc, char **argv)
|
|||||||
//read in values
|
//read in values
|
||||||
//string in format of M17:can:src_csd:dst_csd
|
//string in format of M17:can:src_csd:dst_csd
|
||||||
|
|
||||||
|
//check and capatalize any letters in the CSD
|
||||||
|
for (int i = 0; state.m17dat[i]!='\0'; i++)
|
||||||
|
{
|
||||||
|
if(state.m17dat[i] >= 'a' && state.m17dat[i] <= 'z')
|
||||||
|
state.m17dat[i] = state.m17dat[i] -32;
|
||||||
|
}
|
||||||
|
|
||||||
fprintf (stderr, "M17 User Data: ");
|
fprintf (stderr, "M17 User Data: ");
|
||||||
char * curr;
|
char * curr;
|
||||||
|
|
||||||
|
|||||||
18
src/m17.c
18
src/m17.c
@@ -797,7 +797,7 @@ void processM17LSF(dsd_opts * opts, dsd_state * state)
|
|||||||
M17decodeLSF(state);
|
M17decodeLSF(state);
|
||||||
|
|
||||||
else if (opts->aggressive_framesync == 0)
|
else if (opts->aggressive_framesync == 0)
|
||||||
M17decodeLSF(state);
|
M17decodeLSF(state);
|
||||||
|
|
||||||
if (opts->payload == 1)
|
if (opts->payload == 1)
|
||||||
{
|
{
|
||||||
@@ -893,7 +893,7 @@ void processM17LSF_debug(dsd_opts * opts, dsd_state * state, uint8_t * m17_depun
|
|||||||
if (crc_err == 0)
|
if (crc_err == 0)
|
||||||
M17decodeLSF(state);
|
M17decodeLSF(state);
|
||||||
else if (opts->aggressive_framesync == 0)
|
else if (opts->aggressive_framesync == 0)
|
||||||
M17decodeLSF(state);
|
M17decodeLSF(state);
|
||||||
|
|
||||||
if (opts->payload == 1)
|
if (opts->payload == 1)
|
||||||
{
|
{
|
||||||
@@ -994,7 +994,7 @@ void processM17LSF_debug2(dsd_opts * opts, dsd_state * state, uint8_t * m17_rnd_
|
|||||||
if (crc_err == 0)
|
if (crc_err == 0)
|
||||||
M17decodeLSF(state);
|
M17decodeLSF(state);
|
||||||
else if (opts->aggressive_framesync == 0)
|
else if (opts->aggressive_framesync == 0)
|
||||||
M17decodeLSF(state);
|
M17decodeLSF(state);
|
||||||
|
|
||||||
if (opts->payload == 1)
|
if (opts->payload == 1)
|
||||||
{
|
{
|
||||||
@@ -1307,6 +1307,12 @@ void encodeM17STR(dsd_opts * opts, dsd_state * state)
|
|||||||
|
|
||||||
if (state->str50b[0] != 0)
|
if (state->str50b[0] != 0)
|
||||||
sprintf (d40, "%s", state->str50b);
|
sprintf (d40, "%s", state->str50b);
|
||||||
|
|
||||||
|
//if special values, then assign them
|
||||||
|
if (strcmp (d40, "BROADCAST") == 0)
|
||||||
|
dst = 0xFFFFFFFFFFFF;
|
||||||
|
if (strcmp (d40, "ALL") == 0)
|
||||||
|
dst = 0xFFFFFFFFFFFF;
|
||||||
//end
|
//end
|
||||||
|
|
||||||
int i, j, k, x; //basic utility counters
|
int i, j, k, x; //basic utility counters
|
||||||
@@ -2300,6 +2306,12 @@ void encodeM17PKT(dsd_opts * opts, dsd_state * state)
|
|||||||
// s40[10] = '\0';
|
// s40[10] = '\0';
|
||||||
// d40[10] = '\0';
|
// d40[10] = '\0';
|
||||||
|
|
||||||
|
//if special values, then assign them
|
||||||
|
if (strcmp (d40, "BROADCAST") == 0)
|
||||||
|
dst = 0xFFFFFFFFFFFF;
|
||||||
|
if (strcmp (d40, "ALL") == 0)
|
||||||
|
dst = 0xFFFFFFFFFFFF;
|
||||||
|
|
||||||
//debug
|
//debug
|
||||||
// fprintf (stderr, " SRC: %s; DST: %s; SRC_D: %llX; DST_D: %llX; SLEN %d; DLEN: %d;", s40, d40, src, dst, strlen(s40), strlen(d40) );
|
// fprintf (stderr, " SRC: %s; DST: %s; SRC_D: %llX; DST_D: %llX; SLEN %d; DLEN: %d;", s40, d40, src, dst, strlen(s40), strlen(d40) );
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user