Hello community,
here is the log from the commit of package multimon-ng for openSUSE:Factory
checked in at 2018-04-16 12:46:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/multimon-ng (Old)
and /work/SRC/openSUSE:Factory/.multimon-ng.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "multimon-ng"
Mon Apr 16 12:46:54 2018 rev:2 rq:593075 version:1.1.5+git.20180402
Changes:
--------
--- /work/SRC/openSUSE:Factory/multimon-ng/multimon-ng.changes 2018-01-13
21:44:52.657822022 +0100
+++ /work/SRC/openSUSE:Factory/.multimon-ng.new/multimon-ng.changes
2018-04-16 12:46:57.553542850 +0200
@@ -1,0 +2,16 @@
+Mon Apr 02 19:36:39 UTC 2018 - mar...@gmx.de
+
+- Update to version 1.1.5+git.20180402:
+ * Implemented chzchzchz's fix for 'processing unfragmented FLEX messages,
multimon-ng produces corrupted messages'
+ * x10: fix various compiler warnings
+ * Revert "Issue #78 - Found a problem in the length detection sequence,
modified the if statement to ensure the message length is"
+ * Revert "Revert "Issue #78 - Found a problem in the length detection
sequence, modified the if statement to ensure the message length is""
+ * Issue #87 created by bertinhollan:
+ * fix for EAS issue #94
+ * silenced debug message
+ * Comment out includes for sys/wait and sys/resource
+ * Fix event polling loop with SCOPE demodulator
+ * cleaned up unused x10 includes
+ * version 1.1.5
+
+-------------------------------------------------------------------
Old:
----
multimon-ng-1.3.0+git.20171016.tar.xz
New:
----
multimon-ng-1.1.5+git.20180402.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ multimon-ng.spec ++++++
--- /var/tmp/diff_new_pack.FNf9CE/_old 2018-04-16 12:46:58.633503560 +0200
+++ /var/tmp/diff_new_pack.FNf9CE/_new 2018-04-16 12:46:58.633503560 +0200
@@ -18,7 +18,7 @@
Name: multimon-ng
-Version: 1.3.0+git.20171016
+Version: 1.1.5+git.20180402
Release: 0
Summary: A fork of multimon, decodes multiple digital transmission modes
License: GPL-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.FNf9CE/_old 2018-04-16 12:46:58.669502251 +0200
+++ /var/tmp/diff_new_pack.FNf9CE/_new 2018-04-16 12:46:58.669502251 +0200
@@ -5,7 +5,7 @@
<param name="scm">git</param>
<param name="changesgenerate">enable</param>
<param name="filename">multimon-ng</param>
- <param name="versionformat">1.3.0+git.%cd</param>
+ <param name="versionformat">1.1.5+git.%cd</param>
</service>
<service mode="disabled" name="recompress">
<param name="file">*.tar</param>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.FNf9CE/_old 2018-04-16 12:46:58.689501523 +0200
+++ /var/tmp/diff_new_pack.FNf9CE/_new 2018-04-16 12:46:58.689501523 +0200
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/EliasOenal/multimon-ng.git</param>
- <param
name="changesrevision">9548e270956fd7a23fba356e14e6a02ba769a0f1</param></service></servicedata>
\ No newline at end of file
+ <param
name="changesrevision">53de9fb479d643dfb83de4d3c800cc79b1ccc128</param></service></servicedata>
\ No newline at end of file
++++++ multimon-ng-1.3.0+git.20171016.tar.xz ->
multimon-ng-1.1.5+git.20180402.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/multimon-ng-1.3.0+git.20171016/CMakeLists.txt
new/multimon-ng-1.1.5+git.20180402/CMakeLists.txt
--- old/multimon-ng-1.3.0+git.20171016/CMakeLists.txt 2017-10-16
01:54:44.000000000 +0200
+++ new/multimon-ng-1.1.5+git.20180402/CMakeLists.txt 2018-04-02
20:47:26.000000000 +0200
@@ -11,10 +11,10 @@
endif( NOT WIN32 )
set( TARGET "${PROJECT_NAME}" )
-set( VERSION "1.1.4" )
+set( VERSION "1.1.5" )
set( MAJOR "1" )
set( MINOR "1" )
-set( PATCH "4" )
+set( PATCH "5" )
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra" )
if( WIN32 )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/multimon-ng-1.3.0+git.20171016/demod_eas.c
new/multimon-ng-1.1.5+git.20180402/demod_eas.c
--- old/multimon-ng-1.3.0+git.20171016/demod_eas.c 2017-10-16
01:54:44.000000000 +0200
+++ new/multimon-ng-1.1.5+git.20180402/demod_eas.c 2018-04-02
20:47:26.000000000 +0200
@@ -58,7 +58,6 @@
#define FREQ_SPACE 1562.5 // binary 0 freq, in Hz
#define FREQ_SAMP 22050 // req'd input sampling rate, in Hz
#define BAUD 520.83 // symbol rate, in Hz
-#define CORRLEN ((220500/52083)/100)
#define PREAMBLE ((unsigned char)0xAB) // preamble byte, MSB first
#define HEADER_BEGIN "ZCZC" // message begin
@@ -78,7 +77,7 @@
#define MIN_IDENTICAL_MSGS 2 // # of msgs which must be identical
/* ---------------------------------------------------------------------- */
-
+#define CORRLEN ((int)(FREQ_SAMP/BAUD))
#define SPHASEINC (0x10000u*BAUD*SUBSAMP/FREQ_SAMP)
static float eascorr_mark_i[CORRLEN];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/multimon-ng-1.3.0+git.20171016/demod_flex.c
new/multimon-ng-1.1.5+git.20180402/demod_flex.c
--- old/multimon-ng-1.3.0+git.20171016/demod_flex.c 2017-10-16
01:54:44.000000000 +0200
+++ new/multimon-ng-1.1.5+git.20180402/demod_flex.c 2018-04-02
20:47:26.000000000 +0200
@@ -20,6 +20,12 @@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
/*
+ * Version 0.8.6v (18 Dec 2017)
+ * Modification (to this file) made by Bruce Quinton (zano...@gmail.com) on
behalf of bertinhollan (https://github.com/bertinholland)
+ * - Issue #87 created by bertinhollan: Reported issue is that the flex
period timeout was too short and therefore some group messages were not being
processed correctly
+ * After some testing bertinhollan
found that increasing the timeout period fixed the issue in his area. I have
done further testing in my local
+ * area and found the change has not
reduced my success rate. I think the timeout is a localisation setting and I
have added "DEMOD_TIMEOUT"
+ * to the definitions in the top of
this file (the default value is 100 bertinhollan's prefered value, changed up
from 50)
* Version 0.8.5v (08 Sep 2017)
* Modification made by Bruce Quinton (zano...@gmail.com)
* - Issue #78 - Found a problem in the length detection sequence,
modified the if statement to ensure the message length is
@@ -76,6 +82,7 @@
#define LOCK_LEN 24 // Number of symbols to check for
phase locking (max 32)
#define IDLE_THRESHOLD 0 // Number of idle codewords allowed
in data section
#define CAPCODES_INDEX 0
+#define DEMOD_TIMEOUT 100 // Maximum number of periods with
no zero crossings before we decide that the system is not longer within a
Timing lock.
enum Flex_PageTypeEnum {
FLEX_PAGETYPE_SECURE,
@@ -417,6 +424,7 @@
time_t now=time(NULL);
struct tm * gmt=gmtime(&now);
char buf[1024], *message;
+
int frag = (phaseptr[mw1] >> 11) & 0x03;
if (frag == 0x3) {
@@ -426,6 +434,7 @@
} else {
// ignore control data in first byte
message = append_alphanumeric(buf, phaseptr[mw1] & ~0x7F);
+
}
for (i = mw1+1; i < mw2; i++) {
message = append_alphanumeric(message, phaseptr[i]);
@@ -438,7 +447,8 @@
verbprintf(0, "FLEX: %04i-%02i-%02i %02i:%02i:%02i %i/%i/%c %02i.%03i
[%09lld] ALN ", gmt->tm_year+1900, gmt->tm_mon+1, gmt->tm_mday, gmt->tm_hour,
gmt->tm_min, gmt->tm_sec,
flex->Sync.baud, flex->Sync.levels, PhaseNo,
flex->FIW.cycleno, flex->FIW.frameno, flex->Decode.capcode);
- verbprintf(0, "%s\n", message);
+
+ verbprintf(0, "%s\n", message);
if(flex_groupmessage == 1) {
int groupbit = flex->Decode.capcode-2029568;
@@ -1082,9 +1092,9 @@
}
}
- /*Time out after 50 periods with no zero crossing*/
+ /*Time out after X periods with no zero crossing*/
flex->Demodulator.timeout++;
- if (flex->Demodulator.timeout>50) {
+ if (flex->Demodulator.timeout>DEMOD_TIMEOUT) {
verbprintf(1, "FLEX: Timeout\n");
flex->Demodulator.locked = 0;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/multimon-ng-1.3.0+git.20171016/demod_x10.c
new/multimon-ng-1.1.5+git.20180402/demod_x10.c
--- old/multimon-ng-1.3.0+git.20171016/demod_x10.c 2017-10-16
01:54:44.000000000 +0200
+++ new/multimon-ng-1.1.5+git.20180402/demod_x10.c 2018-04-02
20:47:26.000000000 +0200
@@ -16,19 +16,9 @@
*/
/* ---------------------------------------------------------------------- */
-
#include "multimon.h"
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-#include <signal.h>
-#include <math.h>
#include <string.h>
#include <stdio.h>
-#include <unistd.h>
-
-
/* ---------------------------------------------------------------------- */
static const char housecode[] = "MECKOGAINFDLPHBJ";
@@ -131,19 +121,14 @@
static void x10_demod(struct demod_state *s, buffer_t buffer, int length)
{
- short *src;
- float div, f;
+ const short *src;
int i;
int bits = 0;
verbprintf(2, "x10_demod length=%d, current_sequence=%d\n", length,
s->l1.x10.current_sequence);
-
- div = (SAMPLING_RATE/ 1000.0f );
src = buffer.sbuffer;
for ( i=0 ; i < length ; i++, src++) {
- uint32_t ptop;
- float ptopf;
// Start of 9ms high preable (part 1)
if ( s->l1.x10.current_stage == 0 ) {
@@ -172,7 +157,7 @@
s->l1.x10.current_stage = 2;
s->l1.x10.last_rise = i + s->l1.x10.current_sequence;
} else {
- fprintf(stderr, "stage 1 fail1\n");
+ verbprintf(9, "stage 1 fail1\n");
s->l1.x10.current_stage = 0;
}
continue;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/multimon-ng-1.3.0+git.20171016/unixinput.c
new/multimon-ng-1.1.5+git.20180402/unixinput.c
--- old/multimon-ng-1.3.0+git.20171016/unixinput.c 2017-10-16
01:54:44.000000000 +0200
+++ new/multimon-ng-1.1.5+git.20180402/unixinput.c 2018-04-02
20:47:26.000000000 +0200
@@ -4,7 +4,7 @@
* Copyright (C) 1996
* Thomas Sailer (sai...@ife.ee.ethz.ch, hb9...@hb9w.che.eu)
*
- * Copyright (C) 2012-2017
+ * Copyright (C) 2012-2018
* Elias Oenal (multimon...@eliasoenal.com)
*
* This program is free software; you can redistribute it and/or modify
@@ -778,9 +778,9 @@
if ( !quietflg )
{ // pay heed to the quietflg
- fprintf(stderr, "multimon-ng 1.1.4\n"
+ fprintf(stderr, "multimon-ng 1.1.5\n"
" (C) 1996/1997 by Tom Sailer HB9JNX/AE4WA\n"
- " (C) 2012-2017 by Elias Oenal\n"
+ " (C) 2012-2018 by Elias Oenal\n"
"Available demodulators:");
for (i = 0; (unsigned int) i < NUMDEMOD; i++) {
fprintf(stderr, " %s", dem[i]->name);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/multimon-ng-1.3.0+git.20171016/xdisplay.c
new/multimon-ng-1.1.5+git.20180402/xdisplay.c
--- old/multimon-ng-1.3.0+git.20171016/xdisplay.c 2017-10-16
01:54:44.000000000 +0200
+++ new/multimon-ng-1.1.5+git.20180402/xdisplay.c 2018-04-02
20:47:26.000000000 +0200
@@ -114,7 +114,8 @@
if (!display)
return NULL;
- while (XNextEvent(display, &evt) == 0) {
+ while (XCheckWindowEvent(display, window, KeyPressMask |
+ StructureNotifyMask | ExposureMask, &evt)) {
switch (evt.type) {
case KeyPress:
i = XLookupString((XKeyEvent *)&evt, kbuf,
