diff --git a/src/main/resources/yaml/dream2lte_flash.yml b/src/main/resources/yaml/dream2lte_flash.yml index f52364f20abc372336e71eb2f8cf2f7a8b0f6162..ea5ed72dfe99a00deaebdc9af1b7c13d63148af7 100644 --- a/src/main/resources/yaml/dream2lte_flash.yml +++ b/src/main/resources/yaml/dream2lte_flash.yml @@ -1,4 +1,4 @@ -## Copyright 2021 - ECORP SAS +## Copyright 202-2022 - 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 @@ -12,20 +12,33 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -## Author: Vincent Bourgmayer +## Author: Vincent Bourgmayer, Jan Altensen --- -stepsCount: 8 +stepsCount: 7 steps: f0: - type: custom-executable + type: custom stepNumber: 1 nextStepKey: f1 titleKey: stepTitle_oemUnlock - instructions: - - install_instr_openSettings - - install_instr_openDevOptions + instructions: + - install_instr_connectTowifi + - install_instr_openSettingsThenDevOptions + - install_instr_disableAutoUpdateSystem + - install_instr_openSoftwareUpdate + - install_instr_disableAutomaticDownload + - install_instr_clickDlAndInstall + - install_instr_rebootDeviceThenContinue + titleKeyIconName: icon-download.png + f1: + type: custom-executable + stepNumber: 2 + nextStepKey: f2 + titleKey: stepTitle_oemUnlock + instructions: + - install_instr_openSettingsThenDevOptions - install_instr_enableOEMUnlock - - install_instr_turnOff + - install_instr_acceptFactoryReset - install_instr_startDl_pressPowerBixbyVolDown - install_instr_acceptWarning titleKeyIconName: icon-download.png @@ -36,11 +49,11 @@ steps: 0: ~ koCodes: 1: script_error_waitDownload_1 - f1: + f2: type: load - stepNumber: 2 - nextStepKey: f2 - titleKey: stepTitle_installRecovery + stepNumber: 3 + nextStepKey: f3 + titleKey: stepTitle4On7 instructions: - install_instr_recoveryInstall averageTime: 6 @@ -53,118 +66,57 @@ steps: koCodes: 1: script_error_unknown 101: script_error_installRecovery_101 - f2: - type: custom-executable - stepNumber: 3 - nextStepKey: f3 - titleKey: stepTitle_startRecovery - instructions: - - install_instr_leaveDl_pressPowerBixbyVolDown - - install_instr_startRec_pressPowerBixbyVolUp - - install_instr_swipeTwrp - titleKeyIconName: icon-download.png - script: wait-recovery - parameters: - device_id: ${DEVICE_ID} - adb_folder_path: ${ADB_FOLDER_PATH} - okCodes: - 0: ~ - koCodes: - 1: script_error_waitRecovery_1 - 101: script_error_waitRecovery_101 - 102: script_error_waitRecovery_102 f3: type: custom-executable stepNumber: 4 nextStepKey: f4 - titleKey: stepTitle_formatDataTurnOff + titleKey: stepTitle5On7 instructions: - - install_instr_tapWipe - - install_instr_tapFormatData - - install_instr_writeYes - - install_instr_validate - - install_instr_backX3 - - install_instr_tapReboot - - install_instr_tapRebootPowerOff - - install_instr_doNotInstall - titleKeyIconName: icon-search.png - script: wait-reboot + - install_instr_leaveDl_pressPowerBixbyVolDown + - install_instr_startRec_pressPowerBixbyVolUp_e_reco + - install_instr_e_recovery_factory_reset + - install_instr_e_recovery_factory_reset_format_data + - install_instr_e_recovery_factory_reset_format_data_validate + - install_instr_e_recovery_back + - install_instr_e_recovery_apply_update + - install_instr_e_recovery_apply_update_from_adb + titleKeyIconName: icon-download.png + script: wait-e-recovery-sideload parameters: device_id: ${DEVICE_ID} adb_folder_path: ${ADB_FOLDER_PATH} okCodes: 0: ~ koCodes: - 1: script_error_unknown - 10: script_error_waitReboot_10 - 101: script_error_waitReboot_101 + 101: script_error_waitSideload_101 f4: - type: + type: load stepNumber: 5 nextStepKey: f5 - type: action - titleKey: stepTitle_restartRecovery + titleKey: install_instr_eosInstall instructions: - - install_instr_startRec_pressPowerBixbyVolUp - - install_instr_swipeTwrp - titleKeyIconName: icon-download.png - script: wait-recovery - parameters: + - install_instr_eosInstall + averageTime: 150 + script: install-from-e-recovery + parameters: device_id: ${DEVICE_ID} + archive_path: ${ARCHIVE_PATH} adb_folder_path: ${ADB_FOLDER_PATH} okCodes: 0: ~ koCodes: - 1: script_error_waitRecovery_1 - 101: script_error_waitRecovery_101 - 102: script_error_waitRecovery_102 + 1: script_error_installFromSideload f5: - type: load + type: askAccount stepNumber: 6 nextStepKey: f6 - titleKey: stepTitle_installOS - instructions: - - install_instr_eosInstall - averageTime: 475 - script: install-from-recovery - parameters: - device_id: ${DEVICE_ID} - archive_path: ${ARCHIVE_PATH} - adb_folder_path: ${ADB_FOLDER_PATH} - okCodes: - 0: ~ - koCodes: - 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 f6: - type: askAccount + type: custom stepNumber: 7 - nextStepKey: f7 - f7: - type: custom-executable - stepNumber: 8 nextStepKey: end - titleKey: stepTitle_resizeDataPartition + titleKey: stepTitle7On7 instructions: - - install_instr_tapWipe - - install_instr_tapAdvancedWipe - - install_instr_tickData - - install_instr_tapRepairChangeFs - - install_instr_resizeFs - - install_instr_swipeForOk - - install_instr_tapRebootSystem - - install_instr_doNotInstall - titleKeyIconName: icon-search.png - script: wait-reboot - parameters: - device_id: ${DEVICE_ID} - adb_folder_path: ${ADB_FOLDER_PATH} - okCodes: - 0: ~ - koCodes: - 1: script_error_unknown - 10: script_error_waitReboot_10 - 101: script_error_waitReboot_101 \ No newline at end of file + - install_instr_e_recovery_back + - install_instr_e_recovery_reboot + - eAccount_lbl_alreadyAccount + titleKeyIconName: icon-download.png diff --git a/src/main/resources/yaml/dream2lte_fs.yml b/src/main/resources/yaml/dream2lte_fs.yml index 81cfb3fcf41c55e14d678ab75146803299b9f378..f3f9c9fda9a9c66e49198bf86c08908d2d1e4cf2 100644 --- a/src/main/resources/yaml/dream2lte_fs.yml +++ b/src/main/resources/yaml/dream2lte_fs.yml @@ -16,8 +16,8 @@ --- sources: rom: - url: https://images.ecloud.global/stable/dream2lte/e-latest-dream2lte.zip - filePath: e-latest-dream2lte.zip + url: https://images.ecloud.global/stable/dream2lte/e-latest-r-dream2lte.zip + filePath: e-latest-r-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 \ No newline at end of file + url: https://images.ecloud.global/stable/dream2lte/recovery-e-latest-r-dream2lte.img + filePath: recovery-e-latest-r-dream2lte.img \ No newline at end of file diff --git a/src/main/resources/yaml/dreamlte_flash.yml b/src/main/resources/yaml/dreamlte_flash.yml index f52364f20abc372336e71eb2f8cf2f7a8b0f6162..ea5ed72dfe99a00deaebdc9af1b7c13d63148af7 100644 --- a/src/main/resources/yaml/dreamlte_flash.yml +++ b/src/main/resources/yaml/dreamlte_flash.yml @@ -1,4 +1,4 @@ -## Copyright 2021 - ECORP SAS +## Copyright 202-2022 - 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 @@ -12,20 +12,33 @@ ## You should have received a copy of the GNU General Public License ## along with this program. If not, see . -## Author: Vincent Bourgmayer +## Author: Vincent Bourgmayer, Jan Altensen --- -stepsCount: 8 +stepsCount: 7 steps: f0: - type: custom-executable + type: custom stepNumber: 1 nextStepKey: f1 titleKey: stepTitle_oemUnlock - instructions: - - install_instr_openSettings - - install_instr_openDevOptions + instructions: + - install_instr_connectTowifi + - install_instr_openSettingsThenDevOptions + - install_instr_disableAutoUpdateSystem + - install_instr_openSoftwareUpdate + - install_instr_disableAutomaticDownload + - install_instr_clickDlAndInstall + - install_instr_rebootDeviceThenContinue + titleKeyIconName: icon-download.png + f1: + type: custom-executable + stepNumber: 2 + nextStepKey: f2 + titleKey: stepTitle_oemUnlock + instructions: + - install_instr_openSettingsThenDevOptions - install_instr_enableOEMUnlock - - install_instr_turnOff + - install_instr_acceptFactoryReset - install_instr_startDl_pressPowerBixbyVolDown - install_instr_acceptWarning titleKeyIconName: icon-download.png @@ -36,11 +49,11 @@ steps: 0: ~ koCodes: 1: script_error_waitDownload_1 - f1: + f2: type: load - stepNumber: 2 - nextStepKey: f2 - titleKey: stepTitle_installRecovery + stepNumber: 3 + nextStepKey: f3 + titleKey: stepTitle4On7 instructions: - install_instr_recoveryInstall averageTime: 6 @@ -53,118 +66,57 @@ steps: koCodes: 1: script_error_unknown 101: script_error_installRecovery_101 - f2: - type: custom-executable - stepNumber: 3 - nextStepKey: f3 - titleKey: stepTitle_startRecovery - instructions: - - install_instr_leaveDl_pressPowerBixbyVolDown - - install_instr_startRec_pressPowerBixbyVolUp - - install_instr_swipeTwrp - titleKeyIconName: icon-download.png - script: wait-recovery - parameters: - device_id: ${DEVICE_ID} - adb_folder_path: ${ADB_FOLDER_PATH} - okCodes: - 0: ~ - koCodes: - 1: script_error_waitRecovery_1 - 101: script_error_waitRecovery_101 - 102: script_error_waitRecovery_102 f3: type: custom-executable stepNumber: 4 nextStepKey: f4 - titleKey: stepTitle_formatDataTurnOff + titleKey: stepTitle5On7 instructions: - - install_instr_tapWipe - - install_instr_tapFormatData - - install_instr_writeYes - - install_instr_validate - - install_instr_backX3 - - install_instr_tapReboot - - install_instr_tapRebootPowerOff - - install_instr_doNotInstall - titleKeyIconName: icon-search.png - script: wait-reboot + - install_instr_leaveDl_pressPowerBixbyVolDown + - install_instr_startRec_pressPowerBixbyVolUp_e_reco + - install_instr_e_recovery_factory_reset + - install_instr_e_recovery_factory_reset_format_data + - install_instr_e_recovery_factory_reset_format_data_validate + - install_instr_e_recovery_back + - install_instr_e_recovery_apply_update + - install_instr_e_recovery_apply_update_from_adb + titleKeyIconName: icon-download.png + script: wait-e-recovery-sideload parameters: device_id: ${DEVICE_ID} adb_folder_path: ${ADB_FOLDER_PATH} okCodes: 0: ~ koCodes: - 1: script_error_unknown - 10: script_error_waitReboot_10 - 101: script_error_waitReboot_101 + 101: script_error_waitSideload_101 f4: - type: + type: load stepNumber: 5 nextStepKey: f5 - type: action - titleKey: stepTitle_restartRecovery + titleKey: install_instr_eosInstall instructions: - - install_instr_startRec_pressPowerBixbyVolUp - - install_instr_swipeTwrp - titleKeyIconName: icon-download.png - script: wait-recovery - parameters: + - install_instr_eosInstall + averageTime: 150 + script: install-from-e-recovery + parameters: device_id: ${DEVICE_ID} + archive_path: ${ARCHIVE_PATH} adb_folder_path: ${ADB_FOLDER_PATH} okCodes: 0: ~ koCodes: - 1: script_error_waitRecovery_1 - 101: script_error_waitRecovery_101 - 102: script_error_waitRecovery_102 + 1: script_error_installFromSideload f5: - type: load + type: askAccount stepNumber: 6 nextStepKey: f6 - titleKey: stepTitle_installOS - instructions: - - install_instr_eosInstall - averageTime: 475 - script: install-from-recovery - parameters: - device_id: ${DEVICE_ID} - archive_path: ${ARCHIVE_PATH} - adb_folder_path: ${ADB_FOLDER_PATH} - okCodes: - 0: ~ - koCodes: - 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 f6: - type: askAccount + type: custom stepNumber: 7 - nextStepKey: f7 - f7: - type: custom-executable - stepNumber: 8 nextStepKey: end - titleKey: stepTitle_resizeDataPartition + titleKey: stepTitle7On7 instructions: - - install_instr_tapWipe - - install_instr_tapAdvancedWipe - - install_instr_tickData - - install_instr_tapRepairChangeFs - - install_instr_resizeFs - - install_instr_swipeForOk - - install_instr_tapRebootSystem - - install_instr_doNotInstall - titleKeyIconName: icon-search.png - script: wait-reboot - parameters: - device_id: ${DEVICE_ID} - adb_folder_path: ${ADB_FOLDER_PATH} - okCodes: - 0: ~ - koCodes: - 1: script_error_unknown - 10: script_error_waitReboot_10 - 101: script_error_waitReboot_101 \ No newline at end of file + - install_instr_e_recovery_back + - install_instr_e_recovery_reboot + - eAccount_lbl_alreadyAccount + titleKeyIconName: icon-download.png diff --git a/src/main/resources/yaml/dreamlte_fs.yml b/src/main/resources/yaml/dreamlte_fs.yml index 865c0d77e3acfc30516e0d2eecbd7478c3d92682..c618bb5c1a68028a5f9cb7c93ee3da086db16824 100644 --- a/src/main/resources/yaml/dreamlte_fs.yml +++ b/src/main/resources/yaml/dreamlte_fs.yml @@ -16,8 +16,8 @@ --- sources: rom: - url: https://images.ecloud.global/stable/dreamlte/e-latest-dreamlte.zip - filePath: e-latest-dreamlte.zip + url: https://images.ecloud.global/stable/dreamlte/e-latest-r-dreamlte.zip + filePath: e-latest-r-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 \ No newline at end of file + url: https://images.ecloud.global/stable/dreamlte/recovery-e-latest-r-dreamlte.img + filePath: recovery-e-latest-r-dreamlte.img \ No newline at end of file