9 files changed, 15 insertions, 275 deletions
diff --git a/keyboards/moon/pca9555.c b/drivers/gpio/pca9555.c
index b0e542d8d..b0e542d8d 100644
--- a/keyboards/moon/pca9555.c
+++ b/drivers/gpio/pca9555.c
diff --git a/keyboards/moon/pca9555.h b/drivers/gpio/pca9555.h
index ebb97e2f3..ebb97e2f3 100644
--- a/keyboards/moon/pca9555.h
+++ b/drivers/gpio/pca9555.h
diff --git a/keyboards/moon/rules.mk b/keyboards/moon/rules.mk
index 699fc3395..c8b39e8b7 100644
--- a/keyboards/moon/rules.mk
+++ b/keyboards/moon/rules.mk
@@ -1,6 +1,3 @@
-# Project specific files
-SRC += i2c_master.c pca9555.c matrix.c
 # MCU name
 MCU = atmega32u4
@@ -50,10 +47,6 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 #   atmega32a    bootloadHID
 BOOTLOADER = atmel-dfu
-# Supported layouts
-LAYOUTS = tkl_ansi tkl_iso
 # Build Options
 #   change yes to no to disable
 #
@@ -74,4 +67,13 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 HD44780_ENABLE = no         # Enable support for HD44780 based LCDs (+400)
+# custom matrix setup
 CUSTOM_MATRIX = yes
+VPATH += drivers/gpio
+SRC += pca9555.c matrix.c
+QUANTUM_LIB_SRC += i2c_master.c
+# Supported layouts
+LAYOUTS = tkl_ansi tkl_iso
diff --git a/keyboards/xd84/pca9555.c b/keyboards/xd84/pca9555.c
deleted file mode 100644
index b0e542d8d..000000000
--- a/keyboards/xd84/pca9555.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "i2c_master.h"
-#include "pca9555.h"
-#include "debug.h"
-#define SLAVE_TO_ADDR(n) (n << 1)
-#define TIMEOUT 100
-enum {
-  CMD_INPUT_0 = 0,
-  CMD_INPUT_1,
-  CMD_OUTPUT_0,
-  CMD_OUTPUT_1,
-  CMD_INVERSION_0,
-  CMD_INVERSION_1,
-  CMD_CONFIG_0,
-  CMD_CONFIG_1,
-};
-void pca9555_init(uint8_t slave_addr) {
-  static uint8_t s_init = 0;
-  if (!s_init) {
-    i2c_init();
-    s_init = 1;
-  }
-  // TODO: could check device connected
-  // i2c_start(SLAVE_TO_ADDR(slave) | I2C_WRITE);
-  // i2c_stop();
-}
-void pca9555_set_config(uint8_t slave_addr, uint8_t port, uint8_t conf) {
-  uint8_t addr = SLAVE_TO_ADDR(slave_addr);
-  uint8_t cmd  = port ? CMD_CONFIG_1 : CMD_CONFIG_0;
-  i2c_status_t ret = i2c_writeReg(addr, cmd, &conf, sizeof(conf), TIMEOUT);
-  if (ret != I2C_STATUS_SUCCESS) {
-    print("pca9555_set_config::FAILED\n");
-  }
-}
-void pca9555_set_output(uint8_t slave_addr, uint8_t port, uint8_t conf) {
-  uint8_t addr = SLAVE_TO_ADDR(slave_addr);
-  uint8_t cmd  = port ? CMD_OUTPUT_1 : CMD_OUTPUT_0;
-  i2c_status_t ret = i2c_writeReg(addr, cmd, &conf, sizeof(conf), TIMEOUT);
-  if (ret != I2C_STATUS_SUCCESS) {
-    print("pca9555_set_output::FAILED\n");
-  }
-}
-uint8_t pca9555_readPins(uint8_t slave_addr, uint8_t port) {
-  uint8_t addr = SLAVE_TO_ADDR(slave_addr);
-  uint8_t cmd  = port ? CMD_INPUT_1 : CMD_INPUT_0;
-  uint8_t      data = 0;
-  i2c_status_t ret  = i2c_readReg(addr, cmd, &data, sizeof(data), TIMEOUT);
-  if (ret != I2C_STATUS_SUCCESS) {
-    print("pca9555_readPins::FAILED\n");
-  }
-  return data;
-}
diff --git a/keyboards/xd84/pca9555.h b/keyboards/xd84/pca9555.h
deleted file mode 100644
index ebb97e2f3..000000000
--- a/keyboards/xd84/pca9555.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-/*
-            PCA9555
-         ,----------.
-   SDA --| SDA  P00 |-- P00
-   SCL --| SCL  P01 |-- P01
-   INT --| INT  P02 |-- P02
-         |      P03 |-- P03
-   A0  --| A0   P04 |-- P04
-   A1  --| A1   P05 |-- P05
-   A2  --| A2   P06 |-- P06
-         |      P07 |-- P07
-         |          |
-         |      P10 |-- P10
-         |      P11 |-- P11
-         |      P12 |-- P12
-         |      P13 |-- P13
-         |      P14 |-- P14
-         |      P15 |-- P15
-         |      P16 |-- P16
-         |      P17 |-- P17
-         `----------'
-*/
-#define PCA9555_PORT0 0
-#define PCA9555_PORT1 1
-#define ALL_OUTPUT 0
-#define ALL_INPUT 0xFF
-#define ALL_LOW 0
-#define ALL_HIGH 0xFF
-void pca9555_init(uint8_t slave_addr);
-void pca9555_set_config(uint8_t slave_addr, uint8_t port, uint8_t conf);
-void pca9555_set_output(uint8_t slave_addr, uint8_t port, uint8_t conf);
-uint8_t pca9555_readPins(uint8_t slave_addr, uint8_t port);
diff --git a/keyboards/xd84/rules.mk b/keyboards/xd84/rules.mk
index e0982e040..916645226 100644
--- a/keyboards/xd84/rules.mk
+++ b/keyboards/xd84/rules.mk
@@ -77,11 +77,13 @@ UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
-HD44780_ENABLE = no             # Enable support for HD44780 based LCDs (+400)
+HD44780_ENABLE = no         # Enable support for HD44780 based LCDs (+400)
 LINK_TIME_OPTIMIZATION_ENABLE = yes
 # custom matrix setup
 CUSTOM_MATRIX = yes
+VPATH += drivers/gpio
 SRC += custom_matrix_helper.c pca9555.c matrix.c
 QUANTUM_LIB_SRC += i2c_master.c
diff --git a/keyboards/xd96/pca9555.c b/keyboards/xd96/pca9555.c
deleted file mode 100644
index b0e542d8d..000000000
--- a/keyboards/xd96/pca9555.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "i2c_master.h"
-#include "pca9555.h"
-#include "debug.h"
-#define SLAVE_TO_ADDR(n) (n << 1)
-#define TIMEOUT 100
-enum {
-  CMD_INPUT_0 = 0,
-  CMD_INPUT_1,
-  CMD_OUTPUT_0,
-  CMD_OUTPUT_1,
-  CMD_INVERSION_0,
-  CMD_INVERSION_1,
-  CMD_CONFIG_0,
-  CMD_CONFIG_1,
-};
-void pca9555_init(uint8_t slave_addr) {
-  static uint8_t s_init = 0;
-  if (!s_init) {
-    i2c_init();
-    s_init = 1;
-  }
-  // TODO: could check device connected
-  // i2c_start(SLAVE_TO_ADDR(slave) | I2C_WRITE);
-  // i2c_stop();
-}
-void pca9555_set_config(uint8_t slave_addr, uint8_t port, uint8_t conf) {
-  uint8_t addr = SLAVE_TO_ADDR(slave_addr);
-  uint8_t cmd  = port ? CMD_CONFIG_1 : CMD_CONFIG_0;
-  i2c_status_t ret = i2c_writeReg(addr, cmd, &conf, sizeof(conf), TIMEOUT);
-  if (ret != I2C_STATUS_SUCCESS) {
-    print("pca9555_set_config::FAILED\n");
-  }
-}
-void pca9555_set_output(uint8_t slave_addr, uint8_t port, uint8_t conf) {
-  uint8_t addr = SLAVE_TO_ADDR(slave_addr);
-  uint8_t cmd  = port ? CMD_OUTPUT_1 : CMD_OUTPUT_0;
-  i2c_status_t ret = i2c_writeReg(addr, cmd, &conf, sizeof(conf), TIMEOUT);
-  if (ret != I2C_STATUS_SUCCESS) {
-    print("pca9555_set_output::FAILED\n");
-  }
-}
-uint8_t pca9555_readPins(uint8_t slave_addr, uint8_t port) {
-  uint8_t addr = SLAVE_TO_ADDR(slave_addr);
-  uint8_t cmd  = port ? CMD_INPUT_1 : CMD_INPUT_0;
-  uint8_t      data = 0;
-  i2c_status_t ret  = i2c_readReg(addr, cmd, &data, sizeof(data), TIMEOUT);
-  if (ret != I2C_STATUS_SUCCESS) {
-    print("pca9555_readPins::FAILED\n");
-  }
-  return data;
-}
diff --git a/keyboards/xd96/pca9555.h b/keyboards/xd96/pca9555.h
deleted file mode 100644
index ebb97e2f3..000000000
--- a/keyboards/xd96/pca9555.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Copyright 2019
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-/*
-            PCA9555
-         ,----------.
-   SDA --| SDA  P00 |-- P00
-   SCL --| SCL  P01 |-- P01
-   INT --| INT  P02 |-- P02
-         |      P03 |-- P03
-   A0  --| A0   P04 |-- P04
-   A1  --| A1   P05 |-- P05
-   A2  --| A2   P06 |-- P06
-         |      P07 |-- P07
-         |          |
-         |      P10 |-- P10
-         |      P11 |-- P11
-         |      P12 |-- P12
-         |      P13 |-- P13
-         |      P14 |-- P14
-         |      P15 |-- P15
-         |      P16 |-- P16
-         |      P17 |-- P17
-         `----------'
-*/
-#define PCA9555_PORT0 0
-#define PCA9555_PORT1 1
-#define ALL_OUTPUT 0
-#define ALL_INPUT 0xFF
-#define ALL_LOW 0
-#define ALL_HIGH 0xFF
-void pca9555_init(uint8_t slave_addr);
-void pca9555_set_config(uint8_t slave_addr, uint8_t port, uint8_t conf);
-void pca9555_set_output(uint8_t slave_addr, uint8_t port, uint8_t conf);
-uint8_t pca9555_readPins(uint8_t slave_addr, uint8_t port);
diff --git a/keyboards/xd96/rules.mk b/keyboards/xd96/rules.mk
index 91736bd87..3a97fe5f9 100644
--- a/keyboards/xd96/rules.mk
+++ b/keyboards/xd96/rules.mk
@@ -77,10 +77,12 @@ UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
-HD44780_ENABLE = no             # Enable support for HD44780 based LCDs (+400)
+HD44780_ENABLE = no         # Enable support for HD44780 based LCDs (+400)
 LINK_TIME_OPTIMIZATION_ENABLE = yes
 # custom matrix setup
 CUSTOM_MATRIX = yes
+VPATH += drivers/gpio
 SRC += custom_matrix_helper.c pca9555.c matrix.c
 QUANTUM_LIB_SRC += i2c_master.c

diff --git a/keyboards/moon/pca9555.c b/drivers/gpio/pca9555.c index b0e542d8d..b0e542d8d 100644 --- a/keyboards/moon/pca9555.c +++ b/drivers/gpio/pca9555.c


diff --git a/keyboards/moon/pca9555.h b/drivers/gpio/pca9555.h index ebb97e2f3..ebb97e2f3 100644 --- a/keyboards/moon/pca9555.h +++ b/drivers/gpio/pca9555.h


diff --git a/keyboards/moon/rules.mk b/keyboards/moon/rules.mk index 699fc3395..c8b39e8b7 100644 --- a/keyboards/moon/rules.mk +++ b/keyboards/moon/rules.mk
@@ -1,6 +1,3 @@
1	# Project specific files
2	SRC += i2c_master.c pca9555.c matrix.c
3
4	# MCU name	1	# MCU name
5	MCU = atmega32u4	2	MCU = atmega32u4
6		3
@@ -50,10 +47,6 @@ OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
50	# atmega32a bootloadHID	47	# atmega32a bootloadHID
51	BOOTLOADER = atmel-dfu	48	BOOTLOADER = atmel-dfu
52		49
53
54	# Supported layouts
55	LAYOUTS = tkl_ansi tkl_iso
56
57	# Build Options	50	# Build Options
58	# change yes to no to disable	51	# change yes to no to disable
59	#	52	#
@@ -74,4 +67,13 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
74	AUDIO_ENABLE = no # Audio output on port C6	67	AUDIO_ENABLE = no # Audio output on port C6
75	FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches	68	FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
76	HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400)	69	HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400)
		70
		71	# custom matrix setup
77	CUSTOM_MATRIX = yes	72	CUSTOM_MATRIX = yes
		73
		74	VPATH += drivers/gpio
		75	SRC += pca9555.c matrix.c
		76	QUANTUM_LIB_SRC += i2c_master.c
		77
		78	# Supported layouts
		79	LAYOUTS = tkl_ansi tkl_iso


diff --git a/keyboards/xd84/pca9555.c b/keyboards/xd84/pca9555.c deleted file mode 100644 index b0e542d8d..000000000 --- a/keyboards/xd84/pca9555.c +++ /dev/null
@@ -1,78 +0,0 @@
1	/* Copyright 2019
2	*
3	* This program is free software: you can redistribute it and/or modify
4	* it under the terms of the GNU General Public License as published by
5	* the Free Software Foundation, either version 2 of the License, or
6	* (at your option) any later version.
7	*
8	* This program is distributed in the hope that it will be useful,
9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11	* GNU General Public License for more details.
12	*
13	* You should have received a copy of the GNU General Public License
14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
15	*/
16	#include "i2c_master.h"
17	#include "pca9555.h"
18
19	#include "debug.h"
20
21	#define SLAVE_TO_ADDR(n) (n << 1)
22	#define TIMEOUT 100
23
24	enum {
25	CMD_INPUT_0 = 0,
26	CMD_INPUT_1,
27	CMD_OUTPUT_0,
28	CMD_OUTPUT_1,
29	CMD_INVERSION_0,
30	CMD_INVERSION_1,
31	CMD_CONFIG_0,
32	CMD_CONFIG_1,
33	};
34
35	void pca9555_init(uint8_t slave_addr) {
36	static uint8_t s_init = 0;
37	if (!s_init) {
38	i2c_init();
39
40	s_init = 1;
41	}
42
43	// TODO: could check device connected
44	// i2c_start(SLAVE_TO_ADDR(slave) \| I2C_WRITE);
45	// i2c_stop();
46	}
47
48	void pca9555_set_config(uint8_t slave_addr, uint8_t port, uint8_t conf) {
49	uint8_t addr = SLAVE_TO_ADDR(slave_addr);
50	uint8_t cmd = port ? CMD_CONFIG_1 : CMD_CONFIG_0;
51
52	i2c_status_t ret = i2c_writeReg(addr, cmd, &conf, sizeof(conf), TIMEOUT);
53	if (ret != I2C_STATUS_SUCCESS) {
54	print("pca9555_set_config::FAILED\n");
55	}
56	}
57
58	void pca9555_set_output(uint8_t slave_addr, uint8_t port, uint8_t conf) {
59	uint8_t addr = SLAVE_TO_ADDR(slave_addr);
60	uint8_t cmd = port ? CMD_OUTPUT_1 : CMD_OUTPUT_0;
61
62	i2c_status_t ret = i2c_writeReg(addr, cmd, &conf, sizeof(conf), TIMEOUT);
63	if (ret != I2C_STATUS_SUCCESS) {
64	print("pca9555_set_output::FAILED\n");
65	}
66	}
67
68	uint8_t pca9555_readPins(uint8_t slave_addr, uint8_t port) {
69	uint8_t addr = SLAVE_TO_ADDR(slave_addr);
70	uint8_t cmd = port ? CMD_INPUT_1 : CMD_INPUT_0;
71
72	uint8_t data = 0;
73	i2c_status_t ret = i2c_readReg(addr, cmd, &data, sizeof(data), TIMEOUT);
74	if (ret != I2C_STATUS_SUCCESS) {
75	print("pca9555_readPins::FAILED\n");
76	}
77	return data;
78	}


diff --git a/keyboards/xd84/pca9555.h b/keyboards/xd84/pca9555.h deleted file mode 100644 index ebb97e2f3..000000000 --- a/keyboards/xd84/pca9555.h +++ /dev/null
@@ -1,55 +0,0 @@
1	/* Copyright 2019
2	*
3	* This program is free software: you can redistribute it and/or modify
4	* it under the terms of the GNU General Public License as published by
5	* the Free Software Foundation, either version 2 of the License, or
6	* (at your option) any later version.
7	*
8	* This program is distributed in the hope that it will be useful,
9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11	* GNU General Public License for more details.
12	*
13	* You should have received a copy of the GNU General Public License
14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
15	*/
16	#pragma once
17
18	/*
19	PCA9555
20	,----------.
21	SDA --\| SDA P00 \|-- P00
22	SCL --\| SCL P01 \|-- P01
23	INT --\| INT P02 \|-- P02
24	\| P03 \|-- P03
25	A0 --\| A0 P04 \|-- P04
26	A1 --\| A1 P05 \|-- P05
27	A2 --\| A2 P06 \|-- P06
28	\| P07 \|-- P07
29	\| \|
30	\| P10 \|-- P10
31	\| P11 \|-- P11
32	\| P12 \|-- P12
33	\| P13 \|-- P13
34	\| P14 \|-- P14
35	\| P15 \|-- P15
36	\| P16 \|-- P16
37	\| P17 \|-- P17
38	`----------'
39	*/
40
41	#define PCA9555_PORT0 0
42	#define PCA9555_PORT1 1
43
44	#define ALL_OUTPUT 0
45	#define ALL_INPUT 0xFF
46	#define ALL_LOW 0
47	#define ALL_HIGH 0xFF
48
49	void pca9555_init(uint8_t slave_addr);
50
51	void pca9555_set_config(uint8_t slave_addr, uint8_t port, uint8_t conf);
52
53	void pca9555_set_output(uint8_t slave_addr, uint8_t port, uint8_t conf);
54
55	uint8_t pca9555_readPins(uint8_t slave_addr, uint8_t port);


diff --git a/keyboards/xd84/rules.mk b/keyboards/xd84/rules.mk index e0982e040..916645226 100644 --- a/keyboards/xd84/rules.mk +++ b/keyboards/xd84/rules.mk
@@ -77,11 +77,13 @@ UNICODE_ENABLE = no # Unicode
77	BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID	77	BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
78	AUDIO_ENABLE = no # Audio output on port C6	78	AUDIO_ENABLE = no # Audio output on port C6
79	FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches	79	FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
80	HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400)	80	HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400)
81	LINK_TIME_OPTIMIZATION_ENABLE = yes	81	LINK_TIME_OPTIMIZATION_ENABLE = yes
82		82
83	# custom matrix setup	83	# custom matrix setup
84	CUSTOM_MATRIX = yes	84	CUSTOM_MATRIX = yes
		85
		86	VPATH += drivers/gpio
85	SRC += custom_matrix_helper.c pca9555.c matrix.c	87	SRC += custom_matrix_helper.c pca9555.c matrix.c
86	QUANTUM_LIB_SRC += i2c_master.c	88	QUANTUM_LIB_SRC += i2c_master.c
87		89


diff --git a/keyboards/xd96/pca9555.c b/keyboards/xd96/pca9555.c deleted file mode 100644 index b0e542d8d..000000000 --- a/keyboards/xd96/pca9555.c +++ /dev/null
@@ -1,78 +0,0 @@
1	/* Copyright 2019
2	*
3	* This program is free software: you can redistribute it and/or modify
4	* it under the terms of the GNU General Public License as published by
5	* the Free Software Foundation, either version 2 of the License, or
6	* (at your option) any later version.
7	*
8	* This program is distributed in the hope that it will be useful,
9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11	* GNU General Public License for more details.
12	*
13	* You should have received a copy of the GNU General Public License
14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
15	*/
16	#include "i2c_master.h"
17	#include "pca9555.h"
18
19	#include "debug.h"
20
21	#define SLAVE_TO_ADDR(n) (n << 1)
22	#define TIMEOUT 100
23
24	enum {
25	CMD_INPUT_0 = 0,
26	CMD_INPUT_1,
27	CMD_OUTPUT_0,
28	CMD_OUTPUT_1,
29	CMD_INVERSION_0,
30	CMD_INVERSION_1,
31	CMD_CONFIG_0,
32	CMD_CONFIG_1,
33	};
34
35	void pca9555_init(uint8_t slave_addr) {
36	static uint8_t s_init = 0;
37	if (!s_init) {
38	i2c_init();
39
40	s_init = 1;
41	}
42
43	// TODO: could check device connected
44	// i2c_start(SLAVE_TO_ADDR(slave) \| I2C_WRITE);
45	// i2c_stop();
46	}
47
48	void pca9555_set_config(uint8_t slave_addr, uint8_t port, uint8_t conf) {
49	uint8_t addr = SLAVE_TO_ADDR(slave_addr);
50	uint8_t cmd = port ? CMD_CONFIG_1 : CMD_CONFIG_0;
51
52	i2c_status_t ret = i2c_writeReg(addr, cmd, &conf, sizeof(conf), TIMEOUT);
53	if (ret != I2C_STATUS_SUCCESS) {
54	print("pca9555_set_config::FAILED\n");
55	}
56	}
57
58	void pca9555_set_output(uint8_t slave_addr, uint8_t port, uint8_t conf) {
59	uint8_t addr = SLAVE_TO_ADDR(slave_addr);
60	uint8_t cmd = port ? CMD_OUTPUT_1 : CMD_OUTPUT_0;
61
62	i2c_status_t ret = i2c_writeReg(addr, cmd, &conf, sizeof(conf), TIMEOUT);
63	if (ret != I2C_STATUS_SUCCESS) {
64	print("pca9555_set_output::FAILED\n");
65	}
66	}
67
68	uint8_t pca9555_readPins(uint8_t slave_addr, uint8_t port) {
69	uint8_t addr = SLAVE_TO_ADDR(slave_addr);
70	uint8_t cmd = port ? CMD_INPUT_1 : CMD_INPUT_0;
71
72	uint8_t data = 0;
73	i2c_status_t ret = i2c_readReg(addr, cmd, &data, sizeof(data), TIMEOUT);
74	if (ret != I2C_STATUS_SUCCESS) {
75	print("pca9555_readPins::FAILED\n");
76	}
77	return data;
78	}


diff --git a/keyboards/xd96/pca9555.h b/keyboards/xd96/pca9555.h deleted file mode 100644 index ebb97e2f3..000000000 --- a/keyboards/xd96/pca9555.h +++ /dev/null
@@ -1,55 +0,0 @@
1	/* Copyright 2019
2	*
3	* This program is free software: you can redistribute it and/or modify
4	* it under the terms of the GNU General Public License as published by
5	* the Free Software Foundation, either version 2 of the License, or
6	* (at your option) any later version.
7	*
8	* This program is distributed in the hope that it will be useful,
9	* but WITHOUT ANY WARRANTY; without even the implied warranty of
10	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11	* GNU General Public License for more details.
12	*
13	* You should have received a copy of the GNU General Public License
14	* along with this program. If not, see <http://www.gnu.org/licenses/>.
15	*/
16	#pragma once
17
18	/*
19	PCA9555
20	,----------.
21	SDA --\| SDA P00 \|-- P00
22	SCL --\| SCL P01 \|-- P01
23	INT --\| INT P02 \|-- P02
24	\| P03 \|-- P03
25	A0 --\| A0 P04 \|-- P04
26	A1 --\| A1 P05 \|-- P05
27	A2 --\| A2 P06 \|-- P06
28	\| P07 \|-- P07
29	\| \|
30	\| P10 \|-- P10
31	\| P11 \|-- P11
32	\| P12 \|-- P12
33	\| P13 \|-- P13
34	\| P14 \|-- P14
35	\| P15 \|-- P15
36	\| P16 \|-- P16
37	\| P17 \|-- P17
38	`----------'
39	*/
40
41	#define PCA9555_PORT0 0
42	#define PCA9555_PORT1 1
43
44	#define ALL_OUTPUT 0
45	#define ALL_INPUT 0xFF
46	#define ALL_LOW 0
47	#define ALL_HIGH 0xFF
48
49	void pca9555_init(uint8_t slave_addr);
50
51	void pca9555_set_config(uint8_t slave_addr, uint8_t port, uint8_t conf);
52
53	void pca9555_set_output(uint8_t slave_addr, uint8_t port, uint8_t conf);
54
55	uint8_t pca9555_readPins(uint8_t slave_addr, uint8_t port);


diff --git a/keyboards/xd96/rules.mk b/keyboards/xd96/rules.mk index 91736bd87..3a97fe5f9 100644 --- a/keyboards/xd96/rules.mk +++ b/keyboards/xd96/rules.mk
@@ -77,10 +77,12 @@ UNICODE_ENABLE = no # Unicode
77	BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID	77	BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
78	AUDIO_ENABLE = no # Audio output on port C6	78	AUDIO_ENABLE = no # Audio output on port C6
79	FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches	79	FAUXCLICKY_ENABLE = no # Use buzzer to emulate clicky switches
80	HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400)	80	HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400)
81	LINK_TIME_OPTIMIZATION_ENABLE = yes	81	LINK_TIME_OPTIMIZATION_ENABLE = yes
82		82
83	# custom matrix setup	83	# custom matrix setup
84	CUSTOM_MATRIX = yes	84	CUSTOM_MATRIX = yes
		85
		86	VPATH += drivers/gpio
85	SRC += custom_matrix_helper.c pca9555.c matrix.c	87	SRC += custom_matrix_helper.c pca9555.c matrix.c
86	QUANTUM_LIB_SRC += i2c_master.c	88	QUANTUM_LIB_SRC += i2c_master.c