revpi/revpimodio2
1
0
Fork 0
mirror of https://github.com/naruxde/revpimodio2.git synced 2025-11-08 22:03:53 +01:00
Code Issues Packages Releases Wiki Activity

setup.py für Package angepasst

Browse Source 
get_inps _outs _mems umbenannt in get_inputs _outputs _memmories
IOType von __init__ auf io.Type geändert
IOBase.type eingefügt
This commit is contained in:
Sven Sager
2017-08-18 18:41:43 +02:00
parent e124da758f
commit 37eb012e16
10 changed files with 138 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
revpimodio2/device.py
View File

@@ -7,7 +7,6 @@
# -*- coding: utf-8 -*-
"""Modul fuer die Verwaltung der Devices."""
from threading import Lock
from .__init__ import IOType
from .helper import ProcimgWriter
@@ -99,12 +98,16 @@ class Device(object):
# IOM-Objekte erstellen und Adressen in SLCs speichern
if kwargs.get("simulator", False):
self.slc_inp = self._buildio(dict_device.pop("out"), IOType.INP)
self.slc_out = self._buildio(dict_device.pop("inp"), IOType.OUT)
self.slc_inp = self._buildio(
dict_device.pop("out"), iomodule.Type.INP)
self.slc_out = self._buildio(
dict_device.pop("inp"), iomodule.Type.OUT)
else:
self.slc_inp = self._buildio(dict_device.pop("inp"), IOType.INP)
self.slc_out = self._buildio(dict_device.pop("out"), IOType.OUT)
self.slc_mem = self._buildio(dict_device.pop("mem"), IOType.MEM)
self.slc_inp = self._buildio(
dict_device.pop("inp"), iomodule.Type.INP)
self.slc_out = self._buildio(
dict_device.pop("out"), iomodule.Type.OUT)
self.slc_mem = self._buildio(dict_device.pop("mem"), iomodule.Type.MEM)
# SLCs mit offset berechnen
self.slc_devoff = slice(self.offset, self.offset + self._length)
@@ -174,7 +177,7 @@ class Device(object):
"""Erstellt aus der piCtory-Liste die IOs fuer dieses Device.
@param dict_io dict()-Objekt aus piCtory Konfiguration
@param iotype IOType() Wert
@param iotype io.Type() Wert
@return slice()-Objekt mit Start und Stop Position dieser IOs
"""
@@ -267,7 +270,7 @@ class Device(object):
lst_return += lst_io
return lst_return
def get_inps(self):
def get_inputs(self):
"""Gibt eine Liste aller Inputs zurueck.
@return list() Inputs"""
lst_return = []
@@ -275,7 +278,7 @@ class Device(object):
lst_return += lst_io
return lst_return
def get_outs(self):
def get_outputs(self):
"""Gibt eine Liste aller Outputs zurueck.
@return list() Outputs"""
lst_return = []
@@ -283,7 +286,7 @@ class Device(object):
lst_return += lst_io
return lst_return
def get_mems(self):
def get_memmories(self):
"""Gibt eine Liste aller mems zurueck.
@return list() Mems"""
lst_return = []
@@ -537,9 +540,9 @@ class Gateway(Device):
super().__init__(parent, dict_device, **kwargs)
self._dict_slc = {
IOType.INP: self.slc_inp,
IOType.OUT: self.slc_out,
IOType.MEM: self.slc_mem
iomodule.Type.INP: self.slc_inp,
iomodule.Type.OUT: self.slc_out,
iomodule.Type.MEM: self.slc_mem
}
def get_rawbytes(self):