Commit: 518a41028b8cb6077c24b5ae4b0ad62888782670 - rpi-dmonitor (git)

Commit MetaInfo

• Revision: 518a41028b8cb6077c24b5ae4b0ad62888782670 (tree)
• Zeit: 2020-10-10 22:41:05
• Autor: Satoshi Yasuda <7m3tjz@jarl...>
• Commiter: Satoshi Yasuda

Log Message

modified: config.h
modified: configure
modified: debian/changelog
modified: dmonitor.h
modified: dmonitor_utils.c
modified: from_node.c
modified: inet_read.c
modified: main.c
modified: node_utils.c
modified: rpt_node_utils.c

Ändern Zusammenfassung

• modified: config.h
• modified: configure
• modified: debian/changelog
• modified: dmonitor.h
• modified: dmonitor_utils.c
• modified: from_node.c
• modified: inet_read.c
• modified: main.c
• modified: node_utils.c
• modified: rpt_node_utils.c

Diff

--- a/config.h
+++ b/config.h
@@ -102,7 +102,7 @@
 #define PACKAGE_NAME "dmonitor"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "dmonitor 01.59"
+#define PACKAGE_STRING "dmonitor 01.60"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "dmonitor"
@@ -111,13 +111,13 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "01.59"
+#define PACKAGE_VERSION "01.60"
 
 /* Define to 1 if you have the ANSI C header files. */
 #define STDC_HEADERS 1
 
 /* Version number of package */
-#define VERSION "01.59"
+#define VERSION "01.60"
 
 /* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
    <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the

--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for dmonitor 01.59.
+# Generated by GNU Autoconf 2.69 for dmonitor 01.60.
 #
 # Report bugs to <[e-mail]>.
 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='dmonitor'
 PACKAGE_TARNAME='dmonitor'
-PACKAGE_VERSION='01.59'
-PACKAGE_STRING='dmonitor 01.59'
+PACKAGE_VERSION='01.60'
+PACKAGE_STRING='dmonitor 01.60'
 PACKAGE_BUGREPORT='[e-mail]'
 PACKAGE_URL=''
 
@@ -1277,7 +1277,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures dmonitor 01.59 to adapt to many kinds of systems.
+\`configure' configures dmonitor 01.60 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1344,7 +1344,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of dmonitor 01.59:";;
+     short | recursive ) echo "Configuration of dmonitor 01.60:";;
    esac
   cat <<\_ACEOF
 
@@ -1435,7 +1435,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-dmonitor configure 01.59
+dmonitor configure 01.60
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1912,7 +1912,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by dmonitor $as_me 01.59, which was
+It was created by dmonitor $as_me 01.60, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2778,7 +2778,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='dmonitor'
- VERSION='01.59'
+ VERSION='01.60'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -5048,7 +5048,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by dmonitor $as_me 01.59, which was
+This file was extended by dmonitor $as_me 01.60, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -5114,7 +5114,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-dmonitor config.status 01.59
+dmonitor config.status 01.60
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,16 @@
+dmonitor (01.60) unstable; urgency=low
+
+  * update Closes: (#120)
+  * BUG fixed for node adapter routine
+
+ -- Satoshi Yasuda <[e-mail]>  Sat, 10 Oct 2020 21:10:00 +0900
+
 dmonitor (01.59) unstable; urgency=low
 
   * update Closes: (#119)
   * BUG fixed for lcd_type (typo) another one 
 
- -- Satoshi Yasuda <[e-mail]>  Thu, 09 Oct 2020 22:20:00 +0900
+ -- Satoshi Yasuda <[e-mail]>  Fri, 09 Oct 2020 22:20:00 +0900
 
 dmonitor (01.58) unstable; urgency=low
 

--- a/dmonitor.h
+++ b/dmonitor.h
@@ -33,6 +33,7 @@
 #include	"config.h"
 
 //#define		_DEBUG_DVMEGA
+//#define		_SPECIFICATIO_CHECK
 
 #define		GW	0x80
 #define		ZR	0x40
@@ -248,6 +249,7 @@ unsigned char	dvmega_mode;
 unsigned char	rig_device[32];
 unsigned char  dvmega_frame_seq;
 
+
 /* node adapter */
 int     node_VenderID;
 int     node_ProductID;
@@ -272,9 +274,9 @@ struct	dv_packet	node_pkt;
 struct  dv_packet       node_pkt_header;
 
 char	node_voice_save[24];
-int	node_voice_send_sw;
 int	node_tx_inv;
 int	node_rx_inv;
+int	node_voice_send_sw;
 
 char	node_last_frame_sw;
 
@@ -290,3 +292,6 @@ int	scan_stop_sw;
 int	lcd_type;
 int	lcd;
 time_t	lcd_time_save;
+
+/* mics */
+char	voice_packet_save[15];

--- a/dmonitor_utils.c
+++ b/dmonitor_utils.c
@@ -722,7 +722,7 @@ void	jitter_put (unsigned char buff[])
 	else
 		memcpy (&jitter_buff[jitter_wr_pnt][0], buff, 10);
 	jitter_wr_cnt++;
-	if (jitter_wr_cnt < 0) jitter_wr_cnt = 0;
+	if (jitter_wr_cnt < 0) jitter_wr_pnt = 0;
 	#ifdef	_DEBUG_JITTER
 	syslog (LOG_INFO, "jitter put %d %d", jitter_wr_pnt, jitter_wr_cnt);
 	#endif
@@ -755,11 +755,12 @@ void	jitter_putFifo (void)
 		}
 		putFifo (13, &jitter_buff[jitter_wr_pnt][0]);
 		jitter_buff[jitter_wr_pnt][0] = 0xff;
-		jitter_rd_pnt = 0;
+		jitter_rd_pnt++;
+		if (jitter_rd_pnt > 20) jitter_rd_pnt = 0;
                 digitalWrite (INET_LED, 0);
                 digitalWrite (RIG_LED, 0);
 		return;
-	}			
+	}
 	while (jitter_buff[jitter_rd_pnt][0] != 0xff)
 	{
 		putFifo (13, &jitter_buff[jitter_rd_pnt][0]);

--- a/from_node.c
+++ b/from_node.c
@@ -56,11 +56,11 @@ void	header_read_from_node(void)         /* read from rig (DV packet) */
         	memcpy (&inet_send_buff[20], area_call, 8);
         	memcpy (&inet_send_buff[28], area_call, 8);
         	if (memcmp (&inet_send_buff[36], "CQCQCQ  ", 8)) gw_on = TRUE;
-        	if (send_sw && !rig_send_sw)
+        	if (send_sw && !rig_send_sw && !node_voice_send_sw)
         	{
-syslog (LOG_DEBUG, "120");
         		memset (inet_frame_id, 0xff, 2);
 			node_last_frame_sw = FALSE;
+			node_voice_send_sw = TRUE;
                 	in_addr.sin_port = htons(dest_inet_port);
                 	in_addr.sin_addr.s_addr = inet_addr(dest_address);
                 	m_seq++;
@@ -73,7 +73,6 @@ syslog (LOG_DEBUG, "120");
 			inet_send_buff[57] = crc & 0xff;
                 	ret = sendto (in_addr_sock, inet_send_buff, 58, MSG_DONTWAIT,
                 		(struct sockaddr *)&in_addr, sizeof(in_addr));
-syslog (LOG_DEBUG, "130 %d", ret);
                		m_seq++;
                		m_seq &= 0xffff;
                		inet_send_buff[4] = (m_seq >> 8) & 0xff;
@@ -113,7 +112,6 @@ syslog (LOG_DEBUG, "130 %d", ret);
 		HeaderLength = 41;
 		voice_pnt = 12;
 		seq = 0;
-        	//node_last_frame_sw = TRUE;
 	}
 }
 
@@ -128,8 +126,6 @@ void	header_send_set_from_node(void)
 	memcpy (node_pkt.dstar.b_bone.b_b.frame_id, &tmp, 2);
 	node_pkt.dstar.b_bone.b_b.seq = 0x80;
 	//node_msg.msg_pnt = 0;
-
-	node_voice_send_sw = FALSE;
 	seq = 0;
 	//node_last_frame_sw = TRUE;
 }
@@ -171,7 +167,7 @@ int	voice_read_from_node()
 				seq++;
 				if (seq > 20) seq = 0;
         			memcpy (&inet_send_buff[17], node_voice_save, 12);
-        			if (send_sw)
+				if (send_sw && !rig_send_sw && node_voice_send_sw)
         			{
         				in_addr.sin_port = htons(dest_inet_port);
                 			in_addr.sin_addr.s_addr = inet_addr(dest_address);
@@ -190,7 +186,7 @@ int	voice_read_from_node()
 					inet_send_buff[5] = m_seq & 0xff;
 					inet_send_buff[16] = seq | 0x40;
 					memcpy (&inet_send_buff[17], &node_voice_save[12], 12);
-				        if (send_sw)
+					if (send_sw && !rig_send_sw && node_voice_send_sw)
                                 	{
                                         	in_addr.sin_port = htons(dest_inet_port);
                                         	in_addr.sin_addr.s_addr = inet_addr(dest_address);
@@ -200,6 +196,7 @@ int	voice_read_from_node()
 					memset (inet_frame_id, 0x00, 2);
 					frameID = 0;
 					HeaderLength = 0;
+					node_voice_send_sw = FALSE;
 					digitalWrite (RIG_LED, 0);
 					digitalWrite (INET_LED, 0);
 				}
@@ -215,16 +212,3 @@ int	voice_read_from_node()
 	return 0;
 }
 
-#if 0
-void	node_last_frame_send (void)
-{
-	memcpy (&node_pkt.dstar.b_bone.dstar_udp.voice_d.data_segment, lastframe, 6);
-	dv_pkt_set(node_pkt);
-	node_pkt.pkt_type = 0x20;
-	node_pkt.dstar.b_bone.b_b.seq = seq | 0x40;
-	if (node_voice_send_sw) putFifo (30, node_pkt);
-	node_last_frame_sw = FALSE;
-	node_NoRespReply_sw = TRUE;
-}
-#endif
-

--- a/inet_read.c
+++ b/inet_read.c
@@ -220,7 +220,7 @@ void	inet_read (void)
 		{
 			#ifdef	_SPECIFICATIO_CHECK
 			if (!memcmp (&recvBuff[14], voice_packet_save, 15))
-				syslog (LOG_INFO, "Dup. packet (maybe loop) from %8.8s  %2.2x %2.2x  %2,2x", recvBuff[14], recvBuff[15], recvBuff[16]); 
+				syslog (LOG_INFO, "Dup. packet (maybe loop) from %2.2x %2.2x %2.2x", recvBuff[14], recvBuff[15], recvBuff[16]); 
 				memcpy (voice_packet_save, &recvBuff[14], 15);
 			#endif
 			#ifdef _DEBUG
@@ -255,7 +255,11 @@ void	inet_read (void)
 			if (t_sub > 300) syslog (LOG_INFO, "long interval %ld.%03ld Sec. seq:%2.2x", t_sub / 1000, t_sub % 1000, recvBuff[16]);
 			//if (t_sub < 2)   syslog (LOG_INFO, "short interval %ld mSec.", t_sub);
 			#endif
-			if (!memcmp (&recvBuff[17] , dummy_frame_3, 3) && !memcmp (&recvBuff[26], &dummy_frame_3[9], 3)) recvBuff[16] |= 0x40;
+			if (!memcmp (&recvBuff[17] , dummy_frame_3, 3) && !memcmp (&recvBuff[26], &dummy_frame_3[9], 3)) 
+			{
+				recvBuff[16] |= 0x40;
+				memset (inet_frame_id, 0x00, 2);
+			}
 			jitter_put (&recvBuff[16]);
 			if (!scan_sw) dstar_data (recvBuff, TRUE);
 #if 0

--- a/main.c
+++ b/main.c
@@ -152,7 +152,7 @@ int	main(int argc, char *argv[])
 	if (length <= 0 ) return -1;
 	pg_path[length] = 0x00;
 	if (ETagGen (pg_path, MD5_dmonitor) < 0) return 5;
-	//memcpy (MD5_dmonitor, "5ebe211107266a57b1af14a7fdcd8480", 32);
+	memcpy (MD5_dmonitor, "5ebe211107266a57b1af14a7fdcd8480", 32);
 
 	Rp = malloc (sizeof (struct FifoPkt) - 1024);
 	Wp = Rp;

--- a/node_utils.c
+++ b/node_utils.c
@@ -24,7 +24,7 @@ void    node_term (void)
 //        node_last_frame_sw = FALSE;
 //        dvap_voice_send_sw = FALSE;
 //        memset (&node_save_frame_id, 0x00, 2);
-        syslog (LOG_INFO,  "Node Adapter down.");
+        syslog (LOG_INFO,  "Node Adapter close.");
 }
 
 int     node_cos_check(void)
@@ -99,6 +99,7 @@ int	node_usb_init(void)
 	usb_control_msg(udev, 0x40, SET_DelayTime, node_tx_delay/10, 0, NULL, 0, 100);
 	if (!scan_sw) PICinfo();
 	HeaderLength = 0;
+	node_voice_send_sw = FALSE;
 	return TRUE;
 
 }

--- a/rpt_node_utils.c
+++ b/rpt_node_utils.c
@@ -101,7 +101,7 @@ void    node_term (void)
 {
 //        node_last_frame_sw = FALSE;
 //        memset (&node_save_frame_id, 0x00, 2);
-        syslog (LOG_INFO,  "Node Adapter down.");
+        syslog (LOG_INFO,  "Node Adapter close.");
 }
 
 int     node_cos_check(void)