From 499ac3ad4aeabb01863880a64ff43e944857a45c Mon Sep 17 00:00:00 2001
From: Jared Boone <jboone@earfeast.com>
Date: Thu, 31 Jan 2019 09:37:48 +0000
Subject: [PATCH] PortaPack: Move UI code to hackrf_usb project.

Was in common/ and in the common CMake file, which meant it was being included in the blinky project, which was unnecessary.
---
 firmware/hackrf-common.cmake                   | 7 -------
 firmware/hackrf_usb/CMakeLists.txt             | 7 +++++++
 firmware/{common => hackrf_usb}/ui_portapack.c | 0
 firmware/{common => hackrf_usb}/ui_portapack.h | 0
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename firmware/{common => hackrf_usb}/ui_portapack.c (100%)
 rename firmware/{common => hackrf_usb}/ui_portapack.h (100%)

diff --git a/firmware/hackrf-common.cmake b/firmware/hackrf-common.cmake
index ebd853a5..679d4fe7 100644
--- a/firmware/hackrf-common.cmake
+++ b/firmware/hackrf-common.cmake
@@ -139,13 +139,6 @@ macro(DeclareTargets)
 		)
 	endif()
 
-	if(USER_INTERFACE STREQUAL "PORTAPACK")
-		SET(SRC_M4
-			${SRC_M4}
-			${PATH_HACKRF_FIRMWARE_COMMON}/ui_portapack.c
-		)
-	endif()
-
 	configure_file(
 		${PATH_HACKRF_FIRMWARE_COMMON}/m0_bin.s.cmake
 		m0_bin.s
diff --git a/firmware/hackrf_usb/CMakeLists.txt b/firmware/hackrf_usb/CMakeLists.txt
index 9af27a13..d1bf109b 100644
--- a/firmware/hackrf_usb/CMakeLists.txt
+++ b/firmware/hackrf_usb/CMakeLists.txt
@@ -54,4 +54,11 @@ set(SRC_M4
 	"${PATH_HACKRF_FIRMWARE_COMMON}/operacake.c"
 )
 
+if(USER_INTERFACE STREQUAL "PORTAPACK")
+	SET(SRC_M4
+		${SRC_M4}
+		ui_portapack.c
+	)
+endif()
+
 DeclareTargets()
diff --git a/firmware/common/ui_portapack.c b/firmware/hackrf_usb/ui_portapack.c
similarity index 100%
rename from firmware/common/ui_portapack.c
rename to firmware/hackrf_usb/ui_portapack.c
diff --git a/firmware/common/ui_portapack.h b/firmware/hackrf_usb/ui_portapack.h
similarity index 100%
rename from firmware/common/ui_portapack.h
rename to firmware/hackrf_usb/ui_portapack.h