From ff9fb832523261670dd5168e9b6da50c60af335a Mon Sep 17 00:00:00 2001
From: michaelangel007 <michaelangel007@sharedcraft.com>
Date: Sat, 15 Apr 2023 11:37:06 -0700
Subject: [PATCH] Debugger: Add QoL to DISK INFO

---
 source/Debugger/Debug.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/source/Debugger/Debug.cpp b/source/Debugger/Debug.cpp
index fd27f938..835581e9 100644
--- a/source/Debugger/Debug.cpp
+++ b/source/Debugger/Debug.cpp
@@ -3684,14 +3684,23 @@ Update_t CmdDisk (int nArgs)
 		if (nArgs > 2)
 			return HelpLastCommand();
 
-		ConsoleBufferPushFormat("FW%2d: D%d at T$%s, phase $%s, bitOffset $%04X, extraCycles %.2f, %s",
+		ConsolePrintFormat(
+			/*CHC_DEFAULT*/ "FW"        CHC_NUM_DEC "%2d"  CHC_ARG_SEP ":"
+			  CHC_DEFAULT   " D"        CHC_NUM_DEC "%d"
+			  CHC_DEFAULT   " T$"       CHC_NUM_HEX "%s"   CHC_ARG_SEP ","
+			  CHC_DEFAULT   " Phase $"  CHC_NUM_HEX "%s"   CHC_ARG_SEP ","
+			  CHC_DEFAULT   " Offset $" CHC_ADDRESS "%04X" CHC_ARG_SEP ","
+			  CHC_DEFAULT   " Cycles "  CHC_NUM_DEC "%.2f" CHC_ARG_SEP ","
+			  CHC_CATEGORY  " %s"
+			  CHC_DEFAULT   " "         CHC_NUM_HEX "%02X",
 			diskCard.GetCurrentFirmware(),
 			diskCard.GetCurrentDrive() + 1,
 			diskCard.GetCurrentTrackString().c_str(),
 			diskCard.GetCurrentPhaseString().c_str(),
 			diskCard.GetCurrentBitOffset(),
 			diskCard.GetCurrentExtraCycles(),
-			diskCard.GetCurrentState()
+			diskCard.GetCurrentState(),
+			diskCard.GetCurrentShiftReg()
 		);
 
 		return ConsoleUpdate();