diff options
| -rw-r--r-- | src/Kconfig | 13 | ||||
| -rw-r--r-- | src/Makefile | 3 | ||||
| -rw-r--r-- | test/configs/ar100.config | 3 | ||||
| -rw-r--r-- | test/configs/atmega328.config | 1 | ||||
| -rw-r--r-- | test/configs/pru.config | 3 | ||||
| -rw-r--r-- | test/configs/stm32f031.config | 3 |
6 files changed, 18 insertions, 8 deletions
diff --git a/src/Kconfig b/src/Kconfig index e715e5c3..a5cb3b06 100644 --- a/src/Kconfig +++ b/src/Kconfig @@ -104,7 +104,11 @@ config WANT_PULSE_COUNTER bool depends on HAVE_GPIO default y -config WANT_DISPLAYS +config WANT_ST7920 + bool + depends on HAVE_GPIO + default y +config WANT_HD44780 bool depends on HAVE_GPIO default y @@ -171,8 +175,11 @@ config WANT_NEOPIXEL config WANT_PULSE_COUNTER bool "Support measuring fan tachometer GPIO pins" depends on HAVE_GPIO -config WANT_DISPLAYS - bool "Support LCD devices" +config WANT_ST7920 + bool "Support ST7920 LCD display" + depends on HAVE_GPIO +config WANT_HD44780 + bool "Support HD44780 LCD display" depends on HAVE_GPIO config WANT_THERMOCOUPLE bool "Support thermocouple MAX sensors" diff --git a/src/Makefile b/src/Makefile index 9cbfd2d3..7ff99193 100644 --- a/src/Makefile +++ b/src/Makefile @@ -13,7 +13,8 @@ src-$(CONFIG_WANT_BUTTONS) += buttons.c src-$(CONFIG_WANT_TMCUART) += tmcuart.c src-$(CONFIG_WANT_NEOPIXEL) += neopixel.c src-$(CONFIG_WANT_PULSE_COUNTER) += pulse_counter.c -src-$(CONFIG_WANT_DISPLAYS) += lcd_st7920.c lcd_hd44780.c +src-$(CONFIG_WANT_ST7920) += lcd_st7920.c +src-$(CONFIG_WANT_HD44780) += lcd_hd44780.c src-$(CONFIG_WANT_SOFTWARE_SPI) += spi_software.c src-$(CONFIG_WANT_SOFTWARE_I2C) += i2c_software.c src-$(CONFIG_WANT_THERMOCOUPLE) += thermocouple.c diff --git a/test/configs/ar100.config b/test/configs/ar100.config index 7d32e57c..f0c0a5f1 100644 --- a/test/configs/ar100.config +++ b/test/configs/ar100.config @@ -1,6 +1,7 @@ # Base config file for the ar100 CPU CONFIG_MACH_AR100=y -CONFIG_WANT_DISPLAYS=n +CONFIG_WANT_ST7920=n +CONFIG_WANT_HD44780=n CONFIG_WANT_SOFTWARE_I2C=n CONFIG_WANT_SOFTWARE_SPI=n CONFIG_WANT_LIS2DW=n diff --git a/test/configs/atmega328.config b/test/configs/atmega328.config index 4b5e8c67..d22a54e9 100644 --- a/test/configs/atmega328.config +++ b/test/configs/atmega328.config @@ -2,7 +2,6 @@ CONFIG_MACH_AVR=y CONFIG_MACH_atmega328=y CONFIG_CLOCK_FREQ=16000000 -CONFIG_WANT_DISPLAYS=n CONFIG_WANT_SOFTWARE_SPI=n CONFIG_WANT_SOFTWARE_I2C=n CONFIG_WANT_THERMOCOUPLE=n diff --git a/test/configs/pru.config b/test/configs/pru.config index 202659f5..fb8566ff 100644 --- a/test/configs/pru.config +++ b/test/configs/pru.config @@ -5,4 +5,5 @@ CONFIG_WANT_TMCUART=n CONFIG_WANT_NEOPIXEL=n CONFIG_WANT_PULSE_COUNTER=n CONFIG_WANT_HX71X=n -CONFIG_WANT_DISPLAYS=n +CONFIG_WANT_ST7920=n +CONFIG_WANT_HD44780=n diff --git a/test/configs/stm32f031.config b/test/configs/stm32f031.config index 869ff6a8..43b096d5 100644 --- a/test/configs/stm32f031.config +++ b/test/configs/stm32f031.config @@ -10,4 +10,5 @@ CONFIG_WANT_TMCUART=n CONFIG_WANT_NEOPIXEL=n CONFIG_WANT_PULSE_COUNTER=n CONFIG_WANT_HX71X=n -CONFIG_WANT_DISPLAYS=n +CONFIG_WANT_ST7920=n +CONFIG_WANT_HD44780=n |