Просмотр исходного кода

Merge pull request #4 from hedger/master

Fixes for ufbt
Roman Shchekin 2 лет назад
Родитель
Сommit
ae598c3671
3 измененных файлов с 7 добавлено и 56 удалено
  1. 4 52
      .gitignore
  2. 1 3
      application.fam
  3. 2 1
      helpers/hex_viewer_storage.h

+ 4 - 52
.gitignore

@@ -1,52 +1,4 @@
-# Prerequisites
-*.d
-
-# Object files
-*.o
-*.ko
-*.obj
-*.elf
-
-# Linker output
-*.ilk
-*.map
-*.exp
-
-# Precompiled Headers
-*.gch
-*.pch
-
-# Libraries
-*.lib
-*.a
-*.la
-*.lo
-
-# Shared objects (inc. Windows DLLs)
-*.dll
-*.so
-*.so.*
-*.dylib
-
-# Executables
-*.exe
-*.out
-*.app
-*.i*86
-*.x86_64
-*.hex
-
-# Debug files
-*.dSYM/
-*.su
-*.idb
-*.pdb
-
-# Kernel Module Compile Results
-*.mod*
-*.cmd
-.tmp_versions/
-modules.order
-Module.symvers
-Mkfile.old
-dkms.conf
+dist/*
+.vscode
+.clang-format
+.editorconfig

+ 1 - 3
application.fam

@@ -3,14 +3,12 @@ App(
     name="Hex Viewer",
     apptype=FlipperAppType.EXTERNAL,
     entry_point="hex_viewer_app",
-    cdefines=["APP_HEX_VIEWER"],
     requires=[
         "gui",
         "dialogs",
     ],
     stack_size=2 * 1024,
-    order=20,
-    fap_libs=["assets"],
     fap_icon="icons/hex_10px.png",
+    fap_icon_assets="icons",
     fap_category="Tools",
 )

+ 2 - 1
helpers/hex_viewer_storage.h

@@ -1,3 +1,5 @@
+#pragma once
+
 #include <stdlib.h>
 #include <string.h>
 #include <storage/storage.h>
@@ -17,6 +19,5 @@
 void hex_viewer_save_settings(void* context);
 void hex_viewer_read_settings(void* context);
 
-
 bool hex_viewer_open_file(void* context, const char* file_path);
 bool hex_viewer_read_file(void* context);