From fa4a33258209d2b02c1b9331340869f189582740 Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Thu, 10 Sep 2026 16:32:24 -0400 Subject: [PATCH] DMR: Add Special Use Cases for RAS Passwords that use a # or a $ in the help and complete usage doc; #359 --- examples/cygwin_bat/complete_usage_options.txt | 10 +++++++--- src/dsd_main.c | 8 ++++++-- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/examples/cygwin_bat/complete_usage_options.txt b/examples/cygwin_bat/complete_usage_options.txt index 60be8d1..dc051e4 100644 --- a/examples/cygwin_bat/complete_usage_options.txt +++ b/examples/cygwin_bat/complete_usage_options.txt @@ -1,4 +1,4 @@ -Build Version: AW 2026-41-gfb3dc75 +Build Version: AW 2026-43-g4139b19 MBElib Version: 1.3.4 CODEC2 Support Enabled @@ -173,10 +173,14 @@ Advanced Decoder options: -A Manually Enter and Enforce Anytone 16-bit BP Key Value (DMR) (Hex Value) - -$ Enter RAS Password 6-24 Char Key Value (DMR) (String Value) + -$ Enter RAS Password 6-24 Char Key Value (DMR) (a-z A-Z, 0-9, $ # _ -) -$ Password123 - -y Enter RAS 56-bit Effective Key Value (DMR) (14 Hex Value) + Special Use Cases involving # and $, use parenthesis and put \ in front of all $ signs + -$ "######" + -$ "\$\$\$\$\$\$" + + -y Enter RAS 56-bit Effective Key Value (DMR) (14 Char Hex Value) -y 6DF241BC4AE2EC -, Manually Enter and Enforce Auctus A6 (GoComm) 8 Char Key Value (DMR) (String Value) diff --git a/src/dsd_main.c b/src/dsd_main.c index 385eeef..d43da5d 100644 --- a/src/dsd_main.c +++ b/src/dsd_main.c @@ -1587,10 +1587,14 @@ printf (" \n"); printf (" -A Manually Enter and Enforce Anytone 16-bit BP Key Value (DMR) (Hex Value) \n"); printf (" \n"); - printf (" -$ Enter RAS Password 6-24 Char Key Value (DMR) (String Value) \n"); + printf (" -$ Enter RAS Password 6-24 Char Key Value (DMR) (a-z A-Z, 0-9, $ # _ -) \n"); printf (" -$ Password123\n"); printf (" \n"); - printf (" -y Enter RAS 56-bit Effective Key Value (DMR) (14 Hex Value) \n"); + printf (" Special Use Cases involving # and $, use parenthesis and put \\ in front of all $ signs\n"); + printf (" -$ \"######\"\n"); + printf (" -$ \"\\$\\$\\$\\$\\$\\$\"\n"); + printf (" \n"); + printf (" -y Enter RAS 56-bit Effective Key Value (DMR) (14 Char Hex Value) \n"); printf (" -y 6DF241BC4AE2EC\n"); printf (" \n"); printf (" -, Manually Enter and Enforce Auctus A6 (GoComm) 8 Char Key Value (DMR) (String Value) \n");