6.0.24.20

AlertWords.txt

@@ -1,2 +0,0 @@
-g8bpq
-very bad phrase

BPQTermMDI.c

@@ -614,6 +614,11 @@ VOID CALLBACK SetupTermSessions(HWND hwnd, UINT  uMsg, UINT  idEvent,  DWORD  dw
 			AppendMenu(hMonCfgMenu,MF_STRING | MF_UNCHECKED,BPQBASE + i,msg);
 	}
 
+	if (mtxparam & 0x80)
+		CheckMenuItem(hMonCfgMenu,MONLOCALTIME,MF_CHECKED);
+	else
+		CheckMenuItem(hMonCfgMenu,MONLOCALTIME,MF_UNCHECKED);
+	
 	if (mtxparam & 1)
 		CheckMenuItem(hMonCfgMenu,BPQMTX,MF_CHECKED);
 	else
@@ -1733,6 +1738,10 @@ LRESULT CALLBACK MonWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPara
 
 			break;
 		}
+		case MONLOCALTIME:
+
+			ToggleLocalTime();
+			break;
 
 		case BPQMTX:
 	
@@ -4266,6 +4275,24 @@ int ToggleMTX(HWND hWnd)
 
     return (0);
   
+}
+
+int ToggleLocalTime(HWND hWnd)
+{
+	mtxparam = mtxparam ^ 0x80;
+	
+	if (mtxparam & 0x80)
+
+		CheckMenuItem(hMonCfgMenu,MONLOCALTIME,MF_CHECKED);
+	
+	else
+
+		CheckMenuItem(hMonCfgMenu,MONLOCALTIME,MF_UNCHECKED);
+
+	IntSetTraceOptionsEx(portmask,mtxparam,mcomparam, monUI);
+
+    return (0);
+  
 }
 int ToggleMCOM(HWND hWnd)
 {

Bpq32.c

@@ -1198,6 +1198,8 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 //	If FT847 om PTC Port send a "Cat On" command (17)
 //	Fix some 63 port bugs in RigCOntrol (17)
 //	Fix 63 port bug in Bridging (18)
+//	Add FTDX10 Rigcontrol (19)
+//	Fix 64 bit bug in displaying INP3 Messages
 
 #define CKernel
 

BpqTermMDI.h

@@ -40,6 +40,7 @@
 #define CHATTERM                        1179
 #define IDM_CLOSEWINDOW					1180
 #define MONITORAPRS						1181
+#define MONLOCALTIME					1182
 #define MON_UI_ONLY                     40006
 #define StopALLMon                      40007
 

CBPQ32.vcproj.DESKTOP-MHE5LO8.johnw.user

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioUserFile
+	ProjectType="Visual C++"
+	Version="8.00"
+	ShowAllFiles="false"
+	>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			>
+			<DebugSettings
+				Command="c:\devprogs\bpq32\bpq32.exe"
+				WorkingDirectory=""
+				CommandArguments=""
+				Attach="false"
+				DebuggerType="3"
+				Remote="1"
+				RemoteMachine="DESKTOP-MHE5LO8"
+				RemoteCommand=""
+				HttpUrl=""
+				PDBPath=""
+				SQLDebugging=""
+				Environment=""
+				EnvironmentMerge="true"
+				DebuggerFlavor="0"
+				MPIRunCommand=""
+				MPIRunArguments=""
+				MPIRunWorkingDirectory=""
+				ApplicationCommand=""
+				ApplicationArguments=""
+				ShimCommand=""
+				MPIAcceptMode=""
+				MPIAcceptFilter=""
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			>
+			<DebugSettings
+				Command=""
+				WorkingDirectory=""
+				CommandArguments=""
+				Attach="false"
+				DebuggerType="3"
+				Remote="1"
+				RemoteMachine="DESKTOP-MHE5LO8"
+				RemoteCommand=""
+				HttpUrl=""
+				PDBPath=""
+				SQLDebugging=""
+				Environment=""
+				EnvironmentMerge="true"
+				DebuggerFlavor=""
+				MPIRunCommand=""
+				MPIRunArguments=""
+				MPIRunWorkingDirectory=""
+				ApplicationCommand=""
+				ApplicationArguments=""
+				ShimCommand=""
+				MPIAcceptMode=""
+				MPIAcceptFilter=""
+			/>
+		</Configuration>
+	</Configurations>
+</VisualStudioUserFile>

ChatUsers.txt

@@ -1,16 +0,0 @@
-IZ4FVW 0 Giulio Cesena ITA JN64ce, 1k2 bps radio link¬55¬0
-N5UXT 0 Angelo th New Orleans, La¬99¬0
-N0NJY 0 Rick Oak Island, NC¬76¬0
-KB8UVN 0 Matt Johnstown, Ohio¬95¬0
-WA3WLH 0 Rich East Greenville, PA¬55¬0
-EI2GYB 0 Steve_353 Donegal, Ireland (IO65JG)¬55¬0
-PE1RRR 0 Red Network Hub Monitor¬91¬0
-PE1NNZ 0 Guido nr Eindhoven¬91¬0
-G7TAJ 0 Steve_44 E.Sussex UK,JO00FU¬91¬0
-N3HYM 0 Ray Frederick, Md¬97¬0
-VE3CGH 0 Ted ?_qth¬71¬0
-WE1H 0 Matt Merrimack, NH¬26¬0
-W9IKU 0 Greg Portage, Wisconsin USA¬55¬0
-KA3VSP 0 Brian New Castle, DE¬91¬0
-G8BPQ 0 John Nottingham¬26¬0
-GM8BPQ 40 John ?_qth¬14¬0

CommonCode.c

@@ -4955,6 +4955,7 @@ VOID SendWebRequest(SOCKET sock, char * Host, char * Request, char * Params, int
 					{
 						strlop(Buffer, 13);
 						Debugprintf("Map Update Params - %s", Params);
+
 						Debugprintf("Map Update failed - %s", Buffer);
 					}
 					return;

KernelScript1.rc

@@ -10,7 +10,7 @@
 // Generated from the TEXTINCLUDE 2 resource.
 //
 #include "afxres.h"
-#include "bpqtermmdi.h"
+#include "BpqTermMDI.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
@@ -241,6 +241,7 @@ BEGIN
     END
     POPUP "Monitor"
     BEGIN
+        MENUITEM "Use Local Time",              MONLOCALTIME
         MENUITEM "Monitor TX",                  BPQMTX
         MENUITEM "Monitor Supervisory",         BPQMCOM
         MENUITEM "Monitor UI Only",             MON_UI_ONLY
@@ -276,13 +277,13 @@ INCOMINGCALL            WAVE    MOVEABLE PURE   "Ring.wav"
 BEGIN
     "kernelresource.h\0"
     """\r\n"
-    "bpqtermmdi.h\0"
+    "BpqTermMDI.h\0"
 END
 
 2 TEXTINCLUDE DISCARDABLE 
 BEGIN
     "#include ""afxres.h""\r\n"
-    "#include ""bpqtermmdi.h""\r\n"
+    "#include ""BpqTermMDI.h""\r\n"
     "\0"
 END
 

LinBPQ.c

@@ -1581,8 +1581,8 @@ int main(int argc, char * argv[])
 				{
 					if (GenerateTrafficReport && (LastTrafficTime + 86400) < NOW)
 					{
-						LastTrafficTime = NOW;
 						CreateBBSTrafficReport();
+						LastTrafficTime = NOW;
 					}
 				}
 			}

Moncode.c

@@ -634,7 +634,7 @@ char * DISPLAY_NETROM(MESSAGE * ADJBUFFER, UCHAR * Output, int MsgLen)
 		// If an INP3 RIF (type <> UI) decode as such
 	
 		if (ADJBUFFER->CTL != 3)		// UI
-			return DisplayINP3RIF(&ADJBUFFER->L2DATA[1], Output, MsgLen - 24);
+			return DisplayINP3RIF(&ADJBUFFER->L2DATA[1], Output, MsgLen - (MSGHDDRLEN + 14 + 3));
 
 		memcpy(Alias, ++ptr, 6);
 

RTKnown.txt

@@ -1,26 +0,0 @@
-G8BPQ-1 1681280155
-GM8BPQ-3 1681280155
-KB8UVN-6 1681280155
-N8BHL-6 1681280155
-KF8MZ-6 1681280155
-W8BAP-6 1681280155
-G8BPQ-4 1681280155
-EI2GYB-4 1681280155
-IZ4FVW-10 1681280155
-PE1NNZ-5 1681280155
-PI1LAP-4 1681280155
-K8OPG-14 1681280155
-KB9PVH-11 1681280155
-N0NJY-11 1681280155
-N3MEL-3 1681280155
-K5DAT-11 1681280155
-N2UEM-11 1681280155
-W9IKU-11 1681280155
-WA3WLH-11 1681280155
-WA3WLH-14 1681280155
-PE1RRR-4 1681280155
-MS0HFI-4 1681280155
-AE5E-2 1681280155
-G0BMH-4 1681280155
-OH5RM-8 1681280155
-GM8BPQ-4 1681280155

RigControl.c

@@ -175,9 +175,10 @@ char FTRXModes[8][6] = {"LSB", "USB", "CW", "AM", "FM", "RTTY", "PKT", ""};
 
 char KenwoodModes[16][6] = {"????", "LSB",  "USB", "CW", "FM", "AM", "FSK", "????"};
 
-//char FT2000Modes[16][6] = {"????", "LSB",  "USB", "CW", "FM", "AM", "FSK", "PKT-L", "FSK-R", "PKT-FM", "FM-N", "PKT-U", "????"};
 char FT2000Modes[16][6] = {"????", "LSB",  "USB", "CW", "FM", "AM", "FSK", "CW-R", "PKT-L", "FSK-R", "PKT-FM", "FM-N", "PKT-U", "????"};
 
+char FTDX10Modes[16][9] = {"????", "LSB",  "USB", "CW-U", "FM", "AM", "RTTY-L", "CW-L", "DATA-L", "RTTY-U", "DATA-FM", "FM-N", "DATA-U", "AM-N", "PSK", "DATA-FM-N"};
+
 char FT991AModes[16][9] = {"????", "LSB",  "USB", "CW-U", "FM", "AM", "RTTY-LSB", "CW-L", "DATA-LSB", "RTTY-USB", "DATA-FM", "FM-N", "DATA-USB", "AM-N", "C4FM", "????"};
 
 char FLEXModes[16][6] = {"LSB", "USB", "DSB", "CWL", "CWU", "FM", "AM", "DIGU", "SPEC", "DIGL", "SAM", "DRM"};
@@ -564,6 +565,7 @@ VOID Rig_PTTEx(struct RIGINFO * RIG, BOOL PTTState, struct TNCINFO * TNC)
 		case ICOM:
 		case KENWOOD:
 		case FT2000:
+		case FTDX10:
 		case FT991A:
 		case FLEX:
 		case NMEA:
@@ -1285,6 +1287,7 @@ int Rig_CommandEx(struct RIGPORTINFO * PORT, struct RIGINFO * RIG, TRANSPORTENTR
 		case KENWOOD:
 		case FT991A:
 		case FT2000:
+		case FTDX10:
 		case FLEX:
 		case NMEA:
 
@@ -1870,6 +1873,7 @@ int Rig_CommandEx(struct RIGPORTINFO * PORT, struct RIGINFO * RIG, TRANSPORTENTR
 
 	case KENWOOD:
 	case FT2000:
+	case FTDX10:
 	case FT991A:
 	case FLEX:
 			
@@ -1885,6 +1889,10 @@ int Rig_CommandEx(struct RIGPORTINFO * PORT, struct RIGINFO * RIG, TRANSPORTENTR
 				if (_stricmp(FT2000Modes[ModeNo], Mode) == 0)
 				break;
 
+			if (PORT->PortType == FTDX10)
+				if (_stricmp(FTDX10Modes[ModeNo], Mode) == 0)
+				break;
+
 			if (PORT->PortType == FT991A)
 				if (_stricmp(FT991AModes[ModeNo], Mode) == 0)
 				break;
@@ -1925,8 +1933,8 @@ int Rig_CommandEx(struct RIGPORTINFO * PORT, struct RIGINFO * RIG, TRANSPORTENTR
 		if (PORT->PortType == FT2000)
 			FreqPtr->Cmd1Len = sprintf(Poll, "FA%s;MD0%X;FA;MD;", &FreqString[1], ModeNo);
 		else
-		if (PORT->PortType == FT991A)
+		if (PORT->PortType == FT991A || PORT->PortType == FTDX10)
-			FreqPtr->Cmd1Len = sprintf(Poll, "FA%s;MD0%X;FA;MD;", &FreqString, ModeNo);
+			FreqPtr->Cmd1Len = sprintf(Poll, "FA%s;MD0%X;FA;MD;", FreqString, ModeNo);
 		else
 		if (PORT->PortType == FLEX)
 			FreqPtr->Cmd1Len = sprintf(Poll, "ZZFA00%s;ZZMD%02d;ZZFA;ZZMD;", &FreqString[1], ModeNo);
@@ -2694,6 +2702,7 @@ BOOL Rig_Poll()
 
 		case KENWOOD:
 		case FT2000:
+		case FTDX10:
 		case FT991A:
 		case FLEX:
 		case NMEA:
@@ -2763,7 +2772,7 @@ int OpenRigCOMMPort(struct RIGPORTINFO * PORT, VOID * Port, int Speed)
 	if (PORT->remoteSock)		// Using WINMORCONTROL
 		return TRUE;
 
-	if (PORT->PortType == FT2000 || PORT->PortType == FT991A || strcmp(PORT->Rigs[0].RigName, "FT847") == 0)		// FT2000 and similar seem to need two stop bits
+	if (PORT->PortType == FT2000 || PORT->PortType == FT991A || PORT->PortType == FTDX10 || strcmp(PORT->Rigs[0].RigName, "FT847") == 0)		// FT2000 and similar seem to need two stop bits
 		PORT->hDevice = OpenCOMPort((VOID *)Port, Speed, FALSE, FALSE, PORT->Alerted, TWOSTOPBITS);
 	else if (PORT->PortType == NMEA)
 		PORT->hDevice = OpenCOMPort((VOID *)Port, Speed, FALSE, FALSE, PORT->Alerted, ONESTOPBIT);
@@ -2976,6 +2985,7 @@ void CheckRX(struct RIGPORTINFO * PORT)
 
 	case KENWOOD:
 	case FT2000:
+	case FTDX10:
 	case FT991A:
 	case FLEX:
 
@@ -4770,6 +4780,17 @@ Loop:
 			strcpy(RIG->WEB_MODE, FT991AModes[Mode]);
 			strcpy(RIG->ModeString, RIG->WEB_MODE);
 		}
+		else if (PORT->PortType == FTDX10)
+		{
+			Mode = Msg[3] - 48;
+			if (Mode > 16)
+				Mode -= 7;
+			
+			if (Mode > 15) Mode = 15;
+			SetWindowText(RIG->hMODE, FTDX10Modes[Mode]);
+			strcpy(RIG->WEB_MODE, FTDX10Modes[Mode]);
+			strcpy(RIG->ModeString, RIG->WEB_MODE);
+		}
 		else if (PORT->PortType == FLEX)
 		{
 			Mode = atoi(&Msg[3]);
@@ -5893,6 +5914,13 @@ PortFound:
 		PORT->PortType = FT2000;
 	}
 
+	// FTDX10 seems to be different to most other YAESU types
+
+	if (strcmp(RigName, "FTDX10") == 0 && PORT->PortType == YAESU)
+	{
+		PORT->PortType = FTDX10;
+	}
+
 	// FT991A seems to be different to most other YAESU types
 
 	if (strcmp(RigName, "FT991A") == 0 && PORT->PortType == YAESU)
@@ -6453,7 +6481,7 @@ CheckOtherParams:
 		strcpy(RIG->PTTOff, "TX0;");
 		RIG->PTTOffLen = 4;
 	}
-	else if	(PORT->PortType == FT991A)
+	else if	(PORT->PortType == FT991A || PORT->PortType == FTDX10)
 	{	
 		RIG->PollLen = 7;
 		strcpy(RIG->Poll, "FA;MD0;");
@@ -6784,6 +6812,24 @@ CheckScan:
 			}
 			break;
 
+		case FTDX10:
+
+			for (ModeNo = 0; ModeNo < 16; ModeNo++)
+			{
+				if (strlen(Mode) == 1)
+				{
+					if (FTDX10Modes[ModeNo][0] == Mode[0])
+						break;
+				}
+				else
+				{
+					if (_stricmp(FTDX10Modes[ModeNo], Mode) == 0)
+						break;
+				}
+			}
+			break;
+
+
 
 		case FT100:						
 
@@ -7163,7 +7209,7 @@ CheckScan:
 		{	
 			FreqPtr[0]->Cmd1Len = sprintf(CmdPtr, "FA%s;MD0%X;FA;MD;", &FreqString[1], ModeNo);
 		}
-		else if	(PORT->PortType == FT991A)
+		else if	(PORT->PortType == FT991A || PORT->PortType == FTDX10)
 		{	
 			FreqPtr[0]->Cmd1Len = sprintf(CmdPtr, "FA%s;MD0%X;FA;MD0;", &FreqString, ModeNo);
 		}

Versions.h

@@ -10,14 +10,14 @@
 
 #endif
 
-#define KVers 6,0,24,18
+#define KVers 6,0,24,20
-#define KVerstring "6.0.24.18\0"
+#define KVerstring "6.0.24.20\0"
 
 #ifdef CKernel
 
 #define Vers KVers
 #define Verstring KVerstring
-#define Datestring "October 2023"
+#define Datestring "November 2023"
 #define VerComments "G8BPQ Packet Switch (C Version)" KVerstring
 #define VerCopyright "Copyright © 2001-2023 John Wiseman G8BPQ\0"
 #define VerDesc "BPQ32 Switch\0"

nodestatus.txt

@@ -1,2 +0,0 @@
-2021/03/24 16:23:50 - 0 Active Nodes
-|

rigcontrol.h

@@ -202,6 +202,7 @@ struct RIGINFO
 //G7TAJ
 #define SDRANGEL 19
 //G7TAJ
+#define FTDX10 20
 
 // Yease seem to have lots of variants of the same model