summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorMechMerlin <30334081+mechmerlin@users.noreply.github.com>2019-08-07 19:02:27 -0700
committerDrashna Jaelre <drashna@live.com>2019-08-07 19:02:27 -0700
commit2c0c25d0140d75e0cd005b10aa5bc35837c363f5 (patch)
tree129de3377360fdf869c5d68555a6bf9b7b743052 /keyboards
parent8479dd65d404ff5e401ea80dfb16160d65247307 (diff)
Move Alice to TGR Directory (#6502)
* git mv alice into the tgr directory * update readme with new build instructions
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/alice/readme.md60
-rw-r--r--keyboards/tgr/alice/alice.c (renamed from keyboards/alice/alice.c)0
-rw-r--r--keyboards/tgr/alice/alice.h (renamed from keyboards/alice/alice.h)0
-rw-r--r--keyboards/tgr/alice/config.h (renamed from keyboards/alice/config.h)0
-rw-r--r--keyboards/tgr/alice/info.json (renamed from keyboards/alice/info.json)0
-rw-r--r--keyboards/tgr/alice/keymaps/default/keymap.c (renamed from keyboards/alice/keymaps/default/keymap.c)0
-rw-r--r--keyboards/tgr/alice/keymaps/mrkeebs/keymap.c (renamed from keyboards/alice/keymaps/mrkeebs/keymap.c)0
-rw-r--r--keyboards/tgr/alice/readme.md48
-rw-r--r--keyboards/tgr/alice/rules.mk (renamed from keyboards/alice/rules.mk)0
-rw-r--r--keyboards/tgr/alice/usbconfig.h (renamed from keyboards/alice/usbconfig.h)0
10 files changed, 48 insertions, 60 deletions
diff --git a/keyboards/alice/readme.md b/keyboards/alice/readme.md
deleted file mode 100644
index 8e901ae7e4..0000000000
--- a/keyboards/alice/readme.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# TGR Alice
-
-![TGR Alice](https://i.imgur.com/cJohEqS.jpg)
-
-An ergonomic 60% keyboard.
-
-Keyboard Maintainer: [Felipe Coury](https://github.com/fcoury)
-Hardware Supported: TGR Alice
-Hardware Availability: Group buy finished
-
-Make example for this keyboard (after setting up your build environment):
-
- make alice:default
-
-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.
-
-
-ps2avrGB keyboard firmware
-==========================
-
-This keyboard uses the port of the QMK firmware for boards that are based on the
-ps2avrGB firmware.
-
-Note that this is a complete replacement for the firmware, so you won't be
-using Bootmapper Client to change any keyboard settings, since not all the
-USB report options are supported.
-
-## Installing
-
-First, install the requirements. These commands are for OSX, but all you
-need is the AVR toolchain and `bootloadHID` for flashing:
-
-```
-$ brew cask install crosspack-avr
-$ brew install --HEAD https://raw.githubusercontent.com/robertgzr/homebrew-tap/master/bootloadhid.rb
-$ pip install pyusb
-```
-
-Then, with the keyboard plugged in, simply run this command from the
-`qmk_firmware` directory:
-
-```
-$ make alice
-$ bootloadHID -r alice_default.hex
-```
-
-## Setting the board to bootloader mode
-
-Hold the ESC key (the one before the 1! key, in case you remaped it).
-
-## 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.
diff --git a/keyboards/alice/alice.c b/keyboards/tgr/alice/alice.c
index adb88fef0a..adb88fef0a 100644
--- a/keyboards/alice/alice.c
+++ b/keyboards/tgr/alice/alice.c
diff --git a/keyboards/alice/alice.h b/keyboards/tgr/alice/alice.h
index 1486612f9f..1486612f9f 100644
--- a/keyboards/alice/alice.h
+++ b/keyboards/tgr/alice/alice.h
diff --git a/keyboards/alice/config.h b/keyboards/tgr/alice/config.h
index 2200fbbe46..2200fbbe46 100644
--- a/keyboards/alice/config.h
+++ b/keyboards/tgr/alice/config.h
diff --git a/keyboards/alice/info.json b/keyboards/tgr/alice/info.json
index b262093326..b262093326 100644
--- a/keyboards/alice/info.json
+++ b/keyboards/tgr/alice/info.json
diff --git a/keyboards/alice/keymaps/default/keymap.c b/keyboards/tgr/alice/keymaps/default/keymap.c
index 29fff66183..29fff66183 100644
--- a/keyboards/alice/keymaps/default/keymap.c
+++ b/keyboards/tgr/alice/keymaps/default/keymap.c
diff --git a/keyboards/alice/keymaps/mrkeebs/keymap.c b/keyboards/tgr/alice/keymaps/mrkeebs/keymap.c
index 3d8099c413..3d8099c413 100644
--- a/keyboards/alice/keymaps/mrkeebs/keymap.c
+++ b/keyboards/tgr/alice/keymaps/mrkeebs/keymap.c
diff --git a/keyboards/tgr/alice/readme.md b/keyboards/tgr/alice/readme.md
new file mode 100644
index 0000000000..f5db63814b
--- /dev/null
+++ b/keyboards/tgr/alice/readme.md
@@ -0,0 +1,48 @@
+# Alice
+
+![TGR Alice](https://i.imgur.com/cJohEqS.jpg)
+
+An ergonomic 60% keyboard.
+
+Keyboard Maintainer: [Felipe Coury](https://github.com/fcoury)
+Hardware Supported: TGR Alice
+Hardware Availability: Group buy finished
+
+Make example for this keyboard (after setting up your build environment):
+
+ make tgr/alice:default
+
+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 `Esc` while plugging in the keyboard.
+
+Windows:
+1. Download [HIDBootFlash](http://vusb.wikidot.com/project:hidbootflash).
+2. Place your keyboard into reset.
+3. Press the `Find Device` button and ensure that your keyboard is found.
+4. Press the `Open .hex File` button and locate the `.hex` file you created.
+5. Press the `Flash Device` button and wait for the process to complete.
+
+macOS:
+1. Install homebrew by typing the following:
+ ```
+ /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+ ```
+2. Install `crosspack-avr`.
+ ```
+ brew cask install crosspack-avr
+ ```
+3. Install the following packages:
+ ```
+ 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).
diff --git a/keyboards/alice/rules.mk b/keyboards/tgr/alice/rules.mk
index eecd38d7e7..eecd38d7e7 100644
--- a/keyboards/alice/rules.mk
+++ b/keyboards/tgr/alice/rules.mk
diff --git a/keyboards/alice/usbconfig.h b/keyboards/tgr/alice/usbconfig.h
index df7a88e3ab..df7a88e3ab 100644
--- a/keyboards/alice/usbconfig.h
+++ b/keyboards/tgr/alice/usbconfig.h