Commit: 5b09efd1c1a9757b110a84bea4c82ca71d71a469 - rpi-dmonitor (git)

Commit MetaInfo

• Revision: 5b09efd1c1a9757b110a84bea4c82ca71d71a469 (tree)
• Zeit: 2020-10-08 07:27:36
• Autor: Satoshi Yasuda <7m3tjz@jarl...>
• Commiter: Satoshi Yasuda

Log Message

modified: debian/install
modified: debian/rules
modified: dmonitor.h
modified: dmonitor_cmd.c
modified: dmonitor_utils.c
modified: main.c
modified: node_utils.c
modified: rpt_conn.c
modified: rpt_conn.h
modified: rpt_conn_rig.c

Ändern Zusammenfassung

• modified: debian/install
• modified: debian/rules
• modified: dmonitor.h
• modified: dmonitor_cmd.c
• modified: dmonitor_utils.c
• modified: main.c
• modified: node_utils.c
• modified: rpt_conn.c
• modified: rpt_conn.h
• modified: rpt_conn_rig.c

Diff

--- a/debian/install
+++ b/debian/install
@@ -21,8 +21,6 @@ Update		/var/www/cgi-bin
 Shutdown	/var/www/cgi-bin
 Reboot		/var/www/cgi-bin
 update_log	/var/www/cgi-bin
-CallStore	/var/www/cgi-bin
-RegistCall	/var/www/cgi-bin
 redirect	/var/www/cgi-bin
 simple_redirect	/var/www/cgi-bin
 init_cmd	/var/www/cgi-bin

--- a/debian/rules
+++ b/debian/rules
@@ -54,8 +54,6 @@ override_dh_prep:
 	cp /var/www/cgi-bin/Shutdown  	debian/tmp/
 	cp /var/www/cgi-bin/Reboot	debian/tmp/
 	cp /var/www/cgi-bin/update_log	debian/tmp/
-	cp /var/www/cgi-bin/CallStore	debian/tmp/
-	cp /var/www/cgi-bin/RegistCall  debian/tmp/
 	cp /var/www/cgi-bin/redirect	debian/tmp/
 	cp /var/www/cgi-bin/simple_redirect	debian/tmp/
 	cp /var/www/cgi-bin/init_cmd	debian/tmp/

--- a/dmonitor.h
+++ b/dmonitor.h
@@ -289,3 +289,4 @@ int	scan_stop_sw;
 
 int	lcd_type;
 int	lcd;
+time_t	lcd_time_save;

--- a/dmonitor_cmd.c
+++ b/dmonitor_cmd.c
@@ -1,6 +1,19 @@
 #include	"dmonitor.h"
 
 
+void	lcd_write (void)
+{
+	if (lcd_type == LCD_20x4) 
+	{
+		lcdPosition (lcd, 0, 3);
+		msg_temp [20] = 0x00;
+		lcdPuts (lcd, msg_temp);
+	}
+	else if (lcd_type == LCD_16x2)
+	{
+	}
+}
+
 int	cmd_check (unsigned char cmd[])
 {
 
@@ -9,73 +22,48 @@ int	cmd_check (unsigned char cmd[])
 	{
 		fprintf (status_fd, "%8.8s from Rig\n", cmd);
 	}
-	if (lcd_type == LCD_20x4)  lcdPosition (lcd, 0, 3);
 	if (!memcmp (cmd, "DISCON", 6) || !memcmp (cmd, "UNLINK", 6))
 	{
 		sprintf	(msg_temp, "UNLINK FROM %8.8s", area_call);
 		memcpy	(mycall2, "UNLK", 4);
 		send_msg_sw = TRUE;
 		sig_term = TRUE;
-		if (lcd_type == LCD_20x4)
-		{
-			msg_temp[20] = 0x00;
-			lcdPuts (lcd, msg_temp);
-		}
+		lcd_write();
 		return FALSE;
 	}
         if (!memcmp (cmd, "STATUS", 6))
         {
-		if (lcd_type == LCD_20x4) lcdPosition (lcd, 0, 3);
        		sprintf (msg_temp, "LINKED TO %8.8s  ", area_call);
                 memcpy  (mycall2, "DMON", 4);
                 send_msg_sw = TRUE;
-		if (lcd_type == LCD_20x4)
-		{
-			msg_temp[20] = 0x00;
-			lcdPuts (lcd, msg_temp);
-		}
+		lcd_write ();
                 return FALSE;
         }
        	if (!memcmp (cmd, "SCAN", 4))
        	{
-		if (lcd_type == LCD_20x4) lcdPosition (lcd, 0, 3);
        		memcpy (msg_temp, "EXIT FROM SCAN      ", 20);
                	memcpy  (mycall2, "DMON", 4);
                	send_msg_sw = TRUE;
 		scan_stop_sw = TRUE;
-		if (lcd_type == LCD_20x4)
-		{
-			msg_temp[20] = 0x00;
-			lcdPuts (lcd, msg_temp);
-		}
+		lcd_write();
                	return FALSE;
        	}
         if (!memcmp (cmd, "REBOOT", 6))
         {
-		if (lcd_type == LCD_20x4) lcdPosition (lcd, 0, 3);
        		memcpy (msg_temp, "RASPI REBOOT        ", 20);
                 memcpy  (mycall2, "DMON", 4);
                 send_msg_sw = ON;
 		reboot_sw = ON;
-		if (lcd_type == LCD_20x4)
-		{
-			msg_temp[20] = 0x00;
-			lcdPuts (lcd, msg_temp);
-		}
+		lcd_write ();
                 return FALSE;
         }
         if (!memcmp (cmd, "SHUTDOWN", 8))
         {
-		if (lcd_type == LCD_20x4) lcdPosition (lcd, 0, 3);
         	memcpy (msg_temp, "RASPI SHUTDOWN      ", 20);
                 memcpy  (mycall2, "DMON", 4);
 		send_msg_sw = ON;
                 shutdown_sw = ON;
-		if (lcd_type == LCD_20x4)
-		{
-			msg_temp[20] = 0x00;
-			lcdPuts (lcd, msg_temp);
-		}
+		lcd_write();
                 return FALSE;
 	}
 	if (!memcmp (cmd, "CQCQCQ", 6))

--- a/dmonitor_utils.c
+++ b/dmonitor_utils.c
@@ -12,6 +12,7 @@ void	jitter_putFifo (void);
 int	send_dest_keep_alive(void);
 int	node_usb_init (void);
 void	node_close (void);
+void	lcd_write(void);
 
 extern	char	dummy_frame_1[12];
 extern	char	dummy_frame_2[12];
@@ -593,29 +594,19 @@ void	error_msg (char str[])
 
 	if (!memcmp (&str[44], "未登録", 9))
 	{
-		if (lcd_type == LCD_20x4) lcdPosition (lcd, 0, 3);
                	sprintf (msg_temp, "NOT REGIST %8.8s ", &str[31]);
                	memcpy (mycall2, "NORG", 4);
                	send_msg_sw = TRUE;
                	sig_term = TRUE;
 		not_clear_error_msg = TRUE;
-		if (lcd_type == LCD_20x4)
-		{
-			msg_temp[20] = 0x00;
-			lcdPuts (lcd, msg_temp);
-		}
+		lcd_write();
 	}
 	if (!memcmp (&str[44], "登録済", 9))
        	{
-		if (lcd_type == LCD_20x4) lcdPosition (lcd, 0,3);
        		sprintf (msg_temp, "LINK TO %8.8s    ", area_call);
                	memcpy (mycall2, "LINK", 4);
                	send_msg_sw = TRUE;
-		if (lcd_type == LCD_20x4)
-		{
-			msg_temp[20] = 0x00;
-			lcdPuts (lcd, msg_temp);
-		}
+		lcd_write ();
        	}
 }
 

--- a/main.c
+++ b/main.c
@@ -87,6 +87,7 @@ int	main(int argc, char *argv[])
 	send_msg_sw = FALSE;
 	beep_sw = OFF;
 	scan_stop_sw = FALSE;
+	lcd_time_save = 0;
 
 	openlog ("dmonitor", LOG_CONS | LOG_PID, LOG_LOCAL0);
 
@@ -247,24 +248,24 @@ int	main(int argc, char *argv[])
 	pinMode(INET_LED, OUTPUT);
 	digitalWrite (RIG_LED, 0);
 	digitalWrite (INET_LED, 0);
-	lcd_init();
 	inet_led_sw = 0;
 	rig_led_sw = 0;
 	if (lcd_type != NONE)
 	{
+		lcd_init();
 		lcdPosition (lcd, 0, 0);
         	if (lcd_type == LCD_20x4)
 		{
 		
-        		if (scan_sw) sprintf (temp, "ScnRpt %8.8s scan", area_call);
-			else sprintf (temp, "Rpt    %8.8s dmon", area_call);
-			temp[20] = 0x00;
+        		if (scan_sw) sprintf (temp, "ScnRpt %8.8s ", area_call);
+			else sprintf (temp, "Rpt    %8.8s ", area_call);
+			temp[16] = 0x00;
 		}
 		else if (lcd_type == LCD_16x2)
 		{
-			if (scan_sw) sprintf (temp, "%8.8s    scan", area_call);
-			else sprintf (temp, "%8.8s    dmon", area_call);
-			temp[16] = 0x00;
+			if (scan_sw) sprintf (temp, "%8.8s   ", area_call);
+			else sprintf (temp, "%8.8s    ", area_call);
+			temp[12] = 0x00;
 		}
         	lcdPuts(lcd, temp);
 	}
@@ -315,6 +316,25 @@ int	main(int argc, char *argv[])
 	while (1)
 	{
 top:
+		time (&cur_time);
+		if ((lcd_type != NONE) && (cur_time != lcd_time_save))
+		{
+			if (lcd_type == LCD_20x4) lcdPosition (lcd, 16, 0);
+			else if (lcd_type == LCD_16x2) lcdPosition (lcd, 12, 0);
+			if (cur_time % 2)
+			{
+				if (scan_sw) lcdPuts (lcd, "SCAN\0");
+				else lcdPuts (lcd, "DMON\0");
+			}
+			else
+			{
+				if (scan_sw) lcdPuts (lcd, "scan\0");
+				else lcdPuts (lcd, "dmon\0");
+			}
+			lcd_time_save = cur_time;
+		}
+			
+
 		memcpy (&read_set, &fd_save, sizeof(fd_set));
 		memcpy (&sigset, &save_sig, sizeof(save_sig));
 		ret = pselect (FD_SETSIZE, &read_set, (fd_set *)NULL,
@@ -339,7 +359,6 @@ top:
 		}
 		jitter_putFifo();
 		rig ();
-		time (&cur_time);
 		if ((cur_time - hole_punch_send_time) >= hole_punch_send_interval)
 		{
 			if (hole_punch_send_interval == HOLE_PUNCH_SEND_INTERVAL) 

--- a/node_utils.c
+++ b/node_utils.c
@@ -2,6 +2,8 @@
 
 void	PICinfo (void);
 void	node_term (void);
+void    header_read_from_node(void);
+int	voice_read_from_node(void);
 
 void    node_close (void)
 {

--- a/rpt_conn.c
+++ b/rpt_conn.c
@@ -21,6 +21,7 @@ int	rpt_conn_scan (void);
 void	node_close (void);
 void    lcd_init (void);
 void    lcdPosition (int handle, int x, int y);
+void    lcd_write (void);
 
 void	main(void)
 {
@@ -88,6 +89,7 @@ void	main(void)
 	ScanTable_pnt = NULL;
 	wiringPiSetupGpio();
 	if (lcd_type != NODE) lcd_init();
+	lcd_time_save = 0;
 loop:
         node_VenderID = 0x4d8;
         node_ProductID = 0x300;
@@ -110,30 +112,21 @@ scan_loop:
 	while (1)
 	{
 		time (&cur_time);
-		if (lcd_type == LCD_20x4)
+		if ((lcd_type != NONE) && (cur_time != lcd_time_save))
 		{
-        		lcdPosition (lcd, 16, 0);
-		}
-		else if (lcd_type == LCD_16x2)
-		{
-			lcdPosition (lcd, 12, 0);
-		}
-		if (lcd_type != NODE)
-		{
-			if (cur_time %2) memset (temp, 0x20, 4);
-			else
+			if (lcd_type == LCD_20x4) lcdPosition (lcd, 16, 0);
+			else if (lcd_type == LCD_16x2) lcdPosition (lcd, 12, 0);
+			if (cur_time %2)
 			{
-        			if (scan_sw)
-        			{
-                			memcpy (temp, "scan", 4);
-        			}
-        			else
-        			{
-                			memcpy (temp, "rptc", 4);
-				}
-        		}
-        		temp[4] = 0x00;
-        		lcdPuts (lcd, temp);
+        			if (scan_sw) lcdPuts (lcd, "SCAN\0");
+				else lcdPuts (lcd, "RPTC\0");
+			}
+			else 
+			{
+				if (scan_sw) lcdPuts (lcd, "scan\0");
+				else lcdPuts (lcd, "rptc\0");
+			}
+			lcd_time_save = cur_time;
 		}
 		memcpy (&read_set, &fd_save, sizeof(fd_set));
 		memcpy (&sigset, &save_sig, sizeof(save_sig));
@@ -193,63 +186,43 @@ skip:
 		}
 		if (!memcmp (connect_call, "STATUS", 6))
 		{
-			if (lcd_type == LCD_20x4) lcdPosition (lcd, 0, 3);
 			memcpy (msg_temp, "RPT CONN RUNNING    ", 20);
 			memcpy (mycall2, "RPTC", 4);
 			flag1 = 0x00;
 			send_msg_sw = TRUE;
 			memset (connect_call, 0x00, 8);
 			scan_sw = FALSE;
-			if (lcd_type == LCD_20x4)
-			{
-				msg_temp[20] = 0x00;
-				lcdPuts (lcd, msg_temp);
-			}
+			lcd_write ();
 		}
 		if (!memcmp (connect_call, "UNLINK", 6) || !memcmp (connect_call, "DISCON", 6))
 		{
-			if (lcd_type == LCD_20x4) lcdPosition (lcd, 0, 3);
 			memcpy (msg_temp, "NOT UNLINK  RPTC RUN", 20);
 			memcpy (mycall2, "RPTC", 4);
 			flag1 = 0x00;
 			send_msg_sw = TRUE;
 			memset (connect_call, 0x00, 8);
 			scan_sw = FALSE;
-			if (lcd_type == LCD_20x4)
-                        {
-                                msg_temp[20] = 0x00;
-                                lcdPuts (lcd, msg_temp);
-                        }
+			lcd_write ();
 		}
                 if (!memcmp (connect_call, "REBOOT", 6))
                 {
-			if (lcd_type == LCD_20x4) lcdPosition (lcd, 0, 3);
                         memcpy (msg_temp, "RASPI REBOOT        ", 20);
                         memcpy (mycall2, "RPTC", 4);
                         flag1 = 0x00;
                         send_msg_sw = TRUE;
                         memset (connect_call, 0x00, 8);
                         reboot_sw = TRUE;
-                        if (lcd_type == LCD_20x4)
-                        {
-                                msg_temp[20] = 0x00;
-                                lcdPuts (lcd, msg_temp);
-                        }
+			lcd_write ();
                 }
                 if (!memcmp (connect_call, "SHUTDOWN", 6))
                 {
-			if (lcd_type == LCD_20x4) lcdPosition (lcd, 0, 3);
                         memcpy (msg_temp, "RASPI SHUTDOWN      ", 20);
                         memcpy (mycall2, "RPTC", 4);
                         flag1 = 0x00;
                         send_msg_sw = TRUE;
                         memset (connect_call, 0x00, 8);
                         shutdown_sw = TRUE;
-                        if (lcd_type == LCD_20x4)
-                        {
-                                msg_temp[20] = 0x00;
-                                lcdPuts (lcd, msg_temp);
-                        }
+			lcd_write ();
                 }
 		if (!memcmp (connect_call, "SCAN", 4))
 		{

--- a/rpt_conn.h
+++ b/rpt_conn.h
@@ -238,3 +238,4 @@ union
 
 int     lcd_type;
 int     lcd;
+time_t	lcd_time_save;

--- a/rpt_conn_rig.c
+++ b/rpt_conn_rig.c
@@ -15,7 +15,7 @@ void    dvap_write (int fd, unsigned char buff[], int length);
 int	read_dvmega(void);
 void	send_dvmega_status(void);
 void    dvmega_write (int fd, unsigned char buff[], int length);
-void node_write (unsigned char buff[], int length);
+void 	node_write (unsigned char buff[], int length);
 void	dvmega (void);
 void	node (void);