7 files changed, 37 insertions, 21 deletions
diff --git a/apps/settings.h b/apps/settings.h
index d4498cf721..482b791d77 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -119,27 +119,6 @@ extern const struct opt_items trig_durations[TRIG_DURATION_COUNT];
 #define FOLDER_ADVANCE_NEXT 1
 #define FOLDER_ADVANCE_RANDOM 2
 
-/* system defines */
-#ifndef TARGET_TREE
-
-#ifndef HAVE_LCD_COLOR
-#define DEFAULT_CONTRAST_SETTING    40
-#endif
-
-#if defined HAVE_LCD_CHARCELLS
-#define MIN_CONTRAST_SETTING        5
-#define MAX_CONTRAST_SETTING        31
-#else
-#define MIN_CONTRAST_SETTING        5
-#define MAX_CONTRAST_SETTING        63
-#endif
-
-#endif /* !TARGET_TREE */
-
-#if !defined(HAVE_LCD_COLOR)
-#define HAVE_LCD_CONTRAST
-#endif
-
 /* repeat mode options */
 enum
 {
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h
index b237bd5804..170bd27041 100644
--- a/firmware/export/config-fmrecorder.h
+++ b/firmware/export/config-fmrecorder.h
@@ -109,3 +109,9 @@
 #define BOOTDIR "/"
 
 #endif /* SIMULATOR */
+
+#define HAVE_LCD_CONTRAST
+
+#define MIN_CONTRAST_SETTING        5
+#define MAX_CONTRAST_SETTING        63
+
diff --git a/firmware/export/config-ondiofm.h b/firmware/export/config-ondiofm.h
index 1a288c5c87..18c0ad7deb 100644
--- a/firmware/export/config-ondiofm.h
+++ b/firmware/export/config-ondiofm.h
@@ -122,3 +122,9 @@
 #define BOOTDIR "/"
 
 #endif /* SIMULATOR */
+
+#define HAVE_LCD_CONTRAST
+
+#define MIN_CONTRAST_SETTING        5
+#define MAX_CONTRAST_SETTING        63
+
diff --git a/firmware/export/config-ondiosp.h b/firmware/export/config-ondiosp.h
index 9d3dd729f2..41ee1e068e 100644
--- a/firmware/export/config-ondiosp.h
+++ b/firmware/export/config-ondiosp.h
@@ -105,3 +105,9 @@
 #define BOOTDIR "/"
 
 #endif /* SIMULATOR */
+
+#define HAVE_LCD_CONTRAST
+
+#define MIN_CONTRAST_SETTING        5
+#define MAX_CONTRAST_SETTING        63
+
diff --git a/firmware/export/config-player.h b/firmware/export/config-player.h
index 723b852d3d..b9e3035951 100644
--- a/firmware/export/config-player.h
+++ b/firmware/export/config-player.h
@@ -84,3 +84,10 @@
 #define BOOTDIR "/"
 
 #endif /* SIMULATOR */
+
+#define HAVE_LCD_CONTRAST
+
+#define MIN_CONTRAST_SETTING        5
+#define MAX_CONTRAST_SETTING        31
+#define DEFAULT_CONTRAST_SETTING    30
+
diff --git a/firmware/export/config-recorder.h b/firmware/export/config-recorder.h
index bb57ba5666..a5de2a809c 100644
--- a/firmware/export/config-recorder.h
+++ b/firmware/export/config-recorder.h
@@ -100,3 +100,9 @@
 #define BOOTDIR "/"
 
 #endif /* SIMULATOR */
+
+#define HAVE_LCD_CONTRAST
+
+#define MIN_CONTRAST_SETTING        5
+#define MAX_CONTRAST_SETTING        63
+
diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h
index f06aa92550..f15879e41b 100644
--- a/firmware/export/config-recorderv2.h
+++ b/firmware/export/config-recorderv2.h
@@ -109,3 +109,9 @@
 #define BOOTDIR "/"
 
 #endif /* SIMULATOR */
+
+#define HAVE_LCD_CONTRAST
+
+#define MIN_CONTRAST_SETTING        5
+#define MAX_CONTRAST_SETTING        63
+