Skip to content

Commit 9e378a1

Browse files
committed
Squashed 'applications/external/' changes from 8fedc95895..011d43030c
011d43030c Format 2d9a237ee3 Merge totp from https://github.com/xMasterX/all-the-plugins 44fee6f2ed Merge rolling_flaws from https://github.com/xMasterX/all-the-plugins a1ca156b37 Merge nfc_magic from https://github.com/flipperdevices/flipperzero-good-faps f9f3b0bf8f Merge mfkey from https://github.com/xMasterX/all-the-plugins e677733780 Merge flizzer_tracker from https://github.com/LTVA1/flizzer_tracker 3617f7f8f1 Merge avr_isp from https://github.com/flipperdevices/flipperzero-good-faps b8ee321446 Merge avr_isp from https://github.com/xMasterX/all-the-plugins ca84eb1 Update changelog.md d52ebbf Update application.fam 3d87c7b add set engine rate command 83e02282f9 Rename standart to standard when using UMCs (#187) 0b0c42bedd AVR_ISP: Update API (#192) 939a63fa27 Fix for firmware API improvements a37fbbb4c5 Fix for firmware API improvements 1eca55b030 Fix for firmware API improvements c89a768e0e Update MFKey to version 2.1 git-subtree-dir: applications/external git-subtree-split: 011d43030c8bb04aa70f575afd01ad26e31507ff
1 parent ff5889b commit 9e378a1

File tree

8 files changed

+29
-7
lines changed

8 files changed

+29
-7
lines changed

avr_isp/.catalog/changelog.md

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
## 1.3
2+
- Update API v60.3
13
## 1.2
2-
- Updade icon
4+
- Update icon
35
## 1.1
4-
- Updade API v58.0
6+
- Update API v58.0
57
## 1.0
68
- Initial release

avr_isp/application.fam

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ App(
66
requires=["gui"],
77
stack_size=4 * 1024,
88
fap_description="Application for flashing AVR microcontrollers",
9-
fap_version="1.2",
9+
fap_version="1.3",
1010
fap_icon="avr_app_icon_10px.png",
1111
fap_category="GPIO",
1212
fap_icon_assets="images",

flizzer_tracker/.vscode/settings.json

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"files.associations": {
3+
"tracker_engine.h": "c"
4+
}
5+
}

flizzer_tracker/application.fam

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ App(
66
cdefines=["APP_FLIZZER_TRACKER"],
77
stack_size=2 * 1024,
88
order=90,
9-
fap_version=(0, 5),
9+
fap_version=(0, 6),
1010
fap_description="An advanced Flipper Zero chiptune tracker with 4 channels",
1111
fap_author="LTVA",
1212
fap_weburl="https://github.com/LTVA1/flizzer_tracker",

flizzer_tracker/docs/changelog.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# Flizzer Tracker v0.3 #
2+
3+
## Added ##
4+
- Qxx effect (set tracker engine rate)
5+
16
# Flizzer Tracker v0.2 #
27

38
## Added ##

flizzer_tracker/tracker_engine/do_effects.c

+10
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
#include "../sound_engine/sound_engine_filter.h"
66
#include "tracker_engine.h"
77

8+
#include "../flizzer_tracker_hal.h"
9+
810
void do_command(
911
uint16_t opcode,
1012
TrackerEngine* tracker_engine,
@@ -427,6 +429,14 @@ void do_command(
427429
break;
428430
}
429431

432+
case TE_EFFECT_SET_RATE: {
433+
if(tick == 0 && (opcode & 0xff) > 0) {
434+
tracker_engine_set_rate(opcode & 0xff);
435+
}
436+
437+
break;
438+
}
439+
430440
case TE_EFFECT_PORTA_UP_SEMITONE: {
431441
uint32_t prev = te_channel->note;
432442

flizzer_tracker/tracker_engine/tracker_engine_defs.h

+2-3
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,8 @@ typedef enum {
9090
TE_EFFECT_SET_SUSTAIN = 0x1700, // Nxx
9191
TE_EFFECT_SET_RELEASE = 0x1800, // Oxx
9292
TE_EFFECT_PROGRAM_RESTART = 0x1900, // Pxx
93-
/*
94-
TE_EFFECT_ = 0x1a00, //Qxx
95-
*/
93+
94+
TE_EFFECT_SET_RATE = 0x1a00, //Qxx
9695

9796
TE_EFFECT_SET_RING_MOD_SRC = 0x1b00, // Rxx
9897
TE_EFFECT_SET_HARD_SYNC_SRC = 0x1c00, // Sxx

flizzer_tracker/view/opcode_description.c

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ static const OpcodeDescription opcode_desc[] = {
5151
{TE_EFFECT_SET_SUSTAIN, 0x7f00, "SET ENVELOPE SUSTAIN", "ADSR S"},
5252
{TE_EFFECT_SET_RELEASE, 0x7f00, "SET ENVELOPE RELEASE", "ADSR R"},
5353
{TE_EFFECT_PROGRAM_RESTART, 0x7f00, "RESTART INSTRUMENT PROGRAM", "P.RES."},
54+
{TE_EFFECT_SET_RATE, 0x7f00, "SET TRACKER ENGINE RATE (HZ)", "E.RATE"},
5455
{TE_EFFECT_SET_RING_MOD_SRC, 0x7f00, "SET RING MODULATION SOURCE CH.", "R.SRC"},
5556
{TE_EFFECT_SET_HARD_SYNC_SRC, 0x7f00, "SET HARD SYNC SOURCE CHANNEL", "S.SRC"},
5657
{TE_EFFECT_PORTA_UP_SEMITONE, 0x7f00, "PORTAMENTO UP (SEMITONES)", "PU.SEM"},

0 commit comments

Comments
 (0)