Skip to content

Commit

Permalink
Merge pull request #109 from ChristianTremblay/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
ChristianTremblay committed Oct 1, 2018
2 parents 90f9f8a + be59ea1 commit 8ecc530
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion BAC0/core/devices/Device.py
Expand Up @@ -486,7 +486,7 @@ def __getitem__(self, point_name):
if isinstance(point_name, list):
return self.df(point_name, force_read=False)
else:
return self._findPoint(point_name)
return self._findPoint(point_name, force_read=False)
except ValueError as ve:
self._log.error('{}'.format(ve))

Expand Down
2 changes: 1 addition & 1 deletion BAC0/core/devices/Points.py
Expand Up @@ -497,7 +497,7 @@ def _set(self, value):
raise ValueError('Value must be numeric')

def __repr__(self):
return '{}/{} : {:.2f} {}'.format(self.properties.device.properties.name, self.properties.name, self.lastValue, self.properties.units_state)
return '{}/{} : {:.2f} {}'.format(self.properties.device.properties.name, self.properties.name, self.value, self.properties.units_state)

def __add__(self, other):
return self.value + other
Expand Down
2 changes: 1 addition & 1 deletion BAC0/infos.py
Expand Up @@ -12,5 +12,5 @@
__email__ = 'christian.tremblay@servisys.com'
__url__ = 'https://github.com/ChristianTremblay/BAC0'
__download_url__ = 'https://github.com/ChristianTremblay/BAC0/archive/master.zip'
__version__ = '0.99.941'
__version__ = '0.99.942'
__license__ = 'LGPLv3'
4 changes: 3 additions & 1 deletion tests/test_WithFakeDevice.py
Expand Up @@ -12,7 +12,7 @@

@pytest.fixture(scope='session')
def network_and_devices():
bacnet = BAC0.connect()
bacnet = BAC0.lite()

device_app = BAC0.lite(port=47809)
mv = create_MV(oid=1, name='mv', pv=1)
Expand All @@ -32,9 +32,11 @@ def network_and_devices():

yield (bacnet, device_app, test_device)
# Close when done
test_device.disconnect()
bacnet.disconnect()
device_app.disconnect()


def test_ReadAV(network_and_devices):
bacnet, device_app, test_device = network_and_devices
assert (test_device['av'] - 99.90) < 0.01
Expand Down

0 comments on commit 8ecc530

Please sign in to comment.