diff options
author | QMK Bot <hello@qmk.fm> | 2021-09-05 20:37:03 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-09-05 20:37:03 +0000 |
commit | 147289e173999b132f1b97835f8d57716a2bd376 (patch) | |
tree | 8aff70bcbc2bd3bec97a8f46006dab808e9997ca /keyboards/nk65 | |
parent | 673f82ebd9fb48371d815a1c4f8a5bb3d5d0bfe3 (diff) | |
parent | 8d6d8cfadfd1522b3dd2cc8ac1ce7393b45bbe64 (diff) |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards/nk65')
-rwxr-xr-x | keyboards/nk65/config.h | 2 | ||||
-rwxr-xr-x | keyboards/nk65/keymaps/default/keymap.c | 12 | ||||
-rwxr-xr-x | keyboards/nk65/keymaps/via/keymap.c | 12 |
3 files changed, 1 insertions, 25 deletions
diff --git a/keyboards/nk65/config.h b/keyboards/nk65/config.h index a178307cc0..3268e8ebf4 100755 --- a/keyboards/nk65/config.h +++ b/keyboards/nk65/config.h @@ -151,7 +151,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #ifndef FLASHSIZE_BASE # define FLASHSIZE_BASE ((uint32_t)0x1FFFF7CCU) /*!< FLASH Size register base address */ #endif -#define EEPROM_START_ADDRESS +#define FEE_MCU_FLASH_SIZE_IGNORE_CHECK #define FEE_MCU_FLASH_SIZE \ ({ \ uint16_t (*flash_size) = (uint16_t*)FLASHSIZE_BASE; \ diff --git a/keyboards/nk65/keymaps/default/keymap.c b/keyboards/nk65/keymaps/default/keymap.c index a793a8bf41..b4ea68e0e8 100755 --- a/keyboards/nk65/keymaps/default/keymap.c +++ b/keyboards/nk65/keymaps/default/keymap.c @@ -44,15 +44,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), }; - -void matrix_init_user(void) { - //user initialization -} - -void matrix_scan_user(void) { - //user matrix -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; -}
\ No newline at end of file diff --git a/keyboards/nk65/keymaps/via/keymap.c b/keyboards/nk65/keymaps/via/keymap.c index a793a8bf41..b4ea68e0e8 100755 --- a/keyboards/nk65/keymaps/via/keymap.c +++ b/keyboards/nk65/keymaps/via/keymap.c @@ -44,15 +44,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,\ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), }; - -void matrix_init_user(void) { - //user initialization -} - -void matrix_scan_user(void) { - //user matrix -} - -bool process_record_user(uint16_t keycode, keyrecord_t *record) { - return true; -}
\ No newline at end of file |