summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMechMerlin <30334081+mechmerlin@users.noreply.github.com>2019-09-21 11:27:53 -0700
committerDrashna Jaelre <drashna@live.com>2019-09-21 11:27:53 -0700
commitfd19795879a92287faa93eb3900ce8d10f89ace3 (patch)
tree1bc5e25ff2f52e0b1bfd4bd289b164e7a890436a
parentf069e9fc09859baf03d940b6db47e95c50a24936 (diff)
downloadqmk_firmware-fd19795879a92287faa93eb3900ce8d10f89ace3.tar.gz
qmk_firmware-fd19795879a92287faa93eb3900ce8d10f89ace3.zip
[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
-rw-r--r--keyboards/percent/canoe/canoe.c (renamed from keyboards/canoe/canoe.c)0
-rw-r--r--keyboards/percent/canoe/canoe.h (renamed from keyboards/canoe/canoe.h)0
-rw-r--r--keyboards/percent/canoe/config.h (renamed from keyboards/canoe/config.h)0
-rw-r--r--keyboards/percent/canoe/i2c.c (renamed from keyboards/canoe/i2c.c)0
-rw-r--r--keyboards/percent/canoe/i2c.h (renamed from keyboards/canoe/i2c.h)0
-rw-r--r--keyboards/percent/canoe/info.json (renamed from keyboards/canoe/info.json)0
-rw-r--r--keyboards/percent/canoe/keymaps/boy_314/keymap.c (renamed from keyboards/canoe/keymaps/boy_314/keymap.c)0
-rw-r--r--keyboards/percent/canoe/keymaps/boy_314/readme.md (renamed from keyboards/canoe/keymaps/boy_314/readme.md)0
-rw-r--r--keyboards/percent/canoe/keymaps/default/keymap.c (renamed from keyboards/canoe/keymaps/default/keymap.c)0
-rw-r--r--keyboards/percent/canoe/keymaps/dhertz/keymap.c (renamed from keyboards/canoe/keymaps/dhertz/keymap.c)0
-rw-r--r--keyboards/percent/canoe/keymaps/iso/keymap.c (renamed from keyboards/canoe/keymaps/iso/keymap.c)0
-rw-r--r--keyboards/percent/canoe/matrix.c (renamed from keyboards/canoe/matrix.c)0
-rw-r--r--keyboards/percent/canoe/readme.md (renamed from keyboards/canoe/readme.md)12
-rw-r--r--keyboards/percent/canoe/rules.mk (renamed from keyboards/canoe/rules.mk)0
-rw-r--r--keyboards/percent/canoe/usbconfig.h (renamed from keyboards/canoe/usbconfig.h)0
-rw-r--r--keyboards/percent/skog/README.md (renamed from keyboards/skog/README.md)38
-rw-r--r--keyboards/percent/skog/backlight.c (renamed from keyboards/skog/backlight.c)0
-rw-r--r--keyboards/percent/skog/backlight_custom.h (renamed from keyboards/skog/backlight_custom.h)0
-rw-r--r--keyboards/percent/skog/breathing_custom.h (renamed from keyboards/skog/breathing_custom.h)0
-rw-r--r--keyboards/percent/skog/config.h (renamed from keyboards/skog/config.h)0
-rw-r--r--keyboards/percent/skog/i2c.c (renamed from keyboards/skog/i2c.c)0
-rw-r--r--keyboards/percent/skog/i2c.h (renamed from keyboards/skog/i2c.h)0
-rw-r--r--keyboards/percent/skog/info.json (renamed from keyboards/skog/info.json)0
-rw-r--r--keyboards/percent/skog/keymaps/default/keymap.c (renamed from keyboards/skog/keymaps/default/keymap.c)0
-rw-r--r--keyboards/percent/skog/matrix.c (renamed from keyboards/skog/matrix.c)0
-rw-r--r--keyboards/percent/skog/rules.mk (renamed from keyboards/skog/rules.mk)0
-rw-r--r--keyboards/percent/skog/skog.c (renamed from keyboards/skog/skog.c)0
-rw-r--r--keyboards/percent/skog/skog.h (renamed from keyboards/skog/skog.h)0
-rw-r--r--keyboards/percent/skog/usbconfig.h (renamed from keyboards/skog/usbconfig.h)0
29 files changed, 17 insertions, 33 deletions
diff --git a/keyboards/canoe/canoe.c b/keyboards/percent/canoe/canoe.c
index a7427e1528..a7427e1528 100644
--- a/keyboards/canoe/canoe.c
+++ b/keyboards/percent/canoe/canoe.c
diff --git a/keyboards/canoe/canoe.h b/keyboards/percent/canoe/canoe.h
index 22f2a1f22d..22f2a1f22d 100644
--- a/keyboards/canoe/canoe.h
+++ b/keyboards/percent/canoe/canoe.h
diff --git a/keyboards/canoe/config.h b/keyboards/percent/canoe/config.h
index 45581b5493..45581b5493 100644
--- a/keyboards/canoe/config.h
+++ b/keyboards/percent/canoe/config.h
diff --git a/keyboards/canoe/i2c.c b/keyboards/percent/canoe/i2c.c
index a4f9521352..a4f9521352 100644
--- a/keyboards/canoe/i2c.c
+++ b/keyboards/percent/canoe/i2c.c
diff --git a/keyboards/canoe/i2c.h b/keyboards/percent/canoe/i2c.h
index 93a69c94da..93a69c94da 100644
--- a/keyboards/canoe/i2c.h
+++ b/keyboards/percent/canoe/i2c.h
diff --git a/keyboards/canoe/info.json b/keyboards/percent/canoe/info.json
index 17bdacaa5d..17bdacaa5d 100644
--- a/keyboards/canoe/info.json
+++ b/keyboards/percent/canoe/info.json
diff --git a/keyboards/canoe/keymaps/boy_314/keymap.c b/keyboards/percent/canoe/keymaps/boy_314/keymap.c
index e3b4c88d28..e3b4c88d28 100644
--- a/keyboards/canoe/keymaps/boy_314/keymap.c
+++ b/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
index 3db01a66d0..3db01a66d0 100644
--- a/keyboards/canoe/keymaps/boy_314/readme.md
+++ b/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
index fc67308476..fc67308476 100644
--- a/keyboards/canoe/keymaps/default/keymap.c
+++ b/keyboards/percent/canoe/keymaps/default/keymap.c
diff --git a/keyboards/canoe/keymaps/dhertz/keymap.c b/keyboards/percent/canoe/keymaps/dhertz/keymap.c
index bc8a4bca20..bc8a4bca20 100644
--- a/keyboards/canoe/keymaps/dhertz/keymap.c
+++ b/keyboards/percent/canoe/keymaps/dhertz/keymap.c
diff --git a/keyboards/canoe/keymaps/iso/keymap.c b/keyboards/percent/canoe/keymaps/iso/keymap.c
index 89af719d12..89af719d12 100644
--- a/keyboards/canoe/keymaps/iso/keymap.c
+++ b/keyboards/percent/canoe/keymaps/iso/keymap.c
diff --git a/keyboards/canoe/matrix.c b/keyboards/percent/canoe/matrix.c
index 245813dfd2..245813dfd2 100644
--- a/keyboards/canoe/matrix.c
+++ b/keyboards/percent/canoe/matrix.c
diff --git a/keyboards/canoe/readme.md b/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
index 8cfc810566..8cfc810566 100644
--- a/keyboards/canoe/rules.mk
+++ b/keyboards/percent/canoe/rules.mk
diff --git a/keyboards/canoe/usbconfig.h b/keyboards/percent/canoe/usbconfig.h
index d2d848fcdc..d2d848fcdc 100644
--- a/keyboards/canoe/usbconfig.h
+++ b/keyboards/percent/canoe/usbconfig.h
diff --git a/keyboards/skog/README.md b/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).
-
-## 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.
+**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.
-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
index 94e8126d88..94e8126d88 100644
--- a/keyboards/skog/backlight.c
+++ b/keyboards/percent/skog/backlight.c
diff --git a/keyboards/skog/backlight_custom.h b/keyboards/percent/skog/backlight_custom.h
index 51365fe3ba..51365fe3ba 100644
--- a/keyboards/skog/backlight_custom.h
+++ b/keyboards/percent/skog/backlight_custom.h
diff --git a/keyboards/skog/breathing_custom.h b/keyboards/percent/skog/breathing_custom.h
index 71416b1b45..71416b1b45 100644
--- a/keyboards/skog/breathing_custom.h
+++ b/keyboards/percent/skog/breathing_custom.h
diff --git a/keyboards/skog/config.h b/keyboards/percent/skog/config.h
index ed7c558db7..ed7c558db7 100644
--- a/keyboards/skog/config.h
+++ b/keyboards/percent/skog/config.h
diff --git a/keyboards/skog/i2c.c b/keyboards/percent/skog/i2c.c
index a4f9521352..a4f9521352 100644
--- a/keyboards/skog/i2c.c
+++ b/keyboards/percent/skog/i2c.c
diff --git a/keyboards/skog/i2c.h b/keyboards/percent/skog/i2c.h
index ada8cc7bf1..ada8cc7bf1 100644
--- a/keyboards/skog/i2c.h
+++ b/keyboards/percent/skog/i2c.h
diff --git a/keyboards/skog/info.json b/keyboards/percent/skog/info.json
index 06fad3a741..06fad3a741 100644
--- a/keyboards/skog/info.json
+++ b/keyboards/percent/skog/info.json
diff --git a/keyboards/skog/keymaps/default/keymap.c b/keyboards/percent/skog/keymaps/default/keymap.c
index eefc24cb0d..eefc24cb0d 100644
--- a/keyboards/skog/keymaps/default/keymap.c
+++ b/keyboards/percent/skog/keymaps/default/keymap.c
diff --git a/keyboards/skog/matrix.c b/keyboards/percent/skog/matrix.c
index 245813dfd2..245813dfd2 100644
--- a/keyboards/skog/matrix.c
+++ b/keyboards/percent/skog/matrix.c
diff --git a/keyboards/skog/rules.mk b/keyboards/percent/skog/rules.mk
index b8439906b8..b8439906b8 100644
--- a/keyboards/skog/rules.mk
+++ b/keyboards/percent/skog/rules.mk
diff --git a/keyboards/skog/skog.c b/keyboards/percent/skog/skog.c
index 3d1eb0e1a1..3d1eb0e1a1 100644
--- a/keyboards/skog/skog.c
+++ b/keyboards/percent/skog/skog.c
diff --git a/keyboards/skog/skog.h b/keyboards/percent/skog/skog.h
index 17be94621b..17be94621b 100644
--- a/keyboards/skog/skog.h
+++ b/keyboards/percent/skog/skog.h
diff --git a/keyboards/skog/usbconfig.h b/keyboards/percent/skog/usbconfig.h
index 481d7c0b14..481d7c0b14 100644
--- a/keyboards/skog/usbconfig.h
+++ b/keyboards/percent/skog/usbconfig.h