diff options
| author | Andrew Kannan <andrew.kannan@klaviyo.com> | 2020-07-27 12:16:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-27 12:16:21 -0400 |
| commit | b0e99c803dba3f8768ad8f0c8df8ce0b3183794a (patch) | |
| tree | 810a9d55df4356673c0b54645fe8df8464faf3c7 | |
| parent | 463c97f4c690ae3c0463965648fb4f565305ef74 (diff) | |
| download | qmk_firmware-b0e99c803dba3f8768ad8f0c8df8ce0b3183794a.tar.gz qmk_firmware-b0e99c803dba3f8768ad8f0c8df8ce0b3183794a.zip | |
Atlas Updates (#9343)
* Update atlas keyboard files and default keyboard layout
* Remove wierd LT things
* Update keyboards/cannonkeys/atlas/keymaps/via/keymap.c
Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Joel Challis <git@zvecr.com>
| -rw-r--r-- | keyboards/cannonkeys/atlas/config.h | 2 | ||||
| -rw-r--r-- | keyboards/cannonkeys/atlas/keymaps/default/keymap.c | 11 | ||||
| -rw-r--r-- | keyboards/cannonkeys/atlas/keymaps/via/keymap.c | 4 |
3 files changed, 9 insertions, 8 deletions
diff --git a/keyboards/cannonkeys/atlas/config.h b/keyboards/cannonkeys/atlas/config.h index 6cd1d1b6e..4dfd445c8 100644 --- a/keyboards/cannonkeys/atlas/config.h +++ b/keyboards/cannonkeys/atlas/config.h | |||
| @@ -29,7 +29,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 29 | #define MATRIX_ROWS 5 | 29 | #define MATRIX_ROWS 5 |
| 30 | #define MATRIX_COLS 12 | 30 | #define MATRIX_COLS 12 |
| 31 | 31 | ||
| 32 | #define MATRIX_COL_PINS { A9, A10, A15, B9, C13, C14, C15, F0, F1, A0, A1, A2 } | 32 | #define MATRIX_COL_PINS { A2, A1, A0, F1, F0, C15, C14, C13, B9, A15, A10, A9 } |
| 33 | #define MATRIX_ROW_PINS { A8, B14, B12, B4, B3 } | 33 | #define MATRIX_ROW_PINS { A8, B14, B12, B4, B3 } |
| 34 | #define DIODE_DIRECTION COL2ROW | 34 | #define DIODE_DIRECTION COL2ROW |
| 35 | 35 | ||
diff --git a/keyboards/cannonkeys/atlas/keymaps/default/keymap.c b/keyboards/cannonkeys/atlas/keymaps/default/keymap.c index 705d31a40..a57e66e31 100644 --- a/keyboards/cannonkeys/atlas/keymaps/default/keymap.c +++ b/keyboards/cannonkeys/atlas/keymaps/default/keymap.c | |||
| @@ -47,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 47 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, \ | 47 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, \ |
| 48 | KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ | 48 | KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ |
| 49 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, \ | 49 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, \ |
| 50 | BL_TOGG, KC_LCTL, KC_LALT, KC_LGUI, MO(_LOWER), KC_SPC, KC_SPC, MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ | 50 | RGB_MOD, KC_LCTL, KC_LALT, KC_LGUI, MO(_LOWER), KC_SPC, KC_SPC, MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ |
| 51 | ), | 51 | ), |
| 52 | /* Lower | 52 | /* Lower |
| 53 | * ,-----------------------------------------------------------------------------------. | 53 | * ,-----------------------------------------------------------------------------------. |
| @@ -84,10 +84,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 84 | * `-----------------------------------------------------------------------------------' | 84 | * `-----------------------------------------------------------------------------------' |
| 85 | */ | 85 | */ |
| 86 | [_RAISE] = LAYOUT_ortho_5x12( \ | 86 | [_RAISE] = LAYOUT_ortho_5x12( \ |
| 87 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ | 87 | KC_GRV, KC_1, RGB_SAI, RGB_VAI, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, \ |
| 88 | KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \ | 88 | KC_GRV, KC_1, RGB_SAD, RGB_VAD, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, \ |
| 89 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ | 89 | KC_DEL, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS, \ |
| 90 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, \ | 90 | _______, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______, \ |
| 91 | RGB_TOG, RGB_MOD, BL_INC, BL_DEC, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ | 91 | RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY \ |
| 92 | ) | 92 | ) |
| 93 | }; | 93 | } |
| 94 | ; | ||
diff --git a/keyboards/cannonkeys/atlas/keymaps/via/keymap.c b/keyboards/cannonkeys/atlas/keymaps/via/keymap.c index 2e72c8f9d..43a3b01a2 100644 --- a/keyboards/cannonkeys/atlas/keymaps/via/keymap.c +++ b/keyboards/cannonkeys/atlas/keymaps/via/keymap.c | |||
| @@ -48,11 +48,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | |||
| 48 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, \ | 48 | KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, \ |
| 49 | KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ | 49 | KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, \ |
| 50 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, \ | 50 | KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, \ |
| 51 | BL_TOGG, KC_LCTL, KC_LALT, KC_LGUI, MO(_LOWER), KC_SPC, KC_SPC, MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ | 51 | RGB_MOD, KC_LCTL, KC_LALT, KC_LGUI, MO(_LOWER), KC_SPC, KC_SPC, MO(_RAISE), KC_LEFT, KC_DOWN, KC_UP, KC_RGHT \ |
| 52 | ), | 52 | ), |
| 53 | /* Lower | 53 | /* Lower |
| 54 | * ,-----------------------------------------------------------------------------------. | 54 | * ,-----------------------------------------------------------------------------------. |
| 55 | * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | | 55 | * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp |n |
| 56 | * |------+------+------+------+------+-------------+------+------+------+------+------| | 56 | * |------+------+------+------+------+-------------+------+------+------+------+------| |
| 57 | * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Del | | 57 | * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Del | |
| 58 | * |------+------+------+------+------+-------------+------+------+------+------+------| | 58 | * |------+------+------+------+------+-------------+------+------+------+------+------| |
