Skip to content

Commit 8afdb5b

Browse files
committed
Merge branch 'dev' into release
2 parents 83624b1 + c80405f commit 8afdb5b

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

ReadMe.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ You can support us by using links or addresses below:
132132
- ESP8266 Deauther plugin [(by SequoiaSan)](https://github.com/SequoiaSan/FlipperZero-Wifi-ESP8266-Deauther-Module)
133133
- WiFi Scanner plugin [(by SequoiaSan)](https://github.com/SequoiaSan/FlipperZero-WiFi-Scanner_Module)
134134
- MultiConverter plugin [(by theisolinearchip)](https://github.com/theisolinearchip/flipperzero_stuff)
135-
- WAV Player [(OFW: DrZlo13)](https://github.com/flipperdevices/flipperzero-firmware/tree/zlo/wav-player) - Fixed and improved by [LTVA1](https://github.com/LTVA1/wav_player)
135+
- WAV Player [(OFW: DrZlo13)](https://github.com/flipperdevices/flipperzero-firmware/tree/zlo/wav-player) - Fixed and improved by [LTVA1](https://github.com/LTVA1/wav_player) -> Also outputs audio on `PA6` - `3(A6)` pin
136136
- Barcode generator plugin [(original by McAzzaMan)](https://github.com/McAzzaMan/flipperzero-firmware/tree/UPC-A_Barcode_Generator/applications/barcode_generator) - [EAN-8 and refactoring](https://github.com/DarkFlippers/unleashed-firmware/pull/154) by @msvsergey
137137
- GPIO: Sentry Safe plugin [(by H4ckd4ddy)](https://github.com/H4ckd4ddy/flipperzero-sentry-safe-plugin)
138138
- ESP32: WiFi Marauder companion plugin [(by 0xchocolate)](https://github.com/0xchocolate/flipperzero-firmware-with-wifi-marauder-companion) - Saving .pcap on flipper microSD [by tcpassos](https://github.com/tcpassos/flipperzero-firmware-with-wifi-marauder-companion) -> Only with custom marauder build (It is necessary to uncomment "#define WRITE_PACKETS_SERIAL" in configs.h (in marauder fw) and compile the firmware for the wifi board.) Or download precompiled build -> [Download esp32_marauder_ver_flipper_sd_serial.bin](https://github.com/justcallmekoko/ESP32Marauder/releases/latest)

applications/external/wav_player/README.md

+2
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,5 @@
22
A Flipper Zero application for playing wav files. My fork adds support for correct playback speed (for files with different sample rates) and for mono files (original wav player only plays stereo). ~~You still need to convert your file to unsigned 8-bit PCM format for it to played correctly on flipper~~. Now supports 16-bit (ordinary) wav files too, both mono and stereo!
33

44
Original app by https://github.com/DrZlo13.
5+
6+
Also outputs audio on `PA6` - `3(A6)` pin

applications/external/wav_player/wav_player.c

+10-4
Original file line numberDiff line numberDiff line change
@@ -404,14 +404,20 @@ static void app_run(WavPlayerApp* app) {
404404
} else if(event.type == WavPlayerEventCtrlMoveL) {
405405
int32_t seek =
406406
stream_tell(app->stream) - wav_parser_get_data_start(app->parser);
407-
seek =
408-
MIN(seek, (int32_t)(wav_parser_get_data_len(app->parser) / (size_t)100));
407+
seek = MIN(
408+
seek,
409+
(int32_t)(wav_parser_get_data_len(app->parser) / (size_t)100) % 2 ?
410+
((int32_t)(wav_parser_get_data_len(app->parser) / (size_t)100) - 1) :
411+
(int32_t)(wav_parser_get_data_len(app->parser) / (size_t)100));
409412
stream_seek(app->stream, -seek, StreamOffsetFromCurrent);
410413
wav_player_view_set_current(app->view, stream_tell(app->stream));
411414
} else if(event.type == WavPlayerEventCtrlMoveR) {
412415
int32_t seek = wav_parser_get_data_end(app->parser) - stream_tell(app->stream);
413-
seek =
414-
MIN(seek, (int32_t)(wav_parser_get_data_len(app->parser) / (size_t)100));
416+
seek = MIN(
417+
seek,
418+
(int32_t)(wav_parser_get_data_len(app->parser) / (size_t)100) % 2 ?
419+
((int32_t)(wav_parser_get_data_len(app->parser) / (size_t)100) - 1) :
420+
(int32_t)(wav_parser_get_data_len(app->parser) / (size_t)100));
415421
stream_seek(app->stream, seek, StreamOffsetFromCurrent);
416422
wav_player_view_set_current(app->view, stream_tell(app->stream));
417423
} else if(event.type == WavPlayerEventCtrlOk) {

0 commit comments

Comments
 (0)