Skip to content

Commit

Permalink
Merge pull request #89 from UMONS-GFA/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
bastinc committed Feb 14, 2018
2 parents a1d364e + 8097403 commit 1bb8907
Show file tree
Hide file tree
Showing 11 changed files with 434 additions and 57 deletions.
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.idea
ardas/*.ssr
ardas/settings.py
ardas/data/*
ardas/logs/*
cronlog.log
ardas/__pycache__/*
15 changes: 9 additions & 6 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,19 @@
[[source]]

url = "https://pypi.python.org/simple"
name = "pypi"
verify_ssl = true

[dev-packages]

[requires]
python_version = "3.5"

[packages]

pyserial = "*"
pandas = "*"
influxdb = "*"
"w1thermsensor" = "*"
ntplib = "*"
influxdb = "*"
numpy = "*"


[dev-packages]
sphinx = "*"
"sphinx-rtd-theme" = "*"
225 changes: 185 additions & 40 deletions Pipfile.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 46 additions & 0 deletions ardas/fake_sensor.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
import random
import time
import datetime
from calendar import timegm


class Fake1WireSensor:
"""Generic fake 1-Wire sensor"""
def __init__(self, seller_id='00-00000'):
"""Generate a unique id with hexadecimal timestamp"""
self.id = seller_id + hex(timegm(datetime.datetime.now().utctimetuple()))[3:]


class FakeTempSensor(Fake1WireSensor):
"""Fake 1-Wire temperature sensor default is DS18B20"""
def __init__(self):
Fake1WireSensor.__init__(self, seller_id='28-00000')
self.name = 't'
self.temperature = 0

def set_name(self, new_name):
self.name = new_name

def get_temperature(self):
self.temperature = random.uniform(20, 28)
return self.temperature


def generate_temp_sensor(nb_sensor=2):
sensors = []
for i in range(nb_sensor):
s = FakeTempSensor()
s.set_name('T' + str(i))
sensors.append(s)
time.sleep(1) # mandatory otherwise each sensor will have the same name
return sensors


def main():
sensors = generate_temp_sensor()
for s in sensors:
print("Temperature of {:s} is {:.3f}".format(s.id, s.get_temperature()))


if __name__ == '__main__':
main()
2 changes: 1 addition & 1 deletion ardas/get_git_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ def get_version():
"""
dir = os.path.dirname(__file__)
branch = subprocess.check_output('cd ' + dir + '; git rev-parse --abbrev-ref HEAD', shell=True)
version = subprocess.check_output('cd ' + dir + '; git describe --long --dirty --abbrev=6 --tags', shell=True)
version = subprocess.check_output('cd ' + dir + '; git describe --long --dirty --abbrev=7 --tags', shell=True)
return branch.decode('ascii')[:-1] + ' | ' + version.decode('ascii')[:-1]

if __name__ == '__main__':
Expand Down

0 comments on commit 1bb8907

Please sign in to comment.