From a97a44187ed9b5da8473ceab5708d6f190b02372 Mon Sep 17 00:00:00 2001 From: kos Date: Thu, 29 Dec 2011 13:56:16 +0900 Subject: [PATCH] upgrade plugins. - fpgaupgrade. - firmwareupgrade. --- .../Plugins/SystemPlugins/FPGAUpgrade/_fpga.so | Bin 76456 -> 76456 bytes .../Plugins/SystemPlugins/FPGAUpgrade/plugin.py | 14 ++++++++------ .../Plugins/SystemPlugins/FirmwareUpgrade/_fu.so | Bin 51700 -> 51700 bytes .../SystemPlugins/FirmwareUpgrade/plugin.py | 21 ++++++++++++++++----- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/lib/python/Plugins/SystemPlugins/FPGAUpgrade/_fpga.so b/lib/python/Plugins/SystemPlugins/FPGAUpgrade/_fpga.so index 52cb658733d69c68f2e246ccc436e1409df18e01..b031d6f4455a30f9d81ec234d47c70c765e9ce2a 100644 GIT binary patch delta 37 tcmZ2+m1V_MmJKUZgvwZ1Y(7f1m`E_VFbF6xFgPnV?^4;mONH?rD**J>3+Mm< delta 37 tcmZ2+m1V_MmJKUZgl=cB*sSetF_B """ - def __init__(self, session, parent, timeout = 10): + def __init__(self, session, parent, timeout = 20): Screen.__init__(self,session) self.session = session @@ -41,7 +41,7 @@ class UpgradeStatus(Screen): self.is_done = 0 self.exit_count = 0 - self.timeout = timeout + self.timeout = 20 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!!" - 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.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 = '' @@ -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 + 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.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: @@ -221,7 +223,7 @@ class FPGAUpgrade(Screen): 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() diff --git a/lib/python/Plugins/SystemPlugins/FirmwareUpgrade/_fu.so b/lib/python/Plugins/SystemPlugins/FirmwareUpgrade/_fu.so index 3aa21d872202f98f260c6685c1bb1b8e0c9ab1f7..c4c34bea7d80f2c1fa06e8a7cf0b312b232f48ce 100644 GIT binary patch delta 474 zcmW-ePe@cz6vofF5C4pl^)!MP3_Y7SFoFXr86nLgt64;gK`0n^;mm;0q9DX^6C-N9 z7g39YIM1FoZVGDA40oiEVib`Uf#jl{P%d1wvc)WAj%T`XzTdg`9=PXxw?RgOj7qT` z13lNCMGWYu;~{R*c;_*?dMxx-VSx_AztN@bGil7|p6=(pW3Fo?6MpoS=VnJNxCJ|L z1*Qd%1v7TpnuHz80LRLKRa|(jARCML3oj9F#&VGF4;S;WN5AZu?kau z+ZW2ACZ9+|x|;l0Vk+F^13mq8pmX@dXHF`FNWlC+cw?2hD9o)fmxZ-5^G{)7o%vsj zdjHv{mL+qpjbCWpb+AUe|MMf!uhixZ;sIUtY#gEc-W3J!^b4=+tk}1-d|e#dUw$v{ z&6ci7UM-y$_jW~9rjIuLOC5zM$TFzzUsQoZn}JQED>j-mA?ng>OSQl9@tn+;`oL|N np;RR;H%pacEa=5*T}eTzW}`fq-XJSZJ zk(t@jlguEXlERRx!QGI`aDMVl`EuS({}}{y81@5I$k@!;9IGJD#8|VrR!NzWF=F#V zWgum;`KXFN6XTP~qUz<0Ig@+U_cQWr_SGn622uyLPcwtW^p68Mp$6WZEDS)fd4c5t z7tuMK|Nj2~VhOH)|8syih5O(C8=Fh(v^fla%>4h~hKZ3uV$T2n2|(Ir?*IP{KssUG z|Njes^o9lh|6c&o8Vmpb{{W&lUu;_s3X;YSdB!c17j`H!ZkT)&%zg?acT8sO)Mvag z*|bxh(O`0Dr!mu?rJK7tx%hy=H+8x-FvKoSUk(ht${FTB_Qn~)z|cDiB$+}KChwXl z$6lfYay9eh`Z-c;$`I!MnUX-wmb2s;c_v2!$(G5LAae7}S*!VhUUgmdpOrCWvg-za ppv=?_?-@%rw{G0e1XSR