From 7930f73a4ee64851d12f5273e1ce24d241589de4 Mon Sep 17 00:00:00 2001
From: MX <10697207+xMasterX@users.noreply.github.com>
Date: Sat, 10 Sep 2022 17:51:13 +0300
Subject: [PATCH] introduce example, update changelog/readme
---
.drone.yml | 2 ++
CHANGELOG.md | 4 ++--
ReadMe.md | 7 +++++--
assets/resources/Manifest | 4 +++-
assets/resources/subplaylist/example_playlist.txt | 5 +++++
firmware/targets/f7/furi_hal/furi_hal_version.c | 2 +-
6 files changed, 18 insertions(+), 6 deletions(-)
create mode 100644 assets/resources/subplaylist/example_playlist.txt
diff --git a/.drone.yml b/.drone.yml
index 9bcb355466..6702bf25e8 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -37,6 +37,7 @@ steps:
- mkdir -p sd-card/infrared/assets
- mkdir -p sd-card/unirf
- mkdir -p sd-card/rfidfuzzer
+ - mkdir -p sd-card/subplaylist
- mkdir -p sd-card/badusb/layouts
- cp assets/resources/badusb/layouts/* sd-card/badusb/layouts/
- cp assets/resources/subghz/assets/dangerous_settings sd-card/subghz/assets/dangerous_settings
@@ -50,6 +51,7 @@ steps:
- cp assets/resources/infrared/assets/audio.ir sd-card/infrared/assets/audio.ir
- cp assets/resources/unirf/unirf_map_example.txt sd-card/unirf/unirf_map_example.txt
- cp assets/resources/rfidfuzzer/example_uids.txt sd-card/rfidfuzzer/example_uids.txt
+ - cp assets/resources/subplaylist/example_playlist.txt sd-card/subplaylist/example_playlist.txt
- cp assets/resources/Manifest sd-card/Manifest
- zip -r artifacts-default/sd-card-${DRONE_TAG}.zip sd-card
- rm -rf sd-card
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c404d929d..dd39f00b4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
### New changes
-* Actually fix universal tv remote
-* bt and lfrfid tune debug apps excluded from releases
+* .sub playlist plugin [(by darmiel)](https://github.com/darmiel/flipper-playlist) (PR #62)
+* HW Region will be reported as 0 so it won't call subghz provisioning in apps (I hope)
**Note: To avoid issues prefer installing using web updater or by self update package, all needed assets will be installed**
diff --git a/ReadMe.md b/ReadMe.md
index c555e734c4..20926c8869 100644
--- a/ReadMe.md
+++ b/ReadMe.md
@@ -16,7 +16,7 @@ Please help us implement emulation for all subghz dynamic (rolling code) protoco
Our Discord Community:
-
+
@@ -61,6 +61,7 @@ See changelog in releases for latest updates!
- RFID Fuzzer plugin [(by Ganapati)](https://github.com/Eng1n33r/flipperzero-firmware/pull/54) with some changes by xMasterX
- Sub-GHz bruteforce plugin [(by Ganapati & xMasterX)](https://github.com/Eng1n33r/flipperzero-firmware/pull/57)
+- Sub-GHz playlist plugin [(by darmiel)](https://github.com/Eng1n33r/flipperzero-firmware/pull/62)
- ESP8266 Deauther plugin [(by SequoiaSan)](https://github.com/SequoiaSan/FlipperZero-Wifi-ESP8266-Deauther-Module)
- WiFi Scanner plugin [(by SequoiaSan)](https://github.com/SequoiaSan/FlipperZero-WiFi-Scanner_Module)
- MultiConverter plugin [(by theisolinearchip)](https://github.com/theisolinearchip/flipperzero_stuff)
@@ -100,6 +101,8 @@ See changelog in releases for latest updates!
## [- WAV Player sample files & how to convert](https://github.com/UberGuidoZ/Flipper/tree/main/Wav_Player#readme)
+## [- SubGHz playlist generator script](https://github.com/darmiel/flipper-scripts/blob/main/playlist/playlist_creator_by_chunk.py)
+
### **Plugins that works with external hardware**
## [- How to use: [NRF24] plugins](https://github.com/Eng1n33r/flipperzero-firmware/blob/dev/documentation/NRF24.md)
@@ -137,7 +140,7 @@ See changelog in releases for latest updates!
# Links
-* Unofficial Discord: [discord.gg/58D6E8BtTU](https://discord.gg/58D6E8BtTU)
+* Unofficial Discord: [discord.gg/flipperzero-unofficial](https://discord.gg/flipperzero-unofficial)
* Docs by atmanos / How to write your own app (outdated API): [https://flipper.atmanos.com/docs/overview/intro](https://flipper.atmanos.com/docs/overview/intro)
* Official Docs: [http://docs.flipperzero.one](http://docs.flipperzero.one)
diff --git a/assets/resources/Manifest b/assets/resources/Manifest
index 01feb4a512..7277ba21c1 100644
--- a/assets/resources/Manifest
+++ b/assets/resources/Manifest
@@ -1,5 +1,5 @@
V:0
-T:1662725830
+T:1662820417
D:badusb
D:dolphin
D:infrared
@@ -7,6 +7,7 @@ D:music_player
D:nfc
D:rfidfuzzer
D:subghz
+D:subplaylist
D:u2f
D:unirf
D:badusb/layouts
@@ -261,6 +262,7 @@ F:111d2b8df83e27fd889fc5e270297865:3231:subghz/assets/keeloq_mfcodes
F:bb48d7d7db4f6e849436d0e1a9b7a1a7:633:subghz/assets/keeloq_mfcodes_user_example
F:653bd8d349055a41e1152e557d4a52d3:202:subghz/assets/nice_flor_s
F:48eec96d1884c311a7b011c0ad5b2dde:2816:subghz/assets/setting_user
+F:bbb5c7ef8f286b75cce75ab167cf27e6:234:subplaylist/example_playlist.txt
D:u2f/assets
F:7e11e688e39034bbb9d88410044795e1:365:u2f/assets/cert.der
F:f60b88c20ed479ed9684e249f7134618:264:u2f/assets/cert_key.u2f
diff --git a/assets/resources/subplaylist/example_playlist.txt b/assets/resources/subplaylist/example_playlist.txt
new file mode 100644
index 0000000000..efa883cb08
--- /dev/null
+++ b/assets/resources/subplaylist/example_playlist.txt
@@ -0,0 +1,5 @@
+# Example file, it will not work, you need to add paths to your files!
+sub: /ext/subghz/Vehicles/Tesla/Tesla_charge_AM270.sub
+sub: /ext/subghz/Vehicles/Tesla/Tesla_charge_AM650.sub
+sub: /ext/subghz/Test1.sub
+sub: /ext/subghz/Test2.sub
\ No newline at end of file
diff --git a/firmware/targets/f7/furi_hal/furi_hal_version.c b/firmware/targets/f7/furi_hal/furi_hal_version.c
index 90c09ffe79..4f197eaeda 100644
--- a/firmware/targets/f7/furi_hal/furi_hal_version.c
+++ b/firmware/targets/f7/furi_hal/furi_hal_version.c
@@ -265,7 +265,7 @@ uint8_t furi_hal_version_get_hw_connect() {
}
FuriHalVersionRegion furi_hal_version_get_hw_region() {
- return furi_hal_version.board_region;
+ return FuriHalVersionRegionUnknown;
}
const char* furi_hal_version_get_hw_region_name() {