v1.81 release, fixes #46,#47,#48, removed delfate from payload

soarqin · Mar 17, 2019 · ce66e6f · ce66e6f
1 parent e6e20fa
commit ce66e6f
Show file tree

Hide file tree

Showing 20 changed files with 244 additions and 295 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,5 +1,11 @@
+v1.81
+1. Remove deflate from h-encore to get payload loading slight faster
+2. Support 3.61/3.67 now, you won't be asked to update on these firmwares (#46)
+3. Reduced C2-12821-1 error (#47)
+4. Fixed mismatch firmware versions display on firmware update
+
 v1.8
-1. Support for memecore(h-encore 2.0 for VITA 3.60 support with PSN access), compiled from [my fork](https://github.com/soarqin/h-encore), thanks to [CelesteBlue-dev](https://github.com/CelesteBlue-dev) for his port
+1. Support for memecore(h-encore 2.0 for VITA 3.60 support), compiled from [my fork](https://github.com/soarqin/h-encore), thanks to [CelesteBlue-dev](https://github.com/CelesteBlue-dev) for his port
 2. Can trim h-encore app to only 6.5MB now, thanks to [KuromeSan](https://github.com/KuromeSan)
 3. Fixed a bug that button is reset to be clickable when another info sync from PSVITA is received
 4. Fixed French language

diff --git a/README.md b/README.md
@@ -5,8 +5,8 @@ a tool to push h-encore exploit for PS VITA/PS TV automatically
 see [CREDITS.md](CREDITS.md)
 
 # Usage
-1. For common use just open the executable binary and follow instructions.
-2. If you want to update PS Vita to firmware 3.65 or 3.68 through USB connection, just download related Update Packages from [here](https://darthsternie.bplaced.net/ps-vita.html) and extract the normal PSP2UPDAT.PUP to the same folder of this tool
+1. For common use just open the executable binary and follow instructions. Supported firmwares: 3.60/3.61/3.65/3.67/3.68
+2. If you want to update PS Vita to firmware 3.60, 3.65 or 3.68 through USB connection, just download related Update Packages from [here](darthsternie.net/index.php/ps-vita-firmwares/) and extract the normal PSP2UPDAT.PUP to the same folder of this tool
 3. If you want to install VitaShell or enso by transferring in Content Manager, just download prebuilt zip from `releases` tab and put in the same folder of this tool
 
 # Prebuilt binaries for windows/macOS

diff --git a/src/finalhe.cc b/src/finalhe.cc
@@ -160,8 +160,6 @@ void FinalHE::updateExpandArea() {
                 item0->setFlags(Qt::NoItemFlags);
                 ui.extraItems->addItem(item0);
                 hasFirmware = true;
-                item->setCheckState(Qt::Checked);
-                i == 0 ? vita->setUse365Update() : vita->setUse368Update();
             } else
                 item->setCheckState(Qt::Unchecked);
             item->setData(Qt::UserRole, i + 1);
@@ -207,56 +205,49 @@ bool FinalHE::checkFwUpdate() {
             ? tr("On PS Vita:\nSettings -> System Update -> Update by Connecting to a PC")
             : tr("To update through USB:\nPut Update Package(.PUP) in this tool's folder and restart the tool")));
         return false;
-    } else if (vita->getDeviceVersion() > "3.60" && vita->getDeviceVersion() < "3.65") {
-        if (vita->has365Update() || vita->has368Update()) {
-            int count = ui.extraItems->count();
-            for (int i = 0; i < count; ++i) {
-                auto *eitem = ui.extraItems->item(i);
-                if (eitem->flags() == Qt::NoItemFlags) continue;
-                bool ok;
-                int n = eitem->data(Qt::UserRole).toInt(&ok);
-                if (ok) {
-                    if (n == 1) {
-                        ui.extraItems->removeItemWidget(eitem);
-                        delete eitem;
-                        count = ui.extraItems->count();
-                        --i;
-                    } else
-                        eitem->setCheckState(n > 1 ? Qt::Checked : Qt::Unchecked);
+    } else if (vita->getDeviceVersion() < "3.65") {
+        bool needUpdate = vita->getDeviceVersion() > "3.61";
+        int count = ui.extraItems->count();
+        for (int i = 0; i < count; ++i) {
+            auto *eitem = ui.extraItems->item(i);
+            if (eitem->flags() == Qt::NoItemFlags) continue;
+            bool ok;
+            int n = eitem->data(Qt::UserRole).toInt(&ok);
+            if (ok) {
+                if (n == 1) {
+                    ui.extraItems->removeItemWidget(eitem);
+                    delete eitem;
+                    count = ui.extraItems->count();
+                    --i;
+                } else if (needUpdate) {
+                    eitem->setCheckState(n > 1 ? Qt::Checked : Qt::Unchecked);
                 }
             }
         }
-        ui.textPkg->setText(tr("Fimrware version is not supported by h-encore.") + "\n"
-            + tr("Update to %1 first.").arg("3.65/3.68") + "\n"
-            + (vita->has368Update()
-            ? tr("On PS Vita:\nSettings -> System Update -> Update by Connecting to a PC")
-            : tr("To update through USB:\nPut Update Package(.PUP) in this tool's folder and restart the tool")));
-        return false;
-    } else if (vita->getDeviceVersion() > "3.65" && vita->getDeviceVersion() < "3.68") {
-        if (vita->has368Update()) {
-            int count = ui.extraItems->count();
-            for (int i = 0; i < count; ++i) {
-                auto *eitem = ui.extraItems->item(i);
-                if (eitem->flags() == Qt::NoItemFlags) continue;
-                bool ok;
-                int n = eitem->data(Qt::UserRole).toInt(&ok);
-                if (ok) {
-                    if (n == 1 || n == 2) {
-                        ui.extraItems->removeItemWidget(eitem);
-                        delete eitem;
-                        count = ui.extraItems->count();
-                        --i;
-                    } else
-                        eitem->setCheckState(n > 2 ? Qt::Checked : Qt::Unchecked);
+        if (needUpdate) {
+            ui.textPkg->setText(tr("Fimrware version is not supported by h-encore.") + "\n"
+                + tr("Update to %1 first.").arg("3.65/3.68") + "\n"
+                + (vita->has368Update()
+                ? tr("On PS Vita:\nSettings -> System Update -> Update by Connecting to a PC")
+                : tr("To update through USB:\nPut Update Package(.PUP) in this tool's folder and restart the tool")));
+            return false;
+        }
+    } else if (vita->getDeviceVersion() < "3.68") {
+        int count = ui.extraItems->count();
+        for (int i = 0; i < count; ++i) {
+            auto *eitem = ui.extraItems->item(i);
+            if (eitem->flags() == Qt::NoItemFlags) continue;
+            bool ok;
+            int n = eitem->data(Qt::UserRole).toInt(&ok);
+            if (ok) {
+                if (n == 1 || n == 2) {
+                    ui.extraItems->removeItemWidget(eitem);
+                    delete eitem;
+                    count = ui.extraItems->count();
+                    --i;
                 }
             }
         }
-        ui.textPkg->setText(tr("Fimrware version is not supported by h-encore.") + "\n"
-            + tr("Update to %1 first.").arg("3.68") + "\n"
-            + (vita->has368Update()
-            ? tr("On PS Vita:\nSettings -> System Update -> Update by Connecting to a PC")
-            : tr("To update through USB:\nPut Update Package(.PUP) in this tool's folder and restart the tool")));
-        return false;
     }
     return true;
 }
@@ -318,9 +309,12 @@ void FinalHE::extraItemsChanged(QListWidgetItem *item) {
         if (checked) {
             switch (fwidx) {
             case 1:
-                vita->setUse365Update();
+                vita->setUse360Update();
                 break;
             case 2:
+                vita->setUse365Update();
+                break;
+            case 3:
                 vita->setUse368Update();
                 break;
             default:

diff --git a/src/finalhe.ui b/src/finalhe.ui
@@ -119,7 +119,7 @@
              </font>
             </property>
             <property name="text">
-             <string>Trim h-encore to ~6.5MB</string>
+             <string>Trim h-encore to ~7MB</string>
             </property>
            </widget>
           </item>

diff --git a/src/package.cc b/src/package.cc
@@ -502,18 +502,15 @@ void Package::createPsvImgs(QString titleID) {
                     if (cdir.cd("resource") && cdir.cd("image") && cdir.cd("stitle"))
                         cdir.removeRecursively();
                     cdir = curr;
-                    if (cdir.cd("resource") && cdir.cd("image") && cdir.cd("sys"))
-                        cdir.removeRecursively();
-                    cdir = curr;
                     if (cdir.cd("resource") && cdir.cd("image") && cdir.cd("sysc")) {
                         cdir.remove("kuro_waku.png");
                         cdir.remove("shiro_waku.png");
                         cdir.remove("sysc_bgm_mode_base.jpg");
                         cdir.remove("sysc_black.jpg");
-                        cdir.remove("sysc_button_number.png");
                         cdir.remove("sysc_cg_mode_base.jpg");
                         cdir.remove("sysc_how_to_base.jpg");
                         cdir.remove("sysc_info_base.jpg");
+                        cdir.remove("sysc_load_base.jpg");
                         cdir.remove("sysc_log_base.jpg");
                         cdir.remove("sysc_mabuta_1.png");
                         cdir.remove("sysc_mabuta_2.png");

diff --git a/src/resources/raw/h-encore.zip b/src/resources/raw/h-encore.zip
diff --git a/src/resources/raw/memecore.zip b/src/resources/raw/memecore.zip
diff --git a/src/translations/cs_CZ.ts b/src/translations/cs_CZ.ts
@@ -38,54 +38,50 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../finalhe.cc" line="175"/>
+        <location filename="../finalhe.cc" line="173"/>
         <source>-- Additional applications --</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../finalhe.cc" line="204"/>
-        <location filename="../finalhe.cc" line="229"/>
-        <location filename="../finalhe.cc" line="254"/>
+        <location filename="../finalhe.cc" line="202"/>
+        <location filename="../finalhe.cc" line="228"/>
         <source>Fimrware version is not supported by h-encore.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../finalhe.cc" line="205"/>
-        <location filename="../finalhe.cc" line="230"/>
-        <location filename="../finalhe.cc" line="255"/>
+        <location filename="../finalhe.cc" line="203"/>
+        <location filename="../finalhe.cc" line="229"/>
         <source>Update to %1 first.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../finalhe.cc" line="208"/>
-        <location filename="../finalhe.cc" line="233"/>
-        <location filename="../finalhe.cc" line="258"/>
+        <location filename="../finalhe.cc" line="206"/>
+        <location filename="../finalhe.cc" line="232"/>
         <source>To update through USB:
 Put Update Package(.PUP) in this tool&apos;s folder and restart the tool</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../finalhe.cc" line="207"/>
-        <location filename="../finalhe.cc" line="232"/>
-        <location filename="../finalhe.cc" line="257"/>
+        <location filename="../finalhe.cc" line="205"/>
+        <location filename="../finalhe.cc" line="231"/>
         <source>On PS Vita:
 Settings -&gt; System Update -&gt; Update by Connecting to a PC</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../finalhe.cc" line="267"/>
+        <location filename="../finalhe.cc" line="258"/>
         <source>Click button to START!</source>
         <translation>Stiskněte tlačítko pro START!</translation>
     </message>
     <message>
-        <location filename="../finalhe.cc" line="285"/>
+        <location filename="../finalhe.cc" line="276"/>
         <source>Registering device: %1
 Input this PIN on PS Vita: %2</source>
         <translation>Registruji zařízení: %1
 Zadejte na Vaší Vitě následující PIN: %2</translation>
     </message>
     <message>
-        <location filename="../finalhe.cc" line="289"/>
+        <location filename="../finalhe.cc" line="280"/>
         <source>Registered device.</source>
         <translation>Zařízení zaregistrované.</translation>
     </message>
@@ -99,8 +95,8 @@ Zadejte na Vaší Vitě následující PIN: %2</translation>
     </message>
     <message>
         <location filename="../finalhe.ui" line="122"/>
-        <source>Trim h-encore to ~6.5MB</source>
-        <translation>Zmenšit velikost h-encore na ~6.5MB</translation>
+        <source>Trim h-encore to ~7MB</source>
+        <translation>Zmenšit velikost h-encore na ~7MB</translation>
     </message>
 </context>
 <context>
@@ -175,7 +171,7 @@ Stiskněte tlačítko pro START!</translation>
         <translation>Spusťte na Vaší Vitě &quot;Content Manager&quot; a připojte Vitu k počítači.</translation>
     </message>
     <message>
-        <location filename="../package.cc" line="542"/>
+        <location filename="../package.cc" line="539"/>
         <source>Createing psvimg&apos;s</source>
         <translation>Vytvářím psvimg</translation>
     </message>
@@ -209,7 +205,7 @@ Prosím, zkontrolujte připojení k síťi!</translation>
     <name>base</name>
     <message>
         <location filename="../finalhe.cc" line="63"/>
-        <location filename="../finalhe.cc" line="351"/>
+        <location filename="../finalhe.cc" line="345"/>
         <source>English</source>
         <translation>Anglicky</translation>
     </message>

diff --git a/src/translations/de_DE.ts b/src/translations/de_DE.ts
@@ -14,56 +14,52 @@
         <translation>-- Firmware Aktualisierung --</translation>
     </message>
     <message>
-        <location filename="../finalhe.cc" line="175"/>
+        <location filename="../finalhe.cc" line="173"/>
         <source>-- Additional applications --</source>
         <translation>-- Zusätzliche Anwendungen --</translation>
     </message>
     <message>
-        <location filename="../finalhe.cc" line="204"/>
-        <location filename="../finalhe.cc" line="229"/>
-        <location filename="../finalhe.cc" line="254"/>
+        <location filename="../finalhe.cc" line="202"/>
+        <location filename="../finalhe.cc" line="228"/>
         <source>Fimrware version is not supported by h-encore.</source>
         <translation>Firmware version wird von h-encore nicht unterstützt.</translation>
     </message>
     <message>
-        <location filename="../finalhe.cc" line="205"/>
-        <location filename="../finalhe.cc" line="230"/>
-        <location filename="../finalhe.cc" line="255"/>
+        <location filename="../finalhe.cc" line="203"/>
+        <location filename="../finalhe.cc" line="229"/>
         <source>Update to %1 first.</source>
         <translation>Update zuerst auf %1.</translation>
     </message>
     <message>
-        <location filename="../finalhe.cc" line="207"/>
-        <location filename="../finalhe.cc" line="232"/>
-        <location filename="../finalhe.cc" line="257"/>
+        <location filename="../finalhe.cc" line="205"/>
+        <location filename="../finalhe.cc" line="231"/>
         <source>On PS Vita:
 Settings -&gt; System Update -&gt; Update by Connecting to a PC</source>
         <translation>Auf der PS Vita:
 Einstellungen -&gt; System Update -&gt; System-Aktualisierung -&gt; Über einen PC aktualisieren</translation>
     </message>
     <message>
-        <location filename="../finalhe.cc" line="208"/>
-        <location filename="../finalhe.cc" line="233"/>
-        <location filename="../finalhe.cc" line="258"/>
+        <location filename="../finalhe.cc" line="206"/>
+        <location filename="../finalhe.cc" line="232"/>
         <source>To update through USB:
 Put Update Package(.PUP) in this tool&apos;s folder and restart the tool</source>
         <translation>Um per USB upzudaten:
 Lege das Update Packet(.PUB) in das Verzeichnis des Programms und starte es neu</translation>
     </message>
     <message>
-        <location filename="../finalhe.cc" line="267"/>
+        <location filename="../finalhe.cc" line="258"/>
         <source>Click button to START!</source>
         <translation>Drücke den Knopf um zu STARTEN!</translation>
     </message>
     <message>
-        <location filename="../finalhe.cc" line="285"/>
+        <location filename="../finalhe.cc" line="276"/>
         <source>Registering device: %1
 Input this PIN on PS Vita: %2</source>
         <translation>Gerät registrieren: %1
 Gebe diesen PIN auf der PS Vita ein: %2</translation>
     </message>
     <message>
-        <location filename="../finalhe.cc" line="289"/>
+        <location filename="../finalhe.cc" line="280"/>
         <source>Registered device.</source>
         <translation>Registriertes Gerät.</translation>
     </message>
@@ -97,8 +93,8 @@ Gebe diesen PIN auf der PS Vita ein: %2</translation>
     </message>
     <message>
         <location filename="../finalhe.ui" line="122"/>
-        <source>Trim h-encore to ~6.5MB</source>
-        <translation>Kürze h-encore auf ~6.5MB</translation>
+        <source>Trim h-encore to ~7MB</source>
+        <translation>Kürze h-encore auf ~7MB</translation>
     </message>
 </context>
 <context>
@@ -167,7 +163,7 @@ Gebe diesen PIN auf der PS Vita ein: %2</translation>
         <translation>Kürze Paket</translation>
     </message>
     <message>
-        <location filename="../package.cc" line="542"/>
+        <location filename="../package.cc" line="539"/>
         <source>Createing psvimg&apos;s</source>
         <translation>Erstelle psvimgs</translation>
     </message>
@@ -207,7 +203,7 @@ Drücke den Knopf um zu STARTEN!</translation>
     <name>base</name>
     <message>
         <location filename="../finalhe.cc" line="63"/>
-        <location filename="../finalhe.cc" line="351"/>
+        <location filename="../finalhe.cc" line="345"/>
         <source>English</source>
         <translation>Englisch</translation>
     </message>