From e1deb45aac34787f8770c61a58a97e1403b682be Mon Sep 17 00:00:00 2001 From: Nerzal Date: Mon, 22 Mar 2021 15:25:43 +0100 Subject: [PATCH] add 4x4 keypad driver (#226) add 4x4 keypad driver --- Makefile | 4 ++++ README.md | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f073712..1f694e1 100644 --- a/Makefile +++ b/Makefile @@ -175,7 +175,11 @@ endif DRIVERS = $(wildcard */) NOTESTS = build examples flash semihosting pcd8544 shiftregister st7789 microphone mcp3008 gps microbitmatrix \ hcsr04 ssd1331 ws2812 thermistor apa102 easystepper ssd1351 ili9341 wifinina shifter hub75 \ +<<<<<<< HEAD hd44780 buzzer ssd1306 espat l9110x st7735 bmi160 l293x dht keypad4x4 max72xx +======= + hd44780 buzzer ssd1306 espat l9110x st7735 bmi160 l293x dht keypad4x4 +>>>>>>> add 4x4 keypad driver (#226) TESTS = $(filter-out $(addsuffix /%,$(NOTESTS)),$(DRIVERS)) unit-test: diff --git a/README.md b/README.md index 971ccbf..34398ff 100644 --- a/README.md +++ b/README.md @@ -87,10 +87,7 @@ The following 58 devices are supported. | [LIS3DH accelerometer](https://www.st.com/resource/en/datasheet/lis3dh.pdf) | I2C | | [LSM6DS3 accelerometer](https://www.st.com/resource/en/datasheet/lsm6ds3.pdf) | I2C | | [MAG3110 magnetometer](https://www.nxp.com/docs/en/data-sheet/MAG3110.pdf) | I2C | -<<<<<<< HEAD | [MAX7219 & MAX7221 display driver](https://datasheets.maximintegrated.com/en/ds/MAX7219-MAX7221.pdf) | SPI | -======= ->>>>>>> docs: add missing new drivers added since last release | [MCP23017 port expander](https://ww1.microchip.com/downloads/en/DeviceDoc/20001952C.pdf) | I2C | | [MCP3008 analog to digital converter (ADC)](http://ww1.microchip.com/downloads/en/DeviceDoc/21295d.pdf) | SPI | | [Microphone - PDM](https://cdn-learn.adafruit.com/assets/assets/000/049/977/original/MP34DT01-M.pdf) | I2S/PDM |