HG_REPOSITORIES/LPP/INSTRUMENTATION/SocExplorerPlugins Commit - r66:a69da3403983

AHBUART plugin now saves data.

jeandet -

r66:a69da3403983 default

parent child

Context file:

r66:a69da3403983

ahbuartplugin/ahbuartplugin.cpp +15 -14

             #include <QStringList>
             #include <QLineEdit>
             #include <socexplorerproxy.h>
+            #include <socexplorersettings.h>
             ahbuartplugin::ahbuartplugin(QWidget *parent):socexplorerplugin(parent,false)
             {
                 this->setWidget((QWidget*)this->UI);
                 QObject::connect(this,SIGNAL(activateSig(bool)),this->UI,SLOT(setConnected(bool)));
                 QObject::connect(this->UI,SIGNAL(connectPortsig(QString,int)),this,SLOT(togglePort(QString,int)));
-            //    this->pyObject = new ahbuartPywrapper(this);
-            //    QObject::connect(((ahbuartPywrapper*)this->pyObject),SIGNAL(open(QString,int)),this,SLOT(open(QString,int)));
-            //    QObject::connect(((ahbuartPywrapper*)this->pyObject),SIGNAL(close()),this,SLOT(close()));
-            //    QObject::connect(((ahbuartPywrapper*)this->pyObject),SIGNAL(ReadBytes(uint,uint)),this,SLOT(ReadBytes(uint,uint)));
-            //    QObject::connect(((ahbuartPywrapper*)this->pyObject),SIGNAL(WriteBytes(uint,QList<QVariant>)),this,SLOT(WriteBytes(uint,QList<QVariant>)));
                 QObject::connect(this->UI,SIGNAL(rescanPorts()),this,SLOT(updatePortList()));
                 QObject::connect(this,SIGNAL(addReadBytes(int)),this->UI,SLOT(addReadBytes(int)));
                 QObject::connect(this,SIGNAL(addWritenBytes(int)),this->UI,SLOT(addWritenBytes(int)));
                 this->portListcompleter = NULL;
-                this->scanDone = false;
+            //    this->scanDone = false;
                 updatePortList();
             }
                     rs232close(this->port);
                     this->port = (rs232port_t)NULL;
                 }
+                SocExplorerSettings::setValue(this->instance(),"PORT",this->UI->portName(),SocExplorerSettings::Session);
+                SocExplorerSettings::setValue(this->instance(),"SPEED",this->UI->baudRate(),SocExplorerSettings::Session);
                 this->UI->close();
                 this->UI->~ahbUartPluginUI();
             }
                             this->Connected = true;
                             SocExplorerEngine::message(this,QString("Connection success on ")+PortName,2);
                             emit this->activate(true);
-                            if(this->scanDone==false)
+                            if(!socexplorerproxy::haveChild(this,"AMBA_PLUGIN"))
                             {
                                 socexplorerproxy::loadChildSysDriver(this,"AMBA_PLUGIN");
-                                this->scanDone=true;
+            //                    this->scanDone=true;
                             }
                             this->UI->setSystemSpeed(this->detectSpeed());
                             break;
                         CMD[4] = (char)((address)&0xFF);
                         SAFEWRITE(CMD,5,timeout,1000,return 0);
                         timeout.restart();
-                        int avail=0;
+                        unsigned int avail=0;
                         do{
                             avail=rs232availablebytes(this->port);
                             if(timeout.elapsed()>1000)
                     QProgressBar* progress = NULL;
                     if(count>128)
                         progress = SocExplorerEngine::getProgressBar("Writing on uart @0x"+QString::number(address,16)+" %v of "+QString::number(count)+" words ",count);
-                    int offset = 0;
+                    unsigned int offset = 0;
                     char* CMD= (char*)malloc((32*4)+5);
                     writen=0;
                     while(count>32)
                     result.append(QVariant((int)(0x0FF&(data[i]))));
                 }
-                for(int i=0;i<(count%4);i++)
+                for(unsigned int i=0;i<(count%4);i++)
                 {
                     result.append(QVariant((int)(0x0FF&(data[count/4]>>((3-i)*8)))));
                 }
                 unsigned int scaler = 0,dsuVal1=0,dsuVal2=0;
                 int speed=0;
                 QElapsedTimer time;
-                if(dsuBaseAddress!=-1)
+                if((int)dsuBaseAddress!=-1)
                 {
                     time.start();
                     if( this->Read(&dsuVal1,1,dsuBaseAddress+0x08)==1)
                             return ((dsuVal2-dsuVal1)/el)*1000;
                     }
                 }
-                if(ahbUartBaseAddress!=-1)
+                if((int)ahbUartBaseAddress!=-1)
                 {
                     if( this->Read(&scaler,1,ahbUartBaseAddress+0x0C)==1)
                     {
             void ahbuartplugin::postInstantiationTrigger()
             {
-                if(this->scanDone && this->Connected)
+                if(this->Connected)
                 {
                     this->UI->setSystemSpeed(this->detectSpeed());
                 }
+                QString portName = SocExplorerSettings::value(this->instance(),"PORT",this->UI->portName(),SocExplorerSettings::Session).toString();
+                int baudRate = SocExplorerSettings::value(this->instance(),"SPEED",this->UI->baudRate(),SocExplorerSettings::Session).toInt();
+                this->UI->setconfig(portName,baudRate);
             }

ahbuartplugin/ahbuartplugin.h +1 -1

                 void addWritenBytes(int count);
                 void addReadBytes(int count);
             private:
-                bool scanDone;
+            //    bool scanDone;
                 QProgressDialog* progress;
                 QLayout * mainLayout;
                 ahbUartPluginUI* UI;

ahbuartplugin/ahbuartpluginui.cpp +6 0

                 return ui->portSpeed->text().toInt();
             }
+             QString ahbUartPluginUI::portName()
+            {
+                return this->ui->PortName->text();
+            }
             void ahbUartPluginUI::closeEvent(QCloseEvent *event)
             {
                 event->accept();

ahbuartplugin/ahbuartpluginui.h +1 0

                 void closeEvent(QCloseEvent *event);
                 void setCompleter(QCompleter* completer);
                 int baudRate();
+                QString portName();
             public slots:
                 void setConnected(bool connected);
                 void connectPort();

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages