ua1zbe
/
dsd-fme-01.09.2024
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Patch For Testing; Remove Old Patches;

This commit is contained in:
lwvmobile 2024-02-21 15:57:48 -05:00
parent c4e2730ced
commit 71d79ff45b
3 changed files with 1222 additions and 593 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1222
patch/better_dmr_and_p25p2_single_voice_to_stereo_fix_p2_slots.patch Normal file
View File

File diff suppressed because it is too large Load Diff

274
patch/enable_both_slots_p2_trunking.patch
View File

@ -1,274 +0,0 @@
diff --git a/src/p25p2_vpdu.c b/src/p25p2_vpdu.c
index 5155bd7..3cf0480 100644
--- a/src/p25p2_vpdu.c
+++ b/src/p25p2_vpdu.c
@@ -155,16 +155,16 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
//shim fix to stutter/lag by only enabling slot on the target/channel we tuned to
//this will only occur in realtime tuning, not not required .bin or .wav playback
- if (channel & 1) //VCH1
- {
- opts->slot1_on = 0;
- opts->slot2_on = 1;
- }
- else //VCH0
- {
- opts->slot1_on = 1;
- opts->slot2_on = 0;
- }
+ // if (channel & 1) //VCH1
+ // {
+ // opts->slot1_on = 0;
+ // opts->slot2_on = 1;
+ // }
+ // else //VCH0
+ // {
+ // opts->slot1_on = 1;
+ // opts->slot2_on = 0;
+ // }
}
}
@@ -255,16 +255,16 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
//shim fix to stutter/lag by only enabling slot on the target/channel we tuned to
//this will only occur in realtime tuning, not not required .bin or .wav playback
- if (channel & 1) //VCH1
- {
- opts->slot1_on = 0;
- opts->slot2_on = 1;
- }
- else //VCH0
- {
- opts->slot1_on = 1;
- opts->slot2_on = 0;
- }
+ // if (channel & 1) //VCH1
+ // {
+ // opts->slot1_on = 0;
+ // opts->slot2_on = 1;
+ // }
+ // else //VCH0
+ // {
+ // opts->slot1_on = 1;
+ // opts->slot2_on = 0;
+ // }
}
}
@@ -386,16 +386,16 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
//shim fix to stutter/lag by only enabling slot on the target/channel we tuned to
//this will only occur in realtime tuning, not not required .bin or .wav playback
- if (tunable_chan & 1) //VCH1
- {
- opts->slot1_on = 0;
- opts->slot2_on = 1;
- }
- else //VCH0
- {
- opts->slot1_on = 1;
- opts->slot2_on = 0;
- }
+ // if (tunable_chan & 1) //VCH1
+ // {
+ // opts->slot1_on = 0;
+ // opts->slot2_on = 1;
+ // }
+ // else //VCH0
+ // {
+ // opts->slot1_on = 1;
+ // opts->slot2_on = 0;
+ // }
}
}
@@ -511,16 +511,16 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
//shim fix to stutter/lag by only enabling slot on the target/channel we tuned to
//this will only occur in realtime tuning, not not required .bin or .wav playback
- if (channel & 1) //VCH1
- {
- opts->slot1_on = 0;
- opts->slot2_on = 1;
- }
- else //VCH0
- {
- opts->slot1_on = 1;
- opts->slot2_on = 0;
- }
+ // if (channel & 1) //VCH1
+ // {
+ // opts->slot1_on = 0;
+ // opts->slot2_on = 1;
+ // }
+ // else //VCH0
+ // {
+ // opts->slot1_on = 1;
+ // opts->slot2_on = 0;
+ // }
}
}
@@ -642,16 +642,16 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
//shim fix to stutter/lag by only enabling slot on the target/channel we tuned to
//this will only occur in realtime tuning, not not required .bin or .wav playback
- if (channel & 1) //VCH1
- {
- opts->slot1_on = 0;
- opts->slot2_on = 1;
- }
- else //VCH0
- {
- opts->slot1_on = 1;
- opts->slot2_on = 0;
- }
+ // if (channel & 1) //VCH1
+ // {
+ // opts->slot1_on = 0;
+ // opts->slot2_on = 1;
+ // }
+ // else //VCH0
+ // {
+ // opts->slot1_on = 1;
+ // opts->slot2_on = 0;
+ // }
}
}
@@ -748,16 +748,16 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
//shim fix to stutter/lag by only enabling slot on the target/channel we tuned to
//this will only occur in realtime tuning, not not required .bin or .wav playback
- if (channel & 1) //VCH1
- {
- opts->slot1_on = 0;
- opts->slot2_on = 1;
- }
- else //VCH0
- {
- opts->slot1_on = 1;
- opts->slot2_on = 0;
- }
+ // if (channel & 1) //VCH1
+ // {
+ // opts->slot1_on = 0;
+ // opts->slot2_on = 1;
+ // }
+ // else //VCH0
+ // {
+ // opts->slot1_on = 1;
+ // opts->slot2_on = 0;
+ // }
}
}
@@ -918,16 +918,16 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
//shim fix to stutter/lag by only enabling slot on the target/channel we tuned to
//this will only occur in realtime tuning, not not required .bin or .wav playback
- if (tunable_chan & 1) //VCH1
- {
- opts->slot1_on = 0;
- opts->slot2_on = 1;
- }
- else //VCH0
- {
- opts->slot1_on = 1;
- opts->slot2_on = 0;
- }
+ // if (tunable_chan & 1) //VCH1
+ // {
+ // opts->slot1_on = 0;
+ // opts->slot2_on = 1;
+ // }
+ // else //VCH0
+ // {
+ // opts->slot1_on = 1;
+ // opts->slot2_on = 0;
+ // }
}
}
@@ -1109,16 +1109,16 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
//shim fix to stutter/lag by only enabling slot on the target/channel we tuned to
//this will only occur in realtime tuning, not not required .bin or .wav playback
- if (tunable_chan & 1) //VCH1
- {
- opts->slot1_on = 0;
- opts->slot2_on = 1;
- }
- else //VCH0
- {
- opts->slot1_on = 1;
- opts->slot2_on = 0;
- }
+ // if (tunable_chan & 1) //VCH1
+ // {
+ // opts->slot1_on = 0;
+ // opts->slot2_on = 1;
+ // }
+ // else //VCH0
+ // {
+ // opts->slot1_on = 1;
+ // opts->slot2_on = 0;
+ // }
}
}
@@ -1245,16 +1245,16 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
//shim fix to stutter/lag by only enabling slot on the target/channel we tuned to
//this will only occur in realtime tuning, not not required .bin or .wav playback
- if (tunable_chan & 1) //VCH1
- {
- opts->slot1_on = 0;
- opts->slot2_on = 1;
- }
- else //VCH0
- {
- opts->slot1_on = 1;
- opts->slot2_on = 0;
- }
+ // if (tunable_chan & 1) //VCH1
+ // {
+ // opts->slot1_on = 0;
+ // opts->slot2_on = 1;
+ // }
+ // else //VCH0
+ // {
+ // opts->slot1_on = 1;
+ // opts->slot2_on = 0;
+ // }
}
}
@@ -1374,16 +1374,16 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
//shim fix to stutter/lag by only enabling slot on the target/channel we tuned to
//this will only occur in realtime tuning, not not required .bin or .wav playback
- if (channelt & 1) //VCH1
- {
- opts->slot1_on = 0;
- opts->slot2_on = 1;
- }
- else //VCH0
- {
- opts->slot1_on = 1;
- opts->slot2_on = 0;
- }
+ // if (channelt & 1) //VCH1
+ // {
+ // opts->slot1_on = 0;
+ // opts->slot2_on = 1;
+ // }
+ // else //VCH0
+ // {
+ // opts->slot1_on = 1;
+ // opts->slot2_on = 0;
+ // }
}

319
patch/enable_pref_slots_p2_trunking.patch
View File

@ -1,319 +0,0 @@
diff --git a/src/p25p1_mdpu.c b/src/p25p1_mdpu.c
index 7d29860..00c1828 100644
--- a/src/p25p1_mdpu.c
+++ b/src/p25p1_mdpu.c
@@ -527,13 +527,13 @@ void processMPDU(dsd_opts * opts, dsd_state * state)
//this will only occur in realtime tuning, not not required .bin or .wav playback
if (channelt & 1) //VCH1
{
- opts->slot1_on = 0;
- opts->slot2_on = 1;
+ //opts->slot1_on = 0;
+ opts->slot_preference = 1;
}
else //VCH0
{
- opts->slot1_on = 1;
- opts->slot2_on = 0;
+ opts->slot_preference = 0;
+ //opts->slot2_on = 0;
}
}
@@ -644,13 +644,13 @@ void processMPDU(dsd_opts * opts, dsd_state * state)
//this will only occur in realtime tuning, not not required .bin or .wav playback
if (channelt & 1) //VCH1
{
- opts->slot1_on = 0;
- opts->slot2_on = 1;
+ //opts->slot1_on = 0;
+ opts->slot_preference = 1;
}
else //VCH0
{
- opts->slot1_on = 1;
- opts->slot2_on = 0;
+ opts->slot_preference = 0;
+ //opts->slot2_on = 0;
}
}
@@ -753,13 +753,13 @@ void processMPDU(dsd_opts * opts, dsd_state * state)
//this will only occur in realtime tuning, not not required .bin or .wav playback
if (channel & 1) //VCH1
{
- opts->slot1_on = 0;
- opts->slot2_on = 1;
+ //opts->slot1_on = 0;
+ opts->slot_preference = 1;
}
else //VCH0
{
- opts->slot1_on = 1;
- opts->slot2_on = 0;
+ opts->slot_preference = 0;
+ //opts->slot2_on = 0;
}
}
@@ -876,13 +876,13 @@ void processMPDU(dsd_opts * opts, dsd_state * state)
//this will only occur in realtime tuning, not not required .bin or .wav playback
if (channelt & 1) //VCH1
{
- opts->slot1_on = 0;
- opts->slot2_on = 1;
+ //opts->slot1_on = 0;
+ opts->slot_preference = 1;
}
else //VCH0
{
- opts->slot1_on = 1;
- opts->slot2_on = 0;
+ opts->slot_preference = 0;
+ //opts->slot2_on = 0;
}
}
diff --git a/src/p25p1_tsbk.c b/src/p25p1_tsbk.c
index c801b7f..345335a 100644
--- a/src/p25p1_tsbk.c
+++ b/src/p25p1_tsbk.c
@@ -294,13 +294,13 @@ void processTSBK(dsd_opts * opts, dsd_state * state)
//this will only occur in realtime tuning, not not required .bin or .wav playback
if (channel & 1) //VCH1
{
- opts->slot1_on = 0;
- opts->slot2_on = 1;
+ //opts->slot1_on = 0;
+ opts->slot_preference = 1;
}
else //VCH0
{
- opts->slot1_on = 1;
- opts->slot2_on = 0;
+ opts->slot_preference = 0;
+ //opts->slot2_on = 0;
}
}
diff --git a/src/p25p2_vpdu.c b/src/p25p2_vpdu.c
index 468b71a..1b14d71 100644
--- a/src/p25p2_vpdu.c
+++ b/src/p25p2_vpdu.c
@@ -75,8 +75,6 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
//Temp Fix: Disable Slot Playback when MAC_SIGNAL present (good CRC),
//during trunking, will re-enable when call grant is received, prevent lagging:
- if (opts->p25_trunk == 1 && opts->p25_is_tuned == 0) opts->slot1_on = 0;
- if (opts->p25_trunk == 1 && opts->p25_is_tuned == 0) opts->slot2_on = 0;
//TODO: Iron out issues with audio playing in every non SACCH slot when no voice present
//without it stuttering during actual voice
@@ -156,13 +154,13 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
//this will only occur in realtime tuning, not not required .bin or .wav playback
if (channel & 1) //VCH1
{
- opts->slot1_on = 0;
- opts->slot2_on = 1;
+ //opts->slot1_on = 0;
+ opts->slot_preference = 1;
}
else //VCH0
{
- opts->slot1_on = 1;
- opts->slot2_on = 0;
+ opts->slot_preference = 0;
+ //opts->slot2_on = 0;
}
}
@@ -256,13 +254,13 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
//this will only occur in realtime tuning, not not required .bin or .wav playback
if (channel & 1) //VCH1
{
- opts->slot1_on = 0;
- opts->slot2_on = 1;
+ //opts->slot1_on = 0;
+ opts->slot_preference = 1;
}
else //VCH0
{
- opts->slot1_on = 1;
- opts->slot2_on = 0;
+ opts->slot_preference = 0;
+ //opts->slot2_on = 0;
}
}
@@ -387,13 +385,13 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
//this will only occur in realtime tuning, not not required .bin or .wav playback
if (tunable_chan & 1) //VCH1
{
- opts->slot1_on = 0;
- opts->slot2_on = 1;
+ //opts->slot1_on = 0;
+ opts->slot_preference = 1;
}
else //VCH0
{
- opts->slot1_on = 1;
- opts->slot2_on = 0;
+ opts->slot_preference = 0;
+ //opts->slot2_on = 0;
}
}
@@ -512,13 +510,13 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
//this will only occur in realtime tuning, not not required .bin or .wav playback
if (channel & 1) //VCH1
{
- opts->slot1_on = 0;
- opts->slot2_on = 1;
+ //opts->slot1_on = 0;
+ opts->slot_preference = 1;
}
else //VCH0
{
- opts->slot1_on = 1;
- opts->slot2_on = 0;
+ opts->slot_preference = 0;
+ //opts->slot2_on = 0;
}
}
@@ -643,13 +641,13 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
//this will only occur in realtime tuning, not not required .bin or .wav playback
if (channel & 1) //VCH1
{
- opts->slot1_on = 0;
- opts->slot2_on = 1;
+ //opts->slot1_on = 0;
+ opts->slot_preference = 1;
}
else //VCH0
{
- opts->slot1_on = 1;
- opts->slot2_on = 0;
+ opts->slot_preference = 0;
+ //opts->slot2_on = 0;
}
}
@@ -749,13 +747,13 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
//this will only occur in realtime tuning, not not required .bin or .wav playback
if (channel & 1) //VCH1
{
- opts->slot1_on = 0;
- opts->slot2_on = 1;
+ //opts->slot1_on = 0;
+ opts->slot_preference = 1;
}
else //VCH0
{
- opts->slot1_on = 1;
- opts->slot2_on = 0;
+ opts->slot_preference = 0;
+ //opts->slot2_on = 0;
}
}
@@ -919,13 +917,13 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
//this will only occur in realtime tuning, not not required .bin or .wav playback
if (tunable_chan & 1) //VCH1
{
- opts->slot1_on = 0;
- opts->slot2_on = 1;
+ //opts->slot1_on = 0;
+ opts->slot_preference = 1;
}
else //VCH0
{
- opts->slot1_on = 1;
- opts->slot2_on = 0;
+ opts->slot_preference = 0;
+ //opts->slot2_on = 0;
}
}
@@ -1110,13 +1108,13 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
//this will only occur in realtime tuning, not not required .bin or .wav playback
if (tunable_chan & 1) //VCH1
{
- opts->slot1_on = 0;
- opts->slot2_on = 1;
+ //opts->slot1_on = 0;
+ opts->slot_preference = 1;
}
else //VCH0
{
- opts->slot1_on = 1;
- opts->slot2_on = 0;
+ opts->slot_preference = 0;
+ //opts->slot2_on = 0;
}
}
@@ -1246,13 +1244,13 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
//this will only occur in realtime tuning, not not required .bin or .wav playback
if (tunable_chan & 1) //VCH1
{
- opts->slot1_on = 0;
- opts->slot2_on = 1;
+ //opts->slot1_on = 0;
+ opts->slot_preference = 1;
}
else //VCH0
{
- opts->slot1_on = 1;
- opts->slot2_on = 0;
+ opts->slot_preference = 0;
+ //opts->slot2_on = 0;
}
}
@@ -1375,13 +1373,13 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
//this will only occur in realtime tuning, not not required .bin or .wav playback
if (channelt & 1) //VCH1
{
- opts->slot1_on = 0;
- opts->slot2_on = 1;
+ //opts->slot1_on = 0;
+ opts->slot_preference = 1;
}
else //VCH0
{
- opts->slot1_on = 1;
- opts->slot2_on = 0;
+ opts->slot_preference = 0;
+ //opts->slot2_on = 0;
}
}
@@ -1498,13 +1496,13 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
//this will only occur in realtime tuning, not not required .bin or .wav playback
if (channelt & 1) //VCH1
{
- opts->slot1_on = 0;
- opts->slot2_on = 1;
+ //opts->slot1_on = 0;
+ opts->slot_preference = 1;
}
else //VCH0
{
- opts->slot1_on = 1;
- opts->slot2_on = 0;
+ opts->slot_preference = 0;
+ //opts->slot2_on = 0;
}
}
@@ -1516,9 +1514,6 @@ void process_MAC_VPDU(dsd_opts * opts, dsd_state * state, int type, unsigned lon
state->samplesPerSymbol = 10;
state->symbolCenter = 4;
opts->frame_p25p1 = 1; //enable, just in case it isn't already
-
- //enable voice on slot 1 (just in case they start talking too, but probably won't)
- opts->slot1_on = 1;
}
}