# HG changeset patch # User Jeandet Alexis # Date 2014-02-27 14:23:54 # Node ID 73bdcb77e383486dbc3afb1b41f5a7d4db805124 # Parent 14ad7466d71c81c5599477b391c4a67b10b8a547 updated plugin headers and win32/Apbuart fix tentative. diff --git a/APBUARTPLUGIN/APBUARTPLUGIN.cpp b/APBUARTPLUGIN/APBUARTPLUGIN.cpp --- a/APBUARTPLUGIN/APBUARTPLUGIN.cpp +++ b/APBUARTPLUGIN/APBUARTPLUGIN.cpp @@ -1,9 +1,10 @@ -/*------------------------------------------------------------------------------ -- This file is a part of the LPPMON Software +/*------------------------------------------------------------------------------ +-- This file is a part of the SocExplorer Software -- Copyright (C) 2013, Laboratory of Plasmas Physic - CNRS -- -- 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 3 of the License, or +-- the Free Software Foundation; either version 2 of the License, or -- (at your option) any later version. -- -- This program is distributed in the hope that it will be useful, @@ -73,6 +74,7 @@ void ApbUartPlugin::uartReadout() { if(this->baseAddress()!=-1) { + this->loopBackTimer.stop(); unsigned int status_reg,data; char ch; QString printdata=""; @@ -85,6 +87,7 @@ void ApbUartPlugin::uartReadout() } if(printdata!="") emit apbUartTextReceived(printdata); + this->loopBackTimer.start(); } else { @@ -109,7 +112,7 @@ void ApbUartPlugin::activate(bool flag) void ApbUartPlugin::activateScan(bool flag) { if(flag) - this->loopBackTimer.start(100); + this->loopBackTimer.start(200); else this->loopBackTimer.stop(); } @@ -118,7 +121,7 @@ int ApbUartPlugin::enableLoopback() { this->useLoopBack = true; - this->loopBackTimer.start(100); + this->loopBackTimer.start(200); SocExplorerEngine::message(this,"Set FiFo debug mode mode"); if(parent==NULL) { diff --git a/APBUARTPLUGIN/APBUARTPLUGIN.h b/APBUARTPLUGIN/APBUARTPLUGIN.h --- a/APBUARTPLUGIN/APBUARTPLUGIN.h +++ b/APBUARTPLUGIN/APBUARTPLUGIN.h @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2013, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/APBUARTPLUGIN/apbuartcfg.cpp b/APBUARTPLUGIN/apbuartcfg.cpp --- a/APBUARTPLUGIN/apbuartcfg.cpp +++ b/APBUARTPLUGIN/apbuartcfg.cpp @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2013, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/APBUARTPLUGIN/apbuartcfg.h b/APBUARTPLUGIN/apbuartcfg.h --- a/APBUARTPLUGIN/apbuartcfg.h +++ b/APBUARTPLUGIN/apbuartcfg.h @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2013, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/APBUARTPLUGIN/apbuartpluginui.cpp b/APBUARTPLUGIN/apbuartpluginui.cpp --- a/APBUARTPLUGIN/apbuartpluginui.cpp +++ b/APBUARTPLUGIN/apbuartpluginui.cpp @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2013, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/APBUARTPLUGIN/apbuartpluginui.h b/APBUARTPLUGIN/apbuartpluginui.h --- a/APBUARTPLUGIN/apbuartpluginui.h +++ b/APBUARTPLUGIN/apbuartpluginui.h @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2013, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/APBUARTPLUGIN/apbuartterminal.cpp b/APBUARTPLUGIN/apbuartterminal.cpp --- a/APBUARTPLUGIN/apbuartterminal.cpp +++ b/APBUARTPLUGIN/apbuartterminal.cpp @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2013, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/APBUARTPLUGIN/apbuartterminal.h b/APBUARTPLUGIN/apbuartterminal.h --- a/APBUARTPLUGIN/apbuartterminal.h +++ b/APBUARTPLUGIN/apbuartterminal.h @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2013, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/ahbuartplugin/ahbuartplugin.cpp b/ahbuartplugin/ahbuartplugin.cpp --- a/ahbuartplugin/ahbuartplugin.cpp +++ b/ahbuartplugin/ahbuartplugin.cpp @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/ahbuartplugin/ahbuartplugin.h b/ahbuartplugin/ahbuartplugin.h --- a/ahbuartplugin/ahbuartplugin.h +++ b/ahbuartplugin/ahbuartplugin.h @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/ahbuartplugin/ahbuartpluginui.cpp b/ahbuartplugin/ahbuartpluginui.cpp --- a/ahbuartplugin/ahbuartpluginui.cpp +++ b/ahbuartplugin/ahbuartpluginui.cpp @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/ahbuartplugin/ahbuartpluginui.h b/ahbuartplugin/ahbuartpluginui.h --- a/ahbuartplugin/ahbuartpluginui.h +++ b/ahbuartplugin/ahbuartpluginui.h @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/ahbuartplugin/ahbuartpywrapper.cpp b/ahbuartplugin/ahbuartpywrapper.cpp --- a/ahbuartplugin/ahbuartpywrapper.cpp +++ b/ahbuartplugin/ahbuartpywrapper.cpp @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/ambaplugin/AHB/ahbdevicelist.cpp b/ambaplugin/AHB/ahbdevicelist.cpp --- a/ambaplugin/AHB/ahbdevicelist.cpp +++ b/ambaplugin/AHB/ahbdevicelist.cpp @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/ambaplugin/AHB/ahbdevicelist.h b/ambaplugin/AHB/ahbdevicelist.h --- a/ambaplugin/AHB/ahbdevicelist.h +++ b/ambaplugin/AHB/ahbdevicelist.h @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/ambaplugin/AHB/ahbpluginui.cpp b/ambaplugin/AHB/ahbpluginui.cpp --- a/ambaplugin/AHB/ahbpluginui.cpp +++ b/ambaplugin/AHB/ahbpluginui.cpp @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/ambaplugin/AHB/ahbpluginui.h b/ambaplugin/AHB/ahbpluginui.h --- a/ambaplugin/AHB/ahbpluginui.h +++ b/ambaplugin/AHB/ahbpluginui.h @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/ambaplugin/APB/apbdevicelist.cpp b/ambaplugin/APB/apbdevicelist.cpp --- a/ambaplugin/APB/apbdevicelist.cpp +++ b/ambaplugin/APB/apbdevicelist.cpp @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/ambaplugin/APB/apbdevicelist.h b/ambaplugin/APB/apbdevicelist.h --- a/ambaplugin/APB/apbdevicelist.h +++ b/ambaplugin/APB/apbdevicelist.h @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/ambaplugin/APB/apbpluginui.cpp b/ambaplugin/APB/apbpluginui.cpp --- a/ambaplugin/APB/apbpluginui.cpp +++ b/ambaplugin/APB/apbpluginui.cpp @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/ambaplugin/APB/apbpluginui.h b/ambaplugin/APB/apbpluginui.h --- a/ambaplugin/APB/apbpluginui.h +++ b/ambaplugin/APB/apbpluginui.h @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/ambaplugin/ambaplugin.cpp b/ambaplugin/ambaplugin.cpp --- a/ambaplugin/ambaplugin.cpp +++ b/ambaplugin/ambaplugin.cpp @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2012, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/ambaplugin/ambaplugin.h b/ambaplugin/ambaplugin.h --- a/ambaplugin/ambaplugin.h +++ b/ambaplugin/ambaplugin.h @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2012, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/ambaplugin/ambapluginui.cpp b/ambaplugin/ambapluginui.cpp --- a/ambaplugin/ambapluginui.cpp +++ b/ambaplugin/ambapluginui.cpp @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2012, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/ambaplugin/ambapluginui.h b/ambaplugin/ambapluginui.h --- a/ambaplugin/ambapluginui.h +++ b/ambaplugin/ambapluginui.h @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2012, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/dsu3plugin/dsu3plugin.cpp b/dsu3plugin/dsu3plugin.cpp --- a/dsu3plugin/dsu3plugin.cpp +++ b/dsu3plugin/dsu3plugin.cpp @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/dsu3plugin/dsu3plugin.h b/dsu3plugin/dsu3plugin.h --- a/dsu3plugin/dsu3plugin.h +++ b/dsu3plugin/dsu3plugin.h @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2012, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/dsu3plugin/dsu3pluginui.cpp b/dsu3plugin/dsu3pluginui.cpp --- a/dsu3plugin/dsu3pluginui.cpp +++ b/dsu3plugin/dsu3pluginui.cpp @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2013, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/dsu3plugin/dsu3pluginui.h b/dsu3plugin/dsu3pluginui.h --- a/dsu3plugin/dsu3pluginui.h +++ b/dsu3plugin/dsu3pluginui.h @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2012, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/genericrwplugin/genericrwplugin.cpp b/genericrwplugin/genericrwplugin.cpp --- a/genericrwplugin/genericrwplugin.cpp +++ b/genericrwplugin/genericrwplugin.cpp @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/genericrwplugin/genericrwplugin.h b/genericrwplugin/genericrwplugin.h --- a/genericrwplugin/genericrwplugin.h +++ b/genericrwplugin/genericrwplugin.h @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/genericrwplugin/genericrwpluginpywrapper.cpp b/genericrwplugin/genericrwpluginpywrapper.cpp --- a/genericrwplugin/genericrwpluginpywrapper.cpp +++ b/genericrwplugin/genericrwpluginpywrapper.cpp @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2014, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/genericrwplugin/genericrwpluginpywrapper.h b/genericrwplugin/genericrwpluginpywrapper.h --- a/genericrwplugin/genericrwpluginpywrapper.h +++ b/genericrwplugin/genericrwpluginpywrapper.h @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2014, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/genericrwplugin/genericrwpluginui.cpp b/genericrwplugin/genericrwpluginui.cpp --- a/genericrwplugin/genericrwpluginui.cpp +++ b/genericrwplugin/genericrwpluginui.cpp @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/genericrwplugin/genericrwpluginui.h b/genericrwplugin/genericrwpluginui.h --- a/genericrwplugin/genericrwpluginui.h +++ b/genericrwplugin/genericrwpluginui.h @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/genericrwplugin/memeditor.cpp b/genericrwplugin/memeditor.cpp --- a/genericrwplugin/memeditor.cpp +++ b/genericrwplugin/memeditor.cpp @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/genericrwplugin/memeditor.h b/genericrwplugin/memeditor.h --- a/genericrwplugin/memeditor.h +++ b/genericrwplugin/memeditor.h @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/memctrlrplugin/memctrlrplugin.cpp b/memctrlrplugin/memctrlrplugin.cpp --- a/memctrlrplugin/memctrlrplugin.cpp +++ b/memctrlrplugin/memctrlrplugin.cpp @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/memctrlrplugin/memctrlrplugin.h b/memctrlrplugin/memctrlrplugin.h --- a/memctrlrplugin/memctrlrplugin.h +++ b/memctrlrplugin/memctrlrplugin.h @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/memctrlrplugin/memctrlrpluginui.cpp b/memctrlrplugin/memctrlrpluginui.cpp --- a/memctrlrplugin/memctrlrpluginui.cpp +++ b/memctrlrplugin/memctrlrpluginui.cpp @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify diff --git a/memctrlrplugin/memctrlrpluginui.h b/memctrlrplugin/memctrlrpluginui.h --- a/memctrlrplugin/memctrlrpluginui.h +++ b/memctrlrplugin/memctrlrpluginui.h @@ -1,5 +1,5 @@ /*------------------------------------------------------------------------------ --- This file is a part of the LPPMON Software +-- This file is a part of the SocExplorer Software -- Copyright (C) 2011, Laboratory of Plasmas Physic - CNRS -- -- This program is free software; you can redistribute it and/or modify