boards/shields: ssd1306: Factorize and move to conditional Kconfig

Factorize definitions for ssd1306_128x32 and sd1306_128x64 shields and move to conditional Kconfig. As part of this change, direct drivers Kconfig symbols enabling (I2C, SSD1306) are removed as they are application responsibility. Also disabling SSD16XX is removed as SSD16XX should not be enabled by default. Signed-off-by: Erwan Gouriou <[email protected]>
e7dal · Jan 2, 2020 · 4faf654 · 4faf654
1 parent 980ddb6
commit 4faf654
Show file tree

Hide file tree

Showing 14 changed files with 68 additions and 64 deletions.
diff --git a/boards/shields/ssd1306/Kconfig.defconfig b/boards/shields/ssd1306/Kconfig.defconfig
@@ -0,0 +1,45 @@
+# Copyright (c) 2019 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+if SHIELD_SSD1306_128X64 || SHIELD_SSD1306_128X32
+
+if DISPLAY
+
+config I2C
+	default y
+
+config SSD1306
+	default y
+
+if LVGL
+
+config LVGL_DISPLAY_DEV_NAME
+	default "SSD1306"
+
+config LVGL_HOR_RES
+	default 128
+
+config LVGL_VER_RES
+	default 64 if SHIELD_SSD1306_128X64
+	default 32 if SHIELD_SSD1306_128X32
+
+config LVGL_VDB_SIZE
+	default 64
+
+config LVGL_DPI
+	default 148
+
+config LVGL_BITS_PER_PIXEL
+	default 1
+
+choice LVGL_COLOR_DEPTH
+	default LVGL_COLOR_DEPTH_1
+endchoice
+
+endif # LVGL
+
+rsource "boards/*.defconfig"
+
+endif # DISPLAY
+
+endif # SHIELD_SSD1306_128X64 || SHIELD_SSD1306_128X32
diff --git a/boards/shields/ssd1306/Kconfig.shield b/boards/shields/ssd1306/Kconfig.shield
@@ -0,0 +1,8 @@
+# Copyright (c) 2019 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+config SHIELD_SSD1306_128X32
+	def_bool $(shields_list_contains,ssd1306_128x32)
+
+config SHIELD_SSD1306_128X64
+	def_bool $(shields_list_contains,ssd1306_128x64)
diff --git a/boards/shields/ssd1306/boards/reel_board.defconfig b/boards/shields/ssd1306/boards/reel_board.defconfig
@@ -0,0 +1,10 @@
+# Copyright (c) 2019 Linaro Limited
+# SPDX-License-Identifier: Apache-2.0
+
+if BOARD_REEL_BOARD
+
+choice I2C_0_NRF_TYPE
+	default I2C_0_NRF_TWI
+endchoice
+
+endif # BOARD_REEL_BOARD
diff --git a/.../ssd1306_128x32/boards/reel_board.overlay → ...shields/ssd1306/boards/reel_board.overlay b/.../ssd1306_128x32/boards/reel_board.overlay → ...shields/ssd1306/boards/reel_board.overlay
diff --git a/boards/shields/ssd1306_128x64/doc/index.rst → boards/shields/ssd1306/doc/index.rst b/boards/shields/ssd1306_128x64/doc/index.rst → boards/shields/ssd1306/doc/index.rst
@@ -1,12 +1,12 @@
-.. _ssd1306_128x64_shield:
+.. _ssd1306_128_shield:
 
-SSD1306 128x64 pixels generic shield
-####################################
+SSD1306 128x64(/32) pixels generic shield
+#########################################
 
 Overview
 ********
 
-This is a generic shield for 128x64 pixel resolution OLED displays
+This is a generic shield for 128x64(/32) pixel resolution OLED displays
 based on SSD1306 controller. These displays have an I2C interface and
 usually only four pins: GND, VCC, SCL and SDA. Display pins can be
 connected to the pin header of a board using jumper wires.

diff --git a/...lds/ssd1306_128x32/ssd1306_128x32.overlay → ...ds/shields/ssd1306/ssd1306_128x32.overlay b/...lds/ssd1306_128x32/ssd1306_128x32.overlay → ...ds/shields/ssd1306/ssd1306_128x32.overlay
diff --git a/...lds/ssd1306_128x64/ssd1306_128x64.overlay → ...ds/shields/ssd1306/ssd1306_128x64.overlay b/...lds/ssd1306_128x64/ssd1306_128x64.overlay → ...ds/shields/ssd1306/ssd1306_128x64.overlay
diff --git a/boards/shields/ssd1306_128x32/boards/reel_board.conf b/boards/shields/ssd1306_128x32/boards/reel_board.conf
diff --git a/boards/shields/ssd1306_128x32/doc/index.rst b/boards/shields/ssd1306_128x32/doc/index.rst
diff --git a/boards/shields/ssd1306_128x32/ssd1306_128x32.conf b/boards/shields/ssd1306_128x32/ssd1306_128x32.conf
diff --git a/boards/shields/ssd1306_128x64/boards/reel_board.conf b/boards/shields/ssd1306_128x64/boards/reel_board.conf
diff --git a/boards/shields/ssd1306_128x64/boards/reel_board.overlay b/boards/shields/ssd1306_128x64/boards/reel_board.overlay
diff --git a/boards/shields/ssd1306_128x64/ssd1306_128x64.conf b/boards/shields/ssd1306_128x64/ssd1306_128x64.conf
diff --git a/samples/gui/lvgl/README.rst b/samples/gui/lvgl/README.rst
@@ -16,7 +16,7 @@ Display shield and a board which provides a configuration
 for Arduino connectors, for example:
 
 - :ref:`adafruit_2_8_tft_touch_v2` and :ref:`nrf52840_pca10056`
-- :ref:`ssd1306_128x64_shield` and :ref:`frdm_k64f`
+- :ref:`ssd1306_128_shield` and :ref:`frdm_k64f`
 
 or a simulated display environment in a native Posix application: