Merge flizzer_tracker from https://github.com/xMasterX/all-the-plugins

# Conflicts:
#	flizzer_tracker/application.fam

flizzer_tracker/flizzer_tracker.c

@@ -9,8 +9,6 @@
 #include "font.h"
 #include <flizzer_tracker_icons.h>
 
-#include <expansion/expansion.h>
-
 void draw_callback(Canvas* canvas, void* ctx) {
     TrackerViewModel* model = (TrackerViewModel*)ctx;
     FlizzerTrackerApp* tracker = (FlizzerTrackerApp*)(model->tracker);
@@ -102,9 +100,6 @@ bool input_callback(InputEvent* input_event, void* ctx) {
 int32_t flizzer_tracker_app(void* p) {
     UNUSED(p);
 
-    Expansion* expansion = furi_record_open(RECORD_EXPANSION);
-    expansion_disable(expansion);
-
     Storage* storage = furi_record_open(RECORD_STORAGE);
     bool st = storage_simply_mkdir(storage, APPSDATA_FOLDER);
     st = storage_simply_mkdir(storage, FLIZZER_TRACKER_FOLDER);
@@ -125,8 +120,5 @@ int32_t flizzer_tracker_app(void* p) {
 
     deinit_tracker(tracker);
 
-    expansion_enable(expansion);
-    furi_record_close(RECORD_EXPANSION);
-
     return 0;
 }

flizzer_tracker/sound_engine/sound_engine_defs.h

@@ -20,9 +20,9 @@
 #define MAX_ADSR (0xff << 17)
 #define MAX_ADSR_VOLUME 0x80
 #define BASE_FREQ 22050
-#define envspd(eng, slope)                                                                       \
-    ((slope) != 0 ?                                                                              \
-         (((uint64_t)MAX_ADSR / ((slope) * (slope) * 256 / 8)) * BASE_FREQ / eng->sample_rate) : \
+#define envspd(eng, slope)                                                                     \
+    ((slope) != 0 ?                                                                            \
+         (((uint64_t)MAX_ADSR / ((slope) * (slope)*256 / 8)) * BASE_FREQ / eng->sample_rate) : \
          ((uint64_t)MAX_ADSR * BASE_FREQ / eng->sample_rate))
 
 typedef enum {

flizzer_tracker/tracker_engine/do_effects.c

@@ -470,7 +470,8 @@ void do_command(
     }
 
     case TE_EFFECT_TRIGGER_RELEASE: {
-        if(tick == (opcode & 0xff)) {
+        if(tick == (opcode & 0xff))
+        {
             sound_engine_enable_gate(tracker_engine->sound_engine, se_channel, 0);
         }
 

flizzer_tracker/tracker_engine/tracker_engine.c

@@ -444,8 +444,8 @@ void tracker_engine_advance_channel(TrackerEngine* tracker_engine, uint8_t chan)
 
         int32_t chn_note = (int16_t)(te_channel->fixed_note != 0xffff ? te_channel->fixed_note :
                                                                         te_channel->note) +
-                           vib + ((int16_t)te_channel->arpeggio_note << 8) +
-                           te_channel->finetune_note;
+                           vib + ((int16_t)te_channel->arpeggio_note << 8) 
+                           + te_channel->finetune_note;
 
         if(chn_note < 0) {
             chn_note = 0;

flizzer_tracker/tracker_engine/tracker_engine_defs.h

@@ -90,7 +90,7 @@ typedef enum {
     TE_EFFECT_SET_SUSTAIN = 0x1700, // Nxx
     TE_EFFECT_SET_RELEASE = 0x1800, // Oxx
     TE_EFFECT_PROGRAM_RESTART = 0x1900, // Pxx
-
+    
     TE_EFFECT_SET_RATE = 0x1a00, //Qxx
 
     TE_EFFECT_SET_RING_MOD_SRC = 0x1b00, // Rxx