diff --git a/MainWindow.ui b/MainWindow.ui index 72df0d8..7ae3720 100644 --- a/MainWindow.ui +++ b/MainWindow.ui @@ -32,8 +32,8 @@ - 32 - 32 + 64 + 64 @@ -47,6 +47,9 @@ + + + @@ -163,59 +166,6 @@ - - - toolBar_3 - - - false - - - Qt::LeftToolBarArea - - - - 32 - 32 - - - - LeftToolBarArea - - - false - - - - - - - - - toolBar_4 - - - false - - - Qt::LeftToolBarArea - - - - 32 - 32 - - - - LeftToolBarArea - - - false - - - - - @@ -306,66 +256,6 @@ Configure - - - true - - - - :/icon-theme/icon-theme/debug-run.png:/icon-theme/icon-theme/debug-run.png - - - Start Debug - - - Start Debugger - - - - - - :/icon-theme/icon-theme/debug-step-over.png:/icon-theme/icon-theme/debug-step-over.png - - - Step Over - - - Step Over - - - false - - - - - - :/icon-theme/icon-theme/debug-step-into.png:/icon-theme/icon-theme/debug-step-into.png - - - Step Into - - - Step Into - - - false - - - - - - :/icon-theme/icon-theme/debug-step-out.png:/icon-theme/icon-theme/debug-step-out.png - - - Step Out - - - Step to function out - - - false - - diff --git a/embedded-ide.pro b/embedded-ide.pro index 7746494..61b292c 100644 --- a/embedded-ide.pro +++ b/embedded-ide.pro @@ -64,7 +64,8 @@ HEADERS += mainwindow.h \ etags.h \ projectview.h \ filedownloader.h \ - version.h + version.h \ + templates/ciaa-lpcopen.template FORMS += mainwindow.ui \ editorwidget.ui \ @@ -81,6 +82,7 @@ RESOURCES += \ OTHER_FILES += \ templates/generic-make.template \ + templates/ciaa-lpcopen.template \ templates/sAPI.template \ project-filters.txt diff --git a/mainwindow.cpp b/mainwindow.cpp index 2d03992..8e0f518 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -277,15 +277,3 @@ void MainWindow::on_textLog_anchorClicked(const QUrl &url) // qDebug() << "Opening" << file << row << col; ui->centralWidget->fileOpen(file, row, col, &ui->projectView->makeInfo()); } - -void MainWindow::on_actionStart_Debug_toggled(bool debugOn) -{ - ui->projectView->setDebugOn(debugOn); - QList al = this->findChildren(QRegExp("actionDebug.*")); - foreach(QAction *a, al) - a->setVisible(debugOn); - if (debugOn) { - } else { - - } -} diff --git a/mainwindow.h b/mainwindow.h index c1e5696..e6bb479 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -55,8 +55,6 @@ private slots: void on_textLog_anchorClicked(const QUrl &url); - void on_actionStart_Debug_toggled(bool debugOn); - private: Ui::MainWindow *ui; }; diff --git a/mainwindow.ui b/mainwindow.ui index 4bfaa8a..7ae3720 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -7,7 +7,7 @@ 0 0 1000 - 586 + 600 @@ -32,7 +32,7 @@ - 72 + 64 64 @@ -168,7 +168,7 @@ - + :/icon-theme/icon-theme/project-development-new-template.png:/icon-theme/icon-theme/project-development-new-template.png @@ -256,66 +256,6 @@ Configure - - - true - - - - :/icon-theme/icon-theme/debug-run.png:/icon-theme/icon-theme/debug-run.png - - - Start Debug - - - Start Debugger - - - - - - :/icon-theme/icon-theme/debug-step-over.png:/icon-theme/icon-theme/debug-step-over.png - - - Step Over - - - Step Over - - - false - - - - - - :/icon-theme/icon-theme/debug-step-into.png:/icon-theme/icon-theme/debug-step-into.png - - - Step Into - - - Step Into - - - false - - - - - - :/icon-theme/icon-theme/debug-step-out.png:/icon-theme/icon-theme/debug-step-out.png - - - Step Out - - - Step to function out - - - false - - diff --git a/resources.qrc b/resources.qrc index 739849d..7bb8962 100644 --- a/resources.qrc +++ b/resources.qrc @@ -99,6 +99,7 @@ templates/generic-make.template templates/sAPI.template project-filters.txt + templates/ciaa-lpcopen.template style.css diff --git a/templates/ciaa-lpcopen.template b/templates/ciaa-lpcopen.template index 0a8cdea..2311ee7 100644 --- a/templates/ciaa-lpcopen.template +++ b/templates/ciaa-lpcopen.template @@ -485,7 +485,7 @@ diff -aur --unidirectional-new-file -x '.git*' -x '*.o' -x '*.d' -x '*.elf' -x ' +MODULES=app lpc_chip_43xx lpc_board_ciaa_edu_4337 +DEFINES=CORE_M4 __USE_LPCOPEN __USE_NEWLIB + -+VERBOSE=${{Verbose_build items:y|n} ++VERBOSE=${{Verbose_build items:n|y}} diff -aur --unidirectional-new-file -x '.git*' -x '*.o' -x '*.d' -x '*.elf' -x '*.lst' -x '*.map' -x '.config*' -x '*.conf' -x autoconf.h a_HTOeHw/lpc_board_ciaa_edu_4337/inc/board_api.h ./lpc_board_ciaa_edu_4337/inc/board_api.h --- a_HTOeHw/lpc_board_ciaa_edu_4337/inc/board_api.h 1969-12-31 21:00:00.000000000 -0300 +++ ./lpc_board_ciaa_edu_4337/inc/board_api.h 2016-10-08 23:15:59.519834655 -0300 @@ -36321,7 +36321,7 @@ diff -aur --unidirectional-new-file -x '.git*' -x '*.o' -x '*.d' -x '*.elf' -x ' +CC=$(CROSS)gcc +LD=$(CROSS)gcc +SIZE=$(CROSS)size -+LIST=$(CROSS)objdump -xCedlSwz ++LIST=$(CROSS)objdump -xdS +OBJCOPY=$(CROSS)objcopy +GDB=$(CROSS)gdb +OOCD=openocd diff --git a/templates/sAPI.template b/templates/sAPI.template index 235858f..c326f87 100644 --- a/templates/sAPI.template +++ b/templates/sAPI.template @@ -506,7 +506,7 @@ diff -aur --unidirectional-new-file -x '.git*' -x '*.o' -x '*.d' -x '*.elf' -x ' +MODULES=app lpc_chip_43xx lpc_board_ciaa_edu_4337 sapi_bm +DEFINES=CORE_M4 __USE_LPCOPEN __USE_NEWLIB + -+VERBOSE=${{Verbose_build items:y|n} ++VERBOSE=${{Verbose_build items:n|y}} diff -aur --unidirectional-new-file -x '.git*' -x '*.o' -x '*.d' -x '*.elf' -x '*.lst' -x '*.map' -x '.config*' -x '*.conf' -x autoconf.h a_SdMdjL/lpc_board_ciaa_edu_4337/inc/board_api.h ./lpc_board_ciaa_edu_4337/inc/board_api.h --- a_SdMdjL/lpc_board_ciaa_edu_4337/inc/board_api.h 1969-12-31 21:00:00.000000000 -0300 +++ ./lpc_board_ciaa_edu_4337/inc/board_api.h 2016-10-08 23:44:36.331826200 -0300 diff --git a/version.cpp b/version.cpp index 62addfd..2eee794 100644 --- a/version.cpp +++ b/version.cpp @@ -1,4 +1,4 @@ #include "version.h" -const char *VERSION = "v0.1-rc2"; +const char *VERSION = "v0.1"; const char *BUILD_DATE = __DATE__ " " __TIME__;