mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-19 20:27:26 -05:00
DMR Cap+ Rest Channel FLCO/SLCO Fix;
This commit is contained in:
@@ -655,7 +655,7 @@ void dmr_cspdu (dsd_opts * opts, dsd_state * state, uint8_t cs_pdu_bits[], uint8
|
|||||||
fprintf (stderr, "%s", KYEL);
|
fprintf (stderr, "%s", KYEL);
|
||||||
uint8_t fl = (uint8_t)ConvertBitIntoBytes(&cs_pdu_bits[16], 2);
|
uint8_t fl = (uint8_t)ConvertBitIntoBytes(&cs_pdu_bits[16], 2);
|
||||||
uint8_t slot = cs_pdu_bits[18];
|
uint8_t slot = cs_pdu_bits[18];
|
||||||
uint8_t rest_channel = cs_pdu[2] & 0xF; //0xF, or 0x1F?
|
uint8_t rest_channel = cs_pdu[2] & 0xF; //0xF, this one was correct, but other two had 8 bits?
|
||||||
uint8_t ch[8]; //one bit per channel
|
uint8_t ch[8]; //one bit per channel
|
||||||
uint8_t tg = 0;
|
uint8_t tg = 0;
|
||||||
uint32_t tghex = 0; //combined all tgs for debug
|
uint32_t tghex = 0; //combined all tgs for debug
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
|
|||||||
uint8_t so = 0;
|
uint8_t so = 0;
|
||||||
uint32_t target = 0;
|
uint32_t target = 0;
|
||||||
uint32_t source = 0;
|
uint32_t source = 0;
|
||||||
|
uint8_t capsite = 0;
|
||||||
int restchannel = -1;
|
int restchannel = -1;
|
||||||
int is_cap_plus = 0;
|
int is_cap_plus = 0;
|
||||||
int is_alias = 0;
|
int is_alias = 0;
|
||||||
@@ -44,7 +45,8 @@ void dmr_flco (dsd_opts * opts, dsd_state * state, uint8_t lc_bits[], uint32_t C
|
|||||||
if (type == 1 && fid == 0x10 && flco == 0x04)
|
if (type == 1 && fid == 0x10 && flco == 0x04)
|
||||||
{
|
{
|
||||||
is_cap_plus = 1;
|
is_cap_plus = 1;
|
||||||
restchannel = (int)ConvertBitIntoBytes(&lc_bits[48], 8);
|
capsite = (uint8_t)ConvertBitIntoBytes(&lc_bits[48], 4); //can't verify, just speculating
|
||||||
|
restchannel = (int)ConvertBitIntoBytes(&lc_bits[52], 4); //was 48,8
|
||||||
source = (uint32_t)ConvertBitIntoBytes(&lc_bits[56], 16);
|
source = (uint32_t)ConvertBitIntoBytes(&lc_bits[56], 16);
|
||||||
sprintf (state->dmr_branding, "%s", "Motorola");
|
sprintf (state->dmr_branding, "%s", "Motorola");
|
||||||
sprintf (state->dmr_branding_sub, "%s", "Cap+ ");
|
sprintf (state->dmr_branding_sub, "%s", "Cap+ ");
|
||||||
@@ -553,7 +555,8 @@ void dmr_slco (dsd_opts * opts, dsd_state * state, uint8_t slco_bits[])
|
|||||||
uint8_t con_netid = (uint8_t)ConvertBitIntoBytes(&slco_bits[8], 8);
|
uint8_t con_netid = (uint8_t)ConvertBitIntoBytes(&slco_bits[8], 8);
|
||||||
uint8_t con_siteid = (uint8_t)ConvertBitIntoBytes(&slco_bits[16], 8);
|
uint8_t con_siteid = (uint8_t)ConvertBitIntoBytes(&slco_bits[16], 8);
|
||||||
//Cap+
|
//Cap+
|
||||||
uint8_t restchannel = (uint8_t)ConvertBitIntoBytes(&slco_bits[12], 8);
|
uint8_t capsite = (uint8_t)ConvertBitIntoBytes(&slco_bits[12], 4); //can't verify, just speculating
|
||||||
|
uint8_t restchannel = (uint8_t)ConvertBitIntoBytes(&slco_bits[16], 4); //was 12,8
|
||||||
|
|
||||||
//initial line break
|
//initial line break
|
||||||
fprintf (stderr, "\n");
|
fprintf (stderr, "\n");
|
||||||
|
|||||||
Reference in New Issue
Block a user