Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enables I2C for OLKB rev*_drop boards #14514

Merged
merged 3 commits into from
Sep 19, 2021
Merged

Enables I2C for OLKB rev*_drop boards #14514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
20ff1ae
Change printf to dprintf
daskygit Sep 19, 2021
9cd29bd
enable i2c for _drop revs
jackhumbert Sep 19, 2021
4923de0
Merge branch 'fix/new_drop_revs' into olkb_i2c
jackhumbert Sep 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions keyboards/planck/rev6_drop/halconf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
12 changes: 6 additions & 6 deletions keyboards/planck/rev6_drop/matrix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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");
}
}
5 changes: 5 additions & 0 deletions keyboards/planck/rev6_drop/mcuconf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

1 change: 1 addition & 0 deletions keyboards/preonic/rev3_drop/halconf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
12 changes: 6 additions & 6 deletions keyboards/preonic/rev3_drop/matrix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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");
}
}
4 changes: 4 additions & 0 deletions keyboards/preonic/rev3_drop/mcuconf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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