You can subscribe to this list here.
| 2012 |
Jan
|
Feb
|
Mar
(16) |
Apr
(22) |
May
(8) |
Jun
(24) |
Jul
(18) |
Aug
(15) |
Sep
(4) |
Oct
(24) |
Nov
(2) |
Dec
|
|---|
|
From: <az...@us...> - 2012-11-08 05:56:42
|
Revision: 2982
http://piklab.svn.sourceforge.net/piklab/?rev=2982&view=rev
Author: azhyd
Date: 2012-11-08 05:56:36 +0000 (Thu, 08 Nov 2012)
Log Message:
-----------
fix device order and graphs in device selector
Modified Paths:
--------------
trunk/piklab_kde4/src/libgui/device_gui.cpp
trunk/piklab_kde4/src/libgui/device_gui.h
Modified: trunk/piklab_kde4/src/libgui/device_gui.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/device_gui.cpp 2012-11-08 05:45:40 UTC (rev 2981)
+++ trunk/piklab_kde4/src/libgui/device_gui.cpp 2012-11-08 05:56:36 UTC (rev 2982)
@@ -310,15 +310,37 @@
return;
}
- QMap<QString, KListViewItem *> groups;
Q3ListViewItem *selected = NULL;
+ addListItems("mem24", NULL, i18n("24 EEPROM"), device, selected);
+ for (int i = Pic::Architecture::Nb_Types-1; i >= 0; --i) {
+ Pic::Architecture arch = Pic::Architecture::Type(i);
+ addListItems("pic", arch.key(), arch.label(), device, selected);
+ }
+ if (selected == NULL) selected = _listView->firstChild();
+ if (selected != NULL) {
+ _listView->setSelected(selected, true);
+ _listView->ensureItemVisible(selected);
+ currentChanged(selected);
+ }
+}
+
+void DeviceChooser::Dialog::addListItems(const QString& group, const QString& arch, const QString& parentName, const QString& device, Q3ListViewItem*& selected)
+{
+ ListItem* parentItem = NULL;
+ if (_listTypeCombo->value().type() == ListType::FamilyTree) {
+ parentItem = new ListItem(_listView, parentName, false, false);
+ }
+ const Programmer::Group *pgroup = programmerGroup();
+ const Tool::Group *tgroup = toolGroup();
const QStringList list = Device::Lister::instance().supportedDevices();
QStringList::const_iterator it = list.end();
for (it--; it!=list.begin(); it--) {
+ const Device::Data *data = Device::Lister::instance().data(*it);
+ ASSERT(data);
+ if (data->group().name() != group) continue;
+ if (group == "pic" && static_cast<const Pic::Data *>(data)->architecture().key() != arch) continue;
if ( pgroup && !pgroup->isSupported(*it) ) continue;
if ( tgroup && !tgroup->isSupported(*it) ) continue;
- const Device::Data *data = Device::Lister::instance().data(*it);
- ASSERT(data);
if ( _memoryCombo->value()!=Device::MemoryTechnology::Nb_Types && data->memoryTechnology()!=_memoryCombo->value() ) continue;
if ( _statusCombo->value()!=Device::Status::Nb_Types && data->status()!=_statusCombo->value() ) continue;
if ( _featureCombo->value()!=Pic::Feature::Nb_Types ) {
@@ -340,10 +362,7 @@
KListViewItem *item = 0;
switch (_listTypeCombo->value().type()) {
case ListType::FamilyTree: {
- QString gname = data->listViewGroup();
- if ( !groups.contains(gname) )
- groups[gname] = new ListItem(_listView, gname, false, false);
- item = new ListItem(groups[gname], *it);
+ item = new ListItem(parentItem, *it);
break;
}
case ListType::Flat:
@@ -353,11 +372,9 @@
}
if ( device==(*it) ) selected = item;
}
- if ( selected==0 ) selected = _listView->firstChild();
- if (selected) {
- _listView->setSelected(selected, true);
- _listView->ensureItemVisible(selected);
- currentChanged(selected);
+ if (parentItem != NULL && parentItem->childCount() == 0) {
+ delete parentItem;
+ parentItem = NULL;
}
}
@@ -473,19 +490,20 @@
{
const Device::Data *data = Device::Lister::instance().data(name);
if (data == NULL) return;
+ _info->setData(data);
+ _memory->setData(data);
+ _vfg->setData(data);
+ _pins->setData(data);
+
QString doc = htmlInfo(*data, (cannotChangeDevice ? "" : "device:%1"), Device::documentHtml(*data));
doc += Device::supportedHtmlInfo(*data);
_info->setText("<html><body>" + doc + "</body></html>");
- _info->setData(data);
doc = voltageFrequencyHtml(*data, "vf_");
QString label = data->name() + "_memory_map.png";
_memory->setText("<html><body><img src=\"" + label + "\" /></body></html>");
- _memory->setData(data);
_vfg->setText("<html><body>" + doc + "</body></html>");
- _vfg->setData(data);
doc = pinsHtml(*data, "pins_");
_pins->setText("<html><body>" + doc + "</body></html>");
- _pins->setData(data);
}
void DeviceChooser::View::setText(const QString &text)
Modified: trunk/piklab_kde4/src/libgui/device_gui.h
===================================================================
--- trunk/piklab_kde4/src/libgui/device_gui.h 2012-11-08 05:45:40 UTC (rev 2981)
+++ trunk/piklab_kde4/src/libgui/device_gui.h 2012-11-08 05:56:36 UTC (rev 2982)
@@ -111,6 +111,7 @@
View* _deviceView;
void updateList(const QString &device);
+ void addListItems(const QString& group, const QString& arch, const QString& parentName, const QString& device, Q3ListViewItem*& selected);
const Programmer::Group *programmerGroup() const;
const Tool::Group *toolGroup() const;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <az...@us...> - 2012-11-08 05:45:47
|
Revision: 2981
http://piklab.svn.sourceforge.net/piklab/?rev=2981&view=rev
Author: azhyd
Date: 2012-11-08 05:45:40 +0000 (Thu, 08 Nov 2012)
Log Message:
-----------
fix crash in toolchain configuration
Modified Paths:
--------------
trunk/piklab_kde4/src/tools/gui/toolchain_config_widget.cpp
Modified: trunk/piklab_kde4/src/tools/gui/toolchain_config_widget.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/gui/toolchain_config_widget.cpp 2012-10-21 20:10:56 UTC (rev 2980)
+++ trunk/piklab_kde4/src/tools/gui/toolchain_config_widget.cpp 2012-11-08 05:45:40 UTC (rev 2981)
@@ -235,7 +235,10 @@
_devicesLabel->setText(i18n("Hardcoded (%1)").arg(supported.count()));
} else {
for (int i=0; i<_devicesData.count(); i++) {
- delete _devicesData[i].process;
+ if (_devicesData[i].process != NULL) {
+ _devicesData[i].process->blockSignals(true);
+ delete _devicesData[i].process;
+ }
_devicesData[i].process = checkDevicesProcess(i);
_devicesData[i].command = _devicesData[i].process->prettyCommand();
connect(_devicesData[i].process, SIGNAL(done()), SLOT(checkDevicesDone()));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <az...@us...> - 2012-10-21 20:11:06
|
Revision: 2980
http://piklab.svn.sourceforge.net/piklab/?rev=2980&view=rev
Author: azhyd
Date: 2012-10-21 20:10:56 +0000 (Sun, 21 Oct 2012)
Log Message:
-----------
fixes for config generator + fixes for some config bits
Modified Paths:
--------------
trunk/piklab_kde4/Changelog
trunk/piklab_kde4/src/coff/base/disassembler.cpp
trunk/piklab_kde4/src/devices/pic/base/pic.cpp
trunk/piklab_kde4/src/devices/pic/xml_data/12F1822.xml
trunk/piklab_kde4/src/devices/pic/xml_data/12F519.xml
trunk/piklab_kde4/src/devices/pic/xml_data/16F1507.xml
trunk/piklab_kde4/src/devices/pic/xml_data/16F1823.xml
trunk/piklab_kde4/src/devices/pic/xml_data/16F1824.xml
trunk/piklab_kde4/src/devices/pic/xml_data/16F1825.xml
trunk/piklab_kde4/src/devices/pic/xml_data/16F1826.xml
trunk/piklab_kde4/src/devices/pic/xml_data/16F1827.xml
trunk/piklab_kde4/src/devices/pic/xml_data/16F1828.xml
trunk/piklab_kde4/src/devices/pic/xml_data/16F1829.xml
trunk/piklab_kde4/src/devices/pic/xml_data/16F1933.xml
trunk/piklab_kde4/src/devices/pic/xml_data/16F1934.xml
trunk/piklab_kde4/src/devices/pic/xml_data/16F1936.xml
trunk/piklab_kde4/src/devices/pic/xml_data/16F1937.xml
trunk/piklab_kde4/src/devices/pic/xml_data/16F1938.xml
trunk/piklab_kde4/src/devices/pic/xml_data/16F1939.xml
trunk/piklab_kde4/src/devices/pic/xml_data/16F1946.xml
trunk/piklab_kde4/src/devices/pic/xml_data/16F1947.xml
trunk/piklab_kde4/src/devices/pic/xml_data/16F526.xml
trunk/piklab_kde4/src/devices/pic/xml_data/18F1220.xml
trunk/piklab_kde4/src/devices/pic/xml_data/18F13K22.xml
trunk/piklab_kde4/src/devices/pic/xml_data/18F13K50.xml
trunk/piklab_kde4/src/devices/pic/xml_data/18F14K22.xml
trunk/piklab_kde4/src/devices/pic/xml_data/18F14K50.xml
trunk/piklab_kde4/src/devices/pic/xml_data/18F43K22.xml
trunk/piklab_kde4/src/devices/pic/xml_data/18F4450.xml
trunk/piklab_kde4/src/devices/pic/xml_data/18F44K22.xml
trunk/piklab_kde4/src/devices/pic/xml_data/18F45K22.xml
trunk/piklab_kde4/src/devices/pic/xml_data/18F46K22.xml
trunk/piklab_kde4/src/devices/pic/xml_data/18F6310.xml
trunk/piklab_kde4/src/devices/pic/xml_data/18F6390.xml
trunk/piklab_kde4/src/devices/pic/xml_data/18F6410.xml
trunk/piklab_kde4/src/devices/pic/xml_data/18F6490.xml
trunk/piklab_kde4/src/devices/pic/xml_data/18F6527.xml
trunk/piklab_kde4/src/devices/pic/xml_data/18F6622.xml
trunk/piklab_kde4/src/devices/pic/xml_data/18F8527.xml
trunk/piklab_kde4/src/devices/pic/xml_data/18F8622.xml
trunk/piklab_kde4/src/piklab-test/base/device_test.cpp
trunk/piklab_kde4/src/piklab-test/base/generator_check.cpp
trunk/piklab_kde4/src/piklab-test/base/generator_check.h
trunk/piklab_kde4/test/sdcc/usart_lib/usart_lib.piklab
Modified: trunk/piklab_kde4/Changelog
===================================================================
--- trunk/piklab_kde4/Changelog 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/Changelog 2012-10-21 20:10:56 UTC (rev 2980)
@@ -1,5 +1,7 @@
-0.16.3 (18 October 2012)
+0.16.3 (21 October 2012)
* fix crash when selecting some programmer in programmer settings dialog [reported by Marc Berlioux]
+* remove DEBUG config bits from config generation
+* fix some configuration bits errors
0.16.2 (14 October 2012)
* added support for 24FJXXXGB1XX
@@ -25,7 +27,7 @@
* fixed compilation on Fedora 17 [thanks to bitlord]
* fixed compilation on CentOS 6 [thanks to Alain Portal]
* fixed link on Slackware [reported by breakfastfish]
-* add regression testing for compile/clean project
+* add regression testing for compile/clean project (gputils and sdcc)
0.16.1 (1 July 2012)
* fixed command-line utilities compilation with Qt only
Modified: trunk/piklab_kde4/src/coff/base/disassembler.cpp
===================================================================
--- trunk/piklab_kde4/src/coff/base/disassembler.cpp 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/coff/base/disassembler.cpp 2012-10-21 20:10:56 UTC (rev 2980)
@@ -128,6 +128,7 @@
QStringList cnames;
for (uint k=0; k<uint(cword.masks.count()); k++) {
const Pic::Config::Mask &cmask = cword.masks[k];
+ if ( cmask.name == "DEBUG" ) continue;
if ( cmask.value.isInside(cword.pmask) ) continue; // protected bits
for (int l=cmask.values.count()-1; l>=0; l--) {
const Pic::Config::Value &cvalue = cmask.values[l];
Modified: trunk/piklab_kde4/src/devices/pic/base/pic.cpp
===================================================================
--- trunk/piklab_kde4/src/devices/pic/base/pic.cpp 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/base/pic.cpp 2012-10-21 20:10:56 UTC (rev 2980)
@@ -58,11 +58,11 @@
};
const Pic::Feature::Data Pic::Feature::DATA[Nb_Types] = {
- { "ccp", I18N_NOOP("CCP") },
- { "adc", I18N_NOOP("ADC") },
- { "ssp", I18N_NOOP("SSP") },
- { "lvd", I18N_NOOP("Low Voltage Detect") },
- { "usb", I18N_NOOP("USB") },
+ { "ccp", I18N_NOOP("CCP") },
+ { "adc", I18N_NOOP("ADC") },
+ { "ssp", I18N_NOOP("SSP") },
+ { "lvd", I18N_NOOP("Low Voltage Detect") },
+ { "usb", I18N_NOOP("USB") },
{ "usart", I18N_NOOP("USART") },
{ "can", I18N_NOOP("CAN") },
{ "ecan", I18N_NOOP("ECAN") },
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/12F1822.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/12F1822.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/12F1822.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -49,7 +49,7 @@
<value value="0x0003" name="EC_IO" def="_FOSC_EXTRC" />
<value value="0x0004" name="INTRC_IO" def="_FOSC_INTOSC" />
<value value="0x0005" name="EC_LP" def="_FOSC_ECL" />
- <value value="0x0006" name="EC_MP" def="_FOEC_ECM" />
+ <value value="0x0006" name="EC_MP" def="_FOSC_ECM" />
<value value="0x0007" name="EC_HP" def="_FOSC_ECH" />
</mask>
<mask name="WDT" value="0x0018" >
@@ -59,8 +59,8 @@
<value value="0x0018" name="On" def="_WDTE_ON" />
</mask>
<mask name="PWRTE" value="0x0020" >
- <value value="0x0000" name="On" def="_nPWRTE_ON" />
- <value value="0x0020" name="Off" def="_nPWRTE_OFF" />
+ <value value="0x0000" name="On" def="_PWRTE_ON" />
+ <value value="0x0020" name="Off" def="_PWRTE_OFF" />
</mask>
<mask name="MCLRE" value="0x0040" >
<value value="0x0000" name="Internal" def="_MCLRE_OFF" />
@@ -110,12 +110,12 @@
<value value="0x0200" name="On" def="_STVREN_ON" />
</mask>
<mask name="BORV" value="0x0400" >
- <value value="0x0400" name="1.9" def="_BORV_19" />
- <value value="0x0000" name="2.5" def="_BORV_25" />
+ <value value="0x0400" name="1.9" def="_BORV_LO" />
+ <value value="0x0000" name="2.7" def="_BORV_HI" />
</mask>
<mask name="DEBUG" value="0x1000" >
- <value value="0x0000" name="On" def="_nDEBUG_ON" />
- <value value="0x1000" name="Off" def="_nDEBUG_OFF" />
+ <value value="0x0000" name="On" def="_DEBUG_ON" />
+ <value value="0x1000" name="Off" def="_DEBUG_OFF" />
</mask>
<mask name="LVP" value="0x2000" >
<value value="0x0000" name="Off" def="_LVP_OFF" />
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/12F519.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/12F519.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/12F519.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -58,8 +58,8 @@
<value value="0x010" name="External" def="_MCLRE_ON" />
</mask>
<mask name="IOSCFS" value="0x020" >
- <value value="0x000" name="4MHZ" def="_IOSCFS_OFF" />
- <value value="0x020" name="8MHZ" def="_IOSCFS_ON" />
+ <value value="0x000" name="4MHZ" def="_IOSCFS_4MHz" />
+ <value value="0x020" name="8MHZ" def="_IOSCFS_8MHz" />
</mask>
<mask name="CPD" value="0x040" >
<value value="0x000" name="All" def="_CPDF_ON" />
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/16F1507.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/16F1507.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/16F1507.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -78,7 +78,7 @@
</mask>
</config>
- <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x2E03" >
+ <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x3E03" >
<mask name="WRT" value="0x0003" >
<value value="0x0000" name="0000:07FF" def="_WRT_ALL" />
<value value="0x0001" name="0000:03FF" def="_WRT_HALF" />
@@ -90,12 +90,13 @@
<value value="0x0200" name="On" def="_STVREN_ON" />
</mask>
<mask name="BORV" value="0x0400" >
- <value value="0x0400" name="1.9" def="_BORV_19" />
- <value value="0x0000" name="2.5" def="_BORV_25" />
+ <value value="0x0400" name="1.9" def="_BORV_LO" />
+ <value value="0x0000" name="2.5" def="_BORV_HI" />
</mask>
-
-<!-- NOT_LPBOR is missing here 0x0000 and 0x00800 -->
-
+ <mask name="LPBOR" value="0x0800" >
+ <value value="0x0800" name="Off" def="_LPBOR_OFF" />
+ <value value="0x0000" name="On" def="_LPBOR_ON" />
+ </mask>
<mask name="DEBUG" value="0x1000" >
<value value="0x0000" name="On" def="_DEBUG_ON" />
<value value="0x1000" name="Off" def="_DEBUG_OFF" />
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/16F1823.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/16F1823.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/16F1823.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -49,7 +49,7 @@
<value value="0x0003" name="EC_IO" def="_FOSC_EXTRC" />
<value value="0x0004" name="INTRC_IO" def="_FOSC_INTOSC" />
<value value="0x0005" name="EC_LP" def="_FOSC_ECL" />
- <value value="0x0006" name="EC_MP" def="_FOEC_ECM" />
+ <value value="0x0006" name="EC_MP" def="_FOSC_ECM" />
<value value="0x0007" name="EC_HP" def="_FOSC_ECH" />
</mask>
<mask name="WDT" value="0x0018" >
@@ -59,8 +59,8 @@
<value value="0x0018" name="On" def="_WDTE_ON" />
</mask>
<mask name="PWRTE" value="0x0020" >
- <value value="0x0000" name="On" def="_nPWRTE_ON" />
- <value value="0x0020" name="Off" def="_nPWRTE_OFF" />
+ <value value="0x0000" name="On" def="_PWRTE_ON" />
+ <value value="0x0020" name="Off" def="_PWRTE_OFF" />
</mask>
<mask name="MCLRE" value="0x0040" >
<value value="0x0000" name="Internal" def="_MCLRE_OFF" />
@@ -110,12 +110,12 @@
<value value="0x0200" name="On" def="_STVREN_ON" />
</mask>
<mask name="BORV" value="0x0400" >
- <value value="0x0400" name="1.9" def="_BORV_19" />
- <value value="0x0000" name="2.5" def="_BORV_25" />
+ <value value="0x0400" name="1.9" def="_BORV_LO" />
+ <value value="0x0000" name="2.7" def="_BORV_HI" />
</mask>
<mask name="DEBUG" value="0x1000" >
- <value value="0x0000" name="On" def="_nDEBUG_ON" />
- <value value="0x1000" name="Off" def="_nDEBUG_OFF" />
+ <value value="0x0000" name="On" def="_DEBUG_ON" />
+ <value value="0x1000" name="Off" def="_DEBUG_OFF" />
</mask>
<mask name="LVP" value="0x2000" >
<value value="0x0000" name="Off" def="_LVP_OFF" />
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/16F1824.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/16F1824.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/16F1824.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -49,7 +49,7 @@
<value value="0x0003" name="EC_IO" def="_FOSC_EXTRC" />
<value value="0x0004" name="INTRC_IO" def="_FOSC_INTOSC" />
<value value="0x0005" name="EC_LP" def="_FOSC_ECL" />
- <value value="0x0006" name="EC_MP" def="_FOEC_ECM" />
+ <value value="0x0006" name="EC_MP" def="_FOSC_ECM" />
<value value="0x0007" name="EC_HP" def="_FOSC_ECH" />
</mask>
<mask name="WDT" value="0x0018" >
@@ -59,8 +59,8 @@
<value value="0x0018" name="On" def="_WDTE_ON" />
</mask>
<mask name="PWRTE" value="0x0020" >
- <value value="0x0000" name="On" def="_nPWRTE_ON" />
- <value value="0x0020" name="Off" def="_nPWRTE_OFF" />
+ <value value="0x0000" name="On" def="_PWRTE_ON" />
+ <value value="0x0020" name="Off" def="_PWRTE_OFF" />
</mask>
<mask name="MCLRE" value="0x0040" >
<value value="0x0000" name="Internal" def="_MCLRE_OFF" />
@@ -110,12 +110,12 @@
<value value="0x0200" name="On" def="_STVREN_ON" />
</mask>
<mask name="BORV" value="0x0400" >
- <value value="0x0400" name="1.9" def="_BORV_19" />
- <value value="0x0000" name="2.5" def="_BORV_25" />
+ <value value="0x0400" name="1.9" def="_BORV_LO" />
+ <value value="0x0000" name="2.7" def="_BORV_HI" />
</mask>
<mask name="DEBUG" value="0x1000" >
- <value value="0x0000" name="On" def="_nDEBUG_ON" />
- <value value="0x1000" name="Off" def="_nDEBUG_OFF" />
+ <value value="0x0000" name="On" def="_DEBUG_ON" />
+ <value value="0x1000" name="Off" def="_DEBUG_OFF" />
</mask>
<mask name="LVP" value="0x2000" >
<value value="0x0000" name="Off" def="_LVP_OFF" />
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/16F1825.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/16F1825.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/16F1825.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -49,7 +49,7 @@
<value value="0x0003" name="EC_IO" def="_FOSC_EXTRC" />
<value value="0x0004" name="INTRC_IO" def="_FOSC_INTOSC" />
<value value="0x0005" name="EC_LP" def="_FOSC_ECL" />
- <value value="0x0006" name="EC_MP" def="_FOEC_ECM" />
+ <value value="0x0006" name="EC_MP" def="_FOSC_ECM" />
<value value="0x0007" name="EC_HP" def="_FOSC_ECH" />
</mask>
<mask name="WDT" value="0x0018" >
@@ -59,8 +59,8 @@
<value value="0x0018" name="On" def="_WDTE_ON" />
</mask>
<mask name="PWRTE" value="0x0020" >
- <value value="0x0000" name="On" def="_nPWRTE_ON" />
- <value value="0x0020" name="Off" def="_nPWRTE_OFF" />
+ <value value="0x0000" name="On" def="_PWRTE_ON" />
+ <value value="0x0020" name="Off" def="_PWRTE_OFF" />
</mask>
<mask name="MCLRE" value="0x0040" >
<value value="0x0000" name="Internal" def="_MCLRE_OFF" />
@@ -110,12 +110,12 @@
<value value="0x0200" name="On" def="_STVREN_ON" />
</mask>
<mask name="BORV" value="0x0400" >
- <value value="0x0400" name="1.9" def="_BORV_19" />
- <value value="0x0000" name="2.5" def="_BORV_25" />
+ <value value="0x0400" name="1.9" def="_BORV_LO" />
+ <value value="0x0000" name="2.7" def="_BORV_HI" />
</mask>
<mask name="DEBUG" value="0x1000" >
- <value value="0x0000" name="On" def="_nDEBUG_ON" />
- <value value="0x1000" name="Off" def="_nDEBUG_OFF" />
+ <value value="0x0000" name="On" def="_DEBUG_ON" />
+ <value value="0x1000" name="Off" def="_DEBUG_OFF" />
</mask>
<mask name="LVP" value="0x2000" >
<value value="0x0000" name="Off" def="_LVP_OFF" />
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/16F1826.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/16F1826.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/16F1826.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -49,7 +49,7 @@
<value value="0x0003" name="EC_IO" def="_FOSC_EXTRC" />
<value value="0x0004" name="INTRC_IO" def="_FOSC_INTOSC" />
<value value="0x0005" name="EC_LP" def="_FOSC_ECL" />
- <value value="0x0006" name="EC_MP" def="_FOEC_ECM" />
+ <value value="0x0006" name="EC_MP" def="_FOSC_ECM" />
<value value="0x0007" name="EC_HP" def="_FOSC_ECH" />
</mask>
<mask name="WDT" value="0x0018" >
@@ -59,8 +59,8 @@
<value value="0x0018" name="On" def="_WDTE_ON" />
</mask>
<mask name="PWRTE" value="0x0020" >
- <value value="0x0000" name="On" def="_nPWRTE_ON" />
- <value value="0x0020" name="Off" def="_nPWRTE_OFF" />
+ <value value="0x0000" name="On" def="_PWRTE_ON" />
+ <value value="0x0020" name="Off" def="_PWRTE_OFF" />
</mask>
<mask name="MCLRE" value="0x0040" >
<value value="0x0000" name="Internal" def="_MCLRE_OFF" />
@@ -110,12 +110,12 @@
<value value="0x0200" name="On" def="_STVREN_ON" />
</mask>
<mask name="BORV" value="0x0400" >
- <value value="0x0400" name="1.9" def="_BORV_19" />
- <value value="0x0000" name="2.5" def="_BORV_25" />
+ <value value="0x0400" name="1.9" def="_BORV_LO" />
+ <value value="0x0000" name="2.7" def="_BORV_HI" />
</mask>
<mask name="DEBUG" value="0x1000" >
- <value value="0x0000" name="On" def="_nDEBUG_ON" />
- <value value="0x1000" name="Off" def="_nDEBUG_OFF" />
+ <value value="0x0000" name="On" def="_DEBUG_ON" />
+ <value value="0x1000" name="Off" def="_DEBUG_OFF" />
</mask>
<mask name="LVP" value="0x2000" >
<value value="0x0000" name="Off" def="_LVP_OFF" />
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/16F1827.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/16F1827.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/16F1827.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -49,7 +49,7 @@
<value value="0x0003" name="EC_IO" def="_FOSC_EXTRC" />
<value value="0x0004" name="INTRC_IO" def="_FOSC_INTOSC" />
<value value="0x0005" name="EC_LP" def="_FOSC_ECL" />
- <value value="0x0006" name="EC_MP" def="_FOEC_ECM" />
+ <value value="0x0006" name="EC_MP" def="_FOSC_ECM" />
<value value="0x0007" name="EC_HP" def="_FOSC_ECH" />
</mask>
<mask name="WDT" value="0x0018" >
@@ -59,8 +59,8 @@
<value value="0x0018" name="On" def="_WDTE_ON" />
</mask>
<mask name="PWRTE" value="0x0020" >
- <value value="0x0000" name="On" def="_nPWRTE_ON" />
- <value value="0x0020" name="Off" def="_nPWRTE_OFF" />
+ <value value="0x0000" name="On" def="_PWRTE_ON" />
+ <value value="0x0020" name="Off" def="_PWRTE_OFF" />
</mask>
<mask name="MCLRE" value="0x0040" >
<value value="0x0000" name="Internal" def="_MCLRE_OFF" />
@@ -110,12 +110,12 @@
<value value="0x0200" name="On" def="_STVREN_ON" />
</mask>
<mask name="BORV" value="0x0400" >
- <value value="0x0400" name="1.9" def="_BORV_19" />
- <value value="0x0000" name="2.5" def="_BORV_25" />
+ <value value="0x0400" name="1.9" def="_BORV_LO" />
+ <value value="0x0000" name="2.7" def="_BORV_HI" />
</mask>
<mask name="DEBUG" value="0x1000" >
- <value value="0x0000" name="On" def="_nDEBUG_ON" />
- <value value="0x1000" name="Off" def="_nDEBUG_OFF" />
+ <value value="0x0000" name="On" def="_DEBUG_ON" />
+ <value value="0x1000" name="Off" def="_DEBUG_OFF" />
</mask>
<mask name="LVP" value="0x2000" >
<value value="0x0000" name="Off" def="_LVP_OFF" />
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/16F1828.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/16F1828.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/16F1828.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -49,7 +49,7 @@
<value value="0x0003" name="EC_IO" def="_FOSC_EXTRC" />
<value value="0x0004" name="INTRC_IO" def="_FOSC_INTOSC" />
<value value="0x0005" name="EC_LP" def="_FOSC_ECL" />
- <value value="0x0006" name="EC_MP" def="_FOEC_ECM" />
+ <value value="0x0006" name="EC_MP" def="_FOSC_ECM" />
<value value="0x0007" name="EC_HP" def="_FOSC_ECH" />
</mask>
<mask name="WDT" value="0x0018" >
@@ -59,8 +59,8 @@
<value value="0x0018" name="On" def="_WDTE_ON" />
</mask>
<mask name="PWRTE" value="0x0020" >
- <value value="0x0000" name="On" def="_nPWRTE_ON" />
- <value value="0x0020" name="Off" def="_nPWRTE_OFF" />
+ <value value="0x0000" name="On" def="_PWRTE_ON" />
+ <value value="0x0020" name="Off" def="_PWRTE_OFF" />
</mask>
<mask name="MCLRE" value="0x0040" >
<value value="0x0000" name="Internal" def="_MCLRE_OFF" />
@@ -110,12 +110,12 @@
<value value="0x0200" name="On" def="_STVREN_ON" />
</mask>
<mask name="BORV" value="0x0400" >
- <value value="0x0400" name="1.9" def="_BORV_19" />
- <value value="0x0000" name="2.5" def="_BORV_25" />
+ <value value="0x0400" name="1.9" def="_BORV_LO" />
+ <value value="0x0000" name="2.7" def="_BORV_HI" />
</mask>
<mask name="DEBUG" value="0x1000" >
- <value value="0x0000" name="On" def="_nDEBUG_ON" />
- <value value="0x1000" name="Off" def="_nDEBUG_OFF" />
+ <value value="0x0000" name="On" def="_DEBUG_ON" />
+ <value value="0x1000" name="Off" def="_DEBUG_OFF" />
</mask>
<mask name="LVP" value="0x2000" >
<value value="0x0000" name="Off" def="_LVP_OFF" />
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/16F1829.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/16F1829.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/16F1829.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -49,7 +49,7 @@
<value value="0x0003" name="EC_IO" def="_FOSC_EXTRC" />
<value value="0x0004" name="INTRC_IO" def="_FOSC_INTOSC" />
<value value="0x0005" name="EC_LP" def="_FOSC_ECL" />
- <value value="0x0006" name="EC_MP" def="_FOEC_ECM" />
+ <value value="0x0006" name="EC_MP" def="_FOSC_ECM" />
<value value="0x0007" name="EC_HP" def="_FOSC_ECH" />
</mask>
<mask name="WDT" value="0x0018" >
@@ -59,8 +59,8 @@
<value value="0x0018" name="On" def="_WDTE_ON" />
</mask>
<mask name="PWRTE" value="0x0020" >
- <value value="0x0000" name="On" def="_nPWRTE_ON" />
- <value value="0x0020" name="Off" def="_nPWRTE_OFF" />
+ <value value="0x0000" name="On" def="_PWRTE_ON" />
+ <value value="0x0020" name="Off" def="_PWRTE_OFF" />
</mask>
<mask name="MCLRE" value="0x0040" >
<value value="0x0000" name="Internal" def="_MCLRE_OFF" />
@@ -110,12 +110,12 @@
<value value="0x0200" name="On" def="_STVREN_ON" />
</mask>
<mask name="BORV" value="0x0400" >
- <value value="0x0400" name="1.9" def="_BORV_19" />
- <value value="0x0000" name="2.5" def="_BORV_25" />
+ <value value="0x0400" name="1.9" def="_BORV_LO" />
+ <value value="0x0000" name="2.7" def="_BORV_HI" />
</mask>
<mask name="DEBUG" value="0x1000" >
- <value value="0x0000" name="On" def="_nDEBUG_ON" />
- <value value="0x1000" name="Off" def="_nDEBUG_OFF" />
+ <value value="0x0000" name="On" def="_DEBUG_ON" />
+ <value value="0x1000" name="Off" def="_DEBUG_OFF" />
</mask>
<mask name="LVP" value="0x2000" >
<value value="0x0000" name="Off" def="_LVP_OFF" />
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/16F1933.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/16F1933.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/16F1933.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -49,7 +49,7 @@
<value value="0x0003" name="EC_IO" def="_FOSC_EXTRC" />
<value value="0x0004" name="INTRC_IO" def="_FOSC_INTOSC" />
<value value="0x0005" name="EC_LP" def="_FOSC_ECL" />
- <value value="0x0006" name="EC_MP" def="_FOEC_ECM" />
+ <value value="0x0006" name="EC_MP" def="_FOSC_ECM" />
<value value="0x0007" name="EC_HP" def="_FOSC_ECH" />
</mask>
<mask name="WDT" value="0x0018" >
@@ -59,8 +59,8 @@
<value value="0x0018" name="On" def="_WDTE_ON" />
</mask>
<mask name="PWRTE" value="0x0020" >
- <value value="0x0000" name="On" def="_nPWRTE_ON" />
- <value value="0x0020" name="Off" def="_nPWRTE_OFF" />
+ <value value="0x0000" name="On" def="_PWRTE_ON" />
+ <value value="0x0020" name="Off" def="_PWRTE_OFF" />
</mask>
<mask name="MCLRE" value="0x0040" >
<value value="0x0000" name="Internal" def="_MCLRE_OFF" />
@@ -120,8 +120,8 @@
<value value="0x0000" name="2.5" def="_BORV_25" />
</mask>
<mask name="DEBUG" value="0x1000" >
- <value value="0x0000" name="On" def="_nDEBUG_ON" />
- <value value="0x1000" name="Off" def="_nDEBUG_OFF" />
+ <value value="0x0000" name="On" def="_DEBUG_ON" />
+ <value value="0x1000" name="Off" def="_DEBUG_OFF" />
</mask>
<mask name="LVP" value="0x2000" >
<value value="0x0000" name="Off" def="_LVP_OFF" />
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/16F1934.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/16F1934.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/16F1934.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -49,7 +49,7 @@
<value value="0x0003" name="EC_IO" def="_FOSC_EXTRC" />
<value value="0x0004" name="INTRC_IO" def="_FOSC_INTOSC" />
<value value="0x0005" name="EC_LP" def="_FOSC_ECL" />
- <value value="0x0006" name="EC_MP" def="_FOEC_ECM" />
+ <value value="0x0006" name="EC_MP" def="_FOSC_ECM" />
<value value="0x0007" name="EC_HP" def="_FOSC_ECH" />
</mask>
<mask name="WDT" value="0x0018" >
@@ -59,8 +59,8 @@
<value value="0x0018" name="On" def="_WDTE_ON" />
</mask>
<mask name="PWRTE" value="0x0020" >
- <value value="0x0000" name="On" def="_nPWRTE_ON" />
- <value value="0x0020" name="Off" def="_nPWRTE_OFF" />
+ <value value="0x0000" name="On" def="_PWRTE_ON" />
+ <value value="0x0020" name="Off" def="_PWRTE_OFF" />
</mask>
<mask name="MCLRE" value="0x0040" >
<value value="0x0000" name="Internal" def="_MCLRE_OFF" />
@@ -120,8 +120,8 @@
<value value="0x0000" name="2.5" def="_BORV_25" />
</mask>
<mask name="DEBUG" value="0x1000" >
- <value value="0x0000" name="On" def="_nDEBUG_ON" />
- <value value="0x1000" name="Off" def="_nDEBUG_OFF" />
+ <value value="0x0000" name="On" def="_DEBUG_ON" />
+ <value value="0x1000" name="Off" def="_DEBUG_OFF" />
</mask>
<mask name="LVP" value="0x2000" >
<value value="0x0000" name="Off" def="_LVP_OFF" />
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/16F1936.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/16F1936.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/16F1936.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -49,7 +49,7 @@
<value value="0x0003" name="EC_IO" def="_FOSC_EXTRC" />
<value value="0x0004" name="INTRC_IO" def="_FOSC_INTOSC" />
<value value="0x0005" name="EC_LP" def="_FOSC_ECL" />
- <value value="0x0006" name="EC_MP" def="_FOEC_ECM" />
+ <value value="0x0006" name="EC_MP" def="_FOSC_ECM" />
<value value="0x0007" name="EC_HP" def="_FOSC_ECH" />
</mask>
<mask name="WDT" value="0x0018" >
@@ -59,8 +59,8 @@
<value value="0x0018" name="On" def="_WDTE_ON" />
</mask>
<mask name="PWRTE" value="0x0020" >
- <value value="0x0000" name="On" def="_nPWRTE_ON" />
- <value value="0x0020" name="Off" def="_nPWRTE_OFF" />
+ <value value="0x0000" name="On" def="_PWRTE_ON" />
+ <value value="0x0020" name="Off" def="_PWRTE_OFF" />
</mask>
<mask name="MCLRE" value="0x0040" >
<value value="0x0000" name="Internal" def="_MCLRE_OFF" />
@@ -120,8 +120,8 @@
<value value="0x0000" name="2.5" def="_BORV_25" />
</mask>
<mask name="DEBUG" value="0x1000" >
- <value value="0x0000" name="On" def="_nDEBUG_ON" />
- <value value="0x1000" name="Off" def="_nDEBUG_OFF" />
+ <value value="0x0000" name="On" def="_DEBUG_ON" />
+ <value value="0x1000" name="Off" def="_DEBUG_OFF" />
</mask>
<mask name="LVP" value="0x2000" >
<value value="0x0000" name="Off" def="_LVP_OFF" />
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/16F1937.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/16F1937.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/16F1937.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -49,7 +49,7 @@
<value value="0x0003" name="EC_IO" def="_FOSC_EXTRC" />
<value value="0x0004" name="INTRC_IO" def="_FOSC_INTOSC" />
<value value="0x0005" name="EC_LP" def="_FOSC_ECL" />
- <value value="0x0006" name="EC_MP" def="_FOEC_ECM" />
+ <value value="0x0006" name="EC_MP" def="_FOSC_ECM" />
<value value="0x0007" name="EC_HP" def="_FOSC_ECH" />
</mask>
<mask name="WDT" value="0x0018" >
@@ -59,8 +59,8 @@
<value value="0x0018" name="On" def="_WDTE_ON" />
</mask>
<mask name="PWRTE" value="0x0020" >
- <value value="0x0000" name="On" def="_nPWRTE_ON" />
- <value value="0x0020" name="Off" def="_nPWRTE_OFF" />
+ <value value="0x0000" name="On" def="_PWRTE_ON" />
+ <value value="0x0020" name="Off" def="_PWRTE_OFF" />
</mask>
<mask name="MCLRE" value="0x0040" >
<value value="0x0000" name="Internal" def="_MCLRE_OFF" />
@@ -120,8 +120,8 @@
<value value="0x0000" name="2.5" def="_BORV_25" />
</mask>
<mask name="DEBUG" value="0x1000" >
- <value value="0x0000" name="On" def="_nDEBUG_ON" />
- <value value="0x1000" name="Off" def="_nDEBUG_OFF" />
+ <value value="0x0000" name="On" def="_DEBUG_ON" />
+ <value value="0x1000" name="Off" def="_DEBUG_OFF" />
</mask>
<mask name="LVP" value="0x2000" >
<value value="0x0000" name="Off" def="_LVP_OFF" />
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/16F1938.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/16F1938.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/16F1938.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -49,7 +49,7 @@
<value value="0x0003" name="EC_IO" def="_FOSC_EXTRC" />
<value value="0x0004" name="INTRC_IO" def="_FOSC_INTOSC" />
<value value="0x0005" name="EC_LP" def="_FOSC_ECL" />
- <value value="0x0006" name="EC_MP" def="_FOEC_ECM" />
+ <value value="0x0006" name="EC_MP" def="_FOSC_ECM" />
<value value="0x0007" name="EC_HP" def="_FOSC_ECH" />
</mask>
<mask name="WDT" value="0x0018" >
@@ -59,8 +59,8 @@
<value value="0x0018" name="On" def="_WDTE_ON" />
</mask>
<mask name="PWRTE" value="0x0020" >
- <value value="0x0000" name="On" def="_nPWRTE_ON" />
- <value value="0x0020" name="Off" def="_nPWRTE_OFF" />
+ <value value="0x0000" name="On" def="_PWRTE_ON" />
+ <value value="0x0020" name="Off" def="_PWRTE_OFF" />
</mask>
<mask name="MCLRE" value="0x0040" >
<value value="0x0000" name="Internal" def="_MCLRE_OFF" />
@@ -120,8 +120,8 @@
<value value="0x0000" name="2.5" def="_BORV_25" />
</mask>
<mask name="DEBUG" value="0x1000" >
- <value value="0x0000" name="On" def="_nDEBUG_ON" />
- <value value="0x1000" name="Off" def="_nDEBUG_OFF" />
+ <value value="0x0000" name="On" def="_DEBUG_ON" />
+ <value value="0x1000" name="Off" def="_DEBUG_OFF" />
</mask>
<mask name="LVP" value="0x2000" >
<value value="0x0000" name="Off" def="_LVP_OFF" />
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/16F1939.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/16F1939.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/16F1939.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -49,7 +49,7 @@
<value value="0x0003" name="EC_IO" def="_FOSC_EXTRC" />
<value value="0x0004" name="INTRC_IO" def="_FOSC_INTOSC" />
<value value="0x0005" name="EC_LP" def="_FOSC_ECL" />
- <value value="0x0006" name="EC_MP" def="_FOEC_ECM" />
+ <value value="0x0006" name="EC_MP" def="_FOSC_ECM" />
<value value="0x0007" name="EC_HP" def="_FOSC_ECH" />
</mask>
<mask name="WDT" value="0x0018" >
@@ -59,8 +59,8 @@
<value value="0x0018" name="On" def="_WDTE_ON" />
</mask>
<mask name="PWRTE" value="0x0020" >
- <value value="0x0000" name="On" def="_nPWRTE_ON" />
- <value value="0x0020" name="Off" def="_nPWRTE_OFF" />
+ <value value="0x0000" name="On" def="_PWRTE_ON" />
+ <value value="0x0020" name="Off" def="_PWRTE_OFF" />
</mask>
<mask name="MCLRE" value="0x0040" >
<value value="0x0000" name="Internal" def="_MCLRE_OFF" />
@@ -120,8 +120,8 @@
<value value="0x0000" name="2.5" def="_BORV_25" />
</mask>
<mask name="DEBUG" value="0x1000" >
- <value value="0x0000" name="On" def="_nDEBUG_ON" />
- <value value="0x1000" name="Off" def="_nDEBUG_OFF" />
+ <value value="0x0000" name="On" def="_DEBUG_ON" />
+ <value value="0x1000" name="Off" def="_DEBUG_OFF" />
</mask>
<mask name="LVP" value="0x2000" >
<value value="0x0000" name="Off" def="_LVP_OFF" />
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/16F1946.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/16F1946.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/16F1946.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -49,7 +49,7 @@
<value value="0x0003" name="EC_IO" def="_FOSC_EXTRC" />
<value value="0x0004" name="INTRC_IO" def="_FOSC_INTOSC" />
<value value="0x0005" name="EC_LP" def="_FOSC_ECL" />
- <value value="0x0006" name="EC_MP" def="_FOEC_ECM" />
+ <value value="0x0006" name="EC_MP" def="_FOSC_ECM" />
<value value="0x0007" name="EC_HP" def="_FOSC_ECH" />
</mask>
<mask name="WDT" value="0x0018" >
@@ -59,8 +59,8 @@
<value value="0x0018" name="On" def="_WDTE_ON" />
</mask>
<mask name="PWRTE" value="0x0020" >
- <value value="0x0000" name="On" def="_nPWRTE_ON" />
- <value value="0x0020" name="Off" def="_nPWRTE_OFF" />
+ <value value="0x0000" name="On" def="_PWRTE_ON" />
+ <value value="0x0020" name="Off" def="_PWRTE_OFF" />
</mask>
<mask name="MCLRE" value="0x0040" >
<value value="0x0000" name="Internal" def="_MCLRE_OFF" />
@@ -101,11 +101,9 @@
<value value="0x0002" name="0000:01FF" def="_WRT_BOOT" />
<value value="0x0003" name="Off" def="_WRT_OFF" />
</mask>
- <mask name="VCAP" value="0x0030" >
- <value value="0x0000" name="RA0" def="_VCAPEN_RA0" />
- <value value="0x0010" name="RA5" def="_VCAPEN_RA5" />
- <value value="0x0020" name="RA6" def="_VCAPEN_RA6" />
- <value value="0x0030" name="Off" def="_VCAPEN_OFF" />
+ <mask name="VCAP" value="0x0010" >
+ <value value="0x0000" name="RF0" def="_VCAPEN_ON" />
+ <value value="0x0010" name="Off" def="_VCAPEN_OFF" />
</mask>
<mask name="PLLEN" value="0x0100" >
<value value="0x0000" name="Off" def="_PLLEN_OFF" />
@@ -120,8 +118,8 @@
<value value="0x0000" name="2.5" def="_BORV_25" />
</mask>
<mask name="DEBUG" value="0x1000" >
- <value value="0x0000" name="On" def="_nDEBUG_ON" />
- <value value="0x1000" name="Off" def="_nDEBUG_OFF" />
+ <value value="0x0000" name="On" def="_DEBUG_ON" />
+ <value value="0x1000" name="Off" def="_DEBUG_OFF" />
</mask>
<mask name="LVP" value="0x2000" >
<value value="0x0000" name="Off" def="_LVP_OFF" />
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/16F1947.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/16F1947.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/16F1947.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -49,7 +49,7 @@
<value value="0x0003" name="EC_IO" def="_FOSC_EXTRC" />
<value value="0x0004" name="INTRC_IO" def="_FOSC_INTOSC" />
<value value="0x0005" name="EC_LP" def="_FOSC_ECL" />
- <value value="0x0006" name="EC_MP" def="_FOEC_ECM" />
+ <value value="0x0006" name="EC_MP" def="_FOSC_ECM" />
<value value="0x0007" name="EC_HP" def="_FOSC_ECH" />
</mask>
<mask name="WDT" value="0x0018" >
@@ -59,8 +59,8 @@
<value value="0x0018" name="On" def="_WDTE_ON" />
</mask>
<mask name="PWRTE" value="0x0020" >
- <value value="0x0000" name="On" def="_nPWRTE_ON" />
- <value value="0x0020" name="Off" def="_nPWRTE_OFF" />
+ <value value="0x0000" name="On" def="_PWRTE_ON" />
+ <value value="0x0020" name="Off" def="_PWRTE_OFF" />
</mask>
<mask name="MCLRE" value="0x0040" >
<value value="0x0000" name="Internal" def="_MCLRE_OFF" />
@@ -101,11 +101,9 @@
<value value="0x0002" name="0000:01FF" def="_WRT_BOOT" />
<value value="0x0003" name="Off" def="_WRT_OFF" />
</mask>
- <mask name="VCAP" value="0x0030" >
- <value value="0x0000" name="RA0" def="_VCAPEN_RA0" />
- <value value="0x0010" name="RA5" def="_VCAPEN_RA5" />
- <value value="0x0020" name="RA6" def="_VCAPEN_RA6" />
- <value value="0x0030" name="Off" def="_VCAPEN_OFF" />
+ <mask name="VCAP" value="0x0010" >
+ <value value="0x0000" name="RF0" def="_VCAPEN_ON" />
+ <value value="0x0010" name="Off" def="_VCAPEN_OFF" />
</mask>
<mask name="PLLEN" value="0x0100" >
<value value="0x0000" name="Off" def="_PLLEN_OFF" />
@@ -120,8 +118,8 @@
<value value="0x0000" name="2.5" def="_BORV_25" />
</mask>
<mask name="DEBUG" value="0x1000" >
- <value value="0x0000" name="On" def="_nDEBUG_ON" />
- <value value="0x1000" name="Off" def="_nDEBUG_OFF" />
+ <value value="0x0000" name="On" def="_DEBUG_ON" />
+ <value value="0x1000" name="Off" def="_DEBUG_OFF" />
</mask>
<mask name="LVP" value="0x2000" >
<value value="0x0000" name="Off" def="_LVP_OFF" />
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/16F526.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/16F526.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/16F526.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -41,18 +41,18 @@
<!--* Configuration bits ***************************************************-->
<config offset="0x0" name="" wmask="0xFFF" bvalue="0x0FF" >
<mask name="FOSC" value="0x007" >
- <value value="0x000" name="LP" def="_LP_OSC" />
- <value value="0x001" name="XT" def="_XT_OSC" />
- <value value="0x002" name="HS" def="_HS_OSC" />
- <value value="0x003" name="EC_IO" def="_EC_OSC" />
- <value value="0x004" name="INTRC_IO" def="_IntRC_OSC_RB4EN" />
- <value value="0x005" name="INTRC_CLKOUT" def="_IntRC_OSC_CLKOUTEN" />
- <value value="0x006" name="EXTRC_IO" def="_ExtRC_OSC_RB4EN" />
- <value value="0x007" name="EXTRC_CLKOUT" def="_ExtRC_OSC_CLKOUTEN" />
+ <value value="0x000" name="LP" def="_LP_OSC" />
+ <value value="0x001" name="XT" def="_XT_OSC" />
+ <value value="0x002" name="HS" def="_HS_OSC" />
+ <value value="0x003" name="EC_IO" def="_EC_OSC" />
+ <value value="0x004" name="INTRC_IO" def="_IntRC_OSC_RB4" />
+ <value value="0x005" name="INTRC_CLKOUT" def="_IntRC_OSC_CLKOUT" />
+ <value value="0x006" name="EXTRC_IO" def="_ExtRC_OSC_RB4" />
+ <value value="0x007" name="EXTRC_CLKOUT" def="_ExtRC_OSC_CLKOUT" />
</mask>
<mask name="WDT" value="0x008" >
- <value value="0x000" name="Off" def="_WDT_OFF" />
- <value value="0x008" name="On" def="_WDT_ON" />
+ <value value="0x000" name="Off" def="_WDTE_OFF" />
+ <value value="0x008" name="On" def="_WDTE_ON" />
</mask>
<mask name="CP" value="0x010" >
<value value="0x000" name="040:3FE" def="_CP_ON" />
@@ -63,8 +63,8 @@
<value value="0x020" name="External" def="_MCLRE_ON" />
</mask>
<mask name="IOSCFS" value="0x040" >
- <value value="0x000" name="4MHZ" def="_IOSCFS_4MHZ" />
- <value value="0x040" name="8MHZ" def="_IOSCFS_8MHZ" />
+ <value value="0x000" name="4MHZ" def="_IOSCFS_4MHz" />
+ <value value="0x040" name="8MHZ" def="_IOSCFS_8MHz" />
</mask>
<mask name="CPD" value="0x080" >
<value value="0x000" name="All" def="_CPDF_ON" />
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/18F1220.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/18F1220.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/18F1220.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -79,7 +79,7 @@
<value value="0x00" name="4.5" def="_BORV_45" sdcc="_BODENV_4_5V" />
<value value="0x04" name="4.2" def="_BORV_42" sdcc="_BODENV_4_2V" />
<value value="0x08" name="2.7" def="_BORV_27" sdcc="_BODENV_2_7V" />
- <value value="0x0C" name="2.0" def="_BORV_20" sdcc="_BODENV_2_0V" />
+ <value value="0x0C" name="invalid" />
</mask>
</config>
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/18F13K22.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/18F13K22.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/18F13K22.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -89,7 +89,7 @@
<value value="0x00" name="Off" def="_BOREN_OFF" />
<value value="0x02" name="Software" def="_BOREN_ON" />
<value value="0x04" name="On_run" def="_BOREN_NOSLP" />
- <value value="0x06" name="Hardware" def="_BOREN_SBORENDIS" />
+ <value value="0x06" name="Hardware" def="_BOREN_SBORDIS" />
</mask>
<mask name="BORV" value="0x18" >
<value value="0x00" name="3.0" def="_BORV_30" />
@@ -137,7 +137,7 @@
</mask>
</config>
- <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x05" >
+ <config offset="0x6" name="CONFIG4L" wmask="0xFF" bvalue="0x85" >
<mask name="STVREN" value="0x01" >
<value value="0x00" name="Off" def="_STVREN_OFF" />
<value value="0x01" name="On" def="_STVREN_ON" />
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/18F13K50.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/18F13K50.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/18F13K50.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -44,14 +44,14 @@
<!--* Configuration bits ***************************************************-->
<config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" >
<mask name="USBDIV" value="0x20" >
- <value value="0x00" name="1" def="_USBDIV_1"/>
- <value value="0x20" name="2" def="_USBDIV_2"/>
+ <value value="0x00" name="1" def="_USBDIV_OFF"/>
+ <value value="0x20" name="2" def="_USBDIV_ON"/>
</mask>
<mask name="CPUDIV" value="0x18" >
- <value value="0x00" name="1" def="_CPUDIV_OSC1_PLL2"/>
- <value value="0x08" name="2" def="_CPUDIV_OSC2_PLL3"/>
- <value value="0x10" name="3" def="_CPUDIV_OSC3_PLL4"/>
- <value value="0x18" name="4" def="_CPUDIV_OSC4_PLL6"/>
+ <value value="0x00" name="1" def="_CPUDIV_NOCLKDIV"/>
+ <value value="0x08" name="2" def="_CPUDIV_CLKDIV2"/>
+ <value value="0x10" name="3" def="_CPUDIV_CLKDIV3"/>
+ <value value="0x18" name="4" def="_CPUDIV_CLKDIV4"/>
</mask>
</config>
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/18F14K22.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/18F14K22.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/18F14K22.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -90,7 +90,7 @@
<value value="0x00" name="Off" def="_BOREN_OFF" />
<value value="0x02" name="Software" def="_BOREN_ON" />
<value value="0x04" name="On_run" def="_BOREN_NOSLP" />
- <value value="0x06" name="Hardware" def="_BOREN_SBORENDIS" />
+ <value value="0x06" name="Hardware" def="_BOREN_SBORDIS" />
</mask>
<mask name="BORV" value="0x18" >
<value value="0x00" name="3.0" def="_BORV_30" />
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/18F14K50.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/18F14K50.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/18F14K50.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -44,14 +44,14 @@
<!--* Configuration bits ***************************************************-->
<config offset="0x0" name="CONFIG1L" wmask="0xFF" bvalue="0x00" >
<mask name="USBDIV" value="0x20" >
- <value value="0x00" name="1" def="_USBDIV_1"/>
- <value value="0x20" name="2" def="_USBDIV_2"/>
+ <value value="0x00" name="1" def="_USBDIV_OFF"/>
+ <value value="0x20" name="2" def="_USBDIV_ON"/>
</mask>
<mask name="CPUDIV" value="0x18" >
- <value value="0x00" name="1" def="_CPUDIV_OSC1_PLL2"/>
- <value value="0x08" name="2" def="_CPUDIV_OSC2_PLL3"/>
- <value value="0x10" name="3" def="_CPUDIV_OSC3_PLL4"/>
- <value value="0x18" name="4" def="_CPUDIV_OSC4_PLL6"/>
+ <value value="0x00" name="1" def="_CPUDIV_NOCLKDIV"/>
+ <value value="0x08" name="2" def="_CPUDIV_CLKDIV2"/>
+ <value value="0x10" name="3" def="_CPUDIV_CLKDIV3"/>
+ <value value="0x18" name="4" def="_CPUDIV_CLKDIV4"/>
</mask>
</config>
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/18F43K22.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/18F43K22.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/18F43K22.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -139,8 +139,8 @@
<value value="0x02" name="analog" def="_PBADEN_ON" />
</mask>
<mask name="CCP3MX" value="0x04" >
- <value value="0x00" name="RC6" def="_CCP3MX_PORTC6" />
- <value value="0x04" name="RB5" def="_CCP3MX_PORTB5" />
+ <value value="0x00" name="RE0" def="_CCP3MX_PORTE0" />
+ <value value="0x04" name="RB5" def="_CCP3MX_PORTB5" />
</mask>
<mask name="HFOFST" value="0x08" >
<value value="0x00" name="Off" def="_HFOFST_OFF" />
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/18F4450.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/18F4450.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/18F4450.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -162,8 +162,8 @@
<value value="0x08" name="2048" def="_BBSIZ_BB2K" />
</mask>
<mask name="ICPORT" value="0x20" >
- <value value="0x00" name="On" def="_ICPORT_ON" />
- <value value="0x20" name="Off" def="_ICPORT_OFF" />
+ <value value="0x00" name="On" def="_ICPRT_ON" />
+ <value value="0x20" name="Off" def="_ICPRT_OFF" />
</mask>
<mask name="XINST" value="0x40" >
<value value="0x00" name="Off" def="_XINST_OFF" />
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/18F44K22.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/18F44K22.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/18F44K22.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -140,8 +140,8 @@
<value value="0x02" name="analog" def="_PBADEN_ON" />
</mask>
<mask name="CCP3MX" value="0x04" >
- <value value="0x00" name="RC6" def="_CCP3MX_PORTC6" />
- <value value="0x04" name="RB5" def="_CCP3MX_PORTB5" />
+ <value value="0x00" name="RE0" def="_CCP3MX_PORTE0" />
+ <value value="0x04" name="RB5" def="_CCP3MX_PORTB5" />
</mask>
<mask name="HFOFST" value="0x08" >
<value value="0x00" name="Off" def="_HFOFST_OFF" />
@@ -292,7 +292,7 @@
<pin index="40" name="RB7/PGD" />
</package>
- <!-- <package types="uqfn" nb_pins="40" >
+ <!-- <package types="uqfn" nb_pins="40" >
Error compiling Fatal [18F43K22]: Package qfn does not have the correct number of pins 40 (0)
same problem in 18F44K22, 18F45K22, 18F46K22
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/18F45K22.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/18F45K22.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/18F45K22.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -139,8 +139,8 @@
<value value="0x02" name="analog" def="_PBADEN_ON" />
</mask>
<mask name="CCP3MX" value="0x04" >
- <value value="0x00" name="RC6" def="_CCP3MX_PORTC6" />
- <value value="0x04" name="RB5" def="_CCP3MX_PORTB5" />
+ <value value="0x00" name="RE0" def="_CCP3MX_PORTE0" />
+ <value value="0x04" name="RB5" def="_CCP3MX_PORTB5" />
</mask>
<mask name="HFOFST" value="0x08" >
<value value="0x00" name="Off" def="_HFOFST_OFF" />
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/18F46K22.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/18F46K22.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/18F46K22.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -139,8 +139,8 @@
<value value="0x02" name="analog" def="_PBADEN_ON" />
</mask>
<mask name="CCP3MX" value="0x04" >
- <value value="0x00" name="RC6" def="_CCP3MX_PORTC6" />
- <value value="0x04" name="RB5" def="_CCP3MX_PORTB5" />
+ <value value="0x00" name="RE0" def="_CCP3MX_PORTE0" />
+ <value value="0x04" name="RB5" def="_CCP3MX_PORTB5" />
</mask>
<mask name="HFOFST" value="0x08" >
<value value="0x00" name="Off" def="_HFOFST_OFF" />
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/18F6310.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/18F6310.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/18F6310.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -109,12 +109,6 @@
</config>
<config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" >
- <mask name="PM" value="0x03" >
- <value value="0x00" name="Extended microcontroller" def="_PM_EM" />
- <value value="0x01" name="Microprocessor with boot" def="_PM_MPB" />
- <value value="0x02" name="Microprocessor" def="_PM_MP" />
- <value value="0x03" name="Microcontroller" def="_PM_MC" />
- </mask>
<mask name="BW" value="0x40" >
<value value="0x00" name="8" def="_BW_8" />
<value value="0x40" name="16" def="_BW_16" />
@@ -170,12 +164,7 @@
<config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" />
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" >
- <mask name="EBTR" value="0x01" >
- <value value="0x00" name="All" def="_EBTR_ON" />
- <value value="0x01" name="Off" def="_EBTR_OFF" />
- </mask>
- </config>
+ <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x00" />
<config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" />
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/18F6390.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/18F6390.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/18F6390.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -108,22 +108,7 @@
</mask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" >
- <mask name="PM" value="0x03" >
- <value value="0x00" name="Extended microcontroller" def="_PM_EM" />
- <value value="0x01" name="Microprocessor with boot" def="_PM_MPB" />
- <value value="0x02" name="Microprocessor" def="_PM_MP" />
- <value value="0x03" name="Microcontroller" def="_PM_MC" />
- </mask>
- <mask name="BW" value="0x40" >
- <value value="0x00" name="8" def="_BW_8" />
- <value value="0x40" name="16" def="_BW_16" />
- </mask>
- <mask name="WAIT" value="0x80" >
- <value value="0x00" name="On" def="_WAIT_ON" />
- <value value="0x80" name="Off" def="_WAIT_OFF" />
- </mask>
- </config>
+ <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
<config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
<mask name="CCP2MX" value="0x01" >
@@ -170,12 +155,7 @@
<config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" />
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" >
- <mask name="EBTR" value="0x01" >
- <value value="0x00" name="All" def="_EBTR_ON" />
- <value value="0x01" name="Off" def="_EBTR_OFF" />
- </mask>
- </config>
+ <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x00" />
<config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" />
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/18F6410.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/18F6410.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/18F6410.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -109,12 +109,6 @@
</config>
<config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" >
- <mask name="PM" value="0x03" >
- <value value="0x00" name="Extended microcontroller" def="_PM_EM" />
- <value value="0x01" name="Microprocessor with boot" def="_PM_MPB" />
- <value value="0x02" name="Microprocessor" def="_PM_MP" />
- <value value="0x03" name="Microcontroller" def="_PM_MC" />
- </mask>
<mask name="BW" value="0x40" >
<value value="0x00" name="8" def="_BW_8" />
<value value="0x40" name="16" def="_BW_16" />
@@ -170,12 +164,7 @@
<config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" />
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" >
- <mask name="EBTR" value="0x01" >
- <value value="0x00" name="All" def="_EBTR_ON" />
- <value value="0x01" name="Off" def="_EBTR_OFF" />
- </mask>
- </config>
+ <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x00" />
<config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" />
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/18F6490.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/18F6490.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/18F6490.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -108,22 +108,7 @@
</mask>
</config>
- <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0xC3" >
- <mask name="PM" value="0x03" >
- <value value="0x00" name="Extended microcontroller" def="_PM_EM" />
- <value value="0x01" name="Microprocessor with boot" def="_PM_MPB" />
- <value value="0x02" name="Microprocessor" def="_PM_MP" />
- <value value="0x03" name="Microcontroller" def="_PM_MC" />
- </mask>
- <mask name="BW" value="0x40" >
- <value value="0x00" name="8" def="_BW_8" />
- <value value="0x40" name="16" def="_BW_16" />
- </mask>
- <mask name="WAIT" value="0x80" >
- <value value="0x00" name="On" def="_WAIT_ON" />
- <value value="0x80" name="Off" def="_WAIT_OFF" />
- </mask>
- </config>
+ <config offset="0x4" name="CONFIG3L" wmask="0xFF" bvalue="0x00" />
<config offset="0x5" name="CONFIG3H" wmask="0xFF" bvalue="0x81" >
<mask name="CCP2MX" value="0x01" >
@@ -170,12 +155,7 @@
<config offset="0xB" name="CONFIG6H" wmask="0xFF" bvalue="0x00" />
- <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x01" >
- <mask name="EBTR" value="0x01" >
- <value value="0x00" name="All" def="_EBTR_ON" />
- <value value="0x01" name="Off" def="_EBTR_OFF" />
- </mask>
- </config>
+ <config offset="0xC" name="CONFIG7L" wmask="0xFF" bvalue="0x00" />
<config offset="0xD" name="CONFIG7H" wmask="0xFF" bvalue="0x00" />
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/18F6527.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/18F6527.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/18F6527.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -100,12 +100,12 @@
<value value="0x0E" name="1:128" def="_WDTPS_128" />
<value value="0x10" name="1:256" def="_WDTPS_256" />
<value value="0x12" name="1:512" def="_WDTPS_512" />
- <value value="0x14" name="1:1024" def="_WDTPS_1K" />
- <value value="0x16" name="1:2048" def="_WDTPS_2K" />
- <value value="0x18" name="1:4096" def="_WDTPS_4K" />
- <value value="0x1A" name="1:8192" def="_WDTPS_8K" />
- <value value="0x1C" name="1:16384" def="_WDTPS_16K" />
- <value value="0x1E" name="1:32768" def="_WDTPS_32K" />
+ <value value="0x14" name="1:1024" def="_WDTPS_1024" />
+ <value value="0x16" name="1:2048" def="_WDTPS_2048" />
+ <value value="0x18" name="1:4096" def="_WDTPS_4096" />
+ <value value="0x1A" name="1:8192" def="_WDTPS_8192" />
+ <value value="0x1C" name="1:16384" def="_WDTPS_16384" />
+ <value value="0x1E" name="1:32768" def="_WDTPS_32768" />
</mask>
</config>
Modified: trunk/piklab_kde4/src/devices/pic/xml_data/18F6622.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/18F6622.xml 2012-10-20 23:40:25 UTC (rev 2979)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/18F6622.xml 2012-10-21 20:10:56 UTC (rev 2980)
@@ -100,12 +100,12 @@
<value value="0x0E" name="1:128" def="_WDTPS_128" />
<value value="0x10" name="1:256" def="_WDTPS_256" />
<value value="0x12" name="1:512" def="_WDTPS_512" />
- <value value="0x14" name="1:1024" def="_WDTPS_1K" />
- <value value="0x16" name="1:2048" def="_WDTPS_2K" />
- <value value="0x18" name="1:4096" d...
[truncated message content] |
|
From: <az...@us...> - 2012-10-20 23:40:34
|
Revision: 2979
http://piklab.svn.sourceforge.net/piklab/?rev=2979&view=rev
Author: azhyd
Date: 2012-10-20 23:40:25 +0000 (Sat, 20 Oct 2012)
Log Message:
-----------
clean-up libraries list for linking
Modified Paths:
--------------
trunk/piklab_kde4/Changelog
trunk/piklab_kde4/cmake/Piklab.cmake
trunk/piklab_kde4/src/coff/xml/CMakeLists.txt
trunk/piklab_kde4/src/data/CMakeLists.txt
trunk/piklab_kde4/src/dev-utils/dev_config_check/CMakeLists.txt
trunk/piklab_kde4/src/dev-utils/gen_device_xml/CMakeLists.txt
trunk/piklab_kde4/src/dev-utils/html_generator/CMakeLists.txt
trunk/piklab_kde4/src/dev-utils/inc_parser/CMakeLists.txt
trunk/piklab_kde4/src/dev-utils/list_generator/CMakeLists.txt
trunk/piklab_kde4/src/dev-utils/pickit2_to_data/CMakeLists.txt
trunk/piklab_kde4/src/dev-utils/pickit3_dds_parser/CMakeLists.txt
trunk/piklab_kde4/src/dev-utils/picp_check/CMakeLists.txt
trunk/piklab_kde4/src/dev-utils/reg_extractor/CMakeLists.txt
trunk/piklab_kde4/src/dev-utils/usb_snoop_filter/CMakeLists.txt
trunk/piklab_kde4/src/dev-utils/usbmon_filter/CMakeLists.txt
trunk/piklab_kde4/src/devices/mem24/xml/CMakeLists.txt
trunk/piklab_kde4/src/devices/pic/base/CMakeLists.txt
trunk/piklab_kde4/src/devices/pic/xml/CMakeLists.txt
trunk/piklab_kde4/src/piklab/CMakeLists.txt
trunk/piklab_kde4/src/piklab-coff/CMakeLists.txt
trunk/piklab_kde4/src/piklab-hex/CMakeLists.txt
trunk/piklab_kde4/src/piklab-prog/CMakeLists.txt
trunk/piklab_kde4/src/piklab-test/build/CMakeLists.txt
trunk/piklab_kde4/src/piklab-test/checksum/CMakeLists.txt
trunk/piklab_kde4/src/piklab-test/generators/CMakeLists.txt
trunk/piklab_kde4/src/piklab-test/misc/CMakeLists.txt
trunk/piklab_kde4/src/piklab-test/save_load_memory/CMakeLists.txt
trunk/piklab_kde4/src/progs/direct/xml/CMakeLists.txt
trunk/piklab_kde4/src/progs/icd1/xml/CMakeLists.txt
trunk/piklab_kde4/src/progs/icd2/xml/CMakeLists.txt
trunk/piklab_kde4/src/progs/icd3/xml/CMakeLists.txt
trunk/piklab_kde4/src/progs/open_prog/xml/CMakeLists.txt
trunk/piklab_kde4/src/progs/picdem_bootloader/xml/CMakeLists.txt
trunk/piklab_kde4/src/progs/pickit1/xml/CMakeLists.txt
trunk/piklab_kde4/src/progs/pickit2/xml/CMakeLists.txt
trunk/piklab_kde4/src/progs/pickit2_bootloader/xml/CMakeLists.txt
trunk/piklab_kde4/src/progs/pickit3/xml/CMakeLists.txt
trunk/piklab_kde4/src/progs/psp/xml/CMakeLists.txt
trunk/piklab_kde4/src/progs/tbl_bootloader/xml/CMakeLists.txt
trunk/piklab_kde4/src/xml_to_data/CMakeLists.txt
Modified: trunk/piklab_kde4/Changelog
===================================================================
--- trunk/piklab_kde4/Changelog 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/Changelog 2012-10-20 23:40:25 UTC (rev 2979)
@@ -12,7 +12,7 @@
* fixed parsing for jalv2
* fixed template generator for jalv2
* fixed sdcc generator for latest sdcc [patch by Antonio Augusto Todo Bom Neto]
-* add libraries libm, libio, and libc by default sdcc linker arguments [requested by Antonio Augusto Todo Bom Neto]
+* add libraries libm, libio, and libc to default sdcc linker arguments [requested by Antonio Augusto Todo Bom Neto]
* fixed log views to properly read setting [reported by Luis Claudio Gambôa Lopes]
* fixed config generator text field to expand properly [report by Alain Portal]
* support firmware directory with space [reported by Luis Claudio Gambôa Lopes]
Modified: trunk/piklab_kde4/cmake/Piklab.cmake
===================================================================
--- trunk/piklab_kde4/cmake/Piklab.cmake 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/cmake/Piklab.cmake 2012-10-20 23:40:25 UTC (rev 2979)
@@ -51,14 +51,25 @@
if(QT_ONLY)
add_definitions(-DNO_KDE)
- set(EXE_LIBS ${QT_LIBRARIES} ${READLINE_LIBRARIES} ${NCURSES_LIBRARIES})
- set(GUI_LIBS nokde_gui ${EXE_LIBS} ${LIBUSB_LIBRARIES})
+ set(BASE_LIBS ${QT_LIBRARIES} ${READLINE_LIBRARIES} ${NCURSES_LIBRARIES} ${LIBUSB_LIBRARIES})
+ set(GUI_LIBS nokde_gui ${BASE_LIBS})
else(QT_ONLY)
find_package(KDE4 REQUIRED)
add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
include_directories( ${KDE4_INCLUDES})
- set(EXE_LIBS ${QT_LIBRARIES} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${READLINE_LIBRARIES} ${NCURSES_LIBRARIES})
- set(GUI_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${EXE_LIBS} kde_gui ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KFILE_LIBS} ${LIBUSB_LIBRARIES})
+ set(BASE_LIBS ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${QT_LIBRARIES} ${READLINE_LIBRARIES} ${NCURSES_LIBRARIES} ${LIBUSB_LIBRARIES})
+ set(GUI_LIBS kde_gui ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KFILE_LIBS} ${BASE_LIBS})
endif(QT_ONLY)
+set(DEV_LIBS coff global pic picbase picxml mem24 mem24base mem24xml devicebase common ${BASE_LIBS})
+set(PROG_LIBS picdembootloader pickit2bootloader tblbootloader bootloader gpsim psp pickit1 pickit3 pickit3data
+ pickit2v2 pickit2 icd3 icd1 icd2 icd2data directprog mem24prog picprog progmanager progbase port ${DEV_LIBS})
+set(DEV_CLI_LIBS cli devicelistnoui ${DEV_LIBS})
+set(PROG_CLI_LIBS proglistnoui ${PROG_LIBS} ${DEV_CLI_LIBS})
+set(PIKLAB_LIBS gui toollist cc5xui boostui mpcui ccscui c18ui jalv2ui jalui pic30ui piccui sdccui gputilsui
+ customtool cc5x boost mpc ccsc c18 jalv2 jal pic30 picc sdcc gputils toolui toolbase proglistui customprogui
+ picdembootloaderui pickit2bootloaderui tblbootloaderui bootloaderui gpsimui pspui pickit1ui
+ pickit3ui pickit2v2ui pickit2ui icd1ui icd2ui directui progui customprog ${PROG_LIBS}
+ devicelistui mem24ui picui deviceui commonui ${DEV_LIBS} ${GUI_LIBS})
+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
Modified: trunk/piklab_kde4/src/coff/xml/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/coff/xml/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/coff/xml/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -5,10 +5,8 @@
xml_coff_parser.cpp
)
automoc(${xml_coff_parser_SRCS})
-
add_executable(xml_coff_parser ${xml_coff_parser_SRCS})
target_link_libraries(xml_coff_parser devicelistnoui pic
picbase picxml mem24 mem24base mem24xml
xmltodata devicebase common
- ${EXE_LIBS}
-)
+ ${BASE_LIBS})
Modified: trunk/piklab_kde4/src/data/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/data/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/data/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -5,7 +5,7 @@
)
automoc(${syntax_xml_generator_SRCS})
add_executable(syntax_xml_generator ${syntax_xml_generator_SRCS})
-target_link_libraries(syntax_xml_generator ${EXE_LIBS})
+target_link_libraries(syntax_xml_generator ${BASE_LIBS})
ADD_CUSTOM_COMMAND(
OUTPUT asm-pic.xml coff-pic.xml
Modified: trunk/piklab_kde4/src/dev-utils/dev_config_check/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/dev-utils/dev_config_check/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/dev-utils/dev_config_check/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -5,10 +5,4 @@
)
automoc(${dev_config_check_SRCS})
add_executable(dev_config_check ${dev_config_check_SRCS})
-target_link_libraries(dev_config_check
- devparser
- devicelistnoui
- pic picbase picxml mem24 mem24base mem24xml
- devicebase global common
- ${EXE_LIBS}
-)
\ No newline at end of file
+target_link_libraries(dev_config_check devparser ${DEV_CLI_LIBS})
Modified: trunk/piklab_kde4/src/dev-utils/gen_device_xml/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/dev-utils/gen_device_xml/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/dev-utils/gen_device_xml/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -5,10 +5,4 @@
)
automoc(${gen_device_xml_SRCS})
add_executable(gen_device_xml ${gen_device_xml_SRCS})
-target_link_libraries(gen_device_xml
- coff devicelistnoui
- pic picbase picxml mem24 mem24base mem24xml
- devicebase common
- ${EXE_LIBS}
- ${LIBUSB_LIBRARIES}
-)
+target_link_libraries(gen_device_xml ${DEV_CLI_LIBS})
Modified: trunk/piklab_kde4/src/dev-utils/html_generator/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/dev-utils/html_generator/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/dev-utils/html_generator/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -5,15 +5,4 @@
)
automoc(${html_generator_SRCS})
add_executable(html_generator ${html_generator_SRCS})
-target_link_libraries(html_generator
- generator proglistnoui
- picdembootloader pickit2bootloader tblbootloader
- bootloader gpsim psp pickit1
- pickit3 pickit3data pickit2v2 pickit2 icd3 icd1 icd2 icd2data directprog
- mem24prog picprog progmanager progbase
- coff port cli devicelistnoui
- pic picbase picxml mem24 mem24base mem24xml
- devicebase global common
- ${EXE_LIBS}
- ${LIBUSB_LIBRARIES}
-)
+target_link_libraries(html_generator generator ${PROG_CLI_LIBS})
Modified: trunk/piklab_kde4/src/dev-utils/inc_parser/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/dev-utils/inc_parser/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/dev-utils/inc_parser/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -4,11 +4,5 @@
inc_parser.cpp
)
automoc(${inc_parser_SRCS})
-
add_executable(inc_parser ${inc_parser_SRCS})
-target_link_libraries(inc_parser
- coff devicelistnoui
- pic picbase picxml mem24 mem24base mem24xml
- devicebase global common
- ${EXE_LIBS}
-)
+target_link_libraries(inc_parser ${DEV_CLI_LIBS})
Modified: trunk/piklab_kde4/src/dev-utils/list_generator/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/dev-utils/list_generator/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/dev-utils/list_generator/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -5,24 +5,4 @@
)
automoc(${list_generator_SRCS})
add_executable(list_generator ${list_generator_SRCS})
-target_link_libraries(list_generator generator
- gui toollist
- cc5xui boostui mpcui ccscui c18ui jalv2ui
- jalui pic30ui piccui sdccui gputilsui
- customtool cc5x boost mpc ccsc c18 jalv2 jal pic30 picc sdcc gputils
- toolui toolbase
- proglistui customprogui
- picdembootloaderui pickit2bootloaderui tblbootloaderui
- bootloaderui gpsimui pspui pickit1ui
- pickit3ui pickit2v2ui pickit2ui icd1ui icd2ui directui progui
- customprog
- picdembootloader pickit2bootloader tblbootloader
- bootloader gpsim psp pickit1
- pickit3 pickit3data pickit2v2 pickit2 icd1 icd2 icd2data directprog
- mem24prog picprog progmanager progbase
- coff port global
- devicelistui mem24ui picui deviceui commonui
- pic picbase picxml mem24 mem24base mem24xml
- devicebase common
- ${GUI_LIBS}
-)
+target_link_libraries(list_generator generator ${PIKLAB_LIBS})
Modified: trunk/piklab_kde4/src/dev-utils/pickit2_to_data/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/dev-utils/pickit2_to_data/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/dev-utils/pickit2_to_data/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -5,9 +5,4 @@
)
automoc(${pickit2_to_data_SRCS})
add_executable(pickit2_to_data ${pickit2_to_data_SRCS})
-target_link_libraries(pickit2_to_data
- devicelistnoui
- pic picbase picxml mem24 mem24base mem24xml
- devicebase global common
- ${EXE_LIBS}
-)
+target_link_libraries(pickit2_to_data ${DEV_CLI_LIBS})
Modified: trunk/piklab_kde4/src/dev-utils/pickit3_dds_parser/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/dev-utils/pickit3_dds_parser/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/dev-utils/pickit3_dds_parser/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -4,17 +4,5 @@
pickit3_dds_parser.cpp
)
automoc(${pickit3_dds_parser_SRCS})
-
add_executable(pickit3_dds_parser ${pickit3_dds_parser_SRCS})
-target_link_libraries(pickit3_dds_parser
- proglistnoui
- picdembootloader pickit2bootloader tblbootloader
- bootloader gpsim psp pickit1
- pickit3 pickit3data pickit2v2 pickit2 icd3 icd1 icd2 icd2data directprog
- mem24prog picprog progmanager progbase
- coff port cli global devicelistnoui
- pic picbase picxml mem24 mem24base mem24xml
- devicebase common
- ${EXE_LIBS}
- ${LIBUSB_LIBRARIES}
-)
+target_link_libraries(pickit3_dds_parser ${PROG_CLI_LIBS})
Modified: trunk/piklab_kde4/src/dev-utils/picp_check/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/dev-utils/picp_check/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/dev-utils/picp_check/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -6,15 +6,4 @@
)
automoc(${picp_check_SRCS})
add_executable(picp_check ${picp_check_SRCS})
-target_link_libraries(picp_check
- proglistnoui
- picdembootloader pickit2bootloader tblbootloader
- bootloader gpsim psp pickit1
- pickit3 pickit3data pickit2v2 pickit2 icd3 icd1 icd2 icd2data directprog
- mem24prog picprog progmanager progbase
- coff port cli global devicelistnoui
- pic picbase picxml mem24 mem24base mem24xml
- devicebase common
- ${EXE_LIBS}
- ${LIBUSB_LIBRARIES}
-)
+target_link_libraries(picp_check ${PROG_CLI_LIBS})
Modified: trunk/piklab_kde4/src/dev-utils/reg_extractor/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/dev-utils/reg_extractor/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/dev-utils/reg_extractor/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -5,10 +5,4 @@
)
automoc(${reg_extractor_SRCS})
add_executable(reg_extractor ${reg_extractor_SRCS})
-target_link_libraries(reg_extractor
- devparser
- devicelistnoui
- pic picbase picxml mem24 mem24base mem24xml
- devicebase global common
- ${EXE_LIBS}
-)
\ No newline at end of file
+target_link_libraries(reg_extractor devparser ${DEV_CLI_LIBS})
Modified: trunk/piklab_kde4/src/dev-utils/usb_snoop_filter/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/dev-utils/usb_snoop_filter/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/dev-utils/usb_snoop_filter/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -4,9 +4,5 @@
usb_snoop_filter.cpp
)
automoc(${usb_snoop_filter_SRCS})
-
add_executable(usb_snoop_filter ${usb_snoop_filter_SRCS})
-target_link_libraries(usb_snoop_filter
- cli global common
- ${EXE_LIBS}
-)
+target_link_libraries(usb_snoop_filter cli global common ${BASE_LIBS})
Modified: trunk/piklab_kde4/src/dev-utils/usbmon_filter/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/dev-utils/usbmon_filter/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/dev-utils/usbmon_filter/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -4,9 +4,5 @@
usbmon_filter.cpp
)
automoc(${usbmon_filter_SRCS})
-
add_executable(usbmon_filter ${usbmon_filter_SRCS})
-target_link_libraries(usbmon_filter
- cli global common
- ${EXE_LIBS}
-)
+target_link_libraries(usbmon_filter cli global common ${BASE_LIBS})
Modified: trunk/piklab_kde4/src/devices/mem24/xml/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/devices/mem24/xml/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/devices/mem24/xml/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -4,6 +4,5 @@
mem24_xml_to_data.cpp
)
automoc(${mem24_xml_to_data_SRCS})
-
add_executable(mem24_xml_to_data ${mem24_xml_to_data_SRCS})
-target_link_libraries(mem24_xml_to_data mem24base xmltodata devicebase common ${EXE_LIBS})
+target_link_libraries(mem24_xml_to_data mem24base xmltodata devicebase common ${BASE_LIBS})
Modified: trunk/piklab_kde4/src/devices/pic/base/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/devices/pic/base/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/devices/pic/base/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -5,7 +5,7 @@
)
automoc(${pic_prog_family_xml_to_data_SRCS})
add_executable(pic_prog_family_xml_to_data ${pic_prog_family_xml_to_data_SRCS})
-target_link_libraries(pic_prog_family_xml_to_data xmltodata devicebase common ${EXE_LIBS})
+target_link_libraries(pic_prog_family_xml_to_data xmltodata devicebase common ${BASE_LIBS})
FILE(GLOB PROG_XML_DEPEND RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/*.xml")
ADD_CUSTOM_COMMAND(
Modified: trunk/piklab_kde4/src/devices/pic/xml/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/devices/pic/xml/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -5,4 +5,4 @@
)
automoc(${pic_xml_to_data_SRCS})
add_executable(pic_xml_to_data ${pic_xml_to_data_SRCS})
-target_link_libraries(pic_xml_to_data picbase xmltodata devicebase common ${EXE_LIBS})
+target_link_libraries(pic_xml_to_data picbase xmltodata devicebase common ${BASE_LIBS})
Modified: trunk/piklab_kde4/src/piklab/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/piklab/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/piklab/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -5,25 +5,6 @@
)
automoc(${piklab_SRCS})
add_executable(piklab ${piklab_SRCS})
-target_link_libraries(piklab gui toollist
- cc5xui boostui mpcui ccscui c18ui jalv2ui
- jalui pic30ui piccui sdccui gputilsui
- customtool cc5x boost mpc ccsc c18 jalv2 jal pic30 picc sdcc gputils
- toolui toolbase
- proglistui customprogui
- picdembootloaderui pickit2bootloaderui tblbootloaderui
- bootloaderui gpsimui pspui pickit1ui
- pickit3ui pickit2v2ui pickit2ui icd1ui icd2ui directui progui
- customprog
- picdembootloader pickit2bootloader tblbootloader
- bootloader gpsim psp pickit1
- pickit3 pickit3data pickit2v2 pickit2 icd1 icd2 icd2data directprog
- mem24prog picprog progmanager progbase
- coff port global
- devicelistui mem24ui picui deviceui commonui
- pic picbase picxml mem24 mem24base mem24xml
- devicebase common
- ${GUI_LIBS}
-)
+target_link_libraries(piklab ${PIKLAB_LIBS})
install(TARGETS piklab DESTINATION bin)
Modified: trunk/piklab_kde4/src/piklab-coff/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/piklab-coff/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/piklab-coff/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -4,13 +4,7 @@
main.cpp
)
automoc(${piklab_coff_SRCS})
-
add_executable(piklab-coff ${piklab_coff_SRCS})
-target_link_libraries(piklab-coff
- cli coff global
- devicelistnoui pic picbase picxml mem24 mem24base mem24xml
- devicebase common
- ${EXE_LIBS}
-)
+target_link_libraries(piklab-coff ${DEV_CLI_LIBS})
install(TARGETS piklab-coff DESTINATION bin)
Modified: trunk/piklab_kde4/src/piklab-hex/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/piklab-hex/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/piklab-hex/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -4,13 +4,7 @@
main.cpp
)
automoc(${piklab_hex_SRCS})
-
add_executable(piklab-hex ${piklab_hex_SRCS})
-target_link_libraries(piklab-hex
- cli global devicelistnoui
- pic picbase picxml mem24 mem24base mem24xml
- devicebase common
- ${EXE_LIBS}
-)
+target_link_libraries(piklab-hex ${DEV_CLI_LIBS})
install(TARGETS piklab-hex DESTINATION bin)
Modified: trunk/piklab_kde4/src/piklab-prog/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/piklab-prog/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/piklab-prog/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -6,19 +6,7 @@
cli_debug_manager.cpp
)
automoc(${piklab_prog_SRCS})
-
add_executable(piklab-prog ${piklab_prog_SRCS})
-target_link_libraries(piklab-prog
- proglistnoui
- picdembootloader pickit2bootloader tblbootloader
- bootloader gpsim psp pickit1
- pickit3 pickit3data pickit2v2 pickit2 icd3 icd1 icd2 icd2data directprog
- mem24prog picprog progmanager progbase
- coff port cli global devicelistnoui
- pic picbase picxml mem24 mem24base mem24xml
- devicebase common
- ${EXE_LIBS}
- ${LIBUSB_LIBRARIES}
-)
+target_link_libraries(piklab-prog ${PROG_CLI_LIBS})
install(TARGETS piklab-prog DESTINATION bin)
Modified: trunk/piklab_kde4/src/piklab-test/build/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/piklab-test/build/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/piklab-test/build/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -5,24 +5,4 @@
)
automoc(${build_check_SRCS})
add_executable(build_check ${build_check_SRCS})
-target_link_libraries(build_check
- gui_test gui toollist
- cc5xui boostui mpcui ccscui c18ui jalv2ui
- jalui pic30ui piccui sdccui gputilsui
- customtool cc5x boost mpc ccsc c18 jalv2 jal pic30 picc sdcc gputils
- toolui toolbase
- proglistui customprogui
- picdembootloaderui pickit2bootloaderui tblbootloaderui
- bootloaderui gpsimui pspui pickit1ui
- pickit3ui pickit2v2ui pickit2ui icd1ui icd2ui directui progui
- customprog
- picdembootloader pickit2bootloader tblbootloader
- bootloader gpsim psp pickit1
- pickit3 pickit3data pickit2v2 pickit2 icd1 icd2 icd2data directprog
- mem24prog picprog progmanager progbase
- coff port global
- devicelistui mem24ui picui deviceui commonui
- pic picbase picxml mem24 mem24base mem24xml
- devicebase common
- ${GUI_LIBS}
-)
+target_link_libraries(build_check gui_test ${PIKLAB_LIBS})
Modified: trunk/piklab_kde4/src/piklab-test/checksum/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/piklab-test/checksum/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/piklab-test/checksum/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -4,11 +4,5 @@
checksum_check.cpp
)
automoc(${checksum_check_SRCS})
-
add_executable(checksum_check ${checksum_check_SRCS})
-target_link_libraries(checksum_check
- test cli global devicelistnoui
- pic picbase picxml mem24 mem24base mem24xml
- devicebase common
- ${EXE_LIBS}
-)
+target_link_libraries(checksum_check test ${DEV_CLI_LIBS})
Modified: trunk/piklab_kde4/src/piklab-test/generators/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/piklab-test/generators/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/piklab-test/generators/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -5,33 +5,18 @@
)
automoc(${gputils_config_generator_check_SRCS})
add_executable(gputils_config_generator_check ${gputils_config_generator_check_SRCS})
-target_link_libraries(gputils_config_generator_check
- test cli global sdcc gputils coff devicelistnoui
- pic picbase picxml mem24 mem24base mem24xml
- devicebase common
- ${EXE_LIBS}
-)
+target_link_libraries(gputils_config_generator_check test sdcc gputils ${DEV_CLI_LIBS})
SET(gputils_template_generator_check_SRCS
gputils_template_generator_check.cpp
)
automoc(${gputils_template_generator_check_SRCS})
add_executable(gputils_template_generator_check ${gputils_template_generator_check_SRCS})
-target_link_libraries(gputils_template_generator_check
- test cli global sdcc gputils coff devicelistnoui
- pic picbase picxml mem24 mem24base mem24xml
- devicebase common
- ${EXE_LIBS}
-)
+target_link_libraries(gputils_template_generator_check test sdcc gputils ${DEV_CLI_LIBS})
SET(sdcc_config_generator_check_SRCS
sdcc_config_generator_check.cpp
)
automoc(${sdcc_config_generator_check_SRCS})
add_executable(sdcc_config_generator_check ${sdcc_config_generator_check_SRCS})
-target_link_libraries(sdcc_config_generator_check
- test cli global sdcc gputils coff devicelistnoui
- pic picbase picxml mem24 mem24base mem24xml
- devicebase common
- ${EXE_LIBS}
-)
+target_link_libraries(sdcc_config_generator_check test sdcc gputils ${DEV_CLI_LIBS})
Modified: trunk/piklab_kde4/src/piklab-test/misc/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/piklab-test/misc/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/piklab-test/misc/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -5,7 +5,4 @@
)
automoc(${misc_check_SRCS})
add_executable(misc_check ${misc_check_SRCS})
-target_link_libraries(misc_check
- cli global common
- ${EXE_LIBS}
-)
+target_link_libraries(misc_check ${DEV_CLI_LIBS})
Modified: trunk/piklab_kde4/src/piklab-test/save_load_memory/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/piklab-test/save_load_memory/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/piklab-test/save_load_memory/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -5,9 +5,4 @@
)
automoc(${save_load_memory_check_SRCS})
add_executable(save_load_memory_check ${save_load_memory_check_SRCS})
-target_link_libraries(save_load_memory_check
- test cli global coff devicelistnoui
- pic picbase picxml mem24 mem24base mem24xml
- devicebase common
- ${EXE_LIBS}
-)
+target_link_libraries(save_load_memory_check test ${DEV_CLI_LIBS})
Modified: trunk/piklab_kde4/src/progs/direct/xml/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/progs/direct/xml/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/progs/direct/xml/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -3,10 +3,5 @@
SET(xml_direct_parser_SRCS
xml_direct_parser.cpp
)
-
add_executable(xml_direct_parser ${xml_direct_parser_SRCS})
-target_link_libraries(xml_direct_parser
- devicelistnoui pic picbase picxml
- mem24 mem24base mem24xml xmltodata devicebase common
- ${EXE_LIBS}
-)
+target_link_libraries(xml_direct_parser xmltodata ${DEV_CLI_LIBS})
Modified: trunk/piklab_kde4/src/progs/icd1/xml/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/progs/icd1/xml/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/progs/icd1/xml/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -3,10 +3,5 @@
SET(xml_icd1_parser_SRCS
xml_icd1_parser.cpp
)
-
add_executable(xml_icd1_parser ${xml_icd1_parser_SRCS})
-target_link_libraries(xml_icd1_parser
- devicelistnoui pic picbase picxml
- mem24 mem24base mem24xml xmltodata devicebase common
- ${EXE_LIBS}
-)
+target_link_libraries(xml_icd1_parser xmltodata ${DEV_CLI_LIBS})
Modified: trunk/piklab_kde4/src/progs/icd2/xml/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/progs/icd2/xml/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/progs/icd2/xml/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -3,10 +3,5 @@
SET(xml_icd2_parser_SRCS
xml_icd2_parser.cpp
)
-
add_executable(xml_icd2_parser ${xml_icd2_parser_SRCS})
-target_link_libraries(xml_icd2_parser
- icd2data devicelistnoui pic picbase picxml
- mem24 mem24base mem24xml xmltodata devicebase common
- ${EXE_LIBS}
-)
+target_link_libraries(xml_icd2_parser icd2data xmltodata ${DEV_CLI_LIBS})
Modified: trunk/piklab_kde4/src/progs/icd3/xml/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/progs/icd3/xml/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/progs/icd3/xml/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -3,10 +3,5 @@
SET(xml_icd3_parser_SRCS
xml_icd3_parser.cpp
)
-
add_executable(xml_icd3_parser ${xml_icd3_parser_SRCS})
-target_link_libraries(xml_icd3_parser
- icd3data devicelistnoui pic picbase picxml
- mem24 mem24base mem24xml xmltodata devicebase common
- ${EXE_LIBS}
-)
+target_link_libraries(xml_icd3_parser icd3data xmltodata ${DEV_CLI_LIBS})
Modified: trunk/piklab_kde4/src/progs/open_prog/xml/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/progs/open_prog/xml/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/progs/open_prog/xml/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -3,10 +3,5 @@
SET(xml_op_parser_SRCS
xml_op_parser.cpp
)
-
add_executable(xml_op_parser ${xml_op_parser_SRCS})
-target_link_libraries(xml_op_parser
- devicelistnoui pic picbase picxml
- mem24 mem24base mem24xml xmltodata devicebase common
- ${EXE_LIBS}
-)
+target_link_libraries(xml_op_parser xmltodata ${DEV_CLI_LIBS})
Modified: trunk/piklab_kde4/src/progs/picdem_bootloader/xml/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/progs/picdem_bootloader/xml/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/progs/picdem_bootloader/xml/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -3,10 +3,5 @@
SET(xml_picdem_bootloader_parser_SRCS
xml_picdem_bootloader_parser.cpp
)
-
add_executable(xml_picdem_bootloader_parser ${xml_picdem_bootloader_parser_SRCS})
-target_link_libraries(xml_picdem_bootloader_parser
- devicelistnoui pic picbase picxml
- mem24 mem24base mem24xml xmltodata devicebase common
- ${EXE_LIBS}
-)
+target_link_libraries(xml_picdem_bootloader_parser xmltodata ${DEV_CLI_LIBS})
Modified: trunk/piklab_kde4/src/progs/pickit1/xml/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/progs/pickit1/xml/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/progs/pickit1/xml/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -3,10 +3,5 @@
SET(xml_pickit1_parser_SRCS
xml_pickit1_parser.cpp
)
-
add_executable(xml_pickit1_parser ${xml_pickit1_parser_SRCS})
-target_link_libraries(xml_pickit1_parser
- devicelistnoui pic picbase picxml
- mem24 mem24base mem24xml xmltodata devicebase common
- ${EXE_LIBS}
-)
+target_link_libraries(xml_pickit1_parser xmltodata ${DEV_CLI_LIBS})
Modified: trunk/piklab_kde4/src/progs/pickit2/xml/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/progs/pickit2/xml/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/progs/pickit2/xml/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -3,10 +3,5 @@
SET(xml_pickit2_parser_SRCS
xml_pickit2_parser.cpp
)
-
add_executable(xml_pickit2_parser ${xml_pickit2_parser_SRCS})
-target_link_libraries(xml_pickit2_parser
- devicelistnoui pic picbase picxml
- mem24 mem24base mem24xml xmltodata devicebase common
- ${EXE_LIBS}
-)
+target_link_libraries(xml_pickit2_parser xmltodata ${DEV_CLI_LIBS})
Modified: trunk/piklab_kde4/src/progs/pickit2_bootloader/xml/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/progs/pickit2_bootloader/xml/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/progs/pickit2_bootloader/xml/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -5,8 +5,4 @@
)
add_executable(xml_pickit2_bootloader_parser ${xml_pickit2_bootloader_parser_SRCS})
-target_link_libraries(xml_pickit2_bootloader_parser
- devicelistnoui pic picbase picxml
- mem24 mem24base mem24xml xmltodata devicebase common
- ${EXE_LIBS}
-)
+target_link_libraries(xml_pickit2_bootloader_parser xmltodata ${DEV_CLI_LIBS})
Modified: trunk/piklab_kde4/src/progs/pickit3/xml/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/progs/pickit3/xml/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/progs/pickit3/xml/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -3,10 +3,5 @@
SET(xml_pickit3_parser_SRCS
xml_pickit3_parser.cpp
)
-
add_executable(xml_pickit3_parser ${xml_pickit3_parser_SRCS})
-target_link_libraries(xml_pickit3_parser pickit3data
- coff devicelistnoui pic picbase picxml
- mem24 mem24base mem24xml xmltodata devicebase common
- ${EXE_LIBS}
-)
+target_link_libraries(xml_pickit3_parser pickit3data xmltodata ${DEV_CLI_LIBS})
Modified: trunk/piklab_kde4/src/progs/psp/xml/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/progs/psp/xml/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/progs/psp/xml/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -3,10 +3,5 @@
SET(xml_psp_parser_SRCS
xml_psp_parser.cpp
)
-
add_executable(xml_psp_parser ${xml_psp_parser_SRCS})
-target_link_libraries(xml_psp_parser
- devicelistnoui pic picbase picxml
- mem24 mem24base mem24xml xmltodata devicebase common
- ${EXE_LIBS}
-)
+target_link_libraries(xml_psp_parser xmltodata ${DEV_CLI_LIBS})
Modified: trunk/piklab_kde4/src/progs/tbl_bootloader/xml/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/progs/tbl_bootloader/xml/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/progs/tbl_bootloader/xml/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -3,10 +3,5 @@
SET(xml_tbl_bootloader_parser_SRCS
xml_tbl_bootloader_parser.cpp
)
-
add_executable(xml_tbl_bootloader_parser ${xml_tbl_bootloader_parser_SRCS})
-target_link_libraries(xml_tbl_bootloader_parser
- devicelistnoui pic picbase picxml
- mem24 mem24base mem24xml xmltodata devicebase common
- ${EXE_LIBS}
-)
+target_link_libraries(xml_tbl_bootloader_parser xmltodata ${DEV_CLI_LIBS})
Modified: trunk/piklab_kde4/src/xml_to_data/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/xml_to_data/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
+++ trunk/piklab_kde4/src/xml_to_data/CMakeLists.txt 2012-10-20 23:40:25 UTC (rev 2979)
@@ -4,7 +4,5 @@
xml_to_data.cpp
device_xml_to_data.cpp
)
-
automoc(${xmltodata_STAT_SRCS})
-
add_library(xmltodata STATIC ${xmltodata_STAT_SRCS})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <az...@us...> - 2012-10-20 23:03:02
|
Revision: 2978
http://piklab.svn.sourceforge.net/piklab/?rev=2978&view=rev
Author: azhyd
Date: 2012-10-20 23:02:53 +0000 (Sat, 20 Oct 2012)
Log Message:
-----------
work on test suite
Modified Paths:
--------------
trunk/piklab_kde4/src/piklab-test/CMakeLists.txt
trunk/piklab_kde4/src/piklab-test/base/CMakeLists.txt
trunk/piklab_kde4/src/piklab-test/base/device_test.cpp
trunk/piklab_kde4/src/piklab-test/base/device_test.h
trunk/piklab_kde4/src/piklab-test/base/generator_check.cpp
trunk/piklab_kde4/src/piklab-test/base/generator_check.h
trunk/piklab_kde4/src/piklab-test/base/main_test.h
trunk/piklab_kde4/src/piklab-test/build/CMakeLists.txt
trunk/piklab_kde4/src/piklab-test/checksum/checksum_check.cpp
trunk/piklab_kde4/src/piklab-test/checksum/checksum_check.h
trunk/piklab_kde4/src/piklab-test/gui/CMakeLists.txt
trunk/piklab_kde4/src/piklab-test/save_load_memory/save_load_memory_check.cpp
trunk/piklab_kde4/src/piklab-test/save_load_memory/save_load_memory_check.h
Added Paths:
-----------
trunk/piklab_kde4/src/piklab-test/build/
trunk/piklab_kde4/src/piklab-test/build/build_check.cpp
trunk/piklab_kde4/src/piklab-test/build/build_check.h
Removed Paths:
-------------
trunk/piklab_kde4/src/piklab-test/build/build_check.cpp
trunk/piklab_kde4/src/piklab-test/build/build_check.h
trunk/piklab_kde4/src/piklab-test/build/gui_check.cpp
trunk/piklab_kde4/src/piklab-test/build/gui_check.h
trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp
trunk/piklab_kde4/src/piklab-test/gui/build_check.h
Modified: trunk/piklab_kde4/src/piklab-test/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/piklab-test/CMakeLists.txt 2012-10-19 03:48:33 UTC (rev 2977)
+++ trunk/piklab_kde4/src/piklab-test/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
@@ -6,4 +6,5 @@
if(NOT QT_ONLY)
add_subdirectory(generators)
add_subdirectory(gui)
+ add_subdirectory(build)
endif(NOT QT_ONLY)
\ No newline at end of file
Modified: trunk/piklab_kde4/src/piklab-test/base/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/piklab-test/base/CMakeLists.txt 2012-10-19 03:48:33 UTC (rev 2977)
+++ trunk/piklab_kde4/src/piklab-test/base/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
@@ -5,7 +5,5 @@
device_test.cpp
generator_check.cpp
)
-
automoc(${test_STAT_SRCS})
-
add_library(test STATIC ${test_STAT_SRCS})
Modified: trunk/piklab_kde4/src/piklab-test/base/device_test.cpp
===================================================================
--- trunk/piklab_kde4/src/piklab-test/base/device_test.cpp 2012-10-19 03:48:33 UTC (rev 2977)
+++ trunk/piklab_kde4/src/piklab-test/base/device_test.cpp 2012-10-20 23:02:53 UTC (rev 2978)
@@ -8,6 +8,8 @@
***************************************************************************/
#include "device_test.h"
+#include <iostream>
+
#include "devices/base/device_group.h"
#include "devices/list/device_list.h"
@@ -16,7 +18,7 @@
if ( _args->count()==1 ) {
_device = QString(_args->arg(0)).upper();
if (!Device::Lister::instance().isSupported(_device)) qFatal("Specified device \"%s\" not supported.", _device.latin1());
- printf("Testing only %s\n", _device.latin1());
+ std::cout << "Testing only " << _device.latin1() << std::endl;
}
}
@@ -25,21 +27,24 @@
for (Device::Lister::ConstIterator it = Device::Lister::instance().begin();
it != Device::Lister::instance().end();
++it) {
+ std::cout << std::endl << it.key().latin1() << " ";
+ uint nb = it.data()->count();
+ uint i = 0;
for (Group::Base::const_iterator git = it.data()->begin(); git != it.data()->end(); ++git) {
const Device::Data &data = *git->second.data;
if (!_device.isEmpty() && data.name() != _device) continue;
_message = data.name();
if (skip(data)) {
skipped();
- printf("S");
+ std::cout << "S" << std::flush;
} else {
- if (init(data)) {
- printf("*");
- executeDevice(data);
- } else printf("S");
+ init(data);
+ executeDevice(data);
+ std::cout << "." << std::flush;
cleanup(data);
+ ++i;
+ if (i%10 == 0) std::cout << " " << i*100/nb << "% ";
}
- fflush(stdout);
}
}
}
Modified: trunk/piklab_kde4/src/piklab-test/base/device_test.h
===================================================================
--- trunk/piklab_kde4/src/piklab-test/base/device_test.h 2012-10-19 03:48:33 UTC (rev 2977)
+++ trunk/piklab_kde4/src/piklab-test/base/device_test.h 2012-10-20 23:02:53 UTC (rev 2978)
@@ -19,10 +19,10 @@
protected:
virtual void execute();
- virtual bool skip(const Device::Data &) const { return false; }
- virtual bool init(const Device::Data &) { return true; } // returns false if skipped or failed
- virtual bool executeDevice(const Device::Data &data) = 0; // returns false if skipped or failed
- virtual void cleanup(const Device::Data &) {}
+ virtual bool skip(const Device::Data&) const { return false; }
+ virtual void init(const Device::Data&) {}
+ virtual bool executeDevice(const Device::Data& data) = 0; // returns false if skipped or failed
+ virtual void cleanup(const Device::Data&) {}
virtual void checkArguments();
private:
Modified: trunk/piklab_kde4/src/piklab-test/base/generator_check.cpp
===================================================================
--- trunk/piklab_kde4/src/piklab-test/base/generator_check.cpp 2012-10-19 03:48:33 UTC (rev 2977)
+++ trunk/piklab_kde4/src/piklab-test/base/generator_check.cpp 2012-10-20 23:02:53 UTC (rev 2978)
@@ -53,7 +53,7 @@
return DeviceTest::runTest();
}
-bool GeneratorCheck::init(const Device::Data &data)
+void GeneratorCheck::init(const Device::Data &data)
{
PURL::Url dest(PURL::currentDirectory(), "test.xxx");
dest = dest.toFileType(_helper->sourceFileType());
@@ -62,7 +62,6 @@
PURL::Url hex(PURL::currentDirectory(), "test.hex");
_fhex.reset(new PURL::File(hex, *_view));
_memory1 = data.group().createMemory(data);
- return true;
}
bool GeneratorCheck::skip(const Device::Data &data) const
@@ -107,11 +106,10 @@
}
//----------------------------------------------------------------------------
-bool ConfigGeneratorCheck::init(const Device::Data &data)
+void ConfigGeneratorCheck::init(const Device::Data &data)
{
- if ( !GeneratorCheck::init(data) ) return false;
+ GeneratorCheck::init(data);
_memory2 = data.group().createMemory(data);
- return true;
}
bool ConfigGeneratorCheck::executeDevice(const Device::Data &data)
@@ -183,16 +181,15 @@
}
//----------------------------------------------------------------------------
-bool TemplateGeneratorCheck::init(const Device::Data &data)
+void TemplateGeneratorCheck::init(const Device::Data &data)
{
- if ( !GeneratorCheck::init(data) ) return false;
+ GeneratorCheck::init(data);
bool ok;
PURL::SourceFamily sfamily = _helper->sourceFileType().data().sourceFamily;
PURL::ToolType ttype = sfamily.data().toolType;
SourceLine::List lines = _helper->generator()->templateSourceFile(ttype, data, ok);
_source = SourceLine::text(sfamily, lines, 2);
- if (!ok) TEST_FAILED_RETURN(QString("Incomplete template generator for %1").arg(data.name()))
- return true;
+ if (!ok) TEST_FAILED(QString("Incomplete template generator for %1").arg(data.name()))
}
//----------------------------------------------------------------------------
@@ -211,7 +208,7 @@
_supported = GPUtils::getSupportedDevices(p.string(Process::OutputType::Stdout));
}
-bool GPUtilsGeneratorCheckHelper::init(const Device::Data &data)
+void GPUtilsGeneratorCheckHelper::init(const Device::Data &data)
{
_cprocess = new Process::StringOutput;
QStringList options;
@@ -225,7 +222,6 @@
options += "test.hex";
options += "test.o";
_lprocess->setup("gplink", options, false);
- return true;
}
SourceLine::List GPUtilsGeneratorCheckHelper::configEndLines() const
@@ -261,7 +257,7 @@
}
}
-bool SDCCGeneratorCheckHelper::init(const Device::Data &data)
+void SDCCGeneratorCheckHelper::init(const Device::Data &data)
{
_cprocess = new Process::StringOutput;
QStringList options;
@@ -271,7 +267,6 @@
options += "-I/usr/share/gputils/header";
options += "-Wl-otext.hex";
_cprocess->setup("sdcc", options, false);
- return true;
}
SourceLine::List SDCCGeneratorCheckHelper::configEndLines() const
Modified: trunk/piklab_kde4/src/piklab-test/base/generator_check.h
===================================================================
--- trunk/piklab_kde4/src/piklab-test/base/generator_check.h 2012-10-19 03:48:33 UTC (rev 2977)
+++ trunk/piklab_kde4/src/piklab-test/base/generator_check.h 2012-10-20 23:02:53 UTC (rev 2978)
@@ -23,7 +23,7 @@
GeneratorCheckHelper();
virtual ~GeneratorCheckHelper();
virtual void initSupported() = 0;
- virtual bool init(const Device::Data &data) = 0;
+ virtual void init(const Device::Data &data) = 0;
void cleanup();
bool isSupported(const Device::Data &data) const { return _supported.contains(&data); }
virtual PURL::FileType sourceFileType() const = 0;
@@ -45,7 +45,7 @@
virtual ~GeneratorCheck();
virtual bool skip(const Device::Data &data) const;
virtual int runTest();
- virtual bool init(const Device::Data &data);
+ virtual void init(const Device::Data &data);
virtual bool executeDevice(const Device::Data &data);
virtual void cleanup(const Device::Data &data);
@@ -63,7 +63,7 @@
{
public:
ConfigGeneratorCheck(GeneratorCheckHelper *helper) : GeneratorCheck(helper), _memory2(0) {}
- virtual bool init(const Device::Data &data);
+ virtual void init(const Device::Data &data);
virtual bool executeDevice(const Device::Data &data);
virtual void cleanup(const Device::Data &data);
@@ -76,7 +76,7 @@
{
public:
TemplateGeneratorCheck(GeneratorCheckHelper *helper) : GeneratorCheck(helper) {}
- virtual bool init(const Device::Data &data);
+ virtual void init(const Device::Data &data);
};
//----------------------------------------------------------------------------
@@ -85,7 +85,7 @@
public:
GPUtilsGeneratorCheckHelper();
virtual void initSupported();
- virtual bool init(const Device::Data &data);
+ virtual void init(const Device::Data &data);
virtual PURL::FileType sourceFileType() const { return PURL::AsmGPAsm; }
virtual SourceLine::List configEndLines() const;
};
@@ -96,7 +96,7 @@
public:
SDCCGeneratorCheckHelper();
virtual void initSupported();
- virtual bool init(const Device::Data &data);
+ virtual void init(const Device::Data &data);
virtual PURL::FileType sourceFileType() const { return PURL::CSource; }
virtual SourceLine::List configEndLines() const;
};
Modified: trunk/piklab_kde4/src/piklab-test/base/main_test.h
===================================================================
--- trunk/piklab_kde4/src/piklab-test/base/main_test.h 2012-10-19 03:48:33 UTC (rev 2977)
+++ trunk/piklab_kde4/src/piklab-test/base/main_test.h 2012-10-20 23:02:53 UTC (rev 2978)
@@ -15,7 +15,7 @@
#define TEST_SKIPPED_RETURN { skipped(); return false; }
#define TEST_FAILED_RETURN(message) { failed(message, __FILE__, __LINE__); return false; }
#define TEST_FAILED(message) { failed(message, __FILE__, __LINE__); }
-#define TEST_PASSED { printf("."); fflush(stdout); passed(); }
+#define TEST_PASSED { passed(); }
#define TEST_MAIN(Type) \
int main(int argc, char **argv) \
{ \
Modified: trunk/piklab_kde4/src/piklab-test/build/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/piklab-test/gui/CMakeLists.txt 2012-10-14 23:09:59 UTC (rev 2965)
+++ trunk/piklab_kde4/src/piklab-test/build/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
@@ -1,13 +1,12 @@
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
SET(build_check_SRCS
- gui_check.cpp
build_check.cpp
)
automoc(${build_check_SRCS})
add_executable(build_check ${build_check_SRCS})
target_link_libraries(build_check
- gui toollist
+ gui_test gui toollist
cc5xui boostui mpcui ccscui c18ui jalv2ui
jalui pic30ui piccui sdccui gputilsui
customtool cc5x boost mpc ccsc c18 jalv2 jal pic30 picc sdcc gputils
Deleted: trunk/piklab_kde4/src/piklab-test/build/build_check.cpp
===================================================================
--- trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp 2012-10-14 23:09:59 UTC (rev 2965)
+++ trunk/piklab_kde4/src/piklab-test/build/build_check.cpp 2012-10-20 23:02:53 UTC (rev 2978)
@@ -1,161 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2012 Nicolas Hadacek <ha...@kd...> *
- * *
- * 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. *
- ***************************************************************************/
-
-#include <iostream>
-
-#include "build_check.h"
-#include "build_check.moc"
-#include "libgui/toplevel.h"
-#include "libgui/editor_manager.h"
-
-//----------------------------------------------------------------------------
-BuildCheckData DATA[] = {
- { "gputils", "blinker", PURL::Project, { "blinker.asm", NULL }, { NULL }, { "o", "lst", NULL }, { "cof", "cof", "map", "hex", NULL } },
- { "gputils", "blinker_18", PURL::Project, { "blinker_18.asm", NULL }, { NULL }, { "o", "lst", NULL }, { "cof", "cof", "map", "hex", NULL } },
- { "gputils", "blinker_lib", PURL::Project, { "blinker.asm", NULL }, { NULL }, { "o", "lst", NULL }, { "lib", NULL } },
- { "gputils", "project", PURL::Project, { "test.asm", "test2.asm", NULL }, { "test.inc", "test.lib", NULL }, { "o", "lst", NULL }, { "cof", "cof", "map", "hex", NULL } },
- { "gputils", "project", PURL::PikdevProject, { "test.asm", "test2.asm", NULL }, { "test.inc", "test.lib", NULL }, { "o", "lst", NULL }, { "cof", "cof", "map", "hex", NULL } },
- { "sdcc", "blinker", PURL::Project, { "blinker.c", "sub/add.c", NULL }, { "blinker.h", NULL }, { "o", "lst", "asm", "adb", "p", NULL }, { "cof", "cof", "map", "hex", NULL } },
- { "sdcc", "blinker_lib", PURL::Project, { "blinker.c", "add.c", NULL }, { NULL }, { "o", "lst", "asm", "adb", "p", NULL }, { "lib", NULL } },
- { "sdcc", "test18", PURL::Project, { "test18.c", NULL }, { NULL }, { "o", "lst", "asm", "adb", NULL }, { "cof", "cof", "map", "hex", NULL } },
- { "sdcc", "usart", PURL::Project, { "usart_test.c", NULL }, { NULL }, { "o", "lst", "asm", "adb", NULL }, { "cof", "cof", "map", "hex", NULL } },
- { "sdcc", "usart_lib", PURL::Project, { "usart_test.c", NULL }, { NULL }, { "o", "lst", "asm", "adb", NULL }, { "lib", NULL } },
-
- { NULL, NULL, PURL::Nb_FileTypes, { NULL }, { NULL }, { NULL }, { NULL } }
-};
-
-//----------------------------------------------------------------------------
-bool BuildCheck::init(uint index)
-{
- if (DATA[index].dir == NULL) {
- return false;
- }
- _dir = DATA[index].dir;
- _project = DATA[index].project;
- _projType = DATA[index].projType;
- _sources.clear();
- for (uint i = 0; DATA[index].sources[i] != NULL; ++i) {
- _sources.append(DATA[index].sources[i]);
- }
- _incFiles.clear();
- for (uint i = 0; DATA[index].incFiles[i] != NULL; ++i) {
- _incFiles.append(DATA[index].incFiles[i]);
- }
- _objExtensions.clear();
- for (uint i = 0; DATA[index].objExtensions[i] != NULL; ++i) {
- _objExtensions.append(DATA[index].objExtensions[i]);
- }
- _extensions.clear();
- for (uint i = 0; DATA[index].extensions[i] != NULL; ++i) {
- _extensions.append(DATA[index].extensions[i]);
- }
- return true;
-}
-
-PURL::Directory BuildCheck::testDir() const
-{
- return PURL::currentDirectory().down("../../../../test/" + _dir + "/" + _project);
-}
-
-PURL::Url BuildCheck::getUrl(const QString& filename) const
-{
- return PURL::Url(testDir(), filename);
-}
-
-void BuildCheck::checkFilesExist(bool exists) const
-{
- for (QStringList::const_iterator it = _sources.begin(); it != _sources.end(); ++it) {
- for (QStringList::const_iterator it2 = _objExtensions.begin(); it2 != _objExtensions.end(); ++it2) {
- if (!exists) {
- PURL::Url url = PURL::Url(testDir(), *it).toExtension(*it2);
- QVERIFY2(url.exists() == exists, url.pretty().latin1());
- }
- QString filename = PURL::Url(PURL::Directory(), *it).filename();
- PURL::Url url = PURL::Url(testDir(), filename).toExtension(*it2);
- QVERIFY2(url.exists() == exists, url.pretty().latin1());
- }
- }
- for (QStringList::const_iterator it = _incFiles.begin(); it != _incFiles.end(); ++it) {
- PURL::Url url = PURL::Url(testDir(), *it);
- QVERIFY2(url.exists(), url.pretty().latin1());
- }
- for (QStringList::const_iterator it = _extensions.begin(); it != _extensions.end(); ++it) {
- PURL::Url url = getUrl(_project).toExtension(*it);
- QVERIFY2(url.exists() == exists, url.pretty().latin1());
- }
-}
-
-void BuildCheck::test1()
-{
- std::cout << "TESTING: " << _dir.latin1() << "/" << _project.latin1()
- << "/" << _project.latin1() << "." << _projType.data().extensions[0] << std::endl;
- MainWindow::self().closeProject();
-}
-
-void BuildCheck::test2()
-{
- QVERIFY(Main::project() == NULL);
- Main::editorManager().closeAllEditors();
-}
-
-void BuildCheck::test3()
-{
- QVERIFY(Main::editorManager().currentEditor() == NULL);
- QVERIFY(testDir().exists());
- PURL::Url url = getUrl(_project).toFileType(_projType);
- QVERIFY(url.exists());
- QVERIFY(MainWindow::self().openProject(url));
-}
-
-void BuildCheck::test4()
-{
- QVERIFY(Main::project() != NULL);
- Main::editorManager().closeAllEditors();
-}
-
-void BuildCheck::test5()
-{
- QVERIFY(Main::editorManager().currentEditor() == NULL);
- QVERIFY(_sources.size() > 0);
- QVERIFY(Main::editorManager().openFile(getUrl(*_sources.begin())));
-}
-
-void BuildCheck::test6()
-{
- QVERIFY(Main::editorManager().currentEditor() != NULL);
- QVERIFY(Main::editorManager().nbEditors() == 1);
- MainWindow::self().cleanBuild();
-}
-
-void BuildCheck::test7()
-{
- checkFilesExist(false);
- MainWindow::self().buildProject();
-}
-
-void BuildCheck::test8()
-{
- checkFilesExist(true);
- MainWindow::self().cleanBuild();
-}
-
-void BuildCheck::test9()
-{
- checkFilesExist(false);
-}
-
-//----------------------------------------------------------------------------
-void BuildCheckProxy::start()
-{
- BuildCheck check;
- run(check);
-}
-
-//----------------------------------------------------------------------------
-QTEST_APPLESS_MAIN(BuildCheckProxy);
Copied: trunk/piklab_kde4/src/piklab-test/build/build_check.cpp (from rev 2976, trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp)
===================================================================
--- trunk/piklab_kde4/src/piklab-test/build/build_check.cpp (rev 0)
+++ trunk/piklab_kde4/src/piklab-test/build/build_check.cpp 2012-10-20 23:02:53 UTC (rev 2978)
@@ -0,0 +1,161 @@
+/***************************************************************************
+ * Copyright (C) 2012 Nicolas Hadacek <ha...@kd...> *
+ * *
+ * 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. *
+ ***************************************************************************/
+
+#include <iostream>
+
+#include "build_check.h"
+#include "build_check.moc"
+#include "libgui/toplevel.h"
+#include "libgui/editor_manager.h"
+#include "tools/list/compile_manager.h"
+
+//----------------------------------------------------------------------------
+BuildCheckData DATA[] = {
+ { "gputils", "blinker", PURL::Project, { "blinker.asm", NULL }, { NULL }, { "o", "lst", NULL }, { "cof", "cof", "map", "hex", NULL } },
+ { "gputils", "blinker_18", PURL::Project, { "blinker_18.asm", NULL }, { NULL }, { "o", "lst", NULL }, { "cof", "cof", "map", "hex", NULL } },
+ { "gputils", "blinker_lib", PURL::Project, { "blinker.asm", NULL }, { NULL }, { "o", "lst", NULL }, { "lib", NULL } },
+ { "gputils", "project", PURL::Project, { "test.asm", "test2.asm", NULL }, { "test.inc", "test.lib", NULL }, { "o", "lst", NULL }, { "cof", "cof", "map", "hex", NULL } },
+ { "gputils", "project", PURL::PikdevProject, { "test.asm", "test2.asm", NULL }, { "test.inc", "test.lib", NULL }, { "o", "lst", NULL }, { "cof", "cof", "map", "hex", NULL } },
+ { "sdcc", "blinker", PURL::Project, { "blinker.c", "sub/add.c", NULL }, { "blinker.h", NULL }, { "o", "lst", "asm", "adb", "p", NULL }, { "cof", "cof", "map", "hex", NULL } },
+ { "sdcc", "blinker_lib", PURL::Project, { "blinker.c", "add.c", NULL }, { NULL }, { "o", "lst", "asm", "adb", "p", NULL }, { "lib", NULL } },
+ { "sdcc", "test18", PURL::Project, { "test18.c", NULL }, { NULL }, { "o", "lst", "asm", "adb", NULL }, { "cof", "cof", "map", "hex", NULL } },
+ { "sdcc", "usart", PURL::Project, { "usart_test.c", NULL }, { NULL }, { "o", "lst", "asm", "adb", NULL }, { "cof", "cof", "map", "hex", NULL } },
+ { "sdcc", "usart_lib", PURL::Project, { "usart_test.c", NULL }, { NULL }, { "o", "lst", "asm", "adb", NULL }, { "lib", NULL } },
+
+ { NULL, NULL, PURL::Nb_FileTypes, { NULL }, { NULL }, { NULL }, { NULL } }
+};
+
+//----------------------------------------------------------------------------
+bool BuildCheck::init(uint index)
+{
+ if (DATA[index].dir == NULL) {
+ return false;
+ }
+ _dir = DATA[index].dir;
+ _project = DATA[index].project;
+ _projType = DATA[index].projType;
+ _sources.clear();
+ for (uint i = 0; DATA[index].sources[i] != NULL; ++i) {
+ _sources.append(DATA[index].sources[i]);
+ }
+ _incFiles.clear();
+ for (uint i = 0; DATA[index].incFiles[i] != NULL; ++i) {
+ _incFiles.append(DATA[index].incFiles[i]);
+ }
+ _objExtensions.clear();
+ for (uint i = 0; DATA[index].objExtensions[i] != NULL; ++i) {
+ _objExtensions.append(DATA[index].objExtensions[i]);
+ }
+ _extensions.clear();
+ for (uint i = 0; DATA[index].extensions[i] != NULL; ++i) {
+ _extensions.append(DATA[index].extensions[i]);
+ }
+ _testDir = PURL::currentDirectory().down("../../../../test/" + _dir + "/" + _project);
+ if (!_testDir.exists()) {
+ _testDir = PURL::currentDirectory().down("../../../test/" + _dir + "/" + _project);
+ }
+ return true;
+}
+
+PURL::Url BuildCheck::getUrl(const QString& filename) const
+{
+ return PURL::Url(_testDir, filename);
+}
+
+void BuildCheck::checkFilesExist(bool exists) const
+{
+ for (QStringList::const_iterator it = _sources.begin(); it != _sources.end(); ++it) {
+ for (QStringList::const_iterator it2 = _objExtensions.begin(); it2 != _objExtensions.end(); ++it2) {
+ if (!exists) {
+ PURL::Url url = PURL::Url(_testDir, *it).toExtension(*it2);
+ QVERIFY2(url.exists() == exists, url.pretty().latin1());
+ }
+ QString filename = PURL::Url(PURL::Directory(), *it).filename();
+ PURL::Url url = PURL::Url(_testDir, filename).toExtension(*it2);
+ QVERIFY2(url.exists() == exists, url.pretty().latin1());
+ }
+ }
+ for (QStringList::const_iterator it = _incFiles.begin(); it != _incFiles.end(); ++it) {
+ PURL::Url url = PURL::Url(_testDir, *it);
+ QVERIFY2(url.exists(), url.pretty().latin1());
+ }
+ for (QStringList::const_iterator it = _extensions.begin(); it != _extensions.end(); ++it) {
+ PURL::Url url = getUrl(_project).toExtension(*it);
+ QVERIFY2(url.exists() == exists, url.pretty().latin1());
+ }
+}
+
+void BuildCheck::closeProject()
+{
+ execUntilSignal(MainWindow::self(), "closeProject", MainWindow::self(), SIGNAL(deviceChanged()));
+ QVERIFY(Main::project() == NULL);
+}
+
+void BuildCheck::closeAllEditors()
+{
+ execUntilSignal(Main::editorManager(), "closeAllEditors", MainWindow::self(), SIGNAL(deviceChanged()));
+ QVERIFY(Main::editorManager().currentEditor() == NULL);
+}
+
+void BuildCheck::openProject()
+{
+ closeProject();
+ closeAllEditors();
+ QVERIFY2(_testDir.exists(), _testDir.pretty().latin1());
+ PURL::Url url = getUrl(_project).toFileType(_projType);
+ QVERIFY2(url.exists(), url.pretty().latin1());
+ bool res = false;
+ execUntilSignal(MainWindow::self(), "openProject", MainWindow::self(), SIGNAL(deviceChanged()), Q_ARG(PURL::Url, url), &res);
+ QVERIFY(res);
+ QVERIFY(Main::project() != NULL);
+}
+
+void BuildCheck::openSingleFile(const PURL::Url& url)
+{
+ closeAllEditors();
+ bool res = false;
+ execUntilSignal(Main::editorManager(), "openFile", MainWindow::self(), SIGNAL(deviceChanged()), Q_ARG(PURL::Url, url), &res);
+ QVERIFY(res);
+ QVERIFY(Main::editorManager().currentEditor() != NULL);
+ QVERIFY(Main::editorManager().nbEditors() == 1);
+}
+
+void BuildCheck::cleanProject()
+{
+ execUntilSignal(MainWindow::self(), "cleanBuild", MainWindow::self(), SIGNAL(deviceChanged()));
+ checkFilesExist(false);
+}
+
+void BuildCheck::buildProject()
+{
+ cleanProject();
+ execUntilSignal(MainWindow::self(), "buildProject", Main::compileManager(), SIGNAL(success()));
+ checkFilesExist(true);
+}
+
+void BuildCheck::runTest()
+{
+ std::cout << "TESTING: " << _dir.latin1() << "/" << _project.latin1()
+ << "/" << _project.latin1() << "." << _projType.data().extensions[0] << std::endl;
+ openProject();
+ QVERIFY(_sources.size() > 0);
+ openSingleFile(getUrl(*_sources.begin()));
+ buildProject();
+ cleanProject();
+}
+
+//----------------------------------------------------------------------------
+void BuildCheckProxy::start()
+{
+ BuildCheck check;
+ run(check);
+}
+
+//----------------------------------------------------------------------------
+QTEST_APPLESS_MAIN(BuildCheckProxy);
Deleted: trunk/piklab_kde4/src/piklab-test/build/build_check.h
===================================================================
--- trunk/piklab_kde4/src/piklab-test/gui/build_check.h 2012-10-14 23:09:59 UTC (rev 2965)
+++ trunk/piklab_kde4/src/piklab-test/build/build_check.h 2012-10-20 23:02:53 UTC (rev 2978)
@@ -1,65 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2012 Nicolas Hadacek <ha...@kd...> *
- * *
- * 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. *
- ***************************************************************************/
-#ifndef BUILD_CHECK_H
-#define BUILD_CHECK_H
-
-#include "gui_check.h"
-#include "common/global/purl.h"
-
-//----------------------------------------------------------------------------
-struct BuildCheckData {
- const char* dir;
- const char* project;
- PURL::FileType projType;
- const char* sources[3];
- const char* incFiles[3];
- const char* objExtensions[6];
- const char* extensions[5];
-};
-
-class BuildCheck : public GuiCheck
-{
- Q_OBJECT
-
- private slots:
- void test1();
- void test2();
- void test3();
- void test4();
- void test5();
- void test6();
- void test7();
- void test8();
- void test9();
-
- private:
- QString _dir;
- QString _project;
- PURL::FileType _projType;
- QStringList _sources;
- QStringList _incFiles;
- QStringList _objExtensions;
- QStringList _extensions;
-
- PURL::Directory testDir() const;
- PURL::Url getUrl(const QString& filename) const;
- void checkFilesExist(bool exists) const;
- virtual bool init(uint index);
-};
-
-//----------------------------------------------------------------------------
-class BuildCheckProxy : public GuiCheckProxy
-{
- Q_OBJECT
-
- private slots:
- void start();
-};
-
-#endif
Copied: trunk/piklab_kde4/src/piklab-test/build/build_check.h (from rev 2969, trunk/piklab_kde4/src/piklab-test/gui/build_check.h)
===================================================================
--- trunk/piklab_kde4/src/piklab-test/build/build_check.h (rev 0)
+++ trunk/piklab_kde4/src/piklab-test/build/build_check.h 2012-10-20 23:02:53 UTC (rev 2978)
@@ -0,0 +1,61 @@
+/***************************************************************************
+ * Copyright (C) 2012 Nicolas Hadacek <ha...@kd...> *
+ * *
+ * 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. *
+ ***************************************************************************/
+#ifndef BUILD_CHECK_H
+#define BUILD_CHECK_H
+
+#include "piklab-test/gui/gui_check.h"
+#include "common/global/purl.h"
+
+//----------------------------------------------------------------------------
+struct BuildCheckData {
+ const char* dir;
+ const char* project;
+ PURL::FileType projType;
+ const char* sources[3];
+ const char* incFiles[3];
+ const char* objExtensions[6];
+ const char* extensions[5];
+};
+
+class BuildCheck : public GuiCheck
+{
+ Q_OBJECT
+
+ private:
+ QString _dir;
+ QString _project;
+ PURL::Directory _testDir;
+ PURL::FileType _projType;
+ QStringList _sources;
+ QStringList _incFiles;
+ QStringList _objExtensions;
+ QStringList _extensions;
+
+ PURL::Url getUrl(const QString& filename) const;
+ void checkFilesExist(bool exists) const;
+ void closeProject();
+ void closeAllEditors();
+ void openProject();
+ void openSingleFile(const PURL::Url&);
+ void cleanProject();
+ void buildProject();
+ virtual bool init(uint index);
+ virtual void runTest();
+};
+
+//----------------------------------------------------------------------------
+class BuildCheckProxy : public GuiCheckProxy
+{
+ Q_OBJECT
+
+ private slots:
+ void start();
+};
+
+#endif
Deleted: trunk/piklab_kde4/src/piklab-test/build/gui_check.cpp
===================================================================
--- trunk/piklab_kde4/src/piklab-test/gui/gui_check.cpp 2012-10-14 23:09:59 UTC (rev 2965)
+++ trunk/piklab_kde4/src/piklab-test/build/gui_check.cpp 2012-10-20 23:02:53 UTC (rev 2978)
@@ -1,55 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2012 Nicolas Hadacek <ha...@kd...> *
- * *
- * 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. *
- ***************************************************************************/
-
-#include "gui_check.h"
-#include "gui_check.moc"
-#include "libgui/main_global.h"
-#include "libgui/toplevel.h"
-
-//----------------------------------------------------------------------------
-GuiCheck::GuiCheck()
-: _index(0),
- _subIndex(1)
-{
-}
-
-void GuiCheck::invokeTest()
-{
- if (_subIndex == 1) {
- if (!init(_index)) {
- MainWindow::self().close();
- return;
- }
- }
- if (QTest::currentTestFailed()) {
- QTimer::singleShot(300, &MainWindow::self(), SLOT(close()));
- return;
- }
-
- QString s1 = QString("test%1").arg(_subIndex);
- QString s2 = s1 + "()";
- if (metaObject()->indexOfMethod(s2.latin1()) == -1) {
- ++_index;
- _subIndex = 1;
- } else {
- QMetaObject::invokeMethod(this, s1.latin1());
- ++_subIndex;
- }
- QTimer::singleShot(400, this, SLOT(invokeTest()));
-}
-
-//----------------------------------------------------------------------------
-void GuiCheckProxy::run(GuiCheck& check)
-{
- int argc = 1;
- const char* argv[] = { "gui_check", NULL };
- Main::setupApplication(argc, (char**)argv);
- QTimer::singleShot(200, &check, SLOT(invokeTest()));
- kapp->exec();
-}
Deleted: trunk/piklab_kde4/src/piklab-test/build/gui_check.h
===================================================================
--- trunk/piklab_kde4/src/piklab-test/gui/gui_check.h 2012-10-14 23:09:59 UTC (rev 2965)
+++ trunk/piklab_kde4/src/piklab-test/build/gui_check.h 2012-10-20 23:02:53 UTC (rev 2978)
@@ -1,40 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2012 Nicolas Hadacek <ha...@kd...> *
- * *
- * 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. *
- ***************************************************************************/
-#ifndef GUI_CHECK_H
-#define GUI_CHECK_H
-
-#include <QtTest/QtTest>
-
-//----------------------------------------------------------------------------
-class GuiCheck : public QObject
-{
- Q_OBJECT
-
- public:
- GuiCheck();
-
- private:
- uint _index;
- uint _subIndex;
-
- virtual bool init(uint index) = 0;
-
- private slots:
- void invokeTest();
-};
-
-//----------------------------------------------------------------------------
-class GuiCheckProxy : public QObject
-{
- Q_OBJECT
- public:
- void run(GuiCheck& check);
-};
-
-#endif
Modified: trunk/piklab_kde4/src/piklab-test/checksum/checksum_check.cpp
===================================================================
--- trunk/piklab_kde4/src/piklab-test/checksum/checksum_check.cpp 2012-10-19 03:48:33 UTC (rev 2977)
+++ trunk/piklab_kde4/src/piklab-test/checksum/checksum_check.cpp 2012-10-20 23:02:53 UTC (rev 2978)
@@ -16,10 +16,9 @@
return ( data.group().name()!="pic" );
}
-bool ChecksumCheck::init(const Device::Data &data)
+void ChecksumCheck::init(const Device::Data &data)
{
_memory = data.group().createMemory(data);
- return true;
}
void ChecksumCheck::cleanup(const Device::Data &)
Modified: trunk/piklab_kde4/src/piklab-test/checksum/checksum_check.h
===================================================================
--- trunk/piklab_kde4/src/piklab-test/checksum/checksum_check.h 2012-10-19 03:48:33 UTC (rev 2977)
+++ trunk/piklab_kde4/src/piklab-test/checksum/checksum_check.h 2012-10-20 23:02:53 UTC (rev 2978)
@@ -18,7 +18,7 @@
{
public:
virtual bool skip(const Device::Data &data) const;
- virtual bool init(const Device::Data &data);
+ virtual void init(const Device::Data &data);
virtual bool executeDevice(const Device::Data &data);
virtual void cleanup(const Device::Data &data);
Modified: trunk/piklab_kde4/src/piklab-test/gui/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/piklab-test/gui/CMakeLists.txt 2012-10-19 03:48:33 UTC (rev 2977)
+++ trunk/piklab_kde4/src/piklab-test/gui/CMakeLists.txt 2012-10-20 23:02:53 UTC (rev 2978)
@@ -1,29 +1,7 @@
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-SET(build_check_SRCS
+SET(gui_test_STAT_SRCS
gui_check.cpp
- build_check.cpp
)
-automoc(${build_check_SRCS})
-add_executable(build_check ${build_check_SRCS})
-target_link_libraries(build_check
- gui toollist
- cc5xui boostui mpcui ccscui c18ui jalv2ui
- jalui pic30ui piccui sdccui gputilsui
- customtool cc5x boost mpc ccsc c18 jalv2 jal pic30 picc sdcc gputils
- toolui toolbase
- proglistui customprogui
- picdembootloaderui pickit2bootloaderui tblbootloaderui
- bootloaderui gpsimui pspui pickit1ui
- pickit3ui pickit2v2ui pickit2ui icd1ui icd2ui directui progui
- customprog
- picdembootloader pickit2bootloader tblbootloader
- bootloader gpsim psp pickit1
- pickit3 pickit3data pickit2v2 pickit2 icd1 icd2 icd2data directprog
- mem24prog picprog progmanager progbase
- coff port global
- devicelistui mem24ui picui deviceui commonui
- pic picbase picxml mem24 mem24base mem24xml
- devicebase common
- ${GUI_LIBS}
-)
+automoc(${gui_test_STAT_SRCS})
+add_library(gui_test STATIC ${gui_test_STAT_SRCS})
Deleted: trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp
===================================================================
--- trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp 2012-10-19 03:48:33 UTC (rev 2977)
+++ trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp 2012-10-20 23:02:53 UTC (rev 2978)
@@ -1,161 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2012 Nicolas Hadacek <ha...@kd...> *
- * *
- * 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. *
- ***************************************************************************/
-
-#include <iostream>
-
-#include "build_check.h"
-#include "build_check.moc"
-#include "libgui/toplevel.h"
-#include "libgui/editor_manager.h"
-#include "tools/list/compile_manager.h"
-
-//----------------------------------------------------------------------------
-BuildCheckData DATA[] = {
- { "gputils", "blinker", PURL::Project, { "blinker.asm", NULL }, { NULL }, { "o", "lst", NULL }, { "cof", "cof", "map", "hex", NULL } },
- { "gputils", "blinker_18", PURL::Project, { "blinker_18.asm", NULL }, { NULL }, { "o", "lst", NULL }, { "cof", "cof", "map", "hex", NULL } },
- { "gputils", "blinker_lib", PURL::Project, { "blinker.asm", NULL }, { NULL }, { "o", "lst", NULL }, { "lib", NULL } },
- { "gputils", "project", PURL::Project, { "test.asm", "test2.asm", NULL }, { "test.inc", "test.lib", NULL }, { "o", "lst", NULL }, { "cof", "cof", "map", "hex", NULL } },
- { "gputils", "project", PURL::PikdevProject, { "test.asm", "test2.asm", NULL }, { "test.inc", "test.lib", NULL }, { "o", "lst", NULL }, { "cof", "cof", "map", "hex", NULL } },
- { "sdcc", "blinker", PURL::Project, { "blinker.c", "sub/add.c", NULL }, { "blinker.h", NULL }, { "o", "lst", "asm", "adb", "p", NULL }, { "cof", "cof", "map", "hex", NULL } },
- { "sdcc", "blinker_lib", PURL::Project, { "blinker.c", "add.c", NULL }, { NULL }, { "o", "lst", "asm", "adb", "p", NULL }, { "lib", NULL } },
- { "sdcc", "test18", PURL::Project, { "test18.c", NULL }, { NULL }, { "o", "lst", "asm", "adb", NULL }, { "cof", "cof", "map", "hex", NULL } },
- { "sdcc", "usart", PURL::Project, { "usart_test.c", NULL }, { NULL }, { "o", "lst", "asm", "adb", NULL }, { "cof", "cof", "map", "hex", NULL } },
- { "sdcc", "usart_lib", PURL::Project, { "usart_test.c", NULL }, { NULL }, { "o", "lst", "asm", "adb", NULL }, { "lib", NULL } },
-
- { NULL, NULL, PURL::Nb_FileTypes, { NULL }, { NULL }, { NULL }, { NULL } }
-};
-
-//----------------------------------------------------------------------------
-bool BuildCheck::init(uint index)
-{
- if (DATA[index].dir == NULL) {
- return false;
- }
- _dir = DATA[index].dir;
- _project = DATA[index].project;
- _projType = DATA[index].projType;
- _sources.clear();
- for (uint i = 0; DATA[index].sources[i] != NULL; ++i) {
- _sources.append(DATA[index].sources[i]);
- }
- _incFiles.clear();
- for (uint i = 0; DATA[index].incFiles[i] != NULL; ++i) {
- _incFiles.append(DATA[index].incFiles[i]);
- }
- _objExtensions.clear();
- for (uint i = 0; DATA[index].objExtensions[i] != NULL; ++i) {
- _objExtensions.append(DATA[index].objExtensions[i]);
- }
- _extensions.clear();
- for (uint i = 0; DATA[index].extensions[i] != NULL; ++i) {
- _extensions.append(DATA[index].extensions[i]);
- }
- _testDir = PURL::currentDirectory().down("../../../../test/" + _dir + "/" + _project);
- if (!_testDir.exists()) {
- _testDir = PURL::currentDirectory().down("../../../test/" + _dir + "/" + _project);
- }
- return true;
-}
-
-PURL::Url BuildCheck::getUrl(const QString& filename) const
-{
- return PURL::Url(_testDir, filename);
-}
-
-void BuildCheck::checkFilesExist(bool exists) const
-{
- for (QStringList::const_iterator it = _sources.begin(); it != _sources.end(); ++it) {
- for (QStringList::const_iterator it2 = _objExtensions.begin(); it2 != _objExtensions.end(); ++it2) {
- if (!exists) {
- PURL::Url url = PURL::Url(_testDir, *it).toExtension(*it2);
- QVERIFY2(url.exists() == exists, url.pretty().latin1());
- }
- QString filename = PURL::Url(PURL::Directory(), *it).filename();
- PURL::Url url = PURL::Url(_testDir, filename).toExtension(*it2);
- QVERIFY2(url.exists() == exists, url.pretty().latin1());
- }
- }
- for (QStringList::const_iterator it = _incFiles.begin(); it != _incFiles.end(); ++it) {
- PURL::Url url = PURL::Url(_testDir, *it);
- QVERIFY2(url.exists(), url.pretty().latin1());
- }
- for (QStringList::const_iterator it = _extensions.begin(); it != _extensions.end(); ++it) {
- PURL::Url url = getUrl(_project).toExtension(*it);
- QVERIFY2(url.exists() == exists, url.pretty().latin1());
- }
-}
-
-void BuildCheck::closeProject()
-{
- execUntilSignal(MainWindow::self(), "closeProject", MainWindow::self(), SIGNAL(deviceChanged()));
- QVERIFY(Main::project() == NULL);
-}
-
-void BuildCheck::closeAllEditors()
-{
- execUntilSignal(Main::editorManager(), "closeAllEditors", MainWindow::self(), SIGNAL(deviceChanged()));
- QVERIFY(Main::editorManager().currentEditor() == NULL);
-}
-
-void BuildCheck::openProject()
-{
- closeProject();
- closeAllEditors();
- QVERIFY2(_testDir.exists(), _testDir.pretty().latin1());
- PURL::Url url = getUrl(_project).toFileType(_projType);
- QVERIFY2(url.exists(), url.pretty().latin1());
- bool res = false;
- execUntilSignal(MainWindow::self(), "openProject", MainWindow::self(), SIGNAL(deviceChanged()), Q_ARG(PURL::Url, url), &res);
- QVERIFY(res);
- QVERIFY(Main::project() != NULL);
-}
-
-void BuildCheck::openSingleFile(const PURL::Url& url)
-{
- closeAllEditors();
- bool res = false;
- execUntilSignal(Main::editorManager(), "openFile", MainWindow::self(), SIGNAL(deviceChanged()), Q_ARG(PURL::Url, url), &res);
- QVERIFY(res);
- QVERIFY(Main::editorManager().currentEditor() != NULL);
- QVERIFY(Main::editorManager().nbEditors() == 1);
-}
-
-void BuildCheck::cleanProject()
-{
- execUntilSignal(MainWindow::self(), "cleanBuild", MainWindow::self(), SIGNAL(deviceChanged()));
- checkFilesExist(false);
-}
-
-void BuildCheck::buildProject()
-{
- cleanProject();
- execUntilSignal(MainWindow::self(), "buildProject", Main::compileManager(), SIGNAL(success()));
- checkFilesExist(true);
-}
-
-void BuildCheck::runTest()
-{
- std::cout << "TESTING: " << _dir.latin1() << "/" << _project.latin1()
- << "/" << _project.latin1() << "." << _projType.data().extensions[0] << std::endl;
- openProject();
- QVERIFY(_sources.size() > 0);
- openSingleFile(getUrl(*_sources.begin()));
- buildProject();
- cleanProject();
-}
-
-//----------------------------------------------------------------------------
-void BuildCheckProxy::start()
-{
- BuildCheck check;
- run(check);
-}
-
-//----------------------------------------------------------------------------
-QTEST_APPLESS_MAIN(BuildCheckProxy);
Deleted: trunk/piklab_kde4/src/piklab-test/gui/build_check.h
===================================================================
--- trunk/piklab_kde4/src/piklab-test/gui/build_check.h 2012-10-19 03:48:33 UTC (rev 2977)
+++ trunk/piklab_kde4/src/piklab-test/gui/build_check.h 2012-10-20 23:02:53 UTC (rev 2978)
@@ -1,61 +0,0 @@
-/***************************************************************************
- * Copyright (C) 2012 Nicolas Hadacek <ha...@kd...> *
- * *
- * 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. *
- ***************************************************************************/
-#ifndef BUILD_CHECK_H
-#define BUILD_CHECK_H
-
-#include "gui_check.h"
-#include "common/global/purl.h"
-
-//----------------------------------------------------------------------------
-struct BuildCheckData {
- const char* dir;
- const char* project;
- PURL::FileType projType;
- const char* sources[3];
- const char* incFiles[3];
- const char* objExtensions[6];
- const char* extensions[5];
-};
-
-class BuildCheck : public GuiCheck
-{
- Q_OBJECT
-
- private:
- QString _dir;
- QString _project;
- PURL::Directory _testDir;
- PURL::FileType _projType;
- QStringList _sources;
- QStringList _incFiles;
- QStringList _objExtensions;
- QStringList _extensions;
-
- PURL::Url getUrl(const QString& filename) const;
- void checkFilesExist(bool exists) const;
- void closeProject();
- void closeAllEditors();
- void openProject();
- void openSingleFile(const PURL::Url&);
- void cleanProject();
- void buildProject();
- virtual bool init(uint index);
- virtual void runTest();
-};
-
-//----------------------------------------------------------------------------
-class BuildCheckProxy : public GuiCheckProxy
-{
- Q_OBJECT
-
- private slots:
- void start();
-};
-
-#endif
Modified: trunk/piklab_kde4/src/piklab-test/save_load_memory/save_load_memory_check.cpp
===================================================================
--- trunk/piklab_kde4/src/piklab-test/save_load_memory/save_load_memory_check.cpp 2012-10-19 03:48:33 UTC (rev 2977)
+++ trunk/piklab_kde4/src/piklab-test/save_load_memory/save_load_memory_check.cpp 2012-10-20 23:02:53 UTC (rev 2978)
@@ -27,11 +27,10 @@
delete _view;
}
-bool SaveLoadMemoryCheck::init(const Device::Data &data)
+void SaveLoadMemoryCheck::init(const Device::Data &data)
{
_memory1 = data.group().createMemory(data);
_memory2 = data.group().createMemory(data);
- return true;
}
void SaveLoadMemoryCheck::cleanup(const Device::Data &)
Modified: trunk/piklab_kde4/src/piklab-test/save_load_memory/save_load_memory_check.h
===================================================================
--- trunk/piklab_kde4/src/piklab-test/save_load_memory/save_load_memory_check.h 2012-10-19 03:48:33 UTC (rev 2977)
+++ trunk/piklab_kde4/src/piklab-test/save_load_memory/save_load_memory_check.h 2012-10-20 23:02:53 UTC (rev 2978)
@@ -19,7 +19,7 @@
public:
SaveLoadMemoryCheck();
virtual ~SaveLoadMemoryCheck();
- virtual bool init(const Device::Data &data);
+ virtual void init(const Device::Data &data);
virtual bool executeDevice(const Device::Data &data);
virtual void cleanup(const Device::Data &data);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <az...@us...> - 2012-10-19 03:48:40
|
Revision: 2977
http://piklab.svn.sourceforge.net/piklab/?rev=2977&view=rev
Author: azhyd
Date: 2012-10-19 03:48:33 +0000 (Fri, 19 Oct 2012)
Log Message:
-----------
fix crash when selecting some programmer in programmer settings dialog [reported by Marc Berlioux]
Modified Paths:
--------------
trunk/piklab_kde4/Changelog
trunk/piklab_kde4/src/progs/gui/prog_config_center.cpp
trunk/piklab_kde4/test/sdcc/usart_lib/usart_lib.piklab
Modified: trunk/piklab_kde4/Changelog
===================================================================
--- trunk/piklab_kde4/Changelog 2012-10-19 03:05:21 UTC (rev 2976)
+++ trunk/piklab_kde4/Changelog 2012-10-19 03:48:33 UTC (rev 2977)
@@ -1,3 +1,6 @@
+0.16.3 (18 October 2012)
+* fix crash when selecting some programmer in programmer settings dialog [reported by Marc Berlioux]
+
0.16.2 (14 October 2012)
* added support for 24FJXXXGB1XX
* do not set target power with ICD2 if device nominal vdd is not 5V
Modified: trunk/piklab_kde4/src/progs/gui/prog_config_center.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/gui/prog_config_center.cpp 2012-10-19 03:05:21 UTC (rev 2976)
+++ trunk/piklab_kde4/src/progs/gui/prog_config_center.cpp 2012-10-19 03:48:33 UTC (rev 2977)
@@ -121,7 +121,7 @@
}
HardwareDescription hd;
hd.port = _portSelector->portDescription();
- std::auto_ptr< ::Hardware::Config> config(Main::programmerGroup().hardwareConfig());
+ std::auto_ptr< ::Hardware::Config> config(_group.hardwareConfig());
if (config.get() != NULL) hd.name = config->currentHardware(hd.port.type);
_specific->setPort(hd);
//_portSelector->setStatus(hd.port.type, ok ? i18n("Connection: Ok") : i18n("Connection: Error"));
Modified: trunk/piklab_kde4/test/sdcc/usart_lib/usart_lib.piklab
===================================================================
--- trunk/piklab_kde4/test/sdcc/usart_lib/usart_lib.piklab 2012-10-19 03:05:21 UTC (rev 2976)
+++ trunk/piklab_kde4/test/sdcc/usart_lib/usart_lib.piklab 2012-10-19 03:48:33 UTC (rev 2977)
@@ -9,9 +9,6 @@
<description/>
<version>0.1</version>
<output_type>library</output_type>
- <opened_files>
- <item>usart_test.c</item>
- </opened_files>
</general>
<compiler>
<has_custom_arguments>false</has_custom_arguments>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <az...@us...> - 2012-10-19 03:05:28
|
Revision: 2976
http://piklab.svn.sourceforge.net/piklab/?rev=2976&view=rev
Author: azhyd
Date: 2012-10-19 03:05:21 +0000 (Fri, 19 Oct 2012)
Log Message:
-----------
fix compilation
Modified Paths:
--------------
trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp
Modified: trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp
===================================================================
--- trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp 2012-10-16 06:42:46 UTC (rev 2975)
+++ trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp 2012-10-19 03:05:21 UTC (rev 2976)
@@ -120,7 +120,7 @@
{
closeAllEditors();
bool res = false;
- execUntilSignal(Main::editorManager(), "openFile", MainWindow::self(), SIGNAL(deviceChanged()), Q_ARG(const PURL::Url&, url), &res);
+ execUntilSignal(Main::editorManager(), "openFile", MainWindow::self(), SIGNAL(deviceChanged()), Q_ARG(PURL::Url, url), &res);
QVERIFY(res);
QVERIFY(Main::editorManager().currentEditor() != NULL);
QVERIFY(Main::editorManager().nbEditors() == 1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <az...@us...> - 2012-10-16 06:43:28
|
Revision: 2975
http://piklab.svn.sourceforge.net/piklab/?rev=2975&view=rev
Author: azhyd
Date: 2012-10-16 06:42:46 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/www/devices/10F200.htm
trunk/www/devices/10F200_10F200_extended.png
trunk/www/devices/10F200_pins_graph.png
trunk/www/devices/10F202.htm
trunk/www/devices/10F202_10F202_extended.png
trunk/www/devices/10F202_pins_graph.png
trunk/www/devices/10F204.htm
trunk/www/devices/10F204_10F204_extended.png
trunk/www/devices/10F204_pins_graph.png
trunk/www/devices/10F206.htm
trunk/www/devices/10F206_10F206_extended.png
trunk/www/devices/10F206_pins_graph.png
trunk/www/devices/10F220.htm
trunk/www/devices/10F220_10F220_extended.png
trunk/www/devices/10F220_pins_graph.png
trunk/www/devices/10F222.htm
trunk/www/devices/10F222_10F222_extended.png
trunk/www/devices/10F222_pins_graph.png
trunk/www/devices/10F320.htm
trunk/www/devices/10F320_10F320_extended.png
trunk/www/devices/10F320_pins_graph.png
trunk/www/devices/10F322.htm
trunk/www/devices/10F322_10F322_extended.png
trunk/www/devices/10F322_pins_graph.png
trunk/www/devices/12C508.htm
trunk/www/devices/12C508A.htm
trunk/www/devices/12C508A_12C508A_extended.png
trunk/www/devices/12C508A_pins_graph.png
trunk/www/devices/12C508_12C508_extended.png
trunk/www/devices/12C508_12C508_industrial.png
trunk/www/devices/12C508_pins_graph.png
trunk/www/devices/12C509.htm
trunk/www/devices/12C509A.htm
trunk/www/devices/12C509A_12C509A_extended.png
trunk/www/devices/12C509A_pins_graph.png
trunk/www/devices/12C509_12C509_extended.png
trunk/www/devices/12C509_12C509_industrial.png
trunk/www/devices/12C509_pins_graph.png
trunk/www/devices/12C671.htm
trunk/www/devices/12C671_12C671_commercial.png
trunk/www/devices/12C671_12C671_extended.png
trunk/www/devices/12C671_12LC671_commercial.png
trunk/www/devices/12C671_pins_graph.png
trunk/www/devices/12C672.htm
trunk/www/devices/12C672_12C672_commercial.png
trunk/www/devices/12C672_12C672_extended.png
trunk/www/devices/12C672_12LC672_commercial.png
trunk/www/devices/12C672_pins_graph.png
trunk/www/devices/12CE518.htm
trunk/www/devices/12CE518_12CE518_extended.png
trunk/www/devices/12CE518_pins_graph.png
trunk/www/devices/12CE519.htm
trunk/www/devices/12CE519_12CE519_extended.png
trunk/www/devices/12CE519_pins_graph.png
trunk/www/devices/12CE673.htm
trunk/www/devices/12CE673_12CE673_commercial.png
trunk/www/devices/12CE673_12CE673_extended.png
trunk/www/devices/12CE673_12LCE673_commercial.png
trunk/www/devices/12CE673_pins_graph.png
trunk/www/devices/12CE674.htm
trunk/www/devices/12CE674_12CE674_commercial.png
trunk/www/devices/12CE674_12CE674_extended.png
trunk/www/devices/12CE674_12LCE674_commercial.png
trunk/www/devices/12CE674_pins_graph.png
trunk/www/devices/12CR509A.htm
trunk/www/devices/12CR509A_12CR509A_extended.png
trunk/www/devices/12CR509A_pins_graph.png
trunk/www/devices/12F1822.htm
trunk/www/devices/12F1822_12F1822_extended.png
trunk/www/devices/12F1822_12LF1822_extended.png
trunk/www/devices/12F1822_pins_graph.png
trunk/www/devices/12F508.htm
trunk/www/devices/12F508_12F508_extended.png
trunk/www/devices/12F508_pins_graph.png
trunk/www/devices/12F509.htm
trunk/www/devices/12F509_12F509_extended.png
trunk/www/devices/12F509_pins_graph.png
trunk/www/devices/12F510.htm
trunk/www/devices/12F510_12F510_extended.png
trunk/www/devices/12F510_pins_graph.png
trunk/www/devices/12F519.htm
trunk/www/devices/12F519_12F519_extended.png
trunk/www/devices/12F519_pins_graph.png
trunk/www/devices/12F609.htm
trunk/www/devices/12F609_12F609_extended.png
trunk/www/devices/12F609_12HV609_extended.png
trunk/www/devices/12F609_pins_graph.png
trunk/www/devices/12F615.htm
trunk/www/devices/12F615_12F615_extended.png
trunk/www/devices/12F615_12HV615_extended.png
trunk/www/devices/12F615_pins_graph.png
trunk/www/devices/12F617.htm
trunk/www/devices/12F617_12F617_extended.png
trunk/www/devices/12F617_pins_graph.png
trunk/www/devices/12F629.htm
trunk/www/devices/12F629_12F629_commercial.png
trunk/www/devices/12F629_12F629_extended.png
trunk/www/devices/12F629_pins_graph.png
trunk/www/devices/12F635.htm
trunk/www/devices/12F635_12F635_extended.png
trunk/www/devices/12F635_pins_graph.png
trunk/www/devices/12F675.htm
trunk/www/devices/12F675_12F675_commercial.png
trunk/www/devices/12F675_12F675_extended.png
trunk/www/devices/12F675_pins_graph.png
trunk/www/devices/12F683.htm
trunk/www/devices/12F683_12F683_extended.png
trunk/www/devices/12F683_pins_graph.png
trunk/www/devices/12F752.htm
trunk/www/devices/12F752_12F752_extended.png
trunk/www/devices/12F752_12HV752_extended.png
trunk/www/devices/12F752_pins_graph.png
trunk/www/devices/14000.htm
trunk/www/devices/14000_14000_industrial.png
trunk/www/devices/14000_pins_graph.png
trunk/www/devices/16C432.htm
trunk/www/devices/16C432_16C432_industrial.png
trunk/www/devices/16C432_pins_graph.png
trunk/www/devices/16C433.htm
trunk/www/devices/16C433_16C433_industrial.png
trunk/www/devices/16C433_pins_graph.png
trunk/www/devices/16C505.htm
trunk/www/devices/16C505_16C505_commercial.png
trunk/www/devices/16C505_16C505_extended.png
trunk/www/devices/16C505_16LC505_industrial.png
trunk/www/devices/16C505_pins_graph.png
trunk/www/devices/16C52.htm
trunk/www/devices/16C52_16C52_industrial.png
trunk/www/devices/16C52_pins_graph.png
trunk/www/devices/16C54.htm
trunk/www/devices/16C54A.htm
trunk/www/devices/16C54A_16C54A_extended.png
trunk/www/devices/16C54A_16C54A_industrial.png
trunk/www/devices/16C54A_16LC54A_extended.png
trunk/www/devices/16C54A_16LV54A_industrial.png
trunk/www/devices/16C54A_pins_graph.png
trunk/www/devices/16C54B.htm
trunk/www/devices/16C54B_16C54B_extended.png
trunk/www/devices/16C54B_16C54B_industrial.png
trunk/www/devices/16C54B_16LC54B_industrial.png
trunk/www/devices/16C54B_pins_graph.png
trunk/www/devices/16C54C.htm
trunk/www/devices/16C54C_16C54C_extended.png
trunk/www/devices/16C54C_16C54C_industrial.png
trunk/www/devices/16C54C_16LC54C_industrial.png
trunk/www/devices/16C54C_pins_graph.png
trunk/www/devices/16C54_16C54_extended.png
trunk/www/devices/16C54_16C54_industrial.png
trunk/www/devices/16C54_pins_graph.png
trunk/www/devices/16C55.htm
trunk/www/devices/16C554.htm
trunk/www/devices/16C554_16C554_commercial.png
trunk/www/devices/16C554_16C554_extended.png
trunk/www/devices/16C554_16LC554_commercial.png
trunk/www/devices/16C554_16LC554_industrial.png
trunk/www/devices/16C554_pins_graph.png
trunk/www/devices/16C557.htm
trunk/www/devices/16C557_16C557_commercial.png
trunk/www/devices/16C557_16C557_extended.png
trunk/www/devices/16C557_16LC557_commercial.png
trunk/www/devices/16C557_16LC557_industrial.png
trunk/www/devices/16C557_pins_graph.png
trunk/www/devices/16C558.htm
trunk/www/devices/16C558_16C558_commercial.png
trunk/www/devices/16C558_16C558_extended.png
trunk/www/devices/16C558_16LC558_commercial.png
trunk/www/devices/16C558_16LC558_industrial.png
trunk/www/devices/16C558_pins_graph.png
trunk/www/devices/16C55A.htm
trunk/www/devices/16C55A_16C55A_extended.png
trunk/www/devices/16C55A_16C55A_industrial.png
trunk/www/devices/16C55A_16LC55A_industrial.png
trunk/www/devices/16C55A_pins_graph.png
trunk/www/devices/16C55_16C55_extended.png
trunk/www/devices/16C55_16C55_industrial.png
trunk/www/devices/16C55_pins_graph.png
trunk/www/devices/16C56.htm
trunk/www/devices/16C56A.htm
trunk/www/devices/16C56A_16C56A_extended.png
trunk/www/devices/16C56A_16C56A_industrial.png
trunk/www/devices/16C56A_16LC56A_industrial.png
trunk/www/devices/16C56A_pins_graph.png
trunk/www/devices/16C56_16C56_extended.png
trunk/www/devices/16C56_16C56_industrial.png
trunk/www/devices/16C56_pins_graph.png
trunk/www/devices/16C57.htm
trunk/www/devices/16C57C.htm
trunk/www/devices/16C57C_16C57C_extended.png
trunk/www/devices/16C57C_16C57C_industrial.png
trunk/www/devices/16C57C_16LC57C_industrial.png
trunk/www/devices/16C57C_pins_graph.png
trunk/www/devices/16C57_16C57_extended.png
trunk/www/devices/16C57_16C57_industrial.png
trunk/www/devices/16C57_pins_graph.png
trunk/www/devices/16C58A.htm
trunk/www/devices/16C58A_16C58A_extended.png
trunk/www/devices/16C58A_16C58A_industrial.png
trunk/www/devices/16C58A_16LC58A_extended.png
trunk/www/devices/16C58A_16LV58A_industrial.png
trunk/www/devices/16C58A_pins_graph.png
trunk/www/devices/16C58B.htm
trunk/www/devices/16C58B_16C58B_extended.png
trunk/www/devices/16C58B_16C58B_industrial.png
trunk/www/devices/16C58B_16LC58B_industrial.png
trunk/www/devices/16C58B_pins_graph.png
trunk/www/devices/16C61.htm
trunk/www/devices/16C61_16C61_extended.png
trunk/www/devices/16C61_16LC61_industrial.png
trunk/www/devices/16C61_pins_graph.png
trunk/www/devices/16C62.htm
trunk/www/devices/16C620.htm
trunk/www/devices/16C620A.htm
trunk/www/devices/16C620A_16C620A_commercial.png
trunk/www/devices/16C620A_16C620A_extended.png
trunk/www/devices/16C620A_16LC620A_commercial.png
trunk/www/devices/16C620A_16LC620A_industrial.png
trunk/www/devices/16C620A_pins_graph.png
trunk/www/devices/16C620_16C620_commercial.png
trunk/www/devices/16C620_16C620_extended.png
trunk/www/devices/16C620_16LC620_industrial.png
trunk/www/devices/16C620_pins_graph.png
trunk/www/devices/16C621.htm
trunk/www/devices/16C621A.htm
trunk/www/devices/16C621A_16C621A_commercial.png
trunk/www/devices/16C621A_16C621A_extended.png
trunk/www/devices/16C621A_16LC621A_commercial.png
trunk/www/devices/16C621A_16LC621A_industrial.png
trunk/www/devices/16C621A_pins_graph.png
trunk/www/devices/16C621_16C621_commercial.png
trunk/www/devices/16C621_16C621_extended.png
trunk/www/devices/16C621_16LC621_industrial.png
trunk/www/devices/16C621_pins_graph.png
trunk/www/devices/16C622.htm
trunk/www/devices/16C622A.htm
trunk/www/devices/16C622A_16C622A_commercial.png
trunk/www/devices/16C622A_16C622A_extended.png
trunk/www/devices/16C622A_16LC622A_commercial.png
trunk/www/devices/16C622A_16LC622A_industrial.png
trunk/www/devices/16C622A_pins_graph.png
trunk/www/devices/16C622_16C622_commercial.png
trunk/www/devices/16C622_16C622_extended.png
trunk/www/devices/16C622_16LC622_industrial.png
trunk/www/devices/16C622_pins_graph.png
trunk/www/devices/16C62A.htm
trunk/www/devices/16C62A_16C62A_extended.png
trunk/www/devices/16C62A_16LC62A_industrial.png
trunk/www/devices/16C62A_pins_graph.png
trunk/www/devices/16C62B.htm
trunk/www/devices/16C62B_16C62B_extended.png
trunk/www/devices/16C62B_16LC62B_industrial.png
trunk/www/devices/16C62B_pins_graph.png
trunk/www/devices/16C62_16C62_industrial.png
trunk/www/devices/16C62_16LC62_industrial.png
trunk/www/devices/16C62_pins_graph.png
trunk/www/devices/16C63.htm
trunk/www/devices/16C63A.htm
trunk/www/devices/16C63A_16C63A_extended.png
trunk/www/devices/16C63A_16LC63A_industrial.png
trunk/www/devices/16C63A_pins_graph.png
trunk/www/devices/16C63_16C63_extended.png
trunk/www/devices/16C63_16LC63_industrial.png
trunk/www/devices/16C63_pins_graph.png
trunk/www/devices/16C64.htm
trunk/www/devices/16C641.htm
trunk/www/devices/16C641_16C641_extended.png
trunk/www/devices/16C641_16LC641_industrial.png
trunk/www/devices/16C641_pins_graph.png
trunk/www/devices/16C642.htm
trunk/www/devices/16C642_16C642_extended.png
trunk/www/devices/16C642_16LC642_industrial.png
trunk/www/devices/16C642_pins_graph.png
trunk/www/devices/16C64A.htm
trunk/www/devices/16C64A_16C64A_extended.png
trunk/www/devices/16C64A_16LC64A_industrial.png
trunk/www/devices/16C64A_pins_graph.png
trunk/www/devices/16C64_16C64_industrial.png
trunk/www/devices/16C64_16LC64_industrial.png
trunk/www/devices/16C64_pins_graph.png
trunk/www/devices/16C65.htm
trunk/www/devices/16C65A.htm
trunk/www/devices/16C65A_16C65A_extended.png
trunk/www/devices/16C65A_16LC65A_industrial.png
trunk/www/devices/16C65A_pins_graph.png
trunk/www/devices/16C65B.htm
trunk/www/devices/16C65B_16C65B_extended.png
trunk/www/devices/16C65B_16LC65B_industrial.png
trunk/www/devices/16C65B_pins_graph.png
trunk/www/devices/16C65_16C65_industrial.png
trunk/www/devices/16C65_16LC65_industrial.png
trunk/www/devices/16C65_pins_graph.png
trunk/www/devices/16C66.htm
trunk/www/devices/16C661.htm
trunk/www/devices/16C661_16C661_extended.png
trunk/www/devices/16C661_16LC661_industrial.png
trunk/www/devices/16C661_pins_graph.png
trunk/www/devices/16C662.htm
trunk/www/devices/16C662_16C662_extended.png
trunk/www/devices/16C662_16LC662_industrial.png
trunk/www/devices/16C662_pins_graph.png
trunk/www/devices/16C66_16C66_extended.png
trunk/www/devices/16C66_16LC66_industrial.png
trunk/www/devices/16C66_pins_graph.png
trunk/www/devices/16C67.htm
trunk/www/devices/16C67_16C67_extended.png
trunk/www/devices/16C67_16LC67_industrial.png
trunk/www/devices/16C67_pins_graph.png
trunk/www/devices/16C71.htm
trunk/www/devices/16C710.htm
trunk/www/devices/16C710_16C710_extended.png
trunk/www/devices/16C710_16LC710_commercial.png
trunk/www/devices/16C710_16LC710_extended.png
trunk/www/devices/16C710_pins_graph.png
trunk/www/devices/16C711.htm
trunk/www/devices/16C711_16C711_extended.png
trunk/www/devices/16C711_16LC711_commercial.png
trunk/www/devices/16C711_16LC711_extended.png
trunk/www/devices/16C711_pins_graph.png
trunk/www/devices/16C712.htm
trunk/www/devices/16C712_16C712_extended.png
trunk/www/devices/16C712_16LC712_commercial.png
trunk/www/devices/16C712_pins_graph.png
trunk/www/devices/16C715.htm
trunk/www/devices/16C715_16C715_extended.png
trunk/www/devices/16C715_16LC715_industrial.png
trunk/www/devices/16C715_pins_graph.png
trunk/www/devices/16C716.htm
trunk/www/devices/16C716_16C716_extended.png
trunk/www/devices/16C716_16LC716_commercial.png
trunk/www/devices/16C716_pins_graph.png
trunk/www/devices/16C717.htm
trunk/www/devices/16C717_16C717_industrial.png
trunk/www/devices/16C717_16LC717_commercial.png
trunk/www/devices/16C717_16LC717_industrial.png
trunk/www/devices/16C717_pins_graph.png
trunk/www/devices/16C71_16C71_industrial.png
trunk/www/devices/16C71_16LC71_industrial.png
trunk/www/devices/16C71_pins_graph.png
trunk/www/devices/16C72.htm
trunk/www/devices/16C72A.htm
trunk/www/devices/16C72A_16C72A_extended.png
trunk/www/devices/16C72A_16LC72A_industrial.png
trunk/www/devices/16C72A_pins_graph.png
trunk/www/devices/16C72_16C72_extended.png
trunk/www/devices/16C72_16LC72_industrial.png
trunk/www/devices/16C72_pins_graph.png
trunk/www/devices/16C73.htm
trunk/www/devices/16C73A.htm
trunk/www/devices/16C73A_16C73A_extended.png
trunk/www/devices/16C73A_16LC73A_industrial.png
trunk/www/devices/16C73A_pins_graph.png
trunk/www/devices/16C73B.htm
trunk/www/devices/16C73B_16C73B_extended.png
trunk/www/devices/16C73B_16LC73B_industrial.png
trunk/www/devices/16C73B_pins_graph.png
trunk/www/devices/16C73_16C73_industrial.png
trunk/www/devices/16C73_16LC73_industrial.png
trunk/www/devices/16C73_pins_graph.png
trunk/www/devices/16C74.htm
trunk/www/devices/16C745.htm
trunk/www/devices/16C745_16C745_industrial.png
trunk/www/devices/16C745_pins_graph.png
trunk/www/devices/16C74A.htm
trunk/www/devices/16C74A_16C74A_extended.png
trunk/www/devices/16C74A_16LC74A_industrial.png
trunk/www/devices/16C74A_pins_graph.png
trunk/www/devices/16C74B.htm
trunk/www/devices/16C74B_16C74B_extended.png
trunk/www/devices/16C74B_16LC74B_industrial.png
trunk/www/devices/16C74B_pins_graph.png
trunk/www/devices/16C74_16C74_industrial.png
trunk/www/devices/16C74_16LC74_industrial.png
trunk/www/devices/16C74_pins_graph.png
trunk/www/devices/16C76.htm
trunk/www/devices/16C765.htm
trunk/www/devices/16C765_16C765_industrial.png
trunk/www/devices/16C765_pins_graph.png
trunk/www/devices/16C76_16C76_extended.png
trunk/www/devices/16C76_16LC76_industrial.png
trunk/www/devices/16C76_pins_graph.png
trunk/www/devices/16C77.htm
trunk/www/devices/16C770.htm
trunk/www/devices/16C770_16C770_industrial.png
trunk/www/devices/16C770_16LC770_commercial.png
trunk/www/devices/16C770_16LC770_industrial.png
trunk/www/devices/16C770_pins_graph.png
trunk/www/devices/16C771.htm
trunk/www/devices/16C771_16C771_industrial.png
trunk/www/devices/16C771_16LC771_commercial.png
trunk/www/devices/16C771_16LC771_industrial.png
trunk/www/devices/16C771_pins_graph.png
trunk/www/devices/16C773.htm
trunk/www/devices/16C773_16C773_industrial.png
trunk/www/devices/16C773_16LC773_industrial.png
trunk/www/devices/16C773_pins_graph.png
trunk/www/devices/16C774.htm
trunk/www/devices/16C774_16C774_industrial.png
trunk/www/devices/16C774_16LC774_industrial.png
trunk/www/devices/16C774_pins_graph.png
trunk/www/devices/16C77_16C77_extended.png
trunk/www/devices/16C77_16LC77_industrial.png
trunk/www/devices/16C77_pins_graph.png
trunk/www/devices/16C781.htm
trunk/www/devices/16C781_16C781_industrial.png
trunk/www/devices/16C781_16LC781_industrial.png
trunk/www/devices/16C781_pins_graph.png
trunk/www/devices/16C782.htm
trunk/www/devices/16C782_16C782_industrial.png
trunk/www/devices/16C782_16LC782_industrial.png
trunk/www/devices/16C782_pins_graph.png
trunk/www/devices/16C84.htm
trunk/www/devices/16C84_16C84_industrial.png
trunk/www/devices/16C84_16LC84_industrial.png
trunk/www/devices/16C84_pins_graph.png
trunk/www/devices/16C923.htm
trunk/www/devices/16C923_16C923_industrial.png
trunk/www/devices/16C923_16LC923_industrial.png
trunk/www/devices/16C923_pins_graph.png
trunk/www/devices/16C924.htm
trunk/www/devices/16C924_16C924_industrial.png
trunk/www/devices/16C924_16LC924_industrial.png
trunk/www/devices/16C924_pins_graph.png
trunk/www/devices/16C925.htm
trunk/www/devices/16C925_16C925_industrial.png
trunk/www/devices/16C925_16LC925_industrial.png
trunk/www/devices/16C926.htm
trunk/www/devices/16C926_16C926_industrial.png
trunk/www/devices/16C926_16LC926_industrial.png
trunk/www/devices/16CE623.htm
trunk/www/devices/16CE623_16CE623_commercial.png
trunk/www/devices/16CE623_16CE623_extended.png
trunk/www/devices/16CE623_16LCE623_extended.png
trunk/www/devices/16CE623_pins_graph.png
trunk/www/devices/16CE624.htm
trunk/www/devices/16CE624_16CE624_commercial.png
trunk/www/devices/16CE624_16CE624_extended.png
trunk/www/devices/16CE624_16LCE624_extended.png
trunk/www/devices/16CE624_pins_graph.png
trunk/www/devices/16CE625.htm
trunk/www/devices/16CE625_16CE625_commercial.png
trunk/www/devices/16CE625_16CE625_extended.png
trunk/www/devices/16CE625_16LCE625_extended.png
trunk/www/devices/16CE625_pins_graph.png
trunk/www/devices/16CR54A.htm
trunk/www/devices/16CR54A_16CR54A_extended.png
trunk/www/devices/16CR54A_16CR54A_industrial.png
trunk/www/devices/16CR54A_16LCR54A_industrial.png
trunk/www/devices/16CR54A_pins_graph.png
trunk/www/devices/16CR54B.htm
trunk/www/devices/16CR54B_16CR54B_extended.png
trunk/www/devices/16CR54B_16CR54B_industrial.png
trunk/www/devices/16CR54B_16LCR54B_industrial.png
trunk/www/devices/16CR54B_pins_graph.png
trunk/www/devices/16CR54C.htm
trunk/www/devices/16CR54C_16CR54C_extended.png
trunk/www/devices/16CR54C_16CR54C_industrial.png
trunk/www/devices/16CR54C_16LCR54C_industrial.png
trunk/www/devices/16CR54C_pins_graph.png
trunk/www/devices/16CR56A.htm
trunk/www/devices/16CR56A_16CR56A_extended.png
trunk/www/devices/16CR56A_16CR56A_industrial.png
trunk/www/devices/16CR56A_16LCR56A_industrial.png
trunk/www/devices/16CR56A_pins_graph.png
trunk/www/devices/16CR57B.htm
trunk/www/devices/16CR57B_16CR57B_extended.png
trunk/www/devices/16CR57B_16CR57B_industrial.png
trunk/www/devices/16CR57B_16LCR57B_industrial.png
trunk/www/devices/16CR57B_pins_graph.png
trunk/www/devices/16CR57C.htm
trunk/www/devices/16CR57C_16CR57C_extended.png
trunk/www/devices/16CR57C_16CR57C_industrial.png
trunk/www/devices/16CR57C_16LCR57C_industrial.png
trunk/www/devices/16CR57C_pins_graph.png
trunk/www/devices/16CR58A.htm
trunk/www/devices/16CR58A_16CR58A_extended.png
trunk/www/devices/16CR58A_16CR58A_industrial.png
trunk/www/devices/16CR58A_16LCR58A_industrial.png
trunk/www/devices/16CR58A_pins_graph.png
trunk/www/devices/16CR58B.htm
trunk/www/devices/16CR58B_16CR58B_extended.png
trunk/www/devices/16CR58B_16CR58B_industrial.png
trunk/www/devices/16CR58B_16LCR58B_industrial.png
trunk/www/devices/16CR58B_pins_graph.png
trunk/www/devices/16CR62.htm
trunk/www/devices/16CR620A.htm
trunk/www/devices/16CR620A_16CR620A_commercial.png
trunk/www/devices/16CR620A_16CR620A_extended.png
trunk/www/devices/16CR620A_16LCR620A_extended.png
trunk/www/devices/16CR620A_pins_graph.png
trunk/www/devices/16CR62_16CR62_extended.png
trunk/www/devices/16CR62_16LCR62_industrial.png
trunk/www/devices/16CR62_pins_graph.png
trunk/www/devices/16CR63.htm
trunk/www/devices/16CR63_16CR63_industrial.png
trunk/www/devices/16CR63_16LCR63_industrial.png
trunk/www/devices/16CR63_pins_graph.png
trunk/www/devices/16CR64.htm
trunk/www/devices/16CR64_16CR64_extended.png
trunk/www/devices/16CR64_16LCR64_industrial.png
trunk/www/devices/16CR64_pins_graph.png
trunk/www/devices/16CR65.htm
trunk/www/devices/16CR65_16CR65_industrial.png
trunk/www/devices/16CR65_16LCR65_industrial.png
trunk/www/devices/16CR65_pins_graph.png
trunk/www/devices/16CR72.htm
trunk/www/devices/16CR72_16CR72_extended.png
trunk/www/devices/16CR72_16LCR72_industrial.png
trunk/www/devices/16CR72_pins_graph.png
trunk/www/devices/16CR73.htm
trunk/www/devices/16CR73_16CR73_extended.png
trunk/www/devices/16CR73_16LCR73_industrial.png
trunk/www/devices/16CR73_pins_graph.png
trunk/www/devices/16CR74.htm
trunk/www/devices/16CR74_16CR74_extended.png
trunk/www/devices/16CR74_16LCR74_industrial.png
trunk/www/devices/16CR74_pins_graph.png
trunk/www/devices/16CR76.htm
trunk/www/devices/16CR76_16CR76_extended.png
trunk/www/devices/16CR76_16LCR76_industrial.png
trunk/www/devices/16CR76_pins_graph.png
trunk/www/devices/16CR77.htm
trunk/www/devices/16CR77_16CR77_extended.png
trunk/www/devices/16CR77_16LCR77_industrial.png
trunk/www/devices/16CR77_pins_graph.png
trunk/www/devices/16CR83.htm
trunk/www/devices/16CR83_16CR83_industrial.png
trunk/www/devices/16CR83_16LCR83_industrial.png
trunk/www/devices/16CR83_pins_graph.png
trunk/www/devices/16CR84.htm
trunk/www/devices/16CR84_16CR84_industrial.png
trunk/www/devices/16CR84_16LCR84_industrial.png
trunk/www/devices/16CR84_pins_graph.png
trunk/www/devices/16F1507.htm
trunk/www/devices/16F1507_16F1507_extended.png
trunk/www/devices/16F1507_16LF1507_extended.png
trunk/www/devices/16F1507_pins_graph.png
trunk/www/devices/16F1823.htm
trunk/www/devices/16F1823_16F1823_extended.png
trunk/www/devices/16F1823_16LF1823_extended.png
trunk/www/devices/16F1823_pins_graph.png
trunk/www/devices/16F1824.htm
trunk/www/devices/16F1824_16F1824_extended.png
trunk/www/devices/16F1824_16LF1824_extended.png
trunk/www/devices/16F1824_pins_graph.png
trunk/www/devices/16F1825.htm
trunk/www/devices/16F1825_16F1825_extended.png
trunk/www/devices/16F1825_16LF1825_extended.png
trunk/www/devices/16F1825_pins_graph.png
trunk/www/devices/16F1826.htm
trunk/www/devices/16F1826_16F1826_extended.png
trunk/www/devices/16F1826_16LF1826_extended.png
trunk/www/devices/16F1826_pins_graph.png
trunk/www/devices/16F1827.htm
trunk/www/devices/16F1827_16F1827_extended.png
trunk/www/devices/16F1827_16LF1827_extended.png
trunk/www/devices/16F1827_pins_graph.png
trunk/www/devices/16F1828.htm
trunk/www/devices/16F1828_16F1828_extended.png
trunk/www/devices/16F1828_16LF1828_extended.png
trunk/www/devices/16F1828_pins_graph.png
trunk/www/devices/16F1829.htm
trunk/www/devices/16F1829_16F1829_extended.png
trunk/www/devices/16F1829_16LF1829_extended.png
trunk/www/devices/16F1829_pins_graph.png
trunk/www/devices/16F1933.htm
trunk/www/devices/16F1933_16F1933_extended.png
trunk/www/devices/16F1933_16LF1933_extended.png
trunk/www/devices/16F1933_pins_graph.png
trunk/www/devices/16F1934.htm
trunk/www/devices/16F1934_16F1934_extended.png
trunk/www/devices/16F1934_16LF1934_extended.png
trunk/www/devices/16F1934_pins_graph.png
trunk/www/devices/16F1936.htm
trunk/www/devices/16F1936_16F1936_extended.png
trunk/www/devices/16F1936_16LF1936_extended.png
trunk/www/devices/16F1936_pins_graph.png
trunk/www/devices/16F1937.htm
trunk/www/devices/16F1937_16F1937_extended.png
trunk/www/devices/16F1937_16LF1937_extended.png
trunk/www/devices/16F1937_pins_graph.png
trunk/www/devices/16F1938.htm
trunk/www/devices/16F1938_16F1938_extended.png
trunk/www/devices/16F1938_16LF1938_extended.png
trunk/www/devices/16F1938_pins_graph.png
trunk/www/devices/16F1939.htm
trunk/www/devices/16F1939_16F1939_extended.png
trunk/www/devices/16F1939_16LF1939_extended.png
trunk/www/devices/16F1939_pins_graph.png
trunk/www/devices/16F1946.htm
trunk/www/devices/16F1946_16F1946_extended.png
trunk/www/devices/16F1946_16LF1946_extended.png
trunk/www/devices/16F1947.htm
trunk/www/devices/16F1947_16F1947_extended.png
trunk/www/devices/16F1947_16LF1947_extended.png
trunk/www/devices/16F505.htm
trunk/www/devices/16F505_16F505_extended.png
trunk/www/devices/16F505_pins_graph.png
trunk/www/devices/16F506.htm
trunk/www/devices/16F506_16F506_extended.png
trunk/www/devices/16F506_pins_graph.png
trunk/www/devices/16F526.htm
trunk/www/devices/16F526_16F526_extended.png
trunk/www/devices/16F526_pins_graph.png
trunk/www/devices/16F54.htm
trunk/www/devices/16F54_16F54_extended.png
trunk/www/devices/16F54_pins_graph.png
trunk/www/devices/16F57.htm
trunk/www/devices/16F57_16F57_extended.png
trunk/www/devices/16F57_pins_graph.png
trunk/www/devices/16F59.htm
trunk/www/devices/16F59_16F59_extended.png
trunk/www/devices/16F59_pins_graph.png
trunk/www/devices/16F610.htm
trunk/www/devices/16F610_16F610_extended.png
trunk/www/devices/16F610_16HV610_extended.png
trunk/www/devices/16F610_pins_graph.png
trunk/www/devices/16F616.htm
trunk/www/devices/16F616_16F616_extended.png
trunk/www/devices/16F616_16HV616_extended.png
trunk/www/devices/16F616_pins_graph.png
trunk/www/devices/16F627.htm
trunk/www/devices/16F627A.htm
trunk/www/devices/16F627A_16F627A_extended.png
trunk/www/devices/16F627A_16LF627A_industrial.png
trunk/www/devices/16F627A_pins_graph.png
trunk/www/devices/16F627_16F627_commercial.png
trunk/www/devices/16F627_16F627_extended.png
trunk/www/devices/16F627_16LF627_commercial.png
trunk/www/devices/16F627_16LF627_extended.png
trunk/www/devices/16F627_pins_graph.png
trunk/www/devices/16F628.htm
trunk/www/devices/16F628A.htm
trunk/www/devices/16F628A_16F628A_extended.png
trunk/www/devices/16F628A_16LF628A_industrial.png
trunk/www/devices/16F628A_pins_graph.png
trunk/www/devices/16F628_16F628_commercial.png
trunk/www/devices/16F628_16F628_extended.png
trunk/www/devices/16F628_16LF628_commercial.png
trunk/www/devices/16F628_16LF628_extended.png
trunk/www/devices/16F628_pins_graph.png
trunk/www/devices/16F630.htm
trunk/www/devices/16F630_16F630_commercial.png
trunk/www/devices/16F630_16F630_extended.png
trunk/www/devices/16F630_pins_graph.png
trunk/www/devices/16F631.htm
trunk/www/devices/16F631_16F631_extended.png
trunk/www/devices/16F631_pins_graph.png
trunk/www/devices/16F636.htm
trunk/www/devices/16F636_16F636_extended.png
trunk/www/devices/16F636_pins_graph.png
trunk/www/devices/16F639.htm
trunk/www/devices/16F639_16F639_extended.png
trunk/www/devices/16F639_pins_graph.png
trunk/www/devices/16F648A.htm
trunk/www/devices/16F648A_16F648A_extended.png
trunk/www/devices/16F648A_16LF648A_industrial.png
trunk/www/devices/16F648A_pins_graph.png
trunk/www/devices/16F676.htm
trunk/www/devices/16F676_16F676_commercial.png
trunk/www/devices/16F676_16F676_extended.png
trunk/www/devices/16F676_pins_graph.png
trunk/www/devices/16F677.htm
trunk/www/devices/16F677_16F677_extended.png
trunk/www/devices/16F677_pins_graph.png
trunk/www/devices/16F684.htm
trunk/www/devices/16F684_16F684_extended.png
trunk/www/devices/16F684_pins_graph.png
trunk/www/devices/16F685.htm
trunk/www/devices/16F685_16F685_extended.png
trunk/www/devices/16F685_pins_graph.png
trunk/www/devices/16F687.htm
trunk/www/devices/16F687_16F687_extended.png
trunk/www/devices/16F687_pins_graph.png
trunk/www/devices/16F688.htm
trunk/www/devices/16F688_16F688_extended.png
trunk/www/devices/16F688_pins_graph.png
trunk/www/devices/16F689.htm
trunk/www/devices/16F689_16F689_extended.png
trunk/www/devices/16F689_pins_graph.png
trunk/www/devices/16F690.htm
trunk/www/devices/16F690_16F690_extended.png
trunk/www/devices/16F690_pins_graph.png
trunk/www/devices/16F716.htm
trunk/www/devices/16F716_16F716_extended.png
trunk/www/devices/16F716_16F716_industrial.png
trunk/www/devices/16F716_pins_graph.png
trunk/www/devices/16F72.htm
trunk/www/devices/16F722.htm
trunk/www/devices/16F722_16F722_extended.png
trunk/www/devices/16F722_16LF722_extended.png
trunk/www/devices/16F722_pins_graph.png
trunk/www/devices/16F723.htm
trunk/www/devices/16F723_16F723_extended.png
trunk/www/devices/16F723_16LF723_extended.png
trunk/www/devices/16F723_pins_graph.png
trunk/www/devices/16F724.htm
trunk/www/devices/16F724_16F724_extended.png
trunk/www/devices/16F724_16LF724_extended.png
trunk/www/devices/16F724_pins_graph.png
trunk/www/devices/16F726.htm
trunk/www/devices/16F726_16F726_extended.png
trunk/www/devices/16F726_16LF726_extended.png
trunk/www/devices/16F726_pins_graph.png
trunk/www/devices/16F727.htm
trunk/www/devices/16F727_16F727_extended.png
trunk/www/devices/16F727_16LF727_extended.png
trunk/www/devices/16F727_pins_graph.png
trunk/www/devices/16F72_16F72_extended.png
trunk/www/devices/16F72_16LF72_industrial.png
trunk/www/devices/16F72_pins_graph.png
trunk/www/devices/16F73.htm
trunk/www/devices/16F737.htm
trunk/www/devices/16F737_16F737_extended.png
trunk/www/devices/16F737_16LF737_industrial.png
trunk/www/devices/16F737_pins_graph.png
trunk/www/devices/16F73_16F73_extended.png
trunk/www/devices/16F73_16LF73_industrial.png
trunk/www/devices/16F73_pins_graph.png
trunk/www/devices/16F74.htm
trunk/www/devices/16F747.htm
trunk/www/devices/16F747_16F747_extended.png
trunk/www/devices/16F747_16LF747_industrial.png
trunk/www/devices/16F747_pins_graph.png
trunk/www/devices/16F74_16F74_extended.png
trunk/www/devices/16F74_16LF74_industrial.png
trunk/www/devices/16F74_pins_graph.png
trunk/www/devices/16F76.htm
trunk/www/devices/16F767.htm
trunk/www/devices/16F767_16F767_extended.png
trunk/www/devices/16F767_16LF767_industrial.png
trunk/www/devices/16F767_pins_graph.png
trunk/www/devices/16F76_16F76_extended.png
trunk/www/devices/16F76_16LF76_industrial.png
trunk/www/devices/16F76_pins_graph.png
trunk/www/devices/16F77.htm
trunk/www/devices/16F777.htm
trunk/www/devices/16F777_16F777_extended.png
trunk/www/devices/16F777_16LF777_industrial.png
trunk/www/devices/16F777_pins_graph.png
trunk/www/devices/16F77_16F77_extended.png
trunk/www/devices/16F77_16LF77_industrial.png
trunk/www/devices/16F77_pins_graph.png
trunk/www/devices/16F785.htm
trunk/www/devices/16F785_16F785_extended.png
trunk/www/devices/16F785_16HV785_extended.png
trunk/www/devices/16F785_pins_graph.png
trunk/www/devices/16F818.htm
trunk/www/devices/16F818_16F818_extended.png
trunk/www/devices/16F818_16LF818_industrial.png
trunk/www/devices/16F818_pins_graph.png
trunk/www/devices/16F819.htm
trunk/www/devices/16F819_16F819_extended.png
trunk/www/devices/16F819_16LF819_industrial.png
trunk/www/devices/16F819_pins_graph.png
trunk/www/devices/16F83.htm
trunk/www/devices/16F83_16F83_industrial.png
trunk/www/devices/16F83_16LF83_industrial.png
trunk/www/devices/16F83_pins_graph.png
trunk/www/devices/16F84.htm
trunk/www/devices/16F84A.htm
trunk/www/devices/16F84A_16F84A_extended.png
trunk/www/devices/16F84A_16LF84A_extended.png
trunk/www/devices/16F84A_pins_graph.png
trunk/www/devices/16F84_16F84_industrial.png
trunk/www/devices/16F84_16LF84_industrial.png
trunk/www/devices/16F84_pins_graph.png
trunk/www/devices/16F87.htm
trunk/www/devices/16F870.htm
trunk/www/devices/16F870_16F870_industrial.png
trunk/www/devices/16F870_16LF870_industrial.png
trunk/www/devices/16F870_pins_graph.png
trunk/www/devices/16F871.htm
trunk/www/devices/16F871_16F871_industrial.png
trunk/www/devices/16F871_16LF871_industrial.png
trunk/www/devices/16F871_pins_graph.png
trunk/www/devices/16F872.htm
trunk/www/devices/16F872_16F872_industrial.png
trunk/www/devices/16F872_16LF872_industrial.png
trunk/www/devices/16F872_pins_graph.png
trunk/www/devices/16F873.htm
trunk/www/devices/16F873A.htm
trunk/www/devices/16F873A_16F873A_extended.png
trunk/www/devices/16F873A_16LF873A_industrial.png
trunk/www/devices/16F873A_pins_graph.png
trunk/www/devices/16F873_16F873_extended.png
trunk/www/devices/16F873_16F873_industrial.png
trunk/www/devices/16F873_16LF873_industrial.png
trunk/www/devices/16F873_pins_graph.png
trunk/www/devices/16F874.htm
trunk/www/devices/16F874A.htm
trunk/www/devices/16F874A_16F874A_extended.png
trunk/www/devices/16F874A_16LF874A_industrial.png
trunk/www/devices/16F874A_pins_graph.png
trunk/www/devices/16F874_16F874_extended.png
trunk/www/devices/16F874_16F874_industrial.png
trunk/www/devices/16F874_16LF874_industrial.png
trunk/www/devices/16F874_pins_graph.png
trunk/www/devices/16F876.htm
trunk/www/devices/16F876A.htm
trunk/www/devices/16F876A_16F876A_extended.png
trunk/www/devices/16F876A_16LF876A_industrial.png
trunk/www/devices/16F876A_pins_graph.png
trunk/www/devices/16F876_16F876_extended.png
trunk/www/devices/16F876_16F876_industrial.png
trunk/www/devices/16F876_16LF876_industrial.png
trunk/www/devices/16F876_pins_graph.png
trunk/www/devices/16F877.htm
trunk/www/devices/16F877A.htm
trunk/www/devices/16F877A_16F877A_extended.png
trunk/www/devices/16F877A_16LF877A_industrial.png
trunk/www/devices/16F877A_pins_graph.png
trunk/www/devices/16F877_16F877_extended.png
trunk/www/devices/16F877_16F877_industrial.png
trunk/www/devices/16F877_16LF877_industrial.png
trunk/www/devices/16F877_pins_graph.png
trunk/www/devices/16F87_16F87_extended.png
trunk/www/devices/16F87_16LF87_industrial.png
trunk/www/devices/16F87_pins_graph.png
trunk/www/devices/16F88.htm
trunk/www/devices/16F882.htm
trunk/www/devices/16F882_16F882_extended.png
trunk/www/devices/16F882_pins_graph.png
trunk/www/devices/16F883.htm
trunk/www/devices/16F883_16F883_extended.png
trunk/www/devices/16F883_pins_graph.png
trunk/www/devices/16F884.htm
trunk/www/devices/16F884_16F884_extended.png
trunk/www/devices/16F884_pins_graph.png
trunk/www/devices/16F886.htm
trunk/www/devices/16F886_16F886_extended.png
trunk/www/devices/16F886_pins_graph.png
trunk/www/devices/16F887.htm
trunk/www/devices/16F887_16F887_extended.png
trunk/www/devices/16F887_pins_graph.png
trunk/www/devices/16F88_16F88_extended.png
trunk/www/devices/16F88_16LF88_industrial.png
trunk/www/devices/16F88_pins_graph.png
trunk/www/devices/16F913.htm
trunk/www/devices/16F913_16F913_extended.png
trunk/www/devices/16F913_pins_graph.png
trunk/www/devices/16F914.htm
trunk/www/devices/16F914_16F914_extended.png
trunk/www/devices/16F916.htm
trunk/www/devices/16F916_16F916_extended.png
trunk/www/devices/16F916_pins_graph.png
trunk/www/devices/16F917.htm
trunk/www/devices/16F917_16F917_extended.png
trunk/www/devices/16F946.htm
trunk/www/devices/16F946_16F946_extended.png
trunk/www/devices/16HV540.htm
trunk/www/devices/16HV540_16HV540_industrial.png
trunk/www/devices/16HV540_pins_graph.png
trunk/www/devices/17C42.htm
trunk/www/devices/17C42A.htm
trunk/www/devices/17C42A_17C42A_industrial.png
trunk/www/devices/17C42A_17LC42A_industrial.png
trunk/www/devices/17C42A_pins_graph.png
trunk/www/devices/17C42_17C42_industrial.png
trunk/www/devices/17C42_pins_graph.png
trunk/www/devices/17C43.htm
trunk/www/devices/17C43_17C43_industrial.png
trunk/www/devices/17C43_17LC43_industrial.png
trunk/www/devices/17C43_pins_graph.png
trunk/www/devices/17C44.htm
trunk/www/devices/17C44_17C44_industrial.png
trunk/www/devices/17C44_17LC44_industrial.png
trunk/www/devices/17C44_pins_graph.png
trunk/www/devices/17C752.htm
trunk/www/devices/17C752_17C752_extended.png
trunk/www/devices/17C752_17LC752_industrial.png
trunk/www/devices/17C756.htm
trunk/www/devices/17C756A.htm
trunk/www/devices/17C756A_17C756A_extended.png
trunk/www/devices/17C756A_17LC756A_industrial.png
trunk/www/devices/17C756_17C756_extended.png
trunk/www/devices/17C756_17LC756_industrial.png
trunk/www/devices/17C762.htm
trunk/www/devices/17C762_17C762_extended.png
trunk/www/devices/17C762_17LC762_industrial.png
trunk/www/devices/17C766.htm
trunk/www/devices/17C766_17C766_extended.png
trunk/www/devices/17C766_17LC766_industrial.png
trunk/www/devices/17CR42.htm
trunk/www/devices/17CR42_17CR42_industrial.png
trunk/www/devices/17CR42_17LCR42_industrial.png
trunk/www/devices/17CR42_pins_graph.png
trunk/www/devices/17CR43.htm
trunk/www/devices/17CR43_17CR43_industrial.png
trunk/www/devices/17CR43_17LCR43_industrial.png
trunk/www/devices/17CR43_pins_graph.png
trunk/www/devices/18C242.htm
trunk/www/devices/18C242_18C242_extended.png
trunk/www/devices/18C242_18LC242_industrial.png
trunk/www/devices/18C242_pins_graph.png
trunk/www/devices/18C252.htm
trunk/www/devices/18C252_18C252_extended.png
trunk/www/devices/18C252_18LC252_industrial.png
trunk/www/devices/18C252_pins_graph.png
trunk/www/devices/18C442.htm
trunk/www/devices/18C442_18C442_extended.png
trunk/www/devices/18C442_18LC442_industrial.png
trunk/www/devices/18C442_pins_graph.png
trunk/www/devices/18C452.htm
trunk/www/devices/18C452_18C452_extended.png
trunk/www/devices/18C452_18LC452_industrial.png
trunk/www/devices/18C452_pins_graph.png
trunk/www/devices/18C601.htm
trunk/www/devices/18C601_18C601_extended.png
trunk/www/devices/18C601_18LC601_industrial.png
trunk/www/devices/18C658.htm
trunk/www/devices/18C658_18C658_extended.png
trunk/www/devices/18C658_18LC658_industrial.png
trunk/www/devices/18C801.htm
trunk/www/devices/18C801_18C801_extended.png
trunk/www/devices/18C801_18LC801_industrial.png
trunk/www/devices/18C858.htm
trunk/www/devices/18C858_18C858_extended.png
trunk/www/devices/18C858_18LC858_industrial.png
trunk/www/devices/18F1220.htm
trunk/www/devices/18F1220_18F1220_extended.png
trunk/www/devices/18F1220_18F1220_industrial.png
trunk/www/devices/18F1220_18LF1220_industrial.png
trunk/www/devices/18F1220_pins_graph.png
trunk/www/devices/18F1230.htm
trunk/www/devices/18F1230_18F1230_extended.png
trunk/www/devices/18F1230_18F1230_industrial.png
trunk/www/devices/18F1230_18LF1230_industrial.png
trunk/www/devices/18F1230_pins_graph.png
trunk/www/devices/18F1320.htm
trunk/www/devices/18F1320_18F1320_extended.png
trunk/www/devices/18F1320_18F1320_industrial.png
trunk/www/devices/18F1320_18LF1320_industrial.png
trunk/www/devices/18F1320_pins_graph.png
trunk/www/devices/18F1330.htm
trunk/www/devices/18F1330_18F1330_extended.png
trunk/www/devices/18F1330_18F1330_industrial.png
trunk/www/devices/18F1330_18LF1330_industrial.png
trunk/www/devices/18F1330_pins_graph.png
trunk/www/devices/18F13K22.htm
trunk/www/devices/18F13K22_18F13K22_extended.png
trunk/www/devices/18F13K22_18F13K22_industrial.png
trunk/www/devices/18F13K22_18LF13K22_extended.png
trunk/www/devices/18F13K22_18LF13K22_industrial.png
trunk/www/devices/18F13K22_pins_graph.png
trunk/www/devices/18F13K50.htm
trunk/www/devices/18F13K50_18F13K50_extended.png
trunk/www/devices/18F13K50_18F13K50_industrial.png
trunk/www/devices/18F13K50_18LF13K50_extended.png
trunk/www/devices/18F13K50_18LF13K50_industrial.png
trunk/www/devices/18F13K50_pins_graph.png
trunk/www/devices/18F14K22.htm
trunk/www/devices/18F14K22_18F14K22_extended.png
trunk/www/devices/18F14K22_18F14K22_industrial.png
trunk/www/devices/18F14K22_18LF14K22_extended.png
trunk/www/devices/18F14K22_18LF14K22_industrial.png
trunk/www/devices/18F14K22_pins_graph.png
trunk/www/devices/18F14K50.htm
trunk/www/devices/18F14K50_18F14K50_extended.png
trunk/www/devices/18F14K50_18F14K50_industrial.png
trunk/www/devices/18F14K50_18LF14K50_extended.png
trunk/www/devices/18F14K50_18LF14K50_industrial.png
trunk/www/devices/18F14K50_pins_graph.png
trunk/www/devices/18F2220.htm
trunk/www/devices/18F2220_18F2220_extended.png
trunk/www/devices/18F2220_18F2220_industrial.png
trunk/www/devices/18F2220_18LF2220_industrial.png
trunk/www/devices/18F2220_pins_graph.png
trunk/www/devices/18F2221.htm
trunk/www/devices/18F2221_18F2221_extended.png
trunk/www/devices/18F2221_18F2221_industrial.png
trunk/www/devices/18F2221_18LF2221_industrial.png
trunk/www/devices/18F2221_pins_graph.png
trunk/www/devices/18F2320.htm
trunk/www/devices/18F2320_18F2320_extended.png
trunk/www/devices/18F2320_18F2320_industrial.png
trunk/www/devices/18F2320_18LF2320_industrial.png
trunk/www/devices/18F2320_pins_graph.png
trunk/www/devices/18F2321.htm
trunk/www/devices/18F2321_18F2321_extended.png
trunk/www/devices/18F2321_18F2321_industrial.png
trunk/www/devices/18F2321_18LF2321_industrial.png
trunk/www/devices/18F2321_pins_graph.png
trunk/www/devices/18F2331.htm
trunk/www/devices/18F2331_18F2331_extended.png
trunk/www/devices/18F2331_18F2331_industrial.png
trunk/www/devices/18F2331_18LF2331_industrial.png
trunk/www/devices/18F2331_pins_graph.png
trunk/www/devices/18F23K20.htm
trunk/www/devices/18F23K20_18F23K20_extended.png
trunk/www/devices/18F23K20_18F23K20_industrial.png
trunk/www/devices/18F23K20_pins_graph.png
trunk/www/devices/18F23K22.htm
trunk/www/devices/18F23K22_18F23K22_extended.png
trunk/www/devices/18F23K22_18F23K22_industrial.png
trunk/www/devices/18F23K22_18LF23K22_extended.png
trunk/www/devices/18F23K22_18LF23K22_industrial.png
trunk/www/devices/18F23K22_pins_graph.png
trunk/www/devices/18F2410.htm
trunk/www/devices/18F2410_18F2410_extended.png
trunk/www/devices/18F2410_18F2410_industrial.png
trunk/www/devices/18F2410_18LF2410_industrial.png
trunk/www/devices/18F2410_pins_graph.png
trunk/www/devices/18F242.htm
trunk/www/devices/18F2420.htm
trunk/www/devices/18F2420_18F2420_extended.png
trunk/www/devices/18F2420_18F2420_industrial.png
trunk/www/devices/18F2420_18LF2420_industrial.png
trunk/www/devices/18F2420_pins_graph.png
trunk/www/devices/18F2423.htm
trunk/www/devices/18F2423_18F2423_industrial.png
trunk/www/devices/18F2423_18LF2423_industrial.png
trunk/www/devices/18F2423_pins_graph.png
trunk/www/devices/18F242_18F242_extended.png
trunk/www/devices/18F242_18F242_industrial.png
trunk/www/devices/18F242_18LF242_industrial.png
trunk/www/devices/18F242_pins_graph.png
trunk/www/devices/18F2431.htm
trunk/www/devices/18F2431_18F2431_extended.png
trunk/www/devices/18F2431_18F2431_industrial.png
trunk/www/devices/18F2431_18LF2431_industrial.png
trunk/www/devices/18F2431_pins_graph.png
trunk/www/devices/18F2439.htm
trunk/www/devices/18F2439_18F2439_extended.png
trunk/www/devices/18F2439_18F2439_industrial.png
trunk/www/devices/18F2439_18LF2439_industrial.png
trunk/www/devices/18F2439_pins_graph.png
trunk/www/devices/18F2450.htm
trunk/www/devices/18F2450_18F2450_extended.png
trunk/www/devices/18F2450_18F2450_industrial.png
trunk/www/devices/18F2450_18LF2450_industrial.png
trunk/www/devices/18F2450_pins_graph.png
trunk/www/devices/18F2455.htm
trunk/www/devices/18F2455_18F2455_industrial.png
trunk/www/devices/18F2455_18LF2455_industrial.png
trunk/www/devices/18F2455_pins_graph.png
trunk/www/devices/18F2458.htm
trunk/www/devices/18F2458_18F2458_industrial.png
trunk/www/devices/18F2458_18LF2458_industrial.png
trunk/www/devices/18F2458_pins_graph.png
trunk/www/devices/18F248.htm
trunk/www/devices/18F2480.htm
trunk/www/devices/18F2480_18F2480_extended.png
trunk/www/devices/18F2480_18F2480_industrial.png
trunk/www/devices/18F2480_18LF2480_industrial.png
trunk/www/devices/18F2480_pins_graph.png
trunk/www/devices/18F248_18F248_extended.png
trunk/www/devices/18F248_18F248_industrial.png
trunk/www/devices/18F248_18LF248_industrial.png
trunk/www/devices/18F248_pins_graph.png
trunk/www/devices/18F24J10.htm
trunk/www/devices/18F24J10_18F24J10_industrial.png
trunk/www/devices/18F24J10_18LF24J10_industrial.png
trunk/www/devices/18F24J10_pins_graph.png
trunk/www/devices/18F24K20.htm
trunk/www/devices/18F24K20_18F24K20_extended.png
trunk/www/devices/18F24K20_18F24K20_industrial.png
trunk/www/devices/18F24K20_pins_graph.png
trunk/www/devices/18F24K22.htm
trunk/www/devices/18F24K22_18F24K22_extended.png
trunk/www/devices/18F24K22_18F24K22_industrial.png
trunk/www/devices/18F24K22_18LF24K22_extended.png
trunk/www/devices/18F24K22_18LF24K22_industrial.png
trunk/www/devices/18F24K22_pins_graph.png
trunk/www/devices/18F2510.htm
trunk/www/devices/18F2510_18F2510_extended.png
trunk/www/devices/18F2510_18F2510_industrial.png
trunk/www/devices/18F2510_18LF2510_industrial.png
trunk/www/devices/18F2510_pins_graph.png
trunk/www/devices/18F2515.htm
trunk/www/devices/18F2515_18F2515_extended.png
trunk/www/devices/18F2515_18F2515_industrial.png
trunk/www/devices/18F2515_18LF2515_industrial.png
trunk/www/devices/18F2515_pins_graph.png
trunk/www/devices/18F252.htm
trunk/www/devices/18F2520.htm
trunk/www/devices/18F2520_18F2520_extended.png
trunk/www/devices/18F2520_18F2520_industrial.png
trunk/www/devices/18F2520_18LF2520_industrial.png
trunk/www/devices/18F2520_pins_graph.png
trunk/www/devices/18F2523.htm
trunk/www/devices/18F2523_18F2523_industrial.png
trunk/www/devices/18F2523_18LF2523_industrial.png
trunk/www/devices/18F2523_pins_graph.png
trunk/www/devices/18F2525.htm
trunk/www/devices/18F2525_18F2525_extended.png
trunk/www/devices/18F2525_18F2525_industrial.png
trunk/www/devices/18F2525_18LF2525_industrial.png
trunk/www/devices/18F2525_pins_graph.png
trunk/www/devices/18F252_18F252_extended.png
trunk/www/devices/18F252_18F252_industrial.png
trunk/www/devices/18F252_18LF252_industrial.png
trunk/www/devices/18F252_pins_graph.png
trunk/www/devices/18F2539.htm
trunk/www/devices/18F2539_18F2539_extended.png
trunk/www/devices/18F2539_18F2539_industrial.png
trunk/www/devices/18F2539_18LF2539_industrial.png
trunk/www/devices/18F2539_pins_graph.png
trunk/www/devices/18F2550.htm
trunk/www/devices/18F2550_18F2550_industrial.png
trunk/www/devices/18F2550_18LF2550_industrial.png
trunk/www/devices/18F2550_pins_graph.png
trunk/www/devices/18F2553.htm
trunk/www/devices/18F2553_18F2553_industrial.png
trunk/www/devices/18F2553_18LF2553_industrial.png
trunk/www/devices/18F2553_pins_graph.png
trunk/www/devices/18F258.htm
trunk/www/devices/18F2580.htm
trunk/www/devices/18F2580_18F2580_extended.png
trunk/www/devices/18F2580_18F2580_industrial.png
trunk/www/devices/18F2580_18LF2580_industrial.png
trunk/www/devices/18F2580_pins_graph.png
trunk/www/devices/18F2585.htm
trunk/www/devices/18F2585_18F2585_extended.png
trunk/www/devices/18F2585_18F2585_industrial.png
trunk/www/devices/18F2585_18LF2585_industrial.png
trunk/www/devices/18F2585_pins_graph.png
trunk/www/devices/18F258_18F258_extended.png
trunk/www/devices/18F258_18F258_industrial.png
trunk/www/devices/18F258_18LF258_industrial.png
trunk/www/devices/18F258_pins_graph.png
trunk/www/devices/18F25J10.htm
trunk/www/devices/18F25J10_18F25J10_industrial.png
trunk/www/devices/18F25J10_18LF25J10_industrial.png
trunk/www/devices/18F25J10_pins_graph.png
trunk/www/devices/18F25K20.htm
trunk/www/devices/18F25K20_18F25K20_extended.png
trunk/www/devices/18F25K20_18F25K20_industrial.png
trunk/www/devices/18F25K20_pins_graph.png
trunk/www/devices/18F25K22.htm
trunk/www/devices/18F25K22_18F25K22_extended.png
trunk/www/devices/18F25K22_18F25K22_industrial.png
trunk/www/devices/18F25K22_18LF25K22_extended.png
trunk/www/devices/18F25K22_18LF25K22_industrial.png
trunk/www/devices/18F25K22_pins_graph.png
trunk/www/devices/18F2610.htm
trunk/www/devices/18F2610_18F2610_extended.png
trunk/www/devices/18F2610_18F2610_industrial.png
trunk/www/devices/18F2610_18LF2610_industrial.png
trunk/www/devices/18F2610_pins_graph.png
trunk/www/devices/18F2620.htm
trunk/www/devices/18F2620_18F2620_extended.png
trunk/www/devices/18F2620_18F2620_industrial.png
trunk/www/devices/18F2620_18LF2620_industrial.png
trunk/www/devices/18F2620_pins_graph.png
trunk/www/devices/18F2680.htm
trunk/www/devices/18F2680_18F2680_extended.png
trunk/www/devices/18F2680_18F2680_industrial.png
trunk/www/devices/18F2680_18LF2680_industrial.png
trunk/www/devices/18F2680_pins_graph.png
trunk/www/devices/18F2682.htm
trunk/www/devices/18F2682_18F2682_extended.png
trunk/www/devices/18F2682_18F2682_industrial.png
trunk/www/devices/18F2682_18LF2682_industrial.png
trunk/www/devices/18F2682_pins_graph.png
trunk/www/devices/18F2685.htm
trunk/www/devices/18F2685_18F2685_extended.png
trunk/www/devices/18F2685_18F2685_industrial.png
trunk/www/devices/18F2685_18LF2685_industrial.png
trunk/www/devices/18F2685_pins_graph.png
trunk/www/devices/18F26K20.htm
trunk/www/devices/18F26K20_18F26K20_extended.png
trunk/www/devices/18F26K20_18F26K20_industrial.png
trunk/www/devices/18F26K20_pins_graph.png
trunk/www/devices/18F26K22.htm
trunk/www/devices/18F26K22_18F26K22_extended.png
trunk/www/devices/18F26K22_18F26K22_industrial.png
trunk/www/devices/18F26K22_18LF26K22_extended.png
trunk/www/devices/18F26K22_18LF26K22_industrial.png
trunk/www/devices/18F26K22_pins_graph.png
trunk/www/devices/18F4220.htm
trunk/www/devices/18F4220_18F4220_extended.png
trunk/www/devices/18F4220_18F4220_industrial.png
trunk/www/devices/18F4220_18LF4220_industrial.png
trunk/www/devices/18F4220_pins_graph.png
trunk/www/devices/18F4221.htm
trunk/www/devices/18F4221_18F4221_extended.png
trunk/www/devices/18F4221_18F4221_industrial.png
trunk/www/devices/18F4221_18LF4221_industrial.png
trunk/www/devices/18F4221_pins_graph.png
trunk/www/devices/18F4320.htm
trunk/www/devices/18F4320_18F4320_extended.png
trunk/www/devices/18F4320_18F4320_industrial.png
trunk/www/devices/18F4320_18LF4320_industrial.png
trunk/www/devices/18F4320_pins_graph.png
trunk/www/devices/18F4321.htm
trunk/www/devices/18F4321_18F4321_extended.png
trunk/www/devices/18F4321_18F4321_industrial.png
trunk/www/devices/18F4321_18LF4321_industrial.png
trunk/www/devices/18F4321_pins_graph.png
trunk/www/devices/18F4331.htm
trunk/www/devices/18F4331_18F4331_extended.png
trunk/www/devices/18F4331_18F4331_industrial.png
trunk/www/devices/18F4331_18LF4331_industrial.png
trunk/www/devices/18F4331_pins_graph.png
trunk/www/devices/18F43K20.htm
trunk/www/devices/18F43K20_18F43K20_extended.png
trunk/www/devices/18F43K20_18F43K20_industrial.png
trunk/www/devices/18F43K20_pins_graph.png
trunk/www/devices/18F43K22.htm
trunk/www/devices/18F43K22_18F43K22_extended.png
trunk/www/devices/18F43K22_18F43K22_industrial.png
trunk/www/devices/18F43K22_18LF43K22_extended.png
trunk/www/devices/18F43K22_18LF43K22_industrial.png
trunk/www/devices/18F43K22_pins_graph.png
trunk/www/devices/18F4410.htm
trunk/www/devices/18F4410_18F4410_extended.png
trunk/www/devices/18F4410_18F4410_industrial.png
trunk/www/devices/18F4410_18LF4410_industrial.png
trunk/www/devices/18F4410_pins_graph.png
trunk/www/devices/18F442.htm
trunk/www/devices/18F4420.htm
trunk/www/devices/18F4420_18F4420_extended.png
trunk/www/devices/18F4420_18F4420_industrial.png
trunk/www/devices/18F4420_18LF4420_industrial.png
trunk/www/devices/18F4420_pins_graph.png
trunk/www/devices/18F4423.htm
trunk/www/devices/18F4423_18F4423_industrial.png
trunk/www/devices/18F4423_18LF4423_industrial.png
trunk/www/devices/18F4423_pins_graph.png
trunk/www/devices/18F442_18F442_extended.png
trunk/www/devices/18F442_18F442_industrial.png
trunk/www/devices/18F442_18LF442_industrial.png
trunk/www/devices/18F442_pins_graph.png
trunk/www/devices/18F4431.htm
trunk/www/devices/18F4431_18F4431_extended.png
trunk/www/devices/18F4431_18F4431_industrial.png
trunk/www/devices/18F4431_18LF4431_industrial.png
trunk/www/devices/18F4431_pins_graph.png
trunk/www/devices/18F4439.htm
trunk/www/devices/18F4439_18F4439_extended.png
trunk/www/devices/18F4439_18F4439_industrial.png
trunk/www/devices/18F4439_18LF4439_industrial.png
trunk/www/devices/18F4439_pins_graph.png
trunk/www/devices/18F4450.htm
trunk/www/devices/18F4450_18F4450_industrial.png
trunk/www/devices/18F4450_18LF4450_industrial.png
trunk/www/devices/18F4450_pins_graph.png
trunk/www/devices/18F4455.htm
trunk/www/devices/18F4455_18F4455_industrial.png
trunk/www/devices/18F4455_18LF4455_industrial.png
trunk/www/devices/18F4455_pins_graph.png
trunk/www/devices/18F4458.htm
trunk/www/devices/18F4458_18F4458_industrial.png
trunk/www/devices/18F4458_18LF4458_industrial.png
trunk/www/devices/18F4458_pins_graph.png
trunk/www/devices/18F448.htm
trunk/www/devices/18F4480.htm
trunk/www/devices/18F4480_18F4480_extended.png
trunk/www/devices/18F4480_18F4480_industrial.png
trunk/www/devices/18F4480_18LF4480_industrial.png
trunk/www/devices/18F4480_pins_graph.png
trunk/www/devices/18F448_18F448_extended.png
trunk/www/devices/18F448_18F448_industrial.png
trunk/www/devices/18F448_18LF448_industrial.png
trunk/www/devices/18F448_pins_graph.png
trunk/www/devices/18F44J10.htm
trunk/www/devices/18F44J10_18F44J10_industrial.png
trunk/www/devices/18F44J10_18LF44J10_industrial.png
trunk/www/devices/18F44J10_pins_graph.png
trunk/www/devices/18F44K20.htm
trunk/www/devices/18F44K20_18F44K20_extended.png
trunk/www/devices/18F44K20_18F44K20_industrial.png
trunk/www/devices/18F44K20_pins_graph.png
trunk/www/devices/18F44K22.htm
trunk/www/devices/18F44K22_18F44K22_extended.png
trunk/www/devices/18F44K22_18F44K22_industrial.png
trunk/www/devices/18F44K22_18LF44K22_extended.png
trunk/www/devices/18F44K22_18LF44K22_industrial.png
trunk/www/devices/18F44K22_pins_graph.png
trunk/www/devices/18F4510.htm
trunk/www/devices/18F4510_18F4510_extended.png
trunk/www/devices/18F4510_18F4510_industrial.png
trunk/www/devices/18F4510_18LF4510_industrial.png
trunk/www/devices/18F4510_pins_graph.png
trunk/www/devices/18F4515.htm
trunk/www/devices/18F4515_18F4515_extended.png
trunk/www/devices/18F4515_18F4515_industrial.png
trunk/www/devices/18F4515_18LF4515_industrial.png
trunk/www/devices/18F4515_pins_graph.png
trunk/www/devices/18F452.htm
trunk/www/devices/18F4520.htm
trunk/www/devices/18F4520_18F4520_extended.png
trunk/www/devices/18F4520_18F4520_industrial.png
trunk/www/devices/18F4520_18LF4520_industrial.png
trunk/www/devices/18F4520_pins_graph.png
trunk/www/devices/18F4523.htm
trunk/www/devices/18F4523_18F4523_industrial.png
trunk/www/devices/18F4523_18LF4523_industrial.png
trunk/www/devices/18F4523_pins_graph.png
trunk/www/devices/18F4525.htm
trunk/www/devices/18F4525_18F4525_extended.png
trunk/www/devices/18F4525_18F4525_industrial.png
trunk/www/devices/18F4525_18LF4525_industrial.png
trunk/www/devices/18F4525_pins_graph.png
trunk/www/devices/18F452_18F452_extended.png
trunk/www/devices/18F452_18F452_industrial.png
trunk/www/devices/18F452_18LF452_industrial.png
trunk/www/devices/18F452_pins_graph.png
trunk/www/devices/18F4539.htm
trunk/www/devices/18F4539_18F4539_extended.png
trunk/www/devices/18F4539_18F4539_industrial.png
trunk/www/devices/18F4539_18LF4539_industrial.png
trunk/www/devices/18F4539_pins_graph.png
trunk/www/devices/18F4550.htm
trunk/www/devices/18F4550_18F4550_industrial.png
trunk/www/devices/18F4550_18LF4550_industrial.png
trunk/www/devices/18F4550_pins_graph.png
trunk/www/devices/18F4553.htm
trunk/www/devices/18F4553_18F4553_industrial.png
trunk/www/devices/18F4553_18LF4553_industrial.png
trunk/www/devices/18F4553_pins_graph.png
trunk/www/devices/18F458.htm
trunk/www/devices/18F4580.htm
trunk/www/devices/18F4580_18F4580_extended.png
trunk/www/devices/18F4580_18F4580_industrial.png
trunk/www/devices/18F4580_18LF4580_industrial.png
trunk/www/devices/18F4580_pins_graph.png
trunk/www/devices/18F4585.htm
trunk/www/devices/18F4585_18F4585_extended.png
trunk/www/devices/18F4585_18F4585_industrial.png
trunk/www/devices/18F4585_18LF4585_industrial.png
trunk/www/devices/18F4585_pins_graph.png
trunk/www/devices/18F458_18F458_extended.png
trunk/www/devices/18F458_18F458_industrial.png
trunk/www/devices/18F458_18LF458_industrial.png
trunk/www/devices/18F458_pins_graph.png
trunk/www/devices/18F45J10.htm
trunk/www/devices/18F45J10_18F45J10_industrial.png
trunk/www/devices/18F45J10_18LF45J10_industrial.png
trunk/www/devices/18F45J10_pins_graph.png
trunk/www/devices/18F45K20.htm
...
[truncated message content] |
|
From: <az...@us...> - 2012-10-16 05:59:10
|
Revision: 2974
http://piklab.svn.sourceforge.net/piklab/?rev=2974&view=rev
Author: azhyd
Date: 2012-10-16 05:59:04 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/www/Changelog
trunk/www/screenshots/piklab_asm_view.png
trunk/www/screenshots/piklab_debugging.png
trunk/www/screenshots/piklab_device_chooser.png
trunk/www/screenshots/piklab_hex_view.png
trunk/www/screenshots.php
Added Paths:
-----------
trunk/www/screenshots/piklab_register_view.png
Modified: trunk/www/Changelog
===================================================================
--- trunk/www/Changelog 2012-10-16 05:48:59 UTC (rev 2973)
+++ trunk/www/Changelog 2012-10-16 05:59:04 UTC (rev 2974)
@@ -1,3 +1,29 @@
+0.16.2 (14 October 2012)
+* added support for 24FJXXXGB1XX
+* do not set target power with ICD2 if device nominal vdd is not 5V
+* added menu entries to configure editor, to toggle/enable breakpoints, to switch editors, and
+ to toggle read-only mode for hex editor
+* fixed crash when changing watched variable value [reported by Luca]
+* added pickit3 support for 18F2XX/4XX 18F4520/18F4580 (with correct firmware loaded)
+* fixed toolchain output when executable cannot be found
+* fixed parsing for jalv2
+* fixed template generator for jalv2
+* fixed sdcc generator for latest sdcc [patch by Antonio Augusto Todo Bom Neto]
+* add libraries libm, libio, and libc by default sdcc linker arguments [requested by Antonio Augusto Todo Bom Neto]
+* fixed log views to properly read setting [reported by Luis Claudio Gambôa Lopes]
+* fixed config generator text field to expand properly [report by Alain Portal]
+* support firmware directory with space [reported by Luis Claudio Gambôa Lopes]
+* fixed warning when external tool not found
+* fixed running kfind from project context menu
+* fixed hang with "stop" command in interactive command-line programmer
+* fixed %I argument for custom tool [reported by Marc Berlioux]
+* fixed link for source files outside project directory [patch by Marcelo Roberto Jimenez]
+* clean all files generated by sdcc [reported by Alain Portal]
+* fixed compilation on Fedora 17 [thanks to bitlord]
+* fixed compilation on CentOS 6 [thanks to Alain Portal]
+* fixed link on Slackware [reported by breakfastfish]
+* add regression testing for compile/clean project
+
0.16.1 (1 July 2012)
* fixed command-line utilities compilation with Qt only
* fixed command-line utilities compilation on Windows
@@ -21,13 +47,13 @@
0.15.11 (14 December 2010)
* added icd2 programmer support for 24FJ128GA010 [with help from Anantha Krishnan]
-* fix duplicate devices in "device-list" output [reported by Frans Pinkse]
+* fixed duplicate devices in "device-list" output [reported by Frans Pinkse]
* parse more errors from sdcc output [fix by Stefan Olsson]
-* fix problem where lines were sometimes missed for compilation output c
-* fix unfound ilike icons [fix by Stefan Olsson]
+* fixed problem where lines were sometimes missed for compilation output c
+* fixed unfound ilike icons [fix by Stefan Olsson]
* correctly switch programmer when a different project is opened [reported by Gál Zsolt]
-* add some missing configuration bits to 18F2550/4550 [patch by Joe Ciccone]
-* fix crash when clicking on the project icon when no project is open [reported by Richard Bown]
+* added some missing configuration bits to 18F2550/4550 [patch by Joe Ciccone]
+* fixed crash when clicking on the project icon when no project is open [reported by Richard Bown]
0.15.10 (2 July 2010)
* added tiny bootloader support for 16F886/887 [fix by Alexandr]
@@ -40,9 +66,9 @@
* added icd2 programmer support for 16F88X [requested by Lorenzo Marcantonio]
* added icd2 programmer support for 18F23K20/24K20/25K20/26K20/43K20/44K20/45K20/46K20 [requested by Joris Van Dyck]
* added icd2 programmer support for 18F2458/2553/4458/4553
-* fix to make gpsim support more robust
-* fix custom programmer so that each command is synchronous [reported by Zoltan Szilvasy]
-* fix device chooser
+* made gpsim support more robust
+* fixed custom programmer so that each command is synchronous [reported by Zoltan Szilvasy]
+* fixed device chooser
0.15.8 (30 April 2010)
* added support for 18F23K20/18F26K20 [fix by Florian Hühn]
@@ -73,7 +99,7 @@
* added support for dspicc compiler
* fixed crash when configuring custom programmer
* added options to custom programmer [requested by Alberto Maccioni]
- * fixed crash when using "stop" command [reported by biglacko]
+ * fixed crash when using "stop" command [reported by Nagy László]
* added "khexterm" in external tools [authored by Javier Fernando Vargas G.]
* fixed the output of piklab-hex "compare" command
Modified: trunk/www/screenshots/piklab_asm_view.png
===================================================================
(Binary files differ)
Modified: trunk/www/screenshots/piklab_debugging.png
===================================================================
(Binary files differ)
Modified: trunk/www/screenshots/piklab_device_chooser.png
===================================================================
(Binary files differ)
Modified: trunk/www/screenshots/piklab_hex_view.png
===================================================================
(Binary files differ)
Added: trunk/www/screenshots/piklab_register_view.png
===================================================================
(Binary files differ)
Property changes on: trunk/www/screenshots/piklab_register_view.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/www/screenshots.php
===================================================================
--- trunk/www/screenshots.php 2012-10-16 05:48:59 UTC (rev 2973)
+++ trunk/www/screenshots.php 2012-10-16 05:59:04 UTC (rev 2974)
@@ -4,17 +4,20 @@
?>
<div class="screenshot">
-<img class="screenshot" src="screenshots/piklab_asm_view.png" alt="Screenshot: assembler editor" />
+<img class="screenshot" src="screenshots/piklab_asm_view.png" alt="Screenshot: Source Editor" />
</div>
<div class="screenshot">
-<img class="screenshot" src="screenshots/piklab_hex_view.png" alt="Screenshot: hex editor"/>
+<img class="screenshot" src="screenshots/piklab_hex_view.png" alt="Screenshot: Hex Editor"/>
</div>
<div class="screenshot">
-<img class="screenshot" src="screenshots/piklab_debugging.png" alt="Screenshot: dissassembly listing while debugging"/>
+<img class="screenshot" src="screenshots/piklab_debugging.png" alt="Screenshot: Dissassembly Listing"/>
</div>
<div class="screenshot">
-<img class="screenshot" src="screenshots/piklab_device_chooser.png" alt="Screenshot: device chooser" />
+<img class="screenshot" src="screenshots/piklab_device_chooser.png" alt="Screenshot: Device Selector" />
</div>
+<div class="screenshot">
+<img class="screenshot" src="screenshots/piklab_register_view.png" alt="Screenshot: Register View" />
+</div>
<?php
pageEnd("\$LastChangedDate$");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <az...@us...> - 2012-10-16 05:49:06
|
Revision: 2973
http://piklab.svn.sourceforge.net/piklab/?rev=2973&view=rev
Author: azhyd
Date: 2012-10-16 05:48:59 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
Added Paths:
-----------
tags/PIKLAB_0_16_2_RELEASE/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <az...@us...> - 2012-10-16 05:26:41
|
Revision: 2972
http://piklab.svn.sourceforge.net/piklab/?rev=2972&view=rev
Author: azhyd
Date: 2012-10-16 05:26:34 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
more work on GUI testing
Modified Paths:
--------------
trunk/piklab_kde4/src/common/global/purl.cpp
trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp
trunk/piklab_kde4/test/sdcc/usart_lib/usart_lib.piklab
Modified: trunk/piklab_kde4/src/common/global/purl.cpp
===================================================================
--- trunk/piklab_kde4/src/common/global/purl.cpp 2012-10-16 05:12:06 UTC (rev 2971)
+++ trunk/piklab_kde4/src/common/global/purl.cpp 2012-10-16 05:26:34 UTC (rev 2972)
@@ -473,7 +473,7 @@
PURL::Directory PURL::Directory::up() const
{
QDir dir(path());
- dir.cdUp();
+ if (!dir.cdUp()) return PURL::Directory();
return PURL::Directory(dir.path());
}
@@ -481,7 +481,7 @@
{
ASSERT( QDir::isRelativePath(subPath) );
QDir dir(path());
- dir.cd(subPath);
+ if (!dir.cd(subPath)) return PURL::Directory();
return PURL::Directory(dir.path());
}
Modified: trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp
===================================================================
--- trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp 2012-10-16 05:12:06 UTC (rev 2971)
+++ trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp 2012-10-16 05:26:34 UTC (rev 2972)
@@ -107,9 +107,9 @@
{
closeProject();
closeAllEditors();
- QVERIFY(_testDir.exists());
+ QVERIFY2(_testDir.exists(), _testDir.pretty().latin1());
PURL::Url url = getUrl(_project).toFileType(_projType);
- QVERIFY(url.exists());
+ QVERIFY2(url.exists(), url.pretty().latin1());
bool res = false;
execUntilSignal(MainWindow::self(), "openProject", MainWindow::self(), SIGNAL(deviceChanged()), Q_ARG(PURL::Url, url), &res);
QVERIFY(res);
Modified: trunk/piklab_kde4/test/sdcc/usart_lib/usart_lib.piklab
===================================================================
--- trunk/piklab_kde4/test/sdcc/usart_lib/usart_lib.piklab 2012-10-16 05:12:06 UTC (rev 2971)
+++ trunk/piklab_kde4/test/sdcc/usart_lib/usart_lib.piklab 2012-10-16 05:26:34 UTC (rev 2972)
@@ -9,6 +9,9 @@
<description/>
<version>0.1</version>
<output_type>library</output_type>
+ <opened_files>
+ <item>usart_test.c</item>
+ </opened_files>
</general>
<compiler>
<has_custom_arguments>false</has_custom_arguments>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <az...@us...> - 2012-10-16 05:12:12
|
Revision: 2971
http://piklab.svn.sourceforge.net/piklab/?rev=2971&view=rev
Author: azhyd
Date: 2012-10-16 05:12:06 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
more work on GUI testing
Modified Paths:
--------------
trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp
trunk/piklab_kde4/src/piklab-test/gui/gui_check.cpp
trunk/piklab_kde4/src/piklab-test/gui/gui_check.h
Modified: trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp
===================================================================
--- trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp 2012-10-16 05:09:06 UTC (rev 2970)
+++ trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp 2012-10-16 05:12:06 UTC (rev 2971)
@@ -110,14 +110,18 @@
QVERIFY(_testDir.exists());
PURL::Url url = getUrl(_project).toFileType(_projType);
QVERIFY(url.exists());
- execUntilSignal(MainWindow::self(), "openProject", MainWindow::self(), SIGNAL(deviceChanged()), Q_ARG(PURL::Url, url));
+ bool res = false;
+ execUntilSignal(MainWindow::self(), "openProject", MainWindow::self(), SIGNAL(deviceChanged()), Q_ARG(PURL::Url, url), &res);
+ QVERIFY(res);
QVERIFY(Main::project() != NULL);
}
void BuildCheck::openSingleFile(const PURL::Url& url)
{
closeAllEditors();
- execUntilSignal(Main::editorManager(), "openFile", MainWindow::self(), SIGNAL(deviceChanged()), Q_ARG(const PURL::Url&, url));
+ bool res = false;
+ execUntilSignal(Main::editorManager(), "openFile", MainWindow::self(), SIGNAL(deviceChanged()), Q_ARG(const PURL::Url&, url), &res);
+ QVERIFY(res);
QVERIFY(Main::editorManager().currentEditor() != NULL);
QVERIFY(Main::editorManager().nbEditors() == 1);
}
Modified: trunk/piklab_kde4/src/piklab-test/gui/gui_check.cpp
===================================================================
--- trunk/piklab_kde4/src/piklab-test/gui/gui_check.cpp 2012-10-16 05:09:06 UTC (rev 2970)
+++ trunk/piklab_kde4/src/piklab-test/gui/gui_check.cpp 2012-10-16 05:12:06 UTC (rev 2971)
@@ -23,10 +23,14 @@
QTimer::singleShot(300, &MainWindow::self(), SLOT(close()));
}
-void GuiCheck::execUntilSignal(QObject& obj1, const char* slot, QObject& obj2, const char* signal, QGenericArgument val0)
+void GuiCheck::execUntilSignal(QObject& obj1, const char* slot, QObject& obj2, const char* signal, QGenericArgument val0, bool* ret)
{
QSignalSpy spy(&obj2, signal);
- QMetaObject::invokeMethod(&obj1, slot, val0);
+ if (ret != NULL) {
+ QMetaObject::invokeMethod(&obj1, slot, Q_RETURN_ARG(bool, *ret), val0);
+ } else {
+ QMetaObject::invokeMethod(&obj1, slot, val0);
+ }
do {
QTest::qWait(100);
} while(spy.count() == 0);
Modified: trunk/piklab_kde4/src/piklab-test/gui/gui_check.h
===================================================================
--- trunk/piklab_kde4/src/piklab-test/gui/gui_check.h 2012-10-16 05:09:06 UTC (rev 2970)
+++ trunk/piklab_kde4/src/piklab-test/gui/gui_check.h 2012-10-16 05:12:06 UTC (rev 2971)
@@ -17,7 +17,8 @@
Q_OBJECT
protected:
- void execUntilSignal(QObject& obj1, const char* slot, QObject& obj2, const char* signal, QGenericArgument val0 = QGenericArgument());
+ void execUntilSignal(QObject& obj1, const char* slot, QObject& obj2, const char* signal,
+ QGenericArgument val0 = QGenericArgument(), bool* ok = NULL);
private:
virtual bool init(uint index) = 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <az...@us...> - 2012-10-16 05:09:13
|
Revision: 2970
http://piklab.svn.sourceforge.net/piklab/?rev=2970&view=rev
Author: azhyd
Date: 2012-10-16 05:09:06 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
more work on GUI testing
Modified Paths:
--------------
trunk/piklab_kde4/src/libgui/editor_manager.cpp
trunk/piklab_kde4/src/libgui/editor_manager.h
trunk/piklab_kde4/src/libgui/main_global.h
trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp
trunk/piklab_kde4/src/piklab-test/gui/gui_check.cpp
trunk/piklab_kde4/src/piklab-test/gui/gui_check.h
trunk/piklab_kde4/test/sdcc/usart_lib/usart_lib.piklab
Modified: trunk/piklab_kde4/src/libgui/editor_manager.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/editor_manager.cpp 2012-10-16 04:22:22 UTC (rev 2969)
+++ trunk/piklab_kde4/src/libgui/editor_manager.cpp 2012-10-16 05:09:06 UTC (rev 2970)
@@ -179,7 +179,6 @@
bool EditorManager::closeAllEditors()
{
- if ( currentEditor()==0 ) return true;
while ( currentEditor() )
if ( !closeEditor(currentEditor(), true) ) break;
emit guiChanged();
Modified: trunk/piklab_kde4/src/libgui/editor_manager.h
===================================================================
--- trunk/piklab_kde4/src/libgui/editor_manager.h 2012-10-16 04:22:22 UTC (rev 2969)
+++ trunk/piklab_kde4/src/libgui/editor_manager.h 2012-10-16 05:09:06 UTC (rev 2970)
@@ -79,7 +79,6 @@
void showEditor(Editor *e);
bool closeEditor(const PURL::Url &url);
bool closeEditor(Editor *e, bool ask);
- bool openFile(const PURL::Url &url);
Editor *openEditor(const PURL::Url &url);
void connectEditor(Editor *editor);
void disconnectEditor(Editor *editor);
@@ -87,6 +86,7 @@
Editor *openEditor(ProjectManager::SpecialEditorType type);
public slots:
+ bool openFile(const PURL::Url &url);
void updateTitles();
void slotDropEvent(QDropEvent *e);
void saveAllFiles();
Modified: trunk/piklab_kde4/src/libgui/main_global.h
===================================================================
--- trunk/piklab_kde4/src/libgui/main_global.h 2012-10-16 04:22:22 UTC (rev 2969)
+++ trunk/piklab_kde4/src/libgui/main_global.h 2012-10-16 05:09:06 UTC (rev 2970)
@@ -46,6 +46,7 @@
static const Device::Data& deviceData();
static Breakpoint::View& breakpointsView() { return *_breakpointsView; }
static ProjectManager::View& projectManager() { return *_projectManager; }
+ static Compile::Manager& compileManager() { return *_compileManager; }
static Project* project();
static Register::WatchView& watchView() { return *_watchView; }
static Compile::LogWidget& compileLog() { return *_compileLog; }
Modified: trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp
===================================================================
--- trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp 2012-10-16 04:22:22 UTC (rev 2969)
+++ trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp 2012-10-16 05:09:06 UTC (rev 2970)
@@ -13,6 +13,7 @@
#include "build_check.moc"
#include "libgui/toplevel.h"
#include "libgui/editor_manager.h"
+#include "tools/list/compile_manager.h"
//----------------------------------------------------------------------------
BuildCheckData DATA[] = {
@@ -92,11 +93,16 @@
void BuildCheck::closeProject()
{
- MainWindow::self().closeProject();
- continueOnUiUpdate();
+ execUntilSignal(MainWindow::self(), "closeProject", MainWindow::self(), SIGNAL(deviceChanged()));
QVERIFY(Main::project() == NULL);
}
+void BuildCheck::closeAllEditors()
+{
+ execUntilSignal(Main::editorManager(), "closeAllEditors", MainWindow::self(), SIGNAL(deviceChanged()));
+ QVERIFY(Main::editorManager().currentEditor() == NULL);
+}
+
void BuildCheck::openProject()
{
closeProject();
@@ -104,39 +110,28 @@
QVERIFY(_testDir.exists());
PURL::Url url = getUrl(_project).toFileType(_projType);
QVERIFY(url.exists());
- QVERIFY(MainWindow::self().openProject(url));
- continueOnUiUpdate();
+ execUntilSignal(MainWindow::self(), "openProject", MainWindow::self(), SIGNAL(deviceChanged()), Q_ARG(PURL::Url, url));
QVERIFY(Main::project() != NULL);
}
-void BuildCheck::closeAllEditors()
-{
- Main::editorManager().closeAllEditors();
- continueOnUiUpdate();
- QVERIFY(Main::editorManager().currentEditor() == NULL);
-}
-
void BuildCheck::openSingleFile(const PURL::Url& url)
{
closeAllEditors();
- QVERIFY(Main::editorManager().openFile(url));
- continueOnUiUpdate();
+ execUntilSignal(Main::editorManager(), "openFile", MainWindow::self(), SIGNAL(deviceChanged()), Q_ARG(const PURL::Url&, url));
QVERIFY(Main::editorManager().currentEditor() != NULL);
QVERIFY(Main::editorManager().nbEditors() == 1);
}
void BuildCheck::cleanProject()
{
- MainWindow::self().cleanBuild();
- continueOnUiUpdate();
+ execUntilSignal(MainWindow::self(), "cleanBuild", MainWindow::self(), SIGNAL(deviceChanged()));
checkFilesExist(false);
}
void BuildCheck::buildProject()
{
cleanProject();
- MainWindow::self().buildProject();
- continueOnSignal(MainWindow::self(), SIGNAL(compileSuccess()));
+ execUntilSignal(MainWindow::self(), "buildProject", Main::compileManager(), SIGNAL(success()));
checkFilesExist(true);
}
Modified: trunk/piklab_kde4/src/piklab-test/gui/gui_check.cpp
===================================================================
--- trunk/piklab_kde4/src/piklab-test/gui/gui_check.cpp 2012-10-16 04:22:22 UTC (rev 2969)
+++ trunk/piklab_kde4/src/piklab-test/gui/gui_check.cpp 2012-10-16 05:09:06 UTC (rev 2970)
@@ -13,39 +13,26 @@
#include "libgui/toplevel.h"
//----------------------------------------------------------------------------
-GuiCheck::GuiCheck()
-: _index(0)
-{
-}
-
void GuiCheck::test()
{
- if (!init(_index)) {
- MainWindow::self().close();
- return;
+ uint index = 0;
+ while (!QTest::currentTestFailed() && init(index)) {
+ runTest();
+ ++index;
}
- if (QTest::currentTestFailed()) {
- QTimer::singleShot(300, &MainWindow::self(), SLOT(close()));
- return;
- }
-
- runTest();
+ QTimer::singleShot(300, &MainWindow::self(), SLOT(close()));
}
-void GuiCheck::continueOnSignal(QObject& obj, const char* signal)
+void GuiCheck::execUntilSignal(QObject& obj1, const char* slot, QObject& obj2, const char* signal, QGenericArgument val0)
{
- QSignalSpy spy(&obj, signal);
- for(;;) {
+ QSignalSpy spy(&obj2, signal);
+ QMetaObject::invokeMethod(&obj1, slot, val0);
+ do {
QTest::qWait(100);
} while(spy.count() == 0);
kapp->processEvents();
}
-void GuiCheck::continueOnUiUpdate()
-{
- continueOnSignal(MainWindow::self(), SIGNAL(deviceChanged()));
-}
-
//----------------------------------------------------------------------------
void GuiCheckProxy::run(GuiCheck& check)
{
Modified: trunk/piklab_kde4/src/piklab-test/gui/gui_check.h
===================================================================
--- trunk/piklab_kde4/src/piklab-test/gui/gui_check.h 2012-10-16 04:22:22 UTC (rev 2969)
+++ trunk/piklab_kde4/src/piklab-test/gui/gui_check.h 2012-10-16 05:09:06 UTC (rev 2970)
@@ -16,16 +16,10 @@
{
Q_OBJECT
- public:
- GuiCheck();
-
protected:
- void continueOnSignal(QObject& obj, const char* signal);
- void continueOnUiUpdate();
+ void execUntilSignal(QObject& obj1, const char* slot, QObject& obj2, const char* signal, QGenericArgument val0 = QGenericArgument());
private:
- uint _index;
-
virtual bool init(uint index) = 0;
virtual void runTest() = 0;
Modified: trunk/piklab_kde4/test/sdcc/usart_lib/usart_lib.piklab
===================================================================
--- trunk/piklab_kde4/test/sdcc/usart_lib/usart_lib.piklab 2012-10-16 04:22:22 UTC (rev 2969)
+++ trunk/piklab_kde4/test/sdcc/usart_lib/usart_lib.piklab 2012-10-16 05:09:06 UTC (rev 2970)
@@ -9,9 +9,6 @@
<description/>
<version>0.1</version>
<output_type>library</output_type>
- <opened_files>
- <item>usart_test.c</item>
- </opened_files>
</general>
<compiler>
<has_custom_arguments>false</has_custom_arguments>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <az...@us...> - 2012-10-16 04:22:29
|
Revision: 2969
http://piklab.svn.sourceforge.net/piklab/?rev=2969&view=rev
Author: azhyd
Date: 2012-10-16 04:22:22 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
more work on test
Modified Paths:
--------------
trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp
trunk/piklab_kde4/src/piklab-test/gui/build_check.h
trunk/piklab_kde4/test/sdcc/usart_lib/usart_lib.piklab
Modified: trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp
===================================================================
--- trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp 2012-10-16 04:15:18 UTC (rev 2968)
+++ trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp 2012-10-16 04:22:22 UTC (rev 2969)
@@ -55,17 +55,16 @@
for (uint i = 0; DATA[index].extensions[i] != NULL; ++i) {
_extensions.append(DATA[index].extensions[i]);
}
+ _testDir = PURL::currentDirectory().down("../../../../test/" + _dir + "/" + _project);
+ if (!_testDir.exists()) {
+ _testDir = PURL::currentDirectory().down("../../../test/" + _dir + "/" + _project);
+ }
return true;
}
-PURL::Directory BuildCheck::testDir() const
-{
- return PURL::currentDirectory().down("../../../../test/" + _dir + "/" + _project);
-}
-
PURL::Url BuildCheck::getUrl(const QString& filename) const
{
- return PURL::Url(testDir(), filename);
+ return PURL::Url(_testDir, filename);
}
void BuildCheck::checkFilesExist(bool exists) const
@@ -73,16 +72,16 @@
for (QStringList::const_iterator it = _sources.begin(); it != _sources.end(); ++it) {
for (QStringList::const_iterator it2 = _objExtensions.begin(); it2 != _objExtensions.end(); ++it2) {
if (!exists) {
- PURL::Url url = PURL::Url(testDir(), *it).toExtension(*it2);
+ PURL::Url url = PURL::Url(_testDir, *it).toExtension(*it2);
QVERIFY2(url.exists() == exists, url.pretty().latin1());
}
QString filename = PURL::Url(PURL::Directory(), *it).filename();
- PURL::Url url = PURL::Url(testDir(), filename).toExtension(*it2);
+ PURL::Url url = PURL::Url(_testDir, filename).toExtension(*it2);
QVERIFY2(url.exists() == exists, url.pretty().latin1());
}
}
for (QStringList::const_iterator it = _incFiles.begin(); it != _incFiles.end(); ++it) {
- PURL::Url url = PURL::Url(testDir(), *it);
+ PURL::Url url = PURL::Url(_testDir, *it);
QVERIFY2(url.exists(), url.pretty().latin1());
}
for (QStringList::const_iterator it = _extensions.begin(); it != _extensions.end(); ++it) {
@@ -102,7 +101,7 @@
{
closeProject();
closeAllEditors();
- QVERIFY(testDir().exists());
+ QVERIFY(_testDir.exists());
PURL::Url url = getUrl(_project).toFileType(_projType);
QVERIFY(url.exists());
QVERIFY(MainWindow::self().openProject(url));
Modified: trunk/piklab_kde4/src/piklab-test/gui/build_check.h
===================================================================
--- trunk/piklab_kde4/src/piklab-test/gui/build_check.h 2012-10-16 04:15:18 UTC (rev 2968)
+++ trunk/piklab_kde4/src/piklab-test/gui/build_check.h 2012-10-16 04:22:22 UTC (rev 2969)
@@ -30,13 +30,13 @@
private:
QString _dir;
QString _project;
+ PURL::Directory _testDir;
PURL::FileType _projType;
QStringList _sources;
QStringList _incFiles;
QStringList _objExtensions;
QStringList _extensions;
- PURL::Directory testDir() const;
PURL::Url getUrl(const QString& filename) const;
void checkFilesExist(bool exists) const;
void closeProject();
Modified: trunk/piklab_kde4/test/sdcc/usart_lib/usart_lib.piklab
===================================================================
--- trunk/piklab_kde4/test/sdcc/usart_lib/usart_lib.piklab 2012-10-16 04:15:18 UTC (rev 2968)
+++ trunk/piklab_kde4/test/sdcc/usart_lib/usart_lib.piklab 2012-10-16 04:22:22 UTC (rev 2969)
@@ -9,6 +9,9 @@
<description/>
<version>0.1</version>
<output_type>library</output_type>
+ <opened_files>
+ <item>usart_test.c</item>
+ </opened_files>
</general>
<compiler>
<has_custom_arguments>false</has_custom_arguments>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <az...@us...> - 2012-10-16 04:15:25
|
Revision: 2968
http://piklab.svn.sourceforge.net/piklab/?rev=2968&view=rev
Author: azhyd
Date: 2012-10-16 04:15:18 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
better GUI testing
Modified Paths:
--------------
trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp
trunk/piklab_kde4/src/piklab-test/gui/build_check.h
trunk/piklab_kde4/src/piklab-test/gui/gui_check.cpp
trunk/piklab_kde4/src/piklab-test/gui/gui_check.h
trunk/piklab_kde4/test/sdcc/usart_lib/usart_lib.piklab
Modified: trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp
===================================================================
--- trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp 2012-10-15 04:38:52 UTC (rev 2967)
+++ trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp 2012-10-16 04:15:18 UTC (rev 2968)
@@ -91,63 +91,65 @@
}
}
-void BuildCheck::test1()
+void BuildCheck::closeProject()
{
- std::cout << "TESTING: " << _dir.latin1() << "/" << _project.latin1()
- << "/" << _project.latin1() << "." << _projType.data().extensions[0] << std::endl;
MainWindow::self().closeProject();
-}
-
-void BuildCheck::test2()
-{
+ continueOnUiUpdate();
QVERIFY(Main::project() == NULL);
- Main::editorManager().closeAllEditors();
}
-void BuildCheck::test3()
+void BuildCheck::openProject()
{
- QVERIFY(Main::editorManager().currentEditor() == NULL);
+ closeProject();
+ closeAllEditors();
QVERIFY(testDir().exists());
PURL::Url url = getUrl(_project).toFileType(_projType);
QVERIFY(url.exists());
QVERIFY(MainWindow::self().openProject(url));
+ continueOnUiUpdate();
+ QVERIFY(Main::project() != NULL);
}
-void BuildCheck::test4()
+void BuildCheck::closeAllEditors()
{
- QVERIFY(Main::project() != NULL);
Main::editorManager().closeAllEditors();
-}
-
-void BuildCheck::test5()
-{
+ continueOnUiUpdate();
QVERIFY(Main::editorManager().currentEditor() == NULL);
- QVERIFY(_sources.size() > 0);
- QVERIFY(Main::editorManager().openFile(getUrl(*_sources.begin())));
}
-void BuildCheck::test6()
+void BuildCheck::openSingleFile(const PURL::Url& url)
{
+ closeAllEditors();
+ QVERIFY(Main::editorManager().openFile(url));
+ continueOnUiUpdate();
QVERIFY(Main::editorManager().currentEditor() != NULL);
QVERIFY(Main::editorManager().nbEditors() == 1);
- MainWindow::self().cleanBuild();
}
-void BuildCheck::test7()
+void BuildCheck::cleanProject()
{
+ MainWindow::self().cleanBuild();
+ continueOnUiUpdate();
checkFilesExist(false);
- MainWindow::self().buildProject();
}
-void BuildCheck::test8()
+void BuildCheck::buildProject()
{
+ cleanProject();
+ MainWindow::self().buildProject();
+ continueOnSignal(MainWindow::self(), SIGNAL(compileSuccess()));
checkFilesExist(true);
- MainWindow::self().cleanBuild();
}
-void BuildCheck::test9()
+void BuildCheck::runTest()
{
- checkFilesExist(false);
+ std::cout << "TESTING: " << _dir.latin1() << "/" << _project.latin1()
+ << "/" << _project.latin1() << "." << _projType.data().extensions[0] << std::endl;
+ openProject();
+ QVERIFY(_sources.size() > 0);
+ openSingleFile(getUrl(*_sources.begin()));
+ buildProject();
+ cleanProject();
}
//----------------------------------------------------------------------------
Modified: trunk/piklab_kde4/src/piklab-test/gui/build_check.h
===================================================================
--- trunk/piklab_kde4/src/piklab-test/gui/build_check.h 2012-10-15 04:38:52 UTC (rev 2967)
+++ trunk/piklab_kde4/src/piklab-test/gui/build_check.h 2012-10-16 04:15:18 UTC (rev 2968)
@@ -27,17 +27,6 @@
{
Q_OBJECT
- private slots:
- void test1();
- void test2();
- void test3();
- void test4();
- void test5();
- void test6();
- void test7();
- void test8();
- void test9();
-
private:
QString _dir;
QString _project;
@@ -50,7 +39,14 @@
PURL::Directory testDir() const;
PURL::Url getUrl(const QString& filename) const;
void checkFilesExist(bool exists) const;
+ void closeProject();
+ void closeAllEditors();
+ void openProject();
+ void openSingleFile(const PURL::Url&);
+ void cleanProject();
+ void buildProject();
virtual bool init(uint index);
+ virtual void runTest();
};
//----------------------------------------------------------------------------
Modified: trunk/piklab_kde4/src/piklab-test/gui/gui_check.cpp
===================================================================
--- trunk/piklab_kde4/src/piklab-test/gui/gui_check.cpp 2012-10-15 04:38:52 UTC (rev 2967)
+++ trunk/piklab_kde4/src/piklab-test/gui/gui_check.cpp 2012-10-16 04:15:18 UTC (rev 2968)
@@ -14,42 +14,44 @@
//----------------------------------------------------------------------------
GuiCheck::GuiCheck()
-: _index(0),
- _subIndex(1)
+: _index(0)
{
}
-void GuiCheck::invokeTest()
+void GuiCheck::test()
{
- if (_subIndex == 1) {
- if (!init(_index)) {
- MainWindow::self().close();
- return;
- }
+ if (!init(_index)) {
+ MainWindow::self().close();
+ return;
}
if (QTest::currentTestFailed()) {
QTimer::singleShot(300, &MainWindow::self(), SLOT(close()));
return;
}
- QString s1 = QString("test%1").arg(_subIndex);
- QString s2 = s1 + "()";
- if (metaObject()->indexOfMethod(s2.latin1()) == -1) {
- ++_index;
- _subIndex = 1;
- } else {
- QMetaObject::invokeMethod(this, s1.latin1());
- ++_subIndex;
- }
- QTimer::singleShot(400, this, SLOT(invokeTest()));
+ runTest();
}
+void GuiCheck::continueOnSignal(QObject& obj, const char* signal)
+{
+ QSignalSpy spy(&obj, signal);
+ for(;;) {
+ QTest::qWait(100);
+ } while(spy.count() == 0);
+ kapp->processEvents();
+}
+
+void GuiCheck::continueOnUiUpdate()
+{
+ continueOnSignal(MainWindow::self(), SIGNAL(deviceChanged()));
+}
+
//----------------------------------------------------------------------------
void GuiCheckProxy::run(GuiCheck& check)
{
int argc = 1;
const char* argv[] = { "gui_check", NULL };
Main::setupApplication(argc, (char**)argv);
- QTimer::singleShot(200, &check, SLOT(invokeTest()));
+ QTimer::singleShot(200, &check, SLOT(test()));
kapp->exec();
}
Modified: trunk/piklab_kde4/src/piklab-test/gui/gui_check.h
===================================================================
--- trunk/piklab_kde4/src/piklab-test/gui/gui_check.h 2012-10-15 04:38:52 UTC (rev 2967)
+++ trunk/piklab_kde4/src/piklab-test/gui/gui_check.h 2012-10-16 04:15:18 UTC (rev 2968)
@@ -19,14 +19,18 @@
public:
GuiCheck();
+ protected:
+ void continueOnSignal(QObject& obj, const char* signal);
+ void continueOnUiUpdate();
+
private:
uint _index;
- uint _subIndex;
virtual bool init(uint index) = 0;
+ virtual void runTest() = 0;
private slots:
- void invokeTest();
+ void test();
};
//----------------------------------------------------------------------------
Modified: trunk/piklab_kde4/test/sdcc/usart_lib/usart_lib.piklab
===================================================================
--- trunk/piklab_kde4/test/sdcc/usart_lib/usart_lib.piklab 2012-10-15 04:38:52 UTC (rev 2967)
+++ trunk/piklab_kde4/test/sdcc/usart_lib/usart_lib.piklab 2012-10-16 04:15:18 UTC (rev 2968)
@@ -9,9 +9,6 @@
<description/>
<version>0.1</version>
<output_type>library</output_type>
- <opened_files>
- <item>usart_test.c</item>
- </opened_files>
</general>
<compiler>
<has_custom_arguments>false</has_custom_arguments>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <az...@us...> - 2012-10-15 04:38:58
|
Revision: 2967
http://piklab.svn.sourceforge.net/piklab/?rev=2967&view=rev
Author: azhyd
Date: 2012-10-15 04:38:52 +0000 (Mon, 15 Oct 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/piklab_kde4/Changelog
Modified: trunk/piklab_kde4/Changelog
===================================================================
--- trunk/piklab_kde4/Changelog 2012-10-15 04:37:30 UTC (rev 2966)
+++ trunk/piklab_kde4/Changelog 2012-10-15 04:38:52 UTC (rev 2967)
@@ -1,27 +1,27 @@
0.16.2 (14 October 2012)
-* fixed toolchain output when executable cannot be found
-* fixed parsing for jalv2
-* fixed template generator for jalv2
+* added support for 24FJXXXGB1XX
* do not set target power with ICD2 if device nominal vdd is not 5V
* added menu entries to configure editor, to toggle/enable breakpoints, to switch editors, and
to toggle read-only mode for hex editor
* fixed crash when changing watched variable value [reported by Luca]
* added pickit3 support for 18F2XX/4XX 18F4520/18F4580 (with correct firmware loaded)
-* fixed hang with "stop" command in interactive command-line programmer
-* fixed compilation on Fedora 17 [thanks to bitlord]
-* fixed compilation on CentOS 6 [thanks to Alain Portal]
-* fixed link on Slackware [reported by breakfastfish]
+* fixed toolchain output when executable cannot be found
+* fixed parsing for jalv2
+* fixed template generator for jalv2
* fixed sdcc generator for latest sdcc [patch by Antonio Augusto Todo Bom Neto]
-* fixed log views to read properly setting [reported by Luis Claudio Gambôa Lopes]
-* added support for 24FJXXXGB1XX
-* support firmware directory with space [reported by Luis Claudio Gambôa Lopes]
* add libraries libm, libio, and libc by default sdcc linker arguments [requested by Antonio Augusto Todo Bom Neto]
+* fixed log views to properly read setting [reported by Luis Claudio Gambôa Lopes]
* fixed config generator text field to expand properly [report by Alain Portal]
+* support firmware directory with space [reported by Luis Claudio Gambôa Lopes]
* fixed warning when external tool not found
* fixed running kfind from project context menu
+* fixed hang with "stop" command in interactive command-line programmer
* fixed %I argument for custom tool [reported by Marc Berlioux]
* fixed link for source files outside project directory [patch by Marcelo Roberto Jimenez]
* clean all files generated by sdcc [reported by Alain Portal]
+* fixed compilation on Fedora 17 [thanks to bitlord]
+* fixed compilation on CentOS 6 [thanks to Alain Portal]
+* fixed link on Slackware [reported by breakfastfish]
* add regression testing for compile/clean project
0.16.1 (1 July 2012)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <az...@us...> - 2012-10-15 04:37:40
|
Revision: 2966
http://piklab.svn.sourceforge.net/piklab/?rev=2966&view=rev
Author: azhyd
Date: 2012-10-15 04:37:30 +0000 (Mon, 15 Oct 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/piklab_kde4/CMakeLists.txt
trunk/piklab_kde4/po/cs.po
trunk/piklab_kde4/po/de.po
trunk/piklab_kde4/po/es.po
trunk/piklab_kde4/po/fr.po
trunk/piklab_kde4/po/hu.po
trunk/piklab_kde4/po/it.po
trunk/piklab_kde4/po/piklab.pot
trunk/piklab_kde4/test/sdcc/usart_lib/usart_lib.piklab
Modified: trunk/piklab_kde4/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/CMakeLists.txt 2012-10-14 23:09:59 UTC (rev 2965)
+++ trunk/piklab_kde4/CMakeLists.txt 2012-10-15 04:37:30 UTC (rev 2966)
@@ -1,5 +1,5 @@
project(piklab)
-set(VERSION "0.16.1")
+set(VERSION "0.16.2")
if(WIN32)
Modified: trunk/piklab_kde4/po/cs.po
===================================================================
--- trunk/piklab_kde4/po/cs.po 2012-10-14 23:09:59 UTC (rev 2965)
+++ trunk/piklab_kde4/po/cs.po 2012-10-15 04:37:30 UTC (rev 2966)
@@ -9,7 +9,7 @@
"Project-Id-Version: cs\n"
"Report-Msgid-Bugs-To: http://sourceforge.net/tracker/?"
"group_id=138852&atid=743140\n"
-"POT-Creation-Date: 2012-07-01 17:15-0700\n"
+"POT-Creation-Date: 2012-10-14 21:35-0700\n"
"PO-Revision-Date: 2007-06-18 10:07+0200\n"
"Last-Translator: Milan Horák\n"
"Language-Team: Czech <cs...@li...>\n"
@@ -25,6 +25,7 @@
msgstr ""
#: coff/base/cdb_parser.cpp:17 coff/base/coff_object.cpp:53
+#: libgui/breakpoint_view.cpp:34
#, fuzzy
msgid "File"
msgstr "Selhalo"
@@ -698,114 +699,114 @@
msgid "Display help."
msgstr "Zobrazit nápovědu."
-#: common/cli/cli_main.cpp:44
+#: common/cli/cli_main.cpp:44 common/cli/cli_main.cpp:45
#, fuzzy
msgid "Exit."
msgstr "Ukončit."
-#: common/cli/cli_main.cpp:45
+#: common/cli/cli_main.cpp:46
msgid ""
"Set property value: \"set <property> <value>\" or \"<property> <value>\"."
msgstr ""
"Nastavit vlastnost: \"set <vlastnost> <hodnota>\" nebo \"<vlastnost> "
"<hodnota>\"."
-#: common/cli/cli_main.cpp:46
+#: common/cli/cli_main.cpp:47
msgid "Unset property value: \"unset <property>\"."
msgstr "Uvolnit hodnotu vlastnosti: \"unset <vlastnost>\"."
-#: common/cli/cli_main.cpp:47
+#: common/cli/cli_main.cpp:48
msgid "Get property value: \"get <property>\" or \"<property>\"."
msgstr "Získat hodnotu vlastnosti: \"get <vlastnost>\" nebo \"<vlastnost>\"."
-#: common/cli/cli_main.cpp:48
+#: common/cli/cli_main.cpp:49
msgid "Display the list of available properties."
msgstr "Zobrazit seznam dostupných vlastností."
-#: common/cli/cli_main.cpp:49
+#: common/cli/cli_main.cpp:50
msgid "Replay commands in provided file: \"replay <file>\"."
msgstr ""
-#: common/cli/cli_main.cpp:232
+#: common/cli/cli_main.cpp:233
msgid "Supported commands:"
msgstr "Podporované příkazy:"
-#: common/cli/cli_main.cpp:274
+#: common/cli/cli_main.cpp:275
#, fuzzy
msgid "Output file already exists."
msgstr "Název výstupního hex souboru již existuje."
-#: common/cli/cli_main.cpp:282 common/cli/cli_main.cpp:303
+#: common/cli/cli_main.cpp:283 common/cli/cli_main.cpp:304
#, fuzzy
msgid "Unknown property \"%1\"."
msgstr "Neznámá vlastnost \"%1\""
-#: common/cli/cli_main.cpp:305
+#: common/cli/cli_main.cpp:306
msgid "<not set>"
msgstr "<nenastaveno>"
-#: common/cli/cli_main.cpp:375
+#: common/cli/cli_main.cpp:376
msgid "Too few arguments."
msgstr "Příliš málo parametrů."
-#: common/cli/cli_main.cpp:376
+#: common/cli/cli_main.cpp:377
msgid "Too many arguments."
msgstr "Příliš mnoho parametrů."
-#: common/cli/cli_main.cpp:402
+#: common/cli/cli_main.cpp:403
msgid "No command specified"
msgstr "Nespecifikován žádný příkaz"
-#: common/cli/cli_main.cpp:404
+#: common/cli/cli_main.cpp:405
msgid "Unknown command: %1"
msgstr "Neznámý příkaz: %1"
-#: common/cli/cli_main.cpp:416
+#: common/cli/cli_main.cpp:417
#, fuzzy
msgid "Interactive mode: type 'help' for the list of commands."
msgstr "Interaktivní mód: napište help pro nápovědu"
-#: common/cli/cli_main.cpp:437
+#: common/cli/cli_main.cpp:438
#, fuzzy
msgid "Unrecognized line #%1 of replay file."
msgstr "Nerozpoznaný formát (řádek %1)."
-#: common/cli/cli_main.cpp:495
+#: common/cli/cli_main.cpp:496
#, fuzzy
msgid "Unrecognized command."
msgstr "Nerozpoznaný formát (řádek %1)."
-#: common/cli/cli_main.cpp:499
+#: common/cli/cli_main.cpp:500
#, fuzzy
msgid "This command takes no argument."
msgstr "Tento příkaz nemá žádné parametry"
-#: common/cli/cli_main.cpp:500
+#: common/cli/cli_main.cpp:501
#, fuzzy
msgid "This command takes one argument."
msgstr "Tento příkaz má jeden parametr"
-#: common/cli/cli_main.cpp:501
+#: common/cli/cli_main.cpp:502
#, fuzzy
msgid "This command takes %1 arguments."
msgstr "Tento příkaz má dva argumenty"
-#: common/cli/cli_main.cpp:505
+#: common/cli/cli_main.cpp:506
#, fuzzy
msgid "This command needs at least one argument."
msgstr "Tento příkaz má jeden parametr"
-#: common/cli/cli_main.cpp:506
+#: common/cli/cli_main.cpp:507
#, fuzzy
msgid "This command needs at least %1 arguments."
msgstr "Tento příkaz má dva argumenty"
-#: common/cli/cli_main.cpp:509
+#: common/cli/cli_main.cpp:510
#, fuzzy
msgid "This command takes at most one argument."
msgstr "Tento příkaz má jeden parametr"
-#: common/cli/cli_main.cpp:510
+#: common/cli/cli_main.cpp:511
#, fuzzy
msgid "This command takes at most %1 arguments."
msgstr "Tento příkaz má dva argumenty"
@@ -1146,18 +1147,62 @@
msgid "File not opened."
msgstr "Soubor neotevřen."
-#: common/global/pfile.cpp:130 common/kde/kde_pfile.cpp:25
+#: common/global/pfile.cpp:106 common/global/pfile.cpp:156
+#: common/global/pfile.cpp:212
msgid "Could not create temporary file."
msgstr "Nemohu vytvořit dočasný soubor."
-#: common/global/pfile.cpp:131 common/kde/kde_pfile.cpp:26
-#: common/kde/kde_pfile.cpp:65 common/nokde/nokde_pfile.cpp:20
-#: common/nokde/nokde_pfile.cpp:38 libgui/project_manager.cpp:293
-#: libgui/project_manager.cpp:306 tools/list/compile_manager.cpp:45
-#: tools/list/compile_manager.cpp:74
+#: common/global/pfile.cpp:107 common/global/pfile.cpp:125
+#: common/global/pfile.cpp:157 common/global/pfile.cpp:167
+#: common/global/pfile.cpp:213 libgui/project_manager.cpp:293
+#: libgui/project_manager.cpp:306 tools/list/compile_manager.cpp:46
+#: tools/list/compile_manager.cpp:75
msgid "File: %1"
msgstr "Soubor: %1"
+#: common/global/pfile.cpp:124 common/global/pfile.cpp:166
+msgid "Could not open temporary file."
+msgstr "Nemohu otevřít dočasný soubor."
+
+#: common/global/pfile.cpp:147
+#, fuzzy
+msgid "Could not download file."
+msgstr "Nemohu najít soubor."
+
+#: common/global/purl.cpp:50
+msgid "Download error %1"
+msgstr ""
+
+#: common/global/purl.cpp:65
+msgid "Upload error %1"
+msgstr ""
+
+#: common/global/purl.cpp:79
+msgid "Delete error %1"
+msgstr ""
+
+#: common/global/purl.cpp:419
+msgid "Could not copy file"
+msgstr "Nemohu zkopírovat soubor"
+
+#: common/global/purl.cpp:437
+msgid "Could not create file"
+msgstr "Nemohu vytvořit soubor"
+
+#: common/global/purl.cpp:451
+#, fuzzy
+msgid "Could not delete file"
+msgstr "Nemohu smazat soubor."
+
+#: common/global/purl.cpp:508
+msgid "Could not create directory"
+msgstr "Nemohu vytvořit adresář"
+
+#: common/global/purl.cpp:512
+#, fuzzy
+msgid "Could not create non-local directory"
+msgstr "Nemohu vytvořit adresář"
+
#: common/global/xml_data_file.cpp:40
#, fuzzy
msgid "Error opening file: %1"
@@ -1217,34 +1262,6 @@
msgid "Select File"
msgstr "Vybrat soubor"
-#: common/kde/kde_pfile.cpp:47
-msgid "Could not save file."
-msgstr "Nemohu uložit soubor."
-
-#: common/kde/kde_pfile.cpp:59 common/nokde/nokde_pfile.cpp:37
-msgid "Could not open file for reading."
-msgstr "Nemohu otevřít soubor pro čtení."
-
-#: common/kde/kde_pfile.cpp:64
-msgid "Could not open temporary file."
-msgstr "Nemohu otevřít dočasný soubor."
-
-#: common/kde/kde_purl.cpp:22 common/nokde/nokde_purl.cpp:25
-msgid "Could not copy file"
-msgstr "Nemohu zkopírovat soubor"
-
-#: common/kde/kde_purl.cpp:34 common/nokde/nokde_purl.cpp:41
-msgid "Could not create file"
-msgstr "Nemohu vytvořit soubor"
-
-#: common/kde/kde_purl.cpp:41
-msgid "Could not delete file."
-msgstr "Nemohu smazat soubor."
-
-#: common/kde/kde_purl.cpp:51 common/nokde/nokde_purl.cpp:65
-msgid "Could not create directory"
-msgstr "Nemohu vytvořit adresář"
-
#: common/nokde_gui/nokde_dialog.cpp:70
msgid "Enter url"
msgstr ""
@@ -1291,7 +1308,7 @@
msgstr "Otevřít projekt..."
#: common/nokde_gui/nokde_misc_ui.cpp:166 libgui/editor_manager.cpp:400
-#: libgui/log_view.cpp:38
+#: libgui/log_view.cpp:39
#, fuzzy
msgid "Save As..."
msgstr "Uložit vše"
@@ -1699,45 +1716,12 @@
msgid "KDE-tempfile"
msgstr ""
-#: common/nokde/nokde_pfile.cpp:19
-msgid "Could not open file for writing."
-msgstr "Nemohu otevřít soubor pro zápis."
-
-#: common/nokde/nokde_purl.cpp:15
+#: common/port/hid_port.cpp:170
#, fuzzy
-msgid "Could not copy non-local file"
-msgstr "Nemohu zkopírovat soubor"
-
-#: common/nokde/nokde_purl.cpp:19
-msgid "Could not copy to non-local destination"
-msgstr ""
-
-#: common/nokde/nokde_purl.cpp:32
-#, fuzzy
-msgid "Could not create non-local file"
-msgstr "Nemohu vytvořit soubor"
-
-#: common/nokde/nokde_purl.cpp:48
-#, fuzzy
-msgid "Could not delete non-local file"
-msgstr "Nemohu smazat soubor."
-
-#: common/nokde/nokde_purl.cpp:52
-#, fuzzy
-msgid "Could not delete file"
-msgstr "Nemohu smazat soubor."
-
-#: common/nokde/nokde_purl.cpp:60
-#, fuzzy
-msgid "Could not create non-local directory"
-msgstr "Nemohu vytvořit adresář"
-
-#: common/port/hid_port.cpp:120
-#, fuzzy
msgid "Could not find HID device (vendor=%1 product=%2)."
msgstr "Nemohu najít USB zařízení (poskytovatel=%1 výrobek=%2)."
-#: common/port/hid_port.cpp:128
+#: common/port/hid_port.cpp:178
#, fuzzy
msgid "Error opening HID device."
msgstr "Chyba při otvírání USB zařízení."
@@ -1914,7 +1898,7 @@
msgid "Unsupported"
msgstr "Nepodporováno"
-#: devices/base/device_group.cpp:224 libgui/breakpoint_view.cpp:44
+#: devices/base/device_group.cpp:224 libgui/breakpoint_view.cpp:33
msgid "Status"
msgstr "Stav"
@@ -2358,7 +2342,7 @@
msgid "Low power crystal"
msgstr "Nízkopříkonový krystal"
-#: devices/pic/base/pic_config.cpp:50 devices/pic/base/pic_config.cpp:291
+#: devices/pic/base/pic_config.cpp:50 devices/pic/base/pic_config.cpp:292
msgid "External clock"
msgstr "Externí hodiny"
@@ -2554,7 +2538,7 @@
msgid "Brown-out reset voltage"
msgstr "Brown-out reset napětí"
-#: devices/pic/base/pic_config.cpp:103
+#: devices/pic/base/pic_config.cpp:103 devices/pic/base/pic_config.cpp:221
msgid "Undefined"
msgstr "Nedefinováno"
@@ -2589,8 +2573,8 @@
msgstr "WDT post-scaler"
#: devices/pic/base/pic_config.cpp:111 devices/pic/base/pic_config.cpp:216
-#: devices/pic/base/pic_config.cpp:245 devices/pic/base/pic_config.cpp:428
-#: devices/pic/base/pic_config.cpp:432
+#: devices/pic/base/pic_config.cpp:246 devices/pic/base/pic_config.cpp:438
+#: devices/pic/base/pic_config.cpp:442
msgid "Disabled"
msgstr "Zakázán"
@@ -2623,8 +2607,8 @@
msgid "Voltage Regulator Capacitor"
msgstr "USB napěťový regulátor"
-#: devices/pic/base/pic_config.cpp:120 devices/pic/base/pic_config.cpp:274
-#: devices/pic/base/pic_config.cpp:288 devices/pic/base/pic_config.cpp:311
+#: devices/pic/base/pic_config.cpp:120 devices/pic/base/pic_config.cpp:275
+#: devices/pic/base/pic_config.cpp:289 devices/pic/base/pic_config.cpp:312
msgid "Off"
msgstr ""
@@ -2652,7 +2636,7 @@
msgid "Analog"
msgstr "Analogový"
-#: devices/pic/base/pic_config.cpp:129 devices/pic/base/pic_config.cpp:296
+#: devices/pic/base/pic_config.cpp:129 devices/pic/base/pic_config.cpp:297
msgid "Watchdog timer window"
msgstr "Okno Watchdog časovače"
@@ -2804,7 +2788,7 @@
msgid "Timer1"
msgstr "Timer1"
-#: devices/pic/base/pic_config.cpp:170 devices/pic/base/pic_config.cpp:287
+#: devices/pic/base/pic_config.cpp:170 devices/pic/base/pic_config.cpp:288
msgid "Primary oscillator mode"
msgstr "Primární mód oscilátoru"
@@ -2932,351 +2916,383 @@
msgid "ICD communication channel"
msgstr "ICD komunikační kanál"
-#: devices/pic/base/pic_config.cpp:222
+#: devices/pic/base/pic_config.cpp:223
msgid "USB clock (PLL divided by)"
msgstr "USB hodiny (PLL děleno)"
-#: devices/pic/base/pic_config.cpp:223 devices/pic/base/pic_config.cpp:225
-#: devices/pic/base/pic_config.cpp:227
+#: devices/pic/base/pic_config.cpp:224 devices/pic/base/pic_config.cpp:226
+#: devices/pic/base/pic_config.cpp:228
msgid "not divided"
msgstr "neděleno"
-#: devices/pic/base/pic_config.cpp:224
+#: devices/pic/base/pic_config.cpp:225
msgid "CPU system clock (divided by)"
msgstr "Systémové hodiny CPU (děleno)"
-#: devices/pic/base/pic_config.cpp:226
+#: devices/pic/base/pic_config.cpp:227
msgid "PLL clock (divided by)"
msgstr "PLL hodiny (děleno)"
-#: devices/pic/base/pic_config.cpp:229
+#: devices/pic/base/pic_config.cpp:230
msgid "Master clear pull-up resistor"
msgstr "Master clear pull-up rezistor"
-#: devices/pic/base/pic_config.cpp:230
+#: devices/pic/base/pic_config.cpp:231
msgid "Internal oscillator speed"
msgstr "Rychlost vnitřního oscilátoru"
-#: devices/pic/base/pic_config.cpp:231
+#: devices/pic/base/pic_config.cpp:232
msgid "8 MHz"
msgstr "8 MHz"
-#: devices/pic/base/pic_config.cpp:232
+#: devices/pic/base/pic_config.cpp:233
msgid "4 MHz"
msgstr "4 MHz"
-#: devices/pic/base/pic_config.cpp:235
+#: devices/pic/base/pic_config.cpp:236
msgid "4x PLL enable"
msgstr ""
-#: devices/pic/base/pic_config.cpp:236
+#: devices/pic/base/pic_config.cpp:237
#, fuzzy
msgid "Primary clock enable"
msgstr "Primární mód oscilátoru"
-#: devices/pic/base/pic_config.cpp:237
+#: devices/pic/base/pic_config.cpp:238
msgid "HFINTOSC fast start"
msgstr ""
-#: devices/pic/base/pic_config.cpp:240
+#: devices/pic/base/pic_config.cpp:241
msgid "Ethernet LED enable"
msgstr ""
-#: devices/pic/base/pic_config.cpp:241
+#: devices/pic/base/pic_config.cpp:242
#, fuzzy
msgid "Default system clock select"
msgstr "Přepínač systémových hodin oscilátoru"
-#: devices/pic/base/pic_config.cpp:242
+#: devices/pic/base/pic_config.cpp:243
msgid "FOSC1:FOSC0"
msgstr ""
-#: devices/pic/base/pic_config.cpp:243
+#: devices/pic/base/pic_config.cpp:244
msgid "INTRC"
msgstr ""
-#: devices/pic/base/pic_config.cpp:244
+#: devices/pic/base/pic_config.cpp:245
#, fuzzy
msgid "External memory bus"
msgstr "Externí rezistor"
-#: devices/pic/base/pic_config.cpp:246
+#: devices/pic/base/pic_config.cpp:247
msgid "12-bit external bus"
msgstr ""
-#: devices/pic/base/pic_config.cpp:247
+#: devices/pic/base/pic_config.cpp:248
msgid "16-bit external bus"
msgstr ""
-#: devices/pic/base/pic_config.cpp:248
+#: devices/pic/base/pic_config.cpp:249
msgid "20-bit external bus"
msgstr ""
-#: devices/pic/base/pic_config.cpp:249
+#: devices/pic/base/pic_config.cpp:250
#, fuzzy
msgid "External address bus shift"
msgstr "Externí rezistor"
-#: devices/pic/base/pic_config.cpp:250
+#: devices/pic/base/pic_config.cpp:251
msgid "MSSP address select bit"
msgstr ""
-#: devices/pic/base/pic_config.cpp:251
+#: devices/pic/base/pic_config.cpp:252
msgid "7-bit address mask mode"
msgstr ""
-#: devices/pic/base/pic_config.cpp:252
+#: devices/pic/base/pic_config.cpp:253
msgid "5-bit address mask mode"
msgstr ""
-#: devices/pic/base/pic_config.cpp:253
+#: devices/pic/base/pic_config.cpp:254
msgid "PMP pin select bit"
msgstr ""
-#: devices/pic/base/pic_config.cpp:254
+#: devices/pic/base/pic_config.cpp:255
#, fuzzy
msgid "Connected to EMB"
msgstr "Připojen"
-#: devices/pic/base/pic_config.cpp:255
+#: devices/pic/base/pic_config.cpp:256
#, fuzzy
msgid "Not connected to EMB"
msgstr "Nepřipojen"
-#: devices/pic/base/pic_config.cpp:258
+#: devices/pic/base/pic_config.cpp:259
#, fuzzy
msgid "Boot segment write-protection"
msgstr "Ochrana spouštěče proti zápisu"
-#: devices/pic/base/pic_config.cpp:259
+#: devices/pic/base/pic_config.cpp:260
#, fuzzy
msgid "Boot segment size"
msgstr "Velikost zaváděcího bloku"
-#: devices/pic/base/pic_config.cpp:260
+#: devices/pic/base/pic_config.cpp:261
msgid "Boot segment security"
msgstr ""
-#: devices/pic/base/pic_config.cpp:261 devices/pic/base/pic_config.cpp:268
+#: devices/pic/base/pic_config.cpp:262 devices/pic/base/pic_config.cpp:269
#: devices/pic/gui/pic_memory_editor.cpp:63
#, fuzzy
msgid "High Security"
msgstr "Nejvyšší"
-#: devices/pic/base/pic_config.cpp:262 devices/pic/base/pic_config.cpp:269
+#: devices/pic/base/pic_config.cpp:263 devices/pic/base/pic_config.cpp:270
#, fuzzy
msgid "Standard Security"
msgstr "Standardní operace"
-#: devices/pic/base/pic_config.cpp:263
+#: devices/pic/base/pic_config.cpp:264
#, fuzzy
msgid "Boot segment EEPROM size"
msgstr "Velikost zaváděcího bloku"
-#: devices/pic/base/pic_config.cpp:264
+#: devices/pic/base/pic_config.cpp:265
msgid "Boot segment RAM size"
msgstr ""
-#: devices/pic/base/pic_config.cpp:265
+#: devices/pic/base/pic_config.cpp:266
#, fuzzy
msgid "Secure segment write-protection"
msgstr "Ochrana proti zápisu obecného kódu"
-#: devices/pic/base/pic_config.cpp:266
+#: devices/pic/base/pic_config.cpp:267
msgid "Secure segment size"
msgstr ""
-#: devices/pic/base/pic_config.cpp:267
+#: devices/pic/base/pic_config.cpp:268
msgid "Secure segment security"
msgstr ""
-#: devices/pic/base/pic_config.cpp:270
+#: devices/pic/base/pic_config.cpp:271
#, fuzzy
msgid "Secure segment EEPROM size"
msgstr "Velikost zaváděcího bloku"
-#: devices/pic/base/pic_config.cpp:271
+#: devices/pic/base/pic_config.cpp:272
msgid "Secure segment RAM size"
msgstr ""
-#: devices/pic/base/pic_config.cpp:272
+#: devices/pic/base/pic_config.cpp:273
#, fuzzy
msgid "General segment write-protection"
msgstr "Ochrana proti zápisu obecného kódu"
-#: devices/pic/base/pic_config.cpp:273
+#: devices/pic/base/pic_config.cpp:274
#, fuzzy
msgid "General segment security"
msgstr "Ochrana proti čtení obecného kódu"
-#: devices/pic/base/pic_config.cpp:275
+#: devices/pic/base/pic_config.cpp:276
#, fuzzy
msgid "High security"
msgstr "Nejvyšší"
-#: devices/pic/base/pic_config.cpp:276
+#: devices/pic/base/pic_config.cpp:277
#, fuzzy
msgid "Standard security"
msgstr "Standardní operace"
-#: devices/pic/base/pic_config.cpp:277
+#: devices/pic/base/pic_config.cpp:278
#, fuzzy
msgid "Initial oscillator source"
msgstr "Zdroj oscilátoru"
-#: devices/pic/base/pic_config.cpp:278
+#: devices/pic/base/pic_config.cpp:279
#, fuzzy
msgid "Fast RC oscillator"
msgstr "Externí RC oscilátor"
-#: devices/pic/base/pic_config.cpp:279
+#: devices/pic/base/pic_config.cpp:280
#, fuzzy
msgid "Internal fast RC oscillator"
msgstr "Vnitřní rychlý RC oscilátor s 8x PLL"
-#: devices/pic/base/pic_config.cpp:280
+#: devices/pic/base/pic_config.cpp:281
#, fuzzy
msgid "Internal fast RC oscillator with PLL"
msgstr "Vnitřní rychlý RC oscilátor s 8x PLL"
-#: devices/pic/base/pic_config.cpp:281
+#: devices/pic/base/pic_config.cpp:282
#, fuzzy
msgid "Primary oscillator"
msgstr "Primární mód oscilátoru"
-#: devices/pic/base/pic_config.cpp:282
+#: devices/pic/base/pic_config.cpp:283
#, fuzzy
msgid "Primary oscillator with PLL"
msgstr "Primární mód oscilátoru"
-#: devices/pic/base/pic_config.cpp:283
+#: devices/pic/base/pic_config.cpp:284
#, fuzzy
msgid "Secondary oscillator (LP)"
msgstr "Vnitřní oscilátor (bez CLKOUT)"
-#: devices/pic/base/pic_config.cpp:284
+#: devices/pic/base/pic_config.cpp:285
#, fuzzy
msgid "Low power RC oscillator"
msgstr "Nízkopříkonový Timer1 oscilátor"
-#: devices/pic/base/pic_config.cpp:285
+#: devices/pic/base/pic_config.cpp:286
#, fuzzy
msgid "Internal fast RC oscillator with divide-by-16"
msgstr "Vnitřní rychlý RC oscilátor s 16x PLL"
-#: devices/pic/base/pic_config.cpp:286
+#: devices/pic/base/pic_config.cpp:287
#, fuzzy
msgid "Internal fast RC oscillator with postscaler"
msgstr "Vnitřní rychlý RC oscilátor s 4x PLL"
-#: devices/pic/base/pic_config.cpp:289
+#: devices/pic/base/pic_config.cpp:290
#, fuzzy
msgid "HS crystal oscillator"
msgstr "Vnitřní oscilátor"
-#: devices/pic/base/pic_config.cpp:290
+#: devices/pic/base/pic_config.cpp:291
#, fuzzy
msgid "XT crystal oscillator"
msgstr "Vnitřní oscilátor"
-#: devices/pic/base/pic_config.cpp:292
+#: devices/pic/base/pic_config.cpp:293
#, fuzzy
msgid "Temperature protection"
msgstr "Rozsah teplot: "
-#: devices/pic/base/pic_config.cpp:293
+#: devices/pic/base/pic_config.cpp:294
msgid "OSC2 pin function"
msgstr ""
-#: devices/pic/base/pic_config.cpp:294
+#: devices/pic/base/pic_config.cpp:295
#, fuzzy
msgid "Digital I/O"
msgstr "Číslicový"
-#: devices/pic/base/pic_config.cpp:295
+#: devices/pic/base/pic_config.cpp:296
#, fuzzy
msgid "Clock output"
msgstr " (výstup)"
-#: devices/pic/base/pic_config.cpp:297
+#: devices/pic/base/pic_config.cpp:298
#, fuzzy
msgid "Watchdog timer prescaler"
msgstr "Dělička Watchdog časovače A"
-#: devices/pic/base/pic_config.cpp:298
+#: devices/pic/base/pic_config.cpp:299
#, fuzzy
msgid "Watchdog timer postscaler"
msgstr "Dělička Watchdog časovače B"
-#: devices/pic/base/pic_config.cpp:299
+#: devices/pic/base/pic_config.cpp:300
#, fuzzy
msgid "JTAG port enabled"
msgstr " port nenalezen"
-#: devices/pic/base/pic_config.cpp:300
+#: devices/pic/base/pic_config.cpp:301
#, fuzzy
msgid "Peripheral pin select configuration"
msgstr "Obecné nastavení"
-#: devices/pic/base/pic_config.cpp:301
+#: devices/pic/base/pic_config.cpp:302
msgid "Allow only one reconfiguration"
msgstr ""
-#: devices/pic/base/pic_config.cpp:302
+#: devices/pic/base/pic_config.cpp:303
msgid "Allow multiple reconfigurations"
msgstr ""
-#: devices/pic/base/pic_config.cpp:303
+#: devices/pic/base/pic_config.cpp:304
#, fuzzy
msgid "Alternate I2C pins"
msgstr "Alternativy"
-#: devices/pic/base/pic_config.cpp:304
+#: devices/pic/base/pic_config.cpp:305
#, fuzzy
msgid "I2C pins selection"
msgstr "Popisy ikon:"
-#: devices/pic/base/pic_config.cpp:305
+#: devices/pic/base/pic_config.cpp:306
#, fuzzy
msgid "Default"
msgstr "Nastavit implicitní"
-#: devices/pic/base/pic_config.cpp:306
+#: devices/pic/base/pic_config.cpp:307
#, fuzzy
msgid "Alternate"
msgstr "Alternativy"
-#: devices/pic/base/pic_config.cpp:307
+#: devices/pic/base/pic_config.cpp:308
msgid "Frequency range selection for FRC oscillator"
msgstr ""
-#: devices/pic/base/pic_config.cpp:308
+#: devices/pic/base/pic_config.cpp:309
msgid "High range (nominal FRC frequency is 14.1 MHz)"
msgstr ""
-#: devices/pic/base/pic_config.cpp:309
+#: devices/pic/base/pic_config.cpp:310
msgid "Low range (nominal FRC frequency is 9.7 MHz)"
msgstr ""
-#: devices/pic/base/pic_config.cpp:310
+#: devices/pic/base/pic_config.cpp:311
#, fuzzy
msgid "Brown-out reset"
msgstr "Detekce brown-out"
-#: devices/pic/base/pic_config.cpp:312
+#: devices/pic/base/pic_config.cpp:313
#, fuzzy
msgid "Enabled in hardware"
msgstr "Upravit a otestovat zařízení"
-#: devices/pic/base/pic_config.cpp:342
+#: devices/pic/base/pic_config.cpp:314
+#, fuzzy
+msgid "Internal USB Regulator"
+msgstr "Vnitřní oscilátor"
+
+#: devices/pic/base/pic_config.cpp:315
+msgid "Protected Code Segment Boundary Page"
+msgstr ""
+
+#: devices/pic/base/pic_config.cpp:316
+#, fuzzy
+msgid "Segment Write Protection"
+msgstr "Ochrana proti zápisu obecného kódu"
+
+#: devices/pic/base/pic_config.cpp:317
+#, fuzzy
+msgid "Configuration Word Code Page Protection"
+msgstr "Ochrana konfigurace proti zápisu"
+
+#: devices/pic/base/pic_config.cpp:318
+#, fuzzy
+msgid "Segment Write Protection End Page"
+msgstr "Ochrana proti zápisu obecného kódu"
+
+#: devices/pic/base/pic_config.cpp:319
+msgid "Protected segment ends at last code page"
+msgstr ""
+
+#: devices/pic/base/pic_config.cpp:320
+msgid "Protected segment starts at first code page"
+msgstr ""
+
+#: devices/pic/base/pic_config.cpp:350
msgid "%1 for block %2"
msgstr "%1 pro blok %2"
-#: devices/pic/base/pic_config.cpp:427
+#: devices/pic/base/pic_config.cpp:437
msgid "All"
msgstr "Vše"
-#: devices/pic/base/pic_config.cpp:431
+#: devices/pic/base/pic_config.cpp:441
msgid "Enabled"
msgstr "Povoleno"
@@ -3284,8 +3300,8 @@
msgid "Code memory"
msgstr "Paměť kódu"
-#: devices/pic/base/pic.cpp:25 progs/gui/prog_group_ui.cpp:102
-#: progs/gui/prog_group_ui.cpp:103
+#: devices/pic/base/pic.cpp:25 progs/gui/prog_group_ui.cpp:103
+#: progs/gui/prog_group_ui.cpp:104
msgid "Calibration"
msgstr "Kalibrace"
@@ -3324,7 +3340,7 @@
#: devices/pic/base/pic.cpp:42
#, fuzzy
-msgid "Enhance Mid-Range Family"
+msgid "Enhanced Mid-Range Family"
msgstr "Střední rodina"
#: devices/pic/base/pic.cpp:43
@@ -3347,100 +3363,100 @@
msgid "18J Family"
msgstr "Rodina 18Xx"
-#: devices/pic/base/pic.cpp:48
+#: devices/pic/base/pic.cpp:47
#, fuzzy
msgid "24F Family"
msgstr "Rodina 18Xx"
-#: devices/pic/base/pic.cpp:49
+#: devices/pic/base/pic.cpp:48
#, fuzzy
msgid "24H Family"
msgstr "Rodina 18Xx"
-#: devices/pic/base/pic.cpp:50
+#: devices/pic/base/pic.cpp:49
#, fuzzy
msgid "30F Family"
msgstr "Rodina 18Xx"
-#: devices/pic/base/pic.cpp:51
+#: devices/pic/base/pic.cpp:50
#, fuzzy
msgid "33F Family"
msgstr "Rodina 18Xx"
-#: devices/pic/base/pic.cpp:62
+#: devices/pic/base/pic.cpp:61
msgid "CCP"
msgstr ""
-#: devices/pic/base/pic.cpp:63
+#: devices/pic/base/pic.cpp:62
msgid "ADC"
msgstr ""
-#: devices/pic/base/pic.cpp:64
+#: devices/pic/base/pic.cpp:63
#, fuzzy
msgid "SSP"
msgstr "SSOP"
-#: devices/pic/base/pic.cpp:65
+#: devices/pic/base/pic.cpp:64
#, fuzzy
msgid "Low Voltage Detect"
msgstr "Nízké napětí"
-#: devices/pic/base/pic.cpp:66 progs/gui/port_selector.cpp:21
+#: devices/pic/base/pic.cpp:65 progs/gui/port_selector.cpp:21
msgid "USB"
msgstr "USB"
-#: devices/pic/base/pic.cpp:67
+#: devices/pic/base/pic.cpp:66
msgid "USART"
msgstr ""
-#: devices/pic/base/pic.cpp:68
+#: devices/pic/base/pic.cpp:67
msgid "CAN"
msgstr ""
-#: devices/pic/base/pic.cpp:69
+#: devices/pic/base/pic.cpp:68
msgid "ECAN"
msgstr ""
-#: devices/pic/base/pic.cpp:70
+#: devices/pic/base/pic.cpp:69
#, fuzzy
msgid "Ethernet"
msgstr "Rozšířené"
-#: devices/pic/base/pic.cpp:71
+#: devices/pic/base/pic.cpp:70
msgid "LCD"
msgstr ""
-#: devices/pic/base/pic.cpp:72
+#: devices/pic/base/pic.cpp:71
msgid "Motor Control"
msgstr ""
-#: devices/pic/base/pic.cpp:73
+#: devices/pic/base/pic.cpp:72
msgid "Motion Feeback"
msgstr ""
-#: devices/pic/base/pic.cpp:74
+#: devices/pic/base/pic.cpp:73
#, fuzzy
msgid "Self-Write"
msgstr "Autotest"
-#: devices/pic/base/pic.cpp:203 devices/pic/base/pic.cpp:213
+#: devices/pic/base/pic.cpp:209 devices/pic/base/pic.cpp:219
msgid "%1 (rev. %2)"
msgstr "%1 (rev. %2)"
-#: devices/pic/base/pic.cpp:206
+#: devices/pic/base/pic.cpp:212
#, fuzzy
msgid "%1 (rev. %2.%3)"
msgstr "%1 (rev. %2)"
-#: devices/pic/base/pic.cpp:209
+#: devices/pic/base/pic.cpp:215
msgid "%1 (proc. %2; rev. %3.%4)"
msgstr "%1 (proc. %2; rev. %3.%4)"
-#: devices/pic/base/pic.cpp:233
+#: devices/pic/base/pic.cpp:239
msgid "Calibration word at address %1 is blank."
msgstr "Kalibrační slovo na adrese %1 je prázdné."
-#: devices/pic/base/pic.cpp:239
+#: devices/pic/base/pic.cpp:245
msgid "Calibration word is not a compatible opcode (%2)."
msgstr "Kalibrační slovo není kompatibilní opcode (%2)."
@@ -3601,7 +3617,7 @@
msgid "Bank %1 (high)"
msgstr "Banka %1 (high)"
-#: devices/pic/gui/pic_register_view.cpp:82 libgui/toplevel.cpp:957
+#: devices/pic/gui/pic_register_view.cpp:82 libgui/toplevel.cpp:992
#: progs/custom/base/custom_prog.cpp:19 progs/gui/prog_group_ui.cpp:31
#: progs/gui/prog_group_ui.cpp:44
msgid "Read"
@@ -3797,7 +3813,7 @@
"%1: Mazání jen tohoto rozsahu není zvoleným programátorem podporováno. Tato "
"operace vymaže celý mikrokontrolér a obnoví ostatní rozsahy paměti."
-#: devices/pic/prog/pic_prog.cpp:419 devices/pic/prog/pic_prog.cpp:511
+#: devices/pic/prog/pic_prog.cpp:419 devices/pic/prog/pic_prog.cpp:512
msgid "The selected programmer cannot read the specified memory range."
msgstr "Zvolený programátor neumí načíst zvolený paměťový rozsah."
@@ -3832,31 +3848,31 @@
msgid "Disabling DEBUG configuration bit."
msgstr "Chyba nastavování konfigurace USB %1."
-#: devices/pic/prog/pic_prog.cpp:474
+#: devices/pic/prog/pic_prog.cpp:475
#, fuzzy
msgid "Disabling JTAGEN configuration bit."
msgstr "Používám port z konfiguračního souboru."
-#: devices/pic/prog/pic_prog.cpp:519 devices/pic/prog/pic_prog.cpp:634
-#: devices/pic/prog/pic_prog.cpp:645
+#: devices/pic/prog/pic_prog.cpp:520 devices/pic/prog/pic_prog.cpp:635
+#: devices/pic/prog/pic_prog.cpp:646
msgid " Write memory: %1"
msgstr "Zapsat paměť: %1"
-#: devices/pic/prog/pic_prog.cpp:561
+#: devices/pic/prog/pic_prog.cpp:562
msgid "Cannot write ROM or ROMless device."
msgstr "Nemohu zapsat ROM nebo mikrokontrolér bez ROM."
-#: devices/pic/prog/pic_prog.cpp:576
+#: devices/pic/prog/pic_prog.cpp:577
#, fuzzy
msgid " EPROM device: blank checking first..."
msgstr "EPROM: zkouška prázdné paměti..."
-#: devices/pic/prog/pic_prog.cpp:580
+#: devices/pic/prog/pic_prog.cpp:581
#, fuzzy
msgid " Blank check successful"
msgstr "Zkouška prázdné paměti úspěšná"
-#: devices/pic/prog/pic_prog.cpp:585
+#: devices/pic/prog/pic_prog.cpp:586
msgid ""
"Protecting code memory or data EEPROM on OTP devices is disabled as a "
"security..."
@@ -3864,11 +3880,11 @@
"Ochrana paměti kódu nebo EEPROM dat na OTP mikrokontrolérech je zapnuta z "
"důvodu bezpečnosti..."
-#: devices/pic/prog/pic_prog.cpp:596
+#: devices/pic/prog/pic_prog.cpp:597
msgid "This memory range is programming protected."
msgstr "Tento paměťový rozsah je chráněn proti programování."
-#: devices/pic/prog/pic_prog.cpp:601
+#: devices/pic/prog/pic_prog.cpp:602
msgid ""
"The range cannot be erased first by the selected programmer so programming "
"may fail..."
@@ -3876,11 +3892,11 @@
"Rozsah nemůže být zvoleným programátorem napřed smazán, takže programování "
"může selhat..."
-#: devices/pic/prog/pic_prog.cpp:609 devices/pic/prog/pic_prog.cpp:665
+#: devices/pic/prog/pic_prog.cpp:610 devices/pic/prog/pic_prog.cpp:666
msgid " Erasing device"
msgstr "Mažu zařízení"
-#: devices/pic/prog/pic_prog.cpp:613
+#: devices/pic/prog/pic_prog.cpp:614
msgid ""
"The device cannot be erased first by the selected programmer so programming "
"may fail..."
@@ -3888,23 +3904,23 @@
"Mikrokontrolér nemůže být programátorem napřed smazán, takže programování "
"může selhat..."
-#: devices/pic/prog/pic_prog.cpp:626
+#: devices/pic/prog/pic_prog.cpp:627
msgid "The calibration word %1 is not valid."
msgstr "Kalibrační slovo %1 není platné."
-#: devices/pic/prog/pic_prog.cpp:629
+#: devices/pic/prog/pic_prog.cpp:630
msgid "Do you want to overwrite the device calibration with %1?"
msgstr "Chcete přepsat kalibraci mikrokontroléru %1?"
-#: devices/pic/prog/pic_prog.cpp:661
+#: devices/pic/prog/pic_prog.cpp:662
msgid "Programming calibration data needs a chip erase. Continue anyway?"
msgstr "K programování kalibračních dat je třeba smazat celý čip. Pokračovat?"
-#: devices/pic/prog/pic_prog.cpp:686 devices/pic/prog/pic_prog.cpp:687
+#: devices/pic/prog/pic_prog.cpp:687 devices/pic/prog/pic_prog.cpp:688
msgid "Programming calibration..."
msgstr "Programování kalibrace..."
-#: devices/pic/prog/pic_prog.cpp:689
+#: devices/pic/prog/pic_prog.cpp:690
msgid "Programming calibration successful"
msgstr "Programování kalibrace úspěšné"
@@ -3924,34 +3940,62 @@
"Paměť mikrokontroléru neodpovídá hex souboru (v %1 na adrese %2: přečteno %3 "
"a očekáváno %4)."
-#: libgui/breakpoint_view.cpp:21
-msgid "Remove breakpoint"
-msgstr "Odstranit bod přerušení"
+#: dev-utils/generator/main_generator.cpp:14
+#, fuzzy
+msgid "Output directory."
+msgstr "Adresář pro spouštění"
-#: libgui/breakpoint_view.cpp:21
-msgid "Set breakpoint"
-msgstr "Nastavit bod přerušení"
+#: dev-utils/pickit3_dds_parser/pickit3_dds_parser.cpp:32
+msgid "DDS data as parsed by usb_snoop_filter"
+msgstr ""
-#: libgui/breakpoint_view.cpp:24
-msgid "Enable breakpoint"
-msgstr "Povolit bod přerušení"
+#: dev-utils/usb_snoop_filter/usb_snoop_filter.cpp:67
+#, fuzzy
+msgid "Short output"
+msgstr " (výstup)"
-#: libgui/breakpoint_view.cpp:24
-msgid "Disable breakpoint"
-msgstr "Zakázat bod přerušení"
+#: dev-utils/usb_snoop_filter/usb_snoop_filter.cpp:68
+msgid "Add timestamps"
+msgstr ""
-#: libgui/breakpoint_view.cpp:45
-msgid "Location"
-msgstr "Umístění"
+#: dev-utils/usb_snoop_filter/usb_snoop_filter.cpp:69
+msgid "Text file copied and pasted from SnoopyPro"
+msgstr ""
-#: libgui/breakpoint_view.cpp:46 piklab-coff/main.cpp:162
+#: libgui/breakpoint_view.cpp:35
+msgid "Line"
+msgstr ""
+
+#: libgui/breakpoint_view.cpp:36 piklab-coff/main.cpp:162
msgid "Address"
msgstr "Adresa"
-#: libgui/breakpoint_view.cpp:61
+#: libgui/breakpoint_view.cpp:53
msgid "Non-code breakpoint"
msgstr "Bod přerušení mimo kód"
+#: libgui/breakpoint_view.cpp:81 libgui/toplevel.cpp:133
+msgid "Breakpoints"
+msgstr "Body přerušení"
+
+#: libgui/breakpoint_view.cpp:82 libgui/text_editor.cpp:227
+msgid "Remove breakpoint"
+msgstr "Odstranit bod přerušení"
+
+#: libgui/breakpoint_view.cpp:85 libgui/text_editor.cpp:230
+msgid "Enable breakpoint"
+msgstr "Povolit bod přerušení"
+
+#: libgui/breakpoint_view.cpp:85 libgui/text_editor.cpp:230
+msgid "Disable breakpoint"
+msgstr "Zakázat bod přerušení"
+
+#: libgui/breakpoint_view.cpp:88 libgui/log_view.cpp:40
+#: libgui/watch_view.cpp:109
+#, fuzzy
+msgid "Clear"
+msgstr "&Vyčistit"
+
#: libgui/config_center.cpp:61
msgid "Configure Piklab"
msgstr "Nastavit Piklab"
@@ -3965,7 +4009,7 @@
msgstr "Obecné nastavení"
#: libgui/config_gen.cpp:36 libgui/project_wizard.cpp:130
-#: tools/list/tools_config_widget.cpp:46
+#: tools/list/tools_config_widget.cpp:47
msgid "Toolchain:"
msgstr "Sada nástrojů:"
@@ -3973,24 +4017,24 @@
msgid "Tool Type:"
msgstr "Typ nástroje:"
-#: libgui/config_gen.cpp:60
+#: libgui/config_gen.cpp:61
msgid "Copy to clipboard"
msgstr "Zkopírovat do schránky"
-#: libgui/config_gen.cpp:106
+#: libgui/config_gen.cpp:107
msgid "Generation is not supported yet for the selected toolchain or device."
msgstr ""
"Generování není touto sadou nástrojů nebo tímto mikrokontrolérem podporováno."
-#: libgui/config_gen.cpp:113
+#: libgui/config_gen.cpp:114
msgid "This toolchain does not need explicit config bits."
msgstr "Tato sada nástrojů nevyžaduje konfigurační bity."
-#: libgui/config_gen.cpp:120
+#: libgui/config_gen.cpp:121
msgid "Generation is only partially supported for this device."
msgstr "Generování je tímto mikrokontrolérem podporováno jen částečně."
-#: libgui/config_gen.cpp:125
+#: libgui/config_gen.cpp:126
msgid ""
"Could not detect supported devices for selected toolchain. Please check "
"installation."
@@ -3998,19 +4042,19 @@
"Nemohu zjistit mikrokontroléry podporované zvolenou sadou nástrojů. Prosím "
"zkontrolujte instalaci."
-#: libgui/config_gen.cpp:126
+#: libgui/config_gen.cpp:127
msgid "Device not supported by the selected toolchain."
msgstr "Zařízení není podporováno zvolenou sadou nástrojů."
-#: libgui/config_gen.cpp:139
+#: libgui/config_gen.cpp:140
msgid "Config Generator"
msgstr "Generátor konfigurace"
-#: libgui/config_gen.cpp:165
+#: libgui/config_gen.cpp:166
msgid "Template Generator"
msgstr "Generátor šablon"
-#: libgui/console.cpp:33
+#: libgui/console.cpp:35
#, fuzzy
msgid "Could not find \"konsolepart\"; please install konsole."
msgstr "Nemohu najít \"konsolepart\": Prosím nainstalujte kdebase."
@@ -4081,7 +4125,7 @@
msgid "Device"
msgstr "Mikrokontrolér"
-#: libgui/device_gui.cpp:304 progs/manager/prog_manager.cpp:71
+#: libgui/device_gui.cpp:304 progs/manager/prog_manager.cpp:64
msgid ""
"Could not detect supported devices for \"%1\". Please check installation."
msgstr ""
@@ -4131,7 +4175,7 @@
msgid "Reload"
msgstr "Znovu načís&t"
-#: libgui/editor_manager.cpp:398 libgui/toplevel.cpp:185
+#: libgui/editor_manager.cpp:398 libgui/toplevel.cpp:189
msgid "Close All Others"
msgstr "Zavřít všechny ostatní"
@@ -4166,11 +4210,11 @@
msgid "You cannot set breakpoints when a debugger is not selected."
msgstr ""
-#: libgui/gui_debug_manager.cpp:127
+#: libgui/gui_debug_manager.cpp:131
msgid "Breakpoint at non-code line cannot be activated."
msgstr "Bod přerušení nemůže být mimo řádek s kódem"
-#: libgui/gui_debug_manager.cpp:248
+#: libgui/gui_debug_manager.cpp:261
msgid "Cannot show disassembly location for non-code line."
msgstr ""
@@ -4189,7 +4233,7 @@
msgid "Compile and Program First"
msgstr "Z&kompilovat soubor"
-#: libgui/gui_prog_manager.cpp:39 libgui/toplevel.cpp:909
+#: libgui/gui_prog_manager.cpp:39 libgui/toplevel.cpp:944
msgid "Continue Anyway"
msgstr ""
@@ -4235,19 +4279,29 @@
msgid "Checksum: %1"
msgstr "Kontrolní součet: %1"
-#: libgui/log_view.cpp:39 libgui/watch_view.cpp:109
-#, fuzzy
-msgid "Clear"
-msgstr "&Vyčistit"
-
-#: libgui/log_view.cpp:46
+#: libgui/log_view.cpp:47
msgid "Output in console"
msgstr "Výstup v konzoli"
-#: libgui/log_view.cpp:120
+#: libgui/log_view.cpp:121
msgid "Save log to file"
msgstr "Uložit log do souboru"
+#: libgui/main_global.cpp:25
+msgid "Optional filenames to be opened upon startup."
+msgstr "Názvy souborů, které mají být otevřeny po spuštění."
+
+#: libgui/main_global.cpp:98
+msgid "Piklab"
+msgstr "Piklab"
+
+#: libgui/main_global.cpp:99
+msgid ""
+"Graphical development environment for applications based on PIC and dsPIC "
+"microcontrollers."
+msgstr ""
+"Grafické vývojové prostředí pro aplikace s mikrokontroléry PIC a dsPIC."
+
#: libgui/new_dialogs.cpp:29
msgid "Location:"
msgstr "Umístění:"
@@ -4304,7 +4358,7 @@
msgid "Description:"
msgstr "Popis"
-#: libgui/project_editor.cpp:41 progs/gui/prog_group_ui.cpp:66
+#: libgui/project_editor.cpp:41 progs/gui/prog_group_ui.cpp:67
#: progs/icd2/gui/icd2_group_ui.cpp:32
msgid "Version:"
msgstr "Verze:"
@@ -4397,7 +4451,7 @@
msgstr "Nastavit sadu nástrojů..."
#: libgui/project_manager.cpp:229 libgui/project_manager_ui.cpp:33
-#: progs/gui/prog_group_ui.cpp:56
+#: progs/gui/prog_group_ui.cpp:57
msgid "Programmer"
msgstr "Programátor"
@@ -4596,14 +4650,18 @@
msgid "The selected device has no register."
msgstr "Zvolený mikrokontrolér nemá žádný registr."
-#: libgui/text_editor.cpp:202
+#: libgui/text_editor.cpp:213
msgid "Line: %1 Col: %2"
msgstr "Řádek: %1 Sloupec: %2"
-#: libgui/text_editor.cpp:203
+#: libgui/text_editor.cpp:214
msgid "R/O"
msgstr "R/O"
+#: libgui/text_editor.cpp:227
+msgid "Set breakpoint"
+msgstr "Nastavit bod přerušení"
+
#: libgui/toplevel.cpp:62
msgid "&Pikloops..."
msgstr "&Pikloops..."
@@ -4617,61 +4675,57 @@
msgid "&KHexTerm..."
msgstr ""
-#: libgui/toplevel.cpp:86
+#: libgui/toplevel.cpp:90
#, fuzzy
msgid "Vdd"
msgstr "Vdd (V)"
-#: libgui/toplevel.cpp:88
+#: libgui/toplevel.cpp:92
msgid "Vpp"
msgstr ""
-#: libgui/toplevel.cpp:94
+#: libgui/toplevel.cpp:98
msgid "Project Manager"
msgstr "Správce projektu"
-#: libgui/toplevel.cpp:101
+#: libgui/toplevel.cpp:105
msgid "Watch View"
msgstr "Sledování"
-#: libgui/toplevel.cpp:115
+#: libgui/toplevel.cpp:119
msgid "Compile Log"
msgstr "Záznam kompilace"
-#: libgui/toplevel.cpp:122
+#: libgui/toplevel.cpp:126
msgid "Program Log"
msgstr "Log programu"
-#: libgui/toplevel.cpp:129
-msgid "Breakpoints"
-msgstr "Body přerušení"
-
-#: libgui/toplevel.cpp:136
+#: libgui/toplevel.cpp:140
#, fuzzy
msgid "Console"
msgstr "Konsole"
-#: libgui/toplevel.cpp:169
+#: libgui/toplevel.cpp:173
msgid "&New Source File..."
msgstr "&Nový zdrojový soubor..."
-#: libgui/toplevel.cpp:171
+#: libgui/toplevel.cpp:175
msgid "New hex File..."
msgstr "Nový hex soubor..."
-#: libgui/toplevel.cpp:178
+#: libgui/toplevel.cpp:182
msgid "Save All"
msgstr "Uložit vše"
-#: libgui/toplevel.cpp:182
+#: libgui/toplevel.cpp:186
msgid "C&lose All"
msgstr "&Zavřít vše"
-#: libgui/toplevel.cpp:201
+#: libgui/toplevel.cpp:203
msgid "Switch to..."
msgstr "Přepnout do..."
-#: libgui/toplevel.cpp:204
+#: libgui/toplevel.cpp:206
msgid "Switch Header/Implementation"
msgstr "Přepnout hlavička/implementace"
@@ -4799,33 +4853,38 @@
msgid "&Template Generator..."
msgstr "Generá&tor šablon..."
-#: libgui/toplevel.cpp:527
+#: libgui/toplevel.cpp:357
+#, fuzzy
+msgid "Configure Editor..."
+msgstr "Nastavení..."
+
+#: libgui/toplevel.cpp:535
msgid "Hex"
msgstr "Hex"
-#: libgui/toplevel.cpp:541
+#: libgui/toplevel.cpp:549
msgid "All Files"
msgstr "Všechny soubory"
-#: libgui/toplevel.cpp:542
+#: libgui/toplevel.cpp:550
msgid "Open File"
msgstr "Otevřít soubor"
-#: libgui/toplevel.cpp:694 libgui/toplevel.cpp:696
+#: libgui/toplevel.cpp:737 libgui/toplevel.cpp:739
#, fuzzy
msgid "Could not run \"%1\""
msgstr "Nemohu spustit \"pikloops\""
-#: libgui/toplevel.cpp:846
+#: libgui/toplevel.cpp:881
msgid "Programming in progress. Cannot be aborted."
msgstr "Probíhá programování. Nemohu přerušit."
-#: libgui/toplevel.cpp:908
+#: libgui/toplevel.cpp:943
#, fuzzy
msgid "Recompile First"
msgstr "Z&kompilovat soubor"
-#: libgui/toplevel.cpp:910
+#: libgui/toplevel.cpp:945
#, fuzzy
msgid ""
"The project hex file may not be up-to-date since some project files have "
@@ -4834,7 +4893,7 @@
"<qt>Hex soubor nemusí být aktuální, protože byly změněny některé projektové "
"soubory. Přesto pokračovat?</qt>"
-#: libgui/toplevel.cpp:942
+#: libgui/toplevel.cpp:977
#, fuzzy
msgid ""
"It is not possible to start a debugging session with an hex file not "
@@ -5156,21 +5215,6 @@
msgid "Hex filename(s)."
msgstr "Název hex souboru."
-#: piklab/main.cpp:14
-msgid "Optional filenames to be opened upon startup."
-msgstr "Názvy souborů, které mají být otevřeny po spuštění."
-
-#: piklab/main.cpp:20
-msgid "Piklab"
-msgstr "Piklab"
-
-#: piklab/main.cpp:21
-msgid ""
-"Graphical development environment for applications based on PIC and dsPIC "
-"microcontrollers."
-msgstr ""
-"Grafické vývojové prostředí pro aplikace s mikrokontroléry PIC a dsPIC."
-
#: piklab-prog/cli_prog_manager.cpp:23
msgid "Using port from configuration file."
msgstr "Používám port z konfiguračního souboru."
@@ -5658,11 +5702,11 @@
msgid "Programming..."
msgstr "Programování..."
-#: progs/base/generic_prog.cpp:30 progs/base/generic_prog.cpp:434
+#: progs/base/generic_prog.cpp:30 progs/base/generic_prog.cpp:438
msgid "Verifying..."
msgstr "Ověřuji..."
-#: progs/base/generic_prog.cpp:31 progs/base/generic_prog.cpp:341
+#: progs/base/generic_prog.cpp:31 progs/base/generic_prog.cpp:345
msgid "Erasing..."
msgstr "Mažu..."
@@ -5683,7 +5727,8 @@
msgstr "Připojuji..."
#: progs/base/generic_prog.cpp:124
-msgid " Set target self powered: %1"
+#, fuzzy
+msgid " Set target power: %1"
msgstr "Nastavit cílové zařízení s vlastním napájením: %1"
#: progs/base/generic_prog.cpp:131
@@ -5695,18 +5740,24 @@
msgstr "Mikrokontrolér není programován"
#: progs/base/generic_prog.cpp:163
-msgid "Firmware directory is not configured or does not exist."
+#, fuzzy
+msgid "Firmware directory is not configured."
+msgstr "Adresář s firmware není nastaven."
+
+#: progs/base/generic_prog.cpp:167
+#, fuzzy
+msgid "Firmware directory '%1' does not exist."
msgstr "Adresář s firmware není nastaven nebo neexistuje."
-#: progs/base/generic_prog.cpp:171
+#: progs/base/generic_prog.cpp:175
msgid "Programmer is in bootload mode."
msgstr "Programátor je v módu zavaděče."
-#: progs/base/generic_prog.cpp:173
+#: progs/base/generic_prog.cpp:177
msgid "Firmware version is %1"
msgstr "Verze firmware je %1"
-#: progs/base/generic_prog.cpp:177
+#: progs/base/generic_prog.cpp:181
#, fuzzy
msgid ""
"The firmware version (%1) is higher than the version tested with piklab "
@@ -5716,7 +5767,7 @@
"Verze firmware (%1) je vyšší než verze testovaná s Piklabem (%2).\n"
"Mohou nastat problémy."
-#: progs/base/generic_prog.cpp:183
+#: progs/base/generic_prog.cpp:187
#, fuzzy
msgid ""
"The firmware version (%1) is lower than the version tested with piklab "
@@ -5726,7 +5777,7 @@
"Verze firmware (%1) je nižší než verze testovaná s Piklabem (%2).\n"
"Mohou nastat problémy."
-#: progs/base/generic_prog.cpp:189
+#: progs/base/generic_prog.cpp:193
#, fuzzy
msgid ""
"The firmware version (%1) is lower than the recommended version (%2).\n"
@@ -5735,70 +5786,70 @@
"Verze firmware (%1) je nižší než doporučená verze (%2).\n"
"Doporučuji aktualizovat firmware."
-#: progs/base/generic_prog.cpp:205
+#: progs/base/generic_prog.cpp:209
msgid " %1 = %2 V: error in voltage level."
msgstr " %1 = %2 V:chybné napětí."
-#: progs/base/generic_prog.cpp:273 progs/manager/debug_manager.cpp:259
+#: progs/base/generic_prog.cpp:277 progs/manager/debug_manager.cpp:259
msgid "Running..."
msgstr "Běží..."
-#: progs/base/generic_prog.cpp:276
+#: progs/base/generic_prog.cpp:280
msgid "Run..."
msgstr "Spustit..."
-#: progs/base/generic_prog.cpp:284
+#: progs/base/generic_prog.cpp:288
#, fuzzy
msgid "Breaking..."
msgstr "Mažu..."
-#: progs/base/generic_prog.cpp:309 progs/icd2/base/icd2_debug_specific.cpp:31
+#: progs/base/generic_prog.cpp:313 progs/icd2/base/icd2_debug_specific.cpp:31
#: progs/icd2/base/icd2_prog.cpp:87 progs/pickit2/base/pickit_prog.cpp:34
msgid "Could not open firmware file \"%1\"."
msgstr "Nemohu otevřít firmware soubor \"%1\"."
-#: progs/base/generic_prog.cpp:321
+#: progs/base/generic_prog.cpp:325
#, fuzzy
msgid "Uploading firmware..."
msgstr "Nahrávám firmware pro PICkit2..."
-#: progs/base/generic_prog.cpp:343
+#: progs/base/generic_prog.cpp:347
msgid "Erasing done"
msgstr "Mazání hotovo"
-#: progs/base/generic_prog.cpp:346 progs/base/generic_prog.cpp:455
+#: progs/base/generic_prog.cpp:350 progs/base/generic_prog.cpp:459
msgid "Blank checking..."
msgstr "Kontrola vymazání..."
-#: progs/base/generic_prog.cpp:348
+#: progs/base/generic_prog.cpp:352
msgid "Blank checking done."
msgstr "Kontrola vymazání ukončena."
-#: progs/base/generic_prog.cpp:357
+#: progs/base/generic_prog.cpp:361
msgid "The selected programmer cannot read device memory."
msgstr "Zvolený programátor neumí načíst paměť mikrokontroléru."
-#: progs/base/generic_prog.cpp:378
+#: progs/base/generic_prog.cpp:382
msgid "Reading device memory..."
msgstr "Čtení paměti mikrokontroléru..."
-#: progs/base/generic_prog.cpp:381
+#: progs/base/generic_prog.cpp:385
msgid "Reading done."
msgstr "Čtení hotovo."
-#: progs/base/generic_prog.cpp:400 progs/icd2/base/icd2_debug.cpp:169
+#: progs/base/generic_prog.cpp:404 progs/icd2/base/icd2_debug.cpp:169
msgid "Programming device memory..."
msgstr "Programování paměti mikrokontroléru..."
-#: progs/base/generic_prog.cpp:402
+#: progs/base/generic_prog.cpp:406
msgid "Programming successful."
msgstr "Programování úspěšné."
-#: progs/base/generic_prog.cpp:436
+#: progs/base/generic_prog.cpp:440
msgid "Verifying successful."
msgstr "Úspěšně ověřeno."
-#: progs/base/generic_prog.cpp:457
+#: progs/base/generic_prog.cpp:461
msgid "Blank checking successful."
msgstr "Kontrola vymazání úspěšná."
@@ -5871,21 +5922,21 @@
msgid "Executing '%1' command..."
msgstr ""
-#: progs/custom/base/custom_prog.cpp:77
+#: progs/custom/base/custom_prog.cpp:77 tools/list/compile_process.cpp:225
msgid "*** Error executing command ***"
msgstr ""
-#: progs/custom/base/custom_prog.cpp:81 tools/list/compile_manager.cpp:46
-#: tools/list/compile_manager.cpp:75 tools/list/compile_manager.cpp:192
+#: progs/custom/base/custom_prog.cpp:81 tools/list/compile_manager.cpp:47
+#: tools/list/compile_manager.cpp:76 tools/list/compile_manager.cpp:193
msgid "*** Aborted ***"
msgstr "*** Přerušeno ***"
-#: progs/custom/base/custom_prog.cpp:86 tools/list/compile_manager.cpp:225
-#: tools/list/compile_manager.cpp:288
+#: progs/custom/base/custom_prog.cpp:86 tools/list/compile_manager.cpp:226
+#: tools/list/compile_manager.cpp:285
msgid "*** Success ***"
msgstr "*** Úspěch ***"
-#: progs/custom/base/custom_prog.cpp:88 tools/list/compile_process.cpp:225
+#: progs/custom/base/custom_prog.cpp:88 tools/list/compile_process.cpp:233
msgid "*** Exited with status: %1 ***"
msgstr "*** Ukončeno se zprávou: %1 ***"
@@ -6171,27 +6222,22 @@
msgid "Continuously send 0xA55A on \"Data out\" pin."
msgstr "Neustále posílat 0xA55A na \"Data out\" vývod."
-#: progs/gpsim/base/gpsim.cpp:104
+#: progs/gpsim/base/gpsim.cpp:110
#, fuzzy
-msgid "Failed to start \"gpsim\"."
-msgstr "Selhalo spouštění \"gpsim\""
-
-#: progs/gpsim/base/gpsim.cpp:113
-#, fuzzy
msgid "Timeout waiting for \"gpsim\"."
msgstr "Timeout při čekání na \"gpsim\""
-#: progs/gpsim/base/gpsim.cpp:117
+#: progs/gpsim/base/gpsim.cpp:114
#, fuzzy
msgid "\"gpsim\" unexpectedly exited."
msgstr "\"gpsim\" nečekaně skončil"
-#: progs/gpsim/base/gpsim.cpp:137
+#: progs/gpsim/base/gpsim.cpp:134
#, fuzzy
msgid "Error sending a signal to the subprocess."
msgstr "Chyba při posílání signálu pro podproces."
-#: progs/gpsim/base/gpsim.cpp:188
+#: progs/gpsim/base/gpsim.cpp:185
#, fuzzy
msgid "Could not recognize gpsim version."
msgstr "Nemohu určit verzi gpsim."
@@ -6409,55 +6455,55 @@
msgid "Advanced Dialog"
msgstr "Pokročilé"
-#: progs/gui/prog_group_ui.cpp:62
+#: progs/gui/prog_group_ui.cpp:63
msgid "Firmware"
msgstr "Firmware"
-#: progs/gui/prog_group_ui.cpp:65
+#: progs/gui/prog_group_ui.cpp:66
#, fuzzy
msgid "Uploading..."
msgstr "Nahrát..."
-#: progs/gui/prog_group_ui.cpp:77
+#: progs/gui/prog_group_ui.cpp:78
msgid "Voltages"
msgstr "Napětí"
-#: progs/gui/prog_group_ui.cpp:95
+#: progs/gui/prog_group_ui.cpp:96
msgid "Self-test"
msgstr "Autotest"
-#: progs/gui/prog_group_ui.cpp:108
+#: progs/gui/prog_group_ui.cpp:109
msgid "This device has no calibration information."
msgstr "Tento mikrokontrolér nemá žádné kalibrační hodnoty."
-#: progs/gui/prog_group_ui.cpp:109
+#: progs/gui/prog_group_ui.cpp:110
msgid "The selected device is not supported by this programmer."
msgstr "Zvolený mikrokontrolér není tímto programátorem podporován."
-#: progs/gui/prog_group_ui.cpp:129
+#: progs/gui/prog_group_ui.cpp:130
msgid "Could not connect programmer."
msgstr "Nemohu připojit programátor."
-#: progs/gui/prog_group_ui.cpp:150
+#: progs/gui/prog_group_ui.cpp:151
msgid "Open Firmware"
msgstr "Otevřít firmware"
-#: progs/gui/prog_group_ui.cpp:155
+#: progs/gui/prog_group_ui.cpp:156
msgid "Firmware uploaded successfully."
msgstr "Firmware nahrán úspěšně."
-#: progs/gui/prog_group_ui.cpp:156
+#: progs/gui/prog_group_ui.cpp:157
msgid "Error uploading firmware."
msgstr "Chyba při nahrávání firmware."
-#: progs/gui/prog_group_ui.cpp:183
+#: progs/gui/prog_group_ui.cpp:184
#, fuzzy
msgid ""
"Oscillator calibration regeneration is not available with the selected "
"programmer."
msgstr "Navrácení OSCCAL nemůže být provedeno zvoleným programátorem"
-#: progs/icd1/base/icd1.cpp:33 progs/icd2/base/icd2_serial.cpp:42
+#: progs/icd1/base/icd1.cpp:33 progs/icd2/base/icd2_serial.cpp:51
msgid "Failed to set port mode to '%1'."
msgstr "Selhalo nastavování portu do módu '%1'."
@@ -6530,11 +6576,17 @@
msgid "Bad checksum for received string"
msgstr "Špatný kontrolní součet přijatého řetězce"
-#: progs/icd2/base/icd2.cpp:343
+#: progs/icd2/base/icd2.cpp:280
+msgid ""
+"Set target power disabled because device does not support 5V supply (nomial "
+"vdd is %1V)."
+msgstr ""
+
+#: progs/icd2/base/icd2.cpp:350
msgid "Invalid begin or end character for read block."
msgstr "Neplatný počáteční nebo koncový znak čteného bloku."
-#: progs/icd2/base/icd2.cpp:361
+#: progs/icd2/base/icd2.cpp:368
msgid "Bad checksum for read block: %1 (%2 expected)."
msgstr "Špatný kontrolní součet při čtení bloku: %1 (očekáváno %2)."
@@ -6699,6 +6751,30 @@
msgid "ICD3 Programmer"
msgstr "ICD1 programátor"
+#: progs/list/device_info.cpp:20
+#, fuzzy
+msgid "Device Page"
+msgstr "Napájení mikrokontroléru"
+
+#: progs/list/device_info.cpp:32
+msgid "Datasheet"
+msgstr ""
+
+#: progs/list/device_info.cpp:33
+#, fuzzy
+msgid "Programming Specifications"
+msgstr "Programování kalibrace..."
+
+#: progs/list/device_info.cpp:34
+#, fuzzy
+msgid "Documents"
+msgstr "Parametry:"
+
+#: progs/list/device_info.cpp:50
+#, fuzzy
+msgid "Programmers"
+msgstr "Programátor"
+
#: progs/manager/debug_manager.cpp:91
msgid "Parsing COFF file: %1"
msgstr "Parsuji COFF soubor: %1"
@@ -6736,52 +6812,52 @@
msgid "Cannot start debugging session without input file (%1)."
msgstr "Nemohu spustit ladění bez vstupního souboru (%1)."
-#: progs/manager/prog_manager.cpp:62
+#: progs/manager/prog_manager.cpp:55
msgid "You need to specify the device for programming."
msgstr "Pro programování musíte zvolit mikrokontrolér."
-#: progs/manager/prog_manager.cpp:66
+#: progs/manager/prog_manager.cpp:59
#, fuzzy
msgid "You need to specify the programmer."
msgstr "Musíte zvolit rozsah"
-#: progs/manager/prog_manager.cpp:72
+#: progs/manager/prog_manager.cpp:65
msgid "The current programmer \"%1\" does not support device \"%2\"."
msgstr "Zvolený programátor \"%1\" nepodporuje mikrokontrolér \"%2\"."
-#: progs/manager/prog_manager.cpp:145
+#: progs/manager/prog_manager.cpp:138
#, fuzzy
msgid "Cannot toggle target power since target is self-powered."
msgstr "Znamená, že zařízení má vlastní napájení."
-#: progs/manager/prog_manager.cpp:147
+#: progs/manager/prog_manager.cpp:140
msgid "Toggle Device Power..."
msgstr "Přepnout napájení mikrokontroléru..."
-#: progs/manager/prog_manager.cpp:148
+#: progs/manager/prog_manager.cpp:141
#, fuzzy
msgid "Power device up"
msgstr "Neznámý mikrokontrolér"
-#: progs/manager/prog_manager.cpp:148
+#: progs/manager/prog_manager.cpp:141
msgid "Power device down"
msgstr ""
-#: progs/manager/prog_manager.cpp:158
+#: progs/manager/prog_manager.cpp:151
msgid "Disconnecting..."
msgstr "Odpojuji..."
-#: progs/manager/prog_manager.cpp:165 progs/manager/prog_manager.cpp:187
+#: progs/manager/prog_manager.cpp:157 progs/manager/prog_manager.cpp:182
#, fuzzy
msgid "Stopped."
msgstr "Zastaveno"
-#: progs/manager/prog_manager.cpp:201
+#: progs/manager/prog_manager.cpp:196
#, fuzzy
msgid "Resetting..."
msgstr "Restartovat..."
-#: progs/manager/prog_manager.cpp:205
+#: progs/manager/prog_manager.cpp:200
#, fuzzy
msgid "Restarting..."
msgstr "Restartovat..."
@@ -6934,6 +7010,84 @@
msgid "PICkit2 Firmware 2.x"
msgstr "PICkit2 Firmware 2.x"
+#: progs/pickit3/base/pickit3.cpp:114 progs/pickit3/base/pickit3.cpp:147
+#, fuzzy
+msgid "Wrong return command \"%1\" (was expecting \"%2\")"
+msgstr "Špatná návratová hodnota (\"%1\"; očekáváno \"%2\")"
+
+#: progs/pickit3/base/pickit3.cpp:139
+msgid "Command \"%1\" failed (%2)"
+msgstr ""
+
+#: progs/pickit3/base/pickit3.cpp:257
+#, fuzzy
+msgid "Wrong size \"%1\" (was expecting \"%2\")"
+msgstr "Špatná návratová hodnota (\"%1\"; očekáváno \"%2\")"
+
+#: progs/pickit3/base/pickit3.cpp:262
+#, fuzzy
+msgid "Wrong status \"%1\" (was expecting \"%2\")"
+msgstr "Špatná návratová hodnota (\"%1\"; očekáváno \"%2\")"
+
+#: progs/pickit3/base/pickit3_prog.cpp:60
+#, fuzzy
+msgid " Incorrect AP loaded."
+msgstr "Nahrán nesprávný firmware."
+
+#: progs/pickit3/base/pickit3_prog.cpp:68
+#, fuzzy
+msgid "Could not find AP file \"%1\" in directory \"%2\"."
+msgstr "Nemohu najít soubor s firmwarem \"%1\" v adresáři \"%2\"."
+
+#: progs/pickit3/base/pickit3_prog.cpp:78
+#, fuzzy
+msgid "Could not open AP file \"%1\"."
+msgstr "Nemohu otevřít ne název soubor \"%1\""
+
+#: progs/pickit3/base/pickit3_prog.cpp:86
+#, fuzzy
+msgid "Could not read AP hex file \"%1\": %2."
+msgstr "Nemohu načíst hex soubor s firmware \"%1\": (%2)."
+
+#: progs/pickit3/base/pickit3_prog.cpp:90
+#, fuzzy
+msgid "AP hex file seems incompatible with device 24FJ256GB106 inside Pickit3."
+msgstr ""
+"Hex soubor s firmware není kompatibilní s mikrokontrolérem 18F2550 v PICkit2."
+
+#: progs/pickit3/base/pickit3_prog.cpp:94
+#, fuzzy
+msgid "Failed to upload AP."
+msgstr "Selhalo nahrávání firmware."
+
+#: progs/pickit3/base/pickit3_prog.cpp:101
+#, fuzzy
+msgid "AP still incorrect after uploading."
+msgstr "Firmware i po nahrání stále nesprávný."
+
+#: progs/pickit3/base/pickit3_prog.cpp:104
+#, fuzzy
+msgid " AP succesfully uploaded."
+msgstr "Firmware úspěšně nahrán."
+
+#: progs/pickit3/base/pickit3_prog.h:64
+msgid "Pickit3"
+msgstr ""
+
+#: progs/pickit3/gui/pickit3_group_ui.cpp:21
+#, fuzzy
+msgid "OS Version:"
+msgstr "Verze:"
+
+#: progs/pickit3/gui/pickit3_group_ui.cpp:27
+#, fuzzy
+msgid "AP Version:"
+msgstr "Verze:"
+
+#: progs/pickit3/gui/pickit3_group_ui.cpp:33
+msgid "AP Id:"
+msgstr ""
+
#: progs/psp/base/psp.cpp:173
msgid "Wrong programmer connected"
msgstr "Připojen jiný programátor"
@@ -7172,7 +7326,8 @@
#: tools/boost/boost_generator.cpp:52 tools/boost/boost_generator.cpp:76
#: tools/gputils/gputils_generator.cpp:52 tools/jal/jal_generator.cpp:31
-#: tools/pic30/pic30_generator.cpp:79 tools/sdcc/sdcc_generator.cpp:118
+#: tools/jalv2/jalv2_generator.cpp:30 tools/pic30/pic30_generator.cpp:79
+#: tools/sdcc/sdcc_generator.cpp:118
msgid "insert code"
msgstr "vložit kód"
@@ -7180,7 +7335,7 @@
#: tools/gputils/gputils_generator.cpp:125
#: tools/gputils/gputils_generator.cpp:180
#: tools/gputils/gputils_generator.cpp:248 tools/jal/jal_generator.cpp:32
-#: tools/pic30/pic30_generator.cpp:82
+#: tools/jalv2/jalv2_generator.cpp:31 tools/pic30/pic30_generator.cpp:82
msgid "loop forever"
msgstr "opakuj navždy"
@@ -7481,53 +7636,45 @@
msgid "\"%1\" not recognized"
msgstr "\"%1\" nerozpoznáno"
-#: tools/gui/toolchain_config_widget.cpp:224
-msgid "\"%1\" not found"
-msgstr "\"%1\" nenalezeno"
-
-#: tools/gui/toolchain_config_widget.cpp:225
+#: tools/gui/toolchain_config_widget.cpp:229
msgid "Detecting \"%1\"..."
msgstr "Rozpoznávám \"%1\"..."
-#: tools/gui/toolchain_config_widget.cpp:231
+#: tools/gui/toolchain_config_widget.cpp:235
msgid "Hardcoded (%1)"
msgstr "Napevno zapsáno (%1)"
-#: tools/gui/toolchain_config_widget.cpp:241
-msgid "Failed"
-msgstr "Selhalo"
-
-#: tools/gui/toolchain_config_widget.cpp:242
+#: tools/gui/toolchain_config_widget.cpp:247
msgid "Detecting ..."
msgstr "Rozpoznávám..."
-#: tools/gui/toolchain_config_widget.cpp:261
+#: tools/gui/toolchain_config_widget.cpp:266
msgid "<qt><b>Command for executable detection:</b><br>%1<br>"
msgstr "<qt><b>Příkaz pro zjištění spustitelnosti:</b><br>%1<br>"
-#: tools/gui/toolchain_config_widget.cpp:262
+#: tools/gui/toolchain_config_widget.cpp:267
msgid "<b>Version string:</b><br>%1<br></qt>"
msgstr "<b>Verze:</b><br>%1<br></qt>"
-#: tools/gui/toolchain_config_widget.cpp:263
+#: tools/gui/toolchain_config_widget.cpp:268
msgid "This tool cannot be automatically detected."
msgstr "Tento nástroj nemůže být automaticky zjištěn."
-#: tools/gui/toolchain_config_widget.cpp:289
+#: tools/gui/toolchain_config_widget.cpp:294
#, fuzzy
msgid "<b>Command for devices detection:</b><br>%1<br>"
msgstr "<qt><b>Příkaz pro zjištění mikrokontroléru:</b><br>%1<br>"
-#: tools/gui/toolchain_config_widget.cpp:290
+#: tools/gui/toolchain_config_widget.cpp:295
#, fuzzy
msgid "<b>Command #%1 for devices detection:</b><br>%2<br>"
msgstr "<qt><b>Příkaz #%1 pro zjištění mikrokontroléru:</b><br>%2<br>"
-#: tools/gui/toolchain_config_widget.cpp:292
+#: tools/gui/toolchain_config_widget.cpp:297
msgid "<b>Device string:</b><br>%1<br>"
msgstr "<b>Mikrokontrolér:</b><br>%1<br>"
-#: tools/gui/toolchain_config_widget.cpp:293
+#: tools/gui/toolchain_config_widget.cpp:298
msgid "<b>Device string #%1:</b><br>%2<br>"
msgstr "<b>Mikrokontrolér #%1:</b><br>%2<br>"
@@ -7576,7 +7723,7 @@
msgid "jal standard library"
msgstr "standardní knihovna jal"
-#: tools/jal/jal_generator.cpp:30
+#: tools/jal/jal_generator.cpp:30 tools/jalv2/jalv2_generator.cpp:29
msgid "main code"
msgstr "hlavní kód"
@@ -7593,7 +7740,7 @@
msgid "JAL V2"
msgstr "JAL V2"
-#: tools/list/compile_manager.cpp:44
+#: tools/list/compile_manager.cpp:45
msgid ""
"The selected toolchain (%1) cannot compile file. It only supports files with "
"extensions: %2"
@@ -7601,7 +7748,7 @@
"Zvolená sada nástrojů (%1) neumí zkompilovat soubor. Podporuje pouze soubory "
"s příponami: %2"
-#: tools/list/compile_manager.cpp:73
+#: tools/list/compile_manager....
[truncated message content] |
|
From: <az...@us...> - 2012-10-14 23:10:09
|
Revision: 2965
http://piklab.svn.sourceforge.net/piklab/?rev=2965&view=rev
Author: azhyd
Date: 2012-10-14 23:09:59 +0000 (Sun, 14 Oct 2012)
Log Message:
-----------
add libc18f to sdcc link + clean all files generated by sdcc + add regression testing for compile/clean project
Modified Paths:
--------------
trunk/piklab_kde4/Changelog
trunk/piklab_kde4/src/libgui/console.cpp
trunk/piklab_kde4/src/libgui/main_global.cpp
trunk/piklab_kde4/src/libgui/main_global.h
trunk/piklab_kde4/src/libgui/toplevel.cpp
trunk/piklab_kde4/src/libgui/toplevel.h
trunk/piklab_kde4/src/piklab/main.cpp
trunk/piklab_kde4/src/piklab-test/CMakeLists.txt
trunk/piklab_kde4/src/tools/list/compile_process.cpp
trunk/piklab_kde4/src/tools/sdcc/sdcc_compile.cpp
Added Paths:
-----------
trunk/piklab_kde4/src/piklab-test/gui/
trunk/piklab_kde4/src/piklab-test/gui/CMakeLists.txt
trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp
trunk/piklab_kde4/src/piklab-test/gui/build_check.h
trunk/piklab_kde4/src/piklab-test/gui/gui_check.cpp
trunk/piklab_kde4/src/piklab-test/gui/gui_check.h
trunk/piklab_kde4/test/gputils/blinker_18/
trunk/piklab_kde4/test/gputils/blinker_18/blinker_18.asm
trunk/piklab_kde4/test/gputils/blinker_18/blinker_18.piklab
trunk/piklab_kde4/test/gputils/blinker_lib/
trunk/piklab_kde4/test/gputils/blinker_lib/blinker.asm
trunk/piklab_kde4/test/gputils/blinker_lib/blinker_lib.piklab
trunk/piklab_kde4/test/gputils/project/project.piklab
trunk/piklab_kde4/test/gputils/project/project.pikprj
trunk/piklab_kde4/test/sdcc/blinker/
trunk/piklab_kde4/test/sdcc/blinker/blinker.c
trunk/piklab_kde4/test/sdcc/blinker/blinker.h
trunk/piklab_kde4/test/sdcc/blinker/blinker.piklab
trunk/piklab_kde4/test/sdcc/blinker/sub/
trunk/piklab_kde4/test/sdcc/blinker/sub/add.c
trunk/piklab_kde4/test/sdcc/blinker_lib/
trunk/piklab_kde4/test/sdcc/blinker_lib/add.c
trunk/piklab_kde4/test/sdcc/blinker_lib/blinker.c
trunk/piklab_kde4/test/sdcc/blinker_lib/blinker_lib.piklab
trunk/piklab_kde4/test/sdcc/standalone/
trunk/piklab_kde4/test/sdcc/standalone/standalone_blinker.c
trunk/piklab_kde4/test/sdcc/test18/
trunk/piklab_kde4/test/sdcc/test18/test18.c
trunk/piklab_kde4/test/sdcc/test18/test18.piklab
trunk/piklab_kde4/test/sdcc/usart/
trunk/piklab_kde4/test/sdcc/usart/usart.piklab
trunk/piklab_kde4/test/sdcc/usart/usart_test.c
trunk/piklab_kde4/test/sdcc/usart_lib/
trunk/piklab_kde4/test/sdcc/usart_lib/usart_lib.piklab
trunk/piklab_kde4/test/sdcc/usart_lib/usart_test.c
Removed Paths:
-------------
trunk/piklab_kde4/test/gputils/blinker/blinker_lib.piklab
trunk/piklab_kde4/test/gputils/blinker_18/blinker_18.asm
trunk/piklab_kde4/test/gputils/blinker_18/blinker_18.piklab
trunk/piklab_kde4/test/gputils/project/test_project.piklab
trunk/piklab_kde4/test/gputils/project/test_project.pikprj
trunk/piklab_kde4/test/sdcc/.cvsignore
trunk/piklab_kde4/test/sdcc/add_sdcc250.c
trunk/piklab_kde4/test/sdcc/blink.piklab
trunk/piklab_kde4/test/sdcc/blink_lib.piklab
trunk/piklab_kde4/test/sdcc/blinker.c
trunk/piklab_kde4/test/sdcc/blinker.h
trunk/piklab_kde4/test/sdcc/blinker.piklab
trunk/piklab_kde4/test/sdcc/blinker_sdcc250.c
trunk/piklab_kde4/test/sdcc/blinker_sdcc250.piklab
trunk/piklab_kde4/test/sdcc/sdcc250_16f783.lkr
trunk/piklab_kde4/test/sdcc/sdcc250_pic16f873.h
trunk/piklab_kde4/test/sdcc/standalone_blinker.c
trunk/piklab_kde4/test/sdcc/test18/test18.c
trunk/piklab_kde4/test/sdcc/test18/test18.piklab
trunk/piklab_kde4/test/sdcc/test18/usart_test.c
trunk/piklab_kde4/test/sdcc/test18/usart_test.piklab
trunk/piklab_kde4/test/sdcc/test18/usart_test_lib.piklab
Modified: trunk/piklab_kde4/Changelog
===================================================================
--- trunk/piklab_kde4/Changelog 2012-10-07 17:39:02 UTC (rev 2964)
+++ trunk/piklab_kde4/Changelog 2012-10-14 23:09:59 UTC (rev 2965)
@@ -1,4 +1,4 @@
-0.16.2 (6 October 2012)
+0.16.2 (14 October 2012)
* fixed toolchain output when executable cannot be found
* fixed parsing for jalv2
* fixed template generator for jalv2
@@ -15,12 +15,14 @@
* fixed log views to read properly setting [reported by Luis Claudio Gambôa Lopes]
* added support for 24FJXXXGB1XX
* support firmware directory with space [reported by Luis Claudio Gambôa Lopes]
-* add libraries libm and libio by default sdcc linker arguments [requested by Antonio Augusto Todo Bom Neto]
+* add libraries libm, libio, and libc by default sdcc linker arguments [requested by Antonio Augusto Todo Bom Neto]
* fixed config generator text field to expand properly [report by Alain Portal]
* fixed warning when external tool not found
* fixed running kfind from project context menu
* fixed %I argument for custom tool [reported by Marc Berlioux]
* fixed link for source files outside project directory [patch by Marcelo Roberto Jimenez]
+* clean all files generated by sdcc [reported by Alain Portal]
+* add regression testing for compile/clean project
0.16.1 (1 July 2012)
* fixed command-line utilities compilation with Qt only
Modified: trunk/piklab_kde4/src/libgui/console.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/console.cpp 2012-10-07 17:39:02 UTC (rev 2964)
+++ trunk/piklab_kde4/src/libgui/console.cpp 2012-10-14 23:09:59 UTC (rev 2965)
@@ -13,6 +13,7 @@
#include <qdir.h>
#include <klibloader.h>
#include <kparts/part.h>
+#include <kservice.h>
#include <kde_terminal_interface.h>
#include "common/common/misc.h"
@@ -27,17 +28,16 @@
{
if ( !_initialized ) {
_initialized = true;
- KPluginLoader loader("libkonsolepart");
- KPluginFactory *factory = loader.factory();
+
QVBoxLayout *top = new QVBoxLayout(this, 0, 10);
- if (factory == NULL) {
+ KService::Ptr service = KService::serviceByDesktopName("konsolepart");
+ if (!service) {
QLabel *label = new QLabel(i18n("Could not find \"konsolepart\"; please install konsole."), this);
label->show();
top->addWidget(label);
return;
}
-
- KParts::Part* part = factory->create<KParts::Part>(this);
+ KParts::ReadOnlyPart* part = service->createInstance<KParts::ReadOnlyPart>(this, this, QVariantList());
ASSERT(part != NULL);
QWidget* widget = part->widget();
ASSERT(widget != NULL);
@@ -45,10 +45,6 @@
top->addWidget(widget);
setFocusProxy(widget);
- TerminalInterface* terminal = qobject_cast<TerminalInterface*>(part);
- ASSERT(terminal != NULL);
- terminal->showShellInDir(QDir::home().path());
-
QWidget::showEvent(e);
}
}
Modified: trunk/piklab_kde4/src/libgui/main_global.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/main_global.cpp 2012-10-07 17:39:02 UTC (rev 2964)
+++ trunk/piklab_kde4/src/libgui/main_global.cpp 2012-10-14 23:09:59 UTC (rev 2965)
@@ -20,6 +20,13 @@
#include "gui_prog_manager.h"
#include "device_editor.h"
+//----------------------------------------------------------------------------
+const Piklab::CmdLineOption OPTIONS[] = {
+ { "+[file]", I18N_NOOP("Optional filenames to be opened upon startup."), NULL },
+ { NULL, NULL, NULL}
+};
+
+//----------------------------------------------------------------------------
Main::State Main::_state = Main::Idle;
EditorManager* Main::_editorManager = NULL;
ProjectManager::View* Main::_projectManager = NULL;
@@ -29,6 +36,7 @@
Compile::Manager* Main::_compileManager = NULL;
ConsoleView* Main::_consoleView = NULL;
+//----------------------------------------------------------------------------
void Main::setState(State state)
{
_state = state;
@@ -84,3 +92,15 @@
{
return Compile::Config::toolGroup(project());
}
+
+void Main::setupApplication(int argc, char** argv)
+{
+ Piklab::AboutData about("piklab", I18N_NOOP("Piklab"),
+ I18N_NOOP( "Graphical development environment for applications based on PIC and dsPIC microcontrollers."));
+ Piklab::OptionList options(OPTIONS);
+ Piklab::initArgs(about, argc, argv, options);
+ const bool gui = true;
+ Piklab::createApplication(about.appName(), argc, argv, gui, NULL);
+ if (kapp->isSessionRestored() && KMainWindow::canBeRestored(1)) MainWindow::self().restore(1);
+ else MainWindow::self().show();
+}
Modified: trunk/piklab_kde4/src/libgui/main_global.h
===================================================================
--- trunk/piklab_kde4/src/libgui/main_global.h 2012-10-07 17:39:02 UTC (rev 2964)
+++ trunk/piklab_kde4/src/libgui/main_global.h 2012-10-14 23:09:59 UTC (rev 2965)
@@ -14,6 +14,7 @@
#include "common/gui/misc_gui.h"
#include "progs/base/generic_prog.h"
+//----------------------------------------------------------------------------
class EditorManager;
namespace ProjectManager { class View; }
class Editor;
@@ -26,6 +27,7 @@
namespace Tool { class Group; }
class ConsoleView;
+//----------------------------------------------------------------------------
class Main
{
public:
@@ -49,6 +51,8 @@
static Compile::LogWidget& compileLog() { return *_compileLog; }
static const Tool::Group& toolGroup();
+ static void setupApplication(int argc, char** argv);
+
private:
static State _state;
static EditorManager *_editorManager;
Modified: trunk/piklab_kde4/src/libgui/toplevel.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/toplevel.cpp 2012-10-07 17:39:02 UTC (rev 2964)
+++ trunk/piklab_kde4/src/libgui/toplevel.cpp 2012-10-14 23:09:59 UTC (rev 2965)
@@ -549,14 +549,18 @@
filter += "\n*|" + i18n("All Files");
PURL::Url url = PURL::getOpenUrl("kfiledialog:///open_file", filter, this ,i18n("Open File"));
if ( url.fileType()==PURL::Project || url.fileType()==PURL::PikdevProject ) {
- stopOperations();
- if ( !Main::_projectManager->openProject(url) ) return false;
- updateGUI();
- return true;
+ return openProject(url);
}
return Main::_editorManager->openFile(url);
}
+bool MainWindow::openProject(const PURL::Url& url)
+{
+ stopOperations();
+ if ( !Main::_projectManager->openProject(url) ) return false;
+ updateGUI();
+ return true;
+}
void MainWindow::updateGUI()
{
static bool updating = false;
Modified: trunk/piklab_kde4/src/libgui/toplevel.h
===================================================================
--- trunk/piklab_kde4/src/libgui/toplevel.h 2012-10-07 17:39:02 UTC (rev 2964)
+++ trunk/piklab_kde4/src/libgui/toplevel.h 2012-10-14 23:09:59 UTC (rev 2965)
@@ -57,6 +57,9 @@
void selectTool(const Tool::Group &group);
void selectProgrammer(const Programmer::Group &group);
+ bool openProject(const PURL::Url& url);
+ void closeProject();
+
private slots:
void newHexFile();
bool openFile();
@@ -90,7 +93,6 @@
void runKfind();
void openRecentProject(const KUrl &url);
- void closeProject();
void initialLoading();
Modified: trunk/piklab_kde4/src/piklab/main.cpp
===================================================================
--- trunk/piklab_kde4/src/piklab/main.cpp 2012-10-07 17:39:02 UTC (rev 2964)
+++ trunk/piklab_kde4/src/piklab/main.cpp 2012-10-14 23:09:59 UTC (rev 2965)
@@ -7,23 +7,11 @@
* (at your option) any later version. *
***************************************************************************/
-#include "libgui/toplevel.h"
+#include "libgui/main_global.h"
#include "common/global/about.h"
-const Piklab::CmdLineOption OPTIONS[] = {
- { "+[file]", I18N_NOOP("Optional filenames to be opened upon startup."), NULL },
- { NULL, NULL, NULL}
-};
-
int main(int argc, char **argv)
{
- Piklab::AboutData about("piklab", I18N_NOOP("Piklab"),
- I18N_NOOP( "Graphical development environment for applications based on PIC and dsPIC microcontrollers."));
- Piklab::OptionList options(OPTIONS);
- Piklab::initArgs(about, argc, argv, options);
- const bool gui = true;
- Piklab::createApplication(about.appName(), argc, argv, gui, NULL);
- if ( kapp->isSessionRestored() && KMainWindow::canBeRestored(1) ) MainWindow::self().restore(1);
- else MainWindow::self().show();
+ Main::setupApplication(argc, argv);
return kapp->exec();
}
Modified: trunk/piklab_kde4/src/piklab-test/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/piklab-test/CMakeLists.txt 2012-10-07 17:39:02 UTC (rev 2964)
+++ trunk/piklab_kde4/src/piklab-test/CMakeLists.txt 2012-10-14 23:09:59 UTC (rev 2965)
@@ -5,4 +5,5 @@
if(NOT QT_ONLY)
add_subdirectory(generators)
+ add_subdirectory(gui)
endif(NOT QT_ONLY)
\ No newline at end of file
Added: trunk/piklab_kde4/src/piklab-test/gui/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/piklab-test/gui/CMakeLists.txt (rev 0)
+++ trunk/piklab_kde4/src/piklab-test/gui/CMakeLists.txt 2012-10-14 23:09:59 UTC (rev 2965)
@@ -0,0 +1,29 @@
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+SET(build_check_SRCS
+ gui_check.cpp
+ build_check.cpp
+)
+automoc(${build_check_SRCS})
+add_executable(build_check ${build_check_SRCS})
+target_link_libraries(build_check
+ gui toollist
+ cc5xui boostui mpcui ccscui c18ui jalv2ui
+ jalui pic30ui piccui sdccui gputilsui
+ customtool cc5x boost mpc ccsc c18 jalv2 jal pic30 picc sdcc gputils
+ toolui toolbase
+ proglistui customprogui
+ picdembootloaderui pickit2bootloaderui tblbootloaderui
+ bootloaderui gpsimui pspui pickit1ui
+ pickit3ui pickit2v2ui pickit2ui icd1ui icd2ui directui progui
+ customprog
+ picdembootloader pickit2bootloader tblbootloader
+ bootloader gpsim psp pickit1
+ pickit3 pickit3data pickit2v2 pickit2 icd1 icd2 icd2data directprog
+ mem24prog picprog progmanager progbase
+ coff port global
+ devicelistui mem24ui picui deviceui commonui
+ pic picbase picxml mem24 mem24base mem24xml
+ devicebase common
+ ${GUI_LIBS}
+)
Added: trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp
===================================================================
--- trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp (rev 0)
+++ trunk/piklab_kde4/src/piklab-test/gui/build_check.cpp 2012-10-14 23:09:59 UTC (rev 2965)
@@ -0,0 +1,161 @@
+/***************************************************************************
+ * Copyright (C) 2012 Nicolas Hadacek <ha...@kd...> *
+ * *
+ * 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. *
+ ***************************************************************************/
+
+#include <iostream>
+
+#include "build_check.h"
+#include "build_check.moc"
+#include "libgui/toplevel.h"
+#include "libgui/editor_manager.h"
+
+//----------------------------------------------------------------------------
+BuildCheckData DATA[] = {
+ { "gputils", "blinker", PURL::Project, { "blinker.asm", NULL }, { NULL }, { "o", "lst", NULL }, { "cof", "cof", "map", "hex", NULL } },
+ { "gputils", "blinker_18", PURL::Project, { "blinker_18.asm", NULL }, { NULL }, { "o", "lst", NULL }, { "cof", "cof", "map", "hex", NULL } },
+ { "gputils", "blinker_lib", PURL::Project, { "blinker.asm", NULL }, { NULL }, { "o", "lst", NULL }, { "lib", NULL } },
+ { "gputils", "project", PURL::Project, { "test.asm", "test2.asm", NULL }, { "test.inc", "test.lib", NULL }, { "o", "lst", NULL }, { "cof", "cof", "map", "hex", NULL } },
+ { "gputils", "project", PURL::PikdevProject, { "test.asm", "test2.asm", NULL }, { "test.inc", "test.lib", NULL }, { "o", "lst", NULL }, { "cof", "cof", "map", "hex", NULL } },
+ { "sdcc", "blinker", PURL::Project, { "blinker.c", "sub/add.c", NULL }, { "blinker.h", NULL }, { "o", "lst", "asm", "adb", "p", NULL }, { "cof", "cof", "map", "hex", NULL } },
+ { "sdcc", "blinker_lib", PURL::Project, { "blinker.c", "add.c", NULL }, { NULL }, { "o", "lst", "asm", "adb", "p", NULL }, { "lib", NULL } },
+ { "sdcc", "test18", PURL::Project, { "test18.c", NULL }, { NULL }, { "o", "lst", "asm", "adb", NULL }, { "cof", "cof", "map", "hex", NULL } },
+ { "sdcc", "usart", PURL::Project, { "usart_test.c", NULL }, { NULL }, { "o", "lst", "asm", "adb", NULL }, { "cof", "cof", "map", "hex", NULL } },
+ { "sdcc", "usart_lib", PURL::Project, { "usart_test.c", NULL }, { NULL }, { "o", "lst", "asm", "adb", NULL }, { "lib", NULL } },
+
+ { NULL, NULL, PURL::Nb_FileTypes, { NULL }, { NULL }, { NULL }, { NULL } }
+};
+
+//----------------------------------------------------------------------------
+bool BuildCheck::init(uint index)
+{
+ if (DATA[index].dir == NULL) {
+ return false;
+ }
+ _dir = DATA[index].dir;
+ _project = DATA[index].project;
+ _projType = DATA[index].projType;
+ _sources.clear();
+ for (uint i = 0; DATA[index].sources[i] != NULL; ++i) {
+ _sources.append(DATA[index].sources[i]);
+ }
+ _incFiles.clear();
+ for (uint i = 0; DATA[index].incFiles[i] != NULL; ++i) {
+ _incFiles.append(DATA[index].incFiles[i]);
+ }
+ _objExtensions.clear();
+ for (uint i = 0; DATA[index].objExtensions[i] != NULL; ++i) {
+ _objExtensions.append(DATA[index].objExtensions[i]);
+ }
+ _extensions.clear();
+ for (uint i = 0; DATA[index].extensions[i] != NULL; ++i) {
+ _extensions.append(DATA[index].extensions[i]);
+ }
+ return true;
+}
+
+PURL::Directory BuildCheck::testDir() const
+{
+ return PURL::currentDirectory().down("../../../../test/" + _dir + "/" + _project);
+}
+
+PURL::Url BuildCheck::getUrl(const QString& filename) const
+{
+ return PURL::Url(testDir(), filename);
+}
+
+void BuildCheck::checkFilesExist(bool exists) const
+{
+ for (QStringList::const_iterator it = _sources.begin(); it != _sources.end(); ++it) {
+ for (QStringList::const_iterator it2 = _objExtensions.begin(); it2 != _objExtensions.end(); ++it2) {
+ if (!exists) {
+ PURL::Url url = PURL::Url(testDir(), *it).toExtension(*it2);
+ QVERIFY2(url.exists() == exists, url.pretty().latin1());
+ }
+ QString filename = PURL::Url(PURL::Directory(), *it).filename();
+ PURL::Url url = PURL::Url(testDir(), filename).toExtension(*it2);
+ QVERIFY2(url.exists() == exists, url.pretty().latin1());
+ }
+ }
+ for (QStringList::const_iterator it = _incFiles.begin(); it != _incFiles.end(); ++it) {
+ PURL::Url url = PURL::Url(testDir(), *it);
+ QVERIFY2(url.exists(), url.pretty().latin1());
+ }
+ for (QStringList::const_iterator it = _extensions.begin(); it != _extensions.end(); ++it) {
+ PURL::Url url = getUrl(_project).toExtension(*it);
+ QVERIFY2(url.exists() == exists, url.pretty().latin1());
+ }
+}
+
+void BuildCheck::test1()
+{
+ std::cout << "TESTING: " << _dir.latin1() << "/" << _project.latin1()
+ << "/" << _project.latin1() << "." << _projType.data().extensions[0] << std::endl;
+ MainWindow::self().closeProject();
+}
+
+void BuildCheck::test2()
+{
+ QVERIFY(Main::project() == NULL);
+ Main::editorManager().closeAllEditors();
+}
+
+void BuildCheck::test3()
+{
+ QVERIFY(Main::editorManager().currentEditor() == NULL);
+ QVERIFY(testDir().exists());
+ PURL::Url url = getUrl(_project).toFileType(_projType);
+ QVERIFY(url.exists());
+ QVERIFY(MainWindow::self().openProject(url));
+}
+
+void BuildCheck::test4()
+{
+ QVERIFY(Main::project() != NULL);
+ Main::editorManager().closeAllEditors();
+}
+
+void BuildCheck::test5()
+{
+ QVERIFY(Main::editorManager().currentEditor() == NULL);
+ QVERIFY(_sources.size() > 0);
+ QVERIFY(Main::editorManager().openFile(getUrl(*_sources.begin())));
+}
+
+void BuildCheck::test6()
+{
+ QVERIFY(Main::editorManager().currentEditor() != NULL);
+ QVERIFY(Main::editorManager().nbEditors() == 1);
+ MainWindow::self().cleanBuild();
+}
+
+void BuildCheck::test7()
+{
+ checkFilesExist(false);
+ MainWindow::self().buildProject();
+}
+
+void BuildCheck::test8()
+{
+ checkFilesExist(true);
+ MainWindow::self().cleanBuild();
+}
+
+void BuildCheck::test9()
+{
+ checkFilesExist(false);
+}
+
+//----------------------------------------------------------------------------
+void BuildCheckProxy::start()
+{
+ BuildCheck check;
+ run(check);
+}
+
+//----------------------------------------------------------------------------
+QTEST_APPLESS_MAIN(BuildCheckProxy);
Added: trunk/piklab_kde4/src/piklab-test/gui/build_check.h
===================================================================
--- trunk/piklab_kde4/src/piklab-test/gui/build_check.h (rev 0)
+++ trunk/piklab_kde4/src/piklab-test/gui/build_check.h 2012-10-14 23:09:59 UTC (rev 2965)
@@ -0,0 +1,65 @@
+/***************************************************************************
+ * Copyright (C) 2012 Nicolas Hadacek <ha...@kd...> *
+ * *
+ * 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. *
+ ***************************************************************************/
+#ifndef BUILD_CHECK_H
+#define BUILD_CHECK_H
+
+#include "gui_check.h"
+#include "common/global/purl.h"
+
+//----------------------------------------------------------------------------
+struct BuildCheckData {
+ const char* dir;
+ const char* project;
+ PURL::FileType projType;
+ const char* sources[3];
+ const char* incFiles[3];
+ const char* objExtensions[6];
+ const char* extensions[5];
+};
+
+class BuildCheck : public GuiCheck
+{
+ Q_OBJECT
+
+ private slots:
+ void test1();
+ void test2();
+ void test3();
+ void test4();
+ void test5();
+ void test6();
+ void test7();
+ void test8();
+ void test9();
+
+ private:
+ QString _dir;
+ QString _project;
+ PURL::FileType _projType;
+ QStringList _sources;
+ QStringList _incFiles;
+ QStringList _objExtensions;
+ QStringList _extensions;
+
+ PURL::Directory testDir() const;
+ PURL::Url getUrl(const QString& filename) const;
+ void checkFilesExist(bool exists) const;
+ virtual bool init(uint index);
+};
+
+//----------------------------------------------------------------------------
+class BuildCheckProxy : public GuiCheckProxy
+{
+ Q_OBJECT
+
+ private slots:
+ void start();
+};
+
+#endif
Added: trunk/piklab_kde4/src/piklab-test/gui/gui_check.cpp
===================================================================
--- trunk/piklab_kde4/src/piklab-test/gui/gui_check.cpp (rev 0)
+++ trunk/piklab_kde4/src/piklab-test/gui/gui_check.cpp 2012-10-14 23:09:59 UTC (rev 2965)
@@ -0,0 +1,55 @@
+/***************************************************************************
+ * Copyright (C) 2012 Nicolas Hadacek <ha...@kd...> *
+ * *
+ * 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. *
+ ***************************************************************************/
+
+#include "gui_check.h"
+#include "gui_check.moc"
+#include "libgui/main_global.h"
+#include "libgui/toplevel.h"
+
+//----------------------------------------------------------------------------
+GuiCheck::GuiCheck()
+: _index(0),
+ _subIndex(1)
+{
+}
+
+void GuiCheck::invokeTest()
+{
+ if (_subIndex == 1) {
+ if (!init(_index)) {
+ MainWindow::self().close();
+ return;
+ }
+ }
+ if (QTest::currentTestFailed()) {
+ QTimer::singleShot(300, &MainWindow::self(), SLOT(close()));
+ return;
+ }
+
+ QString s1 = QString("test%1").arg(_subIndex);
+ QString s2 = s1 + "()";
+ if (metaObject()->indexOfMethod(s2.latin1()) == -1) {
+ ++_index;
+ _subIndex = 1;
+ } else {
+ QMetaObject::invokeMethod(this, s1.latin1());
+ ++_subIndex;
+ }
+ QTimer::singleShot(400, this, SLOT(invokeTest()));
+}
+
+//----------------------------------------------------------------------------
+void GuiCheckProxy::run(GuiCheck& check)
+{
+ int argc = 1;
+ const char* argv[] = { "gui_check", NULL };
+ Main::setupApplication(argc, (char**)argv);
+ QTimer::singleShot(200, &check, SLOT(invokeTest()));
+ kapp->exec();
+}
Added: trunk/piklab_kde4/src/piklab-test/gui/gui_check.h
===================================================================
--- trunk/piklab_kde4/src/piklab-test/gui/gui_check.h (rev 0)
+++ trunk/piklab_kde4/src/piklab-test/gui/gui_check.h 2012-10-14 23:09:59 UTC (rev 2965)
@@ -0,0 +1,40 @@
+/***************************************************************************
+ * Copyright (C) 2012 Nicolas Hadacek <ha...@kd...> *
+ * *
+ * 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. *
+ ***************************************************************************/
+#ifndef GUI_CHECK_H
+#define GUI_CHECK_H
+
+#include <QtTest/QtTest>
+
+//----------------------------------------------------------------------------
+class GuiCheck : public QObject
+{
+ Q_OBJECT
+
+ public:
+ GuiCheck();
+
+ private:
+ uint _index;
+ uint _subIndex;
+
+ virtual bool init(uint index) = 0;
+
+ private slots:
+ void invokeTest();
+};
+
+//----------------------------------------------------------------------------
+class GuiCheckProxy : public QObject
+{
+ Q_OBJECT
+ public:
+ void run(GuiCheck& check);
+};
+
+#endif
Modified: trunk/piklab_kde4/src/tools/list/compile_process.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/list/compile_process.cpp 2012-10-07 17:39:02 UTC (rev 2964)
+++ trunk/piklab_kde4/src/tools/list/compile_process.cpp 2012-10-14 23:09:59 UTC (rev 2965)
@@ -300,7 +300,11 @@
if ( type==PURL::Hex && _data.project==0 ) actions |= Show;
list += fileData(type, actions);
}
- } else list += FileData(url().toExtension(files[i]), Compile::Generated);
+ } else {
+ PURL::Url url = _data.items[nbFiles()-1].url;
+ url = PURL::Url(Main::project()->directory(), url.filename()).toExtension(files[i]);
+ list += FileData(url, Compile::Generated);
+ }
}
return list;
}
Modified: trunk/piklab_kde4/src/tools/sdcc/sdcc_compile.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/sdcc/sdcc_compile.cpp 2012-10-07 17:39:02 UTC (rev 2964)
+++ trunk/piklab_kde4/src/tools/sdcc/sdcc_compile.cpp 2012-10-14 23:09:59 UTC (rev 2965)
@@ -84,6 +84,7 @@
} else {
args += "libio" + _data.device.toLower() + ".lib";
args += "libm18f.lib";
+ args += "libc18f.lib";
}
args += config.includeDirs(Tool::Category::Linker, "-I");
args += config.customOptions(Tool::Category::Linker);
Deleted: trunk/piklab_kde4/test/gputils/blinker/blinker_lib.piklab
===================================================================
--- trunk/piklab_kde4/test/gputils/blinker/blinker_lib.piklab 2012-10-07 17:39:02 UTC (rev 2964)
+++ trunk/piklab_kde4/test/gputils/blinker/blinker_lib.piklab 2012-10-14 23:09:59 UTC (rev 2965)
@@ -1,89 +0,0 @@
-<!DOCTYPE piklab>
-<piklab>
- <general>
- <files>
- <item>blinker.asm</item>
- </files>
- <version>0.1</version>
- <description/>
- <device>16F877</device>
- <tool>gputils</tool>
- <custom_linker_script/>
- <is_library>true</is_library>
- <output_type>library</output_type>
- <opened_files>
- <item>blinker.asm</item>
- </opened_files>
- </general>
- <assembler>
- <warning_level>0</warning_level>
- <include_dir/>
- <custom_options/>
- <has_custom_arguments>false</has_custom_arguments>
- <custom_arguments>
- <item>-c</item>
- <item>-I$(SRCPATH)</item>
- <item>-p%DEVICE</item>
- <item>-w1</item>
- <item>%I</item>
- <item>-g</item>
- <item>-I/usr/share/gputils/header</item>
- </custom_arguments>
- <includes>
- <item>$(SRCPATH)</item>
- </includes>
- </assembler>
- <linker>
- <debug>0</debug>
- <hex_format>inhx32</hex_format>
- <object_dir/>
- <custom_options/>
- <format>inhx32</format>
- <custom_linker_script>/home/nicolas/prog/piklab/piklab/test/sdcc/16f873.lkr</custom_linker_script>
- <has_custom_arguments>false</has_custom_arguments>
- <custom_libraries/>
- <custom_arguments>
- <item>-o%O</item>
- <item>-c</item>
- <item>-ainhx32</item>
- <item>-m</item>
- <item>-I$(SRCPATH)</item>
- <item>$LKR(-s%LKR)</item>
- <item>%OBJS</item>
- <item>%LIBS</item>
- </custom_arguments>
- <includes>
- <item>$(SRCPATH)</item>
- </includes>
- </linker>
- <sdcc>
- <custom_options/>
- <include_dir/>
- </sdcc>
- <compiler>
- <has_custom_arguments>false</has_custom_arguments>
- <custom_options/>
- <warning_level>0</warning_level>
- <custom_arguments>
- <item>-I$(SRCPATH)</item>
- <item>-I</item>
- <item>-p</item>
- <item>%DEVICE</item>
- <item>%I</item>
- </custom_arguments>
- <includes>
- <item>$(SRCPATH)</item>
- </includes>
- </compiler>
- <librarian>
- <has_custom_arguments>false</has_custom_arguments>
- <custom_options/>
- <custom_arguments>
- <item>-c</item>
- <item>%O</item>
- <item>%OBJS</item>
- <item>%LIBS</item>
- </custom_arguments>
- </librarian>
- <editors/>
-</piklab>
Deleted: trunk/piklab_kde4/test/gputils/blinker_18/blinker_18.asm
===================================================================
--- trunk/piklab_kde4/test/gputils/blinker18/blinker_18.asm 2012-08-16 06:38:39 UTC (rev 2951)
+++ trunk/piklab_kde4/test/gputils/blinker_18/blinker_18.asm 2012-10-14 23:09:59 UTC (rev 2965)
@@ -1,59 +0,0 @@
-; LIST p=18F452 ;PIC18F452 is the target processor
- INCLUDE "p18f452.inc" ;Include file with register defines
-
- ;Programming Configuration Information
- __CONFIG _CONFIG1H, _XT_OSC_1H ;XT HS PLL (10MHz XTAL)
- __CONFIG _CONFIG2L, _BOR_ON_2L & _PWRT_ON_2L ;Power-Up timer ON, Brown-out at 2.7V
-
- __CONFIG _CONFIG2H, _WDT_OFF_2H & _WDTPS_1_2H ;WDT OFF for debug
- __CONFIG _CONFIG3H, _CCP2MX_OFF_3H ;CCP Module Off
- __CONFIG _CONFIG4L, _LVP_OFF_4L & _DEBUG_OFF_4L
-
- ;UnProtect entire device program space for DEBUG
- __CONFIG _CONFIG5L, _CP0_OFF_5L & _CP1_OFF_5L & _CP2_OFF_5L
- __CONFIG _CONFIG5H, _CPB_OFF_5H & _CPD_OFF_5H
- __CONFIG _CONFIG6L, _WRT0_OFF_6L & _WRT1_OFF_6L & _WRT2_OFF_6L
- __CONFIG _CONFIG6H, _WRTC_OFF_6H & _WRTB_OFF_6H & _WRTD_OFF_6H
-
-;Assorted miscellaneous general-purpose registers
-DlyRegA equ 0x3D ;Temp register for delay
-DlyRegB equ 0x3E ;Temp register for delay
-DlyRegC equ 0x3F ;Temp register for delay
-
-STARTUP CODE 0x000
- nop ;Required for ICD Debugging
- nop
- goto Main
-
-Main
- clrf BSR,A ;Ensure BSR register points to first block
- clrf TRISB,A
- movlw 0x7
- movwf PORTB,A
-
-Loop
- bsf PORTB,0 ;Turn the LED on
- call LongDelay
- bcf PORTB,0 ;Turn the LED off
- call LongDelay
- goto Loop
-
-;A long delay
-LongDelay
- movlw H'10' ;Adjust to produce a suitable time delay
- movwf DlyRegA
-ldelayc movlw H'10'
- movwf DlyRegB
-ldelayb movlw H'FF'
- movwf DlyRegC
-ldelaya decfsz DlyRegC,f ;Inner Loop
- goto ldelaya
- decfsz DlyRegB,f ;Middle Loop
- goto ldelayb
- decfsz DlyRegA,f ;Outer Loop
- goto ldelayc
- return
-
- END
-
-
Copied: trunk/piklab_kde4/test/gputils/blinker_18/blinker_18.asm (from rev 2950, trunk/piklab_kde4/test/gputils/blinker18/blinker_18.asm)
===================================================================
--- trunk/piklab_kde4/test/gputils/blinker_18/blinker_18.asm (rev 0)
+++ trunk/piklab_kde4/test/gputils/blinker_18/blinker_18.asm 2012-10-14 23:09:59 UTC (rev 2965)
@@ -0,0 +1,59 @@
+; LIST p=18F452 ;PIC18F452 is the target processor
+ INCLUDE "p18f452.inc" ;Include file with register defines
+
+ ;Programming Configuration Information
+ __CONFIG _CONFIG1H, _XT_OSC_1H ;XT HS PLL (10MHz XTAL)
+ __CONFIG _CONFIG2L, _BOR_ON_2L & _PWRT_ON_2L ;Power-Up timer ON, Brown-out at 2.7V
+
+ __CONFIG _CONFIG2H, _WDT_OFF_2H & _WDTPS_1_2H ;WDT OFF for debug
+ __CONFIG _CONFIG3H, _CCP2MX_OFF_3H ;CCP Module Off
+ __CONFIG _CONFIG4L, _LVP_OFF_4L & _DEBUG_OFF_4L
+
+ ;UnProtect entire device program space for DEBUG
+ __CONFIG _CONFIG5L, _CP0_OFF_5L & _CP1_OFF_5L & _CP2_OFF_5L
+ __CONFIG _CONFIG5H, _CPB_OFF_5H & _CPD_OFF_5H
+ __CONFIG _CONFIG6L, _WRT0_OFF_6L & _WRT1_OFF_6L & _WRT2_OFF_6L
+ __CONFIG _CONFIG6H, _WRTC_OFF_6H & _WRTB_OFF_6H & _WRTD_OFF_6H
+
+;Assorted miscellaneous general-purpose registers
+DlyRegA equ 0x3D ;Temp register for delay
+DlyRegB equ 0x3E ;Temp register for delay
+DlyRegC equ 0x3F ;Temp register for delay
+
+STARTUP CODE 0x000
+ nop ;Required for ICD Debugging
+ nop
+ goto Main
+
+Main
+ clrf BSR,A ;Ensure BSR register points to first block
+ clrf TRISB,A
+ movlw 0x7
+ movwf PORTB,A
+
+Loop
+ bsf PORTB,0 ;Turn the LED on
+ call LongDelay
+ bcf PORTB,0 ;Turn the LED off
+ call LongDelay
+ goto Loop
+
+;A long delay
+LongDelay
+ movlw H'10' ;Adjust to produce a suitable time delay
+ movwf DlyRegA
+ldelayc movlw H'10'
+ movwf DlyRegB
+ldelayb movlw H'FF'
+ movwf DlyRegC
+ldelaya decfsz DlyRegC,f ;Inner Loop
+ goto ldelaya
+ decfsz DlyRegB,f ;Middle Loop
+ goto ldelayb
+ decfsz DlyRegA,f ;Outer Loop
+ goto ldelayc
+ return
+
+ END
+
+
Deleted: trunk/piklab_kde4/test/gputils/blinker_18/blinker_18.piklab
===================================================================
--- trunk/piklab_kde4/test/gputils/blinker18/blinker_18.piklab 2012-08-16 06:38:39 UTC (rev 2951)
+++ trunk/piklab_kde4/test/gputils/blinker_18/blinker_18.piklab 2012-10-14 23:09:59 UTC (rev 2965)
@@ -1,51 +0,0 @@
-<!DOCTYPE piklab>
-<piklab>
- <general>
- <device>18F452</device>
- <files>
- <item>blinker_18.asm</item>
- </files>
- <watched_ios>
- <item>3969</item>
- </watched_ios>
- <description/>
- <version>0.1</version>
- <tool>gputils</tool>
- <programmer>pickit3</programmer>
- </general>
- <assembler>
- <custom_options/>
- <warning_level>0</warning_level>
- <has_custom_arguments>false</has_custom_arguments>
- <custom_arguments>
- <item>-c</item>
- <item>-I$(SRCPATH)</item>
- <item>-w0</item>
- <item>%I</item>
- <item>-g</item>
- </custom_arguments>
- <includes>
- <item>$(SRCPATH)</item>
- </includes>
- </assembler>
- <linker>
- <custom_options/>
- <format>inhx32</format>
- <custom_libraries/>
- <has_custom_arguments>false</has_custom_arguments>
- <custom_arguments>
- <item>-o%O</item>
- <item>-c</item>
- <item>-ainhx8m</item>
- <item>-m</item>
- <item>-I$(SRCPATH)</item>
- <item>$LKR(-s%LKR)</item>
- <item>%OBJS</item>
- <item>%LIBS</item>
- </custom_arguments>
- <includes>
- <item>$(SRCPATH)</item>
- </includes>
- </linker>
- <editors/>
-</piklab>
Copied: trunk/piklab_kde4/test/gputils/blinker_18/blinker_18.piklab (from rev 2957, trunk/piklab_kde4/test/gputils/blinker18/blinker_18.piklab)
===================================================================
--- trunk/piklab_kde4/test/gputils/blinker_18/blinker_18.piklab (rev 0)
+++ trunk/piklab_kde4/test/gputils/blinker_18/blinker_18.piklab 2012-10-14 23:09:59 UTC (rev 2965)
@@ -0,0 +1,54 @@
+<!DOCTYPE piklab>
+<piklab>
+ <general>
+ <device>18F452</device>
+ <files>
+ <item>blinker_18.asm</item>
+ </files>
+ <watched_ios>
+ <item>3969</item>
+ </watched_ios>
+ <description/>
+ <version>0.1</version>
+ <tool>gputils</tool>
+ <programmer>pickit3</programmer>
+ <opened_files>
+ <item>blinker_18.asm</item>
+ </opened_files>
+ </general>
+ <assembler>
+ <custom_options/>
+ <warning_level>0</warning_level>
+ <has_custom_arguments>false</has_custom_arguments>
+ <custom_arguments>
+ <item>-c</item>
+ <item>-I$(SRCPATH)</item>
+ <item>-w0</item>
+ <item>%I</item>
+ <item>-g</item>
+ </custom_arguments>
+ <includes>
+ <item>$(SRCPATH)</item>
+ </includes>
+ </assembler>
+ <linker>
+ <custom_options/>
+ <format>inhx32</format>
+ <custom_libraries/>
+ <has_custom_arguments>false</has_custom_arguments>
+ <custom_arguments>
+ <item>-o%O</item>
+ <item>-c</item>
+ <item>-ainhx8m</item>
+ <item>-m</item>
+ <item>-I$(SRCPATH)</item>
+ <item>$LKR(-s%LKR)</item>
+ <item>%OBJS</item>
+ <item>%LIBS</item>
+ </custom_arguments>
+ <includes>
+ <item>$(SRCPATH)</item>
+ </includes>
+ </linker>
+ <editors/>
+</piklab>
Added: trunk/piklab_kde4/test/gputils/blinker_lib/blinker.asm
===================================================================
--- trunk/piklab_kde4/test/gputils/blinker_lib/blinker.asm (rev 0)
+++ trunk/piklab_kde4/test/gputils/blinker_lib/blinker.asm 2012-10-14 23:09:59 UTC (rev 2965)
@@ -0,0 +1,149 @@
+
+ #include <p16f877.inc> ; processor specific variable definitions
+
+ __CONFIG _CP_OFF & _WDT_OFF & _BODEN_OFF & _PWRTE_ON & _XT_OSC & _WRT_ENABLE_ON & _LVP_OFF & _CPD_OFF
+ ;__CONFIG _CP_OFF & _WDT_OFF & _PWRTE_ON & _EXTRC_CLKOUT
+
+;**********************************************************************
+M_SAVE_STATE macro
+ movwf w_saved
+ movfw STATUS
+ movwf status_saved
+ endm
+
+M_RESTORE_STATE macro
+ movfw status_saved
+ movwf STATUS
+ swapf w_saved,f
+ swapf w_saved,w
+ endm
+
+BANK0 = 0x0
+BANK1 = 0x80
+BANK2 = 0x100
+BANK3 = 0x180
+
+;**********************************************************************
+INT_VAR UDATA_SHR 0x20
+w_saved RES 1
+status_saved RES 1
+pclath_saved RES 1
+INT1_VAR UDATA_SHR 0xA0
+w_saved1 RES 1
+
+TEMP_VAR UDATA_SHR
+count RES 1
+count2 RES 1
+ledA RES 1
+ledC RES 1
+ledB RES 1
+test EQU 0x75
+
+;**********************************************************************
+STARTUP CODE 0x000 ; processor reset vector
+ nop ; for debugger
+ movlw high start ; load upper byte of 'start' label
+ movwf PCLATH ; initialize PCLATH
+ goto start ; go to beginning of program
+
+;**********************************************************************
+INT_VECTOR CODE 0x004 ; interrupt vector location
+ goto interrupt
+
+;**********************************************************************
+PROG1 CODE
+interrupt
+ M_SAVE_STATE
+ M_SAVE_STATE ; try using twice a macro
+
+; increment duty cycle
+; btfss CCP1CON ^ BANK0,4
+; goto duty_cycle_inc_bit0
+; bcf CCP1CON ^ BANK0,4
+; btfss CCP1CON ^ BANK0,5
+; goto duty_cycle_inc_bit1
+; bcf CCP1CON ^ BANK0,5
+; incfsz CCPR1L ^ BANK0,f
+; goto update_duty_cycle_done
+;duty_cycle_inc_bit0
+; bsf CCP1CON ^ BANK0,4
+; goto update_duty_cycle_done
+;duty_cycle_inc_bit1
+; bsf CCP1CON ^ BANK0,5
+;update_duty_cycle_done
+
+; increment count
+ decfsz count,1
+ goto done
+ movlw .10
+ movwf count
+
+; blink and output
+ movfw ledB
+ xorlw B'00001111'
+ movwf ledB
+ movwf PORTB
+
+done
+ bcf INTCON,2 ; reset TMR0 interrupt flag
+ M_RESTORE_STATE
+ retfie ; return from interrupt
+
+;**********************************************************************
+start
+; initialize microchip
+ clrf TMR0 ^ BANK0
+ clrf INTCON ^ BANK0
+; clrf PORTA ^ BANK0
+ clrf PORTB ^ BANK0
+; clrf PORTC ^ BANK0
+; clrf PORTD ^ BANK0
+; clrf PORTE ^ BANK0
+ banksel TRISA ; bank 1
+; clrf TRISA ^ BANK1 ; all outputs
+ clrf TRISB ^ BANK1 ; all outputs
+; clrf TRISC ^ BANK1 ; all outputs
+; clrf TRISD ^ BANK1 ; all outputs
+; clrf TRISE ^ BANK1 ; all outputs
+ movlw B'11010101' ; set prescaler to 64
+ movwf OPTION_REG ^ BANK1 ; and start TMR0 (internal source clock)
+; movlw B'00000110' ; set PORTA and PORTE to be all digital
+; movwf ADCON1 ^ BANK1
+ banksel INTCON ; back to bank 0
+ bsf INTCON,T0IE ; enable TMR0 interrupt
+ bsf INTCON,GIE ; enable all interrupts
+
+; initialize PWM
+; CLRF CCP1CON ^ BANK0 ; disable CCP module
+; CLRF TMR2 ^ BANK0 ; clear Timer2 (also set the pre-scaler to 1)
+; MOVLW .1
+; MOVWF CCPR1L ^ BANK0 ; set duty cycle = (CCPR1L+1)/(PR2+1) [25% for (31+1)/(127+1)]
+; banksel PR2 ; select bank 1
+; MOVLW .255
+; MOVWF PR2 ^ BANK1 ; set period = Fosc/4/pre-scaler/(PR2+1)
+; BCF TRISC ^ BANK1,2 ; set CCP1 pin as output
+; banksel PIR1 ; back to bank 0
+; MOVLW B'001100'
+; MOVWF CCP1CON ^ BANK0 ; set PWM mode (the 2 LSBs of the duty cycle are set to '00')
+; BSF T2CON ^ BANK0,TMR2ON ; Timer2 starts to increment
+
+ ; The CCP1 interrupt is disabled,
+ ; do polling on the TMR2 Interrupt flag bit
+;PWM_Period_Match
+; BTFSS PIR1, TMR2IF
+; GOTO PWM_Period_Match
+
+ ; Update this PWM period and the following PWM Duty cycle
+; BCF PIR1, TMR2IF
+
+; initialize variables
+ movlw B'00000101'
+ movwf ledB
+ movlw .10
+ movwf count
+
+; loop forever
+ goto $
+
+;**********************************************************************
+ END
Added: trunk/piklab_kde4/test/gputils/blinker_lib/blinker_lib.piklab
===================================================================
--- trunk/piklab_kde4/test/gputils/blinker_lib/blinker_lib.piklab (rev 0)
+++ trunk/piklab_kde4/test/gputils/blinker_lib/blinker_lib.piklab 2012-10-14 23:09:59 UTC (rev 2965)
@@ -0,0 +1,89 @@
+<!DOCTYPE piklab>
+<piklab>
+ <general>
+ <files>
+ <item>blinker.asm</item>
+ </files>
+ <version>0.1</version>
+ <description/>
+ <device>16F877</device>
+ <tool>gputils</tool>
+ <custom_linker_script/>
+ <is_library>true</is_library>
+ <output_type>library</output_type>
+ <opened_files>
+ <item>blinker.asm</item>
+ </opened_files>
+ </general>
+ <assembler>
+ <warning_level>0</warning_level>
+ <include_dir/>
+ <custom_options/>
+ <has_custom_arguments>false</has_custom_arguments>
+ <custom_arguments>
+ <item>-c</item>
+ <item>-I$(SRCPATH)</item>
+ <item>-p%DEVICE</item>
+ <item>-w1</item>
+ <item>%I</item>
+ <item>-g</item>
+ <item>-I/usr/share/gputils/header</item>
+ </custom_arguments>
+ <includes>
+ <item>$(SRCPATH)</item>
+ </includes>
+ </assembler>
+ <linker>
+ <debug>0</debug>
+ <hex_format>inhx32</hex_format>
+ <object_dir/>
+ <custom_options/>
+ <format>inhx32</format>
+ <custom_linker_script>/home/nicolas/prog/piklab/piklab/test/sdcc/16f873.lkr</custom_linker_script>
+ <has_custom_arguments>false</has_custom_arguments>
+ <custom_libraries/>
+ <custom_arguments>
+ <item>-o%O</item>
+ <item>-c</item>
+ <item>-ainhx32</item>
+ <item>-m</item>
+ <item>-I$(SRCPATH)</item>
+ <item>$LKR(-s%LKR)</item>
+ <item>%OBJS</item>
+ <item>%LIBS</item>
+ </custom_arguments>
+ <includes>
+ <item>$(SRCPATH)</item>
+ </includes>
+ </linker>
+ <sdcc>
+ <custom_options/>
+ <include_dir/>
+ </sdcc>
+ <compiler>
+ <has_custom_arguments>false</has_custom_arguments>
+ <custom_options/>
+ <warning_level>0</warning_level>
+ <custom_arguments>
+ <item>-I$(SRCPATH)</item>
+ <item>-I</item>
+ <item>-p</item>
+ <item>%DEVICE</item>
+ <item>%I</item>
+ </custom_arguments>
+ <includes>
+ <item>$(SRCPATH)</item>
+ </includes>
+ </compiler>
+ <librarian>
+ <has_custom_arguments>false</has_custom_arguments>
+ <custom_options/>
+ <custom_arguments>
+ <item>-c</item>
+ <item>%O</item>
+ <item>%OBJS</item>
+ <item>%LIBS</item>
+ </custom_arguments>
+ </librarian>
+ <editors/>
+</piklab>
Copied: trunk/piklab_kde4/test/gputils/project/project.piklab (from rev 2950, trunk/piklab_kde4/test/gputils/project/test_project.piklab)
===================================================================
--- trunk/piklab_kde4/test/gputils/project/project.piklab (rev 0)
+++ trunk/piklab_kde4/test/gputils/project/project.piklab 2012-10-14 23:09:59 UTC (rev 2965)
@@ -0,0 +1,52 @@
+<!DOCTYPE piklab>
+<piklab>
+ <general>
+ <files>
+ <item>test.asm</item>
+ <item>test.lib</item>
+ <item>test2.asm</item>
+ </files>
+ <version>0.2</version>
+ <description/>
+ <device>16F871</device>
+ <tool>gputils</tool>
+ <opened_files>
+ <item>test.asm</item>
+ </opened_files>
+ </general>
+ <assembler>
+ <warning_level>0</warning_level>
+ <custom_options/>
+ <has_custom_arguments>false</has_custom_arguments>
+ <custom_arguments>
+ <item>-c</item>
+ <item>-I$(SRCPATH)</item>
+ <item>-p%DEVICE</item>
+ <item>-w0</item>
+ <item>%I</item>
+ </custom_arguments>
+ <includes>
+ <item>$(SRCPATH)</item>
+ </includes>
+ </assembler>
+ <linker>
+ <format>inhx32</format>
+ <custom_options/>
+ <has_custom_arguments>false</has_custom_arguments>
+ <custom_arguments>
+ <item>-o%O</item>
+ <item>-c</item>
+ <item>-ainhx32</item>
+ <item>-m</item>
+ <item>-I$(SRCPATH)</item>
+ <item>$LKR(-s%LKR)</item>
+ <item>%OBJS</item>
+ <item>%LIBS</item>
+ </custom_arguments>
+ </linker>
+ <compiler>
+ <includes>$(SRCPATH)</includes>
+ <custom_options/>
+ </compiler>
+ <editors/>
+</piklab>
Copied: trunk/piklab_kde4/test/gputils/project/project.pikprj (from rev 2950, trunk/piklab_kde4/test/gputils/project/test_project.pikprj)
===================================================================
--- trunk/piklab_kde4/test/gputils/project/project.pikprj (rev 0)
+++ trunk/piklab_kde4/test/gputils/project/project.pikprj 2012-10-14 23:09:59 UTC (rev 2965)
@@ -0,0 +1,20 @@
+[Assembler]
+include-dir=
+other-options=
+radix=dec
+target-device=16F871
+warn-level=0
+
+[Files]
+inputFiles=test.asm,test2.asm,test.lib
+
+[General]
+description=
+output=test_project.hex
+version=0.1
+
+[Linker]
+debug=false
+hex-format=inhx32
+objs-libs-dir=
+other-options=
Deleted: trunk/piklab_kde4/test/gputils/project/test_project.piklab
===================================================================
--- trunk/piklab_kde4/test/gputils/project/test_project.piklab 2012-10-07 17:39:02 UTC (rev 2964)
+++ trunk/piklab_kde4/test/gputils/project/test_project.piklab 2012-10-14 23:09:59 UTC (rev 2965)
@@ -1,52 +0,0 @@
-<!DOCTYPE piklab>
-<piklab>
- <general>
- <files>
- <item>test.asm</item>
- <item>test.lib</item>
- <item>test2.asm</item>
- </files>
- <version>0.2</version>
- <description/>
- <device>16F871</device>
- <tool>gputils</tool>
- <opened_files>
- <item>test.asm</item>
- <item>test2.asm</item>
- </opened_files>
- </general>
- <assembler>
- <warning_level>0</warning_level>
- <custom_options/>
- <has_custom_arguments>false</has_custom_arguments>
- <custom_arguments>
- <item>-c</item>
- <item>-I$(SRCPATH)</item>
- <item>-p%DEVICE</item>
- <item>-w0</item>
- <item>%I</item>
- </custom_arguments>
- <includes>
- <item>$(SRCPATH)</item>
- </includes>
- </assembler>
- <linker>
- <format>inhx32</format>
- <custom_options/>
- <has_custom_arguments>false</has_custom_arguments>
- <custom_arguments>
- <item>-o%O</item>
- <item>-c</item>
- <item>-ainhx32</item>
- <item>-m</item>
- <item>-I$(SRCPATH)</item>
- <item>$LKR(-s%LKR)</item>
- <item>%OBJS</item>
- <item>%LIBS</item>
- </custom_arguments>
- </linker>
- <compiler>
- <includes>$(SRCPATH)</includes>
- <custom_options/>
- </compiler>
-</piklab>
Deleted: trunk/piklab_kde4/test/gputils/project/test_project.pikprj
===================================================================
--- trunk/piklab_kde4/test/gputils/project/test_project.pikprj 2012-10-07 17:39:02 UTC (rev 2964)
+++ trunk/piklab_kde4/test/gputils/project/test_project.pikprj 2012-10-14 23:09:59 UTC (rev 2965)
@@ -1,20 +0,0 @@
-[Assembler]
-include-dir=
-other-options=
-radix=dec
-target-device=16F871
-warn-level=0
-
-[Files]
-inputFiles=test.asm,test2.asm,test.lib
-
-[General]
-description=
-output=test_project.hex
-version=0.1
-
-[Linker]
-debug=false
-hex-format=inhx32
-objs-libs-dir=
-other-options=
Deleted: trunk/piklab_kde4/test/sdcc/.cvsignore
===================================================================
--- trunk/piklab_kde4/test/sdcc/.cvsignore 2012-10-07 17:39:02 UTC (rev 2964)
+++ trunk/piklab_kde4/test/sdcc/.cvsignore 2012-10-14 23:09:59 UTC (rev 2965)
@@ -1,13 +0,0 @@
-*.o
-*.hex.asm
-*.map
-*.lst
-*.cod
-*.cof
-*.d
-*.p
-*.adb
-blinker.hex
-standalone_blinker.hex
-blinker.asm
-standalone_blinker.asm
\ No newline at end of file
Deleted: trunk/piklab_kde4/test/sdcc/add_sdcc250.c
===================================================================
--- trunk/piklab_kde4/test/sdcc/add_sdcc250.c 2012-10-07 17:39:02 UTC (rev 2964)
+++ trunk/piklab_kde4/test/sdcc/add_sdcc250.c 2012-10-14 23:09:59 UTC (rev 2965)
@@ -1,9 +0,0 @@
-#include "sdcc250_pic16f873.h"
-
-extern unsigned char ms_delay;
-
-void test() {
- ms_delay++;
- PIR1 = 0;
- PEIE = 1;
-}
Deleted: trunk/piklab_kde4/test/sdcc/blink.piklab
===================================================================
--- trunk/piklab_kde4/test/sdcc/blink.piklab 2012-10-07 17:39:02 UTC (rev 2964)
+++ trunk/piklab_kde4/test/sdcc/blink.piklab 2012-10-14 23:09:59 UTC (rev 2965)
@@ -1,107 +0,0 @@
-<!DOCTYPE piklab>
-<piklab>
- <general>
- <device>16F873</device>
- <description/>
- <version>0.1</version>
- <tool>sdcc</tool>
- <custom_linker_script/>
- <files>
- <item>blinker.c</item>
- <item>sub/add.c</item>
- </files>
- <is_library>true</is_library>
- <programmer>direct</programmer>
- <output_type>executable</output_type>
- <custom_shell_commands>
- <item>ls %I</item>
- </custom_shell_commands>
- <opened_files>
- <item>blinker.c</item>
- <item>sub/add.c</item>
- </opened_files>
- </general>
- <sdcc>
- <custom_options/>
- <include_dir>/home/nicolas/prog/piklab/test/sdcc/</include_dir>
- </sdcc>
- <assembler>
- <warning_level>0</warning_level>
- <custom_options/>
- <include_dir>/home/nicolas/prog/piklab/test/sdcc/</include_dir>
- <has_custom_arguments>false</has_custom_arguments>
- <custom_arguments>
- <item>-c</item>
- <item>-I$(SRCPATH)</item>
- <item>-p%DEVICE</item>
- <item>-w0</item>
- <item>%I</item>
- </custom_arguments>
- <includes>
- <item>$(SRCPATH)</item>
- </includes>
- </assembler>
- <linker>
- <hex_format>inhx32</hex_format>
- <object_dir>/home/nicolas/prog/piklab/test/sdcc/</object_dir>
- <custom_options>-Wl-r</custom_options>
- <format>inhx32</format>
- <has_custom_arguments>false</has_custom_arguments>
- <custom_arguments>
- <item>-m%FAMILY</item>
- <item>-%DEVICE</item>
- <item>-V</item>
- <item>--debug</item>
- <item>-Wl-c</item>
- <item>$LKR(-Wl-s%LKR)</item>
- <item>-I$(SRCPATH)</item>
- <item>-Wl-r</item>
- <item>-o%O</item>
- <item>%OBJS</item>
- <item>%LIBS</item>
- </custom_arguments>
- <includes>
- <item>$(SRCPATH)</item>
- </includes>
- </linker>
- <compiler>
- <custom_options/>
- <has_custom_arguments>false</has_custom_arguments>
- <custom_arguments>
- <item>-m%FAMILY</item>
- <item>-%DEVICE</item>
- <item>-V</item>
- <item>--debug</item>
- <item>-I$(SRCPATH)</item>
- <item>-c</item>
- <item>%I</item>
- <item>-Wa-g</item>
- </custom_arguments>
- <includes>
- <item>$(SRCPATH)</item>
- </includes>
- </compiler>
- <bin_to_hex>
- <includes>$(SRCPATH)</includes>
- <custom_options/>
- </bin_to_hex>
- <object_viewer>
- <includes>$(SRCPATH)</includes>
- <custom_options/>
- </object_viewer>
- <disassembler>
- <includes>$(SRCPATH)</includes>
- <custom_options/>
- </disassembler>
- <librarian>
- <has_custom_arguments>false</has_custom_arguments>
- <custom_options/>
- <custom_arguments>
- <item>-c</item>
- <item>%O</item>
- <item>%OBJS</item>
- <item>%LIBS</item>
- </custom_arguments>
- </librarian>
- <editors/>
-</piklab>
Deleted: trunk/piklab_kde4/test/sdcc/blink_lib.piklab
===================================================================
--- trunk/piklab_kde4/test/sdcc/blink_lib.piklab 2012-10-07 17:39:02 UTC (rev 2964)
+++ trunk/piklab_kde4/test/sdcc/blink_lib.piklab 2012-10-14 23:09:59 UTC (rev 2965)
@@ -1,103 +0,0 @@
-<!DOCTYPE piklab>
-<piklab>
- <general>
- <device>16F873</device>
- <description></description>
- <version>0.1</version>
- <tool>sdcc</tool>
- <custom_linker_script/>
- <files>
- <item>add.c</item>
- <item>blinker.c</item>
- </files>
- <is_library>true</is_library>
- <output_type>library</output_type>
- <opened_files>
- <item>add.c</item>
- <item>blinker.c</item>
- </opened_files>
- </general>
- <sdcc>
- <custom_options/>
- <include_dir>/home/nicolas/prog/piklab/test/sdcc/</include_dir>
- </sdcc>
- <assembler>
- <warning_level>0</warning_level>
- <custom_options/>
- <include_dir>/home/nicolas/prog/piklab/test/sdcc/</include_dir>
- <has_custom_arguments>false</has_custom_arguments>
- <custom_arguments>
- <item>-c</item>
- <item>-I$(SRCPATH)</item>
- <item>-p%DEVICE</item>
- <item>-w0</item>
- <item>%I</item>
- </custom_arguments>
- <includes>
- <item>$(SRCPATH)</item>
- </includes>
- </assembler>
- <linker>
- <hex_format>inhx32</hex_format>
- <object_dir>/home/nicolas/prog/piklab/test/sdcc/</object_dir>
- <custom_options>-Wl-r</custom_options>
- <format>inhx32</format>
- <has_custom_arguments>false</has_custom_arguments>
- <custom_arguments>
- <item>-m%FAMILY</item>
- <item>-%DEVICE</item>
- <item>-V</item>
- <item>--debug</item>
- <item>-Wl-c</item>
- <item>$LKR(-Wl-s%LKR)</item>
- <item>-I$(SRCPATH)</item>
- <item>-Wl-r</item>
- <item>-o%O</item>
- <item>%OBJS</item>
- <item>%LIBS</item>
- </custom_arguments>
- <includes>
- <item>$(SRCPATH)</item>
- </includes>
- </linker>
- <compiler>
- <custom_options></custom_options>
- <has_custom_arguments>false</has_custom_arguments>
- <custom_arguments>
- <item>-m%FAMILY</item>
- <item>-%DEVICE</item>
- <item>-V</item>
- <item>--debug</item>
- <item>-I$(SRCPATH)</item>
- <item>-c</item>
- <item>%I</item>
- <item>-Wa-g</item>
- </custom_arguments>
- <includes>
- <item>$(SRCPATH)</item>
- </includes>
- </compiler>
- <bin_to_hex>
- <includes>$(SRCPATH)</includes>
- <custom_options/>
- </bin_to_hex>
- <object_viewer>
- <includes>$(SRCPATH)</includes>
- <custom_options/>
- </object_viewer>
- <disassembler>
- <includes>$(SRCPATH)</includes>
- <custom_options/>
- </disassembler>
- <librarian>
- <has_custom_arguments>false</has_custom_arguments>
- <custom_options></custom_options>
- <custom_arguments>
- <item>-c</item>
- <item>%O</item>
- <item>%OBJS</item>
- <item>%LIBS</item>
- </custom_arguments>
- </librarian>
- <editors/>
-</piklab>
Added: trunk/piklab_kde4/test/sdcc/blinker/blinker.c
===================================================================
--- trunk/piklab_kde4/test/sdcc/blinker/blinker.c (rev 0)
+++ trunk/piklab_kde4/test/sdcc/blinker/blinker.c 2012-10-14 23:09:59 UTC (rev 2965)
@@ -0,0 +1,37 @@
+#define __16F873
+#include <pic16f873.h>
+#include "blinker.h"
+
+typedef unsigned int word;
+word __at 0x2007 CONFIG = _CP_OFF & _WDT_OFF & _BODEN_ON & \
+ _PWRTE_ON & _HS_OSC & _WRT_ENABLE_ON & \
+ _LVP_OFF & _DEBUG_OFF & _CPD_OFF;
+
+unsigned char count, x = 2;
+unsigned char ms_delay = 0;
+float abcd;
+
+void Intr() __interrupt 0 {
+ ms_delay++;
+ PIR1 = 0;
+ PEIE = 1;
+}
+
+void main() {
+ NOT_RBPU = 0;
+ T2CON = 0x7f;
+ GIE = 1;
+ PEIE = 1;
+ //INTCON=0xc0;
+ PIR1 = 0;
+ PIE1 = 2;
+ PR2 = 200;
+
+ TRISB = 0;
+ ms_delay = 0;
+ while(1) {
+ count = ms_delay;
+ x = PIE1;
+ PORTB = (count & 0xf0) | (x & 0xf);
+ }
+}
Added: trunk/piklab_kde4/test/sdcc/blinker/blinker.h
===================================================================
--- trunk/piklab_kde4/test/sdcc/blinker/blinker.h (rev 0)
+++ trunk/piklab_kde4/test/sdcc/blinker/blinker.h 2012-10-14 23:09:59 UTC (rev 2965)
@@ -0,0 +1 @@
+// empty
\ No newline at end of file
Added: trunk/piklab_kde4/test/sdcc/blinker/blinker.piklab
===================================================================
--- trunk/piklab_kde4/test/sdcc/blinker/blinker.piklab (rev 0)
+++ trunk/piklab_kde4/test/sdcc/blinker/blinker.piklab 2012-10-14 23:09:59 UTC (rev 2965)
@@ -0,0 +1,100 @@
+<!DOCTYPE piklab>
+<piklab>
+ <general>
+ <device>16F873</device>
+ <description/>
+ <version>0.1</version>
+ <tool>sdcc</tool>
+ <custom_linker_script/>
+ <files>
+ <item>blinker.c</item>
+ <item>sub/add.c</item>
+ <item>blinker.h</item>
+ </files>
+ <programmer>icd2</programmer>
+ <output_type>executable</output_type>
+ <opened_files>
+ <item>blinker.c</item>
+ </opened_files>
+ </general>
+ <sdcc>
+ <custom_options/>
+ <include_dir>/home/nicolas/prog/piklab/test/sdcc/</include_dir>
+ </sdcc>
+ <assembler>
+ <warning_level>0</warning_level>
+ <custom_options/>
+ <include_dir>/home/nicolas/prog/piklab/test/sdcc/</include_dir>
+ <has_custom_arguments>false</has_custom_arguments>
+ <custom_arguments>
+ <item>-c</item>
+ <item>-I$(SRCPATH)</item>
+ <item>-w0</item>
+ <item>%I</item>
+ </custom_arguments>
+ <includes>
+ <item>$(...
[truncated message content] |
|
From: <az...@us...> - 2012-10-07 17:39:09
|
Revision: 2964
http://piklab.svn.sourceforge.net/piklab/?rev=2964&view=rev
Author: azhyd
Date: 2012-10-07 17:39:02 +0000 (Sun, 07 Oct 2012)
Log Message:
-----------
fix compilation with gputils
Modified Paths:
--------------
trunk/piklab_kde4/src/libgui/project.cpp
trunk/piklab_kde4/src/tools/list/compile_process.cpp
trunk/piklab_kde4/test/sdcc/blink.piklab
trunk/piklab_kde4/test/sdcc/blinker.piklab
trunk/piklab_kde4/test/sdcc18/test18.piklab
Modified: trunk/piklab_kde4/src/libgui/project.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/project.cpp 2012-10-07 01:03:58 UTC (rev 2963)
+++ trunk/piklab_kde4/src/libgui/project.cpp 2012-10-07 17:39:02 UTC (rev 2964)
@@ -120,7 +120,10 @@
PURL::UrlList files = absoluteFiles();
// objects files corresponding to src files
for (PURL::UrlList::const_iterator it=files.begin(); it!=files.end(); ++it)
- if ( (*it).data().group==PURL::Source ) objs += (*it).toExtension(extension).filename();
+ if ( (*it).data().group==PURL::Source ) {
+ if (extension.isEmpty()) objs += (*it).toFileType(PURL::Object).filename();
+ else objs += (*it).toExtension(extension).filename();
+ }
// objects
for (PURL::UrlList::const_iterator it=files.begin(); it!=files.end(); ++it)
if ( (*it).fileType()==PURL::Object ) objs += (*it).relativeTo(directory(), execType.data().separator);
Modified: trunk/piklab_kde4/src/tools/list/compile_process.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/list/compile_process.cpp 2012-10-07 01:03:58 UTC (rev 2963)
+++ trunk/piklab_kde4/src/tools/list/compile_process.cpp 2012-10-07 17:39:02 UTC (rev 2964)
@@ -260,12 +260,14 @@
url = _data.items[i].url;
}
if (type!=PURL::Nb_FileTypes) url = url.toFileType(type);
- return PURL::Url(Main::project()->directory(), url.filename());
+ return url;
}
Compile::FileData Compile::BaseProcess::fileData(PURL::FileType type, FileActions actions) const
{
- return FileData(url(type, nbFiles()-1), actions);
+ PURL::Url tmp = url(type, nbFiles()-1);
+ if (actions & Compile::Generated) tmp = PURL::Url(Main::project()->directory(), tmp.filename());
+ return FileData(tmp, actions);
}
QString Compile::BaseProcess::outputFilepath() const
Modified: trunk/piklab_kde4/test/sdcc/blink.piklab
===================================================================
--- trunk/piklab_kde4/test/sdcc/blink.piklab 2012-10-07 01:03:58 UTC (rev 2963)
+++ trunk/piklab_kde4/test/sdcc/blink.piklab 2012-10-07 17:39:02 UTC (rev 2964)
@@ -16,6 +16,10 @@
<custom_shell_commands>
<item>ls %I</item>
</custom_shell_commands>
+ <opened_files>
+ <item>blinker.c</item>
+ <item>sub/add.c</item>
+ </opened_files>
</general>
<sdcc>
<custom_options/>
Modified: trunk/piklab_kde4/test/sdcc/blinker.piklab
===================================================================
--- trunk/piklab_kde4/test/sdcc/blinker.piklab 2012-10-07 01:03:58 UTC (rev 2963)
+++ trunk/piklab_kde4/test/sdcc/blinker.piklab 2012-10-07 17:39:02 UTC (rev 2964)
@@ -2,17 +2,17 @@
<piklab>
<general>
<device>16F873</device>
- <description/>
+ <description></description>
<version>0.1</version>
- <tool>gputils</tool>
+ <tool>sdcc</tool>
<custom_linker_script/>
<files>
- <item>add.c</item>
<item>blinker.c</item>
+ <item>sub/add.c</item>
</files>
<programmer>icd2</programmer>
+ <output_type>executable</output_type>
<opened_files>
- <item>add.c</item>
<item>blinker.c</item>
</opened_files>
</general>
@@ -22,14 +22,23 @@
</sdcc>
<assembler>
<warning_level>0</warning_level>
- <custom_options/>
+ <custom_options></custom_options>
<include_dir>/home/nicolas/prog/piklab/test/sdcc/</include_dir>
- <includes>$(SRCPATH)</includes>
+ <has_custom_arguments>false</has_custom_arguments>
+ <custom_arguments>
+ <item>-c</item>
+ <item>-I$(SRCPATH)</item>
+ <item>-w0</item>
+ <item>%I</item>
+ </custom_arguments>
+ <includes>
+ <item>$(SRCPATH)</item>
+ </includes>
</assembler>
<linker>
<hex_format>inhx32</hex_format>
<object_dir>/home/nicolas/prog/piklab/test/sdcc/</object_dir>
- <custom_options>-Wl-r</custom_options>
+ <custom_options></custom_options>
<format>inhx32</format>
<has_custom_arguments>false</has_custom_arguments>
<custom_arguments>
@@ -77,4 +86,14 @@
<custom_options/>
</disassembler>
<editors/>
+ <librarian>
+ <has_custom_arguments>false</has_custom_arguments>
+ <custom_arguments>
+ <item>-c</item>
+ <item>%O</item>
+ <item>%OBJS</item>
+ <item>%LIBS</item>
+ </custom_arguments>
+ <custom_options></custom_options>
+ </librarian>
</piklab>
Modified: trunk/piklab_kde4/test/sdcc18/test18.piklab
===================================================================
--- trunk/piklab_kde4/test/sdcc18/test18.piklab 2012-10-07 01:03:58 UTC (rev 2963)
+++ trunk/piklab_kde4/test/sdcc18/test18.piklab 2012-10-07 17:39:02 UTC (rev 2964)
@@ -9,9 +9,6 @@
<description/>
<version>0.1</version>
<output_type>executable</output_type>
- <opened_files>
- <item>test18.c</item>
- </opened_files>
</general>
<editors/>
<compiler>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <az...@us...> - 2012-10-07 01:04:05
|
Revision: 2963
http://piklab.svn.sourceforge.net/piklab/?rev=2963&view=rev
Author: azhyd
Date: 2012-10-07 01:03:58 +0000 (Sun, 07 Oct 2012)
Log Message:
-----------
fixed link for source files outside project directory [patch by Marcelo Roberto Jimenez]
Modified Paths:
--------------
trunk/piklab_kde4/Changelog
trunk/piklab_kde4/src/libgui/project.cpp
trunk/piklab_kde4/src/libgui/project.h
trunk/piklab_kde4/src/tools/list/compile_manager.cpp
trunk/piklab_kde4/src/tools/list/compile_process.cpp
trunk/piklab_kde4/test/sdcc/blink.piklab
Added Paths:
-----------
trunk/piklab_kde4/test/sdcc/sub/
trunk/piklab_kde4/test/sdcc/sub/add.c
Removed Paths:
-------------
trunk/piklab_kde4/test/sdcc/add.c
Modified: trunk/piklab_kde4/Changelog
===================================================================
--- trunk/piklab_kde4/Changelog 2012-10-06 22:04:23 UTC (rev 2962)
+++ trunk/piklab_kde4/Changelog 2012-10-07 01:03:58 UTC (rev 2963)
@@ -20,6 +20,7 @@
* fixed warning when external tool not found
* fixed running kfind from project context menu
* fixed %I argument for custom tool [reported by Marc Berlioux]
+* fixed link for source files outside project directory [patch by Marcelo Roberto Jimenez]
0.16.1 (1 July 2012)
* fixed command-line utilities compilation with Qt only
Modified: trunk/piklab_kde4/src/libgui/project.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/project.cpp 2012-10-06 22:04:23 UTC (rev 2962)
+++ trunk/piklab_kde4/src/libgui/project.cpp 2012-10-07 01:03:58 UTC (rev 2963)
@@ -114,21 +114,13 @@
clearList("general", "files");
}
-QString Project::toSourceObject(const PURL::Url &url, const QString &extension, Tool::ExecutableType execType) const
-{
- PURL::Url tmp;
- if ( extension.isEmpty() ) tmp = url.toFileType(PURL::Object);
- else tmp = url.toExtension(extension);
- return tmp.relativeTo(directory(), execType.data().separator);
-}
-
QStringList Project::objectsForLinker(const QString &extension, Tool::ExecutableType execType) const
{
QStringList objs;
PURL::UrlList files = absoluteFiles();
// objects files corresponding to src files
for (PURL::UrlList::const_iterator it=files.begin(); it!=files.end(); ++it)
- if ( (*it).data().group==PURL::Source ) objs += toSourceObject(*it, extension, execType);
+ if ( (*it).data().group==PURL::Source ) objs += (*it).toExtension(extension).filename();
// objects
for (PURL::UrlList::const_iterator it=files.begin(); it!=files.end(); ++it)
if ( (*it).fileType()==PURL::Object ) objs += (*it).relativeTo(directory(), execType.data().separator);
Modified: trunk/piklab_kde4/src/libgui/project.h
===================================================================
--- trunk/piklab_kde4/src/libgui/project.h 2012-10-06 22:04:23 UTC (rev 2962)
+++ trunk/piklab_kde4/src/libgui/project.h 2012-10-07 01:03:58 UTC (rev 2963)
@@ -30,7 +30,6 @@
PURL::UrlList openedFiles() const;
PURL::Url customLinkerScript() const;
QValueList<Register::TypeData> watchedRegisters() const;
- QString toSourceObject(const PURL::Url &url, const QString &extension, Tool::ExecutableType execType) const;
QStringList objectsForLinker(const QString &extension, Tool::ExecutableType execType) const;
QStringList librariesForLinker(const QString &prefix, Tool::ExecutableType execType) const;
QValueList<uint> bookmarkLines(const PURL::Url &url) const; // absolute filepath
Modified: trunk/piklab_kde4/src/tools/list/compile_manager.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/list/compile_manager.cpp 2012-10-06 22:04:23 UTC (rev 2962)
+++ trunk/piklab_kde4/src/tools/list/compile_manager.cpp 2012-10-07 01:03:58 UTC (rev 2963)
@@ -258,7 +258,7 @@
}
if ( Main::toolGroup().isCustom() ) _customCommandIndex++;
else {
- FileData::List list = _base->files(0).onlyExistingFiles();
+ FileData::List list = _base->files(NULL).onlyExistingFiles();
for (FileData::List::const_iterator it = list.begin(); it != list.end(); ++it) emit updateFile(*it);
}
QTimer::singleShot(0, this, SLOT(execute()));
Modified: trunk/piklab_kde4/src/tools/list/compile_process.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/list/compile_process.cpp 2012-10-06 22:04:23 UTC (rev 2962)
+++ trunk/piklab_kde4/src/tools/list/compile_process.cpp 2012-10-07 01:03:58 UTC (rev 2963)
@@ -259,8 +259,8 @@
ASSERT( i<(uint)_data.items.count() );
url = _data.items[i].url;
}
- if ( type==PURL::Nb_FileTypes ) return url;
- return url.toFileType(type);
+ if (type!=PURL::Nb_FileTypes) url = url.toFileType(type);
+ return PURL::Url(Main::project()->directory(), url.filename());
}
Compile::FileData Compile::BaseProcess::fileData(PURL::FileType type, FileActions actions) const
Deleted: trunk/piklab_kde4/test/sdcc/add.c
===================================================================
--- trunk/piklab_kde4/test/sdcc/add.c 2012-10-06 22:04:23 UTC (rev 2962)
+++ trunk/piklab_kde4/test/sdcc/add.c 2012-10-07 01:03:58 UTC (rev 2963)
@@ -1,9 +0,0 @@
-#include <pic16f873.h>
-
-extern unsigned char ms_delay;
-
-void test() {
- ms_delay++;
- PIR1 = 0;
- PEIE = 1;
-}
Modified: trunk/piklab_kde4/test/sdcc/blink.piklab
===================================================================
--- trunk/piklab_kde4/test/sdcc/blink.piklab 2012-10-06 22:04:23 UTC (rev 2962)
+++ trunk/piklab_kde4/test/sdcc/blink.piklab 2012-10-07 01:03:58 UTC (rev 2963)
@@ -2,13 +2,13 @@
<piklab>
<general>
<device>16F873</device>
- <description></description>
+ <description/>
<version>0.1</version>
- <tool>custom</tool>
+ <tool>sdcc</tool>
<custom_linker_script/>
<files>
- <item>add.c</item>
<item>blinker.c</item>
+ <item>sub/add.c</item>
</files>
<is_library>true</is_library>
<programmer>direct</programmer>
Added: trunk/piklab_kde4/test/sdcc/sub/add.c
===================================================================
--- trunk/piklab_kde4/test/sdcc/sub/add.c (rev 0)
+++ trunk/piklab_kde4/test/sdcc/sub/add.c 2012-10-07 01:03:58 UTC (rev 2963)
@@ -0,0 +1,9 @@
+#include <pic16f873.h>
+
+extern unsigned char ms_delay;
+
+void test() {
+ ms_delay++;
+ PIR1 = 0;
+ PEIE = 1;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <az...@us...> - 2012-10-06 22:04:31
|
Revision: 2962
http://piklab.svn.sourceforge.net/piklab/?rev=2962&view=rev
Author: azhyd
Date: 2012-10-06 22:04:23 +0000 (Sat, 06 Oct 2012)
Log Message:
-----------
misc fixes
Modified Paths:
--------------
trunk/piklab_kde4/Changelog
trunk/piklab_kde4/cmake/Piklab.cmake
trunk/piklab_kde4/src/common/global/process.cpp
trunk/piklab_kde4/src/common/global/process.h
trunk/piklab_kde4/src/common/global/process_kde.cpp
trunk/piklab_kde4/src/common/global/process_kde.h
trunk/piklab_kde4/src/common/gui/dialog.cpp
trunk/piklab_kde4/src/libgui/console.cpp
trunk/piklab_kde4/src/libgui/project_manager.cpp
trunk/piklab_kde4/src/libgui/toplevel.cpp
trunk/piklab_kde4/src/libgui/toplevel.h
trunk/piklab_kde4/src/progs/gpsim/base/gpsim.cpp
trunk/piklab_kde4/src/tools/custom/CMakeLists.txt
trunk/piklab_kde4/src/tools/gui/tool_config_widget.cpp
trunk/piklab_kde4/src/tools/gui/toolchain_config_widget.cpp
trunk/piklab_kde4/src/tools/list/compile_manager.cpp
trunk/piklab_kde4/src/tools/list/compile_process.cpp
trunk/piklab_kde4/src/tools/list/compile_process.h
trunk/piklab_kde4/src/tools/list/tools_config_widget.cpp
trunk/piklab_kde4/test/sdcc/blink.piklab
Added Paths:
-----------
trunk/piklab_kde4/src/tools/custom/custom_process.cpp
trunk/piklab_kde4/src/tools/custom/custom_process.h
Modified: trunk/piklab_kde4/Changelog
===================================================================
--- trunk/piklab_kde4/Changelog 2012-10-02 05:12:47 UTC (rev 2961)
+++ trunk/piklab_kde4/Changelog 2012-10-06 22:04:23 UTC (rev 2962)
@@ -1,4 +1,4 @@
-0.16.2 (30 September 2012)
+0.16.2 (6 October 2012)
* fixed toolchain output when executable cannot be found
* fixed parsing for jalv2
* fixed template generator for jalv2
@@ -17,6 +17,9 @@
* support firmware directory with space [reported by Luis Claudio Gambôa Lopes]
* add libraries libm and libio by default sdcc linker arguments [requested by Antonio Augusto Todo Bom Neto]
* fixed config generator text field to expand properly [report by Alain Portal]
+* fixed warning when external tool not found
+* fixed running kfind from project context menu
+* fixed %I argument for custom tool [reported by Marc Berlioux]
0.16.1 (1 July 2012)
* fixed command-line utilities compilation with Qt only
Modified: trunk/piklab_kde4/cmake/Piklab.cmake
===================================================================
--- trunk/piklab_kde4/cmake/Piklab.cmake 2012-10-02 05:12:47 UTC (rev 2961)
+++ trunk/piklab_kde4/cmake/Piklab.cmake 2012-10-06 22:04:23 UTC (rev 2962)
@@ -39,7 +39,7 @@
find_package(LIBUSB REQUIRED)
include_directories(${LIBUSB_INCLUDE_DIRS})
- # required for compilation on Slackware (?)
+ # required for compilation on Slackware
find_package(NCurses REQUIRED)
include_directories(${NCURSES_INCLUDE_DIRS})
Modified: trunk/piklab_kde4/src/common/global/process.cpp
===================================================================
--- trunk/piklab_kde4/src/common/global/process.cpp 2012-10-02 05:12:47 UTC (rev 2961)
+++ trunk/piklab_kde4/src/common/global/process.cpp 2012-10-06 22:04:23 UTC (rev 2962)
@@ -52,7 +52,7 @@
FOR_EACH(OutputType, type) _outputs[type] = QString::null;
}
-bool Process::Base::start(int msec)
+void Process::Base::start(int msec)
{
_state = Stopped;
clearOutputs();
@@ -69,14 +69,9 @@
env += _environment;
}
- if ( !_process->start(env.isEmpty() ? 0 : &env) ) {
- _state = Error;
- return false;
- }
-
+ _process->start(env.isEmpty() ? 0 : &env);
if (msec >=0 ) _timer.start(msec);
_state = Running;
- return true;
}
int Process::Base::exitCode() const
@@ -173,9 +168,7 @@
bool Process::Base::execute(int msec)
{
- if (_state != Running && !start()) {
- return false;
- }
+ if (_state != Running) start();
while (msec != 0) {
int step = 100;
Modified: trunk/piklab_kde4/src/common/global/process.h
===================================================================
--- trunk/piklab_kde4/src/common/global/process.h 2012-10-02 05:12:47 UTC (rev 2961)
+++ trunk/piklab_kde4/src/common/global/process.h 2012-10-06 22:04:23 UTC (rev 2962)
@@ -45,7 +45,7 @@
QString prettyCommand() const { return arguments().join(" "); }
void setWorkingDirectory(const PURL::Directory &dir);
void setUseShell(bool useShell);
- virtual bool start(int msec = -1); // -1 == no timeout
+ void start(int msec = -1); // -1 == no timeout
void writeToStdin(const QString &s);
bool signal(int n);
bool isRunning() const;
Modified: trunk/piklab_kde4/src/common/global/process_kde.cpp
===================================================================
--- trunk/piklab_kde4/src/common/global/process_kde.cpp 2012-10-02 05:12:47 UTC (rev 2961)
+++ trunk/piklab_kde4/src/common/global/process_kde.cpp 2012-10-06 22:04:23 UTC (rev 2962)
@@ -31,7 +31,7 @@
}
}
-bool Process::ProcessIO::start(QStringList *env)
+void Process::ProcessIO::start(QStringList *env)
{
if (env) {
for (QStringList::const_iterator it = env->begin();
@@ -43,7 +43,6 @@
}
_kproc->setOutputChannelMode(KProcess::SeparateChannels);
_kproc->start();
- return true;
}
QByteArray Process::ProcessIO::readStdout()
Modified: trunk/piklab_kde4/src/common/global/process_kde.h
===================================================================
--- trunk/piklab_kde4/src/common/global/process_kde.h 2012-10-02 05:12:47 UTC (rev 2961)
+++ trunk/piklab_kde4/src/common/global/process_kde.h 2012-10-06 22:04:23 UTC (rev 2962)
@@ -21,7 +21,7 @@
public:
ProcessIO(QObject *parent = 0);
void setArguments(const QStringList &args);
- bool start(QStringList *env = 0);
+ void start(QStringList *env = 0);
QByteArray readStdout();
QByteArray readStderr();
Modified: trunk/piklab_kde4/src/common/gui/dialog.cpp
===================================================================
--- trunk/piklab_kde4/src/common/gui/dialog.cpp 2012-10-02 05:12:47 UTC (rev 2961)
+++ trunk/piklab_kde4/src/common/gui/dialog.cpp 2012-10-06 22:04:23 UTC (rev 2962)
@@ -129,7 +129,7 @@
{
Synchronous sync(1000);
QObject::connect(&process, SIGNAL(done(int)), &sync, SLOT(done()));
- if ( process.state()!=Running && !process.start() ) return process.state();
+ if (process.state()!=Running) process.start();
if (sync.enterLoop()) return process.state();
// continue running the process with a dialog
Modified: trunk/piklab_kde4/src/libgui/console.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/console.cpp 2012-10-02 05:12:47 UTC (rev 2961)
+++ trunk/piklab_kde4/src/libgui/console.cpp 2012-10-06 22:04:23 UTC (rev 2962)
@@ -19,7 +19,8 @@
#include "common/gui/global_ui.h"
ConsoleView::ConsoleView(QWidget *parent)
- : QWidget(parent, "console_view"), _initialized(false)
+: QWidget(parent, "console_view"),
+ _initialized(false)
{}
void ConsoleView::showEvent(QShowEvent *e)
Modified: trunk/piklab_kde4/src/libgui/project_manager.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/project_manager.cpp 2012-10-02 05:12:47 UTC (rev 2961)
+++ trunk/piklab_kde4/src/libgui/project_manager.cpp 2012-10-06 22:04:23 UTC (rev 2962)
@@ -183,7 +183,7 @@
if (_project.get() != NULL) {
pop.addTitle(i18n("Project"));
pop.insertItem("document-properties", i18n("Options..."), &MainWindow::self(), SLOT(configureProject()));
- pop.insertItem("edit-find", i18n("Find Files..."), &MainWindow::self(), SLOT(runKfind()));
+ pop.insertItem("edit-find", i18n("Find Files..."), &MainWindow::self(), SLOT(runKfind()));
pop.insertSeparator();
pop.insertItem("run-build", i18n("Build Project"), &MainWindow::self(), SLOT(buildProject()));
pop.insertItem("run-build-clean", i18n("Clean Project"), &MainWindow::self(), SLOT(cleanBuild()));
Modified: trunk/piklab_kde4/src/libgui/toplevel.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/toplevel.cpp 2012-10-02 05:12:47 UTC (rev 2961)
+++ trunk/piklab_kde4/src/libgui/toplevel.cpp 2012-10-06 22:04:23 UTC (rev 2962)
@@ -76,6 +76,10 @@
: _configGenerator(NULL),
_actionAfterBuild(Programmer::ProgramAction::Nb_Types)
{
+ FOR_EACH(ExternalToolType, type) {
+ _externalToolProcesses[type.type()] = NULL;
+ }
+
// status bar
_actionStatus = new QLabel(statusBar());
statusBar()->addWidget(_actionStatus);
@@ -681,39 +685,62 @@
FOR_EACH(ExternalToolType, type) {
QString name = "tools_" + type.key();
if (sender() == actionCollection()->action(name.latin1())) {
- if (_externalToolProcesses[type.type()].get() != NULL) return;
- ::Process::StringOutput* process = new ::Process::StringOutput;
- _externalToolProcesses[type.type()].reset(process);
- QStringList args;
- if (type == ExternalToolType::KFind) {
- QString path;
- PURL::Url url = Main::projectManager().projectUrl();
- if ( !url.isEmpty() ) path = url.path();
- args.append(path);
- }
- process->setup(type.key(), args, false);
- connect(process, SIGNAL(done(int)), SLOT(externalToolDone()));
- if (!process->start()) {
- if (type.data().url != NULL) {
- MessageBox::detailedSorry(i18n("Could not run \"%1\"").arg(type.key()), type.data().url, Log::Show);
- } else {
- MessageBox::sorry(i18n("Could not run \"%1\"").arg(type.key()), Log::Show);
- }
- _externalToolProcesses[type.type()].reset(NULL);
- }
+ runExternalTool(type);
+ break;
}
}
}
+void MainWindow::runKfind()
+{
+ runExternalTool(ExternalToolType::KFind);
+}
+
+void MainWindow::runExternalTool(ExternalToolType type)
+{
+ if (_externalToolProcesses[type.type()] != NULL) return;
+ ::Process::StringOutput* process = new ::Process::StringOutput;
+ _externalToolProcesses[type.type()] = process;
+ QStringList args;
+ if (type == ExternalToolType::KFind) {
+ QString path;
+ PURL::Url url = Main::projectManager().projectUrl();
+ if ( !url.isEmpty() ) path = url.path();
+ args.append(path);
+ }
+ process->setup(type.key(), args, false);
+ connect(process, SIGNAL(done()), SLOT(externalToolDone()));
+ connect(process, SIGNAL(error()), SLOT(externalToolError()));
+ process->start();
+}
+
void MainWindow::externalToolDone()
{
FOR_EACH(ExternalToolType, type) {
- if (sender() == _externalToolProcesses[type.type()].get()) {
- _externalToolProcesses[type.type()].reset(NULL);
+ if (sender() == _externalToolProcesses[type.type()]) {
+ _externalToolProcesses[type.type()]->deleteLater();
+ _externalToolProcesses[type.type()] = NULL;
+ break;
}
}
}
+void MainWindow::externalToolError()
+{
+ FOR_EACH(ExternalToolType, type) {
+ if (sender() == _externalToolProcesses[type.type()]) {
+ if (type.data().url != NULL) {
+ MessageBox::detailedSorry(i18n("Could not run \"%1\"").arg(type.key()), type.data().url, Log::Show);
+ } else {
+ MessageBox::sorry(i18n("Could not run \"%1\"").arg(type.key()), Log::Show);
+ }
+ _externalToolProcesses[type.type()]->deleteLater();
+ _externalToolProcesses[type.type()] = NULL;
+ break;
+ }
+ }
+}
+
//-----------------------------------------------------------------------------
void MainWindow::compileFile()
{
Modified: trunk/piklab_kde4/src/libgui/toplevel.h
===================================================================
--- trunk/piklab_kde4/src/libgui/toplevel.h 2012-10-02 05:12:47 UTC (rev 2961)
+++ trunk/piklab_kde4/src/libgui/toplevel.h 2012-10-06 22:04:23 UTC (rev 2962)
@@ -86,6 +86,8 @@
void runExternalTool();
void externalToolDone();
+ void externalToolError();
+ void runKfind();
void openRecentProject(const KUrl &url);
void closeProject();
@@ -103,7 +105,7 @@
VoltageStatusWidget *_vddStatus, *_vppStatus;
Q3ProgressBar *_actionProgress;
ConfigGenerator *_configGenerator;
- std::auto_ptr< ::Process::Base> _externalToolProcesses[ExternalToolType::Nb_Types];
+ ::Process::Base* _externalToolProcesses[ExternalToolType::Nb_Types];
Programmer::ProgramAction _actionAfterBuild;
std::auto_ptr<BusyCursorStarter> _busyCursor;
@@ -133,6 +135,7 @@
void cleanBuild(bool singleFile);
virtual void keyPressEvent(QKeyEvent *e);
void doAfterBuild();
+ void runExternalTool(ExternalToolType);
};
#endif
Modified: trunk/piklab_kde4/src/progs/gpsim/base/gpsim.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/gpsim/base/gpsim.cpp 2012-10-02 05:12:47 UTC (rev 2961)
+++ trunk/piklab_kde4/src/progs/gpsim/base/gpsim.cpp 2012-10-06 22:04:23 UTC (rev 2962)
@@ -100,10 +100,7 @@
exec += "gpsim";
_process._ready = false;
_process.setup(exec, QStringList("-i"), false);
- if ( !_process.start() ) {
- log(Log::LineType::Error, i18n("Failed to start \"gpsim\"."));
- return false;
- }
+ _process.start();
return runSynchronously();
}
Modified: trunk/piklab_kde4/src/tools/custom/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/tools/custom/CMakeLists.txt 2012-10-02 05:12:47 UTC (rev 2961)
+++ trunk/piklab_kde4/src/tools/custom/CMakeLists.txt 2012-10-06 22:04:23 UTC (rev 2962)
@@ -2,6 +2,7 @@
SET(customtool_STAT_SRCS
custom.cpp
+ custom_process.cpp
)
automoc(${customtool_STAT_SRCS})
Added: trunk/piklab_kde4/src/tools/custom/custom_process.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/custom/custom_process.cpp (rev 0)
+++ trunk/piklab_kde4/src/tools/custom/custom_process.cpp 2012-10-06 22:04:23 UTC (rev 2962)
@@ -0,0 +1,32 @@
+/***************************************************************************
+ * Copyright (C) 2005-2010 Nicolas Hadacek <ha...@kd...> *
+ * Copyright (C) 2003-2004 Alain Gibaud <ala...@fr...> *
+ * *
+ * 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. *
+ ***************************************************************************/
+#include "custom_process.h"
+#include "custom_process.moc"
+
+#include "tools/list/compile_manager.h"
+
+//-----------------------------------------------------------------------------
+void Compile::CustomProcess::setupProcess()
+{
+ _process->setUseShell(true);
+ QStringList args = QStringList::split(" ", _command);
+ args = process(args);
+ _process->setup(args.join(" "), QStringList(), false);
+}
+
+void Compile::CustomProcess::logLine(::Process::OutputType, const QString &line)
+{
+ _manager->log(Log::LineType::Normal, line);
+}
+
+QString Compile::CustomProcess::deviceName() const
+{
+ return GPUtils::toDeviceName(_data.device);
+}
Added: trunk/piklab_kde4/src/tools/custom/custom_process.h
===================================================================
--- trunk/piklab_kde4/src/tools/custom/custom_process.h (rev 0)
+++ trunk/piklab_kde4/src/tools/custom/custom_process.h 2012-10-06 22:04:23 UTC (rev 2962)
@@ -0,0 +1,40 @@
+/***************************************************************************
+ * Copyright (C) 2005-2006 Nicolas Hadacek <ha...@kd...> *
+ * *
+ * 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. *
+ ***************************************************************************/
+#ifndef CUSTOM_PROCESS_H
+#define CUSTOM_PROCESS_H
+
+#include "tools/list/compile_process.h"
+
+namespace Compile
+{
+
+//-----------------------------------------------------------------------------
+class CustomProcess : public BaseProcess
+{
+Q_OBJECT
+public:
+ CustomProcess(const QString &command) : _command(command) {}
+ virtual bool check() const { return true; }
+ virtual FileData::List files(bool *ok) const { if (ok) *ok = true; return FileData::List(); }
+
+protected:
+ virtual void setupProcess();
+ virtual QString outputFiles() const { return QString::null; }
+ virtual QString deviceName() const;
+
+protected slots:
+ virtual void logLine(::Process::OutputType type, const QString &line);
+
+private:
+ QString _command;
+};
+
+} // namespace
+
+#endif
Modified: trunk/piklab_kde4/src/tools/gui/tool_config_widget.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/gui/tool_config_widget.cpp 2012-10-02 05:12:47 UTC (rev 2961)
+++ trunk/piklab_kde4/src/tools/gui/tool_config_widget.cpp 2012-10-06 22:04:23 UTC (rev 2962)
@@ -64,7 +64,7 @@
_config = _group->createConfig(_project);
_tmpProject = new Project(PURL::Url());
_tmpConfig = _group->createConfig(*_tmpProject);
- Compile::Data data(_category, QValueList<Compile::Item>(), QString::null, _project, Compile::NormalLinking, Compile::Build);
+ Compile::Data data(_category, QValueList<Compile::Item>(), _config->device(&_project).name(), _project, Compile::NormalLinking, Compile::Build);
_process = _group->createCompileProcess(data, 0);
initEntries();
Modified: trunk/piklab_kde4/src/tools/gui/toolchain_config_widget.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/gui/toolchain_config_widget.cpp 2012-10-02 05:12:47 UTC (rev 2961)
+++ trunk/piklab_kde4/src/tools/gui/toolchain_config_widget.cpp 2012-10-06 22:04:23 UTC (rev 2962)
@@ -225,8 +225,8 @@
connect(_data[k].process, SIGNAL(error()), SLOT(checkExecutableDone()));
connect(_data[k].process, SIGNAL(timeout()), SLOT(checkExecutableDone()));
QString exec = baseExecutable(k);
- if ( !_data[k].process->start(5000) ) _data[k].label->setText(i18n("\"%1\" not found").arg(exec));
- else _data[k].label->setText(i18n("Detecting \"%1\"...").arg(exec));
+ _data[k].process->start(5000);
+ _data[k].label->setText(i18n("Detecting \"%1\"...").arg(exec));
}
}
@@ -243,8 +243,8 @@
connect(_devicesData[i].process, SIGNAL(timeout()), SLOT(checkDevicesDone()));
_devicesData[i].done = false;
_devicesData[i].checkLines.clear();
- if ( !_devicesData[i].process->start(5000) ) _devicesLabel->setText(i18n("Failed"));
- else _devicesLabel->setText(i18n("Detecting ..."));
+ _devicesData[i].process->start(5000);
+ _devicesLabel->setText(i18n("Detecting ..."));
}
}
Modified: trunk/piklab_kde4/src/tools/list/compile_manager.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/list/compile_manager.cpp 2012-10-02 05:12:47 UTC (rev 2961)
+++ trunk/piklab_kde4/src/tools/list/compile_manager.cpp 2012-10-06 22:04:23 UTC (rev 2962)
@@ -17,6 +17,7 @@
#include "compile_config.h"
#include "libgui/main_global.h"
#include "progs/base/prog_group.h"
+#include "tools/custom/custom_process.h"
#include "tool_list.h"
Compile::Manager::Manager(QObject *parent)
@@ -244,11 +245,7 @@
processFailed();
return false;
}
- if ( !_base->start() ) {
- log(Log::LineType::Error, i18n("Failed to execute command: check toolchain configuration."), Log::Delayed);
- processFailed();
- return false;
- }
+ _base->start();
}
return true;
}
@@ -291,13 +288,14 @@
}
QString command = commands[_customCommandIndex];
_base.reset(new CustomProcess(command));
- Compile::Data data(Tool::Category::Nb_Types, QValueList<Item>(), Main::deviceData().name(),
+ QValueList<Item> items;
+ const PURL::UrlList files = Main::project()->absoluteFiles();
+ for (PURL::UrlList::const_iterator it = files.begin(); it != files.end(); ++it) {
+ items += Item(*it, Item::NotGenerated);
+ }
+ Compile::Data data(Tool::Category::Nb_Types, items, Main::deviceData().name(),
*Main::project(), NormalLinking, Build);
_base->init(data, this);
- if ( !_base->start() ) {
- log(Log::LineType::Error, i18n("Failed to execute custom command #%1.").arg(_customCommandIndex+1), Log::Delayed);
- processFailed();
- return false;
- }
+ _base->start();
return true;
}
Modified: trunk/piklab_kde4/src/tools/list/compile_process.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/list/compile_process.cpp 2012-10-02 05:12:47 UTC (rev 2961)
+++ trunk/piklab_kde4/src/tools/list/compile_process.cpp 2012-10-06 22:04:23 UTC (rev 2962)
@@ -203,7 +203,7 @@
_manager = manager;
}
-bool Compile::BaseProcess::start()
+void Compile::BaseProcess::start()
{
_stdout = QString::null;
_stderr = QString::null;
@@ -217,7 +217,7 @@
_process->setWorkingDirectory(directory().path());
setupProcess();
_manager->log(Log::LineType::Command, _process->arguments().join(" "));
- return _process->start();
+ _process->start();
}
void Compile::BaseProcess::error()
@@ -485,22 +485,3 @@
}
static_cast<LogWidget *>(_manager->view())->appendLine(type, s + message.stripWhiteSpace(), LogData(url, line));
}
-
-//-----------------------------------------------------------------------------
-void Compile::CustomProcess::setupProcess()
-{
- _process->setUseShell(true);
- QStringList args = QStringList::split(" ", _command);
- args = process(args);
- _process->setup(args.join(" "), QStringList(), false);
-}
-
-void Compile::CustomProcess::logLine(::Process::OutputType, const QString &line)
-{
- _manager->log(Log::LineType::Normal, line);
-}
-
-QString Compile::CustomProcess::deviceName() const
-{
- return GPUtils::toDeviceName(_data.device);
-}
Modified: trunk/piklab_kde4/src/tools/list/compile_process.h
===================================================================
--- trunk/piklab_kde4/src/tools/list/compile_process.h 2012-10-02 05:12:47 UTC (rev 2961)
+++ trunk/piklab_kde4/src/tools/list/compile_process.h 2012-10-06 22:04:23 UTC (rev 2962)
@@ -165,7 +165,7 @@
virtual void init(const Data &data, Manager *manager);
virtual bool check() const = 0;
virtual FileData::List files(bool *ok) const;
- bool start();
+ void start();
signals:
void success();
@@ -221,27 +221,6 @@
virtual QString postReplaceValue(const IdData &idata, const QString &arg) const;
};
-//-----------------------------------------------------------------------------
-class CustomProcess : public BaseProcess
-{
-Q_OBJECT
-public:
- CustomProcess(const QString &command) : _command(command) {}
- virtual bool check() const { return true; }
- virtual FileData::List files(bool *ok) const { if (ok) *ok = true; return FileData::List(); }
-
-protected:
- virtual void setupProcess();
- virtual QString outputFiles() const { return QString::null; }
- virtual QString deviceName() const;
-
-protected slots:
- virtual void logLine(::Process::OutputType type, const QString &line);
-
-private:
- QString _command;
-};
-
} // namespace
#endif
Modified: trunk/piklab_kde4/src/tools/list/tools_config_widget.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/list/tools_config_widget.cpp 2012-10-02 05:12:47 UTC (rev 2961)
+++ trunk/piklab_kde4/src/tools/list/tools_config_widget.cpp 2012-10-06 22:04:23 UTC (rev 2962)
@@ -13,6 +13,7 @@
#include "tool_list.h"
#include "tools/gui/tool_config_widget.h"
#include "tools/gui/tool_group_ui.h"
+#include "tools/custom/custom_process.h"
#include "compile_config.h"
#include "compile_process.h"
#include "libgui/project.h"
Modified: trunk/piklab_kde4/test/sdcc/blink.piklab
===================================================================
--- trunk/piklab_kde4/test/sdcc/blink.piklab 2012-10-02 05:12:47 UTC (rev 2961)
+++ trunk/piklab_kde4/test/sdcc/blink.piklab 2012-10-06 22:04:23 UTC (rev 2962)
@@ -2,9 +2,9 @@
<piklab>
<general>
<device>16F873</device>
- <description/>
+ <description></description>
<version>0.1</version>
- <tool>sdcc</tool>
+ <tool>custom</tool>
<custom_linker_script/>
<files>
<item>add.c</item>
@@ -12,6 +12,10 @@
</files>
<is_library>true</is_library>
<programmer>direct</programmer>
+ <output_type>executable</output_type>
+ <custom_shell_commands>
+ <item>ls %I</item>
+ </custom_shell_commands>
</general>
<sdcc>
<custom_options/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <az...@us...> - 2012-10-02 05:12:53
|
Revision: 2961
http://piklab.svn.sourceforge.net/piklab/?rev=2961&view=rev
Author: azhyd
Date: 2012-10-02 05:12:47 +0000 (Tue, 02 Oct 2012)
Log Message:
-----------
fix config generator text field stretch and minimum height
Modified Paths:
--------------
trunk/piklab_kde4/Changelog
trunk/piklab_kde4/src/libgui/config_gen.cpp
trunk/piklab_kde4/src/libgui/text_editor.cpp
Modified: trunk/piklab_kde4/Changelog
===================================================================
--- trunk/piklab_kde4/Changelog 2012-10-02 04:54:00 UTC (rev 2960)
+++ trunk/piklab_kde4/Changelog 2012-10-02 05:12:47 UTC (rev 2961)
@@ -16,6 +16,7 @@
* added support for 24FJXXXGB1XX
* support firmware directory with space [reported by Luis Claudio Gambôa Lopes]
* add libraries libm and libio by default sdcc linker arguments [requested by Antonio Augusto Todo Bom Neto]
+* fixed config generator text field to expand properly [report by Alain Portal]
0.16.1 (1 July 2012)
* fixed command-line utilities compilation with Qt only
Modified: trunk/piklab_kde4/src/libgui/config_gen.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/config_gen.cpp 2012-10-02 04:54:00 UTC (rev 2960)
+++ trunk/piklab_kde4/src/libgui/config_gen.cpp 2012-10-02 05:12:47 UTC (rev 2961)
@@ -53,6 +53,7 @@
_text = new SimpleTextEditor(false, mainWidget());
_text->setReadOnly(true);
top->addWidget(_text);
+ top->setStretchFactor(_text, 10);
_warning = new QLabel(mainWidget());
top->addWidget(_warning);
Modified: trunk/piklab_kde4/src/libgui/text_editor.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/text_editor.cpp 2012-10-02 04:54:00 UTC (rev 2960)
+++ trunk/piklab_kde4/src/libgui/text_editor.cpp 2012-10-02 05:12:47 UTC (rev 2961)
@@ -56,6 +56,9 @@
void TextEditor::init(bool withDebugger)
{
+ QFontMetrics fm(font());
+ setMinimumHeight(5*fm.height());
+
KPluginLoader loader("katepart");
KPluginFactory *factory = loader.factory();
if (factory == NULL) qFatal("Could not find katepart: Install Kate.");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <az...@us...> - 2012-10-02 04:54:06
|
Revision: 2960
http://piklab.svn.sourceforge.net/piklab/?rev=2960&view=rev
Author: azhyd
Date: 2012-10-02 04:54:00 +0000 (Tue, 02 Oct 2012)
Log Message:
-----------
maybe fix compilation on Slackware
Modified Paths:
--------------
trunk/piklab_kde4/cmake/Piklab.cmake
trunk/piklab_kde4/src/dev-utils/list_generator/CMakeLists.txt
trunk/piklab_kde4/src/piklab/CMakeLists.txt
trunk/piklab_kde4/src/piklab-coff/CMakeLists.txt
trunk/piklab_kde4/src/piklab-hex/CMakeLists.txt
trunk/piklab_kde4/src/piklab-prog/CMakeLists.txt
trunk/piklab_kde4/src/piklab-test/checksum/CMakeLists.txt
trunk/piklab_kde4/src/piklab-test/generators/CMakeLists.txt
trunk/piklab_kde4/src/piklab-test/save_load_memory/CMakeLists.txt
Modified: trunk/piklab_kde4/cmake/Piklab.cmake
===================================================================
--- trunk/piklab_kde4/cmake/Piklab.cmake 2012-10-01 05:10:01 UTC (rev 2959)
+++ trunk/piklab_kde4/cmake/Piklab.cmake 2012-10-02 04:54:00 UTC (rev 2960)
@@ -20,18 +20,6 @@
qt4_automoc(${ARGV})
endmacro(automoc)
-if(QT_ONLY)
- add_definitions(-DNO_KDE)
- set(EXE_LIBS ${QT_LIBRARIES})
- set(GUI_LIBS nokde_gui ${EXE_LIBS})
-else(QT_ONLY)
- find_package(KDE4 REQUIRED)
- add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
- include_directories( ${KDE4_INCLUDES})
- set(EXE_LIBS ${QT_LIBRARIES} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS})
- set(GUI_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${EXE_LIBS} kde_gui ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KFILE_LIBS})
-endif(QT_ONLY)
-
if(WIN32)
if (HAVE_USB)
if(NOT EXISTS "${LIBUSB_DIR}")
@@ -51,6 +39,7 @@
find_package(LIBUSB REQUIRED)
include_directories(${LIBUSB_INCLUDE_DIRS})
+ # required for compilation on Slackware (?)
find_package(NCurses REQUIRED)
include_directories(${NCURSES_INCLUDE_DIRS})
@@ -60,4 +49,16 @@
find_package(ParallelPortSupport)
endif(WIN32)
+if(QT_ONLY)
+ add_definitions(-DNO_KDE)
+ set(EXE_LIBS ${QT_LIBRARIES} ${READLINE_LIBRARIES} ${NCURSES_LIBRARIES})
+ set(GUI_LIBS nokde_gui ${EXE_LIBS} ${LIBUSB_LIBRARIES})
+else(QT_ONLY)
+ find_package(KDE4 REQUIRED)
+ add_definitions(${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
+ include_directories( ${KDE4_INCLUDES})
+ set(EXE_LIBS ${QT_LIBRARIES} ${KDE4_KDECORE_LIBS} ${KDE4_KIO_LIBS} ${READLINE_LIBRARIES} ${NCURSES_LIBRARIES})
+ set(GUI_LIBS ${KDE4_KDEUI_LIBS} ${KDE4_KDE3SUPPORT_LIBS} ${EXE_LIBS} kde_gui ${KDE4_KTEXTEDITOR_LIBS} ${KDE4_KFILE_LIBS} ${LIBUSB_LIBRARIES})
+endif(QT_ONLY)
+
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
Modified: trunk/piklab_kde4/src/dev-utils/list_generator/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/dev-utils/list_generator/CMakeLists.txt 2012-10-01 05:10:01 UTC (rev 2959)
+++ trunk/piklab_kde4/src/dev-utils/list_generator/CMakeLists.txt 2012-10-02 04:54:00 UTC (rev 2960)
@@ -25,5 +25,4 @@
pic picbase picxml mem24 mem24base mem24xml
devicebase common
${GUI_LIBS}
- ${LIBUSB_LIBRARIES}
)
Modified: trunk/piklab_kde4/src/piklab/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/piklab/CMakeLists.txt 2012-10-01 05:10:01 UTC (rev 2959)
+++ trunk/piklab_kde4/src/piklab/CMakeLists.txt 2012-10-02 04:54:00 UTC (rev 2960)
@@ -24,7 +24,6 @@
pic picbase picxml mem24 mem24base mem24xml
devicebase common
${GUI_LIBS}
- ${LIBUSB_LIBRARIES}
)
install(TARGETS piklab DESTINATION bin)
Modified: trunk/piklab_kde4/src/piklab-coff/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/piklab-coff/CMakeLists.txt 2012-10-01 05:10:01 UTC (rev 2959)
+++ trunk/piklab_kde4/src/piklab-coff/CMakeLists.txt 2012-10-02 04:54:00 UTC (rev 2960)
@@ -11,7 +11,6 @@
devicelistnoui pic picbase picxml mem24 mem24base mem24xml
devicebase common
${EXE_LIBS}
- ${READLINE_LIBRARIES}
)
install(TARGETS piklab-coff DESTINATION bin)
Modified: trunk/piklab_kde4/src/piklab-hex/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/piklab-hex/CMakeLists.txt 2012-10-01 05:10:01 UTC (rev 2959)
+++ trunk/piklab_kde4/src/piklab-hex/CMakeLists.txt 2012-10-02 04:54:00 UTC (rev 2960)
@@ -11,7 +11,6 @@
pic picbase picxml mem24 mem24base mem24xml
devicebase common
${EXE_LIBS}
- ${READLINE_LIBRARIES}
)
install(TARGETS piklab-hex DESTINATION bin)
Modified: trunk/piklab_kde4/src/piklab-prog/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/piklab-prog/CMakeLists.txt 2012-10-01 05:10:01 UTC (rev 2959)
+++ trunk/piklab_kde4/src/piklab-prog/CMakeLists.txt 2012-10-02 04:54:00 UTC (rev 2960)
@@ -19,7 +19,6 @@
devicebase common
${EXE_LIBS}
${LIBUSB_LIBRARIES}
- ${READLINE_LIBRARIES}
)
install(TARGETS piklab-prog DESTINATION bin)
Modified: trunk/piklab_kde4/src/piklab-test/checksum/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/piklab-test/checksum/CMakeLists.txt 2012-10-01 05:10:01 UTC (rev 2959)
+++ trunk/piklab_kde4/src/piklab-test/checksum/CMakeLists.txt 2012-10-02 04:54:00 UTC (rev 2960)
@@ -11,5 +11,4 @@
pic picbase picxml mem24 mem24base mem24xml
devicebase common
${EXE_LIBS}
- ${CURSES_LIBRARIES} ${LIBREADLINE_LIBRARIES} ${LIBHISTORY_LIBRARIES}
)
Modified: trunk/piklab_kde4/src/piklab-test/generators/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/piklab-test/generators/CMakeLists.txt 2012-10-01 05:10:01 UTC (rev 2959)
+++ trunk/piklab_kde4/src/piklab-test/generators/CMakeLists.txt 2012-10-02 04:54:00 UTC (rev 2960)
@@ -10,7 +10,6 @@
pic picbase picxml mem24 mem24base mem24xml
devicebase common
${EXE_LIBS}
- ${READLINE_LIBRARIES}
)
SET(gputils_template_generator_check_SRCS
@@ -23,7 +22,6 @@
pic picbase picxml mem24 mem24base mem24xml
devicebase common
${EXE_LIBS}
- ${READLINE_LIBRARIES}
)
SET(sdcc_config_generator_check_SRCS
@@ -36,5 +34,4 @@
pic picbase picxml mem24 mem24base mem24xml
devicebase common
${EXE_LIBS}
- ${READLINE_LIBRARIES}
)
Modified: trunk/piklab_kde4/src/piklab-test/save_load_memory/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/piklab-test/save_load_memory/CMakeLists.txt 2012-10-01 05:10:01 UTC (rev 2959)
+++ trunk/piklab_kde4/src/piklab-test/save_load_memory/CMakeLists.txt 2012-10-02 04:54:00 UTC (rev 2960)
@@ -10,5 +10,4 @@
pic picbase picxml mem24 mem24base mem24xml
devicebase common
${EXE_LIBS}
- ${READLINE_LIBRARIES}
)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <az...@us...> - 2012-10-01 05:10:07
|
Revision: 2959
http://piklab.svn.sourceforge.net/piklab/?rev=2959&view=rev
Author: azhyd
Date: 2012-10-01 05:10:01 +0000 (Mon, 01 Oct 2012)
Log Message:
-----------
try to fix compilation for slackware
Modified Paths:
--------------
trunk/piklab_kde4/Changelog
trunk/piklab_kde4/cmake/Piklab.cmake
Added Paths:
-----------
trunk/piklab_kde4/cmake/FindNCurses.cmake
Modified: trunk/piklab_kde4/Changelog
===================================================================
--- trunk/piklab_kde4/Changelog 2012-10-01 04:45:14 UTC (rev 2958)
+++ trunk/piklab_kde4/Changelog 2012-10-01 05:10:01 UTC (rev 2959)
@@ -9,7 +9,8 @@
* added pickit3 support for 18F2XX/4XX 18F4520/18F4580 (with correct firmware loaded)
* fixed hang with "stop" command in interactive command-line programmer
* fixed compilation on Fedora 17 [thanks to bitlord]
-* fixed compilation on CentOS 6 [Thanks to Alain Portal]
+* fixed compilation on CentOS 6 [thanks to Alain Portal]
+* fixed link on Slackware [reported by breakfastfish]
* fixed sdcc generator for latest sdcc [patch by Antonio Augusto Todo Bom Neto]
* fixed log views to read properly setting [reported by Luis Claudio Gambôa Lopes]
* added support for 24FJXXXGB1XX
Added: trunk/piklab_kde4/cmake/FindNCurses.cmake
===================================================================
--- trunk/piklab_kde4/cmake/FindNCurses.cmake (rev 0)
+++ trunk/piklab_kde4/cmake/FindNCurses.cmake 2012-10-01 05:10:01 UTC (rev 2959)
@@ -0,0 +1,25 @@
+# - Try to find Readline
+# Once done this will define
+# NCURSES_FOUND - System has ncurses
+# NCURSES_INCLUDE_DIRS - The ncurses include directories
+# NCURSES_LIBRARIES - The libraries needed to use ncurses
+# NCURSES_DEFINITIONS - Compiler switches required for using ncurses
+
+find_package ( PkgConfig )
+pkg_check_modules ( PC_NCURSES QUIET ncurses )
+set ( NCURSES_DEFINITIONS ${PC_NCURSES_CFLAGS_OTHER} )
+
+find_path ( NCURSES_INCLUDE_DIR ncurses.h
+ HINTS ${PC_NCURSES_INCLUDEDIR} ${PC_NCURSES_INCLUDE_DIRS}
+ PATH_SUFFIXES ncurses )
+
+find_library ( NCURSES_LIBRARY NAMES ncurses
+ HINTS ${PC_NCURSES_LIBDIR} ${PC_NCURSES_LIBRARY_DIRS} )
+
+set ( NCURSES_LIBRARIES ${NCURSES_LIBRARY} )
+set ( NCURSES_INCLUDE_DIRS ${NCURSES_INCLUDE_DIR} )
+
+include ( FindPackageHandleStandardArgs )
+# handle the QUIETLY and REQUIRED arguments and set NCURSES_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args ( ncurses DEFAULT_MSG NCURSES_LIBRARY NCURSES_INCLUDE_DIR )
Modified: trunk/piklab_kde4/cmake/Piklab.cmake
===================================================================
--- trunk/piklab_kde4/cmake/Piklab.cmake 2012-10-01 04:45:14 UTC (rev 2958)
+++ trunk/piklab_kde4/cmake/Piklab.cmake 2012-10-01 05:10:01 UTC (rev 2959)
@@ -51,6 +51,9 @@
find_package(LIBUSB REQUIRED)
include_directories(${LIBUSB_INCLUDE_DIRS})
+ find_package(NCurses REQUIRED)
+ include_directories(${NCURSES_INCLUDE_DIRS})
+
find_package(Readline REQUIRED)
include_directories(${READLINE_INCLUDE_DIRS})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <az...@us...> - 2012-10-01 04:45:20
|
Revision: 2958
http://piklab.svn.sourceforge.net/piklab/?rev=2958&view=rev
Author: azhyd
Date: 2012-10-01 04:45:14 +0000 (Mon, 01 Oct 2012)
Log Message:
-----------
fix compilation on CentOS 6
Modified Paths:
--------------
trunk/piklab_kde4/Changelog
trunk/piklab_kde4/src/libgui/CMakeLists.txt
trunk/piklab_kde4/src/libgui/text_editor.cpp
Modified: trunk/piklab_kde4/Changelog
===================================================================
--- trunk/piklab_kde4/Changelog 2012-10-01 04:29:11 UTC (rev 2957)
+++ trunk/piklab_kde4/Changelog 2012-10-01 04:45:14 UTC (rev 2958)
@@ -9,11 +9,12 @@
* added pickit3 support for 18F2XX/4XX 18F4520/18F4580 (with correct firmware loaded)
* fixed hang with "stop" command in interactive command-line programmer
* fixed compilation on Fedora 17 [thanks to bitlord]
+* fixed compilation on CentOS 6 [Thanks to Alain Portal]
* fixed sdcc generator for latest sdcc [patch by Antonio Augusto Todo Bom Neto]
* fixed log views to read properly setting [reported by Luis Claudio Gambôa Lopes]
* added support for 24FJXXXGB1XX
* support firmware directory with space [reported by Luis Claudio Gambôa Lopes]
-* add libraries libm and libio by default sdcc linker options [requested by Antonio Augusto Todo Bom Neto]
+* add libraries libm and libio by default sdcc linker arguments [requested by Antonio Augusto Todo Bom Neto]
0.16.1 (1 July 2012)
* fixed command-line utilities compilation with Qt only
Modified: trunk/piklab_kde4/src/libgui/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/libgui/CMakeLists.txt 2012-10-01 04:29:11 UTC (rev 2957)
+++ trunk/piklab_kde4/src/libgui/CMakeLists.txt 2012-10-01 04:45:14 UTC (rev 2958)
@@ -1,5 +1,8 @@
include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${KDE3_INCLUDE_DIR} ${QT_INCLUDE_DIR} )
+# needed for CentOS 6 to use KXMLGUIClient::setXMLFile and KXMLGUIClient::setLocalXMLFile
+set_source_files_properties(text_editor.cpp PROPERTIES COMPILE_FLAGS -fno-access-control)
+
# for messages extraction
FILE(GLOB RC_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/../data/app_data/*.rc")
ADD_CUSTOM_COMMAND(
Modified: trunk/piklab_kde4/src/libgui/text_editor.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/text_editor.cpp 2012-10-01 04:29:11 UTC (rev 2957)
+++ trunk/piklab_kde4/src/libgui/text_editor.cpp 2012-10-01 04:45:14 UTC (rev 2958)
@@ -122,7 +122,9 @@
// prevent warning: No such XML file ".../.kde/share/apps/piklab/katepartui.rc"
QFile::copy(katePartUI, katePartLocalUI);
}
- v->replaceXMLFile(katePartUI, katePartLocalUI);
+ //v->replaceXMLFile(katePartUI, katePartLocalUI); // does not compile on CentOS 6 (kde 4.3.4)
+ v->setLocalXMLFile(katePartLocalUI);
+ v->setXMLFile(katePartUI);
}
v->actionCollection()->addAction("editor_toggle_breakpoint", Debugger::manager, SLOT(toggleBreakpoint()));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|