Merge pull request #5 from H3c702/development

Current state after 35C3 maiden trip

.gitignore

@@ -80,3 +80,7 @@ modules.xml
 *.pyc
 
 *.db
+
+src/log
+
+src/nohup\.out

src/ConfigureScreen.py

@@ -21,14 +21,18 @@ def exit(self):
             Label(text='Do you realy want to close Hector9000 ? \nThere will be no more drinks ....'))
         root.add_widget(root2)
 
-        content = Button(text='OK', font_size=60, size_hint_y=0.15)
-        root.add_widget(content)
+        buttOK = Button(text='OK', font_size=60, size_hint_y=0.15)
+        root.add_widget(buttOK)
+
+        buttCancel = Button(text='Cancel', font_size=60, size_hint_y=0.15)
+        root.add_widget(buttCancel)
 
         popup = Popup(title='WAIT !!!', content=root,
                       auto_dismiss=False)
 
-        content.bind(on_press=popup.dismiss)
-        popup.bind(on_dismiss=self.shutdown)
+        buttOK.bind(on_press=self.shutdown)
+        buttCancel.bind(on_press=popup.dismiss)
+        #popup.bind(on_dismiss=self.shutdown)
         popup.open()
 
     def shutdown(self, instance):

src/HectorConfig.py

@@ -10,21 +10,22 @@
         "valvechannels": range(12),  # 0..11
         "valvepositions": [  # (open, closed)
             (375, 535),  # ch 0
-            (375, 500),  # ch 1
-            (375, 535),  # ch 2
-            (375, 535),  # ch 3
-            (375, 535),  # ch 4
-            (375, 535),  # ch 5
-            (375, 250),  # ch 6
+            (375, 510),  # ch 1
+            (375, 515),  # ch 2
+            (375, 515),  # ch 3
+            (375, 520),  # ch 4
+            (375, 520),  # ch 5
+            (375, 235),  # ch 6
             (375, 250),  # ch 7
             (375, 250),  # ch 8
-            (375, 250),  # ch 9
-            (375, 250),  # ch 10
+            (375, 240),  # ch 9
+            (375, 235),  # ch 10
             (375, 250)  # ch 11
         ],
         "fingerchannel": 12,
         "fingerpositions": (280, 430, 450),  # retracted, above bell, bell
-        "lightchannel": 13,
+        "lightpin": 22,
+        "lightpwmchannel": 13,
         "lightpositions": (0, 500)
     },
     "a4988": {