FactoryTest : fix bug, only fan speed up for uno,ultimo
[vuplus_dvbapp] / lib / python / Plugins / SystemPlugins / FactoryTest / plugin.py
index b84ac01..1a36c3e 100755 (executable)
@@ -16,37 +16,93 @@ from Components.HTMLComponent import HTMLComponent
 from Components.GUIComponent import GUIComponent
 from enigma import eListboxPythonStringContent, eListbox, gFont, eServiceCenter, eDVBResourceManager
 from enigma import eServiceReference
-from enigma import eMemtest
-from enigma import eSctest
+from sctest import eSctest
 from enigma import eDVBDB
 from Components.NimManager import nimmanager
 from enigma import eDVBCI_UI,eDVBCIInterfaces
+from Tools.Directories import resolveFilename, SCOPE_SYSETC
+from Components.Sources.StaticText import StaticText
 
-class TestResultList(HTMLComponent, GUIComponent):
-       def __init__(self, source):
-               GUIComponent.__init__(self)
-               self.l = eListboxPythonStringContent()
-               self.list = source
-               self.l.setList(self.list)
-
-       GUI_WIDGET = eListbox
-
+class TestResultList(MenuList):
        def postWidgetCreate(self, instance):
                self.instance.setSelectionEnable(0)
-               self.instance.setContent(self.l)
+               instance.setContent(self.l)
+               instance.selectionChanged.get().append(self.selectionChanged)
+               if self.enableWrapAround:
+                       self.instance.setWrapAround(True)
+
+       def updateList(self, list):
+               self.list = list
+               self.l.setList(self.list)
 
-       def updateList(self,list):
-               self.l.setList(list)
+class TuneMessageBox(MessageBox):
+       skin = """
+               <screen position="center,center" size="600,10" title="Message">
+                       <widget name="text" position="65,8" size="420,0" font="Regular;22" />
+                       <widget name="ErrorPixmap" pixmap="Vu_HD/icons/input_error.png" position="5,5" size="53,53" alphatest="blend" />
+                       <widget name="QuestionPixmap" pixmap="Vu_HD/icons/input_question.png" position="5,5" size="53,53" alphatest="blend" />
+                       <widget name="InfoPixmap" pixmap="Vu_HD/icons/input_info.png" position="5,5" size="53,53" alphatest="blend" />
+                       <widget name="list" position="100,100" size="380,375" transparent="1" backgroundColor="darkgrey" />
+                       <!-- Signal Quality -->
+                       <eLabel text="SNR : " position="60,130" size="60,25" font="Regular;25" transparent="1" />
+                       <widget source="session.FrontendStatus" render="Label" position="120,130" size="60,25" font="Regular;25"  transparent="1">
+                               <convert type="FrontendInfo">SNRdB</convert>
+                       </widget>
+                       <!-- AGC -->
+                       <eLabel text="AGC : " position="200,130" size="60,25" font="Regular;25"  transparent="1" noWrap="1" />
+                       <widget source="session.FrontendStatus" render="Label" position="260,130" size="60,25" font="Regular;25"  transparent="1" noWrap="1">
+                               <convert type="FrontendInfo">AGC</convert>
+                       </widget>
+                       <applet type="onLayoutFinish">
+# this should be factored out into some helper code, but currently demonstrates applets.
+from enigma import eSize, ePoint
+
+orgwidth = self.instance.size().width()
+orgpos = self.instance.position()
+textsize = self[&quot;text&quot;].getSize()
+
+# y size still must be fixed in font stuff...
+textsize = (textsize[0] + 50, textsize[1] + 50)
+offset = 0
+if self.type == self.TYPE_YESNO:
+       offset = 60
+wsizex = textsize[0] + 60
+wsizey = textsize[1] + offset
+if (280 &gt; wsizex):
+       wsizex = 280
+wsizex = wsizex + 30
+wsizey = wsizey + 30
+wsize = (wsizex, wsizey)
+
+# resize
+self.instance.resize(eSize(*wsize))
+
+# resize label
+self[&quot;text&quot;].instance.resize(eSize(*textsize))
+
+# move list
+listsize = (wsizex, 50)
+self[&quot;list&quot;].instance.move(ePoint(0, textsize[1]))
+self[&quot;list&quot;].instance.resize(eSize(*listsize))
+
+# center window
+newwidth = wsize[0]
+self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
+                       </applet>
+               </screen>"""
+       def __init__(self, session, text, type = MessageBox.TYPE_YESNO):
+               MessageBox.__init__(self, session, text, type)
 
 class FactoryTest(Screen):
        skin = """
-               <screen position="120,125" size="440,400" title="Test Menu" >
-                       <widget name="testlist" position="10,0" size="340,350" />
-                       <widget name="resultlist" position="370,0" size="60,350" />
-                       <widget name="testdate" position="20,350" size="150,25" font="Regular;22" />
-                       <widget name="testversion" position="20,375" size="150,25" font="Regular;22" />
-                       <widget name="mactext" position="180,350" size="230,25" font="Regular;22" />                    
+               <screen name="FactoryTest" position="300,100" size="660,550" title="Test Menu" >
+                       <widget name="testlist" position="10,0" size="440,455" itemHeight="35" />
+                       <widget name="resultlist" position="470,0" size="60,455" itemHeight="35" />
+                       <widget name="testdate" position="20,470" size="250,35" font="Regular;30" />
+                       <widget name="testversion" position="20,505" size="250,35" font="Regular;30" />
+                       <widget name="mactext" position="320,470" size="340,35" font="Regular;30" />
                </screen>"""
+
        def __init__(self, session):
 
                self["actions"] = NumberActionMap(["OkCancelActions","WizardActions","NumberActions","ColorActions",],
@@ -72,8 +128,8 @@ class FactoryTest(Screen):
                }, -2)
 
                Screen.__init__(self, session)
-               TESTPROGRAM_DATE = "2010-12-14"
-               TESTPROGRAM_VERSION = "Version 00.01"
+               TESTPROGRAM_DATE = self.getImageVersion() +" (v1.10)"
+               TESTPROGRAM_VERSION = "Version 01.10"
 
                self.model = 0
                self.getModelInfo()
@@ -81,12 +137,13 @@ class FactoryTest(Screen):
                self["testdate"]=Label((TESTPROGRAM_DATE))
                self["testversion"]=Label(("Loading version..."))
                self["mactext"]=Label(("Loading mac address..."))
-               nimConfig = nimmanager.getNimConfig(0)
-               nimConfig.configMode.slot_id=0
-               nimConfig.configMode.value= "simple"
-               nimConfig.diseqcMode.value="diseqc_a_b"
-               nimConfig.diseqcA.value="160"
-               nimConfig.diseqcB.value="100"
+               if self.model == 0 or self.model == 1:
+                       nimConfig = nimmanager.getNimConfig(0)
+                       nimConfig.configMode.slot_id=0
+                       nimConfig.configMode.value= "simple"
+                       nimConfig.diseqcMode.value="diseqc_a_b"
+                       nimConfig.diseqcA.value="160"
+                       nimConfig.diseqcB.value="100"
                if self.model == 0:
                        nimConfig = nimmanager.getNimConfig(1)
                        nimConfig.configMode.slot_id=1          
@@ -96,13 +153,116 @@ class FactoryTest(Screen):
                        nimConfig.diseqcB.value="192"
                if self.model == 2:
                        pass
-               nimmanager.sec.update()         
+               if self.model == 3 or self.model == 4:
+                       self.NimType = {}
+                       sat_list = ["160","100","130","192","620","642"]
+                       try:
+                               nimfile = open("/proc/bus/nim_sockets")
+                       except IOError:
+                               nimfile = None
+                       if nimfile is None:
+                               self.session.openWithCallback(self.close, MessageBox, _("File not Found!\n/proc/bus/nim_sockets"), MessageBox.TYPE_ERROR)
+                       for line in nimfile.readlines():
+                               print line
+                               if line == "":
+                                       break
+                               if line.strip().startswith("NIM Socket"):
+                                       parts = line.strip().split(" ")
+                                       current_slot = int(parts[2][:-1])
+                                       self.NimType[current_slot]={}
+                                       self.NimType[current_slot]["slot"] = current_slot
+                               elif line.strip().startswith("Type:"):
+                                       print str(line.strip())
+                                       self.NimType[current_slot]["type"] = str(line.strip()[6:])
+                                       if self.NimType[current_slot]["type"].startswith("DVB-S"):
+                                               self.NimType[current_slot]["sat1"] = sat_list.pop(0)
+                                               self.NimType[current_slot]["sat2"] = sat_list.pop(0)
+                                       else:
+                                               self.NimType[current_slot]["sat1"] = None
+                                               self.NimType[current_slot]["sat2"] = None
+                               elif line.strip().startswith("empty"):
+                                       self.NimType.pop(current_slot)  
+                       nimfile.close()
+                       if True:
+                               for (key, val) in self.NimType.items():
+                                       print key
+                                       print val
+                                       if val["type"].startswith("DVB-S"):
+                                               print "nimConfig (dvb-s): ",key
+                                               nimConfig = nimmanager.getNimConfig(key)
+                                               nimConfig.configMode.slot_id=key
+                                               nimConfig.configMode.value= "simple"
+                                               nimConfig.diseqcMode.value="diseqc_a_b"
+                                               nimConfig.diseqcA.value = val["sat1"]
+                                               nimConfig.diseqcB.value = val["sat2"]
+                                       else :
+                                               nimConfig = nimmanager.getNimConfig(key)
+                                               print "configMode check : ",nimConfig.configMode.value
+                       
+               nimmanager.sec.update()
                
                system("cp /usr/lib/enigma2/python/Plugins/SystemPlugins/FactoryTest/testdb /etc/enigma2/lamedb")
                db = eDVBDB.getInstance()
                db.reloadServicelist()
+               self.createConfig()
+               
+               self.rlist = []
+               for x in range(self.menulength-1):
+                       self.rlist.append((".."))
+               self.rlist.append((" "))
+               self["resultlist"] = TestResultList(self.rlist)
+
+               self.avswitch = AVSwitch()
+               self.scTest= eSctest()
+               
+               self.testing = 0
+
+               self.servicelist = ServiceList()
+               self.oldref = session.nav.getCurrentlyPlayingServiceReference()
+               print "oldref",self.oldref
+               session.nav.stopService() # try to disable foreground service
+               
+               self.tunemsgtimer = eTimer()
+               self.tunemsgtimer.callback.append(self.tunemsg)
+
+               self.camstep = 1
+               self.camtimer = eTimer()
+               self.camtimer.callback.append(self.cam_state)
+               self.mactry = 1
+               self.getmacaddr()
+               self.getversion()
+               
+               self.tunerlock = 0
+               self.tuningtimer = eTimer()
+               self.tuningtimer.callback.append(self.updateStatus)
+
+               self.satatry = 8
+               self.satatimer = eTimer()
+               self.satatimer.callback.append(self.sataCheck)
+
+               self.usbtimer = eTimer()
+               self.usbtimer.callback.append(self.usbCheck)
 
+               self.agingtimer = eTimer()
+               self.agingtimer.callback.append(self.agingCheck)
+               self.setSourceVar()
+               self.FanSpeedUp(255)
+
+       def FanSpeedUp(self,value):
+               if self.model in (3,4): # uno or ultimo
+                       if value <0:
+                               value = 0
+                       elif value >255:
+                               value = 255
+                       print "[FactoryTest, FanSpeedUp] setPWM to : %d"%value
+                       f = open("/proc/stb/fp/fan_pwm", "w")
+                       f.write("%x" % value)
+                       f.close()
+
+       def createConfig(self):
                tlist = []
+               self.satetestIndex = -1
+               self.scarttestIndex = -1
                if self.model == 0:
                        self.satetestIndex=0
                        tlist.append((" 0. Sata & extend hdd test",self.satetestIndex))
@@ -113,33 +273,27 @@ class FactoryTest(Screen):
                        self.smarttestIndex=3
                        tlist.append((" 3. Smartcard test",self.smarttestIndex))
                        self.tuner1_1testIndex=4
-                       tlist.append((" 4. T1 H 22K x 4:3 CVBS",self.tuner1_1testIndex))
+                       tlist.append((" 4. T1/H/22K x /4:3/CVBS",self.tuner1_1testIndex))
                        self.tuner1_2testIndex=5
-                       tlist.append((" 5. T1 V 22k o 16:9 RGB",self.tuner1_2testIndex))
+                       tlist.append((" 5. T1/V/22k o/16:9/RGB",self.tuner1_2testIndex))
                        self.tuner2_1testIndex=6
-                       tlist.append((" 6. T2 H 22k x 4:3 YC",self.tuner2_1testIndex))
+                       tlist.append((" 6. T2/H/22k x/4:3/YC",self.tuner2_1testIndex))
                        self.tuner2_2testIndex=7
-                       tlist.append((" 7. T2 V 22k o 16:9 CVBS CAM",self.tuner2_2testIndex))
+                       tlist.append((" 7. T2/V/22k o/16:9/CVBS/CAM",self.tuner2_2testIndex))
                        self.scarttestIndex=8
                        tlist.append((" 8. VCR Scart loop",self.scarttestIndex))
                        self.rs232testIndex=9
                        tlist.append((" 9. RS232 test",self.rs232testIndex))
                        self.ethernettestIndex=10
                        tlist.append(("10. Ethernet & mac test",self.ethernettestIndex))
-#              tlist.append(("11. DRAM test",11))
-#              tlist.append(("12. Flash test",12))
-#              tlist.append(("13. DRAM+Flash test",13))
                        self.fdefaultIndex=11
                        tlist.append(("11. Factory default",self.fdefaultIndex))
                        self.shutdownIndex=12
-                       tlist.append(("12. Shutdown",self.shutdownIndex))
+                       tlist.append(("12. Shutdown(Deep Standby)",self.shutdownIndex))
+                       self.tuner_test_first_index = 4
+                       self.tuner_test_last_index = 7
+                       
                elif self.model == 1:
-#                      tlist.append((" 0. Sata & extend hdd test",self.satetestIndex=0))
-                       self.satetestIndex = -1
-                       self.scarttestIndex = -1
-
-
-
                        self.usbtestIndex=0
                        tlist.append((" 0. USB test",self.usbtestIndex))
                        self.fronttestIndex=1
@@ -147,27 +301,21 @@ class FactoryTest(Screen):
                        self.smarttestIndex=2
                        tlist.append((" 2. Smartcard test",self.smarttestIndex))
                        self.tuner1_1testIndex=3
-                       tlist.append((" 3. T1 H 22K x 4:3 CVBS",self.tuner1_1testIndex))
-                       self.tuner1_2testIndex=4
-                       tlist.append((" 4. T1 V 22k o 16:9 RGB CAM",self.tuner1_2testIndex))
-                       self.tuner2_2testIndex=4
-#                      tlist.append((" 6. T2 H 22k x 4:3 YC",self.tuner2_1testIndex=6))
-#                      tlist.append((" 7. T2 V 22k o 16:9 CVBS CAM",self.tuner2_2testIndex=7))
-#                      tlist.append((" 8. VCR Scart loop",self.scarttestIndex=8))
+                       tlist.append((" 3. T1/H/22K x/4:3/CVBS",self.tuner1_1testIndex))
+                       self.tuner2_2testIndex = self.tuner1_2testIndex=4
+                       tlist.append((" 4. T1/V/22k o/16:9/RGB/CAM",self.tuner1_2testIndex))
                        self.rs232testIndex=5
                        tlist.append((" 5. RS232 test",self.rs232testIndex))
                        self.ethernettestIndex=6
                        tlist.append((" 6. Ethernet & mac test",self.ethernettestIndex))
-#              tlist.append(("11. DRAM test",11))
-#              tlist.append(("12. Flash test",12))
-#              tlist.append(("13. DRAM+Flash test",13))
                        self.fdefaultIndex=7
                        tlist.append((" 7. Factory default",self.fdefaultIndex))
                        self.shutdownIndex=8
-                       tlist.append((" 8. Shutdown",self.shutdownIndex))
+                       tlist.append((" 8. Shutdown(Deep Standby)",self.shutdownIndex))
+                       self.tuner_test_first_index = 3
+                       self.tuner_test_last_index = 4
 
                elif self.model == 2:
-                       self.scarttestIndex = -1
                        self.satetestIndex=0
                        tlist.append((" 0. Sata & extend hdd test",self.satetestIndex))
                        self.usbtestIndex=1
@@ -191,75 +339,139 @@ class FactoryTest(Screen):
                        tlist.append(("9. Factory default",self.fdefaultIndex))
                        self.shutdownIndex=10
                        tlist.append(("10. Shutdown",self.shutdownIndex))
+                       self.tuner_test_first_index = 4
+                       self.tuner_test_last_index = 6
+
+               elif self.model == 3 or self.model == 4:
+                       self.satetestIndex=0
+                       tlist.append((" 0. Sata & extend hdd test",self.satetestIndex))
+                       self.usbtestIndex=1
+                       tlist.append((" 1. USB test",self.usbtestIndex))
+                       self.fronttestIndex=2
+                       tlist.append((" 2. Front test",self.fronttestIndex))
+                       self.smarttestIndex=3
+                       tlist.append((" 3. Smartcard test",self.smarttestIndex))
+                       if self.model == 3:
+                               self.tuner_test_first_index = current_index = 4
+                       elif self.model == 4:
+                               self.tuner_test_first_index = 4
+                               current_index = 0
+                       AspectRatio=["4:3", "16:9"]
+                       ColorFormat=["CVBS","RGB","YC","CVBS","CVBS","CVBS","CVBS","CVBS"]      
+                       self.tuneInfo={}
+                       tunelist = []
+                       for (key, val) in self.NimType.items():
+                               if val["type"].startswith("DVB-S"):
+# Chang : DVB -S setting diseqc A
+                                       getRatio = AspectRatio.pop(0) # ratio
+                                       AspectRatio.append(getRatio)
+                                       getColorFormat=ColorFormat.pop(0) # colorFormat
+                                       menuname=" %d. T%d/%s/H/22k x/%s/%s" % (current_index, key+1, val["type"], getRatio, getColorFormat)    #menuname
+                                       print current_index
+#                                              current_index=4
+                                       self.setTuneInfo(index=current_index, slot=key, type=val["type"], sat=val["sat1"], pol="H", tone=False, ratio=getRatio, color=getColorFormat, cam=False) # setTuneInfo
+#                                              self.setTuneInfo(current_index, key, val["type"], val["sat1"], "H", True, getRatio, getColorFormat, False) # setTuneInfo
+                                       tunelist.append((menuname,current_index))
+                                       current_index+=1
+# Chang : DVB -S setting diseqc B
+                                       getRatio = AspectRatio.pop(0)
+                                       AspectRatio.append(getRatio)
+                                       getColorFormat=ColorFormat.pop(0)
+                                       menuname=" %d. T%d/%s/V/22k o/%s/%s" % (current_index, key+1, val["type"], getRatio, getColorFormat)
+                                       if len(self.NimType) == key+1: # CAM test on/off
+                                               menuname+="/CAM"
+                                               camtest = True
+                                       else:
+                                               camtest = False
+                                       self.setTuneInfo( index=current_index, slot=key, type=val["type"], sat=val["sat2"], pol="V", tone=True, ratio=getRatio, color=getColorFormat, cam=camtest)
+                                       tunelist.append((menuname,current_index))
+                                       current_index+=1
+# Chang : DVB -T or DVB-C
+                               elif val["type"].startswith("DVB-T") or val["type"].startswith("DVB-C"):
+                                       additionalMenu = None
+                                       menulen = 1
+                                       if len(self.NimType) == 1:
+                                               additionalMenu = True
+                                               menulen +=1
+                                       for x in range(menulen):
+                                               getRatio = AspectRatio.pop(0)
+                                               AspectRatio.append(getRatio)
+                                               getColorFormat=ColorFormat.pop(0)
+                                               menuname=" %d. T%d/%s/%s/%s" % (current_index, key+1, val["type"], getRatio, getColorFormat)
+                                               if len(self.NimType) == key+1 and (additionalMenu is None or x != 0): # CAM test on/off
+                                                       menuname+=" CAM"
+                                                       camtest = True
+                                               else:
+                                                       camtest = False
+                                               self.setTuneInfo( index=current_index, slot=key, type=val["type"], sat=None, pol=None, tone=None, ratio=getRatio, color=getColorFormat, cam=camtest)
+                                               tunelist.append((menuname,current_index))
+                                               current_index+=1
+                       if self.model == 3:
+                               tlist.extend(tunelist)
+                               self.tuner_test_last_index = current_index-1
+                       elif self.model == 4:
+                               self.tunelist = tunelist
+                               self.tuner_test_last_index = 4
+                               current_index = self.tuner_test_last_index
+                               tlist.append((" %d. Tuning test" % current_index,self.tuner_test_last_index))
+                               current_index+=1
+                       self.rs232testIndex=current_index
+                       tlist.append((" %d. RS232 test" % current_index,self.rs232testIndex))
+                       current_index+=1
+                       self.ethernettestIndex=current_index
+                       tlist.append((" %d. Ethernet & mac test" % current_index,self.ethernettestIndex))
+                       current_index+=1
+                       self.fdefaultIndex=current_index
+                       tlist.append((" %d. Factory default" % current_index,self.fdefaultIndex))
+                       current_index+=1
+                       self.shutdownIndex=current_index
+                       tlist.append((" %d. Shutdown(Deep Standby)" % current_index,self.shutdownIndex))
                        
-               self.menulength= len(tlist)-1
+               self.menulength= len(tlist)
                self["testlist"] = MenuList(tlist)
-               self.rlist = []
-               for x in range(self.menulength):
-                       self.rlist.append((".."))
-               self["resultlist"] = TestResultList(self.rlist)
-               self.NetworkState = 0
-               self.first = 0
-
-               self.avswitch = AVSwitch()
-               self.memTest = eMemtest()
-               self.scTest= eSctest()
-               
-               self.feid=0
-               self.agingmode=0
-               self.testing = 0
-
-               self.servicelist = ServiceList()
-               self.oldref = session.nav.getCurrentlyPlayingServiceReference()
-               print "oldref",self.oldref
-               session.nav.stopService() # try to disable foreground service
-               
-               self.tunemsgtimer = eTimer()
-               self.tunemsgtimer.callback.append(self.tunemsg)
-
-               if self.model == 0:
-                       self.cam_index = 7
-               elif self.model == 1:
-                       self.cam_index = 4
-               elif self.model == 2:
-                       self.cam_index = 6      
-               self.camstep = 1
-               self.camtimer = eTimer()
-               self.camtimer.callback.append(self.cam_state)
-               self.mactry = 1
-               self.getmacaddr()
-               self.getversion()
-               
-               self.tunerlock = 0
-               self.tuningtimer = eTimer()
-               self.tuningtimer.callback.append(self.updateStatus)
-
-               self.satatry = 8
-               self.satatimer = eTimer()
-               self.satatimer.callback.append(self.sataCheck)
-
-               self.usbtimer = eTimer()
-               self.usbtimer.callback.append(self.usbCheck)
+       
+       def setTuneInfo(self,index=0,slot=0,type="DVB-S2",sat="160",pol="H",tone=True,ratio="4:3",color="CVBS",cam=False):
+               self.tuneInfo[index]={}
+               self.tuneInfo[index]["slot"]=slot
+               self.tuneInfo[index]["type"]=type
+               self.tuneInfo[index]["sat"]=sat
+               self.tuneInfo[index]["pol"]=pol
+               self.tuneInfo[index]["22k"]=tone
+               self.tuneInfo[index]["ratio"]=ratio
+               self.tuneInfo[index]["color"]=color
+               self.tuneInfo[index]["cam"]=cam
 
        def getModelInfo(self):
                getmodel = 0
                if fileExists("/proc/stb/info/vumodel"):
-                       info = open("/proc/stb/info/vumodel").read().strip()
-                       if info == "combo":
-                               self.model = 2
+                       vumodel = open("/proc/stb/info/vumodel")
+                       info=vumodel.read().strip()
+                       vumodel.close()
+                       if info == "duo":
+                               self.model = 0
                                getmodel = 1
-                               print "getModelInfo : combo"
+                               print "getModelInfo : duo"
                        if info == "solo":
                                self.model = 1
                                getmodel = 1
                                print "getModelInfo : solo"
-                       if info == "duo":
-                               self.model = 0
+                       if info == "combo":
+                               self.model = 2
                                getmodel = 1
-                               print "getModelInfo : duo"
+                               print "getModelInfo : combo"
+                       if info == "uno":
+                               self.model = 3
+                               getmodel = 1
+                               print "getModelInfo : uno"
+                       if info == "ultimo":
+                               self.model = 4
+                               getmodel = 1
+                               print "getModelInfo : ultimo"
+
                if getmodel == 0 and fileExists("/proc/stb/info/version"):
-                       info = open("/proc/stb/info/version").read()
-#                      print info,info[:2]
+                       vesion = open("/proc/stb/info/version")
+                       info=version.read()
+                       version.close()
                        if info[:2] == "14":
                                self.model = 1
                                print "getModelInfo : solo_"
@@ -271,68 +483,63 @@ class FactoryTest(Screen):
                print "nothing"
 
        def keyup(self):
+               print "self.menulength = ",self.menulength
+               print "self[\"testlist\"].getCurrent()[1] = ",self["testlist"].getCurrent()[1]
                if self.testing==1:
                        return
                if self["testlist"].getCurrent()[1]==0:
-                       self["testlist"].moveToIndex(self.menulength)
+                       self["testlist"].moveToIndex(self.menulength-1)
+                       self["resultlist"].moveToIndex(self.menulength-1)
                else:
                        self["testlist"].up()
+                       self["resultlist"].up()
 
 
        def keydown(self):
+               print "self.menulength = ",self.menulength
+               print "self[\"testlist\"].getCurrent()[1] = ",self["testlist"].getCurrent()[1]
                if self.testing==1:
                        return
-               if self["testlist"].getCurrent()[1]==(self.menulength):
+               if self["testlist"].getCurrent()[1]==(self.menulength-1):
                        self["testlist"].moveToIndex(0)
+                       self["resultlist"].moveToIndex(0)
                else:
                        self["testlist"].down()
+                       self["resultlist"].down()
 
        def numberaction(self, number):
                if self.testing==1:
                        return
+               if number >= self.menulength:
+                       return
                index = int(number)
                self["testlist"].moveToIndex(index)
-
-
-       def updateStatus(self):
-               index = self["testlist"].getCurrent()[1]
-               if index ==self.tuner1_1testIndex or index==self.tuner1_2testIndex:
-                       tunno = 1
-                       result = eSctest.getInstance().getFrontendstatus(0)
-               else:
-                       tunno = 2
-                       result = eSctest.getInstance().getFrontendstatus(1)
-
-               if self.agingmode == 1:
-                       tunno = 1
-                       result = eSctest.getInstance().getFrontendstatus(0)
-                       hv = "Ver"
-               if self.model == 2 and index==self.tuner2_2testIndex:
-                       hv = ""
-               elif index == self.tuner1_2testIndex or index==self.tuner2_2testIndex:
-                       hv = "Ver"
-               else:
-                       hv = "Hor"
-                       
-               print "eSctest.getInstance().getFrontendstatus - %d"%result
-               if result == 0:
-                       self.tunerlock = 0
-                       self.tunemsgtimer.stop()
-                       self.session.nav.stopService()
-                       self.avswitch.setColorFormat(0)
-                       self.session.open( MessageBox, _("Tune%d %s Locking Fail..."%(tunno,hv)), MessageBox.TYPE_ERROR)        
-                       if self.agingmode==0:
-                               self.rlist[self["testlist"].getCurrent()[1]]="fail"
-                       self.agingmode = 0
-               else :
-                       self.tunerlock = 1
-                       if self.agingmode==1:
-                               self.session.openWithCallback(self.checkaging,AgingTest)                        
+               self["resultlist"].moveToIndex(index)
+
+       def getImageVersion(self):
+               date = 'xxxx-xx-xx'
+               file = open(resolveFilename(SCOPE_SYSETC, 'image-version'), 'r')
+               lines = file.readlines()
+               for x in lines:
+                       splitted = x.split('=')
+                       if splitted[0] == "version":
+                       #     YYYY MM DD hh mm
+                               #0120 2005 11 29 01 16
+                               #0123 4567 89 01 23 45
+                               version = splitted[1]
+                               year = version[4:8]
+                               month = version[8:10]
+                               day = version[10:12]
+                               date = '-'.join((year, month, day))
+                               break;
+               file.close()
+               return date
 
        def getversion(self):
                try:
                        fd = open("/proc/stb/info/version","r")
                        version = fd.read()
+                       fd.close()
                        self["testversion"].setText(("Version %s"%version))
                except:
                        self["testversion"].setText(("Version no load"))
@@ -340,7 +547,7 @@ class FactoryTest(Screen):
 
        def getmacaddr(self):
                try:
-                       if self.model == 2:
+                       if self.model == 2 or self.model == 3 or self.model == 4:
                                cmd = "nanddump -s 0x" + str((self.mactry-1)*2) + "0000 -b -o -l 64 -p /dev/mtd5"
                        elif self.model == 0 or self.model == 1:
                                cmd = "nanddump -s 0x" + str((self.mactry-1)*2) + "0000 -b -o -l 64 -p /dev/mtd4"
@@ -385,35 +592,20 @@ class FactoryTest(Screen):
                        return
                
        def TestAction(self):
-#
-#                      tlist.append((" 0. Sata & extend hdd test",self.satetestIndex=0))
-#                      tlist.append((" 1. USB test",self.usbtestIndex=1))
-#                      tlist.append((" 2. Front test",self.fronttestIndex=2))
-#                      tlist.append((" 3. Smartcard test",self.smarttestIndex=3))
-#                      tlist.append((" 4. T1 H 22K x 4:3 CVBS",self.tuner1_1testIndex=4))
-#                      tlist.append((" 5. T1 V 22k o 16:9 RGB",self.tuner1_2testIndex=5))
-#                      tlist.append((" 6. T2 H 22k x 4:3 YC",self.tuner2_1testIndex=6))
-#                      tlist.append((" 7. T2 V 22k o 16:9 CVBS CAM",self.tuner2_2testIndex=7))
-#                      tlist.append((" 8. VCR Scart loop",self.scarttestIndex=8))
-#                      tlist.append((" 9. RS232 test",self.rs232testIndex=9))
-#                      tlist.append(("10. Ethernet & mac test",self.ethernettestIndex=10))
-#              tlist.append(("11. DRAM test",11))
-#              tlist.append(("12. Flash test",12))
-#              tlist.append(("13. DRAM+Flash test",13))
-#                      tlist.append(("11. Factory default",self.fdefaultIndex=11))
-#                      tlist.append(("12. Shutdown",self.shutdownIndex=12))
-#
                if self.testing==1:
                        return
                print "line - ",self["testlist"].getCurrent()[1]
-               index = self["testlist"].getCurrent()[1]
+               self.currentindex = index = self["testlist"].getCurrent()[1]
                result = 0
                if index==self.satetestIndex:
                        self.Test0()
                elif index==self.fronttestIndex:
                        self.Test1()
-               elif index>=self.tuner1_1testIndex and index<=self.tuner2_2testIndex:
-                       self.TestTune(index)
+               elif index>=self.tuner_test_first_index and index<=self.tuner_test_last_index:
+                       if self.model == 0 or self.model == 1 or self.model == 2 or self.model == 3:
+                               self.TestTune(index)
+                       elif self.model == 4:
+                               self.openTestTuneMenu()
                elif index==self.scarttestIndex:
                        self.Test6()
                elif index==self.rs232testIndex:
@@ -432,8 +624,8 @@ class FactoryTest(Screen):
 #                      self.Test13()
                elif index==self.fdefaultIndex:
                        self.Test14()
-               elif index==self.shutdownIndex:
-                       self.Test15()
+#              elif index==self.shutdownIndex:
+#                      self.Test15()
                else:
                        pass
 
@@ -483,44 +675,44 @@ class FactoryTest(Screen):
                        result = 1
                        displayerror = 1
                try:
-                       if fileExists("/media/hdd"):
-                               if access("/media/hdd",F_OK|R_OK|W_OK):
-                                       dummy=open("/media/hdd/dummy03","w")
+                       if fileExists("/autofs/sda1"):
+                               if access("/autofs/sda1",F_OK|R_OK|W_OK):
+                                       dummy=open("/autofs/sda1/dummy03","w")
                                        dummy.write("complete")
                                        dummy.close()
-                                       dummy=open("/media/hdd/dummy03","r")
+                                       dummy=open("/autofs/sda1/dummy03","r")
                                        if dummy.readline()=="complete":
-                                               print "/media/hdd - complete"
+                                               print "/autofs/sda1 - complete"
                                        else:
-                                               print "/media/hdd - readline error"
+                                               print "/autofs/sda1 - readline error"
                                                result += 1
                                                displayerror = 1
                                        dummy.close()
-                                       system("rm /media/hdd/dummy03")
+                                       system("rm /autofs/sda1/dummy03")
                                else:
-                                       print "/media/hdd - rw access error"
+                                       print "/autofs/sda1 - rw access error"
                                        result += 1
                                        displayerror = 1
                        else:
-                               print "/media/hdd - file not exist"
+                               print "/autofs/sda1 - file not exist"
                                result += 1
                except:
-                       print "/media/hdd - exceptional error"
+                       print "/autofs/sda1 - exceptional error"
                        result += 1
                        displayerror = 1
                
                if result == 0:
-                       self.session.open( MessageBox, _("Sata & extend hdd test pass"), MessageBox.TYPE_INFO)
+                       self.session.open( MessageBox, _("Sata & extend hdd test pass\nPress 'OK' button!"), MessageBox.TYPE_INFO)
                        self.rlist[self["testlist"].getCurrent()[1]]="pass"
                elif result == 1:
                        if displayerror==1:
-                               self.session.open( MessageBox, _("One hdd test error"), MessageBox.TYPE_ERROR)
+                               self.session.open( MessageBox, _("One hdd test error\nPress 'EXIT' button!"), MessageBox.TYPE_ERROR)
                                self.rlist[self["testlist"].getCurrent()[1]]="fail"
                        else:
                                self.satatimer.start(1100,True)
                else:
                        if displayerror==1:
-                               self.session.open( MessageBox, _("Sata & extend hdd test error"), MessageBox.TYPE_ERROR)
+                               self.session.open( MessageBox, _("Sata & extend hdd test error\nPress 'EXIT' button!"), MessageBox.TYPE_ERROR)
                                self.rlist[self["testlist"].getCurrent()[1]]="fail"
                        else:
                                self.satatimer.start(1100,True)
@@ -530,8 +722,10 @@ class FactoryTest(Screen):
                        self.session.openWithCallback(self.displayresult ,FrontTest)
                elif self.model == 1:
                        self.session.openWithCallback(self.displayresult ,FrontTest_solo)
-               elif self.model == 2:
-                       self.session.openWithCallback(self.displayresult ,FrontTest_solo)
+               elif self.model == 2 or self.model == 3:
+                       self.session.openWithCallback(self.displayresult ,FrontTest_uno)
+               elif  self.model == 4:
+                       self.session.openWithCallback(self.displayresult ,FrontTest_ultimo)
 
        def displayresult(self):
                global fronttest
@@ -540,10 +734,15 @@ class FactoryTest(Screen):
                else:
                        self.rlist[self["testlist"].getCurrent()[1]]="fail"
 
-       INTERNAL_PID_STATUS_NOOP = 0
-       INTERNAL_PID_STATUS_WAITING = 1
-       INTERNAL_PID_STATUS_SUCCESSFUL = 2
-       INTERNAL_PID_STATUS_FAILED = 3
+       def openTestTuneMenu(self):
+               self.session.openWithCallback(self.TestTuneMenuResult ,TestTuneMenu, self.tuneInfo, self.tunelist, self.NimType)
+
+       def TestTuneMenuResult(self,result):
+               if result :
+                       self.rlist[self["testlist"].getCurrent()[1]]="pass"
+               else:
+                       self.rlist[self["testlist"].getCurrent()[1]]="fail"
+               self["resultlist"].updateList(self.rlist)
 
        def TestTune(self,index):       
                if self.oldref is None:
@@ -553,58 +752,45 @@ class FactoryTest(Screen):
                        if not servicelist is None:
                                ref = servicelist.getNext()
                        else:
-                               ref = self.getCurrentSelection()
+                               ref = self.getCurrentSelection() # raise error
                                print "servicelist none"
                else:
                        ref = self.oldref
                self.session.nav.stopService() # try to disable foreground service
-               if index==self.tuner1_1testIndex:
-                       ref.setData(0,1)
-                       ref.setData(1,0x6D3)
-                       ref.setData(2,0x3)
-                       ref.setData(3,0xA4)
-                       ref.setData(4,0xA00000)
-                       self.session.nav.playService(ref)
-                       self.avswitch.setColorFormat(0)
-                       self.avswitch.setAspectRatio(0)
-               elif index==self.tuner1_2testIndex:
-                       if self.model == 1:
+               if self.model == 0 or self.model == 1:
+                       if index==self.tuner1_1testIndex:
+                               ref.setData(0,1)
+                               ref.setData(1,0x6D3)
+                               ref.setData(2,0x3)
+                               ref.setData(3,0xA4)
+                               ref.setData(4,0xA00000)
+                               self.session.nav.playService(ref)
+                               self.avswitch.setColorFormat(0)
+                               self.avswitch.setAspectRatio(0)
+                       elif index==self.tuner1_2testIndex:
+                               if self.model == 1:
+                                       self.camstep = 1
+                                       self.camtimer.start(100,True)
+                               ref.setData(0,0x19)
+                               ref.setData(1,0x1325)
+                               ref.setData(2,0x3ef)
+                               ref.setData(3,0x1)
+                               ref.setData(4,0x64af79)
+                               self.session.nav.playService(ref)
+                               self.avswitch.setColorFormat(1)
+                               self.avswitch.setAspectRatio(6)                 
+                       elif index==self.tuner2_1testIndex:
+                               ref.setData(0,1)
+                               ref.setData(1,0x6D3)
+                               ref.setData(2,0x3)
+                               ref.setData(3,0xA4)
+                               ref.setData(4,0x820000)
+                               self.session.nav.playService(ref)
+                               self.avswitch.setColorFormat(2)                 
+                               self.avswitch.setAspectRatio(0)                 
+                       elif index==self.tuner2_2testIndex:
                                self.camstep = 1
                                self.camtimer.start(100,True)
-                       ref.setData(0,0x19)
-                       ref.setData(1,0x1325)
-                       ref.setData(2,0x3ef)
-                       ref.setData(3,0x1)
-                       ref.setData(4,0x64af79)
-#              ref.setData(0,0x19)
-#              ref.setData(1,0x83)
-#              ref.setData(2,0x6)
-#              ref.setData(3,0x85)
-#              ref.setData(4,0x640000)
-                       self.session.nav.playService(ref)
-                       self.avswitch.setColorFormat(1)
-                       self.avswitch.setAspectRatio(6)                 
-               elif index==self.tuner2_1testIndex:
-#                      self.camstep = 1
-#                      self.camtimer.start(100,True)
-                       ref.setData(0,1)
-                       ref.setData(1,0x6D3)
-                       ref.setData(2,0x3)
-                       ref.setData(3,0xA4)
-                       ref.setData(4,0x820000)
-                       self.session.nav.playService(ref)
-                       self.avswitch.setColorFormat(2)                 
-                       self.avswitch.setAspectRatio(0)                 
-               elif index==self.tuner2_2testIndex:
-                       self.camstep = 1
-                       self.camtimer.start(100,True)
-#                      ref.setData(0,0x19)
-#                      ref.setData(1,0x83)
-#                      ref.setData(2,0x6)
-#                      ref.setData(3,0x85)
-#              ref.setData(4,0xC00000)
-#      ikseong - for 22000 tp ( /home/ikseong/share/lamedb_ORF)
-                       if self.model==0:
                                ref.setData(0,0x19)
                                ref.setData(1,0x1325)
                                ref.setData(2,0x3ef)
@@ -613,19 +799,64 @@ class FactoryTest(Screen):
                                self.session.nav.playService(ref)
                                self.avswitch.setColorFormat(0)                 
                                self.avswitch.setAspectRatio(6)
-                       elif self.model==2:
+                       self.tuningtimer.start(2000,True)
+                       self.tunemsgtimer.start(3000, True)
+               elif self.model == 3 or self.model == 4:
+                       getTuneInfo=self.tuneInfo[index]
+                       if getTuneInfo["cam"] is True:
+                               self.camstep = 1
+                               self.camtimer.start(100,True)
+                       if getTuneInfo["type"].startswith("DVB-S"):
+                               if getTuneInfo["pol"] == "H":
+                                       ref.setData(0,1)
+                                       ref.setData(1,0x6D3)
+                                       ref.setData(2,0x3)
+                                       ref.setData(3,0xA4)
+                               else:
+                                       ref.setData(0,0x19)
+                                       ref.setData(1,0x1325)
+                                       ref.setData(2,0x3ef)
+                                       ref.setData(3,0x1)
+                               if getTuneInfo["sat"] == "160": # Eutelsat W2
+                                       ref.setData(4,0xA00000)
+                               elif getTuneInfo["sat"] == "100": # Eutelsat
+                                       ref.setData(4,0x64af79)
+                               elif getTuneInfo["sat"] == "130": # Hotbird
+                                       ref.setData(4,0x820000)
+                               elif getTuneInfo["sat"] == "192": # Astra
+                                       ref.setData(4,0xC00000)
+                               elif getTuneInfo["sat"] == "620": # Intelsat 902
+                                       ref.setData(4,0x26c0000) # need to fix later
+                               elif getTuneInfo["sat"] == "642": # Intelsat 906
+                                       ref.setData(4,0x282AF79) # need to fix later
+                       elif getTuneInfo["type"].startswith("DVB-C"):
                                ref.setData(0,0x19)
                                ref.setData(1,0x1325)
                                ref.setData(2,0x3ef)
                                ref.setData(3,0x1)
-                               ref.setData(4,0xfff029a)
-                               self.session.nav.playService(ref)
+                               ref.setData(4,-64870) # ffff029a
+                       elif getTuneInfo["type"].startswith("DVB-T"):
+                               ref.setData(0,0x19)
+                               ref.setData(1,0x1325)
+                               ref.setData(2,0x3ef)
+                               ref.setData(3,0x1)
+                               ref.setData(4,-286391716) # eeee025c
+                       self.session.nav.playService(ref)
+                       if getTuneInfo["color"]=="CVBS":
+                               self.avswitch.setColorFormat(0)
+                       elif getTuneInfo["color"]=="RGB":
+                               self.avswitch.setColorFormat(1)
+                       elif getTuneInfo["color"]=="YC":
                                self.avswitch.setColorFormat(2)
+                       if getTuneInfo["ratio"] == "4:3":
                                self.avswitch.setAspectRatio(0)
-               self.tuningtimer.start(4000,True)
-               self.tunemsgtimer.start(5000, True)
-
+                       elif getTuneInfo["ratio"] == "16:9":
+                               self.avswitch.setAspectRatio(6)
+                       self.tuningtimer.start(2000,True)
+                       self.tunemsgtimer.start(3000, True) 
+               
        def cam_state(self):
+               current_index = self.currentindex
                if self.camstep == 1:
                        slot = 0
                        state = eDVBCI_UI.getInstance().getState(slot)
@@ -636,10 +867,8 @@ class FactoryTest(Screen):
                        else:
                                self.session.nav.stopService()
                                self.session.open( MessageBox, _("CAM1_NOT_INSERTED\nPress exit!"), MessageBox.TYPE_ERROR)
-                               self.rlist[self["testlist"].getCurrent()[1]]="fail"
+                               self.rlist[current_index]="fail"
                                self.tunemsgtimer.stop()
-#                              self.rlist[index]="fail"
-#                              self["resultlist"].updateList(self.rlist)
                elif self.camstep == 2:
                        slot = 0
                        appname = eDVBCI_UI.getInstance().getAppName(slot)
@@ -647,7 +876,7 @@ class FactoryTest(Screen):
                        if appname is None:
                                self.session.nav.stopService()
                                self.session.open( MessageBox, _("NO_GET_APPNAME\nPress exit!"), MessageBox.TYPE_ERROR)
-                               self.rlist[self["testlist"].getCurrent()[1]]="fail"
+                               self.rlist[current_index]="fail"
                                self.tunemsgtimer.stop()                                
                        else:
                                self.camstep=3
@@ -662,10 +891,8 @@ class FactoryTest(Screen):
                        else:
                                self.session.nav.stopService()
                                self.session.open( MessageBox, _("CAM2_NOT_INSERTED\nPress exit!"), MessageBox.TYPE_ERROR)
-                               self.rlist[self["testlist"].getCurrent()[1]]="fail"
+                               self.rlist[current_index]="fail"
                                self.tunemsgtimer.stop()                                
-#                              self.rlist[index]="fail"
-#                              self["resultlist"].updateList(self.rlist)
                elif self.camstep == 4:
                        slot = 1
                        appname = eDVBCI_UI.getInstance().getAppName(slot)
@@ -673,54 +900,109 @@ class FactoryTest(Screen):
                        if appname is None:
                                self.session.nav.stopService()
                                self.session.open( MessageBox, _("NO_GET_APPNAME\nPress exit!"), MessageBox.TYPE_ERROR)
-                               self.rlist[self["testlist"].getCurrent()[1]]="fail"
+                               self.rlist[current_index]="fail"
                                self.tunemsgtimer.stop()                                
                        else:
                                self.setSource()
                                self.camstep = 5
-#                              self.session.open( MessageBox, _("CAM OK!"), MessageBox.TYPE_INFO,2)
+
+       def updateStatus(self):
+               current_index = self.currentindex
+               if self.model == 0 or self.model == 1:
+                       if current_index ==self.tuner1_1testIndex or current_index==self.tuner1_2testIndex:
+                               tunno = 1
+                               result = eSctest.getInstance().getFrontendstatus(0)
+                       else:
+                               tunno = 2
+                               result = eSctest.getInstance().getFrontendstatus(1)
+                       if current_index == self.tuner1_2testIndex or current_index==self.tuner2_2testIndex:
+                               hv = "Ver"
+                       else:
+                               hv = "Hor"
+
+               elif self.model == 3 or self.model == 4:
+                       getTuneInfo=self.tuneInfo[current_index]
+                       result = eSctest.getInstance().getFrontendstatus(getTuneInfo["slot"])
+                       tunno = getTuneInfo["slot"]+1
+                       hv = getTuneInfo["pol"]
+                       if hv == "H":
+                               hv = "Hor"
+                       elif hv == "V":
+                               hv = "Ver"
+                       else :
+                               hv == ""
+                               
+               print "eSctest.getInstance().getFrontendstatus - %d"%result
+               if result == 0 or result == -1:
+                       self.tunerlock = 0
+                       self.tunemsgtimer.stop()
+                       self.session.nav.stopService()
+                       self.avswitch.setColorFormat(0)
+                       self.session.open( MessageBox, _("Tune%d %s Locking Fail..."%(tunno,hv)), MessageBox.TYPE_ERROR)
+                       self.rlist[current_index]="fail"
+               else : 
+                       self.tunerlock = 1
+
+       def tuneback(self,yesno):
+               current_index=self.currentindex
+               self.session.nav.stopService() # try to disable foreground service
+               if yesno and self.tunerlock == 1:
+                       if current_index == self.tuner_test_last_index and self.camstep < 5: # need fix to depending about CAM exist
+                               self.rlist[current_index]="fail"
+                       else :
+                               self.rlist[current_index]="pass"
+               else:
+                       self.rlist[current_index]="fail"
+               if self.model == 0 and current_index == 6: # YC
+                       self.avswitch.setColorFormat(0)
+               elif ( self.model == 3 or self.model == 4 ) and self.tuneInfo[current_index]["color"] == "YC":
+                       self.avswitch.setColorFormat(0)
+               self.resetSource()
+               self["resultlist"].updateList(self.rlist)
+
+       def tunemsg(self):
+               self.tuningtimer.stop()
+               self.session.openWithCallback(self.tuneback, TuneMessageBox, _("%s ok?" %(self["testlist"].getCurrent()[0])), MessageBox.TYPE_YESNO)
+
+       def setSourceVar(self):
+               if self.model == 0:
+                       self.input_pad_num=1
+                       self.setTuner = 'B'
+               elif self.model == 1:
+                       self.input_pad_num=0
+                       self.setTuner = 'A'
+               else:
+                       self.input_pad_num=len(self.NimType)-1
+                       if self.input_pad_num == 0:
+                               self.setTuner = 'A'
+                       elif self.input_pad_num == 1:
+                               self.setTuner = 'B'
+                       elif self.input_pad_num == 2:
+                               self.setTuner = 'C'
 
 #      ikseong - for 22000 tp
        def setSource(self):
+# fix input source
+               inputname = ("/proc/stb/tsmux/input%d" % self.input_pad_num)
+               print "<setsource> inputname : ",inputname
+               fd=open(inputname,"w")
+               fd.write("CI0")
+               fd.close()
+# fix ci_input Tuner
                filename = ("/proc/stb/tsmux/ci0_input")
                fd = open(filename,'w')
-               fd.write('B')
-#              fd.write('A')
-               fd.close()
-#              filename = ("/proc/stb/tsmux/ci1_input")
-#              fd = open(filename,'w')
-#              fd.write('CI0')
-#              fd.close()
-               fd=open("/proc/stb/tsmux/input1","w")
-#              fd=open("/proc/stb/tsmux/input0","w")
-               fd.write("CI0")
+               fd.write(self.setTuner)
+               print "setTuner(CI0) : ",self.setTuner
                fd.close()
                print "CI loop test!!!!!!!!!!!!!!"
                        
        def resetSource(self):
-               fd=open("/proc/stb/tsmux/input1","w")
-               fd.write("B")
+               inputname = ("/proc/stb/tsmux/input%d" % self.input_pad_num)
+               print "<resetsource> inputname : ",inputname
+               fd=open(inputname,"w")
+               fd.write(self.setTuner)
                fd.close()
                print "CI loop test end!!!!!!!!!!!!!!"
-               
-       def tunemsg(self):
-               self.tuningtimer.stop()
-               self.session.openWithCallback(self.tuneback, MessageBox, _("%s ok?" %(self["testlist"].getCurrent()[0])), MessageBox.TYPE_YESNO)
-
-       def tuneback(self,yesno):
-               self.session.nav.stopService() # try to disable foreground service
-               if yesno:
-                       self.rlist[self["testlist"].getCurrent()[1]]="pass"
-                       if self.tunerlock == 0:
-                               self.rlist[self["testlist"].getCurrent()[1]]="fail"
-                       elif self["testlist"].getCurrent()[1] == self.cam_index and self.camstep < 5:
-                               self.rlist[self["testlist"].getCurrent()[1]]="fail"
-               else:
-                       self.rlist[self["testlist"].getCurrent()[1]]="fail"
-               if self["testlist"].getCurrent()[1] == 6: # YC
-                       self.avswitch.setColorFormat(0)                 
-               self.resetSource()
-               self["resultlist"].updateList(self.rlist)
                                
        def Test6(self):
                self.avswitch.setInput("SCART")
@@ -759,30 +1041,48 @@ class FactoryTest(Screen):
                else:
                        ref = self.oldref
                self.session.nav.stopService() # try to disable foreground service
-               ref.setData(0,0x19)
-               ref.setData(1,0x1325)
-               ref.setData(2,0x3ef)
-               ref.setData(3,0x1)
-               ref.setData(4,0x64af79)
-#              ref.setData(0,1)
-#              ref.setData(1,0x6D3)
-#              ref.setData(2,0x3)
-#              ref.setData(3,0xA4)
-#              ref.setData(4,0xA00000)
+               if self.model == 0 or self.model == 1 or self.NimType[0]["type"].startswith("DVB-S"):
+                       ref.setData(0,0x19)
+                       ref.setData(1,0x1325)
+                       ref.setData(2,0x3ef)
+                       ref.setData(3,0x1)
+                       ref.setData(4,0x64af79)
+               elif self.NimType[0]["type"].startswith("DVB-C"):
+                       ref.setData(0,0x19)
+                       ref.setData(1,0x1325)
+                       ref.setData(2,0x3ef)
+                       ref.setData(3,0x1)
+                       ref.setData(4,-64870) # ffff029a
+               elif self.NimType[0]["type"].startswith("DVB-T"):
+                       ref.setData(0,0x19)
+                       ref.setData(1,0x1325)
+                       ref.setData(2,0x3ef)
+                       ref.setData(3,0x1)
+                       ref.setData(4,-286391716) # eeee025c
                self.session.nav.playService(ref)
                self.avswitch.setColorFormat(0)
                self.avswitch.setAspectRatio(0)
-               self.tuningtimer.start(2000,True)
-               self.agingmode = 1
+               self.agingtimer.start(2000,True)
+
+       def agingCheck(self):
+               result = eSctest.getInstance().getFrontendstatus(0)
+               hv = "Ver"      
+               print "eSctest.getInstance().getFrontendstatus - %d"%result
+               if result == 0:
+                       self.session.nav.stopService()
+                       self.session.open( MessageBox, _("Tune 1 Ver Locking Fail..."), MessageBox.TYPE_ERROR)
+               elif result == 1 :
+                       self.session.openWithCallback(self.agingResult,AgingTest)
+               else:
+                       self.session.nav.stopService()
+                       self.session.open( MessageBox, _("Tune 1 Ver Error %d..."%result), MessageBox.TYPE_ERROR)
 
-       def checkaging(self):
+       def agingResult(self):
                global Agingresult
                if(Agingresult ==1):
                        self["testlist"].moveToIndex(self.fdefaultIndex)
                        self.Test14()
-                       self["testlist"].moveToIndex(self.shutdownIndex)
-               self.agingmode = 0
-#                      self["testlist"].instance.moveSelection(self["testlist"].instance.moveDown)             
+                       self["testlist"].moveToIndex(self.shutdownIndex)        
        
        def Test8(self):
                self.usbtry = 9
@@ -797,12 +1097,16 @@ class FactoryTest(Screen):
                        self.usbtry -= 1
                        displayerror = 0
 
-               if self.model==0:
+               if self.model==0 or self.model==3 or self.model==4:
                        devices = [ "/autofs/sdc1", "/autofs/sdd1", "/autofs/sde1" ]
                elif self.model==1:
                        devices = [ "/autofs/sda1", "/autofs/sdb1" ]
                elif self.model==2:
                        devices = [ "/autofs/sdc1", "/autofs/sdd1" ]
+               else :
+                       self.session.open( MessageBox, _("invalid model"), MessageBox.TYPE_ERROR)                       
+                       self.rlist[self["testlist"].getCurrent()[1]]="fail"
+                       return
 
                result=len(devices)
                
@@ -837,11 +1141,11 @@ class FactoryTest(Screen):
                if result < 0 :
                        result = 0
                elif result == len(devices):
-                       self.session.open( MessageBox, _("USB test pass %d devices\nPress OK!"%result), MessageBox.TYPE_INFO)                   
+                       self.session.open( MessageBox, _("USB test pass %d devices\nPress 'OK' button!"%result), MessageBox.TYPE_INFO)
                        self.rlist[self["testlist"].getCurrent()[1]]="pass"
                else:
                        if displayerror == 1:
-                               self.session.open( MessageBox, _("USB test error : Success-%d"%result+" Fail-%d\nPress EXIT!"%(len(devices)-result)), MessageBox.TYPE_ERROR)
+                               self.session.open( MessageBox, _("USB test error : Success-%d"%result+" Fail-%d\nPress 'EXIT' button!"%(len(devices)-result)), MessageBox.TYPE_ERROR)
                                self.rlist[self["testlist"].getCurrent()[1]]="fail"
                        else:
                                self.usbtimer.start(1100,True)
@@ -877,7 +1181,6 @@ class FactoryTest(Screen):
                if data == 1:
                        ethtest = 1
                        print "success"
-#                      self.session.open( MessageBox, _("Ping test pass"), MessageBox.TYPE_INFO,2)
                        self.session.openWithCallback(self.openMacConfig ,MessageBox, _("Ping test pass"), MessageBox.TYPE_INFO,2)
                
                else:
@@ -896,35 +1199,33 @@ class FactoryTest(Screen):
                global ethtest
                if ethtest == 1:
                        self.rlist[self.ethernettestIndex]="pass"               
-#                      self.rlist[self["testlist"].getCurrent()[1]]="pass"
                else:
                        self.rlist[self.ethernettestIndex]="fail"               
-#                      self.rlist[self["testlist"].getCurrent()[1]]="fail"
                self.getmacaddr()
                self.testing = 0                        
        
-       def MemTest(self, which):
-               index = which
-               result = 0
-               if index==0:
-                       result = eMemtest.getInstance().dramtest()
-               elif index==1:
-                       result = eMemtest.getInstance().flashtest()
-                       result = 0      #       temp
-               else:
-                       result = eMemtest.getInstance().dramtest()
-                       result = eMemtest.getInstance().flashtest()
-                       result = 0      #       temp
+#      def MemTest(self, which):
+#              index = which
+#              result = 0
+#              if index==0:
+#                      result = eMemtest.getInstance().dramtest()
+#              elif index==1:
+#                      result = eMemtest.getInstance().flashtest()
+#                      result = 0      #       temp
+#              else:
+#                      result = eMemtest.getInstance().dramtest()
+#                      result = eMemtest.getInstance().flashtest()
+#                      result = 0      #       temp
                        
-               index = index+10
+#              index = index+10
                
-               if result == 0:
-                       print index,self.rlist[index]
-                       self.rlist[index]="pass"
-               else:
-                       print index,self.rlist[index]
-                       self.rlist[index]="fail"
-               self["resultlist"].updateList(self.rlist)
+#              if result == 0:
+#                      print index,self.rlist[index]
+#                      self.rlist[index]="pass"
+#              else:
+#                      print index,self.rlist[index]
+#                      self.rlist[index]="fail"
+#              self["resultlist"].updateList(self.rlist)
                        
        def scciresult(self):
                global smartcardtest
@@ -936,23 +1237,25 @@ class FactoryTest(Screen):
        def Test10(self):
                self.session.openWithCallback(self.scciresult ,SmartCardTest,stbmodel=self.model)
 
-       def Test11(self):
-               self.MemTest(1)
+#      def Test11(self):
+#              self.MemTest(1)
                
-       def Test12(self):
-               self.MemTest(2)
-
-       def Test13(self):
-               self.MemTest(3) 
+#      def Test12(self):
+#              self.MemTest(2)
 
+#      def Test13(self):
+#              self.MemTest(3)
 
        def Test14(self):
                try:
+                       print "test14"
                        system("rm -R /etc/enigma2")
+                       system("ls /")
                        system("cp -R /usr/share/enigma2/defaults /etc/enigma2")
                        self.rlist[self["testlist"].getCurrent()[1]]="pass"
                        self["resultlist"].updateList(self.rlist)
                except:
+                       print "test14 except"
                        self.rlist[self["testlist"].getCurrent()[1]]="fail"
                        self["resultlist"].updateList(self.rlist)
                        self.session.open( MessageBox, _("Factory reset fail"), MessageBox.TYPE_ERROR)
@@ -979,12 +1282,12 @@ class FactoryTest(Screen):
 ethtest = 0
 class MacConfig(Screen):
        skin = """
-               <screen position="100,250" size="520,100" title="Mac Config" >
+               <screen name="MacConfig" position="center,center" size="520,100" title="Mac Config" >
                        <eLabel text="Mac Address " position="10,15" size="200,40" font="Regular;30" />         
-                       <widget name="text" position="230,15" size="230,40" font="Regular;30" />
+                       <widget name="text" position="230,15" size="230,40" font="Regular;30" halign="right"/>
                        <widget name="text1" position="470,15" size="40,40" font="Regular;30" />                
                        <eLabel text=" " position="5,55" zPosition="-1" size="510,5" backgroundColor="#02e1e8e6" />             
-                       <widget name="stattext" position="30,75" size="400,25" font="Regular;20" />
+                       <widget name="stattext" position="30,75" size="450,35" font="Regular;30" />
                </screen>"""
 
        def __init__(self, session, mactry = 1):
@@ -1001,7 +1304,6 @@ class MacConfig(Screen):
                self.mactry = mactry
                self.model = 0
                self.getModelInfo()
-#              self.result = 0
                self.macfd = 0
                self.macaddr = "000000000000"
                self.ReadMacinfo = 0
@@ -1017,21 +1319,34 @@ class MacConfig(Screen):
        def getModelInfo(self):
                getmodel = 0
                if fileExists("/proc/stb/info/vumodel"):
-                       info = open("/proc/stb/info/vumodel").read().strip()
+                       vumodel = open("/proc/stb/info/vumodel")
+                       info=vumodel.read().strip()
+                       vumodel.close()
                        if info == "combo":
                                self.model = 2
                                getmodel = 1
                                print "MacConfig, model : combo"
-                       if info == "solo":
+                       elif info == "solo":
                                self.model = 1
                                getmodel = 1
                                print "MacConfig, model : solo"
-                       if info == "duo":
+                       elif info == "duo":
                                self.model = 0
                                getmodel = 1
                                print "MacConfig, model : duo"
+                       elif info == "uno":
+                               self.model = 3
+                               getmodel = 1
+                               print "getModelInfo : uno"
+                       elif info == "ultimo":
+                               self.model = 4
+                               getmodel = 1
+                               print "getModelInfo : ultimo"
+
                if getmodel == 0 and fileExists("/proc/stb/info/version"):
-                       info = open("/proc/stb/info/version").read()
+                       version = open("/proc/stb/info/version")
+                       info=version.read()
+                       version.close()
 #                      print info,info[:2]
                        if info[:2] == "14":
                                self.model = 1
@@ -1044,16 +1359,17 @@ class MacConfig(Screen):
                try:
                        self.macfd = 0
 
-                       if self.model==0:
-                               devices = ["/autofs/sda1", "/autofs/sdb1", "/autofs/sdc1", "/autofs/sdd1", "/autofs/sde1" ]
+                       if self.model==0 or self.model==3 or self.model==4 :
+                               devices = ["/autofs/sdb1", "/autofs/sdc1", "/autofs/sdd1", "/autofs/sde1" ]
                        elif self.model==1:
                                devices = [ "/autofs/sda1", "/autofs/sdb1" ]
                        elif self.model==2:
-                               devices = [ "/autofs/sda1", "/autofs/sdb1", "/autofs/sdc1", "/autofs/sdd1" ]
+                               devices = [ "/autofs/sdb1", "/autofs/sdc1", "/autofs/sdd1" ]
 
                        for dev in devices:
                                print 'try..',dev
                                if  fileExists(dev+"/macinfo.txt"):
+                                       print "<open>"+dev+"/macinfo.txt"
                                        self.macfd = open(dev+"/macinfo.txt","r+")
                                        break
 
@@ -1078,7 +1394,7 @@ class MacConfig(Screen):
                if self.ReadMacinfo==0:
                        return
                try:
-                       if self.model == 2:
+                       if self.model == 2 or self.model == 3 or self.model == 4:
                                cmd = "nanddump -s 0x" + str((self.mactry-1)*2) + "0000 -b -o -l 64 -p /dev/mtd5"
                        elif self.model == 0 or self.model == 1:
                                cmd = "nanddump -s 0x" + str((self.mactry-1)*2) + "0000 -b -o -l 64 -p /dev/mtd4"
@@ -1155,7 +1471,7 @@ class MacConfig(Screen):
 #nandwrite /dev/mtd4 /tmp/mac.sector -p                        
                        cmd = "make_mac_sector %02x-%02x-%02x-%02x-%02x-%02x > /tmp/mac.sector"%(int(macaddr[0:2],16),int(macaddr[2:4],16),int(macaddr[4:6],16),int(macaddr[6:8],16),int(macaddr[8:10],16),int(macaddr[10:12],16))
                        system(cmd)
-                       if self.model == 2:
+                       if self.model == 2 or self.model == 3 or self.model == 4:
                                system("flash_eraseall /dev/mtd5")
                                system("nandwrite /dev/mtd5 /tmp/mac.sector -p")
                        elif self.model == 0 or self.model ==1 :
@@ -1185,266 +1501,23 @@ class MacConfig(Screen):
                ethtest = 0
                self.close()
 
-
-sccitest = 0
-
-class ScCiTest(Screen):
-       skin = """
-               <screen position="120,225" size="440,200" title="CI Smartcard Test" >
-                       <widget name="testlist" position="10,0" size="340,120" />
-                       <widget name="resultlist" position="370,0" size="60,120" />
-                       <eLabel text=" " position="5,125" zPosition="-1" size="430,5" backgroundColor="#02e1e8e6" />            
-                       <widget name="text" position="10,140" size="420,50" font="Regular;25" />
-               </screen>"""
-       step=1
-       def __init__(self, session):
-               self["actions"] = ActionMap(["DirectionActions","OkCancelActions"],
-               {
-                       "ok": self.keyOk,
-                       "up": self.up,
-                       "down":self.down,
-                       "cancel": self.keyCancel,
-               }, -2)
-
-               Screen.__init__(self, session)
-               tlist = []
-               tlist.append(("Smartcard 1 Test",0))
-               tlist.append(("Smartcard 2 Test",1))
-               tlist.append(("CI 1 Test",2))
-               tlist.append(("CI 2 Test",3))
-               self["testlist"] = MenuList(tlist)
-               self.rlist = []
-               for x in range(4):
-                       self.rlist.append((".."))
-               self["resultlist"] = TestResultList(self.rlist)
-               self.result = 0
-               self.removecard = eTimer()
-               self.removecard.callback.append(self.remove_card)
-               self["text"]=Label(("Press OK Key"))
-               self.camstate= eTimer()
-               self.camstate.callback.append(self.cam_state)
-               self.camtry = 5
-               self.camstep = 0
-
-       def keyCancel(self):
-               global sccitest
-               print "result ", self.result
-               if self.result==15:
-                       sccitest=1
-               self.resetSource()
-               self.close()
-
-       def up(self):
-               self["text"].setText(_("Press OK Key"))
-               self["testlist"].instance.moveSelection(self["testlist"].instance.moveUp)
-               
-       def down(self):
-               self["text"].setText(_("Press OK Key"))
-               self["testlist"].instance.moveSelection(self["testlist"].instance.moveDown)
-               
-       def keyOk(self):
-               print "line - ",self["testlist"].getCurrent()[1]
-               index = self["testlist"].getCurrent()[1]
-               result = 0
-               if index==0 or index==1:                
-                       self["text"].setText(_("Insert Card?"))
-                       self.ScTest(True)
-               elif index ==2 or index==3:
-                       self["text"].setText(_("Insert Cam"))
-                       self.CamTest()
-
-       def CamTest(self):
-               self.camtry = 10
-               self.camstep = 1
-               self.camstate.start(1000,True)          
-
-       def setSource(self, cislot):
-               filename = ("/proc/stb/tsmux/ci%d_input"%cislot)
-               fd = open(filename,'w')
-               fd.write('A')
-               fd.close()
-
-       def setInputSource(self, cislot):
-               fd=open("/proc/stb/tsmux/input0","w")
-               if cislot==0:
-                       fd.write("CI0")
-               else:
-                       fd.write("CI1")
-               fd.close()
-                       
-       def resetSource(self):
-               fd=open("/proc/stb/tsmux/input0","w")
-               fd.write("A")
-               fd.close()
-#              fd = open("/proc/stb/tsmux/ci0_input","w")
-#              fd.write("CI0")
-#              fd.close()
-#              fd = open("/proc/stb/tsmux/ci1_input","w")
-#              fd.write("CI1")
-#              fd.close()
-
-       def channelstart(self):
-               ref = eServiceReference("1:0:19:1324:3EF:1:C00000:0:0:0")
-               ref.setData(0,0x19)
-               ref.setData(1,0x83)
-               ref.setData(2,0x6)
-               ref.setData(3,0x85)
-               ref.setData(4,0x640000)
-               self.session.nav.playService(ref)
-
-       def channelstop(self):
-               self.session.nav.stopService() # try to disable foreground service              
-       
-       def cam_state(self):
-               index = self["testlist"].getCurrent()[1] 
-               if (index-2)==0:
-                       slot = 1
-               else:
-                       slot = 0
-               print 'cam_state', self.camstep,self.camtry
-               if self.camstep == 1:
-                       state = eDVBCI_UI.getInstance().getState(slot)
-                       print 'stat',state
-                       if state == 1:
-                               self.camstep=2
-                               self.camtry=10
-                               self["text"].setText(_("Getting Cam name...."))
-                               self.camstate.start(5000,True)
-                       else:
-                               self.camtry-=1
-                               if self.camtry>0:
-                                       self.camstate.start(1000,True)
-                               else:
-                                       self.session.open( MessageBox, _("NO_NOT_INSERTED"), MessageBox.TYPE_ERROR)
-                                       self.rlist[index]="fail"
-                                       self["resultlist"].updateList(self.rlist)
-
-               elif self.camstep == 2:
-                       appname = eDVBCI_UI.getInstance().getAppName(slot)
-                       print 'appname',appname
-                       if appname is None:
-                               self.camtry-=1
-                               if self.camtry>0:
-                                       self.camstate.start(1000,True)
-                               else:
-                                       self.session.open( MessageBox, _("NO_GET_APPNAME"), MessageBox.TYPE_ERROR)
-                                       self.rlist[index]="fail"
-                                       self["resultlist"].updateList(self.rlist)
-                       else:
-                               self["text"].setText(_("Get Cam name : %s"%appname+". \n Remove Cam!"))
-                               self.channelstart()
-                               self.setInputSource(slot)
-                               self.setSource(slot)
-                               self.camstep=3
-                               self.camtry=30
-                               self.camstate.start(1000,True)          
-               elif self.camstep==3:
-                       state = eDVBCI_UI.getInstance().getState(slot)
-                       print 'stat', state
-                       if state == 0:
-                               self.channelstop()
-                               self.result += (1<<index)
-                               print self.result
-                               self.rlist[index]="pass"
-                               self["text"].setText(_("Press OK Key"))
-                               self["resultlist"].updateList(self.rlist)                               
-                               if index==2:
-                                       self.down()
-                               elif index == 3:
-                                       self.keyCancel()
-                       else:
-                               self.camtry-=1
-                               if self.camtry>0:
-                                       self.camstate.start(1000,True)
-                               else:
-                                       self.channelstop()
-                                       self.session.open( MessageBox, _("NO_REMOVE_CAM"), MessageBox.TYPE_ERROR)
-                                       self.rlist[index]="fail"
-                                       self["resultlist"].updateList(self.rlist)
-
-       def check_smart_card(self,which):
-               index = which
-               result  = 0
-               if which==0:
-                       result = eSctest.getInstance().check_smart_card("/dev/sci0")
-               elif which ==1:
-                       result = eSctest.getInstance().check_smart_card("/dev/sci1")
-               else:
-                       result = -1
-
-               print result                    
-               
-               if result == 0:
-                       print 'pass'
-               else:
-                       if result ==-1:
-                               self.session.open( MessageBox, _("1:NO_DEV_FOUND"), MessageBox.TYPE_ERROR)
-                       elif result == -2:
-                               self.session.open( MessageBox, _("1:SC_NOT_INSERTED"), MessageBox.TYPE_ERROR)
-                       elif result == -3:
-                               self.session.open( MessageBox, _("1:SC_NOT_VALID_ATR"), MessageBox.TYPE_ERROR)
-                       elif result == -5:
-                               self.session.open( MessageBox, _("1:SC_READ_TIMEOUT"), MessageBox.TYPE_ERROR)
-                       self.rlist[which]="fail"
-                       self["resultlist"].updateList(self.rlist)
-               return result
-               
-       def remove_card(self):
-               index = self["testlist"].getCurrent()[1]
-               if index==0:
-                       result = eSctest.getInstance().eject_smart_card("/dev/sci0")    
-               elif index==1:
-                       result = eSctest.getInstance().eject_smart_card("/dev/sci1")    
-               print 'remove result' ,result
-               if result == 0:
-                       self.rlist[index]="pass"
-                       self.result += (1<<index)
-               else:
-                       if result ==-1:
-                               self.session.open( MessageBox, _("2:NO_DEV_FOUND"), MessageBox.TYPE_ERROR)
-                       elif result == -2:
-                               self.session.open( MessageBox, _("2:SC_NOT_INSERTED"), MessageBox.TYPE_ERROR)
-                       elif result == -3:
-                               self.session.open( MessageBox, _("2:SC_NOT_VALID_ATR"), MessageBox.TYPE_ERROR)
-                       elif result == -4:
-                               self.session.open( MessageBox, _("2:SC_NOT_REMOVED"), MessageBox.TYPE_ERROR)
-                       self.rlist[index]="fail"
-               self["resultlist"].updateList(self.rlist)
-               self["text"].setText(_("Press OK Key"))
-               self.down()
-               return result
-       
-
-       def ScTest(self, yesno):
-               if yesno==False:
-                       return
-               index = self["testlist"].getCurrent()[1]
-               result = self.check_smart_card(index)
-               if result==0:
-                       self.removecard.start(100,True)
-                       self["text"].setText(_("Read Ok. Remove Card!"))
-               else:
-                       return
-
 smartcardtest = 0
-
 class SmartCardTest(Screen):
        skin = """
-               <screen position="300,240" size="160,120" title="SmartCard Test" >
-                       <widget name="text" position="10,10" size="140,100" font="Regular;22" />
+               <screen name="SmartCardTest" position="center,center" size="300,120" title="SmartCard Test" >
+                       <widget name="text" position="10,10" size="280,100" font="Regular;30" />
                </screen>"""
 
        def __init__(self, session, stbmodel = 0):
                self["actions"] = ActionMap(["DirectionActions", "OkCancelActions"],
                {
                        "cancel": self.keyCancel,
-                       "ok" : self.keyCancel
+                       "ok" : self.keyOk
                }, -2)
 
                Screen.__init__(self, session)
-#              self["text"]=Label(("Press Key LEFT"))
                self["text"]=Label(("Testing Smartcard 1..."))
-               self.step = 0
+               self.testok = 0
                self.smartcardtimer = eTimer()
                self.smartcardtimer.callback.append(self.check_smart_card)
                self.closetimer = eTimer()
@@ -1453,7 +1526,6 @@ class SmartCardTest(Screen):
                global smartcardtest
                smartcardtest = 0
                self.model = stbmodel
-               self.Testmode = 1
                self.smartcardtimer.start(100,True)
 
        def check_smart_card(self):
@@ -1461,35 +1533,32 @@ class SmartCardTest(Screen):
                index = self.smartcard
                result  = 0
                if index==0:
-                       if self.Testmode==0:
-                               result = eSctest.getInstance().check_smart_card("/dev/sci0")
-                       else:
-                               result = eSctest.getInstance().n_check_smart_card("/dev/sci0")                  
+                       result = eSctest.getInstance().check_smart_card("/dev/sci0")
                elif index ==1:
-                       if self.Testmode==0:
-                               result = eSctest.getInstance().check_smart_card("/dev/sci1")
-                       else:
-                               result = eSctest.getInstance().n_check_smart_card("/dev/sci1")                  
+                       result = eSctest.getInstance().check_smart_card("/dev/sci1")
                else:
                        result = -1
 
-               print result                    
+               print "check smartcard : ", result
                
                if result == 0:
                        print 'pass'
-                       if(index== 0 and ( self.model== 0 or self.model==2) ):
+                       if(index== 0 and ( self.model== 0 or self.model==2 or self.model == 3 or self.model == 4) ):
                                self.smartcard = 1
                                self["text"].setText(_("Testing Smartcard 2..."))
                                self.smartcardtimer.start(100,True)
                                return
                        elif (index==1 or self.model==1):
                                smartcardtest = 1
-#                              self.session.open( MessageBox, _("Smart Card OK!!"), MessageBox.TYPE_INFO,2)
-                               self.step = 1
+                               self.testok = 1
                                self["text"].setText(_("Smart Card OK!!"))
                                self.closetimer.start(2000,True)
                                self.smartcardtimer.stop()
-#                      self.session.openWithCallback(self.check6, MessageBox, _("Scart loop ok?"), MessageBox.TYPE_INFO)
+                       else :
+                               
+                               self["text"].setText(_("Smart Card model type error"))
+                               self.closetimer.start(2000,True)
+                               self.smartcardtimer.stop()
                else:
 #                      if result ==-1:
 #                              self.session.open( MessageBox, _("%d:NO_DEV_FOUND"%(index+1)), MessageBox.TYPE_ERROR)
@@ -1510,14 +1579,18 @@ class SmartCardTest(Screen):
        def keyCancel(self):
                self.close()
 
+       def keyOk(self):
+               if self.testok == 1:
+                       self.close()
+
        
 
 fronttest = 0
 
 class FrontTest(Screen):
        skin = """
-               <screen position="260,240" size="200,180" title="Front Test" >
-                       <widget name="text" position="10,10" size="180,160" font="Regular;22" />
+               <screen name="FrontTest" position="center,center" size="300,180" title="Front Test" >
+                       <widget name="text" position="10,10" size="280,160" font="Regular;30" />
                </screen>"""
 
        def __init__(self, session):
@@ -1574,8 +1647,6 @@ class FrontTest(Screen):
                        self.keytimeout.start(5000,True)
                        self.step=2
                        self["text"].setText(_("Wheel RIGHT"))
-#              else:
-#                      print ""
 
        def keyOk(self):
                if self.step == 3:
@@ -1602,8 +1673,8 @@ class FrontTest(Screen):
 
 class FrontTest_solo(Screen):
        skin = """
-               <screen position="260,240" size="200,180" title="Front Test" >
-                       <widget name="text" position="10,10" size="180,160" font="Regular;22" />
+               <screen name="FrontTest_solo" position="center,center" size="300,180" title="Front Test" >
+                       <widget name="text" position="10,10" size="280,160" font="Regular;30" />
                </screen>"""
 
        def __init__(self, session):
@@ -1697,11 +1768,111 @@ class FrontTest_solo(Screen):
 
        def keyOk(self):
                global fronttest
+               if self.step == 6:
+                       fronttest = 1
+                       self.fronttimer.stop()
+                       eSctest.getInstance().VFD_Close()
+                       self.close()
+
+       def FrontAnimate(self):
+               if (self.frontturnonoff==0):
+                       eSctest.getInstance().turnon_VFD()
+                       self.frontturnonoff = 1
+               else:
+                       self.frontturnonoff = 0
+                       eSctest.getInstance().turnoff_VFD()
+               self.fronttimer.start(1000,True)
+
+class FrontTest_uno(Screen):
+       skin = """
+               <screen name="FrontTest_uno" position="center,center" size="300,180" title="Front Test" >
+                       <widget name="text" position="10,10" size="280,160" font="Regular;30" />
+               </screen>"""
+
+       def __init__(self, session):
+               self["actions"] = ActionMap(["DirectionActions", "OkCancelActions","GlobalActions"],
+               {
+                       "ok": self.keyOk,
+                       "cancel": self.keyCancel,
+                       "left": self.keyleft,
+                       "right": self.keyright,
+                       "volumeUp": self.keyvolup,
+                       "volumeDown": self.keyvoldown,
+                       "power_down": self.keypower,
+               }, -2)
+
+               Screen.__init__(self, session)
+               self["text"]=Label(("Press Front CH -"))
+               self.step = 1
+               self.fronttimer= eTimer()
+               self.fronttimer.callback.append(self.FrontAnimate)
+               self.frontturnonoff = 0
+               eSctest.getInstance().VFD_Open()
+               self.keytimeout = eTimer()
+               self.keytimeout.callback.append(self.KeyTimeOut)
+               self.keytimeout.start(5000,True)
+
+       def KeyTimeOut(self):
+               if self.step == 1:
+                       self["text"].setText(("Front CH - ERROR\nPress exit!"))
+               elif self.step == 2:
+                       self["text"].setText(("Front CH + ERROR\nPress exit!"))
+               elif self.step == 3 :
+                       self["text"].setText(("Front VOL - ERROR\nPress exit!"))
+               elif self.step == 4:
+                       self["text"].setText(("Front VOL + ERROR\nPress exit!"))
+               elif self.step == 5:
+                       self["text"].setText(("Front STANDBY ERROR\nPress exit!"))
+               self.step = 0
+
+       def keyleft(self):
+               if self.step== 1:
+                       self.keytimeout.stop()
+                       self.keytimeout.start(5000,True)
+                       self.step = 2
+                       self["text"].setText(_("Press Front CH +"))
+       def keyright(self):
+               if self.step== 2:
+                       self.keytimeout.stop()
+                       self.keytimeout.start(5000,True)
+                       self.step = 3
+                       self["text"].setText(_("Press Front VOL -"))
+
+       def keyvoldown(self):
+               if self.step== 3:
+                       self.keytimeout.stop()
+                       self.keytimeout.start(5000,True)
+                       self.step = 4
+                       self["text"].setText(_("Press Front VOL +"))
+
+       def keyvolup(self):
+               if self.step== 4:
+                       self.keytimeout.stop()
+                       self.keytimeout.start(5000,True)
+                       self.step = 5
+                       self["text"].setText(_("Press Front STANDBY"))
+
+       def keypower(self):
+               if self.step== 5:
+                       self.keytimeout.stop()
+                       self.step = 6
+                       self.fronttimer.start(1000,True)
+                       self["text"].setText(_("Front LED OK?\n\nyes-ok\nno-exit"))
+
+       def keyCancel(self):
+               global fronttest
                self.fronttimer.stop()
                eSctest.getInstance().VFD_Close()
+               fronttest = 0
+               self.close()
+
+       def keyOk(self):
+               global fronttest
                if self.step == 6:
                        fronttest = 1
-               self.close()
+                       self.fronttimer.stop()
+                       eSctest.getInstance().VFD_Close()
+                       self.close()
 
        def FrontAnimate(self):
                if (self.frontturnonoff==0):
@@ -1712,8 +1883,11 @@ class FrontTest_solo(Screen):
                        eSctest.getInstance().turnoff_VFD()
                self.fronttimer.start(1000,True)
 
-
-       
+class FrontTest_ultimo(FrontTest_solo):
+       skin = """
+               <screen position="center,center" size="300,180" title="Front Test" >
+                <widget name="text" position="10,10" size="280,160" font="Regular;30" />
+               </screen>"""
 
 rstest = 0
 
@@ -1721,8 +1895,8 @@ import select
 
 class RS232Test(Screen):
        skin = """
-               <screen position="300,240" size="160,100" title="RS232 Test" >
-                       <widget name="text" position="10,10" size="140,80" font="Regular;22" />
+               <screen name="RS232Test" position="center,center" size="260,100" title="RS232 Test" >
+                       <widget name="text" position="10,10" size="240,80" font="Regular;30" />
                </screen>"""
        step=1
        def __init__(self, session):
@@ -1746,15 +1920,22 @@ class RS232Test(Screen):
                        if r:
                                input = rs.read(1)
                                if input == "\n":
-#                              if input == "m":
                                        rstest = 1
                                else:
                                        rstest = 0 
                        else:
                                rstest = 0
+                       rs.close()
                except:
-                       print 'error'
+                       try:
+                               if rs:
+                                       rs.close()
+                       except:
+                               pass
+                       print 'except error'
                        rstest = 0
+               if rstest == 0:
+                       self.session.open( MessageBox, _("RS232 Test Failed!\nPress 'EXIT' button!"), MessageBox.TYPE_ERROR)
                self.close()
 
        def keyCancel(self):
@@ -1764,16 +1945,26 @@ Agingresult = 0
 
 class AgingTest(Screen):
        skin = """
-               <screen position="200,240" size="250,100" title="Aging Test" >
-                       <widget name="text1" position="10,10" size="230,40" font="Regular;22" />
-                       <widget name="text2" position="10,50" size="230,40" font="Regular;22" />
+               <screen position="center,center" size="350,150" title="Aging Test" >
+                       <widget name="text1" position="10,10" size="330,40" font="Regular;30" />
+                       <widget name="text2" position="10,60" size="330,40" font="Regular;30" />
+                       <!-- Signal Quality -->
+                       <eLabel text="SNR : " position="40,120" size="60,25" font="Regular;25" transparent="1" />
+                       <widget source="session.FrontendStatus" render="Label" position="100,120" size="60,25" font="Regular;25"  transparent="1">
+                               <convert type="FrontendInfo">SNRdB</convert>
+                       </widget>
+                       <!-- AGC -->
+                       <eLabel text="AGC : " position="180,120" size="60,25" font="Regular;25"  transparent="1" noWrap="1" />
+                       <widget source="session.FrontendStatus" render="Label" position="240,120" size="60,25" font="Regular;25"  transparent="1" noWrap="1">
+                               <convert type="FrontendInfo">AGC</convert>
+                       </widget>
                </screen>"""
        step=1
        def __init__(self, session):
-               self["actions"] = ActionMap(["WizardActions","GlobalActions"],
+               self["actions"] = ActionMap(["MediaPlayerActions","GlobalActions"],
                {
-                       "agingend": self.keyEnd,
-                       "agingfinish": self.keyFinish,
+                       "pause": self.keyEnd,
+                       "stop": self.keyFinish,
                        "volumeUp": self.nothing,
                        "volumeDown": self.nothing,
                        "volumeMute": self.nothing,             
@@ -1790,7 +1981,7 @@ class AgingTest(Screen):
                self.tunerlock = 0
                self.tuningtimer = eTimer()
                self.tuningtimer.callback.append(self.updateStatus)
-#              self.tuningtimer.start(2000,True)
+#              self.tuningtimer.start(200,True)
 
 
        def updateStatus(self):
@@ -1801,13 +1992,13 @@ class AgingTest(Screen):
                if result == 0:
                        self.tunerlock = 0
                        self.session.nav.stopService()
-                       self.session.open( MessageBox, _("Tune 1 Ver Locking Fail..."), MessageBox.TYPE_ERROR)  
+                       self.session.open( MessageBox, _("Tune 1 Ver Locking Fail..."), MessageBox.TYPE_ERROR)
                elif result==1 :
                        self.tunerlock = 1
                else:
                        self.tunerlock = 0
                        self.session.nav.stopService()
-                       self.session.open( MessageBox, _("Tune 1 Ver Error %d..."%result), MessageBox.TYPE_ERROR)       
+                       self.session.open( MessageBox, _("Tune 1 Ver Error %d..."%result), MessageBox.TYPE_ERROR)
 
 
        def nothing(self):
@@ -1844,6 +2035,297 @@ class AgingTest(Screen):
                Agingresult = 1
                self.session.nav.stopService() # try to disable foreground service
                self.close()
+
+class TestTuneMenu(Screen):
+       skin = """
+       <screen position="350,230" size="550,300" title="Tuning Test" >
+               <widget name="testlist" position="10,0" size="440,250" itemHeight="35"/>
+               <widget name="resultlist" position="470,0" size="60,250" itemHeight="35"/>
+               <widget source="text" render="Label" position="100,270" size="450,30" font="Regular;22" />
+       </screen>"""
+
+       def __init__(self ,session ,tuneInfo, tunelist,NimType):
+               self.session = session
+               self.NimType = NimType
+               self.tuneInfo = tuneInfo
+               self.tunelist = tunelist
+               self.model = 4
+               self["actions"] = NumberActionMap(["OkCancelActions","WizardActions","NumberActions"],
+               {
+                       "left": self.nothing,
+                       "right":self.nothing,
+                       "ok": self.TestAction,
+                       "cancel": self.keyCancel,
+                       "up": self.keyup,
+                       "down": self.keydown,
+                       "0": self.numberaction,
+                       "1": self.numberaction,
+                       "2": self.numberaction,
+                       "3": self.numberaction,
+                       "4": self.numberaction,
+                       "5": self.numberaction,
+                       "6": self.numberaction,
+                       "7": self.numberaction,
+                       "8": self.numberaction,
+                       "9": self.numberaction,
+
+               }, -2)
+               Screen.__init__(self, session)
+               self.text = _("Press 'EXIT' key to finish tune test.")
+               self["text"] = StaticText(self.text)
+               self.createConfig()
+               session.nav.stopService() # try to disable foreground service
+
+               self.tunemsgtimer = eTimer()
+               self.tunemsgtimer.callback.append(self.tunemsg)
+
+               self.camstep = 1
+               self.camtimer = eTimer()
+               self.camtimer.callback.append(self.cam_state)
+
+               self.tunerlock = 0
+               self.tuningtimer = eTimer()
+               self.tuningtimer.callback.append(self.updateStatus)
+               self.setSourceVar()
+               self.avswitch = AVSwitch()
+
+       def createConfig(self):
+               self.menulength= len(self.tunelist)
+               self["testlist"] = MenuList(self.tunelist)
+               self.rlist = []
+               for x in range(self.menulength):
+                       self.rlist.append((".."))
+               self["resultlist"] = TestResultList(self.rlist)
+
+       def TestAction(self):
+               print "line - ",self["testlist"].getCurrent()[1]
+               self.currentindex = index = self["testlist"].getCurrent()[1]
+               result = 0
+               self.TestTune(index)
+
+       def nothing(self):
+               print "nothing"
+
+       def keyup(self):
+               print "self.menulength = ",self.menulength
+               print "self[\"testlist\"].getCurrent()[1] = ",self["testlist"].getCurrent()[1]
+               if self["testlist"].getCurrent()[1]==0:
+                       self["testlist"].moveToIndex(self.menulength-1)
+                       self["resultlist"].moveToIndex(self.menulength-1)
+               else:
+                       self["testlist"].up()
+                       self["resultlist"].up()
+
+
+       def keydown(self):
+               print "self.menulength = ",self.menulength
+               print "self[\"testlist\"].getCurrent()[1] = ",self["testlist"].getCurrent()[1]
+               if self["testlist"].getCurrent()[1]==(self.menulength-1):
+                       self["testlist"].moveToIndex(0)
+                       self["resultlist"].moveToIndex(0)
+               else:
+                       self["testlist"].down()
+                       self["resultlist"].down()
+
+       def numberaction(self, number):
+               if number >= self.menulength:
+                       return
+               index = int(number)
+               self["testlist"].moveToIndex(index)
+               self["resultlist"].moveToIndex(index)
+
+       def keyCancel(self):
+               print "testtunemenu exit"
+               if not '..' in self.rlist and not 'fail' in self.rlist:
+                       self.close(True)
+               else:
+                       self.close(False)
+#              if self.oldref is not None:
+#                      self.session.nav.playService(self.oldref)
+
+       def TestTune(self,index):
+               ref = eServiceReference("1:0:19:1324:3EF:1:C00000:0:0:0")
+               self.session.nav.stopService() # try to disable foreground service
+               getTuneInfo=self.tuneInfo[index]
+               if getTuneInfo["cam"] is True:
+                       self.camstep = 1
+                       self.camtimer.start(100,True)
+               if getTuneInfo["type"].startswith("DVB-S"):
+                       if getTuneInfo["pol"] == "H":
+                               ref.setData(0,1)
+                               ref.setData(1,0x6D3)
+                               ref.setData(2,0x3)
+                               ref.setData(3,0xA4)
+                       else:
+                               ref.setData(0,0x19)
+                               ref.setData(1,0x1325)
+                               ref.setData(2,0x3ef)
+                               ref.setData(3,0x1)
+                       if getTuneInfo["sat"] == "160": # Eutelsat W2
+                               ref.setData(4,0xA00000)
+                       elif getTuneInfo["sat"] == "100": # Eutelsat
+                               ref.setData(4,0x64af79)
+                       elif getTuneInfo["sat"] == "130": # Hotbird
+                               ref.setData(4,0x820000)
+                       elif getTuneInfo["sat"] == "192": # Astra
+                               ref.setData(4,0xC00000)
+                       elif getTuneInfo["sat"] == "620": # Intelsat 902
+                               ref.setData(4,0x26c0000) # need to fix later
+                       elif getTuneInfo["sat"] == "642": # Intelsat 906
+                               ref.setData(4,0x282AF79) # need to fix later
+               elif getTuneInfo["type"].startswith("DVB-C"):
+                       ref.setData(0,0x19)
+                       ref.setData(1,0x1325)
+                       ref.setData(2,0x3ef)
+                       ref.setData(3,0x1)
+                       ref.setData(4,-64870) # ffff029a
+               elif getTuneInfo["type"].startswith("DVB-T"):
+                       ref.setData(0,0x19)
+                       ref.setData(1,0x1325)
+                       ref.setData(2,0x3ef)
+                       ref.setData(3,0x1)
+                       ref.setData(4,-286391716) # eeee025c
+               self.session.nav.playService(ref)
+               if getTuneInfo["color"]=="CVBS":
+                       self.avswitch.setColorFormat(0)
+               elif getTuneInfo["color"]=="RGB":
+                       self.avswitch.setColorFormat(1)
+               elif getTuneInfo["color"]=="YC":
+                       self.avswitch.setColorFormat(2)
+               if getTuneInfo["ratio"] == "4:3":
+                       self.avswitch.setAspectRatio(0)
+               elif getTuneInfo["ratio"] == "16:9":
+                       self.avswitch.setAspectRatio(6)
+               self.tuningtimer.start(2000,True)
+               self.tunemsgtimer.start(3000, True)
+
+       def cam_state(self):
+               current_index = self.currentindex
+               if self.camstep == 1:
+                       slot = 0
+                       state = eDVBCI_UI.getInstance().getState(slot)
+                       print '-1-stat',state
+                       if state > 0:
+                               self.camstep=2
+                               self.camtimer.start(100,True)
+                       else:
+                               self.session.nav.stopService()
+                               self.session.open( MessageBox, _("CAM1_NOT_INSERTED\nPress exit!"), MessageBox.TYPE_ERROR)
+                               self.rlist[current_index]="fail"
+                               self.tunemsgtimer.stop()
+               elif self.camstep == 2:
+                       slot = 0
+                       appname = eDVBCI_UI.getInstance().getAppName(slot)
+                       print 'appname',appname
+                       if appname is None:
+                               self.session.nav.stopService()
+                               self.session.open( MessageBox, _("NO_GET_APPNAME\nPress exit!"), MessageBox.TYPE_ERROR)
+                               self.rlist[current_index]="fail"
+                               self.tunemsgtimer.stop()
+                       else:
+                               self.camstep=3
+                               self.camtimer.start(100,True)
+               elif self.camstep==3:
+                       slot = 1
+                       state = eDVBCI_UI.getInstance().getState(slot)
+                       print '-2-stat',state
+                       if state > 0:
+                               self.camstep=4
+                               self.camtimer.start(100,True)
+                       else:
+                               self.session.nav.stopService()
+                               self.session.open( MessageBox, _("CAM2_NOT_INSERTED\nPress exit!"), MessageBox.TYPE_ERROR)
+                               self.rlist[current_index]="fail"
+                               self.tunemsgtimer.stop()
+               elif self.camstep == 4:
+                       slot = 1
+                       appname = eDVBCI_UI.getInstance().getAppName(slot)
+                       print 'appname',appname
+                       if appname is None:
+                               self.session.nav.stopService()
+                               self.session.open( MessageBox, _("NO_GET_APPNAME\nPress exit!"), MessageBox.TYPE_ERROR)
+                               self.rlist[current_index]="fail"
+                               self.tunemsgtimer.stop()
+                       else:
+                               self.setSource()
+                               self.camstep = 5
+
+       def updateStatus(self):
+               current_index = self.currentindex
+               getTuneInfo=self.tuneInfo[current_index]
+               result = eSctest.getInstance().getFrontendstatus(getTuneInfo["slot"])
+               tunno = getTuneInfo["slot"]+1
+               hv = getTuneInfo["pol"]
+               if hv == "H":
+                       hv = "Hor"
+               elif hv == "V":
+                       hv = "Ver"
+               else :
+                       hv == ""
+
+               print "eSctest.getInstance().getFrontendstatus - %d"%result
+               if result == 0 or result == -1:
+                       self.tunerlock = 0
+                       self.tunemsgtimer.stop()
+                       self.session.nav.stopService()
+                       self.avswitch.setColorFormat(0)
+                       self.session.open( MessageBox, _("Tune%d %s Locking Fail..."%(tunno,hv)), MessageBox.TYPE_ERROR)
+                       self.rlist[current_index]="fail"
+               else :
+                       self.tunerlock = 1
+
+       def tuneback(self,yesno):
+               current_index=self.currentindex
+               self.session.nav.stopService() # try to disable foreground service
+               if yesno and self.tunerlock == 1:
+                       getTuneInfo=self.tuneInfo[current_index]
+                       if getTuneInfo["cam"] and self.camstep < 5: # need fix to depending about CAM exist
+                               self.rlist[current_index]="fail"
+                       else :
+                               self.rlist[current_index]="pass"
+               else:
+                       self.rlist[current_index]="fail"
+               if self.tuneInfo[current_index]["color"] == "YC":
+                       self.avswitch.setColorFormat(0)
+               self.resetSource()
+               self["resultlist"].updateList(self.rlist)
+
+       def tunemsg(self):
+               self.tuningtimer.stop()
+               self.session.openWithCallback(self.tuneback, TuneMessageBox, _("%s ok?" %(self["testlist"].getCurrent()[0])), MessageBox.TYPE_YESNO)
+
+       def setSourceVar(self):
+               self.input_pad_num=len(self.NimType)-1
+               if self.input_pad_num == 0:
+                       self.setTuner = 'A'
+               elif self.input_pad_num == 1:
+                       self.setTuner = 'B'
+               elif self.input_pad_num == 2:
+                       self.setTuner = 'C'
+
+#      ikseong - for 22000 tp
+       def setSource(self):
+# fix input source
+               inputname = ("/proc/stb/tsmux/input%d" % self.input_pad_num)
+               print "<setsource> inputname : ",inputname
+               fd=open(inputname,"w")
+               fd.write("CI0")
+               fd.close()
+# fix ci_input Tuner
+               filename = ("/proc/stb/tsmux/ci0_input")
+               fd = open(filename,'w')
+               fd.write(self.setTuner)
+               print "setTuner(CI0) : ",self.setTuner
+               fd.close()
+               print "CI loop test!!!!!!!!!!!!!!"
+
+       def resetSource(self):
+               inputname = ("/proc/stb/tsmux/input%d" % self.input_pad_num)
+               print "<resetsource> inputname : ",inputname
+               fd=open(inputname,"w")
+               fd.write(self.setTuner)
+               fd.close()
+               print "CI loop test end!!!!!!!!!!!!!!"
                
 session = None
 
@@ -1865,3 +2347,6 @@ def main(session, servicelist, **kwargs):
 
 #def Plugins(**kwargs):
 #      return PluginDescriptor(name=_("Factory Test"), description="Test App for Factory", where = PluginDescriptor.WHERE_EXTENSIONSMENU, fnc=main)
+
+def Plugins(**kwargs):
+       return []