• R/O
  • HTTP
  • SSH
  • HTTPS

rpi-dmonitor: Commit


Commit MetaInfo

Revision99574e5f907029851258929bab6a95cbf9c77a03 (tree)
Time2019-11-09 09:53:02
AuthorSatoshi Yasuda <7m3tjz@jarl...>
CommiterSatoshi Yasuda

Log Message

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

Change Summary

Incremental Difference

--- a/config.h
+++ b/config.h
@@ -86,7 +86,7 @@
8686 #define PACKAGE_NAME "dmonitor"
8787
8888 /* Define to the full name and version of this package. */
89-#define PACKAGE_STRING "dmonitor 01.25"
89+#define PACKAGE_STRING "dmonitor 01.27"
9090
9191 /* Define to the one symbol short name of this package. */
9292 #define PACKAGE_TARNAME "dmonitor"
@@ -95,10 +95,10 @@
9595 #define PACKAGE_URL ""
9696
9797 /* Define to the version of this package. */
98-#define PACKAGE_VERSION "01.25"
98+#define PACKAGE_VERSION "01.27"
9999
100100 /* Define to 1 if you have the ANSI C header files. */
101101 #define STDC_HEADERS 1
102102
103103 /* Version number of package */
104-#define VERSION "01.25"
104+#define VERSION "01.27"
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
11 #! /bin/sh
22 # Guess values for system-dependent variables and create Makefiles.
3-# Generated by GNU Autoconf 2.69 for dmonitor 01.25.
3+# Generated by GNU Autoconf 2.69 for dmonitor 01.27.
44 #
55 # Report bugs to <7m3tjz@jarl.com>.
66 #
@@ -580,8 +580,8 @@ MAKEFLAGS=
580580 # Identity of this package.
581581 PACKAGE_NAME='dmonitor'
582582 PACKAGE_TARNAME='dmonitor'
583-PACKAGE_VERSION='01.25'
584-PACKAGE_STRING='dmonitor 01.25'
583+PACKAGE_VERSION='01.27'
584+PACKAGE_STRING='dmonitor 01.27'
585585 PACKAGE_BUGREPORT='7m3tjz@jarl.com'
586586 PACKAGE_URL=''
587587
@@ -1277,7 +1277,7 @@ if test "$ac_init_help" = "long"; then
12771277 # Omit some internal or obsolete options to make the list less imposing.
12781278 # This message is too long to be a string in the A/UX 3.1 sh.
12791279 cat <<_ACEOF
1280-\`configure' configures dmonitor 01.25 to adapt to many kinds of systems.
1280+\`configure' configures dmonitor 01.27 to adapt to many kinds of systems.
12811281
12821282 Usage: $0 [OPTION]... [VAR=VALUE]...
12831283
@@ -1344,7 +1344,7 @@ fi
13441344
13451345 if test -n "$ac_init_help"; then
13461346 case $ac_init_help in
1347- short | recursive ) echo "Configuration of dmonitor 01.25:";;
1347+ short | recursive ) echo "Configuration of dmonitor 01.27:";;
13481348 esac
13491349 cat <<\_ACEOF
13501350
@@ -1435,7 +1435,7 @@ fi
14351435 test -n "$ac_init_help" && exit $ac_status
14361436 if $ac_init_version; then
14371437 cat <<\_ACEOF
1438-dmonitor configure 01.25
1438+dmonitor configure 01.27
14391439 generated by GNU Autoconf 2.69
14401440
14411441 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1804,7 +1804,7 @@ cat >config.log <<_ACEOF
18041804 This file contains any messages produced by compilers while
18051805 running configure, to aid debugging if configure makes a mistake.
18061806
1807-It was created by dmonitor $as_me 01.25, which was
1807+It was created by dmonitor $as_me 01.27, which was
18081808 generated by GNU Autoconf 2.69. Invocation command line was
18091809
18101810 $ $0 $@
@@ -2670,7 +2670,7 @@ fi
26702670
26712671 # Define the identity of the package.
26722672 PACKAGE='dmonitor'
2673- VERSION='01.25'
2673+ VERSION='01.27'
26742674
26752675
26762676 cat >>confdefs.h <<_ACEOF
@@ -4768,7 +4768,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
47684768 # report actual input values of CONFIG_FILES etc. instead of their
47694769 # values after options handling.
47704770 ac_log="
4771-This file was extended by dmonitor $as_me 01.25, which was
4771+This file was extended by dmonitor $as_me 01.27, which was
47724772 generated by GNU Autoconf 2.69. Invocation command line was
47734773
47744774 CONFIG_FILES = $CONFIG_FILES
@@ -4834,7 +4834,7 @@ _ACEOF
48344834 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
48354835 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
48364836 ac_cs_version="\\
4837-dmonitor config.status 01.25
4837+dmonitor config.status 01.27
48384838 configured by $0, generated by GNU Autoconf 2.69,
48394839 with options \\"\$ac_cs_config\\"
48404840
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
1+dmonitor (01.26) unstable; urgency=low
2+
3+ * update Closes: (#088)
4+ * changed continuse packet.
5+
6+ -- Satoshi Yasuda <7m3tjz@jarl.com> Tue, 5 Nov 2019 16:20:00 +0900
7+
18 dmonitor (01.25) unstable; urgency=low
29
310 * update Closes: (#087)
--- a/debian/dmonitor/DEBIAN/control
+++ b/debian/dmonitor/DEBIAN/control
@@ -1,5 +1,5 @@
11 Package: dmonitor
2-Version: 01.25
2+Version: 01.26
33 Architecture: armhf
44 Maintainer: Satoshi Yasuda <7m3tjz@jarl.com>
55 Installed-Size: 143
--- a/debian/dmonitor/DEBIAN/md5sums
+++ b/debian/dmonitor/DEBIAN/md5sums
@@ -1,9 +1,9 @@
11 d27fb6e6be7d30ba05eedaf0319f2ce9 usr/bin/auto_repmon
2-9ffa29d6b23812b5ee8d9958513f86e6 usr/bin/dmonitor
2+a7577ff96eef7d1263ada49847f4339c usr/bin/dmonitor
33 4883951bb1a98b2aebec93706608ed67 usr/bin/repeater_mon
44 c5b0337b130e0b603f3c18c521b94c99 usr/bin/repeater_scan
55 fd7d34a7321d40fd2c1c039565778ec9 usr/bin/rig_port_check
6-9d25e3a84ad7183b4826f6b5a8774108 usr/share/doc/dmonitor/changelog.gz
6+95eaad025ce06ec2891975d1a6c2cc2b usr/share/doc/dmonitor/changelog.gz
77 50704bff5afce197b1ea87f23e44f64a usr/share/doc/dmonitor/copyright
88 7a7d517fe81db8a20e729e972b95e943 var/tmp/10-cgi.conf.buster
99 474a2f7237ded372896c3d3020c5a953 var/tmp/10-expire.conf.buster
@@ -14,18 +14,18 @@ c445d79dbc0f455f11e4571b96d02dbc var/tmp/rc.local.new
1414 6a90cfd5694d36946458968923289676 var/www/cgi-bin/RegistCall
1515 aa5923807af7900b8fe07694ec4fc1e3 var/www/cgi-bin/Shutdown
1616 e0081f02dc77e7ef87cea584add175ad var/www/cgi-bin/Update
17-5abc3dbf7085a8d706c094995160b6b5 var/www/cgi-bin/add_buffer
17+2898d80187bdd6cea38c591c114443fc var/www/cgi-bin/add_buffer
1818 6ebb966c3e3d71d8a6da3648d6f24059 var/www/cgi-bin/init_cmd
1919 c2cb1bcb277afdc44fd678198404b57e var/www/cgi-bin/kill_dmon
2020 6d034a17fb4dce8e47fff2767b6ca705 var/www/cgi-bin/kill_repScan
21-4909077ec07fe3db7b6623b3415a43be var/www/cgi-bin/menu
22-8fdb257896405506d0af8eed1814cf42 var/www/cgi-bin/monitor
21+509ed2de43086102fbe0daba706b47e1 var/www/cgi-bin/menu
22+04d1d1507dae6d25a6be20f1abb6e9ff var/www/cgi-bin/monitor
2323 bffa48941e01dee9ced1fb836476faab var/www/cgi-bin/redirect
2424 a5a6370479b0af00df0a9c1b87719188 var/www/cgi-bin/repActive
2525 de110ae308456d9a9f1689272e226bf2 var/www/cgi-bin/repMon
2626 0065c03f23c5757abc113929a6b83355 var/www/cgi-bin/repScan
2727 6f40ef2beb41d6bb59cb5d4e2b92141b var/www/cgi-bin/repUpd
28-2194bbf72ebaae4296c207d4cfdf0bb9 var/www/cgi-bin/sub_buffer
28+c2f00b4d32415b8e03c44720286a520f var/www/cgi-bin/sub_buffer
2929 b48eb3a363cba9a5d49dd28c4f964165 var/www/cgi-bin/update_log
3030 899400a1c7d58e203b3346654342f5d9 var/www/html/TrustAccessLog.html
3131 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,3 +1,3 @@
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
1+dmonitor-dbgsym_01.26_armhf.deb debug optional automatic=yes
2+dmonitor_01.26_armhf.buildinfo hamradio optional
3+dmonitor_01.26_armhf.deb hamradio optional
--- a/debian/tmp/add_buffer
+++ b/debian/tmp/add_buffer
@@ -20,7 +20,7 @@ print <<'EOF';
2020
2121 </HEAD>
2222 <BODY>
23-<h3>dmonitor connection status V01.25</h3>
23+<h3>dmonitor connection status V01.26</h3>
2424 EOF
2525 print $call;
2626 open(BuffSize, "< /var/tmp/buff_hold.txt") or die("Error: $!");
--- a/debian/tmp/menu
+++ b/debian/tmp/menu
@@ -85,7 +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-閉じる(戻るボタンで閉じてください) Multi Forward Monitor (dmonitor) V01.25
88+閉じる(戻るボタンで閉じてください) Multi Forward Monitor (dmonitor) V01.26
8989 </center></body>
9090 </html>
9191 EOF
--- a/debian/tmp/monitor
+++ b/debian/tmp/monitor
@@ -22,7 +22,7 @@ print <<'EOF';
2222 <TITLE>Monitor Interface</TITLE>
2323 </HEAD>
2424 <BODY>
25-<h3>dmonitor connection status V01.25</h3>
25+<h3>dmonitor connection status V01.26</h3>
2626 <font color=red>
2727 接続コールサインが設定されていません<br>
2828 最上部のメニューから<br>
@@ -46,7 +46,7 @@ print <<'EOF';
4646
4747 </HEAD>
4848 <BODY>
49-<h3>dmonitor connection status V01.25</h3>
49+<h3>dmonitor connection status V01.26</h3>
5050 EOF
5151 system ("sudo killall -q -s 9 repeater_scan");
5252 system ("sudo killall -q -s 2 dmonitor");
--- a/debian/tmp/sub_buffer
+++ b/debian/tmp/sub_buffer
@@ -23,7 +23,7 @@ print <<'EOF';
2323
2424 </HEAD>
2525 <BODY>
26-<h3>dmonitor connection status V01.25</h3>
26+<h3>dmonitor connection status V01.26</h3>
2727 EOF
2828 print $call;
2929 print "<br><br>";
--- a/dmonitor.h
+++ b/dmonitor.h
@@ -32,6 +32,7 @@
3232 #define _DEBUG_RIG_9
3333 //#define _DEBUG_INET
3434 //#define _DEBUG_JITTER
35+#define _SPECIFICATION_CHECK
3536
3637 #define GW 0x80
3738 #define ZR 0x40
@@ -167,3 +168,9 @@ int jitter_wr_pnt;
167168 char ptt;
168169
169170 char hole_punch_msg_sw;
171+
172+int fifo_hold_limit;
173+
174+#ifdef _SPECIFICATION_CHECK
175+char voice_packet_save[15];
176+#endif
--- a/dmonitor_utils.c
+++ b/dmonitor_utils.c
@@ -7,6 +7,7 @@ void LastFrameSend (void);
77 void rig_led_onoff(void);
88 void inet_led_onoff(void);
99 void buff_hold_size (int n);
10+void dummy_last_frame (void);
1011
1112 extern char dummy_frame_1[];
1213 extern char dummy_frame_2[];
@@ -219,8 +220,6 @@ int send_rig (void)
219220 length = getFifo (&send_buff[3]);
220221 if (length == 0)
221222 {
222- Fifo_cnt = 0;
223- rig_send_sw = FALSE;
224223 return FALSE;
225224 }
226225 else if (length == 42)
@@ -241,7 +240,12 @@ int send_rig (void)
241240 #ifdef _DEBUG
242241 syslog (LOG_INFO, "Fifo_cnt (last frame) %d", Fifo_cnt);
243242 #endif
244- if (Fifo_cnt < fifo_hold) rig_send_sw = FALSE;
243+ if (Fifo_cnt < fifo_hold)
244+ {
245+ rig_send_sw = FALSE;
246+ fifo_hold_limit = fifo_hold + 10;
247+ }
248+ else fifo_hold_limit = Fifo_cnt + 10;
245249 }
246250 }
247251 return TRUE;
@@ -388,17 +392,20 @@ void error_msg (char str[])
388392 char cmd[128];
389393 int ret;
390394 FILE *error_fd;
395+ char hole_punch_flag;
391396
397+ if (hole_punch_msg_sw) hole_punch_flag = '*';
398+ else hole_punch_flag = ' ';
392399 if (stat ("/var/tmp/", &sb)) return;
393400 if ((sb.st_mode & S_IFMT) != S_IFDIR) return;
394401 error_fd = fopen (ERROR_TEMP, "w");
395402 fprintf (error_fd, "<!DOCTYPE HTML>\n");
396403 fprintf (error_fd, "<html><head>\n");
397- fprintf (error_fd, "<meta http-equiv=\"refresh\" content=\"1;URL=./error_msg.html\">\n");
404+ fprintf (error_fd, "<meta http-equiv=\"refresh\" content=\"2;URL=./error_msg.html\">\n");
398405 fprintf (error_fd, "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n");
399406 fprintf (error_fd, "</head>\n");
400407 fprintf (error_fd, "<body style=\"background-color:#ff8c00;\">\n");
401- fprintf (error_fd, "<center>%s</center>", &str[5]);
408+ fprintf (error_fd, "<center><b>%c</b> %s</center>", hole_punch_flag, &str[5]);
402409 fprintf (error_fd, "</body></html>");
403410 fclose (error_fd);
404411 sprintf (cmd, "mv -f %s %s", ERROR_TEMP, ERROR_MSG);
@@ -526,7 +533,7 @@ void jitter_putFifo (void)
526533 syslog (LOG_INFO, "n:%d\n", n);
527534 #endif
528535 }
529- if (n > 3)
536+ if (n > 4)
530537 {
531538 while (jitter_rd_pnt != jitter_wr_pnt)
532539 {
--- a/inet_read.c
+++ b/inet_read.c
@@ -3,7 +3,6 @@
33 int rig_status(void);
44 void header_store (char str[]);
55 void putFifo (int len, unsigned char pkt[]);
6-void send_rig_header(void);
76 void inet_led_onoff(void);
87 void connected_table(char str[]);
98 void error_msg (char str[]);
@@ -168,6 +167,9 @@ void inet_read(void)
168167 jitter_max = 0;
169168 jitter_min = 500000;
170169 jitter_ave = 0;
170+ #ifdef _SPECIFICATION_CHECK
171+ memset (voice_packet_save, 0xff, 15);
172+ #endif
171173
172174 }
173175 if (!scan_sw)
@@ -186,6 +188,11 @@ void inet_read(void)
186188 {
187189 if (!memcmp (&inet_frame_id, &recvBuff[14], 2))
188190 {
191+ #ifdef _SPECIFICATIO_CHECK
192+ if (!memcmp (&recvBuff[14], voice_packet_save, 15))
193+ syslog (LOG_INFO, "Dup. packet (maybe loop) from %8.8s %2.2x %2.2x %2,2x", recvBuff[14], recvBuff[15], recvBuff[16]);
194+ memcpy (voice_packet_save, &recvBuff[14], 15);
195+ #endif
189196 #ifdef _DEBUG
190197 if ((recvBuff[16] & 0x1f) > 0x14) syslog (LOG_INFO, "bad seq. info. %2.2x", recvBuff[16]);
191198 #endif
@@ -193,6 +200,13 @@ void inet_read(void)
193200 if (recvBuff[16] == 0x00) inet_led_onoff();
194201 if (recvBuff[16] & 0x40)
195202 {
203+ #ifdef _SPECIFICATION_CHECK
204+ if (memcmp (&recvBuff[17], dummy_frame_3, 3) || memcmp (&recvBuff[26], &dummy_frame_3[9], 3))
205+ {
206+ syslog (LOG_INFO, "Last packet wrong from %8.8s 0-2 %2.2x %2.2x %2.2x 9-11 %2.2x %2.2x %2.2x",
207+ &header_save[29], recvBuff[17], recvBuff[18], recvBuff[19], recvBuff[26], recvBuff[27], recvBuff[28]);
208+ }
209+ #endif
196210 memcpy (&recvBuff[17], dummy_frame_3, 12);
197211 memset (inet_frame_id, 0x00, 2);
198212 digitalWrite (INET_LED, 0);
@@ -202,6 +216,7 @@ void inet_read(void)
202216 rig_send_check();
203217 }
204218 jitter_put (&recvBuff[16]);
219+ jitter_putFifo();
205220 inet_recv_time_save.tv_sec = inet_recv_time.tv_sec;
206221 inet_recv_time_save.tv_usec = inet_recv_time.tv_usec;
207222 gettimeofday (&inet_recv_time, NULL);
@@ -210,12 +225,25 @@ void inet_read(void)
210225 if (t_sub > jitter_max) jitter_max = t_sub;
211226 if (t_sub & (t_sub < jitter_min)) jitter_min = t_sub;
212227 jitter_ave += (t_sub - 20);
228+ #ifdef _SPECIFICATION_CHECK
229+ if (t_sub > 300) syslog (LOG_INFO, "long interval %ld.%03ld Sec.", t_sub / 1000, t_sub % 1000);
230+ //if (t_sub < 2) syslog (LOG_INFO, "short interval %ld mSec.", t_sub);
231+ #endif
213232 }
214233 }
215234 else if (length == 32)
216235 {
217236 if (!memcmp (inet_frame_id, &recvBuff[14], 2))
218237 {
238+ #ifdef _SPECIFICATION_CHECK
239+ syslog (LOG_INFO, "Packet length wrong (32 bytes) from %8.8s", &header_save[29]);
240+ if (memcmp (&recvBuff[29], dummy_frame_3, 3) || memcmp (&recvBuff[26], &dummy_frame_3[9], 3))
241+ {
242+ syslog (LOG_INFO, "Last packet wrong (32 bytes) from %8.8s 0-2 %2.2x %2.2x %2.2x 9-11 %2.2x %2.2x %2.2x 12-14 %2.2x %2.2x %2.2x",
243+ &header_save[29], recvBuff[17], recvBuff[18], recvBuff[19],
244+ recvBuff[26], recvBuff[27], recvBuff[28], recvBuff[29], recvBuff[30], recvBuff[31]);
245+ }
246+ #endif
219247 #ifdef _DEBUG
220248 if ((recvBuff[16] & 0x1f) > 0x14) syslog (LOG_INFO, "bad seq. info. %2.2x", recvBuff[16]);
221249 #endif
@@ -247,6 +275,10 @@ void inet_read(void)
247275 if (t_sub > jitter_max) jitter_max = t_sub;
248276 if (t_sub && (t_sub < jitter_min)) jitter_min = t_sub;
249277 jitter_ave += (t_sub - 20);
278+ #ifdef _SPECIFICATION_CHECK
279+ if (t_sub > 300) syslog (LOG_INFO, "long interval %ld/%03ld Sec.", t_sub / 1000, t_sub % 1000);
280+ //if (t_sub < 2) syslog (LOG_INFO, "short interval %ld mSec", t_sub);
281+ #endif
250282 digitalWrite (INET_LED, 0);
251283 digitalWrite (RIG_LED, 0);
252284 rig_last_frame_send = TRUE;
--- a/main.c
+++ b/main.c
@@ -132,9 +132,9 @@ int main(int argc, char *argv[])
132132 rig_send_time_20mSec.tv_sec = 0;
133133 rig_send_time_20mSec.tv_usec = 20000;
134134
135- l_int = (fifo_hold - 5) * 20000;
136- inet_recv_timeout.tv_sec = l_int / 1000000;
137- inet_recv_timeout.tv_usec = l_int % 1000000;
135+ l_int = (fifo_hold - 5) * 20;
136+ inet_recv_timeout.tv_sec = l_int / 1000;
137+ inet_recv_timeout.tv_usec = (l_int % 1000) * 1000;
138138
139139 rig_send_time.tv_sec = 0;
140140 rig_send_time.tv_usec = 0;
@@ -160,6 +160,7 @@ int main(int argc, char *argv[])
160160
161161 ptt = 0x00;
162162 hole_punch_msg_sw = FALSE;
163+ fifo_hold_limit = fifo_hold + 10;
163164
164165 while (1)
165166 {
@@ -203,22 +204,26 @@ int main(int argc, char *argv[])
203204 rig_send_time.tv_usec = temp_time.tv_usec;
204205 }
205206 }
206- if ((inet_frame_id[0] != 0x00) || (inet_frame_id[1] != 0x00))
207+ }
208+ if ((inet_frame_id[0] != 0x00) || (inet_frame_id[1] != 0x00))
209+ {
210+ timeradd (&inet_recv_time, &inet_recv_timeout, &temp_time);
211+ if (timercmp (&c_time, &temp_time, >))
207212 {
208- timeradd (&inet_recv_time, &inet_recv_timeout, &temp_time);
209- if (timercmp (&c_time, &temp_time, >))
210- {
211- syslog(LOG_INFO, "insert dummy_last_frame");
212- dummy_last_frame();
213- }
213+ syslog(LOG_INFO, "insert dummy_last_frame");
214+ dummy_last_frame();
215+ #ifdef _SPECIFICATION_CHECK
216+ timersub (&c_time, &inet_recv_time, &temp_time);
217+ syslog (LOG_INFO, "Long Interval %ld.%03ld Sec.", temp_time.tv_sec, temp_time.tv_usec/1000);
218+ #endif
214219 }
215220 }
216221 else
217222 {
218223 fifo_hold = fifo_new_hold;
219- l_int = (fifo_hold - 5) * 20000;
220- inet_recv_timeout.tv_sec = l_int / 1000000;
221- inet_recv_timeout.tv_usec = l_int % 1000000;
224+ l_int = (fifo_hold - 5) * 20;
225+ inet_recv_timeout.tv_sec = l_int / 1000;
226+ inet_recv_timeout.tv_usec = (l_int % 1000) * 1000;
222227 }
223228 if (scan_sw)
224229 {
--- a/rig_read.c
+++ b/rig_read.c
@@ -116,7 +116,6 @@ void rig(void)
116116 jitter_buff_init();
117117 length = 1;
118118 while (length) length = getFifo(dummy);
119- gettimeofday (&inet_recv_time, NULL);
120119 Fifo_cnt = 0;
121120 rig_send_sw = FALSE;
122121 }
@@ -348,7 +347,7 @@ int rig_read (void)
348347 }
349348 error_msg_sw = FALSE;
350349
351- if ((Fifo_cnt > (fifo_hold + 10)) || (Fifo_cnt < 0))
350+ if ((Fifo_cnt > fifo_hold_limit) || (Fifo_cnt < 0))
352351 {
353352 syslog (LOG_INFO, "rig fifo overflow");
354353 rig_state = RIG_INIT;
@@ -382,9 +381,9 @@ void rig_write (int length, unsigned char buff[])
382381 if (length == 17)
383382 {
384383 syslog (LOG_DEBUG,
385- "%2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %d",
384+ "%2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %2.2x %d %d",
386385 buff[0], buff[1], buff[2], buff[3], buff[4], buff[5], buff[6], buff[7], buff[8], buff[9], buff[10],
387- buff[11], buff[12], buff[13], buff[14], buff[15], buff[16], Fifo_cnt);
386+ buff[11], buff[12], buff[13], buff[14], buff[15], buff[16], fifo_hold_limit, Fifo_cnt);
388387 }
389388 #endif
390389 }
Show on old repository browser