n5ac/smartsdr-dsp
1
0
Fork 0
mirror of https://github.com/n5ac/smartsdr-dsp.git synced 2026-02-14 02:54:14 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

DSTAR Audio decode working. Add ICOM order bits to bytes

Browse source
This commit is contained in:
Ed Gonzalez 2015-06-16 14:49:55 -05:00
parent 319feb6f0e
commit 843d734b60
2 changed files with 50 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
DSP_API/ThumbDV/dstar.c
View file

@ -477,6 +477,22 @@ void dstar_processHeader(unsigned char * bytes, DSTAR_HEADER header)
dstar_dumpHeader(header);
}
static unsigned char icom_bitsToByte(const BOOL * bits)
{
uint32 l = 0;
unsigned char val = 0x00;
for ( l = 0 ; l < 8 ; l++ ) {
val >>= 1;
if ( bits[l] ) {
val |= 0x80;
}
}
return val;
}
BOOL dstar_stateMachine(DSTAR_MACHINE machine, BOOL in_bit, unsigned char * ambe_out, uint32 ambe_buf_len)
{
BOOL have_audio_packet = FALSE;
@ -506,7 +522,7 @@ BOOL dstar_stateMachine(DSTAR_MACHINE machine, BOOL in_bit, unsigned char * ambe
header[machine->bit_count++] = in_bit;
if ( machine->bit_count == FEC_SECTION_LENGTH_BITS ) {
output("Found 660 bits - descrambling\n");
// output("Found 660 bits - descrambling\n");
/* Found 660 bits of header */
// gmsk_bitsToBytes(header, bytes, FEC_SECTION_LENGTH_BITS);
@ -548,10 +564,14 @@ BOOL dstar_stateMachine(DSTAR_MACHINE machine, BOOL in_bit, unsigned char * ambe
voice_bits[machine->bit_count++] = in_bit;
if ( machine->bit_count == VOICE_FRAME_LENGTH_BITS ) {
gmsk_bitsToBytes(voice_bits, bytes, VOICE_FRAME_LENGTH_BITS);
//thumbDV_dump("Voice Frame:", bytes, VOICE_FRAME_LENGTH_BITS / 8);
memset(bytes, 0, VOICE_FRAME_LENGTH_BYTES);
uint32 n = 0;
uint32 i = 0 ;
for ( i = 0, n = 0 ; i < 9 ; i++, n += 8) {
bytes[i] = icom_bitsToByte(voice_bits + n);
}
//thumbDV_dump("ICOM Order: " , bytes, VOICE_FRAME_LENGTH_BITS / 8);
memcpy(ambe_out, bytes, VOICE_FRAME_LENGTH_BITS / 8);
have_audio_packet = TRUE;
@ -575,7 +595,12 @@ BOOL dstar_stateMachine(DSTAR_MACHINE machine, BOOL in_bit, unsigned char * ambe
machine->state = END_PATTERN_FOUND;
machine->bit_count = 0;
} else if ( machine->bit_count == DATA_FRAME_LENGTH_BITS ) {
gmsk_bitsToBytes(data_bits, bytes, DATA_FRAME_LENGTH_BITS);
BOOL out[DATA_FRAME_LENGTH_BITS] = {0};
uint32 scramble_count = 0;
dstar_scramble(data_bits, out, DATA_FRAME_LENGTH_BITS, &scramble_count);
gmsk_bitsToBytes(out, bytes, DATA_FRAME_LENGTH_BITS);
//thumbDV_dump("Data Frame:", bytes, DATA_FRAME_LENGTH_BITS/8);
machine->frame_count++;

28
DSP_API/ThumbDV/thumbDV.c
View file

@ -381,7 +381,7 @@ int thumbDV_processSerial(int serial_fd)
BufferDescriptor desc = NULL;
packet_type = buffer[3];
//dump("Serial data", buffer, respLen);
//thumbDV_dump("Serial data", buffer, respLen);
if ( packet_type == AMBE3000_CTRL_PKT_TYPE ) {
thumbDV_dump(ANSI_YELLOW "Serial data" ANSI_WHITE, buffer, respLen);
} else if ( packet_type == AMBE3000_CHAN_PKT_TYPE ) {
@ -409,6 +409,7 @@ int thumbDV_processSerial(int serial_fd)
int thumbDV_decode(int serial_fd, unsigned char * packet_in, short * speech_out, uint8 bytes_in_packet)
{
uint32 i = 0;
unsigned char full_packet[15] = {0};
if ( packet_in != NULL ) {
full_packet[0] = 0x61;
@ -417,19 +418,27 @@ int thumbDV_decode(int serial_fd, unsigned char * packet_in, short * speech_out,
full_packet[3] = 0x01;
full_packet[4] = 0x01;
full_packet[5] = 0x48;
for ( i = 0 ; i < 9 ; i++ ) {
full_packet[i+6] = packet_in[i];
uint32 j = 0;
for ( i = 0, j = 8 ; i < 9 ; i++ , j--) {
full_packet[i+6] = packet_in[i];
}
//thumbDV_dump("Encoded packet:", full_packet, 15);
// thumbDV_dump("Just AMBE", packet_in, 9);
// thumbDV_dump("Encoded packet:", full_packet, 15);
thumbDV_writeSerial(serial_fd, full_packet, 15);
}
int32 samples_returned = 0;
BufferDescriptor desc = _thumbDVDecodedList_UnlinkHead();
uint32 samples_in_speech_packet = 0;
uint32 length = 0;
if ( desc != NULL ) {
length = (((unsigned char * )desc->buf_ptr)[1] << 8 ) + ((unsigned char * )desc->buf_ptr)[2];;
if ( length != 0x142 ) {
output(ANSI_YELLOW, "WARNING LENGHT DOESN'T Match %d " ANSI_WHITE, length);
thumbDV_dump("MISMATHCED", ((unsigned char * ) desc->buf_ptr), desc->num_samples);
}
samples_in_speech_packet = ((unsigned char * )desc->buf_ptr)[5];
unsigned char * idx = &(((unsigned char * )desc->buf_ptr)[6]);
@ -608,7 +617,7 @@ void thumbDV_init(const char * serial_device_name, int * serial_fd)
thumbDV_writeSerial(*serial_fd, read_cfg, 5);
thumbDV_writeSerial(*serial_fd, dstar_mode, 17);
/* Init */
//// /* Init */
unsigned char pkt_init[6] = { 0x61, 0x00, 0x02, 0x00, 0x0B, 0x07 };
thumbDV_writeSerial(*serial_fd, pkt_init, 6);
@ -620,8 +629,11 @@ void thumbDV_init(const char * serial_device_name, int * serial_fd)
unsigned char pkt_compand[6] = { 0x61, 0x00, 0x02, 0x00, 0x32, 0x00 };
thumbDV_writeSerial(*serial_fd, pkt_compand, 6);
//unsigned char test_coded[15] = {0x61, 0x00 ,0x0B ,0x01 ,0x01 ,0x48 ,0x5E ,0x83 ,0x12 ,0x3B ,0x98 ,0x79 ,0xDE ,0x13 ,0x90};
unsigned char test_coded[15] = {0x61, 0x00 ,0x0B ,0x01 ,0x01 ,0x48 ,0x5E ,0x83 ,0x12 ,0x3B ,0x98 ,0x79 ,0xDE ,0x13 ,0x90};
//thumbDV_writeSerial(*serial_fd, test_coded, 15);
thumbDV_writeSerial(*serial_fd, test_coded, 15);
unsigned char pkt_fmt[7] = {0x61, 0x00, 0x3, 0x00, 0x15, 0x00, 0x00};
thumbDV_writeSerial(*serial_fd, pkt_fmt, 7);
}