pyocd: Rename board ID config attribute to probe ID.

Signed-off-by: Chris Reed <flit@me.com>
eclipse-embed-cdt · Jan 5, 2021 · e017f13 · e017f13
1 parent fd46408
commit e017f13
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/...g.gdbjtag.pyocd.core/src/org/eclipse/embedcdt/debug/gdbjtag/pyocd/core/Configuration.java b/...g.gdbjtag.pyocd.core/src/org/eclipse/embedcdt/debug/gdbjtag/pyocd/core/Configuration.java
@@ -142,7 +142,7 @@ public static String[] getGdbServerCommandLineArray(ILaunchConfiguration configu
 					DefaultPreferences.GDB_SERVER_TELNET_PORT_NUMBER_DEFAULT)));
 
 			// Board ID
-			String boardId = configuration.getAttribute(ConfigurationAttributes.GDB_SERVER_BOARD_ID,
+			String boardId = configuration.getAttribute(ConfigurationAttributes.GDB_SERVER_PROBE_ID,
 					DefaultPreferences.GDB_SERVER_BOARD_ID_DEFAULT);
 			if (!boardId.isEmpty()) {
 				lst.add("--uid");

diff --git a/...pyocd.core/src/org/eclipse/embedcdt/debug/gdbjtag/pyocd/core/ConfigurationAttributes.java b/...pyocd.core/src/org/eclipse/embedcdt/debug/gdbjtag/pyocd/core/ConfigurationAttributes.java
@@ -40,7 +40,7 @@ public interface ConfigurationAttributes extends org.eclipse.embedcdt.debug.gdbj
 
 	public static final String GDB_SERVER_TELNET_PORT_NUMBER = PREFIX + ".gdbServerTelnetPortNumber"; //$NON-NLS-1$
 
-	public static final String GDB_SERVER_BOARD_ID = PREFIX + ".gdbServerBoardId"; //$NON-NLS-1$
+	public static final String GDB_SERVER_PROBE_ID = PREFIX + ".gdbServerBoardId"; //$NON-NLS-1$
 
 	public static final String GDB_SERVER_BOARD_NAME = PREFIX + ".gdbServerBoardName"; //$NON-NLS-1$
 

diff --git a/...t.debug.gdbjtag.pyocd.ui/src/org/eclipse/embedcdt/debug/gdbjtag/pyocd/ui/TabDebugger.java b/...t.debug.gdbjtag.pyocd.ui/src/org/eclipse/embedcdt/debug/gdbjtag/pyocd/ui/TabDebugger.java
@@ -1407,7 +1407,7 @@ public void initializeFrom(ILaunchConfiguration configuration) {
 								DefaultPreferences.GDB_SERVER_TELNET_PORT_NUMBER_DEFAULT)));
 
 				// Probe ID
-				fSelectedProbeId = configuration.getAttribute(ConfigurationAttributes.GDB_SERVER_BOARD_ID,
+				fSelectedProbeId = configuration.getAttribute(ConfigurationAttributes.GDB_SERVER_PROBE_ID,
 						DefaultPreferences.GDB_SERVER_BOARD_ID_DEFAULT);
 				// active probe will be selected after updateProbes() runs.
 
@@ -1769,7 +1769,7 @@ public void performApply(ILaunchConfigurationWorkingCopy configuration) {
 
 			// Probe ID
 			if (fSelectedProbeId != null) {
-				configuration.setAttribute(ConfigurationAttributes.GDB_SERVER_BOARD_ID, fSelectedProbeId);
+				configuration.setAttribute(ConfigurationAttributes.GDB_SERVER_PROBE_ID, fSelectedProbeId);
 			}
 
 			// Target override
@@ -1933,7 +1933,7 @@ public void setDefaults(ILaunchConfigurationWorkingCopy configuration) {
 					DefaultPreferences.GDB_SERVER_TELNET_PORT_NUMBER_DEFAULT);
 
 			// Probe ID
-			configuration.setAttribute(ConfigurationAttributes.GDB_SERVER_BOARD_ID,
+			configuration.setAttribute(ConfigurationAttributes.GDB_SERVER_PROBE_ID,
 					DefaultPreferences.GDB_SERVER_BOARD_ID_DEFAULT);
 
 			configuration.setAttribute(ConfigurationAttributes.GDB_SERVER_BOARD_NAME,