anfractuosity 3 лет назад
Родитель
Сommit
766ece90f6
8 измененных файлов с 1 добавлено и 6 удалено
  1. 0 1
      application.fam
  2. 0 0
      images/.gitkeep
  3. 0 1
      scenes/scope_scene_about.c
  4. 0 1
      scenes/scope_scene_run.c
  5. 0 1
      scenes/scope_scene_setup.c
  6. 0 0
      scenes/scope_types.h
  7. 0 1
      scope.c
  8. 1 1
      scope_app_i.h

+ 0 - 1
application.fam

@@ -7,7 +7,6 @@ App(
     stack_size=1 * 1024,
     stack_size=1 * 1024,
     fap_category="Tools",
     fap_category="Tools",
     fap_icon="scope_10px.png",
     fap_icon="scope_10px.png",
-    fap_icon_assets="images",
     fap_private_libs=[
     fap_private_libs=[
         Lib(name="adc",
         Lib(name="adc",
             fap_include_paths=["inc"],
             fap_include_paths=["inc"],

+ 0 - 0
images/.gitkeep


+ 0 - 1
scenes/scope_scene_about.c

@@ -1,5 +1,4 @@
 #include "../scope_app_i.h"
 #include "../scope_app_i.h"
-#include "../helpers/scope_types.h"
 
 
 void scope_scene_about_widget_callback(
 void scope_scene_about_widget_callback(
     GuiButtonType result,
     GuiButtonType result,

+ 0 - 1
scenes/scope_scene_run.c

@@ -14,7 +14,6 @@
 #include "stm32wbxx_nucleo.h"
 #include "stm32wbxx_nucleo.h"
 #include "stm32wbxx_hal_adc.h"
 #include "stm32wbxx_hal_adc.h"
 #include "../scope_app_i.h"
 #include "../scope_app_i.h"
-#include "../helpers/scope_types.h"
 
 
 #define DIGITAL_SCALE_12BITS             ((uint32_t) 0xFFF)
 #define DIGITAL_SCALE_12BITS             ((uint32_t) 0xFFF)
 #define ADC_CONVERTED_DATA_BUFFER_SIZE   ((uint32_t)  128)
 #define ADC_CONVERTED_DATA_BUFFER_SIZE   ((uint32_t)  128)

+ 0 - 1
scenes/scope_scene_setup.c

@@ -1,5 +1,4 @@
 #include "../scope_app_i.h"
 #include "../scope_app_i.h"
-#include "../helpers/scope_types.h"
 
 
 void scope_scene_setup_widget_callback(
 void scope_scene_setup_widget_callback(
     GuiButtonType result,
     GuiButtonType result,

+ 0 - 0
helpers/scope_types.h → scenes/scope_types.h


+ 0 - 1
scope.c

@@ -8,7 +8,6 @@
 #include <gui/modules/widget.h>
 #include <gui/modules/widget.h>
 #include <notification/notification_messages.h>
 #include <notification/notification_messages.h>
 
 
-#include "scope_icons.h"
 #include "scope_app_i.h"
 #include "scope_app_i.h"
 
 
 void assert_failed(uint8_t * file, uint32_t line)
 void assert_failed(uint8_t * file, uint32_t line)

+ 1 - 1
scope_app_i.h

@@ -1,6 +1,6 @@
 #pragma once
 #pragma once
 
 
-#include "helpers/scope_types.h"
+#include "scenes/scope_types.h"
 #include "scenes/scope_scene.h"
 #include "scenes/scope_scene.h"
 
 
 #include <gui/gui.h>
 #include <gui/gui.h>