fleg
/
OpenRTX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added channel access number and frame type to M17 data field in radio state, merged TX and RX channel access number fields of rtx configuaration data structure into one.

This commit is contained in:
Silvano Seva 2022-12-04 15:57:48 +01:00
parent d8c4ba4420
commit e3b66f6a4b
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
openrtx/include/core/state.h
View File

@ -34,7 +34,8 @@
*/
typedef struct
{
char dst_addr[10];
char dst_addr[10]; // Destination callsign
uint8_t can; // Channel Access Number
}
m17_t;

8
openrtx/include/rtx/rtx.h
View File

@ -43,8 +43,8 @@ typedef struct
freq_t rxFrequency; /**< RX frequency, in Hz */
freq_t txFrequency; /**< TX frequency, in Hz */
float txPower; /**< TX power, in W */
uint8_t sqlLevel; /**< Squelch opening level */
float txPower; /**< TX power, in W */
uint8_t sqlLevel; /**< Squelch opening level */
uint16_t rxToneEn : 1, /**< RX CTC/DCS tone enable */
rxTone : 15; /**< RX CTC/DCS tone */
@ -52,8 +52,8 @@ typedef struct
uint16_t txToneEn : 1, /**< TX CTC/DCS tone enable */
txTone : 15; /**< TX CTC/DCS tone */
uint8_t rxCan : 4, /**< M17 Channel Access Number for RX squelch */
txCan : 4; /**< M17 Channel Access Number for TX squelch */
uint8_t can : 4, /**< M17 Channel Access Number */
_unused : 4;
char source_address[10]; /**< M17 call source address */
char destination_address[10]; /**< M17 call routing address */