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 @@
 #define _GUI_BUTTONBAR_H_
 #include "config.h"
 #include "button.h"
-#if CONFIG_KEYPAD == RECORDER_PAD
+#include "screen_access.h"
+
 
-#define HAS_BUTTONBAR
+#ifdef HAS_BUTTONBAR
 #define BUTTONBAR_HEIGHT 8
 #define BUTTONBAR_MAX_BUTTONS 3
 #define BUTTONBAR_CAPTION_LENGTH 8
-#include "screen_access.h"
+
 
 struct gui_buttonbar
 {
@@ -76,6 +77,7 @@ extern void gui_buttonbar_draw(struct gui_buttonbar * buttonbar);
  *  - buttonbar : the buttonbar
  */
 extern bool gui_buttonbar_isset(struct gui_buttonbar * buttonbar);
-
-#endif  /* CONFIG_KEYPAD == RECORDER_PAD */
+#else
+#define BUTTONBAR_HEIGHT 0
+#endif
 #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 @@
 #define O_BINARY 0
 #endif
 
-#if CONFIG_KEYPAD == RECORDER_PAD
-#define BUTTONBAR_HEIGHT 8
-#else
-#define BUTTONBAR_HEIGHT 0
-#endif
 
 #define DEFAULT_MARGIN 6
 #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 @@
 #define HAVE_QUICKSCREEN
 /* define this if you have access to the pitchscreen */
 #define HAVE_PITCHSCREEN
+/* define this if you have the button bar */
+#define HAS_BUTTONBAR
 
 /* define this if you would like tagcache to build on this target */
 #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 @@
 #define HAVE_QUICKSCREEN
 /* define this if you have access to the pitchscreen */
 #define HAVE_PITCHSCREEN
+/* define this if you have the button bar */
+#define HAS_BUTTONBAR
 
 /* define this if you would like tagcache to build on this target */
 #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 @@
 #define HAVE_QUICKSCREEN
 /* define this if you have access to the pitchscreen */
 #define HAVE_PITCHSCREEN
+/* define this if you have the button bar */
+#define HAS_BUTTONBAR
 
 /* define this if you would like tagcache to build on this target */
 #define HAVE_TAGCACHE