From fd19795879a92287faa93eb3900ce8d10f89ace3 Mon Sep 17 00:00:00 2001 From: MechMerlin <30334081+mechmerlin@users.noreply.github.com> Date: Sat, 21 Sep 2019 11:27:53 -0700 Subject: [PATCH] [Keyboard] Move more percent boards into the percent directory (#6781) * move canoe into percent directory * update readme for new make path * move skog into percent directory * update readme for new path and new instructions * update readme * fix error in naming --- keyboards/{ => percent}/canoe/canoe.c | 0 keyboards/{ => percent}/canoe/canoe.h | 0 keyboards/{ => percent}/canoe/config.h | 0 keyboards/{ => percent}/canoe/i2c.c | 0 keyboards/{ => percent}/canoe/i2c.h | 0 keyboards/{ => percent}/canoe/info.json | 0 .../canoe/keymaps/boy_314/keymap.c | 0 .../canoe/keymaps/boy_314/readme.md | 0 .../canoe/keymaps/default/keymap.c | 0 .../canoe/keymaps/dhertz/keymap.c | 0 .../{ => percent}/canoe/keymaps/iso/keymap.c | 0 keyboards/{ => percent}/canoe/matrix.c | 0 keyboards/{ => percent}/canoe/readme.md | 12 +++--- keyboards/{ => percent}/canoe/rules.mk | 0 keyboards/{ => percent}/canoe/usbconfig.h | 0 keyboards/{ => percent}/skog/README.md | 38 ++++++------------- keyboards/{ => percent}/skog/backlight.c | 0 .../{ => percent}/skog/backlight_custom.h | 0 .../{ => percent}/skog/breathing_custom.h | 0 keyboards/{ => percent}/skog/config.h | 0 keyboards/{ => percent}/skog/i2c.c | 0 keyboards/{ => percent}/skog/i2c.h | 0 keyboards/{ => percent}/skog/info.json | 0 .../skog/keymaps/default/keymap.c | 0 keyboards/{ => percent}/skog/matrix.c | 0 keyboards/{ => percent}/skog/rules.mk | 0 keyboards/{ => percent}/skog/skog.c | 0 keyboards/{ => percent}/skog/skog.h | 0 keyboards/{ => percent}/skog/usbconfig.h | 0 29 files changed, 17 insertions(+), 33 deletions(-) rename keyboards/{ => percent}/canoe/canoe.c (100%) rename keyboards/{ => percent}/canoe/canoe.h (100%) rename keyboards/{ => percent}/canoe/config.h (100%) rename keyboards/{ => percent}/canoe/i2c.c (100%) rename keyboards/{ => percent}/canoe/i2c.h (100%) rename keyboards/{ => percent}/canoe/info.json (100%) rename keyboards/{ => percent}/canoe/keymaps/boy_314/keymap.c (100%) rename keyboards/{ => percent}/canoe/keymaps/boy_314/readme.md (100%) rename keyboards/{ => percent}/canoe/keymaps/default/keymap.c (100%) rename keyboards/{ => percent}/canoe/keymaps/dhertz/keymap.c (100%) rename keyboards/{ => percent}/canoe/keymaps/iso/keymap.c (100%) rename keyboards/{ => percent}/canoe/matrix.c (100%) rename keyboards/{ => percent}/canoe/readme.md (77%) rename keyboards/{ => percent}/canoe/rules.mk (100%) rename keyboards/{ => percent}/canoe/usbconfig.h (100%) rename keyboards/{ => percent}/skog/README.md (56%) rename keyboards/{ => percent}/skog/backlight.c (100%) rename keyboards/{ => percent}/skog/backlight_custom.h (100%) rename keyboards/{ => percent}/skog/breathing_custom.h (100%) rename keyboards/{ => percent}/skog/config.h (100%) rename keyboards/{ => percent}/skog/i2c.c (100%) rename keyboards/{ => percent}/skog/i2c.h (100%) rename keyboards/{ => percent}/skog/info.json (100%) rename keyboards/{ => percent}/skog/keymaps/default/keymap.c (100%) rename keyboards/{ => percent}/skog/matrix.c (100%) rename keyboards/{ => percent}/skog/rules.mk (100%) rename keyboards/{ => percent}/skog/skog.c (100%) rename keyboards/{ => percent}/skog/skog.h (100%) rename keyboards/{ => percent}/skog/usbconfig.h (100%) diff --git a/keyboards/canoe/canoe.c b/keyboards/percent/canoe/canoe.c similarity index 100% rename from keyboards/canoe/canoe.c rename to keyboards/percent/canoe/canoe.c diff --git a/keyboards/canoe/canoe.h b/keyboards/percent/canoe/canoe.h similarity index 100% rename from keyboards/canoe/canoe.h rename to keyboards/percent/canoe/canoe.h diff --git a/keyboards/canoe/config.h b/keyboards/percent/canoe/config.h similarity index 100% rename from keyboards/canoe/config.h rename to keyboards/percent/canoe/config.h diff --git a/keyboards/canoe/i2c.c b/keyboards/percent/canoe/i2c.c similarity index 100% rename from keyboards/canoe/i2c.c rename to keyboards/percent/canoe/i2c.c diff --git a/keyboards/canoe/i2c.h b/keyboards/percent/canoe/i2c.h similarity index 100% rename from keyboards/canoe/i2c.h rename to keyboards/percent/canoe/i2c.h diff --git a/keyboards/canoe/info.json b/keyboards/percent/canoe/info.json similarity index 100% rename from keyboards/canoe/info.json rename to keyboards/percent/canoe/info.json diff --git a/keyboards/canoe/keymaps/boy_314/keymap.c b/keyboards/percent/canoe/keymaps/boy_314/keymap.c similarity index 100% rename from keyboards/canoe/keymaps/boy_314/keymap.c rename to keyboards/percent/canoe/keymaps/boy_314/keymap.c diff --git a/keyboards/canoe/keymaps/boy_314/readme.md b/keyboards/percent/canoe/keymaps/boy_314/readme.md similarity index 100% rename from keyboards/canoe/keymaps/boy_314/readme.md rename to keyboards/percent/canoe/keymaps/boy_314/readme.md diff --git a/keyboards/canoe/keymaps/default/keymap.c b/keyboards/percent/canoe/keymaps/default/keymap.c similarity index 100% rename from keyboards/canoe/keymaps/default/keymap.c rename to keyboards/percent/canoe/keymaps/default/keymap.c diff --git a/keyboards/canoe/keymaps/dhertz/keymap.c b/keyboards/percent/canoe/keymaps/dhertz/keymap.c similarity index 100% rename from keyboards/canoe/keymaps/dhertz/keymap.c rename to keyboards/percent/canoe/keymaps/dhertz/keymap.c diff --git a/keyboards/canoe/keymaps/iso/keymap.c b/keyboards/percent/canoe/keymaps/iso/keymap.c similarity index 100% rename from keyboards/canoe/keymaps/iso/keymap.c rename to keyboards/percent/canoe/keymaps/iso/keymap.c diff --git a/keyboards/canoe/matrix.c b/keyboards/percent/canoe/matrix.c similarity index 100% rename from keyboards/canoe/matrix.c rename to keyboards/percent/canoe/matrix.c diff --git a/keyboards/canoe/readme.md b/keyboards/percent/canoe/readme.md similarity index 77% rename from keyboards/canoe/readme.md rename to keyboards/percent/canoe/readme.md index 729ab1a0fa..45773e4683 100644 --- a/keyboards/canoe/readme.md +++ b/keyboards/percent/canoe/readme.md @@ -1,5 +1,4 @@ -CANOE -======== +# Canoe A 65% keyboard with some RGB @@ -9,7 +8,7 @@ Hardware Availability: https://geekhack.org/index.php?topic=92418.0 Make example for this keyboard (after setting up your build environment): - make canoe:default + make percent/canoe:default Flashing @@ -33,12 +32,13 @@ macOS: ``` 3. Install the following packages: ``` - brew install python - pip install pyusb + brew install python3 + pip3 install pyusb brew install --HEAD https://raw.githubusercontent.com/robertgzr/homebrew-tap/master/bootloadhid.rb + ``` 4. Place your keyboard into reset. 5. Flash the board by typing `bootloadHID -r` followed by the path to your `.hex` file. -See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. +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). diff --git a/keyboards/canoe/rules.mk b/keyboards/percent/canoe/rules.mk similarity index 100% rename from keyboards/canoe/rules.mk rename to keyboards/percent/canoe/rules.mk diff --git a/keyboards/canoe/usbconfig.h b/keyboards/percent/canoe/usbconfig.h similarity index 100% rename from keyboards/canoe/usbconfig.h rename to keyboards/percent/canoe/usbconfig.h diff --git a/keyboards/skog/README.md b/keyboards/percent/skog/README.md similarity index 56% rename from keyboards/skog/README.md rename to keyboards/percent/skog/README.md index 51a792b6bd..5b7dacd915 100644 --- a/keyboards/skog/README.md +++ b/keyboards/percent/skog/README.md @@ -1,5 +1,4 @@ -Skog TKL by Percent -========================== +# Skog TKL Keyboard Maintainer: QMK Community Hardware Supported: Skog PCB @@ -7,21 +6,14 @@ Hardware Availability: https://geekhack.org/index.php?topic=87953.0 Make example for this keyboard (after setting up your build environment): - make skog:default + make percent/skog:default -## Setting the board to bootloader mode - -If you're lucky, the programming script does this automagically for you. If -however this doesn't work for you, you need to enter the bootloader mode manually -by plugging the keyboard in while holding the bootloader key. If you did this -correctly the LEDs will blink and you'll be able to flash your firmware. - -The bootloader key is in the top-right (Pause). - -## Flashing +Flashing ps2avr(GB) boards use an atmega32a microcontroller and a different bootloader. It is not flashable using the regular QMK methods. +**Reset Key:** Hold down the key located at `K00`, commonly programmed as Pause while plugging in the keyboard. + Windows: 1. Download [HIDBootFlash](http://vusb.wikidot.com/project:hidbootflash). 2. Place your keyboard into reset. @@ -40,22 +32,14 @@ macOS: ``` 3. Install the following packages: ``` - brew install python - brew install pyusb - brew install --HEAD`https://raw.githubusercontent.com/robertgzr/homebrew-tap/master/bootloadhid.rb + brew install python3 + pip3 install pyusb + brew install --HEAD https://raw.githubusercontent.com/robertgzr/homebrew-tap/master/bootloadhid.rb + ``` 4. Place your keyboard into reset. 5. Flash the board by typing `bootloadHID -r` followed by the path to your `.hex` file. -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). +**Please Note:** You will need to use the `EEP_RST` keycode first, followed by unplugging/replugging the board to get RGB underglow effects to work. -## Troubleshooting - -From my experience, it's really hard to brick these boards. But these -tricks have been useful when it got stuck in a weird scenario. - -1. Try plugging the board in while holding the bootloader key. This will force - it to boot only the bootloader without loading the firmware. Once this is - done, just reflash the board with the original firmware. -2. Sometimes USB hubs can act weird, so try connecting the board directly - to your computer or plugging/unplugging the USB hub. +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). \ No newline at end of file diff --git a/keyboards/skog/backlight.c b/keyboards/percent/skog/backlight.c similarity index 100% rename from keyboards/skog/backlight.c rename to keyboards/percent/skog/backlight.c diff --git a/keyboards/skog/backlight_custom.h b/keyboards/percent/skog/backlight_custom.h similarity index 100% rename from keyboards/skog/backlight_custom.h rename to keyboards/percent/skog/backlight_custom.h diff --git a/keyboards/skog/breathing_custom.h b/keyboards/percent/skog/breathing_custom.h similarity index 100% rename from keyboards/skog/breathing_custom.h rename to keyboards/percent/skog/breathing_custom.h diff --git a/keyboards/skog/config.h b/keyboards/percent/skog/config.h similarity index 100% rename from keyboards/skog/config.h rename to keyboards/percent/skog/config.h diff --git a/keyboards/skog/i2c.c b/keyboards/percent/skog/i2c.c similarity index 100% rename from keyboards/skog/i2c.c rename to keyboards/percent/skog/i2c.c diff --git a/keyboards/skog/i2c.h b/keyboards/percent/skog/i2c.h similarity index 100% rename from keyboards/skog/i2c.h rename to keyboards/percent/skog/i2c.h diff --git a/keyboards/skog/info.json b/keyboards/percent/skog/info.json similarity index 100% rename from keyboards/skog/info.json rename to keyboards/percent/skog/info.json diff --git a/keyboards/skog/keymaps/default/keymap.c b/keyboards/percent/skog/keymaps/default/keymap.c similarity index 100% rename from keyboards/skog/keymaps/default/keymap.c rename to keyboards/percent/skog/keymaps/default/keymap.c diff --git a/keyboards/skog/matrix.c b/keyboards/percent/skog/matrix.c similarity index 100% rename from keyboards/skog/matrix.c rename to keyboards/percent/skog/matrix.c diff --git a/keyboards/skog/rules.mk b/keyboards/percent/skog/rules.mk similarity index 100% rename from keyboards/skog/rules.mk rename to keyboards/percent/skog/rules.mk diff --git a/keyboards/skog/skog.c b/keyboards/percent/skog/skog.c similarity index 100% rename from keyboards/skog/skog.c rename to keyboards/percent/skog/skog.c diff --git a/keyboards/skog/skog.h b/keyboards/percent/skog/skog.h similarity index 100% rename from keyboards/skog/skog.h rename to keyboards/percent/skog/skog.h diff --git a/keyboards/skog/usbconfig.h b/keyboards/percent/skog/usbconfig.h similarity index 100% rename from keyboards/skog/usbconfig.h rename to keyboards/percent/skog/usbconfig.h