summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMechMerlin <30334081+mechmerlin@users.noreply.github.com>2018-08-22 20:14:52 -0700
committerDrashna Jaelre <drashna@live.com>2018-08-22 20:14:52 -0700
commit5d8d3509762407997626d15700094cad066dcf6d (patch)
treef9a2e5363ebb165b79528cf33cadc310b3c96fe0
parent6076ed85be111f0e88c7049aa3d2e69eed5005a1 (diff)
Keyboard: Finish up the HSE now that I have a board to play with! (#3728)
* fix up readmes * update keymap to match configurator default * add more info
-rw-r--r--keyboards/1up60hse/config.h4
-rw-r--r--keyboards/1up60hse/keymaps/default/keymap.c45
-rw-r--r--keyboards/1up60hse/keymaps/default/readme.md7
-rw-r--r--keyboards/1up60hse/readme.md8
4 files changed, 22 insertions, 42 deletions
diff --git a/keyboards/1up60hse/config.h b/keyboards/1up60hse/config.h
index b89a13b3d2..c3682de43e 100644
--- a/keyboards/1up60hse/config.h
+++ b/keyboards/1up60hse/config.h
@@ -23,9 +23,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define VENDOR_ID 0xFEED
#define PRODUCT_ID 0x0000
#define DEVICE_VER 0x0001
-#define MANUFACTURER You
+#define MANUFACTURER 1upkeyboards
#define PRODUCT 1up60hse
-#define DESCRIPTION A custom keyboard
+#define DESCRIPTION A custom 60% keyboard
/* key matrix size */
#define MATRIX_ROWS 5
diff --git a/keyboards/1up60hse/keymaps/default/keymap.c b/keyboards/1up60hse/keymaps/default/keymap.c
index 040f9ebedb..556246a3b2 100644
--- a/keyboards/1up60hse/keymaps/default/keymap.c
+++ b/keyboards/1up60hse/keymaps/default/keymap.c
@@ -19,51 +19,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[0] = LAYOUT_60_ansi(
KC_ESC, 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_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_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
+ MO(1), 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_LSFT,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_LALT, MO(1), KC_RGUI, KC_LCTL),
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(2), KC_RGUI, KC_RCTL),
[1] = LAYOUT_60_ansi(
- 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_DEL,
+ 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_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
- KC_CAPS, 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_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
KC_LSFT, 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),
-};
-
-
-const uint16_t PROGMEM fn_actions[] = {
-
-};
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
- // MACRODOWN only works in this function
- switch(id) {
- case 0:
- if (record->event.pressed) {
- register_code(KC_RSFT);
- } else {
- unregister_code(KC_RSFT);
- }
- break;
- }
- return MACRO_NONE;
+ [2] = LAYOUT_60_ansi(
+ RESET, 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, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_STEP, BL_DEC, BL_INC, BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS,
+ KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD, RGB_HUI, RGB_MOD, RGB_TOG, 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) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
return true;
}
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/keyboards/1up60hse/keymaps/default/readme.md b/keyboards/1up60hse/keymaps/default/readme.md
index 22f10a9312..a9afa5ea6d 100644
--- a/keyboards/1up60hse/keymaps/default/readme.md
+++ b/keyboards/1up60hse/keymaps/default/readme.md
@@ -1 +1,6 @@
-# The default keymap for 1up60hse
+# 1up60hse default keymap
+
+This is the default keymap provided by [1upkeyboards](https://www.1upkeyboards.com).
+
+## Notes
+- Software reset key is located on `Esc` on the third layer.
diff --git a/keyboards/1up60hse/readme.md b/keyboards/1up60hse/readme.md
index 021e84d1e9..5ea040bf4a 100644
--- a/keyboards/1up60hse/readme.md
+++ b/keyboards/1up60hse/readme.md
@@ -1,11 +1,11 @@
-# 1up60hse
+# 1up60hse (hot swap edition)
-![1up60hse](imgur.com image replace me!)
+![1up60hse](https://i2.wp.com/www.1upkeyboards.com/wp-content/uploads/2018/08/PCB-1up-60-hotswap-group-RGB.jpg?fit=1280%2C1280&ssl=1)
-A 60% PCB with USB C, RGB underglow, backlighting, and hotswappable switches.
+A 60% PCB with USB C, RGB underglow, backlighting, hotswappable switches, and a standard ANSI layout.
Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin)
-Hardware Supported: 1up60hse 60% PCB.
+Hardware Supported: 1up60hse 60% PCB.
Hardware Availability: [1upkeyboards.com](https://www.1upkeyboards.com/shop/controllers/1up-rgb-pcb-hse/)
Make example for this keyboard (after setting up your build environment):