Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

IEP-925 2.9.1 project combo is empty and launch can throw an exception #739

Merged
merged 4 commits into from
Apr 6, 2023
Merged

IEP-925 2.9.1 project combo is empty and launch can throw an exception #739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f90be84
fix combo is empty and launch exception
sigmaaa Apr 5, 2023
31926f9
default project selection fix
sigmaaa Apr 5, 2023
b2e8740
fix: can't change default toolchain for target
sigmaaa Apr 5, 2023
cd71643
fix problem with jtag/uart flash
sigmaaa Apr 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions bundles/com.espressif.idf.core/src/com/espressif/idf/core/build/IDFBuildConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@
import org.eclipse.cdt.core.IConsoleParser2;
import org.eclipse.cdt.core.build.CBuildConfiguration;
import org.eclipse.cdt.core.build.IToolChain;
import org.eclipse.cdt.core.build.IToolChainManager;
import org.eclipse.cdt.core.envvar.EnvironmentVariable;
import org.eclipse.cdt.core.envvar.IEnvironmentVariable;
import org.eclipse.cdt.core.index.IIndexManager;
Expand Down Expand Up @@ -141,8 +142,6 @@ public IDFBuildConfiguration(IBuildConfiguration config, String name) throws Cor
{
super(config, name);
buildConfiguration = config;
ICMakeToolChainManager manager = IDFCorePlugin.getService(ICMakeToolChainManager.class);
this.toolChainFile = manager.getToolChainFileFor(getToolChain());
}

public IDFBuildConfiguration(IBuildConfiguration config, String name, IToolChain toolChain)
Expand Down Expand Up @@ -266,8 +265,10 @@ private IBinary[] getBuildOutput(final IBinaryContainer binaries, final IPath ou
.toArray(IBinary[]::new);
}

public ICMakeToolChainFile getToolChainFile()
public ICMakeToolChainFile getToolChainFile() throws CoreException
{
ICMakeToolChainManager manager = IDFCorePlugin.getService(ICMakeToolChainManager.class);
this.toolChainFile = manager.getToolChainFileFor(getToolChain());
return toolChainFile;
}

Expand Down Expand Up @@ -799,6 +800,14 @@ private IFolder getIDFComponentsFolder() throws CoreException
return folder;
}

@Override
public IToolChain getToolChain() throws CoreException
{
String typeId = getProperty(TOOLCHAIN_TYPE);
String id = getProperty(TOOLCHAIN_ID);
IToolChainManager toolChainManager = CCorePlugin.<IToolChainManager>getService(IToolChainManager.class);
return toolChainManager.getToolChain(typeId, id);
}
private static IPath getComponentsPath()
{
return new org.eclipse.core.runtime.Path(IDFConstants.BUILD_FOLDER).append("ide").append(ESP_IDF_COMPONENTS); //$NON-NLS-1$
Expand Down
4 changes: 4 additions & 0 deletions ...om.espressif.idf.core/src/com/espressif/idf/core/build/IDFBuildConfigurationProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ public synchronized ICBuildConfiguration getCBuildConfiguration(IBuildConfigurat
try
{
ILaunchTarget target = barManager.getActiveLaunchTarget();
if (target == null)
{
return null;
}
for (IToolChain tc : toolChainManager.getToolChainsMatching(target.getAttributes()))
{
if (tc instanceof AbstractESPToolchain)
Expand Down
10 changes: 8 additions & 2 deletions ...al.core/src/com/espressif/idf/launch/serial/internal/SerialFlashLaunchConfigDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,15 @@
import org.eclipse.embedcdt.core.EclipseUtils;
import org.eclipse.embedcdt.core.StringUtils;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.launchbar.core.ILaunchBarManager;
import org.eclipse.launchbar.core.target.ILaunchTarget;
import org.eclipse.launchbar.core.target.ILaunchTargetManager;
import org.eclipse.launchbar.core.target.launch.ITargetedLaunch;
import org.eclipse.launchbar.ui.internal.Activator;
import org.eclipse.launchbar.ui.target.ILaunchTargetUIManager;
import org.eclipse.swt.widgets.Display;

import com.espressif.idf.core.IDFCorePlugin;
import com.espressif.idf.core.IDFEnvironmentVariables;
import com.espressif.idf.core.build.IDFLaunchConstants;
import com.espressif.idf.core.logging.Logger;
Expand All @@ -75,6 +77,10 @@ public class SerialFlashLaunchConfigDelegate extends CoreBuildGenericLaunchConfi
@Override
public ITargetedLaunch getLaunch(ILaunchConfiguration configuration, String mode, ILaunchTarget target)
throws CoreException {
if (target == null) {
ILaunchBarManager barManager = IDFCorePlugin.getService(ILaunchBarManager.class);
target = barManager.getActiveLaunchTarget();
}
return new SerialFlashLaunch(configuration, mode, null, target);
}

Expand Down Expand Up @@ -131,7 +137,7 @@ protected void launchInternal(ILaunchConfiguration configuration, String mode, I
if (checkIfPortIsEmpty(configuration)) {
return;
}
String arguments = configuration.getAttribute(ICDTLaunchConfigurationConstants.ATTR_TOOL_ARGUMENTS,
String arguments = configuration.getAttribute(IDFLaunchConstants.ATTR_SERIAL_FLASH_ARGUMENTS,
espFlashCommand);
arguments = arguments.replace(ESPFlashUtil.SERIAL_PORT, serialPort);
if (!arguments.isEmpty()) {
Expand Down Expand Up @@ -177,7 +183,7 @@ protected void flashOverJtag(ILaunchConfiguration configuration, ILaunch launch)
openocdExe = openocdExe.replace(DEFAULT_PATH, tmp);
commands.add(openocdExe);

String arguments = configuration.getAttribute(ICDTLaunchConfigurationConstants.ATTR_TOOL_ARGUMENTS, ""); //$NON-NLS-1$
String arguments = configuration.getAttribute(IDFLaunchConstants.ATTR_JTAG_FLASH_ARGUMENTS, ""); //$NON-NLS-1$
arguments = arguments.replace(DEFAULT_PATH, tmp).trim();
commands.addAll(StringUtils.splitCommandLineOptions(arguments));

Expand Down
7 changes: 2 additions & 5 deletions ...r.serial/src/com/espressif/idf/terminal/connector/serial/controls/SerialSettingsPage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import java.util.Optional;

import org.eclipse.cdt.serial.SerialPort;
import org.eclipse.core.resources.IBuildConfiguration;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
Expand All @@ -38,7 +37,7 @@
import org.eclipse.tm.terminal.view.ui.interfaces.IConfigurationPanelContainer;
import org.osgi.service.prefs.Preferences;

import com.espressif.idf.core.build.IDFBuildConfigurationProvider;
import com.espressif.idf.core.IDFProjectNature;
import com.espressif.idf.core.logging.Logger;
import com.espressif.idf.core.util.StringUtil;
import com.espressif.idf.terminal.connector.serial.activator.Activator;
Expand Down Expand Up @@ -105,9 +104,7 @@ public void createControl(Composite parent)
{
try
{
IBuildConfiguration activeBuildConfig = project.getActiveBuildConfig();
if (activeBuildConfig != null
&& activeBuildConfig.getName().startsWith(IDFBuildConfigurationProvider.ID))
if (project.hasNature(IDFProjectNature.ID))
{
projectCombo.add(project.getName());
}
Expand Down
9 changes: 4 additions & 5 deletions bundles/com.espressif.idf.ui/src/com/espressif/idf/ui/EclipseUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import org.eclipse.ui.IWorkbenchWindow;
import org.eclipse.ui.PlatformUI;

import com.espressif.idf.core.build.IDFBuildConfigurationProvider;
import com.espressif.idf.core.IDFProjectNature;
import com.espressif.idf.core.logging.Logger;

/**
Expand Down Expand Up @@ -70,8 +70,7 @@ public static IProject getSelectedIDFProjectInExplorer()
IProject project = getSelectedProject(IPageLayout.ID_PROJECT_EXPLORER);
try
{
if (project != null && project.getActiveBuildConfig() != null
&& project.getActiveBuildConfig().getName().startsWith(IDFBuildConfigurationProvider.ID))
if (project != null && project.hasNature(IDFProjectNature.ID))
{
return project;
}
Expand All @@ -94,10 +93,10 @@ private static IProject getSelectedProject(String viewID)
IStructuredSelection structured = (IStructuredSelection) service.getSelection(viewID);
if (structured instanceof IStructuredSelection)
{
Object selectedObject = ((IStructuredSelection) structured).getFirstElement();
Object selectedObject = structured.getFirstElement();
if (selectedObject instanceof IAdaptable)
{
IResource resource = (IResource) ((IAdaptable) selectedObject).getAdapter(IResource.class);
IResource resource = ((IAdaptable) selectedObject).getAdapter(IResource.class);
if (resource != null)
{
return resource.getProject();
Expand Down