diff --git a/NeoBoot/plugin.py b/NeoBoot/plugin.py index 9dea3a8..467ef66 100644 --- a/NeoBoot/plugin.py +++ b/NeoBoot/plugin.py @@ -547,6 +547,7 @@ class NeoBootInstallation(Screen): 'bcm7358', 'bcm7424', 'bm750', + 'bcm73625' 'vuduo', 'vusolo', 'vuuno', @@ -560,7 +561,8 @@ class NeoBootInstallation(Screen): 'osmini', 'h3', 'ini-1000sv', - 'ini-8000sv']: + 'ini-8000sv' + 'formuler4turbo']: #vuplus stb mtd1 if getBoxHostName() == 'bm750' or getBoxHostName() == 'vuduo' or getBoxHostName() == 'vusolo' or getBoxHostName() == 'vuuno' or getBoxHostName() == 'vuultimo': if fileExists ('/usr/sbin/nanddump'): @@ -582,8 +584,8 @@ class NeoBootInstallation(Screen): os.system('cd; cd /media/neoboot/ImagesUpload/.kernel; /usr/sbin/nanddump /dev/mtd2 -o > vmlinux.gz; mv /home/root/vmlinux.gz /media/neoboot/ImagesUpload/.kernel/') os.system('cd ' + LinkNeoBoot + '/; rm ./bin/neobm; rm ./bin/fontforneoboot.ttf; rm ./bin/libpngneo; mv ' + LinkNeoBoot + '/target/vu_dev_mtd2.sh ' + LinkNeoBoot + '/files/kernel.sh; mv ' + LinkNeoBoot + '/target/vu_mtd2_run.py ' + LinkNeoBoot + '/run.py; cd') - #inne stb - elif getCPUSoC() == 'bcm7358' or getCPUSoC() == 'bcm7362' or getCPUSoC() == 'BCM7362' or getCPUSoC() == 'bcm7356' or getCPUSoC() == 'bcm7241' or getCPUSoC() == 'bcm7362' or getBoxHostName() == 'mbmini' or getBoxHostName() == 'osmini' or getTunerModel() == 'ini-1000sv' or getTunerModel() == 'h3': + #inne stb + elif getCPUSoC() == 'bcm73625' or getCPUSoC() == 'bcm7358' or getCPUSoC() == 'bcm7362' or getCPUSoC() == 'BCM7362' or getCPUSoC() == 'bcm7356' or getCPUSoC() == 'bcm7241' or getCPUSoC() == 'bcm7362' or getBoxHostName() == 'formuler4turbo' or getBoxHostName() == 'mbmini' or getBoxHostName() == 'osmini' or getTunerModel() == 'ini-1000sv' or getTunerModel() == 'h3': os.system('cd ' + LinkNeoBoot + '/; mv ./bin/fontforneoboot.ttf /usr/share/fonts; mv ./bin/libpngneo /usr/lib; cp -f ./bin/neoinitmips /sbin/neoinitmips; cp -f ./bin/neoinitmipsvu /sbin/neoinitmipsvu; chmod 0755 /sbin/neoinit*; chmod 0755 ./bin/neobm; chmod 0755 /usr/lib/libpngneo; cd; chmod 0755 /sbin/neoinitmips; ln -sf /media/neoboot/ImageBoot/.neonextboot /etc/neoimage; mv ' + LinkNeoBoot + '/target/mips_run.py ' + LinkNeoBoot + '/run.py; cd') @@ -630,11 +632,12 @@ class NeoBootImageChoose(Screen): screenwidth = getDesktop(0).size().width() if screenwidth and screenwidth == 1920: skin = """ - """ + """ else: skin = """ \n\t\t\t\t\t\t\t \n\t\t\t\t\t\t\t \n\t\t\t\t\t\t\t \n\t\t\t\t\t\t\t \n\t\t\t\t\t\t\t Format:%A %e %B %Y \t\t\t""" + def __init__(self, session): Screen.__init__(self, session) if not fileExists('' + LinkNeoBoot + '/files/mountpoint.sh'): @@ -876,16 +879,15 @@ class NeoBootImageChoose(Screen): if fileExists('/media/sda1' or '/media/sdb1'): self.session.open(MessageBox, _('NeoBoot - Please restart the system !!!'), MessageBox.TYPE_INFO, 10) self.close() - self.close() + self.close() - if fileExists('/.multinfo'): + elif fileExists('/.multinfo'): with open('%sImageBoot/.neonextboot' % getNeoLocation(), 'r' ) as f: imagefile = f.readline().strip() f.close() out = open('%sImageBoot/.neonextboot'% getNeoLocation(), 'w' ) out.write(imagefile) out.close() - else: system('touch /tmp/.init_reboot') out = open('%sImageBoot/.neonextboot' % getNeoLocation() , 'w') @@ -1245,6 +1247,7 @@ class NeoBootImageChoose(Screen): 'bcm7362', 'BCM7362', 'bcm7358', + 'bcm73625' '7405', '7405(with 3D)', 'bcm7424', @@ -1253,7 +1256,8 @@ class NeoBootImageChoose(Screen): 'osmini', 'mbultra', 'ustym4kpro' - 'h3']: + 'h3' + 'formuler4turbo']: self.extractImage() else: self.messagebox = self.session.open(MessageBox, _('Tuner nie jest wspierany przez NeoBoota.\nSkontaktuj sie z autorem.\nNie wykryto odpowiedniego STB do instalacji !!!!'), MessageBox.TYPE_INFO, 8)