HGKeeper

beremiz

Fix various pylint and pep8 errors

2019-03-13, Andrey Skvortsov

eb4a4cc41914

Fix various pylint and pep8 errors

Check basic code-style problems for PEP-8
pep8 version: 2.4.0
./connectors/PYRO/__init__.py:57:43: E261 at least two spaces before inline comment
./connectors/SchemeEditor.py:29:21: E128 continuation line under-indented for visual indent
./controls/IDBrowser.py:101:23: E127 continuation line over-indented for visual indent
./controls/IDBrowser.py:102:23: E127 continuation line over-indented for visual indent

Check for problems using pylint ...
No config file found, using default configuration
pylint 1.9.4,
astroid 1.6.5
Python 2.7.16rc1 (default, Feb 18 2019, 11:05:09)
[GCC 8.2.0]
Use multiple threads for pylint
Using config file /home/developer/WorkData/PLC/beremiz/beremiz/.pylint
************* Module connectors.PYRO_dialog
connectors/PYRO_dialog.py:9: [W0611(unused-import), ] Unused import wx
************* Module connectors
connectors/__init__.py:32: [W1652(deprecated-types-field), ] Accessing a deprecated fields on the types module
connectors/__init__.py:32: [C0411(wrong-import-order), ] standard import "from types import ClassType" should be placed before "from connectors.ConnectorBase import ConnectorBase"
************* Module connectors.PYRO.PSK_Adapter
connectors/PYRO/PSK_Adapter.py:7: [C0411(wrong-import-order), ] standard import "import ssl" should be placed before "import sslpsk"
************* Module connectors.SchemeEditor
connectors/SchemeEditor.py:29: [C0330(bad-continuation), ] Wrong continued indentation (add 1 space).
wx.ALIGN_CENTER_VERTICAL),
^|
connectors/SchemeEditor.py:42: [W0631(undefined-loop-variable), SchemeEditor.__init__] Using possibly undefined loop variable 'tag'
************* Module runtime.WampClient
runtime/WampClient.py:138: [W1612(unicode-builtin), WampSession.onJoin] unicode built-in referenced
runtime/WampClient.py:154: [W1612(unicode-builtin), WampSession.publishWithOwnID] unicode built-in referenced
runtime/WampClient.py:346: [W1612(unicode-builtin), PublishEvent] unicode built-in referenced
runtime/WampClient.py:351: [W1612(unicode-builtin), PublishEventWithOwnID] unicode built-in referenced
runtime/WampClient.py:31: [W0611(unused-import), ] Unused str imported from builtins as text
************* Module runtime.PLCObject
runtime/PLCObject.py:35: [W1648(bad-python3-import), ] Module moved in Python 3
runtime/PLCObject.py:35: [C0411(wrong-import-order), ] standard import "import md5" should be placed before "from six.moves import xrange"
runtime/PLCObject.py:36: [C0411(wrong-import-order), ] standard import "from tempfile import mkstemp" should be placed before "from six.moves import xrange"
runtime/PLCObject.py:37: [C0411(wrong-import-order), ] standard import "import shutil" should be placed before "from six.moves import xrange"
runtime/PLCObject.py:38: [C0411(wrong-import-order), ] standard import "from functools import wraps, partial" should be placed before "from six.moves import xrange"
************* Module runtime.Worker
runtime/Worker.py:12: [W1648(bad-python3-import), ] Module moved in Python 3
************* Module runtime.spawn_subprocess
runtime/spawn_subprocess.py:125: [C0325(superfluous-parens), ] Unnecessary parens after 'print' keyword
runtime/spawn_subprocess.py:130: [C0325(superfluous-parens), ] Unnecessary parens after 'print' keyword
runtime/spawn_subprocess.py:125: [E1601(print-statement), ] print statement used
runtime/spawn_subprocess.py:130: [E1601(print-statement), ] print statement used
************* Module controls.IDBrowser
controls/IDBrowser.py:101: [C0330(bad-continuation), ] Wrong continued indentation (remove 5 spaces).
if self.isManager
| ^
controls/IDBrowser.py:102: [C0330(bad-continuation), ] Wrong continued indentation (remove 5 spaces).
else dv.DATAVIEW_CELL_INERT),
| ^
************* Module Beremiz_service
Beremiz_service.py:34: [W0611(unused-import), ] Unused import __builtin__

Template C code used to produce target Ethercat C code

Distributed under the terms of the GNU Lesser General Public License as

published by the Free Software Foundation; either version 2 of the License, or

(at your option) any later version.

See COPYING file for copyrights details.

#include <rtdm/rtdm.h>

#include <native/task.h>

#include <native/timer.h>

#include "ecrt.h"

#include "beremiz.h"

#include "iec_types_all.h"

// declaration of interface variables

%(located_variables_declaration)s

// process data

uint8_t *domain1_pd = NULL;

%(used_pdo_entry_offset_variables_declaration)s

const static ec_pdo_entry_reg_t domain1_regs[] = {

%(used_pdo_entry_configuration)s

{}

};

/*****************************************************************************/

%(pdos_configuration_declaration)s

long long wait_period_ns = 100000LL;

// EtherCAT

static ec_master_t *master = NULL;

static ec_domain_t *domain1 = NULL;

static int first_sent=0;

%(slaves_declaration)s

#define SLOGF(level, format, args...)\

char sbuf[256];\

int slen = snprintf(sbuf , sizeof(sbuf) , format , ##args);\

LogMessage(level, sbuf, slen);\

}

/* Beremiz plugin functions */

int __init_%(location)s(int argc,char **argv)

{

uint32_t abort_code;

size_t result_size;

abort_code = 0;

result_size = 0;

master = ecrt_request_master(%(master_number)d);

if (!master) {

SLOGF(LOG_CRITICAL, "EtherCAT master request failed!");

return -1;

}

if(!(domain1 = ecrt_master_create_domain(master))){

SLOGF(LOG_CRITICAL, "EtherCAT Domain Creation failed!");

goto ecat_failed;

}

// slaves PDO configuration

%(slaves_configuration)s

if (ecrt_domain_reg_pdo_entry_list(domain1, domain1_regs)) {

SLOGF(LOG_CRITICAL, "EtherCAT PDO registration failed!");

goto ecat_failed;

}

ecrt_master_set_send_interval(master, common_ticktime__);

// slaves initialization

%(slaves_initialization)s

// extracting default value for not mapped entry in output PDOs

%(slaves_output_pdos_default_values_extraction)s

if (ecrt_master_activate(master)){

SLOGF(LOG_CRITICAL, "EtherCAT Master activation failed");

goto ecat_failed;

}

if (!(domain1_pd = ecrt_domain_data(domain1))) {

SLOGF(LOG_CRITICAL, "Failed to map EtherCAT process data");

goto ecat_failed;

}

SLOGF(LOG_INFO, "Master %(master_number)d activated.");

first_sent = 0;

return 0;

ecat_failed:

ecrt_release_master(master);

return -1;

}

void __cleanup_%(location)s(void)

{

//release master

ecrt_release_master(master);

first_sent = 0;

}

void __retrieve_%(location)s(void)

{

// receive ethercat

if(first_sent){

ecrt_master_receive(master);

ecrt_domain_process(domain1);

%(retrieve_variables)s

}

static RTIME _last_occur=0;

static RTIME _last_publish=0;

RTIME _current_lag=0;

RTIME _max_jitter=0;

static inline RTIME max(RTIME a,RTIME b){return a>b?a:b;}

void __publish_%(location)s(void)

{

%(publish_variables)s

ecrt_domain_queue(domain1);

{

RTIME current_time = rt_timer_read();

// Limit spining max 1/5 of common_ticktime

RTIME maxdeadline = current_time + (common_ticktime__ / 5);

RTIME deadline = _last_occur ?

_last_occur + common_ticktime__ :

current_time + _max_jitter;

if(deadline > maxdeadline) deadline = maxdeadline;

_current_lag = deadline - current_time;

if(_last_publish != 0){

RTIME period = current_time - _last_publish;

if(period > common_ticktime__ )

_max_jitter = max(_max_jitter, period - common_ticktime__);

else

_max_jitter = max(_max_jitter, common_ticktime__ - period);

}

_last_publish = current_time;

_last_occur = current_time;

while(current_time < deadline) {

_last_occur = current_time; //Drift backward by default

current_time = rt_timer_read();

}

if( _max_jitter * 10 < common_ticktime__ && _current_lag < _max_jitter){

//Consuming security margin ?

_last_occur = current_time; //Drift forward

}

ecrt_master_send(master);

first_sent = 1;

}