Commit: 4d209d5779c01ab532e0adee564085b32a27f9cc - rpi-dmonitor (git)

Commit MetaInfo

• Révision: 4d209d5779c01ab532e0adee564085b32a27f9cc (tree)
• l'heure: 2020-10-05 22:58:41
• Auteur: Satoshi Yasuda <7m3tjz@jarl...>
• Commiter: Satoshi Yasuda

Message de Log

modified: dmonitor.h
modified: main.c
modified: repeater_mon.c
modified: repeater_mon.h
modified: repeater_mon_light.c
modified: repeater_scan.c
modified: rpt_conn.c
modified: rpt_conn.h

Change Summary

• modified: dmonitor.h
• modified: main.c
• modified: repeater_mon.c
• modified: repeater_mon.h
• modified: repeater_mon_light.c
• modified: repeater_scan.c
• modified: rpt_conn.c
• modified: rpt_conn.h

Modification

--- a/dmonitor.h
+++ b/dmonitor.h
@@ -52,7 +52,7 @@
 #define		BUFF_HOLD		"/var/www/buff_hold.txt"
 #define		DVAP_CONF		"/var/www/dvap.conf"
 #define		DVMEGA_CONF		"/var/www/dvmega.conf"
-#define         NODE_CONF             "/var/www/node.conf"
+#define         NODE_CONF         	"/var/www/node.conf"
 #define		RIG_DEVICE		"/dev/dstar"
 #define		DMONITOR_FILE		"/var/www/dmonitor.conf"
 #define		IDxxPlus_SPEED  	B38400

--- a/main.c
+++ b/main.c
@@ -123,6 +123,7 @@ int	main(int argc, char *argv[])
 			if (!memcmp (recvBuff, "NONE", 4)) lcd_type = NODE;
 			else if (!memcmp (recvBuff, "G20x4", 5)) lcd_type = LCD_20x4;
 			else if (!memcmp (recvBuff, "G16x2", 5)) lcd_type = LCD_16x2;
+				
 		}
 		fclose (dmonitor_file);
 	}

--- a/repeater_mon.c
+++ b/repeater_mon.c
@@ -294,7 +294,9 @@ void main(int argc, char** argv)
                 addr.sin_addr.s_addr = *(unsigned int *)host->h_addr_list[0];
         }
 
-	connect_fd = fopen (ConnectCALL, "r");
+	connect_fd = fopen (DMONITOR_FILE, "r");
+	fgets (ConnectCall, 10, connect_fd);		// skip 2 lines
+	fgets (ConnectCall, 10, connect_fd);
 	fgets (ConnectCall, 10, connect_fd);
 	fclose (connect_fd);
 

--- a/repeater_mon.h
+++ b/repeater_mon.h
@@ -26,7 +26,7 @@
 #define SCAN_HTML_TEMP		"/var/tmp/repeater_scan.temp"
 #define	CONN_TEMP		"/var/tmp/repeater_conn.tmp"
 #define	CONN_TXT		"/var/tmp/repeater_conn.txt"
-#define	ConnectCALL		"/var/www/ConnectCall"
+#define	DMONITOR_FILE		"/var/www/dmonitor.conf"
 
 int	sig_term;
 

--- a/repeater_mon_light.c
+++ b/repeater_mon_light.c
@@ -129,7 +129,9 @@ void main(int argc, char** argv)
                 addr.sin_addr.s_addr = *(unsigned int *)host->h_addr_list[0];
         }
 
-	connect_fd = fopen (ConnectCALL, "r");
+	connect_fd = fopen (DMONITOR_FILE, "r");
+	fgets (ConnectCall, 10, connect_fd);	// skip 2 lines
+	fgets (ConnectCall, 10, connect_fd);
 	fgets (ConnectCall, 10, connect_fd);
 	fclose (connect_fd);
 

--- a/repeater_scan.c
+++ b/repeater_scan.c
@@ -211,8 +211,10 @@ int main(int argc, char** argv)
 	handler_init();
 
 	ret = daemon (0, 0);
-	call_fd = fopen (ConnectCALL, "r");
-	ret = fread (connect_call, 8, 1, call_fd);
+	call_fd = fopen (DMONITOR_FILE, "r");
+	fgets (tmp_call, sizeof(tmp_call), call_fd);    // skip 2 lines
+	fgets (tmp_call, sizeof(tmp_call), call_fd);
+	fgets (connect_call, 8, call_fd);
 	fclose (call_fd);
 	while (1)
 	{

--- a/rpt_conn.c
+++ b/rpt_conn.c
@@ -73,13 +73,11 @@ void	main(void)
                         if (!memcmp (recvBuff, "NONE", 4)) lcd_type = NODE;
                         else if (!memcmp (recvBuff, "G20x4", 5)) lcd_type = LCD_20x4;
                         else if (!memcmp (recvBuff, "G16x2", 5)) lcd_type = LCD_16x2;
+			fgets (ConnectCall, sizeof (ConnectCall), dmonitor_file);
                 }
 		fclose (dmonitor_file);
 	}
 
-	connCall_fd = fopen (CONNECT_CALL, "r");
-	fgets (ConnectCall, sizeof(ConnectCall), connCall_fd);
-	fclose (connCall_fd);
 	sig_term = FALSE;
 	reboot_sw = FALSE;
 	shutdown_sw = FALSE;
@@ -111,25 +109,30 @@ scan_loop:
 	rig_reset();
 	while (1)
 	{
+		time (&cur_time);
 		if (lcd_type == LCD_20x4)
 		{
         		lcdPosition (lcd, 16, 0);
 		}
-		if (lcd_type == LCD_16x2)
+		else if (lcd_type == LCD_16x2)
 		{
-			lcdPosition (lcd, 13, 0);
+			lcdPosition (lcd, 12, 0);
 		}
 		if (lcd_type != NODE)
 		{
-        		if (scan_sw)
-        		{
-                		memcpy (temp, "scan", 4);
-        		}
-        		else
-        		{
-                		memcpy (temp, "rptc", 4);
+			if (cur_time %2) memset (temp, 0x20, 4);
+			else
+			{
+        			if (scan_sw)
+        			{
+                			memcpy (temp, "scan", 4);
+        			}
+        			else
+        			{
+                			memcpy (temp, "rptc", 4);
+				}
         		}
-        		temp[5] = 0x00;
+        		temp[4] = 0x00;
         		lcdPuts (lcd, temp);
 		}
 		memcpy (&read_set, &fd_save, sizeof(fd_set));
@@ -190,39 +193,63 @@ 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);
+			}
 		}
 		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);
+                        }
 		}
                 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);
+                        }
                 }
                 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);
+                        }
                 }
 		if (!memcmp (connect_call, "SCAN", 4))
 		{

--- a/rpt_conn.h
+++ b/rpt_conn.h
@@ -42,7 +42,7 @@
 #define		DVMEGA_CONF		"/var/www/dvmega.conf"
 #define		NODE_CONF		"/var/www/node.conf"
 #define		RIG_DEVICE		"/dev/dstar"
-#define		DMONITOR_FILE		"/var/www/dmonitor.type"
+#define		DMONITOR_FILE		"/var/www/dmonitor.conf"
 #define		CONNECT_CALL		"/var/www/ConnectCall"
 #define		IDxxPlus_SPEED  	B38400
 #define         DVAP_SPEED      	B230400
@@ -232,7 +232,6 @@ union
 } usb;
 
 /* LCD */
-/* LCD */
 #define         NONE            0
 #define         LCD_20x4        1
 #define         LCD_16x2        2