piklab-svn — Subversion Commits

[Piklab-svn] SF.net SVN: piklab:[2882] trunk/piklab_kde4/src

[<az...@us...>]

Revision: 2882
          http://piklab.svn.sourceforge.net/piklab/?rev=2882&view=rev
Author:   azhyd
Date:     2012-04-24 06:35:28 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
fixes

Modified Paths:
--------------
    trunk/piklab_kde4/src/devices/pic/gui/pic_register_view.cpp
    trunk/piklab_kde4/src/progs/custom/gui/custom_group_ui.cpp
    trunk/piklab_kde4/src/progs/gpsim/gui/gpsim_group_ui.cpp
    trunk/piklab_kde4/src/progs/gui/prog_config_center.cpp
    trunk/piklab_kde4/src/progs/gui/prog_config_widget.cpp
    trunk/piklab_kde4/src/tools/gui/toolchain_config_widget.cpp

Modified: trunk/piklab_kde4/src/devices/pic/gui/pic_register_view.cpp
===================================================================
--- trunk/piklab_kde4/src/devices/pic/gui/pic_register_view.cpp	2012-04-23 16:12:54 UTC (rev 2881)
+++ trunk/piklab_kde4/src/devices/pic/gui/pic_register_view.cpp	2012-04-24 06:35:28 UTC (rev 2882)
@@ -67,8 +67,8 @@
     row++;
   }
 
-  QPixmap readIcon = IconLoader::loadIcon("viewmag", IconLoader::Small);
-  QPixmap editIcon = IconLoader::loadIcon("edit", IconLoader::Small);
+  QPixmap readIcon = IconLoader::loadIcon("zoom-in", IconLoader::Small);
+  QPixmap editIcon = IconLoader::loadIcon("edit-rename", IconLoader::Small);
   uint nb;
   if ( !data.is18Family() ) nb = rdata.nbRegistersPerBank();
   else nb = qMax(rdata.accessBankSplit, rdata.nbRegistersPerBank() - rdata.accessBankSplit);

Modified: trunk/piklab_kde4/src/progs/custom/gui/custom_group_ui.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/custom/gui/custom_group_ui.cpp	2012-04-23 16:12:54 UTC (rev 2881)
+++ trunk/piklab_kde4/src/progs/custom/gui/custom_group_ui.cpp	2012-04-24 06:35:28 UTC (rev 2882)
@@ -18,7 +18,7 @@
 {
   Config config;
   uint row = numRows();
-  KPushButton *button = new KPushButton(KGuiItem(QString::null, "help"), this);
+  KPushButton *button = new KPushButton(KGuiItem(QString::null, "help-about"), this);
   connect(button, SIGNAL(clicked()), SLOT(displayHelpSlot()));
   addWidget(button, row,row, 2,2);
   ++row;

Modified: trunk/piklab_kde4/src/progs/gpsim/gui/gpsim_group_ui.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/gpsim/gui/gpsim_group_ui.cpp	2012-04-23 16:12:54 UTC (rev 2881)
+++ trunk/piklab_kde4/src/progs/gpsim/gui/gpsim_group_ui.cpp	2012-04-24 06:35:28 UTC (rev 2882)
@@ -32,7 +32,7 @@
   addWidget(label, row,row, 0,0);
   _status = new QLabel(this);
   addWidget(_status, row,row, 1,1);
-  KPushButton* button = new KPushButton(KGuiItem(QString::null, "viewmag"), this);
+  KPushButton* button = new KPushButton(KGuiItem(QString::null, "zoom-in"), this);
   addWidget(button, row,row, 2,2);
   connect(button, SIGNAL(clicked()), SLOT(showVersionDetails()));
   ++row;
@@ -41,7 +41,7 @@
   addWidget(label, row,row, 0,0);
   _devicesLabel = new QLabel(this);
   addWidget(_devicesLabel, row,row, 1,1);
-  button = new KPushButton(KGuiItem(QString::null, "viewmag"), this);
+  button = new KPushButton(KGuiItem(QString::null, "zoom-in"), this);
   addWidget(button, row,row, 2,2);
   connect(button, SIGNAL(clicked()), SLOT(showDevicesDetails()));
   ++row;

Modified: trunk/piklab_kde4/src/progs/gui/prog_config_center.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/gui/prog_config_center.cpp	2012-04-23 16:12:54 UTC (rev 2881)
+++ trunk/piklab_kde4/src/progs/gui/prog_config_center.cpp	2012-04-24 06:35:28 UTC (rev 2882)
@@ -123,8 +123,8 @@
   hd.port = _portSelector->portDescription();
   std::auto_ptr< ::Hardware::Config> config(Main::programmerGroup().hardwareConfig());
   if (config.get() != NULL) hd.name = config->currentHardware(hd.port.type);
-  bool ok = _specific->setPort(hd);
-  _portSelector->setStatus(hd.port.type, ok ? i18n("Connection: Ok") : i18n("Connection: Error"));
+  _specific->setPort(hd);
+  //_portSelector->setStatus(hd.port.type, ok ? i18n("Connection: Ok") : i18n("Connection: Error"));
 }
 
 void Programmer::ProgConfigWidget::saveConfig()

Modified: trunk/piklab_kde4/src/progs/gui/prog_config_widget.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/gui/prog_config_widget.cpp	2012-04-23 16:12:54 UTC (rev 2881)
+++ trunk/piklab_kde4/src/progs/gui/prog_config_widget.cpp	2012-04-24 06:35:28 UTC (rev 2882)
@@ -37,7 +37,7 @@
   if (_firmwareDir) GroupConfig::writeFirmwareDirectory(_group, _firmwareDir->url().url());
 }
 
-bool Programmer::ConfigWidget::setPort(const HardwareDescription &hd)
+bool Programmer::ConfigWidget::setPort(const HardwareDescription &)
 {
-  return _group.checkConnection(hd);
+  return true;//_group.checkConnection(hd);
 }

Modified: trunk/piklab_kde4/src/tools/gui/toolchain_config_widget.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/gui/toolchain_config_widget.cpp	2012-04-23 16:12:54 UTC (rev 2881)
+++ trunk/piklab_kde4/src/tools/gui/toolchain_config_widget.cpp	2012-04-24 06:35:28 UTC (rev 2882)
@@ -67,7 +67,7 @@
     container->addWidget(label, row,row, 0,0);
     _data[k].label = new QLabel(container);
     container->addWidget(_data[k].label, row,row, 1,1);
-    _data[k].button = new KPushButton(KGuiItem(QString::null, "viewmag"), container);
+    _data[k].button = new KPushButton(KGuiItem(QString::null, "zoom-in"), container);
     connect(_data[k].button, SIGNAL(clicked()), SLOT(showDetails()));
     container->addWidget(_data[k].button, row,row, 2,2);
     row++;
@@ -77,7 +77,7 @@
   container->addWidget(label, row,row, 0,0);
   _devicesLabel = new QLabel(container);
   container->addWidget(_devicesLabel, row,row, 1,1);
-  KPushButton *button = new KPushButton(KGuiItem(QString::null, "viewmag"), container);
+  KPushButton *button = new KPushButton(KGuiItem(QString::null, "zoom-in"), container);
   connect(button, SIGNAL(clicked()), SLOT(showDeviceDetails()));
   container->addWidget(button, row,row, 2,2);
   row++;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2881] trunk/piklab_kde4/src

[<az...@us...>]

Revision: 2881
          http://piklab.svn.sourceforge.net/piklab/?rev=2881&view=rev
Author:   azhyd
Date:     2012-04-23 16:12:54 +0000 (Mon, 23 Apr 2012)
Log Message:
-----------
fix images in device info

Modified Paths:
--------------
    trunk/piklab_kde4/src/common/common/global.h
    trunk/piklab_kde4/src/devices/base/device_group.cpp
    trunk/piklab_kde4/src/devices/base/device_group.h
    trunk/piklab_kde4/src/devices/base/hex_buffer.cpp
    trunk/piklab_kde4/src/libgui/device_gui.cpp
    trunk/piklab_kde4/src/libgui/device_gui.h
    trunk/piklab_kde4/src/progs/direct/gui/direct_config_widget.cpp

Modified: trunk/piklab_kde4/src/common/common/global.h
===================================================================
--- trunk/piklab_kde4/src/common/common/global.h	2012-04-22 23:28:53 UTC (rev 2880)
+++ trunk/piklab_kde4/src/common/common/global.h	2012-04-23 16:12:54 UTC (rev 2881)
@@ -27,7 +27,6 @@
 #include <Q3ValueList>
 #include <Q3MemArray>
 #include <Q3Url>
-#include <Q3MimeSourceFactory>
 #include <Q3CString>
 
 #define QValueVector Q3ValueVector

Modified: trunk/piklab_kde4/src/devices/base/device_group.cpp
===================================================================
--- trunk/piklab_kde4/src/devices/base/device_group.cpp	2012-04-22 23:28:53 UTC (rev 2880)
+++ trunk/piklab_kde4/src/devices/base/device_group.cpp	2012-04-23 16:12:54 UTC (rev 2881)
@@ -253,9 +253,8 @@
   return doc;
 }
 
-QString Device::htmlPinDiagrams(const Device::Data &data, const QString &imagePrefix, Q3MimeSourceFactory *msf)
+QString Device::pinsHtml(const Device::Data &data, const QString &imagePrefix)
 {
-  QString doc;
   // pins
   const Package *package = 0;
   for (uint i=0; Package::TYPE_DATA[i].name; i++) {
@@ -263,11 +262,11 @@
     package = barPackage(Package::TYPE_DATA[i].name, data);
     if (package) break;
   }
+  QString doc;
   if (package) {
-    QPixmap pix = pinsGraph(*package);
     doc += "<table cellpadding=\"3\"><tr bgcolor=\"gray\"><th align=\"center\">";
     QStringList names = package->names();
-    for (uint k=0; k<uint (names.count()); k++) {
+    for (int k=0; k<names.count(); k++) {
       if ( k!=0 ) doc += " ";
       doc += i18n(Package::data(names[k])->label);
       doc += "(" + QString::number(package->nbPins()) + ")";
@@ -275,29 +274,49 @@
     doc += "</th></tr><tr><td align=\"center\">";
     QString label = data.name() + "_pins_graph.png";
     doc += "<img src=\"" + imagePrefix + label + "\" />";
-    if (msf) msf->setPixmap(label, pix);
     doc += "</td></tr></table>";
   }
   return doc;
 }
 
-QString Device::htmlVoltageFrequencyGraphs(const Device::Data &data, const QString &imagePrefix, Q3MimeSourceFactory *msf)
+QPixmap Device::pinsPixmap(const Device::Data& data)
 {
+  for (uint i=0; Package::TYPE_DATA[i].name; i++) {
+    if ( Package::TYPE_DATA[i].shape!=Package::Bar ) continue;
+    const Package* package = barPackage(Package::TYPE_DATA[i].name, data);
+    if (package) return pinsGraph(*package);
+  }
+  return QPixmap();
+}
+
+QString Device::voltageFrequencyHtml(const Device::Data &data, const QString &imagePrefix)
+{
   QString doc;
   FOR_EACH(Special, special) {
     for (int k=0; k<data.frequencyRanges().count(); k++) {
       const Device::FrequencyRange &fr = data.frequencyRanges()[k];
       if ( fr.special!=special ) continue;
       doc += "<h3>" + data.fname(special) + " - " + i18n("Temperature range: ") + fr.operatingCondition.label() + "</h3>";
-      QString label = data.name() + "_" + data.fname(special) + "_"
-        + fr.operatingCondition.key() + ".png";
+      QString label = data.name() + "_" + data.fname(special) + "_" + fr.operatingCondition.key() + ".png";
       doc += "<img src=\"" + imagePrefix + label + "\" />";
-      if (msf) msf->setPixmap(label, Device::vddGraph(i18n("F (MHz)"), i18n("Vdd (V)"), fr.vdds));
     }
   }
   return doc;
 }
 
+QPixmap Device::voltageFrequencyPixmap(const Device::Data &data, const QString &name)
+{
+  FOR_EACH(Special, special) {
+    for (int k=0; k<data.frequencyRanges().count(); k++) {
+      const Device::FrequencyRange &fr = data.frequencyRanges()[k];
+      if ( fr.special!=special ) continue;
+      QString label = data.name() + "_" + data.fname(special) + "_" + fr.operatingCondition.key() + ".png";
+      if (label == name) return Device::vddGraph(i18n("F (MHz)"), i18n("Vdd (V)"), fr.vdds);
+    }
+  }
+  return QPixmap();
+}
+
 bool Device::MemoryGraphData::operator<(const Device::MemoryGraphData &data) const
 {
   return startAddress < data.startAddress;

Modified: trunk/piklab_kde4/src/devices/base/device_group.h
===================================================================
--- trunk/piklab_kde4/src/devices/base/device_group.h	2012-04-22 23:28:53 UTC (rev 2880)
+++ trunk/piklab_kde4/src/devices/base/device_group.h	2012-04-23 16:12:54 UTC (rev 2881)
@@ -61,8 +61,10 @@
 QPixmap pinsGraph(const Package &package);
 
 QString htmlInfo(const Data &data, const QString &deviceHref, const QString &documentHtml);
-QString htmlPinDiagrams(const Device::Data &data, const QString &imagePrefix, Q3MimeSourceFactory *msf);
-QString htmlVoltageFrequencyGraphs(const Device::Data &data, const QString &imagePrefix, Q3MimeSourceFactory *msf);
+QString pinsHtml(const Device::Data &data, const QString &imagePrefix);
+QPixmap pinsPixmap(const Device::Data &data);
+QString voltageFrequencyHtml(const Device::Data &data, const QString &imagePrefix);
+QPixmap voltageFrequencyPixmap(const Device::Data &data, const QString& label);
 
 struct MemoryGraphData
 {
@@ -72,6 +74,7 @@
 
   bool operator<(const Device::MemoryGraphData &data) const;
 };
+
 extern QPixmap memoryGraph(const std::list<MemoryGraphData> &ranges);
 
 } // namespace

Modified: trunk/piklab_kde4/src/devices/base/hex_buffer.cpp
===================================================================
--- trunk/piklab_kde4/src/devices/base/hex_buffer.cpp	2012-04-22 23:28:53 UTC (rev 2880)
+++ trunk/piklab_kde4/src/devices/base/hex_buffer.cpp	2012-04-23 16:12:54 UTC (rev 2881)
@@ -248,9 +248,9 @@
               // if block begins at odd address
               // because |= works on an uninitalized word
               // however, I  don't know if such a situation can occurs
-              uint a = addrbase+x >> 1;
+              uint a = (addrbase+x) >> 1;
               BitValue value = (*this)[a];
-              if ( addrbase+x & 1 ) insert(a, value.maskWith(0x00FF) | data << 8); // Odd addr => Hi byte
+              if ( (addrbase+x) & 1 ) insert(a, value.maskWith(0x00FF) | data << 8); // Odd addr => Hi byte
               else insert(a, value.maskWith(0xFF00) | data); // Low byte
               //if ( x==0 ) qDebug("fb@%s: %s", toHex(addrbase+x >> 1, 8).data(), toHex(fb[addrbase+x >> 1], 8).data());
               cksum += data;

Modified: trunk/piklab_kde4/src/libgui/device_gui.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/device_gui.cpp	2012-04-22 23:28:53 UTC (rev 2880)
+++ trunk/piklab_kde4/src/libgui/device_gui.cpp	2012-04-23 16:12:54 UTC (rev 2881)
@@ -403,7 +403,8 @@
 
 //-----------------------------------------------------------------------------
 DeviceChooser::Browser::Browser(QWidget *parent)
- : KTextBrowser(parent, "device_browser")
+ : KTextBrowser(parent),
+   _data(NULL)
 {}
 
 PURL::Url findDocumentUrl(const QString &prefix, const QString &baseName)
@@ -420,42 +421,51 @@
   return previous;
 }
 
-void DeviceChooser::Browser::setSource(const QString &name)
+void DeviceChooser::Browser::setSource(const QUrl& url)
 {
   BusyCursorStarter bc;
-  if ( name.startsWith("device://") ) emit deviceChanged(name.mid(9));
-  else if ( name.startsWith("document://") ) {
+  if (url.scheme() == "device") emit deviceChanged(url.toString(QUrl::RemoveScheme));
+  else if (url.scheme() == "document") {
     QString prefix = "http://ww1.microchip.com/downloads/en/DeviceDoc/";
-    PURL::Url url = findDocumentUrl(prefix, name.mid(11, name.length()-11-1));
-    QString s = Qt::escape(url.kurl().prettyUrl());
-    KTextBrowser::setSource(s);
-  } else KTextBrowser::setSource(name);
+    PURL::Url foundUrl = findDocumentUrl(prefix, url.toString(QUrl::RemoveScheme));
+    KTextBrowser::setSource(foundUrl.kurl());
+  } else KTextBrowser::setSource(url);
 }
 
+void DeviceChooser::Browser::setData(const Device::Data* data)
+{
+  _data = data;
+}
+
+QVariant DeviceChooser::Browser::loadResource(int type, const QUrl& url)
+{
+  if (type != QTextDocument::ImageResource) return KTextBrowser::loadResource(type, url);
+  QString label = url.path();
+  if (label.startsWith("vf_")) return voltageFrequencyPixmap(*_data, label.mid(3));
+  else if (label.startsWith("pins_")) return pinsPixmap(*_data);
+  else return _data->group().memoryGraph(*_data);
+}
+
 //-----------------------------------------------------------------------------
 DeviceChooser::View::View(QWidget *parent)
   : TabWidget(parent, "device_view")
 {
   // Information
   _info = new Browser(this);
-  //  _info->setMimeSourceFactory(&_msf);
   insertTab(_info, i18n("Information"));
   connect(_info, SIGNAL(deviceChanged(const QString &)),
           SIGNAL(deviceChanged(const QString &)));
 
   // Memory Map
   _memory = new Browser(this);
-  //_memory->setMimeSourceFactory(&_msf);
   insertTab(_memory, i18n("Memory Map"));
 
   // Voltage-Frequency Graphs
   _vfg = new Browser(this);
-  //_vfg->setMimeSourceFactory(&_msf);
   insertTab(_vfg, i18n("Voltage-Frequency Graphs"));
 
   // Pin Diagrams
   _pins = new Browser(this);
-  //_pins->setMimeSourceFactory(&_msf);
   insertTab(_pins, i18n("Pin Diagrams"));
 }
 
@@ -466,14 +476,16 @@
   QString doc = htmlInfo(*data, (cannotChangeDevice ? "" : "device:%1"), Device::documentHtml(*data));
   doc += Device::supportedHtmlInfo(*data);
   _info->setText("<html><body>" + doc + "</body></html>");
-  doc = htmlVoltageFrequencyGraphs(*data, QString::null, &_msf);
-  QPixmap pix = data->group().memoryGraph(*data);
+  _info->setData(data);
+  doc = voltageFrequencyHtml(*data, "vf_");
   QString label = data->name() + "_memory_map.png";
-  _msf.setPixmap(label, pix);
   _memory->setText("<html><body><img src=\"" + label + "\" /></body></html>");
+  _memory->setData(data);
   _vfg->setText("<html><body>" + doc + "</body></html>");
-  doc = htmlPinDiagrams(*data, QString::null, &_msf);
+  _vfg->setData(data);
+  doc = pinsHtml(*data, "pins_");
   _pins->setText("<html><body>" + doc + "</body></html>");
+  _pins->setData(data);
 }
 
 void DeviceChooser::View::setText(const QString &text)

Modified: trunk/piklab_kde4/src/libgui/device_gui.h
===================================================================
--- trunk/piklab_kde4/src/libgui/device_gui.h	2012-04-22 23:28:53 UTC (rev 2880)
+++ trunk/piklab_kde4/src/libgui/device_gui.h	2012-04-23 16:12:54 UTC (rev 2881)
@@ -150,12 +150,17 @@
 Q_OBJECT
 public:
   Browser(QWidget *parent);
+  void setData(const Device::Data*);
 
 signals:
   void deviceChanged(const QString &device);
 
-public slots:
-  virtual void setSource(const QString &name);
+protected:
+  virtual void setSource(const QUrl& url);
+  virtual QVariant loadResource(int type, const QUrl& url);
+
+private:
+  const Device::Data* _data;
 };
 
 //-----------------------------------------------------------------------------
@@ -172,7 +177,6 @@
   void deviceChanged(const QString &device);
 
 private:
-  Q3MimeSourceFactory _msf;
   Browser *_info, *_memory, *_vfg, *_pins;
 };
 

Modified: trunk/piklab_kde4/src/progs/direct/gui/direct_config_widget.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/direct/gui/direct_config_widget.cpp	2012-04-22 23:28:53 UTC (rev 2880)
+++ trunk/piklab_kde4/src/progs/direct/gui/direct_config_widget.cpp	2012-04-23 16:12:54 UTC (rev 2881)
@@ -64,7 +64,7 @@
   QLabel *label = new QLabel(i18n("Clock delay"), this);
   QToolTip::add(label, i18n(DELAY_LABEL));
   hbox->addWidget(label);
-  _delay = new KIntNumInput(0, Qt::Horizontal, this);
+  _delay = new KIntNumInput(0, this);
   _delay->setRange(0, 50, 5);
   _delay->setEnabled(edit);
   QToolTip::add(_delay, i18n(DELAY_LABEL));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2880] trunk/piklab_kde4/src

[<az...@us...>]

Revision: 2880
          http://piklab.svn.sourceforge.net/piklab/?rev=2880&view=rev
Author:   azhyd
Date:     2012-04-22 23:28:53 +0000 (Sun, 22 Apr 2012)
Log Message:
-----------
more fixes

Modified Paths:
--------------
    trunk/piklab_kde4/src/libgui/device_gui.cpp
    trunk/piklab_kde4/src/libgui/editor.cpp
    trunk/piklab_kde4/src/libgui/editor_manager.cpp
    trunk/piklab_kde4/src/libgui/global_config.cpp
    trunk/piklab_kde4/src/libgui/log_view.cpp
    trunk/piklab_kde4/src/libgui/log_view.h
    trunk/piklab_kde4/src/libgui/new_dialogs.cpp
    trunk/piklab_kde4/src/libgui/project_manager.cpp
    trunk/piklab_kde4/src/libgui/project_wizard.cpp
    trunk/piklab_kde4/src/libgui/toplevel.cpp
    trunk/piklab_kde4/src/progs/gui/prog_group_ui.cpp

Modified: trunk/piklab_kde4/src/libgui/device_gui.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/device_gui.cpp	2012-04-22 22:27:07 UTC (rev 2879)
+++ trunk/piklab_kde4/src/libgui/device_gui.cpp	2012-04-22 23:28:53 UTC (rev 2880)
@@ -107,7 +107,7 @@
   : ::Dialog(parent, "device_chooser_dialog", true, i18n("Select a device"),
              Ok|Close, Close, false, QSize(400, 300))
 {
-  setButtonGuiItem(Ok, KGuiItem(i18n( "&Select"), "button_ok"));
+  setButtonGuiItem(Ok, KGuiItem(i18n( "&Select"), "dialog-ok"));
   QVBoxLayout *top = new QVBoxLayout(mainWidget(), 0, 10);
 
   // view
@@ -116,7 +116,7 @@
   _listTypeCombo.reset(new EnumComboBox<ListType>("list_type", mainWidget()));
   connect(_listTypeCombo->combo(), SIGNAL(activated(int)), SLOT(updateList()));
   vbox->addWidget(_listTypeCombo->combo());
-  QPushButton *button = new KPushButton(KGuiItem(i18n("Reset Filters"), "reload"), mainWidget());
+  QPushButton *button = new KPushButton(KGuiItem(i18n("Reset Filters"), "view-refresh"), mainWidget());
   connect(button, SIGNAL(clicked()), SLOT(resetFilters()));
   vbox->addWidget(button);
   vbox->addStretch(1);

Modified: trunk/piklab_kde4/src/libgui/editor.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/editor.cpp	2012-04-22 22:27:07 UTC (rev 2879)
+++ trunk/piklab_kde4/src/libgui/editor.cpp	2012-04-22 23:28:53 UTC (rev 2880)
@@ -49,7 +49,7 @@
 bool Editor::saveAs()
 {
   QString filter = PURL::filter(fileType());
-  PURL::Url purl = PURL::getSaveUrl(":save_file_as", filter, this, i18n("Save File"), PURL::AskOverwrite);
+  PURL::Url purl = PURL::getSaveUrl("kfiledialog:///save_file_as", filter, this, i18n("Save File"), PURL::AskOverwrite);
   if ( purl.isEmpty() ) return false;
   if ( !save(purl) ) return false;
   setModified(false);

Modified: trunk/piklab_kde4/src/libgui/editor_manager.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/editor_manager.cpp	2012-04-22 22:27:07 UTC (rev 2879)
+++ trunk/piklab_kde4/src/libgui/editor_manager.cpp	2012-04-22 23:28:53 UTC (rev 2880)
@@ -119,10 +119,10 @@
     return true;
   }
   if ( !openEditor(url) ) {
-    static_cast< KRecentFilesAction *>(Main::action("document-open-recent"))->removeUrl(url.kurl());
+    static_cast< KRecentFilesAction *>(Main::action("file_open_recent"))->removeUrl(url.kurl());
     return false;
   }
-  static_cast<KRecentFilesAction *>(Main::action("document-open-recent"))->addUrl(url.kurl());
+  static_cast<KRecentFilesAction *>(Main::action("file_open_recent"))->addUrl(url.kurl());
   return true;
 }
 

Modified: trunk/piklab_kde4/src/libgui/global_config.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/global_config.cpp	2012-04-22 22:27:07 UTC (rev 2879)
+++ trunk/piklab_kde4/src/libgui/global_config.cpp	2012-04-22 23:28:53 UTC (rev 2880)
@@ -13,11 +13,11 @@
 #include "tools/list/tool_list.h"
 
 const BaseGlobalConfig::Data BaseGlobalConfig::DATA[Nb_Types] = {
-  { "auto_rebuild_modified", I18N_NOOP("Automatically rebuild project before programming if it is modified."), QVariant(true, 0) },
-  { "program_after_build", I18N_NOOP("Program device after successful build."), QVariant(false, 0) },
-  { "user_id_set_to_checksum", I18N_NOOP("Set User Ids to unprotected checksum (if User Ids are empty)."), QVariant(false, 0) },
-  { "show_tab_close_buttons", I18N_NOOP("Show close buttons on tabs (need restart to take effect)."), QVariant(true, 0) },
-  { "parse_disassembly_listing_after_build", I18N_NOOP("Parse disassembly listing after build."), QVariant(true, 0) }
+  { "auto_rebuild_modified",                 I18N_NOOP("Automatically rebuild project before programming if it is modified."), QVariant(true, 0) },
+  { "program_after_build",                   I18N_NOOP("Program device after successful build."),                              QVariant(false, 0) },
+  { "user_id_set_to_checksum",               I18N_NOOP("Set User Ids to unprotected checksum (if User Ids are empty)."),       QVariant(false, 0) },
+  { "show_tab_close_buttons",                I18N_NOOP("Show close buttons on tabs (need restart to take effect)."),           QVariant(true, 0) },
+  { "parse_disassembly_listing_after_build", I18N_NOOP("Parse disassembly listing after build."),                              QVariant(true, 0) }
 };
 
 PURL::Url GlobalConfig::openedProject()
@@ -59,7 +59,7 @@
 Log::DebugLevel GlobalConfig::debugLevel()
 {
   GenericConfig config(QString::null);
-  return config.readEnumEntry<Log::DebugLevel>("log_debug_level", Log::DebugLevel::Normal);
+  return config.readEnumEntry<Log::DebugLevel>("log_debug_level", Log::DebugLevel::Quiet);
 }
 
 void GlobalConfig::writeLogOutputType(Log::OutputType type)

Modified: trunk/piklab_kde4/src/libgui/log_view.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/log_view.cpp	2012-04-22 22:27:07 UTC (rev 2879)
+++ trunk/piklab_kde4/src/libgui/log_view.cpp	2012-04-22 23:28:53 UTC (rev 2880)
@@ -28,21 +28,25 @@
   setPalette(p);
   setMinimumWidth(300);
 
-  QMenu* popup = KTextEdit::mousePopupMenu();
-  popup->insertItem(KIcon("filesave"), i18n("Save As..."), this, SLOT(saveAs()));
-  popup->insertItem(KIcon("fileclose"), i18n("Clear"), this, SLOT(clear()));
+  connect(this, SIGNAL(aboutToShowContextMenu(QMenu*)), this, SLOT(slotAboutToShowContextMenu(QMenu*)));
+}
+
+void Log::Widget::slotAboutToShowContextMenu(QMenu* popup)
+{
+  setDebugLevel(GlobalConfig::debugLevel());
+
+  popup->insertItem(KIcon("document-save"), i18n("Save As..."), this, SLOT(saveAs()));
+  popup->insertItem(KIcon("edit-clear"), i18n("Clear"), this, SLOT(clear()));
   popup->insertSeparator();
   FOR_EACH(DebugLevel, level) {
     _id[level.type()] = popup->insertItem(level.label());
+    popup->setItemChecked(_id[level.type()], _debugLevel==level);
   }
   popup->insertSeparator();
-  _consoleOutputId = popup->insertItem(i18n("Output in console"), this, SLOT(toggleConsoleOutput()));
+  int id = popup->insertItem(i18n("Output in console"), this, SLOT(toggleConsoleOutput()));
+  popup->setItemChecked(id, GlobalConfig::logOutputType()==GuiConsole);
   connect(popup, SIGNAL(activated(int)), SLOT(toggleVisible(int)));
-}
 
-void Log::Widget::updateDebugLevel()
-{
-  setDebugLevel(GlobalConfig::debugLevel());
 }
 
 void Log::Widget::logExtra(const QString &text)
@@ -76,16 +80,6 @@
     QCoreApplication::processEvents(QEventLoop::ExcludeUserInput);
 }
 
-void Log::Widget::contextMenuEvent(QContextMenuEvent*)
-{
-  updateDebugLevel();
-  QMenu* popup = KTextEdit::mousePopupMenu();
-  FOR_EACH(DebugLevel, level) {
-    popup->setItemChecked(_id[level.type()], _debugLevel==level);
-  }
-  popup->setItemChecked(_consoleOutputId, GlobalConfig::logOutputType()==GuiConsole);
-}
-
 void Log::Widget::toggleVisible(int id)
 {
   FOR_EACH(DebugLevel, level) {
@@ -123,7 +117,7 @@
 
 void Log::Widget::saveAs()
 {
-  PURL::Url url = PURL::getSaveUrl(":save_log", "text/x-log", this, i18n("Save log to file"), PURL::AskOverwrite);
+  PURL::Url url = PURL::getSaveUrl("kfiledialog:///save_log", "text/x-log", this, i18n("Save log to file"), PURL::AskOverwrite);
   if ( url.isEmpty() ) return;
   url.write(_text, *this);
 }

Modified: trunk/piklab_kde4/src/libgui/log_view.h
===================================================================
--- trunk/piklab_kde4/src/libgui/log_view.h	2012-04-22 22:27:07 UTC (rev 2879)
+++ trunk/piklab_kde4/src/libgui/log_view.h	2012-04-22 23:28:53 UTC (rev 2880)
@@ -26,7 +26,6 @@
   virtual bool askContinue(const QString &message);
 
 protected:
-  virtual void contextMenuEvent(QContextMenuEvent* e);
   virtual void mouseReleaseEvent(QMouseEvent *e);
   virtual void lineClicked(int line) { Q_UNUSED(line); }
 
@@ -34,14 +33,13 @@
   void toggleVisible(int i);
   void toggleConsoleOutput();
   void saveAs();
+  void slotAboutToShowContextMenu(QMenu* popup);
 
 private:
   int          _id[DebugLevel::Nb_Types];
-  int          _consoleOutputId;
   QString      _text;
   int          _selectedLine;
 
-  virtual void updateDebugLevel();
   virtual void doLog(LineType type, const QString &text, Action action = Immediate);
   virtual void doLog(DebugLevel level, const QString &text, Action action = Immediate);
   void doLog(const QString &text, const QString &color, bool bold, Action action = Immediate);

Modified: trunk/piklab_kde4/src/libgui/new_dialogs.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/new_dialogs.cpp	2012-04-22 22:27:07 UTC (rev 2879)
+++ trunk/piklab_kde4/src/libgui/new_dialogs.cpp	2012-04-22 23:28:53 UTC (rev 2880)
@@ -69,7 +69,7 @@
 QString NewFileDialog::startDir() const
 {
   if (_project) return _project->directory().path();
-  return ":new_file";
+  return "kfiledialog:///new_file";
 }
 
 PURL::Url NewFileDialog::url() const

Modified: trunk/piklab_kde4/src/libgui/project_manager.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/project_manager.cpp	2012-04-22 22:27:07 UTC (rev 2879)
+++ trunk/piklab_kde4/src/libgui/project_manager.cpp	2012-04-22 23:28:53 UTC (rev 2880)
@@ -167,10 +167,10 @@
     pop.addTitle(i18n("Linker Script"));
     QAction* addAction = pop.addAction(KIcon("document-import"), i18n("Set Custom..."));
     QAction* removeAction = !_project->customLinkerScript().isEmpty()
-      ? pop.addAction(KIcon("editdelete"), i18n("Set Default")) : NULL;
+      ? pop.addAction(KIcon("edit-delete"), i18n("Set Default")) : NULL;
     QAction* action = pop.exec(p);
     if ( action==addAction ) {
-      PURL::Url url = PURL::getOpenUrl(":custom_linker_script", PURL::filter(Main::toolGroup().linkerScriptType()), this, i18n("Select Linker Script"));
+      PURL::Url url = PURL::getOpenUrl("kfiledilog:///custom_linker_script", PURL::filter(Main::toolGroup().linkerScriptType()), this, i18n("Select Linker Script"));
       if ( !url.isEmpty() ) _project->setCustomLinkerScript(url);
     } else if ( action==removeAction ) {
       _project->setCustomLinkerScript(PURL::Url());
@@ -272,14 +272,14 @@
 
 void ProjectManager::View::insertSourceFiles()
 {
-  PURL::UrlList list = PURL::getOpenUrls(":<sources>", PURL::sourceFilter(PURL::CompleteFilter), this, i18n("Select Source File"));
+  PURL::UrlList list = PURL::getOpenUrls("kfiledialog:///sources", PURL::sourceFilter(PURL::CompleteFilter), this, i18n("Select Source File"));
   if ( list.isEmpty() ) return;
   for (PURL::UrlList::const_iterator it=list.begin(); it!=list.end(); ++it) insertFile(*it);
 }
 
 void ProjectManager::View::insertObjectFiles()
 {
-  PURL::UrlList list = PURL::getOpenUrls(":<objects>", PURL::objectFilter(PURL::CompleteFilter), this, i18n("Select Object File"));
+  PURL::UrlList list = PURL::getOpenUrls("kfiledialog:///objects", PURL::objectFilter(PURL::CompleteFilter), this, i18n("Select Object File"));
   if ( list.isEmpty() ) return;
   for (PURL::UrlList::const_iterator it=list.begin(); it!=list.end(); ++it) insertFile(*it);
 }
@@ -316,7 +316,7 @@
 
 bool ProjectManager::View::openProject()
 {
-  PURL::Url url = PURL::getOpenUrl(":open_project", PURL::projectFilter(PURL::CompleteFilter), this, i18n("Select Project file"));
+  PURL::Url url = PURL::getOpenUrl("kfiledialog:///open_project", PURL::projectFilter(PURL::CompleteFilter), this, i18n("Select Project file"));
   return openProject(url);
 }
 

Modified: trunk/piklab_kde4/src/libgui/project_wizard.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/project_wizard.cpp	2012-04-22 22:27:07 UTC (rev 2879)
+++ trunk/piklab_kde4/src/libgui/project_wizard.cpp	2012-04-22 23:28:53 UTC (rev 2880)
@@ -120,7 +120,7 @@
   grid->addMultiCellWidget(_name, 0,0, 1,2);
   label = new QLabel(i18n("Directory:"), _first);
   grid->addWidget(label, 1, 0);
-  _directory = new PURL::DirectoryWidget(":new_project", _first);
+  _directory = new PURL::DirectoryWidget("kfiledialog:///new_project", _first);
   grid->addMultiCellWidget(_directory, 1,1, 1,2);
   label = new QLabel(i18n("Device:"), _first);
   grid->addWidget(label, 2, 0);

Modified: trunk/piklab_kde4/src/libgui/toplevel.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/toplevel.cpp	2012-04-22 22:27:07 UTC (rev 2879)
+++ trunk/piklab_kde4/src/libgui/toplevel.cpp	2012-04-22 23:28:53 UTC (rev 2880)
@@ -528,7 +528,7 @@
   filter += "\n" + PURL::filter(PURL::Hex);
   filter += "\n" + PURL::projectFilter(PURL::SimpleFilter);
   filter += "\n*|" + i18n("All Files");
-  PURL::Url url = PURL::getOpenUrl(":open_file", filter, this ,i18n("Open File"));
+  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;

Modified: trunk/piklab_kde4/src/progs/gui/prog_group_ui.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/gui/prog_group_ui.cpp	2012-04-22 22:27:07 UTC (rev 2879)
+++ trunk/piklab_kde4/src/progs/gui/prog_group_ui.cpp	2012-04-22 23:28:53 UTC (rev 2880)
@@ -147,7 +147,7 @@
 
 void Programmer::AdvancedDialog::uploadFirmware()
 {
-  PURL::Url url = PURL::getOpenUrl(":open_firmware", PURL::filter(PURL::Hex), this ,i18n("Open Firmware"));
+  PURL::Url url = PURL::getOpenUrl("kfiledialog:///open_firmware", PURL::filter(PURL::Hex), this ,i18n("Open Firmware"));
   if ( url.isEmpty() ) return;
   BusyCursorStarter bc;
   if ( !connectProgrammer() ) return;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2879] trunk/piklab_kde4/src

[<az...@us...>]

Revision: 2879
          http://piklab.svn.sourceforge.net/piklab/?rev=2879&view=rev
Author:   azhyd
Date:     2012-04-22 22:27:07 +0000 (Sun, 22 Apr 2012)
Log Message:
-----------
fix hex editor

Modified Paths:
--------------
    trunk/piklab_kde4/src/common/gui/global_ui.h
    trunk/piklab_kde4/src/devices/base/device_group.cpp
    trunk/piklab_kde4/src/libgui/device_editor.cpp

Modified: trunk/piklab_kde4/src/common/gui/global_ui.h
===================================================================
--- trunk/piklab_kde4/src/common/gui/global_ui.h	2012-04-22 20:42:20 UTC (rev 2878)
+++ trunk/piklab_kde4/src/common/gui/global_ui.h	2012-04-22 22:27:07 UTC (rev 2879)
@@ -44,7 +44,6 @@
 #include <Q3VButtonGroup>
 #include <Q3PointArray>
 #include <Q3TextBrowser>
-#include <Q3ScrollView>
 #include <Q3Wizard>
 #include <Q3StrList>
 #include <Q3UriDrag>

Modified: trunk/piklab_kde4/src/devices/base/device_group.cpp
===================================================================
--- trunk/piklab_kde4/src/devices/base/device_group.cpp	2012-04-22 20:42:20 UTC (rev 2878)
+++ trunk/piklab_kde4/src/devices/base/device_group.cpp	2012-04-22 22:27:07 UTC (rev 2879)
@@ -66,7 +66,7 @@
   TickMap xTicks, yTicks;
   xTicks.add(0.0, 0.0);
   yTicks.add(0.0, 0.0);
-  for (uint i=0; i<boxes.count(); i++) {
+  for (int i=0; i<boxes.count(); i++) {
 //    qDebug("box #%i: %f=[%f %f] %f=[%f %f]", i, boxes[i].start.x, boxes[i].start.yMin,
 //           boxes[i].start.yMax, boxes[i].end.x, boxes[i].end.yMin, boxes[i].end.yMax);
     xTicks.add(boxes[i].start.x, boxes[i].start.yMin);
@@ -95,7 +95,7 @@
   // draw boxes
   p.setPen(Qt::lightGray);
   p.setBrush(Qt::lightGray);
-  for (uint i=0; i<boxes.count(); i++) {
+  for (int i=0; i<boxes.count(); i++) {
     double ax = double(xEnd - xStart)/xMax;
     double ay = double(yEnd - yStart)/yMax;
     Q3PointArray pa(4);
@@ -151,7 +151,7 @@
 
 const Device::Package *Device::barPackage(const char *name, const Device::Data &data)
 {
-  for (uint i=0; i<data.packages().count(); i++)
+  for (int i=0; i<data.packages().count(); i++)
     if ( data.packages()[i].names().contains(name) ) return &data.packages()[i];
   return 0;
 }
@@ -210,7 +210,7 @@
   doc += "<h1>";
   bool first = true;
   FOR_EACH(Special, special) {
-    for (uint k=0; k<data.frequencyRanges().count(); k++) {
+    for (int k=0; k<data.frequencyRanges().count(); k++) {
       if ( data.frequencyRanges()[k].special!=special ) continue;
       if (first) first = false;
       else doc += " / ";
@@ -225,7 +225,7 @@
   doc += htmlTableRow(i18n("Status"), status);
   if ( data.alternatives().count() ) {
     QString s;
-    for (uint i=0; i<data.alternatives().count(); i++) {
+    for (int i=0; i<data.alternatives().count(); i++) {
       if ( i!=0 ) s += ", ";
       if ( deviceHref.isEmpty() ) s += data.alternatives()[i].upper();
       else {
@@ -242,7 +242,7 @@
   doc += "<table>";
   doc += data.group().informationHtml(data);
   QString s;
-  for (uint i=0; i<data.packages().count(); i++) {
+  for (int i=0; i<data.packages().count(); i++) {
     QStringList names = data.packages()[i].names();
     for (uint k=0; k<uint(names.count()); k++)
       s += i18n(Package::data(names[k])->label) + QString("[%1] ").arg(data.packages()[i].nbPins());
@@ -285,7 +285,7 @@
 {
   QString doc;
   FOR_EACH(Special, special) {
-    for (uint k=0; k<data.frequencyRanges().count(); k++) {
+    for (int k=0; k<data.frequencyRanges().count(); k++) {
       const Device::FrequencyRange &fr = data.frequencyRanges()[k];
       if ( fr.special!=special ) continue;
       doc += "<h3>" + data.fname(special) + " - " + i18n("Temperature range: ") + fr.operatingCondition.label() + "</h3>";

Modified: trunk/piklab_kde4/src/libgui/device_editor.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/device_editor.cpp	2012-04-22 20:42:20 UTC (rev 2878)
+++ trunk/piklab_kde4/src/libgui/device_editor.cpp	2012-04-22 22:27:07 UTC (rev 2879)
@@ -11,6 +11,7 @@
 #include "device_editor.moc"
 
 #include <qregexp.h>
+#include <qscrollarea.h>
 
 #include "devices/list/device_list.h"
 #include "toplevel.h"
@@ -34,11 +35,9 @@
 void DeviceEditor::init()
 {
   QHBoxLayout *hbox = new QHBoxLayout(this, 0);
-  Q3ScrollView *sview = new Q3ScrollView(this, "scroll_view");
-  sview->setResizePolicy(Q3ScrollView::AutoOneFit);
-  hbox->addWidget(sview);
-  _widget = new QWidget(sview->viewport(), "main_scroll_widget");
-  sview->addChild(_widget);
+  QScrollArea *area = new QScrollArea(this);
+  hbox->addWidget(area);
+  _widget = new QWidget;
   _top = new QVBoxLayout(_widget, 0, 0);
   _labelDevice = new QLabel(_widget);
   _labelDevice->setMargin(10);
@@ -49,6 +48,9 @@
   _labelWarning->setTextFormat(Qt::RichText);
   _top->addWidget(_labelWarning);
   _vbox = new QVBoxLayout(_top);
+  area->setWidgetResizable(true);
+  area->setWidget(_widget);
+  _widget->show();
 
   connect(&MainWindow::self(), SIGNAL(deviceChanged()), SLOT(updateDevice()));
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2878] trunk/piklab_kde4/src

[<az...@us...>]

Revision: 2878
          http://piklab.svn.sourceforge.net/piklab/?rev=2878&view=rev
Author:   azhyd
Date:     2012-04-22 20:42:20 +0000 (Sun, 22 Apr 2012)
Log Message:
-----------
fix

Modified Paths:
--------------
    trunk/piklab_kde4/src/libgui/hex_editor.cpp
    trunk/piklab_kde4/src/progs/gui/debug_config_center.cpp

Modified: trunk/piklab_kde4/src/libgui/hex_editor.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/hex_editor.cpp	2012-04-22 19:16:40 UTC (rev 2877)
+++ trunk/piklab_kde4/src/libgui/hex_editor.cpp	2012-04-22 20:42:20 UTC (rev 2878)
@@ -30,13 +30,20 @@
 
   actionCollection()->addAction(KStandardAction::Save, editor, SLOT(save()));
   actionCollection()->addAction(KStandardAction::SaveAs, editor, SLOT(saveAs()));
-  actionCollection()->addAction("tools_toggle_write_lock", editor, SLOT(toggleReadOnly()));
+  QAction* a = action("tools_toggle_write_lock");
+  delete a;
+  a = new KToggleAction(i18n("Read Only Mode"), this);
+  actionCollection()->addAction("tools_toggle_write_lock", a);
+  connect(a, SIGNAL(toggled(bool)), editor, SLOT(toggleReadOnly()));
 }
 
 void HexEditorPart::setReadWrite(bool rw)
 {
   KParts::ReadWritePart::setReadWrite(rw);
-  static_cast<KToggleAction *>(action("tools_toggle_write_lock"))->setChecked(!rw);
+  QAction* a = action("tools_toggle_write_lock");
+  a->blockSignals(true);
+  a->setChecked(!rw);
+  a->blockSignals(false);
 }
 
 //-----------------------------------------------------------------------------

Modified: trunk/piklab_kde4/src/progs/gui/debug_config_center.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/gui/debug_config_center.cpp	2012-04-22 19:16:40 UTC (rev 2877)
+++ trunk/piklab_kde4/src/progs/gui/debug_config_center.cpp	2012-04-22 20:42:20 UTC (rev 2878)
@@ -12,5 +12,5 @@
 
 QPixmap Debugger::OptionsConfigWidget::pixmap() const
 {
-  return IconLoader::loadIcon("tool_report_bug", IconLoader::Toolbar);
+  return IconLoader::loadIcon("tool-report-bug", IconLoader::Toolbar);
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2877] trunk/piklab_kde4/src

[<az...@us...>]

Revision: 2877
          http://piklab.svn.sourceforge.net/piklab/?rev=2877&view=rev
Author:   azhyd
Date:     2012-04-22 19:16:40 +0000 (Sun, 22 Apr 2012)
Log Message:
-----------
update icons

Modified Paths:
--------------
    trunk/piklab_kde4/src/common/gui/editlistbox.cpp
    trunk/piklab_kde4/src/devices/gui/memory_editor.cpp
    trunk/piklab_kde4/src/libgui/device_gui.cpp
    trunk/piklab_kde4/src/libgui/editor_manager.cpp
    trunk/piklab_kde4/src/libgui/project_manager.cpp
    trunk/piklab_kde4/src/libgui/project_manager_ui.cpp
    trunk/piklab_kde4/src/libgui/text_editor.cpp
    trunk/piklab_kde4/src/libgui/toplevel.cpp
    trunk/piklab_kde4/src/libgui/watch_view.cpp
    trunk/piklab_kde4/src/progs/gui/debug_config_center.cpp
    trunk/piklab_kde4/src/progs/gui/prog_config_center.cpp
    trunk/piklab_kde4/src/progs/gui/prog_group_ui.cpp
    trunk/piklab_kde4/src/tools/gui/tool_config_widget.cpp
    trunk/piklab_kde4/src/tools/gui/toolchain_config_center.cpp
    trunk/piklab_kde4/src/tools/list/tools_config_widget.cpp
    trunk/piklab_kde4/src/tools/list/tools_config_widget.h

Modified: trunk/piklab_kde4/src/common/gui/editlistbox.cpp
===================================================================
--- trunk/piklab_kde4/src/common/gui/editlistbox.cpp	2012-04-22 19:10:50 UTC (rev 2876)
+++ trunk/piklab_kde4/src/common/gui/editlistbox.cpp	2012-04-22 19:16:40 UTC (rev 2877)
@@ -57,7 +57,7 @@
       QHBoxLayout *hbox = new QHBoxLayout(Dialog::spacingHint());
       grid->addMultiCellLayout(hbox, row,row, 0,1);
       if (m_lineEdit) {
-	KIcon icon("locationbar_erase");
+	KIcon icon("edit-clear-locationbar-ltr");
         KPushButton *button = new KPushButton(icon, QString::null, this);
         connect(button, SIGNAL(clicked()), SLOT(clearEdit()));
         hbox->addWidget(button);
@@ -109,7 +109,7 @@
     delete _removeButton;
     _removeButton = 0;
     if ( buttons & Remove ) {
-        _removeButton = new KPushButton(KGuiItem(i18n("Remove"), "clear"), this);
+        _removeButton = new KPushButton(KGuiItem(i18n("Remove"), "list-remove"), this);
         _removeButton->setEnabled(false);
         _removeButton->show();
         connect(_removeButton, SIGNAL(clicked()), SLOT(removeItem()));
@@ -119,7 +119,7 @@
     delete _removeAllButton;
     _removeAllButton = 0;
     if ( buttons & RemoveAll ) {
-        _removeAllButton = new KPushButton(KGuiItem(i18n("Remove All"), "delete"), this);
+        _removeAllButton = new KPushButton(KGuiItem(i18n("Remove All"), "edit-clear-list"), this);
         _removeAllButton->show();
         connect(_removeAllButton, SIGNAL(clicked()), SLOT(clear()));
         _buttonsLayout->addWidget(_removeAllButton);

Modified: trunk/piklab_kde4/src/devices/gui/memory_editor.cpp
===================================================================
--- trunk/piklab_kde4/src/devices/gui/memory_editor.cpp	2012-04-22 19:10:50 UTC (rev 2876)
+++ trunk/piklab_kde4/src/devices/gui/memory_editor.cpp	2012-04-22 19:16:40 UTC (rev 2877)
@@ -266,15 +266,15 @@
 
 //-----------------------------------------------------------------------------
 const Device::ActionData Device::ACTION_DATA[Nb_Actions] = {
-  { I18N_NOOP("&Clear"),       "fileclose",         NeedWrite },
-  { I18N_NOOP("&Zero"),        0,                   NeedWrite },
-  { I18N_NOOP("For checksum check"), 0,             NeedWrite },
-  { I18N_NOOP("Re&load"),      "reload",            SeparatorAfter | NeedModified },
-  { I18N_NOOP("&Program"),     "piklab_burnchip",   NeedProgrammer },
-  { I18N_NOOP("&Verify"),      "piklab_verifychip", NeedProgrammer },
-  { I18N_NOOP("&Read"),        "piklab_readchip",   NeedProgrammer | NeedWrite },
-  { I18N_NOOP("&Erase"),       "piklab_erasechip",  NeedProgrammer },
-  { I18N_NOOP("&Blank Check"), "piklab_blankcheck", NeedProgrammer }
+  { I18N_NOOP("&Clear"),       "edit-clear",      NeedWrite },
+  { I18N_NOOP("&Zero"),        0,                 NeedWrite },
+  { I18N_NOOP("For checksum check"), 0,           NeedWrite },
+  { I18N_NOOP("Re&load"),      "view-refresh",    SeparatorAfter | NeedModified },
+  { I18N_NOOP("&Program"),     "arrow-down",      NeedProgrammer },
+  { I18N_NOOP("&Verify"),      "dialog-ok-apply", NeedProgrammer },
+  { I18N_NOOP("&Read"),        "arrow-up",        NeedProgrammer | NeedWrite },
+  { I18N_NOOP("&Erase"),       "draw-eraser",     NeedProgrammer },
+  { I18N_NOOP("&Blank Check"), "dialog-ok",       NeedProgrammer }
 };
 
 Device::MemoryTypeEditor::MemoryTypeEditor(const HexView *hexview, Device::Memory &memory,

Modified: trunk/piklab_kde4/src/libgui/device_gui.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/device_gui.cpp	2012-04-22 19:10:50 UTC (rev 2876)
+++ trunk/piklab_kde4/src/libgui/device_gui.cpp	2012-04-22 19:16:40 UTC (rev 2877)
@@ -388,7 +388,7 @@
   _combo = new ComboBox(this);
   connect(_combo, SIGNAL(activated(int)), SIGNAL(changed()));
   hbox->addWidget(_combo);
-  KPushButton *button = new KPushButton(KIcon("fileopen"), QString::null, this);
+  KPushButton *button = new KPushButton(KIcon("document-open"), QString::null, this);
   connect(button, SIGNAL(clicked()), SLOT(chooseDevice()));
   hbox->addWidget(button);
 }

Modified: trunk/piklab_kde4/src/libgui/editor_manager.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/editor_manager.cpp	2012-04-22 19:10:50 UTC (rev 2876)
+++ trunk/piklab_kde4/src/libgui/editor_manager.cpp	2012-04-22 19:16:40 UTC (rev 2877)
@@ -119,10 +119,10 @@
     return true;
   }
   if ( !openEditor(url) ) {
-    static_cast< KRecentFilesAction *>(Main::action("file_open_recent"))->removeUrl(url.kurl());
+    static_cast< KRecentFilesAction *>(Main::action("document-open-recent"))->removeUrl(url.kurl());
     return false;
   }
-  static_cast<KRecentFilesAction *>(Main::action("file_open_recent"))->addUrl(url.kurl());
+  static_cast<KRecentFilesAction *>(Main::action("document-open-recent"))->addUrl(url.kurl());
   return true;
 }
 
@@ -157,8 +157,8 @@
 void EditorManager::updateTitles()
 {
   QPixmap def = IconLoader::loadIcon("piklab", IconLoader::Small);
-  QPixmap modified = IconLoader::loadIcon("filesave", IconLoader::Small);
-  QPixmap chip = IconLoader::loadIcon("piklab_chip", IconLoader::Small);
+  QPixmap modified = IconLoader::loadIcon("document-save", IconLoader::Small);
+  QPixmap chip = IconLoader::loadIcon("media-flash", IconLoader::Small);
   for (QValueList<Editor *>::iterator it = _editors.begin(); it!=_editors.end(); ++it) {
     Editor* e = *it;
     static_cast<EditorTabBar*>(tabBar())->setReadOnly(indexOf(e), e->isReadOnly());
@@ -394,11 +394,11 @@
 
   std::auto_ptr<KPopupMenu> popup(new KPopupMenu);
   popup->addTitle(title(*editor));
-  QAction* close = popup->addAction(KIcon("fileclose"), i18n("Close"));
-  QAction* closeAllOthers = nbEditors()>1 ? popup->addAction(i18n("Close All Others")) : NULL;
-  QAction* save = editor->isModified() ? popup->addAction(KIcon("filesave"), i18n("Save")) : NULL;
-  QAction* saveAs = popup->addAction(KIcon("filesaveas"), i18n("Save As..."));
-  QAction* reload = !editor->url().isEmpty() ? popup->addAction(KIcon("reload"), i18n("Reload")) : NULL;
+  QAction* close = popup->addAction(KIcon("document-close"), i18n("Close"));
+  QAction* closeAllOthers = nbEditors()>1 ? popup->addAction(KIcon("document-close"), i18n("Close All Others")) : NULL;
+  QAction* save = editor->isModified() ? popup->addAction(KIcon("document-save"), i18n("Save")) : NULL;
+  QAction* saveAs = popup->addAction(KIcon("document-save-as"), i18n("Save As..."));
+  QAction* reload = !editor->url().isEmpty() ? popup->addAction(KIcon("view-refresh"), i18n("Reload")) : NULL;
   QAction* action = popup->exec(p);
   if ( action==close ) closeEditor(editor, true);
   else if ( action==closeAllOthers ) closeAllOtherEditors();

Modified: trunk/piklab_kde4/src/libgui/project_manager.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/project_manager.cpp	2012-04-22 19:10:50 UTC (rev 2876)
+++ trunk/piklab_kde4/src/libgui/project_manager.cpp	2012-04-22 19:16:40 UTC (rev 2877)
@@ -165,7 +165,7 @@
   if ( item->rtti()==LinkerScriptRtti || group==Group::LinkerScript ) {
     if ( Main::toolGroup().linkerScriptType()==PURL::Nb_FileTypes ) return;
     pop.addTitle(i18n("Linker Script"));
-    QAction* addAction = pop.addAction(KIcon("piklab_addfile"), i18n("Set Custom..."));
+    QAction* addAction = pop.addAction(KIcon("document-import"), i18n("Set Custom..."));
     QAction* removeAction = !_project->customLinkerScript().isEmpty()
       ? pop.addAction(KIcon("editdelete"), i18n("Set Default")) : NULL;
     QAction* action = pop.exec(p);
@@ -179,52 +179,52 @@
   } else if ( item->rtti()==RootRtti ) {
     if (_project.get() != NULL) {
       pop.addTitle(i18n("Project"));
-      pop.insertItem("configure", i18n("Options..."), &MainWindow::self(), SLOT(configureProject()));
-      pop.insertItem("find", i18n("Find Files..."),   &MainWindow::self(), SLOT(runKfind()));
+      pop.insertItem("document-properties", i18n("Options..."), &MainWindow::self(), SLOT(configureProject()));
+      pop.insertItem("edit-find", i18n("Find Files..."),   &MainWindow::self(), SLOT(runKfind()));
       pop.insertSeparator();
-      pop.insertItem("piklab_compile", i18n("Build Project"), &MainWindow::self(), SLOT(buildProject()));
-      pop.insertItem("trashcan_empty", i18n("Clean Project"), &MainWindow::self(), SLOT(cleanBuild()));
+      pop.insertItem("run-build", i18n("Build Project"), &MainWindow::self(), SLOT(buildProject()));
+      pop.insertItem("run-build-clean", i18n("Clean Project"), &MainWindow::self(), SLOT(cleanBuild()));
       pop.insertSeparator();
-      pop.insertItem("filenew", i18n("New Source File..."), &MainWindow::self(), SLOT(newSourceFile()));
-      pop.insertItem("piklab_addfile", i18n("Add Source Files..."), this, SLOT(insertSourceFiles()));
-      pop.insertItem("piklab_addfile", i18n("Add Object Files..."), this, SLOT(insertObjectFiles()));
-      if (Main::currentEditor() != NULL) pop.insertItem("piklab_addcurrentfile", i18n("Add Current File"), this, SLOT(insertCurrentFile()));
+      pop.insertItem("document-new", i18n("New Source File..."), &MainWindow::self(), SLOT(newSourceFile()));
+      pop.insertItem("document-import", i18n("Add Source Files..."), this, SLOT(insertSourceFiles()));
+      pop.insertItem("document-import", i18n("Add Object Files..."), this, SLOT(insertObjectFiles()));
+      if (Main::currentEditor() != NULL) pop.insertItem("document-import", i18n("Add Current File"), this, SLOT(insertCurrentFile()));
       pop.exec(p);
     }
   } else if ( item->rtti()==FileRtti ) {
     FileItem *fi = static_cast<FileItem *>(item);
     if ( isExternalFile(fi->url()) ) return;
     pop.addTitle(item->text(0));
-    pop.insertItem("editdelete", i18n("Remove From Project"));
+    pop.insertItem("edit-delete", i18n("Remove From Project"));
     if ( pop.exec(p)!=NULL ) removeFile(fi->url());
   } else if ( item->rtti()==HeaderRtti ) {
     switch (group.type()) {
       case Group::LinkerObject:
         pop.addTitle(i18n("Objects"));
-        pop.insertItem("piklab_addfile", i18n("Add Object Files..."), this, SLOT(insertObjectFiles()));
+        pop.insertItem("document-import", i18n("Add Object Files..."), this, SLOT(insertObjectFiles()));
         pop.exec(p);
         break;
       case Group::Source:
       case Group::Header:
         pop.addTitle(i18n("Sources"));
-        pop.insertItem("filenew", i18n("New File..."), &MainWindow::self(), SLOT(newSourceFile()));
-        pop.insertItem("piklab_addfile", i18n("Add Source Files..."), this, SLOT(insertSourceFiles()));
+        pop.insertItem("document-new", i18n("New File..."), &MainWindow::self(), SLOT(newSourceFile()));
+        pop.insertItem("document-import", i18n("Add Source Files..."), this, SLOT(insertSourceFiles()));
         pop.exec(p);
         break;
       case Group::Device:
         pop.addTitle(i18n("Device"));
-        pop.insertItem("piklab_chip", i18n("Select..."), &MainWindow::self(), SLOT(showDeviceInfo()));
+        pop.insertItem("media-flash", i18n("Select..."), &MainWindow::self(), SLOT(showDeviceInfo()));
         pop.exec(p);
         break;
       case Group::Toolchain:
         pop.addTitle(i18n("Toolchain"));
-        pop.insertItem("configure", i18n("Options..."), &MainWindow::self(), SLOT(configureProjectToolchain()));
-        pop.insertItem("exec", i18n("Configure Toolchains..."), &MainWindow::self(), SLOT(configureToolchains()));
+        pop.insertItem("document-properties", i18n("Options..."), &MainWindow::self(), SLOT(configureProjectToolchain()));
+        pop.insertItem("system-run", i18n("Configure Toolchains..."), &MainWindow::self(), SLOT(configureToolchains()));
         pop.exec(p);
         break;
       case Group::Programmer:
         pop.addTitle(i18n("Programmer"));
-        pop.insertItem("piklab_config_programmer", i18n("Configure Programmers..."), &MainWindow::self(), SLOT(configureProgrammers()));
+        pop.insertItem("audio-card", i18n("Configure Programmers..."), &MainWindow::self(), SLOT(configureProgrammers()));
         pop.exec(p);
         break;
       case Group::LinkerScript:

Modified: trunk/piklab_kde4/src/libgui/project_manager_ui.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/project_manager_ui.cpp	2012-04-22 19:10:50 UTC (rev 2876)
+++ trunk/piklab_kde4/src/libgui/project_manager_ui.cpp	2012-04-22 19:16:40 UTC (rev 2877)
@@ -28,9 +28,9 @@
 
 //----------------------------------------------------------------------------
 const ProjectManager::Group::Data ProjectManager::Group::DATA[Nb_Types] = {
-  { I18N_NOOP("Device"),        "piklab_chip" },
-  { I18N_NOOP("Toolchain"),     "exec" },
-  { I18N_NOOP("Programmer"),    "piklab_burnchip" },
+  { I18N_NOOP("Device"),        "media-flash" },
+  { I18N_NOOP("Toolchain"),     "system-run" },
+  { I18N_NOOP("Programmer"),    "audio-card" },
   { I18N_NOOP("Headers"),       NULL },
   { I18N_NOOP("Linker Script"), NULL },
   { I18N_NOOP("Sources"),       NULL },

Modified: trunk/piklab_kde4/src/libgui/text_editor.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/text_editor.cpp	2012-04-22 19:10:50 UTC (rev 2876)
+++ trunk/piklab_kde4/src/libgui/text_editor.cpp	2012-04-22 19:16:40 UTC (rev 2877)
@@ -219,7 +219,7 @@
 {
   KTextEditor::MarkInterface *markInterface = qobject_cast<KTextEditor::MarkInterface*>(_document);
   ASSERT(markInterface != NULL);
-  const QHash<int, KTextEditor::Mark*>& marks = markInterface->marks();
+  const QHash<int, KTextEditor::Mark*> marks = markInterface->marks();
   for (QHash<int, KTextEditor::Mark*>::const_iterator it = marks.begin(); it != marks.end(); ++it)
     if ( it.value()->type==type ) markInterface->removeMark(it.key(), it.value()->type);
 }

Modified: trunk/piklab_kde4/src/libgui/toplevel.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/toplevel.cpp	2012-04-22 19:10:50 UTC (rev 2876)
+++ trunk/piklab_kde4/src/libgui/toplevel.cpp	2012-04-22 19:16:40 UTC (rev 2877)
@@ -58,9 +58,9 @@
 
 //----------------------------------------------------------------------------
 const ExternalToolType::Data ExternalToolType::DATA[Nb_Types] = {
-  { "pikloops", I18N_NOOP("&Pikloops..."),   NULL,   "http://pikloops.sourceforge.net" },
-  { "kfind",    I18N_NOOP("&Find Files..."), "find", NULL },
-  { "khexterm", I18N_NOOP("&KHexTerm..."),   NULL,   "http://khexterm.sourceforge.net" }
+  { "pikloops", I18N_NOOP("&Pikloops..."),   "chronometer",        "http://pikloops.sourceforge.net" },
+  { "kfind",    I18N_NOOP("&Find Files..."), "edit-find",          NULL },
+  { "khexterm", I18N_NOOP("&KHexTerm..."),   "utilities-terminal", "http://khexterm.sourceforge.net" }
 };
 
 //----------------------------------------------------------------------------
@@ -175,11 +175,14 @@
     recent->loadEntries(configGroup);
     a = actionCollection()->addAction("file_save_all", Main::_editorManager, SLOT(saveAllFiles()));
     a->setText(i18n("Save All"));
+    a->setIcon(KIcon("document-save"));
     actionCollection()->addAction(KStandardAction::Close, Main::_editorManager, SLOT(closeCurrentEditor()));
     a = actionCollection()->addAction("file_close_all", Main::_editorManager, SLOT(closeAllEditors()));
     a->setText(i18n("C&lose All"));
+    a->setIcon(KIcon("window-close"));
     a = actionCollection()->addAction("file_close_other", Main::_editorManager, SLOT(closeAllOtherEditors()));
     a->setText(i18n("Close All Others"));
+    a->setIcon(KIcon("window-close"));
     actionCollection()->addAction(KStandardAction::Quit, this, SLOT(close()));
 
     // edit actions
@@ -201,87 +204,89 @@
     // project actions
     a = actionCollection()->addAction("project_new", this, SLOT(newProject()));
     a->setText(i18n("New Project..."));
-    a->setIcon(KIcon("piklab_createproject"));
+    a->setIcon(KIcon("document-new"));
     a = actionCollection()->addAction("project_open", this , SLOT(openProject()));
     a->setText(i18n("Open Project..."));
-    a->setIcon(KIcon("piklab_openproject"));
+    a->setIcon(KIcon("document-open"));
     recent = new KRecentFilesAction(i18n("Open Recent Project"), this);
     actionCollection()->addAction("project_open_recent", recent);
     connect(recent, SIGNAL(urlSelected(const KUrl&)), this, SLOT(openRecentProject(const KUrl&)));
     configGroup = KGlobal::config()->group("recent-projects");
     recent->loadEntries(configGroup);
+    recent->setIcon(KIcon("document-open-recent"));
     a = actionCollection()->addAction("project_options", this, SLOT(configureProject()));
     a->setText(i18n("Project Options..."));
-    a->setIcon(KIcon("configure"));
+    a->setIcon(KIcon("document-properties"));
     a = actionCollection()->addAction("project_close", this, SLOT(closeProject()));
     a->setText(i18n("Close Project"));
-    a->setIcon(KIcon("fileclose"));
+    a->setIcon(KIcon("document-close"));
     a = actionCollection()->addAction("project_add_source_file", Main::_projectManager, SLOT(insertSourceFiles()));
     a->setText(i18n("Add Source File..."));
-    a->setIcon(KIcon("piklab_addfile"));
+    a->setIcon(KIcon("document-import"));
     a = actionCollection()->addAction("project_add_object_file", Main::_projectManager, SLOT(insertObjectFiles()));
     a->setText(i18n("Add Object File..."));
-    a->setIcon(KIcon("piklab_addfile"));
+    a->setIcon(KIcon("document-import"));
     a = actionCollection()->addAction("project_add_current_file", Main::_projectManager, SLOT(insertCurrentFile()));
     a->setText(i18n("Add Current File"));
-    a->setIcon(KIcon("piklab_addcurrentfile"));
+    a->setIcon(KIcon("document-import"));
 
     // build actions
     a = actionCollection()->addAction("build_build_project", this, SLOT(buildProject()));
     a->setText(i18n("&Build Project"));
-    a->setIcon(KIcon("piklab_compile"));
+    a->setIcon(KIcon("run-build"));
     a->setShortcut(Qt::Key_F8);
     a = actionCollection()->addAction("build_compile_file", this, SLOT(compileFile()));
     a->setText(i18n("&Compile File"));
+    a->setIcon(KIcon("run-build-file"));
     a->setShortcut(Qt::SHIFT + Qt::Key_F8);
     a = actionCollection()->addAction("build_clean", this, SLOT(cleanBuild()));
     a->setText(i18n("Clean"));
-    a->setIcon(KIcon("trashcan_empty"));
+    a->setIcon(KIcon("run-build-clean"));
     a = actionCollection()->addAction("build_stop", this, SLOT(stopBuild()));
     a->setText(i18n("Stop"));
-    a->setIcon(KIcon("stop"));
+    a->setIcon(KIcon("process-stop"));
     a = actionCollection()->addAction("build_disassemble", this, SLOT(disassembleFile()));
     a->setText(i18n("Disassemble"));
-    a->setIcon(KIcon("piklab_decompile"));
+    a->setIcon(KIcon("document-edit-decrypt"));
 
     // programmer actions
     a = actionCollection()->addAction("prog_connect", Programmer::manager, SLOT(connectDevice()));
     a->setText(i18n("&Connect"));
-    a->setIcon(KIcon("connect_creating"));
+    a->setIcon(KIcon("network-wired-activated"));
     a = actionCollection()->addAction("prog_power", Programmer::manager, SLOT(toggleDevicePower()));
     a->setText(i18n("Device Power"));
-    a->setIcon(KIcon("piklab_power"));
+    a->setIcon(KIcon("battery-charging"));
     a = actionCollection()->addAction("prog_disconnect", Programmer::manager, SLOT(disconnectDevice()));
     a->setText(i18n("&Disconnect"));
-    a->setIcon(KIcon("connect_no"));
+    a->setIcon(KIcon("network-wired"));
     a = actionCollection()->addAction("prog_program", this , SLOT(program()));
     a->setText(i18n("&Program"));
-    a->setIcon(KIcon("piklab_burnchip"));
+    a->setIcon(KIcon("arrow-down"));
     a->setShortcut(Qt::SHIFT + Qt::Key_F5);
     a = actionCollection()->addAction("prog_verify", this , SLOT(verify()));
     a->setText(i18n("&Verify"));
-    a->setIcon(KIcon("piklab_verifychip"));
+    a->setIcon(KIcon("dialog-ok-apply"));
     a->setShortcut(Qt::SHIFT + Qt::Key_F6);
     a = actionCollection()->addAction("prog_read", this , SLOT(read()));
     a->setText(i18n("&Read"));
-    a->setIcon(KIcon("piklab_readchip"));
+    a->setIcon(KIcon("arrow-up"));
     a->setShortcut(Qt::SHIFT + Qt::Key_F7);
     a = actionCollection()->addAction("prog_erase", this, SLOT(erase()));
     a->setText(i18n("&Erase"));
-    a->setIcon(KIcon("piklab_erasechip"));
+    a->setIcon(KIcon("draw-eraser"));
     a = actionCollection()->addAction("prog_blank_check", this, SLOT(blankCheck()));
     a->setText(i18n("&Blank Check"));
-    a->setIcon(KIcon("piklab_blankcheck"));
+    a->setIcon(KIcon("dialog-ok"));
     a = actionCollection()->addAction("prog_run", Programmer::manager, SLOT(run()));
     a->setText(i18n("&Run"));
-    a->setIcon(KIcon("launch"));
+    a->setIcon(KIcon("system-run"));
     a->setShortcut(Qt::SHIFT + Qt::Key_F9);
     a = actionCollection()->addAction("prog_stop", Programmer::manager, SLOT(halt()));
     a->setText(i18n("&Stop"));
-    a->setIcon(KIcon("piklab_stop"));
+    a->setIcon(KIcon("media-playback-stop"));
     a = actionCollection()->addAction("prog_restart", Programmer::manager, SLOT(restart()));
     a->setText(i18n("R&estart"));
-    a->setIcon(KIcon("piklab_restart"));
+    a->setIcon(KIcon("view-refresh"));
     a = actionCollection()->addAction("prog_advanced", Programmer::manager , SLOT(showAdvancedDialog()));
     a->setText(i18n("&Advanced..."));
     a = actionCollection()->addAction("prog_settings", this , SLOT(showProgrammerSettings()));
@@ -291,10 +296,10 @@
     // debugger actions
     a = actionCollection()->addAction("debug_next", Programmer::manager, SLOT(step()));
     a->setText(i18n("&Start/Step"));
-    a->setIcon(KIcon("piklab_debug_step"));
+    a->setIcon(KIcon("debug-step-instruction"));
     a = actionCollection()->addAction("debug_run", Programmer::manager, SLOT(run()));
     a->setText(i18n("&Run"));
-    a->setIcon(KIcon("piklab_run"));
+    a->setIcon(KIcon("debug-run"));
     a->setShortcut(Qt::SHIFT + Qt::Key_F9);
     //(void)new KAction(i18n("Step &In"), "piklab_debug_stepin",
     //             0, this, SLOT(debugStepIn()), actionCollection(), "debug_step_in");
@@ -302,19 +307,19 @@
     //             0, this, SLOT(debugStepOut()), actionCollection(), "debug_step_out");
     a = actionCollection()->addAction("debug_halt", Programmer::manager, SLOT(halt()));
     a->setText(i18nc("it is the verb", "&Halt"));
-    a->setIcon(KIcon("piklab_debughalt"));
+    a->setIcon(KIcon("media-playback-pause"));
     a = actionCollection()->addAction("debug_stop",  Programmer::manager, SLOT(disconnectDevice()));
     a->setText(i18n("&Disconnect/Stop"));
-    a->setIcon(KIcon("piklab_stop"));
+    a->setIcon(KIcon("media-playback-stop"));
     a = actionCollection()->addAction("debug_reset", Programmer::manager, SLOT(restart()));
     a->setText(i18n("R&eset"));
-    a->setIcon(KIcon("piklab_restart"));
+    a->setIcon(KIcon("view-refresh"));
     a = actionCollection()->addAction("debug_show_pc", Debugger::manager, SLOT(showPC()));
     a->setText(i18n("Show Program Counter"));
-    a->setIcon(KIcon("piklab_program_counter"));
+    a->setIcon(KIcon("view-process-all"));
     a = actionCollection()->addAction("debug_clear_breakpoints", Debugger::manager, SLOT(clearBreakpoints()));
     a->setText(i18n("Clear All Breakpoints"));
-    a->setIcon(KIcon("remove"));
+    a->setIcon(KIcon("edit-delete"));
     a = actionCollection()->addAction("debug_settings", this , SLOT(showDebuggerSettings()));
     a->setText(i18n("Settings..."));
     a->setIcon(KIcon("configure"));
@@ -328,7 +333,7 @@
     }
     a = actionCollection()->addAction("tools_device_information", this , SLOT(showDeviceInfo()));
     a->setText(i18n("&Device Selector..."));
-    a->setIcon(KIcon("piklab_chip"));
+    a->setIcon(KIcon("media-flash"));
     a = actionCollection()->addAction("tools_config_generator", this , SLOT(configGenerator()));
     a->setText(i18n("&Config Generator..."));
     a = actionCollection()->addAction("tools_template_generator", this , SLOT(templateGenerator()));
@@ -337,10 +342,10 @@
     // settings actions
     a = actionCollection()->addAction("options_configure_toolchains", this, SLOT(configureToolchains()));
     a->setText(i18n("Configure Toolchains..."));
-    a->setIcon(KIcon("exec"));
+    a->setIcon(KIcon("system-run"));
     a = actionCollection()->addAction("options_configure_programmers", this, SLOT(configureProgrammers()));
     a->setText(i18n("Configure Programmers..."));
-    a->setIcon(KIcon("piklab_config_programmer"));
+    a->setIcon(KIcon("audio-card"));
     actionCollection()->addAction(KStandardAction::Preferences, this, SLOT(configure()));
 
     toolBar()->setToolButtonStyle(Qt::ToolButtonIconOnly);

Modified: trunk/piklab_kde4/src/libgui/watch_view.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/watch_view.cpp	2012-04-22 19:10:50 UTC (rev 2876)
+++ trunk/piklab_kde4/src/libgui/watch_view.cpp	2012-04-22 19:16:40 UTC (rev 2877)
@@ -43,7 +43,7 @@
 {
   delete _root;
   _root = new ListViewItemContainer(i18n("Registers"), this);
-  _root->setPixmap(0, IconLoader::loadIcon("piklab_chip", IconLoader::Small));
+  _root->setPixmap(0, IconLoader::loadIcon("media-flash", IconLoader::Small));
   _root->setSelectable(false);
   _root->setOpen(true);
   if (data) Device::groupui(*data).fillWatchListContainer(_root, _ids);
@@ -81,7 +81,7 @@
   addColumn(QString::null);
 
   _root = new ListViewItemContainer(i18n("Watched"), this);
-  _root->setPixmap(0, IconLoader::loadIcon("viewmag", IconLoader::Small));
+  _root->setPixmap(0, IconLoader::loadIcon("zoom-select", IconLoader::Small));
   _root->setSelectable(false);
   _root->setOpen(true);
 }
@@ -105,7 +105,7 @@
   Device::groupui(*data).fillWatchListContainer(_popup, _ids);
   _popup->insertSeparator();
   _formatPopup = appendFormatMenu(_popup, _ids.count());
-  QPixmap icon = IconLoader::loadIcon("cancel", IconLoader::Small);
+  QPixmap icon = IconLoader::loadIcon("edit-clear", IconLoader::Small);
   _popup->insertItem(icon, i18n("Clear"), Debugger::manager, SLOT(stopWatchAll()));
 }
 
@@ -174,10 +174,10 @@
     KPopupMenu *fpop = appendFormatMenu(pop.get(), 0);
     FOR_EACH(NumberBase, base) fpop->setItemChecked(base.type(), ritem->base()==base);
     pop->insertSeparator();
-    QPixmap icon = IconLoader::loadIcon("edit", IconLoader::Small);
+    QPixmap icon = IconLoader::loadIcon("edit-rename", IconLoader::Small);
     int editId = pop->insertItem(icon, i18n("Edit"));
     pop->setItemEnabled(editId, Main::programmerState()==Programmer::Halted);
-    icon = IconLoader::loadIcon("cancel", IconLoader::Small);
+    icon = IconLoader::loadIcon("edit-delete", IconLoader::Small);
     int removeId = pop->insertItem(icon, i18n("Remove"));
     QAction* action = pop->exec(p);
     // ### FIXME

Modified: trunk/piklab_kde4/src/progs/gui/debug_config_center.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/gui/debug_config_center.cpp	2012-04-22 19:10:50 UTC (rev 2876)
+++ trunk/piklab_kde4/src/progs/gui/debug_config_center.cpp	2012-04-22 19:16:40 UTC (rev 2877)
@@ -12,5 +12,5 @@
 
 QPixmap Debugger::OptionsConfigWidget::pixmap() const
 {
-  return IconLoader::loadIcon("piklab_config_debugger", IconLoader::Toolbar);
+  return IconLoader::loadIcon("tool_report_bug", IconLoader::Toolbar);
 }

Modified: trunk/piklab_kde4/src/progs/gui/prog_config_center.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/gui/prog_config_center.cpp	2012-04-22 19:10:50 UTC (rev 2876)
+++ trunk/piklab_kde4/src/progs/gui/prog_config_center.cpp	2012-04-22 19:16:40 UTC (rev 2877)
@@ -21,7 +21,7 @@
 //----------------------------------------------------------------------------
 QPixmap Programmer::OptionsConfigWidget::pixmap() const
 {
-  return IconLoader::loadIcon("piklab_config_programmer", IconLoader::Toolbar);
+  return IconLoader::loadIcon("audio-card", IconLoader::Toolbar);
 }
 
 //----------------------------------------------------------------------------
@@ -29,7 +29,7 @@
 : TreeListDialog(parent, "configure_programmers_dialog", true,
                  i18n("Configure Programmers"), Ok|User1|Apply|Cancel, Cancel, false)
 {
-  setButtonGuiItem(User1, KGuiItem(i18n("Update"), "reload"));
+  setButtonGuiItem(User1, KGuiItem(i18n("Update"), "view-refresh"));
 
   KPageWidgetItem* current = NULL;
   for (Lister::ConstIterator it = Lister::instance().begin();
@@ -100,7 +100,7 @@
     _portSelector = new PortSelector(container);
     connect(_portSelector, SIGNAL(changed()), SLOT(detect()));
     container->addWidget(_portSelector, 0,0, 0,0);
-    QPixmap icon = IconLoader::loadIcon("connect_creating", IconLoader::Small);
+    QPixmap icon = IconLoader::loadIcon("network-wired-activated", IconLoader::Small);
     tabWidget->insertTab(container, icon, i18n("Port Selection"), 0);
   } else {
     _portSelector = NULL;

Modified: trunk/piklab_kde4/src/progs/gui/prog_group_ui.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/gui/prog_group_ui.cpp	2012-04-22 19:10:50 UTC (rev 2876)
+++ trunk/piklab_kde4/src/progs/gui/prog_group_ui.cpp	2012-04-22 19:16:40 UTC (rev 2877)
@@ -28,7 +28,7 @@
 void Programmer::StandaloneMemoryCalibrationEditor::init(bool first)
 {
   Pic::MemoryCalibrationEditor::init(first);
-  KAction *action = new KAction(KIcon("reload"), i18n("Read"), this);
+  KAction *action = new KAction(KIcon("view-refresh"), i18n("Read"), this);
   connect(action, SIGNAL(triggered()), this, SIGNAL(updateCalibration()));
   addAction(action);
   action = new KAction(i18n("Regenerating..."), this);
@@ -41,7 +41,7 @@
                                     QObject *receiver, const char *updateSlot, QWidget *parent)
   : Container::Button(title, parent)
 {
-  if (receiver) button().appendAction(i18n("Read"), "reload", receiver, updateSlot);
+  if (receiver) button().appendAction(i18n("Read"), "view-refresh", receiver, updateSlot);
 }
 
 //----------------------------------------------------------------------------
@@ -54,7 +54,7 @@
   _programmerContainer = new Container::Grid(this);
   KPageWidgetItem* item = addPage(_programmerContainer, _base.group().label());
   item->setHeader(i18n("Programmer"));
-  item->setIcon(KIcon("piklab_burnchip"));
+  item->setIcon(KIcon("arrow-down"));
 
   Properties properties = _base.group().properties();
   uint row = _programmerContainer->numRows();
@@ -62,7 +62,7 @@
     _firmwareContainer = new ButtonContainer(i18n("Firmware"), this, SLOT(updateFirmware()), _programmerContainer);
     _programmerContainer->addWidget(_firmwareContainer, row,row, 0,1);
     if ( _base.group().properties() & CanUploadFirmware )
-      _firmwareContainer->button().appendAction(i18n("Uploading..."), "piklab_burnchip", this, SLOT(uploadFirmware()));
+      _firmwareContainer->button().appendAction(i18n("Uploading..."), "arrow-down", this, SLOT(uploadFirmware()));
     QLabel *label = new QLabel(i18n("Version:"), _firmwareContainer);
     _firmwareContainer->addWidget(label, 1,1, 0,0);
     _firmwareLabel = new QLabel(_firmwareContainer);

Modified: trunk/piklab_kde4/src/tools/gui/tool_config_widget.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/gui/tool_config_widget.cpp	2012-04-22 19:10:50 UTC (rev 2876)
+++ trunk/piklab_kde4/src/tools/gui/tool_config_widget.cpp	2012-04-22 19:16:40 UTC (rev 2877)
@@ -41,7 +41,7 @@
   _arguments = new KLineEdit(container);
   _arguments->setReadOnly(true);
   container->addWidget(_arguments, 1,1, 1,2);
-  KPushButton *button = new KPushButton(KGuiItem(QString::null, "help"), container);
+  KPushButton *button = new KPushButton(KGuiItem(QString::null, "help-about"), container);
   connect(button, SIGNAL(clicked()), SLOT(displayHelpSlot()));
   container->addWidget(button, 1,1, 3,3);
   _argumentsEditor = new EditListBox(1, container, "arguments_editor", EditListBox::DuplicatesAllowed,

Modified: trunk/piklab_kde4/src/tools/gui/toolchain_config_center.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/gui/toolchain_config_center.cpp	2012-04-22 19:10:50 UTC (rev 2876)
+++ trunk/piklab_kde4/src/tools/gui/toolchain_config_center.cpp	2012-04-22 19:16:40 UTC (rev 2877)
@@ -22,8 +22,8 @@
                    i18n("Configure Toolchains"), Ok|User1|User2|User3|Cancel, Cancel, false)
 {
   setButtonGuiItem(User1, KStandardGuiItem::reset());
-  setButtonGuiItem(User2, KGuiItem(i18n("Update"), "reload"));
-  setButtonGuiItem(User3, KGuiItem(i18n("Info"), "info"));
+  setButtonGuiItem(User2, KGuiItem(i18n("Update"), "view-refresh"));
+  setButtonGuiItem(User3, KGuiItem(i18n("Info"), "help-about"));
 
   KPageWidgetItem *current = 0;
   FOR_EACH(PURL::SourceFamily, family) {
@@ -56,7 +56,7 @@
   connect(this, SIGNAL(user3Clicked()), SLOT(slotUser3()));
 }
 
-void ToolchainsConfigCenter::currentPageChangedSlot(KPageWidgetItem *page)
+void ToolchainsConfigCenter::currentPageChangedSlot(KPageWidgetItem*)
 {
   ToolchainConfigWidget* tcw = static_cast<ToolchainConfigWidget*>(currentPage()->widget());
   if (tcw != NULL) {

Modified: trunk/piklab_kde4/src/tools/list/tools_config_widget.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/list/tools_config_widget.cpp	2012-04-22 19:10:50 UTC (rev 2876)
+++ trunk/piklab_kde4/src/tools/list/tools_config_widget.cpp	2012-04-22 19:16:40 UTC (rev 2877)
@@ -55,7 +55,7 @@
   addWidget(_output->widget(), row,row, 3,3);
   row++;
 
-  _mainStack = new Q3WidgetStack(this);
+  _mainStack = new QStackedWidget(this);
   addWidget(_mainStack, row,row, 0,4);
   row++;
   _tabWidget = new QTabWidget(_mainStack);
@@ -80,7 +80,7 @@
   QHBoxLayout *hbox = new QHBoxLayout(vbox);
   label = new QLabel(i18n("Custom shell commands:"), _customWidget);
   hbox->addWidget(label, 1);
-  KPushButton *button = new KPushButton(KGuiItem(QString::null, "help"), _customWidget);
+  KPushButton *button = new KPushButton(KGuiItem(QString::null, "help-about"), _customWidget);
   connect(button, SIGNAL(clicked()), SLOT(customDisplayHelp()));
   hbox->addWidget(button);
   _commandsEditor = new EditListBox(1, _customWidget, "command_editor", EditListBox::DuplicatesAllowed);
@@ -104,9 +104,9 @@
   _output->widget()->setEnabled(canMakeLibrary);
   if ( !canMakeLibrary ) _output->setCurrentItem(Tool::OutputType::Executable);
   QString name = group.name();
-  if (name == Tool::Group::CUSTOM_NAME) _mainStack->raiseWidget(_customWidget);
+  if (name == Tool::Group::CUSTOM_NAME) _mainStack->setCurrentWidget(_customWidget);
   else {
-    _mainStack->raiseWidget(_tabWidget);
+    _mainStack->setCurrentWidget(_tabWidget);
     FOR_EACH(Tool::Category, k) {
       _tabWidget->removePage(_stacks[k]->widget());
       _stacks[k]->widget()->hide();

Modified: trunk/piklab_kde4/src/tools/list/tools_config_widget.h
===================================================================
--- trunk/piklab_kde4/src/tools/list/tools_config_widget.h	2012-04-22 19:10:50 UTC (rev 2876)
+++ trunk/piklab_kde4/src/tools/list/tools_config_widget.h	2012-04-22 19:16:40 UTC (rev 2877)
@@ -13,6 +13,8 @@
 #include <map>
 #include <memory>
 
+#include <QStackedWidget>
+
 #include "common/gui/config_widget.h"
 #include "common/gui/dialog.h"
 #include "common/gui/key_gui.h"
@@ -52,7 +54,7 @@
   Project&       _project;
   std::auto_ptr<ListerComboBox<Tool::Lister> > _tool;
   std::auto_ptr<KeyComboBox<Tool::OutputType> > _output;
-  Q3WidgetStack *_mainStack;
+  QStackedWidget *_mainStack;
   QWidget       *_customWidget;
   EditListBox   *_commandsEditor;
   QTabWidget    *_tabWidget;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2876] trunk/piklab_kde4/src/data

[<az...@us...>]

Revision: 2876
          http://piklab.svn.sourceforge.net/piklab/?rev=2876&view=rev
Author:   azhyd
Date:     2012-04-22 19:10:50 +0000 (Sun, 22 Apr 2012)
Log Message:
-----------
remove icons

Modified Paths:
--------------
    trunk/piklab_kde4/src/data/CMakeLists.txt
    trunk/piklab_kde4/src/data/app_data/CMakeLists.txt
    trunk/piklab_kde4/src/data/app_data/piklab.desktop

Removed Paths:
-------------
    trunk/piklab_kde4/src/data/hi16-action-piklab_addcurrentfile.png
    trunk/piklab_kde4/src/data/hi16-action-piklab_addfile.png
    trunk/piklab_kde4/src/data/hi16-action-piklab_blankcheck.png
    trunk/piklab_kde4/src/data/hi16-action-piklab_burnchip.png
    trunk/piklab_kde4/src/data/hi16-action-piklab_chip.png
    trunk/piklab_kde4/src/data/hi16-action-piklab_closeproject.png
    trunk/piklab_kde4/src/data/hi16-action-piklab_compile.png
    trunk/piklab_kde4/src/data/hi16-action-piklab_createproject.png
    trunk/piklab_kde4/src/data/hi16-action-piklab_decompile.png
    trunk/piklab_kde4/src/data/hi16-action-piklab_editproject.png
    trunk/piklab_kde4/src/data/hi16-action-piklab_erasechip.png
    trunk/piklab_kde4/src/data/hi16-action-piklab_find_next.png
    trunk/piklab_kde4/src/data/hi16-action-piklab_find_previous.png
    trunk/piklab_kde4/src/data/hi16-action-piklab_openproject.png
    trunk/piklab_kde4/src/data/hi16-action-piklab_readchip.png
    trunk/piklab_kde4/src/data/hi16-action-piklab_verifychip.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_addcurrentfile.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_addfile.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_blankcheck.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_breakpoint_active.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_breakpoint_disabled.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_breakpoint_invalid.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_breakpoint_reached.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_burnchip.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_chip.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_closeproject.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_compile.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_createproject.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_debug_step.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_debug_stepin.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_debug_stepout.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_debug_stepover.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_debughalt.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_decompile.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_editproject.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_erasechip.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_find_next.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_find_previous.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_openproject.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_power.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_program_counter.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_program_counter_disabled.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_readchip.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_restart.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_run.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_stop.png
    trunk/piklab_kde4/src/data/hi22-action-piklab_verifychip.png
    trunk/piklab_kde4/src/data/hi32-action-piklab_config_assembler.png
    trunk/piklab_kde4/src/data/hi32-action-piklab_config_disassembler.png
    trunk/piklab_kde4/src/data/hi32-action-piklab_config_programmer.png
    trunk/piklab_kde4/src/data/likeback/

Modified: trunk/piklab_kde4/src/data/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/data/CMakeLists.txt	2012-04-22 00:27:07 UTC (rev 2875)
+++ trunk/piklab_kde4/src/data/CMakeLists.txt	2012-04-22 19:10:50 UTC (rev 2876)
@@ -1,5 +1,4 @@
 add_subdirectory(app_data)
-add_subdirectory(likeback)
 
 SET(syntax_xml_generator_SRCS
    syntax_xml_generator.cpp
@@ -15,5 +14,3 @@
 )
 ADD_CUSTOM_TARGET(generate_coff-pic ALL DEPENDS coff-pic.xml)
 install(FILES asm-pic.xml coff-pic.xml jal-pic.xml coff-c-pic.xml DESTINATION share/apps/katepart/syntax)
-
-kde4_install_icons(hicolor)

Modified: trunk/piklab_kde4/src/data/app_data/CMakeLists.txt
===================================================================
--- trunk/piklab_kde4/src/data/app_data/CMakeLists.txt	2012-04-22 00:27:07 UTC (rev 2875)
+++ trunk/piklab_kde4/src/data/app_data/CMakeLists.txt	2012-04-22 19:10:50 UTC (rev 2876)
@@ -1,6 +1,8 @@
 
-install(FILES piklab.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-install(FILES piklabui.rc hexeditorpartui.rc DESTINATION ${DATA_INSTALL_DIR}/piklab)
-install(FILES x-piklab.desktop DESTINATION ${MIME_INSTALL_DIR})
+install(FILES piklabui.rc hexeditorpartui.rc DESTINATION ${DATA_INSTALL_DIR}/piklab )
 
-kde4_install_icons(hicolor)
+install(PROGRAMS piklab.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+install(FILES x-piklab.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
+
+kde4_install_icons(${ICON_INSTALL_DIR})
+kde4_update_iconcache()

Modified: trunk/piklab_kde4/src/data/app_data/piklab.desktop
===================================================================
--- trunk/piklab_kde4/src/data/app_data/piklab.desktop	2012-04-22 00:27:07 UTC (rev 2875)
+++ trunk/piklab_kde4/src/data/app_data/piklab.desktop	2012-04-22 19:10:50 UTC (rev 2876)
@@ -2,7 +2,7 @@
 Encoding=UTF-8
 Type=Application
 Exec=piklab %U
-Icon=piklab.png
+Icon=piklab
 X-DocPath=piklab/index.html
 Categories=Qt;KDE;Development;IDE;Electronics;
 Comment=Integrated development environment for applications based on PIC microcontrollers.

Deleted: trunk/piklab_kde4/src/data/hi16-action-piklab_addcurrentfile.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi16-action-piklab_addfile.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi16-action-piklab_blankcheck.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi16-action-piklab_burnchip.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi16-action-piklab_chip.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi16-action-piklab_closeproject.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi16-action-piklab_compile.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi16-action-piklab_createproject.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi16-action-piklab_decompile.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi16-action-piklab_editproject.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi16-action-piklab_erasechip.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi16-action-piklab_find_next.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi16-action-piklab_find_previous.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi16-action-piklab_openproject.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi16-action-piklab_readchip.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi16-action-piklab_verifychip.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_addcurrentfile.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_addfile.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_blankcheck.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_breakpoint_active.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_breakpoint_disabled.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_breakpoint_invalid.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_breakpoint_reached.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_burnchip.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_chip.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_closeproject.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_compile.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_createproject.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_debug_step.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_debug_stepin.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_debug_stepout.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_debug_stepover.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_debughalt.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_decompile.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_editproject.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_erasechip.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_find_next.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_find_previous.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_openproject.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_power.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_program_counter.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_program_counter_disabled.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_readchip.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_restart.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_run.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_stop.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi22-action-piklab_verifychip.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi32-action-piklab_config_assembler.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi32-action-piklab_config_disassembler.png
===================================================================
(Binary files differ)

Deleted: trunk/piklab_kde4/src/data/hi32-action-piklab_config_programmer.png
===================================================================
(Binary files differ)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2875] trunk/piklab_kde4/src

[<az...@us...>]

Revision: 2875
          http://piklab.svn.sourceforge.net/piklab/?rev=2875&view=rev
Author:   azhyd
Date:     2012-04-22 00:27:07 +0000 (Sun, 22 Apr 2012)
Log Message:
-----------
more fixes

Modified Paths:
--------------
    trunk/piklab_kde4/src/common/global/generic_config.h
    trunk/piklab_kde4/src/common/gui/hexword_gui.cpp
    trunk/piklab_kde4/src/libgui/config_center.cpp
    trunk/piklab_kde4/src/libgui/global_config.cpp
    trunk/piklab_kde4/src/libgui/project_editor.cpp
    trunk/piklab_kde4/src/libgui/text_editor.cpp
    trunk/piklab_kde4/src/libgui/toplevel.cpp
    trunk/piklab_kde4/src/progs/gui/hardware_config_widget.cpp

Modified: trunk/piklab_kde4/src/common/global/generic_config.h
===================================================================
--- trunk/piklab_kde4/src/common/global/generic_config.h	2012-04-21 22:08:53 UTC (rev 2874)
+++ trunk/piklab_kde4/src/common/global/generic_config.h	2012-04-22 00:27:07 UTC (rev 2875)
@@ -59,7 +59,9 @@
     QVariant defValue;
   };
   template <typename Type>
-  QVariant readVariantEntry(Type type) const { return readVariantEntry(type.key(), type.data().defValue); }
+  QVariant readVariantEntry(Type type) const {
+    return readVariantEntry(type.key(), type.data().defValue);
+  }
   template <typename Type>
   void writeVariantEntry(Type type, const QVariant &value) {
     ASSERT( value.type()==type.data().defValue.type() );

Modified: trunk/piklab_kde4/src/common/gui/hexword_gui.cpp
===================================================================
--- trunk/piklab_kde4/src/common/gui/hexword_gui.cpp	2012-04-21 22:08:53 UTC (rev 2874)
+++ trunk/piklab_kde4/src/common/gui/hexword_gui.cpp	2012-04-22 00:27:07 UTC (rev 2875)
@@ -23,7 +23,7 @@
 QValidator::State HexValueValidator::validate(QString &input, int &) const
 {
   if ( input.length()==0 ) return Acceptable;
-  if ( input.length()>_nbChars ) return Invalid;
+  if ( input.length()>(int)_nbChars ) return Invalid;
   for (int i=0; i<input.length(); i++)
     if ( !isxdigit(input[i].latin1()) && input[i]!='-' ) return Invalid;
   return Acceptable;
@@ -42,7 +42,7 @@
 
 void GenericHexWordEditor::slotTextChanged()
 {
-  if ( text().length()!=_nbChars ) return;
+  if ( text().length()!=(int)_nbChars ) return;
   if ( changeValue() ) emit moveNext();
 }
 

Modified: trunk/piklab_kde4/src/libgui/config_center.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/config_center.cpp	2012-04-21 22:08:53 UTC (rev 2874)
+++ trunk/piklab_kde4/src/libgui/config_center.cpp	2012-04-22 00:27:07 UTC (rev 2875)
@@ -69,6 +69,9 @@
     _pages[i]->setIcon(KIcon(_configWidgets[i]->pixmap()));
   }
   setCurrentPage(_pages[showType]);
+
+  connect(this, SIGNAL(okClicked()), SLOT(slotOk()));
+  connect(this, SIGNAL(applyClicked()), SLOT(slotApply()));
 }
 
 void ConfigCenter::slotApply()

Modified: trunk/piklab_kde4/src/libgui/global_config.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/global_config.cpp	2012-04-21 22:08:53 UTC (rev 2874)
+++ trunk/piklab_kde4/src/libgui/global_config.cpp	2012-04-22 00:27:07 UTC (rev 2875)
@@ -45,7 +45,7 @@
 void GlobalConfig::writeOpenedFiles(const PURL::UrlList &files)
 {
   GenericConfig config(QString::null);
-  for (uint i=0; i<=files.count(); i++) {
+  for (int i=0; i<=files.count(); i++) {
     QString s = (i==files.count() ? QString::null : files[i].filepath());
     config.writeEntry(QString("file%1").arg(i), s);
   }

Modified: trunk/piklab_kde4/src/libgui/project_editor.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/project_editor.cpp	2012-04-21 22:08:53 UTC (rev 2874)
+++ trunk/piklab_kde4/src/libgui/project_editor.cpp	2012-04-22 00:27:07 UTC (rev 2875)
@@ -68,6 +68,8 @@
   grid->setColStretch(2, 1);
 
   tabWidget->setCurrentPage(type);
+
+  connect(this, SIGNAL(okClicked()), SLOT(slotOk()));
 }
 
 void ProjectEditor::slotOk()

Modified: trunk/piklab_kde4/src/libgui/text_editor.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/text_editor.cpp	2012-04-21 22:08:53 UTC (rev 2874)
+++ trunk/piklab_kde4/src/libgui/text_editor.cpp	2012-04-22 00:27:07 UTC (rev 2875)
@@ -65,7 +65,7 @@
   _split->setFrameStyle(QFrame::TabWidgetPanel |  QFrame::Sunken);
   top->addWidget(_split);
 
-  connect(_document, SIGNAL(hilightingModeChanged(KTextEditor::Document*)), SLOT(highlightChanged()));
+  connect(_document, SIGNAL(preHighlightChanged(uint)), SLOT(highlightChanged()));
   setAcceptDrops(true);
   addView();
 

Modified: trunk/piklab_kde4/src/libgui/toplevel.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/toplevel.cpp	2012-04-21 22:08:53 UTC (rev 2874)
+++ trunk/piklab_kde4/src/libgui/toplevel.cpp	2012-04-22 00:27:07 UTC (rev 2875)
@@ -207,7 +207,7 @@
     a->setIcon(KIcon("piklab_openproject"));
     recent = new KRecentFilesAction(i18n("Open Recent Project"), this);
     actionCollection()->addAction("project_open_recent", recent);
-    recent->setMaxItems(20);
+    connect(recent, SIGNAL(urlSelected(const KUrl&)), this, SLOT(openRecentProject(const KUrl&)));
     configGroup = KGlobal::config()->group("recent-projects");
     recent->loadEntries(configGroup);
     a = actionCollection()->addAction("project_options", this, SLOT(configureProject()));

Modified: trunk/piklab_kde4/src/progs/gui/hardware_config_widget.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/gui/hardware_config_widget.cpp	2012-04-21 22:08:53 UTC (rev 2874)
+++ trunk/piklab_kde4/src/progs/gui/hardware_config_widget.cpp	2012-04-22 00:27:07 UTC (rev 2875)
@@ -59,6 +59,9 @@
 
   bool ok = _hc->set(pd, *data);
   label->setText(ok ? i18n("Connected") : i18n("Not Connected"));
+
+  connect(this, SIGNAL(okClicked()), SLOT(slotOk()));
+  connect(this, SIGNAL(cancelClicked()), SLOT(slotCancel()));
 }
 
 void Hardware::EditDialog::slotOk()

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2874] trunk/piklab_kde4/src

[<az...@us...>]

Revision: 2874
          http://piklab.svn.sourceforge.net/piklab/?rev=2874&view=rev
Author:   azhyd
Date:     2012-04-21 22:08:53 +0000 (Sat, 21 Apr 2012)
Log Message:
-----------
fix toolchain paths

Modified Paths:
--------------
    trunk/piklab_kde4/src/common/global/purl.cpp
    trunk/piklab_kde4/src/libgui/toplevel.cpp
    trunk/piklab_kde4/src/piklab-test/misc/misc_check.cpp
    trunk/piklab_kde4/src/piklab-test/misc/misc_check.h

Modified: trunk/piklab_kde4/src/common/global/purl.cpp
===================================================================
--- trunk/piklab_kde4/src/common/global/purl.cpp	2012-04-16 03:36:08 UTC (rev 2873)
+++ trunk/piklab_kde4/src/common/global/purl.cpp	2012-04-21 22:08:53 UTC (rev 2874)
@@ -212,7 +212,8 @@
 
 QString PURL::Base::path(TerminationType ttype, SeparatorType stype) const
 {
-  QString s = _url.dirPath().stripWhiteSpace();
+  QString s;
+  if (!_url.isEmpty()) s =_url.dirPath();
   switch (ttype) {
     case Terminated:
       if ( !s.isEmpty() && !s.endsWith("/") ) s += '/';

Modified: trunk/piklab_kde4/src/libgui/toplevel.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/toplevel.cpp	2012-04-16 03:36:08 UTC (rev 2873)
+++ trunk/piklab_kde4/src/libgui/toplevel.cpp	2012-04-21 22:08:53 UTC (rev 2874)
@@ -171,7 +171,6 @@
     a->setIcon(KIcon("document-new"));
     actionCollection()->addAction(KStandardAction::Open, this, SLOT(openFile()));
     KRecentFilesAction *recent = static_cast<KRecentFilesAction*>(actionCollection()->addAction(KStandardAction::OpenRecent, this, SLOT(openRecentFile(const KUrl&))));
-    recent->setMaxItems(20);
     KConfigGroup configGroup = KGlobal::config()->group("recent-files");
     recent->loadEntries(configGroup);
     a = actionCollection()->addAction("file_save_all", Main::_editorManager, SLOT(saveAllFiles()));

Modified: trunk/piklab_kde4/src/piklab-test/misc/misc_check.cpp
===================================================================
--- trunk/piklab_kde4/src/piklab-test/misc/misc_check.cpp	2012-04-16 03:36:08 UTC (rev 2873)
+++ trunk/piklab_kde4/src/piklab-test/misc/misc_check.cpp	2012-04-21 22:08:53 UTC (rev 2874)
@@ -12,8 +12,6 @@
 #include "common/global/purl.h"
 #include "common/global/pfile.h"
 
-#include <iostream>
-
 //----------------------------------------------------------------------------
 void MiscCheck::testUrl()
 {
@@ -95,6 +93,52 @@
   }
 }
 
+void MiscCheck::testDir()
+{
+  {
+    PURL::Directory dir;
+    QVERIFY(dir.isEmpty());
+    QVERIFY(dir.isLocal());
+    QVERIFY(dir.isRelative());
+    QCOMPARE(dir.path(), QString(""));
+  }
+  {
+    PURL::Directory dir("");
+    QVERIFY(dir.isEmpty());
+    QVERIFY(dir.isLocal());
+    QVERIFY(dir.isRelative());
+    QCOMPARE(dir.path(), QString(""));
+  }
+  {
+    PURL::Directory dir("/");
+    QVERIFY(!dir.isEmpty());
+    QVERIFY(dir.isLocal());
+    QVERIFY(!dir.isRelative());
+    QCOMPARE(dir.path(), QString("/"));
+  }
+  {
+    PURL::Directory dir("test");
+    QVERIFY(!dir.isEmpty());
+    QVERIFY(dir.isLocal());
+    QVERIFY(dir.isRelative());
+    QCOMPARE(dir.path(), QString("/test/"));
+  }
+  {
+    PURL::Directory dir("/test");
+    QVERIFY(!dir.isEmpty());
+    QVERIFY(dir.isLocal());
+    QVERIFY(!dir.isRelative());
+    QCOMPARE(dir.path(), QString("/test/"));
+  }
+  {
+    PURL::Directory dir("/test/");
+    QVERIFY(!dir.isEmpty());
+    QVERIFY(dir.isLocal());
+    QVERIFY(!dir.isRelative());
+    QCOMPARE(dir.path(), QString("/test/"));
+  }
+}
+
 void MiscCheck::testUrlOperations()
 {
   Log::StringView log;

Modified: trunk/piklab_kde4/src/piklab-test/misc/misc_check.h
===================================================================
--- trunk/piklab_kde4/src/piklab-test/misc/misc_check.h	2012-04-16 03:36:08 UTC (rev 2873)
+++ trunk/piklab_kde4/src/piklab-test/misc/misc_check.h	2012-04-21 22:08:53 UTC (rev 2874)
@@ -16,6 +16,7 @@
   Q_OBJECT
   private slots:
     void testUrl();
+    void testDir();
     void testUrlOperations();
     void testFile();
 };

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2873] trunk/piklab_kde4

[<az...@us...>]

Revision: 2873
          http://piklab.svn.sourceforge.net/piklab/?rev=2873&view=rev
Author:   azhyd
Date:     2012-04-16 03:36:08 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
more fixes

Modified Paths:
--------------
    trunk/piklab_kde4/src/common/kde/kde_purl.cpp
    trunk/piklab_kde4/src/piklab-test/misc/misc_check.cpp
    trunk/piklab_kde4/src/piklab-test/misc/misc_check.h

Property Changed:
----------------
    trunk/piklab_kde4/


Property changes on: trunk/piklab_kde4
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/piklab:2822-2868
   + /trunk/piklab:2822-2872

Modified: trunk/piklab_kde4/src/common/kde/kde_purl.cpp
===================================================================
--- trunk/piklab_kde4/src/common/kde/kde_purl.cpp	2012-04-16 00:16:01 UTC (rev 2872)
+++ trunk/piklab_kde4/src/common/kde/kde_purl.cpp	2012-04-16 03:36:08 UTC (rev 2873)
@@ -26,8 +26,9 @@
 bool PURL::Url::create(Log::Generic &log) const
 {
   // assume file do no exist if ioslave cannot tell...
-  if ( KIO::NetAccess::exists(_url, false, qApp->mainWidget()) ) return true;
+  if ( KIO::NetAccess::exists(_url, KIO::NetAccess::DestinationSide, qApp->mainWidget()) ) return false;
   KTemporaryFile tmp;
+  if (!tmp.open()) return false;
   // do not overwrite
   bool ok = KIO::NetAccess::file_copy(tmp.name(), _url, qApp->mainWidget());
   if ( !ok ) log.sorry(i18n("Could not create file"), KIO::NetAccess::lastErrorString());
@@ -45,7 +46,7 @@
 bool PURL::Directory::create(Log::Generic &log) const
 {
   // assume dir do no exist if ioslave cannot tell...
-  if ( KIO::NetAccess::exists(_url, false, qApp->mainWidget()) ) return true;
+  if ( KIO::NetAccess::exists(_url, KIO::NetAccess::DestinationSide, qApp->mainWidget()) ) return false;
   bool ok = KIO::NetAccess::mkdir(_url, qApp->mainWidget());
   if ( !ok ) log.sorry(i18n("Could not create directory"), KIO::NetAccess::lastErrorString());
   return ok;

Modified: trunk/piklab_kde4/src/piklab-test/misc/misc_check.cpp
===================================================================
--- trunk/piklab_kde4/src/piklab-test/misc/misc_check.cpp	2012-04-16 00:16:01 UTC (rev 2872)
+++ trunk/piklab_kde4/src/piklab-test/misc/misc_check.cpp	2012-04-16 03:36:08 UTC (rev 2873)
@@ -15,7 +15,7 @@
 #include <iostream>
 
 //----------------------------------------------------------------------------
-void MiscCheck::testPURL()
+void MiscCheck::testUrl()
 {
   {
     PURL::Url url = PURL::fromPathOrUrl(QString::null, false);
@@ -95,6 +95,33 @@
   }
 }
 
+void MiscCheck::testUrlOperations()
+{
+  Log::StringView log;
+  PURL::Url url(PURL::currentDirectory(), "toto");
+  url.del(log); // clean state
+  QVERIFY(!url.exists());
+  QVERIFY(url.create(log));
+  QVERIFY(!url.create(log));
+  QVERIFY(url.exists());
+  QVERIFY(url.del(log));
+  QVERIFY(!url.exists());
+  QVERIFY(!url.del(log));
+  QVERIFY(url.write("test", log));
+  QVERIFY(url.exists());
+
+  PURL::Url url2 = url.toExtension("cpp");
+  QVERIFY(url2.fileType() == PURL::CppSource);
+  url2.del(log); // clean start
+  QVERIFY(!url2.exists());
+  QVERIFY(url.copyTo(url2, log));
+  QVERIFY(url2.exists());
+  QVERIFY(url.del(log));
+  QVERIFY(!url.exists());
+  QVERIFY(url2.del(log));
+  QVERIFY(!url2.exists());
+}
+
 void MiscCheck::testFile()
 {
   Log::StringView log;

Modified: trunk/piklab_kde4/src/piklab-test/misc/misc_check.h
===================================================================
--- trunk/piklab_kde4/src/piklab-test/misc/misc_check.h	2012-04-16 00:16:01 UTC (rev 2872)
+++ trunk/piklab_kde4/src/piklab-test/misc/misc_check.h	2012-04-16 03:36:08 UTC (rev 2873)
@@ -15,7 +15,8 @@
 {
   Q_OBJECT
   private slots:
-    void testPURL();
+    void testUrl();
+    void testUrlOperations();
     void testFile();
 };
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2872] trunk/piklab_kde4/src

[<az...@us...>]

Revision: 2872
          http://piklab.svn.sourceforge.net/piklab/?rev=2872&view=rev
Author:   azhyd
Date:     2012-04-16 00:16:01 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
more fixes

Modified Paths:
--------------
    trunk/piklab_kde4/src/common/common/purl_base.cpp
    trunk/piklab_kde4/src/common/gui/dialog.cpp
    trunk/piklab_kde4/src/common/gui/dialog.h
    trunk/piklab_kde4/src/libgui/device_gui.cpp
    trunk/piklab_kde4/src/libgui/toplevel.cpp
    trunk/piklab_kde4/src/libgui/toplevel.h
    trunk/piklab_kde4/src/progs/gui/prog_config_center.cpp
    trunk/piklab_kde4/src/progs/gui/prog_config_center.h
    trunk/piklab_kde4/src/tools/gputils/gputils_compile.cpp
    trunk/piklab_kde4/src/tools/gui/toolchain_config_center.cpp
    trunk/piklab_kde4/src/tools/gui/toolchain_config_center.h
    trunk/piklab_kde4/src/tools/pic30/pic30_compile.cpp

Modified: trunk/piklab_kde4/src/common/common/purl_base.cpp
===================================================================
--- trunk/piklab_kde4/src/common/common/purl_base.cpp	2012-04-16 00:13:58 UTC (rev 2871)
+++ trunk/piklab_kde4/src/common/common/purl_base.cpp	2012-04-16 00:16:01 UTC (rev 2872)
@@ -32,9 +32,10 @@
   { "AsmGPAsm",    Source, Editable, SourceFamily::Asm, I18N_NOOP("Assembler File"),            { "asm", "src", "pic", 0 }, sourcefile_xpm,  0,               "XPicAsm"   },
   { "AsmPIC30",    Source, Editable, SourceFamily::Asm, I18N_NOOP("Assembler File for PIC30"),  { "s", 0 },                 sourcefile_xpm,  0,               "XPicAsm"   },
   { "AsmPICC",     Source, Editable, SourceFamily::Asm, I18N_NOOP("Assembler File for PICC"),   { "as", 0 },                sourcefile_xpm,  0,               "XPicAsm"   },
+
   { "Inc",         Header, Editable, SourceFamily::Asm, I18N_NOOP("Include File"),        { "inc", 0 },               includefile_xpm, 0,               "XPicAsm"   },
   { "CSource",     Source, Editable, SourceFamily::C,   I18N_NOOP("C Source File"),       { "c", 0 },                 0,               "text/x-csrc",   "C"         },
-  { "CppSource",   Source, Editable, SourceFamily::C,   I18N_NOOP("C++ Source File"),     { "cpp", "cxx", 0 },        0,               "text/x-c++src", "C++"       },
+  { "CppSource",   Source, Editable, SourceFamily::Cpp, I18N_NOOP("C++ Source File"),     { "cpp", "cxx", 0 },        0,               "text/x-c++src", "C++"       },
   { "CHeader",     Header, Editable, SourceFamily::C,   I18N_NOOP("C Header File"),       { "h", 0 },                 0,               "text/x-chdr",   "C"         },
   { "JalSource",   Source, Editable, SourceFamily::JAL, I18N_NOOP("JAL File"),            { "jal", 0},                sourcefile_xpm,  0,               "XPicJal"   },
   { "BasicSource", Source, Editable, SourceFamily::Basic, I18N_NOOP("Basic Source File"), { "bas", 0 },               sourcefile_xpm,  0,               "FreeBASIC" },

Modified: trunk/piklab_kde4/src/common/gui/dialog.cpp
===================================================================
--- trunk/piklab_kde4/src/common/gui/dialog.cpp	2012-04-16 00:13:58 UTC (rev 2871)
+++ trunk/piklab_kde4/src/common/gui/dialog.cpp	2012-04-16 00:16:01 UTC (rev 2872)
@@ -73,8 +73,6 @@
   setCaption(caption);
   setButtons(buttons);
   setDefaultButton(defaultButton);
-  QWidget *main = new QWidget(this);
-  setMainWidget(main);
 
   QTimer::singleShot(0, this, SLOT(updateSize()));
 }
@@ -93,140 +91,15 @@
 }
 
 //-----------------------------------------------------------------------------
-TreeListDialog::Item::Item(const QString &label, QWidget *page, const QString &title, Q3ListView *listview)
-  : KListViewItem(listview, label), _page(page), _title(title)
-{}
-
-TreeListDialog::Item::Item(const QString &label, QWidget *page, const QString &title, Q3ListViewItem *item)
-  : KListViewItem(item, label), _page(page), _title(title)
-{}
-
 TreeListDialog::TreeListDialog(QWidget *parent, const char *name, bool modal,
                                const QString &caption,
 			       ButtonCodes buttons, ButtonCode defaultButton,
                                bool separator)
   : PageDialog(parent, name, modal, caption, buttons, defaultButton, separator)
 {
-  QVBoxLayout *top = new QVBoxLayout(mainWidget(), 0, 10);
-
-  // list view
-  QValueList<int> widths;
-  widths += 80;
-  widths += 500;
-  Splitter *splitter = new Splitter(widths, Qt::Horizontal, mainWidget(), name);
-  top->addWidget(splitter);
-  _listView = new ListView(splitter);
-  connect(_listView, SIGNAL(currentChanged(Q3ListViewItem *)), SLOT(currentChanged(Q3ListViewItem *)));
-  _listView->setAllColumnsShowFocus(true);
-  _listView->setRootIsDecorated(true);
-  _listView->setSorting(0);
-  _listView->addColumn(QString::null);
-  _listView->header()->hide();
-  _listView->setResizeMode(Q3ListView::LastColumn);
-
-  // pages
-  _frame = new QFrame(splitter);
-  QVBoxLayout *vbox = new QVBoxLayout(_frame, 10, 10);
-  _titleBox = new QHBoxLayout(vbox);
-  _label = new QLabel(_frame);
-  _titleBox->addWidget(_label);
-  _stack = new Q3WidgetStack(_frame);
-  connect(_stack, SIGNAL(aboutToShow(QWidget *)), SIGNAL(aboutToShowPage(QWidget *)));
-  vbox->addWidget(_stack);
-  vbox->addStretch(1);
+  setFaceType(Tree);
 }
 
-QWidget *TreeListDialog::addPage(const QStringList &labels)
-{
-  Q_ASSERT( !labels.isEmpty() );
-
-  QWidget *page = NULL;
-  Q3ListViewItem *item = NULL;
-  Q3ListViewItemIterator it(_listView);
-  for (; it.current(); ++it) {
-    if ( it.current()->text(0)==labels[0] ) {
-      item = it.current();
-      break;
-    }
-  }
-  if ( item==0 ) {
-    page = new QWidget(_stack);
-    connect(page, SIGNAL(destroyed(QObject *)), SLOT(pageDestroyed(QObject *)));
-    _stack->addWidget(page);
-    item = new Item(labels[0], page, labels[0], _listView);
-    item->setOpen(true);
-    bool last = ( labels.count()==1 );
-    item->setSelectable(last);
-  }
-  for (int i=1; i<labels.count(); i++) {
-    Q3ListViewItem *parent = item;
-    item = NULL;
-    Q3ListViewItemIterator iti(parent);
-    for (; it.current(); ++it) {
-      if ( it.current()->text(0)==labels[i] ) {
-        item = it.current();
-        break;
-      }
-    }
-    if ( item==NULL ) {
-      page = new QWidget(_stack);
-      connect(page, SIGNAL(destroyed(QObject *)), SLOT(pageDestroyed(QObject *)));
-      _stack->addWidget(page);
-      item = new Item(labels[i], page, labels[i], parent);
-      item->setOpen(true);
-      bool last = ( labels.count()==i+1 );
-      item->setSelectable(last);
-    }
-  }
-
-  return page;
-}
-
-void TreeListDialog::currentChanged(Q3ListViewItem *lvitem)
-{
-  if ( lvitem==0 ) return;
-  Item *item = static_cast<Item *>(lvitem);
-  _listView->ensureItemVisible(item);
-  _label->setText(item->_title);
-  _stack->raiseWidget(item->_page);
-}
-
-void TreeListDialog::showPage(QWidget *page)
-{
-  Q3ListViewItemIterator it(_listView);
-  for (; it.current(); ++it) {
-    Item *item = static_cast<Item *>(it.current());
-    if ( item->_page==page ) {
-      _listView->setCurrentItem(item);
-      currentChanged(item);
-      break;
-    }
-  }
-}
-
-int TreeListDialog::pageIndex(QWidget *page) const
-{
-  return _stack->id(page);
-}
-
-int TreeListDialog::activePageIndex() const
-{
-  const Item *item = static_cast<const Item *>(_listView->currentItem());
-  if ( item==0 ) return -1;
-  return pageIndex(item->_page);
-}
-
-void TreeListDialog::pageDestroyed(QObject *object)
-{
-  Q3ListViewItemIterator it(_listView);
-  for (; it.current(); ++it) {
-    Item *item = static_cast<Item *>(it.current());
-    if ( item->_page!=object ) continue;
-    delete item;
-    break;
-  }
-}
-
 //-----------------------------------------------------------------------------
 TextEditorDialog::TextEditorDialog(const QString &text, const QString &caption,
                                    bool wrapAtWidgetWidth, QWidget *parent)

Modified: trunk/piklab_kde4/src/common/gui/dialog.h
===================================================================
--- trunk/piklab_kde4/src/common/gui/dialog.h	2012-04-16 00:13:58 UTC (rev 2871)
+++ trunk/piklab_kde4/src/common/gui/dialog.h	2012-04-16 00:16:01 UTC (rev 2872)
@@ -69,32 +69,6 @@
 		 bool modal, const QString &caption,
 		 ButtonCodes buttons, ButtonCode defaultButton,
 		 bool separator);
-  QWidget *addPage(const QStringList &labels);
-  void showPage(QWidget *page);
-  int activePageIndex() const;
-  int pageIndex(QWidget *page) const;
-
-signals:
-  void aboutToShapePage(QWidget*);
-
-private slots:
-  virtual void currentChanged(Q3ListViewItem *item);
-  void pageDestroyed(QObject *page);
-
-protected:
-  QFrame        *_frame;
-  ListView      *_listView;
-  QHBoxLayout   *_titleBox;
-  QLabel        *_label;
-  Q3WidgetStack *_stack;
-
- class Item : public KListViewItem {
-  public:
-    Item(const QString &label, QWidget *page, const QString &title, Q3ListView *listview);
-    Item(const QString &label, QWidget *page, const QString &title, Q3ListViewItem *item);
-    QWidget *_page;
-    QString  _title;
-  };
 };
 
 //-----------------------------------------------------------------------------

Modified: trunk/piklab_kde4/src/libgui/device_gui.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/device_gui.cpp	2012-04-16 00:13:58 UTC (rev 2871)
+++ trunk/piklab_kde4/src/libgui/device_gui.cpp	2012-04-16 00:16:01 UTC (rev 2872)
@@ -309,12 +309,12 @@
     _deviceView->setText(i18n("Could not detect supported devices for toolchain \"%1\". Please check installation.").arg(tgroup->label()));
     return;
   }
-  
+
   QMap<QString, KListViewItem *> groups;
   Q3ListViewItem *selected = NULL;
   const QStringList list = Device::Lister::instance().supportedDevices();
   QStringList::const_iterator it = list.end();
-  for (it--; it!=list.end(); it--) {
+  for (it--; it!=list.begin(); it--) {
     if ( pgroup && !pgroup->isSupported(*it) ) continue;
     if ( tgroup && !tgroup->isSupported(*it) ) continue;
     const Device::Data *data = Device::Lister::instance().data(*it);

Modified: trunk/piklab_kde4/src/libgui/toplevel.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/toplevel.cpp	2012-04-16 00:13:58 UTC (rev 2871)
+++ trunk/piklab_kde4/src/libgui/toplevel.cpp	2012-04-16 00:16:01 UTC (rev 2872)
@@ -111,37 +111,37 @@
     connect(Main::_editorManager, SIGNAL(modified(const PURL::Url &)), Main::_projectManager, SLOT(modified(const PURL::Url &)));
     connect(Main::_editorManager, SIGNAL(statusChanged(const QString &)), _editorStatus, SLOT(setText(const QString &)));
 
-    QDockWidget* dock3 = new QDockWidget(i18n("Compile Log"), this);
-    dock3->setObjectName("compile_log_dock");
-    Main::_compileLog = new Compile::LogWidget(dock3);
+    _compileDock = new QDockWidget(i18n("Compile Log"), this);
+    _compileDock->setObjectName("compile_log_dock");
+    Main::_compileLog = new Compile::LogWidget(_compileDock);
     Main::_compileLog->setFocusPolicy(Qt::NoFocus);
-    dock3->setWidget(Main::_compileLog);
-    addDockWidget(Qt::BottomDockWidgetArea, dock3);
+    _compileDock->setWidget(Main::_compileLog);
+    addDockWidget(Qt::BottomDockWidgetArea, _compileDock);
 
-    QDockWidget* dock4 = new QDockWidget(i18n("Program Log"), this);
-    dock4->setObjectName("program_log_dock");
-    _programLog = new Log::Widget(dock4, "program_log");
+    _programDock = new QDockWidget(i18n("Program Log"), this);
+    _programDock->setObjectName("program_log_dock");
+    _programLog = new Log::Widget(_programDock, "program_log");
     _programLog->setFocusPolicy(Qt::NoFocus);
-    dock4->setWidget(_programLog);
-    addDockWidget(Qt::BottomDockWidgetArea, dock4);
+    _programDock->setWidget(_programLog);
+    addDockWidget(Qt::BottomDockWidgetArea, _programDock);
 
-    QDockWidget* dock5 = new QDockWidget(i18n("Breakpoints"), this);
-    dock5->setObjectName("breakpoints_dock");
-    Main::_breakpointsView = new Breakpoint::View(dock5);
+    QDockWidget* breakpointDock = new QDockWidget(i18n("Breakpoints"), this);
+    breakpointDock->setObjectName("breakpoints_dock");
+    Main::_breakpointsView = new Breakpoint::View(breakpointDock);
     Main::_breakpointsView->setFocusPolicy(Qt::NoFocus);
-    dock5->setWidget(Main::_breakpointsView);
-    addDockWidget(Qt::BottomDockWidgetArea, dock5);
+    breakpointDock->setWidget(Main::_breakpointsView);
+    addDockWidget(Qt::BottomDockWidgetArea, breakpointDock);
 
-    QDockWidget* dock6 = new QDockWidget(i18n("Console"), this);
-    dock6->setObjectName("console_dock");
-    Main::_consoleView = new ConsoleView(dock6);
-    dock6->setWidget(Main::_consoleView);
-    addDockWidget(Qt::BottomDockWidgetArea, dock6);
+    QDockWidget* consoleDock = new QDockWidget(i18n("Console"), this);
+    consoleDock->setObjectName("console_dock");
+    Main::_consoleView = new ConsoleView(consoleDock);
+    consoleDock->setWidget(Main::_consoleView);
+    addDockWidget(Qt::BottomDockWidgetArea, consoleDock);
 
-    tabifyDockWidget(dock5, dock6);
-    tabifyDockWidget(dock4, dock6);
-    tabifyDockWidget(dock3, dock6);
-    dock3->raise();
+    tabifyDockWidget(_compileDock, _programDock);
+    tabifyDockWidget(_programDock, breakpointDock);
+    tabifyDockWidget(breakpointDock, consoleDock);
+    _compileDock->raise();
 
 // managers
     Programmer::manager = new Programmer::GuiManager(this);
@@ -549,10 +549,10 @@
   case Main::Compiling:
     _actionStatus->setText(Main::_compileManager->label());
     showProgress(true);
-    Main::_compileLog->show();
+    _compileDock->raise();
     break;
   case Main::Programming:
-    _programLog->show();
+    _programDock->raise();
     break;
   }
 
@@ -810,7 +810,7 @@
   if (he == NULL) return;
   stopOperations();
   Main::_compileLog->clear();
-  Main::_compileLog->show();
+  _compileDock->raise();
   const Device::Data& data = Main::deviceData();
   std::auto_ptr<Editor> editor(new DisassemblyEditor(*he, data, this));
   if (editor->open(PURL::Url()) ) {

Modified: trunk/piklab_kde4/src/libgui/toplevel.h
===================================================================
--- trunk/piklab_kde4/src/libgui/toplevel.h	2012-04-16 00:13:58 UTC (rev 2871)
+++ trunk/piklab_kde4/src/libgui/toplevel.h	2012-04-16 00:16:01 UTC (rev 2872)
@@ -95,6 +95,8 @@
   void deviceChanged();
 
 private:
+  QDockWidget            *_compileDock;
+  QDockWidget            *_programDock;
   Log::Widget            *_programLog;
   QLabel                 *_actionStatus, *_debugStatus, *_editorStatus;
   VoltageStatusWidget    *_vddStatus, *_vppStatus;

Modified: trunk/piklab_kde4/src/progs/gui/prog_config_center.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/gui/prog_config_center.cpp	2012-04-16 00:13:58 UTC (rev 2871)
+++ trunk/piklab_kde4/src/progs/gui/prog_config_center.cpp	2012-04-16 00:16:01 UTC (rev 2872)
@@ -31,45 +31,39 @@
 {
   setButtonGuiItem(User1, KGuiItem(i18n("Update"), "reload"));
 
-  QWidget *current = 0;
+  KPageWidgetItem* current = NULL;
   for (Lister::ConstIterator it = Lister::instance().begin();
        it != Lister::instance().end();
        ++it) {
      const Programmer::Group& group = *it.data();
      QStringList names;
      names += group.label();
-     QWidget *page = addPage(names);
-     QVBoxLayout *vbox = new QVBoxLayout(page);
-     ProgConfigWidget *cw = new ProgConfigWidget(group, page);
+     ProgConfigWidget *cw = new ProgConfigWidget(group, NULL);
+     _configWidgets.push_back(cw);
      cw->loadConfig();
-     vbox->addWidget(cw);
-     _pages[page] = cw;
+     KPageWidgetItem* page = addPage(cw, group.label());
      if ( it.key()==sgroup.name() ) current = page;
   }
-  showPage(current);
-  aboutToShowPageSlot(current);
-  connect(this, SIGNAL(aboutToShowPage(QWidget *)), SLOT(aboutToShowPageSlot(QWidget *)));
-}
+  setCurrentPage(current);
+  currentPageChangedSlot(current);
 
-void Programmer::ConfigCenter::aboutToShowPageSlot(QWidget* page)
-{
-  _pages[page]->detect();
+  connect(this, SIGNAL(currentPageChanged(KPageWidgetItem*, KPageWidgetItem*)), SLOT(currentPageChangedSlot(KPageWidgetItem*)));
+  connect(this, SIGNAL(okClicked()), SLOT(slotOk()));
+  connect(this, SIGNAL(applyClicked()), SLOT(slotApply()));
+  connect(this, SIGNAL(user1Clicked()), SLOT(slotUser1()));
 }
 
-Programmer::ProgConfigWidget* Programmer::ConfigCenter::current() const
+void Programmer::ConfigCenter::currentPageChangedSlot(KPageWidgetItem* page)
 {
-  int i = activePageIndex();
-  if ( i==-1 ) return NULL;
-  for (Pages::const_iterator it = _pages.begin(); it != _pages.end(); ++it)
-    if ( pageIndex(it->first)==i ) return it->second;
-  Q_ASSERT(false);
-  return NULL;
+  ProgConfigWidget* cw = static_cast<ProgConfigWidget*>(page->widget());
+  if (cw != NULL) {
+    QTimer::singleShot(0, cw, SLOT(detect()));
+  }
 }
 
 void Programmer::ConfigCenter::slotApply()
 {
-  for (Pages::const_iterator it = _pages.begin(); it != _pages.end(); ++it)
-    it->second->saveConfig();
+  for (ConfigWidgetVector::const_iterator it = _configWidgets.begin(); it != _configWidgets.end(); ++it) (*it)->saveConfig();
 }
 
 void Programmer::ConfigCenter::slotOk()
@@ -80,8 +74,10 @@
 
 void Programmer::ConfigCenter::slotUser1()
 {
-  ProgConfigWidget* w = current();
-  if (w != NULL) w->detect();
+  ProgConfigWidget* cw = static_cast<ProgConfigWidget*>(currentPage()->widget());
+  if (cw != NULL) {
+    cw->detect();
+  }
 }
 
 //----------------------------------------------------------------------------

Modified: trunk/piklab_kde4/src/progs/gui/prog_config_center.h
===================================================================
--- trunk/piklab_kde4/src/progs/gui/prog_config_center.h	2012-04-16 00:13:58 UTC (rev 2871)
+++ trunk/piklab_kde4/src/progs/gui/prog_config_center.h	2012-04-16 00:16:01 UTC (rev 2872)
@@ -37,19 +37,15 @@
 public:
   ConfigCenter(const Programmer::Group &group, QWidget *parent);
 
-public slots:
+private slots:
   virtual void slotOk();
   virtual void slotApply();
   virtual void slotUser1();
+  void currentPageChangedSlot(KPageWidgetItem*);
 
-private slots:
-  void aboutToShowPageSlot(QWidget* page);
-
 private:
-  typedef std::map<QWidget *, ProgConfigWidget *> Pages;
-  Pages _pages;
-
-  ProgConfigWidget* current() const;
+  typedef std::vector<ProgConfigWidget*> ConfigWidgetVector;
+  ConfigWidgetVector _configWidgets;
 };
 
 //----------------------------------------------------------------------------

Modified: trunk/piklab_kde4/src/tools/gputils/gputils_compile.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/gputils/gputils_compile.cpp	2012-04-16 00:13:58 UTC (rev 2871)
+++ trunk/piklab_kde4/src/tools/gputils/gputils_compile.cpp	2012-04-16 00:16:01 UTC (rev 2872)
@@ -35,7 +35,7 @@
   QStringList args;
   args += "-c"; // relocatable code
   args += config.includeDirs(Tool::Category::Assembler, "-I");
-  if ( _data.items[0].type==Compile::Item::NotGenerated ) args += "-p%DEVICE";
+  if ( !_data.items.empty() && _data.items[0].type==Compile::Item::NotGenerated ) args += "-p%DEVICE";
   uint wl = static_cast<const Config &>(config).gpasmWarningLevel() ;
   if( wl!=Config::Nb_WarningLevels ) args += "-w" + QString::number(wl);
   args += config.customOptions(Tool::Category::Assembler);

Modified: trunk/piklab_kde4/src/tools/gui/toolchain_config_center.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/gui/toolchain_config_center.cpp	2012-04-16 00:13:58 UTC (rev 2871)
+++ trunk/piklab_kde4/src/tools/gui/toolchain_config_center.cpp	2012-04-16 00:16:01 UTC (rev 2872)
@@ -19,18 +19,15 @@
 //-----------------------------------------------------------------------------
 ToolchainsConfigCenter::ToolchainsConfigCenter(const Tool::Group &sgroup, QWidget *parent)
   : TreeListDialog(parent, "configure_toolchains_dialog", true,
-                   i18n("Configure Toolchains"), Ok|User1|User2|Cancel, Cancel, false)
+                   i18n("Configure Toolchains"), Ok|User1|User2|User3|Cancel, Cancel, false)
 {
   setButtonGuiItem(User1, KStandardGuiItem::reset());
   setButtonGuiItem(User2, KGuiItem(i18n("Update"), "reload"));
+  setButtonGuiItem(User3, KGuiItem(i18n("Info"), "info"));
 
-  _titleBox->addStretch(1);
-  _infoButton = new KPushButton(KGuiItem(QString::null, "viewmag"), _frame);
-  connect(_infoButton, SIGNAL(clicked()), SLOT(showInformationDialog()));
-  _titleBox->addWidget(_infoButton);
-
-  QWidget *current = 0;
+  KPageWidgetItem *current = 0;
   FOR_EACH(PURL::SourceFamily, family) {
+    KPageWidgetItem* familyWidget = addPage(NULL, family.label());
     for (Tool::Lister::ConstIterator it = Tool::Lister::instance().begin();
          it != Tool::Lister::instance().end();
          ++it) {
@@ -40,34 +37,36 @@
       QStringList names;
       names += family.label();
       names += it.data()->label();
-      QWidget *page = addPage(names);
-      QVBoxLayout *vbox = new QVBoxLayout(page);
-      ToolchainConfigWidget *tcw = static_cast<const ::Tool::GroupUI *>(it.data()->gui())->toolchainConfigWidgetFactory(page);
+      ToolchainConfigWidget* tcw = static_cast<const ::Tool::GroupUI *>(it.data()->gui())->toolchainConfigWidgetFactory(NULL);
+      _configWidgets.push_back(tcw);
       tcw->init();
       tcw->loadConfig();
-      vbox->addWidget(tcw);
-      _pages[page] = tcw;
+      KPageWidgetItem* page = addSubPage(familyWidget, tcw, it.data()->label());
       if ( it.key()==sgroup.name() ) current = page;
     }
   }
-  showPage(current);
-  aboutToShowPageSlot(current);
-  connect(this, SIGNAL(aboutToShowPage(QWidget *)), SLOT(aboutToShowPageSlot(QWidget *)));
+  setCurrentPage(current);
+  currentPageChangedSlot(current);
+
+  connect(this, SIGNAL(currentPageChanged(KPageWidgetItem*, KPageWidgetItem*)), SLOT(currentPageChangedSlot(KPageWidgetItem*)));
+  connect(this, SIGNAL(okClicked()), SLOT(slotOk()));
+  connect(this, SIGNAL(applyClicked()), SLOT(slotApply()));
+  connect(this, SIGNAL(user1Clicked()), SLOT(slotUser1()));
+  connect(this, SIGNAL(user2Clicked()), SLOT(slotUser2()));
+  connect(this, SIGNAL(user3Clicked()), SLOT(slotUser3()));
 }
 
-void ToolchainsConfigCenter::aboutToShowPageSlot(QWidget *page)
+void ToolchainsConfigCenter::currentPageChangedSlot(KPageWidgetItem *page)
 {
-  if ( !_pages.contains(page) ) _infoButton->hide();
-  else {
-    _infoButton->show();
-    QTimer::singleShot(0, _pages[page], SLOT(detect()));
+  ToolchainConfigWidget* tcw = static_cast<ToolchainConfigWidget*>(currentPage()->widget());
+  if (tcw != NULL) {
+    QTimer::singleShot(0, tcw, SLOT(detect()));
   }
 }
 
 void ToolchainsConfigCenter::slotApply()
 {
-  QMap<QWidget *, ToolchainConfigWidget *>::iterator it;
-  for (it=_pages.begin(); it!=_pages.end(); ++it) it.data()->saveConfig();
+  for (ConfigWidgetVector::const_iterator it = _configWidgets.begin(); it != _configWidgets.end(); ++it) (*it)->saveConfig();
 }
 
 void ToolchainsConfigCenter::slotOk()
@@ -76,21 +75,10 @@
   accept();
 }
 
-ToolchainConfigWidget *ToolchainsConfigCenter::current() const
-{
-  int i = activePageIndex();
-  if ( i==-1 ) return 0;
-  QMap<QWidget *, ToolchainConfigWidget *>::const_iterator it;
-  for (it=_pages.begin(); it!=_pages.end(); ++it)
-    if ( pageIndex(it.key())==i ) return it.data();
-  Q_ASSERT(false);
-  return 0;
-}
-
 void ToolchainsConfigCenter::slotUser1()
 {
-  ToolchainConfigWidget *tcw = current();
-  if (tcw) {
+  ToolchainConfigWidget* tcw = static_cast<ToolchainConfigWidget*>(currentPage()->widget());
+  if (tcw != NULL) {
     tcw->loadConfig();
     tcw->forceDetect();
   }
@@ -98,14 +86,17 @@
 
 void ToolchainsConfigCenter::slotUser2()
 {
-  ToolchainConfigWidget *tcw = current();
-  if (tcw) tcw->forceDetect();
+  ToolchainConfigWidget* tcw = static_cast<ToolchainConfigWidget*>(currentPage()->widget());
+  if (tcw != NULL) {
+    tcw->forceDetect();
+  }
 }
 
-void ToolchainsConfigCenter::showInformationDialog()
+void ToolchainsConfigCenter::slotUser3()
 {
-  ToolchainConfigWidget *tcw = current();
-  Q_ASSERT(tcw);
-  TextEditorDialog dialog(tcw->group().informationText(), tcw->group().label(), true, this);
-  dialog.exec();
+  const ToolchainConfigWidget* tcw = static_cast<const ToolchainConfigWidget*>(currentPage()->widget());
+  if (tcw != NULL) {
+    TextEditorDialog dialog(tcw->group().informationText(), tcw->group().label(), true, this);
+    dialog.exec();
+  }
 }

Modified: trunk/piklab_kde4/src/tools/gui/toolchain_config_center.h
===================================================================
--- trunk/piklab_kde4/src/tools/gui/toolchain_config_center.h	2012-04-16 00:13:58 UTC (rev 2871)
+++ trunk/piklab_kde4/src/tools/gui/toolchain_config_center.h	2012-04-16 00:16:01 UTC (rev 2872)
@@ -26,16 +26,14 @@
   virtual void slotApply();
   virtual void slotUser1();
   virtual void slotUser2();
+  virtual void slotUser3();
 
 private slots:
-  void aboutToShowPageSlot(QWidget *page);
-  void showInformationDialog();
+  void currentPageChangedSlot(KPageWidgetItem*);
 
 private:
-  KPushButton *_infoButton;
-  QMap<QWidget *, ToolchainConfigWidget *> _pages;
-
-  ToolchainConfigWidget *current() const;
+  typedef std::vector<ToolchainConfigWidget*> ConfigWidgetVector;
+  ConfigWidgetVector _configWidgets;
 };
 
 #endif

Modified: trunk/piklab_kde4/src/tools/pic30/pic30_compile.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/pic30/pic30_compile.cpp	2012-04-16 00:13:58 UTC (rev 2871)
+++ trunk/piklab_kde4/src/tools/pic30/pic30_compile.cpp	2012-04-16 00:16:01 UTC (rev 2872)
@@ -73,7 +73,7 @@
 QStringList PIC30::AssembleProjectFile::genericArguments(const Compile::Config &config) const
 {
   QStringList args = AssembleFile::genericArguments(config);
-  if ( _data.items[0].type==Compile::Item::NotGenerated ) args += "-p%DEVICE";
+  if ( !_data.items.empty() && _data.items[0].type==Compile::Item::NotGenerated ) args += "-p%DEVICE";
   args += "%I";
   return args;
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2871] trunk/piklab/src

[<az...@us...>]

Revision: 2871
          http://piklab.svn.sourceforge.net/piklab/?rev=2871&view=rev
Author:   azhyd
Date:     2012-04-16 00:13:58 +0000 (Mon, 16 Apr 2012)
Log Message:
-----------
fix potential sources of crash

Modified Paths:
--------------
    trunk/piklab/src/libgui/device_gui.cpp
    trunk/piklab/src/tools/gputils/gputils_compile.cpp
    trunk/piklab/src/tools/pic30/pic30_compile.cpp

Modified: trunk/piklab/src/libgui/device_gui.cpp
===================================================================
--- trunk/piklab/src/libgui/device_gui.cpp	2012-04-14 19:24:45 UTC (rev 2870)
+++ trunk/piklab/src/libgui/device_gui.cpp	2012-04-16 00:13:58 UTC (rev 2871)
@@ -314,7 +314,7 @@
   Q3ListViewItem *selected = NULL;
   const QStringList list = Device::Lister::instance().supportedDevices();
   QStringList::const_iterator it = list.end();
-  for (it--; it!=list.end(); it--) {
+  for (it--; it!=list.begin(); it--) {
     if ( pgroup && !pgroup->isSupported(*it) ) continue;
     if ( tgroup && !tgroup->isSupported(*it) ) continue;
     const Device::Data *data = Device::Lister::instance().data(*it);

Modified: trunk/piklab/src/tools/gputils/gputils_compile.cpp
===================================================================
--- trunk/piklab/src/tools/gputils/gputils_compile.cpp	2012-04-14 19:24:45 UTC (rev 2870)
+++ trunk/piklab/src/tools/gputils/gputils_compile.cpp	2012-04-16 00:13:58 UTC (rev 2871)
@@ -35,7 +35,7 @@
   QStringList args;
   args += "-c"; // relocatable code
   args += config.includeDirs(Tool::Category::Assembler, "-I");
-  if ( _data.items[0].type==Compile::Item::NotGenerated ) args += "-p%DEVICE";
+  if ( !_data.items.empty() && _data.items[0].type==Compile::Item::NotGenerated ) args += "-p%DEVICE";
   uint wl = static_cast<const Config &>(config).gpasmWarningLevel() ;
   if( wl!=Config::Nb_WarningLevels ) args += "-w" + QString::number(wl);
   args += config.customOptions(Tool::Category::Assembler);

Modified: trunk/piklab/src/tools/pic30/pic30_compile.cpp
===================================================================
--- trunk/piklab/src/tools/pic30/pic30_compile.cpp	2012-04-14 19:24:45 UTC (rev 2870)
+++ trunk/piklab/src/tools/pic30/pic30_compile.cpp	2012-04-16 00:13:58 UTC (rev 2871)
@@ -73,7 +73,7 @@
 QStringList PIC30::AssembleProjectFile::genericArguments(const Compile::Config &config) const
 {
   QStringList args = AssembleFile::genericArguments(config);
-  if ( _data.items[0].type==Compile::Item::NotGenerated ) args += "-p%DEVICE";
+  if ( !_data.items.empty() && _data.items[0].type==Compile::Item::NotGenerated ) args += "-p%DEVICE";
   args += "%I";
   return args;
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2870] trunk/piklab_kde4/src

[<az...@us...>]

Revision: 2870
          http://piklab.svn.sourceforge.net/piklab/?rev=2870&view=rev
Author:   azhyd
Date:     2012-04-14 19:24:45 +0000 (Sat, 14 Apr 2012)
Log Message:
-----------
fixed crashing project manager and file opening

Modified Paths:
--------------
    trunk/piklab_kde4/src/common/global/purl.cpp
    trunk/piklab_kde4/src/common/gui/list_view.cpp
    trunk/piklab_kde4/src/common/gui/list_view.h
    trunk/piklab_kde4/src/common/kde/kde_pfile.cpp
    trunk/piklab_kde4/src/devices/gui/register_view.cpp
    trunk/piklab_kde4/src/devices/gui/register_view.h
    trunk/piklab_kde4/src/devices/pic/gui/pic_config_word_editor.cpp
    trunk/piklab_kde4/src/libgui/project_manager_ui.cpp
    trunk/piklab_kde4/src/libgui/project_manager_ui.h
    trunk/piklab_kde4/src/piklab-test/misc/misc_check.cpp
    trunk/piklab_kde4/src/piklab-test/misc/misc_check.h

Modified: trunk/piklab_kde4/src/common/global/purl.cpp
===================================================================
--- trunk/piklab_kde4/src/common/global/purl.cpp	2012-04-13 15:12:14 UTC (rev 2869)
+++ trunk/piklab_kde4/src/common/global/purl.cpp	2012-04-14 19:24:45 UTC (rev 2870)
@@ -444,7 +444,7 @@
 
 PURL::Directory PURL::currentDirectory()
 {
-  return QDir::currentDirPath();
+  return QDir::currentPath();
 }
 
 PURL::Url PURL::fromPathOrUrl(const QString &s, bool keepRelative)

Modified: trunk/piklab_kde4/src/common/gui/list_view.cpp
===================================================================
--- trunk/piklab_kde4/src/common/gui/list_view.cpp	2012-04-13 15:12:14 UTC (rev 2869)
+++ trunk/piklab_kde4/src/common/gui/list_view.cpp	2012-04-14 19:24:45 UTC (rev 2870)
@@ -139,10 +139,6 @@
 EditListViewItem::~EditListViewItem()
 {
   if ( listView() ) static_cast<ListView *>(listView())->_editItems.remove(this);
-  for (uint i=0; i<_editWidgets.size(); i++) {
-    delete _editWidgets[i];
-    _editWidgets[i] = NULL;
-  }
 }
 
 void EditListViewItem::paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int align)
@@ -195,9 +191,9 @@
   bool resetFocus = false;
   for (uint i=0; i<_editWidgets.size(); i++) {
     if ( lv->viewport()->focusProxy()==_editWidgets[i] ) resetFocus = true;
-    delete _editWidgets[i];
+    lv->viewport()->setFocusProxy(NULL);
+    _editWidgets[i]->hide();
     _editWidgets[i] = NULL;
-    editWidgetDeleted(i);
   }
   _editWidgets.clear();
   delete renameBox;
@@ -210,15 +206,8 @@
 
 void EditListViewItem::editDone(int col, const QWidget *edit)
 {
-  const QMetaObject& metaObj = *edit->metaObject();
-  int index = metaObj.indexOfProperty("text");
-  if (index == -1) {
-    index = metaObj.indexOfProperty("currentText");
-  }
-  const char* name = index != -1 ? metaObj.property(index).name() : NULL;
-  if (name != NULL) {
-    emit listView()->itemRenamed(this, col, name);
-  }
+  QString s = edit->property("currentText").toString();
+  emit listView()->itemRenamed(this, col, s);
 }
 
 void EditListViewItem::renameDone(bool force)
@@ -240,10 +229,5 @@
   QWidget* widget = _renaming ? _editWidgets[col] : editWidgetFactory(col);
   if (widget == NULL) return w;
   w = QMAX(w, widget->sizeHint().width());
-  if (!_renaming) {
-    delete widget;
-    widget = NULL;
-    editWidgetDeleted(col);
-  }
   return w;
 }

Modified: trunk/piklab_kde4/src/common/gui/list_view.h
===================================================================
--- trunk/piklab_kde4/src/common/gui/list_view.h	2012-04-13 15:12:14 UTC (rev 2869)
+++ trunk/piklab_kde4/src/common/gui/list_view.h	2012-04-14 19:24:45 UTC (rev 2870)
@@ -78,7 +78,6 @@
   virtual void cancelRename(int) { renameDone(false); }
   void renameDone(bool force);
   virtual QWidget *editWidgetFactory(int col) const = 0;
-  virtual void editWidgetDeleted(int col) const { Q_UNUSED(col); }
   virtual bool alwaysAcceptEdit(int col) const = 0;
   void removeEditBox();
 

Modified: trunk/piklab_kde4/src/common/kde/kde_pfile.cpp
===================================================================
--- trunk/piklab_kde4/src/common/kde/kde_pfile.cpp	2012-04-13 15:12:14 UTC (rev 2869)
+++ trunk/piklab_kde4/src/common/kde/kde_pfile.cpp	2012-04-14 19:24:45 UTC (rev 2870)
@@ -18,8 +18,10 @@
 {
   close();
   _tmp.reset(new KTemporaryFile);
-  _tmp->setSuffix("." + _extension);
-  if (_tmp->status() != 0) {
+  if (!_extension.isEmpty()) {
+    _tmp->setSuffix("." + _extension);
+  }
+  if (!_tmp->open()) {
     _error = i18n("Could not create temporary file.");
     _log.sorry(_error, i18n("File: %1").arg(_tmp->name()));
     return false;
@@ -31,14 +33,13 @@
 {
   if (_tmp.get() != NULL) _tmp->close();
   else _file->close();
-  bool ok = (_tmp.get() != NULL ? _tmp->status() : _file->status())==IO_Ok;
   if ( !_file->name().isEmpty() ) {
     KIO::NetAccess::removeTempFile(_file->name());
     _file->setName(QString::null);
   }
   _stream.reset(NULL);
-  if (ok
-      && _tmp.get() != NULL
+  bool ok = true;
+  if (_tmp.get() != NULL
       && !_url.isEmpty()
       && !KIO::NetAccess::upload(_tmp->name(), _url.kurl(), qApp->mainWidget())) {
     _error = KIO::NetAccess::lastErrorString();
@@ -89,11 +90,6 @@
   _stream.reset(NULL);
   if (_tmp.get() != NULL) {
     _tmp->close();
-    if ( _tmp->status()!=IO_Ok ) {
-      _error = i18n("Could not write to temporary file.");
-      _log.sorry(_error, i18n("File: %1").arg(_tmp->name()));
-      return false;
-    }
   }
   return true;
 }
@@ -102,8 +98,10 @@
 {
   close();
   _tmp.reset(new KTemporaryFile);
-  _tmp->setSuffix("." + _extension);
-  if ( _tmp->status()!=0 ) {
+  if (!_extension.isEmpty()) {
+    _tmp->setSuffix("." + _extension);
+  }
+  if (!_tmp->open()) {
     _error = i18n("Could not create temporary file.");
     _log.sorry(_error, i18n("File: %1").arg(_tmp->name()));
     return false;

Modified: trunk/piklab_kde4/src/devices/gui/register_view.cpp
===================================================================
--- trunk/piklab_kde4/src/devices/gui/register_view.cpp	2012-04-13 15:12:14 UTC (rev 2869)
+++ trunk/piklab_kde4/src/devices/gui/register_view.cpp	2012-04-14 19:24:45 UTC (rev 2870)
@@ -152,8 +152,9 @@
 
 QWidget *Register::ListViewItem::editWidgetFactory(int col) const
 {
-  if ( col!=2 || Main::programmerState()!=Programmer::Halted ) return 0;
-  return new NumberLineEdit(textValue(), 0);
+  if ( col!=2 || Main::programmerState()!=Programmer::Halted ) return NULL;
+  _editWidget.reset(new NumberLineEdit(textValue(), 0));
+  return _editWidget.get();
 }
 
 void Register::ListViewItem::editDone(int col, const QWidget *edit)

Modified: trunk/piklab_kde4/src/devices/gui/register_view.h
===================================================================
--- trunk/piklab_kde4/src/devices/gui/register_view.h	2012-04-13 15:12:14 UTC (rev 2869)
+++ trunk/piklab_kde4/src/devices/gui/register_view.h	2012-04-14 19:24:45 UTC (rev 2870)
@@ -50,6 +50,7 @@
   TypeData _data;
   QValueList<PortBitListViewItem *> _items;
   NumberBase _base;
+  mutable std::auto_ptr<NumberLineEdit> _editWidget;
 
   virtual void paintCell(QPainter *p, const QColorGroup &cg, int column, int width, int align);
   virtual QWidget *editWidgetFactory(int col) const;

Modified: trunk/piklab_kde4/src/devices/pic/gui/pic_config_word_editor.cpp
===================================================================
--- trunk/piklab_kde4/src/devices/pic/gui/pic_config_word_editor.cpp	2012-04-13 15:12:14 UTC (rev 2869)
+++ trunk/piklab_kde4/src/devices/pic/gui/pic_config_word_editor.cpp	2012-04-14 19:24:45 UTC (rev 2870)
@@ -30,7 +30,7 @@
 void Pic::ConfigWordComboBox::setItem(uint i)
 {
   if ( !isValid() ) removeItem(0);
-  for (uint l=0; l<_map.count(); l++)
+  for (int l=0; l<_map.count(); l++)
     if ( _map[l]==i ) setCurrentIndex(l);
 }
 
@@ -121,14 +121,14 @@
   const Config::Word &cword = device().config()._words[ci];
   _combos.resize(cword.masks.count());
   uint nbChars = device().nbCharsWord(MemoryRangeType::Config);
-  for (uint k=0; k<_combos.count(); k++) {
+  for (int k=0; k<_combos.count(); k++) {
     const Config::Mask &cmask = cword.masks[k];
     QLabel *label = new QLabel(Config::maskLabel(cmask.name) + ":", this);
     grid->addWidget(label, k, 0);
     label = new QLabel(cmask.name, this);
     grid->addWidget(label, k, 1);
     _combos[k] = new ConfigWordComboBox(this);
-    for (uint i=0; i<cmask.values.count(); i++) {
+    for (int i=0; i<cmask.values.count(); i++) {
       if ( !cmask.values[i].isValid() ) continue;
       QString label = Config::valueLabel(cmask.name, cmask.values[i].name);
       label += " (" + toHexLabel(cmask.values[i].value, nbChars) + ")";
@@ -143,7 +143,7 @@
 {
   if (_mdb) _mdb->setReadOnly(readOnly);
   const Config::Word &cword = device().config()._words[_configIndex];
-  for (uint k=0; k<_combos.count(); k++) {
+  for (int k=0; k<_combos.count(); k++) {
     const Config::Mask &cmask = cword.masks[k];
     _combos[k]->setEnabled(!readOnly && !cmask.value.isOverlapping(cword.pmask) && cmask.values.count()!=1);
   }
@@ -153,7 +153,7 @@
 {
   BitValue v = memory().word(MemoryRangeType::Config, _configIndex);
   //qDebug("BinWordEditor::slotModified %i: %s", _configIndex, toHex(v, 4).data());
-  for (uint k=0; k<_combos.count(); k++) {
+  for (int k=0; k<_combos.count(); k++) {
     const Config::Mask &cmask = device().config()._words[_configIndex].masks[k];
     v = v.clearMaskBits(cmask.value);
     v |= cmask.values[_combos[k]->index()].value; // set value
@@ -169,7 +169,7 @@
   BitValue v = memory().word(MemoryRangeType::Config, _configIndex);
   uint nbChars = device().nbCharsWord(MemoryRangeType::Config);
   //qDebug("BinWordEditor::updateDisplay %i: %s", _configIndex, toHex(v, 4).data());
-  for (uint k=0; k<_combos.count(); k++) {
+  for (int k=0; k<_combos.count(); k++) {
     const Config::Mask &cmask = device().config()._words[_configIndex].masks[k];
     for (int i=cmask.values.count()-1; i>=0; i--) {
       if ( cmask.values[i].value.isInside(v) ) {

Modified: trunk/piklab_kde4/src/libgui/project_manager_ui.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/project_manager_ui.cpp	2012-04-13 15:12:14 UTC (rev 2869)
+++ trunk/piklab_kde4/src/libgui/project_manager_ui.cpp	2012-04-14 19:24:45 UTC (rev 2870)
@@ -163,10 +163,10 @@
 
 QWidget *ProjectManager::DeviceItem::editWidgetFactory(int) const
 {
-  QComboBox *combo = new DeviceChooser::ComboBox(NULL);
-  combo->setCurrentText(Main::deviceData().name());
-  QObject::connect(combo, SIGNAL(activated(int)), listView(), SLOT(finishRenaming()));
-  return combo;
+  _combo.reset(new DeviceChooser::ComboBox(NULL));
+  _combo->setCurrentText(Main::deviceData().name());
+  QObject::connect(_combo.get(), SIGNAL(activated(int)), listView(), SLOT(finishRenaming()));
+  return _combo.get();
 }
 
 void ProjectManager::DeviceItem::updateText()
@@ -189,11 +189,6 @@
   return _combo->widget();
 }
 
-void ProjectManager::ToolchainItem::editWidgetDeleted(int) const
-{
-  _combo.reset(NULL);
-}
-
 void ProjectManager::ToolchainItem::editDone(int col, const QWidget* widget)
 {
   _group = &_combo->group();
@@ -220,11 +215,6 @@
   return _combo->widget();
 }
 
-void ProjectManager::ProgrammerItem::editWidgetDeleted(int) const
-{
-  _combo.reset(NULL);
-}
-
 void ProjectManager::ProgrammerItem::editDone(int col, const QWidget* widget)
 {
   _group = &_combo->group();

Modified: trunk/piklab_kde4/src/libgui/project_manager_ui.h
===================================================================
--- trunk/piklab_kde4/src/libgui/project_manager_ui.h	2012-04-13 15:12:14 UTC (rev 2869)
+++ trunk/piklab_kde4/src/libgui/project_manager_ui.h	2012-04-14 19:24:45 UTC (rev 2870)
@@ -129,6 +129,8 @@
   virtual int rtti() const { return DeviceRtti; }
 
 private:
+  mutable std::auto_ptr<QComboBox> _combo;
+  
   virtual QWidget *editWidgetFactory(int) const;
   virtual bool alwaysAcceptEdit(int) const { return true; }
 };
@@ -143,13 +145,12 @@
   virtual int rtti() const { return ToolchainRtti; }
 
 private:
+  const Tool::Group* _group;
+  mutable std::auto_ptr<ListerComboBox<Tool::Lister> > _combo;
+
   virtual QWidget *editWidgetFactory(int) const;
-  virtual void editWidgetDeleted(int) const;
   virtual bool alwaysAcceptEdit(int) const { return true; }
   virtual void editDone(int col, const QWidget *editWidget);
-
-  const Tool::Group* _group;
-  mutable std::auto_ptr<ListerComboBox<Tool::Lister> > _combo;
 };
 
 //-----------------------------------------------------------------------------
@@ -162,13 +163,12 @@
   virtual int rtti() const { return ProgrammerRtti; }
 
 private:
+  const Programmer::Group* _group;
+  mutable std::auto_ptr<ListerComboBox<Programmer::Lister> > _combo;
+
   virtual QWidget *editWidgetFactory(int) const;
-  virtual void editWidgetDeleted(int) const;
   virtual bool alwaysAcceptEdit(int) const { return true; }
   virtual void editDone(int col, const QWidget *editWidget);
-
-  const Programmer::Group* _group;
-  mutable std::auto_ptr<ListerComboBox<Programmer::Lister> > _combo;
 };
 
 //-----------------------------------------------------------------------------

Modified: trunk/piklab_kde4/src/piklab-test/misc/misc_check.cpp
===================================================================
--- trunk/piklab_kde4/src/piklab-test/misc/misc_check.cpp	2012-04-13 15:12:14 UTC (rev 2869)
+++ trunk/piklab_kde4/src/piklab-test/misc/misc_check.cpp	2012-04-14 19:24:45 UTC (rev 2870)
@@ -10,7 +10,10 @@
 #include "misc_check.moc"
 
 #include "common/global/purl.h"
+#include "common/global/pfile.h"
 
+#include <iostream>
+
 //----------------------------------------------------------------------------
 void MiscCheck::testPURL()
 {
@@ -92,5 +95,38 @@
   }
 }
 
+void MiscCheck::testFile()
+{
+  Log::StringView log;
+  PURL::TempFile file1(log);
+  QVERIFY(!file1.isOpen());
+  QVERIFY(file1.openForWrite());
+  QVERIFY(file1.isOpen());
+  file1.appendText("toto");
+  QVERIFY(!file1.hasError());
+  QVERIFY(file1.close());
+  QVERIFY(!file1.isOpen());
+
+  PURL::File file2(log);
+  const bool keepRelative = false;
+  PURL::Url url = PURL::fromPathOrUrl("toto.txt", keepRelative);
+  file2.setUrl(url);
+  QVERIFY(file2.openForWrite());
+  QVERIFY(file2.isOpen());
+  file2.appendText("toto");
+  QVERIFY(!file2.hasError());
+  QVERIFY(file2.close());
+  QVERIFY(!file2.isOpen());
+  QFileInfo info("toto.txt");
+  QVERIFY(info.exists());
+  QVERIFY(file2.openForRead());
+  QVERIFY(file2.isOpen());
+  QVERIFY(file2.remove());
+  info.refresh();
+  QVERIFY(!info.exists());
+  QVERIFY(!file2.openForRead());
+  QVERIFY(!file2.isOpen());
+}
+
 //----------------------------------------------------------------------------
 QTEST_MAIN(MiscCheck)

Modified: trunk/piklab_kde4/src/piklab-test/misc/misc_check.h
===================================================================
--- trunk/piklab_kde4/src/piklab-test/misc/misc_check.h	2012-04-13 15:12:14 UTC (rev 2869)
+++ trunk/piklab_kde4/src/piklab-test/misc/misc_check.h	2012-04-14 19:24:45 UTC (rev 2870)
@@ -16,6 +16,7 @@
   Q_OBJECT
   private slots:
     void testPURL();
+    void testFile();
 };
 
 #endif

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2869] trunk/piklab_kde4

[<az...@us...>]

Revision: 2869
          http://piklab.svn.sourceforge.net/piklab/?rev=2869&view=rev
Author:   azhyd
Date:     2012-04-13 15:12:14 +0000 (Fri, 13 Apr 2012)
Log Message:
-----------
integrate from trunk + fix more compile warnings

Modified Paths:
--------------
    trunk/piklab_kde4/Changelog
    trunk/piklab_kde4/src/coff/base/coff.xml
    trunk/piklab_kde4/src/coff/base/coff_object.cpp
    trunk/piklab_kde4/src/coff/base/gpdis.cpp
    trunk/piklab_kde4/src/coff/xml/xml_coff_parser.cpp
    trunk/piklab_kde4/src/common/port/usb_port.cpp
    trunk/piklab_kde4/src/devices/pic/base/pic.cpp
    trunk/piklab_kde4/src/devices/pic/base/pic.h
    trunk/piklab_kde4/src/devices/pic/base/pic_config.cpp
    trunk/piklab_kde4/src/devices/pic/base/pic_register.cpp
    trunk/piklab_kde4/src/devices/pic/gui/pic_register_view.cpp
    trunk/piklab_kde4/src/devices/pic/pic/pic_memory.cpp
    trunk/piklab_kde4/src/devices/pic/prog/pic_prog.cpp
    trunk/piklab_kde4/src/devices/pic/xml/pic_xml_to_data.cpp
    trunk/piklab_kde4/src/devices/pic/xml_data/10F200.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/10F202.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/10F204.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/10F206.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/10F220.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/10F222.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/12C508.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/12C508A.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/12C509.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/12C509A.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/12C671.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/12C672.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/12CE518.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/12CE519.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/12CE673.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/12CE674.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/12CR509A.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/12F508.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/12F509.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/12F510.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/12F519.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/12F609.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/12F615.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/12F629.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/12F635.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/12F675.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/12F683.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/14000.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C432.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C433.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C505.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C52.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C54.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C54A.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C54B.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C54C.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C55.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C554.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C557.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C558.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C55A.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C56.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C56A.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C57.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C57C.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C58A.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C58B.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C61.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C62.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C620.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C620A.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C621.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C621A.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C622.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C622A.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C62A.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C62B.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C63.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C63A.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C64.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C641.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C642.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C64A.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C65.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C65A.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C65B.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C66.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C661.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C662.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C67.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C71.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C710.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C711.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C712.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C715.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C716.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C717.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C72.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C72A.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C73.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C73A.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C73B.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C74.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C745.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C74A.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C74B.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C76.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C765.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C77.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C770.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C771.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C773.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C774.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C781.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C782.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C84.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C923.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C924.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C925.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16C926.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16CE623.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16CE624.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16CE625.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16CR54A.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16CR54B.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16CR54C.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16CR56A.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16CR57B.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16CR57C.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16CR58A.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16CR58B.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16CR62.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16CR620A.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16CR63.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16CR64.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16CR65.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16CR72.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16CR73.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16CR74.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16CR76.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16CR77.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16CR83.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16CR84.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F1507.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/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/16F505.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F506.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F526.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F54.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F57.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F59.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F610.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F616.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F627.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F627A.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F628.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F628A.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F630.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F631.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F636.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F639.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F648A.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F676.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F677.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F684.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F685.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F687.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F688.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F689.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F690.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F716.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F72.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F722.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F723.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F724.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F726.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F727.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F73.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F737.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F74.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F747.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F76.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F767.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F77.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F777.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F785.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F818.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F819.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F83.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F84.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F84A.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F87.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F870.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F871.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F872.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F873.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F873A.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F874.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F874A.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F876.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F876A.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F877.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F877A.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F88.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F882.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F883.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F884.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F886.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F887.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F913.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F914.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F916.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F917.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16F946.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/16HV540.xml
    trunk/piklab_kde4/src/libgui/device_gui.cpp
    trunk/piklab_kde4/src/progs/direct/base/direct.xml
    trunk/piklab_kde4/src/progs/direct/base/direct_16F.cpp
    trunk/piklab_kde4/src/progs/direct/base/direct_16F.h
    trunk/piklab_kde4/src/progs/icd2/base/icd2_debug.cpp
    trunk/piklab_kde4/src/progs/icd2/base/icd2_debug_specific_24f.cpp
    trunk/piklab_kde4/src/progs/tbl_bootloader/base/tbl_bootloader.cpp
    trunk/piklab_kde4/src/tools/boost/boostbasic.h
    trunk/piklab_kde4/src/tools/boost/boostc.h
    trunk/piklab_kde4/src/tools/boost/boostcpp.h
    trunk/piklab_kde4/src/tools/cc5x/cc5x.cpp
    trunk/piklab_kde4/src/tools/ccsc/ccsc_compile.cpp
    trunk/piklab_kde4/src/tools/gputils/gputils_generator.cpp
    trunk/piklab_kde4/src/tools/jalv2/jalv2.cpp
    trunk/piklab_kde4/src/tools/list/device_info.cpp
    trunk/piklab_kde4/src/tools/mpc/mpc.cpp
    trunk/piklab_kde4/src/tools/sdcc/sdcc_generator.cpp

Added Paths:
-----------
    trunk/piklab_kde4/src/devices/pic/xml_data/10F320.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/10F322.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/12F1822.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/12F617.xml
    trunk/piklab_kde4/src/devices/pic/xml_data/12F752.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/16F1828.xml

Property Changed:
----------------
    trunk/piklab_kde4/


Property changes on: trunk/piklab_kde4
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/piklab:2822-2855
   + /trunk/piklab:2822-2868

Modified: trunk/piklab_kde4/Changelog
===================================================================
--- trunk/piklab_kde4/Changelog	2012-04-09 14:11:49 UTC (rev 2868)
+++ trunk/piklab_kde4/Changelog	2012-04-13 15:12:14 UTC (rev 2869)
@@ -1,5 +1,9 @@
-0.15.13 (14 March 2012)
+0.15.13 (9 April 2012)
 * add default argument "--use-non-free" to sdcc [patch by Gál Zsolt]
+* added support for 10F320/322, 12F617/752
+* added support for 12F1822, 16F1823/1824/1825/1828/1829 [patch by Michael Vrolijk]
+* added support for direct programming of 12F1822/16F182X
+* added device family "enhanced mid-range" in device chooser
 
 0.15.12 (19 February 2012)
 * added support for 18F2XK22/18F4XK22 [patch by Micheal Vrolijk]

Modified: trunk/piklab_kde4/src/coff/base/coff.xml
===================================================================
--- trunk/piklab_kde4/src/coff/base/coff.xml	2012-04-09 14:11:49 UTC (rev 2868)
+++ trunk/piklab_kde4/src/coff/base/coff.xml	2012-04-13 15:12:14 UTC (rev 2869)
@@ -1,5 +1,5 @@
 <!-- ************************************************************************* -->
-<!-- * Copyright (C) 2006-2010 Nicolas Hadacek <ha...@kd...>             * -->
+<!-- * Copyright (C) 2006-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  * -->
@@ -15,6 +15,8 @@
   <device name="10f206" id="0xf206" />
   <device name="10f220" id="0xf220" />
   <device name="10f222" id="0xf222" />
+  <device name="10f320" id="0xf320" />
+  <device name="10f322" id="0xf322" />
   <device name="12c508" id="0x2508" />
   <device name="12c508a" id="0x508a" />
   <device name="12c509" id="0x2509" />
@@ -32,10 +34,12 @@
   <device name="12f519" id="0xf519" />
   <device name="12f609" id="0xf609" />
   <device name="12f615" id="0xf615" />
+  <device name="12f617" id="0xf617" />
   <device name="12f629" id="0x2629" />
   <device name="12f635" id="0xf635" />
   <device name="12f675" id="0x2675" />
   <device name="12f683" id="0xf683" />
+  <device name="12f752" id="0xf752" />
   <device name="14000" id="0x4000" />
 <!--  <device name="16c5x" id="0x658a" /> -->
 <!--  <device name="16cxx" id="0x6c77" /> -->
@@ -72,11 +76,13 @@
   <device name="16c63a" id="0x663a" />
   <device name="16c64" id="0x6c64" />
   <device name="16c64a" id="0x664a" />
+  <device name="16c641" id="0x6641" />
   <device name="16c642" id="0x6642" />
   <device name="16c65" id="0x6c65" />
   <device name="16c65a" id="0x665a" />
   <device name="16c65b" id="0x665b" />
   <device name="16c66" id="0x6c66" />
+  <device name="16c661" id="0x6661" />
   <device name="16c662" id="0x6662" />
   <device name="16c67" id="0x6c67" />
   <device name="16c71" id="0x6c71" />
@@ -129,8 +135,13 @@
   <device name="16cr64" id="0xdc64" />
   <device name="16cr65" id="0x6d65" />
   <device name="16cr72" id="0x6d72" />
+  <device name="16cr73" id="0x6d73" />
+  <device name="16cr74" id="0x6d74" />
+  <device name="16cr76" id="0x6d76" />
+  <device name="16cr77" id="0x6d77" />
   <device name="16cr83" id="0xdc83" />
   <device name="16cr84" id="0xdc84" />
+  <device name="16f1507" id="0x1507" />
   <device name="16f1826" id="0x1826" />
   <device name="16f1827" id="0x1827" />
   <device name="16f1829" id="0x1829" />
@@ -138,6 +149,10 @@
   <device name="16f1934" id="0x1934" />
   <device name="16f1936" id="0x1936" />
   <device name="16f1937" id="0x1937" />
+  <device name="16f1938" id="0x1938" />
+  <device name="16f1939" id="0x1939" />
+  <device name="16f1946" id="0x1946" />
+  <device name="16f1947" id="0x1947" />
   <device name="16f505" id="0xf505" />
   <device name="16f506" id="0xf506" />
   <device name="16f526" id="0xf526" />

Modified: trunk/piklab_kde4/src/coff/base/coff_object.cpp
===================================================================
--- trunk/piklab_kde4/src/coff/base/coff_object.cpp	2012-04-09 14:11:49 UTC (rev 2868)
+++ trunk/piklab_kde4/src/coff/base/coff_object.cpp	2012-04-13 15:12:14 UTC (rev 2869)
@@ -624,7 +624,8 @@
     Register::TypeData td(it.key(), it.data().address, it.data().nbChars);
     list.append(Pic::RegisterNameData(it.key(), td));
   }
-  if ( data.architecture()==Pic::Architecture::P16X )
+  if ( data.architecture()==Pic::Architecture::MidRange
+       || data.architecture()==Pic::Architecture::EMidRange)
     list.append(Pic::RegisterNameData("WREG", Register::TypeData("WREG", rdata.nbChars())));
   qSort(list);
   return list;

Modified: trunk/piklab_kde4/src/coff/base/gpdis.cpp
===================================================================
--- trunk/piklab_kde4/src/coff/base/gpdis.cpp	2012-04-09 14:11:49 UTC (rev 2868)
+++ trunk/piklab_kde4/src/coff/base/gpdis.cpp	2012-04-13 15:12:14 UTC (rev 2869)
@@ -67,7 +67,7 @@
   case Pic::Architecture::P33F:
     snprintf(buffer, sizeof_buffer, "--");
     return 0;
-  case Pic::Architecture::P10X:
+  case Pic::Architecture::Baseline:
     for(i = 0; i < num_op_12c5xx; i++) {
       if((op_12c5xx[i].mask & opcode) == op_12c5xx[i].opcode) {
         instruction = &op_12c5xx[i];
@@ -84,7 +84,8 @@
     }
     break;
 */
-  case Pic::Architecture::P16X:
+  case Pic::Architecture::MidRange:
+  case Pic::Architecture::EMidRange:
     for(i = 0; i < num_op_16cxx; i++) {
       if((op_16cxx[i].mask & opcode) == op_16cxx[i].opcode) {
         instruction = &op_16cxx[i];

Modified: trunk/piklab_kde4/src/coff/xml/xml_coff_parser.cpp
===================================================================
--- trunk/piklab_kde4/src/coff/xml/xml_coff_parser.cpp	2012-04-09 14:11:49 UTC (rev 2868)
+++ trunk/piklab_kde4/src/coff/xml/xml_coff_parser.cpp	2012-04-13 15:12:14 UTC (rev 2869)
@@ -81,8 +81,9 @@
   for (::Group::Base::const_iterator it = gpic.begin(); it != gpic.end(); ++it) {
     const Pic::Data *data = static_cast<const Pic::Data*>(it->second.data);
     switch (data->architecture().type()) {
-      case Pic::Architecture::P10X:
-      case Pic::Architecture::P16X:
+      case Pic::Architecture::Baseline:
+      case Pic::Architecture::MidRange:
+      case Pic::Architecture::EMidRange:
       case Pic::Architecture::P17C:
       case Pic::Architecture::P18C:
       case Pic::Architecture::P18F:

Modified: trunk/piklab_kde4/src/common/port/usb_port.cpp
===================================================================
--- trunk/piklab_kde4/src/common/port/usb_port.cpp	2012-04-09 14:11:49 UTC (rev 2868)
+++ trunk/piklab_kde4/src/common/port/usb_port.cpp	2012-04-13 15:12:14 UTC (rev 2869)
@@ -225,13 +225,13 @@
     setSystemError(i18n("Error resetting USB device."));
     return false;
   }
-#  endif
   usb_close(_handle);
   _handle = usb_open(_device);
   if ( _handle==0 ) {
     setSystemError(i18n("Error opening USB device."));
     return false;
   }
+#  endif
   tryToDetachDriver();
   uint i = 0;
   for (; i<_device->descriptor.bNumConfigurations; i++)

Modified: trunk/piklab_kde4/src/devices/pic/base/pic.cpp
===================================================================
--- trunk/piklab_kde4/src/devices/pic/base/pic.cpp	2012-04-09 14:11:49 UTC (rev 2868)
+++ trunk/piklab_kde4/src/devices/pic/base/pic.cpp	2012-04-13 15:12:14 UTC (rev 2869)
@@ -37,8 +37,9 @@
 //  name family_label nbBytesPC nbBytesWord nbBitsRegister registerBankLength
 //  {Code, Cal, UserID, DevId, Conf, EEPROM, DebugVec, HardStack, CalBackup, Program Executive}
 //  properties nominalVdd
-  { "10X", I18N_NOOP("Baseline Family"),  0, 2, 8, 0x020, { 12, 12, 12, 12, 12,  8, 12,  0, 12,  0 },  NoArchitectureProperty, 5.0 }, // 9, 10, 11 or 12-bit program counter
-  { "16X", I18N_NOOP("Midrange Family"), 13, 2, 8, 0x080, { 14, 14, 14, 14, 14,  8, 14,  0, 14,  0 },  MaybeSelfWrite, 5.0 }, // max eeprom: 256 words
+  { "baseline", I18N_NOOP("Baseline Family"),  0, 2, 8, 0x020, { 12, 12, 12, 12, 12,  8, 12,  0, 12,  0 },  NoArchitectureProperty, 5.0 }, // 9, 10, 11 or 12-bit program counter
+  { "midrange", I18N_NOOP("Mid-Range Family"), 13, 2, 8, 0x080, { 14, 14, 14, 14, 14,  8, 14,  0, 14,  0 },  MaybeSelfWrite, 5.0 }, // max eeprom: 256 words
+  { "emidrange", I18N_NOOP("Enhance Mid-Range Family"), 13, 2, 8, 0x080, { 14, 14, 14, 14, 14,  8, 14,  0, 14,  0 },  MaybeSelfWrite, 5.0 }, // max eeprom: 256 words
   { "17C", I18N_NOOP("17C Family"),      16, 2, 8, 0x100, { 16,  0,  0,  0, 16,  8,  0,  0,  0,  0 },  RandomMemoryAccess,     5.0 },
   { "18C", I18N_NOOP("18C Family"),      21, 2, 8, 0x100, { 16,  8,  8,  8,  8,  8, 16,  0,  8,  0 },  PackedHex | RandomMemoryAccess, 5.0 },
   { "18F", I18N_NOOP("18F Family"),      21, 2, 8, 0x100, { 16,  8,  8,  8,  8,  8, 16,  0,  8,  0 },  PackedHex | RandomMemoryAccess | MaybeSelfWrite, 5.0 },
@@ -153,8 +154,9 @@
     idata.special = it.key();
     BitValue nid = 0x0;
     switch (architecture().type()) {
-      case Architecture::P10X:
-      case Architecture::P16X:
+      case Architecture::Baseline:
+      case Architecture::MidRange:
+      case Architecture::EMidRange:
       case Architecture::P17C:
       case Architecture::P18C:
       case Architecture::P18F:
@@ -191,8 +193,9 @@
   QMap<QString, Device::IdData>::const_iterator it;
   for (it=ids.begin(); it!=ids.end(); ++it) {
     switch (_architecture.type()) {
-      case Architecture::P10X:
-      case Architecture::P16X:
+      case Architecture::Baseline:
+      case Architecture::MidRange:
+      case Architecture::EMidRange:
       case Architecture::P17C:
       case Architecture::P18C:
       case Architecture::P18F:
@@ -278,12 +281,13 @@
   Q_ASSERT( address<addressIncrement(MemoryRangeType::Code)*nbWords(MemoryRangeType::Code) );
   Device::Array a;
   switch (_architecture.type()) {
-  case Architecture::P10X:
+  case Architecture::Baseline:
     if ( nbWords(MemoryRangeType::Code)>0x1FF && withPageSelection)
       a.append(0x4A3 | (address>0x1FF ? 0x100 : 0x000)); // bsf STATUS,PA0 or bcf STATUS,PA0
     a.append(0xA00 | (address.toUInt() & 0x1FF)); // goto
     break;
-  case Architecture::P16X:
+  case Architecture::MidRange:
+  case Architecture::EMidRange:
     if ( nbWords(MemoryRangeType::Code)>0x7FF && withPageSelection ) {
       if ( address<=0x7FF ) a.append(0x018A); // clrf PCLATH
       else {
@@ -317,8 +321,9 @@
 bool Pic::Data::isGotoInstruction(BitValue instruction) const
 {
   switch (_architecture.type()) {
-  case Architecture::P10X: return ( instruction.maskWith(0xE00)==0xA00 );
-  case Architecture::P16X: return ( instruction.maskWith(0xF800)==0x2800 );
+  case Architecture::Baseline: return ( instruction.maskWith(0xE00)==0xA00 );
+  case Architecture::MidRange:
+  case Architecture::EMidRange: return ( instruction.maskWith(0xF800)==0x2800 );
   case Architecture::P17C: return ( instruction.maskWith(0xE000)==0xC000 );
   case Architecture::P18C:
   case Architecture::P18F:

Modified: trunk/piklab_kde4/src/devices/pic/base/pic.h
===================================================================
--- trunk/piklab_kde4/src/devices/pic/base/pic.h	2012-04-09 14:11:49 UTC (rev 2868)
+++ trunk/piklab_kde4/src/devices/pic/base/pic.h	2012-04-13 15:12:14 UTC (rev 2869)
@@ -65,7 +65,7 @@
   double nominalVdd;
 };
 BEGIN_DECLARE_ENUM(Architecture)
-  P10X = 0, P16X, P17C, P18C, P18F, P18J, P24F, P24H, P30F, P33F
+  Baseline = 0, MidRange, EMidRange, P17C, P18C, P18F, P18J, P24F, P24H, P30F, P33F
 END_DECLARE_ENUM(Architecture, ArchitectureData)
 
 enum MemoryRangeProperty { NotPresent = 0, Present = 1, Programmable = 2 };

Modified: trunk/piklab_kde4/src/devices/pic/base/pic_config.cpp
===================================================================
--- trunk/piklab_kde4/src/devices/pic/base/pic_config.cpp	2012-04-09 14:11:49 UTC (rev 2868)
+++ trunk/piklab_kde4/src/devices/pic/base/pic_config.cpp	2012-04-13 15:12:14 UTC (rev 2869)
@@ -102,6 +102,7 @@
   { { "BORV",  I18N_NOOP("Brown-out reset voltage") }, ValueDouble, {
     { "0", I18N_NOOP("Undefined")  }, { 0, 0 } } },
   { { "LVP",   I18N_NOOP("Low voltage programming")   }, Toggle, { { 0, 0 } } },
+  { { "LPBOR", I18N_NOOP("Low power brown-out reset")   }, Toggle, { { 0, 0 } } },
   { { "CCP3MX", I18N_NOOP("CCP3 multiplex")           }, Pin, { { 0, 0 } } },
   { { "CCP2MX", I18N_NOOP("CCP2 multiplex")           }, Pin, { { 0, 0 } } },
   { { "CCP1MX", I18N_NOOP("CCP1 multiplex")           }, Pin, { { 0, 0 } } },

Modified: trunk/piklab_kde4/src/devices/pic/base/pic_register.cpp
===================================================================
--- trunk/piklab_kde4/src/devices/pic/base/pic_register.cpp	2012-04-09 14:11:49 UTC (rev 2868)
+++ trunk/piklab_kde4/src/devices/pic/base/pic_register.cpp	2012-04-13 15:12:14 UTC (rev 2869)
@@ -138,7 +138,10 @@
 
 QString Pic::RegistersData::latchName(uint index) const
 {
-  if ( _data.architecture()==Architecture::P10X || _data.architecture()==Architecture::P16X || _data.architecture()==Architecture::P17C )
+  if ( _data.architecture()==Architecture::Baseline
+       || _data.architecture()==Architecture::MidRange
+       || _data.architecture()==Architecture::EMidRange
+       || _data.architecture()==Architecture::P17C )
     return QString::null;
   return QString("LAT") + char('A' + index);
 }

Modified: trunk/piklab_kde4/src/devices/pic/gui/pic_register_view.cpp
===================================================================
--- trunk/piklab_kde4/src/devices/pic/gui/pic_register_view.cpp	2012-04-09 14:11:49 UTC (rev 2868)
+++ trunk/piklab_kde4/src/devices/pic/gui/pic_register_view.cpp	2012-04-13 15:12:14 UTC (rev 2869)
@@ -146,9 +146,9 @@
   const Pic::Data &data = static_cast<const Pic::Data &>(Main::deviceData());
   const Pic::RegistersData &rdata = data.registersData();
   uint nbChars = rdata.nbCharsAddress();
-  uint nb = nbRegisters();
+  int nb = nbRegisters();
   uint offset = indexOffset();
-  for (uint k=0; k<_registers.count(); k++) {
+  for (int k=0; k<_registers.count(); k++) {
     if ( k<nb ) {
       _registers[k].alabel->show();
       _registers[k].address = rdata.addressFromIndex(offset + k);
@@ -161,7 +161,7 @@
 {
   const Pic::Data &data = static_cast<const Pic::Data &>(Main::deviceData());
   const Pic::RegistersData &rdata = data.registersData();
-  for (uint i=0; i<_registers.count(); i++) {
+  for (int i=0; i<_registers.count(); i++) {
     if ( sender()!=_registers[i].button ) continue;
     Register::TypeData rtd(_registers[i].address, rdata.nbChars());
     switch (id) {
@@ -184,7 +184,7 @@
 {
   const Pic::Data &data = static_cast<const Pic::Data &>(Main::deviceData());
   const Pic::RegistersData &rdata = data.registersData();
-  for (uint i=0; i<_registers.count(); i++) {
+  for (int i=0; i<_registers.count(); i++) {
     if ( sender()!=_registers[i].edit ) continue;
     Register::TypeData rtd(_registers[i].address, rdata.nbChars());
     Debugger::manager->writeRegister(rtd, _registers[i].edit->value());
@@ -198,8 +198,8 @@
   const Pic::RegistersData &rdata = data.registersData();
   bool active = ( Main::programmerState()==Programmer::Halted );
   const Coff::Object *coff = Debugger::manager->coff();
-  uint nb = nbRegisters();
-  for (uint i=0; i<_registers.count(); i++) {
+  int nb = nbRegisters();
+  for (int i=0; i<_registers.count(); i++) {
     uint address = _registers[i].address;
     Device::RegisterProperties rp = rdata.properties(address);
     QString label = rdata.label(address);
@@ -293,7 +293,7 @@
 void Pic::RegisterView::updateView()
 {
   if (_readAllButton) _readAllButton->setEnabled(Main::programmerState()==Programmer::Halted);
-  for (uint i=0; i<_banks.count(); i++) if (_banks[i]) _banks[i]->updateView();
+  for (int i=0; i<_banks.count(); i++) if (_banks[i]) _banks[i]->updateView();
 }
 
 void Pic::RegisterView::stopWatchAllRegisters()

Modified: trunk/piklab_kde4/src/devices/pic/pic/pic_memory.cpp
===================================================================
--- trunk/piklab_kde4/src/devices/pic/pic/pic_memory.cpp	2012-04-09 14:11:49 UTC (rev 2868)
+++ trunk/piklab_kde4/src/devices/pic/pic/pic_memory.cpp	2012-04-13 15:12:14 UTC (rev 2869)
@@ -299,11 +299,12 @@
 {
   clear();
   switch (device().architecture().type()) {
-    case Architecture::P10X:
+    case Architecture::Baseline:
       setWord(MemoryRangeType::Code, device().range(MemoryRangeType::Code).start.toUInt(), 0x723);
       setWord(MemoryRangeType::Code, device().range(MemoryRangeType::Code).end.toUInt(), 0x723);
       break;
-    case Architecture::P16X:
+    case Architecture::MidRange:
+    case Architecture::EMidRange:
       if ( device().name()=="16F72" || device().name()=="16F73" || device().name()=="16F74" || device().name()=="16F76" || device().name()=="16F77"
            || device().name()=="16CR73" || device().name()=="16CR74" || device().name()=="16CR76" || device().name()=="16CR77" ) {
         setWord(MemoryRangeType::Code, device().range(MemoryRangeType::Code).start.toUInt(), 0x05E6);
@@ -366,8 +367,9 @@
     BitValue v = word(MemoryRangeType::Code, i).maskWith(mask);
     //if ( i==0 || i==device().nbWords(MemoryRangeType::Code)-1 ) qDebug("%s %s", toHexLabel(i, 4).latin1(), toHexLabel(v, 4).latin1());
     switch (device().architecture().type()) {
-      case Architecture::P10X:
-      case Architecture::P16X:
+      case Architecture::Baseline:
+      case Architecture::MidRange:
+      case Architecture::EMidRange:
       case Architecture::P17C:
         if ( rv.contains(i) ) {
           switch (algorithm.type()) {

Modified: trunk/piklab_kde4/src/devices/pic/prog/pic_prog.cpp
===================================================================
--- trunk/piklab_kde4/src/devices/pic/prog/pic_prog.cpp	2012-04-09 14:11:49 UTC (rev 2868)
+++ trunk/piklab_kde4/src/devices/pic/prog/pic_prog.cpp	2012-04-13 15:12:14 UTC (rev 2869)
@@ -19,8 +19,9 @@
   const Pic::Data *data = static_cast<const Pic::Data *>(base.device());
   if (data != NULL) {
     switch (data->architecture().type()) {
-      case Pic::Architecture::P10X:
-      case Pic::Architecture::P16X: return new ::Debugger::P16FSpecific(base);
+      case Pic::Architecture::Baseline:
+      case Pic::Architecture::MidRange:
+      case Pic::Architecture::EMidRange: return new ::Debugger::P16FSpecific(base);
       case Pic::Architecture::P18C:
       case Pic::Architecture::P18F:
       case Pic::Architecture::P18J: return new ::Debugger::P18FSpecific(base);
@@ -161,8 +162,9 @@
   Q_ASSERT( data.count()!=0 );
   BitValue id = 0x0;
   switch (device()->architecture().type()) {
-    case Pic::Architecture::P10X:
-    case Pic::Architecture::P16X:
+    case Pic::Architecture::Baseline:
+    case Pic::Architecture::MidRange:
+    case Pic::Architecture::EMidRange:
     case Pic::Architecture::P17C: id = data[0]; break;
     case Pic::Architecture::P18C:
     case Pic::Architecture::P18F:

Modified: trunk/piklab_kde4/src/devices/pic/xml/pic_xml_to_data.cpp
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml/pic_xml_to_data.cpp	2012-04-09 14:11:49 UTC (rev 2868)
+++ trunk/piklab_kde4/src/devices/pic/xml/pic_xml_to_data.cpp	2012-04-13 15:12:14 UTC (rev 2869)
@@ -513,7 +513,7 @@
       if ( child.nodeName()!="checksum" ) qFatal("Childs of \"checksums\" should \"checksum\"");
       QString valueName = getChecksumData(child.toElement());
       if ( protection.family()==Protection::BasicProtection ) {
-        if ( !valueNames.contains(valueName) ) qFatal("Unknown protected attribute");
+        if ( !valueNames.contains(valueName) ) qFatal(QString("Unknown protected attribute in checksum \"%1\"").arg(valueName));
         valueNames[valueName] = true;
       }
       child = child.nextSibling();

Modified: trunk/piklab_kde4/src/devices/pic/xml_data/10F200.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/10F200.xml	2012-04-09 14:11:49 UTC (rev 2868)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/10F200.xml	2012-04-13 15:12:14 UTC (rev 2869)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="10F200" document="019863" status="IP" memory_technology="FLASH" architecture="10X" pc="9"
+<device name="10F200" document="019863" status="IP" memory_technology="FLASH" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab_kde4/src/devices/pic/xml_data/10F202.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/10F202.xml	2012-04-09 14:11:49 UTC (rev 2868)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/10F202.xml	2012-04-13 15:12:14 UTC (rev 2869)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="10F202" document="020030" status="IP" memory_technology="FLASH" architecture="10X" pc="9"
+<device name="10F202" document="020030" status="IP" memory_technology="FLASH" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab_kde4/src/devices/pic/xml_data/10F204.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/10F204.xml	2012-04-09 14:11:49 UTC (rev 2868)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/10F204.xml	2012-04-13 15:12:14 UTC (rev 2869)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="10F204" document="020031" status="IP" memory_technology="FLASH" architecture="10X" pc="9"
+<device name="10F204" document="020031" status="IP" memory_technology="FLASH" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab_kde4/src/devices/pic/xml_data/10F206.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/10F206.xml	2012-04-09 14:11:49 UTC (rev 2868)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/10F206.xml	2012-04-13 15:12:14 UTC (rev 2869)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="10F206" document="020032" status="IP" memory_technology="FLASH" architecture="10X" pc="9"
+<device name="10F206" document="020032" status="IP" memory_technology="FLASH" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab_kde4/src/devices/pic/xml_data/10F220.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/10F220.xml	2012-04-09 14:11:49 UTC (rev 2868)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/10F220.xml	2012-04-13 15:12:14 UTC (rev 2869)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="10F220" document="023673" status="IP" memory_technology="FLASH" architecture="10X" pc="9"
+<device name="10F220" document="023673" status="IP" memory_technology="FLASH" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab_kde4/src/devices/pic/xml_data/10F222.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/10F222.xml	2012-04-09 14:11:49 UTC (rev 2868)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/10F222.xml	2012-04-13 15:12:14 UTC (rev 2869)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="10F222" document="023672" status="IP" memory_technology="FLASH" architecture="10X" pc="9"
+<device name="10F222" document="023672" status="IP" memory_technology="FLASH" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Copied: trunk/piklab_kde4/src/devices/pic/xml_data/10F320.xml (from rev 2868, trunk/piklab/src/devices/pic/xml_data/10F320.xml)
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/10F320.xml	                        (rev 0)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/10F320.xml	2012-04-13 15:12:14 UTC (rev 2869)
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--************************************************************************-->
+<!--* 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.                                  *-->
+<!--************************************************************************-->
+<device name="10F320" status="IP" memory_technology="FLASH" self_write="yes" architecture="midrange" id="0x29A0"
+        xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+        xsi:noNamespaceSchemaLocation='pic.xsd'>
+
+<!--* Documents ************************************************************-->
+  <documents webpage="552961" datasheet="41585" progsheet="41572" erratas="80529" />
+
+<!--* Checksums ************************************************************-->
+  <checksums>
+    <checksum protected="Off" bchecksum="0x1EFF" cchecksum="0xA055" />
+    <checksum protected="All" bchecksum="0x372E" cchecksum="0xB854" />
+  </checksums>
+
+<!--* Operating characteristics ********************************************-->
+  <frequency_range name="extended" >
+    <frequency start="0"  end="16" vdd_min="2.3" vdd_max="5.5" />
+    <frequency start="16" end="20" vdd_min="2.5" vdd_max="5.5" />
+  </frequency_range>
+
+  <voltages name="vpp"      min="8"   max="9"   nominal="8.5" />
+  <voltages name="vdd_prog" min="2.7" max="5.5" nominal="5"  />
+
+<!--* Memory ***************************************************************-->
+  <memory name="code"               start="0x0000" end="0x00FF" />
+  <memory name="calibration"        start="0x2008" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000"/>
+  <memory name="user_ids"           start="0x2000" end="0x2003" rmask="0x000F" />
+  <memory name="config"             start="0x2007" end="0x2007" />
+  <memory name="device_id"          start="0x2006" end="0x2006" />
+
+<!--* Configuration bits ***************************************************-->
+  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
+    <mask name="FOSC"   value="0x0001" >
+      <value value="0x0000" name="INTRC" def="_FOSC_INTOSC" />
+      <value value="0x0001" name="EC"     def="_FOSC_EC"     />
+    </mask>
+    <mask name="BODEN"  value="0x0006" >
+      <value value="0x0000" name="Off"      def="_BOREN_OFF"    />
+      <value value="0x0002" name="Software" def="_BOREN_SBODEN" />
+      <value value="0x0004" name="On_run"   def="_BOREN_NSLEEP" />
+      <value value="0x0006" name="On"       def="_BOREN_ON"     />
+    </mask>
+    <mask name="WDT"    value="0x0018" >
+      <value value="0x0000" name="Off"      def="_WDT_OFF"    />
+      <value value="0x0008" name="Software" def="_WDT_SWDTEN" />
+      <value value="0x0010" name="On_run"   def="_WDT_NSLEEP" />
+      <value value="0x0018" name="On"       def="_WDT_ON"     />
+    </mask>
+    <mask name="PWRTE"  value="0x0020" >
+      <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" />
+      <value value="0x0040" name="External" def="_MCLRE_ON"  />
+    </mask>
+    <mask name="CP"  value="0x0080" >
+      <value value="0x0000" name="All" def="_CP_ON"  />
+      <value value="0x0080" name="Off" def="_CP_OFF" />
+    </mask>
+    <mask name="LVP"  value="0x0100" >
+      <value value="0x0000" name="Off" def="_LVP_OFF" />
+      <value value="0x0100" name="On"  def="_LVP_ON"  />
+    </mask>
+    <mask name="LPBOR"  value="0x0200" >
+      <value value="0x0000" name="Off" def="_LPBOR_OFF" />
+      <value value="0x0200" name="On"  def="_LPBOR_ON"  />
+    </mask>
+    <mask name="BORV"  value="0x0400" >
+      <value value="0x0000" name="2.7" def="_BORV_27" />
+      <value value="0x0400" name="2.4" def="_BORV_24"  />
+    </mask>
+    <mask name="WRT"  value="0x1800" >
+      <value value="0x0000" name="000:0FF" def="_WRT_ALL" />
+      <value value="0x0800" name="000:07F" def="_WRT_HALF"  />
+      <value value="0x1000" name="000:03F" def="_WRT_BOOT"  />
+      <value value="0x1800" name="Off"     def="_WRT_OFF"  />
+    </mask>
+    <mask name="DEBUG"  value="0x2000" >
+      <value value="0x0000" name="On"   def="_DEBUG_OFF" />
+      <value value="0x2000" name="Off"  def="_DEBUG_ON"  />
+    </mask>
+  </config>
+
+<!--* Packages *************************************************************-->
+  <package types="pdip"  nb_pins="8" >
+    <pin index="1" name="N/C"          />
+    <pin index="2" name="VDD"          />
+    <pin index="3" name="RA2"          />
+    <pin index="4" name="RA1/ISCPCLK"  />
+    <pin index="5" name="RA3/MCLR/VPP" />
+    <pin index="6" name="VSS"          />
+    <pin index="7" name="N/C"          />
+    <pin index="8" name="RA0/ISCPDAT"  />
+  </package>
+
+  <package types="sot23" nb_pins="6" >
+    <pin index="1" name="RA0/ISCPDAT"  />
+    <pin index="2" name="VSS"          />
+    <pin index="3" name="RA2"          />
+    <pin index="4" name="RA1/ISCPCLK"  />
+    <pin index="5" name="VDD"          />
+    <pin index="6" name="RA3/MCLR/VPP" />
+  </package>
+
+</device>

Copied: trunk/piklab_kde4/src/devices/pic/xml_data/10F322.xml (from rev 2868, trunk/piklab/src/devices/pic/xml_data/10F322.xml)
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/10F322.xml	                        (rev 0)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/10F322.xml	2012-04-13 15:12:14 UTC (rev 2869)
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--************************************************************************-->
+<!--* 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.                                  *-->
+<!--************************************************************************-->
+<device name="10F322" status="IP" memory_technology="FLASH" self_write="yes" architecture="midrange" id="0x2980"
+        xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+        xsi:noNamespaceSchemaLocation='pic.xsd'>
+
+<!--* Documents ************************************************************-->
+  <documents webpage="552977" datasheet="41585" progsheet="41572" erratas="80529" />
+
+<!--* Checksums ************************************************************-->
+  <checksums>
+    <checksum protected="Off" bchecksum="0x1DFF" cchecksum="0x9F55" />
+    <checksum protected="All" bchecksum="0x372E" cchecksum="0xB854" />
+  </checksums>
+
+<!--* Operating characteristics ********************************************-->
+  <frequency_range name="extended" >
+    <frequency start="0"  end="16" vdd_min="2.3" vdd_max="5.5" />
+    <frequency start="16" end="20" vdd_min="2.5" vdd_max="5.5" />
+  </frequency_range>
+
+  <voltages name="vpp"      min="8"   max="9"   nominal="8.5" />
+  <voltages name="vdd_prog" min="2.7" max="5.5" nominal="5"  />
+
+<!--* Memory ***************************************************************-->
+  <memory name="code"               start="0x0000" end="0x01FF" />
+  <memory name="calibration"        start="0x2008" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000"/>
+  <memory name="user_ids"           start="0x2000" end="0x2003" rmask="0x000F" />
+  <memory name="config"             start="0x2007" end="0x2007" />
+  <memory name="device_id"          start="0x2006" end="0x2006" />
+
+<!--* Configuration bits ***************************************************-->
+  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
+    <mask name="FOSC"   value="0x0001" >
+      <value value="0x0000" name="INTRC" def="_FOSC_INTOSC" />
+      <value value="0x0001" name="EC"     def="_FOSC_EC"     />
+    </mask>
+    <mask name="BODEN"  value="0x0006" >
+      <value value="0x0000" name="Off"      def="_BOREN_OFF"    />
+      <value value="0x0002" name="Software" def="_BOREN_SBODEN" />
+      <value value="0x0004" name="On_run"   def="_BOREN_NSLEEP" />
+      <value value="0x0006" name="On"       def="_BOREN_ON"     />
+    </mask>
+    <mask name="WDT"    value="0x0018" >
+      <value value="0x0000" name="Off"      def="_WDT_OFF"    />
+      <value value="0x0008" name="Software" def="_WDT_SWDTEN" />
+      <value value="0x0010" name="On_run"   def="_WDT_NSLEEP" />
+      <value value="0x0018" name="On"       def="_WDT_ON"     />
+    </mask>
+    <mask name="PWRTE"  value="0x0020" >
+      <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" />
+      <value value="0x0040" name="External" def="_MCLRE_ON"  />
+    </mask>
+    <mask name="CP"  value="0x0080" >
+      <value value="0x0000" name="All" def="_CP_ON"  />
+      <value value="0x0080" name="Off" def="_CP_OFF" />
+    </mask>
+    <mask name="LVP"  value="0x0100" >
+      <value value="0x0000" name="Off" def="_LVP_OFF" />
+      <value value="0x0100" name="On"  def="_LVP_ON"  />
+    </mask>
+    <mask name="LPBOR"  value="0x0200" >
+      <value value="0x0000" name="Off" def="_LPBOR_OFF" />
+      <value value="0x0200" name="On"  def="_LPBOR_ON"  />
+    </mask>
+    <mask name="BORV"  value="0x0400" >
+      <value value="0x0000" name="2.7" def="_BORV_27" />
+      <value value="0x0400" name="2.4" def="_BORV_24"  />
+    </mask>
+    <mask name="WRT"  value="0x1800" >
+      <value value="0x0000" name="0000:01FF" def="_WRT_ALL" />
+      <value value="0x0800" name="0000:00FF" def="_WRT_HALF"  />
+      <value value="0x1000" name="0000:007F" def="_WRT_BOOT"  />
+      <value value="0x1800" name="Off"       def="_WRT_OFF"  />
+    </mask>
+    <mask name="DEBUG"  value="0x2000" >
+      <value value="0x0000" name="On"   def="_DEBUG_OFF" />
+      <value value="0x2000" name="Off"  def="_DEBUG_ON"  />
+    </mask>
+  </config>
+
+<!--* Packages *************************************************************-->
+  <package types="pdip"  nb_pins="8" >
+    <pin index="1" name="N/C"          />
+    <pin index="2" name="VDD"          />
+    <pin index="3" name="RA2"          />
+    <pin index="4" name="RA1/ISCPCLK"  />
+    <pin index="5" name="RA3/MCLR/VPP" />
+    <pin index="6" name="VSS"          />
+    <pin index="7" name="N/C"          />
+    <pin index="8" name="RA0/ISCPDAT"  />
+  </package>
+
+  <package types="sot23" nb_pins="6" >
+    <pin index="1" name="RA0/ISCPDAT"  />
+    <pin index="2" name="VSS"          />
+    <pin index="3" name="RA2"          />
+    <pin index="4" name="RA1/ISCPCLK"  />
+    <pin index="5" name="VDD"          />
+    <pin index="6" name="RA3/MCLR/VPP" />
+  </package>
+
+</device>

Modified: trunk/piklab_kde4/src/devices/pic/xml_data/12C508.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/12C508.xml	2012-04-09 14:11:49 UTC (rev 2868)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/12C508.xml	2012-04-13 15:12:14 UTC (rev 2869)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="12C508" document="010102" status="NR" alternative="12F508" memory_technology="EPROM" architecture="10X" pc="9"
+<device name="12C508" document="010102" status="NR" alternative="12F508" memory_technology="EPROM" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab_kde4/src/devices/pic/xml_data/12C508A.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/12C508A.xml	2012-04-09 14:11:49 UTC (rev 2868)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/12C508A.xml	2012-04-13 15:12:14 UTC (rev 2869)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="12C508A" document="010103" status="NR" alternative="12F508" memory_technology="EPROM" architecture="10X" pc="9"
+<device name="12C508A" document="010103" status="NR" alternative="12F508" memory_technology="EPROM" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab_kde4/src/devices/pic/xml_data/12C509.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/12C509.xml	2012-04-09 14:11:49 UTC (rev 2868)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/12C509.xml	2012-04-13 15:12:14 UTC (rev 2869)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="12C509" document="010104" status="NR" alternative="12F509" memory_technology="EPROM" architecture="10X" pc="9"
+<device name="12C509" document="010104" status="NR" alternative="12F509" memory_technology="EPROM" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab_kde4/src/devices/pic/xml_data/12C509A.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/12C509A.xml	2012-04-09 14:11:49 UTC (rev 2868)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/12C509A.xml	2012-04-13 15:12:14 UTC (rev 2869)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="12C509A" document="010105" status="NR" alternative="12F509" memory_technology="EPROM" architecture="10X" pc="9"
+<device name="12C509A" document="010105" status="NR" alternative="12F509" memory_technology="EPROM" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab_kde4/src/devices/pic/xml_data/12C671.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/12C671.xml	2012-04-09 14:11:49 UTC (rev 2868)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/12C671.xml	2012-04-13 15:12:14 UTC (rev 2869)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="12C671" document="010106" status="NR" alternative="12F675" memory_technology="EPROM" architecture="16X"
+<device name="12C671" document="010106" status="NR" alternative="12F675" memory_technology="EPROM" architecture="midrange"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab_kde4/src/devices/pic/xml_data/12C672.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/12C672.xml	2012-04-09 14:11:49 UTC (rev 2868)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/12C672.xml	2012-04-13 15:12:14 UTC (rev 2869)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="12C672" document="010107" status="NR" alternative="12F683" memory_technology="EPROM" architecture="16X" 
+<device name="12C672" document="010107" status="NR" alternative="12F683" memory_technology="EPROM" architecture="midrange" 
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab_kde4/src/devices/pic/xml_data/12CE518.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/12CE518.xml	2012-04-09 14:11:49 UTC (rev 2868)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/12CE518.xml	2012-04-13 15:12:14 UTC (rev 2869)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="12CE518" document="010108" status="NR" alternative="12F629" memory_technology="EPROM" architecture="10X" pc="9"
+<device name="12CE518" document="010108" status="NR" alternative="12F629" memory_technology="EPROM" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab_kde4/src/devices/pic/xml_data/12CE519.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/12CE519.xml	2012-04-09 14:11:49 UTC (rev 2868)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/12CE519.xml	2012-04-13 15:12:14 UTC (rev 2869)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="12CE519" document="010109" status="NR" alternative="12F629" memory_technology="EPROM" architecture="10X" pc="9"
+<device name="12CE519" document="010109" status="NR" alternative="12F629" memory_technology="EPROM" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab_kde4/src/devices/pic/xml_data/12CE673.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/12CE673.xml	2012-04-09 14:11:49 UTC (rev 2868)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/12CE673.xml	2012-04-13 15:12:14 UTC (rev 2869)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="12CE673" document="010110" status="NR" alternative="12F675" memory_technology="EPROM" architecture="16X"
+<device name="12CE673" document="010110" status="NR" alternative="12F675" memory_technology="EPROM" architecture="midrange"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab_kde4/src/devices/pic/xml_data/12CE674.xml
===================================================================
--- trunk/piklab_kde4/src/devices/pic/xml_data/12CE674.xml	2012-04-09 14:11:49 UTC (rev 2868)
+++ trunk/piklab_kde4/src/devices/pic/xml_data/12CE674.xml	2012-04-13 15:12:14 UTC (rev 2869)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the Lic...
 
[truncated message content]

[Piklab-svn] SF.net SVN: piklab:[2868] trunk/piklab/src/devices/pic/xml_data

[<az...@us...>]

Revision: 2868
          http://piklab.svn.sourceforge.net/piklab/?rev=2868&view=rev
Author:   azhyd
Date:     2012-04-09 14:11:49 +0000 (Mon, 09 Apr 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/piklab/src/devices/pic/xml_data/12F1822.xml
    trunk/piklab/src/devices/pic/xml_data/16F1823.xml
    trunk/piklab/src/devices/pic/xml_data/16F1824.xml
    trunk/piklab/src/devices/pic/xml_data/16F1825.xml
    trunk/piklab/src/devices/pic/xml_data/16F1828.xml
    trunk/piklab/src/devices/pic/xml_data/16F1829.xml

Modified: trunk/piklab/src/devices/pic/xml_data/12F1822.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/12F1822.xml	2012-04-09 13:45:13 UTC (rev 2867)
+++ trunk/piklab/src/devices/pic/xml_data/12F1822.xml	2012-04-09 14:11:49 UTC (rev 2868)
@@ -13,7 +13,7 @@
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 
 <!--* Documents ************************************************************-->
-  <documents webpage="544839" datasheet="41413" progsheet="41390C" erratas="80502" />
+  <documents webpage="544839" datasheet="41413" progsheet="41390" erratas="80502" />
 
 <!--* Checksums ************************************************************-->
 

Modified: trunk/piklab/src/devices/pic/xml_data/16F1823.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/16F1823.xml	2012-04-09 13:45:13 UTC (rev 2867)
+++ trunk/piklab/src/devices/pic/xml_data/16F1823.xml	2012-04-09 14:11:49 UTC (rev 2868)
@@ -13,7 +13,7 @@
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 
 <!--* Documents ************************************************************-->
-  <documents webpage="544838" datasheet="41413" progsheet="41390C" erratas="80502" />
+  <documents webpage="544838" datasheet="41413" progsheet="41390" erratas="80502" />
 
 <!--* Checksums ************************************************************-->
 

Modified: trunk/piklab/src/devices/pic/xml_data/16F1824.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/16F1824.xml	2012-04-09 13:45:13 UTC (rev 2867)
+++ trunk/piklab/src/devices/pic/xml_data/16F1824.xml	2012-04-09 14:11:49 UTC (rev 2868)
@@ -13,7 +13,7 @@
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 
 <!--* Documents ************************************************************-->
-  <documents webpage="546901" datasheet="41419" progsheet="41390C" erratas="80510" />
+  <documents webpage="546901" datasheet="41419" progsheet="41390" erratas="80510" />
 
 <!--* Checksums ************************************************************-->
 

Modified: trunk/piklab/src/devices/pic/xml_data/16F1825.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/16F1825.xml	2012-04-09 13:45:13 UTC (rev 2867)
+++ trunk/piklab/src/devices/pic/xml_data/16F1825.xml	2012-04-09 14:11:49 UTC (rev 2868)
@@ -13,7 +13,7 @@
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 
 <!--* Documents ************************************************************-->
-  <documents webpage="546902" datasheet="41440" progsheet="41390C" erratas="80517" />
+  <documents webpage="546902" datasheet="41440" progsheet="41390" erratas="80517" />
 
 <!--* Checksums ************************************************************-->
 
@@ -32,7 +32,7 @@
   <voltages name="vdd_prog_write" min="1.8" max="5.5" nominal="5.0"  />
 
 <!--* Memory ***************************************************************-->
-  <memory name="code"         start="0x0000" end="0x7FFF" />
+  <memory name="code"         start="0x0000" end="0x1FFF" />
   <memory name="user_ids"     start="0x8000" end="0x8003" rmask="0x3FFF"          />
   <memory name="debug_vector" start="0x8004" end="0x8004" />
   <memory name="device_id"    start="0x8006" end="0x8006" />
@@ -96,8 +96,8 @@
 
   <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x3713" >
     <mask name="WRT"  value="0x0003" >
-      <value value="0x0000" name="0000:07FF" def="_WRT_ALL"  />
-      <value value="0x0001" name="0000:03FF" def="_WRT_HALF" />
+      <value value="0x0000" name="0000:1FFF" def="_WRT_ALL"  />
+      <value value="0x0001" name="0000:0FFF" def="_WRT_HALF" />
       <value value="0x0002" name="0000:01FF" def="_WRT_BOOT" />
       <value value="0x0003" name="Off"       def="_WRT_OFF"  />
     </mask>

Modified: trunk/piklab/src/devices/pic/xml_data/16F1828.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/16F1828.xml	2012-04-09 13:45:13 UTC (rev 2867)
+++ trunk/piklab/src/devices/pic/xml_data/16F1828.xml	2012-04-09 14:11:49 UTC (rev 2868)
@@ -13,7 +13,7 @@
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 
 <!--* Documents ************************************************************-->
-  <documents webpage="546918" datasheet="41419" progsheet="41390C" erratas="80510" />
+  <documents webpage="546918" datasheet="41419" progsheet="41390" erratas="80510" />
 
 <!--* Checksums ************************************************************-->
 

Modified: trunk/piklab/src/devices/pic/xml_data/16F1829.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/16F1829.xml	2012-04-09 13:45:13 UTC (rev 2867)
+++ trunk/piklab/src/devices/pic/xml_data/16F1829.xml	2012-04-09 14:11:49 UTC (rev 2868)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--************************************************************************-->
-<!--* Copyright (C) 2012 Michael Vrolijk                                   *-->
+<!--* Copyright (C) 2010 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 *-->
@@ -13,7 +13,7 @@
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 
 <!--* Documents ************************************************************-->
-  <documents webpage="546919" datasheet="41440" progsheet="41390C" erratas="80517" />
+  <documents webpage="546919" datasheet="41440" progsheet="41390" erratas="80517" />
 
 <!--* Checksums ************************************************************-->
 
@@ -32,7 +32,7 @@
   <voltages name="vdd_prog_write" min="1.8" max="5.5" nominal="5.0"  />
 
 <!--* Memory ***************************************************************-->
-  <memory name="code"         start="0x0000" end="0x7FFF" />
+  <memory name="code"         start="0x0000" end="0x1FFF" />
   <memory name="user_ids"     start="0x8000" end="0x8003" rmask="0x3FFF"          />
   <memory name="debug_vector" start="0x8004" end="0x8004" />
   <memory name="device_id"    start="0x8006" end="0x8006" />
@@ -96,8 +96,8 @@
 
   <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x3713" >
     <mask name="WRT"  value="0x0003" >
-      <value value="0x0000" name="0000:07FF" def="_WRT_ALL"  />
-      <value value="0x0001" name="0000:03FF" def="_WRT_HALF" />
+      <value value="0x0000" name="0000:1FFF" def="_WRT_ALL"  />
+      <value value="0x0001" name="0000:0FFF" def="_WRT_HALF" />
       <value value="0x0002" name="0000:01FF" def="_WRT_BOOT" />
       <value value="0x0003" name="Off"       def="_WRT_OFF"  />
     </mask>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2867] trunk/piklab

[<az...@us...>]

Revision: 2867
          http://piklab.svn.sourceforge.net/piklab/?rev=2867&view=rev
Author:   azhyd
Date:     2012-04-09 13:45:13 +0000 (Mon, 09 Apr 2012)
Log Message:
-----------
add support for 12F1822, 16F1823/1824/1825/1828/1829 [patch by Michael Vrolijk]

Modified Paths:
--------------
    trunk/piklab/Changelog
    trunk/piklab/src/devices/pic/xml_data/16F1829.xml
    trunk/piklab/src/progs/direct/base/direct.xml
    trunk/piklab/src/progs/direct/base/direct_16F.cpp
    trunk/piklab/src/progs/direct/base/direct_16F.h

Added Paths:
-----------
    trunk/piklab/src/devices/pic/xml_data/12F1822.xml
    trunk/piklab/src/devices/pic/xml_data/16F1823.xml
    trunk/piklab/src/devices/pic/xml_data/16F1824.xml
    trunk/piklab/src/devices/pic/xml_data/16F1825.xml
    trunk/piklab/src/devices/pic/xml_data/16F1828.xml

Modified: trunk/piklab/Changelog
===================================================================
--- trunk/piklab/Changelog	2012-04-07 19:38:04 UTC (rev 2866)
+++ trunk/piklab/Changelog	2012-04-09 13:45:13 UTC (rev 2867)
@@ -1,6 +1,8 @@
-0.15.13 (18 March 2012)
+0.15.13 (9 April 2012)
 * add default argument "--use-non-free" to sdcc [patch by Gál Zsolt]
 * added support for 10F320/322, 12F617/752
+* added support for 12F1822, 16F1823/1824/1825/1828/1829 [patch by Michael Vrolijk]
+* added support for direct programming of 12F1822/16F182X
 * added device family "enhanced mid-range" in device chooser
 
 0.15.12 (19 February 2012)

Added: trunk/piklab/src/devices/pic/xml_data/12F1822.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/12F1822.xml	                        (rev 0)
+++ trunk/piklab/src/devices/pic/xml_data/12F1822.xml	2012-04-09 13:45:13 UTC (rev 2867)
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--************************************************************************-->
+<!--* Copyright (C) 2012 Michael Vrolijk                                   *-->
+<!--*                                                                      *-->
+<!--* 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.                                  *-->
+<!--************************************************************************-->
+<device name="12F1822" status="IP" memory_technology="FLASH" self_write="yes"
+        architecture="emidrange" id="0x2700" id_low_power="0x2800"
+        xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+        xsi:noNamespaceSchemaLocation='pic.xsd'>
+
+<!--* Documents ************************************************************-->
+  <documents webpage="544839" datasheet="41413" progsheet="41390C" erratas="80502" />
+
+<!--* Checksums ************************************************************-->
+
+<!--* Operating characteristics ********************************************-->
+  <frequency_range name="extended" >
+    <frequency start="0"  end="16" vdd_min="1.8" vdd_max="5.5" />
+    <frequency start="16" end="32" vdd_min="2.5" vdd_max="5.5" />
+  </frequency_range>
+  <frequency_range name="extended" special="low_power" >
+    <frequency start="0"  end="16" vdd_min="1.8" vdd_max="3.6" />
+    <frequency start="16" end="32" vdd_min="2.5" vdd_max="3.6" />
+  </frequency_range>
+
+  <voltages name="vpp"            min="8.0" max="9.0" nominal="9.0" />
+  <voltages name="vdd_prog"       min="2.7" max="5.5" nominal="5.0"  />
+  <voltages name="vdd_prog_write" min="1.8" max="5.5" nominal="5.0"  />
+
+<!--* Memory ***************************************************************-->
+  <memory name="code"         start="0x0000" end="0x07FF" />
+  <memory name="user_ids"     start="0x8000" end="0x8003" rmask="0x3FFF"          />
+  <memory name="debug_vector" start="0x8004" end="0x8004" />
+  <memory name="device_id"    start="0x8006" end="0x8006" />
+  <memory name="config"       start="0x8007" end="0x8008" />
+  <memory name="calibration"  start="0x8009" end="0x800A" cal_opmask="0x0000" cal_opcode="0x0000" />
+  <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0xF000" />
+
+<!--* Configuration bits ***************************************************-->
+  <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x3FFF" >
+    <mask name="FOSC"  value="0x0007" >
+      <value value="0x0000" name="LP"       def="_FOSC_LP"     />
+      <value value="0x0001" name="XT"       def="_FOSC_XT"     />
+      <value value="0x0002" name="HS"       def="_FOSC_HS"     />
+      <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="0x0007" name="EC_HP"    def="_FOSC_ECH"    />
+    </mask>
+    <mask name="WDT"   value="0x0018" >
+      <value value="0x0000" name="Off"      def="_WDTE_OFF"    />
+      <value value="0x0008" name="Software" def="_WDTE_SWDTEN" />
+      <value value="0x0010" name="On_run"   def="_WDTE_NSLEEP" />
+      <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" />
+    </mask>
+    <mask name="MCLRE" value="0x0040" >
+      <value value="0x0000" name="Internal" def="_MCLRE_OFF" />
+      <value value="0x0040" name="External" def="_MCLRE_ON"  />
+    </mask>
+    <mask name="CP"    value="0x0080" >
+      <value value="0x0000" name="All" def="_CP_ON"  />
+      <value value="0x0080" name="Off" def="_CP_OFF" />
+    </mask>
+    <mask name="CPD"   value="0x0100" >
+      <value value="0x0000" name="All" def="_CPD_ON"  />
+      <value value="0x0100" name="Off" def="_CPD_OFF" />
+    </mask>
+    <mask name="BODEN" value="0x0600" >
+      <value value="0x0000" name="Off"      def="_BOREN_OFF"    />
+      <value value="0x0200" name="Software" def="_BOREN_SBODEN" />
+      <value value="0x0400" name="On_run"   def="_BOREN_NSLEEP" />
+      <value value="0x0600" name="On"       def="_BOREN_ON"     />
+    </mask>
+    <mask name="CLKOUTEN"  value="0x0800" >
+      <value value="0x0000" name="On"   def="_CLKOUTEN_ON"  />
+      <value value="0x0800" name="Off"  def="_CLKOUTEN_OFF" />
+    </mask>
+    <mask name="IESO"  value="0x1000" >
+      <value value="0x0000" name="Off" def="_IESO_OFF" />
+      <value value="0x1000" name="On"  def="_IESO_ON"  />
+    </mask>
+    <mask name="FCMEN" value="0x2000" >
+      <value value="0x0000" name="Off" def="_FCMEN_OFF" />
+      <value value="0x2000" name="On"  def="_FCMEN_ON"  />
+    </mask>
+  </config>
+
+  <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x3713" >
+    <mask name="WRT"  value="0x0003" >
+      <value value="0x0000" name="0000:07FF" def="_WRT_ALL"  />
+      <value value="0x0001" name="0000:03FF" def="_WRT_HALF" />
+      <value value="0x0002" name="0000:01FF" def="_WRT_BOOT" />
+      <value value="0x0003" name="Off"       def="_WRT_OFF"  />
+    </mask>
+    <mask name="PLLEN"   value="0x0100" >
+      <value value="0x0000" name="Off" def="_PLLEN_OFF" />
+      <value value="0x0100" name="On"  def="_PLLEN_ON"  />
+    </mask>
+    <mask name="STVREN"   value="0x0200" >
+      <value value="0x0000" name="Off" def="_STVREN_OFF" />
+      <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" />
+    </mask>
+    <mask name="DEBUG" value="0x1000" >
+      <value value="0x0000" name="On"  def="_nDEBUG_ON"  />
+      <value value="0x1000" name="Off" def="_nDEBUG_OFF" />
+    </mask>
+    <mask name="LVP"   value="0x2000" >
+      <value value="0x0000" name="Off" def="_LVP_OFF" />
+      <value value="0x2000" name="On"  def="_LVP_ON"  />
+    </mask>
+  </config>
+
+<!--* Packages *************************************************************-->
+  <package types="pdip soic dfn" nb_pins="8" >
+    <pin index="1"  name="VDD" />
+    <pin index="2"  name="RA5/OSC1/CLKIN/SRNQ/T1CKI/T1OSI/CCP1*/P1A*/DT*/RX*" />
+    <pin index="3"  name="RA4/OSC2/CLKOUT/CLKRAN3/CPS3/C1IN1-/T1G*/T1OSO/P1B*/TX*/CK*/SDO*/MDCIN2" />
+    <pin index="4"  name="RA3/MCLR/VPP/T1G/SS*" />
+    <pin index="5"  name="RA2/AN2/CPS2/C1OUT/SRQ/T0CKI/CCP1/P1A/FLT0/SDA/SDI/MDCIN1" />
+    <pin index="6"  name="RA1/ICSPCLK/ICPCLKAN1/VREF/CPS1/C1IN0-/SRI/RX/DT/SCL/SCK/MDMIN" />
+    <pin index="7"  name="RA0/ICSPDAT/ICDDAT/AN0/DACOUT/CPS0/C1IN+/P1B/TX/CK/SDO/SS/MDOUT" />
+    <pin index="8"  name="VSS" />
+  </package>
+
+
+</device>

Added: trunk/piklab/src/devices/pic/xml_data/16F1823.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/16F1823.xml	                        (rev 0)
+++ trunk/piklab/src/devices/pic/xml_data/16F1823.xml	2012-04-09 13:45:13 UTC (rev 2867)
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--************************************************************************-->
+<!--* Copyright (C) 2012 Michael Vrolijk                                   *-->
+<!--*                                                                      *-->
+<!--* 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.                                  *-->
+<!--************************************************************************-->
+<device name="16F1823" status="IP" memory_technology="FLASH" self_write="yes"
+        architecture="emidrange" id="0x2720" id_low_power="0x2820"
+        xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+        xsi:noNamespaceSchemaLocation='pic.xsd'>
+
+<!--* Documents ************************************************************-->
+  <documents webpage="544838" datasheet="41413" progsheet="41390C" erratas="80502" />
+
+<!--* Checksums ************************************************************-->
+
+<!--* Operating characteristics ********************************************-->
+  <frequency_range name="extended" >
+    <frequency start="0"  end="16" vdd_min="1.8" vdd_max="5.5" />
+    <frequency start="16" end="32" vdd_min="2.5" vdd_max="5.5" />
+  </frequency_range>
+  <frequency_range name="extended" special="low_power" >
+    <frequency start="0"  end="16" vdd_min="1.8" vdd_max="3.6" />
+    <frequency start="16" end="32" vdd_min="2.5" vdd_max="3.6" />
+  </frequency_range>
+
+  <voltages name="vpp"            min="8.0" max="9.0" nominal="9.0" />
+  <voltages name="vdd_prog"       min="2.7" max="5.5" nominal="5.0"  />
+  <voltages name="vdd_prog_write" min="1.8" max="5.5" nominal="5.0"  />
+
+<!--* Memory ***************************************************************-->
+  <memory name="code"         start="0x0000" end="0x07FF" />
+  <memory name="user_ids"     start="0x8000" end="0x8003" rmask="0x3FFF"          />
+  <memory name="debug_vector" start="0x8004" end="0x8004" />
+  <memory name="device_id"    start="0x8006" end="0x8006" />
+  <memory name="config"       start="0x8007" end="0x8008" />
+  <memory name="calibration"  start="0x8009" end="0x800A" cal_opmask="0x0000" cal_opcode="0x0000" />
+  <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0xF000" />
+
+<!--* Configuration bits ***************************************************-->
+  <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x3FFF" >
+    <mask name="FOSC"  value="0x0007" >
+      <value value="0x0000" name="LP"       def="_FOSC_LP"     />
+      <value value="0x0001" name="XT"       def="_FOSC_XT"     />
+      <value value="0x0002" name="HS"       def="_FOSC_HS"     />
+      <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="0x0007" name="EC_HP"    def="_FOSC_ECH"    />
+    </mask>
+    <mask name="WDT"   value="0x0018" >
+      <value value="0x0000" name="Off"      def="_WDTE_OFF"    />
+      <value value="0x0008" name="Software" def="_WDTE_SWDTEN" />
+      <value value="0x0010" name="On_run"   def="_WDTE_NSLEEP" />
+      <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" />
+    </mask>
+    <mask name="MCLRE" value="0x0040" >
+      <value value="0x0000" name="Internal" def="_MCLRE_OFF" />
+      <value value="0x0040" name="External" def="_MCLRE_ON"  />
+    </mask>
+    <mask name="CP"    value="0x0080" >
+      <value value="0x0000" name="All" def="_CP_ON"  />
+      <value value="0x0080" name="Off" def="_CP_OFF" />
+    </mask>
+    <mask name="CPD"   value="0x0100" >
+      <value value="0x0000" name="All" def="_CPD_ON"  />
+      <value value="0x0100" name="Off" def="_CPD_OFF" />
+    </mask>
+    <mask name="BODEN" value="0x0600" >
+      <value value="0x0000" name="Off"      def="_BOREN_OFF"    />
+      <value value="0x0200" name="Software" def="_BOREN_SBODEN" />
+      <value value="0x0400" name="On_run"   def="_BOREN_NSLEEP" />
+      <value value="0x0600" name="On"       def="_BOREN_ON"     />
+    </mask>
+    <mask name="CLKOUTEN"  value="0x0800" >
+      <value value="0x0000" name="On"   def="_CLKOUTEN_ON"  />
+      <value value="0x0800" name="Off"  def="_CLKOUTEN_OFF" />
+    </mask>
+    <mask name="IESO"  value="0x1000" >
+      <value value="0x0000" name="Off" def="_IESO_OFF" />
+      <value value="0x1000" name="On"  def="_IESO_ON"  />
+    </mask>
+    <mask name="FCMEN" value="0x2000" >
+      <value value="0x0000" name="Off" def="_FCMEN_OFF" />
+      <value value="0x2000" name="On"  def="_FCMEN_ON"  />
+    </mask>
+  </config>
+
+  <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x3713" >
+    <mask name="WRT"  value="0x0003" >
+      <value value="0x0000" name="0000:07FF" def="_WRT_ALL"  />
+      <value value="0x0001" name="0000:03FF" def="_WRT_HALF" />
+      <value value="0x0002" name="0000:01FF" def="_WRT_BOOT" />
+      <value value="0x0003" name="Off"       def="_WRT_OFF"  />
+    </mask>
+    <mask name="PLLEN"   value="0x0100" >
+      <value value="0x0000" name="Off" def="_PLLEN_OFF" />
+      <value value="0x0100" name="On"  def="_PLLEN_ON"  />
+    </mask>
+    <mask name="STVREN"   value="0x0200" >
+      <value value="0x0000" name="Off" def="_STVREN_OFF" />
+      <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" />
+    </mask>
+    <mask name="DEBUG" value="0x1000" >
+      <value value="0x0000" name="On"  def="_nDEBUG_ON"  />
+      <value value="0x1000" name="Off" def="_nDEBUG_OFF" />
+    </mask>
+    <mask name="LVP"   value="0x2000" >
+      <value value="0x0000" name="Off" def="_LVP_OFF" />
+      <value value="0x2000" name="On"  def="_LVP_ON"  />
+    </mask>
+  </config>
+
+<!--* Packages *************************************************************-->
+  <package types="pdip soic tssop" nb_pins="14" >
+    <pin index="1"  name="VDD" />
+    <pin index="2"  name="RA5/T1CKI/T1OSI/OSC1/CLKIN" />
+    <pin index="3"  name="RA4/AN3/T1G*/SDO*/CLKRT/T1OSO/CLKOUT/OSC2/CPS3" />
+    <pin index="4"  name="RA3/MCLR/VPP/T1G/SS" />
+    <pin index="5"  name="RC5/P1A/CCP1/DT*/RX*/MDCIN2" />
+    <pin index="6"  name="RC4/COUT2C/SRNQ/P1B/CK*/TX*/MDOUT" />
+    <pin index="7"  name="RC3/AN7/CPS7/C12IN3-/P1C/SS*/MDMIN" />
+    <pin index="8"  name="RC2/AN6/CPS6/C12IN2-/P1D/SDO/MDCIN1" />
+    <pin index="9"  name="RC1/AN5/CPS5/C12IN1-/SDA/SDI" />
+    <pin index="10"  name="RC0/AN4/CPS4/C2IN+/SCL/SCK" />
+    <pin index="11"  name="RA2/AN2/CPS2/T0CKI/INT/C1OUT/SRQ/FLT0" />
+    <pin index="12"  name="RA1/AN1/CPS1/C12IN0-/VREF/SRI/RX/DT/ICSPCLK" />
+    <pin index="13"  name="RA0/AN0/CPS0/C1IN+/DACOUT/TX/CK/ICSPDAT/ICDDAT" />
+    <pin index="14"  name="VSS" />
+  </package>
+
+  <package types="qfn" nb_pins="16" >
+    <pin index="1"  name="RA5/T1CKI/T1OSI/OSC1/CLKIN" />
+    <pin index="2"  name="RA4/AN3/T1G*/SDO*/CLKRT/T1OSO/CLKOUT/OSC2/CPS3" />
+    <pin index="3"  name="RA3/MCLR/VPP/T1G/SS" />
+    <pin index="4"  name="RC5/P1A/CCP1/DT*/RX*/MDCIN2" />
+    <pin index="5"  name="RC4/COUT2C/SRNQ/P1B/CK*/TX*/MDOUT" />
+    <pin index="6"  name="RC3/AN7/CPS7/C12IN3-/P1C/SS*/MDMIN" />
+    <pin index="7"  name="RC2/AN6/CPS6/C12IN2-/P1D/SDO/MDCIN1" />
+    <pin index="8"  name="RC1/AN5/CPS5/C12IN1-/SDA/SDI" />
+    <pin index="9"  name="RC0/AN4/CPS4/C2IN+/SCL/SCK" />
+    <pin index="10"  name="RA2/AN2/CPS2/T0CKI/INT/C1OUT/SRQ/FLT0" />
+    <pin index="11"  name="RA1/AN1/CPS1/C12IN0-/VREF/SRI/RX/DT/ICSPCLK" />
+    <pin index="12"  name="RA0/AN0/CPS0/C1IN+/DACOUT/TX/CK/ICSPDAT/ICDDAT" />
+    <pin index="13"  name="VSS" />
+    <pin index="14"  name="NC" />
+    <pin index="15"  name="NC" />
+    <pin index="16"  name="VDD" />
+  </package>
+
+
+</device>

Added: trunk/piklab/src/devices/pic/xml_data/16F1824.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/16F1824.xml	                        (rev 0)
+++ trunk/piklab/src/devices/pic/xml_data/16F1824.xml	2012-04-09 13:45:13 UTC (rev 2867)
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--************************************************************************-->
+<!--* Copyright (C) 2012 Michael Vrolijk                                   *-->
+<!--*                                                                      *-->
+<!--* 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.                                  *-->
+<!--************************************************************************-->
+<device name="16F1824" status="IP" memory_technology="FLASH" self_write="yes"
+        architecture="emidrange" id="0x2740" id_low_power="0x2840"
+        xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+        xsi:noNamespaceSchemaLocation='pic.xsd'>
+
+<!--* Documents ************************************************************-->
+  <documents webpage="546901" datasheet="41419" progsheet="41390C" erratas="80510" />
+
+<!--* Checksums ************************************************************-->
+
+<!--* Operating characteristics ********************************************-->
+  <frequency_range name="extended" >
+    <frequency start="0"  end="16" vdd_min="1.8" vdd_max="5.5" />
+    <frequency start="16" end="32" vdd_min="2.5" vdd_max="5.5" />
+  </frequency_range>
+  <frequency_range name="extended" special="low_power" >
+    <frequency start="0"  end="16" vdd_min="1.8" vdd_max="3.6" />
+    <frequency start="16" end="32" vdd_min="2.5" vdd_max="3.6" />
+  </frequency_range>
+
+  <voltages name="vpp"            min="8.0" max="9.0" nominal="9.0" />
+  <voltages name="vdd_prog"       min="2.7" max="5.5" nominal="5.0"  />
+  <voltages name="vdd_prog_write" min="1.8" max="5.5" nominal="5.0"  />
+
+<!--* Memory ***************************************************************-->
+  <memory name="code"         start="0x0000" end="0x0FFF" />
+  <memory name="user_ids"     start="0x8000" end="0x8003" rmask="0x3FFF"          />
+  <memory name="debug_vector" start="0x8004" end="0x8004" />
+  <memory name="device_id"    start="0x8006" end="0x8006" />
+  <memory name="config"       start="0x8007" end="0x8008" />
+  <memory name="calibration"  start="0x8009" end="0x800A" cal_opmask="0x0000" cal_opcode="0x0000" />
+  <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0xF000" />
+
+<!--* Configuration bits ***************************************************-->
+  <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x3FFF" >
+    <mask name="FOSC"  value="0x0007" >
+      <value value="0x0000" name="LP"       def="_FOSC_LP"     />
+      <value value="0x0001" name="XT"       def="_FOSC_XT"     />
+      <value value="0x0002" name="HS"       def="_FOSC_HS"     />
+      <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="0x0007" name="EC_HP"    def="_FOSC_ECH"    />
+    </mask>
+    <mask name="WDT"   value="0x0018" >
+      <value value="0x0000" name="Off"      def="_WDTE_OFF"    />
+      <value value="0x0008" name="Software" def="_WDTE_SWDTEN" />
+      <value value="0x0010" name="On_run"   def="_WDTE_NSLEEP" />
+      <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" />
+    </mask>
+    <mask name="MCLRE" value="0x0040" >
+      <value value="0x0000" name="Internal" def="_MCLRE_OFF" />
+      <value value="0x0040" name="External" def="_MCLRE_ON"  />
+    </mask>
+    <mask name="CP"    value="0x0080" >
+      <value value="0x0000" name="All" def="_CP_ON"  />
+      <value value="0x0080" name="Off" def="_CP_OFF" />
+    </mask>
+    <mask name="CPD"   value="0x0100" >
+      <value value="0x0000" name="All" def="_CPD_ON"  />
+      <value value="0x0100" name="Off" def="_CPD_OFF" />
+    </mask>
+    <mask name="BODEN" value="0x0600" >
+      <value value="0x0000" name="Off"      def="_BOREN_OFF"    />
+      <value value="0x0200" name="Software" def="_BOREN_SBODEN" />
+      <value value="0x0400" name="On_run"   def="_BOREN_NSLEEP" />
+      <value value="0x0600" name="On"       def="_BOREN_ON"     />
+    </mask>
+    <mask name="CLKOUTEN"  value="0x0800" >
+      <value value="0x0000" name="On"   def="_CLKOUTEN_ON"  />
+      <value value="0x0800" name="Off"  def="_CLKOUTEN_OFF" />
+    </mask>
+    <mask name="IESO"  value="0x1000" >
+      <value value="0x0000" name="Off" def="_IESO_OFF" />
+      <value value="0x1000" name="On"  def="_IESO_ON"  />
+    </mask>
+    <mask name="FCMEN" value="0x2000" >
+      <value value="0x0000" name="Off" def="_FCMEN_OFF" />
+      <value value="0x2000" name="On"  def="_FCMEN_ON"  />
+    </mask>
+  </config>
+
+  <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x3713" >
+    <mask name="WRT"  value="0x0003" >
+      <value value="0x0000" name="0000:0FFF" def="_WRT_ALL"  />
+      <value value="0x0001" name="0000:07FF" def="_WRT_HALF" />
+      <value value="0x0002" name="0000:01FF" def="_WRT_BOOT" />
+      <value value="0x0003" name="Off"       def="_WRT_OFF"  />
+    </mask>
+    <mask name="PLLEN"   value="0x0100" >
+      <value value="0x0000" name="Off" def="_PLLEN_OFF" />
+      <value value="0x0100" name="On"  def="_PLLEN_ON"  />
+    </mask>
+    <mask name="STVREN"   value="0x0200" >
+      <value value="0x0000" name="Off" def="_STVREN_OFF" />
+      <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" />
+    </mask>
+    <mask name="DEBUG" value="0x1000" >
+      <value value="0x0000" name="On"  def="_nDEBUG_ON"  />
+      <value value="0x1000" name="Off" def="_nDEBUG_OFF" />
+    </mask>
+    <mask name="LVP"   value="0x2000" >
+      <value value="0x0000" name="Off" def="_LVP_OFF" />
+      <value value="0x2000" name="On"  def="_LVP_ON"  />
+    </mask>
+  </config>
+
+<!--* Packages *************************************************************-->
+  <package types="pdip soic tssop" nb_pins="14" >
+    <pin index="1"  name="VDD" />
+    <pin index="2"  name="RA5/T1CKI/T1OSI/OSC1/CLKIN/PA2*/CCP2*" />
+    <pin index="3"  name="RA4/AN3/T1G*/P2B*/SDO*/CLKRT/T1OSO/CLKOUT/OSC2/CPS3" />
+    <pin index="4"  name="RA3/MCLR/VPP/T1G/SS" />
+    <pin index="5"  name="RC5/P1A/CCP1/DT*/RX*/MDCIN2" />
+    <pin index="6"  name="RC4/COUT2C/SRNQ/P1B/CK*/TX*/MDOUT" />
+    <pin index="7"  name="RC3/AN7/CPS7/C12IN3-/P1C*/SS*/MDMIN/P2A/CCP2" />
+    <pin index="8"  name="RC2/AN6/CPS6/C12IN2-/P1D*/P2B/SDO/MDCIN1" />
+    <pin index="9"  name="RC1/AN5/CPS5/C12IN1-/SDA/SDI/P1C/CCP4" />
+    <pin index="10"  name="RC0/AN4/CPS4/C2IN+/SCL/SCK/P1D" />
+    <pin index="11"  name="RA2/AN2/CPS2/T0CKI/INT/C1OUT/SRQ/FLT0/CCP3" />
+    <pin index="12"  name="RA1/AN1/CPS1/C12IN0-/VREF+/SRI/RX/DT/ICSPCLK" />
+    <pin index="13"  name="RA0/AN0/CPS0/C1IN+/VREF-/DACOUT/TX/CK/ICSPDAT" />
+    <pin index="14"  name="VSS" />
+  </package>
+
+  <package types="qfn" nb_pins="16" >
+    <pin index="1"  name="RA5/T1CKI/T1OSI/OSC1/CLKIN/PA2*/CCP2*" />
+    <pin index="2"  name="RA4/AN3/T1G*/P2B*/SDO*/CLKRT/T1OSO/CLKOUT/OSC2/CPS3" />
+    <pin index="3"  name="RA3/MCLR/VPP/T1G/SS" />
+    <pin index="4"  name="RC5/P1A/CCP1/DT*/RX*/MDCIN2" />
+    <pin index="5"  name="RC4/COUT2C/SRNQ/P1B/CK*/TX*/MDOUT" />
+    <pin index="6"  name="RC3/AN7/CPS7/C12IN3-/P1C*/SS*/MDMIN/P2A/CCP2" />
+    <pin index="7"  name="RC2/AN6/CPS6/C12IN2-/P1D*/P2B/SDO/MDCIN1" />
+    <pin index="8"  name="RC1/AN5/CPS5/C12IN1-/SDA/SDI/P1C/CCP4" />
+    <pin index="9"  name="RC0/AN4/CPS4/C2IN+/SCL/SCK/P1D" />
+    <pin index="10"  name="RA2/AN2/CPS2/T0CKI/INT/C1OUT/SRQ/FLT0/CCP3" />
+    <pin index="11"  name="RA1/AN1/CPS1/C12IN0-/VREF+/SRI/RX/DT/ICSPCLK" />
+    <pin index="12"  name="RA0/AN0/CPS0/C1IN+/VREF-/DACOUT/TX/CK/ICSPDAT" />
+    <pin index="13"  name="VSS" />
+    <pin index="14"  name="NC" />
+    <pin index="15"  name="NC" />
+    <pin index="16"  name="VDD" />
+  </package>
+
+
+</device>

Added: trunk/piklab/src/devices/pic/xml_data/16F1825.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/16F1825.xml	                        (rev 0)
+++ trunk/piklab/src/devices/pic/xml_data/16F1825.xml	2012-04-09 13:45:13 UTC (rev 2867)
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--************************************************************************-->
+<!--* Copyright (C) 2012 Michael Vrolijk                                   *-->
+<!--*                                                                      *-->
+<!--* 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.                                  *-->
+<!--************************************************************************-->
+<device name="16F1825" status="IP" memory_technology="FLASH" self_write="yes"
+        architecture="emidrange" id="0x2760" id_low_power="0x2860"
+        xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+        xsi:noNamespaceSchemaLocation='pic.xsd'>
+
+<!--* Documents ************************************************************-->
+  <documents webpage="546902" datasheet="41440" progsheet="41390C" erratas="80517" />
+
+<!--* Checksums ************************************************************-->
+
+<!--* Operating characteristics ********************************************-->
+  <frequency_range name="extended" >
+    <frequency start="0"  end="16" vdd_min="1.8" vdd_max="5.5" />
+    <frequency start="16" end="32" vdd_min="2.5" vdd_max="5.5" />
+  </frequency_range>
+  <frequency_range name="extended" special="low_power" >
+    <frequency start="0"  end="16" vdd_min="1.8" vdd_max="3.6" />
+    <frequency start="16" end="32" vdd_min="2.5" vdd_max="3.6" />
+  </frequency_range>
+
+  <voltages name="vpp"            min="8.0" max="9.0" nominal="9.0" />
+  <voltages name="vdd_prog"       min="2.7" max="5.5" nominal="5.0"  />
+  <voltages name="vdd_prog_write" min="1.8" max="5.5" nominal="5.0"  />
+
+<!--* Memory ***************************************************************-->
+  <memory name="code"         start="0x0000" end="0x7FFF" />
+  <memory name="user_ids"     start="0x8000" end="0x8003" rmask="0x3FFF"          />
+  <memory name="debug_vector" start="0x8004" end="0x8004" />
+  <memory name="device_id"    start="0x8006" end="0x8006" />
+  <memory name="config"       start="0x8007" end="0x8008" />
+  <memory name="calibration"  start="0x8009" end="0x800A" cal_opmask="0x0000" cal_opcode="0x0000" />
+  <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0xF000" />
+
+<!--* Configuration bits ***************************************************-->
+  <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x3FFF" >
+    <mask name="FOSC"  value="0x0007" >
+      <value value="0x0000" name="LP"       def="_FOSC_LP"     />
+      <value value="0x0001" name="XT"       def="_FOSC_XT"     />
+      <value value="0x0002" name="HS"       def="_FOSC_HS"     />
+      <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="0x0007" name="EC_HP"    def="_FOSC_ECH"    />
+    </mask>
+    <mask name="WDT"   value="0x0018" >
+      <value value="0x0000" name="Off"      def="_WDTE_OFF"    />
+      <value value="0x0008" name="Software" def="_WDTE_SWDTEN" />
+      <value value="0x0010" name="On_run"   def="_WDTE_NSLEEP" />
+      <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" />
+    </mask>
+    <mask name="MCLRE" value="0x0040" >
+      <value value="0x0000" name="Internal" def="_MCLRE_OFF" />
+      <value value="0x0040" name="External" def="_MCLRE_ON"  />
+    </mask>
+    <mask name="CP"    value="0x0080" >
+      <value value="0x0000" name="All" def="_CP_ON"  />
+      <value value="0x0080" name="Off" def="_CP_OFF" />
+    </mask>
+    <mask name="CPD"   value="0x0100" >
+      <value value="0x0000" name="All" def="_CPD_ON"  />
+      <value value="0x0100" name="Off" def="_CPD_OFF" />
+    </mask>
+    <mask name="BODEN" value="0x0600" >
+      <value value="0x0000" name="Off"      def="_BOREN_OFF"    />
+      <value value="0x0200" name="Software" def="_BOREN_SBODEN" />
+      <value value="0x0400" name="On_run"   def="_BOREN_NSLEEP" />
+      <value value="0x0600" name="On"       def="_BOREN_ON"     />
+    </mask>
+    <mask name="CLKOUTEN"  value="0x0800" >
+      <value value="0x0000" name="On"   def="_CLKOUTEN_ON"  />
+      <value value="0x0800" name="Off"  def="_CLKOUTEN_OFF" />
+    </mask>
+    <mask name="IESO"  value="0x1000" >
+      <value value="0x0000" name="Off" def="_IESO_OFF" />
+      <value value="0x1000" name="On"  def="_IESO_ON"  />
+    </mask>
+    <mask name="FCMEN" value="0x2000" >
+      <value value="0x0000" name="Off" def="_FCMEN_OFF" />
+      <value value="0x2000" name="On"  def="_FCMEN_ON"  />
+    </mask>
+  </config>
+
+  <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x3713" >
+    <mask name="WRT"  value="0x0003" >
+      <value value="0x0000" name="0000:07FF" def="_WRT_ALL"  />
+      <value value="0x0001" name="0000:03FF" def="_WRT_HALF" />
+      <value value="0x0002" name="0000:01FF" def="_WRT_BOOT" />
+      <value value="0x0003" name="Off"       def="_WRT_OFF"  />
+    </mask>
+    <mask name="PLLEN"   value="0x0100" >
+      <value value="0x0000" name="Off" def="_PLLEN_OFF" />
+      <value value="0x0100" name="On"  def="_PLLEN_ON"  />
+    </mask>
+    <mask name="STVREN"   value="0x0200" >
+      <value value="0x0000" name="Off" def="_STVREN_OFF" />
+      <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" />
+    </mask>
+    <mask name="DEBUG" value="0x1000" >
+      <value value="0x0000" name="On"  def="_nDEBUG_ON"  />
+      <value value="0x1000" name="Off" def="_nDEBUG_OFF" />
+    </mask>
+    <mask name="LVP"   value="0x2000" >
+      <value value="0x0000" name="Off" def="_LVP_OFF" />
+      <value value="0x2000" name="On"  def="_LVP_ON"  />
+    </mask>
+  </config>
+
+<!--* Packages *************************************************************-->
+  <package types="pdip soic tssop" nb_pins="14" >
+    <pin index="1"  name="VDD" />
+    <pin index="2"  name="RA5/T1CKI/T1OSI/OSC1/CLKIN/PA2*/CCP2*" />
+    <pin index="3"  name="RA4/AN3/T1G*/P2B*/CLKRT/T1OSO/CLKOUT/OSC2/CPS3/SDO*" />
+    <pin index="4"  name="RA3/MCLR/VPP/T1G/SS1*" />
+    <pin index="5"  name="RC5/P1A/CCP1/DT*/RX*/MDCIN2" />
+    <pin index="6"  name="RC4/C2OUT/SRNQ/P1B/CK*/TX*/MDOUT" />
+    <pin index="7"  name="RC3/AN7/CPS7/C12IN3-/P1C*/MDMIN/P2A/CCP2/SS1" />
+    <pin index="8"  name="RC2/AN6/CPS6/C12IN2-/P1D*/P2B/SDO/MDCIN1" />
+    <pin index="9"  name="RC1/AN5/CPS5/C12IN1-/P1C/CCP4/SDA/SDI" />
+    <pin index="10"  name="RC0/AN4/CPS4/C2IN+/P1D/SCL/SCK" />
+    <pin index="11"  name="RA2/AN2/CPS2/T0CKI/INT/C1OUT/SRQ/FLT0/CCP3" />
+    <pin index="12"  name="RA1/AN1/CPS1/C12IN0-/VREF+/SRI/RX/DT/ICSPCLK" />
+    <pin index="13"  name="RA0/AN0/CPS0/C1IN+/VREF-/DACOUT/TX/CK/ICSPDAT" />
+    <pin index="14"  name="VSS" />
+  </package>
+
+  <package types="qfn" nb_pins="16" >
+    <pin index="1"  name="RA5/T1CKI/T1OSI/OSC1/CLKIN/PA2*/CCP2*" />
+    <pin index="2"  name="RA4/AN3/T1G*/P2B*/CLKRT/T1OSO/CLKOUT/OSC2/CPS3/SDO*" />
+    <pin index="3"  name="RA3/MCLR/VPP/T1G/SS1*" />
+    <pin index="4"  name="RC5/P1A/CCP1/DT*/RX*/MDCIN2" />
+    <pin index="5"  name="RC4/C2OUT/SRNQ/P1B/CK*/TX*/MDOUT" />
+    <pin index="6"  name="RC3/AN7/CPS7/C12IN3-/P1C*/MDMIN/P2A/CCP2/SS1" />
+    <pin index="7"  name="RC2/AN6/CPS6/C12IN2-/P1D*/P2B/SDO/MDCIN1" />
+    <pin index="8"  name="RC1/AN5/CPS5/C12IN1-/P1C/CCP4/SDA/SDI" />
+    <pin index="9"  name="RC0/AN4/CPS4/C2IN+/P1D/SCL/SCK" />
+    <pin index="10"  name="RA2/AN2/CPS2/T0CKI/INT/C1OUT/SRQ/FLT0/CCP3" />
+    <pin index="11"  name="RA1/AN1/CPS1/C12IN0-/VREF+/SRI/RX/DT/ICSPCLK" />
+    <pin index="12"  name="RA0/AN0/CPS0/C1IN+/VREF-/DACOUT/TX/CK/ICSPDAT" />
+    <pin index="13"  name="VSS" />
+    <pin index="14"  name="NC" />
+    <pin index="15"  name="NC" />
+    <pin index="16"  name="VDD" />
+  </package>
+
+
+</device>

Added: trunk/piklab/src/devices/pic/xml_data/16F1828.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/16F1828.xml	                        (rev 0)
+++ trunk/piklab/src/devices/pic/xml_data/16F1828.xml	2012-04-09 13:45:13 UTC (rev 2867)
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--************************************************************************-->
+<!--* Copyright (C) 2012 Michael Vrolijk                                   *-->
+<!--*                                                                      *-->
+<!--* 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.                                  *-->
+<!--************************************************************************-->
+<device name="16F1828" status="IP" memory_technology="FLASH" self_write="yes"
+        architecture="emidrange" id="0x27C0" id_low_power="0x28C0"
+        xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+        xsi:noNamespaceSchemaLocation='pic.xsd'>
+
+<!--* Documents ************************************************************-->
+  <documents webpage="546918" datasheet="41419" progsheet="41390C" erratas="80510" />
+
+<!--* Checksums ************************************************************-->
+
+<!--* Operating characteristics ********************************************-->
+  <frequency_range name="extended" >
+    <frequency start="0"  end="16" vdd_min="1.8" vdd_max="5.5" />
+    <frequency start="16" end="32" vdd_min="2.5" vdd_max="5.5" />
+  </frequency_range>
+  <frequency_range name="extended" special="low_power" >
+    <frequency start="0"  end="16" vdd_min="1.8" vdd_max="3.6" />
+    <frequency start="16" end="32" vdd_min="2.5" vdd_max="3.6" />
+  </frequency_range>
+
+  <voltages name="vpp"            min="8.0" max="9.0" nominal="9.0" />
+  <voltages name="vdd_prog"       min="2.7" max="5.5" nominal="5.0"  />
+  <voltages name="vdd_prog_write" min="1.8" max="5.5" nominal="5.0"  />
+
+<!--* Memory ***************************************************************-->
+  <memory name="code"         start="0x0000" end="0x0FFF" />
+  <memory name="user_ids"     start="0x8000" end="0x8003" rmask="0x3FFF"          />
+  <memory name="debug_vector" start="0x8004" end="0x8004" />
+  <memory name="device_id"    start="0x8006" end="0x8006" />
+  <memory name="config"       start="0x8007" end="0x8008" />
+  <memory name="calibration"  start="0x8009" end="0x800A" cal_opmask="0x0000" cal_opcode="0x0000" />
+  <memory name="eeprom"       start="0x0000" end="0x00FF" hexfile_offset="0xF000" />
+
+<!--* Configuration bits ***************************************************-->
+  <config offset="0x0" name="CONFIG1" wmask="0x3FFF" bvalue="0x3FFF" >
+    <mask name="FOSC"  value="0x0007" >
+      <value value="0x0000" name="LP"       def="_FOSC_LP"     />
+      <value value="0x0001" name="XT"       def="_FOSC_XT"     />
+      <value value="0x0002" name="HS"       def="_FOSC_HS"     />
+      <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="0x0007" name="EC_HP"    def="_FOSC_ECH"    />
+    </mask>
+    <mask name="WDT"   value="0x0018" >
+      <value value="0x0000" name="Off"      def="_WDTE_OFF"    />
+      <value value="0x0008" name="Software" def="_WDTE_SWDTEN" />
+      <value value="0x0010" name="On_run"   def="_WDTE_NSLEEP" />
+      <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" />
+    </mask>
+    <mask name="MCLRE" value="0x0040" >
+      <value value="0x0000" name="Internal" def="_MCLRE_OFF" />
+      <value value="0x0040" name="External" def="_MCLRE_ON"  />
+    </mask>
+    <mask name="CP"    value="0x0080" >
+      <value value="0x0000" name="All" def="_CP_ON"  />
+      <value value="0x0080" name="Off" def="_CP_OFF" />
+    </mask>
+    <mask name="CPD"   value="0x0100" >
+      <value value="0x0000" name="All" def="_CPD_ON"  />
+      <value value="0x0100" name="Off" def="_CPD_OFF" />
+    </mask>
+    <mask name="BODEN" value="0x0600" >
+      <value value="0x0000" name="Off"      def="_BOREN_OFF"    />
+      <value value="0x0200" name="Software" def="_BOREN_SBODEN" />
+      <value value="0x0400" name="On_run"   def="_BOREN_NSLEEP" />
+      <value value="0x0600" name="On"       def="_BOREN_ON"     />
+    </mask>
+    <mask name="CLKOUTEN"  value="0x0800" >
+      <value value="0x0000" name="On"   def="_CLKOUTEN_ON"  />
+      <value value="0x0800" name="Off"  def="_CLKOUTEN_OFF" />
+    </mask>
+    <mask name="IESO"  value="0x1000" >
+      <value value="0x0000" name="Off" def="_IESO_OFF" />
+      <value value="0x1000" name="On"  def="_IESO_ON"  />
+    </mask>
+    <mask name="FCMEN" value="0x2000" >
+      <value value="0x0000" name="Off" def="_FCMEN_OFF" />
+      <value value="0x2000" name="On"  def="_FCMEN_ON"  />
+    </mask>
+  </config>
+
+  <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x3713" >
+    <mask name="WRT"  value="0x0003" >
+      <value value="0x0000" name="0000:0FFF" def="_WRT_ALL"  />
+      <value value="0x0001" name="0000:07FF" def="_WRT_HALF" />
+      <value value="0x0002" name="0000:01FF" def="_WRT_BOOT" />
+      <value value="0x0003" name="Off"       def="_WRT_OFF"  />
+    </mask>
+    <mask name="PLLEN"   value="0x0100" >
+      <value value="0x0000" name="Off" def="_PLLEN_OFF" />
+      <value value="0x0100" name="On"  def="_PLLEN_ON"  />
+    </mask>
+    <mask name="STVREN"   value="0x0200" >
+      <value value="0x0000" name="Off" def="_STVREN_OFF" />
+      <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" />
+    </mask>
+    <mask name="DEBUG" value="0x1000" >
+      <value value="0x0000" name="On"  def="_nDEBUG_ON"  />
+      <value value="0x1000" name="Off" def="_nDEBUG_OFF" />
+    </mask>
+    <mask name="LVP"   value="0x2000" >
+      <value value="0x0000" name="Off" def="_LVP_OFF" />
+      <value value="0x2000" name="On"  def="_LVP_ON"  />
+    </mask>
+  </config>
+
+<!--* Packages *************************************************************-->
+  <package types="pdip soic ssop" nb_pins="20" >
+    <pin index="1"  name="VDD" />
+    <pin index="2"  name="RA5/T1CKI/T1OSI/OSC1/CLKIN/PA2*/CCP2*" />
+    <pin index="3"  name="RA4/AN3/T1G*/P2B*/CLKRT/T1OSO/CLKOUT/OSC2/CPS3" />
+    <pin index="4"  name="RA3/MCLR/VPP/T1G" />
+    <pin index="5"  name="RC5/P1A/CCP1/DT*/RX*/MDCIN2" />
+    <pin index="6"  name="RC4/C2OUT/SRNQ/P1B/CK*/TX*/MDOUT" />
+    <pin index="7"  name="RC3/AN7/CPS7/C12IN3-/P1C*/MDMIN/P2A/CCP2" />
+    <pin index="8"  name="RC6/AN8/CPS8/CCP4/SS" />
+    <pin index="9"  name="RC7/AN9/CPS9/SDO" />
+    <pin index="10"  name="RB7/TX/CK" />
+    <pin index="11"  name="RB6/SCL1/SCK1" />
+    <pin index="12"  name="RB5/AN11/CPS11/RX/DT" />
+    <pin index="13"  name="RB4/AN10/CPS10/SDA1/SDI1" />
+    <pin index="14"  name="RC2/AN6/CPS6/C12IN2-/P1D*/P2B/MDCIN1" />
+    <pin index="15"  name="RC1/AN5/CPS5/C12IN1-/P1C" />
+    <pin index="16"  name="RC0/AN4/CPS4/C2IN+/P1D" />
+    <pin index="17"  name="RA2/AN2/CPS2/T0CKI/INT/C1OUT/SRQ/FLT0/CCP3" />
+    <pin index="18"  name="RA1/AN1/CPS1/C12IN0-/VREF+/SRI/ICSPCLK/ICDCLK" />
+    <pin index="19"  name="RA0/AN0/CPS0/C1IN+/VREF-/DACOUT/ICSPDAT/ICDDAT" />
+    <pin index="20"  name="VSS" />
+
+  </package>
+
+  <package types="qfn" nb_pins="20" >
+    <pin index="1"  name="RA3/MCLR/VPP/T1G" />
+    <pin index="2"  name="RC5/P1A/CCP1/DT*/RX*/MDCIN2" />
+    <pin index="3"  name="RC4/C2OUT/SRNQ/P1B/CK*/TX*/MDOUT" />
+    <pin index="4"  name="RC3/AN7/CPS7/C12IN3-/P1C*/MDMIN/P2A/CCP2" />
+    <pin index="5"  name="RC6/AN8/CPS8/CCP4/SS" />
+    <pin index="6"  name="RC7/AN9/CPS9/SDO" />
+    <pin index="7"  name="RB7/TX/CK" />
+    <pin index="8"  name="RB6/SCL1/SCK1" />
+    <pin index="9"  name="RB5/AN11/CPS11/RX/DT" />
+    <pin index="10"  name="RB4/AN10/CPS10/SDA1/SDI1" />
+    <pin index="11"  name="RC2/AN6/CPS6/C12IN2-/P1D*/P2B/MDCIN1" />
+    <pin index="12"  name="RC1/AN5/CPS5/C12IN1-/P1C" />
+    <pin index="13"  name="RC0/AN4/CPS4/C2IN+/P1D" />
+    <pin index="14"  name="RA2/AN2/CPS2/T0CKI/INT/C1OUT/SRQ/FLT0/CCP3" />
+    <pin index="15"  name="RA1/AN1/CPS1/C12IN0-/VREF+/SRI/ICSPCLK/ICDCLK" />
+    <pin index="16"  name="RA0/AN0/CPS0/C1IN+/VREF-/DACOUT/ICSPDAT/ICDDAT" />
+    <pin index="17"  name="VSS" />
+    <pin index="18"  name="VDD" />
+    <pin index="19"  name="RA5/T1CKI/T1OSI/OSC1/CLKIN/PA2*/CCP2*" />
+    <pin index="20"  name="RA4/AN3/T1G*/P2B*/CLKRT/T1OSO/CLKOUT/OSC2/CPS3" />
+  </package>
+
+
+</device>

Modified: trunk/piklab/src/devices/pic/xml_data/16F1829.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/16F1829.xml	2012-04-07 19:38:04 UTC (rev 2866)
+++ trunk/piklab/src/devices/pic/xml_data/16F1829.xml	2012-04-09 13:45:13 UTC (rev 2867)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--************************************************************************-->
-<!--* Copyright (C) 2011 Gal Zsolt                                         *-->
+<!--* Copyright (C) 2012 Michael Vrolijk                                   *-->
 <!--*                                                                      *-->
 <!--* 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 *-->
@@ -8,12 +8,12 @@
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
 <device name="16F1829" status="IP" memory_technology="FLASH" self_write="yes"
-        architecture="midrange" id="0x27E0" id_low_power="0x28E0"
+        architecture="emidrange" id="0x27E0" id_low_power="0x28E0"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 
 <!--* Documents ************************************************************-->
-  <documents webpage="546919" datasheet="41440" progsheet="41390" erratas="80517" />
+  <documents webpage="546919" datasheet="41440" progsheet="41390C" erratas="80517" />
 
 <!--* Checksums ************************************************************-->
 
@@ -29,10 +29,10 @@
 
   <voltages name="vpp"            min="8.0" max="9.0" nominal="9.0" />
   <voltages name="vdd_prog"       min="2.7" max="5.5" nominal="5.0"  />
-  <voltages name="vdd_prog_write" min="2.1" max="5.5" nominal="5.0"  />
+  <voltages name="vdd_prog_write" min="1.8" max="5.5" nominal="5.0"  />
 
 <!--* Memory ***************************************************************-->
-  <memory name="code"         start="0x0000" end="0x1FFF" />
+  <memory name="code"         start="0x0000" end="0x7FFF" />
   <memory name="user_ids"     start="0x8000" end="0x8003" rmask="0x3FFF"          />
   <memory name="debug_vector" start="0x8004" end="0x8004" />
   <memory name="device_id"    start="0x8006" end="0x8006" />
@@ -59,8 +59,8 @@
       <value value="0x0018" name="On"       def="_WDTE_ON"     />
     </mask>
     <mask name="PWRTE" value="0x0020" >
-      <value value="0x0000" name="On"  def="_PWRTE_ON"  />
-      <value value="0x0020" name="Off" def="_PWRTE_OFF" />
+      <value value="0x0000" name="On"  def="_nPWRTE_ON"  />
+      <value value="0x0020" name="Off" def="_nPWRTE_OFF" />
     </mask>
     <mask name="MCLRE" value="0x0040" >
       <value value="0x0000" name="Internal" def="_MCLRE_OFF" />
@@ -96,8 +96,8 @@
 
   <config offset="0x1" name="CONFIG2" wmask="0x3FFF" bvalue="0x3713" >
     <mask name="WRT"  value="0x0003" >
-      <value value="0x0000" name="0000:0FFF" def="_WRT_ALL"  />
-      <value value="0x0001" name="0000:07FF" def="_WRT_HALF" />
+      <value value="0x0000" name="0000:07FF" def="_WRT_ALL"  />
+      <value value="0x0001" name="0000:03FF" def="_WRT_HALF" />
       <value value="0x0002" name="0000:01FF" def="_WRT_BOOT" />
       <value value="0x0003" name="Off"       def="_WRT_OFF"  />
     </mask>
@@ -124,50 +124,51 @@
   </config>
 
 <!--* Packages *************************************************************-->
-  <package types="pdip ssop soic" nb_pins="20" >
+  <package types="pdip soic ssop" nb_pins="20" >
     <pin index="1"  name="VDD" />
-    <pin index="2"  name="RA5/OSC1/CLKIN/T1CKI/T1OSI" />
-    <pin index="3"  name="RA4/AN3/OSC2/CLKOUT/CPS3/T1OSO/CLKR/T1G" />
-    <pin index="4"  name="RA3/NOT_MCLR/VPP" />
-    <pin index="5"  name="RC5/CCP1/P1A/MDCIN2" />
-    <pin index="6"  name="RC4/C2OUT/P1B/SRNQ/MDOUT" />
-    <pin index="7"  name="RC3/AN7/C12IN3-/P1C/CPS7/CCP2/P2A/MDMIN" />
-    <pin index="8"  name="RC6/AN8/NOT_SS1/CCP4/CPS8" />
-    <pin index="9"  name="RC7/AN9/SDO/CPS9" />
-    <pin index="10" name="RB7/TX/CK/SCL2/SCK2" />
-    <pin index="11" name="RB6/SCK1/SCL1" />
-    <pin index="12" name="RB5/AN11/RX/DT/CPS11/SDA2/SDI2" />
-    <pin index="13" name="RB4/AN10/SDI1/SDA1/CPS10" />
-    <pin index="14" name="RC2/AN6/C12IN2-/P1D/P2B/CPS6/MDCIN1" />
-    <pin index="15" name="RC1/AN5/C12IN1-/SDO2/CPS5" />
-    <pin index="16" name="RC0/AN4/C2IN+/NOT_SS2/CPS4" />
-    <pin index="17" name="RA2/AN2/C1OUT/T0CKI/INT/SRQ/CCP3/FLT0/CPS2" />
-    <pin index="18" name="RA1/AN1/C12IN0-/VREF+/ICSPCLK/IDCCLK/CPS1" />
-    <pin index="19" name="RA0/AN0/VREF-/C1IN+/DACOUT/ICSPDAT/ICDDAT/CPS0" />
-    <pin index="20" name="VSS" />
+    <pin index="2"  name="RA5/T1CKI/T1OSI/OSC1/CLKIN/PA2*/CCP2*/SD02*" />
+    <pin index="3"  name="RA4/AN3/T1G*/P2B*/CLKRT/T1OSO/CLKOUT/OSC2/CPS3/SS2*" />
+    <pin index="4"  name="RA3/MCLR/VPP/T1G" />
+    <pin index="5"  name="RC5/P1A/CCP1/DT*/RX*/MDCIN2" />
+    <pin index="6"  name="RC4/C2OUT/SRNQ/P1B/CK*/TX*/MDOUT" />
+    <pin index="7"  name="RC3/AN7/CPS7/C12IN3-/P1C*/MDMIN/P2A/CCP2" />
+    <pin index="8"  name="RC6/AN8/CPS8/CCP4/SS1" />
+    <pin index="9"  name="RC7/AN9/CPS9/SDO" />
+    <pin index="10"  name="RB7/TX/CK/SCK2/SCL2" />
+    <pin index="11"  name="RB6/SCL1/SCK1" />
+    <pin index="12"  name="RB5/AN11/CPS11/RX/DT/SDA2/SDI2" />
+    <pin index="13"  name="RB4/AN10/CPS10/SDA1/SDI1" />
+    <pin index="14"  name="RC2/AN6/CPS6/C12IN2-/P1D/P2B/MDCIN1" />
+    <pin index="15"  name="RC1/AN5/CPS5/C12IN1-/P1C/SDO2" />
+    <pin index="16"  name="RC0/AN4/CPS4/C2IN+/P1D*/SS2" />
+    <pin index="17"  name="RA2/AN2/CPS2/T0CKI/INT/C1OUT/SRQ/FLT0/CCP3" />
+    <pin index="18"  name="RA1/AN1/CPS1/C12IN0-/VREF+/SRI/ICSPCLK/ICDCLK" />
+    <pin index="19"  name="RA0/AN0/CPS0/C1IN+/VREF-/DACOUT/ICSPDAT/ICDDAT" />
+    <pin index="20"  name="VSS" />
+
   </package>
 
   <package types="qfn" nb_pins="20" >
-    <pin index="1"  name="RA3/NOT_MCLR/VPP" />
-    <pin index="2"  name="RC5/CCP1/P1A/MDCIN2" />
-    <pin index="3"  name="RC4/C2OUT/P1B/SRNQ/MDOUT" />
-    <pin index="4"  name="RC3/AN7/C12IN3-/P1C/CPS7/CCP2/P2A/MDMIN" />
-    <pin index="5"  name="RC6/AN8/NOT_SS1/CCP4/CPS8" />
-    <pin index="6"  name="RC7/AN9/SDO/CPS9" />
-    <pin index="7"  name="RB7/TX/CK/SCL2/SCK2" />
-    <pin index="8"  name="RB6/SCK1/SCL1" />
-    <pin index="9"  name="RB5/AN11/RX/DT/CPS11/SDA2/SDI2" />
-    <pin index="10" name="RB4/AN10/SDI1/SDA1/CPS10" />
-    <pin index="11" name="RC2/AN6/C12IN2-/P1D/P2B/CPS6/MDCIN1" />
-    <pin index="12" name="RC1/AN5/C12IN1-/SDO2/CPS5" />
-    <pin index="13" name="RC0/AN4/C2IN+/NOT_SS2/CPS4" />
-    <pin index="14" name="RA2/AN2/C1OUT/T0CKI/INT/SRQ/CCP3/FLT0/CPS2" />
-    <pin index="15" name="RA1/AN1/C12IN0-/VREF+/ICSPCLK/IDCCLK/CPS1" />
-    <pin index="16" name="RA0/AN0/VREF-/C1IN+/DACOUT/ICSPDAT/ICDDAT/CPS0" />
-    <pin index="17" name="VSS" />
-    <pin index="18" name="VDD" />
-    <pin index="19" name="RA5/OSC1/CLKIN/T1CKI/T1OSI" />
-    <pin index="20" name="RA4/AN3/OSC2/CLKOUT/CPS3/T1OSO/CLKR/T1G" />
+    <pin index="1"  name="RA3/MCLR/VPP/T1G" />
+    <pin index="2"  name="RC5/P1A/CCP1/DT*/RX*/MDCIN2" />
+    <pin index="3"  name="RC4/C2OUT/SRNQ/P1B/CK*/TX*/MDOUT" />
+    <pin index="4"  name="RC3/AN7/CPS7/C12IN3-/P1C*/MDMIN/P2A/CCP2" />
+    <pin index="5"  name="RC6/AN8/CPS8/CCP4/SS1" />
+    <pin index="6"  name="RC7/AN9/CPS9/SDO" />
+    <pin index="7"  name="RB7/TX/CK/SCK2/SCL2" />
+    <pin index="8"  name="RB6/SCL1/SCK1" />
+    <pin index="9"  name="RB5/AN11/CPS11/RX/DT/SDA2/SDI2" />
+    <pin index="10"  name="RB4/AN10/CPS10/SDA1/SDI1" />
+    <pin index="11"  name="RC2/AN6/CPS6/C12IN2-/P1D*/P2B/MDCIN1" />
+    <pin index="12"  name="RC1/AN5/CPS5/C12IN1-/P1C/SDO2" />
+    <pin index="13"  name="RC0/AN4/CPS4/C2IN+/P1D/SS2" />
+    <pin index="14"  name="RA2/AN2/CPS2/T0CKI/INT/C1OUT/SRQ/FLT0/CCP3" />
+    <pin index="15"  name="RA1/AN1/CPS1/C12IN0-/VREF+/SRI/ICSPCLK/ICDCLK" />
+    <pin index="16"  name="RA0/AN0/CPS0/C1IN+/VREF-/DACOUT/ICSPDAT/ICDDAT" />
+    <pin index="17"  name="VSS" />
+    <pin index="18"  name="VDD" />
+    <pin index="19"  name="RA5/T1CKI/T1OSI/OSC1/CLKIN/PA2*/CCP2*/SD02*" />
+    <pin index="20"  name="RA4/AN3/T1G*/P2B*/CLKRT/T1OSO/CLKOUT/OSC2/CPS3/SS2*" />
   </package>
 
 

Modified: trunk/piklab/src/progs/direct/base/direct.xml
===================================================================
--- trunk/piklab/src/progs/direct/base/direct.xml	2012-04-07 19:38:04 UTC (rev 2866)
+++ trunk/piklab/src/progs/direct/base/direct.xml	2012-04-09 13:45:13 UTC (rev 2867)
@@ -131,6 +131,15 @@
   <device name="16C781"   family="12C67X" />
   <device name="16C782"   family="12C67X" />
 
+  <device name="12F1822" family="16F1823" />
+  <device name="16F1823" family="16F1823" />
+  <device name="16F1824" family="16F1824" />
+  <device name="16F1825" family="16F1824" />
+  <device name="16F1826" family="16F1826" />
+  <device name="16F1827" family="16F1826" />
+  <device name="16F1828" family="16F1824" />
+  <device name="16F1829" family="16F1824" />
+
   <device name="16F54"    family="10F2XX" />
   <device name="16F57"    family="16F57"  />
   <device name="16F59"    family="16F57"  />
@@ -165,7 +174,7 @@
   <device name="16F747"   family="16F7X" support_type="tested" />
   <device name="16F767"   family="16F7X" support_type="tested" />
   <device name="16F777"   family="16F7X" support_type="tested" />
-  <device name="16F785"   family="16F913" />
+  <device name="16F785"   family="16F785" />
   <device name="16F818"   family="16F81X" />
   <device name="16F819"   family="16F81X" />
   <device name="16F83"    family="16F8X" />

Modified: trunk/piklab/src/progs/direct/base/direct_16F.cpp
===================================================================
--- trunk/piklab/src/progs/direct/base/direct_16F.cpp	2012-04-07 19:38:04 UTC (rev 2866)
+++ trunk/piklab/src/progs/direct/base/direct_16F.cpp	2012-04-09 13:45:13 UTC (rev 2867)
@@ -70,7 +70,7 @@
 //-----------------------------------------------------------------------------
 uint Direct::P16F84A::waitProgTime(Pic::MemoryRangeType type) const
 {
-  if ( type==Pic::MemoryRangeType::Config || type==Pic::MemoryRangeType::UserId ) return 4000 + 4000; // prog +erase
+  if ( type==Pic::MemoryRangeType::Config || type==Pic::MemoryRangeType::UserId ) return 4000 + 4000; // prog + erase
   return 4000;
 }
 

Modified: trunk/piklab/src/progs/direct/base/direct_16F.h
===================================================================
--- trunk/piklab/src/progs/direct/base/direct_16F.h	2012-04-07 19:38:04 UTC (rev 2866)
+++ trunk/piklab/src/progs/direct/base/direct_16F.h	2012-04-09 13:45:13 UTC (rev 2867)
@@ -161,10 +161,29 @@
 {
 public:
   P16F785(::Programmer::Base &base) : P16F913(base) {}
-  virtual bool doEraseRange(Pic::MemoryRangeType type);
   virtual bool doErase(bool isProtected);
 };
 
+class P16F1826 : public P16F785
+{
+public:
+  P16F1826(::Programmer::Base &base) : P16F785(base) {}
+};
+
+class P16F1823 : public P16F1826
+{
+public:
+  P16F1823(::Programmer::Base &base) : P16F1826(base) {}
+  virtual uint nbWordsCodeProg() const { return 16; }
+};
+
+class P16F1824 : public P16F1826
+{
+public:
+  P16F1824(::Programmer::Base &base) : P16F1826(base) {}
+  virtual uint nbWordsCodeProg() const { return 32; }
+};
+
 } // namespace
 
 #endif

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2866] trunk/piklab_kde4

[<az...@us...>]

Revision: 2866
          http://piklab.svn.sourceforge.net/piklab/?rev=2866&view=rev
Author:   azhyd
Date:     2012-04-07 19:38:04 +0000 (Sat, 07 Apr 2012)
Log Message:
-----------
fix compilation warnings

Modified Paths:
--------------
    trunk/piklab_kde4/piklab.kdev4
    trunk/piklab_kde4/src/devices/gui/hex_view.cpp
    trunk/piklab_kde4/src/devices/gui/memory_editor.cpp
    trunk/piklab_kde4/src/devices/gui/register_view.cpp
    trunk/piklab_kde4/src/devices/pic/gui/pic_group_ui.cpp
    trunk/piklab_kde4/src/devices/pic/gui/pic_memory_editor.cpp
    trunk/piklab_kde4/src/devices/pic/prog/pic_prog.h
    trunk/piklab_kde4/src/libgui/device_editor.h
    trunk/piklab_kde4/src/libgui/device_gui.cpp
    trunk/piklab_kde4/src/libgui/editor_manager.cpp
    trunk/piklab_kde4/src/libgui/hex_editor.h
    trunk/piklab_kde4/src/libgui/project_manager.cpp
    trunk/piklab_kde4/src/libgui/watch_view.cpp
    trunk/piklab_kde4/src/piklab-hex/main.cpp
    trunk/piklab_kde4/src/piklab-test/base/generator_check.cpp
    trunk/piklab_kde4/src/piklab-test/checksum/checksum_check.cpp
    trunk/piklab_kde4/src/progs/direct/base/direct_18.cpp
    trunk/piklab_kde4/src/progs/direct/base/direct_18F.cpp
    trunk/piklab_kde4/src/progs/gpsim/base/gpsim.cpp
    trunk/piklab_kde4/src/progs/gui/hardware_config_widget.cpp
    trunk/piklab_kde4/src/progs/gui/port_selector.cpp
    trunk/piklab_kde4/src/progs/pickit2/base/pickit2.cpp
    trunk/piklab_kde4/src/progs/pickit2v2/base/pickit2v2.cpp
    trunk/piklab_kde4/src/tools/boost/boost.cpp
    trunk/piklab_kde4/src/tools/ccsc/ccsc_compile.cpp
    trunk/piklab_kde4/src/tools/gputils/gputils_generator.cpp
    trunk/piklab_kde4/src/tools/gui/toolchain_config_widget.cpp
    trunk/piklab_kde4/src/tools/jal/jal.cpp
    trunk/piklab_kde4/src/tools/jalv2/jalv2.cpp
    trunk/piklab_kde4/src/tools/list/compile_config.cpp
    trunk/piklab_kde4/src/tools/list/compile_manager.cpp
    trunk/piklab_kde4/src/tools/list/compile_process.cpp
    trunk/piklab_kde4/src/tools/mpc/mpc_compile.cpp
    trunk/piklab_kde4/src/tools/picc/picc.cpp

Modified: trunk/piklab_kde4/piklab.kdev4
===================================================================
--- trunk/piklab_kde4/piklab.kdev4	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/piklab.kdev4	2012-04-07 19:38:04 UTC (rev 2866)
@@ -1,3 +1,3 @@
 [Project]
 Manager=KDevCMakeManager
-Name=piklab
+Name=piklab_kde4

Modified: trunk/piklab_kde4/src/devices/gui/hex_view.cpp
===================================================================
--- trunk/piklab_kde4/src/devices/gui/hex_view.cpp	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/devices/gui/hex_view.cpp	2012-04-07 19:38:04 UTC (rev 2866)
@@ -17,7 +17,7 @@
 void Device::HexView::display(Memory *memory)
 {
   _memory = memory;
-  for (uint i=0; i<_editors.count(); i++) delete _editors[i];
+  for (int i=0; i<_editors.count(); i++) delete _editors[i];
   _editors.clear();
   if ( _memory==0 ) return;
   internalDisplay();

Modified: trunk/piklab_kde4/src/devices/gui/memory_editor.cpp
===================================================================
--- trunk/piklab_kde4/src/devices/gui/memory_editor.cpp	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/devices/gui/memory_editor.cpp	2012-04-07 19:38:04 UTC (rev 2866)
@@ -116,7 +116,7 @@
 
 void Device::MemoryRangeEditor::setReadOnly(bool readOnly)
 {
-  for (uint i=0; i<_editors.count(); i++)
+  for (int i=0; i<_editors.count(); i++)
     _editors[i]->setReadOnly(readOnly || isRangeReadOnly());
 }
 
@@ -144,7 +144,7 @@
   _scrollbar->blockSignals(false);
 
   // memory
-  for (uint i=0; i<_editors.count(); i++) {
+  for (int i=0; i<_editors.count(); i++) {
     int offset = wordOffset() + i;
     _editors[i]->setOffset(offset<int(nbWords()) ? offset : -1);
   }
@@ -152,7 +152,7 @@
   // adresses
   uint inc = addressIncrement();
   Address address = startAddress() + inc * wordOffset();
-  for (uint i=0; i<_addresses.count(); i++) {
+  for (int i=0; i<_addresses.count(); i++) {
     _addresses[i]->setText(toHex(address, 2*_memory->device().nbBytesAddress()));
     updateAddressColor(i, address);
     address += inc * _nbCols;
@@ -254,13 +254,13 @@
 
 void Device::MemoryEditorGroup::setReadOnly(bool readOnly)
 {
-  for (uint i=0; i<_editors.count(); i++)
+  for (int i=0; i<_editors.count(); i++)
     _editors[i]->setReadOnly(readOnly);
 }
 
 void Device::MemoryEditorGroup::updateDisplay()
 {
-  for (uint i=0; i<_editors.count(); i++)
+  for (int i=0; i<_editors.count(); i++)
     _editors[i]->updateDisplay();
 }
 

Modified: trunk/piklab_kde4/src/devices/gui/register_view.cpp
===================================================================
--- trunk/piklab_kde4/src/devices/gui/register_view.cpp	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/devices/gui/register_view.cpp	2012-04-07 19:38:04 UTC (rev 2866)
@@ -116,7 +116,7 @@
   setText(1, label());
   setText(2, textValue());
   repaint();
-  for (uint i=0; i<_items.count(); i++) _items[i]->updateView();
+  for (int i=0; i<_items.count(); i++) _items[i]->updateView();
 }
 
 void Register::ListViewItem::setBase(NumberBase base)

Modified: trunk/piklab_kde4/src/devices/pic/gui/pic_group_ui.cpp
===================================================================
--- trunk/piklab_kde4/src/devices/pic/gui/pic_group_ui.cpp	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/devices/pic/gui/pic_group_ui.cpp	2012-04-07 19:38:04 UTC (rev 2866)
@@ -38,7 +38,7 @@
   const Pic::RegistersData &rdata = data.registersData();
   ListContainer *branch = container->appendBranch(i18n("SFRs"));
   QValueVector<Pic::RegisterNameData> list = Pic::sfrList(data);
-  for (uint i=0; i<list.count(); i++) {
+  for (int i=0; i<list.count(); i++) {
     branch->appendItem(list[i].label(), ids.count(), ListContainer::UnChecked);
     ids.append(list[i].data());
   }
@@ -69,7 +69,7 @@
     if ( list.count()==0 ) {
       branch->appendItem(i18n("No variable"), ids.count(), ListContainer::Disabled);
       ids.append(Register::TypeData());
-    } else for (uint i=0; i<list.count(); i++) {
+    } else for (int i=0; i<list.count(); i++) {
       branch->appendItem(list[i].label(), ids.count(), ListContainer::UnChecked);
       ids.append(list[i].data());
     }

Modified: trunk/piklab_kde4/src/devices/pic/gui/pic_memory_editor.cpp
===================================================================
--- trunk/piklab_kde4/src/devices/pic/gui/pic_memory_editor.cpp	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/devices/pic/gui/pic_memory_editor.cpp	2012-04-07 19:38:04 UTC (rev 2866)
@@ -41,7 +41,7 @@
 
 bool Pic::MemoryEditorLegend::Data::hasAction(const KAction *action) const
 {
-  for (uint i=0; i<actions.count(); i++) if ( actions[i]==action ) return true;
+  for (int i=0; i<actions.count(); i++) if ( actions[i]==action ) return true;
   return false;
 }
 
@@ -102,7 +102,7 @@
     _boot.button->setEnabled(!r.isEmpty());
     _boot.setProtected(memory().isBootProtected(ptype));
   }
-  for (uint i=0; i<_blocks.count(); i++) {
+  for (int i=0; i<_blocks.count(); i++) {
     AddressRange r = memory().blockRange(i);
     if ( r.isEmpty() ) _blocks[i].label->setText(i18n("not present"));
     else _blocks[i].label->setText(QString("[%1:%2]").arg(toHex(r.start, nbChars)).arg(toHex(r.end, nbChars)));
@@ -120,7 +120,7 @@
     emit setStartWord(r.start - start);
     return;
   }
-  for (uint i=0; i<_blocks.count(); i++) {
+  for (int i=0; i<_blocks.count(); i++) {
     if ( _blocks[i].hasAction(action) ) {
       AddressRange r = memory().blockRange(i);
       emit setStartWord(r.start - start);
@@ -139,7 +139,7 @@
     emit setEndWord(r.end - start);
     return;
   }
-  for (uint i=0; i<_blocks.count(); i++) {
+  for (int i=0; i<_blocks.count(); i++) {
     if ( _blocks[i].hasAction(action) ) {
       AddressRange r = memory().blockRange(i);
       emit setEndWord(r.end - start);
@@ -195,7 +195,7 @@
   const Protection &protection = device().config().protection();
   if ( type()==MemoryRangeType::Code ) {
     if ( protection.hasBootBlock() ) _bootRange = memory().bootRange();
-    for (uint k=0; k<_blockRanges.count(); k++)
+    for (int k=0; k<_blockRanges.count(); k++)
       _blockRanges[k] = memory().blockRange(k);
   }
   Protection::Type ptype = (protection.family()==Protection::CodeGuard ? Protection::HighSecurity : Protection::ProgramProtected);
@@ -212,7 +212,7 @@
   _blocks[i]->unsetPalette();
   if ( type()==MemoryRangeType::Code ) {
     if ( _bootRange.contains(address) ) _blocks[i]->setPaletteBackgroundColor(MemoryEditorLegend::bootColor());
-    else for (uint k=0; k<_blockRanges.count(); k++) {
+    else for (int k=0; k<_blockRanges.count(); k++) {
       if ( !_blockRanges[k].contains(address) ) continue;
       _blocks[i]->setPaletteBackgroundColor(MemoryEditorLegend::blockColor(k));
       break;

Modified: trunk/piklab_kde4/src/devices/pic/prog/pic_prog.h
===================================================================
--- trunk/piklab_kde4/src/devices/pic/prog/pic_prog.h	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/devices/pic/prog/pic_prog.h	2012-04-07 19:38:04 UTC (rev 2866)
@@ -56,6 +56,7 @@
   PicHardware *hardware() const { return static_cast<PicHardware *>(_hardware.get()); }
   virtual bool verifyDeviceId();
   virtual uint nbSteps(Task task, const Device::MemoryRange &range) const;
+  using Base::initProgramming;
   bool initProgramming(Task task);
 
   virtual bool checkErase();

Modified: trunk/piklab_kde4/src/libgui/device_editor.h
===================================================================
--- trunk/piklab_kde4/src/libgui/device_editor.h	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/libgui/device_editor.h	2012-04-07 19:38:04 UTC (rev 2866)
@@ -22,6 +22,7 @@
   virtual PURL::Url url() const { return PURL::Url(); }
   virtual void setDevice(bool force = false);
   static QString guessDeviceFromFile(const PURL::Url &url);
+  using Editor::save;
   virtual bool save(const PURL::Url &) { return false; }
   virtual bool open(const PURL::Url &) { return true; }
   virtual QValueList<uint> bookmarkLines() const { return QValueList<uint>(); }

Modified: trunk/piklab_kde4/src/libgui/device_gui.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/device_gui.cpp	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/libgui/device_gui.cpp	2012-04-07 19:38:04 UTC (rev 2866)
@@ -176,7 +176,7 @@
   QStringList names;
   for (uint i=0; Device::Package::TYPE_DATA[i].name; i++) names += Device::Package::TYPE_DATA[i].name;
   qSort(names);
-  for (uint i=0; i<names.count(); i++) _packageCombo->appendItem(names[i], i18n(Device::Package::data(names[i])->label));
+  for (int i=0; i<names.count(); i++) _packageCombo->appendItem(names[i], i18n(Device::Package::data(names[i])->label));
   _packageCombo->setCurrentItem(Config::package());
   connect(_packageCombo->widget(), SIGNAL(activated(int)), SLOT(updateList()));
   fcontainer->appendWidget(_packageCombo->widget());

Modified: trunk/piklab_kde4/src/libgui/editor_manager.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/editor_manager.cpp	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/libgui/editor_manager.cpp	2012-04-07 19:38:04 UTC (rev 2866)
@@ -79,7 +79,7 @@
       return;
     }
     _current++;
-    if ( _current<_names.count() && _names[_current]==name ) return;
+    if ( _current<(uint)_names.count() && _names[_current]==name ) return;
   }
   _names.resize(_current+1);
   _names[_current] = name;
@@ -428,10 +428,10 @@
 void EditorManager::switchToEditor()
 {
   QStringList names;
-  for (uint i=0; i<_editors.count(); i++) names.append(title(*_editors[i]));
+  for (int i=0; i<_editors.count(); i++) names.append(title(*_editors[i]));
   SwitchToDialog dialog(names, this);
   if ( dialog.exec()!=QDialog::Accepted ) return;
-  for (uint i=0; i<names.count(); i++) {
+  for (int i=0; i<names.count(); i++) {
     if ( dialog.name()!=names[i] && dialog.name()!=QString("%1").arg(i+1) ) continue;
     showEditor(_editors[i]);
     return;
@@ -447,7 +447,7 @@
 {
   Q_ASSERT( _history.hasBack() );
   QString s = _history.goBack();
-  for (uint i=0; i<_editors.count(); i++)
+  for (int i=0; i<_editors.count(); i++)
     if ( s==name(*_editors[i]) ) showEditor(_editors[i]);
 }
 
@@ -455,7 +455,7 @@
 {
   Q_ASSERT( _history.hasForward() );
   QString s = _history.goForward();
-  for (uint i=0; i<_editors.count(); i++)
+  for (int i=0; i<_editors.count(); i++)
     if ( s==name(*_editors[i]) ) showEditor(_editors[i]);
 }
 

Modified: trunk/piklab_kde4/src/libgui/hex_editor.h
===================================================================
--- trunk/piklab_kde4/src/libgui/hex_editor.h	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/libgui/hex_editor.h	2012-04-07 19:38:04 UTC (rev 2866)
@@ -70,6 +70,7 @@
   PURL::Url       _url;
 
   virtual void dropEvent(QDropEvent *e) { emit dropEventPass(e); }
+  using Editor::save;
   bool save(const PURL::Url &url, const QString &fileErrorString);
   bool verifyDeviceType();
   virtual QWidget *createView(const Device::Data& data, QWidget *parent);

Modified: trunk/piklab_kde4/src/libgui/project_manager.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/project_manager.cpp	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/libgui/project_manager.cpp	2012-04-07 19:38:04 UTC (rev 2866)
@@ -335,7 +335,6 @@
     ext[url] = Included;
     return;
   }
-  PURL::FileProperties properties = type.data().properties;
   Group grp;
   switch (origin) {
     case Intrinsic: grp = group(type); break;

Modified: trunk/piklab_kde4/src/libgui/watch_view.cpp
===================================================================
--- trunk/piklab_kde4/src/libgui/watch_view.cpp	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/libgui/watch_view.cpp	2012-04-07 19:38:04 UTC (rev 2866)
@@ -118,10 +118,9 @@
     if ( !Register::list().isWatched(ritem->data()) ) delete ritem;
   }
   // add new items
-  bool added = false;
   QValueList<Register::TypeData> watched = Register::list().watched();
   QValueVector<ListViewItem *> items(watched.count());
-  for (uint k=0; k<watched.count(); k++) {
+  for (int k=0; k<watched.count(); k++) {
     Q3ListViewItem *item = _root->firstChild();
     for (; item; item=item->nextSibling())
       if ( static_cast<ListViewItem *>(item)->data()==watched[k] ) break;
@@ -131,7 +130,6 @@
     } else {
       items[k] = Device::groupui(Main::deviceData()).createWatchItem(watched[k], _root);
       items[k]->setBase(_base);
-      added = true;
     }
   }
 }

Modified: trunk/piklab_kde4/src/piklab-hex/main.cpp
===================================================================
--- trunk/piklab_kde4/src/piklab-hex/main.cpp	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/piklab-hex/main.cpp	2012-04-07 19:38:04 UTC (rev 2866)
@@ -182,7 +182,7 @@
   }
   if ( command=="checksum" ) {
     QStringList warnings;
-    Device::Memory::WarningTypes wtypes = _memory->fromHexBuffer(_source1, warnings);
+    _memory->fromHexBuffer(_source1, warnings);
     for (uint i=0; i<uint(warnings.count()); i++) log(Log::LineType::Warning, warnings[i]);
     log(Log::LineType::Warning, i18n("Checksum computation is experimental and is not always correct!")); // #### REMOVE ME
     BitValue cs = _memory->checksum();

Modified: trunk/piklab_kde4/src/piklab-test/base/generator_check.cpp
===================================================================
--- trunk/piklab_kde4/src/piklab-test/base/generator_check.cpp	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/piklab-test/base/generator_check.cpp	2012-04-07 19:38:04 UTC (rev 2866)
@@ -118,12 +118,12 @@
 {
   // create configuration
   const Pic::Config &config = static_cast<const Pic::Data &>(data).config();
-  for (uint l=0; ; l++) {
+  for (int l=0; ; l++) {
     // set config bits
     bool ok = false;
-    for (uint i=0; i<config._words.count(); i++) {
+    for (int i=0; i<config._words.count(); i++) {
       const Pic::Config::Word &cword = config._words[i];
-      for (uint k=0; k<cword.masks.count(); k++) {
+      for (int k=0; k<cword.masks.count(); k++) {
         const Pic::Config::Mask &cmask = cword.masks[k];
         if ( l<cmask.values.count() ) {
           ok = true;
@@ -147,22 +147,22 @@
 
     // check that config bits are the same
     uint nbChars = static_cast<const Pic::Data &>(data).nbCharsWord(Pic::MemoryRangeType::Config);
-    for (uint i=0; i<config._words.count(); i++) {
+    for (int i=0; i<config._words.count(); i++) {
       const Pic::Config::Word &cword = config._words[i];
       BitValue word1 = static_cast<const Pic::Memory&>(*_memory1).word(Pic::MemoryRangeType::Config, i);
       BitValue word2 = static_cast<const Pic::Memory&>(*_memory2).word(Pic::MemoryRangeType::Config, i);
       if ( word1==word2 ) continue;
-      for (uint k=0; k<cword.masks.count(); k++) {
+      for (int k=0; k<cword.masks.count(); k++) {
         const Pic::Config::Mask &cmask = cword.masks[k];
         if ( cmask.value.isInside(cword.pmask) ) continue;
         BitValue value1 = word1.maskWith(cmask.value);
         BitValue value2 = word2.maskWith(cmask.value);
         if ( value1==value2 ) continue;
         QString name1, name2;
-        uint l1 = 0, l2 = 0;
-        for (uint l=0; l<cmask.values.count(); l++) {
+        uint l2 = 0;
+        for (int l=0; l<cmask.values.count(); l++) {
           const Pic::Config::Value &value = cmask.values[l];
-          if ( value.value==value1 ) { name1 = value.name; l1 = l; }
+          if ( value.value==value1 ) { name1 = value.name; }
           if ( value.value==value2 ) { name2 = value.name; l2 = l; }
         }
         if ( name1==name2 ) continue;

Modified: trunk/piklab_kde4/src/piklab-test/checksum/checksum_check.cpp
===================================================================
--- trunk/piklab_kde4/src/piklab-test/checksum/checksum_check.cpp	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/piklab-test/checksum/checksum_check.cpp	2012-04-07 19:38:04 UTC (rev 2866)
@@ -33,7 +33,7 @@
   const Pic::Protection &protection = data.config().protection();
   if ( !maskName.isEmpty() && !valueName.isEmpty() ) memory.setConfigValue(maskName, valueName);
   if ( !valueName.isEmpty() ) memory.setUserIdToUnprotectedChecksum();
-  for (uint i=0; i<cdata.protectedMaskNames.count(); i++) {
+  for (int i=0; i<cdata.protectedMaskNames.count(); i++) {
     QString pmName = cdata.protectedMaskNames[i];
     const Pic::Config::Mask *mask = data.config().findMask(pmName, 0);
     for (int k=mask->values.count()-1; k>=0; k--) {
@@ -86,7 +86,7 @@
       QString maskName = protection.maskName(Pic::Protection::ProgramProtected, Pic::MemoryRangeType::Code);
       const Pic::Config::Mask *mask = pdata.config().findMask(maskName);
       Q_ASSERT(mask);
-      for (uint i=0; i<mask->values.count(); i++) {
+      for (int i=0; i<mask->values.count(); i++) {
         QString valueName = mask->values[i].name;
         if ( valueName.isEmpty() ) continue; // invalid value
         checkChecksum(pdata, maskName, valueName, ok);

Modified: trunk/piklab_kde4/src/progs/direct/base/direct_18.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/direct/base/direct_18.cpp	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/progs/direct/base/direct_18.cpp	2012-04-07 19:38:04 UTC (rev 2866)
@@ -60,7 +60,7 @@
     for (uint x = 0; x<16; x++) {
         hardware().setPin(Clock, High);
         Port::usleep(_clockDelay+5);
-        if ( x>7 && hardware().readBit() ) ind |= (1 << x-8);
+        if ( x>7 && hardware().readBit() ) ind |= 1 << (x-8);
         hardware().setPin(Clock, Low);
         Port::usleep(_clockDelay+3);
     }
@@ -69,7 +69,7 @@
     for (uint x = 0; x<16; x++) {
         hardware().setPin(Clock, High);
         Port::usleep(_clockDelay+5);
-        if ( x>7 && hardware().readBit() ) ind |= (1 << x);
+        if ( x>7 && hardware().readBit() ) ind |= 1 << x;
         hardware().setPin(Clock, Low);
         Port::usleep(_clockDelay+3);
     }
@@ -85,7 +85,7 @@
     for (uint x = 0; x<16; x++) {
         hardware().setPin(Clock, High);
         Port::usleep(_clockDelay+5);
-        if ( x>7 && hardware().readBit() ) ind |= (1 << x-8);
+        if ( x>7 && hardware().readBit() ) ind |= 1 << (x-8);
         hardware().setPin(Clock, Low);
         Port::usleep(_clockDelay+3);
     }

Modified: trunk/piklab_kde4/src/progs/direct/base/direct_18F.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/direct/base/direct_18F.cpp	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/progs/direct/base/direct_18F.cpp	2012-04-07 19:38:04 UTC (rev 2866)
@@ -278,8 +278,8 @@
   if ( type==Pic::MemoryRangeType::Code ) {
     doEraseCommand(0, 0x8181); // boot
     for (uint i=0; i<device().config().protection().nbBlocks(); i++) {
-      uint v = (1 << i);
-      doEraseCommand(v + v<<8, 0x8080);
+      uint v = 1 << i;
+      doEraseCommand(v + (v<<8), 0x8080);
     }
     return true;
   }

Modified: trunk/piklab_kde4/src/progs/gpsim/base/gpsim.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/gpsim/base/gpsim.cpp	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/progs/gpsim/base/gpsim.cpp	2012-04-07 19:38:04 UTC (rev 2866)
@@ -152,7 +152,7 @@
   if (!sendCommand("version", true)) return false;
   version = VersionData();
   QRegExp reg("\\w*\\s*(\\d+\\.\\d+\\.\\d+).*");
-  for (uint i = 0; i<outputLines().count(); ++i) {
+  for (int i = 0; i<outputLines().count(); ++i) {
     if (reg.exactMatch(outputLines()[i]) ) {
       version = VersionData::fromString(reg.cap(1));
       break;

Modified: trunk/piklab_kde4/src/progs/gui/hardware_config_widget.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/gui/hardware_config_widget.cpp	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/progs/gui/hardware_config_widget.cpp	2012-04-07 19:38:04 UTC (rev 2866)
@@ -172,7 +172,7 @@
 {
   _configCombo->clear();
   _names = _config->hardwareNames(type);
-  for (uint i=0; i<_names.count(); i++) {
+  for (int i=0; i<_names.count(); i++) {
     bool standard = _config->isStandardHardware(_names[i]);
     QString s = (standard ? _config->label(_names[i]) : i18n("%1 <custom>").arg(_names[i]));
     _configCombo->insertItem(s);

Modified: trunk/piklab_kde4/src/progs/gui/port_selector.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/gui/port_selector.cpp	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/progs/gui/port_selector.cpp	2012-04-07 19:38:04 UTC (rev 2866)
@@ -94,7 +94,7 @@
 
   if (pd.type.data().withDevice) {
     _combos[pd.type.type()] = new KComboBox(true, _main);
-    for (uint i=0; i<list.count(); i++) _combos[pd.type.type()]->insertItem(list[i]);
+    for (int i=0; i<list.count(); i++) _combos[pd.type.type()]->insertItem(list[i]);
     if ( !pd.device.isEmpty() && !list.contains(pd.device) ) _combos[pd.type.type()]->insertItem(pd.device);
     _combos[pd.type.type()]->setCurrentText(pd.device);
     connect(_combos[pd.type.type()], SIGNAL(activated(int)), SIGNAL(changed()));

Modified: trunk/piklab_kde4/src/progs/pickit2/base/pickit2.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/pickit2/base/pickit2.cpp	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/progs/pickit2/base/pickit2.cpp	2012-04-07 19:38:04 UTC (rev 2866)
@@ -46,7 +46,7 @@
     if ( !receiveWords(1, 1, read) ) return false;
     for (uint k=0; k<nb; k++) {
       uint index = i + start + k;
-      data[index]= read[5 + 2*k] & 0xFF | (read[6 + 2*k] << 8);
+      data[index]= (read[5 + 2*k] & 0xFF) | (read[6 + 2*k] << 8);
       if ( vdata && index>=0x1000 && index<0x3FF0 && data[index]!=(*vdata)[index] ) {
         log(Log::LineType::Error, i18n("Firmware memory does not match hex file (at address 0x%2: reading 0x%3 and expecting 0x%4).")
                     .arg(QString(toHex(index/2, device.nbCharsAddress())))

Modified: trunk/piklab_kde4/src/progs/pickit2v2/base/pickit2v2.cpp
===================================================================
--- trunk/piklab_kde4/src/progs/pickit2v2/base/pickit2v2.cpp	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/progs/pickit2v2/base/pickit2v2.cpp	2012-04-07 19:38:04 UTC (rev 2866)
@@ -388,7 +388,7 @@
 
 bool Pickit2V2::Hardware::downloadData(const QValueVector<uint> &data, uint &index, bool clearBuffer)
 {
-  Q_ASSERT( index<data.count() );
+  Q_ASSERT( index<(uint)data.count() );
   Array cmd;
   uint i = 0;
   if (clearBuffer) { cmd[i] = ClearDownloadBuffer; i++; }

Modified: trunk/piklab_kde4/src/tools/boost/boost.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/boost/boost.cpp	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/tools/boost/boost.cpp	2012-04-07 19:38:04 UTC (rev 2866)
@@ -126,7 +126,7 @@
         _newExecutableNames = (i == 0);
         if (checkExecutable(Tool::Category::Linker, lines)) {
             QRegExp regexp("Boost.*Version\\s+([0-9]+)\\.([0-9]+).*");
-            for (uint i=0; i<lines.count(); ++i) {
+            for (int i=0; i<lines.count(); ++i) {
                 if (regexp.exactMatch(lines[i])) {
                     return VersionData(regexp.cap(1).toUInt(), regexp.cap(2).toUInt(), 0);
                 }

Modified: trunk/piklab_kde4/src/tools/ccsc/ccsc_compile.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/ccsc/ccsc_compile.cpp	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/tools/ccsc/ccsc_compile.cpp	2012-04-07 19:38:04 UTC (rev 2866)
@@ -87,7 +87,7 @@
     if ( !file.openForRead() ) doLog(Log::LineType::Error, i18n("Could not find error file (%1).").arg(url.pretty()), QString::null, 0);
     else {
       QStringList lines = file.readLines();
-      for (uint i=0; i<lines.count(); i++) parseLine(lines[i]);
+      for (int i=0; i<lines.count(); i++) parseLine(lines[i]);
     }
   }
   Compile::Process::done(code);
@@ -96,7 +96,7 @@
 PURL::Url CCSC::CompileFile::url(PURL::FileType type, uint i) const
 {
   PURL::Url url;
-  Q_ASSERT( i<_data.items.count() );
+  Q_ASSERT( i<(uint)_data.items.count() );
   url = _data.items[i].url;
   if ( type==PURL::Nb_FileTypes ) return url;
   return url.toFileType(type);

Modified: trunk/piklab_kde4/src/tools/gputils/gputils_generator.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/gputils/gputils_generator.cpp	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/tools/gputils/gputils_generator.cpp	2012-04-07 19:38:04 UTC (rev 2866)
@@ -17,7 +17,7 @@
 {
   QStringList devices = QStringList::split(' ', s.simplifyWhiteSpace().upper());
   QValueList<const Device::Data *> list;
-  for (uint i=0; i<devices.count(); i++) {
+  for (int i=0; i<devices.count(); i++) {
     QString name = devices[i];
     if ( devices[i].startsWith("P1") ) name = name.mid(1);
     const Device::Data* data = Device::Lister::instance().data(name);

Modified: trunk/piklab_kde4/src/tools/gui/toolchain_config_widget.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/gui/toolchain_config_widget.cpp	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/tools/gui/toolchain_config_widget.cpp	2012-04-07 19:38:04 UTC (rev 2866)
@@ -158,7 +158,7 @@
 
 void ToolchainConfigWidget::checkDevicesDone()
 {
-  for(uint i=0; i<_devicesData.count(); i++) {
+  for(int i=0; i<_devicesData.count(); i++) {
     if ( _devicesData[i].process!=sender() ) continue;
     if ( _devicesData[i].process->state()==::Process::Timedout ) {
       _devicesLabel->setText(i18n("Timeout"));
@@ -169,7 +169,7 @@
     break;
   }
   QValueList<const Device::Data *> list;
-  for(uint i=0; i<_devicesData.count(); i++) {
+  for(int i=0; i<_devicesData.count(); i++) {
     if ( !_devicesData[i].done ) return;
     list += _group.getSupportedDevices(_devicesData[i].checkLines.join("\n"));
   }
@@ -230,7 +230,7 @@
     QStringList supported = _group.supportedDevices();
     _devicesLabel->setText(i18n("Hardcoded (%1)").arg(supported.count()));
   } else {
-    for (uint i=0; i<_devicesData.count(); i++) {
+    for (int i=0; i<_devicesData.count(); i++) {
       delete _devicesData[i].process;
       _devicesData[i].process = checkDevicesProcess(i);
       _devicesData[i].command = _devicesData[i].process->prettyCommand();

Modified: trunk/piklab_kde4/src/tools/jal/jal.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/jal/jal.cpp	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/tools/jal/jal.cpp	2012-04-07 19:38:04 UTC (rev 2866)
@@ -19,7 +19,7 @@
 bool JAL::Base::checkExecutableResult(Tool::ExecutableType, QStringList &lines) const
 {
   QStringList tmp;
-  for (uint i=0; i<lines.count(); i++)
+  for (int i=0; i<lines.count(); i++)
     if ( !lines[i].contains('\r') ) tmp += lines[i]; // ??
   lines = tmp;
   return ( lines.count()>0 && lines[0].startsWith("jal") );

Modified: trunk/piklab_kde4/src/tools/jalv2/jalv2.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/jalv2/jalv2.cpp	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/tools/jalv2/jalv2.cpp	2012-04-07 19:38:04 UTC (rev 2866)
@@ -20,7 +20,7 @@
 bool JALV2::Base::checkExecutableResult(Tool::ExecutableType, QStringList &lines) const
 {
   QStringList tmp;
-  for (uint i=0; i<lines.count(); i++)
+  for (int i=0; i<lines.count(); i++)
     if ( !lines[i].contains('\r') ) tmp += lines[i]; // ??
   lines = tmp;
   return ( lines.count()>0 && lines[0].startsWith("jal") );

Modified: trunk/piklab_kde4/src/tools/list/compile_config.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/list/compile_config.cpp	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/tools/list/compile_config.cpp	2012-04-07 19:38:04 UTC (rev 2866)
@@ -80,7 +80,7 @@
 {
   QStringList list;
   QStringList raw = rawIncludeDirs(category);
-  for (uint i=0; i<raw.size(); i++) {
+  for (int i=0; i<raw.size(); i++) {
     if ( separator.isEmpty() ) list.append(prefix + raw[i] + suffix);
     else if ( i==0 ) list.append(prefix + raw[i]);
     else list[0] += separator + raw[i];

Modified: trunk/piklab_kde4/src/tools/list/compile_manager.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/list/compile_manager.cpp	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/tools/list/compile_manager.cpp	2012-04-07 19:38:04 UTC (rev 2866)
@@ -205,9 +205,9 @@
 bool Compile::Manager::execute()
 {
   log(Log::DebugLevel::Extra, QString("Todo: %1").arg(_todo.count()));
-  for (uint i=0; i<_todo.count(); i++) {
+  for (int i=0; i<_todo.count(); i++) {
     QString s;
-    for (uint k=0; k<_todo[i].items.count(); k++) {
+    for (int k=0; k<_todo[i].items.count(); k++) {
       if ( k!=0 ) s += ",";
       s += _todo[i].items[k].url.pretty();
     }
@@ -284,7 +284,7 @@
     log(Log::LineType::Information, i18n("Executing custom commands..."));
   }
   QStringList commands = Compile::Config::customCommands(Main::project());
-  if ( _customCommandIndex==commands.count() ) {
+  if ( _customCommandIndex==(uint)commands.count() ) {
     log(Log::LineType::Information, i18n("*** Success ***"), Log::Delayed);
     emit success();
     return true;

Modified: trunk/piklab_kde4/src/tools/list/compile_process.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/list/compile_process.cpp	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/tools/list/compile_process.cpp	2012-04-07 19:38:04 UTC (rev 2866)
@@ -244,7 +244,7 @@
   else if (type==PURL::Library || _data.category==Tool::Category::Librarian)
     return Main::project()->url().toExtension(libraryExtension());
   else {
-    ASSERT( i<_data.items.count() );
+    ASSERT( i<(uint)_data.items.count() );
     url = _data.items[i].url;
   }
   if ( type==PURL::Nb_FileTypes ) return url;
@@ -268,7 +268,7 @@
   FileData::List list;
   QRegExp rexp("PURL::(.*)");
   QStringList files = QStringList::split(" ", outputFiles());
-  for (uint i=0; i<files.count(); i++) {
+  for (int i=0; i<files.count(); i++) {
     if ( rexp.exactMatch(files[i]) ) {
       PURL::FileType type = PURL::FileType::fromKey(rexp.cap(1));
       if ( type==PURL::Nb_FileTypes ) {

Modified: trunk/piklab_kde4/src/tools/mpc/mpc_compile.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/mpc/mpc_compile.cpp	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/tools/mpc/mpc_compile.cpp	2012-04-07 19:38:04 UTC (rev 2866)
@@ -41,7 +41,7 @@
   if ( !file.openForRead() ) doLog(Log::LineType::Error, i18n("Could not find error file (%1).").arg(url.pretty()), QString::null, 0);
   else {
     QStringList lines = file.readLines();
-    for (uint i=0; i<lines.count(); i++) parseLine(lines[i]);
+    for (int i=0; i<lines.count(); i++) parseLine(lines[i]);
   }
   Compile::Process::done(code);
 }

Modified: trunk/piklab_kde4/src/tools/picc/picc.cpp
===================================================================
--- trunk/piklab_kde4/src/tools/picc/picc.cpp	2012-03-19 00:16:34 UTC (rev 2865)
+++ trunk/piklab_kde4/src/tools/picc/picc.cpp	2012-04-07 19:38:04 UTC (rev 2866)
@@ -65,7 +65,7 @@
 {
   QValueList<const Device::Data *> list;
   QStringList lines = QStringList::split('\n', s);
-  for (uint i=0; i<lines.count(); i++) {
+  for (int i=0; i<lines.count(); i++) {
     QRegExp re("([A-Za-z0-9]+):.*");
     if ( !re.exactMatch(lines[i]) ) continue;
     const Device::Data* data = Device::Lister::instance().data(re.cap(1));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2865] trunk/piklab/src/coff/base/coff.xml

[<az...@us...>]

Revision: 2865
          http://piklab.svn.sourceforge.net/piklab/?rev=2865&view=rev
Author:   azhyd
Date:     2012-03-19 00:16:34 +0000 (Mon, 19 Mar 2012)
Log Message:
-----------
add missing coff id

Modified Paths:
--------------
    trunk/piklab/src/coff/base/coff.xml

Modified: trunk/piklab/src/coff/base/coff.xml
===================================================================
--- trunk/piklab/src/coff/base/coff.xml	2012-03-19 00:02:12 UTC (rev 2864)
+++ trunk/piklab/src/coff/base/coff.xml	2012-03-19 00:16:34 UTC (rev 2865)
@@ -1,5 +1,5 @@
 <!-- ************************************************************************* -->
-<!-- * Copyright (C) 2006-2010 Nicolas Hadacek <ha...@kd...>             * -->
+<!-- * Copyright (C) 2006-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  * -->
@@ -15,6 +15,8 @@
   <device name="10f206" id="0xf206" />
   <device name="10f220" id="0xf220" />
   <device name="10f222" id="0xf222" />
+  <device name="10f320" id="0xf320" />
+  <device name="10f322" id="0xf322" />
   <device name="12c508" id="0x2508" />
   <device name="12c508a" id="0x508a" />
   <device name="12c509" id="0x2509" />
@@ -32,10 +34,12 @@
   <device name="12f519" id="0xf519" />
   <device name="12f609" id="0xf609" />
   <device name="12f615" id="0xf615" />
+  <device name="12f617" id="0xf617" />
   <device name="12f629" id="0x2629" />
   <device name="12f635" id="0xf635" />
   <device name="12f675" id="0x2675" />
   <device name="12f683" id="0xf683" />
+  <device name="12f752" id="0xf752" />
   <device name="14000" id="0x4000" />
 <!--  <device name="16c5x" id="0x658a" /> -->
 <!--  <device name="16cxx" id="0x6c77" /> -->
@@ -72,11 +76,13 @@
   <device name="16c63a" id="0x663a" />
   <device name="16c64" id="0x6c64" />
   <device name="16c64a" id="0x664a" />
+  <device name="16c641" id="0x6641" />
   <device name="16c642" id="0x6642" />
   <device name="16c65" id="0x6c65" />
   <device name="16c65a" id="0x665a" />
   <device name="16c65b" id="0x665b" />
   <device name="16c66" id="0x6c66" />
+  <device name="16c661" id="0x6661" />
   <device name="16c662" id="0x6662" />
   <device name="16c67" id="0x6c67" />
   <device name="16c71" id="0x6c71" />
@@ -129,8 +135,13 @@
   <device name="16cr64" id="0xdc64" />
   <device name="16cr65" id="0x6d65" />
   <device name="16cr72" id="0x6d72" />
+  <device name="16cr73" id="0x6d73" />
+  <device name="16cr74" id="0x6d74" />
+  <device name="16cr76" id="0x6d76" />
+  <device name="16cr77" id="0x6d77" />
   <device name="16cr83" id="0xdc83" />
   <device name="16cr84" id="0xdc84" />
+  <device name="16f1507" id="0x1507" />
   <device name="16f1826" id="0x1826" />
   <device name="16f1827" id="0x1827" />
   <device name="16f1829" id="0x1829" />
@@ -138,6 +149,10 @@
   <device name="16f1934" id="0x1934" />
   <device name="16f1936" id="0x1936" />
   <device name="16f1937" id="0x1937" />
+  <device name="16f1938" id="0x1938" />
+  <device name="16f1939" id="0x1939" />
+  <device name="16f1946" id="0x1946" />
+  <device name="16f1947" id="0x1947" />
   <device name="16f505" id="0xf505" />
   <device name="16f506" id="0xf506" />
   <device name="16f526" id="0xf526" />

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2864] trunk/piklab

[<az...@us...>]

Revision: 2864
          http://piklab.svn.sourceforge.net/piklab/?rev=2864&view=rev
Author:   azhyd
Date:     2012-03-19 00:02:12 +0000 (Mon, 19 Mar 2012)
Log Message:
-----------
added device family enhanced mid-range

Modified Paths:
--------------
    trunk/piklab/Changelog
    trunk/piklab/src/coff/base/coff_object.cpp
    trunk/piklab/src/coff/base/gpdis.cpp
    trunk/piklab/src/coff/xml/xml_coff_parser.cpp
    trunk/piklab/src/common/port/usb_port.cpp
    trunk/piklab/src/devices/pic/base/pic.cpp
    trunk/piklab/src/devices/pic/base/pic.h
    trunk/piklab/src/devices/pic/base/pic_register.cpp
    trunk/piklab/src/devices/pic/pic/pic_memory.cpp
    trunk/piklab/src/devices/pic/prog/pic_prog.cpp
    trunk/piklab/src/devices/pic/xml_data/10F200.xml
    trunk/piklab/src/devices/pic/xml_data/10F202.xml
    trunk/piklab/src/devices/pic/xml_data/10F204.xml
    trunk/piklab/src/devices/pic/xml_data/10F206.xml
    trunk/piklab/src/devices/pic/xml_data/10F220.xml
    trunk/piklab/src/devices/pic/xml_data/10F222.xml
    trunk/piklab/src/devices/pic/xml_data/10F320.xml
    trunk/piklab/src/devices/pic/xml_data/10F322.xml
    trunk/piklab/src/devices/pic/xml_data/12C508.xml
    trunk/piklab/src/devices/pic/xml_data/12C508A.xml
    trunk/piklab/src/devices/pic/xml_data/12C509.xml
    trunk/piklab/src/devices/pic/xml_data/12C509A.xml
    trunk/piklab/src/devices/pic/xml_data/12C671.xml
    trunk/piklab/src/devices/pic/xml_data/12C672.xml
    trunk/piklab/src/devices/pic/xml_data/12CE518.xml
    trunk/piklab/src/devices/pic/xml_data/12CE519.xml
    trunk/piklab/src/devices/pic/xml_data/12CE673.xml
    trunk/piklab/src/devices/pic/xml_data/12CE674.xml
    trunk/piklab/src/devices/pic/xml_data/12CR509A.xml
    trunk/piklab/src/devices/pic/xml_data/12F508.xml
    trunk/piklab/src/devices/pic/xml_data/12F509.xml
    trunk/piklab/src/devices/pic/xml_data/12F510.xml
    trunk/piklab/src/devices/pic/xml_data/12F519.xml
    trunk/piklab/src/devices/pic/xml_data/12F609.xml
    trunk/piklab/src/devices/pic/xml_data/12F615.xml
    trunk/piklab/src/devices/pic/xml_data/12F617.xml
    trunk/piklab/src/devices/pic/xml_data/12F629.xml
    trunk/piklab/src/devices/pic/xml_data/12F635.xml
    trunk/piklab/src/devices/pic/xml_data/12F675.xml
    trunk/piklab/src/devices/pic/xml_data/12F683.xml
    trunk/piklab/src/devices/pic/xml_data/12F752.xml
    trunk/piklab/src/devices/pic/xml_data/14000.xml
    trunk/piklab/src/devices/pic/xml_data/16C432.xml
    trunk/piklab/src/devices/pic/xml_data/16C433.xml
    trunk/piklab/src/devices/pic/xml_data/16C505.xml
    trunk/piklab/src/devices/pic/xml_data/16C52.xml
    trunk/piklab/src/devices/pic/xml_data/16C54.xml
    trunk/piklab/src/devices/pic/xml_data/16C54A.xml
    trunk/piklab/src/devices/pic/xml_data/16C54B.xml
    trunk/piklab/src/devices/pic/xml_data/16C54C.xml
    trunk/piklab/src/devices/pic/xml_data/16C55.xml
    trunk/piklab/src/devices/pic/xml_data/16C554.xml
    trunk/piklab/src/devices/pic/xml_data/16C557.xml
    trunk/piklab/src/devices/pic/xml_data/16C558.xml
    trunk/piklab/src/devices/pic/xml_data/16C55A.xml
    trunk/piklab/src/devices/pic/xml_data/16C56.xml
    trunk/piklab/src/devices/pic/xml_data/16C56A.xml
    trunk/piklab/src/devices/pic/xml_data/16C57.xml
    trunk/piklab/src/devices/pic/xml_data/16C57C.xml
    trunk/piklab/src/devices/pic/xml_data/16C58A.xml
    trunk/piklab/src/devices/pic/xml_data/16C58B.xml
    trunk/piklab/src/devices/pic/xml_data/16C61.xml
    trunk/piklab/src/devices/pic/xml_data/16C62.xml
    trunk/piklab/src/devices/pic/xml_data/16C620.xml
    trunk/piklab/src/devices/pic/xml_data/16C620A.xml
    trunk/piklab/src/devices/pic/xml_data/16C621.xml
    trunk/piklab/src/devices/pic/xml_data/16C621A.xml
    trunk/piklab/src/devices/pic/xml_data/16C622.xml
    trunk/piklab/src/devices/pic/xml_data/16C622A.xml
    trunk/piklab/src/devices/pic/xml_data/16C62A.xml
    trunk/piklab/src/devices/pic/xml_data/16C62B.xml
    trunk/piklab/src/devices/pic/xml_data/16C63.xml
    trunk/piklab/src/devices/pic/xml_data/16C63A.xml
    trunk/piklab/src/devices/pic/xml_data/16C64.xml
    trunk/piklab/src/devices/pic/xml_data/16C641.xml
    trunk/piklab/src/devices/pic/xml_data/16C642.xml
    trunk/piklab/src/devices/pic/xml_data/16C64A.xml
    trunk/piklab/src/devices/pic/xml_data/16C65.xml
    trunk/piklab/src/devices/pic/xml_data/16C65A.xml
    trunk/piklab/src/devices/pic/xml_data/16C65B.xml
    trunk/piklab/src/devices/pic/xml_data/16C66.xml
    trunk/piklab/src/devices/pic/xml_data/16C661.xml
    trunk/piklab/src/devices/pic/xml_data/16C662.xml
    trunk/piklab/src/devices/pic/xml_data/16C67.xml
    trunk/piklab/src/devices/pic/xml_data/16C71.xml
    trunk/piklab/src/devices/pic/xml_data/16C710.xml
    trunk/piklab/src/devices/pic/xml_data/16C711.xml
    trunk/piklab/src/devices/pic/xml_data/16C712.xml
    trunk/piklab/src/devices/pic/xml_data/16C715.xml
    trunk/piklab/src/devices/pic/xml_data/16C716.xml
    trunk/piklab/src/devices/pic/xml_data/16C717.xml
    trunk/piklab/src/devices/pic/xml_data/16C72.xml
    trunk/piklab/src/devices/pic/xml_data/16C72A.xml
    trunk/piklab/src/devices/pic/xml_data/16C73.xml
    trunk/piklab/src/devices/pic/xml_data/16C73A.xml
    trunk/piklab/src/devices/pic/xml_data/16C73B.xml
    trunk/piklab/src/devices/pic/xml_data/16C74.xml
    trunk/piklab/src/devices/pic/xml_data/16C745.xml
    trunk/piklab/src/devices/pic/xml_data/16C74A.xml
    trunk/piklab/src/devices/pic/xml_data/16C74B.xml
    trunk/piklab/src/devices/pic/xml_data/16C76.xml
    trunk/piklab/src/devices/pic/xml_data/16C765.xml
    trunk/piklab/src/devices/pic/xml_data/16C77.xml
    trunk/piklab/src/devices/pic/xml_data/16C770.xml
    trunk/piklab/src/devices/pic/xml_data/16C771.xml
    trunk/piklab/src/devices/pic/xml_data/16C773.xml
    trunk/piklab/src/devices/pic/xml_data/16C774.xml
    trunk/piklab/src/devices/pic/xml_data/16C781.xml
    trunk/piklab/src/devices/pic/xml_data/16C782.xml
    trunk/piklab/src/devices/pic/xml_data/16C84.xml
    trunk/piklab/src/devices/pic/xml_data/16C923.xml
    trunk/piklab/src/devices/pic/xml_data/16C924.xml
    trunk/piklab/src/devices/pic/xml_data/16C925.xml
    trunk/piklab/src/devices/pic/xml_data/16C926.xml
    trunk/piklab/src/devices/pic/xml_data/16CE623.xml
    trunk/piklab/src/devices/pic/xml_data/16CE624.xml
    trunk/piklab/src/devices/pic/xml_data/16CE625.xml
    trunk/piklab/src/devices/pic/xml_data/16CR54A.xml
    trunk/piklab/src/devices/pic/xml_data/16CR54B.xml
    trunk/piklab/src/devices/pic/xml_data/16CR54C.xml
    trunk/piklab/src/devices/pic/xml_data/16CR56A.xml
    trunk/piklab/src/devices/pic/xml_data/16CR57B.xml
    trunk/piklab/src/devices/pic/xml_data/16CR57C.xml
    trunk/piklab/src/devices/pic/xml_data/16CR58A.xml
    trunk/piklab/src/devices/pic/xml_data/16CR58B.xml
    trunk/piklab/src/devices/pic/xml_data/16CR62.xml
    trunk/piklab/src/devices/pic/xml_data/16CR620A.xml
    trunk/piklab/src/devices/pic/xml_data/16CR63.xml
    trunk/piklab/src/devices/pic/xml_data/16CR64.xml
    trunk/piklab/src/devices/pic/xml_data/16CR65.xml
    trunk/piklab/src/devices/pic/xml_data/16CR72.xml
    trunk/piklab/src/devices/pic/xml_data/16CR73.xml
    trunk/piklab/src/devices/pic/xml_data/16CR74.xml
    trunk/piklab/src/devices/pic/xml_data/16CR76.xml
    trunk/piklab/src/devices/pic/xml_data/16CR77.xml
    trunk/piklab/src/devices/pic/xml_data/16CR83.xml
    trunk/piklab/src/devices/pic/xml_data/16CR84.xml
    trunk/piklab/src/devices/pic/xml_data/16F1507.xml
    trunk/piklab/src/devices/pic/xml_data/16F1826.xml
    trunk/piklab/src/devices/pic/xml_data/16F1827.xml
    trunk/piklab/src/devices/pic/xml_data/16F1829.xml
    trunk/piklab/src/devices/pic/xml_data/16F1933.xml
    trunk/piklab/src/devices/pic/xml_data/16F1934.xml
    trunk/piklab/src/devices/pic/xml_data/16F1936.xml
    trunk/piklab/src/devices/pic/xml_data/16F1937.xml
    trunk/piklab/src/devices/pic/xml_data/16F1938.xml
    trunk/piklab/src/devices/pic/xml_data/16F1939.xml
    trunk/piklab/src/devices/pic/xml_data/16F1946.xml
    trunk/piklab/src/devices/pic/xml_data/16F1947.xml
    trunk/piklab/src/devices/pic/xml_data/16F505.xml
    trunk/piklab/src/devices/pic/xml_data/16F506.xml
    trunk/piklab/src/devices/pic/xml_data/16F526.xml
    trunk/piklab/src/devices/pic/xml_data/16F54.xml
    trunk/piklab/src/devices/pic/xml_data/16F57.xml
    trunk/piklab/src/devices/pic/xml_data/16F59.xml
    trunk/piklab/src/devices/pic/xml_data/16F610.xml
    trunk/piklab/src/devices/pic/xml_data/16F616.xml
    trunk/piklab/src/devices/pic/xml_data/16F627.xml
    trunk/piklab/src/devices/pic/xml_data/16F627A.xml
    trunk/piklab/src/devices/pic/xml_data/16F628.xml
    trunk/piklab/src/devices/pic/xml_data/16F628A.xml
    trunk/piklab/src/devices/pic/xml_data/16F630.xml
    trunk/piklab/src/devices/pic/xml_data/16F631.xml
    trunk/piklab/src/devices/pic/xml_data/16F636.xml
    trunk/piklab/src/devices/pic/xml_data/16F639.xml
    trunk/piklab/src/devices/pic/xml_data/16F648A.xml
    trunk/piklab/src/devices/pic/xml_data/16F676.xml
    trunk/piklab/src/devices/pic/xml_data/16F677.xml
    trunk/piklab/src/devices/pic/xml_data/16F684.xml
    trunk/piklab/src/devices/pic/xml_data/16F685.xml
    trunk/piklab/src/devices/pic/xml_data/16F687.xml
    trunk/piklab/src/devices/pic/xml_data/16F688.xml
    trunk/piklab/src/devices/pic/xml_data/16F689.xml
    trunk/piklab/src/devices/pic/xml_data/16F690.xml
    trunk/piklab/src/devices/pic/xml_data/16F716.xml
    trunk/piklab/src/devices/pic/xml_data/16F72.xml
    trunk/piklab/src/devices/pic/xml_data/16F722.xml
    trunk/piklab/src/devices/pic/xml_data/16F723.xml
    trunk/piklab/src/devices/pic/xml_data/16F724.xml
    trunk/piklab/src/devices/pic/xml_data/16F726.xml
    trunk/piklab/src/devices/pic/xml_data/16F727.xml
    trunk/piklab/src/devices/pic/xml_data/16F73.xml
    trunk/piklab/src/devices/pic/xml_data/16F737.xml
    trunk/piklab/src/devices/pic/xml_data/16F74.xml
    trunk/piklab/src/devices/pic/xml_data/16F747.xml
    trunk/piklab/src/devices/pic/xml_data/16F76.xml
    trunk/piklab/src/devices/pic/xml_data/16F767.xml
    trunk/piklab/src/devices/pic/xml_data/16F77.xml
    trunk/piklab/src/devices/pic/xml_data/16F777.xml
    trunk/piklab/src/devices/pic/xml_data/16F785.xml
    trunk/piklab/src/devices/pic/xml_data/16F818.xml
    trunk/piklab/src/devices/pic/xml_data/16F819.xml
    trunk/piklab/src/devices/pic/xml_data/16F83.xml
    trunk/piklab/src/devices/pic/xml_data/16F84.xml
    trunk/piklab/src/devices/pic/xml_data/16F84A.xml
    trunk/piklab/src/devices/pic/xml_data/16F87.xml
    trunk/piklab/src/devices/pic/xml_data/16F870.xml
    trunk/piklab/src/devices/pic/xml_data/16F871.xml
    trunk/piklab/src/devices/pic/xml_data/16F872.xml
    trunk/piklab/src/devices/pic/xml_data/16F873.xml
    trunk/piklab/src/devices/pic/xml_data/16F873A.xml
    trunk/piklab/src/devices/pic/xml_data/16F874.xml
    trunk/piklab/src/devices/pic/xml_data/16F874A.xml
    trunk/piklab/src/devices/pic/xml_data/16F876.xml
    trunk/piklab/src/devices/pic/xml_data/16F876A.xml
    trunk/piklab/src/devices/pic/xml_data/16F877.xml
    trunk/piklab/src/devices/pic/xml_data/16F877A.xml
    trunk/piklab/src/devices/pic/xml_data/16F88.xml
    trunk/piklab/src/devices/pic/xml_data/16F882.xml
    trunk/piklab/src/devices/pic/xml_data/16F883.xml
    trunk/piklab/src/devices/pic/xml_data/16F884.xml
    trunk/piklab/src/devices/pic/xml_data/16F886.xml
    trunk/piklab/src/devices/pic/xml_data/16F887.xml
    trunk/piklab/src/devices/pic/xml_data/16F913.xml
    trunk/piklab/src/devices/pic/xml_data/16F914.xml
    trunk/piklab/src/devices/pic/xml_data/16F916.xml
    trunk/piklab/src/devices/pic/xml_data/16F917.xml
    trunk/piklab/src/devices/pic/xml_data/16F946.xml
    trunk/piklab/src/devices/pic/xml_data/16HV540.xml
    trunk/piklab/src/progs/icd2/base/icd2_debug.cpp
    trunk/piklab/src/progs/tbl_bootloader/base/tbl_bootloader.cpp
    trunk/piklab/src/tools/boost/boostbasic.h
    trunk/piklab/src/tools/boost/boostc.h
    trunk/piklab/src/tools/boost/boostcpp.h
    trunk/piklab/src/tools/cc5x/cc5x.cpp
    trunk/piklab/src/tools/ccsc/ccsc_compile.cpp
    trunk/piklab/src/tools/gputils/gputils_generator.cpp
    trunk/piklab/src/tools/jalv2/jalv2.cpp
    trunk/piklab/src/tools/mpc/mpc.cpp
    trunk/piklab/src/tools/sdcc/sdcc_generator.cpp

Modified: trunk/piklab/Changelog
===================================================================
--- trunk/piklab/Changelog	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/Changelog	2012-03-19 00:02:12 UTC (rev 2864)
@@ -1,6 +1,7 @@
-0.15.13 (14 March 2012)
+0.15.13 (18 March 2012)
 * add default argument "--use-non-free" to sdcc [patch by Gál Zsolt]
 * added support for 10F320/322, 12F617/752
+* added device family "enhanced mid-range" in device chooser
 
 0.15.12 (19 February 2012)
 * added support for 18F2XK22/18F4XK22 [patch by Micheal Vrolijk]

Modified: trunk/piklab/src/coff/base/coff_object.cpp
===================================================================
--- trunk/piklab/src/coff/base/coff_object.cpp	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/coff/base/coff_object.cpp	2012-03-19 00:02:12 UTC (rev 2864)
@@ -624,7 +624,8 @@
     Register::TypeData td(it.key(), it.data().address, it.data().nbChars);
     list.append(Pic::RegisterNameData(it.key(), td));
   }
-  if ( data.architecture()==Pic::Architecture::P16X )
+  if ( data.architecture()==Pic::Architecture::MidRange
+       || data.architecture()==Pic::Architecture::EMidRange)
     list.append(Pic::RegisterNameData("WREG", Register::TypeData("WREG", rdata.nbChars())));
   qSort(list);
   return list;

Modified: trunk/piklab/src/coff/base/gpdis.cpp
===================================================================
--- trunk/piklab/src/coff/base/gpdis.cpp	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/coff/base/gpdis.cpp	2012-03-19 00:02:12 UTC (rev 2864)
@@ -67,7 +67,7 @@
   case Pic::Architecture::P33F:
     snprintf(buffer, sizeof_buffer, "--");
     return 0;
-  case Pic::Architecture::P10X:
+  case Pic::Architecture::Baseline:
     for(i = 0; i < num_op_12c5xx; i++) {
       if((op_12c5xx[i].mask & opcode) == op_12c5xx[i].opcode) {
         instruction = &op_12c5xx[i];
@@ -84,7 +84,8 @@
     }
     break;
 */
-  case Pic::Architecture::P16X:
+  case Pic::Architecture::MidRange:
+  case Pic::Architecture::EMidRange:
     for(i = 0; i < num_op_16cxx; i++) {
       if((op_16cxx[i].mask & opcode) == op_16cxx[i].opcode) {
         instruction = &op_16cxx[i];

Modified: trunk/piklab/src/coff/xml/xml_coff_parser.cpp
===================================================================
--- trunk/piklab/src/coff/xml/xml_coff_parser.cpp	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/coff/xml/xml_coff_parser.cpp	2012-03-19 00:02:12 UTC (rev 2864)
@@ -81,8 +81,9 @@
   for (::Group::Base::const_iterator it = gpic.begin(); it != gpic.end(); ++it) {
     const Pic::Data *data = static_cast<const Pic::Data*>(it->second.data);
     switch (data->architecture().type()) {
-      case Pic::Architecture::P10X:
-      case Pic::Architecture::P16X:
+      case Pic::Architecture::Baseline:
+      case Pic::Architecture::MidRange:
+      case Pic::Architecture::EMidRange:
       case Pic::Architecture::P17C:
       case Pic::Architecture::P18C:
       case Pic::Architecture::P18F:

Modified: trunk/piklab/src/common/port/usb_port.cpp
===================================================================
--- trunk/piklab/src/common/port/usb_port.cpp	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/common/port/usb_port.cpp	2012-03-19 00:02:12 UTC (rev 2864)
@@ -225,13 +225,13 @@
     setSystemError(i18n("Error resetting USB device."));
     return false;
   }
-#  endif
   usb_close(_handle);
   _handle = usb_open(_device);
   if ( _handle==0 ) {
     setSystemError(i18n("Error opening USB device."));
     return false;
   }
+#  endif
   tryToDetachDriver();
   uint i = 0;
   for (; i<_device->descriptor.bNumConfigurations; i++)

Modified: trunk/piklab/src/devices/pic/base/pic.cpp
===================================================================
--- trunk/piklab/src/devices/pic/base/pic.cpp	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/base/pic.cpp	2012-03-19 00:02:12 UTC (rev 2864)
@@ -37,8 +37,9 @@
 //  name family_label nbBytesPC nbBytesWord nbBitsRegister registerBankLength
 //  {Code, Cal, UserID, DevId, Conf, EEPROM, DebugVec, HardStack, CalBackup, Program Executive}
 //  properties nominalVdd
-  { "10X", I18N_NOOP("Baseline Family"),  0, 2, 8, 0x020, { 12, 12, 12, 12, 12,  8, 12,  0, 12,  0 },  NoArchitectureProperty, 5.0 }, // 9, 10, 11 or 12-bit program counter
-  { "16X", I18N_NOOP("Midrange Family"), 13, 2, 8, 0x080, { 14, 14, 14, 14, 14,  8, 14,  0, 14,  0 },  MaybeSelfWrite, 5.0 }, // max eeprom: 256 words
+  { "baseline", I18N_NOOP("Baseline Family"),  0, 2, 8, 0x020, { 12, 12, 12, 12, 12,  8, 12,  0, 12,  0 },  NoArchitectureProperty, 5.0 }, // 9, 10, 11 or 12-bit program counter
+  { "midrange", I18N_NOOP("Mid-Range Family"), 13, 2, 8, 0x080, { 14, 14, 14, 14, 14,  8, 14,  0, 14,  0 },  MaybeSelfWrite, 5.0 }, // max eeprom: 256 words
+  { "emidrange", I18N_NOOP("Enhance Mid-Range Family"), 13, 2, 8, 0x080, { 14, 14, 14, 14, 14,  8, 14,  0, 14,  0 },  MaybeSelfWrite, 5.0 }, // max eeprom: 256 words
   { "17C", I18N_NOOP("17C Family"),      16, 2, 8, 0x100, { 16,  0,  0,  0, 16,  8,  0,  0,  0,  0 },  RandomMemoryAccess,     5.0 },
   { "18C", I18N_NOOP("18C Family"),      21, 2, 8, 0x100, { 16,  8,  8,  8,  8,  8, 16,  0,  8,  0 },  PackedHex | RandomMemoryAccess, 5.0 },
   { "18F", I18N_NOOP("18F Family"),      21, 2, 8, 0x100, { 16,  8,  8,  8,  8,  8, 16,  0,  8,  0 },  PackedHex | RandomMemoryAccess | MaybeSelfWrite, 5.0 },
@@ -153,8 +154,9 @@
     idata.special = it.key();
     BitValue nid = 0x0;
     switch (architecture().type()) {
-      case Architecture::P10X:
-      case Architecture::P16X:
+      case Architecture::Baseline:
+      case Architecture::MidRange:
+      case Architecture::EMidRange:
       case Architecture::P17C:
       case Architecture::P18C:
       case Architecture::P18F:
@@ -191,8 +193,9 @@
   QMap<QString, Device::IdData>::const_iterator it;
   for (it=ids.begin(); it!=ids.end(); ++it) {
     switch (_architecture.type()) {
-      case Architecture::P10X:
-      case Architecture::P16X:
+      case Architecture::Baseline:
+      case Architecture::MidRange:
+      case Architecture::EMidRange:
       case Architecture::P17C:
       case Architecture::P18C:
       case Architecture::P18F:
@@ -278,12 +281,13 @@
   Q_ASSERT( address<addressIncrement(MemoryRangeType::Code)*nbWords(MemoryRangeType::Code) );
   Device::Array a;
   switch (_architecture.type()) {
-  case Architecture::P10X:
+  case Architecture::Baseline:
     if ( nbWords(MemoryRangeType::Code)>0x1FF && withPageSelection)
       a.append(0x4A3 | (address>0x1FF ? 0x100 : 0x000)); // bsf STATUS,PA0 or bcf STATUS,PA0
     a.append(0xA00 | (address.toUInt() & 0x1FF)); // goto
     break;
-  case Architecture::P16X:
+  case Architecture::MidRange:
+  case Architecture::EMidRange:
     if ( nbWords(MemoryRangeType::Code)>0x7FF && withPageSelection ) {
       if ( address<=0x7FF ) a.append(0x018A); // clrf PCLATH
       else {
@@ -317,8 +321,9 @@
 bool Pic::Data::isGotoInstruction(BitValue instruction) const
 {
   switch (_architecture.type()) {
-  case Architecture::P10X: return ( instruction.maskWith(0xE00)==0xA00 );
-  case Architecture::P16X: return ( instruction.maskWith(0xF800)==0x2800 );
+  case Architecture::Baseline: return ( instruction.maskWith(0xE00)==0xA00 );
+  case Architecture::MidRange:
+  case Architecture::EMidRange: return ( instruction.maskWith(0xF800)==0x2800 );
   case Architecture::P17C: return ( instruction.maskWith(0xE000)==0xC000 );
   case Architecture::P18C:
   case Architecture::P18F:

Modified: trunk/piklab/src/devices/pic/base/pic.h
===================================================================
--- trunk/piklab/src/devices/pic/base/pic.h	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/base/pic.h	2012-03-19 00:02:12 UTC (rev 2864)
@@ -65,7 +65,7 @@
   double nominalVdd;
 };
 BEGIN_DECLARE_ENUM(Architecture)
-  P10X = 0, P16X, P17C, P18C, P18F, P18J, P24F, P24H, P30F, P33F
+  Baseline = 0, MidRange, EMidRange, P17C, P18C, P18F, P18J, P24F, P24H, P30F, P33F
 END_DECLARE_ENUM(Architecture, ArchitectureData)
 
 enum MemoryRangeProperty { NotPresent = 0, Present = 1, Programmable = 2 };

Modified: trunk/piklab/src/devices/pic/base/pic_register.cpp
===================================================================
--- trunk/piklab/src/devices/pic/base/pic_register.cpp	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/base/pic_register.cpp	2012-03-19 00:02:12 UTC (rev 2864)
@@ -138,7 +138,10 @@
 
 QString Pic::RegistersData::latchName(uint index) const
 {
-  if ( _data.architecture()==Architecture::P10X || _data.architecture()==Architecture::P16X || _data.architecture()==Architecture::P17C )
+  if ( _data.architecture()==Architecture::Baseline
+       || _data.architecture()==Architecture::MidRange
+       || _data.architecture()==Architecture::EMidRange
+       || _data.architecture()==Architecture::P17C )
     return QString::null;
   return QString("LAT") + char('A' + index);
 }

Modified: trunk/piklab/src/devices/pic/pic/pic_memory.cpp
===================================================================
--- trunk/piklab/src/devices/pic/pic/pic_memory.cpp	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/pic/pic_memory.cpp	2012-03-19 00:02:12 UTC (rev 2864)
@@ -299,11 +299,12 @@
 {
   clear();
   switch (device().architecture().type()) {
-    case Architecture::P10X:
+    case Architecture::Baseline:
       setWord(MemoryRangeType::Code, device().range(MemoryRangeType::Code).start.toUInt(), 0x723);
       setWord(MemoryRangeType::Code, device().range(MemoryRangeType::Code).end.toUInt(), 0x723);
       break;
-    case Architecture::P16X:
+    case Architecture::MidRange:
+    case Architecture::EMidRange:
       if ( device().name()=="16F72" || device().name()=="16F73" || device().name()=="16F74" || device().name()=="16F76" || device().name()=="16F77"
            || device().name()=="16CR73" || device().name()=="16CR74" || device().name()=="16CR76" || device().name()=="16CR77" ) {
         setWord(MemoryRangeType::Code, device().range(MemoryRangeType::Code).start.toUInt(), 0x05E6);
@@ -366,8 +367,9 @@
     BitValue v = word(MemoryRangeType::Code, i).maskWith(mask);
     //if ( i==0 || i==device().nbWords(MemoryRangeType::Code)-1 ) qDebug("%s %s", toHexLabel(i, 4).latin1(), toHexLabel(v, 4).latin1());
     switch (device().architecture().type()) {
-      case Architecture::P10X:
-      case Architecture::P16X:
+      case Architecture::Baseline:
+      case Architecture::MidRange:
+      case Architecture::EMidRange:
       case Architecture::P17C:
         if ( rv.contains(i) ) {
           switch (algorithm.type()) {

Modified: trunk/piklab/src/devices/pic/prog/pic_prog.cpp
===================================================================
--- trunk/piklab/src/devices/pic/prog/pic_prog.cpp	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/prog/pic_prog.cpp	2012-03-19 00:02:12 UTC (rev 2864)
@@ -19,8 +19,9 @@
   const Pic::Data *data = static_cast<const Pic::Data *>(base.device());
   if (data != NULL) {
     switch (data->architecture().type()) {
-      case Pic::Architecture::P10X:
-      case Pic::Architecture::P16X: return new ::Debugger::P16FSpecific(base);
+      case Pic::Architecture::Baseline:
+      case Pic::Architecture::MidRange:
+      case Pic::Architecture::EMidRange: return new ::Debugger::P16FSpecific(base);
       case Pic::Architecture::P18C:
       case Pic::Architecture::P18F:
       case Pic::Architecture::P18J: return new ::Debugger::P18FSpecific(base);
@@ -161,8 +162,9 @@
   Q_ASSERT( data.count()!=0 );
   BitValue id = 0x0;
   switch (device()->architecture().type()) {
-    case Pic::Architecture::P10X:
-    case Pic::Architecture::P16X:
+    case Pic::Architecture::Baseline:
+    case Pic::Architecture::MidRange:
+    case Pic::Architecture::EMidRange:
     case Pic::Architecture::P17C: id = data[0]; break;
     case Pic::Architecture::P18C:
     case Pic::Architecture::P18F:

Modified: trunk/piklab/src/devices/pic/xml_data/10F200.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/10F200.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/10F200.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="10F200" document="019863" status="IP" memory_technology="FLASH" architecture="10X" pc="9"
+<device name="10F200" document="019863" status="IP" memory_technology="FLASH" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/10F202.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/10F202.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/10F202.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="10F202" document="020030" status="IP" memory_technology="FLASH" architecture="10X" pc="9"
+<device name="10F202" document="020030" status="IP" memory_technology="FLASH" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/10F204.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/10F204.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/10F204.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="10F204" document="020031" status="IP" memory_technology="FLASH" architecture="10X" pc="9"
+<device name="10F204" document="020031" status="IP" memory_technology="FLASH" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/10F206.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/10F206.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/10F206.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="10F206" document="020032" status="IP" memory_technology="FLASH" architecture="10X" pc="9"
+<device name="10F206" document="020032" status="IP" memory_technology="FLASH" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/10F220.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/10F220.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/10F220.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="10F220" document="023673" status="IP" memory_technology="FLASH" architecture="10X" pc="9"
+<device name="10F220" document="023673" status="IP" memory_technology="FLASH" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/10F222.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/10F222.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/10F222.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="10F222" document="023672" status="IP" memory_technology="FLASH" architecture="10X" pc="9"
+<device name="10F222" document="023672" status="IP" memory_technology="FLASH" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/10F320.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/10F320.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/10F320.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="10F320" status="IP" memory_technology="FLASH" self_write="yes" architecture="16X" id="0x29A0"
+<device name="10F320" status="IP" memory_technology="FLASH" self_write="yes" architecture="midrange" id="0x29A0"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/10F322.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/10F322.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/10F322.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="10F322" status="IP" memory_technology="FLASH" self_write="yes" architecture="16X" id="0x2980"
+<device name="10F322" status="IP" memory_technology="FLASH" self_write="yes" architecture="midrange" id="0x2980"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/12C508.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/12C508.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/12C508.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="12C508" document="010102" status="NR" alternative="12F508" memory_technology="EPROM" architecture="10X" pc="9"
+<device name="12C508" document="010102" status="NR" alternative="12F508" memory_technology="EPROM" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/12C508A.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/12C508A.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/12C508A.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="12C508A" document="010103" status="NR" alternative="12F508" memory_technology="EPROM" architecture="10X" pc="9"
+<device name="12C508A" document="010103" status="NR" alternative="12F508" memory_technology="EPROM" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/12C509.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/12C509.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/12C509.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="12C509" document="010104" status="NR" alternative="12F509" memory_technology="EPROM" architecture="10X" pc="9"
+<device name="12C509" document="010104" status="NR" alternative="12F509" memory_technology="EPROM" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/12C509A.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/12C509A.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/12C509A.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="12C509A" document="010105" status="NR" alternative="12F509" memory_technology="EPROM" architecture="10X" pc="9"
+<device name="12C509A" document="010105" status="NR" alternative="12F509" memory_technology="EPROM" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/12C671.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/12C671.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/12C671.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="12C671" document="010106" status="NR" alternative="12F675" memory_technology="EPROM" architecture="16X"
+<device name="12C671" document="010106" status="NR" alternative="12F675" memory_technology="EPROM" architecture="midrange"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/12C672.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/12C672.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/12C672.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="12C672" document="010107" status="NR" alternative="12F683" memory_technology="EPROM" architecture="16X" 
+<device name="12C672" document="010107" status="NR" alternative="12F683" memory_technology="EPROM" architecture="midrange" 
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/12CE518.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/12CE518.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/12CE518.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="12CE518" document="010108" status="NR" alternative="12F629" memory_technology="EPROM" architecture="10X" pc="9"
+<device name="12CE518" document="010108" status="NR" alternative="12F629" memory_technology="EPROM" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/12CE519.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/12CE519.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/12CE519.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="12CE519" document="010109" status="NR" alternative="12F629" memory_technology="EPROM" architecture="10X" pc="9"
+<device name="12CE519" document="010109" status="NR" alternative="12F629" memory_technology="EPROM" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/12CE673.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/12CE673.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/12CE673.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="12CE673" document="010110" status="NR" alternative="12F675" memory_technology="EPROM" architecture="16X"
+<device name="12CE673" document="010110" status="NR" alternative="12F675" memory_technology="EPROM" architecture="midrange"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/12CE674.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/12CE674.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/12CE674.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="12CE674" document="010111" status="NR" alternative="12F683" memory_technology="EPROM" architecture="16X"
+<device name="12CE674" document="010111" status="NR" alternative="12F683" memory_technology="EPROM" architecture="midrange"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/12CR509A.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/12CR509A.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/12CR509A.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="12CR509A" document="010112" status="NR" alternative="12F509" memory_technology="ROM" architecture="10X" pc="9"
+<device name="12CR509A" document="010112" status="NR" alternative="12F509" memory_technology="ROM" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/12F508.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/12F508.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/12F508.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="12F508" document="020094" status="IP" memory_technology="FLASH" architecture="10X" pc="12"
+<device name="12F508" document="020094" status="IP" memory_technology="FLASH" architecture="baseline" pc="12"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/12F509.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/12F509.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/12F509.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="12F509" document="020095" status="IP" memory_technology="FLASH" architecture="10X" pc="12"
+<device name="12F509" document="020095" status="IP" memory_technology="FLASH" architecture="baseline" pc="12"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/12F510.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/12F510.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/12F510.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="12F510" document="023670" status="IP" memory_technology="FLASH" architecture="10X" pc="10"
+<device name="12F510" document="023670" status="IP" memory_technology="FLASH" architecture="baseline" pc="10"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/12F519.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/12F519.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/12F519.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="12F519" status="IP" memory_technology="FLASH" architecture="10X" pc="11"
+<device name="12F519" status="IP" memory_technology="FLASH" architecture="baseline" pc="11"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/12F609.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/12F609.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/12F609.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -8,7 +8,7 @@
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
 <device name="12F609" status="IP" memory_technology="FLASH" self_write="no"
-        self_write="no" architecture="16X" id="0x2240" id_high_voltage="0x2280"
+        self_write="no" architecture="midrange" id="0x2240" id_high_voltage="0x2280"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/12F615.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/12F615.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/12F615.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -8,7 +8,7 @@
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
 <device name="12F615" status="IP" memory_technology="FLASH" self_write="no"
-        architecture="16X" id="0x2180" id_high_voltage="0x21A0"
+        architecture="midrange" id="0x2180" id_high_voltage="0x21A0"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/12F617.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/12F617.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/12F617.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -8,7 +8,7 @@
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
 <device name="12F617" status="IP" memory_technology="FLASH" self_write="yes"
-        architecture="16X" id="0x2360"
+        architecture="midrange" id="0x2360"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/12F629.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/12F629.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/12F629.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -8,7 +8,7 @@
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
 <device name="12F629" document="010113" status="IP" memory_technology="FLASH"
-        self_write="no" self_write="no" architecture="16X" id="0x0F80"
+        self_write="no" self_write="no" architecture="midrange" id="0x0F80"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/12F635.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/12F635.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/12F635.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="12F635" document="019829" status="IP" memory_technology="FLASH" self_write="no" self_write="no" architecture="16X" id="0x0FA0"
+<device name="12F635" document="019829" status="IP" memory_technology="FLASH" self_write="no" self_write="no" architecture="midrange" id="0x0FA0"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/12F675.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/12F675.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/12F675.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -8,7 +8,7 @@
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
 <device name="12F675" document="010114" status="IP" memory_technology="FLASH"
-        self_write="no" self_write="no" architecture="16X" id="0x0FC0"
+        self_write="no" self_write="no" architecture="midrange" id="0x0FC0"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/12F683.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/12F683.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/12F683.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -8,7 +8,7 @@
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
 <device name="12F683" document="010115" status="IP" memory_technology="FLASH"
-        self_write="no" self_write="no" architecture="16X" id="0x0460"
+        self_write="no" self_write="no" architecture="midrange" id="0x0460"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/12F752.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/12F752.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/12F752.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -8,7 +8,7 @@
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
 <device name="12F752" status="IP" memory_technology="FLASH" self_write="yes"
-        architecture="16X" id="0x1500" id_high_voltage="0x1520"
+        architecture="midrange" id="0x1500" id_high_voltage="0x1520"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/14000.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/14000.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/14000.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="14000" document="010116" status="NR" alternative="16F883" memory_technology="EPROM" architecture="16X"
+<device name="14000" document="010116" status="NR" alternative="16F883" memory_technology="EPROM" architecture="midrange"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/16C432.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/16C432.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/16C432.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -8,7 +8,7 @@
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
 <device name="16C432" document="010117"  status="NR"
-        memory_technology="EPROM" architecture="16X"
+        memory_technology="EPROM" architecture="midrange"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/16C433.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/16C433.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/16C433.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="16C433" document="010118" status="IP" memory_technology="EPROM" architecture="16X"
+<device name="16C433" document="010118" status="IP" memory_technology="EPROM" architecture="midrange"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/16C505.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/16C505.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/16C505.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="16C505" document="010119" status="NR" alternative="16F505" memory_technology="EPROM" architecture="10X" pc="12"
+<device name="16C505" document="010119" status="NR" alternative="16F505" memory_technology="EPROM" architecture="baseline" pc="12"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/16C52.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/16C52.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/16C52.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="16C52" document="010120" status="EOL" memory_technology="EPROM" architecture="10X" pc="9"
+<device name="16C52" document="010120" status="EOL" memory_technology="EPROM" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/16C54.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/16C54.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/16C54.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="16C54" document="010121" status="NR" alternative="16F54" memory_technology="EPROM" architecture="10X" pc="9"
+<device name="16C54" document="010121" status="NR" alternative="16F54" memory_technology="EPROM" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/16C54A.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/16C54A.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/16C54A.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="16C54A" document="010122" status="NR" alternative="16F54" memory_technology="EPROM" architecture="10X" pc="9"
+<device name="16C54A" document="010122" status="NR" alternative="16F54" memory_technology="EPROM" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/16C54B.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/16C54B.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/16C54B.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="16C54B" document="010123" status="EOL" memory_technology="EPROM" architecture="10X" pc="9"
+<device name="16C54B" document="010123" status="EOL" memory_technology="EPROM" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/16C54C.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/16C54C.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/16C54C.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="16C54C" document="010124" status="NR" alternative="16F54" memory_technology="EPROM" architecture="10X" pc="9"
+<device name="16C54C" document="010124" status="NR" alternative="16F54" memory_technology="EPROM" architecture="baseline" pc="9"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 

Modified: trunk/piklab/src/devices/pic/xml_data/16C55.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/16C55.xml	2012-03-18 21:37:49 UTC (rev 2863)
+++ trunk/piklab/src/devices/pic/xml_data/16C55.xml	2012-03-19 00:02:12 UTC (rev 2864)
@@ -7,7 +7,7 @@
 <!--* the Free Software Foundation; either version 2 of the License, or    *-->
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
-<device name="16C55" document="010125" status="NR" alternative="16C55A" memor...
 
[truncated message content]

[Piklab-svn] SF.net SVN: piklab:[2863] trunk/piklab

[<az...@us...>]

Revision: 2863
          http://piklab.svn.sourceforge.net/piklab/?rev=2863&view=rev
Author:   azhyd
Date:     2012-03-18 21:37:49 +0000 (Sun, 18 Mar 2012)
Log Message:
-----------
add support for 10F320/322 12F617/752

Modified Paths:
--------------
    trunk/piklab/Changelog
    trunk/piklab/src/devices/pic/base/pic_config.cpp
    trunk/piklab/src/devices/pic/xml/pic_xml_to_data.cpp
    trunk/piklab/src/devices/pic/xml_data/12F609.xml
    trunk/piklab/src/devices/pic/xml_data/12F615.xml
    trunk/piklab/src/libgui/device_gui.cpp

Added Paths:
-----------
    trunk/piklab/src/devices/pic/xml_data/10F320.xml
    trunk/piklab/src/devices/pic/xml_data/10F322.xml
    trunk/piklab/src/devices/pic/xml_data/12F617.xml
    trunk/piklab/src/devices/pic/xml_data/12F752.xml

Modified: trunk/piklab/Changelog
===================================================================
--- trunk/piklab/Changelog	2012-03-17 18:01:56 UTC (rev 2862)
+++ trunk/piklab/Changelog	2012-03-18 21:37:49 UTC (rev 2863)
@@ -1,5 +1,6 @@
 0.15.13 (14 March 2012)
 * add default argument "--use-non-free" to sdcc [patch by Gál Zsolt]
+* added support for 10F320/322, 12F617/752
 
 0.15.12 (19 February 2012)
 * added support for 18F2XK22/18F4XK22 [patch by Micheal Vrolijk]

Modified: trunk/piklab/src/devices/pic/base/pic_config.cpp
===================================================================
--- trunk/piklab/src/devices/pic/base/pic_config.cpp	2012-03-17 18:01:56 UTC (rev 2862)
+++ trunk/piklab/src/devices/pic/base/pic_config.cpp	2012-03-18 21:37:49 UTC (rev 2863)
@@ -102,6 +102,7 @@
   { { "BORV",  I18N_NOOP("Brown-out reset voltage") }, ValueDouble, {
     { "0", I18N_NOOP("Undefined")  }, { 0, 0 } } },
   { { "LVP",   I18N_NOOP("Low voltage programming")   }, Toggle, { { 0, 0 } } },
+  { { "LPBOR", I18N_NOOP("Low power brown-out reset")   }, Toggle, { { 0, 0 } } },
   { { "CCP3MX", I18N_NOOP("CCP3 multiplex")           }, Pin, { { 0, 0 } } },
   { { "CCP2MX", I18N_NOOP("CCP2 multiplex")           }, Pin, { { 0, 0 } } },
   { { "CCP1MX", I18N_NOOP("CCP1 multiplex")           }, Pin, { { 0, 0 } } },

Modified: trunk/piklab/src/devices/pic/xml/pic_xml_to_data.cpp
===================================================================
--- trunk/piklab/src/devices/pic/xml/pic_xml_to_data.cpp	2012-03-17 18:01:56 UTC (rev 2862)
+++ trunk/piklab/src/devices/pic/xml/pic_xml_to_data.cpp	2012-03-18 21:37:49 UTC (rev 2863)
@@ -513,7 +513,7 @@
       if ( child.nodeName()!="checksum" ) qFatal("Childs of \"checksums\" should \"checksum\"");
       QString valueName = getChecksumData(child.toElement());
       if ( protection.family()==Protection::BasicProtection ) {
-        if ( !valueNames.contains(valueName) ) qFatal("Unknown protected attribute");
+        if ( !valueNames.contains(valueName) ) qFatal(QString("Unknown protected attribute in checksum \"%1\"").arg(valueName));
         valueNames[valueName] = true;
       }
       child = child.nextSibling();

Added: trunk/piklab/src/devices/pic/xml_data/10F320.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/10F320.xml	                        (rev 0)
+++ trunk/piklab/src/devices/pic/xml_data/10F320.xml	2012-03-18 21:37:49 UTC (rev 2863)
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--************************************************************************-->
+<!--* 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.                                  *-->
+<!--************************************************************************-->
+<device name="10F320" status="IP" memory_technology="FLASH" self_write="yes" architecture="16X" id="0x29A0"
+        xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+        xsi:noNamespaceSchemaLocation='pic.xsd'>
+
+<!--* Documents ************************************************************-->
+  <documents webpage="552961" datasheet="41585" progsheet="41572" erratas="80529" />
+
+<!--* Checksums ************************************************************-->
+  <checksums>
+    <checksum protected="Off" bchecksum="0x1EFF" cchecksum="0xA055" />
+    <checksum protected="All" bchecksum="0x372E" cchecksum="0xB854" />
+  </checksums>
+
+<!--* Operating characteristics ********************************************-->
+  <frequency_range name="extended" >
+    <frequency start="0"  end="16" vdd_min="2.3" vdd_max="5.5" />
+    <frequency start="16" end="20" vdd_min="2.5" vdd_max="5.5" />
+  </frequency_range>
+
+  <voltages name="vpp"      min="8"   max="9"   nominal="8.5" />
+  <voltages name="vdd_prog" min="2.7" max="5.5" nominal="5"  />
+
+<!--* Memory ***************************************************************-->
+  <memory name="code"               start="0x0000" end="0x00FF" />
+  <memory name="calibration"        start="0x2008" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000"/>
+  <memory name="user_ids"           start="0x2000" end="0x2003" rmask="0x000F" />
+  <memory name="config"             start="0x2007" end="0x2007" />
+  <memory name="device_id"          start="0x2006" end="0x2006" />
+
+<!--* Configuration bits ***************************************************-->
+  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
+    <mask name="FOSC"   value="0x0001" >
+      <value value="0x0000" name="INTRC" def="_FOSC_INTOSC" />
+      <value value="0x0001" name="EC"     def="_FOSC_EC"     />
+    </mask>
+    <mask name="BODEN"  value="0x0006" >
+      <value value="0x0000" name="Off"      def="_BOREN_OFF"    />
+      <value value="0x0002" name="Software" def="_BOREN_SBODEN" />
+      <value value="0x0004" name="On_run"   def="_BOREN_NSLEEP" />
+      <value value="0x0006" name="On"       def="_BOREN_ON"     />
+    </mask>
+    <mask name="WDT"    value="0x0018" >
+      <value value="0x0000" name="Off"      def="_WDT_OFF"    />
+      <value value="0x0008" name="Software" def="_WDT_SWDTEN" />
+      <value value="0x0010" name="On_run"   def="_WDT_NSLEEP" />
+      <value value="0x0018" name="On"       def="_WDT_ON"     />
+    </mask>
+    <mask name="PWRTE"  value="0x0020" >
+      <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" />
+      <value value="0x0040" name="External" def="_MCLRE_ON"  />
+    </mask>
+    <mask name="CP"  value="0x0080" >
+      <value value="0x0000" name="All" def="_CP_ON"  />
+      <value value="0x0080" name="Off" def="_CP_OFF" />
+    </mask>
+    <mask name="LVP"  value="0x0100" >
+      <value value="0x0000" name="Off" def="_LVP_OFF" />
+      <value value="0x0100" name="On"  def="_LVP_ON"  />
+    </mask>
+    <mask name="LPBOR"  value="0x0200" >
+      <value value="0x0000" name="Off" def="_LPBOR_OFF" />
+      <value value="0x0200" name="On"  def="_LPBOR_ON"  />
+    </mask>
+    <mask name="BORV"  value="0x0400" >
+      <value value="0x0000" name="2.7" def="_BORV_27" />
+      <value value="0x0400" name="2.4" def="_BORV_24"  />
+    </mask>
+    <mask name="WRT"  value="0x1800" >
+      <value value="0x0000" name="000:0FF" def="_WRT_ALL" />
+      <value value="0x0800" name="000:07F" def="_WRT_HALF"  />
+      <value value="0x1000" name="000:03F" def="_WRT_BOOT"  />
+      <value value="0x1800" name="Off"     def="_WRT_OFF"  />
+    </mask>
+    <mask name="DEBUG"  value="0x2000" >
+      <value value="0x0000" name="On"   def="_DEBUG_OFF" />
+      <value value="0x2000" name="Off"  def="_DEBUG_ON"  />
+    </mask>
+  </config>
+
+<!--* Packages *************************************************************-->
+  <package types="pdip"  nb_pins="8" >
+    <pin index="1" name="N/C"          />
+    <pin index="2" name="VDD"          />
+    <pin index="3" name="RA2"          />
+    <pin index="4" name="RA1/ISCPCLK"  />
+    <pin index="5" name="RA3/MCLR/VPP" />
+    <pin index="6" name="VSS"          />
+    <pin index="7" name="N/C"          />
+    <pin index="8" name="RA0/ISCPDAT"  />
+  </package>
+
+  <package types="sot23" nb_pins="6" >
+    <pin index="1" name="RA0/ISCPDAT"  />
+    <pin index="2" name="VSS"          />
+    <pin index="3" name="RA2"          />
+    <pin index="4" name="RA1/ISCPCLK"  />
+    <pin index="5" name="VDD"          />
+    <pin index="6" name="RA3/MCLR/VPP" />
+  </package>
+
+</device>


Property changes on: trunk/piklab/src/devices/pic/xml_data/10F320.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Added: trunk/piklab/src/devices/pic/xml_data/10F322.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/10F322.xml	                        (rev 0)
+++ trunk/piklab/src/devices/pic/xml_data/10F322.xml	2012-03-18 21:37:49 UTC (rev 2863)
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--************************************************************************-->
+<!--* 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.                                  *-->
+<!--************************************************************************-->
+<device name="10F322" status="IP" memory_technology="FLASH" self_write="yes" architecture="16X" id="0x2980"
+        xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+        xsi:noNamespaceSchemaLocation='pic.xsd'>
+
+<!--* Documents ************************************************************-->
+  <documents webpage="552977" datasheet="41585" progsheet="41572" erratas="80529" />
+
+<!--* Checksums ************************************************************-->
+  <checksums>
+    <checksum protected="Off" bchecksum="0x1DFF" cchecksum="0x9F55" />
+    <checksum protected="All" bchecksum="0x372E" cchecksum="0xB854" />
+  </checksums>
+
+<!--* Operating characteristics ********************************************-->
+  <frequency_range name="extended" >
+    <frequency start="0"  end="16" vdd_min="2.3" vdd_max="5.5" />
+    <frequency start="16" end="20" vdd_min="2.5" vdd_max="5.5" />
+  </frequency_range>
+
+  <voltages name="vpp"      min="8"   max="9"   nominal="8.5" />
+  <voltages name="vdd_prog" min="2.7" max="5.5" nominal="5"  />
+
+<!--* Memory ***************************************************************-->
+  <memory name="code"               start="0x0000" end="0x01FF" />
+  <memory name="calibration"        start="0x2008" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000"/>
+  <memory name="user_ids"           start="0x2000" end="0x2003" rmask="0x000F" />
+  <memory name="config"             start="0x2007" end="0x2007" />
+  <memory name="device_id"          start="0x2006" end="0x2006" />
+
+<!--* Configuration bits ***************************************************-->
+  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
+    <mask name="FOSC"   value="0x0001" >
+      <value value="0x0000" name="INTRC" def="_FOSC_INTOSC" />
+      <value value="0x0001" name="EC"     def="_FOSC_EC"     />
+    </mask>
+    <mask name="BODEN"  value="0x0006" >
+      <value value="0x0000" name="Off"      def="_BOREN_OFF"    />
+      <value value="0x0002" name="Software" def="_BOREN_SBODEN" />
+      <value value="0x0004" name="On_run"   def="_BOREN_NSLEEP" />
+      <value value="0x0006" name="On"       def="_BOREN_ON"     />
+    </mask>
+    <mask name="WDT"    value="0x0018" >
+      <value value="0x0000" name="Off"      def="_WDT_OFF"    />
+      <value value="0x0008" name="Software" def="_WDT_SWDTEN" />
+      <value value="0x0010" name="On_run"   def="_WDT_NSLEEP" />
+      <value value="0x0018" name="On"       def="_WDT_ON"     />
+    </mask>
+    <mask name="PWRTE"  value="0x0020" >
+      <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" />
+      <value value="0x0040" name="External" def="_MCLRE_ON"  />
+    </mask>
+    <mask name="CP"  value="0x0080" >
+      <value value="0x0000" name="All" def="_CP_ON"  />
+      <value value="0x0080" name="Off" def="_CP_OFF" />
+    </mask>
+    <mask name="LVP"  value="0x0100" >
+      <value value="0x0000" name="Off" def="_LVP_OFF" />
+      <value value="0x0100" name="On"  def="_LVP_ON"  />
+    </mask>
+    <mask name="LPBOR"  value="0x0200" >
+      <value value="0x0000" name="Off" def="_LPBOR_OFF" />
+      <value value="0x0200" name="On"  def="_LPBOR_ON"  />
+    </mask>
+    <mask name="BORV"  value="0x0400" >
+      <value value="0x0000" name="2.7" def="_BORV_27" />
+      <value value="0x0400" name="2.4" def="_BORV_24"  />
+    </mask>
+    <mask name="WRT"  value="0x1800" >
+      <value value="0x0000" name="0000:01FF" def="_WRT_ALL" />
+      <value value="0x0800" name="0000:00FF" def="_WRT_HALF"  />
+      <value value="0x1000" name="0000:007F" def="_WRT_BOOT"  />
+      <value value="0x1800" name="Off"       def="_WRT_OFF"  />
+    </mask>
+    <mask name="DEBUG"  value="0x2000" >
+      <value value="0x0000" name="On"   def="_DEBUG_OFF" />
+      <value value="0x2000" name="Off"  def="_DEBUG_ON"  />
+    </mask>
+  </config>
+
+<!--* Packages *************************************************************-->
+  <package types="pdip"  nb_pins="8" >
+    <pin index="1" name="N/C"          />
+    <pin index="2" name="VDD"          />
+    <pin index="3" name="RA2"          />
+    <pin index="4" name="RA1/ISCPCLK"  />
+    <pin index="5" name="RA3/MCLR/VPP" />
+    <pin index="6" name="VSS"          />
+    <pin index="7" name="N/C"          />
+    <pin index="8" name="RA0/ISCPDAT"  />
+  </package>
+
+  <package types="sot23" nb_pins="6" >
+    <pin index="1" name="RA0/ISCPDAT"  />
+    <pin index="2" name="VSS"          />
+    <pin index="3" name="RA2"          />
+    <pin index="4" name="RA1/ISCPCLK"  />
+    <pin index="5" name="VDD"          />
+    <pin index="6" name="RA3/MCLR/VPP" />
+  </package>
+
+</device>


Property changes on: trunk/piklab/src/devices/pic/xml_data/10F322.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Modified: trunk/piklab/src/devices/pic/xml_data/12F609.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/12F609.xml	2012-03-17 18:01:56 UTC (rev 2862)
+++ trunk/piklab/src/devices/pic/xml_data/12F609.xml	2012-03-18 21:37:49 UTC (rev 2863)
@@ -31,7 +31,7 @@
   <frequency_range name="extended" special="high_voltage" >
     <frequency start="0"  end="8"  vdd_min="2.0" vdd_max="5.0" />
     <frequency start="8"  end="10" vdd_min="3.0" vdd_max="5.0" />
-    <frequency start="10" end="20" vdd_min="4.5" vdd_max="5.0" />
+    <frequency start="10" end="20" vdd_min="4.0" vdd_max="5.0" />
   </frequency_range>
 
   <voltages name="vpp"            min="10"  max="13"  nominal="11.5" />

Modified: trunk/piklab/src/devices/pic/xml_data/12F615.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/12F615.xml	2012-03-17 18:01:56 UTC (rev 2862)
+++ trunk/piklab/src/devices/pic/xml_data/12F615.xml	2012-03-18 21:37:49 UTC (rev 2863)
@@ -8,7 +8,7 @@
 <!--* (at your option) any later version.                                  *-->
 <!--************************************************************************-->
 <device name="12F615" status="IP" memory_technology="FLASH" self_write="no"
-        self_write="no" architecture="16X" id="0x2180" id_high_voltage="0x21A0"
+        architecture="16X" id="0x2180" id_high_voltage="0x21A0"
         xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
         xsi:noNamespaceSchemaLocation='pic.xsd'>
 
@@ -23,15 +23,15 @@
 
 <!--* Operating characteristics ********************************************-->
   <frequency_range name="extended" >
-    <frequency start="0"  end="4"  vdd_min="2"   vdd_max="5.5" />
-    <frequency start="4"  end="10" vdd_min="3"   vdd_max="5.5" />
+    <frequency start="0"  end="8"  vdd_min="2.0" vdd_max="5.5" />
+    <frequency start="8"  end="10" vdd_min="3.0" vdd_max="5.5" />
     <frequency start="10" end="20" vdd_min="4.5" vdd_max="5.5" />
   </frequency_range>
 
   <frequency_range name="extended" special="high_voltage">
-    <frequency start="0"  end="4"  vdd_min="2"   vdd_max="5.0" />
-    <frequency start="4"  end="10" vdd_min="3"   vdd_max="5.0" />
-    <frequency start="10" end="20" vdd_min="4.5" vdd_max="5.0" />
+    <frequency start="0"  end="8"  vdd_min="2.0" vdd_max="5.0" />
+    <frequency start="8"  end="10" vdd_min="3.0" vdd_max="5.0" />
+    <frequency start="10" end="20" vdd_min="4.0" vdd_max="5.0" />
   </frequency_range>
 
   <voltages name="vpp"            min="10"  max="13"  nominal="11.5" />

Added: trunk/piklab/src/devices/pic/xml_data/12F617.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/12F617.xml	                        (rev 0)
+++ trunk/piklab/src/devices/pic/xml_data/12F617.xml	2012-03-18 21:37:49 UTC (rev 2863)
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--************************************************************************-->
+<!--* Copyright (C) 2005-2007 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.                                  *-->
+<!--************************************************************************-->
+<device name="12F617" status="IP" memory_technology="FLASH" self_write="yes"
+        architecture="16X" id="0x2360"
+        xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+        xsi:noNamespaceSchemaLocation='pic.xsd'>
+
+<!--* Documents ************************************************************-->
+  <documents webpage="544446" datasheet="41302" progsheet="41284" erratas="80294" />
+
+<!--* Checksums ************************************************************-->
+  <checksums>
+    <checksum protected="Off" bchecksum="0xFBFF" cchecksum="0xC7CD" />
+    <checksum protected="All" bchecksum="0x03BE" cchecksum="0xCF8C" />
+  </checksums>
+
+<!--* Operating characteristics ********************************************-->
+  <frequency_range name="extended" >
+    <frequency start="0"  end="8"  vdd_min="2.0" vdd_max="5.5" />
+    <frequency start="8"  end="10" vdd_min="3.0" vdd_max="5.5" />
+    <frequency start="10" end="20" vdd_min="4.5" vdd_max="5.5" />
+  </frequency_range>
+
+  <voltages name="vpp"            min="10"  max="13"  nominal="11.5" />
+  <voltages name="vdd_prog"       min="4.5" max="5.5" nominal="5"    />
+  <voltages name="vdd_prog_write" min="2"   max="5.5" nominal="5"    />
+
+<!--* Memory ***************************************************************-->
+  <memory name="code"         start="0x0000" end="0x07FF" />
+  <memory name="calibration"  start="0x2008" end="0x2008" cal_opmask="0x0000" cal_opcode="0x0000" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"      />
+  <memory name="device_id"    start="0x2006" end="0x2006" />
+  <memory name="config"       start="0x2007" end="0x2007" />
+  <memory name="debug_vector" start="0x2004" end="0x2004" />
+
+<!--* Configuration bits ***************************************************-->
+  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x0FFF" >
+    <mask name="FOSC"   value="0x0007" >
+      <value value="0x0000" name="LP"           def="_LP_OSC"             />
+      <value value="0x0001" name="XT"           def="_XT_OSC"             />
+      <value value="0x0002" name="HS"           def="_HS_OSC"             />
+      <value value="0x0003" name="EC_IO"        def="_EC_OSC"             />
+      <value value="0x0004" name="INTRC_IO"     def="_INTRC_OSC_NOCLKOUT" gpasm_extra="_INTOSCIO" />
+      <value value="0x0005" name="INTRC_CLKOUT" def="_INTRC_OSC_CLKOUT"   gpasm_extra="_INTOSC"   />
+      <value value="0x0006" name="EXTRC_IO"     def="_EXTRC_OSC_NOCLKOUT" gpasm_extra="_EXTRCIO"  />
+      <value value="0x0007" name="EXTRC_CLKOUT" def="_EXTRC_OSC_CLKOUT"   gpasm_extra="_EXTRC"    />
+    </mask>
+    <mask name="WDT"    value="0x0008" >
+      <value value="0x0000" name="Off" def="_WDT_OFF" />
+      <value value="0x0008" name="On"  def="_WDT_ON"  />
+    </mask>
+    <mask name="PWRTE"  value="0x0010" >
+      <value value="0x0000" name="On"  def="_PWRTE_ON"  />
+      <value value="0x0010" name="Off" def="_PWRTE_OFF" />
+    </mask>
+    <mask name="MCLRE"  value="0x0020" >
+      <value value="0x0000" name="Internal" def="_MCLRE_OFF" />
+      <value value="0x0020" name="External" def="_MCLRE_ON"  />
+    </mask>
+    <mask name="CP"     value="0x0040" >
+      <value value="0x0000" name="All" def="_CP_ON"  />
+      <value value="0x0040" name="Off" def="_CP_OFF" />
+    </mask>
+    <mask name="IOSCFS" value="0x0080" >
+      <value value="0x0000" name="4MHZ" def="_IOSCFS_4MHZ" />
+      <value value="0x0080" name="8MHZ" def="_IOSCFS_8MHZ" />
+    </mask>
+    <mask name="BODEN"  value="0x0300" >
+      <value value="default" name="Off"    def="_BOR_OFF"    />
+      <value value="0x0200" name="On_run" def="_BOR_NSLEEP" />
+      <value value="0x0300" name="On"     def="_BOR_ON"     />
+    </mask>
+    <mask name="WRT"    value="0x0C00" >
+      <value value="0x0000" name="0000:07FF" def="_WRT_ALL"  />
+      <value value="0x0400" name="0000:03FF" def="_WRT_HALF" />
+      <value value="0x0800" name="0000:01FF" def="_WRT_BOOT" />
+      <value value="0x0C00" name="Off"       def="_WRT_OFF"  />
+    </mask>
+  </config>
+
+<!--* Packages *************************************************************-->
+  <package types="pdip soic dfns tssop" nb_pins="8" >
+    <pin index="1" name="VDD" />
+    <pin index="2" name="GP5" />
+    <pin index="3" name="GP4" />
+    <pin index="4" name="GP3/MCLR/VPP" />
+    <pin index="5" name="GP2" />
+    <pin index="6" name="GP1/ISCPCLK" />
+    <pin index="7" name="GP0/ISCPDAT" />
+    <pin index="8" name="VSS" />
+  </package>
+
+</device>


Property changes on: trunk/piklab/src/devices/pic/xml_data/12F617.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Added: trunk/piklab/src/devices/pic/xml_data/12F752.xml
===================================================================
--- trunk/piklab/src/devices/pic/xml_data/12F752.xml	                        (rev 0)
+++ trunk/piklab/src/devices/pic/xml_data/12F752.xml	2012-03-18 21:37:49 UTC (rev 2863)
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--************************************************************************-->
+<!--* 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.                                  *-->
+<!--************************************************************************-->
+<device name="12F752" status="IP" memory_technology="FLASH" self_write="yes"
+        architecture="16X" id="0x1500" id_high_voltage="0x1520"
+        xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'
+        xsi:noNamespaceSchemaLocation='pic.xsd'>
+
+<!--* Documents ************************************************************-->
+  <documents webpage="552818" datasheet="41576" progsheet="41561" erratas="80535" />
+
+<!--* Checksums ************************************************************-->
+  <checksums>
+    <checksum protected="Off" bchecksum="0x3B79" cchecksum="0x0747" />
+    <checksum protected="All" bchecksum="0x966B" cchecksum="0x0000" />
+  </checksums>
+
+<!--* Operating characteristics ********************************************-->
+  <frequency_range name="extended" >
+    <frequency start="0"  end="8"  vdd_min="2.0" vdd_max="5.5" />
+    <frequency start="8"  end="10" vdd_min="3.0" vdd_max="5.5" />
+    <frequency start="10" end="20" vdd_min="4.5" vdd_max="5.5" />
+  </frequency_range>
+
+  <frequency_range name="extended" special="high_voltage" >
+    <frequency start="0"  end="8"  vdd_min="2.0" vdd_max="5.0" />
+    <frequency start="8"  end="10" vdd_min="3.0" vdd_max="5.0" />
+    <frequency start="10" end="20" vdd_min="4.0" vdd_max="5.0" />
+  </frequency_range>
+
+  <voltages name="vpp"            min="10"  max="13"  nominal="11.5" />
+  <voltages name="vdd_prog"       min="4.5" max="5.5" nominal="5"    />
+  <voltages name="vdd_prog_write" min="2"   max="5.5" nominal="5"    />
+
+<!--* Memory ***************************************************************-->
+  <memory name="code"         start="0x0000" end="0x03FF" />
+  <memory name="calibration"  start="0x2008" end="0x2009" cal_opmask="0x0000" cal_opcode="0x0000" />
+  <memory name="user_ids"     start="0x2000" end="0x2003" rmask="0x007F"      />
+  <memory name="device_id"    start="0x2006" end="0x2006" />
+  <memory name="config"       start="0x2007" end="0x2007" />
+  <memory name="debug_vector" start="0x2004" end="0x2004" />
+
+<!--* Configuration bits ***************************************************-->
+  <config offset="0x0" name="" wmask="0x3FFF" bvalue="0x3FFF" >
+    <mask name="FOSC"   value="0x0001" >
+      <value value="0x0000" name="INTRC" def="_FOSC0_INT" />
+      <value value="0x0001" name="EC"    def="_FOSC0_EC"  />
+    </mask>
+    <mask name="WDT"    value="0x0008" >
+      <value value="0x0000" name="Off" def="_WDT_OFF" />
+      <value value="0x0008" name="On"  def="_WDT_ON"  />
+    </mask>
+    <mask name="PWRTE"  value="0x0010" >
+      <value value="0x0000" name="On"  def="_PWRTE_ON"  />
+      <value value="0x0010" name="Off" def="_PWRTE_OFF" />
+    </mask>
+    <mask name="MCLRE"  value="0x0020" >
+      <value value="0x0000" name="Internal" def="_MCLRE_OFF" />
+      <value value="0x0020" name="External" def="_MCLRE_ON"  />
+    </mask>
+    <mask name="CP"     value="0x0040" >
+      <value value="0x0000" name="All" def="_CP_ON"  />
+      <value value="0x0040" name="Off" def="_CP_OFF" />
+    </mask>
+    <mask name="BODEN"  value="0x0300" >
+      <value value="default" name="Off"    def="_BOREN_DIS"    />
+      <value value="0x0200"  name="On_run" def="_BOREN_SLEEP_DIS" />
+      <value value="0x0300"  name="On"     def="_BOREN_EN"     />
+    </mask>
+    <mask name="WRT"    value="0x0C00" >
+      <value value="0x0000" name="0000:03FF" def="_WRT_ALL"  />
+      <value value="0x0400" name="0000:01FF" def="_WRT_HALF" />
+      <value value="0x0800" name="0000:00FF" def="_WRT_BOOT" />
+      <value value="0x0C00" name="Off"       def="_WRT_OFF"  />
+    </mask>
+    <mask name="CLKOUTEN" value="0x1000" >
+      <value value="0x0000" name="On"  def="_CLKOUTEN_ON"  />
+      <value value="0x1000" name="Off" def="_CLKOUTEN_OFF" />
+    </mask>
+    <mask name="DEBUG" value="0x2000" >
+      <value value="0x0000" name="On"  def="_DEBUG_ON"  />
+      <value value="0x2000" name="Off" def="_DEBUG_OFF" />
+    </mask>
+  </config>
+
+<!--* Packages *************************************************************-->
+  <package types="pdip soic dfn" nb_pins="8" >
+    <pin index="1" name="VDD" />
+    <pin index="2" name="RA5" />
+    <pin index="3" name="RA4" />
+    <pin index="4" name="RA3/MCLR/VPP" />
+    <pin index="5" name="RA2" />
+    <pin index="6" name="RA1/ISCPCLK" />
+    <pin index="7" name="RA0/ISCPDAT" />
+    <pin index="8" name="VSS" />
+  </package>
+
+</device>


Property changes on: trunk/piklab/src/devices/pic/xml_data/12F752.xml
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:eol-style
   + native

Modified: trunk/piklab/src/libgui/device_gui.cpp
===================================================================
--- trunk/piklab/src/libgui/device_gui.cpp	2012-03-17 18:01:56 UTC (rev 2862)
+++ trunk/piklab/src/libgui/device_gui.cpp	2012-03-18 21:37:49 UTC (rev 2863)
@@ -299,8 +299,6 @@
 
 void DeviceChooser::Dialog::updateList(const QString &device)
 {
-  QMap<QString, KListViewItem *> groups;
-  Q3ListViewItem *selected = NULL;
   const Programmer::Group *pgroup = programmerGroup();
   if ( pgroup && pgroup->supportedDevices().isEmpty() && pgroup->isSoftware() ) {
     _deviceView->setText(i18n("Could not detect supported devices for \"%1\". Please check installation.").arg(pgroup->label()));
@@ -311,7 +309,10 @@
     _deviceView->setText(i18n("Could not detect supported devices for toolchain \"%1\". Please check installation.").arg(tgroup->label()));
     return;
   }
-  QStringList list = Device::Lister::instance().supportedDevices();
+  
+  QMap<QString, KListViewItem *> groups;
+  Q3ListViewItem *selected = NULL;
+  const QStringList list = Device::Lister::instance().supportedDevices();
   QStringList::const_iterator it = list.end();
   for (it--; it!=list.end(); it--) {
     if ( pgroup && !pgroup->isSupported(*it) ) continue;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2862] trunk/piklab/src/tools/list/device_info.cpp

[<az...@us...>]

Revision: 2862
          http://piklab.svn.sourceforge.net/piklab/?rev=2862&view=rev
Author:   azhyd
Date:     2012-03-17 18:01:56 +0000 (Sat, 17 Mar 2012)
Log Message:
-----------
remove supported tools from device page

Modified Paths:
--------------
    trunk/piklab/src/tools/list/device_info.cpp

Modified: trunk/piklab/src/tools/list/device_info.cpp
===================================================================
--- trunk/piklab/src/tools/list/device_info.cpp	2012-03-17 17:46:10 UTC (rev 2861)
+++ trunk/piklab/src/tools/list/device_info.cpp	2012-03-17 18:01:56 UTC (rev 2862)
@@ -40,16 +40,6 @@
   QString doc;
   doc += "<hr />\n";
   doc += "<table>\n";
-  QString tools;
-  for (Tool::Lister::ConstIterator tit = Tool::Lister::instance().begin();
-       tit != Tool::Lister::instance().end();
-       ++tit) {
-    if ( !tit.data()->isSupported(data.name()) ) continue;
-    if ( tit.data()->isCustom() ) continue;
-    if ( !tools.isEmpty() ) tools += ", ";
-    tools += tit.data()->label();
-  }
-  doc += htmlTableRow(i18n("Tools"), tools) + "\n";
   QString progs;
   for (Programmer::Lister::ConstIterator pit = Programmer::Lister::instance().begin();
        pit != Programmer::Lister::instance().end();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2861] trunk/www/devices

[<az...@us...>]

Revision: 2861
          http://piklab.svn.sourceforge.net/piklab/?rev=2861&view=rev
Author:   azhyd
Date:     2012-03-17 17:46:10 +0000 (Sat, 17 Mar 2012)
Log Message:
-----------
remove supported tools from device page

Modified Paths:
--------------
    trunk/www/devices/10F200.htm
    trunk/www/devices/10F202.htm
    trunk/www/devices/10F204.htm
    trunk/www/devices/10F206.htm
    trunk/www/devices/10F220.htm
    trunk/www/devices/10F222.htm
    trunk/www/devices/12C508.htm
    trunk/www/devices/12C508A.htm
    trunk/www/devices/12C509.htm
    trunk/www/devices/12C509A.htm
    trunk/www/devices/12C671.htm
    trunk/www/devices/12C672.htm
    trunk/www/devices/12CE518.htm
    trunk/www/devices/12CE519.htm
    trunk/www/devices/12CE673.htm
    trunk/www/devices/12CE674.htm
    trunk/www/devices/12CR509A.htm
    trunk/www/devices/12F508.htm
    trunk/www/devices/12F509.htm
    trunk/www/devices/12F510.htm
    trunk/www/devices/12F519.htm
    trunk/www/devices/12F609.htm
    trunk/www/devices/12F615.htm
    trunk/www/devices/12F629.htm
    trunk/www/devices/12F635.htm
    trunk/www/devices/12F675.htm
    trunk/www/devices/12F683.htm
    trunk/www/devices/14000.htm
    trunk/www/devices/16C432.htm
    trunk/www/devices/16C433.htm
    trunk/www/devices/16C505.htm
    trunk/www/devices/16C52.htm
    trunk/www/devices/16C54.htm
    trunk/www/devices/16C54A.htm
    trunk/www/devices/16C54B.htm
    trunk/www/devices/16C54C.htm
    trunk/www/devices/16C55.htm
    trunk/www/devices/16C554.htm
    trunk/www/devices/16C557.htm
    trunk/www/devices/16C558.htm
    trunk/www/devices/16C55A.htm
    trunk/www/devices/16C56.htm
    trunk/www/devices/16C56A.htm
    trunk/www/devices/16C57.htm
    trunk/www/devices/16C57C.htm
    trunk/www/devices/16C58A.htm
    trunk/www/devices/16C58B.htm
    trunk/www/devices/16C61.htm
    trunk/www/devices/16C62.htm
    trunk/www/devices/16C620.htm
    trunk/www/devices/16C620A.htm
    trunk/www/devices/16C621.htm
    trunk/www/devices/16C621A.htm
    trunk/www/devices/16C622.htm
    trunk/www/devices/16C622A.htm
    trunk/www/devices/16C62A.htm
    trunk/www/devices/16C62B.htm
    trunk/www/devices/16C63.htm
    trunk/www/devices/16C63A.htm
    trunk/www/devices/16C64.htm
    trunk/www/devices/16C641.htm
    trunk/www/devices/16C642.htm
    trunk/www/devices/16C64A.htm
    trunk/www/devices/16C65.htm
    trunk/www/devices/16C65A.htm
    trunk/www/devices/16C65B.htm
    trunk/www/devices/16C66.htm
    trunk/www/devices/16C661.htm
    trunk/www/devices/16C662.htm
    trunk/www/devices/16C67.htm
    trunk/www/devices/16C71.htm
    trunk/www/devices/16C710.htm
    trunk/www/devices/16C711.htm
    trunk/www/devices/16C712.htm
    trunk/www/devices/16C715.htm
    trunk/www/devices/16C716.htm
    trunk/www/devices/16C717.htm
    trunk/www/devices/16C72.htm
    trunk/www/devices/16C72A.htm
    trunk/www/devices/16C73.htm
    trunk/www/devices/16C73A.htm
    trunk/www/devices/16C73B.htm
    trunk/www/devices/16C74.htm
    trunk/www/devices/16C745.htm
    trunk/www/devices/16C74A.htm
    trunk/www/devices/16C74B.htm
    trunk/www/devices/16C76.htm
    trunk/www/devices/16C765.htm
    trunk/www/devices/16C77.htm
    trunk/www/devices/16C770.htm
    trunk/www/devices/16C771.htm
    trunk/www/devices/16C773.htm
    trunk/www/devices/16C774.htm
    trunk/www/devices/16C781.htm
    trunk/www/devices/16C782.htm
    trunk/www/devices/16C84.htm
    trunk/www/devices/16C923.htm
    trunk/www/devices/16C924.htm
    trunk/www/devices/16C925.htm
    trunk/www/devices/16C926.htm
    trunk/www/devices/16CE623.htm
    trunk/www/devices/16CE624.htm
    trunk/www/devices/16CE625.htm
    trunk/www/devices/16CR54A.htm
    trunk/www/devices/16CR54B.htm
    trunk/www/devices/16CR54C.htm
    trunk/www/devices/16CR56A.htm
    trunk/www/devices/16CR57B.htm
    trunk/www/devices/16CR57C.htm
    trunk/www/devices/16CR58A.htm
    trunk/www/devices/16CR58B.htm
    trunk/www/devices/16CR62.htm
    trunk/www/devices/16CR620A.htm
    trunk/www/devices/16CR63.htm
    trunk/www/devices/16CR64.htm
    trunk/www/devices/16CR65.htm
    trunk/www/devices/16CR72.htm
    trunk/www/devices/16CR73.htm
    trunk/www/devices/16CR74.htm
    trunk/www/devices/16CR76.htm
    trunk/www/devices/16CR77.htm
    trunk/www/devices/16CR83.htm
    trunk/www/devices/16CR84.htm
    trunk/www/devices/16F1507.htm
    trunk/www/devices/16F1826.htm
    trunk/www/devices/16F1827.htm
    trunk/www/devices/16F1829.htm
    trunk/www/devices/16F1933.htm
    trunk/www/devices/16F1934.htm
    trunk/www/devices/16F1936.htm
    trunk/www/devices/16F1937.htm
    trunk/www/devices/16F1938.htm
    trunk/www/devices/16F1939.htm
    trunk/www/devices/16F1946.htm
    trunk/www/devices/16F1947.htm
    trunk/www/devices/16F505.htm
    trunk/www/devices/16F506.htm
    trunk/www/devices/16F526.htm
    trunk/www/devices/16F54.htm
    trunk/www/devices/16F57.htm
    trunk/www/devices/16F59.htm
    trunk/www/devices/16F610.htm
    trunk/www/devices/16F616.htm
    trunk/www/devices/16F627.htm
    trunk/www/devices/16F627A.htm
    trunk/www/devices/16F628.htm
    trunk/www/devices/16F628A.htm
    trunk/www/devices/16F630.htm
    trunk/www/devices/16F631.htm
    trunk/www/devices/16F636.htm
    trunk/www/devices/16F639.htm
    trunk/www/devices/16F648A.htm
    trunk/www/devices/16F676.htm
    trunk/www/devices/16F677.htm
    trunk/www/devices/16F684.htm
    trunk/www/devices/16F685.htm
    trunk/www/devices/16F687.htm
    trunk/www/devices/16F688.htm
    trunk/www/devices/16F689.htm
    trunk/www/devices/16F690.htm
    trunk/www/devices/16F716.htm
    trunk/www/devices/16F72.htm
    trunk/www/devices/16F722.htm
    trunk/www/devices/16F723.htm
    trunk/www/devices/16F724.htm
    trunk/www/devices/16F726.htm
    trunk/www/devices/16F727.htm
    trunk/www/devices/16F73.htm
    trunk/www/devices/16F737.htm
    trunk/www/devices/16F74.htm
    trunk/www/devices/16F747.htm
    trunk/www/devices/16F76.htm
    trunk/www/devices/16F767.htm
    trunk/www/devices/16F77.htm
    trunk/www/devices/16F777.htm
    trunk/www/devices/16F785.htm
    trunk/www/devices/16F818.htm
    trunk/www/devices/16F819.htm
    trunk/www/devices/16F83.htm
    trunk/www/devices/16F84.htm
    trunk/www/devices/16F84A.htm
    trunk/www/devices/16F87.htm
    trunk/www/devices/16F870.htm
    trunk/www/devices/16F871.htm
    trunk/www/devices/16F872.htm
    trunk/www/devices/16F873.htm
    trunk/www/devices/16F873A.htm
    trunk/www/devices/16F874.htm
    trunk/www/devices/16F874A.htm
    trunk/www/devices/16F876.htm
    trunk/www/devices/16F876A.htm
    trunk/www/devices/16F877.htm
    trunk/www/devices/16F877A.htm
    trunk/www/devices/16F88.htm
    trunk/www/devices/16F882.htm
    trunk/www/devices/16F883.htm
    trunk/www/devices/16F884.htm
    trunk/www/devices/16F886.htm
    trunk/www/devices/16F887.htm
    trunk/www/devices/16F913.htm
    trunk/www/devices/16F914.htm
    trunk/www/devices/16F916.htm
    trunk/www/devices/16F917.htm
    trunk/www/devices/16F946.htm
    trunk/www/devices/16HV540.htm
    trunk/www/devices/17C42.htm
    trunk/www/devices/17C42A.htm
    trunk/www/devices/17C43.htm
    trunk/www/devices/17C44.htm
    trunk/www/devices/17C752.htm
    trunk/www/devices/17C756.htm
    trunk/www/devices/17C756A.htm
    trunk/www/devices/17C762.htm
    trunk/www/devices/17C766.htm
    trunk/www/devices/17CR42.htm
    trunk/www/devices/17CR43.htm
    trunk/www/devices/18C242.htm
    trunk/www/devices/18C252.htm
    trunk/www/devices/18C442.htm
    trunk/www/devices/18C452.htm
    trunk/www/devices/18C601.htm
    trunk/www/devices/18C658.htm
    trunk/www/devices/18C801.htm
    trunk/www/devices/18C858.htm
    trunk/www/devices/18F1220.htm
    trunk/www/devices/18F1230.htm
    trunk/www/devices/18F1320.htm
    trunk/www/devices/18F1330.htm
    trunk/www/devices/18F13K22.htm
    trunk/www/devices/18F13K50.htm
    trunk/www/devices/18F14K22.htm
    trunk/www/devices/18F14K50.htm
    trunk/www/devices/18F2220.htm
    trunk/www/devices/18F2221.htm
    trunk/www/devices/18F2320.htm
    trunk/www/devices/18F2321.htm
    trunk/www/devices/18F2331.htm
    trunk/www/devices/18F23K20.htm
    trunk/www/devices/18F23K22.htm
    trunk/www/devices/18F2410.htm
    trunk/www/devices/18F242.htm
    trunk/www/devices/18F2420.htm
    trunk/www/devices/18F2423.htm
    trunk/www/devices/18F2431.htm
    trunk/www/devices/18F2439.htm
    trunk/www/devices/18F2450.htm
    trunk/www/devices/18F2455.htm
    trunk/www/devices/18F2458.htm
    trunk/www/devices/18F248.htm
    trunk/www/devices/18F2480.htm
    trunk/www/devices/18F24J10.htm
    trunk/www/devices/18F24K20.htm
    trunk/www/devices/18F24K22.htm
    trunk/www/devices/18F2510.htm
    trunk/www/devices/18F2515.htm
    trunk/www/devices/18F252.htm
    trunk/www/devices/18F2520.htm
    trunk/www/devices/18F2523.htm
    trunk/www/devices/18F2525.htm
    trunk/www/devices/18F2539.htm
    trunk/www/devices/18F2550.htm
    trunk/www/devices/18F2553.htm
    trunk/www/devices/18F258.htm
    trunk/www/devices/18F2580.htm
    trunk/www/devices/18F2585.htm
    trunk/www/devices/18F25J10.htm
    trunk/www/devices/18F25K20.htm
    trunk/www/devices/18F25K22.htm
    trunk/www/devices/18F2610.htm
    trunk/www/devices/18F2620.htm
    trunk/www/devices/18F2680.htm
    trunk/www/devices/18F2682.htm
    trunk/www/devices/18F2685.htm
    trunk/www/devices/18F26K20.htm
    trunk/www/devices/18F26K22.htm
    trunk/www/devices/18F4220.htm
    trunk/www/devices/18F4221.htm
    trunk/www/devices/18F4320.htm
    trunk/www/devices/18F4321.htm
    trunk/www/devices/18F4331.htm
    trunk/www/devices/18F43K20.htm
    trunk/www/devices/18F43K22.htm
    trunk/www/devices/18F4410.htm
    trunk/www/devices/18F442.htm
    trunk/www/devices/18F4420.htm
    trunk/www/devices/18F4423.htm
    trunk/www/devices/18F4431.htm
    trunk/www/devices/18F4439.htm
    trunk/www/devices/18F4450.htm
    trunk/www/devices/18F4455.htm
    trunk/www/devices/18F4458.htm
    trunk/www/devices/18F448.htm
    trunk/www/devices/18F4480.htm
    trunk/www/devices/18F44J10.htm
    trunk/www/devices/18F44K20.htm
    trunk/www/devices/18F44K22.htm
    trunk/www/devices/18F4510.htm
    trunk/www/devices/18F4515.htm
    trunk/www/devices/18F452.htm
    trunk/www/devices/18F4520.htm
    trunk/www/devices/18F4523.htm
    trunk/www/devices/18F4525.htm
    trunk/www/devices/18F4539.htm
    trunk/www/devices/18F4550.htm
    trunk/www/devices/18F4553.htm
    trunk/www/devices/18F458.htm
    trunk/www/devices/18F4580.htm
    trunk/www/devices/18F4585.htm
    trunk/www/devices/18F45J10.htm
    trunk/www/devices/18F45K20.htm
    trunk/www/devices/18F45K22.htm
    trunk/www/devices/18F4610.htm
    trunk/www/devices/18F4620.htm
    trunk/www/devices/18F4680.htm
    trunk/www/devices/18F4682.htm
    trunk/www/devices/18F4685.htm
    trunk/www/devices/18F46K20.htm
    trunk/www/devices/18F46K22.htm
    trunk/www/devices/18F6310.htm
    trunk/www/devices/18F6390.htm
    trunk/www/devices/18F6393.htm
    trunk/www/devices/18F63J11.htm
    trunk/www/devices/18F63J90.htm
    trunk/www/devices/18F6410.htm
    trunk/www/devices/18F6490.htm
    trunk/www/devices/18F6493.htm
    trunk/www/devices/18F64J11.htm
    trunk/www/devices/18F64J90.htm
    trunk/www/devices/18F6520.htm
    trunk/www/devices/18F6525.htm
    trunk/www/devices/18F6527.htm
    trunk/www/devices/18F6585.htm
    trunk/www/devices/18F65J10.htm
    trunk/www/devices/18F65J11.htm
    trunk/www/devices/18F65J15.htm
    trunk/www/devices/18F65J50.htm
    trunk/www/devices/18F65J90.htm
    trunk/www/devices/18F6620.htm
    trunk/www/devices/18F6621.htm
    trunk/www/devices/18F6622.htm
    trunk/www/devices/18F6627.htm
    trunk/www/devices/18F6680.htm
    trunk/www/devices/18F66J10.htm
    trunk/www/devices/18F66J11.htm
    trunk/www/devices/18F66J15.htm
    trunk/www/devices/18F66J16.htm
    trunk/www/devices/18F66J50.htm
    trunk/www/devices/18F66J55.htm
    trunk/www/devices/18F66J60.htm
    trunk/www/devices/18F66J65.htm
    trunk/www/devices/18F6720.htm
    trunk/www/devices/18F6722.htm
    trunk/www/devices/18F67J10.htm
    trunk/www/devices/18F67J11.htm
    trunk/www/devices/18F67J50.htm
    trunk/www/devices/18F67J60.htm
    trunk/www/devices/18F8310.htm
    trunk/www/devices/18F8390.htm
    trunk/www/devices/18F8393.htm
    trunk/www/devices/18F83J11.htm
    trunk/www/devices/18F83J90.htm
    trunk/www/devices/18F8410.htm
    trunk/www/devices/18F8490.htm
    trunk/www/devices/18F8493.htm
    trunk/www/devices/18F84J11.htm
    trunk/www/devices/18F84J90.htm
    trunk/www/devices/18F8520.htm
    trunk/www/devices/18F8525.htm
    trunk/www/devices/18F8527.htm
    trunk/www/devices/18F8585.htm
    trunk/www/devices/18F85J10.htm
    trunk/www/devices/18F85J11.htm
    trunk/www/devices/18F85J15.htm
    trunk/www/devices/18F85J50.htm
    trunk/www/devices/18F85J90.htm
    trunk/www/devices/18F8620.htm
    trunk/www/devices/18F8621.htm
    trunk/www/devices/18F8622.htm
    trunk/www/devices/18F8627.htm
    trunk/www/devices/18F8680.htm
    trunk/www/devices/18F86J10.htm
    trunk/www/devices/18F86J11.htm
    trunk/www/devices/18F86J15.htm
    trunk/www/devices/18F86J16.htm
    trunk/www/devices/18F86J50.htm
    trunk/www/devices/18F86J55.htm
    trunk/www/devices/18F86J60.htm
    trunk/www/devices/18F86J65.htm
    trunk/www/devices/18F8720.htm
    trunk/www/devices/18F8722.htm
    trunk/www/devices/18F87J10.htm
    trunk/www/devices/18F87J11.htm
    trunk/www/devices/18F87J50.htm
    trunk/www/devices/18F87J60.htm
    trunk/www/devices/18F96J60.htm
    trunk/www/devices/18F96J65.htm
    trunk/www/devices/18F97J60.htm
    trunk/www/devices/24AA00.htm
    trunk/www/devices/24AA01.htm
    trunk/www/devices/24AA014.htm
    trunk/www/devices/24AA02.htm
    trunk/www/devices/24AA024.htm
    trunk/www/devices/24AA025.htm
    trunk/www/devices/24AA04.htm
    trunk/www/devices/24AA08.htm
    trunk/www/devices/24AA1025.htm
    trunk/www/devices/24AA128.htm
    trunk/www/devices/24AA16.htm
    trunk/www/devices/24AA164.htm
    trunk/www/devices/24AA256.htm
    trunk/www/devices/24AA32A.htm
    trunk/www/devices/24AA512.htm
    trunk/www/devices/24AA515.htm
    trunk/www/devices/24AA64.htm
    trunk/www/devices/24AA65.htm
    trunk/www/devices/24C00.htm
    trunk/www/devices/24C01C.htm
    trunk/www/devices/24C02C.htm
    trunk/www/devices/24C65.htm
    trunk/www/devices/24FC1025.htm
    trunk/www/devices/24FC128.htm
    trunk/www/devices/24FC256.htm
    trunk/www/devices/24FC512.htm
    trunk/www/devices/24FC515.htm
    trunk/www/devices/24FJ128GA006.htm
    trunk/www/devices/24FJ128GA008.htm
    trunk/www/devices/24FJ128GA010.htm
    trunk/www/devices/24FJ64GA002.htm
    trunk/www/devices/24FJ64GA004.htm
    trunk/www/devices/24FJ64GA006.htm
    trunk/www/devices/24FJ64GA008.htm
    trunk/www/devices/24FJ64GA010.htm
    trunk/www/devices/24FJ96GA006.htm
    trunk/www/devices/24FJ96GA008.htm
    trunk/www/devices/24FJ96GA010.htm
    trunk/www/devices/24HJ128GP206.htm
    trunk/www/devices/24HJ128GP210.htm
    trunk/www/devices/24HJ128GP306.htm
    trunk/www/devices/24HJ128GP310.htm
    trunk/www/devices/24HJ128GP506.htm
    trunk/www/devices/24HJ128GP510.htm
    trunk/www/devices/24HJ12GP201.htm
    trunk/www/devices/24HJ12GP202.htm
    trunk/www/devices/24HJ16GP304.htm
    trunk/www/devices/24HJ256GP206.htm
    trunk/www/devices/24HJ256GP210.htm
    trunk/www/devices/24HJ256GP610.htm
    trunk/www/devices/24HJ32GP202.htm
    trunk/www/devices/24HJ32GP204.htm
    trunk/www/devices/24HJ64GP206.htm
    trunk/www/devices/24HJ64GP210.htm
    trunk/www/devices/24HJ64GP506.htm
    trunk/www/devices/24HJ64GP510.htm
    trunk/www/devices/24LC00.htm
    trunk/www/devices/24LC014.htm
    trunk/www/devices/24LC01B.htm
    trunk/www/devices/24LC024.htm
    trunk/www/devices/24LC025.htm
    trunk/www/devices/24LC02B.htm
    trunk/www/devices/24LC04B.htm
    trunk/www/devices/24LC08B.htm
    trunk/www/devices/24LC1025.htm
    trunk/www/devices/24LC128.htm
    trunk/www/devices/24LC16B.htm
    trunk/www/devices/24LC21A.htm
    trunk/www/devices/24LC22A.htm
    trunk/www/devices/24LC256.htm
    trunk/www/devices/24LC32A.htm
    trunk/www/devices/24LC512.htm
    trunk/www/devices/24LC515.htm
    trunk/www/devices/24LC64.htm
    trunk/www/devices/24LC65.htm
    trunk/www/devices/24LCS21A.htm
    trunk/www/devices/30F1010.htm
    trunk/www/devices/30F2010.htm
    trunk/www/devices/30F2011.htm
    trunk/www/devices/30F2012.htm
    trunk/www/devices/30F2020.htm
    trunk/www/devices/30F2023.htm
    trunk/www/devices/30F3010.htm
    trunk/www/devices/30F3011.htm
    trunk/www/devices/30F3012.htm
    trunk/www/devices/30F3013.htm
    trunk/www/devices/30F3014.htm
    trunk/www/devices/30F4011.htm
    trunk/www/devices/30F4012.htm
    trunk/www/devices/30F4013.htm
    trunk/www/devices/30F5011.htm
    trunk/www/devices/30F5013.htm
    trunk/www/devices/30F5015.htm
    trunk/www/devices/30F5016.htm
    trunk/www/devices/30F6010.htm
    trunk/www/devices/30F6010A.htm
    trunk/www/devices/30F6011.htm
    trunk/www/devices/30F6011A.htm
    trunk/www/devices/30F6012.htm
    trunk/www/devices/30F6012A.htm
    trunk/www/devices/30F6013.htm
    trunk/www/devices/30F6013A.htm
    trunk/www/devices/30F6014.htm
    trunk/www/devices/30F6014A.htm
    trunk/www/devices/30F6015.htm
    trunk/www/devices/33FJ06GS101.htm
    trunk/www/devices/33FJ06GS102.htm
    trunk/www/devices/33FJ06GS202.htm
    trunk/www/devices/33FJ128MC802.htm
    trunk/www/devices/33FJ128MC804.htm
    trunk/www/devices/33FJ12GP201.htm
    trunk/www/devices/33FJ12GP202.htm
    trunk/www/devices/33FJ16GP304.htm
    trunk/www/devices/33FJ16GS402.htm
    trunk/www/devices/33FJ16GS404.htm
    trunk/www/devices/33FJ16GS502.htm
    trunk/www/devices/33FJ16GS504.htm
    trunk/www/devices/33FJ32GP202.htm
    trunk/www/devices/33FJ32GP204.htm

Modified: trunk/www/devices/10F200.htm
===================================================================
--- trunk/www/devices/10F200.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/10F200.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>10F200</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en019863">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>255 words (12 bits)</td></tr><tr><td>IO Ports:</td><td>GPIO[4] </td></tr><tr><td>Packaging:</td><td>PDIP[8] SOT-23[6] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>CC5X Compiler, CCS Compiler, GPUtils, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, GPSim, ICD2 Programmer, PICkit1, PICkit2 Firmware 1.x, Picstart Plus</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/10F202.htm
===================================================================
--- trunk/www/devices/10F202.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/10F202.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>10F202</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en020030">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>511 words (12 bits)</td></tr><tr><td>IO Ports:</td><td>GPIO[4] </td></tr><tr><td>Packaging:</td><td>PDIP[8] SOT-23[6] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>CC5X Compiler, CCS Compiler, GPUtils, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, GPSim, ICD2 Programmer, PICkit1, PICkit2 Firmware 1.x, Picstart Plus</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/10F204.htm
===================================================================
--- trunk/www/devices/10F204.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/10F204.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>10F204</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en020031">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>255 words (12 bits)</td></tr><tr><td>IO Ports:</td><td>GPIO[4] </td></tr><tr><td>Packaging:</td><td>PDIP[8] SOT-23[6] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>CC5X Compiler, CCS Compiler, GPUtils, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, GPSim, ICD2 Programmer, PICkit1, PICkit2 Firmware 1.x, Picstart Plus</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/10F206.htm
===================================================================
--- trunk/www/devices/10F206.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/10F206.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>10F206</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en020032">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>511 words (12 bits)</td></tr><tr><td>IO Ports:</td><td>GPIO[4] </td></tr><tr><td>Packaging:</td><td>PDIP[8] SOT-23[6] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>CC5X Compiler, CCS Compiler, GPUtils, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, ICD2 Programmer, PICkit1, PICkit2 Firmware 1.x, Picstart Plus</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/10F220.htm
===================================================================
--- trunk/www/devices/10F220.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/10F220.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>10F220</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en023673">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>255 words (12 bits)</td></tr><tr><td>IO Ports:</td><td>GPIO[4] </td></tr><tr><td>Features:</td><td>ADC</td></tr><tr><td>Packaging:</td><td>PDIP[8] SOT-23[6] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>CC5X Compiler, CCS Compiler, GPUtils, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, GPSim, ICD2 Programmer, PICkit1, PICkit2 Firmware 1.x</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/10F222.htm
===================================================================
--- trunk/www/devices/10F222.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/10F222.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>10F222</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en023672">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>511 words (12 bits)</td></tr><tr><td>IO Ports:</td><td>GPIO[4] </td></tr><tr><td>Features:</td><td>ADC</td></tr><tr><td>Packaging:</td><td>PDIP[8] SOT-23[6] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>CC5X Compiler, CCS Compiler, GPUtils, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, GPSim, ICD2 Programmer, PICkit1, PICkit2 Firmware 1.x</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/12C508.htm
===================================================================
--- trunk/www/devices/12C508.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/12C508.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>12C508</h1><table><tr><td>Status:</td><td><font color="#ffa500">Not Recommended for New Design</font></td></tr><tr><td>Alternatives:</td><td><a href="devices.php?device=12F508">12F508</a></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en010102">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>EPROM (OTP)</td></tr><tr><td>Code memory:</td><td>511 words (12 bits)</td></tr><tr><td>IO Ports:</td><td>GPIO[6] </td></tr><tr><td>Packaging:</td><td>PDIP[8] SOIC[8] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>CC5X Compiler, CCS Compiler, GPUtils, JAL, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, GPSim, Picstart Plus</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/12C508A.htm
===================================================================
--- trunk/www/devices/12C508A.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/12C508A.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>12C508A</h1><table><tr><td>Status:</td><td><font color="#ffa500">Not Recommended for New Design</font></td></tr><tr><td>Alternatives:</td><td><a href="devices.php?device=12F508">12F508</a></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en010103">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>EPROM (OTP)</td></tr><tr><td>Code memory:</td><td>511 words (12 bits)</td></tr><tr><td>IO Ports:</td><td>GPIO[6] </td></tr><tr><td>Packaging:</td><td>PDIP[8] SOIC[8] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>CC5X Compiler, CCS Compiler, GPUtils, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, Picstart Plus</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/12C509.htm
===================================================================
--- trunk/www/devices/12C509.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/12C509.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>12C509</h1><table><tr><td>Status:</td><td><font color="#ffa500">Not Recommended for New Design</font></td></tr><tr><td>Alternatives:</td><td><a href="devices.php?device=12F509">12F509</a></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en010104">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>EPROM (OTP)</td></tr><tr><td>Code memory:</td><td>1,023 words (12 bits)</td></tr><tr><td>IO Ports:</td><td>GPIO[6] </td></tr><tr><td>Packaging:</td><td>PDIP[8] SOIC[8] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>CC5X Compiler, CCS Compiler, GPUtils, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, GPSim, Picstart Plus</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/12C509A.htm
===================================================================
--- trunk/www/devices/12C509A.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/12C509A.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>12C509A</h1><table><tr><td>Status:</td><td><font color="#ffa500">Not Recommended for New Design</font></td></tr><tr><td>Alternatives:</td><td><a href="devices.php?device=12F509">12F509</a></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en010105">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>EPROM (OTP)</td></tr><tr><td>Code memory:</td><td>1,023 words (12 bits)</td></tr><tr><td>IO Ports:</td><td>GPIO[6] </td></tr><tr><td>Packaging:</td><td>PDIP[8] SOIC[8] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>CC5X Compiler, CCS Compiler, GPUtils, JAL, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, Picstart Plus</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/12C671.htm
===================================================================
--- trunk/www/devices/12C671.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/12C671.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>12C671 / 12LC671</h1><table><tr><td>Status:</td><td><font color="#ffa500">Not Recommended for New Design</font></td></tr><tr><td>Alternatives:</td><td><a href="devices.php?device=12F675">12F675</a></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en010106">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>EPROM (OTP)</td></tr><tr><td>Code memory:</td><td>1,023 words (14 bits)</td></tr><tr><td>IO Ports:</td><td>GPIO[6] </td></tr><tr><td>Features:</td><td>ADC</td></tr><tr><td>Packaging:</td><td>PDIP[8] SOIC[8] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>BoostBasic Compiler for PIC16, BoostC++ Compiler for PIC16, BoostC Compiler for PIC16, CC5X Compiler, CCS Compiler, GPUtils, JAL V2, MPC Compiler, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, Picstart Plus</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/12C672.htm
===================================================================
--- trunk/www/devices/12C672.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/12C672.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>12C672 / 12LC672</h1><table><tr><td>Status:</td><td><font color="#ffa500">Not Recommended for New Design</font></td></tr><tr><td>Alternatives:</td><td><a href="devices.php?device=12F683">12F683</a></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en010107">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>EPROM (OTP)</td></tr><tr><td>Code memory:</td><td>2,047 words (14 bits)</td></tr><tr><td>IO Ports:</td><td>GPIO[6] </td></tr><tr><td>Features:</td><td>ADC</td></tr><tr><td>Packaging:</td><td>PDIP[8] SOIC[8] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>BoostBasic Compiler for PIC16, BoostC++ Compiler for PIC16, BoostC Compiler for PIC16, CC5X Compiler, CCS Compiler, GPUtils, JAL V2, MPC Compiler, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, Picstart Plus</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/12CE518.htm
===================================================================
--- trunk/www/devices/12CE518.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/12CE518.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>12CE518</h1><table><tr><td>Status:</td><td><font color="#ffa500">Not Recommended for New Design</font></td></tr><tr><td>Alternatives:</td><td><a href="devices.php?device=12F629">12F629</a></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en010108">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>EPROM (OTP)</td></tr><tr><td>Code memory:</td><td>511 words (12 bits)</td></tr><tr><td>Data EEPROM:</td><td>16 bytes (8 bits) (not programmable)</td></tr><tr><td>IO Ports:</td><td>GPIO[8] </td></tr><tr><td>Packaging:</td><td>PDIP[8] SOIC[8] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>CC5X Compiler, CCS Compiler, GPUtils, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, GPSim, Picstart Plus</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/12CE519.htm
===================================================================
--- trunk/www/devices/12CE519.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/12CE519.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>12CE519</h1><table><tr><td>Status:</td><td><font color="#ffa500">Not Recommended for New Design</font></td></tr><tr><td>Alternatives:</td><td><a href="devices.php?device=12F629">12F629</a></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en010109">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>EPROM (OTP)</td></tr><tr><td>Code memory:</td><td>1,023 words (12 bits)</td></tr><tr><td>Data EEPROM:</td><td>16 bytes (8 bits) (not programmable)</td></tr><tr><td>IO Ports:</td><td>GPIO[8] </td></tr><tr><td>Packaging:</td><td>PDIP[8] SOIC[8] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>CC5X Compiler, CCS Compiler, GPUtils, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, GPSim, Picstart Plus</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/12CE673.htm
===================================================================
--- trunk/www/devices/12CE673.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/12CE673.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>12CE673 / 12LCE673</h1><table><tr><td>Status:</td><td><font color="#ffa500">Not Recommended for New Design</font></td></tr><tr><td>Alternatives:</td><td><a href="devices.php?device=12F675">12F675</a></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en010110">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>EPROM (OTP)</td></tr><tr><td>Code memory:</td><td>1,023 words (14 bits)</td></tr><tr><td>Data EEPROM:</td><td>16 bytes (8 bits) (not programmable)</td></tr><tr><td>IO Ports:</td><td>GPIO[6] </td></tr><tr><td>Features:</td><td>ADC</td></tr><tr><td>Packaging:</td><td>PDIP[8] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>BoostBasic Compiler for PIC16, BoostC++ Compiler for PIC16, BoostC Compiler for PIC16, CC5X Compiler, CCS Compiler, GPUtils, JAL V2, MPC Compiler, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, Picstart Plus</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/12CE674.htm
===================================================================
--- trunk/www/devices/12CE674.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/12CE674.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>12CE674 / 12LCE674</h1><table><tr><td>Status:</td><td><font color="#ffa500">Not Recommended for New Design</font></td></tr><tr><td>Alternatives:</td><td><a href="devices.php?device=12F683">12F683</a></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en010111">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>EPROM (OTP)</td></tr><tr><td>Code memory:</td><td>2,047 words (14 bits)</td></tr><tr><td>Data EEPROM:</td><td>16 bytes (8 bits) (not programmable)</td></tr><tr><td>IO Ports:</td><td>GPIO[6] </td></tr><tr><td>Features:</td><td>ADC</td></tr><tr><td>Packaging:</td><td>PDIP[8] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>BoostBasic Compiler for PIC16, BoostC++ Compiler for PIC16, BoostC Compiler for PIC16, CC5X Compiler, CCS Compiler, GPUtils, JAL, JAL V2, MPC Compiler, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, Picstart Plus</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/12CR509A.htm
===================================================================
--- trunk/www/devices/12CR509A.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/12CR509A.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>12CR509A</h1><table><tr><td>Status:</td><td><font color="#ffa500">Not Recommended for New Design</font></td></tr><tr><td>Alternatives:</td><td><a href="devices.php?device=12F509">12F509</a></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en010112">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>ROM</td></tr><tr><td>Code memory:</td><td>1,023 words (12 bits)</td></tr><tr><td>IO Ports:</td><td>GPIO[6] </td></tr><tr><td>Packaging:</td><td>PDIP[8] SOIC[8] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>CC5X Compiler, CCS Compiler, GPUtils, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, Picstart Plus</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/12F508.htm
===================================================================
--- trunk/www/devices/12F508.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/12F508.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>12F508</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en020094">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>511 words (12 bits)</td></tr><tr><td>IO Ports:</td><td>GPIO[6] </td></tr><tr><td>Packaging:</td><td>PDIP[8] SOIC[8] MSOP[8] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>CC5X Compiler, CCS Compiler, GPUtils, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, GPSim, ICD2 Programmer, PICkit1, PICkit2 Firmware 1.x, Picstart Plus</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/12F509.htm
===================================================================
--- trunk/www/devices/12F509.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/12F509.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>12F509</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en020095">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>1,023 words (12 bits)</td></tr><tr><td>IO Ports:</td><td>GPIO[6] </td></tr><tr><td>Packaging:</td><td>PDIP[8] SOIC[8] MSOP[8] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>CC5X Compiler, CCS Compiler, GPUtils, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, GPSim, ICD2 Programmer, PICkit1, PICkit2 Firmware 1.x, Picstart Plus</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/12F510.htm
===================================================================
--- trunk/www/devices/12F510.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/12F510.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>12F510</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en023670">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>1,023 words (12 bits)</td></tr><tr><td>IO Ports:</td><td>GPIO[6] </td></tr><tr><td>Features:</td><td>ADC</td></tr><tr><td>Packaging:</td><td>PDIP[8] SOIC[8] MSOP[8] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>CC5X Compiler, CCS Compiler, GPUtils, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, GPSim, ICD2 Programmer, PICkit1, PICkit2 Firmware 1.x</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/12F519.htm
===================================================================
--- trunk/www/devices/12F519.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/12F519.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>12F519</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en530188">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>1,023 words (12 bits)</td></tr><tr><td>Data EEPROM:</td><td>64 bytes (8 bits)</td></tr><tr><td>IO Ports:</td><td>GPIO[6] </td></tr><tr><td>Packaging:</td><td>PDIP[8] SOIC[8] MSOP[8] DFN[8] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>CC5X Compiler, CCS Compiler, GPUtils, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/12F609.htm
===================================================================
--- trunk/www/devices/12F609.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/12F609.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>12F609 / 12HV609</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en028259">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>1,024 words (14 bits)</td></tr><tr><td>IO Ports:</td><td>GPIO[6] </td></tr><tr><td>Packaging:</td><td>PDIP[8] SOIC[8] DFN-S[8] TSSOP[8] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>BoostBasic Compiler for PIC16, BoostC++ Compiler for PIC16, BoostC Compiler for PIC16, CC5X Compiler, CCS Compiler, GPUtils, JAL V2, MPC Compiler, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer, ICD2 Debugger</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/12F615.htm
===================================================================
--- trunk/www/devices/12F615.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/12F615.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>12F615 / 12HV615</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en027148">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>1,024 words (14 bits)</td></tr><tr><td>IO Ports:</td><td>GPIO[6] </td></tr><tr><td>Features:</td><td>CCP, ADC</td></tr><tr><td>Packaging:</td><td>PDIP[8] SOIC[8] DFN-S[8] TSSOP[8] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>BoostBasic Compiler for PIC16, BoostC++ Compiler for PIC16, BoostC Compiler for PIC16, CC5X Compiler, CCS Compiler, GPUtils, JAL V2, MPC Compiler, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, ICD2 Programmer, ICD2 Debugger, PICkit2 Firmware 1.x</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/12F629.htm
===================================================================
--- trunk/www/devices/12F629.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/12F629.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>12F629</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en010113">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>1,023 words (14 bits)</td></tr><tr><td>Data EEPROM:</td><td>128 bytes (8 bits)</td></tr><tr><td>IO Ports:</td><td>GPIO[6] </td></tr><tr><td>Packaging:</td><td>PDIP[8] SOIC[8] DFN-S[8] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>BoostBasic Compiler for PIC16, BoostC++ Compiler for PIC16, BoostC Compiler for PIC16, CC5X Compiler, CCS Compiler, GPUtils, JAL, JAL V2, MPC Compiler, PICC Compiler, Small Device C Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, GPSim, ICD2 Programmer, ICD2 Debugger, PICkit1, PICkit2 Firmware 1.x, Picstart Plus</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/12F635.htm
===================================================================
--- trunk/www/devices/12F635.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/12F635.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>12F635</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en019829">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>1,024 words (14 bits)</td></tr><tr><td>Data EEPROM:</td><td>128 bytes (8 bits)</td></tr><tr><td>IO Ports:</td><td>GPIO[6] </td></tr><tr><td>Features:</td><td>Low Voltage Detect</td></tr><tr><td>Packaging:</td><td>PDIP[8] SOIC[8] DFN-S[8] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>BoostBasic Compiler for PIC16, BoostC++ Compiler for PIC16, BoostC Compiler for PIC16, CC5X Compiler, CCS Compiler, GPUtils, JAL V2, MPC Compiler, PICC Compiler, Small Device C Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, ICD2 Programmer, ICD2 Debugger, PICkit1, PICkit2 Firmware 1.x</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/12F675.htm
===================================================================
--- trunk/www/devices/12F675.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/12F675.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>12F675</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en010114">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>1,023 words (14 bits)</td></tr><tr><td>Data EEPROM:</td><td>128 bytes (8 bits)</td></tr><tr><td>IO Ports:</td><td>GPIO[6] </td></tr><tr><td>Features:</td><td>ADC</td></tr><tr><td>Packaging:</td><td>PDIP[8] SOIC[8] DFN-S[8] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>BoostBasic Compiler for PIC16, BoostC++ Compiler for PIC16, BoostC Compiler for PIC16, CC5X Compiler, CCS Compiler, GPUtils, JAL, JAL V2, MPC Compiler, PICC Compiler, Small Device C Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, GPSim, ICD2 Programmer, ICD2 Debugger, PICkit1, PICkit2 Firmware 1.x, Picstart Plus</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/12F683.htm
===================================================================
--- trunk/www/devices/12F683.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/12F683.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>12F683</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en010115">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>Flash</td></tr><tr><td>Code memory:</td><td>2,048 words (14 bits)</td></tr><tr><td>Data EEPROM:</td><td>256 bytes (8 bits)</td></tr><tr><td>IO Ports:</td><td>GPIO[6] </td></tr><tr><td>Features:</td><td>CCP, ADC</td></tr><tr><td>Packaging:</td><td>PDIP[8] SOIC[8] DFN[8] DFN-S[8] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>BoostBasic Compiler for PIC16, BoostC++ Compiler for PIC16, BoostC Compiler for PIC16, CC5X Compiler, CCS Compiler, GPUtils, JAL V2, MPC Compiler, PICC Compiler, Small Device C Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, GPSim, ICD2 Programmer, ICD2 Debugger, PICkit1, PICkit2 Firmware 1.x, Picstart Plus</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/14000.htm
===================================================================
--- trunk/www/devices/14000.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/14000.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>14000</h1><table><tr><td>Status:</td><td><font color="#ffa500">Not Recommended for New Design</font></td></tr><tr><td>Alternatives:</td><td><a href="devices.php?device=16F883">16F883</a></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en010116">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>EPROM (OTP)</td></tr><tr><td>Code memory:</td><td>4,032 words (14 bits)</td></tr><tr><td>Packaging:</td><td>PDIP[28] SOIC[28] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>BoostBasic Compiler for PIC16, BoostC++ Compiler for PIC16, BoostC Compiler for PIC16, CC5X Compiler, CCS Compiler, GPUtils, JAL V2, MPC Compiler, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, Picstart Plus</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/16C432.htm
===================================================================
--- trunk/www/devices/16C432.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/16C432.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>16C432</h1><table><tr><td>Status:</td><td><font color="#ffa500">Not Recommended for New Design</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en010117">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>EPROM (OTP)</td></tr><tr><td>Code memory:</td><td>2,048 words (14 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[5] PORTB[8] </td></tr><tr><td>Packaging:</td><td>PDIP[20] SSOP[20] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>BoostBasic Compiler for PIC16, BoostC++ Compiler for PIC16, BoostC Compiler for PIC16, CC5X Compiler, CCS Compiler, GPUtils, JAL V2, MPC Compiler, PICC Compiler, Small Device C Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/16C433.htm
===================================================================
--- trunk/www/devices/16C433.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/16C433.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>16C433</h1><table><tr><td>Status:</td><td><font color="#00ff00">In Production</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en010118">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>EPROM (OTP)</td></tr><tr><td>Code memory:</td><td>2,047 words (14 bits)</td></tr><tr><td>IO Ports:</td><td>GPIO[6] </td></tr><tr><td>Features:</td><td>ADC</td></tr><tr><td>Packaging:</td><td>PDIP[18] SOIC[18] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>BoostBasic Compiler for PIC16, BoostC++ Compiler for PIC16, BoostC Compiler for PIC16, CC5X Compiler, CCS Compiler, GPUtils, JAL V2, MPC Compiler, PICC Compiler, Small Device C Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/16C505.htm
===================================================================
--- trunk/www/devices/16C505.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/16C505.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>16C505 / 16LC505</h1><table><tr><td>Status:</td><td><font color="#ffa500">Not Recommended for New Design</font></td></tr><tr><td>Alternatives:</td><td><a href="devices.php?device=16F505">16F505</a></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en010119">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>EPROM (OTP)</td></tr><tr><td>Code memory:</td><td>1,023 words (12 bits)</td></tr><tr><td>IO Ports:</td><td>PORTB[6] PORTC[6] </td></tr><tr><td>Packaging:</td><td>PDIP[14] SOIC[14] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>CC5X Compiler, CCS Compiler, GPUtils, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, Picstart Plus</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/16C52.htm
===================================================================
--- trunk/www/devices/16C52.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/16C52.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>16C52</h1><table><tr><td>Status:</td><td><font color="#ff0000">End Of Life</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en010120">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>EPROM (OTP)</td></tr><tr><td>Code memory:</td><td>384 words (12 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[5] PORTB[8] </td></tr><tr><td>Packaging:</td><td>PDIP[18] SOIC[18] SSOP[20] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>CC5X Compiler, CCS Compiler, GPUtils, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, Picstart Plus</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/16C54.htm
===================================================================
--- trunk/www/devices/16C54.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/16C54.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>16C54</h1><table><tr><td>Status:</td><td><font color="#ffa500">Not Recommended for New Design</font></td></tr><tr><td>Alternatives:</td><td><a href="devices.php?device=16F54">16F54</a></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en010121">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>EPROM (OTP)</td></tr><tr><td>Code memory:</td><td>512 words (12 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[5] PORTB[8] </td></tr><tr><td>Packaging:</td><td>PDIP[18] SOIC[18] SSOP[20] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>CC5X Compiler, CCS Compiler, GPUtils, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, GPSim, Picstart Plus</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/16C54A.htm
===================================================================
--- trunk/www/devices/16C54A.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/16C54A.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>16C54A / 16LC54A / 16LV54A</h1><table><tr><td>Status:</td><td><font color="#ffa500">Not Recommended for New Design</font></td></tr><tr><td>Alternatives:</td><td><a href="devices.php?device=16F54">16F54</a></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en010122">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>EPROM (OTP)</td></tr><tr><td>Code memory:</td><td>512 words (12 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[5] PORTB[8] </td></tr><tr><td>Packaging:</td><td>PDIP[18] SOIC[18] SSOP[20] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>CC5X Compiler, CCS Compiler, GPUtils, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, Picstart Plus</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/16C54B.htm
===================================================================
--- trunk/www/devices/16C54B.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/16C54B.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>16C54B / 16LC54B</h1><table><tr><td>Status:</td><td><font color="#ff0000">End Of Life</font></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en010123">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>EPROM (OTP)</td></tr><tr><td>Code memory:</td><td>512 words (12 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[5] PORTB[8] </td></tr><tr><td>Packaging:</td><td>PDIP[18] SOIC[18] SSOP[20] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>CC5X Compiler, CCS Compiler, GPUtils, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, Picstart Plus</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/16C54C.htm
===================================================================
--- trunk/www/devices/16C54C.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/16C54C.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>16C54C / 16LC54C</h1><table><tr><td>Status:</td><td><font color="#ffa500">Not Recommended for New Design</font></td></tr><tr><td>Alternatives:</td><td><a href="devices.php?device=16F54">16F54</a></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en010124">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>EPROM (OTP)</td></tr><tr><td>Code memory:</td><td>512 words (12 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[5] PORTB[8] </td></tr><tr><td>Packaging:</td><td>PDIP[18] SOIC[18] SSOP[20] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>CC5X Compiler, CCS Compiler, GPUtils, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, Picstart Plus</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/16C55.htm
===================================================================
--- trunk/www/devices/16C55.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/16C55.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>16C55</h1><table><tr><td>Status:</td><td><font color="#ffa500">Not Recommended for New Design</font></td></tr><tr><td>Alternatives:</td><td><a href="devices.php?device=16C55A">16C55A</a></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en010125">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>EPROM (OTP)</td></tr><tr><td>Code memory:</td><td>512 words (12 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[5] PORTB[8] PORTC[8] </td></tr><tr><td>Packaging:</td><td>PDIP[28] SOIC[28] SSOP[28] </td></tr></table><hr />
 <table>
-<tr><td>Tools:</td><td>CC5X Compiler, CCS Compiler, GPUtils, PICC Compiler</td></tr>
 <tr><td>Programmers:</td><td>Custom Programmer, Direct Programmer, GPSim, Picstart Plus</td></tr>
 </table>
 <hr />

Modified: trunk/www/devices/16C554.htm
===================================================================
--- trunk/www/devices/16C554.htm	2012-03-17 07:05:10 UTC (rev 2860)
+++ trunk/www/devices/16C554.htm	2012-03-17 17:46:10 UTC (rev 2861)
@@ -1,6 +1,5 @@
 <table><tr><td><h1>16C554 / 16LC554</h1><table><tr><td>Status:</td><td><font color="#ffa500">Not Recommended for New Design</font></td></tr><tr><td>Alternatives:</td><td><a href="devices.php?device=16F627A">16F627A</a></td></tr><tr><td>Information::</td><td><a href="http://www.microchip.com/stellent/idcplg?IdcService=SS_GET_PAGE&amp;nodeId=1335&amp;dDocName=en010126">Device Page</a> </td></tr></table><hr /><table><tr><td>Memory Type:</td><td>EPROM (OTP)</td></tr><tr><td>Code memory:</td><td>512 words (14 bits)</td></tr><tr><td>IO Ports:</td><td>PORTA[5] PORTB[8] </td></tr><tr><td>Packaging:</td><td>PDIP[18] SOIC[18] SSOP[20] </td></tr></table><hr />
...
 
[truncated message content]

[Piklab-svn] SF.net SVN: piklab:[2860] trunk/www

[<az...@us...>]

Revision: 2860
          http://piklab.svn.sourceforge.net/piklab/?rev=2860&view=rev
Author:   azhyd
Date:     2012-03-17 07:05:10 +0000 (Sat, 17 Mar 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/www/base.php
    trunk/www/contact.php

Modified: trunk/www/base.php
===================================================================
--- trunk/www/base.php	2012-03-17 07:00:10 UTC (rev 2859)
+++ trunk/www/base.php	2012-03-17 07:05:10 UTC (rev 2860)
@@ -14,7 +14,9 @@
               "devel"       => "Developers",
               "help"        => array("How to Help", "How to Help"),
               "changelog"   => "Changelog",
-              "license"     => "License"
+              "license"     => "License",
+	      "",
+              "contact"     => "Contact"
 );
 
 function htmlHeader($title)
@@ -43,11 +45,7 @@
 function htmlFooter($date)
 {
   echo "<table class=\"footer\">\n";
-  echo "<tr><td>\n";
-  echo "<a href=\"https://twitter.com/piklab\" class=\"twitter-follow-button\" data-show-count=\"false\" data-size=\"large\" data-show-screen-name=\"true\">Follow @piklab</a>\n";
-  echo "<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=\"//platform.twitter.com/widgets.js\";fjs.parentNode.insertBefore(js,fjs);}}(document,\"script\",\"twitter-wjs\");</script>\n";
-  echo "</td>\n";
-  echo "<td row-span=\"2\" align=\"right\">\n";
+  echo "<tr><td align=\"right\">\n";
   echo "<form id=\"searchbox_014005445692593695753:w1zlf5pteyk\" action=\"http://google.com/cse\">\n";
   echo "<p>";
   echo "<input type=\"hidden\" name=\"cx\" value=\"014005445692593695753:w1zlf5pteyk\" />\n";
@@ -58,7 +56,6 @@
   echo "</form>\n";
   echo "<script type=\"text/javascript\" src=\"http://google.com/coop/cse/brand?form=searchbox_014005445692593695753%3Aw1zlf5pteyk\"></script>\n";
   echo "</td></tr>\n";
-  echo "<tr><td>Email: <a href=\"mailto:ha...@kd...\">ha...@kd...</a></td></tr>\n";
   echo "</table>\n";
   echo "<table class=\"footer\"><tr>\n";
   echo "<td class=\"data\" valign=\"bottom\"><span class=\"date\">$date</span></td>\n";

Modified: trunk/www/contact.php
===================================================================
--- trunk/www/contact.php	2012-03-17 07:00:10 UTC (rev 2859)
+++ trunk/www/contact.php	2012-03-17 07:05:10 UTC (rev 2860)
@@ -5,13 +5,13 @@
 
 <table>
 <tr><td>Announces Mailing List:</td>
-<td><a href="https://lists.sourceforge.net/lists/listinfo/piklab-announce"> Register</a> to <a href="mailto:pik...@li...">pik...@li...</a> or <a href="https://twitter.com/piklab">follow on twitter</a>.
+<td><a href="https://lists.sourceforge.net/lists/listinfo/piklab-announce">Register</a> to <a href="mailto:pik...@li...">pik...@li...</a> or <a href="https://twitter.com/piklab">follow on twitter</a>.
 </td></tr>
 <tr><td>Users Mailing-List:</td>
-<td><a href="https://lists.sourceforge.net/lists/listinfo/piklab-users"> Register</a> to <a href="mailto:pik...@li...">pik...@li...</a>.
+<td><a href="https://lists.sourceforge.net/lists/listinfo/piklab-users">Register</a> to <a href="mailto:pik...@li...">pik...@li...</a>.
 </td></tr>
 <tr><td>Developpers Mailing-List:</td>
-<td><a href="https://lists.sourceforge.net/lists/listinfo/piklab-devel"> register</a> to <a href="mailto:pik...@li...">pik...@li...</a>.
+<td><a href="https://lists.sourceforge.net/lists/listinfo/piklab-devel">Register</a> to <a href="mailto:pik...@li...">pik...@li...</a>.
 </td></tr>
 <tr><td>Email:</td>
 <td><a href="mailto:ha...@kd...">ha...@kd...</a>

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2859] trunk/www/contact.php

[<az...@us...>]

Revision: 2859
          http://piklab.svn.sourceforge.net/piklab/?rev=2859&view=rev
Author:   azhyd
Date:     2012-03-17 07:00:10 +0000 (Sat, 17 Mar 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/www/contact.php

Modified: trunk/www/contact.php
===================================================================
--- trunk/www/contact.php	2012-03-17 06:56:24 UTC (rev 2858)
+++ trunk/www/contact.php	2012-03-17 07:00:10 UTC (rev 2859)
@@ -3,21 +3,20 @@
   pageStart("contact");
 ?>
 
-<p>
-Announces Mailing List: <a href="https://lists.sourceforge.net/lists/listinfo/piklab-announce"> register</a> to <a href="mailto:pik...@li...">pik...@li...</a> or <a href="https://twitter.com/piklab" class="twitter-follow-button" data-show-count="false" data-size="large" data-show-screen-name="true">Follow @piklab</a>.
-</p>
-<p>
-<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
-</p>
-<p>
-Users Mailing-List: <a href="https://lists.sourceforge.net/lists/listinfo/piklab-users"> register</a> to <a href="mailto:pik...@li...">pik...@li...</a>.
-</p>
-<p>
-Developpers Mailing-List: <a href="https://lists.sourceforge.net/lists/listinfo/piklab-devel"> register</a> to <a href="mailto:pik...@li...">pik...@li...</a>.
-</p>
-<p>
-Email: <a href="mailto:ha...@kd...">ha...@kd...</a>
-</p>
+<table>
+<tr><td>Announces Mailing List:</td>
+<td><a href="https://lists.sourceforge.net/lists/listinfo/piklab-announce"> Register</a> to <a href="mailto:pik...@li...">pik...@li...</a> or <a href="https://twitter.com/piklab">follow on twitter</a>.
+</td></tr>
+<tr><td>Users Mailing-List:</td>
+<td><a href="https://lists.sourceforge.net/lists/listinfo/piklab-users"> Register</a> to <a href="mailto:pik...@li...">pik...@li...</a>.
+</td></tr>
+<tr><td>Developpers Mailing-List:</td>
+<td><a href="https://lists.sourceforge.net/lists/listinfo/piklab-devel"> register</a> to <a href="mailto:pik...@li...">pik...@li...</a>.
+</td></tr>
+<tr><td>Email:</td>
+<td><a href="mailto:ha...@kd...">ha...@kd...</a>
+</td></tr>
+</table>
 
 <?php
   pageEnd("\$LastChangedDate: 2006-04-20 15:12:51 -0600 (Thu, 20 Apr 2006) $");

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Piklab-svn] SF.net SVN: piklab:[2858] trunk/www/contact.php

[<az...@us...>]

Revision: 2858
          http://piklab.svn.sourceforge.net/piklab/?rev=2858&view=rev
Author:   azhyd
Date:     2012-03-17 06:56:24 +0000 (Sat, 17 Mar 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/www/contact.php

Modified: trunk/www/contact.php
===================================================================
--- trunk/www/contact.php	2012-03-17 06:30:05 UTC (rev 2857)
+++ trunk/www/contact.php	2012-03-17 06:56:24 UTC (rev 2858)
@@ -3,13 +3,21 @@
   pageStart("contact");
 ?>
 
-Announces Mailing List: <a href="https://lists.sourceforge.net/lists/listinfo/piklab-announce" register> to <a href="mailto:pik...@li..."> or <a href="https://twitter.com/piklab" class="twitter-follow-button" data-show-count="false" data-size="large" data-show-screen-name="true">Follow @piklab</a>. <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
-
-Users Mailing-List: <a href="https://lists.sourceforge.net/lists/listinfo/piklab-users" register> to <a href="mailto:pik...@li...">.
-
-Developpers Mailing-List: <a href="https://lists.sourceforge.net/lists/listinfo/piklab-devel" register> to <a href="mailto:pik...@li...">.
-
+<p>
+Announces Mailing List: <a href="https://lists.sourceforge.net/lists/listinfo/piklab-announce"> register</a> to <a href="mailto:pik...@li...">pik...@li...</a> or <a href="https://twitter.com/piklab" class="twitter-follow-button" data-show-count="false" data-size="large" data-show-screen-name="true">Follow @piklab</a>.
+</p>
+<p>
+<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+</p>
+<p>
+Users Mailing-List: <a href="https://lists.sourceforge.net/lists/listinfo/piklab-users"> register</a> to <a href="mailto:pik...@li...">pik...@li...</a>.
+</p>
+<p>
+Developpers Mailing-List: <a href="https://lists.sourceforge.net/lists/listinfo/piklab-devel"> register</a> to <a href="mailto:pik...@li...">pik...@li...</a>.
+</p>
+<p>
 Email: <a href="mailto:ha...@kd...">ha...@kd...</a>
+</p>
 
 <?php
   pageEnd("\$LastChangedDate: 2006-04-20 15:12:51 -0600 (Thu, 20 Apr 2006) $");

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.