diff --git a/AlertWords.txt b/AlertWords.txt deleted file mode 100644 index 97b746b..0000000 --- a/AlertWords.txt +++ /dev/null @@ -1,2 +0,0 @@ -g8bpq -very bad phrase diff --git a/BPQTermMDI.c b/BPQTermMDI.c index 54ef348..d07eb39 100644 --- a/BPQTermMDI.c +++ b/BPQTermMDI.c @@ -613,6 +613,11 @@ VOID CALLBACK SetupTermSessions(HWND hwnd, UINT uMsg, UINT idEvent, DWORD dw else 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); @@ -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) { diff --git a/Bpq32.c b/Bpq32.c index 1df9d34..6b088e6 100644 --- a/Bpq32.c +++ b/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 diff --git a/BpqTermMDI.h b/BpqTermMDI.h index b92785f..d011a26 100644 --- a/BpqTermMDI.h +++ b/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 diff --git a/CBPQ32.vcproj.DESKTOP-MHE5LO8.johnw.user b/CBPQ32.vcproj.DESKTOP-MHE5LO8.johnw.user new file mode 100644 index 0000000..2ab49a6 --- /dev/null +++ b/CBPQ32.vcproj.DESKTOP-MHE5LO8.johnw.user @@ -0,0 +1,65 @@ + + + + + + + + + + + diff --git a/ChatUsers.txt b/ChatUsers.txt deleted file mode 100644 index 17a5a25..0000000 --- a/ChatUsers.txt +++ /dev/null @@ -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 diff --git a/CommonCode.c b/CommonCode.c index 6eeb7aa..d28cefa 100644 --- a/CommonCode.c +++ b/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; diff --git a/KernelScript1.rc b/KernelScript1.rc index 55876e7..4eef3b5 100644 --- a/KernelScript1.rc +++ b/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 diff --git a/LinBPQ.c b/LinBPQ.c index 8cda726..084ee45 100644 --- a/LinBPQ.c +++ b/LinBPQ.c @@ -1581,8 +1581,8 @@ int main(int argc, char * argv[]) { if (GenerateTrafficReport && (LastTrafficTime + 86400) < NOW) { - LastTrafficTime = NOW; CreateBBSTrafficReport(); + LastTrafficTime = NOW; } } } diff --git a/MHSave.txt b/MHSave.txt deleted file mode 100644 index e69de29..0000000 diff --git a/Moncode.c b/Moncode.c index 091229e..aa1c0bd 100644 --- a/Moncode.c +++ b/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); diff --git a/RTKnown.txt b/RTKnown.txt deleted file mode 100644 index 5827f30..0000000 --- a/RTKnown.txt +++ /dev/null @@ -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 diff --git a/RigControl.c b/RigControl.c index 4167cd4..ca335a4 100644 --- a/RigControl.c +++ b/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) - FreqPtr->Cmd1Len = sprintf(Poll, "FA%s;MD0%X;FA;MD;", &FreqString, ModeNo); + if (PORT->PortType == FT991A || PORT->PortType == FTDX10) + 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); } diff --git a/Versions.h b/Versions.h index 7619958..82c68c4 100644 --- a/Versions.h +++ b/Versions.h @@ -10,14 +10,14 @@ #endif -#define KVers 6,0,24,18 -#define KVerstring "6.0.24.18\0" +#define KVers 6,0,24,20 +#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" diff --git a/nodelog.txt b/nodelog.txt deleted file mode 100644 index e69de29..0000000 diff --git a/nodestatus.txt b/nodestatus.txt deleted file mode 100644 index 85f31cb..0000000 --- a/nodestatus.txt +++ /dev/null @@ -1,2 +0,0 @@ -2021/03/24 16:23:50 - 0 Active Nodes -| \ No newline at end of file diff --git a/rigcontrol.h b/rigcontrol.h index 13e0218..1f841cf 100644 --- a/rigcontrol.h +++ b/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 diff --git a/savelinks.txt b/savelinks.txt deleted file mode 100644 index e69de29..0000000 diff --git a/savenodes.txt b/savenodes.txt deleted file mode 100644 index e69de29..0000000