From 795b1eb3fa1992c163bceb64e772016d9b36cb00 Mon Sep 17 00:00:00 2001
From: Andre Dunford <andredunford@gmail.com>
Date: Sat, 17 Dec 2022 01:19:46 -0800
Subject: [PATCH] respond to InitiateSweep with nack when misconfigured

---
 .../DeveloperInfo/USB_protocol_v12.pdf        | Bin 199413 -> 199400 bytes
 .../DeveloperInfo/USB_protocol_v12.tex        |   2 +-
 Software/VNA_embedded/Application/App.cpp     |   9 +++++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/Documentation/DeveloperInfo/USB_protocol_v12.pdf b/Documentation/DeveloperInfo/USB_protocol_v12.pdf
index 8d096b29e3ebea6399dc321e82781cadbaf87795..e7a419483586a4b298b5b4e89f49da2f53ac06c0 100644
GIT binary patch
delta 1907
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

delta 1895
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

diff --git a/Documentation/DeveloperInfo/USB_protocol_v12.tex b/Documentation/DeveloperInfo/USB_protocol_v12.tex
index c3d2f05..2785a81 100644
--- a/Documentation/DeveloperInfo/USB_protocol_v12.tex
+++ b/Documentation/DeveloperInfo/USB_protocol_v12.tex
@@ -1029,6 +1029,6 @@ This packet instructs the device to stop sending automatically scheduled DeviceS
 This packet instructs the device to start sending automatically scheduled DeviceStatusV1 packets. This restores default update behaviour if a StopStatusUpdates packet has previously been sent.
 
 \subsection{InitiateSweep}
-This packet instructs the device to initiate a new single sweep when the VNA is configured for standby operation. This triggering method can be used for fast intermittent single sweeps with minimum latency. The packet will be acknowledged but quietly ignored if the SweepSettings are not configured for standby operation.
+This packet instructs the device to initiate a new single sweep when the VNA is configured for standby operation. This triggering method can be used for fast intermittent single sweeps with minimum latency. If the SweepSettings are not configured for standby operation, this packet will result in a Nack response.
 
 \end{document}
diff --git a/Software/VNA_embedded/Application/App.cpp b/Software/VNA_embedded/Application/App.cpp
index 9882420..86e2649 100644
--- a/Software/VNA_embedded/Application/App.cpp
+++ b/Software/VNA_embedded/Application/App.cpp
@@ -184,8 +184,13 @@ inline void App_Process() {
 				}
 					break;
 				case Protocol::PacketType::InitiateSweep: {
-					VNA::InitiateSweep();
-					Communication::SendWithoutPayload(Protocol::PacketType::Ack);
+					if(VNA::GetStandbyMode()) {
+						VNA::InitiateSweep();
+						Communication::SendWithoutPayload(Protocol::PacketType::Ack);
+					} else {
+						Communication::SendWithoutPayload(Protocol::PacketType::Nack);
+					}
+
 				}
 					break;
 				case Protocol::PacketType::SetIdle: