diff --git a/SocExplorer.pro b/SocExplorer.pro --- a/SocExplorer.pro +++ b/SocExplorer.pro @@ -20,8 +20,10 @@ socexplorercfg.files = \ unix{ - SocExplorer.path = /usr/share/applications/ - SocExplorer.files = unixcfg/SocExplorer.desktop + SocExplorerLauncher.path = /usr/share/applications/ + SocExplorerLauncher.files = unixcfg/SocExplorer.desktop + SocExplorerAppData.path = /usr/share/appdata/ + SocExplorerAppData.files = unixcfg/SocExplorer.appdata.xml PluginConfPath.path = /etc/SocExplorer/plugin.conf.d/ PluginConfPath.files = unixcfg/plugins.conf share.path = /usr/share/SocExplorer @@ -33,7 +35,7 @@ unix{ Qt_Creator_Wizard/SocExplorerPlugin/plugin.h \ Qt_Creator_Wizard/SocExplorerPlugin/project.pro \ Qt_Creator_Wizard/SocExplorerPlugin/wizard.xml - INSTALLS+=Wizard SocExplorer share PluginConfPath + INSTALLS+=Wizard SocExplorerLauncher share PluginConfPath SocExplorerAppData } INSTALLS+=socexplorercfg diff --git a/ressources/Python/register.py b/ressources/Python/register.py new file mode 100644 --- /dev/null +++ b/ressources/Python/register.py @@ -0,0 +1,10 @@ +class SocExplorerRegister: + plugin=0 + address=0 + def __init__(self, plugin,address): + self.plugin = plugin + self.address = address + def value(self): + return self.plugin.Read(self.address,1)[0] + def set(self, value): + return self.plugin.Write(self.address,[value]) diff --git a/src/SocExplorerEngine/SOC/registerdata.h b/src/SocExplorerEngine/SOC/registerdata.h --- a/src/SocExplorerEngine/SOC/registerdata.h +++ b/src/SocExplorerEngine/SOC/registerdata.h @@ -25,31 +25,6 @@ #include #include -//class ucBitfield: public QObject -//{ -// Q_OBJECT -//public: -// explicit ucBitfield(QObject* parent =0); -// explicit ucBitfield(const QString& name,int offset,const QString& description,QObject* parent =0); -// QString name(); -// int offset(); -// QString description(); -//public slots: -// void setName(const QString& name); -// void setOffset(int offset); -// void setDescription(const QString& description); - -//signals: -// void nameChanged(const QString& name); -// void offsetChanged(int offset); -// void descriptionChanged(const QString& description); -//private: - -// QString p_name; -// int p_offset; -// QString p_description; -//}; - class ucRegister :public QObject { Q_OBJECT diff --git a/src/SocExplorerEngine/SOC/socmodel.h b/src/SocExplorerEngine/SOC/socmodel.h --- a/src/SocExplorerEngine/SOC/socmodel.h +++ b/src/SocExplorerEngine/SOC/socmodel.h @@ -30,7 +30,6 @@ #include "registerdata.h" #include #include -//#include class socExplorerEnumDevice; class registerBitFieldModel @@ -82,7 +81,6 @@ class SOCEXPLORER_EXPORT SOCModel :publi Q_OBJECT public: SOCModel(socexplorerplugin* rootDev,QObject* parent=0); - // qint32 getRegValue(qint32 baseAddress); bool isRootDev(socexplorerplugin* rootDev) { return rootDev==p_rootDev; @@ -90,7 +88,6 @@ public: bool enumDeviceExists(qint32 baseAddress); socExplorerEnumDevice *getEnumDevice(qint32 baseAddress); public slots: - //void setRegValue(qint32 baseAddress,qint32 value); qint32 getEnumDeviceBaseAddress(int VID,int PID,int count=0); qint32 getEnumDeviceCount(int VID,int PID); socExplorerEnumDevice* addEnumDevice(int VID, int PID, qint32 baseAddress, const QString& name); diff --git a/src/SocExplorerEngine/engine/socexplorerengine.h b/src/SocExplorerEngine/engine/socexplorerengine.h --- a/src/SocExplorerEngine/engine/socexplorerengine.h +++ b/src/SocExplorerEngine/engine/socexplorerengine.h @@ -90,7 +90,6 @@ public: //! Return the configuration folder path, OS dependant. SOCEXPLORER_SDK_EXPORT static QString configFolder(); //! Return the default plugin folder path, OS dependant. - //static QString pluginFolder(){return QString(SOCEXPLORER_PLUGINS_INSTALL_PATH);} static QStringList pluginFolders(); static QString configPath(){return QString(SOCEXPLORER_CONFIG_PATH);} static QString sharePath(){return QString(SOCEXPLORER_SHARE_PATH);} diff --git a/unixcfg/SocExplorer.appdata.xml b/unixcfg/SocExplorer.appdata.xml new file mode 100644 --- /dev/null +++ b/unixcfg/SocExplorer.appdata.xml @@ -0,0 +1,27 @@ + + + + SocExplorer.desktop + CC0-1.0 + GPL-2.0 + SocExplorer + SocExplorer is an open source generic System On Chip testing software/framework. + +

+ SocExplorer is an open source generic System On Chip testing software/framework. +We write this software for the development and the validation of our instrument, +the Low Frequency Receiver(LFR) for the Solar Orbiter mission. This instrument is +based on an actel FPGA hosting a LEON3FT processor and some peripherals. To +make it more collaborative, we use a plugin based system, the main executable is +SocExplorer then all the functionality are provided by plugins. Like this +everybody can provide his set of plugins to handle a new SOC or just a new +peripheral. SocExplorer uses PythonQt to allow user to automate some tasks such +as loading some plugins, configuring them and talking with his device. +

+
+ + https://hephaistos.lpp.polytechnique.fr/redmine/attachments/download/384/SocExplorer_ScreenShot1.png + + http://www.gnome.org/projects/en_US/gnome-power-manager + alexis.jeandet@member.fsf.org +