Commit: 702bb511edc11cf8b16ff9d26fa941359f49c66c - rpi-dmonitor (git)

Commit MetaInfo

• Revision: 702bb511edc11cf8b16ff9d26fa941359f49c66c (tree)
• Zeit: 2022-10-17 08:49:47
• Autor: Satoshi Yasuda <7m3tjz@jarl...>
• Commiter: Satoshi Yasuda

Log Message

modified: dmonitor.h
modified: dmonitor_utils.c
modified: dvap.c
modified: dvmega_utils.c
modified: extern_dmonitor.h
modified: from_node.c
modified: init.h
modified: main.c
modified: node_utils.c
modified: repeater_mon.c
modified: rig_read.c

Ändern Zusammenfassung

• modified: Makefile.am
• modified: debian/changelog
• modified: debian/control
• modified: debian/install
• modified: debian/rules
• modified: dmonitor.h
• modified: dmonitor_utils.c
• modified: dvap.c
• modified: dvmega_utils.c
• modified: extern_dmonitor.h
• modified: from_node.c
• modified: init.h
• modified: main.c
• modified: node_utils.c
• modified: repeater_mon.c
• modified: rig_read.c

Diff

--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,11 @@
-bin_PROGRAMS = dmonitor repeater_mon repeater_mon_light repeater_scan rpt_conn dstar_ntpdate
+bin_PROGRAMS = dmonitor repeater_mon repeater_mon_light repeater_scan rpt_conn dstar_ntpdate ci_v
 dmonitor_SOURCES = main.c dmonitor_utils.c init.c dmonitor_cmd.c inet_read.c rig_read.c  dvap_utils.c dvap.c dvap_conf.c dvmega.c dvmega_conf.c dstar_data.c crc.c send_msg.c dvmega_utils.c node_conf.c node_utils.c from_node.c send_node.c PICinfo.c lcd.c ntpdate.c crc.h dvap.h dmonitor.h init.h config.h dstar.h
 dmonitor_LDADD = -lusb -lwiringPi -lwiringPiDev -lcrypto 
 repeater_mon_SOURCES = repeater_mon.c repeater_mon.h
 repeater_mon_light_SOURCES = repeater_mon_light.c repeater_mon.h
 repeater_scan_SOURCES = repeater_scan.c repeater_mon.h
 rpt_conn_SOURCES = rpt_conn.c rpt_conn_utils.c rpt_conn_dvap.c rpt_dvap_utils.c rpt_conn_dvmega.c rpt_dvmega_utils.c rpt_conn_rig.c rpt_node_utils.c rpt_conn_send_msg.c rpt_conn_scan.c crc.c rpt_conn_lcd.c crc.h rpt_conn.h
+ci_v_SOURCES = ci_v.c 
 rpt_conn_LDADD = -lusb -lwiringPi -lwiringPiDev
 dstar_ntpdate_SOURCES = dstar_ntpdate.c
 

--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 dmonitor (01.81) unstable; urgency=low
 
   * bug fixed main.c (#141)
+  * added skip the gps only packet & ci-v mode
 
- -- Satoshi Yasuda <[e-mail]>  Mon, 11 Jul 2022 13:00:00 +0900
+ -- Satoshi Yasuda <[e-mail]>  Sun, 16 Oct 2022 11:45:00 +0900
 
 dmonitor (01.80) unstable; urgency=low
 

--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Homepage: http://app.d-star.info/
 
 Package: dmonitor
 Architecture: armhf
-Depends: ${shlibs:Depends}, ${perl:Depends}, libcgi-application-perl, nkf, lighttpd, surf, wiringpi
+Depends: ${shlibs:Depends}, ${perl:Depends}, libcgi-application-perl, nkf, lighttpd, surf, wiringpi, bluetooth, pi-bluetooth, bluez, blueman, expect
 Description: D-STAR repeater monitor
  D-STAR Rpeater monitor program 
   access point multi_forward program

--- a/debian/install
+++ b/debian/install
@@ -7,6 +7,7 @@ auto_repmon	/usr/bin
 auto_repmon_light	/usr/bin
 rpt_conn	/usr/bin
 kill_dmonitor	/usr/bin
+ci_v		/usr/bin
 monitor		/var/www/cgi-bin
 kill_dmon	/var/www/cgi-bin
 kill_repScan	/var/www/cgi-bin
@@ -48,6 +49,11 @@ FileExpand.sh		/var/www/cgi-bin
 FileExpand		/var/www/cgi-bin
 lighttpd_first		/var/www/cgi-bin
 dmonitor_upd		/var/www/cgi-bin
+ci-v			/var/www/cgi-bin
+CI-VSet			/var/www/cgi-bin
+CI-VStore		/var/www/cgi-bin
+bluetooth		/var/www/cgi-bin
+bluetooth_status	/var/www/cgi-bin
 debug_exec	/var/www/cgi-bin
 log_delete	/var/www/cgi-bin
 index.html	/var/www/html
@@ -77,6 +83,7 @@ buff_hold.txt	/var/www
 connected_table.html.save /var/www/html
 error_msg.html.save /var/www/html
 short_msg.html.save /var/www/html
+bluetooth.html.save /var/www/html
 010_www-data-nopasswd	/etc/sudoers.d
 dmonitor_log	/etc/logrotate.d
 rpt_conn_log	/etc/logrotate.d
@@ -84,6 +91,8 @@ auto_repmon.service	/etc/systemd/system
 rpt_conn.service	/etc/systemd/system
 auto_repmon_light.service     /etc/systemd/system
 dstar_ntpdate.service	/etc/systemd/system
+rfcomm.service		/etc/systemd/system
+bluetooth.service	/var/tmp
 jquery.cookie.js	/usr/share/javascript/jquery/
 lighttpd.conf.bullseye	/var/tmp
 localhost.conf		/var/tmp
@@ -103,7 +112,10 @@ rpt_mast.txt		/var/www
 dvap.conf.save		/var/www
 dvmega.conf.save	/var/www
 node.conf.save		/var/www
+ci-v.conf.save		/var/www
 99-dstar.rules		/var/tmp
 dmonitor_update		/var/tmp
 dmonitor_update_surf	/var/tmp
 dmonitor_start		/var/tmp
+bluetooth_pair		/var/tmp
+

--- a/debian/rules
+++ b/debian/rules
@@ -33,6 +33,7 @@ override_dh_prep:
 	cp /var/www/html/connected_table.html.save	debian/tmp/
 	cp /var/www/html/error_msg.html.save	debian/tmp/
 	cp /var/www/html/short_msg.html.save	debian/tmp/
+	cp /var/www/html/bluetooth.html.save	debian/tmp/
 	cp /var/www/html/localhost/index.html	debian/tmp/localhost.index.html
 	cp /var/www/html/localhost/simple.html	debian/tmp/localhost.simple.html
 	cp /var/www/html/update.html	debian/tmp/
@@ -87,9 +88,15 @@ override_dh_prep:
 	cp /var/www/cgi-bin/lighttpd_first	debian/tmp/
 	cp /var/www/cgi-bin/log_delete	debian/tmp/
 	cp /var/www/cgi-bin/dmonitor_upd	debian/tmp/
+	cp /var/www/cgi-bin/ci-v		debian/tmp/
+	cp /var/www/cgi-bin/CI-VSet		debian/tmp/
+	cp /var/www/cgi-bin/CI-VStore		debian/tmp/
+	cp /var/www/cgi-bin/bluetooth		debian/tmp/
+	cp /var/www/cgi-bin/bluetooth_status	debian/tmp/
 	cp /var/www/dvap.conf.save	debian/tmp/
 	cp /var/www/dvmega.conf.save      debian/tmp/
 	cp /var/www/node.conf.save	debian/tmp/
+	cp /var/www/ci-v.conf.save	debian/tmp/
 	cp /var/www/html/buff_hold.txt	debian/tmp/
 	cp /etc/sudoers.d/010_www-data-nopasswd debian/tmp/
 	cp /etc/logrotate.d/dmonitor_log	debian/tmp/
@@ -102,6 +109,8 @@ override_dh_prep:
 	cp /etc/systemd/system/rpt_conn.service	debian/tmp/
 	cp /etc/systemd/system/auto_repmon_light.service debian/tmp/
 	cp /etc/systemd/system/dstar_ntpdate.service debian/tmp/
+	cp /etc/systemd/system/rfcomm.service debian/tmp/
+	cp /lib/systemd/system/bluetooth.service debian/tmp/
 	cp /lib/systemd/system/lighttpd.service	debian/tmp/
 	cp /etc/lighttpd/lighttpd.conf.bullseye	debian/tmp/
 	cp /etc/lighttpd/localhost.conf	debian/tmp/
@@ -119,3 +128,5 @@ override_dh_prep:
 	cp /usr/local/bin/dmonitor_update	debian/tmp/
 	cp /usr/local/bin/dmonitor_update_surf	debian/tmp/
 	cp /usr/local/bin/dmonitor_start	debian/tmp/
+	cp /usr/local/bin/bluetooth_pair	debian/tmp/
+

--- a/dmonitor.h
+++ b/dmonitor.h
@@ -41,6 +41,7 @@
 //#define		_DEBUG_DVAP_SQUELCH
 //#define		_DEBUG_JITTER
 //#define		_DEBUG_INET
+#define		_DEBUG_MD5
 
 #define		GW	0x80
 #define		ZR	0x40
@@ -68,6 +69,7 @@
 #define		IDxxPlus_SPEED  	B38400
 #define         DVAP_SPEED      	B230400
 #define		DVMEGA_SPEED		B115200
+#define		CI_V			B38400
 
 #define		RIG_LED		19
 #define		INET_LED	26
@@ -210,6 +212,7 @@ unsigned char	MD5_dmonitor[32];
 #define		DVAP	0x01
 #define		DVMEGA	0x02
 #define		NODE	0x03
+#define		CI-V	0xf0
 
 char	rig_type;
 

--- a/dmonitor_utils.c
+++ b/dmonitor_utils.c
@@ -602,15 +602,15 @@ void	connected_table(char str[])
 		connected_fd = fopen (CONNECTED_LIST_TEMP, "w");
 		fprintf (connected_fd, "<!DOCTYPE HTML>\n");
 		fprintf (connected_fd, "<html lang=\"ja\"><head>\n");
-		fprintf (connected_fd, "<meta http-equiv=\"Pragma\" content=\"no-cache\">\n");
-		fprintf (connected_fd, "<meta http-equiv=\"Cache-Control\" content=\"no-cache\">\n");
-		fprintf (connected_fd, "<meta name=\"expires\" content=\"0\">\n");
+		//fprintf (connected_fd, "<meta http-equiv=\"Pragma\" content=\"no-cache\">\n");
+		//fprintf (connected_fd, "<meta http-equiv=\"Cache-Control\" content=\"no-cache\">\n");
+		//fprintf (connected_fd, "<meta name=\"expires\" content=\"0\">\n");
 		//fprintf (connected_fd, "<meta http-equiv=\"refresh\" content=\"1;URL=./connected_table.html\">\n");
 		fprintf (connected_fd, "<meta http-equiv=\"refresh\" content=\"1\">\n");
 		fprintf (connected_fd, "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n");
-       		//fprintf (connected_fd, "<script type=\"text/javascript\">\n");
-		//fprintf (connected_fd, "setTimeout (function() {location.reload() ;} , 1000) ;\n"); 
-		//fprintf (connected_fd, "</script>\n");
+       		fprintf (connected_fd, "<script type=\"text/javascript\">\n");
+		fprintf (connected_fd, "setTimeout (function() {location.reload() ;} , 1000) ;\n"); 
+		fprintf (connected_fd, "</script>\n");
 		fprintf (connected_fd, "</head>\n");
 		fprintf (connected_fd, "<body style=\"background-color:#ffe6e6;\">\n");
 		//fprintf (connected_fd, "<center>%8.8s 接続ユーザ 一覧 (%s)<br>\n", &str[36], &str[10]);
@@ -668,6 +668,9 @@ void	error_msg (char str[])
 	fprintf (error_fd, "<meta http-equiv=\"Cache-Control\" content=\"no-cache\">\n");
 	fprintf (error_fd, "<meta name=\"expires\" content=\"0\">\n");
 	fprintf (error_fd, "<meta http-equiv=\"refresh\" content=\"1;URL=./error_msg.html\">\n");
+	//fprintf (connected_fd, "<script type=\"text/javascript\">\n");
+	//fprintf (connected_fd, "setTimeout (function() {location.reload() ;} , 1000) ;\n");
+	//fprintf (connected_fd, "</script>\n");
        	fprintf (error_fd, "</head>\n");
        	fprintf (error_fd, "<body style=\"background-color:#ff8c00;\">\n");
        	fprintf (error_fd, "<center>%s</center>", &str[5]);
@@ -695,6 +698,22 @@ void	error_msg (char str[])
 		time (&msg_send_set_time);
 		lcd_write ();
        	}
+	if (!memcmp (&str[41], "タイムアウト", 18))
+	{
+		sprintf (msg_temp, "TIME OUT %8.8s   ", area_call);
+		memcpy (mycall2, "TOUT", 4);
+		send_msg_sw = TRUE;
+		time (&msg_send_set_time);
+		lcd_write ();
+	}
+	if (!memcmp (&str[5], "接続制限数", 15))
+	{
+		sprintf (msg_temp, "MAX CONNECT %8.8s", area_call); 
+		memcpy (mycall2, "MAXC", 4);
+		send_msg_sw = TRUE;
+		time (&msg_send_set_time);
+		lcd_write ();
+	}
 }
 
 void    called_msg (char mycall[], char urcall[8])

--- a/dvap.c
+++ b/dvap.c
@@ -695,14 +695,15 @@ void	dvap_send_voice (void)
 	unsigned  short int crc;
 
 
-	if (gps_only) return;
+	if (gps_only) goto gps_skip;
 	if (gps_wait)
 	{
 		gps_wait = FALSE;
-		if (!memcmp (&dvap_voice[6], NullVoice, 12))
+		if (!memcmp (&dvap_voice[6], NullVoice, 12)
+			|| !memcmp (&dvap_voice[6], gps_only_1, 12))
 		{
 			gps_only = TRUE;
-			return;
+			goto gps_skip;
 		}
         	inet_send_buff[16] = 0x80;
         	//memcpy (&inet_send_buff[17], &dvap_header[6], 41);
@@ -798,16 +799,18 @@ void	dvap_send_voice (void)
                 	(struct sockaddr *)&in_addr, sizeof(in_addr));
 		dstar_data (inet_send_buff, FALSE);
 	}
+	m_seq++;
+	m_seq &= 0xffff;
+gps_skip:
         if (dvap_voice[4] & 0x40)
         {
         	memset (inet_frame_id, 0x00, 2);
 		frameID = 0;
                 digitalWrite (RIG_LED, 0);
                 digitalWrite (INET_LED, 0);
+		gps_wait = TRUE;
+		gps_only = FALSE;
         }
-        m_seq++;
-	m_seq &= 0xffff;
-
 }
 
 void	send_dvap_keep_alive(void)

--- a/dvmega_utils.c
+++ b/dvmega_utils.c
@@ -214,7 +214,8 @@ void	dvmega_read (void)
 			if (gps_wait)
 			{
 				gps_wait = FALSE;
-				if (!memcpy (&rig_buff[4], NullVoice, 12))
+				if (!memcpy (&rig_buff[4], NullVoice, 12)
+					|| !memcmp (&rig_buff[4], gps_only_1, 12))
 				{
 					gps_only = TRUE;
 					break;

--- a/extern_dmonitor.h
+++ b/extern_dmonitor.h
@@ -67,6 +67,7 @@
 #define		IDxxPlus_SPEED  	B38400
 #define         DVAP_SPEED      	B230400
 #define		DVMEGA_SPEED		B115200
+#define         CI_V                    B38400
 
 #define		RIG_LED		19
 #define		INET_LED	26
@@ -324,3 +325,4 @@ extern char    rf_header_save[44];
 
 extern char	NullVoice[12];
 extern char	NullVoice1[12];
+extern char	gps_only_1[12];

--- a/from_node.c
+++ b/from_node.c
@@ -51,9 +51,9 @@ void	header_read_from_node(void)         /* read from rig (DV packet) */
 		}
 		no_cmd_sw = no_cmd_check (usb.node_hdr.YourCall);
 		if (!rig_status_check()) return;
+		#if 0
         	gw_on = FALSE;
         	if (!inet_send_buff_set()) return;
-		#if 0
         	inet_send_buff[16] = 0x80;
         	memcpy (&inet_send_buff[17], usb.buffer, 41);
         	memcpy (&inet_send_buff[20], area_call, 8);
@@ -141,31 +141,58 @@ int	voice_read_from_node()
 {
 	int	i;
 	int	ret;
+	int	len;
 	unsigned short int	crc;
 
 	int	read_len;
 
 	read_len = 24 - voice_pnt;
-
-	ret = usb_control_msg(udev, 0xC0, GET_DATA, 0, 0, usb.buffer, read_len, 200);
-	if (ret > 0)
+	len = usb_control_msg(udev, 0xC0, GET_DATA, 0, 0, usb.buffer, read_len, 200);
+	if (len > 0)
 	{
 		//gettimeofday(&Node_InTime, NULL);
-		for (i = 0 ; i < ret; i++)
+		for (i = 0 ; i < len ; i++)
 		{
 			node_voice_save[voice_pnt] = usb.buffer[i];
 			voice_pnt++;
+			#if 0 
+			if ((voice_pnt == 15) && gps_only)
+			{
+				if (!memcmp (&node_voice_save[9], lastframe, 6))
+				{
+					memset (inet_frame_id, 0x00, 2);
+					frameID = 0;
+					HeaderLength = 0;
+					node_voice_send_sw = FALSE;
+					digitalWrite (RIG_LED, 0);
+					digitalWrite (INET_LED, 0);
+					gps_wait = TRUE;
+					gps_only = FALSE;
+				}
+			}
+			else if (voice_pnt == 24)
+			#endif
 			if (voice_pnt == 24)
 			{
-				if (gps_only) return ret;
+				if (gps_only) 
+				{
+					memcpy (node_voice_save, &node_voice_save[12], 12);
+					voice_pnt = 12;
+					//return ret;
+					goto loop_end;
+				}
 				if (gps_wait) 
 				{
-					gps_wait = FALSE;
-					if (!memcmp (&node_voice_save[12], NullVoice, 12))
+					if (!memcmp (&node_voice_save[12], NullVoice, 12)
+						|| !memcmp (&node_voice_save[12], gps_only_1, 12))
 					{
 						gps_only = TRUE;
-						return ret;
+						voice_pnt = 12;
+						goto loop_end;;
 					}
+					gw_on = FALSE;
+					if (!inet_send_buff_set()) return len;
+					gps_wait = FALSE;
         				inet_send_buff[16] = 0x80;
         				//memcpy (&inet_send_buff[17], usb.buffer, 41);
 					memcpy (&inet_send_buff[17], rf_header_save, 41);
@@ -256,15 +283,15 @@ int	voice_read_from_node()
         			m_seq++;
 				m_seq &= 0xffff;
 			}
-			else if (voice_pnt == 15)
+			if (voice_pnt == 15)
 			{
 				if (!memcmp (&node_voice_save[9], lastframe, 6))
-				{				
+				{
 					inet_send_buff[4] = (m_seq >> 8) & 0xff;
 					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 && !rig_send_sw && node_voice_send_sw)
+					if (send_sw && !rig_send_sw && node_voice_send_sw && !gps_only)
                                 	{
                                         	in_addr.sin_port = htons(dest_inet_port);
                                         	in_addr.sin_addr.s_addr = inet_addr(dest_address);
@@ -279,11 +306,13 @@ int	voice_read_from_node()
 					digitalWrite (INET_LED, 0);
 					gps_wait = TRUE;
 					gps_only = FALSE;
+					return len;
 				}
 			}
-	
+		loop_end:
+			continue;
 		}
-		return ret;
+		return len;
 	}
 	else if (ret < 0)
 	{

--- a/init.h
+++ b/init.h
@@ -1,4 +1,6 @@
 unsigned char	NullVoice[12] = {0x9e,0x8d,0x32,0x88,0x26,0x1a,0x3f,0x61,0xe8,0x55,0x2d,0x16};
 unsigned char   NullVoice1[12] = {0x9e,0x8d,0x32,0x88,0x26,0x1a,0x3f,0x61,0xe8,0xe7,0x84,0x76};
+unsigned char	gps_only_1[12] = {0xb2, 0x4d, 0x22, 0x48, 0xc0, 0x16, 0x28, 0x26, 0xc8, 0x55, 0x2d, 0x16};
+unsigned char   gps_only_2[12] = {0xae, 0xcb, 0x2e, 0x59, 0xe7, 0x0a, 0x5f, 0xe7, 0xe4, 0x55, 0x2d, 0x16};
 
 

--- a/main.c
+++ b/main.c
@@ -46,7 +46,7 @@ void	lcd_write (void);
 void	ntpdate(void);
 void	dvap_reopen(void);
 void	invalid_os (void);
-void	right_os (void);
+
 
 time_t	send_time;
 unsigned char 	*ppp;
@@ -90,7 +90,7 @@ int	main(int argc, char *argv[])
         node_VenderID = 0x4d8;
         node_ProductID = 0x300;
 	HeaderLength = 0;
-	voice_pnt = 0;
+	voice_pnt = 12;
 	node_tx_inv = 0;
 	node_rx_inv = 0;
 	node_tx_delay = 100;
@@ -189,7 +189,9 @@ os_ok:
 	if (length <= 0 ) return -1;
 	pg_path[length] = 0x00;
 	if (ETagGen (pg_path, MD5_dmonitor) < 0) return 5;
+	#ifdef	_DEBUG_MD5
 	memcpy (MD5_dmonitor, "5ebe211107266a57b1af14a7fdcd8480", 32);
+	#endif
 
 	Rp = malloc (sizeof (struct FifoPkt) - 1024);
 	Wp = Rp;

--- a/node_utils.c
+++ b/node_utils.c
@@ -124,7 +124,9 @@ void	node(void)
                         {
                         	//if (last_frame_sw) node_last_frame_send();
                                 HeaderLength = 0;
-                                voice_pnt = 0;
+                                voice_pnt = 12;
+				gps_only = FALSE;
+				gps_wait = TRUE;
               		}
             	}
 	}

--- a/repeater_mon.c
+++ b/repeater_mon.c
@@ -13,9 +13,11 @@ int	col;
 int	active_col;
 int	json_length;
 int	json_cnt;
+char	RigType[10];
 char	ConnectCall[10];
 int	repeater_cnt;
 char	temp[256];
+int	ci_v_sw;
 
 int     ja_check (unsigned char callsign[])
 {
@@ -225,44 +227,80 @@ void	prase (char str[])
 					rep_temp[l] = 0x00;
 					if (status)
 					{
-						fprintf (html_fd, "<td title=\"rpt1:%8.8s rpt2:%8.8s ur:%8.8s my:%8.8s\"<tt><a href=\"/cgi-bin/monitor?ip_addr=%s&port=%d&callsign='%8.8s'&rep_name='%s'&zr_call='%8.8s'\" target=\"cmd1\" style=\"color:red;\">%s</a></tt></td><td>%s</td>\n", 
+						if (ci_v_sw)
+						{
+							fprintf (html_fd, "<td title=\"rpt1:%8.8s rpt2:%8.8s ur:%8.8s my:%8.8s\"<tt><a href=\"/cgi-bin/ci-v?ar_call='%8.8s'&rep_name='%s'\" target=\"cmd1\" style=\"color:red;\">%s</a></tt></td><td>%s</td>\n",
+								rpt1_call, rpt2_call, ur_call, my_call, callsign, &rep_temp[8], call, &rep_temp[8]);
+						} else {
+							fprintf (html_fd, "<td title=\"rpt1:%8.8s rpt2:%8.8s ur:%8.8s my:%8.8s\"<tt><a href=\"/cgi-bin/monitor?ip_addr=%s&port=%d&callsign='%8.8s'&rep_name='%s'&zr_call='%8.8s'\" target=\"cmd1\" style=\"color:red;\">%s</a></tt></td><td>%s</td>\n", 
 							rpt1_call, rpt2_call, ur_call, my_call, ip_addr, port, callsign, &rep_temp[8], zr_call, call, &rep_temp[8]);
+						}
 						if (active_col == 0) 
 						{
-							fprintf (html_active_fd, "<table border=\"1\" style=\"font-size:1.0em;\">\n");
-							fprintf (html_active_fd, "<tr><td><center>Rep. Call</center></td><td><center>Rep. Name</center></td><td><center>GW Call</center></td><td><center>Ur Call</center></td><td><center>My Call</center></td></tr>\n");
+							fprintf (html_active_fd, "<table id=\"active\" sortable=\"sortable\" border=\"1\" style=\"font-size:1.0em;\">\n");
+							fprintf (html_active_fd, "<tr><th><center>Rep. Call</center></th><th><center>Rep. Name</center></td><th><center>GW Call</center></th><th onclick=\"sortTable(3)\"><center>Ur Call</center></th><th onclick=\"sortTable(4)\"><center>My Call</center></th></tr>\n");
 						}
-						fprintf (html_active_fd, "<tr><td><tt><a href=\"/cgi-bin/monitor?ip_addr=%s&port=%d&callsign='%8.8s'&rep_name='%s'&zr_call='%8.8s'\" target=\"cmd1\" style=\"color:red;\">%s</a></tt></td><td>%s</td><td><tt>%8.8s</tt></td><td><tt>%8.8s</tt></td><td><tt>%8.8s</tt></td></tr>\n",
+						if (ci_v_sw)
+						{
+							 fprintf (html_active_fd, "<tr><td><tt><a href=\"/cgi-bin/ci-v?ar_call='%8.8s'&rep_name='%s'\" target=\"cmd1\" style=\"color:red;\">%s</a></tt></td><td>%s</td><td><tt>%8.8s</tt></td><td><tt>%8.8s</tt></td><td><tt>%8.8s</tt></td></tr>\n",
+							 callsign, &rep_temp[8], call, &rep_temp[8], zr_call, ur_call, my_call);
+						} else {
+							fprintf (html_active_fd, "<tr><td><tt><a href=\"/cgi-bin/monitor?ip_addr=%s&port=%d&callsign='%8.8s'&rep_name='%s'&zr_call='%8.8s'\" target=\"cmd1\" style=\"color:red;\">%s</a></tt></td><td>%s</td><td><tt>%8.8s</tt></td><td><tt>%8.8s</tt></td><td><tt>%8.8s</tt></td></tr>\n",
                                                         ip_addr, port, callsign,
-&rep_temp[8], zr_call, call, &rep_temp[8], zr_call, ur_call, my_call);
+							&rep_temp[8], zr_call, call, &rep_temp[8], zr_call, ur_call, my_call);
+						}
 						active_col++;
 					}
 					else
-						fprintf (html_fd, "<td><tt><a href=\"/cgi-bin/monitor?ip_addr=%s&port=%d&callsign='%8.8s'&rep_name='%s'&zr_call='%8.8s'\" target=\"cmd1\">%s</a></tt></td><td>%s</td>\n", 
+					{
+						if (ci_v_sw)
+						{
+						fprintf (html_fd, "<td><tt><a href=\"/cgi-bin/ci-v?ar_call='%8.8s'&rep_name='%s'\" target=\"cmd1\">%s</a></tt></td><td>%s</td>\n",
+						callsign, &rep_temp[8], call, &rep_temp[8]);
+					} else {
+						fprintf (html_fd, "<td><tt><a href=\"/cgi-bin/monitor?ip_addr=%s&port=%d&callsign='%8.8s'&rep_name='%s'&zr_call='%8.8s'\" target=\"cmd1\"><font size=+0.1>%s</font></a></tt></td><td><font size=+0.1>%s</font></td>\n", 
 							ip_addr, port, callsign, &rep_temp[8], zr_call, call, &rep_temp[8]);
+						}
+					}
 					
 					goto mast_close;
 				}
 			    }
 			}
-			if (status)
+			if (status)	// not found
 			{
-				fprintf (html_fd, "<td title=\"rpt1:%8.8s rpt2:%8.8s ur:%8.8s my:%8.8s\"><tt><a href=\"/cgi-bin/monitor?ip_addr=%s&port=%d&callsign='%8.8s'&zr_call='%8.8s'\" target=\"cmd1\" style=\"color:red;\">%s</a></td></tt><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>\n", 
+				if (ci_v_sw)
+				{
+					fprintf (html_fd, "<td title=\"rpt1:%8.8s rpt2:%8.8s ur:%8.8s my:%8.8s\"><tt><a href=\"/cgi-bin/ci-v?&ar_call='%8.8s'&rep_name=' '\" target=\"cmd1\" style=\"color:red;\">%s</a></td></tt><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>\n",
+					rpt1_call, rpt2_call, ur_call, my_call, callsign, call);
+				} else {
+					fprintf (html_fd, "<td title=\"rpt1:%8.8s rpt2:%8.8s ur:%8.8s my:%8.8s\"><tt><a href=\"/cgi-bin/monitor?ip_addr=%s&port=%d&callsign='%8.8s'&zr_call='%8.8s'&rep_name=' '\" target=\"cmd1\" style=\"color:red;\">%s</a></td></tt><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>\n", 
 					rpt1_call, rpt2_call, ur_call, my_call, ip_addr, port, callsign, zr_call, call);
-					if (active_col == 0) 
-					{
-						fprintf (html_active_fd, "<table border=\"1\" style=\"font-size:0.9em;\">\n");
-						fprintf (html_active_fd, "<tr><td><center>Rep. Call</center></td><td><center>Rep. Name</center></td><td><center>GW Call</center></td><td><center>Ur Call</center></td><td><center>My Call</center></td></tr>\n");
-					}
-
-				fprintf (html_active_fd, "<tr><td><tt><a href=\"/cgi-bin/monitor?ip_addr=%s&port=%d&callsign='%8.8s'&zr_call='%8.8s'\" target=\"cmd1\" style=\"color:red;\">%s</a></td></tt><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td><td><tt>%8.8s</tt></td><td><tt>%8.8s</tt></td><td><tt>%8.8s</tt></td></tr>\n",
+				}
+				if (active_col == 0) 
+				{
+					fprintf (html_active_fd, "<table border=\"1\" style=\"font-size:0.9em;\">\n");
+					fprintf (html_active_fd, "<tr><td><center>Rep. Call</center></td><td><center>Rep. Name</center></td><td><center>GW Call</center></td><td><center>Ur Call</center></td><td><center>My Call</center></td></tr>\n");
+				}
+				if (ci_v_sw)
+				{
+					fprintf (html_active_fd, "<tr><td><tt><a href=\"/cgi-bin/ci-v?ar_call='%8.8s'&rep_name=' '\" target=\"cmd1\" style=\"color:red;\">%s</a></td></tt><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td><td><tt>%8.8s</tt></td><td><tt>%8.8s</tt></td><td><tt>%8.8s</tt></td></tr>\n",
+						callsign, call, zr_call, ur_call, my_call);
+				} else {
+					fprintf (html_active_fd, "<tr><td><tt><a href=\"/cgi-bin/monitor?ip_addr=%s&port=%d&callsign='%8.8s'&zr_call='%8.8s&rep_name=' ''\" target=\"cmd1\" style=\"color:red;\">%s</a></td></tt><td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td><td><tt>%8.8s</tt></td><td><tt>%8.8s</tt></td><td><tt>%8.8s</tt></td></tr>\n",
                                         ip_addr, port, callsign, zr_call, call, zr_call, ur_call, my_call);
+				}
 					active_col++;
 			}
 			else
 			{
-				fprintf (html_fd, "<td><tt><a href=\"/cgi-bin/monitor?ip_addr=%s&port=%d&callsign='%8.8s'&zr_call='%8.8s'\" target=\"cmd1\">%s</a></tt></td><td></td>\n", 
+				if (ci_v_sw)
+				{
+					fprintf (html_fd, "<td><tt><a href=\"/cgi-bin/ci-v?ar_call='%8.8s'&rep_name=' '\" target=\"cmd1\">%s</a></tt></td><td></td>\n", callsign, call);
+				} else {
+					fprintf (html_fd, "<td><tt><a href=\"/cgi-bin/monitor?ip_addr=%s&port=%d&callsign='%8.8s'&zr_call='%8.8s'&rep_name=' '\" target=\"cmd1\">%s</a></tt></td><td></td>\n", 
 					ip_addr, port, callsign, zr_call, call);
+				}
 			}
 mast_close:
 			fprintf (conn_fd, "%8.8sdmonitor '%8.8s' %s %d '%8.8s' '%8.8s'\n", callsign, ConnectCall, ip_addr, port, callsign, zr_call);
@@ -424,12 +462,14 @@ os_ok:
         }
 
 	connect_fd = fopen (DMONITOR_FILE, "r");
-	fgets (ConnectCall, 10, connect_fd);		// skip 2 lines
+	fgets (RigType, 10, connect_fd);
 	fgets (ConnectCall, 10, connect_fd);
 	fgets (ConnectCall, 10, connect_fd);
 	fclose (connect_fd);
 
 	if (!ja_check(ConnectCall)) return;
+	if (!memcmp (RigType, "CI-V", 4)) ci_v_sw = TRUE;
+	else	ci_v_sw = FALSE;
 
 	ret = -1;
 	n = 0;
@@ -537,11 +577,33 @@ os_ok:
 	fprintf (html_fd, "\n");
 
 	fprintf (html_fd, "// -->\n</script>\n");
+        fprintf (html_fd, "<style type=\"text/css\"><!--\n");
+        fprintf (html_fd, "div.mon\n");
+        fprintf (html_fd, "width: 500emx;\n");
+        fprintf (html_fd, "}\n");
+        fprintf (html_fd, "div.mon table {\n");
+        fprintf (html_fd, "border-collapse: collapse;\n");
+        fprintf (html_fd, "border: 1px solid black;\n");
+        fprintf (html_fd, "width: 800px;\n");
+        fprintf (html_fd, "}\n");
+        fprintf (html_fd, "div.mon table th,\n");
+        fprintf (html_fd, "div.mon table td {\n");
+        fprintf (html_fd, "padding: 0.1em 0.6em;\n");
+        fprintf (html_fd, "border: 1px solid gray;\n");
+        fprintf (html_fd, "}\n");
+        fprintf (html_fd, "div.mon table tr:nth-child(2n) {\n");
+        fprintf (html_fd, "background-color: white;\n");
+        fprintf (html_fd, "}\n");
+        fprintf (html_fd, "div.mon table tr:nth-child(2n+1) {\n");
+        fprintf (html_fd, "background-color: #e0e0e0\n");
+        fprintf (html_fd, "}\n");
+        fprintf (html_fd, "--></style>\n");
 	fprintf (html_fd, "</head>\n");
 	fprintf (html_fd, "<BODY onload=\"disp_reload()\" style=\"background-color:#ffffcc;\">\n");
 	fprintf (html_fd, "<center>\n");
+	fprintf (html_fd, "<div class=\"mon\">\n");
 
-        fprintf (html_active_fd, "\n<!DOCTYPE html>\n\n");
+	fprintf (html_active_fd, "\n<!DOCTYPE html>\n\n");
 	fprintf (html_active_fd, "<html>\n");
         fprintf (html_active_fd, "<head>\n");
         fprintf (html_active_fd, "<title>Multi Forward Active Repeater</title>\n");
@@ -556,10 +618,55 @@ os_ok:
 	//fprintf (html_active_fd, "setTimeout (function() {location.reload() ;} , 5000) ;\n");
 	//fprintf (html_active_fd, "<table border=\"1\" style=\"font-size:0.9em;\">\n");
 	fprintf (html_active_fd, "self.focus();\n");
-        fprintf (html_active_fd, "// -->\n</script>\n");
+        fprintf (html_active_fd, "// -->\n");
+        fprintf (html_active_fd, "function sortTable(n) {\n");
+        fprintf (html_active_fd, "var table, rows, switching, i, x, y, shouldSwitch;\n");
+        fprintf (html_active_fd, "table = document.getElementById(\"active\");\n");
+        fprintf (html_active_fd, "switching = true;\n");
+        fprintf (html_active_fd, "while (switching) {\n");
+        fprintf (html_active_fd, "switching = false;\n");
+        fprintf (html_active_fd, "rows = table.rows;\n");
+        fprintf (html_active_fd, "for (i = 1; i < (rows.length - 1); i++) {\n");
+        fprintf (html_active_fd, "shouldSwitch = false;\n");
+        fprintf (html_active_fd, "x = rows[i].getElementsByTagName(\"TD\")[n];\n");
+        fprintf (html_active_fd, "y = rows[i + 1].getElementsByTagName(\"TD\")[n];\n");
+        fprintf (html_active_fd, "if (x.innerHTML.toLowerCase() > y.innerHTML.toLowerCase()) {\n");
+        fprintf (html_active_fd, "shouldSwitch = true;\n");
+        fprintf (html_active_fd, "break;\n}\n}\n");
+        fprintf (html_active_fd, "if (shouldSwitch) {\n");
+        fprintf (html_active_fd, "rows[i].parentNode.insertBefore(rows[i + 1], rows[i]);\n");
+        fprintf (html_active_fd, "switching = true;\n");
+        fprintf (html_active_fd, "}\n}\n}\n");
+        fprintf (html_active_fd, "</script>\n");
+        fprintf (html_active_fd, "<style type=\"text/css\"><!--\n");
+        fprintf (html_active_fd, "div.active\n");
+        fprintf (html_active_fd, "width: 500emx;\n");
+        fprintf (html_active_fd, "}\n");
+        fprintf (html_active_fd, "div.active table {\n");
+        fprintf (html_active_fd, "border-collapse: collapse;\n");
+        fprintf (html_active_fd, "border: 1px solid black;\n");
+        fprintf (html_active_fd, "width: 800px;\n");
+        fprintf (html_active_fd, "}\n");
+        fprintf (html_active_fd, "div.active table th,\n");
+        fprintf (html_active_fd, "div.active table td {\n");
+        fprintf (html_active_fd, "padding: 0.1em 0.6em;\n");
+        fprintf (html_active_fd, "border: 1px solid gray;\n");
+        fprintf (html_active_fd, "}\n");
+        fprintf (html_active_fd, "div.active table tr:nth-child(2n) {\n");
+        fprintf (html_active_fd, "background-color: white;\n");
+        fprintf (html_active_fd, "}\n");
+        fprintf (html_active_fd, "div.active table tr:nth-child(2n+1) {\n");
+        fprintf (html_active_fd, "background-color: #e0e0e0\n");
+        fprintf (html_active_fd, "}\n");
+        fprintf (html_active_fd, "div.active table tr:nth-child(1) {\n");
+        fprintf (html_active_fd, "background-color: blue;\n");
+        fprintf (html_active_fd, "color: white;\n");
+        fprintf (html_active_fd, "}\n");
+        fprintf (html_active_fd, "--></style>\n");
         fprintf (html_active_fd, "</head>\n");
         fprintf (html_active_fd, "<BODY style=\"background-color:#ffffcc;\">\n");
 	fprintf (html_active_fd, "<center>\n");
+	fprintf (html_active_fd, "<div class=\"active sortable-table\">\n");
 	//fprintf (html_active_fd, "<table border=\"1\" style=\"font-size:0.9em;\"><tr>\n");
 	p_cnt = 0;
 	buff_pnt = 0;
@@ -678,7 +785,11 @@ next:
 
 	if (active_col)
 	{
-        	fprintf (html_active_fd, "</table>\n");
+        	fprintf (html_active_fd, "</table></div>\n");
+	}
+	else
+	{
+		fprintf (html_active_fd, "ありません");
 	}
 end:
         fprintf (html_active_fd, "</center></BODY></HTML>\n");

--- a/rig_read.c
+++ b/rig_read.c
@@ -499,14 +499,27 @@ int 	rig_read (void)
 			}
 			else if (len == 16)	/* voice */
 			{
-				if (gps_only) break;
+				if (gps_only) 
+				{
+                                	if (rig_buff[3] & 0x40)
+                                	{
+                                        	memset (inet_frame_id, 0x00, 2);
+                                        	frameID = 0;
+                                        	send_header_sw = FALSE;
+                                        	digitalWrite (RIG_LED, 0);
+                                        	gps_wait = TRUE;
+                                        	gps_only = FALSE;
+                                	}
+					goto voice_skip;
+				}
 				if (gps_wait)
 				{
 					gps_wait = FALSE;
-					if (!memcmp (&rig_buff[4], NullVoice, 12)) 
+					if (!memcmp (&rig_buff[4], NullVoice, 12)
+						|| !memcmp (&rig_buff[4], gps_only_1, 12)) 
 					{
 						gps_only = TRUE;
-						break;
+						goto voice_skip;
 					}
 					inet_send_buff[16] = 0x80;
 					//memcpy (&inet_send_buff[17], &rig_buff[2], 41);
@@ -616,6 +629,7 @@ int 	rig_read (void)
 		}
 		else
 			len = 1;
+voice_skip:
 		k = rig_buff_pnt - len;
 		if (k > 0) memmove (&rig_buff[0], &rig_buff[len], k);
 		rig_buff_pnt = k;