From 9dadc06130bd2a83f7e21e2ecff34ae43bc87487 Mon Sep 17 00:00:00 2001 From: Bryan Biedenkapp Date: Sat, 10 Feb 2024 21:21:22 -0500 Subject: [PATCH] I was asked for ASCII art, and I deliver, thus, ASCII art; --- src/common/Defines.h | 13 +++++++++++++ src/fne/HostFNE.cpp | 8 ++++---- src/host/Host.cpp | 8 ++++---- src/host/calibrate/HostCal.cpp | 8 ++++---- src/host/setup/HostSetup.cpp | 8 ++++---- src/host/setup/SetupMainWnd.h | 1 + src/monitor/MonitorMain.cpp | 8 ++++---- src/monitor/MonitorMainWnd.h | 1 + 8 files changed, 35 insertions(+), 20 deletions(-) diff --git a/src/common/Defines.h b/src/common/Defines.h index be4f1fd2..13d488be 100644 --- a/src/common/Defines.h +++ b/src/common/Defines.h @@ -97,6 +97,19 @@ typedef unsigned long long ulong64_t; #define __BUILD__ __DATE__ " " __TIME__ +#define __BANNER__ "\r\n" \ +" . . \r\n" \ +"8 888888888o. `8.`888b ,8' ,8. ,8. \r\n" \ +"8 8888 `^888. `8.`888b ,8' ,888. ,888. \r\n" \ +"8 8888 `88.`8.`888b ,8' .`8888. .`8888. \r\n" \ +"8 8888 `88 `8.`888b ,8' ,8.`8888. ,8.`8888. \r\n" \ +"8 8888 88 `8.`888b ,8' ,8'8.`8888,8^8.`8888. \r\n" \ +"8 8888 88 `8.`888b ,8' ,8' `8.`8888' `8.`8888. \r\n" \ +"8 8888 ,88 `8.`888b8' ,8' `8.`88' `8.`8888. \r\n" \ +"8 8888 ,88' `8.`888' ,8' `8.`' `8.`8888. \r\n" \ +"8 8888 ,o88P' `8.`8' ,8' `8 `8.`8888. \r\n" \ +"8 888888888P' `8.` ,8' ` `8.`8888. \r\n" + #define HOST_SW_API #define DEFAULT_CONF_FILE "config.yml" diff --git a/src/fne/HostFNE.cpp b/src/fne/HostFNE.cpp index c725927a..60904919 100644 --- a/src/fne/HostFNE.cpp +++ b/src/fne/HostFNE.cpp @@ -141,10 +141,10 @@ int HostFNE::run() ::close(STDERR_FILENO); } - ::LogInfo(__PROG_NAME__ " %s (built %s)", __VER__, __BUILD__); - ::LogInfo("Copyright (c) 2017-2024 Bryan Biedenkapp, N2PLL and DVMProject (https://github.com/dvmproject) Authors."); - ::LogInfo("Portions Copyright (c) 2015-2021 by Jonathan Naylor, G4KLX and others"); - ::LogInfo(">> Fixed Network Equipment"); + ::LogInfo(__BANNER__ "\r\n" __PROG_NAME__ " " __VER__ " (built " __BUILD__ ")\r\n" \ + "Copyright (c) 2017-2024 Bryan Biedenkapp, N2PLL and DVMProject (https://github.com/dvmproject) Authors.\r\n" \ + "Portions Copyright (c) 2015-2021 by Jonathan Naylor, G4KLX and others\r\n" \ + ">> Fixed Network Equipment\r\n"); // read base parameters from configuration ret = readParams(); diff --git a/src/host/Host.cpp b/src/host/Host.cpp index e4c37aa7..3711d633 100644 --- a/src/host/Host.cpp +++ b/src/host/Host.cpp @@ -199,10 +199,10 @@ int Host::run() ::close(STDERR_FILENO); } - ::LogInfo(__PROG_NAME__ " %s (built %s)", __VER__, __BUILD__); - ::LogInfo("Copyright (c) 2017-2024 Bryan Biedenkapp, N2PLL and DVMProject (https://github.com/dvmproject) Authors."); - ::LogInfo("Portions Copyright (c) 2015-2021 by Jonathan Naylor, G4KLX and others"); - ::LogInfo(">> Modem Controller"); + ::LogInfo(__BANNER__ "\r\n" __PROG_NAME__ " " __VER__ " (built " __BUILD__ ")\r\n" \ + "Copyright (c) 2017-2024 Bryan Biedenkapp, N2PLL and DVMProject (https://github.com/dvmproject) Authors.\r\n" \ + "Portions Copyright (c) 2015-2021 by Jonathan Naylor, G4KLX and others\r\n" \ + ">> Modem Controller\r\n"); // read base parameters from configuration ret = readParams(); diff --git a/src/host/calibrate/HostCal.cpp b/src/host/calibrate/HostCal.cpp index 516e4569..4692de41 100644 --- a/src/host/calibrate/HostCal.cpp +++ b/src/host/calibrate/HostCal.cpp @@ -71,10 +71,10 @@ int HostCal::run(int argc, char **argv) return 1; } - ::LogInfo(__PROG_NAME__ " %s (built %s)", __VER__, __BUILD__); - ::LogInfo("Copyright (c) 2017-2024 Bryan Biedenkapp, N2PLL and DVMProject (https://github.com/dvmproject) Authors."); - ::LogInfo("Portions Copyright (c) 2015-2021 by Jonathan Naylor, G4KLX and others"); - ::LogInfo(">> Modem Calibration"); + ::LogInfo(__BANNER__ "\r\n" __PROG_NAME__ " " __VER__ " (built " __BUILD__ ")\r\n" \ + "Copyright (c) 2017-2024 Bryan Biedenkapp, N2PLL and DVMProject (https://github.com/dvmproject) Authors.\r\n" \ + "Portions Copyright (c) 2015-2021 by Jonathan Naylor, G4KLX and others\r\n" \ + ">> Modem Calibration\r\n"); yaml::Node systemConf = m_conf["system"]; m_startupDuplex = m_duplex = systemConf["duplex"].as(true); diff --git a/src/host/setup/HostSetup.cpp b/src/host/setup/HostSetup.cpp index 830770b1..0aabc085 100644 --- a/src/host/setup/HostSetup.cpp +++ b/src/host/setup/HostSetup.cpp @@ -185,10 +185,10 @@ int HostSetup::run(int argc, char** argv) return 1; } - ::LogInfo(__PROG_NAME__ " %s (built %s)", __VER__, __BUILD__); - ::LogInfo("Copyright (c) 2017-2024 Bryan Biedenkapp, N2PLL and DVMProject (https://github.com/dvmproject) Authors."); - ::LogInfo("Portions Copyright (c) 2015-2021 by Jonathan Naylor, G4KLX and others"); - ::LogInfo(">> Modem Setup"); + ::LogInfo(__PROG_NAME__ " " __VER__ " (built " __BUILD__ ")\r\n" \ + "Copyright (c) 2017-2024 Bryan Biedenkapp, N2PLL and DVMProject (https://github.com/dvmproject) Authors.\r\n" \ + "Portions Copyright (c) 2015-2021 by Jonathan Naylor, G4KLX and others\r\n" \ + ">> Modem Setup\r\n"); // setup the finalcut tui SetupApplication app{this, argc, argv}; diff --git a/src/host/setup/SetupMainWnd.h b/src/host/setup/SetupMainWnd.h index 0062cc2b..97cf8e0b 100644 --- a/src/host/setup/SetupMainWnd.h +++ b/src/host/setup/SetupMainWnd.h @@ -465,6 +465,7 @@ public: m_aboutItem.addCallback("clicked", this, [&]() { const FString line(2, UniChar::BoxDrawingsHorizontal); FMessageBox info("About", line + __PROG_NAME__ + line + L"\n\n" + L"" + __BANNER__ L"Version " + __VER__ + L"\n\n" L"Copyright (c) 2017-2024 Bryan Biedenkapp, N2PLL and DVMProject (https://github.com/dvmproject) Authors." + L"\n" L"Portions Copyright (c) 2015-2021 by Jonathan Naylor, G4KLX and others", diff --git a/src/monitor/MonitorMain.cpp b/src/monitor/MonitorMain.cpp index db8e41f5..90d6e6a4 100644 --- a/src/monitor/MonitorMain.cpp +++ b/src/monitor/MonitorMain.cpp @@ -198,10 +198,10 @@ int main(int argc, char** argv) return 1; } - ::LogInfo(__PROG_NAME__ " %s (built %s)", __VER__, __BUILD__); - ::LogInfo("Copyright (c) 2017-2024 Bryan Biedenkapp, N2PLL and DVMProject (https://github.com/dvmproject) Authors."); - ::LogInfo("Portions Copyright (c) 2015-2021 by Jonathan Naylor, G4KLX and others"); - ::LogInfo(">> Host Monitor"); + ::LogInfo(__PROG_NAME__ " " __VER__ " (built " __BUILD__ ")\r\n" \ + "Copyright (c) 2017-2024 Bryan Biedenkapp, N2PLL and DVMProject (https://github.com/dvmproject) Authors.\r\n" \ + "Portions Copyright (c) 2015-2021 by Jonathan Naylor, G4KLX and others\r\n" \ + ">> Host Monitor\r\n"); try { ret = yaml::Parse(g_conf, g_iniFile.c_str()); diff --git a/src/monitor/MonitorMainWnd.h b/src/monitor/MonitorMainWnd.h index 16908a9d..d28f662a 100644 --- a/src/monitor/MonitorMainWnd.h +++ b/src/monitor/MonitorMainWnd.h @@ -96,6 +96,7 @@ public: m_aboutItem.addCallback("clicked", this, [&]() { const FString line(2, UniChar::BoxDrawingsHorizontal); FMessageBox info("About", line + __PROG_NAME__ + line + L"\n\n" + L"" + __BANNER__ + L"\n" L"Version " + __VER__ + L"\n\n" L"Copyright (c) 2017-2024 Bryan Biedenkapp, N2PLL and DVMProject (https://github.com/dvmproject) Authors." + L"\n" L"Portions Copyright (c) 2015-2021 by Jonathan Naylor, G4KLX and others",