refactor
parent
c4399c1963
commit
8344f05b60
|
@ -10,7 +10,6 @@
|
||||||
|
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "./matrix.h"
|
|
||||||
#include "./controller/mcp23018.h"
|
#include "./controller/mcp23018.h"
|
||||||
#include "./controller/teensy-2-0.h"
|
#include "./controller/teensy-2-0.h"
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,6 @@
|
||||||
#include <avr/pgmspace.h>
|
#include <avr/pgmspace.h>
|
||||||
#include "../lib/keyboard.h"
|
#include "../lib/keyboard.h"
|
||||||
#include "../lib/key-functions/public.h"
|
#include "../lib/key-functions/public.h"
|
||||||
#include "./matrix.h"
|
|
||||||
#include "./controller.h"
|
#include "./controller.h"
|
||||||
|
|
||||||
typedef void (*void_funptr_t)(void);
|
typedef void (*void_funptr_t)(void);
|
||||||
|
|
|
@ -6,14 +6,7 @@
|
||||||
* Project located at <https://github.com/benblazak/ergodox-firmware>
|
* Project located at <https://github.com/benblazak/ergodox-firmware>
|
||||||
* ------------------------------------------------------------------------- */
|
* ------------------------------------------------------------------------- */
|
||||||
|
|
||||||
|
#pragma once
|
||||||
#ifndef KEYBOARD__ERGODOX__MATRIX_h
|
|
||||||
#define KEYBOARD__ERGODOX__MATRIX_h
|
|
||||||
|
|
||||||
// --------------------------------------------------------------------
|
|
||||||
|
|
||||||
#define KB_ROWS 6 // must match real life
|
|
||||||
#define KB_COLUMNS 14 // must match real life
|
|
||||||
|
|
||||||
// --------------------------------------------------------------------
|
// --------------------------------------------------------------------
|
||||||
|
|
||||||
|
@ -99,6 +92,3 @@
|
||||||
kxx,kxx, \
|
kxx,kxx, \
|
||||||
kxx,kxx,kxx, \
|
kxx,kxx,kxx, \
|
||||||
kxx,kxx,kxx ) \
|
kxx,kxx,kxx ) \
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
|
@ -6,9 +6,7 @@
|
||||||
* Project located at <https://github.com/benblazak/ergodox-firmware>
|
* Project located at <https://github.com/benblazak/ergodox-firmware>
|
||||||
* ------------------------------------------------------------------------- */
|
* ------------------------------------------------------------------------- */
|
||||||
|
|
||||||
|
#pragma once
|
||||||
#ifndef KEYBOARD__ERGODOX__OPTIONS_h
|
|
||||||
#define KEYBOARD__ERGODOX__OPTIONS_h
|
|
||||||
|
|
||||||
// --------------------------------------------------------------------
|
// --------------------------------------------------------------------
|
||||||
|
|
||||||
|
@ -37,4 +35,5 @@
|
||||||
#define MCP23018__DRIVE_ROWS 0
|
#define MCP23018__DRIVE_ROWS 0
|
||||||
#define MCP23018__DRIVE_COLUMNS 1
|
#define MCP23018__DRIVE_COLUMNS 1
|
||||||
|
|
||||||
#endif
|
#define KB_ROWS 6 // must match real life
|
||||||
|
#define KB_COLUMNS 14 // must match real life
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "../../main.h"
|
#include "../../main.h"
|
||||||
#include "../../keyboard/layout.h"
|
#include "../../keyboard/layout.h"
|
||||||
#include "../../keyboard/matrix.h"
|
|
||||||
#include "../../lib-other/pjrc/usb_keyboard/usb_keyboard.h"
|
#include "../../lib-other/pjrc/usb_keyboard/usb_keyboard.h"
|
||||||
#include "../../lib/keyboard.h"
|
#include "../../lib/keyboard.h"
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,6 @@
|
||||||
#include "./lib/key-functions/public.h"
|
#include "./lib/key-functions/public.h"
|
||||||
#include "./keyboard/controller.h"
|
#include "./keyboard/controller.h"
|
||||||
#include "./keyboard/layout.h"
|
#include "./keyboard/layout.h"
|
||||||
#include "./keyboard/matrix.h"
|
|
||||||
|
|
||||||
// --------------------------------------------------------------------
|
// --------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue