diff --git a/patch/dmr_data_voice_call_tg_src_persistency_ncurses.patch b/patch/dmr_data_voice_call_tg_src_persistency_ncurses2.patch similarity index 80% rename from patch/dmr_data_voice_call_tg_src_persistency_ncurses.patch rename to patch/dmr_data_voice_call_tg_src_persistency_ncurses2.patch index d988faa..d96855d 100644 --- a/patch/dmr_data_voice_call_tg_src_persistency_ncurses.patch +++ b/patch/dmr_data_voice_call_tg_src_persistency_ncurses2.patch @@ -1,12 +1,3 @@ -diff --git a/.gitignore b/.gitignore -index 67d5d1c..1d8d34e 100644 ---- a/.gitignore -+++ b/.gitignore -@@ -7,4 +7,3 @@ build - examples - *.bin - *.ans --*.patch diff --git a/src/dmr_block.c b/src/dmr_block.c index 893b0e8..e7f9de7 100644 --- a/src/dmr_block.c @@ -21,8 +12,34 @@ index 893b0e8..e7f9de7 100644 + // sprintf (state->dmr_lrrp_gps[1], "%s", ""); //disabled for dmr data call persistence #174 } \ No newline at end of file +diff --git a/src/dmr_data.c b/src/dmr_data.c +index 3541152..3cae906 100644 +--- a/src/dmr_data.c ++++ b/src/dmr_data.c +@@ -267,7 +267,20 @@ dmr_data_sync (dsd_opts * opts, dsd_state * state) + state->color_code_ok = SlotTypeOk; + + //not sure why I still have two variables for this, need to look and see what state->color_code still ties into +- if (SlotTypeOk == 1) state->dmr_color_code = state->color_code; ++ if (SlotTypeOk == 1) ++ { ++ if (state->dmr_color_code != state->color_code) ++ { ++ //Zero out values on color code change #174 ++ state->lasttg = 0; ++ state->lasttgR =0; ++ state->lastsrc = 0; ++ state->lastsrcR = 0; ++ sprintf (state->dmr_lrrp_gps[0], "%s", ""); ++ sprintf (state->dmr_lrrp_gps[1], "%s", ""); ++ state->dmr_color_code = state->color_code; ++ } ++ } + + /* Reconstitute the burst type */ + burst = (uint8_t)((SlotType[4] << 3) + (SlotType[5] << 2) + (SlotType[6] << 1) + SlotType[7]); diff --git a/src/dsd_main.c b/src/dsd_main.c -index 58174be..7ecb997 100644 +index 5531ef3..5598793 100644 --- a/src/dsd_main.c +++ b/src/dsd_main.c @@ -257,10 +257,10 @@ if(opts->frame_m17 == 1) //&& opts->audio_in_type == 5