Skip to content

Commit 21a95de

Browse files
leedaveleedave
authored
Merge pull request #1 from leedave/freature/refactor_includes
Refactoring Includes
2 parents 8f4d942 + 41a408c commit 21a95de

16 files changed

+113
-101
lines changed

‎helpers/meal_pager_haptic.c

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
#include "meal_pager_haptic.h"
2-
#include "../meal_pager.h"
3-
42

53
void meal_pager_play_happy_bump(void* context) {
64
Meal_Pager* app = context;

‎helpers/meal_pager_haptic.h

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1+
#pragma once
2+
13
#include <notification/notification_messages.h>
4+
#include "../meal_pager_i.h"
25

36
void meal_pager_play_happy_bump(void* context);
47

‎helpers/meal_pager_led.c

-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
#include "meal_pager_led.h"
2-
#include "../meal_pager.h"
3-
4-
52

63
void meal_pager_led_set_rgb(void* context, int red, int green, int blue) {
74
Meal_Pager* app = context;

‎helpers/meal_pager_led.h

+2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
#pragma once
12

3+
#include "../meal_pager_i.h"
24

35
void meal_pager_led_set_rgb(void* context, int red, int green, int blue);
46

‎helpers/meal_pager_speaker.c

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include "meal_pager_speaker.h"
2-
#include "../meal_pager.h"
32

43
#define NOTE_INPUT 587.33f
54

‎helpers/meal_pager_speaker.h

+4
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
#pragma once
2+
3+
#include "../meal_pager_i.h"
4+
15
#define NOTE_INPUT 587.33f
26

37
void meal_pager_play_input_sound(void* context);

‎helpers/meal_pager_storage.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <string.h>
55
#include <storage/storage.h>
66
#include <flipper_format/flipper_format_i.h>
7-
#include "../meal_pager.h"
7+
#include "../meal_pager_i.h"
88

99
#define MEAL_PAGER_SETTINGS_FILE_VERSION 1
1010
#define CONFIG_FILE_DIRECTORY_PATH EXT_PATH("apps_data/meal_pager")

‎helpers/retekess/meal_pager_retekess_t119.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
#pragma once
33

4-
#include "../../meal_pager.h"
4+
#include "../../meal_pager_i.h"
55

66
char* encManchester(const char* bits, int mode);
77

‎meal_pager.h

+1-87
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,3 @@
11
#pragma once
2+
#include "meal_pager_i.h"
23

3-
#include <furi.h>
4-
#include <furi_hal.h>
5-
#include <gui/gui.h>
6-
#include <input/input.h>
7-
#include <stdlib.h>
8-
#include <assets_icons.h>
9-
#include <dialogs/dialogs.h>
10-
#include <notification/notification_messages.h>
11-
#include <gui/view_dispatcher.h>
12-
#include <gui/modules/submenu.h>
13-
#include <gui/scene_manager.h>
14-
#include <gui/modules/variable_item_list.h>
15-
#include <gui/modules/button_menu.h>
16-
#include <gui/modules/dialog_ex.h>
17-
#include "scenes/meal_pager_scene.h"
18-
#include "views/meal_pager_startscreen.h"
19-
#include "views/meal_pager_transmit.h"
20-
#include "helpers/meal_pager_storage.h"
21-
22-
#define TAG "Meal_Pager"
23-
24-
#define SUBGHZ_APP_EXTENSION ".sub"
25-
#define SUBGHZ_APP_FOLDER ANY_PATH("subghz")
26-
27-
typedef struct {
28-
Gui* gui;
29-
NotificationApp* notification;
30-
ViewDispatcher* view_dispatcher;
31-
Submenu* submenu;
32-
SceneManager* scene_manager;
33-
VariableItemList* variable_item_list;
34-
Meal_PagerStartscreen* meal_pager_startscreen;
35-
Meal_PagerTransmit* meal_pager_transmit;
36-
DialogsApp* dialogs; // File Browser
37-
FuriString* file_path; // File Browser
38-
uint32_t haptic;
39-
uint32_t speaker;
40-
uint32_t led;
41-
uint32_t save_settings;
42-
uint32_t pager_type;
43-
uint32_t first_station;
44-
char* first_station_char;
45-
uint32_t last_station;
46-
char* last_station_char;
47-
uint32_t first_pager;
48-
char* first_pager_char;
49-
uint32_t last_pager;
50-
char* last_pager_char;
51-
uint32_t current_station;
52-
uint32_t current_pager;
53-
} Meal_Pager;
54-
55-
typedef enum {
56-
Meal_PagerViewIdStartscreen,
57-
Meal_PagerViewIdMenu,
58-
Meal_PagerViewIdTransmit,
59-
Meal_PagerViewIdSettings,
60-
} Meal_PagerViewId;
61-
62-
typedef enum {
63-
Meal_PagerPagerTypeT119,
64-
Meal_PagerPagerTypeTD157,
65-
Meal_PagerPagerTypeTD165,
66-
Meal_PagerPagerTypeTD174,
67-
} Meal_PagerPagerType;
68-
69-
70-
71-
typedef enum {
72-
Meal_PagerHapticOff,
73-
Meal_PagerHapticOn,
74-
} Meal_PagerHapticState;
75-
76-
typedef enum {
77-
Meal_PagerSpeakerOff,
78-
Meal_PagerSpeakerOn,
79-
} Meal_PagerSpeakerState;
80-
81-
typedef enum {
82-
Meal_PagerLedOff,
83-
Meal_PagerLedOn,
84-
} Meal_PagerLedState;
85-
86-
typedef enum {
87-
Meal_PagerSettingsOff,
88-
Meal_PagerSettingsOn,
89-
} Meal_PagerSettingsStoreState;

‎meal_pager_i.h

+91
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
#pragma once
2+
3+
#include <furi.h>
4+
#include <furi_hal.h>
5+
#include <gui/gui.h>
6+
#include <input/input.h>
7+
#include <stdlib.h>
8+
#include <assets_icons.h>
9+
#include <dialogs/dialogs.h>
10+
#include <notification/notification_messages.h>
11+
#include <gui/view_dispatcher.h>
12+
#include <gui/modules/submenu.h>
13+
#include <gui/scene_manager.h>
14+
#include <gui/modules/variable_item_list.h>
15+
#include <gui/modules/button_menu.h>
16+
#include <gui/modules/dialog_ex.h>
17+
#include "scenes/meal_pager_scene.h"
18+
#include "views/meal_pager_startscreen.h"
19+
#include "views/meal_pager_transmit.h"
20+
#include "helpers/meal_pager_storage.h"
21+
22+
#define TAG "Meal_Pager"
23+
24+
#define SUBGHZ_APP_EXTENSION ".sub"
25+
#define SUBGHZ_APP_FOLDER ANY_PATH("subghz")
26+
27+
typedef struct Meal_PagerTransmit Meal_PagerTransmit;
28+
29+
typedef struct {
30+
Gui* gui;
31+
NotificationApp* notification;
32+
ViewDispatcher* view_dispatcher;
33+
Submenu* submenu;
34+
SceneManager* scene_manager;
35+
VariableItemList* variable_item_list;
36+
Meal_PagerStartscreen* meal_pager_startscreen;
37+
Meal_PagerTransmit* meal_pager_transmit;
38+
DialogsApp* dialogs; // File Browser
39+
FuriString* file_path; // File Browser
40+
uint32_t haptic;
41+
uint32_t speaker;
42+
uint32_t led;
43+
uint32_t save_settings;
44+
uint32_t pager_type;
45+
uint32_t first_station;
46+
char* first_station_char;
47+
uint32_t last_station;
48+
char* last_station_char;
49+
uint32_t first_pager;
50+
char* first_pager_char;
51+
uint32_t last_pager;
52+
char* last_pager_char;
53+
uint32_t current_station;
54+
uint32_t current_pager;
55+
} Meal_Pager;
56+
57+
typedef enum {
58+
Meal_PagerViewIdStartscreen,
59+
Meal_PagerViewIdMenu,
60+
Meal_PagerViewIdTransmit,
61+
Meal_PagerViewIdSettings,
62+
} Meal_PagerViewId;
63+
64+
typedef enum {
65+
Meal_PagerPagerTypeT119,
66+
Meal_PagerPagerTypeTD157,
67+
Meal_PagerPagerTypeTD165,
68+
Meal_PagerPagerTypeTD174,
69+
} Meal_PagerPagerType;
70+
71+
72+
73+
typedef enum {
74+
Meal_PagerHapticOff,
75+
Meal_PagerHapticOn,
76+
} Meal_PagerHapticState;
77+
78+
typedef enum {
79+
Meal_PagerSpeakerOff,
80+
Meal_PagerSpeakerOn,
81+
} Meal_PagerSpeakerState;
82+
83+
typedef enum {
84+
Meal_PagerLedOff,
85+
Meal_PagerLedOn,
86+
} Meal_PagerLedState;
87+
88+
typedef enum {
89+
Meal_PagerSettingsOff,
90+
Meal_PagerSettingsOn,
91+
} Meal_PagerSettingsStoreState;

‎scenes/meal_pager_scene_menu.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "../meal_pager.h"
1+
#include "../meal_pager_i.h"
22

33
enum SubmenuIndex {
44
SubmenuIndexTransmit = 10,

‎scenes/meal_pager_scene_settings.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "../meal_pager.h"
1+
#include "../meal_pager_i.h"
22
#include <lib/toolbox/value_index.h>
33

44
enum SettingsIndex {

‎scenes/meal_pager_scene_startscreen.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "../meal_pager.h"
1+
#include "../meal_pager_i.h"
22
#include "../helpers/meal_pager_custom_event.h"
33
#include "../views/meal_pager_startscreen.h"
44

‎scenes/meal_pager_scene_transmit.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "../meal_pager.h"
1+
#include "../meal_pager_i.h"
22
#include "../helpers/meal_pager_custom_event.h"
33
#include "../helpers/retekess/meal_pager_retekess_t119.h"
44
#include "../views/meal_pager_transmit.h"
@@ -20,6 +20,8 @@ void meal_pager_scene_transmit_on_enter(void* context) {
2020
meal_pager_transmit_set_callback(app->meal_pager_transmit, meal_pager_transmit_callback, app);
2121
view_dispatcher_switch_to_view(app->view_dispatcher, Meal_PagerViewIdTransmit);
2222
meal_pager_retekess_t119_generate_all(app);
23+
FURI_LOG_D(TAG, "Generated tmp.sub");
24+
2325
}
2426

2527
bool meal_pager_scene_transmit_on_event(void* context, SceneManagerEvent event) {

‎views/meal_pager_startscreen.c

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
#include "../meal_pager.h"
1+
#include "meal_pager_startscreen.h"
2+
3+
#include "../meal_pager_i.h"
24
#include <furi.h>
35
#include <furi_hal.h>
46
#include <input/input.h>

‎views/meal_pager_transmit.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "../meal_pager.h"
1+
#include "../meal_pager_i.h"
22
#include <furi.h>
33
#include <furi_hal.h>
44
#include <input/input.h>

0 commit comments

Comments
 (0)