GitHub/dsd-fme
1
0
Fork 0
mirror of https://github.com/lwvmobile/dsd-fme.git synced 2026-11-13 01:07:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

More Code Testing and Cleanup

Browse Source 
More Code Testing and Cleanup
--disable some debug printouts
This commit is contained in:
lwvmobile
2022-06-08 22:42:06 -04:00
committed by GitHub
parent 5a39fe65db
commit cbd3d98151
4 changed files with 105 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/dsd.h
View File

@@ -542,6 +542,7 @@ typedef struct
uint8_t dmr_12_rate_sf[2][60]; //going five frames deep by 12 bytes //[slot][value]
uint8_t dmr_34_rate_sf[2][64]; //going four frames deep by 16 bytes //[slot][value]
int dmr_stereo_payload[144]; //load up 144 dibit buffer for every single DMR TDMA frame
//uint8_t dmr_stereo_payload[144]; //load up 144 dibit buffer for every single DMR TDMA frame
dPMRVoiceFS2Frame_t dPMRVoiceFS2Frame;

106
src/dmr_bs.c
View File

@@ -46,10 +46,6 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
return curr;
}
//Init the superframe buffers
//memset(&state->TS1SuperFrame, 0, sizeof(TimeSlotVoiceSuperFrame_t));
//memset(&state->TS2SuperFrame, 0, sizeof(TimeSlotVoiceSuperFrame_t));
//Init slot lights
sprintf (state->slot1light, " slot1 ");
sprintf (state->slot2light, " slot2 ");
@@ -73,6 +69,8 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
dibit = getDibit(opts, state);
cachdata[i] = dibit;
state->dmr_stereo_payload[i] = dibit;
//fprintf (stderr, "D%X ", dibit);
//fprintf (stderr, "P%X ", state->dmr_stereo_payload[i]);
if(i == 2)
{
state->currentslot = (1 & (dibit >> 1));
@@ -173,15 +171,6 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
}
sync[24] = 0;
if (internalslot == 0 && vc1 == 6)
{
//fprintf (stderr, "\nVC6 Burst = %X\n", syncdata);
}
if (internalslot == 1 && vc2 == 6)
{
//fprintf (stderr, "\nVC6 Burst = %X\n", syncdata);
}
EmbeddedSignallingOk = -1;
if(QR_16_7_6_decode(EmbeddedSignalling))
@@ -404,9 +393,100 @@ void dmrBS (dsd_opts * opts, dsd_state * state)
ProcessVoiceBurstSync(opts, state);
fprintf (stderr, "\n");
}
//test printing ambe_fr values
/*
if (1 == 1)
{
fprintf (stderr, "\nAMBE_FR1 = ");
for (j = 0; j < 4; j++)
{
fprintf (stderr, " - ");
for (k = 0; k < 12;)
{
int b = 0;
int c = 0;
int d = 0;
int e = 0;
b = ambe_fr[j][k];
c = ambe_fr[j][k+1];
d = ambe_fr[j][k+2];
e = ambe_fr[j][k+3];
//fprintf (stderr, "%X", (((uint8_t)ambe_fr[k] << 2) + ambe_fr[k+1]) );
fprintf (stderr, "%01X", ( (b << 3) + (c << 2) + (d << 1) + e ) );
k = k + 4;
}
}
fprintf (stderr, "\nAMBE_FR2 = ");
for (j = 0; j < 4; j++)
{
fprintf (stderr, " - ");
for (k = 0; k < 12;)
{
int b = 0;
int c = 0;
int d = 0;
int e = 0;
b = ambe_fr2[j][k];
c = ambe_fr2[j][k+1];
d = ambe_fr2[j][k+2];
e = ambe_fr2[j][k+3];
//fprintf (stderr, "%X", (((uint8_t)ambe_fr[k] << 2) + ambe_fr[k+1]) );
fprintf (stderr, "%01X", ( (b << 3) + (c << 2) + (d << 1) + e ) );
k = k + 4;
}
}
fprintf (stderr, "\nAMBE_FR3 = ");
for (j = 0; j < 4; j++)
{
fprintf (stderr, " - ");
for (k = 0; k < 12;)
{
int b = 0;
int c = 0;
int d = 0;
int e = 0;
b = ambe_fr3[j][k];
c = ambe_fr3[j][k+1];
d = ambe_fr3[j][k+2];
e = ambe_fr3[j][k+3];
//fprintf (stderr, "%X", (((uint8_t)ambe_fr[k] << 2) + ambe_fr[k+1]) );
fprintf (stderr, "%01X", ( (b << 3) + (c << 2) + (d << 1) + e ) );
k = k + 4;
}
}
fprintf (stderr, "\n");
}
*/
//end testing fr values
processMbeFrame (opts, state, NULL, ambe_fr, NULL);
processMbeFrame (opts, state, NULL, ambe_fr2, NULL);
processMbeFrame (opts, state, NULL, ambe_fr3, NULL);
/*
if (internalslot == 0 ) //&& vc1 == 6
{
fprintf (stderr, "\nVC%d Full = ", vc1);
for (k = 0; k < 144;)
{
fprintf (stderr, "%X", ((state->dmr_stereo_payload[k] << 2) + state->dmr_stereo_payload[k+1]) );
k = k + 2;
}
fprintf (stderr, "\n");
}
if (internalslot == 1 ) //&& vc2 == 6
{
fprintf (stderr, "\nVC%d Full = ", vc2);
for (k = 0; k < 144;)
{
//fprintf (stderr, " L%X R%X ", state->dmr_stereo_payload[k], state->dmr_stereo_payload[k+1]);
fprintf (stderr, "%01X", ((state->dmr_stereo_payload[k] << 2) + state->dmr_stereo_payload[k+1]) );
k = k + 2;
}
fprintf (stderr, "\n");
}
*/
if (internalslot == 0)
{
vc1++;

4
src/dmr_data.c
View File

@@ -462,7 +462,7 @@ processDMRdata (dsd_opts * opts, dsd_state * state)
case 0b0011:
{
//going to disable until I can find more useful info to present
//ProcessCSBK(opts, state, (uint8_t *)info, (uint8_t *)syncdata, (uint8_t *)SlotType);
ProcessCSBK(opts, state, (uint8_t *)info, (uint8_t *)syncdata, (uint8_t *)SlotType);
break;
}
@@ -498,7 +498,7 @@ processDMRdata (dsd_opts * opts, dsd_state * state)
case 0b1000:
{
//need to keep working on improving the trellis decode, but is partially viable now
//Process34Data(opts, state, trellisdibits, (uint8_t *)syncdata, (uint8_t *)SlotType);
Process34Data(opts, state, trellisdibits, (uint8_t *)syncdata, (uint8_t *)SlotType);
break;
}

18
src/provoice.c
View File

@@ -33,7 +33,7 @@ processProVoice (dsd_opts * opts, dsd_state * state)
if (opts->payload == 1)
{
k = 0;
fprintf (stderr, "\nInit 64 ");
//fprintf (stderr, "\nInit 64 ");
for(i = 0; i < 8; i++)
{
initbyte[i] = 0;
@@ -43,9 +43,9 @@ processProVoice (dsd_opts * opts, dsd_state * state)
initbyte[i] = initbyte[i] | init[k];
k++;
}
fprintf (stderr, "%02X", initbyte[i]);
//fprintf (stderr, "%02X", initbyte[i]);
}
fprintf (stderr, "\n");
//fprintf (stderr, "\n");
}
// lid
for (i = 0; i < 16; i++)
@@ -75,7 +75,7 @@ processProVoice (dsd_opts * opts, dsd_state * state)
if (opts->payload == 1)
{
k = 0;
fprintf (stderr, "LID ");
//fprintf (stderr, "LID ");
for(i = 0; i < 10; i++)
{
lidbyte[i] = 0;
@@ -85,9 +85,9 @@ processProVoice (dsd_opts * opts, dsd_state * state)
lidbyte[i] = lidbyte[i] | lid[k];
k++;
}
fprintf (stderr, "%02X", lidbyte[i]);
//fprintf (stderr, "%02X", lidbyte[i]);
}
fprintf (stderr, "\n");
//fprintf (stderr, "\n");
}
@@ -333,7 +333,7 @@ processProVoice (dsd_opts * opts, dsd_state * state)
if (opts->payload == 1)
{
k = 0;
fprintf (stderr, "16 bits? ");
//fprintf (stderr, "16 bits? ");
for(i = 0; i < 2; i++)
{
initbyte[i] = 0;
@@ -343,9 +343,9 @@ if (opts->payload == 1)
initbyte[i] = initbyte[i] | init[k];
k++;
}
fprintf (stderr, "%02X", initbyte[i]);
//fprintf (stderr, "%02X", initbyte[i]);
}
fprintf (stderr, "\n");
//fprintf (stderr, "\n");
}
// imbe frames 3,4 first half
w = pW;