Checking in latest channel checker changes to accomodate 1.12

Roon · May 31, 2019 · 5895e43 · 5895e43
1 parent 7159768
commit 5895e43
Showing 1 changed file with 43 additions and 42 deletions.
diff --git a/anytone-channel-checker.pl b/anytone-channel-checker.pl
@@ -17,14 +17,14 @@
     CHAN_CONTACT        => 9,
     CHAN_CALL_TYPE      => 10,
     CHAN_RADIO_ID       => 11,
-    CHAN_TX_PERMIT      => 12,
-    CHAN_SQUELCH        => 13,
-    CHAN_OPT_SIG        => 14,
-    CHAN_DTMF_ID        => 15,
-    CHAN_2TONE_ID       => 16,
-    CHAN_COLOR_CODE     => 19,
-    CHAN_SLOT           => 20,
-    CHAN_SCANLIST_NAME  => 21,
+    CHAN_TX_PERMIT      => 13,
+    CHAN_SQUELCH        => 14,
+    CHAN_OPT_SIG        => 15,
+    CHAN_DTMF_ID        => 16,
+    CHAN_2TONE_ID       => 17,
+    CHAN_COLOR_CODE     => 18,
+    CHAN_SLOT           => 21,
+    CHAN_SCANLIST_NAME  => 22,
 };
 
 use constant {
@@ -117,7 +117,7 @@ sub report_digital_repeater_arbitrary_fields
 {
     my ($data_ref) = @_;
 
-    my @key_array = (5, 6, 7, 8, 10, 11, 12, 13, 14, 15, 16, 17, 18, 23, 24, 25, 26, 27, 28, 29, 30, 31, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43);
+    my @key_array = (5, 6, 7, 8, 10, 12, 13, 14, 15, 16, 17, 18, 23, 24, 25, 26, 27, 28, 29, 30, 31,32,  34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44);
     analyze_key_value_pairs($data_ref, \@key_array, \&arbitrary_field_key, \&arbitrary_field_value,
             \&digital_repeater_filter, \&chan_num_and_name, "Field", "Value", "??",
             "Digital Repeater Other Field Consistency Report");
@@ -340,39 +340,40 @@ sub anytone_channels_csv_column_name
         8 => "CTCSS/DCS Encode",
         9 => "Contact",
         10 => "Contact Call Type",
-        11 => "Radio ID",
-        12 => "Busy Lock/TX Permit",
-        13 => "Squelch Mode",
-        14 => "Optional Signal",
-        15 => "DTMF ID",
-        16 => "2Tone ID",
-        17 => "5Tone ID",
-        18 => "PTT ID",
-        19 => "Color Code",
-        20 => "Slot",
-        21 => "Scan List",
-        22 => "Receive Group List",
-        23 => "TX Prohibit",
-        24 => "Reverse",
-        25 => "Simplex TDMA",
-        26 => "TDMA Adaptive",
-        27 => "Encryption Type",
-        28 => "Digital Encryption",
-        29 => "Call Confirmation",
-        30 => "Talk Around",
-        31 => "Work Alone",
-        32 => "Custom CTCSS",
-        33 => "2TONE Decode",
-        34 => "Ranging",
-        35 => "Through Mode",
-        36 => "Digi APRS RX",
-        37 => "Analog APRS PTT Mode",
-        38 => "Digital APRS PTT Mode",
-        39 => "APRS Report Type",
-        40 => "Digital APRS Report Channel",
-        41 => "Correct Frequency[Hz]",
-        42 => "SMS Confirmation",
-        43 => "Exclude channel from roaming",
+        11 => "Contact TG/DMR ID",
+        12 => "Radio ID",
+        13 => "Busy Lock/TX Permit",
+        14 => "Squelch Mode",
+        15 => "Optional Signal",
+        16 => "DTMF ID",
+        17 => "2Tone ID",
+        18 => "5Tone ID",
+        19 => "PTT ID",
+        20 => "Color Code",
+        21 => "Slot",
+        22 => "Scan List",
+        23 => "Receive Group List",
+        24 => "TX Prohibit",
+        25 => "Reverse",
+        26 => "Simplex TDMA",
+        27 => "TDMA Adaptive",
+        28 => "Encryption Type",
+        29 => "Digital Encryption",
+        30 => "Call Confirmation",
+        31 => "Talk Around",
+        32 => "Work Alone",
+        33 => "Custom CTCSS",
+        34 => "2TONE Decode",
+        35 => "Ranging",
+        36 => "Through Mode",
+        37 => "Digi APRS RX",
+        38 => "Analog APRS PTT Mode",
+        39 => "Digital APRS PTT Mode",
+        40 => "APRS Report Type",
+        41 => "Digital APRS Report Channel",
+        42 => "Correct Frequency[Hz]",
+        43 => "SMS Confirmation",
+        44 => "Exclude channel from roaming",
     );
 
     my $result = "Unknown Column '$col_num'";