//shack is now part of //god

all modules operate with the outside world somehow and can be
considered god mudules.

sorry for your inconvenience

3 files changed, 0 insertions, 98 deletions

diff --git a/shack/strom/main.py b/shack/strom/main.py
deleted file mode 100644
index e1a85d02..00000000
--- a/shack/strom/main.py
+++ /dev/null
@@ -1,50 +0,0 @@
-#! /usr/bin/python
-# -*- coding utf-8 -*-
-
-from __future__ import division
-
-import re
-
-
-class Reader(object):
-    _re = re.compile(r'^(?P<field>\d-\d:\d+\.\d+\.\d+\*\d+)\((?P<value>\S+?)(?:\*[VAW])?\)$')
-
-    def _convert_periode(value):
-        return int(value, 16) / 100
-
-    fields = {
-            '1-0:1.8.0*255': ('overall', float),
-            '1-0:31.7.0*255': ('l1_strom', float),
-            '1-0:32.7.0*255': ('l1_spannung', float),
-            '1-0:51.7.0*255': ('l2_strom', float),
-            '1-0:52.7.0*255': ('l2_spannung', float),
-            '1-0:71.7.0*255': ('l3_strom', float),
-            '1-0:72.7.0*255': ('l3_spannung', float),
-            '1-0:96.50.0*1': ('periode', _convert_periode),
-    }
-
-    def __init__(self, f):
-        self._file = f
-
-    def __iter__(self):
-        data = {}
-        for line in self._file:
-            line = line.strip()
-            if line == '!':
-                yield data
-                data = {}
-                continue
-            r = self._re.match(line)
-            if not r:
-                continue
-            field = self.fields.get(r.group('field'))
-            if field:
-                data[field[0]] = field[1](r.group('value'))
-            #uncomment to print unmapped values
-            #else:
-            #    print r.groups()
-
-        
-data_file = open('testdata')
-for data in Reader(data_file):
-    print data
diff --git a/shack/strom/testdata b/shack/strom/testdata
deleted file mode 100644
index c4db6b5d..00000000
--- a/shack/strom/testdata
+++ /dev/null
@@ -1,24 +0,0 @@
-/HAG5eHZ010C_IEnBWA02
-
-1-0:0.0.0*255(20745965)
-1-0:1.8.0*255(011107.1314)
-1-0:96.5.5*255(82)
-0-0:96.1.255*255(0000120120)
-1-0:32.7.0*255(233.90*V)
-1-0:52.7.0*255(233.07*V)
-1-0:72.7.0*255(236.50*V)
-1-0:31.7.0*255(004.99*A)
-1-0:51.7.0*255(005.02*A)
-1-0:71.7.0*255(007.14*A)
-1-0:21.7.0*255(+00984*W)
-1-0:41.7.0*255(+00966*W)
-1-0:61.7.0*255(+01640*W)
-1-0:96.50.0*0(EF)
-1-0:96.50.0*1(07CE)
-1-0:96.50.0*2(10)
-1-0:96.50.0*3(0B)
-1-0:96.50.0*4(28)
-1-0:96.50.0*5(1D)
-1-0:96.50.0*6(003D381B260A16F1F6FE560200009F80)
-1-0:96.50.0*7(00)
-!
diff --git a/shack/strom/testdatacomment b/shack/strom/testdatacomment
deleted file mode 100644
index e453b98b..00000000
--- a/shack/strom/testdatacomment
+++ /dev/null
@@ -1,24 +0,0 @@
-/HAG5eHZ010C_IEnBWA02
-
-1-0:0.0.0*255(20745965)         #Eigentumsnummer
-1-0:1.8.0*255(011107.1314)      #Zählerstand Bezug
-1-0:96.5.5*255(82)              #Zählerstand Lieferg
-0-0:96.1.255*255(0000120120)    #Status
-1-0:32.7.0*255(233.90*V)        #Spannung L1
-1-0:52.7.0*255(233.07*V)        #Spannung L2
-1-0:72.7.0*255(236.50*V)        #Spannung L3
-1-0:31.7.0*255(004.99*A)        #Strom L1
-1-0:51.7.0*255(005.02*A)        #Strom L2
-1-0:71.7.0*255(007.14*A)        #Strom L3
-1-0:21.7.0*255(+00984*W)        #Leistung L1
-1-0:41.7.0*255(+00966*W)        #Leistung L2
-1-0:61.7.0*255(+01640*W)        #Leistung L3
-1-0:96.50.0*0(EF)               #Netzstatus
-1-0:96.50.0*1(07CE)             #Netzperiode (1/100ms)
-1-0:96.50.0*2(10)               #aktuelle Chiptemp. Zähler (hex, in °C)
-1-0:96.50.0*3(0B)               #min Chiptemp
-1-0:96.50.0*4(28)               #gemittelte Chiptemp
-1-0:96.50.0*5(1D)               #max. Chiptemp.
-1-0:96.50.0*6(003D381B260A16F1F6FE560200009F80) #Kontrollnummer
-1-0:96.50.0*7(00)               #Diagnose
-!                               #ENTE