summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--apps/gui/buttonbar.h12
-rw-r--r--apps/recorder/keyboard.c5
-rw-r--r--firmware/export/config-fmrecorder.h2
-rw-r--r--firmware/export/config-recorder.h2
-rw-r--r--firmware/export/config-recorderv2.h2
5 files changed, 13 insertions, 10 deletions
diff --git a/apps/gui/buttonbar.h b/apps/gui/buttonbar.h
index e7a366420c..3098ecce4f 100644
--- a/apps/gui/buttonbar.h
+++ b/apps/gui/buttonbar.h
@@ -21,13 +21,14 @@
21#define _GUI_BUTTONBAR_H_ 21#define _GUI_BUTTONBAR_H_
22#include "config.h" 22#include "config.h"
23#include "button.h" 23#include "button.h"
24#if CONFIG_KEYPAD == RECORDER_PAD 24#include "screen_access.h"
25
25 26
26#define HAS_BUTTONBAR 27#ifdef HAS_BUTTONBAR
27#define BUTTONBAR_HEIGHT 8 28#define BUTTONBAR_HEIGHT 8
28#define BUTTONBAR_MAX_BUTTONS 3 29#define BUTTONBAR_MAX_BUTTONS 3
29#define BUTTONBAR_CAPTION_LENGTH 8 30#define BUTTONBAR_CAPTION_LENGTH 8
30#include "screen_access.h" 31
31 32
32struct gui_buttonbar 33struct gui_buttonbar
33{ 34{
@@ -76,6 +77,7 @@ extern void gui_buttonbar_draw(struct gui_buttonbar * buttonbar);
76 * - buttonbar : the buttonbar 77 * - buttonbar : the buttonbar
77 */ 78 */
78extern bool gui_buttonbar_isset(struct gui_buttonbar * buttonbar); 79extern bool gui_buttonbar_isset(struct gui_buttonbar * buttonbar);
79 80#else
80#endif /* CONFIG_KEYPAD == RECORDER_PAD */ 81#define BUTTONBAR_HEIGHT 0
82#endif
81#endif /* _GUI_BUTTONBAR_H_ */ 83#endif /* _GUI_BUTTONBAR_H_ */
diff --git a/apps/recorder/keyboard.c b/apps/recorder/keyboard.c
index ae7666f788..752e0369e9 100644
--- a/apps/recorder/keyboard.c
+++ b/apps/recorder/keyboard.c
@@ -40,11 +40,6 @@
40#define O_BINARY 0 40#define O_BINARY 0
41#endif 41#endif
42 42
43#if CONFIG_KEYPAD == RECORDER_PAD
44#define BUTTONBAR_HEIGHT 8
45#else
46#define BUTTONBAR_HEIGHT 0
47#endif
48 43
49#define DEFAULT_MARGIN 6 44#define DEFAULT_MARGIN 6
50#define KBD_BUF_SIZE 500 45#define KBD_BUF_SIZE 500
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h
index fd5b0e16bd..dc45a86657 100644
--- a/firmware/export/config-fmrecorder.h
+++ b/firmware/export/config-fmrecorder.h
@@ -21,6 +21,8 @@
21#define HAVE_QUICKSCREEN 21#define HAVE_QUICKSCREEN
22/* define this if you have access to the pitchscreen */ 22/* define this if you have access to the pitchscreen */
23#define HAVE_PITCHSCREEN 23#define HAVE_PITCHSCREEN
24/* define this if you have the button bar */
25#define HAS_BUTTONBAR
24 26
25/* define this if you would like tagcache to build on this target */ 27/* define this if you would like tagcache to build on this target */
26#define HAVE_TAGCACHE 28#define HAVE_TAGCACHE
diff --git a/firmware/export/config-recorder.h b/firmware/export/config-recorder.h
index 63b2d7b089..9e26a221ac 100644
--- a/firmware/export/config-recorder.h
+++ b/firmware/export/config-recorder.h
@@ -21,6 +21,8 @@
21#define HAVE_QUICKSCREEN 21#define HAVE_QUICKSCREEN
22/* define this if you have access to the pitchscreen */ 22/* define this if you have access to the pitchscreen */
23#define HAVE_PITCHSCREEN 23#define HAVE_PITCHSCREEN
24/* define this if you have the button bar */
25#define HAS_BUTTONBAR
24 26
25/* define this if you would like tagcache to build on this target */ 27/* define this if you would like tagcache to build on this target */
26#define HAVE_TAGCACHE 28#define HAVE_TAGCACHE
diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h
index 82f7e01541..4945d8f0ec 100644
--- a/firmware/export/config-recorderv2.h
+++ b/firmware/export/config-recorderv2.h
@@ -21,6 +21,8 @@
21#define HAVE_QUICKSCREEN 21#define HAVE_QUICKSCREEN
22/* define this if you have access to the pitchscreen */ 22/* define this if you have access to the pitchscreen */
23#define HAVE_PITCHSCREEN 23#define HAVE_PITCHSCREEN
24/* define this if you have the button bar */
25#define HAS_BUTTONBAR
24 26
25/* define this if you would like tagcache to build on this target */ 27/* define this if you would like tagcache to build on this target */
26#define HAVE_TAGCACHE 28#define HAVE_TAGCACHE