Thread: [Piklab-svn] SF.net SVN: piklab:[2953] trunk/piklab_kde4 (Page 2)
IDE for PIC microcontrollers
Brought to you by:
azhyd
Menu
▾
▴
piklab-svn
|
From: <az...@us...> - 2012-09-01 18:31:15
|
Revision: 2953
http://piklab.svn.sourceforge.net/piklab/?rev=2953&view=rev
Author: azhyd
Date: 2012-09-01 18:31:07 +0000 (Sat, 01 Sep 2012)
Log Message:
-----------
fixed sdcc generator for latest sdcc [patch by Antonio Augusto Todo Bom Neto]
Modified Paths:
--------------
trunk/piklab_kde4/Changelog
trunk/piklab_kde4/src/tools/sdcc/sdcc_generator.cpp
trunk/piklab_kde4/test/gputils/blinker18/blinker_18.piklab
Modified: trunk/piklab_kde4/Changelog
===================================================================
--- trunk/piklab_kde4/Changelog 2012-08-16 06:44:44 UTC (rev 2952)
+++ trunk/piklab_kde4/Changelog 2012-09-01 18:31:07 UTC (rev 2953)
@@ -1,14 +1,15 @@
-0.16.2 (15 August 2012)
+0.16.2 (1 September 2012)
* fixed toolchain output when executable cannot be found
* fixed parsing for jalv2
* fixed template generator for jalv2
* do not set target power with ICD2 if device nominal vdd is not 5V
-* add menu entries to configure editor, to toggle/enable breakpoints, to switch editors, and
+* 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 (with correct firmware loaded)
* fixed hang with "stop" command in interactive command-line programmer
-* fix compilation on Fedora 17 [thanks to bitlord]
+* fixed compilation on Fedora 17 [thanks to bitlord]
+* fixed sdcc generator for latest sdcc [patch by Antonio Augusto Todo Bom Neto]
0.16.1 (1 July 2012)
* fixed command-line utilities compilation with Qt only
@@ -33,13 +34,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]
@@ -52,9 +53,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]
Modified: trunk/piklab_kde4/src/tools/sdcc/sdcc_generator.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/sdcc/sdcc_generator.cpp 2012-08-16 06:44:44 UTC (rev 2952)
+++ trunk/piklab_kde4/src/tools/sdcc/sdcc_generator.cpp 2012-09-01 18:31:07 UTC (rev 2953)
@@ -69,8 +69,8 @@
QStringList cnames = SourceLine::configNames(Pic::ConfigNameType::SDCC, pmemory, i, ok);
if ( cnames.isEmpty() ) continue;
QString code;
- if ( data.is18Family() ) code += "code char at ";
- else code += "word at ";
+ if ( data.is18Family() ) code += "__code char __at ";
+ else code += "word __at ";
if ( cword.name.isEmpty() ) code += toHexLabel(address, data.nbCharsAddress()) + " CONFIG";
else code += prefix + cword.name + " " + cword.name;
code += " = " + cnames.join(" & ") + ";";
Modified: trunk/piklab_kde4/test/gputils/blinker18/blinker_18.piklab
===================================================================
--- trunk/piklab_kde4/test/gputils/blinker18/blinker_18.piklab 2012-08-16 06:44:44 UTC (rev 2952)
+++ trunk/piklab_kde4/test/gputils/blinker18/blinker_18.piklab 2012-09-01 18:31:07 UTC (rev 2953)
@@ -12,6 +12,9 @@
<version>0.1</version>
<tool>gputils</tool>
<programmer>pickit3</programmer>
+ <opened_files>
+ <item>blinker_18.asm</item>
+ </opened_files>
</general>
<assembler>
<custom_options/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <az...@us...> - 2012-09-09 23:37:56
|
Revision: 2956
http://piklab.svn.sourceforge.net/piklab/?rev=2956&view=rev
Author: azhyd
Date: 2012-09-09 23:37:49 +0000 (Sun, 09 Sep 2012)
Log Message:
-----------
work on pickit3 + misc fixes
Modified Paths:
--------------
trunk/piklab_kde4/Changelog
trunk/piklab_kde4/src/libgui/log_view.cpp
trunk/piklab_kde4/src/progs/base/generic_prog.cpp
trunk/piklab_kde4/src/progs/gui/prog_config_widget.cpp
trunk/piklab_kde4/src/progs/gui/prog_group_ui.cpp
trunk/piklab_kde4/src/progs/pickit3/base/pickit3.cpp
trunk/piklab_kde4/src/progs/pickit3/base/pickit3.h
trunk/piklab_kde4/src/progs/pickit3/base/pickit3.xml
trunk/piklab_kde4/src/progs/pickit3/base/pickit3_data.h
trunk/piklab_kde4/src/progs/pickit3/base/pickit3_prog.cpp
trunk/piklab_kde4/src/progs/pickit3/base/pickit3_prog.h
trunk/piklab_kde4/src/progs/pickit3/gui/pickit3_group_ui.cpp
trunk/piklab_kde4/src/progs/pickit3/gui/pickit3_group_ui.h
trunk/piklab_kde4/src/progs/pickit3/pickit3_data/pickit3_data.cpp
trunk/piklab_kde4/test/gputils/blinker18/blinker_18.piklab
Modified: trunk/piklab_kde4/Changelog
===================================================================
--- trunk/piklab_kde4/Changelog 2012-09-09 23:35:27 UTC (rev 2955)
+++ trunk/piklab_kde4/Changelog 2012-09-09 23:37:49 UTC (rev 2956)
@@ -1,4 +1,4 @@
-0.16.2 (1 September 2012)
+0.16.2 (9 September 2012)
* fixed toolchain output when executable cannot be found
* fixed parsing for jalv2
* fixed template generator for jalv2
@@ -6,10 +6,13 @@
* 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 (with correct firmware loaded)
+* 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 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]
0.16.1 (1 July 2012)
* fixed command-line utilities compilation with Qt only
Modified: trunk/piklab_kde4/src/libgui/log_view.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/log_view.cpp 2012-09-09 23:35:27 UTC (rev 2955)
+++ trunk/piklab_kde4/src/libgui/log_view.cpp 2012-09-09 23:37:49 UTC (rev 2956)
@@ -27,6 +27,7 @@
setReadOnly(true);
setPalette(p);
setMinimumWidth(300);
+ setDebugLevel(GlobalConfig::debugLevel());
connect(this, SIGNAL(aboutToShowContextMenu(QMenu*)), this, SLOT(slotAboutToShowContextMenu(QMenu*)));
}
Modified: trunk/piklab_kde4/src/progs/base/generic_prog.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/base/generic_prog.cpp 2012-09-09 23:35:27 UTC (rev 2955)
+++ trunk/piklab_kde4/src/progs/base/generic_prog.cpp 2012-09-09 23:37:49 UTC (rev 2956)
@@ -158,11 +158,15 @@
PURL::Directory Programmer::Base::firmwareDirectory()
{
- if ( _firmwareDirectory.isEmpty() ) _firmwareDirectory = GroupConfig::firmwareDirectory(group());
- if ( !_firmwareDirectory.exists() ) {
- log(Log::LineType::Error, i18n("Firmware directory is not configured or does not exist."));
+ if (_firmwareDirectory.isEmpty()) _firmwareDirectory = GroupConfig::firmwareDirectory(group());
+ if (_firmwareDirectory.isEmpty()) {
+ log(Log::LineType::Error, i18n("Firmware directory is not configured."));
return PURL::Directory();
}
+ if (!_firmwareDirectory.exists()) {
+ log(Log::LineType::Error, i18n("Firmware directory '%1' does not exist.").arg(_firmwareDirectory.pretty()));
+ return PURL::Directory();
+ }
return _firmwareDirectory;
}
@@ -238,7 +242,7 @@
bool Programmer::Base::setTargetPowerOn(bool on)
{
_targetPowerOn = on;
- return _deviceSpecific->setTargetPowerOn(on);
+ return _deviceSpecific.get() != NULL ? _deviceSpecific->setTargetPowerOn(on) : true;
}
void Programmer::Base::appendTask(Task task, const Device::MemoryRange& range)
Modified: trunk/piklab_kde4/src/progs/gui/prog_config_widget.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/gui/prog_config_widget.cpp 2012-09-09 23:35:27 UTC (rev 2955)
+++ trunk/piklab_kde4/src/progs/gui/prog_config_widget.cpp 2012-09-09 23:37:49 UTC (rev 2956)
@@ -34,7 +34,7 @@
void Programmer::ConfigWidget::saveConfig()
{
- if (_firmwareDir) GroupConfig::writeFirmwareDirectory(_group, _firmwareDir->url().url());
+ if (_firmwareDir) GroupConfig::writeFirmwareDirectory(_group, _firmwareDir->url().path());
}
bool Programmer::ConfigWidget::setPort(const HardwareDescription &)
Modified: trunk/piklab_kde4/src/progs/gui/prog_group_ui.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/gui/prog_group_ui.cpp 2012-09-09 23:35:27 UTC (rev 2955)
+++ trunk/piklab_kde4/src/progs/gui/prog_group_ui.cpp 2012-09-09 23:37:49 UTC (rev 2956)
@@ -46,10 +46,11 @@
//----------------------------------------------------------------------------
Programmer::AdvancedDialog::AdvancedDialog(Base &base, QWidget *parent, const char *name)
- : PageDialog(parent, name, true, i18n("Advanced Dialog"), Close, Close, false),
- _base(base), _calEditor(0)
+: PageDialog(parent, name, true, i18n("Advanced Dialog"), Close, Close, false),
+ _base(base), _calEditor(0)
{
setFaceType(List);
+
// programmer
_programmerContainer = new Container::Grid(this);
KPageWidgetItem* item = addPage(_programmerContainer, _base.group().label());
Modified: trunk/piklab_kde4/src/progs/pickit3/base/pickit3.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/pickit3/base/pickit3.cpp 2012-09-09 23:35:27 UTC (rev 2955)
+++ trunk/piklab_kde4/src/progs/pickit3/base/pickit3.cpp 2012-09-09 23:37:49 UTC (rev 2956)
@@ -76,6 +76,7 @@
//-----------------------------------------------------------------------------
Pickit3::Hardware::Hardware(::Programmer::Base &base)
: ::Programmer::PicHardware(base, new Port(base), QString::null),
+ _apId(0), _firmwareId(0),
_powerOptions(NoPowerOption)
{
}
@@ -208,10 +209,8 @@
if (!getStatus(status)) return false;
if (!selfTest()) return false;
if (!readSerialNumber()) return false;
- if (!getVersion()) return false;
if (!queryProgToGoConfig()) return false;
if (!getProtocolVersion()) return false;
- if (!sendConfigPacket()) return false;
return true;
}
@@ -219,7 +218,6 @@
{
ByteArray in;
if (!commandWithSimpleResponse(0x3F, in)) return false;
- // ### FIXME
status._major = in.getValue( 6, 2);
status._init0 = in.getValue(10, 2);
status._init1 = in.getValue(14, 2);
@@ -250,11 +248,30 @@
return true;
}
-bool Pickit3::Hardware::getVersion()
+bool Pickit3::Hardware::getVersions()
{
ByteArray in;
if (!commandWithSimpleResponse(0x41, in)) return false;
- // TODO
+ const uint size = in.getValue(2, 2);
+ if (size != 0x16) {
+ log(Log::LineType::Error, i18n("Wrong size \"%1\" (was expecting \"%2\")").arg(size).arg(0x16));
+ return false;
+ }
+ const uint status = in.getValue(4, 2);
+ if (status != 0x00) {
+ log(Log::LineType::Error, i18n("Wrong status \"%1\" (was expecting \"%2\")").arg(status).arg(0x00));
+ return false;
+ }
+ _osVersion = VersionData(in.getValue(7, 1), in.getValue(8, 1), in.getValue(9, 1));
+ log(Log::DebugLevel::Extra, QString("OS Version: %1").arg(_osVersion.pretty()));
+ _apId = in.getValue(10, 1);
+ _apVersion = VersionData(in.getValue(11, 1), in.getValue(12, 1), in.getValue(13, 1));
+ log(Log::DebugLevel::Extra, QString("AP: %1 Version: %2").arg(_apId).arg(_apVersion.pretty()));
+ _hardwareRevision = in.getValue(18, 2);
+ log(Log::DebugLevel::Extra, QString("Hardware Revision: %1").arg(toHexLabel(_hardwareRevision, 2)));
+ _firmwareId = in.getValue(24, 1);
+ _firmwareVersion = VersionData(in.getValue(25, 1), in.getValue(26, 1), in.getValue(27, 1));
+ log(Log::DebugLevel::Extra, QString("Firmware: %1 Version: %2").arg(_firmwareId).arg(_firmwareVersion.pretty()));
return true;
}
@@ -329,7 +346,9 @@
// row erase latches
data.setValue(progFamily->rowEraseLatches, 68, 1);
// vdd min, max, and default
- data.setValue((progFamily->vddMin * 8) / 1000, 69, 1);
+ uint vddMin = progFamily->vddMin;
+ if (vddMin == 2000) vddMin = 2125; // FIXME
+ data.setValue((vddMin * 8) / 1000, 69, 1);
data.setValue((progFamily->vddMax * 8) / 1000, 70, 1);
data.setValue((progFamily->vddDef * 8) / 1000, 71, 1);
// vpp min, max, and default
@@ -372,7 +391,8 @@
data.setValue(0, 118, 4); // FIXME
data.setValue(0, 122, 4); // FIXME
// panel count, size
- uint panelCount = (codeSize - progFamily->bootSize) / progFamily->panelSize;
+ uint panelCount = 1;
+ if (progFamily->panelSize != 0) panelCount = (codeSize - progFamily->bootSize) / progFamily->panelSize;
data.setValue(panelCount, 126, 2);
data.setValue(progFamily->panelSize, 128, 2);
// config masks
@@ -499,7 +519,7 @@
return commandWithComplexResponse(0xA0, "endBracket", in, &out);
}
-bool Pickit3::Hardware::getVoltages(Device::VoltageValues& voltages)
+bool Pickit3::Hardware::readVoltages(Device::VoltageValues& voltages)
{
ByteArray in;
if (!commandWithSimpleResponse(0x20, in)) return false;
@@ -647,3 +667,10 @@
}
return endBracket();
}
+
+bool Pickit3::Hardware::uploadAP(const Pic::Memory&)
+{
+ // ### FIXME
+ log(Log::LineType::Error, "Uploading firmware not supported yet");
+ return false;
+}
Modified: trunk/piklab_kde4/src/progs/pickit3/base/pickit3.h
===================================================================
--- trunk/piklab_kde4/src/progs/pickit3/base/pickit3.h 2012-09-09 23:35:27 UTC (rev 2955)
+++ trunk/piklab_kde4/src/progs/pickit3/base/pickit3.h 2012-09-09 23:37:49 UTC (rev 2956)
@@ -207,11 +207,20 @@
bool write(Pic::MemoryRangeType type, uint wordOffset, const Device::Array& data);
bool setPower(bool on, bool targetSelfPowered);
virtual bool setTargetReset(Device::ResetMode mode);
- virtual bool getVoltages(Device::VoltageValues&);
+ virtual bool readVoltages(Device::VoltageValues&);
ByteArray createConfigPacket() const;
uint computeChecksum(const ByteArray& data) const;
+ bool sendConfigPacket();
+ bool getVersions();
+ const VersionData& getFirmwareVersion() const { return _firmwareVersion; }
+ const VersionData& getOSVersion() const { return _osVersion; }
+ const VersionData& getAPVersion() const { return _apVersion; }
+ uint getAPId() const { return _apId; }
+ bool uploadAP(const Pic::Memory&);
private:
+ VersionData _osVersion, _apVersion, _firmwareVersion;
+ uint _apId, _hardwareRevision, _firmwareId;
PowerOptions _powerOptions;
virtual bool internalConnectHardware();
@@ -219,10 +228,8 @@
bool getStatus(SystemStatus& status);
bool selfTest();
bool readSerialNumber();
- bool getVersion();
bool queryProgToGoConfig();
bool getProtocolVersion();
- bool sendConfigPacket();
bool beginBracket();
bool endBracket();
bool setDebugOption();
Modified: trunk/piklab_kde4/src/progs/pickit3/base/pickit3.xml
===================================================================
--- trunk/piklab_kde4/src/progs/pickit3/base/pickit3.xml 2012-09-09 23:35:27 UTC (rev 2955)
+++ trunk/piklab_kde4/src/progs/pickit3/base/pickit3.xml 2012-09-09 23:37:49 UTC (rev 2956)
@@ -9,12 +9,14 @@
<!DOCTYPE piklab>
<type name="pickit3">
- <device name="18F242" family="18FXX2_XX8" erase_algo="0x0000" flags="0x0000" />
- <device name="18F248" family="18FXX2_XX8" erase_algo="0x0000" flags="0x0000" />
- <device name="18F252" family="18FXX2_XX8" erase_algo="0xFD30" flags="0x0000" />
- <device name="18F258" family="18FXX2_XX8" erase_algo="0xFD30" flags="0x0000" />
- <device name="18F442" family="18FXX2_XX8" erase_algo="0x5DA8" flags="0x0000" />
- <device name="18F448" family="18FXX2_XX8" erase_algo="0x5DA8" flags="0x0000" />
- <device name="18F452" family="18FXX2_XX8" erase_algo="0x6676" flags="0x0000" />
- <device name="18F458" family="18FXX2_XX8" erase_algo="0xF5A0" flags="0x0000" />
+ <device name="18F242" family="18FXX2_XX8" erase_algo="0x0000" flags="0x0000" />
+ <device name="18F248" family="18FXX2_XX8" erase_algo="0x0000" flags="0x0000" />
+ <device name="18F252" family="18FXX2_XX8" erase_algo="0xFD30" flags="0x0000" />
+ <device name="18F258" family="18FXX2_XX8" erase_algo="0xFD30" flags="0x0000" />
+ <device name="18F442" family="18FXX2_XX8" erase_algo="0x5DA8" flags="0x0000" />
+ <device name="18F448" family="18FXX2_XX8" erase_algo="0x5DA8" flags="0x0000" />
+ <device name="18F452" family="18FXX2_XX8" erase_algo="0x6676" flags="0x0000" />
+ <device name="18F4520" family="18F2XXX_4XXX" erase_algo="0xB938" flags="0x0000" />
+ <device name="18F458" family="18FXX2_XX8" erase_algo="0xF5A0" flags="0x0000" />
+ <device name="18F4580" family="18F2XXX_4XXX" erase_algo="0xB938" flags="0x0000" />
</type>
Modified: trunk/piklab_kde4/src/progs/pickit3/base/pickit3_data.h
===================================================================
--- trunk/piklab_kde4/src/progs/pickit3/base/pickit3_data.h 2012-09-09 23:35:27 UTC (rev 2955)
+++ trunk/piklab_kde4/src/progs/pickit3/base/pickit3_data.h 2012-09-09 23:37:49 UTC (rev 2956)
@@ -19,6 +19,7 @@
struct FamilyData {
const char* name;
uint minorAlgo, debugAlgo, eraseAlgo;
+ uint apId;
};
extern const FamilyData FAMILY_DATA[];
Modified: trunk/piklab_kde4/src/progs/pickit3/base/pickit3_prog.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/pickit3/base/pickit3_prog.cpp 2012-09-09 23:35:27 UTC (rev 2955)
+++ trunk/piklab_kde4/src/progs/pickit3/base/pickit3_prog.cpp 2012-09-09 23:37:49 UTC (rev 2956)
@@ -10,20 +10,36 @@
#include "devices/base/device_group.h"
#include "devices/list/device_list.h"
+#include "pickit3_data.h"
//-----------------------------------------------------------------------------
Pickit3::PicBase::PicBase(const ::Programmer::Group &group, const Pic::Data *data)
-: ::Programmer::PicBase(group, data, "pic_pickit3_programmer"),
- _firmwareId(0)
+: ::Programmer::PicBase(group, data, "pic_pickit3_programmer")
{
}
bool Pickit3::PicBase::readFirmwareVersion()
{
- // ### TODO
+ if (!hardware().getVersions()) return false;
+ _firmwareVersion = hardware().getFirmwareVersion();
return true;
}
+const VersionData& Pickit3::PicBase::getOSVersion() const
+{
+ return hardware().getOSVersion();
+}
+
+const VersionData& Pickit3::PicBase::getAPVersion() const
+{
+ return hardware().getAPVersion();
+}
+
+uint Pickit3::PicBase::getAPId() const
+{
+ return hardware().getAPId();
+}
+
BitValue Pickit3::PicBase::readDeviceId()
{
BitValue v;
@@ -31,6 +47,64 @@
return v;
}
+bool Pickit3::PicBase::setTarget()
+{
+ return hardware().sendConfigPacket();
+}
+
+bool Pickit3::PicBase::setupFirmware()
+{
+ const FamilyData& family = FAMILY_DATA[Pickit3::family(device()->name())];
+ log(Log::DebugLevel::Normal, QString(" AP id is %1 and we want %2").arg(getAPId()).arg(family.apId));
+ if (getAPId() == family.apId) return true;
+ log(Log::LineType::Information, i18n(" Incorrect AP loaded."));
+
+ // find AP file
+ PURL::Directory dir = firmwareDirectory();
+ if ( dir.isEmpty() ) return false;
+ QString nameFilter = "PK3AP_" + QString::number(family.apId).rightJustify(2, '0') + "_??????.hex";
+ QStringList files = dir.files(nameFilter);
+ if ( files.isEmpty() ) {
+ log(Log::LineType::Error, i18n("Could not find AP file \"%1\" in directory \"%2\".").arg(nameFilter).arg(dir.path()));
+ return false;
+ }
+
+ // upload hex file
+ PURL::Url url(dir, files[files.count()-1]);
+ log(Log::DebugLevel::Normal, QString(" AP file: %1").arg(url.pretty()));
+ Log::StringView sview;
+ PURL::File file(url, sview);
+ if ( !file.openForRead() ) {
+ log(Log::LineType::Error, i18n("Could not open AP file \"%1\".").arg(url.pretty()));
+ return false;
+ }
+ const Device::Data &data = *Device::Lister::instance().data("24FJ256GB106");
+ Pic::Memory memory(static_cast<const Pic::Data &>(data));
+ QStringList errors, warnings;
+ Pic::Memory::WarningTypes warningTypes;
+ if ( !memory.load(file.stream(), errors, warningTypes, warnings) ) {
+ log(Log::LineType::Error, i18n("Could not read AP hex file \"%1\": %2.").arg(file.url().pretty()).arg(errors[0]));
+ return false;
+ }
+ if ( warningTypes!=Pic::Memory::NoWarning ) {
+ log(Log::LineType::Error, i18n("AP hex file seems incompatible with device 24FJ256GB106 inside Pickit3."));
+ return false;
+ }
+ if ( !hardware().uploadAP(memory) ) {
+ log(Log::LineType::Error, i18n("Failed to upload AP."));
+ return false;
+ }
+
+ // check AP
+ if ( !hardware().getVersions() ) return false;
+ if (getAPId() != family.apId) {
+ log(Log::LineType::Error, i18n("AP still incorrect after uploading."));
+ return false;
+ }
+ log(Log::LineType::Information, i18n(" AP succesfully uploaded."));
+ return true;
+}
+
//-----------------------------------------------------------------------------
bool Pickit3::DeviceSpecific::setPowerOn()
{
Modified: trunk/piklab_kde4/src/progs/pickit3/base/pickit3_prog.h
===================================================================
--- trunk/piklab_kde4/src/progs/pickit3/base/pickit3_prog.h 2012-09-09 23:35:27 UTC (rev 2955)
+++ trunk/piklab_kde4/src/progs/pickit3/base/pickit3_prog.h 2012-09-09 23:37:49 UTC (rev 2956)
@@ -24,12 +24,16 @@
public:
PicBase(const ::Programmer::Group &group, const Pic::Data *data);
virtual bool readFirmwareVersion();
- uchar firmwareId() const { return _firmwareId; }
+ const VersionData& getOSVersion() const;
+ const VersionData& getAPVersion() const;
+ uint getAPId() const;
private:
- uchar _firmwareId;
Hardware &hardware() { return static_cast<Hardware &>(*_hardware); }
+ const Hardware &hardware() const { return static_cast<const Hardware &>(*_hardware); }
virtual BitValue readDeviceId();
+ virtual bool setTarget();
+ virtual bool setupFirmware();
};
//-----------------------------------------------------------------------------
@@ -58,7 +62,8 @@
public:
virtual QString name() const { return "pickit3"; }
virtual QString label() const { return i18n("Pickit3"); }
- virtual ::Programmer::Properties properties() const { return ::Programmer::Programmer | ::Programmer::CanReadMemory | ::Programmer::HasConnectedState | ::Programmer::CanReleaseReset; }
+ virtual ::Programmer::Properties properties() const { return ::Programmer::Programmer | ::Programmer::CanReadMemory | ::Programmer::HasConnectedState
+ | ::Programmer::CanReleaseReset | ::Programmer::HasFirmware | ::Programmer::CanUploadFirmware | ::Programmer::NeedDeviceSpecificFirmware; }
virtual ::Programmer::TargetPowerMode targetPowerMode() const { return ::Programmer::TargetPowerModeFromConfig; }
virtual bool isPortSupported(PortType type) const { return type == PortType::USB; }
virtual bool canReadVoltage(Device::VoltageType) const;
Modified: trunk/piklab_kde4/src/progs/pickit3/gui/pickit3_group_ui.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/pickit3/gui/pickit3_group_ui.cpp 2012-09-09 23:35:27 UTC (rev 2955)
+++ trunk/piklab_kde4/src/progs/pickit3/gui/pickit3_group_ui.cpp 2012-09-09 23:37:49 UTC (rev 2956)
@@ -18,46 +18,34 @@
: ::Programmer::PicAdvancedDialog(base, parent, "pickit3_advanced_dialog")
{
uint row = _firmwareContainer->numRows();
- QLabel *label = new QLabel(i18n("Id:"), _firmwareContainer);
+ QLabel *label = new QLabel(i18n("OS Version:"), _firmwareContainer);
_firmwareContainer->addWidget(label, row,row, 0,0);
- _firmwareIdLabel = new QLabel(_firmwareContainer);
- _firmwareContainer->addWidget(_firmwareIdLabel, row,row, 1,1);
+ _osVersionLabel = new QLabel(_firmwareContainer);
+ _firmwareContainer->addWidget(_osVersionLabel, row,row, 1,1);
row++;
- row = _programmerContainer->numRows();
- if ( base.group().properties() & ::Programmer::Debugger ) {
- Container::Button *container = new ::Programmer::ButtonContainer(i18n("Debug Executive"), this, SLOT(updateDebugExecutive()), _programmerContainer);
- _programmerContainer->addWidget(container, row,row, 0,1);
- label = new QLabel(i18n("Version:"), container);
- container->addWidget(label, 1,1, 0,0);
- _debugExecLabel = new QLabel(container);
- container->addWidget(_debugExecLabel, 1,1, 1,1);
- row++;
- } else _debugExecLabel = 0;
-}
+ label = new QLabel(i18n("AP Version:"), _firmwareContainer);
+ _firmwareContainer->addWidget(label, row,row, 0,0);
+ _apVersionLabel = new QLabel(_firmwareContainer);
+ _firmwareContainer->addWidget(_apVersionLabel, row,row, 1,1);
+ row++;
-void Pickit3::AdvancedDialog::updateDebugExecutive()
-{
- BusyCursorStarter bc;
- if ( ensureConnected() ) {
- Device::TargetMode mode;
- if ( !base().getTargetMode(mode) ) return;
-// if ( mode==Device::TargetMode::InProgramming )
-// MessageBox::sorry(i18n("You need to initiate debugging to read the debug executive version."), Log::Show);
-// else static_cast<DebugProgrammer &>(base()).readDebugExecutiveVersion();
- }
- updateDisplay();
+ label = new QLabel(i18n("AP Id:"), _firmwareContainer);
+ _firmwareContainer->addWidget(label, row,row, 0,0);
+ _apIdLabel = new QLabel(_firmwareContainer);
+ _firmwareContainer->addWidget(_apIdLabel, row,row, 1,1);
+ row++;
}
void Pickit3::AdvancedDialog::updateDisplay()
{
::Programmer::PicAdvancedDialog::updateDisplay();
- uchar id = base().firmwareId();
- _firmwareIdLabel->setText(id==0 ? "---" : toHexLabel(id, 2));
- if (_debugExecLabel) {
-// const VersionData &vd = static_cast<DebugProgrammer &>(base()).debugExecutiveVersion();
-// _debugExecLabel->setText(vd.isValid() ? vd.pretty() : "---");
- }
+ const VersionData& osVersion = base().getOSVersion();
+ _osVersionLabel->setText(osVersion.pretty());
+ const VersionData& apVersion = base().getAPVersion();
+ _apVersionLabel->setText(apVersion.pretty());
+ uint apId = base().getAPId();
+ _apIdLabel->setText(apId != 0 ? QString::number(apId) : "---");
}
//----------------------------------------------------------------------------
Modified: trunk/piklab_kde4/src/progs/pickit3/gui/pickit3_group_ui.h
===================================================================
--- trunk/piklab_kde4/src/progs/pickit3/gui/pickit3_group_ui.h 2012-09-09 23:35:27 UTC (rev 2955)
+++ trunk/piklab_kde4/src/progs/pickit3/gui/pickit3_group_ui.h 2012-09-09 23:37:49 UTC (rev 2956)
@@ -22,11 +22,8 @@
AdvancedDialog(PicBase &base, QWidget *parent);
virtual void updateDisplay();
-private slots:
- void updateDebugExecutive();
-
private:
- QLabel *_firmwareIdLabel, *_debugExecLabel;
+ QLabel *_osVersionLabel, *_apVersionLabel, *_apIdLabel;
PicBase &base() { return static_cast<PicBase &>(_base); }
};
Modified: trunk/piklab_kde4/src/progs/pickit3/pickit3_data/pickit3_data.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/pickit3/pickit3_data/pickit3_data.cpp 2012-09-09 23:35:27 UTC (rev 2955)
+++ trunk/piklab_kde4/src/progs/pickit3/pickit3_data/pickit3_data.cpp 2012-09-09 23:37:49 UTC (rev 2956)
@@ -9,9 +9,10 @@
#include "progs/pickit3/base/pickit3_data.h"
const Pickit3::FamilyData Pickit3::FAMILY_DATA[] = {
- // MinorAlgo DebugAlgo EraseAlgo
- { "18FXX2_XX8", 0x01, 0x05, 0x01 },
- { NULL, 0, 0, 0 }
+ // MinorAlgo DebugAlgo EraseAlgo AlgoPlugin
+ { "18FXX2_XX8", 0x01, 0x05, 0x01, 5 },
+ { "18F2XXX_4XXX", 0x02, 0x05, 0x07, 5 },
+ { NULL, 0, 0, 0, 0 }
};
const Pickit3::FamilyData* Pickit3::findFamilyData(const QString& name)
Modified: trunk/piklab_kde4/test/gputils/blinker18/blinker_18.piklab
===================================================================
--- trunk/piklab_kde4/test/gputils/blinker18/blinker_18.piklab 2012-09-09 23:35:27 UTC (rev 2955)
+++ trunk/piklab_kde4/test/gputils/blinker18/blinker_18.piklab 2012-09-09 23:37:49 UTC (rev 2956)
@@ -12,9 +12,6 @@
<version>0.1</version>
<tool>gputils</tool>
<programmer>pickit3</programmer>
- <opened_files>
- <item>blinker_18.asm</item>
- </opened_files>
</general>
<assembler>
<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-01 04:29:18
|
Revision: 2957
http://piklab.svn.sourceforge.net/piklab/?rev=2957&view=rev
Author: azhyd
Date: 2012-10-01 04:29:11 +0000 (Mon, 01 Oct 2012)
Log Message:
-----------
added libm and libio to default sdcc linker options
Modified Paths:
--------------
trunk/piklab_kde4/Changelog
trunk/piklab_kde4/src/tools/sdcc/sdcc_compile.cpp
trunk/piklab_kde4/test/gputils/blinker18/blinker_18.piklab
trunk/piklab_kde4/test/sdcc/blink.piklab
trunk/piklab_kde4/test/sdcc/blinker.c
Modified: trunk/piklab_kde4/Changelog
===================================================================
--- trunk/piklab_kde4/Changelog 2012-09-09 23:37:49 UTC (rev 2956)
+++ trunk/piklab_kde4/Changelog 2012-10-01 04:29:11 UTC (rev 2957)
@@ -1,4 +1,4 @@
-0.16.2 (9 September 2012)
+0.16.2 (30 September 2012)
* fixed toolchain output when executable cannot be found
* fixed parsing for jalv2
* fixed template generator for jalv2
@@ -13,6 +13,7 @@
* 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]
0.16.1 (1 July 2012)
* fixed command-line utilities compilation with Qt only
Modified: trunk/piklab_kde4/src/tools/sdcc/sdcc_compile.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/sdcc/sdcc_compile.cpp 2012-09-09 23:37:49 UTC (rev 2956)
+++ trunk/piklab_kde4/src/tools/sdcc/sdcc_compile.cpp 2012-10-01 04:29:11 UTC (rev 2957)
@@ -13,6 +13,8 @@
#include "sdcc_config.h"
#include "tools/list/tool_list.h"
#include "sdcc_generator.h"
+#include "devices/list/device_list.h"
+#include "devices/pic/base/pic.h"
//-----------------------------------------------------------------------------
QString SDCC::Process::familyName() const
@@ -72,6 +74,17 @@
args += "-Wl-c"; // create coff file
args += "-Wl-m"; // output map file
args += "$LKR(-Wl-s%LKR)";
+ if (family(_data.device) == P14) {
+ const Device::Data* data = Device::Lister::instance().data(_data.device);
+ if (static_cast<const Pic::Data&>(*data).architecture().type() == Pic::Architecture::EMidRange) {
+ args += "libme.lib";
+ } else {
+ args += "libm.lib";
+ }
+ } else {
+ args += "libio" + _data.device.toLower() + ".lib";
+ args += "libm18f.lib";
+ }
args += config.includeDirs(Tool::Category::Linker, "-I");
args += config.customOptions(Tool::Category::Linker);
args += "-o%O";
Modified: trunk/piklab_kde4/test/gputils/blinker18/blinker_18.piklab
===================================================================
--- trunk/piklab_kde4/test/gputils/blinker18/blinker_18.piklab 2012-09-09 23:37:49 UTC (rev 2956)
+++ trunk/piklab_kde4/test/gputils/blinker18/blinker_18.piklab 2012-10-01 04:29:11 UTC (rev 2957)
@@ -12,6 +12,9 @@
<version>0.1</version>
<tool>gputils</tool>
<programmer>pickit3</programmer>
+ <opened_files>
+ <item>blinker_18.asm</item>
+ </opened_files>
</general>
<assembler>
<custom_options/>
Modified: trunk/piklab_kde4/test/sdcc/blink.piklab
===================================================================
--- trunk/piklab_kde4/test/sdcc/blink.piklab 2012-09-09 23:37:49 UTC (rev 2956)
+++ trunk/piklab_kde4/test/sdcc/blink.piklab 2012-10-01 04:29:11 UTC (rev 2957)
@@ -12,10 +12,6 @@
</files>
<is_library>true</is_library>
<programmer>direct</programmer>
- <opened_files>
- <item>add.c</item>
- <item>blinker.c</item>
- </opened_files>
</general>
<sdcc>
<custom_options/>
Modified: trunk/piklab_kde4/test/sdcc/blinker.c
===================================================================
--- trunk/piklab_kde4/test/sdcc/blinker.c 2012-09-09 23:37:49 UTC (rev 2956)
+++ trunk/piklab_kde4/test/sdcc/blinker.c 2012-10-01 04:29:11 UTC (rev 2957)
@@ -2,7 +2,7 @@
#include <pic16f873.h>
typedef unsigned int word;
-word at 0x2007 CONFIG = _CP_OFF & _WDT_OFF & _BODEN_ON & \
+word __at 0x2007 CONFIG = _CP_OFF & _WDT_OFF & _BODEN_ON & \
_PWRTE_ON & _HS_OSC & _WRT_ENABLE_ON & \
_LVP_OFF & _DEBUG_OFF & _CPD_OFF;
@@ -10,7 +10,7 @@
unsigned char ms_delay = 0;
float abcd;
-void Intr() interrupt 0 {
+void Intr() __interrupt 0 {
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-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.
|
|
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-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-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-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-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-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-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<...
[truncated message content] |
|
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_pr...
[truncated message content] |
|
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-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 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 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-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-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
==========================================...
[truncated message content] |
|
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" ...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X