# HG changeset patch
# User Malte Bayer <mbayer@neo-soft.org>
# Date 1323430127 -3600
# Node ID a20f59a3016c2e3589a456350a1bf989f3061d89
# Parent  9293f3efcc06e06c6d67234393a782f45ac2a078
ui fix, added car5+6 detector to blackbox

diff -r 9293f3efcc06 -r a20f59a3016c blackbox/interrupts.c
--- a/blackbox/interrupts.c	Fri Dec 09 12:21:22 2011 +0100
+++ b/blackbox/interrupts.c	Fri Dec 09 12:28:47 2011 +0100
@@ -99,6 +99,8 @@
         if ( (tmp > 118) && (tmp < 138) ) car0 = 2;
         if ( (tmp > 186) && (tmp < 206) ) car0 = 3;
         if ( (tmp > 246) && (tmp < 266) ) car0 = 4;
+        if ( (tmp > 310) && (tmp < 330) ) car0 = 5;
+        if ( (tmp > 374) && (tmp < 394) ) car0 = 6;
     }
     car0_old = car0_new;
 }
@@ -114,6 +116,8 @@
         if ( (tmp > 118) && (tmp < 138) ) car1 = 2;
         if ( (tmp > 186) && (tmp < 206) ) car1 = 3;
         if ( (tmp > 246) && (tmp < 266) ) car1 = 4;
+        if ( (tmp > 310) && (tmp < 330) ) car1 = 5;
+        if ( (tmp > 374) && (tmp < 394) ) car1 = 6;
     }
     car1_old = car1_new;
 }
diff -r 9293f3efcc06 -r a20f59a3016c slotUI/SlotCli.py
--- a/slotUI/SlotCli.py	Fri Dec 09 12:21:22 2011 +0100
+++ b/slotUI/SlotCli.py	Fri Dec 09 12:28:47 2011 +0100
@@ -63,6 +63,7 @@
         self.scr.addstr(1,0, "%80s" % " ")
 
     def readName(self, slot):
+        self.scr.nodelay(0) # enable delay on readkey
         curses.echo()
         self.scr.addstr(0,0, "Enter Name for Controller %i [%s]:" % (
             slot + 1,
@@ -75,6 +76,7 @@
         self.cleartop()
         self.scr.refresh()
         curses.noecho()
+        self.scr.nodelay(1) # disable delay on readkey
 
     def monitor(self):
         """