mirror of
https://github.com/epasveer/seer.git
synced 2026-08-29 08:34:42 +08:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Ernie Pasveer
|
cccc8fcb6d | ||
|
Ernie Pasveer
|
841cca2952 |
@@ -695,7 +695,7 @@ QJsonDocument SeerDebugDialog::makeJsonDoc() const {
|
||||
QJsonObject modeJson;
|
||||
// Main Tab
|
||||
modeJson["openocdExe"] = executableOpenOCDPathLineEdit->text();
|
||||
modeJson["openocdCommand"] = openOCDCommandLineEdit->toPlainText();
|
||||
modeJson["openocdOptions"] = openOCDOptionsLineEdit->toPlainText();
|
||||
|
||||
// Symbol File Tab
|
||||
modeJson["symbolFile"] = symbolFileLineEdit->text();
|
||||
@@ -894,7 +894,7 @@ bool SeerDebugDialog::loadJsonDoc (const QJsonDocument& jsonDoc, const QString&
|
||||
if (openocdModeJson.isEmpty() == false) {
|
||||
// Main Tab
|
||||
executableOpenOCDPathLineEdit ->setText(openocdModeJson["openocdExe"].toString());
|
||||
openOCDCommandLineEdit ->setPlainText(openocdModeJson["openocdCommand"].toString());
|
||||
openOCDOptionsLineEdit ->setPlainText(openocdModeJson["openocdOptions"].toString());
|
||||
|
||||
// Symbol file Tab
|
||||
symbolFileLineEdit ->setText(openocdModeJson["symbolFile"].toString());
|
||||
@@ -927,16 +927,16 @@ void SeerDebugDialog::setOpenocdExe(const QString& path)
|
||||
executableOpenOCDPathLineEdit->setText(path);
|
||||
}
|
||||
|
||||
const QString SeerDebugDialog::openocdCommand()
|
||||
const QString SeerDebugDialog::openocdOptions()
|
||||
{
|
||||
QString tmp = openOCDCommandLineEdit->toPlainText();
|
||||
QString tmp = openOCDOptionsLineEdit->toPlainText();
|
||||
tmp.replace("\n", " ");
|
||||
return tmp;
|
||||
}
|
||||
|
||||
void SeerDebugDialog::setOpenocdCommand(const QString& command)
|
||||
void SeerDebugDialog::setOpenocdOptions(const QString& options)
|
||||
{
|
||||
openOCDCommandLineEdit->setPlainText(command);
|
||||
openOCDOptionsLineEdit->setPlainText(options);
|
||||
}
|
||||
|
||||
// ::Symbol Files
|
||||
|
||||
+17
-17
@@ -95,25 +95,25 @@ class SeerDebugDialog : public QDialog, protected Ui::SeerDebugDialogForm {
|
||||
|
||||
// openocd get and set functions
|
||||
// ::Main
|
||||
const QString openocdExe ();
|
||||
void setOpenocdExe (const QString& path);
|
||||
const QString openocdCommand ();
|
||||
void setOpenocdCommand (const QString& command);
|
||||
const QString openocdExe ();
|
||||
void setOpenocdExe (const QString& path);
|
||||
const QString openocdOptions ();
|
||||
void setOpenocdOptions (const QString& options);
|
||||
// ::GDB Multiarch
|
||||
const QString openocdGdbExe ();
|
||||
void setOpenocdGdbExe (const QString& path);
|
||||
const QString openocdGdbPort ();
|
||||
void setOpenocdGdbPort (const QString& port);
|
||||
const QString openocdGdbCommand ();
|
||||
void setOpenocdGdbCommand (const QString& command);
|
||||
const QString openocdGdbExe ();
|
||||
void setOpenocdGdbExe (const QString& path);
|
||||
const QString openocdGdbPort ();
|
||||
void setOpenocdGdbPort (const QString& port);
|
||||
const QString openocdGdbOptions ();
|
||||
void setOpenocdGdbOptions (const QString& options);
|
||||
// ::Symbol Files
|
||||
const QString symbolFile ();
|
||||
void setSymbolFile (const QString& path);
|
||||
const QString workingDirectory ();
|
||||
void setWorkingDirectory (const QString& path);
|
||||
bool hasLoadAddress ();
|
||||
const QString loadAddress ();
|
||||
void setLoadAddress (const QString& address);
|
||||
const QString symbolFile ();
|
||||
void setSymbolFile (const QString& path);
|
||||
const QString workingDirectory ();
|
||||
void setWorkingDirectory (const QString& path);
|
||||
bool hasLoadAddress ();
|
||||
const QString loadAddress ();
|
||||
void setLoadAddress (const QString& address);
|
||||
|
||||
protected slots:
|
||||
void handleExecutableNameToolButton ();
|
||||
|
||||
+358
-510
File diff suppressed because it is too large
Load Diff
@@ -3992,14 +3992,14 @@ void SeerGdbWidget::setOpenocdExe (const QString& path)
|
||||
_openocdExe = path;
|
||||
}
|
||||
|
||||
const QString& SeerGdbWidget::openocdCommand ()
|
||||
const QString& SeerGdbWidget::openocdOptions ()
|
||||
{
|
||||
return _openocdCommands;
|
||||
return _openocdOptions;
|
||||
}
|
||||
|
||||
void SeerGdbWidget::setOpenocdCommand (const QString& command)
|
||||
void SeerGdbWidget::setOpenocdOptions (const QString& options)
|
||||
{
|
||||
_openocdCommands = command;
|
||||
_openocdOptions = options;
|
||||
}
|
||||
|
||||
// ::GDB Multiarch
|
||||
@@ -4099,11 +4099,11 @@ void SeerGdbWidget::handleGdbMultiarchOpenOCDExecutable ()
|
||||
|
||||
_openocdWidget->createOpenOCDConsole(commandLogsWidget->logsTabWidgetInstance());
|
||||
// Start OpenOCD with the given path and command
|
||||
bool foo = _openocdWidget->startOpenOCD(openocdExe(), openocdCommand());
|
||||
bool foo = _openocdWidget->startOpenOCD(openocdExe(), openocdOptions());
|
||||
if (foo == false) {
|
||||
QMessageBox::warning(this, "Seer",
|
||||
QString("Unable to launch the OpenOCD program.\n\n") +
|
||||
QString("'%1 %2'").arg(SeerGdbWidget::openocdExe()).arg(SeerGdbWidget::openocdCommand()) + "\n\n" +
|
||||
QString("'%1 %2'").arg(SeerGdbWidget::openocdExe()).arg(SeerGdbWidget::openocdOptions()) + "\n\n" +
|
||||
QString("Please check your OpenOCD configuration."),
|
||||
QMessageBox::Ok);
|
||||
_openocdWidget->terminate();
|
||||
|
||||
+22
-22
@@ -216,31 +216,31 @@ class SeerGdbWidget : public QWidget, protected Ui::SeerGdbWidgetForm {
|
||||
|
||||
// OpenOCD
|
||||
// ::Main
|
||||
const QString& openocdExe ();
|
||||
void setOpenocdExe (const QString& path);
|
||||
const QString& openocdCommand ();
|
||||
void setOpenocdCommand (const QString& command);
|
||||
const QString& openocdExe ();
|
||||
void setOpenocdExe (const QString& path);
|
||||
const QString& openocdOptions ();
|
||||
void setOpenocdOptions (const QString& options);
|
||||
// ::GDB Multiarch
|
||||
const QString& openocdGdbExe ();
|
||||
void setOpenocdGdbExe (const QString& path);
|
||||
const QString& openocdGdbPort ();
|
||||
void setOpenocdGdbPort (const QString& port);
|
||||
const QString& openocdTelnetPort ();
|
||||
void setOpenocdTelnetPort (const QString& port);
|
||||
const QString& openocdGdbCommand ();
|
||||
void setOpenocdGdbCommand (const QString& command);
|
||||
const QString& openocdGdbExe ();
|
||||
void setOpenocdGdbExe (const QString& path);
|
||||
const QString& openocdGdbPort ();
|
||||
void setOpenocdGdbPort (const QString& port);
|
||||
const QString& openocdTelnetPort ();
|
||||
void setOpenocdTelnetPort (const QString& port);
|
||||
const QString& openocdGdbCommand ();
|
||||
void setOpenocdGdbCommand (const QString& command);
|
||||
|
||||
// ::Symbol Files
|
||||
void setSymbolFile (const QString& file);
|
||||
const QString& symbolFile (void);
|
||||
void setLoadAddressEnabled (bool flag);
|
||||
bool loadAddressEnabled (void);
|
||||
void setLoadAddress (const QString& address);
|
||||
const QString& loadAddress (void);
|
||||
void setSourcePath (const QString& path);
|
||||
const QString& sourcePath (void);
|
||||
void setSymbolFile (const QString& file);
|
||||
const QString& symbolFile (void);
|
||||
void setLoadAddressEnabled (bool flag);
|
||||
bool loadAddressEnabled (void);
|
||||
void setLoadAddress (const QString& address);
|
||||
const QString& loadAddress (void);
|
||||
void setSourcePath (const QString& path);
|
||||
const QString& sourcePath (void);
|
||||
|
||||
void handleGdbMultiarchOpenOCDExecutable ();
|
||||
void handleGdbMultiarchOpenOCDExecutable ();
|
||||
|
||||
public slots:
|
||||
void handleText (const QString& text);
|
||||
@@ -484,7 +484,7 @@ class SeerGdbWidget : public QWidget, protected Ui::SeerGdbWidgetForm {
|
||||
QString _openocdRunningState;
|
||||
// OpenOCD
|
||||
QString _openocdExe;
|
||||
QString _openocdCommands;
|
||||
QString _openocdOptions;
|
||||
// GDB Multiarch
|
||||
QString _openocdGdbExe;
|
||||
QString _openocdGdbPort;
|
||||
|
||||
@@ -661,9 +661,10 @@ void SeerMainWindow::handleFileDebug (bool loadDefaultProject) {
|
||||
dlg.setCoreFilename(executableCoreFilename());
|
||||
dlg.setPreGdbCommands(executablePreGdbCommands());
|
||||
dlg.setPostGdbCommands(executablePostGdbCommands());
|
||||
|
||||
// OpenOCD
|
||||
dlg.setOpenocdExe(openocdExe());
|
||||
dlg.setOpenocdCommand(openocdCommand());
|
||||
dlg.setOpenocdOptions(openocdOptions());
|
||||
dlg.setSymbolFile(symbolFile());
|
||||
|
||||
// If there's a project, use it.
|
||||
@@ -713,7 +714,7 @@ void SeerMainWindow::handleFileDebug (bool loadDefaultProject) {
|
||||
|
||||
// read openocd variables
|
||||
setOpenocdExe(dlg.openocdExe());
|
||||
setOpenocdCommand(dlg.openocdCommand());
|
||||
setOpenocdOptions(dlg.openocdOptions());
|
||||
setSymbolFile(dlg.symbolFile());
|
||||
|
||||
launchExecutable(launchMode, breakMode);
|
||||
@@ -2264,12 +2265,12 @@ void SeerMainWindow::setOpenocdExe (const QString& path) {
|
||||
gdbWidget->setOpenocdExe(path);
|
||||
}
|
||||
|
||||
const QString& SeerMainWindow::openocdCommand() {
|
||||
return gdbWidget->openocdCommand();
|
||||
const QString& SeerMainWindow::openocdOptions() {
|
||||
return gdbWidget->openocdOptions();
|
||||
}
|
||||
|
||||
void SeerMainWindow::setOpenocdCommand (const QString& command){
|
||||
gdbWidget->setOpenocdCommand(command);
|
||||
void SeerMainWindow::setOpenocdOptions (const QString& options){
|
||||
gdbWidget->setOpenocdOptions(options);
|
||||
}
|
||||
|
||||
// ::GDB Multiarch
|
||||
|
||||
@@ -83,8 +83,8 @@ class SeerMainWindow : public QMainWindow, protected Ui::SeerMainWindowForm {
|
||||
// ::Main
|
||||
const QString& openocdExe ();
|
||||
void setOpenocdExe (const QString& path);
|
||||
const QString& openocdCommand ();
|
||||
void setOpenocdCommand (const QString& command);
|
||||
const QString& openocdOptions ();
|
||||
void setOpenocdOptions (const QString& options);
|
||||
// ::GDB Multiarch
|
||||
const QString& openocdGdbExe ();
|
||||
void setOpenocdGdbExe (const QString& path);
|
||||
|
||||
Reference in New Issue
Block a user