From e3b66f6a4b3286873bf66a3a98ad7d33dd4cc321 Mon Sep 17 00:00:00 2001 From: Silvano Seva Date: Sun, 4 Dec 2022 15:57:48 +0100 Subject: [PATCH] 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. --- openrtx/include/core/state.h | 3 ++- openrtx/include/rtx/rtx.h | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/openrtx/include/core/state.h b/openrtx/include/core/state.h index 6bbbe7d7..4118cc74 100644 --- a/openrtx/include/core/state.h +++ b/openrtx/include/core/state.h @@ -34,7 +34,8 @@ */ typedef struct { - char dst_addr[10]; + char dst_addr[10]; // Destination callsign + uint8_t can; // Channel Access Number } m17_t; diff --git a/openrtx/include/rtx/rtx.h b/openrtx/include/rtx/rtx.h index f44d4d1b..60f37dab 100644 --- a/openrtx/include/rtx/rtx.h +++ b/openrtx/include/rtx/rtx.h @@ -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 */