diff --git a/flash-scripts/linux/oem-unlock.sh b/flash-scripts/linux/verify-heimdall.sh similarity index 100% rename from flash-scripts/linux/oem-unlock.sh rename to flash-scripts/linux/verify-heimdall.sh diff --git a/flash-scripts/windows/oem-unlock.bat b/flash-scripts/windows/verify-heimdall.bat similarity index 100% rename from flash-scripts/windows/oem-unlock.bat rename to flash-scripts/windows/verify-heimdall.bat diff --git a/src/main/java/ecorp/easy/installer/controllers/subcontrollers/DeviceDetectedController.java b/src/main/java/ecorp/easy/installer/controllers/subcontrollers/DeviceDetectedController.java index b6668c55b82adb8af6cfa77bec69565e4436db14..5c9a19f3efcd548278c286c2a0f37cc6a5de1e57 100644 --- a/src/main/java/ecorp/easy/installer/controllers/subcontrollers/DeviceDetectedController.java +++ b/src/main/java/ecorp/easy/installer/controllers/subcontrollers/DeviceDetectedController.java @@ -85,6 +85,7 @@ public class DeviceDetectedController extends AbstractSubController{ detectionMsg.setText(String.format(i18n.getString("detect_lbl_compatibleDeviceFound"), model)); if(parentController != null){ parentController.setDevice(result); + AppConstants.setDeviceModel(result.getDevice()); parentController.disableNextButton(false); } } diff --git a/src/main/java/ecorp/easy/installer/helpers/DeviceHelper.java b/src/main/java/ecorp/easy/installer/helpers/DeviceHelper.java index d171821e5ec34f044d50163decb6571a338a839e..62ff0c61d11a0565f86dc6cc63e67a16da256d33 100644 --- a/src/main/java/ecorp/easy/installer/helpers/DeviceHelper.java +++ b/src/main/java/ecorp/easy/installer/helpers/DeviceHelper.java @@ -1,17 +1,42 @@ +/* + * Copyright 2019-2020 - ECORP SAS + + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ package ecorp.easy.installer.helpers; import java.util.HashMap; /** * - * @author André Lam + * @author André Lam, Vincen Bourgmayer */ public class DeviceHelper { - static final HashMap map = new HashMap() {{ + private static final HashMap map = new HashMap() {{ put("hero2lte", "0001"); put("herolte", "0002"); put("star2lte", "0003"); put("starlte", "0004"); put("zeroflte", "0005"); + put("dream2lte", "0006"); + put("dreamlte", "0007"); }}; + + + /** + * Return internal code for a given device + * @param key the device code's name (example: Samsung galaxy S7 => herolte) + * @return can return null if no key doesn't match + */ public static String getDeviceInternalcode(String key){ return map.get(key); } diff --git a/src/main/resources/images/TWRP_rebootPowerOff.png b/src/main/resources/images/TWRP_rebootPowerOff.png new file mode 100644 index 0000000000000000000000000000000000000000..3e3c893d54ef49e2d7f3887af2281299fd7cea76 Binary files /dev/null and b/src/main/resources/images/TWRP_rebootPowerOff.png differ diff --git a/src/main/resources/images/TWRP_rebootSystem.png b/src/main/resources/images/TWRP_rebootSystem.png new file mode 100644 index 0000000000000000000000000000000000000000..fd0ff7ba81ef6153e68a246c2d695a9586e5ccd2 Binary files /dev/null and b/src/main/resources/images/TWRP_rebootSystem.png differ diff --git a/src/main/resources/images/oemUnlock_developerOption.png b/src/main/resources/images/oemUnlock_developerOption.png new file mode 100644 index 0000000000000000000000000000000000000000..c100807cba77fba9206f37a153f122020d596a7e Binary files /dev/null and b/src/main/resources/images/oemUnlock_developerOption.png differ diff --git a/src/main/resources/images/oemUnlock_enable.png b/src/main/resources/images/oemUnlock_enable.png new file mode 100644 index 0000000000000000000000000000000000000000..1e1b2f65ea16ae4b8a472d432783d8a93a32f2de Binary files /dev/null and b/src/main/resources/images/oemUnlock_enable.png differ diff --git a/src/main/resources/images/oemUnlock_settings.png b/src/main/resources/images/oemUnlock_settings.png new file mode 100644 index 0000000000000000000000000000000000000000..f4a0f09c4ff83b6d67742cf141bc182b0287019e Binary files /dev/null and b/src/main/resources/images/oemUnlock_settings.png differ diff --git a/src/main/resources/images/oemUnlock_turnON.png b/src/main/resources/images/oemUnlock_turnON.png new file mode 100644 index 0000000000000000000000000000000000000000..dc158e0aabe1b66f179ecc11b9ac3a9b14d86274 Binary files /dev/null and b/src/main/resources/images/oemUnlock_turnON.png differ diff --git a/src/main/resources/instructions/imageName_en_EN_0003.properties b/src/main/resources/instructions/imageName_en_EN_0003.properties index 925b4c573aa04a870cf149b45d272d5499b74ab5..3570fd7dd7494974a2428d753b3b729f4145002d 100644 --- a/src/main/resources/instructions/imageName_en_EN_0003.properties +++ b/src/main/resources/instructions/imageName_en_EN_0003.properties @@ -14,16 +14,12 @@ # along with this program. If not, see . #install_instr_turnOff -install_instr_startDownload=galaxyS9_Download_mode_mode_400px.png +install_instr_startDl_pressPowerBixbyVolDown=galaxyS9_Download_mode_400px.png install_instr_acceptWarning=galaxyS9_Accept_warning_mode_400px.png -#install_instr_oemUnlock -#install_instr_recoveryInstall -install_instr_leaveDownload=galaxyS9_Download_mode_mode_400px.png -install_instr_startRecovery=galaxyS9_Recovery_mode_mode_400px.png +install_instr_leaveDl_pressPowerBixbyVolDown=galaxyS9_Download_mode_400px.png +install_instr_startRec_pressPowerBixbyVolUp=galaxyS9_Recovery_mode_400px.png install_instr_tapWipe=TWRP_wipe.png install_instr_tapReboot=TWRP_reboot.png -#install_instr_swipeTwrp -#install_instr_eosInstall install_instr_tapAdvancedWipe=TWRP_advanceWipe.png install_instr_tickData=TWRP_checkData.png install_instr_tapRepairChangeFs=TWRP_repairchangeFS.png @@ -39,4 +35,8 @@ install_instr_writeYes=TWRP_writeYes.png install_instr_validate=TWRP_validate.png install_instr_backX3=TWRP_tapback.png install_instr_tapRebootRecovery=TWRP_rebootRecovery.png -install_instr_doNotInstall=TWRP_doNotInstall.png \ No newline at end of file +install_instr_doNotInstall=TWRP_doNotInstall.png +install_instr_openSettings=oemUnlock_settings.png +install_instr_openDevOptions=oemUnlock_developerOption.png +install_instr_checkOEMUnlock=oemUnlock_enable.png +install_instr_acceptFactoryReset=oemUnlock_turnON.png \ No newline at end of file diff --git a/src/main/resources/instructions/imageName_en_EN_0004.properties b/src/main/resources/instructions/imageName_en_EN_0004.properties index 925b4c573aa04a870cf149b45d272d5499b74ab5..5db971662397272830296653f34592f509b49ef0 100644 --- a/src/main/resources/instructions/imageName_en_EN_0004.properties +++ b/src/main/resources/instructions/imageName_en_EN_0004.properties @@ -14,16 +14,12 @@ # along with this program. If not, see . #install_instr_turnOff -install_instr_startDownload=galaxyS9_Download_mode_mode_400px.png -install_instr_acceptWarning=galaxyS9_Accept_warning_mode_400px.png -#install_instr_oemUnlock -#install_instr_recoveryInstall -install_instr_leaveDownload=galaxyS9_Download_mode_mode_400px.png -install_instr_startRecovery=galaxyS9_Recovery_mode_mode_400px.png +install_instr_startDl_pressPowerBixbyVolDown=galaxyS9_Download_mode_400px.png +install_instr_acceptWarning=galaxyS9_Accept_warning_400px.png +install_instr_leaveDl_pressPowerBixbyVolDown=galaxyS9_Download_mode_400px.png +install_instr_startRec_pressPowerBixbyVolUp=galaxyS9_Recovery_mode_400px.png install_instr_tapWipe=TWRP_wipe.png install_instr_tapReboot=TWRP_reboot.png -#install_instr_swipeTwrp -#install_instr_eosInstall install_instr_tapAdvancedWipe=TWRP_advanceWipe.png install_instr_tickData=TWRP_checkData.png install_instr_tapRepairChangeFs=TWRP_repairchangeFS.png @@ -39,4 +35,8 @@ install_instr_writeYes=TWRP_writeYes.png install_instr_validate=TWRP_validate.png install_instr_backX3=TWRP_tapback.png install_instr_tapRebootRecovery=TWRP_rebootRecovery.png -install_instr_doNotInstall=TWRP_doNotInstall.png \ No newline at end of file +install_instr_doNotInstall=TWRP_doNotInstall.png +install_instr_openSettings=oemUnlock_settings.png +install_instr_openDevOptions=oemUnlock_developerOption.png +install_instr_checkOEMUnlock=oemUnlock_enable.png +install_instr_acceptFactoryReset=oemUnlock_turnON.png \ No newline at end of file diff --git a/src/main/resources/instructions/imageName_en_EN_0006.properties b/src/main/resources/instructions/imageName_en_EN_0006.properties new file mode 100644 index 0000000000000000000000000000000000000000..3d7a17b95950ef69540c42d85ad65989df614ee9 --- /dev/null +++ b/src/main/resources/instructions/imageName_en_EN_0006.properties @@ -0,0 +1,40 @@ +# Copyright 2019-2020 - ECORP SAS + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +#install_instr_turnOff +install_instr_startDl_pressPowerBixbyVolDown=galaxyS9_Download_mode_400px.png +install_instr_acceptWarning=galaxyS9_Accept_warning_400px.png +install_instr_leaveDl_pressPowerBixbyVolDown=galaxyS9_Download_mode_400px.png +install_instr_startRec_pressPowerBixbyVolUp=galaxyS9_Recovery_mode_400px.png +install_instr_tapWipe=TWRP_wipe.png +install_instr_tapReboot=TWRP_reboot.png +install_instr_tapAdvancedWipe=TWRP_advanceWipe.png +install_instr_tickData=TWRP_checkData.png +install_instr_tapRepairChangeFs=TWRP_repairchangeFS.png +install_instr_tapChangeFs=TWRP_changeFS.png +install_instr_tapExt3=TWRP_toEXT3.png +install_instr_swipeForOk=TWRP_toEXT3_swipe.png +install_instr_backX2=TWRP_tapback.png +install_instr_resizeFs=TWRP_resizeFS.png +install_instr_tapFormatData=TWRP_formatData.png +install_instr_writeYes=TWRP_writeYes.png +install_instr_validate=TWRP_validate.png +install_instr_backX3=TWRP_tapback.png +install_instr_tapRebootSystem=TWRP_rebootSystem.png +install_instr_doNotInstall=TWRP_doNotInstall.png +install_instr_openSettings=oemUnlock_settings.png +install_instr_openDevOptions=oemUnlock_developerOption.png +install_instr_checkOEMUnlock=oemUnlock_enable.png +install_instr_tapRebootPowerOff = TWRP_rebootPowerOff.png \ No newline at end of file diff --git a/src/main/resources/instructions/imageName_en_EN_0007.properties b/src/main/resources/instructions/imageName_en_EN_0007.properties new file mode 100644 index 0000000000000000000000000000000000000000..0f37c8b111ca3a7aa08b1b2e7c20285af88001f5 --- /dev/null +++ b/src/main/resources/instructions/imageName_en_EN_0007.properties @@ -0,0 +1,39 @@ +# Copyright 2019-2020 - ECORP SAS + +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +install_instr_startDl_pressPowerBixbyVolDown=galaxyS9_Download_mode_400px.png +install_instr_acceptWarning=galaxyS9_Accept_warning_400px.png +install_instr_leaveDl_pressPowerBixbyVolDown=galaxyS9_Download_mode_400px.png +install_instr_startRec_pressPowerBixbyVolUp=galaxyS9_Recovery_mode_400px.png +install_instr_tapWipe=TWRP_wipe.png +install_instr_tapReboot=TWRP_reboot.png +install_instr_tapAdvancedWipe=TWRP_advanceWipe.png +install_instr_tickData=TWRP_checkData.png +install_instr_tapRepairChangeFs=TWRP_repairchangeFS.png +install_instr_tapChangeFs=TWRP_changeFS.png +install_instr_tapExt3=TWRP_toEXT3.png +install_instr_swipeForOk=TWRP_toEXT3_swipe.png +install_instr_backX2=TWRP_tapback.png +install_instr_resizeFs=TWRP_resizeFS.png +install_instr_tapFormatData=TWRP_formatData.png +install_instr_writeYes=TWRP_writeYes.png +install_instr_validate=TWRP_validate.png +install_instr_backX3=TWRP_tapback.png +install_instr_tapRebootSystem=TWRP_rebootSystem.png +install_instr_doNotInstall=TWRP_doNotInstall.png +install_instr_openSettings=oemUnlock_settings.png +install_instr_openDevOptions=oemUnlock_developerOption.png +install_instr_checkOEMUnlock=oemUnlock_enable.png +install_instr_tapRebootPowerOff = TWRP_rebootPowerOff.png \ No newline at end of file diff --git a/src/main/resources/lang/translation.properties b/src/main/resources/lang/translation.properties index a74477b6994221c2950a1a4006da17419e831083..71b19885fc964440733023bd83c8cdc744feeb09 100644 --- a/src/main/resources/lang/translation.properties +++ b/src/main/resources/lang/translation.properties @@ -110,6 +110,7 @@ install_instr_turnOff=Turn off the phone install_instr_turnOffAgain=Turn off the phone again install_instr_startDownload=Keep pressing simultaneously "Power" & "Home" & "Volume Down" until a blue screen appear to access Download Mode install_instr_acceptWarning=Accept warning by pressing on "Volume Up" +install_instr_verifyHeimdall=Verify Heimdall install_instr_oemUnlock=OEM Unlocking install_instr_recoveryInstall=Recovery installation install_instr_leaveDownload=Keep pressing simultaneously "Power" & "Home" & "Volume Down" until device turns off @@ -136,6 +137,14 @@ install_instr_swipeForOk=Swipe the arrowed bar at the bottom of the screen from install_instr_backX2=Tap on 'Back' 2 times install_instr_resizeFs=Tap on 'Resize file System' install_instr_tapRebootSystem=Tap on 'Reboot System' +install_instr_tapRebootPowerOff= Tap on 'Power Off' +install_instr_openSettings=Open 'Settings' +install_instr_openDevOptions=Open 'Developer options' +install_instr_enableOEMUnlock=enable 'OEM unlock' +install_instr_acceptFactoryReset= You'll have to keep pressing "Power" & "Home" & "Volume Down" until you reach "Download mode" once your device is off. When you're ready, accept Factory Reset. +install_instr_startDl_pressPowerBixbyVolDown= Keep pressing simultaneously "Power" & "Bixby" & "Volume Down" until a blue screen appear to access Download Mode +install_instr_startRec_pressPowerBixbyVolUp= Keep pressing simultaneously "Power" & "Bixby" & "Volume Up" until 'teamwin' screen appears +install_instr_leaveDl_pressPowerBixbyVolDown= Keep pressing simultaneously "Power" & "Bixby" & "Volume Down" until device turns off script_error_waitDownload_1 = Can't detect device in "Download mode" script_error_oemUnlock_10 = Can't allow custom OS installation on your device script_error_installRecovery_101=Can't install TWRP @@ -209,4 +218,12 @@ stepTitle3On7 = Restart device in Download mode stepTitle4On7 = Recovery installation stepTitle5On7 = Restart device in Recovery mode stepTitle6On7 = /e/ Installation -stepTitle7On7 = Resize Data partition \ No newline at end of file +stepTitle7On7 = Resize Data partition +stepTitle_verifyHeimdall= Verify Heimdall +stepTitle_oemUnlock = Unlock OEM +stepTitle_installRecovery= Recovery Installation +stepTitle_startRecovery = Start in Recovery mode +stepTitle_formatDataTurnOff = Format data and turn off +stepTitle_restartRecovery = Restart in Recovery mode +stepTitle_installOS = /e/ Installation +stepTitle_resizeDataPartition = Resize Data partition \ No newline at end of file diff --git a/src/main/resources/yaml/dream2lte.yml b/src/main/resources/yaml/dream2lte.yml new file mode 100644 index 0000000000000000000000000000000000000000..fac9e786fe54887ae8a1897998abdc4c728e7450 --- /dev/null +++ b/src/main/resources/yaml/dream2lte.yml @@ -0,0 +1,129 @@ +## Copyright 2019-2020 - ECORP SAS + +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. + +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . +## Author: Vincent Bourgmayer +--- +name: dream2lte +flash: + f1: + script: wait-download + parameters: + heimdall_folder_path: ${HEIMDALL_FOLDER_PATH} + codes: + ok: + 0: ~ + ko: + 1: script_error_waitDownload_1 + output: ~ + succeed: f2 + failed: ~ + f2: + script: install-recovery + parameters: + twrp_image_path: ${TWRP_IMAGE_PATH} + heimdall_folder_path: ${HEIMDALL_FOLDER_PATH} + codes: + ok: + 0: ~ + ko: + 1: script_error_unknown + 101: script_error_installRecovery_101 + output: ~ + succeed: f3 + failed: ~ + f3: + script: wait-recovery + parameters: + device_id: ${DEVICE_ID} + adb_folder_path: ${ADB_FOLDER_PATH} + codes: + ok: + 0: ~ + ko: + 1: script_error_waitRecovery_1 + 101: script_error_waitRecovery_101 + 102: script_error_waitRecovery_102 + output: ~ + succeed: f4 + failed: ~ + f4: + script: wait-reboot + parameters: + device_id: ${DEVICE_ID} + adb_folder_path: ${ADB_FOLDER_PATH} + codes: + ok: + 0: ~ + ko: + 1: script_error_unknown + 10: script_error_waitReboot_10 + 101: script_error_waitReboot_101 + output: ~ + succeed: f5 + failed: ~ + f5: + script: wait-recovery + parameters: + device_id: ${DEVICE_ID} + adb_folder_path: ${ADB_FOLDER_PATH} + codes: + ok: + 0: ~ + ko: + 1: script_error_waitRecovery_1 + 101: script_error_waitRecovery_101 + 102: script_error_waitRecovery_102 + output: ~ + succeed: f6 + failed: ~ + f6: + script: install-from-recovery + parameters: + device_id: ${DEVICE_ID} + archive_path: ${ARCHIVE_PATH} + adb_folder_path: ${ADB_FOLDER_PATH} + codes: + ok: + 0: ~ + ko: + 1: script_error_installFromRecovery_1 + 2: script_error_installFromRecovery_2 + 3: script_error_installFromRecovery_3 + 101: script_error_installFromRecovery_101 + 102: script_error_installFromRecovery_102 + output: ~ + succeed: f7 + failed: ~ + f7: + script: askAccount + parameters: ~ + codes: ~ + output: ~ + succeed: f8 + failed: ~ + f8: + script: wait-reboot + parameters: + device_id: ${DEVICE_ID} + adb_folder_path: ${ADB_FOLDER_PATH} + codes: + ok: + 0: ~ + ko: + 1: script_error_unknown + 10: script_error_waitReboot_10 + 101: script_error_waitReboot_101 + output: ~ + succeed: ~ + failed: ~ \ No newline at end of file diff --git a/src/main/resources/yaml/dream2lte_fs.yml b/src/main/resources/yaml/dream2lte_fs.yml new file mode 100644 index 0000000000000000000000000000000000000000..47d6d927163bfc2bd6bb7677c267dd87eb6ac20b --- /dev/null +++ b/src/main/resources/yaml/dream2lte_fs.yml @@ -0,0 +1,110 @@ +## Copyright 2019-2020 - ECORP SAS + +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. + +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . +## Author: Vincent Bourgmayer +--- +sources: + rom: + url: https://images.ecloud.global/stable/dream2lte/e-latest-dream2lte.zip + filePath: e-latest-dream2lte.zip + twrp: + url: https://images.ecloud.global/stable/twrp/dream2lte/twrp-3.3.1-2-dream2lte.img + filePath: twrp-3.3.1-2-dream2lte.img +flash: + f1: + ui: + type: action + title: stepTitle_oemUnlock + instruction: + - install_instr_openSettings + - install_instr_openDevOptions + - install_instr_enableOEMUnlock + - install_instr_turnOff + - install_instr_startDl_pressPowerBixbyVolDown + - install_instr_acceptWarning + stepNumber: 1/7 + titleIcon: icon-download.png + instructionImg: group2.png + f2: + ui: + type: load + title: stepTitle_installRecovery + instruction: + - install_instr_recoveryInstall + stepNumber: 2/7 + averageTime: 6 + f3: + ui: + type: action + title: stepTitle_startRecovery + instruction: + - install_instr_leaveDl_pressPowerBixbyVolDown + - install_instr_startRec_pressPowerBixbyVolUp + - install_instr_swipeTwrp + stepNumber: 3/7 + titleIcon: icon-download.png + instructionImg: group2.png + f4: + ui: + type: action + title: stepTitle_formatDataTurnOff + instruction: + - install_instr_tapWipe + - install_instr_tapFormatData + - install_instr_writeYes + - install_instr_validate + - install_instr_backX3 + - install_instr_tapReboot + - install_instr_tapRebootPowerOff + - install_instr_doNotInstall + stepNumber: 4/7 + titleIcon: icon-search.png + instructionImg: group2.png + f5: + ui: + type: action + title: stepTitle_restartRecovery + instruction: + - install_instr_startRec_pressPowerBixbyVolUp + - install_instr_swipeTwrp + stepNumber: 5/7 + titleIcon: icon-download.png + instructionImg: group2.png + f6: + ui: + type: load + title: stepTitle_installOS + instruction: + - install_instr_eosInstall + stepNumber: 6/7 + averageTime: 475 + f7: + ui: + type: askAccount + f8: + ui: + type: action + title: stepTitle_resizeDataPartition + instruction: + - install_instr_tapWipe + - install_instr_tapAdvancedWipe + - install_instr_tickData + - install_instr_tapRepairChangeFs + - install_instr_resizeFs + - install_instr_swipeForOk + - install_instr_tapRebootSystem + - install_instr_doNotInstall + stepNumber: 7/7 + titleIcon: icon-search.png + instructionImg: group2.png \ No newline at end of file diff --git a/src/main/resources/yaml/dreamlte.yml b/src/main/resources/yaml/dreamlte.yml new file mode 100644 index 0000000000000000000000000000000000000000..dfe13b104be8d44f04d72b93d2609f96fb48199b --- /dev/null +++ b/src/main/resources/yaml/dreamlte.yml @@ -0,0 +1,129 @@ +## Copyright 2019-2020 - ECORP SAS + +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. + +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . +## Author: Vincent Bourgmayer +--- +name: dreamlte +flash: + f1: + script: wait-download + parameters: + heimdall_folder_path: ${HEIMDALL_FOLDER_PATH} + codes: + ok: + 0: ~ + ko: + 1: script_error_waitDownload_1 + output: ~ + succeed: f2 + failed: ~ + f2: + script: install-recovery + parameters: + twrp_image_path: ${TWRP_IMAGE_PATH} + heimdall_folder_path: ${HEIMDALL_FOLDER_PATH} + codes: + ok: + 0: ~ + ko: + 1: script_error_unknown + 101: script_error_installRecovery_101 + output: ~ + succeed: f3 + failed: ~ + f3: + script: wait-recovery + parameters: + device_id: ${DEVICE_ID} + adb_folder_path: ${ADB_FOLDER_PATH} + codes: + ok: + 0: ~ + ko: + 1: script_error_waitRecovery_1 + 101: script_error_waitRecovery_101 + 102: script_error_waitRecovery_102 + output: ~ + succeed: f4 + failed: ~ + f4: + script: wait-reboot + parameters: + device_id: ${DEVICE_ID} + adb_folder_path: ${ADB_FOLDER_PATH} + codes: + ok: + 0: ~ + ko: + 1: script_error_unknown + 10: script_error_waitReboot_10 + 101: script_error_waitReboot_101 + output: ~ + succeed: f5 + failed: ~ + f5: + script: wait-recovery + parameters: + device_id: ${DEVICE_ID} + adb_folder_path: ${ADB_FOLDER_PATH} + codes: + ok: + 0: ~ + ko: + 1: script_error_waitRecovery_1 + 101: script_error_waitRecovery_101 + 102: script_error_waitRecovery_102 + output: ~ + succeed: f6 + failed: ~ + f6: + script: install-from-recovery + parameters: + device_id: ${DEVICE_ID} + archive_path: ${ARCHIVE_PATH} + adb_folder_path: ${ADB_FOLDER_PATH} + codes: + ok: + 0: ~ + ko: + 1: script_error_installFromRecovery_1 + 2: script_error_installFromRecovery_2 + 3: script_error_installFromRecovery_3 + 101: script_error_installFromRecovery_101 + 102: script_error_installFromRecovery_102 + output: ~ + succeed: f7 + failed: ~ + f7: + script: askAccount + parameters: ~ + codes: ~ + output: ~ + succeed: f8 + failed: ~ + f8: + script: wait-reboot + parameters: + device_id: ${DEVICE_ID} + adb_folder_path: ${ADB_FOLDER_PATH} + codes: + ok: + 0: ~ + ko: + 1: script_error_unknown + 10: script_error_waitReboot_10 + 101: script_error_waitReboot_101 + output: ~ + succeed: ~ + failed: ~ \ No newline at end of file diff --git a/src/main/resources/yaml/dreamlte_fs.yml b/src/main/resources/yaml/dreamlte_fs.yml new file mode 100644 index 0000000000000000000000000000000000000000..14324e38289fbcadde40e6246b1063eaef9c6bf4 --- /dev/null +++ b/src/main/resources/yaml/dreamlte_fs.yml @@ -0,0 +1,110 @@ +## Copyright 2019-2020 - ECORP SAS + +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. + +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . +## Author: Vincent Bourgmayer +--- +sources: + rom: + url: https://images.ecloud.global/stable/dreamlte/e-latest-dreamlte.zip + filePath: e-latest-dreamlte.zip + twrp: + url: https://images.ecloud.global/stable/twrp/dreamlte/twrp-3.3.1-2-dreamlte.img + filePath: twrp-3.3.1-2-dreamlte.img +flash: + f1: + ui: + type: action + title: stepTitle_oemUnlock + instruction: + - install_instr_openSettings + - install_instr_openDevOptions + - install_instr_enableOEMUnlock + - install_instr_turnOff + - install_instr_startDl_pressPowerBixbyVolDown + - install_instr_acceptWarning + stepNumber: 1/7 + titleIcon: icon-download.png + instructionImg: group2.png + f2: + ui: + type: load + title: stepTitle_installRecovery + instruction: + - install_instr_recoveryInstall + stepNumber: 2/7 + averageTime: 6 + f3: + ui: + type: action + title: stepTitle_startRecovery + instruction: + - install_instr_leaveDl_pressPowerBixbyVolDown + - install_instr_startRec_pressPowerBixbyVolUp + - install_instr_swipeTwrp + stepNumber: 3/7 + titleIcon: icon-download.png + instructionImg: group2.png + f4: + ui: + type: action + title: stepTitle_formatDataTurnOff + instruction: + - install_instr_tapWipe + - install_instr_tapFormatData + - install_instr_writeYes + - install_instr_validate + - install_instr_backX3 + - install_instr_tapReboot + - install_instr_tapRebootPowerOff + - install_instr_doNotInstall + stepNumber: 4/7 + titleIcon: icon-search.png + instructionImg: group2.png + f5: + ui: + type: action + title: stepTitle_restartRecovery + instruction: + - install_instr_startRec_pressPowerBixbyVolUp + - install_instr_swipeTwrp + stepNumber: 5/7 + titleIcon: icon-download.png + instructionImg: group2.png + f6: + ui: + type: load + title: stepTitle_installOS + instruction: + - install_instr_eosInstall + stepNumber: 6/7 + averageTime: 475 + f7: + ui: + type: askAccount + f8: + ui: + type: action + title: stepTitle_resizeDataPartition + instruction: + - install_instr_tapWipe + - install_instr_tapAdvancedWipe + - install_instr_tickData + - install_instr_tapRepairChangeFs + - install_instr_resizeFs + - install_instr_swipeForOk + - install_instr_tapRebootSystem + - install_instr_doNotInstall + stepNumber: 7/7 + titleIcon: icon-search.png + instructionImg: group2.png \ No newline at end of file diff --git a/src/main/resources/yaml/hero2lte.yml b/src/main/resources/yaml/hero2lte.yml index 0aa4a0be7af34b5fc8bc341a826f3358acb02165..d0bf18d217ea8dd2f91ded168e7b4dc30b4b8d5b 100644 --- a/src/main/resources/yaml/hero2lte.yml +++ b/src/main/resources/yaml/hero2lte.yml @@ -29,7 +29,7 @@ flash: succeed: f2 failed: ~ f2: - script: oem-unlock + script: verify-heimdall parameters: heimdall_folder_path: ${HEIMDALL_FOLDER_PATH} codes: diff --git a/src/main/resources/yaml/hero2lte_fs.yml b/src/main/resources/yaml/hero2lte_fs.yml index c43bdb11ef4dfec0be193c21720e0a840d3b170b..5f5745555a1cfa87c0d6d40fd811eae712a67992 100644 --- a/src/main/resources/yaml/hero2lte_fs.yml +++ b/src/main/resources/yaml/hero2lte_fs.yml @@ -38,7 +38,7 @@ flash: type: load title: stepTitle2On7 instruction: - - install_instr_oemUnlock + - install_instr_verifyHeimdall stepNumber: 2/7 averageTime: 8 f3: diff --git a/src/main/resources/yaml/herolte.yml b/src/main/resources/yaml/herolte.yml index 52c9d403b43bd0d673480e1fb11402f97d5c9075..e8dd83a9d46c86f4fc8c494ded46bb5b90416310 100644 --- a/src/main/resources/yaml/herolte.yml +++ b/src/main/resources/yaml/herolte.yml @@ -29,7 +29,7 @@ flash: succeed: f2 failed: ~ f2: - script: oem-unlock + script: verify-heimdall parameters: heimdall_folder_path: ${HEIMDALL_FOLDER_PATH} codes: diff --git a/src/main/resources/yaml/herolte_fs.yml b/src/main/resources/yaml/herolte_fs.yml index d1f39efa6c599b4e69b399530b9518bbd335e23b..2e281e658c3aa23f0493d39e4b1cac1454658133 100644 --- a/src/main/resources/yaml/herolte_fs.yml +++ b/src/main/resources/yaml/herolte_fs.yml @@ -38,7 +38,7 @@ flash: type: load title: stepTitle2On7 instruction: - - install_instr_oemUnlock + - install_instr_verifyHeimdall stepNumber: 2/7 averageTime: 8 f3: diff --git a/src/main/resources/yaml/star2lte.yml b/src/main/resources/yaml/star2lte.yml index 25acca6cc770f31e6cb977117b85d5ef4176e69b..90d9e32b380658223e6092aed0a4f4dd0c50c003 100644 --- a/src/main/resources/yaml/star2lte.yml +++ b/src/main/resources/yaml/star2lte.yml @@ -29,7 +29,7 @@ flash: succeed: f2 failed: ~ f2: - script: oem-unlock + script: verify-heimdall parameters: heimdall_folder_path: ${HEIMDALL_FOLDER_PATH} codes: diff --git a/src/main/resources/yaml/star2lte_fs.yml b/src/main/resources/yaml/star2lte_fs.yml index 0c1d32e0f85136805b3d2f9298e38423d5a036fb..2341eac4a30e049bbd96b41a2fdef845a7735f67 100644 --- a/src/main/resources/yaml/star2lte_fs.yml +++ b/src/main/resources/yaml/star2lte_fs.yml @@ -34,7 +34,7 @@ flash: title: stepTitle1On7 instruction: - install_instr_turnOff - - install_instr_startDownload + - install_instr_startDl_pressPowerBixbyVolDown - install_instr_acceptWarning stepNumber: 1/7 titleIcon: icon-download.png @@ -42,18 +42,21 @@ flash: f2: ui: type: load - title: stepTitle2On7 + title: stepTitle_verifyHeimdall instruction: - - install_instr_oemUnlock + - install_instr_verifyHeimdall stepNumber: 2/7 averageTime: 8 f3: ui: type: action - title: stepTitle3On7 + title: stepTitle_oemUnlock instruction: - - install_instr_turnOffAgain - - install_instr_startDownload + - install_instr_openSettings + - install_instr_openDevOptions + - install_instr_enableOEMUnlock + - install_instr_acceptFactoryReset + - install_instr_startDl_pressPowerBixbyVolDown - install_instr_acceptWarning stepNumber: 3/7 titleIcon: icon-download.png @@ -70,9 +73,9 @@ flash: ui: type: action title: stepTitle5On7 - instruction: - - install_instr_leaveDownload - - install_instr_startRecovery + instruction: + - install_instr_leaveDl_pressPowerBixbyVolDown + - install_instr_startRec_pressPowerBixbyVolUp - install_instr_keepReadOnly stepNumber: 5/7 titleIcon: icon-download.png diff --git a/src/main/resources/yaml/starlte.yml b/src/main/resources/yaml/starlte.yml index f1aed5afb3177fecbd5eb50ee330457ec9620704..6e83655255388c2ea4b0b195dea8357c5c055029 100644 --- a/src/main/resources/yaml/starlte.yml +++ b/src/main/resources/yaml/starlte.yml @@ -29,7 +29,7 @@ flash: succeed: f2 failed: ~ f2: - script: oem-unlock + script: verify-heimdall parameters: heimdall_folder_path: ${HEIMDALL_FOLDER_PATH} codes: diff --git a/src/main/resources/yaml/starlte_fs.yml b/src/main/resources/yaml/starlte_fs.yml index e59f84530adae912a2d7e35d8a91c37088d01a6d..ec0e038b744f53a5a43930c055ca456eb4e10771 100644 --- a/src/main/resources/yaml/starlte_fs.yml +++ b/src/main/resources/yaml/starlte_fs.yml @@ -34,7 +34,7 @@ flash: title: stepTitle1On7 instruction: - install_instr_turnOff - - install_instr_startDownload + - install_instr_startDl_pressPowerBixbyVolDown - install_instr_acceptWarning stepNumber: 1/7 titleIcon: icon-download.png @@ -42,18 +42,21 @@ flash: f2: ui: type: load - title: stepTitle2On7 + title: stepTitle_verifyHeimdall instruction: - - install_instr_oemUnlock + - install_instr_verifyHeimdall stepNumber: 2/7 averageTime: 8 f3: ui: type: action - title: stepTitle3On7 + title: stepTitle_oemUnlock instruction: - - install_instr_turnOffAgain - - install_instr_startDownload + - install_instr_openSettings + - install_instr_openDevOptions + - install_instr_enableOEMUnlock + - install_instr_acceptFactoryReset + - install_instr_startDl_pressPowerBixbyVolDown - install_instr_acceptWarning stepNumber: 3/7 titleIcon: icon-download.png @@ -71,8 +74,8 @@ flash: type: action title: stepTitle5On7 instruction: - - install_instr_leaveDownload - - install_instr_startRecovery + - install_instr_leaveDl_pressPowerBixbyVolDown + - install_instr_startRec_pressPowerBixbyVolUp - install_instr_keepReadOnly stepNumber: 5/7 titleIcon: icon-download.png diff --git a/src/main/resources/yaml/zeroflte.yml b/src/main/resources/yaml/zeroflte.yml index 87b64f3362fd55abda9c391431e73fef21b79c04..b8b05d06e06c27a93297f43819cb97fbe1ccf117 100644 --- a/src/main/resources/yaml/zeroflte.yml +++ b/src/main/resources/yaml/zeroflte.yml @@ -29,7 +29,7 @@ flash: succeed: f2 failed: ~ f2: - script: oem-unlock + script: verify-heimdall parameters: heimdall_folder_path: ${HEIMDALL_FOLDER_PATH} codes: diff --git a/src/main/resources/yaml/zeroflte_fs.yml b/src/main/resources/yaml/zeroflte_fs.yml index a7669ff594a37a67f6c2ada826cd80d3210f919a..a205b66d951098f16be8832ccb0de42381b8cab5 100644 --- a/src/main/resources/yaml/zeroflte_fs.yml +++ b/src/main/resources/yaml/zeroflte_fs.yml @@ -38,7 +38,7 @@ flash: type: load title: stepTitle2On7 instruction: - - install_instr_oemUnlock + - install_instr_verifyHeimdall stepNumber: 2/7 averageTime: 10 f3: