Merge fixes

fmf_to_sub/.gitsubtree

@@ -1 +1,2 @@
 https://github.com/xMasterX/all-the-plugins dev non_catalog_apps/fmf_to_sub
+https://github.com/jamisonderek/flipper-zero-tutorials main subghz/fmf_to_sub

fmf_to_sub/app.c

@@ -756,7 +756,7 @@ static Fmf2SubApp* fmf2sub_app_alloc() {
     Gui* gui = furi_record_open(RECORD_GUI);
 
     app->view_dispatcher = view_dispatcher_alloc();
-    
+
     view_dispatcher_attach_to_gui(app->view_dispatcher, gui, ViewDispatcherTypeFullscreen);
     view_dispatcher_set_event_callback_context(app->view_dispatcher, app);
 

key_copier/.gitsubtree

@@ -1 +1,2 @@
 https://github.com/xMasterX/all-the-plugins dev non_catalog_apps/key_copier
+https://github.com/zinongli/KeyCopier main /

key_copier/application.fam

@@ -13,5 +13,5 @@ App(
     fap_icon_assets="assets",
     fap_description="@README.md",
     fap_version="1.0",
-    fap_author="Torron"
+    fap_author="Torron",
 )

key_copier/key_copier.h

@@ -1,5 +1,5 @@
 #define KEY_COPIER_FILE_EXTENSION ".keycopy"
-#define INCHES_PER_PX 0.00978
+#define INCHES_PER_PX             0.00978
 
 static inline int min(int a, int b) {
     return (a < b) ? a : b;
@@ -7,4 +7,4 @@ static inline int min(int a, int b) {
 
 static inline int max(int a, int b) {
     return (a > b) ? a : b;
-}
+}

key_copier/key_formats.c

@@ -2,43 +2,39 @@
 // all lengths in inches since it's all American formats
 // angle is in degrees
 const KeyFormat all_formats[] = {
-    {
-    .manufacturer = "Kwikset",
-    .format_name = "KW1",
-    .format_link = "https://lsamichigan.org/Tech/Kwikset_KeySpecs.pdf",
-    .first_pin_inch = 0.247,
-    .last_pin_inch = 0.847,
-    .pin_increment_inch = 0.15,
-    .pin_num = 5,
-    .pin_width_inch = 0.084,
-    .elbow_inch = 0.15,
-    .drill_angle = 90,
-    .uncut_depth_inch = 0.329,
-    .deepest_depth_inch = 0.191,
-    .depth_step_inch = 0.023,
-    .min_depth_ind = 1,
-    .max_depth_ind = 7,
-    .macs = 4,
-    .clearance = 3
-    },
+    {.manufacturer = "Kwikset",
+     .format_name = "KW1",
+     .format_link = "https://lsamichigan.org/Tech/Kwikset_KeySpecs.pdf",
+     .first_pin_inch = 0.247,
+     .last_pin_inch = 0.847,
+     .pin_increment_inch = 0.15,
+     .pin_num = 5,
+     .pin_width_inch = 0.084,
+     .elbow_inch = 0.15,
+     .drill_angle = 90,
+     .uncut_depth_inch = 0.329,
+     .deepest_depth_inch = 0.191,
+     .depth_step_inch = 0.023,
+     .min_depth_ind = 1,
+     .max_depth_ind = 7,
+     .macs = 4,
+     .clearance = 3},
 
-    {
-    .manufacturer = "Schlage",
-    .format_name = "SC4",
-    .format_link = "https://lsamichigan.org/Tech/SCHLAGE_KeySpecs.pdf",
-    .first_pin_inch = 0.231,
-    .last_pin_inch = 1.012,
-    .pin_increment_inch = 0.1562,
-    .pin_num = 6,
-    .pin_width_inch = 0.031,
-    .elbow_inch = 0.1,
-    .drill_angle = 90, // This should actually be 100 but the current resolution will make 100 degrees very ugly and unsuable
-    .uncut_depth_inch = 0.335,
-    .deepest_depth_inch = 0.2,
-    .depth_step_inch = 0.015,
-    .min_depth_ind = 0,
-    .max_depth_ind = 9,
-    .macs = 7,
-    .clearance = 8
-    }
-};
+    {.manufacturer = "Schlage",
+     .format_name = "SC4",
+     .format_link = "https://lsamichigan.org/Tech/SCHLAGE_KeySpecs.pdf",
+     .first_pin_inch = 0.231,
+     .last_pin_inch = 1.012,
+     .pin_increment_inch = 0.1562,
+     .pin_num = 6,
+     .pin_width_inch = 0.031,
+     .elbow_inch = 0.1,
+     .drill_angle =
+         90, // This should actually be 100 but the current resolution will make 100 degrees very ugly and unsuable
+     .uncut_depth_inch = 0.335,
+     .deepest_depth_inch = 0.2,
+     .depth_step_inch = 0.015,
+     .min_depth_ind = 0,
+     .max_depth_ind = 9,
+     .macs = 7,
+     .clearance = 8}};

key_copier/key_formats.h

@@ -4,7 +4,7 @@
 #define FORMAT_NUM 2
 
 typedef struct {
-    char* manufacturer; 
+    char* manufacturer;
     char* format_name;
     char* format_link;