fix non working ENQ fields in CI mmi (PIN inputs and other)

TODO: make MMI global useable (at moment just in the mmi setup)

diff --git a/data/skin.xml b/data/skin.xml
index 26b6b9d..acb083e 100644 (file)
--- a/data/skin.xml
+++ b/data/skin.xml
@@ -85,13 +85,13 @@
                        <widget name="message" position="20,10" size="320,25" font="Regular;23" />
                </screen>
                <screen name="CiSelection" position="140,165" size="360,100" title="Common Interface">
-                       <widget name="entries" position="20,10" size="320,75" />
+                       <widget name="entries" position="10,10" size="340,75" />
                </screen>
-               <screen name="CiMmi" position="140,165" size="360,260">
-                       <widget name="title" position="10,0" size="320,25" font="Regular;23" />
-                       <widget name="subtitle" position="10,35" size="320,25" font="Regular;23" />
-                       <widget name="entries" position="20,70" size="320,150" scrollbarMode="showOnDemand" />
-                       <widget name="bottom" position="20,230" size="320,25" font="Regular;23" />
+               <screen name="CiMmi" position="130,165" size="450,270">
+                       <widget name="title" position="10,10" size="430,25" font="Regular;23" />
+                       <widget name="subtitle" position="10,35" size="430,25" font="Regular;23" />
+                       <widget name="entries" position="10,70" size="430,150" scrollbarMode="showOnDemand" />
+                       <widget name="bottom" position="10,230" size="430,25" font="Regular;23" />
                </screen>
                <screen name="NimSetup" position="90,98" size="560,410" title="Satconfig">
                        <widget name="config" position="0,0" size="560,402" scrollbarMode="showOnDemand" />

diff --git a/lib/dvb_ci/dvbci_mmi.cpp b/lib/dvb_ci/dvbci_mmi.cpp
index 99426d0..d1103c5 100644 (file)
--- a/lib/dvb_ci/dvbci_mmi.cpp
+++ b/lib/dvb_ci/dvbci_mmi.cpp
@@ -189,8 +189,12 @@ int eDVBCIMMISession::answerEnq(char *answer)
        unsigned int len = strlen(answer);
        printf("eDVBCIMMISession::answerEnq(%d bytes)\n", len);
 
+       unsigned char data[len+1];
+       data[0] = 0x01; // answer ok
+       memcpy(data+1, answer, len);
+
        unsigned char tag[]={0x9f, 0x88, 0x08};
-       sendAPDU(tag, (unsigned char*)answer, len);
+       sendAPDU(tag, data, len+1);
 
        return 0;
 }
@@ -200,7 +204,7 @@ int eDVBCIMMISession::cancelEnq()
        printf("eDVBCIMMISession::cancelEnq()\n");
 
        unsigned char tag[]={0x9f, 0x88, 0x08};
-       unsigned char data[]={0x00};
+       unsigned char data[]={0x00}; // canceled
        sendAPDU(tag, data, 1);
        
        return 0;

diff --git a/lib/dvb_ci/dvbci_ui.cpp b/lib/dvb_ci/dvbci_ui.cpp
index 0716f6c..d36ea6e 100644 (file)
--- a/lib/dvb_ci/dvbci_ui.cpp
+++ b/lib/dvb_ci/dvbci_ui.cpp
@@ -60,10 +60,14 @@ void eDVBCI_UI::setAppName(int slot, const char *name)
        appName = name;
 }
 
+void eDVBCI_UI::setInit(int slot)
+{
+       eDVBCIInterfaces::getInstance()->sendCAPMT(slot);
+}
+
 void eDVBCI_UI::setReset(int slot)
 {
        eDVBCIInterfaces::getInstance()->reset(slot);
-       return;
 }
 
 int eDVBCI_UI::startMMI(int slot)

diff --git a/lib/dvb_ci/dvbci_ui.h b/lib/dvb_ci/dvbci_ui.h
index abf6173..4f23974 100644 (file)
--- a/lib/dvb_ci/dvbci_ui.h
+++ b/lib/dvb_ci/dvbci_ui.h
@@ -32,6 +32,7 @@ public:
        void setState(int slot, int state);
        std::string getAppName(int slot);
        void setAppName(int slot, const char *name);
+       void setInit(int slot);
        void setReset(int slot);
        int initialize(int slot);
        int startMMI(int slot);

diff --git a/lib/python/Screens/Ci.py b/lib/python/Screens/Ci.py
index 79ff34e..f659355 100644 (file)
--- a/lib/python/Screens/Ci.py
+++ b/lib/python/Screens/Ci.py
@@ -9,63 +9,79 @@ from Components.Label import Label
 from Components.HTMLComponent import *
 from Components.GUIComponent import *
 from Components.config import *
+from Components.ConfigList import ConfigList
 
-from enigma import *
+from enigma import eTimer, eDVBCI_UI, eListboxPythonStringContent, eListboxPythonConfigContent
 
-class CiConfigList(HTMLComponent, GUIComponent):
-       def __init__(self, list):
-               GUIComponent.__init__(self)
-               self.l = eListboxPythonConfigContent()
-               self.l.setList(list)
-               self.l.setSeperation(100)
-               self.list = list
+TYPE_MENU = 0
+TYPE_CONFIG = 1
 
-       def toggle(self):
-               pass
+class CiMmi(Screen):
+       def __init__(self, session, slotid, action):
+               Screen.__init__(self, session)
 
-       def handleKey(self, key):
-               selection = self.getCurrent()
-               selection[1].handleKey(key)
-               self.invalidateCurrent()
+               print "ciMMI with action" + str(action)
 
-       def getCurrent(self):
-               return self.l.getCurrentSelection()
+               self.slotid = slotid
 
-       def invalidateCurrent(self):
-               self.l.invalidateEntry(self.l.getCurrentSelectionIndex())
+               self.Timer = eTimer()
+               self.Timer.timeout.get().append(self.TimerCheck)
+               self.Timer.start(1000)
 
-       def invalidate(self, entry):
-               i = 0
-               for x in self.list:
-                       if (entry.getConfigPath() == x[1].parent.getConfigPath()):
-                               self.l.invalidateEntry(i)
-                       i += 1
-               pass
+               #else the skins fails
+               self["title"] = Label("")
+               self["subtitle"] = Label("")
+               self["bottom"] = Label("")
+               self["entries"] = ConfigList([ ])
+               self.listtype = TYPE_CONFIG
 
-       def GUIcreate(self, parent):
-               self.instance = eListbox(parent)
-               self.instance.setContent(self.l)
+               self["actions"] = NumberActionMap(["SetupActions"],
+                       {
+                               "ok": self.okbuttonClick,
+                               "cancel": self.keyCancel,
+                               #for PIN
+                               "left": self.keyLeft,
+                               "right": self.keyRight,
+                               "1": self.keyNumberGlobal,
+                               "2": self.keyNumberGlobal,
+                               "3": self.keyNumberGlobal,
+                               "4": self.keyNumberGlobal,
+                               "5": self.keyNumberGlobal,
+                               "6": self.keyNumberGlobal,
+                               "7": self.keyNumberGlobal,
+                               "8": self.keyNumberGlobal,
+                               "9": self.keyNumberGlobal,
+                               "0": self.keyNumberGlobal
+                       }, -1)
 
-       def GUIdelete(self):
-               self.instance.setContent(None)
-               self.instance = None
+               self.action = action
+
+               if action == 0:                 #reset
+                       eDVBCI_UI.getInstance().setReset(self.slotid)
+                       self.showWait()
+               elif action == 1:               #init
+                       eDVBCI_UI.getInstance().setInit(self.slotid)
+               elif action == 2:               #start MMI
+                       eDVBCI_UI.getInstance().startMMI(self.slotid)
+                       self.showWait()
+               elif action == 3:               #mmi already there (called from infobar)
+                       self.showScreen()
 
-class CiMmi(Screen):
        def addEntry(self, list, entry):
                if entry[0] == "TEXT":          #handle every item (text / pin only?)
-                       #list.append( (entry[1], entry[2]) )
                        list.append( (entry[1], entry[2]) )
                if entry[0] == "PIN":
                        if entry[3] == 1:
                                # masked pins:
-                               x = configElement_nonSave("", configSequence, [1234], configsequencearg.get("PINCODE", (entry[1], "-")))
+                               x = configElement_nonSave("", configSequence, [1234], configsequencearg.get("PINCODE", (entry[1], "*")))
                        else:                           
                                # unmasked pins:
-                               x = configElement_nonSave("", configSequence, [1234], configsequencearg.get("PINCODE", (entry[1], "")))                 
+                               x = configElement_nonSave("", configSequence, [1234], configsequencearg.get("PINCODE", (entry[1], "")))
                        
-                       list.append( (entry[2], 0) )    
+                       self["subtitle"].setText(entry[2])
                        self.pin = getConfigListEntry("",x)
                        list.append( self.pin )
+                       self["bottom"].setText(_("please press OK when ready"))
 
        def okbuttonClick(self):
                print "ok"
@@ -80,9 +96,10 @@ class CiMmi(Screen):
                        eDVBCI_UI.getInstance().answerMenu(self.slotid, 0)
                        self.showWait() 
                elif self.tag == "ENQ":
-                       print "answer ENQ"
-                       eDVBCI_UI.getInstance().answerEnq(self.slotid, str(self.pin[1].parent.value))
-                       self.showWait() 
+                       answer = str(self.pin[1].parent.value[0])
+                       print "answer ENQ", answer
+                       eDVBCI_UI.getInstance().answerEnq(self.slotid, answer)
+                       self.showWait()
 
        def closeMmi(self):
                self.Timer.stop()
@@ -91,16 +108,16 @@ class CiMmi(Screen):
        def keyCancel(self):
                print "keyCancel"
                if self.tag == "WAIT":
+                       eDVBCI_UI.getInstance().stopMMI(self.slotid)
                        self.closeMmi()
-               elif self.tag == "MENU":
+               elif self.tag in [ "MENU", "LIST" ]:
+                       print "cancel list"
                        eDVBCI_UI.getInstance().answerMenu(self.slotid, 0)
-                       self.showWait() 
-               elif self.tag == "LIST":
-                       eDVBCI_UI.getInstance().answerMenu(self.slotid, 0)
-                       self.showWait() 
+                       self.showWait()
                elif self.tag == "ENQ":
+                       print "cancel enq"
                        eDVBCI_UI.getInstance().cancelEnq(self.slotid)
-                       self.showWait() 
+                       self.showWait()
                else:
                        print "give cancel action to ci"        
 
@@ -114,8 +131,28 @@ class CiMmi(Screen):
                self["entries"].handleKey(config.key["nextElement"])
 
        def updateList(self, list):
-               self["entries"].list = list
-               self["entries"].l.setList(list)
+               List = self["entries"]
+               try:
+                       List.instance.moveSelectionTo(0)
+               except:
+                       List.l.setList(list)
+                       return
+
+               if self.tag == "ENQ":
+                       type = TYPE_CONFIG
+               else:
+                       type = TYPE_MENU
+
+               if type != self.listtype:
+                       if type == TYPE_CONFIG:
+                               List.l = eListboxPythonConfigContent()
+                       else:
+                               List.l = eListboxPythonStringContent()
+                       List.instance.setContent(List.l)
+                       self.listtype = type
+
+               List.l.setList(list)
+
 
        def showWait(self):
                self.tag = "WAIT"
@@ -125,30 +162,29 @@ class CiMmi(Screen):
                list = [ ]
                list.append( ("wait for ci...", 0) )
                self.updateList(list)
-               
+
        def showScreen(self):
                screen = eDVBCI_UI.getInstance().getMMIScreen(self.slotid)
        
                list = [ ]
 
                self.tag = screen[0][0]
-               
+
                for entry in screen:
-                       if entry[0] == "TITLE":
-                               self["title"].setText(entry[1])
-                       elif entry[0] == "SUBTITLE":
-                               self["subtitle"].setText(entry[1])
-                       elif entry[0] == "BOTTOM":
-                               self["bottom"].setText(entry[1])
-                       elif entry[0] == "TEXT":
+                       if entry[0] == "PIN":
                                self.addEntry(list, entry)
-                       elif entry[0] == "PIN":
-                               self.addEntry(list, entry)
-
+                       else:
+                               if entry[0] == "TITLE":
+                                       self["title"].setText(entry[1])
+                               elif entry[0] == "SUBTITLE":
+                                       self["subtitle"].setText(entry[1])
+                               elif entry[0] == "BOTTOM":
+                                       self["bottom"].setText(entry[1])
+                               elif entry[0] == "TEXT":
+                                       self.addEntry(list, entry)
                self.updateList(list)
 
        def TimerCheck(self):
-
                if self.action == 0:                    #reset
                        self.closeMmi()
                if self.action == 1:                    #init
@@ -167,58 +203,7 @@ class CiMmi(Screen):
                        self.showScreen()
                        
                #FIXME: check for mmi-session closed    
-                       
-       def __init__(self, session, slotid, action):
-               Screen.__init__(self, session)
-               
-               print "ciMMI with action" + str(action)
-
-               self.slotid = slotid
-
-               self.Timer = eTimer()
-               self.Timer.timeout.get().append(self.TimerCheck)
-               self.Timer.start(1000)
-
-               #else the skins fails
-               self["title"] = Label("")
-               self["subtitle"] = Label("")
-               self["bottom"] = Label("")
-               self["entries"] = MenuList([ ])
-               #self["entries"] = CiConfigList([ ])
-
-               self["actions"] = NumberActionMap(["SetupActions"],
-                       {
-                               "ok": self.okbuttonClick,
-                               "cancel": self.keyCancel,
-                               #for PIN
-                               "left": self.keyLeft,
-                               "right": self.keyRight,
-                               "1": self.keyNumberGlobal,
-                               "2": self.keyNumberGlobal,
-                               "3": self.keyNumberGlobal,
-                               "4": self.keyNumberGlobal,
-                               "5": self.keyNumberGlobal,
-                               "6": self.keyNumberGlobal,
-                               "7": self.keyNumberGlobal,
-                               "8": self.keyNumberGlobal,
-                               "9": self.keyNumberGlobal,
-                               "0": self.keyNumberGlobal
-                       }, -1)
-               
-               self.action = action
 
-               if action == 0:                 #reset
-                       eDVBCI_UI.getInstance().setReset(self.slotid)
-                       self.showWait() 
-               elif action == 1:               #init
-                       pass
-                       self.showWait() 
-               elif action == 2:               #start MMI
-                       eDVBCI_UI.getInstance().startMMI(self.slotid)
-                       self.showWait() 
-               elif action == 3:               #mmi already there (called from infobar)
-                       self.showScreen()       
-                       
 class CiSelection(Screen):
        def createMenu(self):
                self.list = [ ]
@@ -235,8 +220,8 @@ class CiSelection(Screen):
                        appname = eDVBCI_UI.getInstance().getAppName(0)
                        self.list.append( (appname, 2) )
 
-               self["entries"] .list = self.list
-               self["entries"] .l.setList(self.list)
+               self["entries"].list = self.list
+               self["entries"].l.setList(self.list)
 
        def TimerCheck(self):
                state = eDVBCI_UI.getInstance().getState(0)