From 9bb4e63a1123861515c1196a624b4a0f04129601 Mon Sep 17 00:00:00 2001 From: fauxpark Date: Wed, 21 Aug 2019 11:05:08 +1000 Subject: Remove old promicro_bootloader_jmp() declarations (#6444) --- keyboards/handwired/dactyl_manuform/4x5/4x5.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'keyboards/handwired/dactyl_manuform/4x5') diff --git a/keyboards/handwired/dactyl_manuform/4x5/4x5.h b/keyboards/handwired/dactyl_manuform/4x5/4x5.h index b34d97adbf..a70f52f3e1 100644 --- a/keyboards/handwired/dactyl_manuform/4x5/4x5.h +++ b/keyboards/handwired/dactyl_manuform/4x5/4x5.h @@ -2,10 +2,8 @@ #include "dactyl_manuform.h" -//void promicro_bootloader_jmp(bool program); #include "quantum.h" - #ifdef USE_I2C #include #ifdef __AVR__ @@ -14,8 +12,6 @@ #endif #endif -//void promicro_bootloader_jmp(bool program); - #ifndef FLIP_HALF #define LAYOUT( \ L00, L01, L02, L03, L04, R00, R01, R02, R03, R04, \ -- cgit v1.2.3 From b0b433f3cf3d20ddcd10a2897646208c785e26c9 Mon Sep 17 00:00:00 2001 From: Dimitri Krassovski Date: Fri, 4 Oct 2019 22:00:14 +0300 Subject: [Keyboard] Match dactyl-manufom 4x5 layout in doc to actual (#6867) * Match doc layout to actual Raise and Lower were swapped, and there is no "10" button :) * Make mouse button 2 really 2, not a clone of MB1 --- keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'keyboards/handwired/dactyl_manuform/4x5') diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c index 2e5cfd7ced..4836bb0694 100644 --- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c +++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c @@ -20,7 +20,7 @@ extern keymap_config_t keymap_config; #define KC_MU KC_MS_UP #define KC_MD KC_MS_DOWN #define KC_MB1 KC_MS_BTN1 -#define KC_MB2 KC_MS_BTN1 +#define KC_MB2 KC_MS_BTN2 #define RAISE MO(_RAISE) #define LOWER MO(_LOWER) @@ -44,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * '------+------' '------+------' * | TAB | HOME | | END | DEL | * '------+------' '------+------' - * | Lower| ~ | | GUI | Raise| + * | Raise| ~ | | GUI | Lower| * '------+------' '------+------' */ @@ -92,7 +92,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * ,----------------------------------, ,----------------------------------, * | F1 | F2 | F3 | F4 | F5 | | F6 | F7 | F8 | F9 | F10 | * |------+------+------+------+------| |-------------+------+------+------| - * | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 10 | + * | 1 | 2 | 3 | 4 | 5 | | 6 | 7 | 8 | 9 | 0 | * |------+------+------+------+------| |------|------+------+------+------| * | ! | @ | # | $ | % | | ^ | & | * | ( | ) | * |------+------+------+-------------, ,-------------+------+------+------, -- cgit v1.2.3 From 3dbf08b655ac1f14bc7a5ae2b8cd8ae385063640 Mon Sep 17 00:00:00 2001 From: fauxpark Date: Mon, 21 Oct 2019 06:51:37 +1100 Subject: Cleanup rules.mk for 32U4 keyboards, H (#7030) * Cleanup rules.mk for 32U4 keyboards, H * Change some boards incorrectly assumed to be halfkay --- keyboards/handwired/dactyl_manuform/4x5/keymaps/default/rules.mk | 0 keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/rules.mk | 0 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 keyboards/handwired/dactyl_manuform/4x5/keymaps/default/rules.mk delete mode 100644 keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/rules.mk (limited to 'keyboards/handwired/dactyl_manuform/4x5') diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/rules.mk b/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/rules.mk b/keyboards/handwired/dactyl_manuform/4x5/keymaps/dvorak/rules.mk deleted file mode 100644 index e69de29bb2..0000000000 -- cgit v1.2.3 From e6b9980bd45c186f7360df68c24b6e05a80c10dc Mon Sep 17 00:00:00 2001 From: Drashna Jaelre Date: Wed, 20 Nov 2019 14:31:36 -0800 Subject: Remove keymap_config extern from default keymaps (#7399) * Remove keymap_config extern from default keymaps * Revert unicode Apparently VSCode does not like unicode, I didn't actually edit these lines, so it must have been automatic... :( Co-Authored-By: fauxpark --- keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c | 1 - 1 file changed, 1 deletion(-) (limited to 'keyboards/handwired/dactyl_manuform/4x5') diff --git a/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c b/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c index 4836bb0694..1a328f9d0a 100644 --- a/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c +++ b/keyboards/handwired/dactyl_manuform/4x5/keymaps/default/keymap.c @@ -1,6 +1,5 @@ #include QMK_KEYBOARD_H -extern keymap_config_t keymap_config; #define _BASE 0 #define _RAISE 1 -- cgit v1.2.3