pyocd: Group flash mode constants in a namespace class.

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

Hide file tree

Showing 4 changed files with 16 additions and 11 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
@@ -178,13 +178,13 @@ public static String[] getGdbServerCommandLineArray(ILaunchConfiguration configu
 			int flashMode = configuration.getAttribute(ConfigurationAttributes.GDB_SERVER_FLASH_MODE,
 					DefaultPreferences.GDB_SERVER_FLASH_MODE_DEFAULT);
 			switch (flashMode) {
-			case PreferenceConstants.AUTO_ERASE:
+			case PreferenceConstants.FlashMode.AUTO_ERASE:
 				lst.add("--erase=auto");
 				break;
-			case PreferenceConstants.CHIP_ERASE:
+			case PreferenceConstants.FlashMode.CHIP_ERASE:
 				lst.add("--erase=chip");
 				break;
-			case PreferenceConstants.SECTOR_ERASE:
+			case PreferenceConstants.FlashMode.SECTOR_ERASE:
 				lst.add("--erase=sector");
 				break;
 			}

diff --git a/...ore/src/org/eclipse/embedcdt/debug/gdbjtag/pyocd/core/preferences/DefaultPreferences.java b/...ore/src/org/eclipse/embedcdt/debug/gdbjtag/pyocd/core/preferences/DefaultPreferences.java
@@ -51,7 +51,7 @@ public class DefaultPreferences extends org.eclipse.embedcdt.debug.gdbjtag.core.
 	public static final String GDB_SERVER_TARGET_NAME_DEFAULT = ""; //$NON-NLS-1$
 	public static final boolean GDB_SERVER_HALT_AT_HARD_FAULT_DEFAULT = true;
 	public static final boolean GDB_SERVER_STEP_INTO_INTERRUPTS_DEFAULT = false;
-	public static final int GDB_SERVER_FLASH_MODE_DEFAULT = PreferenceConstants.SECTOR_ERASE;
+	public static final int GDB_SERVER_FLASH_MODE_DEFAULT = PreferenceConstants.FlashMode.SECTOR_ERASE;
 	public static final boolean GDB_SERVER_FLASH_FAST_VERIFY_DEFAULT = false;
 	public static final boolean GDB_SERVER_ENABLE_SEMIHOSTING_DEFAULT = true;
 	public static final boolean GDB_SERVER_USE_GDB_SYSCALLS_DEFAULT = false;

diff --git a/...re/src/org/eclipse/embedcdt/debug/gdbjtag/pyocd/core/preferences/PreferenceConstants.java b/...re/src/org/eclipse/embedcdt/debug/gdbjtag/pyocd/core/preferences/PreferenceConstants.java
@@ -1,6 +1,6 @@
 /*******************************************************************************
  * Copyright (c) 2013 Liviu Ionescu.
- * Copyright (c) 2015-2016 Chris Reed.
+ * Copyright (c) 2015-2020 Chris Reed.
  *
  * This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
@@ -20,9 +20,11 @@ public interface PreferenceConstants {
 
 	public static final String DEFAULT_GDB_COMMAND = "arm-none-eabi-gdb"; //$NON-NLS-1$
 
-	public static final int AUTO_ERASE = 0;
-	public static final int CHIP_ERASE = 1;
-	public static final int SECTOR_ERASE = 2;
-	public static final int FAST_PROGRAM = 3;
+	public static final class FlashMode {
+		public static final int AUTO_ERASE = 0;
+		public static final int CHIP_ERASE = 1;
+		public static final int SECTOR_ERASE = 2;
+		public static final int FAST_PROGRAM = 3;
+	}
 
 }
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
@@ -494,9 +494,12 @@ private void createGdbServerGroup(Composite parent) {
 			gd = new GridData();
 			gd.widthHint = 120;
 			fGdbServerFlashMode.setLayoutData(gd);
-			fGdbServerFlashMode.setItems(new String[] { Messages.getString("DebuggerTab.gdbServerFlashMode.AutoErase"),
+			// Note: the index of these items must match the PreferenceConstants.FlashMode constants.
+			fGdbServerFlashMode.setItems(new String[] {
+					Messages.getString("DebuggerTab.gdbServerFlashMode.AutoErase"),
 					Messages.getString("DebuggerTab.gdbServerFlashMode.ChipErase"),
-					Messages.getString("DebuggerTab.gdbServerFlashMode.SectorErase"), });
+					Messages.getString("DebuggerTab.gdbServerFlashMode.SectorErase"),
+					});
 			fGdbServerFlashMode.select(0);
 
 			fGdbServerFlashFastVerify = new Button(comp, SWT.CHECK);