4 files changed, 50 insertions, 35 deletions

diff --git a/firmware/export/config-h100.h b/firmware/export/config-h100.h
index 8ef227676a..fd84f37061 100644
--- a/firmware/export/config-h100.h
+++ b/firmware/export/config-h100.h
@@ -154,13 +154,6 @@
 
 #endif /* !SIMULATOR */
 
-#define DEFAULT_CONTRAST_SETTING    28
-#define MIN_CONTRAST_SETTING        14 /* White screen a bit higher than this */
-#define MAX_CONTRAST_SETTING        63 /* Black screen a bit lower than this*/
-#define DEFAULT_REMOTE_CONTRAST_SETTING 42
-#define MIN_REMOTE_CONTRAST_SETTING MIN_CONTRAST_SETTING
-#define MAX_REMOTE_CONTRAST_SETTING MAX_CONTRAST_SETTING
-
 /* Define this for S/PDIF input available */
 #define HAVE_SPDIF_IN
 
@@ -173,3 +166,15 @@
 
 /* Define this for FM radio input available */
 #define HAVE_FMRADIO_IN
+
+/** Port-specific settings **/
+
+/* Main LCD backlight brightness range and defaults */
+#define MIN_CONTRAST_SETTING        14 /* White screen a bit higher than this */
+#define MAX_CONTRAST_SETTING        63 /* Black screen a bit lower than this */
+#define DEFAULT_CONTRAST_SETTING    28
+
+/* Remote LCD contrast range and defaults */
+#define MIN_REMOTE_CONTRAST_SETTING     5
+#define MAX_REMOTE_CONTRAST_SETTING     63
+#define DEFAULT_REMOTE_CONTRAST_SETTING 42
diff --git a/firmware/export/config-h120.h b/firmware/export/config-h120.h
index e4c5cfe876..4a8a3c99be 100644
--- a/firmware/export/config-h120.h
+++ b/firmware/export/config-h120.h
@@ -150,13 +150,6 @@
 
 #endif /* !SIMULATOR */
 
-#define DEFAULT_CONTRAST_SETTING    28
-#define MIN_CONTRAST_SETTING        14 /* White screen a bit higher than this */
-#define MAX_CONTRAST_SETTING        63 /* Black screen a bit lower than this*/
-#define DEFAULT_REMOTE_CONTRAST_SETTING 42
-#define MIN_REMOTE_CONTRAST_SETTING MIN_CONTRAST_SETTING
-#define MAX_REMOTE_CONTRAST_SETTING MAX_CONTRAST_SETTING
-
 /* Define this for S/PDIF input available */
 #define HAVE_SPDIF_IN
 
@@ -171,3 +164,15 @@
 
 /* Define this if you have a serial port */
 /*#define HAVE_SERIAL*/
+
+/** Port-specific settings **/
+
+/* Main LCD backlight brightness range and defaults */
+#define DEFAULT_CONTRAST_SETTING    28
+#define MIN_CONTRAST_SETTING        14 /* White screen a bit higher than this */
+#define MAX_CONTRAST_SETTING        63 /* Black screen a bit lower than this */
+
+/* Remote LCD contrast range and defaults */
+#define MIN_REMOTE_CONTRAST_SETTING     5
+#define MAX_REMOTE_CONTRAST_SETTING     63
+#define DEFAULT_REMOTE_CONTRAST_SETTING 42
diff --git a/firmware/export/config-h300.h b/firmware/export/config-h300.h
index 14034c61f0..b44a2c5108 100644
--- a/firmware/export/config-h300.h
+++ b/firmware/export/config-h300.h
@@ -151,6 +151,12 @@
 #define HAVE_EEPROM
 
 #endif /* SIMULATOR */
+
+/* Define this for FM radio input available */
+#define HAVE_FMRADIO_IN
+
+/** Port-specific settings **/
+
 /* Main LCD contrast range and defaults */
 #define MIN_CONTRAST_SETTING        5
 #define MAX_CONTRAST_SETTING        63
@@ -163,9 +169,6 @@
 #define DEFAULT_BRIGHTNESS_SETTING  9  /*  9/16 (56.25%) */
 
 /* Remote LCD contrast range and defaults */
-#define MIN_REMOTE_CONTRAST_SETTING     MIN_CONTRAST_SETTING
-#define MAX_REMOTE_CONTRAST_SETTING     MAX_CONTRAST_SETTING
+#define MIN_REMOTE_CONTRAST_SETTING     5
+#define MAX_REMOTE_CONTRAST_SETTING     63
 #define DEFAULT_REMOTE_CONTRAST_SETTING 42 
-
-/* Define this for FM radio input available */
-#define HAVE_FMRADIO_IN
diff --git a/firmware/export/config-iaudiox5.h b/firmware/export/config-iaudiox5.h
index d45f58f14c..82c36437f5 100644
--- a/firmware/export/config-iaudiox5.h
+++ b/firmware/export/config-iaudiox5.h
@@ -62,22 +62,6 @@
 
 #define CONFIG_LCD LCD_X5
 
-/* Main LCD contrast range and defaults */
-#define MIN_CONTRAST_SETTING        1
-#define MAX_CONTRAST_SETTING        30
-#define DEFAULT_CONTRAST_SETTING    19 /* Match boot contrast */
-
-/* Remote LCD contrast range and defaults */
-#define MIN_REMOTE_CONTRAST_SETTING     10
-#define MAX_REMOTE_CONTRAST_SETTING     35
-#define DEFAULT_REMOTE_CONTRAST_SETTING 24 /* Match boot contrast */
-
-/* Main LCD backlight brightness range and defaults */
-/* PCF50506 can output 0%-100% duty cycle but D305A expects %15-100%. */
-#define MIN_BRIGHTNESS_SETTING      1  /* 15/16 (93.75%) */
-#define MAX_BRIGHTNESS_SETTING      13 /*  3/16 (18.75%) */
-#define DEFAULT_BRIGHTNESS_SETTING  8  /*  8/16 (50.00%) = x5 boot default */
-
 /* Define this for LCD backlight available */
 #define CONFIG_BACKLIGHT BL_X5 /* PCF50606 I2C */
 #define HAVE_BACKLIGHT_BRIGHTNESS
@@ -170,3 +154,21 @@
 
 /* Define this for FM radio input available */
 #define HAVE_FMRADIO_IN
+
+/** Port-specific settings **/
+
+/* Main LCD contrast range and defaults */
+#define MIN_CONTRAST_SETTING        1
+#define MAX_CONTRAST_SETTING        30
+#define DEFAULT_CONTRAST_SETTING    19 /* Match boot contrast */
+
+/* Main LCD backlight brightness range and defaults */
+/* PCF50506 can output 0%-100% duty cycle but D305A expects %15-100%. */
+#define MIN_BRIGHTNESS_SETTING      1  /* 15/16 (93.75%) */
+#define MAX_BRIGHTNESS_SETTING      13 /*  3/16 (18.75%) */
+#define DEFAULT_BRIGHTNESS_SETTING  8  /*  8/16 (50.00%) = x5 boot default */
+
+/* Remote LCD contrast range and defaults */
+#define MIN_REMOTE_CONTRAST_SETTING     10
+#define MAX_REMOTE_CONTRAST_SETTING     35
+#define DEFAULT_REMOTE_CONTRAST_SETTING 24 /* Match boot contrast */