From 3bb5ce4e74b841d2e42b83703d1844b9a89bdb08 Mon Sep 17 00:00:00 2001 From: Wolfgang Thaller Date: Wed, 9 Jan 2019 00:15:44 +0100 Subject: [PATCH] LaunchAPPLServer: "Listening on TCP" message --- LaunchAPPL/Server/LaunchAPPLServer.cc | 3 ++- LaunchAPPL/Server/LaunchAPPLServer.r | 2 ++ LaunchAPPL/Server/StatusDisplay.h | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/LaunchAPPL/Server/LaunchAPPLServer.cc b/LaunchAPPL/Server/LaunchAPPLServer.cc index 61168f259d..75770fad20 100644 --- a/LaunchAPPL/Server/LaunchAPPLServer.cc +++ b/LaunchAPPL/Server/LaunchAPPLServer.cc @@ -293,7 +293,8 @@ public: void onReset() { - statusDisplay->SetStatus(gPrefs.port == Port::printerPort ? AppStatus::readyPrinter : AppStatus::readyModem, 0, 0); + AppStatus readyState{ (int)AppStatus::readyModem + (int)gPrefs.port - (int)Port::modemPort }; + statusDisplay->SetStatus(readyState, 0, 0); state = State::command; } diff --git a/LaunchAPPL/Server/LaunchAPPLServer.r b/LaunchAPPL/Server/LaunchAPPLServer.r index 34a2b659d7..071e603c10 100644 --- a/LaunchAPPL/Server/LaunchAPPLServer.r +++ b/LaunchAPPL/Server/LaunchAPPLServer.r @@ -113,6 +113,8 @@ resource 'STR#' (128, purgeable) { { "Listening on Modem Port..."; "Listening on Printer Port..."; + "Listening on TCP port 1984 (MacTCP)..."; + "Listening on TCP port 1984 (OpenTransport)..."; "Downloading Application..."; "Downloading Upgrade..."; "Running Application..."; diff --git a/LaunchAPPL/Server/StatusDisplay.h b/LaunchAPPL/Server/StatusDisplay.h index c9cf824c31..7238b7727c 100644 --- a/LaunchAPPL/Server/StatusDisplay.h +++ b/LaunchAPPL/Server/StatusDisplay.h @@ -9,6 +9,8 @@ enum class AppStatus empty = 0, readyModem = 1, readyPrinter, + readyMacTCP, + readyOpenTpt, downloading, upgrading, running,