コミットメタ情報

リビジョン3f3d3575d99868d796bdc7b7065ceb82ec8791e9 (tree)
日時2019-11-04 22:35:31
作者Satoshi Yasuda <7m3tjz@jarl...>
コミッターSatoshi Yasuda

ログメッセージ

modified: dmonitor.h
modified: dmonitor_utils.c
modified: inet_read.c
modified: rig_read.c

変更サマリ

差分

--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,9 @@
1-<<<<<<< HEAD
21 dmonitor (01.25) unstable; urgency=low
32
43 * update Closes: (#087)
54 * changed the 32 byte packet routine.
65
7- -- Satoshi Yasuda <7m3tjz@jarl.com> Sun, 3 Nov 2019 18:15:00 +0900
6+ -- Satoshi Yasuda <7m3tjz@jarl.com> Mon, 4 Nov 2019 13:30:00 +0900
87
98 dmonitor (01.24) unstable; urgency=low
109
--- a/debian/dmonitor/DEBIAN/control
+++ b/debian/dmonitor/DEBIAN/control
@@ -1,9 +1,5 @@
11 Package: dmonitor
2-<<<<<<< HEAD
3-Version: 01.24
4-=======
5-Version: 01.22
6->>>>>>> 81354636e20f706919e40e1639528b30b06a4f38
2+Version: 01.25
73 Architecture: armhf
84 Maintainer: Satoshi Yasuda <7m3tjz@jarl.com>
95 Installed-Size: 143
--- a/debian/dmonitor/DEBIAN/md5sums
+++ b/debian/dmonitor/DEBIAN/md5sums
@@ -1,17 +1,9 @@
11 d27fb6e6be7d30ba05eedaf0319f2ce9 usr/bin/auto_repmon
2-<<<<<<< HEAD
3-b8b0a1ae5c8daacb26db9583466f2ade usr/bin/dmonitor
4-=======
5-3eb561604c5cc784f4c180d51546e803 usr/bin/dmonitor
6->>>>>>> 81354636e20f706919e40e1639528b30b06a4f38
2+9ffa29d6b23812b5ee8d9958513f86e6 usr/bin/dmonitor
73 4883951bb1a98b2aebec93706608ed67 usr/bin/repeater_mon
84 c5b0337b130e0b603f3c18c521b94c99 usr/bin/repeater_scan
95 fd7d34a7321d40fd2c1c039565778ec9 usr/bin/rig_port_check
10-<<<<<<< HEAD
11-29e02e0d1d6d3b5390b986740e7a7214 usr/share/doc/dmonitor/changelog.gz
12-=======
13-2562c2b2c80987d394a3f40a70f42ba3 usr/share/doc/dmonitor/changelog.gz
14->>>>>>> 81354636e20f706919e40e1639528b30b06a4f38
6+9d25e3a84ad7183b4826f6b5a8774108 usr/share/doc/dmonitor/changelog.gz
157 50704bff5afce197b1ea87f23e44f64a usr/share/doc/dmonitor/copyright
168 7a7d517fe81db8a20e729e972b95e943 var/tmp/10-cgi.conf.buster
179 474a2f7237ded372896c3d3020c5a953 var/tmp/10-expire.conf.buster
@@ -22,31 +14,18 @@ c445d79dbc0f455f11e4571b96d02dbc var/tmp/rc.local.new
2214 6a90cfd5694d36946458968923289676 var/www/cgi-bin/RegistCall
2315 aa5923807af7900b8fe07694ec4fc1e3 var/www/cgi-bin/Shutdown
2416 e0081f02dc77e7ef87cea584add175ad var/www/cgi-bin/Update
25-<<<<<<< HEAD
26-cc0b4506b8c48d08043183ab7e6bb270 var/www/cgi-bin/add_buffer
17+5abc3dbf7085a8d706c094995160b6b5 var/www/cgi-bin/add_buffer
2718 6ebb966c3e3d71d8a6da3648d6f24059 var/www/cgi-bin/init_cmd
2819 c2cb1bcb277afdc44fd678198404b57e var/www/cgi-bin/kill_dmon
2920 6d034a17fb4dce8e47fff2767b6ca705 var/www/cgi-bin/kill_repScan
30-6fe96aa66f9408b970bfaa5edf1eb9e2 var/www/cgi-bin/menu
31-12c3bae07dfe0d76a25b9f042f08a26b var/www/cgi-bin/monitor
32-=======
33-5fe14ee7c9137c14a998fb0c2f138a42 var/www/cgi-bin/add_buffer
34-6ebb966c3e3d71d8a6da3648d6f24059 var/www/cgi-bin/init_cmd
35-c2cb1bcb277afdc44fd678198404b57e var/www/cgi-bin/kill_dmon
36-6d034a17fb4dce8e47fff2767b6ca705 var/www/cgi-bin/kill_repScan
37-69b9b416350890d7bb54a92e50f81790 var/www/cgi-bin/menu
38-be28ce0cf4da50a8ecae06c25b6e799c var/www/cgi-bin/monitor
39->>>>>>> 81354636e20f706919e40e1639528b30b06a4f38
21+4909077ec07fe3db7b6623b3415a43be var/www/cgi-bin/menu
22+8fdb257896405506d0af8eed1814cf42 var/www/cgi-bin/monitor
4023 bffa48941e01dee9ced1fb836476faab var/www/cgi-bin/redirect
4124 a5a6370479b0af00df0a9c1b87719188 var/www/cgi-bin/repActive
4225 de110ae308456d9a9f1689272e226bf2 var/www/cgi-bin/repMon
4326 0065c03f23c5757abc113929a6b83355 var/www/cgi-bin/repScan
4427 6f40ef2beb41d6bb59cb5d4e2b92141b var/www/cgi-bin/repUpd
45-<<<<<<< HEAD
46-440252ca9bf01ed117125bc9ca3cac8e var/www/cgi-bin/sub_buffer
47-=======
48-88373bf269a1febe6a05d9de9c2c98f5 var/www/cgi-bin/sub_buffer
49->>>>>>> 81354636e20f706919e40e1639528b30b06a4f38
28+2194bbf72ebaae4296c207d4cfdf0bb9 var/www/cgi-bin/sub_buffer
5029 b48eb3a363cba9a5d49dd28c4f964165 var/www/cgi-bin/update_log
5130 899400a1c7d58e203b3346654342f5d9 var/www/html/TrustAccessLog.html
5231 c4887e79fc60e14a6da36e60c5c289ae var/www/html/connected_table.html.save
Binary files a/debian/dmonitor/usr/bin/dmonitor and b/debian/dmonitor/usr/bin/dmonitor differ
Binary files a/debian/dmonitor/usr/share/doc/dmonitor/changelog.gz and b/debian/dmonitor/usr/share/doc/dmonitor/changelog.gz differ
--- a/debian/files
+++ b/debian/files
@@ -1,9 +1,3 @@
1-<<<<<<< HEAD
2-dmonitor-dbgsym_01.24_armhf.deb debug optional automatic=yes
3-dmonitor_01.24_armhf.buildinfo hamradio optional
4-dmonitor_01.24_armhf.deb hamradio optional
5-=======
6-dmonitor-dbgsym_01.22_armhf.deb debug optional automatic=yes
7-dmonitor_01.22_armhf.buildinfo hamradio optional
8-dmonitor_01.22_armhf.deb hamradio optional
9->>>>>>> 81354636e20f706919e40e1639528b30b06a4f38
1+dmonitor-dbgsym_01.25_armhf.deb debug optional automatic=yes
2+dmonitor_01.25_armhf.buildinfo hamradio optional
3+dmonitor_01.25_armhf.deb hamradio optional
--- a/debian/tmp/add_buffer
+++ b/debian/tmp/add_buffer
@@ -20,11 +20,7 @@ print <<'EOF';
2020
2121 </HEAD>
2222 <BODY>
23-<<<<<<< HEAD
24-<h3>dmonitor connection status V01.24</h3>
25-=======
26-<h3>dmonitor connection status V01.22</h3>
27->>>>>>> 81354636e20f706919e40e1639528b30b06a4f38
23+<h3>dmonitor connection status V01.25</h3>
2824 EOF
2925 print $call;
3026 open(BuffSize, "< /var/tmp/buff_hold.txt") or die("Error: $!");
--- a/debian/tmp/menu
+++ b/debian/tmp/menu
@@ -85,11 +85,7 @@ EOF
8585 print '<a href=http://' . $result . '/tool.html target=list>システム ツール</a>&nbsp;&nbsp;&nbsp;';
8686 print '<a href=http://log.d-star.info/dmonitor_news.html target=_blank>ニュース</a>&nbsp;&nbsp;&nbsp;';
8787 print <<'EOF'
88-<<<<<<< HEAD
89-閉じる(戻るボタンで閉じてください) Multi Forward Monitor (dmonitor) V01.24
90-=======
91-閉じる(戻るボタンで閉じてください) Multi Forward Monitor (dmonitor) V01.22
92->>>>>>> 81354636e20f706919e40e1639528b30b06a4f38
88+閉じる(戻るボタンで閉じてください) Multi Forward Monitor (dmonitor) V01.25
9389 </center></body>
9490 </html>
9591 EOF
--- a/debian/tmp/monitor
+++ b/debian/tmp/monitor
@@ -22,11 +22,7 @@ print <<'EOF';
2222 <TITLE>Monitor Interface</TITLE>
2323 </HEAD>
2424 <BODY>
25-<<<<<<< HEAD
26-<h3>dmonitor connection status V01.24</h3>
27-=======
28-<h3>dmonitor connection status V01.22</h3>
29->>>>>>> 81354636e20f706919e40e1639528b30b06a4f38
25+<h3>dmonitor connection status V01.25</h3>
3026 <font color=red>
3127 接続コールサインが設定されていません<br>
3228 最上部のメニューから<br>
@@ -50,11 +46,7 @@ print <<'EOF';
5046
5147 </HEAD>
5248 <BODY>
53-<<<<<<< HEAD
54-<h3>dmonitor connection status V01.24</h3>
55-=======
56-<h3>dmonitor connection status V01.22</h3>
57->>>>>>> 81354636e20f706919e40e1639528b30b06a4f38
49+<h3>dmonitor connection status V01.25</h3>
5850 EOF
5951 system ("sudo killall -q -s 9 repeater_scan");
6052 system ("sudo killall -q -s 2 dmonitor");
--- a/debian/tmp/sub_buffer
+++ b/debian/tmp/sub_buffer
@@ -23,11 +23,7 @@ print <<'EOF';
2323
2424 </HEAD>
2525 <BODY>
26-<<<<<<< HEAD
27-<h3>dmonitor connection status V01.24</h3>
28-=======
29-<h3>dmonitor connection status V01.22</h3>
30->>>>>>> 81354636e20f706919e40e1639528b30b06a4f38
26+<h3>dmonitor connection status V01.25</h3>
3127 EOF
3228 print $call;
3329 print "<br><br>";
--- a/dmonitor.h
+++ b/dmonitor.h
@@ -165,4 +165,3 @@ int jitter_wr_cnt;
165165 int jitter_wr_pnt;
166166
167167 char ptt;
168-
--- a/dmonitor_utils.c
+++ b/dmonitor_utils.c
@@ -266,13 +266,16 @@ void LastFrameSend (void)
266266 memcpy (&send_buff[4], dummy_frame_1, 12);
267267 send_buff[16] = 0xff;
268268 rig_write (17, send_buff);
269-
270- send_buff[2] = seq & 0xff;
271- recv_frame_seq++;
272- recv_frame_seq %= 0x15;
273- send_buff[3] = recv_frame_seq;
274- memcpy (&send_buff[4], dummy_frame_2, 12);
275- rig_write (17, send_buff);
269+
270+ if (recv_frame_seq % 2)
271+ {
272+ send_buff[2] = seq & 0xff;
273+ recv_frame_seq++;
274+ recv_frame_seq %= 0x15;
275+ send_buff[3] = recv_frame_seq;
276+ memcpy (&send_buff[4], dummy_frame_2, 12);
277+ rig_write (17, send_buff);
278+ }
276279
277280 send_buff[2] = seq & 0xff;
278281 recv_frame_seq++;
@@ -475,7 +478,7 @@ void jitter_putFifo (void)
475478 syslog (LOG_INFO, "packet loss (drop) %2.2x", jitter_rd_pnt);
476479 }
477480 putFifo (13, &jitter_buff[jitter_rd_pnt][0]);
478- jitter_buff[jitter_rd_pnt][0] = 0x00;
481+ jitter_buff[jitter_rd_pnt][0] = 0xff;
479482 if (jitter_rd_pnt == 0) memcpy (&jitter_buff[jitter_rd_pnt][1], NullVoice, 12);
480483 else memcpy (&jitter_buff[jitter_rd_pnt][1], NullVoice1, 12);
481484 jitter_rd_pnt++;
--- a/inet_read.c
+++ b/inet_read.c
@@ -56,16 +56,20 @@ void dummy_last_frame (void)
5656 memcpy (&recvBuff[17], dummy_frame_1, 12);
5757 jitter_put (&recvBuff[16]);
5858 jitter_putFifo();
59- recvBuff[16]++;
60- if (recvBuff[16] > 20) recvBuff[16] = 0x00;
61- memcpy (&recvBuff[17], dummy_frame_2, 12);
62- jitter_put (&recvBuff[16]);
63- jitter_putFifo();
59+ if (recvBuff[16] % 2)
60+ {
61+ recvBuff[16]++;
62+ if (recvBuff[16] > 20) recvBuff[16] = 0x00;
63+ memcpy (&recvBuff[17], dummy_frame_2, 12);
64+ jitter_put (&recvBuff[16]);
65+ jitter_putFifo();
66+ }
6467 recvBuff[16]++;
6568 if (recvBuff[16] > 20) recvBuff[16] = 0x00;
6669 recvBuff[16] |= 0x40;
6770 memcpy (&recvBuff[17], dummy_frame_3, 12);
6871 jitter_put (&recvBuff[16]);
72+ jitter_putFifo();
6973 memset (inet_frame_id, 0x00, 2);
7074 rig_send_check();
7175 digitalWrite (INET_LED, 0);
--- a/rig_read.c
+++ b/rig_read.c
@@ -97,6 +97,7 @@ void rig(void)
9797 break;
9898
9999 case RIG_INIT:
100+ memset (inet_frame_id, 0xff, 2);
100101 send_rig_init();
101102 rig_state = RIG_INIT_DONE;
102103 time (&rig_init_time);
@@ -218,12 +219,12 @@ int rig_read (void)
218219 {
219220 if (rig_buff[1] == 0x23)
220221 {
222+ #ifdef _DEBUG_RIG
223+ syslog (LOG_INFO, "ack voice:%2.2x seq:%2.2x(%2.2x) %2.2x",
224+ rig_buff[1], rig_buff[2], seq & 0xff, rig_buff[3]);
225+ #endif
221226 if (rig_buff[2] == seq)
222227 {
223- #ifdef _DEBUG_RIG
224- syslog (LOG_INFO, "ack voice:%2.2x seq:%2.2x(%2.2x) %2.2x",
225- rig_buff[1], rig_buff[2], seq & 0xff, rig_buff[3]);
226- #endif
227228 //if (rig_buff[3] == 0x00)
228229 //{
229230 // seq++;
@@ -347,13 +348,12 @@ int rig_read (void)
347348 }
348349 error_msg_sw = FALSE;
349350
350- if ((Fifo_cnt > (fifo_hold + 20)) || (Fifo_cnt < 0))
351+ if ((Fifo_cnt > (fifo_hold + 10)) || (Fifo_cnt < 0))
351352 {
352353 syslog (LOG_INFO, "rig fifo overflow");
353354 rig_state = RIG_INIT;
354355 drop_rate_print();
355356 }
356- return TRUE;
357357 }
358358
359359 void rig_write (int length, unsigned char buff[])
@@ -373,6 +373,7 @@ void rig_write (int length, unsigned char buff[])
373373 syslog(LOG_ERR, "rig write error %s", strerror(errno));
374374 }
375375 time (&rig_alive_send_time);
376+
376377 #ifdef _DEBUG_RIG
377378 syslog (LOG_INFO, "rig_write %d %d %2.2x %2.2x", length, ret, buff[2], buff[3]);
378379 #endif
旧リポジトリブラウザで表示