forked from qmk/qmk_firmware
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Argyle initial commit * Update config.h * Update config.h * fixed * Use json * Update keyboards/argyle/info.json Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/argyle/info.json Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/argyle/info.json Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/argyle/readme.md Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/argyle/info.json Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/argyle/keymaps/via/rules.mk Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/argyle/keymaps/iso/keymap.c Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update keyboards/argyle/info.json Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> * Update info.json * format json * Update keyboards/argyle/rules.mk Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/argyle/info.json Co-authored-by: Drashna Jaelre <drashna@live.com> * Update keyboards/argyle/readme.md Co-authored-by: Tom Barnes <barnestom@me.com> --------- Co-authored-by: yiancar <yiancar@gmail.com> Co-authored-by: Duncan Sutherland <dunk2k_2000@hotmail.com> Co-authored-by: Drashna Jaelre <drashna@live.com> Co-authored-by: Tom Barnes <barnestom@me.com>
- Loading branch information
1 parent
5ddbf60
commit 834fb0b
Showing
8 changed files
with
1,272 additions
and
0 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
/* Copyright 2020 Yiancar | ||
* | ||
* This program is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU General Public License as published by | ||
* the Free Software Foundation, either version 2 of the License, or | ||
* (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU General Public License | ||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
*/ | ||
#include QMK_KEYBOARD_H | ||
|
||
//This is the ANSI version of the PCB | ||
|
||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
[0] = LAYOUT_60_ansi_split_bs_rshift( /* Base */ | ||
QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, | ||
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, | ||
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, | ||
KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, | ||
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1) , KC_APP, KC_RCTL), | ||
|
||
[1] = LAYOUT_60_ansi_split_bs_rshift( /* FN */ | ||
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, | ||
KC_TRNS, KC_TRNS, KC_UP, 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_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
/* Copyright 2020 Yiancar | ||
* | ||
* This program is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU General Public License as published by | ||
* the Free Software Foundation, either version 2 of the License, or | ||
* (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU General Public License | ||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
*/ | ||
#include QMK_KEYBOARD_H | ||
|
||
//This is the ISO version of the PCB | ||
|
||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
[0] = LAYOUT_60_iso_split_bs_rshift( /* Base */ | ||
QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, | ||
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, | ||
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT, | ||
KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, | ||
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1) , KC_APP, KC_RCTL), | ||
|
||
[1] = LAYOUT_60_iso_split_bs_rshift( /* FN */ | ||
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, | ||
KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS , | ||
KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
/* Copyright 2020 Yiancar | ||
* | ||
* This program is free software: you can redistribute it and/or modify | ||
* it under the terms of the GNU General Public License as published by | ||
* the Free Software Foundation, either version 2 of the License, or | ||
* (at your option) any later version. | ||
* | ||
* This program is distributed in the hope that it will be useful, | ||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
* GNU General Public License for more details. | ||
* | ||
* You should have received a copy of the GNU General Public License | ||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
*/ | ||
#include QMK_KEYBOARD_H | ||
|
||
// This keymaps is used for VIA, it reflects the default keymap. | ||
|
||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
[0] = LAYOUT_all( /* Base */ | ||
QK_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_DEL, | ||
KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, | ||
KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, | ||
KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1), | ||
KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1) , KC_APP, KC_RCTL), | ||
|
||
[1] = LAYOUT_all( /* FN */ | ||
KC_GRV, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_TRNS, KC_TRNS, | ||
KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, | ||
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
VIA_ENABLE = yes |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,169 @@ | ||
/* | ||
Copyright 2012-2020 Jun Wako, Jack Humbert, Yiancar | ||
This program is free software: you can redistribute it and/or modify | ||
it under the terms of the GNU General Public License as published by | ||
the Free Software Foundation, either version 2 of the License, or | ||
(at your option) any later version. | ||
This program is distributed in the hope that it will be useful, | ||
but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
GNU General Public License for more details. | ||
You should have received a copy of the GNU General Public License | ||
along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
*/ | ||
#include "atomic_util.h" | ||
#include "wait.h" | ||
#include "matrix.h" | ||
#include "i2c_master.h" | ||
|
||
#define PORT_EXPANDER_ADDRESS 0x20 | ||
|
||
static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS; | ||
static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS; | ||
|
||
static inline void setPinOutput_writeLow(pin_t pin) { | ||
ATOMIC_BLOCK_FORCEON { | ||
setPinOutput(pin); | ||
writePinLow(pin); | ||
} | ||
} | ||
|
||
static inline void setPinOutput_writeHigh(pin_t pin) { | ||
ATOMIC_BLOCK_FORCEON { | ||
setPinOutput(pin); | ||
writePinHigh(pin); | ||
} | ||
} | ||
|
||
static inline void setPinInputHigh_atomic(pin_t pin) { | ||
ATOMIC_BLOCK_FORCEON { | ||
setPinInputHigh(pin); | ||
} | ||
} | ||
|
||
static inline uint8_t readMatrixPin(pin_t pin) { | ||
if (pin != NO_PIN) { | ||
return (readPin(pin) == 0) ? 0 : 1; | ||
} else { | ||
return 1; | ||
} | ||
} | ||
|
||
static bool select_row(uint8_t row) { | ||
pin_t pin = row_pins[row]; | ||
if (pin != NO_PIN) { | ||
setPinOutput_writeLow(pin); | ||
return true; | ||
} | ||
return false; | ||
} | ||
|
||
static void unselect_row(uint8_t row) { | ||
pin_t pin = row_pins[row]; | ||
if (pin != NO_PIN) { | ||
setPinInputHigh_atomic(pin); | ||
} | ||
} | ||
|
||
static void unselect_rows(void) { | ||
for (uint8_t x = 0; x < MATRIX_ROWS; x++) { | ||
unselect_row(x); | ||
} | ||
} | ||
|
||
static void init_pins(void) { | ||
unselect_rows(); | ||
// Set I/O | ||
uint8_t send_data = 0xFF; | ||
i2c_writeReg((PORT_EXPANDER_ADDRESS << 1), 0x00, &send_data, 1, 20); | ||
// Set Pull-up | ||
i2c_writeReg((PORT_EXPANDER_ADDRESS << 1), 0x06, &send_data, 1, 20); | ||
|
||
for (uint8_t x = 0; x < MATRIX_COLS; x++) { | ||
if (col_pins[x] != NO_PIN) { | ||
setPinInputHigh_atomic(col_pins[x]); | ||
} | ||
} | ||
} | ||
|
||
void matrix_init_custom(void) { | ||
// TODO: initialize hardware here | ||
// Initialize I2C | ||
i2c_init(); | ||
|
||
// initialize key pins | ||
init_pins(); | ||
wait_ms(50); | ||
} | ||
|
||
static bool matrix_read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) { | ||
// Store last value of row prior to reading | ||
matrix_row_t last_row_value = current_matrix[current_row]; | ||
|
||
// Clear data in matrix row | ||
current_matrix[current_row] = 0; | ||
|
||
// Select row and wait for row selecton to stabilize | ||
select_row(current_row); | ||
matrix_output_select_delay(); | ||
|
||
uint8_t port_expander_buffer; | ||
i2c_readReg((PORT_EXPANDER_ADDRESS << 1), 0x09, &port_expander_buffer, 1, 20); | ||
|
||
// For each col... | ||
// matrix_row_t row_shifter = MATRIX_ROW_SHIFTER; | ||
for(uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { | ||
uint8_t pin_state; | ||
// Select the col pin to read (active low) | ||
switch (col_index) { | ||
case 6 : | ||
pin_state = port_expander_buffer & (1 << 0); | ||
break; | ||
case 7 : | ||
pin_state = port_expander_buffer & (1 << 1); | ||
break; | ||
case 8 : | ||
pin_state = port_expander_buffer & (1 << 2); | ||
break; | ||
case 9 : | ||
pin_state = port_expander_buffer & (1 << 3); | ||
break; | ||
case 10 : | ||
pin_state = port_expander_buffer & (1 << 4); | ||
break; | ||
case 11 : | ||
pin_state = port_expander_buffer & (1 << 5); | ||
break; | ||
case 12 : | ||
pin_state = port_expander_buffer & (1 << 6); | ||
break; | ||
case 13 : | ||
pin_state = port_expander_buffer & (1 << 7); | ||
break; | ||
default : | ||
pin_state = readMatrixPin(col_pins[col_index]); | ||
} | ||
|
||
// Populate the matrix row with the state of the col pin | ||
current_matrix[current_row] |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index); | ||
} | ||
|
||
// Unselect row | ||
unselect_row(current_row); | ||
|
||
return (last_row_value != current_matrix[current_row]); | ||
} | ||
|
||
bool matrix_scan_custom(matrix_row_t current_matrix[]) { | ||
bool matrix_has_changed = false; | ||
|
||
// Set row, read cols | ||
for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) { | ||
matrix_has_changed |= matrix_read_cols_on_row(current_matrix, current_row); | ||
} | ||
|
||
return matrix_has_changed; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
# Argyle | ||
|
||
![argyle](https://i.imgur.com/6x7ZYhxh.png) | ||
|
||
A 60 percent through hole keyboard with RGB and windows | ||
|
||
Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [GitHub](https://github.com/yiancar) | ||
Hardware Supported: ATMEGA328p with vusb | ||
Hardware Availability: https://prototypist.net/ | ||
|
||
Make example for this keyboard (after setting up your build environment): | ||
|
||
make argyle:default | ||
|
||
Flashing example for this keyboard: | ||
|
||
make argyle:default:flash | ||
|
||
Bootloader: | ||
use usbasploader HSGW's my repository. | ||
https://github.com/hsgw/USBaspLoader/tree/plaid | ||
To put the board in bootloader, either press and hold escape as you plug in, or press the button under the spacebar as you plug in. | ||
See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
SRC += matrix.c | ||
I2C_DRIVER_REQUIRED = yes |