diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index defde9435..000000000 --- a/.drone.yml +++ /dev/null @@ -1,311 +0,0 @@ -kind: pipeline -type: docker -name: "Release firmware" - -steps: - - name: "Update submodules" - image: alpine/git - commands: - - git submodule sync - - git -c protocol.version=2 submodule update --init --force --recursive - - git submodule foreach git config --local gc.auto 0 - - git log -1 --format='%H' - - - name: "Build firmware" - image: hfdj/fztools - pull: never - commands: - - export DIST_SUFFIX=${DRONE_TAG} - - export WORKFLOW_BRANCH_OR_TAG=release-cfw - - ./fbt COMPACT=1 DEBUG=0 updater_package - - mkdir artifacts-default - - mv dist/f7-C/* artifacts-default/ - - ls -laS artifacts-default - - ls -laS artifacts-default/f7-update-${DRONE_TAG} - - sed -i 's/(version)/'${DRONE_TAG}'/g' CHANGELOG.md - - echo '# [Install via Web Updater](https://lab.flipper.net/?url=https://unleashedflip.com/fw/${DRONE_TAG}/flipper-z-f7-update-'${DRONE_TAG}'.tgz&channel=release-cfw&version='${DRONE_TAG}')' >> CHANGELOG.md - environment: - FBT_TOOLS_CUSTOM_LINK: - from_secret: fbt_link - - - name: "Build no anims FW" - image: hfdj/fztools - pull: never - commands: - - rm -f assets/dolphin/external/manifest.txt - - cp .ci_files/anims_ofw.txt assets/dolphin/external/manifest.txt - - export DIST_SUFFIX=${DRONE_TAG}n - - export WORKFLOW_BRANCH_OR_TAG=no-custom-anims - - ./fbt COMPACT=1 DEBUG=0 updater_package - - mkdir artifacts-ofw-anims - - mv dist/f7-C/* artifacts-ofw-anims/ - - ls -laS artifacts-ofw-anims - - ls -laS artifacts-ofw-anims/f7-update-${DRONE_TAG}n - - echo '' >> CHANGELOG.md - - echo '### [Version without custom animations - Install via Web Updater](https://lab.flipper.net/?url=https://unleashedflip.com/fw_no_anim/flipper-z-f7-update-'${DRONE_TAG}'n.tgz&channel=release-cfw&version='${DRONE_TAG}'n)' >> CHANGELOG.md - environment: - FBT_TOOLS_CUSTOM_LINK: - from_secret: fbt_link - - - name: "Bundle self-update packages" - image: kramos/alpine-zip - commands: - - cp artifacts-ofw-anims/flipper-z-f7-update-${DRONE_TAG}n.tgz . - - cp artifacts-default/flipper-z-f7-update-${DRONE_TAG}.tgz . - - zip -r artifacts-ofw-anims/flipper-z-f7-update-${DRONE_TAG}n.zip artifacts-ofw-anims/f7-update-${DRONE_TAG}n - - zip -r artifacts-default/flipper-z-f7-update-${DRONE_TAG}.zip artifacts-default/f7-update-${DRONE_TAG} - - tar czpf artifacts-default/flipper-z-any-scripts-${DRONE_TAG}.tgz scripts debug - - rm -rf artifacts-ofw-anims/f7-update-${DRONE_TAG} - - rm -rf artifacts-default/f7-update-${DRONE_TAG} - - ls -laS artifacts-ofw-anims - - ls -laS artifacts-default - - mv artifacts-default/ ${DRONE_TAG} - - ls -laS ${DRONE_TAG} - - - name: "Upload default to updates srv" - image: appleboy/drone-scp - settings: - host: - from_secret: dep_host - username: - from_secret: dep_user - password: - from_secret: dep_passwd - port: - from_secret: dep_port - target: - from_secret: dep_target_new - source: - - ${DRONE_TAG}/*.tgz - - ${DRONE_TAG}/*.zip - - ${DRONE_TAG}/*.json - - ${DRONE_TAG}/*.elf - - ${DRONE_TAG}/*.dfu - - ${DRONE_TAG}/*.bin - - - name: "Upload no-anims to updates srv" - image: appleboy/drone-scp - settings: - host: - from_secret: dep_host - username: - from_secret: dep_user - password: - from_secret: dep_passwd - port: - from_secret: dep_port - target: - from_secret: dep_target_noanim - source: flipper-z-f7-update-${DRONE_TAG}n.tgz - - - name: "Do Github release" - image: ddplugins/github-release - pull: never - settings: - github_url: https://github.com - repo_owner: - from_secret: github_repoowner - api_key: - from_secret: github_apikey - files: - - ${DRONE_TAG}/*.tgz - - ${DRONE_TAG}/*.zip - - artifacts-ofw-anims/*.tgz - title: ${DRONE_TAG} - note: CHANGELOG.md - checksum: - - md5 - - sha1 - - crc32 - - - name: "Trigger update server reindex" - image: hfdj/fztools - pull: never - environment: - UPD_KEY: - from_secret: git_update_serv_token - UPD_URL: - from_secret: git_update_server_url - commands: - - curl -X POST -F 'key='$UPD_KEY'' $UPD_URL - - - name: "Send files to telegram" - image: appleboy/drone-telegram - settings: - token: - from_secret: tgtoken - to: - from_secret: tgid - format: markdown - message: "New Unleashed firmware released! - - - Version: {{build.tag}} - - - [-Github-](https://github.com/DarkFlippers/unleashed-firmware/releases/tag/${DRONE_TAG}) - - - [-How to install firmware-](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md) - - - [-Download latest extra apps pack-](https://download-directory.github.io/?url=https://github.com/xMasterX/unleashed-extra-pack/tree/main/apps) - - - [-Version without custom animations - Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_no_anim/flipper-z-f7-update-${DRONE_TAG}n.tgz&channel=release-cfw&version=${DRONE_TAG}n) - - - [-Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw/${DRONE_TAG}/flipper-z-f7-update-${DRONE_TAG}.tgz&channel=release-cfw&version=${DRONE_TAG})" - document: - - ${DRONE_TAG}/flipper-z-f7-update-${DRONE_TAG}.tgz - - - name: "Send discord notification" - image: appleboy/drone-discord - settings: - webhook_id: - from_secret: ds_wh_id - webhook_token: - from_secret: ds_wh_token - message: "New Unleashed firmware released! - - - Version: {{build.tag}} - - - [[Github]](https://github.com/DarkFlippers/unleashed-firmware/releases/tag/${DRONE_TAG}) - - - [-How to install firmware-](https://github.com/DarkFlippers/unleashed-firmware/blob/dev/documentation/HowToInstall.md) - - - [-Download latest extra apps pack-](https://download-directory.github.io/?url=https://github.com/xMasterX/unleashed-extra-pack/tree/main/apps) - - - [-Version without custom animations - Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw_no_anim/flipper-z-f7-update-${DRONE_TAG}n.tgz&channel=release-cfw&version=${DRONE_TAG}n) - - - [-Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw/${DRONE_TAG}/flipper-z-f7-update-${DRONE_TAG}.tgz&channel=release-cfw&version=${DRONE_TAG})" - -trigger: - event: - - tag - -node: - typ: haupt - ---- -kind: pipeline -type: docker -name: "Dev build" - -steps: - - name: "Update submodules" - image: alpine/git - commands: - - git submodule sync - - git -c protocol.version=2 submodule update --init --force --recursive - - git submodule foreach git config --local gc.auto 0 - - git log -1 --format='%H' - - - name: "Build dev FW" - image: hfdj/fztools - pull: never - commands: - - export DIST_SUFFIX=${DRONE_BUILD_NUMBER} - - export WORKFLOW_BRANCH_OR_TAG=dev-cfw - - ./fbt COMPACT=1 DEBUG=0 updater_package - - mkdir artifacts-default - - mv dist/f7-C/* artifacts-default/ - - ls -laS artifacts-default - - ls -laS artifacts-default/f7-update-${DRONE_BUILD_NUMBER} - environment: - FBT_TOOLS_CUSTOM_LINK: - from_secret: fbt_link - - - name: "Bundle self-update packages" - image: kramos/alpine-zip - commands: - - cp artifacts-default/flipper-z-f7-update-${DRONE_BUILD_NUMBER}.tgz . - - rm -rf artifacts-default/f7-update-${DRONE_BUILD_NUMBER} - - ls -laS artifacts-default - - mv artifacts-default/ dev - - ls -laS dev - - - name: "Clean dev folder" - image: appleboy/drone-ssh - settings: - host: - from_secret: dep_host - username: - from_secret: dep_user - password: - from_secret: dep_passwd - port: - from_secret: dep_port - command_timeout: 30s - script: - - cd web/unleashedflip.com/public_html/fw/dev && rm -f ./* - - - name: "Upload default to updates srv" - image: appleboy/drone-scp - settings: - host: - from_secret: dep_host - username: - from_secret: dep_user - password: - from_secret: dep_passwd - port: - from_secret: dep_port - target: - from_secret: dep_target_new - source: - - dev/*.tgz - - dev/*.zip - - dev/*.json - - dev/*.elf - - dev/*.dfu - - dev/*.bin - - - name: "Trigger update server reindex" - image: hfdj/fztools - pull: never - environment: - UPD_KEY: - from_secret: git_update_serv_token - UPD_URL: - from_secret: git_update_server_url - commands: - - curl -X POST -F 'key='$UPD_KEY'' $UPD_URL - - - name: "Send files to telegram" - image: appleboy/drone-telegram - settings: - token: - from_secret: tgtoken - to: - from_secret: tgid_dev - format: markdown - message: "Unleashed firmware dev build successful! - - - Build: {{build.number}} - - SHA: {{commit.sha}} - - - Commit: {{commit.message}} - - - [-Install via Web Updater-](https://lab.flipper.net/?url=https://unleashedflip.com/fw/dev/flipper-z-f7-update-${DRONE_BUILD_NUMBER}.tgz&channel=dev-cfw&version=${DRONE_BUILD_NUMBER})" - document: - - dev/flipper-z-f7-update-${DRONE_BUILD_NUMBER}.tgz - -trigger: - branch: - - dev - event: - - push - -node: - typ: haupt diff --git a/assets/dolphin/internal/manifest.txt b/assets/dolphin/internal/manifest.txt index 46f873a84..c94ecd217 100644 --- a/assets/dolphin/internal/manifest.txt +++ b/assets/dolphin/internal/manifest.txt @@ -2,7 +2,7 @@ Filetype: Flipper Animation Manifest Version: 1 # Animation 1 -Name: sfw_128x64 +Name: thx_128x64 Min butthurt: 0 Max butthurt: 14 Min level: 1 diff --git a/assets/dolphin/internal/sfw_128x64/frame_0.png b/assets/dolphin/internal/thx_128x64/frame_0.png similarity index 100% rename from assets/dolphin/internal/sfw_128x64/frame_0.png rename to assets/dolphin/internal/thx_128x64/frame_0.png diff --git a/assets/dolphin/internal/sfw_128x64/frame_1.png b/assets/dolphin/internal/thx_128x64/frame_1.png similarity index 100% rename from assets/dolphin/internal/sfw_128x64/frame_1.png rename to assets/dolphin/internal/thx_128x64/frame_1.png diff --git a/assets/dolphin/internal/sfw_128x64/frame_10.png b/assets/dolphin/internal/thx_128x64/frame_10.png similarity index 100% rename from assets/dolphin/internal/sfw_128x64/frame_10.png rename to assets/dolphin/internal/thx_128x64/frame_10.png diff --git a/assets/dolphin/internal/sfw_128x64/frame_2.png b/assets/dolphin/internal/thx_128x64/frame_2.png similarity index 100% rename from assets/dolphin/internal/sfw_128x64/frame_2.png rename to assets/dolphin/internal/thx_128x64/frame_2.png diff --git a/assets/dolphin/internal/sfw_128x64/frame_3.png b/assets/dolphin/internal/thx_128x64/frame_3.png similarity index 100% rename from assets/dolphin/internal/sfw_128x64/frame_3.png rename to assets/dolphin/internal/thx_128x64/frame_3.png diff --git a/assets/dolphin/internal/sfw_128x64/frame_4.png b/assets/dolphin/internal/thx_128x64/frame_4.png similarity index 100% rename from assets/dolphin/internal/sfw_128x64/frame_4.png rename to assets/dolphin/internal/thx_128x64/frame_4.png diff --git a/assets/dolphin/internal/sfw_128x64/frame_5.png b/assets/dolphin/internal/thx_128x64/frame_5.png similarity index 100% rename from assets/dolphin/internal/sfw_128x64/frame_5.png rename to assets/dolphin/internal/thx_128x64/frame_5.png diff --git a/assets/dolphin/internal/sfw_128x64/frame_6.png b/assets/dolphin/internal/thx_128x64/frame_6.png similarity index 100% rename from assets/dolphin/internal/sfw_128x64/frame_6.png rename to assets/dolphin/internal/thx_128x64/frame_6.png diff --git a/assets/dolphin/internal/sfw_128x64/frame_7.png b/assets/dolphin/internal/thx_128x64/frame_7.png similarity index 100% rename from assets/dolphin/internal/sfw_128x64/frame_7.png rename to assets/dolphin/internal/thx_128x64/frame_7.png diff --git a/assets/dolphin/internal/sfw_128x64/frame_8.png b/assets/dolphin/internal/thx_128x64/frame_8.png similarity index 100% rename from assets/dolphin/internal/sfw_128x64/frame_8.png rename to assets/dolphin/internal/thx_128x64/frame_8.png diff --git a/assets/dolphin/internal/sfw_128x64/frame_9.png b/assets/dolphin/internal/thx_128x64/frame_9.png similarity index 100% rename from assets/dolphin/internal/sfw_128x64/frame_9.png rename to assets/dolphin/internal/thx_128x64/frame_9.png diff --git a/assets/dolphin/internal/sfw_128x64/meta.txt b/assets/dolphin/internal/thx_128x64/meta.txt similarity index 100% rename from assets/dolphin/internal/sfw_128x64/meta.txt rename to assets/dolphin/internal/thx_128x64/meta.txt diff --git a/assets/resources/dolphin/manifest.txt b/assets/resources/dolphin/manifest.txt deleted file mode 100644 index 21b3d6abd..000000000 --- a/assets/resources/dolphin/manifest.txt +++ /dev/null @@ -1,359 +0,0 @@ -Filetype: Flipper Animation Manifest -Version: 1 - -Name: nsfw/lvl_1 -Min butthurt: 0 -Max butthurt: 14 -Min level: 1 -Max level: 30 -Weight: 7 - -Name: nsfw/lvl_2 -Min butthurt: 0 -Max butthurt: 14 -Min level: 2 -Max level: 30 -Weight: 7 - -Name: nsfw/lvl_3 -Min butthurt: 0 -Max butthurt: 14 -Min level: 3 -Max level: 30 -Weight: 7 - -Name: nsfw/lvl_4 -Min butthurt: 0 -Max butthurt: 14 -Min level: 4 -Max level: 30 -Weight: 7 - -Name: nsfw/lvl_5 -Min butthurt: 0 -Max butthurt: 14 -Min level: 5 -Max level: 30 -Weight: 7 - -Name: nsfw/lvl_6 -Min butthurt: 0 -Max butthurt: 14 -Min level: 6 -Max level: 30 -Weight: 7 - -Name: nsfw/lvl_7 -Min butthurt: 0 -Max butthurt: 14 -Min level: 7 -Max level: 30 -Weight: 7 - -Name: nsfw/lvl_8 -Min butthurt: 0 -Max butthurt: 14 -Min level: 8 -Max level: 30 -Weight: 7 - -Name: nsfw/lvl_9 -Min butthurt: 0 -Max butthurt: 14 -Min level: 9 -Max level: 30 -Weight: 7 - -Name: nsfw/lvl_10 -Min butthurt: 0 -Max butthurt: 14 -Min level: 10 -Max level: 30 -Weight: 7 - -Name: nsfw/lvl_11 -Min butthurt: 0 -Max butthurt: 14 -Min level: 11 -Max level: 30 -Weight: 9 - -Name: nsfw/lvl_12 -Min butthurt: 0 -Max butthurt: 14 -Min level: 12 -Max level: 30 -Weight: 7 - -Name: nsfw/lvl_13 -Min butthurt: 0 -Max butthurt: 14 -Min level: 13 -Max level: 30 -Weight: 7 - -Name: nsfw/lvl_14 -Min butthurt: 0 -Max butthurt: 14 -Min level: 14 -Max level: 30 -Weight: 7 - -Name: nsfw/lvl_15 -Min butthurt: 0 -Max butthurt: 14 -Min level: 15 -Max level: 30 -Weight: 7 - -Name: nsfw/lvl_16 -Min butthurt: 0 -Max butthurt: 14 -Min level: 16 -Max level: 30 -Weight: 7 - -Name: nsfw/lvl_17 -Min butthurt: 0 -Max butthurt: 14 -Min level: 17 -Max level: 30 -Weight: 7 - -Name: nsfw/lvl_18 -Min butthurt: 0 -Max butthurt: 14 -Min level: 18 -Max level: 30 -Weight: 7 - -Name: nsfw/lvl_19 -Min butthurt: 0 -Max butthurt: 14 -Min level: 19 -Max level: 30 -Weight: 7 - -Name: nsfw/lvl_20 -Min butthurt: 0 -Max butthurt: 14 -Min level: 20 -Max level: 30 -Weight: 7 - -Name: nsfw/lvl_21 -Min butthurt: 0 -Max butthurt: 14 -Min level: 21 -Max level: 30 -Weight: 9 - -Name: nsfw/lvl_22 -Min butthurt: 0 -Max butthurt: 14 -Min level: 22 -Max level: 30 -Weight: 7 - -Name: nsfw/lvl_23 -Min butthurt: 0 -Max butthurt: 14 -Min level: 23 -Max level: 30 -Weight: 7 - -Name: nsfw/lvl_24 -Min butthurt: 0 -Max butthurt: 14 -Min level: 24 -Max level: 30 -Weight: 7 - -Name: nsfw/lvl_25 -Min butthurt: 0 -Max butthurt: 14 -Min level: 25 -Max level: 30 -Weight: 7 - -Name: nsfw/lvl_26 -Min butthurt: 0 -Max butthurt: 14 -Min level: 26 -Max level: 30 -Weight: 7 - -Name: nsfw/lvl_27 -Min butthurt: 0 -Max butthurt: 14 -Min level: 27 -Max level: 30 -Weight: 7 - -Name: nsfw/lvl_28 -Min butthurt: 0 -Max butthurt: 14 -Min level: 28 -Max level: 30 -Weight: 7 - -Name: nsfw/lvl_29 -Min butthurt: 0 -Max butthurt: 14 -Min level: 29 -Max level: 30 -Weight: 7 - -Name: nsfw/lvl_30 -Min butthurt: 0 -Max butthurt: 14 -Min level: 30 -Max level: 30 -Weight: 9 - -Name: sfw/L1_Waves_128x50 -Min butthurt: 0 -Max butthurt: 5 -Min level: 1 -Max level: 30 -Weight: 3 - -Name: sfw/L1_Laptop_128x51 -Min butthurt: 0 -Max butthurt: 7 -Min level: 1 -Max level: 30 -Weight: 3 - -Name: sfw/L1_Sleep_128x64 -Min butthurt: 0 -Max butthurt: 10 -Min level: 1 -Max level: 30 -Weight: 3 - -Name: sfw/L1_Recording_128x51 -Min butthurt: 0 -Max butthurt: 8 -Min level: 1 -Max level: 30 -Weight: 3 - -Name: sfw/L1_Furippa1_128x64 -Min butthurt: 0 -Max butthurt: 6 -Min level: 1 -Max level: 30 -Weight: 3 - -Name: sfw/L1_Happy_holidays_128x64 -Min butthurt: 0 -Max butthurt: 14 -Min level: 1 -Max level: 30 -Weight: 4 - -Name: sfw/L1_Read_books_128x64 -Min butthurt: 0 -Max butthurt: 8 -Min level: 1 -Max level: 30 -Weight: 3 - -Name: sfw/L1_Cry_128x64 -Min butthurt: 8 -Max butthurt: 13 -Min level: 1 -Max level: 30 -Weight: 3 - -Name: sfw/L1_Boxing_128x64 -Min butthurt: 10 -Max butthurt: 13 -Min level: 1 -Max level: 30 -Weight: 3 - -Name: sfw/L1_Mad_fist_128x64 -Min butthurt: 9 -Max butthurt: 13 -Min level: 1 -Max level: 30 -Weight: 3 - -Name: sfw/L1_Mods_128x64 -Min butthurt: 0 -Max butthurt: 9 -Min level: 1 -Max level: 30 -Weight: 4 - -Name: sfw/L1_Painting_128x64 -Min butthurt: 0 -Max butthurt: 7 -Min level: 1 -Max level: 30 -Weight: 3 - -Name: sfw/L1_Leaving_sad_128x64 -Min butthurt: 14 -Max butthurt: 14 -Min level: 1 -Max level: 30 -Weight: 3 - -Name: sfw/L2_Wake_up_128x64 -Min butthurt: 0 -Max butthurt: 12 -Min level: 1 -Max level: 30 -Weight: 4 - -Name: sfw/L2_Furippa2_128x64 -Min butthurt: 0 -Max butthurt: 6 -Min level: 1 -Max level: 30 -Weight: 3 - -Name: sfw/L2_Hacking_pc_128x64 -Min butthurt: 0 -Max butthurt: 8 -Min level: 1 -Max level: 30 -Weight: 3 - -Name: sfw/L2_Soldering_128x64 -Min butthurt: 0 -Max butthurt: 10 -Min level: 1 -Max level: 30 -Weight: 3 - -Name: sfw/L3_Furippa3_128x64 -Min butthurt: 0 -Max butthurt: 6 -Min level: 1 -Max level: 30 -Weight: 3 - -Name: sfw/L3_Hijack_radio_128x64 -Min butthurt: 0 -Max butthurt: 8 -Min level: 1 -Max level: 30 -Weight: 3 - -Name: sfw/L3_Lab_research_128x54 -Min butthurt: 0 -Max butthurt: 10 -Min level: 1 -Max level: 30 -Weight: 3 - -Name: sfw/L1_Sleigh_ride_128x64 -Min butthurt: 0 -Max butthurt: 14 -Min level: 1 -Max level: 30 -Weight: 4 diff --git a/scripts/assets.py b/scripts/assets.py index f09a895ab..c1e7ac353 100755 --- a/scripts/assets.py +++ b/scripts/assets.py @@ -293,7 +293,10 @@ class Main(App): self.logger.info(f"Processing Dolphin sources") dolphin = Dolphin() self.logger.info(f"Loading data") - dolphin.load(valid_dirs) + if not "external" in str(self.args.input_directory): # AHEM... oopsie. This script apparently just loads all assets, not only external assets, lol. + dolphin.load(self.args.input_directory) + else: + dolphin.load(valid_dirs) self.logger.info(f"Packing") dolphin.pack(self.args.output_directory, self.args.symbol_name) self.logger.info(f"Complete") diff --git a/scripts/flipper/assets/dolphin.py b/scripts/flipper/assets/dolphin.py index d07b2bcc1..02df0416b 100644 --- a/scripts/flipper/assets/dolphin.py +++ b/scripts/flipper/assets/dolphin.py @@ -298,7 +298,11 @@ class DolphinManifest: if len(newname) < 2: newname = name.split("/") - newname = str(newname[1]) + try: # Flipper Zero moment. loading all assets in one script, lol. + newname = str(newname[1]) # external shit we modified + except: + newname = str(newname[0]) # everything else... smh + animation.load(os.path.join(loc, newname)) # Add to array @@ -369,11 +373,17 @@ class Dolphin: self.logger = logging.getLogger("Dolphin") def load(self, valid_dirs: list): - for loc in valid_dirs: - assert os.path.isdir(loc) - # Load Manifest - self.logger.info(f"Loading directory {loc}") - self.manifest.load(loc) + if not "external" in str(valid_dirs): + assert os.path.isdir(valid_dirs) + # Load Manifest + self.logger.info(f"Loading directory {valid_dirs}") + self.manifest.load(valid_dirs) + else: + for loc in valid_dirs: + assert os.path.isdir(loc) + # Load Manifest + self.logger.info(f"Loading directory {loc}") + self.manifest.load(loc) def pack(self, output_directory: str, symbol_name: str = None): self.manifest.save(output_directory, symbol_name)