Merge branch 'EliasOenal:master' into master

jklnz · Oct 21, 2023 · 21813ca · 21813ca
2 parents ad5b50b + abb7288
commit 21813ca
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,9 +11,9 @@ else( NOT WIN32 )
 endif( NOT WIN32 )
 
 set( TARGET "${PROJECT_NAME}" )
-set( VERSION "1.2.0" )
+set( VERSION "1.3.0" )
 set( MAJOR "1" )
-set( MINOR "2" )
+set( MINOR "3" )
 set( PATCH "0" )
 set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra" )
 

diff --git a/demod_flex.c b/demod_flex.c
@@ -611,7 +611,7 @@ static void parse_alphanumeric(struct Flex * flex, unsigned int * phaseptr, char
                 flex->GroupHandler.GroupCycle[groupbit] = -1;
         } 
         pt_offset += sprintf(pt_out + pt_offset, "|ALN|%s\n", message);
-        verbprintf(0, pt_out);
+        verbprintf(0, "%s", pt_out);
 }
 
 static void parse_numeric(struct Flex * flex, unsigned int * phaseptr, char PhaseNo, int j) {

diff --git a/pocsag.c b/pocsag.c
@@ -327,6 +327,34 @@ bool pocsag_init_charset(char *charset)
 			trtab[0x7e] = "ss";
 		#endif
 	}
+	else if (strcmp(charset,"DK")==0) // Danish charset /JT Ref. https://www.ascii-code.com
+	{
+		#ifdef CHARSET_UTF8
+			trtab[0x5b] = "Æ";
+			trtab[0x5c] = "Ø";
+			trtab[0x5d] = "Å";
+
+			trtab[0x7b] = "æ";
+			trtab[0x7c] = "ø";
+			trtab[0x7d] = "å";
+		#elif defined CHARSET_LATIN1
+			trtab[0x5b] = "\306";
+			trtab[0x5c] = "\330";
+			trtab[0x5d] = "\305";
+
+			trtab[0x7b] = "\346";
+			trtab[0x7c] = "\370";
+			trtab[0x7d] = "\345";
+		#else
+			trtab[0x5b] = "AE";
+			trtab[0x5c] = "OE";
+			trtab[0x5d] = "Aa";
+
+			trtab[0x7b] = "ae";
+			trtab[0x7c] = "oe";
+			trtab[0x7d] = "aa";
+		#endif
+	}
 	else if (strcmp(charset,"SE")==0) // Swedish charset
 	{
 		#ifdef CHARSET_UTF8
@@ -391,7 +419,7 @@ bool pocsag_init_charset(char *charset)
 	else
 	{
 		fprintf(stderr, "Error: invalid POCSAG charset %s\n", charset);
-		fprintf(stderr, "Use: US,FR,DE,SE,SI\n");
+		fprintf(stderr, "Use: US,FR,DE,DK,SE,SI\n");
 		charset = "US";
 		return false; 
 	}

diff --git a/unixinput.c b/unixinput.c
@@ -4,7 +4,7 @@
  *      Copyright (C) 1996
  *          Thomas Sailer (sailer@ife.ee.ethz.ch, hb9jnx@hb9w.che.eu)
  *
- *      Copyright (C) 2012-2022
+ *      Copyright (C) 2012-2023
  *          Elias Oenal    (multimon-ng@eliasoenal.com)
  *
  *      This program is free software; you can redistribute it and/or modify
@@ -802,9 +802,9 @@ int main(int argc, char *argv[])
 
     if ( !quietflg )
     { // pay heed to the quietflg
-    fprintf(stderr, "multimon-ng 1.2.0\n"
+    fprintf(stderr, "multimon-ng 1.3.0\n"
         "  (C) 1996/1997 by Tom Sailer HB9JNX/AE4WA\n"
-        "  (C) 2012-2022 by Elias Oenal\n"
+        "  (C) 2012-2023 by Elias Oenal\n"
         "Available demodulators:");
     for (i = 0; (unsigned int) i < NUMDEMOD; i++) {
         fprintf(stderr, " %s", dem[i]->name);