Support Vu+ Zero.
[vuplus_dvbapp] / lib / python / Plugins / SystemPlugins / FirmwareUpgrade / plugin.py
index ff593de..21c4661 100644 (file)
@@ -16,7 +16,7 @@ from Components.Slider import Slider
 from Screens.Screen import Screen
 from Screens.MessageBox import MessageBox
 
-from enigma import ePoint, eConsoleAppContainer, eTimer
+from enigma import ePoint, eConsoleAppContainer, eTimer, getDesktop
 from Tools.Directories import resolveFilename, SCOPE_PLUGINS
 
 fwlist = None
@@ -28,28 +28,313 @@ if os.path.exists("/proc/stb/info/vumodel"):
 
        if info == "ultimo":
                fwlist= [
-                        ("fp", _("Front Processor"))
-                       ,("fpga", _("FPGA"))
+                        ("fpga", _("FPGA"))
+                       ,("fp", _("Front Processor"))
                        ]
                fwdata= { 
-                        "fp"   : ["http://archive.vuplus.com/download/fp", "fp.files", "/dev/bcm_mu;"]
-                       ,"fpga" : ["http://archive.vuplus.com/download/fpga", "fpga.files", "/dev/fpga_dp;/dev/misc/dp;"]
+                        "fpga" : ["http://archive.vuplus.com/download/fpga", "fpga.files", "/dev/fpga_dp;/dev/misc/dp;"]
+                       ,"fp"   : ["http://archive.vuplus.com/download/fp", "fp.files", "/dev/bcm_mu;"]
                        }
        elif info == "uno":
                fwlist= [
                        ("fpga", _("FPGA"))
                        ]
+               fwdata= {
+                       "fpga" : ["http://archive.vuplus.com/download/fpga", "fpga.files", "/dev/fpga_dp;/dev/misc/dp;"]
+                       }
+       elif info == "solo2":
+               fwlist= [
+                        ("fpga", _("FPGA"))
+                       ,("fp", _("Front Processor"))
+                       ]
                fwdata= { 
-                       "fpga" : ["http://archive.vuplus.com/download/fpga", "fpga.file", "/dev/fpga_dp;/dev/misc/dp;"]
+                        "fpga" : ["http://archive.vuplus.com/download/fpga", "fpga.files", "/dev/fpga_dp;/dev/misc/dp;"]
+                       ,"fp"   : ["http://archive.vuplus.com/download/fp", "fp.files", "/dev/bcm_mu;"]
+                       }
+       elif info == "duo2":
+               fwlist= [
+                        ("fpga", _("FPGA"))
+                       ,("fp", _("Front Processor"))
+                       ,("vfd", _("VFD Controller"))
+                       ]
+               fwdata= {
+                        "fpga" : ["http://archive.vuplus.com/download/fpga", "fpga.files", "/dev/fpga_dp;/dev/misc/dp;"]
+                       ,"fp"   : ["http://archive.vuplus.com/download/fp", "fp.files", "/dev/bcm_mu;"]
+                       ,"vfd"  : ["http://archive.vuplus.com/download/vfd", "vfd.files", "/dev/bcm_vfd_ctrl;"]
                        }
+       elif info == "solose":
+               fwlist= [
+                        ("fpga", _("FPGA"))
+                       ,("fp", _("Front Processor"))
+                       ]
+               fwdata= { 
+                        "fpga" : ["http://archive.vuplus.com/download/fpga", "fpga.files", "/dev/fpga_dp;/dev/misc/dp;"]
+                       ,"fp"   : ["http://archive.vuplus.com/download/fp", "fp.files", "/dev/bcm_mu;"]
+                       }
+       elif info == "zero":
+               fwlist= [
+                        ("fpga", _("FPGA"))
+                       ,("fp", _("Front Processor"))
+                       ]
+               fwdata= { 
+                        "fpga" : ["http://archive.vuplus.com/download/fpga", "fpga.files", "/dev/fpga_dp;/dev/misc/dp;"]
+                       ,"fp"   : ["http://archive.vuplus.com/download/fp", "fp.files", "/dev/bcm_mu;"]
+                       }
+
+import os, fcntl, thread
+STATUS_READY           = 0
+STATUS_DONE            = 1
+STATUS_ERROR           = 2
+STATUS_PREPARED                = 3
+STATUS_PROGRAMMING     = 4
+STATUS_RETRY_UPGRADE   = 5
+
+class FPUpgradeCore() :
+       status = STATUS_READY
+       errmsg = ''
+       MAX_CALL_COUNT = 120
+       def __init__(self, firmwarefile, devicefile):
+               self.devicefile = devicefile
+               self.firmwarefile = firmwarefile
+
+       def doUpgrade(self):
+               firmware,device = None,None
+               def closefp(fp, fd):
+                       if fd is not None: os.close(fd)
+                       if fp is not None: fp.close()
+               try:
+                       size = os.path.getsize(self.firmwarefile)
+                       if size == 0: raise Exception, 'data_size is zero'
+                       #print '[FPUpgradeCore] data_size :',size
+
+                       for xx in range(3):
+                               self.callcount = 0
+                               self.status = STATUS_READY
+
+                               firmware = open(self.firmwarefile, 'rb')
+                               device = os.open(self.devicefile, os.O_RDWR)
+                               #print '[FPUpgradeCore] open >> [ok]'
+
+                               rc = fcntl.ioctl(device, 0, size)
+                               if rc < 0: raise Exception, 'fail to set size : %d'%(rc)
+                               #print '[FPUpgradeCore] set size >> [ok]'
+                               self.status = STATUS_PREPARED
+
+                               while True:
+                                       data = firmware.read(1024)
+                                       if data == '': break
+                                       os.write(device, data)
+                               #print '[FPUpgradeCore] write data >> [ok]'
+
+                               self.status = STATUS_PROGRAMMING
+                               rc = fcntl.ioctl(device, 1, 0)
+                               if rc == 0: break
+                               if xx == 2: raise Exception, 'fail to upgrade : %d'%(rc)
+                               self.errmsg = 'fail to upgrade, retry..'
+                               self.status = STATUS_RETRY_UPGRADE
+                               closefp(firmware, device)
+                       #print '[FPUpgradeCore] upgrade done.'
+                       if self.callcount < 20: raise Exception, 'wrong fpga file.'
+               except Exception, msg:
+                       self.errmsg = msg
+                       print '[FPUpgradeCore] ERROR >>',msg
+                       closefp(firmware, device)
+                       return STATUS_ERROR
+               return STATUS_DONE
+
+       def upgradeMain(self):
+               self.status = STATUS_READY
+               self.status = self.doUpgrade()
+               if self.status == STATUS_DONE:
+                       print 'upgrade done.'
+               elif self.status == STATUS_ERROR:
+                       print 'error!!'
+               else:   print 'unknown.'
+
+class FPGAUpgradeCore() :
+       status = STATUS_READY
+       errmsg = ''
+       callcount       = 0
+       MAX_CALL_COUNT  = 1500
+       def __init__(self, firmwarefile, devicefile):
+               print '[FPGAUpgrade]'
+               self.devicefile = devicefile
+               self.firmwarefile = firmwarefile
+
+       def doUpgrade(self):
+               firmware,device = None,None
+               def closefpga(fp, fd):
+                       if fd is not None: os.close(fd)
+                       if fp is not None: fp.close()
+               try:
+                       size = os.path.getsize(self.firmwarefile)
+                       if size == 0: raise Exception, 'data_size is zero'
+                       #print '[FPGAUpgradeCore] data_size :',size
+
+                       firmware = open(self.firmwarefile, 'rb')
+                       device = os.open(self.devicefile, os.O_RDWR)
+                       #print '[FPGAUpgradeCore] open >> [ok]'
+
+                       rc = fcntl.ioctl(device, 0, size)
+                       if rc < 0: raise Exception, 'fail to set size : %d'%(rc)
+                       #print '[FPGAUpgradeCore] set size >> [ok]'
+
+                       rc = fcntl.ioctl(device, 2, 5)
+                       if rc < 0: raise Exception, 'fail to set programming mode : %d'%(rc)
+                       #print '[FPGAUpgradeCore] programming mode >> [ok]'
+                       self.status = STATUS_PREPARED
+
+                       while True:
+                               data = firmware.read(1024)
+                               if data == '': break
+                               os.write(device, data)
+                       #print '[FPGAUpgradeCore] write data >> [ok]'
+
+                       self.status = STATUS_PROGRAMMING
+                       rc = fcntl.ioctl(device, 1, 0)
+                       if rc < 0: raise Exception, 'fail to programming : %d'%(rc)
+                       #print '[FPGAUpgradeCore] upgrade done.'
+                       if self.callcount < 20: raise Exception, 'wrong fpga file.'
+               except Exception, msg:
+                       self.errmsg = msg
+                       print '[FPGAUpgradeCore] ERROR >>',msg
+                       closefpga(firmware, device)
+                       return STATUS_ERROR
+               closefpga(firmware, device)
+               return STATUS_DONE
+
+       def upgradeMain(self):
+               self.status = STATUS_READY
+               self.status = self.doUpgrade()
+               if self.status == STATUS_DONE:
+                       print '[FPGAUpgrade] upgrade done.'
+               elif self.status == STATUS_ERROR:
+                       print '[FPGAUpgrade] occur error.'
+               else:   print '[FPGAUpgrade] occur unknown error.'
+
+
+class VFDCtrlUpgradeCore() :
+       status = STATUS_READY
+       errmsg = ''
+       MAX_CALL_COUNT = 120
+       def __init__(self, firmwarefile, devicefile):
+               #print '[VFDCtrlUpgradeCore]'
+               self.devicefile = devicefile
+               self.firmwarefile = firmwarefile
+               #print '[VFDCtrlUpgradeCore] devicefile :', self.devicefile
+               #print '[VFDCtrlUpgradeCore] firmwarefile :', self.firmwarefile
+
+       def doUpgrade(self):
+               firmware,device,firmwarename = None,None,None
+               print '[VFDCtrlUpgradeCore] checkvfd..'
+               cmd_t = "/usr/lib/enigma2/python/Plugins/SystemPlugins/FirmwareUpgrade/checkvfd %s" 
+               ret_d = os.popen(cmd_t % (self.firmwarefile)).read()
+
+               if ret_d is not None and len(ret_d) > 0:
+                       print '[VFDCtrlUpgradeCore] fail to checkvfd.. [' + ret_d + ']'
+                       return STATUS_ERROR
+
+               def closevfd(fp, fd, filename):
+                       if fd is not None: os.close(fd)
+                       if fp is not None: fp.close()
+                       if filename is not None: os.system('rm -f %s' % (filename))
+               try:
+                       max_size = 1024 * 16
+                       size = max_size #os.path.getsize(self.firmwarefile)
+                       if size == 0: raise Exception, 'data_size is zero'
+                       #print '[VFDCtrlUpgradeCore] data_size :',size
+
+                       for xx in range(3):
+                               self.callcount = 0
+                               self.status = STATUS_READY
+                               firmwarename = os.path.splitext(self.firmwarefile)[0]
+                               firmware = open(firmwarename, 'rb')
+                               device = os.open(self.devicefile, os.O_RDWR)
+                               #print '[VFDCtrlUpgradeCore] open >> [ok]'
+
+                               rc = fcntl.ioctl(device, 0, size)
+                               if rc < 0: raise Exception, 'fail to set size : %d'%(rc)
+                               #print '[VFDCtrlUpgradeCore] set size >> [ok]'
+                               self.status = STATUS_PREPARED
+
+                               total_write_size = 0
+                               while True:
+                                       data = firmware.read(1024)
+                                       if data == '' or total_write_size == max_size:
+                                               break
+                                       os.write(device, data)
+                                       total_write_size = total_write_size + 1024
+                               #print '[VFDCtrlUpgradeCore] write data >> [ok]'
+
+                               self.status = STATUS_PROGRAMMING
+                               rc = fcntl.ioctl(device, 1, 0)
+                               if rc == 0: break
+                               if rc < 0 or xx == 2: raise Exception, 'fail to upgrade : %d'%(rc)
+                               self.errmsg = 'fail to upgrade, retry..'
+                               self.status = STATUS_RETRY_UPGRADE
+                       #print '[VFDCtrlUpgradeCore] upgrade done.'
+                       if self.callcount < 20: raise Exception, 'wrong fpga file.'
+               except Exception, msg:
+                       self.errmsg = msg
+                       print '[VFDCtrlUpgradeCore] ERROR >>',msg
+                       closevfd(firmware, device, firmwarename)
+                       return STATUS_ERROR
+               closevfd(firmware, device, firmwarename)
+               return STATUS_DONE
+
+       def upgradeMain(self):
+               self.status = STATUS_READY
+               self.status = self.doUpgrade()
+               if self.status == STATUS_DONE:
+                       print '[VFDCtrlUpgradeCore] upgrade done.'
+               elif self.status == STATUS_ERROR:
+                       print '[VFDCtrlUpgradeCore] error.'
+               else:   print '[VFDCtrlUpgradeCore] unknown error.'
+
+class FirmwareUpgradeManager:
+       fu = None
+       def getInterval(self):
+               return 200
+
+       def startUpgrade(self, datafile, device, firmware):
+               if firmware == 'fpga':
+                       self.fu = FPGAUpgradeCore(firmwarefile=datafile, devicefile=device)
+               elif firmware == 'fp':
+                       self.fu = FPUpgradeCore(firmwarefile=datafile, devicefile=device)
+               elif firmware == 'vfd':
+                       self.fu = VFDCtrlUpgradeCore(firmwarefile=datafile, devicefile=device)
+               thread.start_new_thread(self.fu.upgradeMain, ())
+
+       def checkError(self):
+               if self.fu.status == STATUS_ERROR:
+                       self.fu.callcount = 0
+                       return True
+               return False
+
+       def getStatus(self):
+               if self.fu.status in (STATUS_READY, STATUS_ERROR):
+                       return 0
+               elif self.fu.status == STATUS_PREPARED:
+                       return 2
+               elif self.fu.status == STATUS_PROGRAMMING:
+                       self.fu.callcount += 1
+                       ret = (self.fu.callcount * 100) / self.fu.MAX_CALL_COUNT + 2
+                       if ret >= 100: ret = 99
+                       #print "callcount : [%d]"%(self.fu.callcount);
+                       return ret
+               elif self.fu.status == STATUS_DONE:
+                       return 100
+
+       def getErrorMessage(self, errno, errmsg):
+               return str(self.fu.errmsg)
 
 class UpgradeStatus(Screen):
        skin =  """
-               <screen position="center,center" size="450,100" title=" ">
+               <screen position="center,center" size="450,130" title=" ">
                        <widget name="name" position="10,0" size="430,20" font="Regular;18" halign="left" valign="bottom"/>
-                       <widget name="slider" position="10,25" size="430,30" backgroundColor="white"/>
-                       <widget name="status" position="10,25" zPosition="1" size="430,30" font="Regular;18" halign="center" valign="center" foregroundColor="black" backgroundColor="black" transparent="1"/>
-                       <widget source="info" render="Label" position="10,70" zPosition="1" size="430,30" font="Regular;22" halign="center" valign="center" backgroundColor="#a08500" transparent="1"/>
+                       <widget name="slider" position="10,25" size="430,30" borderWidth="2" borderColor="#cccccc"/>
+                       <widget name="status" position="10,25" zPosition="1" size="430,30" font="Regular;18" halign="center" valign="center" foregroundColor="#9f1313" transparent="1"/>
+                       <widget source="info" render="Label" position="10,70" zPosition="1" size="430,60" font="Regular;22" halign="center" valign="center" transparent="1"/>
                </screen>
                """
 
@@ -78,8 +363,7 @@ class UpgradeStatus(Screen):
 
                self.setTitle(firmware.upper() + " Upgrade Status")
 
-               import fu
-               self.FU = fu.FU()
+               self.FU = FirmwareUpgradeManager()
 
                self.old_status   = 0
                self.status_exit  = None
@@ -102,7 +386,7 @@ class UpgradeStatus(Screen):
                        self.cbConfirmExit(False)
                        return
                status = self.FU.getStatus()
-               if self.old_status > status:
+               if self.old_status > status and status != -1:
                        self.session.open(MessageBox, _("Fail to upgrade!! Retry!!"), MessageBox.TYPE_INFO, timeout = 10)
                self.slider.setValue(status)
                self["status"].setText(_("%d / 100" % (status)))
@@ -139,14 +423,15 @@ class UpgradeStatus(Screen):
                        self.callback("Reboot now for a successful upgrade.", True)
                self.session.openWithCallback(self.cbConfirmExit, MessageBox, _("Do you want to remove binary data?"), MessageBox.TYPE_YESNO, timeout = 10, default = False)
 
-class Filebrowser(Screen):
+class FUFilebrowser(Screen):
        skin =  """
-               <screen position="center,center" size="500,260" title="File Browser" >
-                       <ePixmap pixmap="Vu_HD/buttons/blue.png" position="5,7" size="80,40" alphatest="blend" />
-                       <widget source="key_blue" render="Label" position="40,0" zPosition="1" size="180,40" font="Regular;20" halign="left" valign="center" transparent="1"/>
-                       <widget name="file_list" position="0,50" size="500,160" scrollbarMode="showOnDemand" />
+               <screen position="center,center" size="500,290" title="File Browser" >
+                       <ePixmap pixmap="skin_default/buttons/blue.png" position="5,10" size="140,40" alphatest="blend" />
+
+                       <widget source="key_blue" render="Label" position="5,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#18188b" foregroundColor="#ffffff" transparent="1"/>
 
-                       <widget source="status" render="Label" position="0,220" zPosition="1" size="500,40" font="Regular;18" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
+                       <widget name="file_list" position="0,70" size="495,160" scrollbarMode="showOnDemand" />
+                       <widget source="status" render="Label" position="0,230" zPosition="1" size="495,70" font="Regular;18" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
                 </screen>
                """
 
@@ -180,7 +465,7 @@ class Filebrowser(Screen):
                self.setTitle(firmware.upper() + " File Browser")
 
        def resetGUI(self):
-               self["status"].setText("Select to press OK, Exit to press Cancel.")
+               self["status"].setText("Press OK to select, Press Cancel to exit.\nPress BLUE to download the latest firmware.")
 
        def setCallback(self, func):
                self.callback = func
@@ -206,13 +491,15 @@ class Filebrowser(Screen):
                                name_ext = os.path.splitext(self["file_list"].getFilename())
                                return len(name_ext)==2 and ext.startswith(name_ext[1])
                        self.check_ext = False
-                       if (self.firmware == "fp" and checkExt(".bin")) or (self.firmware == "fpga" and checkExt(".dat")):
+                       if (self.firmware == "fp" and checkExt(".bin")) or (self.firmware == "fpga" and checkExt(".dat")) or (self.firmware == "vfd" and checkExt(".vfd")):
                                self.check_ext = True
                        if self.check_ext == False:
-                               self.session.open(MessageBox, _("You chose the incorrect file."), MessageBox.TYPE_INFO)
+                               print self.firmware,",",self["file_list"].getFilename()
+                               self.session.open(MessageBox, _("You choose the incorrect file. "), MessageBox.TYPE_INFO)
                                return
                except:
-                       self.session.open(MessageBox, _("You chose the incorrect file."), MessageBox.TYPE_INFO)
+                       print self.firmware,",",self["file_list"].getFilename()
+                       self.session.open(MessageBox, _("You choose the incorrect file. "), MessageBox.TYPE_INFO)
                        return
 
                if os.path.exists("/usr/bin/md5sum") == False:
@@ -237,7 +524,7 @@ class Filebrowser(Screen):
        # tf  : target file name(string)
        # bd  : target base directory(string)
        # cbfunc(string) : callback function(function)
-       def doDownload(self, uri, tf, bd='/tmp', cbfunc=None):
+       def doDownload(self, uri, tf, bd='/tmp', cbfunc=None, errmsg="Fail to download."):
                tar = bd + "/" + tf
                #print "[FirmwareUpgrade] - Download Info : [%s][%s]" % (uri, tar)
                def doHook(blockNumber, blockSize, totalSize) :
@@ -247,13 +534,17 @@ class Filebrowser(Screen):
                try:
                        opener.open(uri)
                except:
-                       self.session.open(MessageBox, _("File not found in this URL:\n%s"%(uri)), MessageBox.TYPE_INFO, timeout = 10)
+                       #self.session.open(MessageBox, _("File not found in this URL:\n%s"%(uri)), MessageBox.TYPE_INFO, timeout = 10)
+                       print "[FirmwareUpgrade] - Fail to download. URL :",uri
+                       self.session.open(MessageBox, _(errmsg), MessageBox.TYPE_INFO, timeout = 10)
                        del opener
                        return False
                try :
                        f, h = urlretrieve(uri, tar, doHook)
                except IOError, msg:
-                       self.session.open(MessageBox, _(str(msg)), MessageBox.TYPE_INFO, timeout = 10)
+                       #self.session.open(MessageBox, _(str(msg)), MessageBox.TYPE_INFO, timeout = 10)
+                       print "[FirmwareUpgrade] - Fail to download. ERR_MSG :",str(msg)
+                       self.session.open(MessageBox, _(errmsg), MessageBox.TYPE_INFO, timeout = 10)
                        del opener
                        return False
                del opener
@@ -266,7 +557,7 @@ class Filebrowser(Screen):
                def cbDownloadDone(tar):
                        try:
                                if os.path.splitext(tar)[1] != ".files":
-                                       self["status"].setText("Downloaded : %s\nSelect to press OK, Exit to press Cancel."%(tar))
+                                       self["status"].setText("Downloaded : %s\nPress OK to select, Press Cancel to exit."%(tar))
                        except:
                                pass
                # target
@@ -298,12 +589,12 @@ class Filebrowser(Screen):
                os.system("rm -f /tmp/" + root_file)
 
                # md5
-               if not self.doDownload(self.guri+".md5", self.gbin+".md5", cbfunc=cbDownloadDone):
+               if not self.doDownload(self.guri+".md5", self.gbin+".md5", cbfunc=cbDownloadDone, errmsg="Can't download the checksum file."):
                        self.resetGUI()
                        self.downloadLock = False
                        return
                # data
-               if not self.doDownload(self.guri, self.gbin, cbfunc=cbDownloadDone):
+               if not self.doDownload(self.guri, self.gbin, cbfunc=cbDownloadDone, errmsg="Can't download the firmware file."):
                        self.resetGUI()
                        self.downloadLock = False
                        return
@@ -364,14 +655,14 @@ class Filebrowser(Screen):
 class FirmwareUpgrade(Screen, ConfigListScreen):
        skin =  """
                <screen position="center,center" size="560,175" title="Firmware Upgrade" >
-                       <ePixmap pixmap="Vu_HD/buttons/red.png" position="125,7" size="80,40" alphatest="blend" />
-                       <ePixmap pixmap="Vu_HD/buttons/green.png" position="330,7" size="80,40" alphatest="blend" />
+                       <ePixmap pixmap="skin_default/buttons/red.png" position="110,10" size="140,40" alphatest="blend" />
+                       <ePixmap pixmap="skin_default/buttons/green.png" position="310,10" size="140,40" alphatest="blend" />
 
-                       <widget source="key_red" render="Label" position="160,0" zPosition="1" size="155,40" font="Regular;20" halign="left" valign="center" transparent="1" />
-                       <widget source="key_green" render="Label" position="365,0" zPosition="1" size="155,40" font="Regular;20" halign="left" valign="center" transparent="1" />
+                       <widget source="key_red" render="Label" position="110,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#9f1313" foregroundColor="#ffffff" transparent="1" />
+                       <widget source="key_green" render="Label" position="310,10" zPosition="1" size="140,40" font="Regular;20" halign="center" valign="center" backgroundColor="#1f771f" foregroundColor="#ffffff" transparent="1" />
 
-                       <widget name="config" zPosition="2" position="0,50" itemHeight="36" size="540,40" scrollbarMode="showOnDemand" transparent="1" />
-                       <widget source="status" render="Label" position="0,100" zPosition="1" size="540,75" font="Regular;20" halign="center" valign="center" backgroundColor="#a08500" transparent="1" />
+                       <widget name="config" zPosition="2" position="0,70" itemHeight="36" size="540,40" scrollbarMode="showOnDemand" transparent="1" />
+                       <widget source="status" render="Label" position="0,100" zPosition="1" size="540,75" font="Regular;20" halign="center" valign="center" />
                 </screen>
                """
 
@@ -391,6 +682,8 @@ class FirmwareUpgrade(Screen, ConfigListScreen):
                self.list = []
                self.updateFilePath = ""
 
+               self.finishedExit = False
+
                self.rebootLock = False
                self.rebootMessage = ""
                self.cbRebootCallCount = 0;
@@ -407,7 +700,7 @@ class FirmwareUpgrade(Screen, ConfigListScreen):
                global fwlist
                if fwlist is None:
                        self["key_green"] = StaticText(_(" "))
-                       self["status"] = StaticText(_("This plugin is supported only the Ultimo/Uno."))
+                       self["status"] = StaticText(_("Duo/Solo was not support."))
                else:
                        self["key_green"] = StaticText(_("Upgrade"))
                        self["status"] = StaticText(_(" "))
@@ -432,23 +725,29 @@ class FirmwareUpgrade(Screen, ConfigListScreen):
                                self.rebootMessage = message
                                self.reboot_timer = eTimer()
                                self.reboot_timer.callback.append(self.cbReboot)
-                               self.reboot_timer.start(500)
+                               self.reboot_timer.start(1000)
                        return
                if not self.rebootLock:
-                       self["status"].setText("Press the Green/OK button")
+                       self["status"].setText(" ")
+
+       def doReboot(self):
+               from Screens.Standby import TryQuitMainloop
+               self.session.open(TryQuitMainloop, 2)
 
        def cbReboot(self):
-               if self.cbRebootCallCount < 6:
+               max_call_count = 20
+               self.finishedExit = True
+               if self.cbRebootCallCount < max_call_count:
                        self.cbRebootCallCount = self.cbRebootCallCount + 1
-                       self["status"].setText("%s (%d)"%(self.rebootMessage, 6-self.cbRebootCallCount))
+                       #self["status"].setText("%s (%d)"%(self.rebootMessage, max_call_count-self.cbRebootCallCount))
+                       self["status"].setText("Reboot in %d seconds. Press OK to reboot now."%(max_call_count-self.cbRebootCallCount))
                        return
-               from Screens.Standby import TryQuitMainloop
-               self.session.open(TryQuitMainloop, 2)
+               self.doReboot()
 
        # filebrowser window callback function
        def cbSetStatus(self, data=None):
                if data is not None:
-                       self["status"].setText("Press the Green/OK button, if you want to upgrade to this file:\n%s\n" % (data))
+                       self["status"].setText(" ")
                        self.updateFilePath = data
                        if self.fileopenmode == False:
                                self.upgrade_auto_run_timer.start(1000)
@@ -475,7 +774,7 @@ class FirmwareUpgrade(Screen, ConfigListScreen):
                fbs.setCallback(self.cbFinishedUpgrade)
        
        def doFileOpen(self):
-               fbs = self.session.open(Filebrowser, self, self._item_firmware.value)
+               fbs = self.session.open(FUFilebrowser, self, self._item_firmware.value)
                fbs.setCallback(self.cbSetStatus)
 
        def keyLeft(self):
@@ -488,6 +787,8 @@ class FirmwareUpgrade(Screen, ConfigListScreen):
                self.setupStatus()
 
        def keyRight(self):
+               if self.rebootLock:
+                       return
                global fwlist
                if fwlist is None:
                        return
@@ -495,6 +796,9 @@ class FirmwareUpgrade(Screen, ConfigListScreen):
                self.setupStatus()
 
        def keyGreen(self):
+               if self.finishedExit:
+                       self.doReboot()
+                       return
                self.upgrade_auto_run_timer.stop()
                if self.rebootLock:
                        return
@@ -505,7 +809,7 @@ class FirmwareUpgrade(Screen, ConfigListScreen):
                        #self.session.open(MessageBox, _("No selected binary data!!"), MessageBox.TYPE_INFO)
                        self.doFileOpen()
                        return
-               msg = "You should not be stop during the upgrade.\nDo you want to upgrade?"
+               msg = "You can't cancel during upgrade.\nDo you want to continue?"
                self.session.openWithCallback(self.cbRunUpgrade, MessageBox, _(msg), MessageBox.TYPE_YESNO, timeout = 15, default = True)
                self.fileopenmode = False