From 49ec3a3d102a114a37bcae75fc6a59241c50c812 Mon Sep 17 00:00:00 2001 From: Ivica Date: Thu, 19 Dec 2024 17:21:00 +0000 Subject: [PATCH 1/4] fix: added extra case for processing single char prefixes of the callsign --- src/JTEncode.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/JTEncode.cpp b/src/JTEncode.cpp index fcb7723..f977279 100644 --- a/src/JTEncode.cpp +++ b/src/JTEncode.cpp @@ -997,14 +997,18 @@ void JTEncode::wspr_bit_packing(uint8_t * c) strncpy(prefix, callsign, slash_pos); strncpy(base_call, callsign + slash_pos + 1, 7); - if(prefix[2] == ' ' || prefix[2] == 0) - { - // Right align prefix - prefix[3] = 0; - prefix[2] = prefix[1]; - prefix[1] = prefix[0]; - prefix[0] = ' '; - } + if (prefix[1] == ' ' || prefix[1] == 0) { + prefix[3] = 0; + prefix[2] = prefix[0]; + prefix[1] = ' '; + prefix[0] = ' '; + + } else if (prefix[2] == ' ' || prefix[2] == 0) { + prefix[3] = 0; + prefix[2] = prefix[1]; + prefix[1] = prefix[0]; + prefix[0] = ' '; + } for(uint8_t i = 0; i < 6; i++) { From 8c9d0e1dbaf25355733f50f6486f19f6b525516f Mon Sep 17 00:00:00 2001 From: Ivica Date: Thu, 19 Dec 2024 17:31:07 +0000 Subject: [PATCH 2/4] refactor: fixed formatting --- src/JTEncode.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/JTEncode.cpp b/src/JTEncode.cpp index f977279..6f3a613 100644 --- a/src/JTEncode.cpp +++ b/src/JTEncode.cpp @@ -997,13 +997,15 @@ void JTEncode::wspr_bit_packing(uint8_t * c) strncpy(prefix, callsign, slash_pos); strncpy(base_call, callsign + slash_pos + 1, 7); - if (prefix[1] == ' ' || prefix[1] == 0) { + if (prefix[1] == ' ' || prefix[1] == 0) + { prefix[3] = 0; prefix[2] = prefix[0]; prefix[1] = ' '; prefix[0] = ' '; - } else if (prefix[2] == ' ' || prefix[2] == 0) { + } else if (prefix[2] == ' ' || prefix[2] == 0) + { prefix[3] = 0; prefix[2] = prefix[1]; prefix[1] = prefix[0]; From d8e328c649dba75c4f65794880ede6b91a98c689 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivica=20Mati=C4=87?= Date: Thu, 19 Dec 2024 17:34:08 +0000 Subject: [PATCH 3/4] refactor: fixed formatting --- src/JTEncode.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/JTEncode.cpp b/src/JTEncode.cpp index 6f3a613..fc035d6 100644 --- a/src/JTEncode.cpp +++ b/src/JTEncode.cpp @@ -997,20 +997,20 @@ void JTEncode::wspr_bit_packing(uint8_t * c) strncpy(prefix, callsign, slash_pos); strncpy(base_call, callsign + slash_pos + 1, 7); - if (prefix[1] == ' ' || prefix[1] == 0) - { - prefix[3] = 0; - prefix[2] = prefix[0]; - prefix[1] = ' '; - prefix[0] = ' '; - - } else if (prefix[2] == ' ' || prefix[2] == 0) - { - prefix[3] = 0; - prefix[2] = prefix[1]; - prefix[1] = prefix[0]; - prefix[0] = ' '; - } + if (prefix[1] == ' ' || prefix[1] == 0) + { + prefix[3] = 0; + prefix[2] = prefix[0]; + prefix[1] = ' '; + prefix[0] = ' '; + + } else if (prefix[2] == ' ' || prefix[2] == 0) + { + prefix[3] = 0; + prefix[2] = prefix[1]; + prefix[1] = prefix[0]; + prefix[0] = ' '; + } for(uint8_t i = 0; i < 6; i++) { @@ -1651,4 +1651,4 @@ void JTEncode::pad_callsign(char * call) // { // // return 1; // } -} \ No newline at end of file +} From 13c71b542aa9528e4bd06d2caa38c68eec212fbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ivica=20Mati=C4=87?= Date: Thu, 19 Dec 2024 17:36:31 +0000 Subject: [PATCH 4/4] refactor: fixed formatting --- src/JTEncode.cpp | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/JTEncode.cpp b/src/JTEncode.cpp index fc035d6..a8778e9 100644 --- a/src/JTEncode.cpp +++ b/src/JTEncode.cpp @@ -997,20 +997,20 @@ void JTEncode::wspr_bit_packing(uint8_t * c) strncpy(prefix, callsign, slash_pos); strncpy(base_call, callsign + slash_pos + 1, 7); - if (prefix[1] == ' ' || prefix[1] == 0) - { - prefix[3] = 0; - prefix[2] = prefix[0]; - prefix[1] = ' '; - prefix[0] = ' '; + if (prefix[1] == ' ' || prefix[1] == 0) + { + prefix[3] = 0; + prefix[2] = prefix[0]; + prefix[1] = ' '; + prefix[0] = ' '; - } else if (prefix[2] == ' ' || prefix[2] == 0) - { - prefix[3] = 0; - prefix[2] = prefix[1]; - prefix[1] = prefix[0]; - prefix[0] = ' '; - } + } else if (prefix[2] == ' ' || prefix[2] == 0) + { + prefix[3] = 0; + prefix[2] = prefix[1]; + prefix[1] = prefix[0]; + prefix[0] = ' '; + } for(uint8_t i = 0; i < 6; i++) {