diff options
| author | Damien <Dbroqua@users.noreply.github.com> | 2017-04-29 15:03:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-29 15:03:52 +0200 |
| commit | 584b804ee33d53102fef3b8cdd045bca4c47bf26 (patch) | |
| tree | cccdc512fed02293ffd0bfb962ec14d8a8664e7f /keyboards/ergodox/infinity | |
| parent | 215dd126d08b29939c53bf0eaa006ce6ecdedb83 (diff) | |
| parent | 26bbfd78125224abdbd2e4ccf3aa3df1b5fc4968 (diff) | |
Merge pull request #21 from qmk/master
Merge from QMK
Diffstat (limited to 'keyboards/ergodox/infinity')
| -rw-r--r-- | keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h | 2 | ||||
| -rw-r--r-- | keyboards/ergodox/infinity/matrix.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h index e8c17e6e33..9650ffb440 100644 --- a/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h +++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h @@ -75,7 +75,7 @@ static GFXINLINE void init_board(GDisplay *g) { palSetPad(ST7565_GPIOPORT, ST7565_RST_PIN); palSetPadModeRaw(MOSI, ST7565_SPI_MODE); palSetPadModeRaw(SLCK, ST7565_SPI_MODE); - palSetPadModeRaw(SS, PAL_MODE_OUTPUT_PUSHPULL); + palSetPadModeNamed(SS, PAL_MODE_OUTPUT_PUSHPULL); spiInit(); spiStart(&SPID1, &spi1config); diff --git a/keyboards/ergodox/infinity/matrix.c b/keyboards/ergodox/infinity/matrix.c index 1fda904849..3364f8c905 100644 --- a/keyboards/ergodox/infinity/matrix.c +++ b/keyboards/ergodox/infinity/matrix.c @@ -24,6 +24,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #include "print.h" #include "debug.h" #include "matrix.h" +#include "serial_link/system/serial_link.h" /* |