summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2021-09-19 14:43:37 -0400
committerGitHub <noreply@github.com>2021-09-19 11:43:37 -0700
commitfa5d21a58ebfe9782225c857ad2e533a0f65d161 (patch)
treeea7c0c8e70b2c0f64396fa92ed521a5f2f4cd40c
parent0e34efd9a2dd401a7cd38f552f7247b8afcb65fc (diff)
[Keyboard] Enables I2C for OLKB rev*_drop boards (#14514)
Co-authored-by: daskygit <32983009+daskygit@users.noreply.github.com>
-rw-r--r--keyboards/planck/rev6_drop/halconf.h1
-rw-r--r--keyboards/planck/rev6_drop/matrix.c12
-rw-r--r--keyboards/planck/rev6_drop/mcuconf.h5
-rw-r--r--keyboards/preonic/rev3_drop/halconf.h1
-rw-r--r--keyboards/preonic/rev3_drop/matrix.c12
-rw-r--r--keyboards/preonic/rev3_drop/mcuconf.h4
6 files changed, 23 insertions, 12 deletions
diff --git a/keyboards/planck/rev6_drop/halconf.h b/keyboards/planck/rev6_drop/halconf.h
index 48b76d2f44..153eacb212 100644
--- a/keyboards/planck/rev6_drop/halconf.h
+++ b/keyboards/planck/rev6_drop/halconf.h
@@ -18,5 +18,6 @@
#define HAL_USE_PWM TRUE
#define HAL_USE_GPT TRUE
#define HAL_USE_DAC TRUE
+#define HAL_USE_I2C TRUE
#include_next <halconf.h>
diff --git a/keyboards/planck/rev6_drop/matrix.c b/keyboards/planck/rev6_drop/matrix.c
index 1fb6ba0d42..49e115d029 100644
--- a/keyboards/planck/rev6_drop/matrix.c
+++ b/keyboards/planck/rev6_drop/matrix.c
@@ -43,7 +43,7 @@ __attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); }
__attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); }
void matrix_init(void) {
- printf("matrix init\n");
+ dprintf("matrix init\n");
// debug_matrix = true;
// actual matrix setup
@@ -151,16 +151,16 @@ bool matrix_is_on(uint8_t row, uint8_t col) { return (matrix[row] & (1 << col));
matrix_row_t matrix_get_row(uint8_t row) { return matrix[row]; }
void matrix_print(void) {
- printf("\nr/c 01234567\n");
+ dprintf("\nr/c 01234567\n");
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
- printf("%X0: ", row);
+ dprintf("%X0: ", row);
matrix_row_t data = matrix_get_row(row);
for (int col = 0; col < MATRIX_COLS; col++) {
if (data & (1 << col))
- printf("1");
+ dprintf("1");
else
- printf("0");
+ dprintf("0");
}
- printf("\n");
+ dprintf("\n");
}
}
diff --git a/keyboards/planck/rev6_drop/mcuconf.h b/keyboards/planck/rev6_drop/mcuconf.h
index 31abf13b63..d7c29fcf65 100644
--- a/keyboards/planck/rev6_drop/mcuconf.h
+++ b/keyboards/planck/rev6_drop/mcuconf.h
@@ -37,3 +37,8 @@
// TIM2 to TIM3.
#undef STM32_ST_USE_TIMER
#define STM32_ST_USE_TIMER 3
+
+// enable i2c
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
+
diff --git a/keyboards/preonic/rev3_drop/halconf.h b/keyboards/preonic/rev3_drop/halconf.h
index 48b76d2f44..153eacb212 100644
--- a/keyboards/preonic/rev3_drop/halconf.h
+++ b/keyboards/preonic/rev3_drop/halconf.h
@@ -18,5 +18,6 @@
#define HAL_USE_PWM TRUE
#define HAL_USE_GPT TRUE
#define HAL_USE_DAC TRUE
+#define HAL_USE_I2C TRUE
#include_next <halconf.h>
diff --git a/keyboards/preonic/rev3_drop/matrix.c b/keyboards/preonic/rev3_drop/matrix.c
index b094d28cdc..392997e0a5 100644
--- a/keyboards/preonic/rev3_drop/matrix.c
+++ b/keyboards/preonic/rev3_drop/matrix.c
@@ -43,7 +43,7 @@ __attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); }
__attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); }
void matrix_init(void) {
- printf("matrix init\n");
+ dprintf("matrix init\n");
// debug_matrix = true;
// actual matrix setup
@@ -153,16 +153,16 @@ bool matrix_is_on(uint8_t row, uint8_t col) { return (matrix[row] & (1 << col));
matrix_row_t matrix_get_row(uint8_t row) { return matrix[row]; }
void matrix_print(void) {
- printf("\nr/c 01234567\n");
+ dprintf("\nr/c 01234567\n");
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
- printf("%X0: ", row);
+ dprintf("%X0: ", row);
matrix_row_t data = matrix_get_row(row);
for (int col = 0; col < MATRIX_COLS; col++) {
if (data & (1 << col))
- printf("1");
+ dprintf("1");
else
- printf("0");
+ dprintf("0");
}
- printf("\n");
+ dprintf("\n");
}
}
diff --git a/keyboards/preonic/rev3_drop/mcuconf.h b/keyboards/preonic/rev3_drop/mcuconf.h
index 31abf13b63..b51bf6708e 100644
--- a/keyboards/preonic/rev3_drop/mcuconf.h
+++ b/keyboards/preonic/rev3_drop/mcuconf.h
@@ -37,3 +37,7 @@
// TIM2 to TIM3.
#undef STM32_ST_USE_TIMER
#define STM32_ST_USE_TIMER 3
+
+// enable i2c
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE \ No newline at end of file