From b830ef7d0db32fac5f9a0caf05e250ea9c5aa14c Mon Sep 17 00:00:00 2001 From: LazyAssassin445 Date: Tue, 28 Feb 2017 15:47:07 +0000 Subject: [PATCH] Organisation and delete temphumidtest --- .../distribution_board.fzz | Bin .../force_sensor.fzz | Bin {circuitboards => circuitdesign}/led_board.fzz | Bin modules/hdc1000.py | 6 ++++++ testprograms/temphumidtest | 16 +++++++++++++++- dimensions => wooddesign/dimensions | 0 dimensions.py => wooddesign/dimensions.py | 1 + 7 files changed, 22 insertions(+), 1 deletion(-) rename {circuitboards => circuitdesign}/distribution_board.fzz (100%) rename {circuitboards => circuitdesign}/force_sensor.fzz (100%) rename {circuitboards => circuitdesign}/led_board.fzz (100%) mode change 100644 => 100755 testprograms/temphumidtest rename dimensions => wooddesign/dimensions (100%) mode change 100644 => 100755 rename dimensions.py => wooddesign/dimensions.py (99%) diff --git a/circuitboards/distribution_board.fzz b/circuitdesign/distribution_board.fzz similarity index 100% rename from circuitboards/distribution_board.fzz rename to circuitdesign/distribution_board.fzz diff --git a/circuitboards/force_sensor.fzz b/circuitdesign/force_sensor.fzz similarity index 100% rename from circuitboards/force_sensor.fzz rename to circuitdesign/force_sensor.fzz diff --git a/circuitboards/led_board.fzz b/circuitdesign/led_board.fzz similarity index 100% rename from circuitboards/led_board.fzz rename to circuitdesign/led_board.fzz diff --git a/modules/hdc1000.py b/modules/hdc1000.py index a420f83..9388d3e 100644 --- a/modules/hdc1000.py +++ b/modules/hdc1000.py @@ -39,6 +39,7 @@ def reset(extra = 0): extra ) bus.i2c([CONFIG_REG, config >> 8, config & 0xff], 0) + time.sleep(0.2) def temperature(): # Request temperature measurement @@ -79,3 +80,8 @@ def drySensor(): def init(): reset() +def done(): + global bus + bus.close() + del bus + diff --git a/testprograms/temphumidtest b/testprograms/temphumidtest old mode 100644 new mode 100755 index 462fce4..08c6c79 --- a/testprograms/temphumidtest +++ b/testprograms/temphumidtest @@ -1 +1,15 @@ -tests and stuff +#!/usr/bin/python3 + +import os, sys +lib_path = os.path.abspath(os.path.join('..', 'modules')) +sys.path.append(lib_path) + +import hdc1000 + +hdc1000.init() + +print("Temperature: %.2f C" % hdc1000.temperature()) +print("Humidity: %.2f %%" % hdc1000.humidity()) + +hdc1000.done() + diff --git a/dimensions b/wooddesign/dimensions old mode 100644 new mode 100755 similarity index 100% rename from dimensions rename to wooddesign/dimensions diff --git a/dimensions.py b/wooddesign/dimensions.py similarity index 99% rename from dimensions.py rename to wooddesign/dimensions.py index 0032581..69e4747 100644 --- a/dimensions.py +++ b/wooddesign/dimensions.py @@ -1,3 +1,4 @@ +#!/usr/bin/python3 import math as maths