upgrade plugins.

    - fpgaupgrade.
    - firmwareupgrade.

diff --git a/lib/python/Plugins/SystemPlugins/FPGAUpgrade/_fpga.so b/lib/python/Plugins/SystemPlugins/FPGAUpgrade/_fpga.so
index 52cb658..b031d6f 100644 (file)
Binary files a/lib/python/Plugins/SystemPlugins/FPGAUpgrade/_fpga.so and b/lib/python/Plugins/SystemPlugins/FPGAUpgrade/_fpga.so differ

diff --git a/lib/python/Plugins/SystemPlugins/FPGAUpgrade/plugin.py b/lib/python/Plugins/SystemPlugins/FPGAUpgrade/plugin.py
index 313e162..76cf06b 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/FPGAUpgrade/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/FPGAUpgrade/plugin.py
@@ -30,7 +30,7 @@ class UpgradeStatus(Screen):
                        <widget source="info" render="Label" position="10,70" zPosition="1" size="430,60" font="Regular;22" halign="center" valign="center" backgroundColor="#a08500" transparent="1"/>
                </screen>
                """
                        <widget source="info" render="Label" position="10,70" zPosition="1" size="430,60" font="Regular;22" halign="center" valign="center" backgroundColor="#a08500" transparent="1"/>
                </screen>
                """

-       def __init__(self, session, parent, timeout = 10):
+       def __init__(self, session, parent, timeout = 20):

                Screen.__init__(self,session)
                self.session = session
 
                Screen.__init__(self,session)
                self.session = session
 


@@ -41,7 +41,7 @@ class UpgradeStatus(Screen):
 
                self.is_done = 0
                self.exit_count = 0
 
                self.is_done = 0
                self.exit_count = 0

-               self.timeout = timeout
+               self.timeout = 20

                self.title_str = "FPGA Upgrade"
 
                #self["name"] = Label(_("Upgrade status"))
                self.title_str = "FPGA Upgrade"
 
                #self["name"] = Label(_("Upgrade status"))


@@ -69,14 +69,14 @@ class UpgradeStatus(Screen):
 
                if self.status == 100:
                        #print "fpga-upgrade done!!"
 
                if self.status == 100:
                        #print "fpga-upgrade done!!"

-                       self.status_bar.setText(_("Success. Press OK to exit."))
+                       self.status_bar.setText(_("Succeed"))

                        #self.status_bar.setText(_("%d / 100" % (self.status)))
                        self.timer_check_progress.stop()
                        self.is_done = 1
                        #self.status_bar.setText(_("%d / 100" % (self.status)))
                        self.timer_check_progress.stop()
                        self.is_done = 1

-

                        self.timer_exit = eTimer()
                        self.timer_exit.callback.append(self.callbackExit)
                        self.timer_exit.start(1000)
                        self.timer_exit = eTimer()
                        self.timer_exit.callback.append(self.callbackExit)
                        self.timer_exit.start(1000)

+

                elif self.status < 0:#elif self.status == -1 or self.status == -2:
                        #print "fpga-upgrade error >> errno : [%d]" % (self.status)
                        ERROR_MSG = ''
                elif self.status < 0:#elif self.status == -1 or self.status == -2:
                        #print "fpga-upgrade error >> errno : [%d]" % (self.status)
                        ERROR_MSG = ''


@@ -86,6 +86,7 @@ class UpgradeStatus(Screen):
                        self["info"].setText(_("Error[%d] : %s.\nPress OK to exit." % (self.status, ERROR_MSG)))
                        self.timer_check_progress.stop()
                        self.is_done = 1
                        self["info"].setText(_("Error[%d] : %s.\nPress OK to exit." % (self.status, ERROR_MSG)))
                        self.timer_check_progress.stop()
                        self.is_done = 1

+

                else:
                        #print "fpga-upgrade status : %d" % self.status
                        self.status_bar.setText(_("%d / 100" % (self.status)))
                else:
                        #print "fpga-upgrade status : %d" % self.status
                        self.status_bar.setText(_("%d / 100" % (self.status)))


@@ -96,7 +97,8 @@ class UpgradeStatus(Screen):
                        self.timer_exit.stop()
                        self.keyExit()
                self.exit_count = self.exit_count + 1
                        self.timer_exit.stop()
                        self.keyExit()
                self.exit_count = self.exit_count + 1

-               self.instance.setTitle("%s (%d)" % (self.title_str, (self.timeout-self.exit_count)))
+               #self.instance.setTitle("%s (%d)" % (self.title_str, (self.timeout-self.exit_count)))
+               self["info"].setText("Reboot after %d seconds.\nPress the OK to reboot now." %(self.timeout-self.exit_count)) 

 
        def keyExit(self):
                if self.need_restart:
 
        def keyExit(self):
                if self.need_restart:


@@ -221,7 +223,7 @@ class FPGAUpgrade(Screen):
                        print "FILE : ", path
                else:
                        #self.session.open(MessageBox, _("Success!!"), MessageBox.TYPE_INFO, timeout = 5)
                        print "FILE : ", path
                else:
                        #self.session.open(MessageBox, _("Success!!"), MessageBox.TYPE_INFO, timeout = 5)

-                       self.session.open(UpgradeStatus, self, timeout = 10)                    
+                       self.session.open(UpgradeStatus, self, timeout = 20)                    

 
        def onClickRed(self):
                self.doExit()
 
        def onClickRed(self):
                self.doExit()

diff --git a/lib/python/Plugins/SystemPlugins/FirmwareUpgrade/_fu.so b/lib/python/Plugins/SystemPlugins/FirmwareUpgrade/_fu.so
index 3aa21d8..c4c34be 100644 (file)
Binary files a/lib/python/Plugins/SystemPlugins/FirmwareUpgrade/_fu.so and b/lib/python/Plugins/SystemPlugins/FirmwareUpgrade/_fu.so differ

diff --git a/lib/python/Plugins/SystemPlugins/FirmwareUpgrade/plugin.py b/lib/python/Plugins/SystemPlugins/FirmwareUpgrade/plugin.py
index f3c28a7..0e1ec25 100644 (file)
--- a/lib/python/Plugins/SystemPlugins/FirmwareUpgrade/plugin.py
+++ b/lib/python/Plugins/SystemPlugins/FirmwareUpgrade/plugin.py
@@ -395,6 +395,8 @@ class FirmwareUpgrade(Screen, ConfigListScreen):
                self.list = []
                self.updateFilePath = ""
 
                self.list = []
                self.updateFilePath = ""
 

+               self.finishedExit = False
+

                self.rebootLock = False
                self.rebootMessage = ""
                self.cbRebootCallCount = 0;
                self.rebootLock = False
                self.rebootMessage = ""
                self.cbRebootCallCount = 0;


@@ -436,18 +438,24 @@ class FirmwareUpgrade(Screen, ConfigListScreen):
                                self.rebootMessage = message
                                self.reboot_timer = eTimer()
                                self.reboot_timer.callback.append(self.cbReboot)
                                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")
 
                        return
                if not self.rebootLock:
                        self["status"].setText("Press the Green/OK button")
 

+       def doReboot(self):
+               from Screens.Standby import TryQuitMainloop
+               self.session.open(TryQuitMainloop, 2)
+

        def cbReboot(self):
        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.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 after %d seconds. Press the OK to reboot now."%(max_call_count-self.cbRebootCallCount))

                        return
                        return

-               from Screens.Standby import TryQuitMainloop
-               self.session.open(TryQuitMainloop, 2)
+               self.doReboot()

 
        # filebrowser window callback function
        def cbSetStatus(self, data=None):
 
        # filebrowser window callback function
        def cbSetStatus(self, data=None):


@@ -499,6 +507,9 @@ class FirmwareUpgrade(Screen, ConfigListScreen):
                self.setupStatus()
 
        def keyGreen(self):
                self.setupStatus()
 
        def keyGreen(self):

+               if self.finishedExit:
+                       self.doReboot()
+                       return

                self.upgrade_auto_run_timer.stop()
                if self.rebootLock:
                        return
                self.upgrade_auto_run_timer.stop()
                if self.rebootLock:
                        return