From 9ea1b01f05bf4274a2688a294743d9d4bd74ee29 Mon Sep 17 00:00:00 2001 From: Nolaan Date: Wed, 22 Oct 2014 01:33:30 -0300 Subject: [PATCH] First version (alpha) V0.5 Early version featuring : Reading and displaying board partition table, local and remote Flashing individual partition to target Saving configuration Next Features to implement : Download remote partition Erase remote partition Manage SD cards Handling building stages before flashing Improve UI Note : This version is focused on the Jetson Board, support for RPi and other boards to come soon! --- .gitignore | 1 - LICENSE | 342 ++++++++++++++++++++++++++++++++ README | 18 ++ sans_titre.pro => companion.pro | 84 ++++---- companion.pro.user | 267 +++++++++++++++++++++++++ core/devboard.cpp | 181 +++++++++++++++-- core/devboard.h | 6 + mainwindow.cpp | 91 ++++++++- mainwindow.h | 22 +- mainwindow.ui | 178 ++++++++++++++++- 10 files changed, 1113 insertions(+), 77 deletions(-) create mode 100644 LICENSE create mode 100644 README rename sans_titre.pro => companion.pro (95%) create mode 100644 companion.pro.user diff --git a/.gitignore b/.gitignore index e8ed2ca..61ffc7c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ -/sans_titre.pro.user /tags diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..5a55d55 --- /dev/null +++ b/LICENSE @@ -0,0 +1,342 @@ +The software "Companion" in this directory is licensed under the terms of the GPLv2 +(see below). +------------------------------------ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/README b/README new file mode 100644 index 0000000..8ef968b --- /dev/null +++ b/README @@ -0,0 +1,18 @@ + Companion + +Companion is mainly a GUI to flash your development board. + +Companion is a program utility main focused on Embedded System Development. + +The aim of the project is to ease the development cycle of embedded systems. +By wrapping the commandline tools used to flash the board and obtain its +status into a GUI. + +Currently only the Nvidia Jetson TK1 board (pm375) is supported. +Soon it will also be compatible with the Raspberry Pi. + +This is an early version that may contain some bugs, provided without warranty. + +Feel free to provide me with encountered issues via github. + +It's licensed under the GPL License. See LICENSE file. diff --git a/sans_titre.pro b/companion.pro similarity index 95% rename from sans_titre.pro rename to companion.pro index 1a94ad7..05cd8ba 100644 --- a/sans_titre.pro +++ b/companion.pro @@ -1,6 +1,6 @@ - #------------------------------------------------- +#------------------------------------------------- # -# Project created by QtCreator 2014-10-13T20:01:16 +# Project created by QtCreator 2014-10-22T01:02:30 # #------------------------------------------------- @@ -8,7 +8,7 @@ QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets -TARGET = sans_titre +TARGET = companion TEMPLATE = app INCLUDEPATH += /usr/include/kde4 @@ -16,12 +16,19 @@ INCLUDEPATH += gui, core, util SOURCES += main.cpp\ mainwindow.cpp \ - gui/partwidget.cpp \ - core/partitionnode.cpp \ - gui/partwidgetbase.cpp \ - gui/parttablewidget.cpp \ + core/copysource.cpp \ + core/copysourcedevice.cpp \ + core/copysourcefile.cpp \ + core/copytarget.cpp \ + core/copytargetdevice.cpp \ + core/copytargetfile.cpp \ + core/devboard.cpp \ core/device.cpp \ + core/libparted.cpp \ + core/operationrunner.cpp \ + core/operationstack.cpp \ core/partition.cpp \ + core/partitionnode.cpp \ core/partitionrole.cpp \ core/partitiontable.cpp \ fs/ext2.cpp \ @@ -43,12 +50,9 @@ SOURCES += main.cpp\ fs/unformatted.cpp \ fs/unknown.cpp \ fs/xfs.cpp \ - util/capacity.cpp \ - util/externalcommand.cpp \ - util/globallog.cpp \ - util/helpers.cpp \ - util/report.cpp \ - core/operationstack.cpp \ + gui/parttablewidget.cpp \ + gui/partwidget.cpp \ + gui/partwidgetbase.cpp \ jobs/backupfilesystemjob.cpp \ jobs/checkfilesystemjob.cpp \ jobs/copyfilesystemjob.cpp \ @@ -76,23 +80,26 @@ SOURCES += main.cpp\ ops/restoreoperation.cpp \ ops/setfilesystemlabeloperation.cpp \ ops/setpartflagsoperation.cpp \ - core/copysourcedevice.cpp \ - core/copytarget.cpp \ - core/copytargetdevice.cpp \ - core/copysource.cpp \ - core/copysourcefile.cpp \ - core/copytargetfile.cpp \ - core/libparted.cpp \ - core/operationrunner.cpp \ - core/devboard.cpp + util/capacity.cpp \ + util/externalcommand.cpp \ + util/globallog.cpp \ + util/helpers.cpp \ + util/report.cpp HEADERS += mainwindow.h \ - gui/partwidget.h \ - core/partitionnode.h \ - gui/partwidgetbase.h \ - gui/parttablewidget.h \ + core/copysource.h \ + core/copysourcedevice.h \ + core/copysourcefile.h \ + core/copytarget.h \ + core/copytargetdevice.h \ + core/copytargetfile.h \ + core/devboard.h \ core/device.h \ + core/libparted.h \ + core/operationrunner.h \ + core/operationstack.h \ core/partition.h \ + core/partitionnode.h \ core/partitionrole.h \ core/partitiontable.h \ fs/ext2.h \ @@ -114,13 +121,9 @@ HEADERS += mainwindow.h \ fs/unformatted.h \ fs/unknown.h \ fs/xfs.h \ - util/capacity.h \ - util/externalcommand.h \ - util/globallog.h \ - util/helpers.h \ - util/libpartitionmanagerexport.h \ - util/report.h \ - core/operationstack.h \ + gui/parttablewidget.h \ + gui/partwidget.h \ + gui/partwidgetbase.h \ jobs/backupfilesystemjob.h \ jobs/checkfilesystemjob.h \ jobs/copyfilesystemjob.h \ @@ -148,15 +151,12 @@ HEADERS += mainwindow.h \ ops/restoreoperation.h \ ops/setfilesystemlabeloperation.h \ ops/setpartflagsoperation.h \ - core/copysourcedevice.h \ - core/copytarget.h \ - core/copytargetdevice.h \ - core/copysource.h \ - core/copysourcefile.h \ - core/copytargetfile.h \ - core/libparted.h \ - core/operationrunner.h \ - core/devboard.h + util/capacity.h \ + util/externalcommand.h \ + util/globallog.h \ + util/helpers.h \ + util/libpartitionmanagerexport.h \ + util/report.h FORMS += mainwindow.ui diff --git a/companion.pro.user b/companion.pro.user new file mode 100644 index 0000000..057c5f5 --- /dev/null +++ b/companion.pro.user @@ -0,0 +1,267 @@ + + + + + + EnvironmentId + {ebfe1ac1-7abc-4545-9d13-46c36d95217c} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.Target.0 + + Kit_par_defaut + Kit_par_defaut + {e3ad5aea-b121-4bbe-b1dc-334b95cd215c} + 1 + 0 + 0 + + /home/nolaan/trash/companion/build-companion-Kit_par_defaut-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + true + + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Compiler + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Nettoyer + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Débogage + + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + /home/nolaan/trash/companion/build-companion-Kit_par_defaut-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + true + + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Compiler + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Nettoyer + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 2 + + + 0 + Déploiement + + ProjectExplorer.BuildSteps.Deploy + + 1 + Déployer localement + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + 2 + + companion + + Qt4ProjectManager.Qt4RunConfiguration:/home/nolaan/trash/companion/companion/companion.pro + + companion.pro + false + false + + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 16 + + + Version + 16 + + diff --git a/core/devboard.cpp b/core/devboard.cpp index 301dda0..735caaf 100644 --- a/core/devboard.cpp +++ b/core/devboard.cpp @@ -6,6 +6,7 @@ #include #include #include +#include DevBoard::DevBoard(MainWindow* parent,const QString& name, const QString& arch,const QString& cpu_name, const QString& cpu_arch) @@ -27,7 +28,7 @@ DevBoard::DevBoard(MainWindow* parent,const QString& name, const QString& arch,c m_timer->setInterval(3000); connect(m_timer, SIGNAL(timeout()), this, SLOT(this->isConnected())); m_timer->start(); - + parseFlashConfig(parent); } DevBoard::~DevBoard() @@ -90,12 +91,13 @@ void DevBoard::getParttable(MainWindow* parent) int start; int last; - int bytepersector=4096; + //int bytepersector=4096; QRegExp rx("\\d+"); QRegExp nm("^\\w+=(\\w+)"); QListsectorsVals; QListpartNames; + // Fetch the partition table text file from the board if(this->m_ConnectionStatus && isConfPathValid(parent)) { @@ -185,16 +187,17 @@ void DevBoard::getParttable(MainWindow* parent) ptable->append(p); } - // Create partition and insert them in ptable - int i=0; - this->setPartitionTable(ptable); } void DevBoard::on_conf_refresh(MainWindow* parent) { if(this->isConfPathValid(parent)) + { this->parseFlashConfig(parent); + parent->refreshMandatoryFiles(m_MandatoryFiles,0); + } + } @@ -229,18 +232,172 @@ void DevBoard::saveConfTab(MainWindow* parent) void DevBoard::parseFlashConfig(MainWindow* parent) { + int start; + int last; + //int bytepersector=4096; + QRegExp rx("\\d+"); + QRegExp nm("^\\w+=(\\w+)"); + QListsectorsVals; + QListpartNames; + + PartitionTable* ptable = new PartitionTable(); + PartitionRole::Roles(r); + r = PartitionRole::Primary; + QString flashcfg; + QString name; + flashcfg = parent->getUrlToolPath() + "/bootloader/flash.cfg"; if(QFile(flashcfg).exists()) { - QSettings sets(flashcfg,QSettings::IniFormat); + QFile layout(flashcfg); + QString line; + if(layout.open(QIODevice::ReadOnly | QIODevice::Text)) + { + QTextStream ts(&layout); + line = ts.readLine(); + start = 0; //reset sectors to begin + last = 0; //reset sectors to begin + while(!ts.atEnd()) + { + // For Jetson in flash.cfg file partion are + // declared with a [partition] heading + if(line.contains("partition")) + { + while(!line.isEmpty()) + { + if(line.contains(QRegExp("^name"))) + { + nm.indexIn(line); + partNames.append(nm.cap(1)); + + } + if(line.contains("size")) + { + rx.indexIn(line); + + last = start + rx.cap().toInt()/4096; // We want the number of sectors! + sectorsVals.append(start); + sectorsVals.append(last); + start = last; + + } + if(line.contains(QRegExp(".img")) && !line.contains("#")) + { + QRegExp nm2("^\\w+=(\\w+.img)"); + nm2.indexIn(line); + m_MandatoryFiles.insert(partNames.last(),parent->getUrlToolPath() + "/bootloader/" + nm2.cap(1)); + } + line = ts.readLine(); + } + } + line = ts.readLine(); + } + + // Create the partition table, populate it with partition + // and apply the partition table to the right partition widget + + + while(!sectorsVals.empty()) + { + start = sectorsVals.takeFirst(); + last = sectorsVals.takeFirst(); + name = partNames.takeFirst(); + this->m_DeviceNode = name; + Partition* p = new Partition(ptable, *this, PartitionRole(r), FileSystemFactory::create(FileSystem::Ext4, 0, 4096), start, last, -1); + this->m_DeviceNode = "emmc"; + + ptable->append(p); + } + + // Adding ptable to the second partition widget + + parent->setFuturePartTable(ptable); + + } + } +} + + + +void DevBoard::flashPart(QString partName, MainWindow* parent) +{ + QProcess process; + QString bootloader, toolPath, options, cmdline, fsImage, go; + int confirmed = 0; + confirmed = QMessageBox::warning(parent, tr("Companion"), + tr("Are you sure?\n" + "Confirm to flash!"), + QMessageBox::Yes + | QMessageBox::Cancel); + if( m_ConnectionStatus && (confirmed==QMessageBox::Yes) ) + { + // Build the command line + // ./nvflash --bl fastboot.bin --download LNX rootfs.img --go + + toolPath = parent->getUrlToolPath(); + toolPath.append("/bootloader/nvflash "); + + options = " --download "; + options.append(partName+" "); + + fsImage = m_MandatoryFiles.value(partName) + " "; + + bootloader = " --bl " + parent->getUrlToolPath(); + bootloader.append("/bootloader/fastboot.bin "); + + go = " --go"; + + cmdline = toolPath + options + fsImage + bootloader + go; + + // Send command + process.start(cmdline); + process.waitForFinished(-1); // will wait forever until finished + + QString stdout = process.readAllStandardOutput(); + QString stderr = process.readAllStandardError(); + cmdline.clear(); + } -// QFile layout(flashcfg); -// QString line; -// if(layout.open(QIODevice::ReadOnly | QIODevice::Text)) -// { -// QSettings -// } +} + +void DevBoard::flashAll(MainWindow* parent) +{ + QProcess process; + QString bootloader, toolPath, options, cmdline, fsImage, go; + int confirmed = 0; + confirmed = QMessageBox::warning(parent, tr("Companion"), + tr("Are you sure?\n" + "Confirm to flash!"), + QMessageBox::Yes + | QMessageBox::Cancel); + + if( m_ConnectionStatus && (confirmed==QMessageBox::Yes) ) + { + process.setWorkingDirectory(parent->getUrlToolPath()); + // Build the command line + // ./flash.sh -L bootloader/u-boot.bin -r jetson-tk1 mmcblk0p1 + + toolPath.append("./flash.sh "); + + bootloader = "-L bootloader/u-boot.bin "; + + options = "-r "; + options.append("jetson-tk1 "); + options.append("mmcblk0p1 "); + + cmdline = toolPath + bootloader + options ; + + // Send command + process.start(cmdline); + + + + process.waitForFinished(-1); // will wait forever until finished + + QString stdout = process.readAllStandardOutput(); + QString stderr = process.readAllStandardError(); + cmdline.clear(); } } diff --git a/core/devboard.h b/core/devboard.h index 7018c98..75c9604 100644 --- a/core/devboard.h +++ b/core/devboard.h @@ -5,6 +5,7 @@ #include #include "mainwindow.h" #include +#include class DevBoard : public Device { @@ -19,6 +20,9 @@ class DevBoard : public Device bool isConfPathValid(MainWindow* parent); void saveConfTab(MainWindow* parent); void parseFlashConfig(MainWindow* parent); + void flashPart(QString partName, MainWindow *parent); + void flashAll(MainWindow* parent); + public: QString m_Arch; @@ -28,9 +32,11 @@ class DevBoard : public Device bool m_ConnectionStatus; MainWindow* m_parent; bool m_ConfPathValid; + QHash m_MandatoryFiles; // Ugly timer for board's connection status QTimer *m_timer; + protected: QString m_partitionfile; diff --git a/mainwindow.cpp b/mainwindow.cpp index 03aa0e4..129df7b 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -5,6 +5,7 @@ #include #include + MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) @@ -44,18 +45,10 @@ MainWindow::MainWindow(QWidget *parent) : m_timer->start(); QString text = ui->filewarning->text(); - text.append(getUrlToolPath()); + text.append(getUrlToolPath()+"/bootloader"); ui->filewarning->setText(text); - QLabel* titre = new QLabel(); - titre->setText("Partition SYS"); - ui->verticalLayout_5->addWidget(titre); - titre->show(); - KUrlRequester* systimg; - systimg = new KUrlRequester(); - ui->verticalLayout_5->addWidget(systimg); - systimg->show(); } @@ -95,10 +88,9 @@ void MainWindow::setRedPalette() void MainWindow::on_Refresh_clicked() { DevBoard* myboard; - //myboard->on_conf_refresh(); myboard = (DevBoard*)m_Board; - myboard->isConnected(); refreshConnectionStatus(m_Board); + myboard->on_conf_refresh(this); } QString MainWindow::getUrlToolPath() @@ -148,3 +140,80 @@ void MainWindow::refreshConnectionStatus(void *Board) // MainWindow::resetPalette(); } } + +void MainWindow::setFuturePartTable(PartitionTable *ptable) +{ + ui->m_PartTableWidgetFuture->setPartitionTable(ptable); +} + +void MainWindow::refreshMandatoryFiles(QHash hash,int a=0) +{ + int number = ui->verticalLayout_5->count(); + if( number > 2 ) + { + //Save title + QString warning(ui->filewarning->text()); + //ui->verticalLayout_5->addWidget(ui->filewarning); + + // Clear widgets + QLayoutItem *child; + while ( (child = ui->verticalLayout_5->takeAt(0)) != 0 ) + { + child->widget()->setParent(NULL); + delete child; + } + + + // Restore title + ui->filewarning = new QLabel(ui->Files); + ui->filewarning->setObjectName(QString::fromUtf8("filewarning")); + ui->filewarning->setWordWrap(true); + ui->filewarning->setText(warning); + ui->verticalLayout_5->addWidget(ui->filewarning); + } + if(!a) + { + foreach(const QString &key, hash.keys()) + { + + QLabel* titre = new QLabel(); + titre->setText("Partition "+key); + ui->verticalLayout_5->addWidget(titre); + titre->show(); + + KUrlRequester* systimg; + systimg = new KUrlRequester(); + systimg->setText(hash.value(key)); + ui->verticalLayout_5->addWidget(systimg); + systimg->show(); + + } + } +} + +void MainWindow::on_flashRoot_clicked() +{ + flashPart("LNX",m_Board); +} + +void MainWindow::flashPart(QString partName, DevBoard* Board) +{ + + Board->flashPart(partName,this); + +} + +void MainWindow::flashAll(DevBoard* Board) +{ + Board->flashAll(this); +} + +void MainWindow::on_flashall_clicked() +{ + flashAll(m_Board); +} + +void MainWindow::on_flashSystem_clicked() +{ + flashPart("SYS",m_Board); +} diff --git a/mainwindow.h b/mainwindow.h index 604d840..fb330f1 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -5,13 +5,13 @@ #include "util/libpartitionmanagerexport.h" #include #include - +#include "core/partition.h" namespace Ui { class MainWindow; } - +class DevBoard; class MainWindow : public QMainWindow { Q_OBJECT @@ -25,12 +25,18 @@ class MainWindow : public QMainWindow void setRedPalette(); QString getUrlConfPath(); QString getUrlToolPath(); - QString m_configDir; - void* m_Board; - QSettings m_settings; void setConf(const QString& key, const QVariant& value); void refreshConnectionStatus(void* Board); + void setFuturePartTable(PartitionTable *ptable); + void refreshMandatoryFiles(QHash hash,int a); + void flashPart(QString partName, DevBoard* Board); + void flashAll(DevBoard* Board); + +public: QTimer* m_timer; + QString m_configDir; + DevBoard* m_Board; + QSettings m_settings; private slots: @@ -40,6 +46,12 @@ private slots: void on_pushButton_clicked(); + void on_flashRoot_clicked(); + + void on_flashall_clicked(); + + void on_flashSystem_clicked(); + private: Ui::MainWindow *ui; }; diff --git a/mainwindow.ui b/mainwindow.ui index 2671427..784985a 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -6,8 +6,8 @@ 0 0 - 597 - 486 + 598 + 478 @@ -45,7 +45,7 @@ - 2 + 0 @@ -57,6 +57,159 @@ Flash + + + + -1 + -1 + 581 + 381 + + + + + + + + + + 0 + 0 + + + + Empty Partition + + + + + + + + 0 + 0 + + + + Empty Partition + + + + + + + + 0 + 0 + + + + Empty Partition + + + + + + + + 0 + 0 + + + + Empty Partition + + + + + + + + 0 + 0 + + + + Empty Partition + + + + + + + + 0 + 0 + + + + Empty Partition + + + + + + + + 0 + 0 + + + + RootFS + + + + + + + + 0 + 0 + + + + System + + + + + + + + + + + Flash All + + + + + + + false + + + + 0 + 0 + + + + Reuse system.img + + + true + + + true + + + + + + + @@ -180,6 +333,19 @@ + + + + + 0 + 0 + + + + Reload + + + @@ -275,7 +441,7 @@ - 0 + 1 @@ -455,7 +621,7 @@ QLayout::SetDefaultConstraint - + 0 @@ -512,7 +678,7 @@ 0 0 - 597 + 598 20