diff --git a/.gitignore b/.gitignore index 76d09a6806..1ff0f2fa98 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,12 @@ -keyboard/planck/dfu-programmer.exe +keyboards/planck/dfu-programmer.exe .dep *.o *.eep *.elf /*.hex -/keyboard/**/*.hex -/keyboard/**/keymaps/**/*.hex -!/keyboard/**/keymaps/**/compiled.hex +/keyboards/**/*.hex +/keyboards/**/keymaps/**/*.hex +!/keyboards/**/keymaps/**/compiled.hex *.log *.lss *.lst diff --git a/.travis.yml b/.travis.yml index 436c17338a..151f8618de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,7 +29,7 @@ env: - KEYBOARD=sixkeyboard script: - - cd keyboard/$KEYBOARD && make all-keymaps + - cd keyboards/$KEYBOARD && make all-keymaps addons: apt: diff --git a/Makefile b/Makefile index 607636035b..93e8fc4045 100644 --- a/Makefile +++ b/Makefile @@ -7,8 +7,8 @@ starting_makefile := $(subst $(space),_SPACE_,$(abspath $(firstword $(MAKEFILE_L mkfile_path := $(subst $(space),_SPACE_,$(abspath $(lastword $(MAKEFILE_LIST)))) abs_tmk_root := $(patsubst %/,%,$(dir $(mkfile_path))) -ifneq (,$(findstring /keyboard/,$(starting_makefile))) - possible_keyboard:=$(patsubst %/,%,$(dir $(patsubst $(abs_tmk_root)/keyboard/%,%,$(starting_makefile)))) +ifneq (,$(findstring /keyboards/,$(starting_makefile))) + possible_keyboard:=$(patsubst %/,%,$(dir $(patsubst $(abs_tmk_root)/keyboards/%,%,$(starting_makefile)))) ifneq (,$(findstring /keymaps/,$(possible_keyboard))) KEYBOARD_DIR:=$(firstword $(subst /keymaps/, ,$(possible_keyboard))) KEYMAP_DIR:=$(lastword $(subst /keymaps/, ,$(possible_keyboard))) @@ -41,9 +41,9 @@ endif ifndef KEYBOARD KEYBOARD=planck endif -KEYBOARD_PATH = $(TOP_DIR)/keyboard/$(KEYBOARD) +KEYBOARD_PATH = $(TOP_DIR)/keyboards/$(KEYBOARD) ifneq ("$(wildcard $(KEYBOARD_PATH)/$(KEYBOARD).c)","") - KEYBOARD_FILE = keyboard/$(KEYBOARD)/$(KEYBOARD).c + KEYBOARD_FILE = keyboards/$(KEYBOARD)/$(KEYBOARD).c ifndef ARCH include $(KEYBOARD_PATH)/Makefile endif @@ -62,7 +62,7 @@ ifndef KEYMAP endif KEYMAP_PATH = $(KEYBOARD_PATH)/keymaps/$(KEYMAP) ifneq ("$(wildcard $(KEYMAP_PATH)/keymap.c)","") - KEYMAP_FILE = keyboard/$(KEYBOARD)/keymaps/$(KEYMAP)/keymap.c + KEYMAP_FILE = keyboards/$(KEYBOARD)/keymaps/$(KEYMAP)/keymap.c -include $(KEYMAP_PATH)/Makefile else $(error "$(KEYMAP_PATH)/keymap.c" does not exist) diff --git a/README.md b/README.md index be7cd0a851..f6e0daa8ec 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ The OLKB product firmwares are maintained by Jack, the Ergodox EZ by Erez, and t This is not a tiny project. While this is the main Readme, there are many other files you might want to consult. Here are some points of interest: -* The Readme for your own keyboard: This is found under `keyboards//`. So for the ErgoDox EZ, it's [here](keyboard/ergodox_ez/); for the Atomic, it's [here](keyboard/atomic/) and so on. +* The Readme for your own keyboard: This is found under `keyboards//`. So for the ErgoDox EZ, it's [here](keyboards/ergodox_ez/); for the Atomic, it's [here](keyboards/atomic/) and so on. * The [build guide](doc/BUILD_GUIDE.md), also mentioned in the next section. This is how you put your development environment together so you can compile the firmware. * The list of possible keycodes you can use in your keymap is actually spread out in a few different places: * [tmk_core/common/keycode.h](tmk_core/common/keycode.h) - the base TMK keycodes. This is the actual source file. @@ -23,9 +23,9 @@ This is not a tiny project. While this is the main Readme, there are many other ## Getting started -* [BUILD_GUIDE.md](doc/BUILD_GUIDE.md) contains instructions to set up a build environment, build the firmware, and deploy it to a keyboard. Once your build environment has been set up, all `make` commands to actually build the firmware must be run from a folder in `keyboard/`. -* If you're looking to customize a keyboard that currently runs QMK or TMK, find your keyboard's directory under `keyboard/` and run the make commands from there. -* If you're looking to apply this firmware to an entirely new hardware project (a new kind of keyboard), you can create your own Quantum-based project by using `util/new_project.sh `, which will create `/keyboard/` with all the necessary components for a Quantum project. +* [BUILD_GUIDE.md](doc/BUILD_GUIDE.md) contains instructions to set up a build environment, build the firmware, and deploy it to a keyboard. Once your build environment has been set up, all `make` commands to actually build the firmware must be run from a folder in `keyboards/`. +* If you're looking to customize a keyboard that currently runs QMK or TMK, find your keyboard's directory under `keyboards/` and run the make commands from there. +* If you're looking to apply this firmware to an entirely new hardware project (a new kind of keyboard), you can create your own Quantum-based project by using `util/new_project.sh `, which will create `/keyboards/` with all the necessary components for a Quantum project. ### Makefile Options @@ -307,7 +307,7 @@ If you have a bunch of macros you want to refer to from your keymap, while keepi #define EXT_PLV M(13) ``` -As was done on the [Planck default keymap](/keyboard/planck/keymaps/default/keymap.c#L33-L40) +As was done on the [Planck default keymap](/keyboards/planck/keymaps/default/keymap.c#L33-L40) #### Timer functionality @@ -400,7 +400,7 @@ Enable the backlight from the Makefile. Your keyboard can make sounds! If you've got a Planck, Preonic, or basically any keyboard that allows access to the C6 port, you can hook up a simple speaker and have it beep. You can use those beeps to indicate layer transitions, modifiers, special keys, or just to play some funky 8bit tunes. -The audio code lives in [quantum/audio/audio.h](/quantum/audio/audio.h) and in the other files in the audio directory. It's enabled by default on the Planck [stock keymap](/keyboard/planck/keymaps/default/keymap.c). Here are the important bits: +The audio code lives in [quantum/audio/audio.h](/quantum/audio/audio.h) and in the other files in the audio directory. It's enabled by default on the Planck [stock keymap](/keyboards/planck/keymaps/default/keymap.c). Here are the important bits: ``` #include "audio.h" @@ -475,7 +475,7 @@ AutoHotkey inserts the Text right of `Send, ` when this combination is pressed. ## RGB Under Glow Mod -![Planck with RGB Underglow](https://raw.githubusercontent.com/yangliu/qmk_firmware/planck-rgb/keyboard/planck/keymaps/yang/planck-with-rgb-underglow.jpg) +![Planck with RGB Underglow](https://raw.githubusercontent.com/yangliu/qmk_firmware/planck-rgb/keyboards/planck/keymaps/yang/planck-with-rgb-underglow.jpg) Here is a quick demo on Youtube (with NPKC KC60) (https://www.youtube.com/watch?v=VKrpPAHlisY). @@ -501,11 +501,11 @@ You'll need to edit `PORTF`, `DDRF`, and `PF4` on the first three lines to the p #define ws2812_DDRREG DDRB #define ws2812_pin PB3 -The firmware supports 5 different light effects, and the color (hue, saturation, brightness) can be customized in most effects. To control the underglow, you need to modify your keymap file to assign those functions to some keys/key combinations. For details, please check this keymap. `keyboard/planck/keymaps/yang/keymap.c` +The firmware supports 5 different light effects, and the color (hue, saturation, brightness) can be customized in most effects. To control the underglow, you need to modify your keymap file to assign those functions to some keys/key combinations. For details, please check this keymap. `keyboards/planck/keymaps/yang/keymap.c` ### WS2812 Wiring -![WS2812 Wiring](https://raw.githubusercontent.com/yangliu/qmk_firmware/planck-rgb/keyboard/planck/keymaps/yang/WS2812-wiring.jpg) +![WS2812 Wiring](https://raw.githubusercontent.com/yangliu/qmk_firmware/planck-rgb/keyboards/planck/keymaps/yang/WS2812-wiring.jpg) Please note the USB port can only supply a limited amount of power to the keyboard (500mA by standard, however, modern computer and most usb hubs can provide 700+mA.). According to the data of NeoPixel from Adafruit, 30 WS2812 LEDs require a 5V 1A power supply, LEDs used in this mod should not more than 20. diff --git a/doc/BUILD_GUIDE.md b/doc/BUILD_GUIDE.md index 5636c65ea4..c9a760107e 100644 --- a/doc/BUILD_GUIDE.md +++ b/doc/BUILD_GUIDE.md @@ -40,20 +40,20 @@ If you have any problems building the firmware, you can try using a tool called ## Verify Your Installation 1. If you haven't already, obtain this repository ([https://github.com/jackhumbert/qmk_firmware](https://github.com/jackhumbert/qmk_firmware)). You can either download it as a zip file and extract it, or clone it using the command line tool git or the Github Desktop application. 2. Open up a terminal or command prompt and navigate to the `qmk_firmware` folder using the `cd` command. The command prompt will typically open to your home directory. If, for example, you cloned the repository to your Documents folder, then you would type `cd Documents/qmk_firmware`. If you extracted the file from a zip, then it may be named `qmk_firmware-master` instead. -3. To confirm that you're in the correct location, you can display the contents of your current folder using the `dir` command on Windows, or the `ls` command on Linux or Mac. You should see several files, including `README.md` and a `quantum` folder. From here, you need to navigate to the appropriate folder under `keyboard/`. For example, if you're building for a Planck, run `cd keyboard/planck`. +3. To confirm that you're in the correct location, you can display the contents of your current folder using the `dir` command on Windows, or the `ls` command on Linux or Mac. You should see several files, including `README.md` and a `quantum` folder. From here, you need to navigate to the appropriate folder under `keyboards/`. For example, if you're building for a Planck, run `cd keyboards/planck`. 4. Once you're in the correct keyboard-specific folder, run the `make` command. This should output a lot of information about the build process. More information about the `make` command can be found below. ## Customizing, Building, and Deploying Your Firmware ### The Make command -The `make` command is how you compile the firmware into a .hex file, which can be loaded by a dfu programmer (like dfu-progammer via `make dfu`) or the [Teensy loader](https://www.pjrc.com/teensy/loader.html) (only used with Teensys). You can run `make` from the root (`/`), your keyboard folder (`/keyboard//`), or your keymap folder (`/keyboard//keymaps//`) if you have a `Makefile` there (see the example [here](/doc/keymap_makefile_example.mk)). +The `make` command is how you compile the firmware into a .hex file, which can be loaded by a dfu programmer (like dfu-progammer via `make dfu`) or the [Teensy loader](https://www.pjrc.com/teensy/loader.html) (only used with Teensys). You can run `make` from the root (`/`), your keyboard folder (`/keyboards//`), or your keymap folder (`/keyboards//keymaps//`) if you have a `Makefile` there (see the example [here](/doc/keymap_makefile_example.mk)). By default, this will generate a `_.hex` file in whichever folder you run `make` from. These files are ignored by git, so don't worry about deleting them when committing/creating pull requests. Your .hex file will also be copied into your keymap folder as `compiled.hex`, which isn't ignored by git - this is included in case first-time users are having trouble compiling, and just want to flash a layout via `make dfu-no-build` or using the Teensy loader. * The "root" (`/`) folder is the qmk_firmware folder, in which are `doc`, `keyboard`, `quantum`, etc. -* The "keyboard" folder is any keyboard project's folder, like `/keyboard/planck`. -* The "keymap" folder is any keymap's folder, like `/keyboard/planck/keymaps/default`. +* The "keyboard" folder is any keyboard project's folder, like `/keyboards/planck`. +* The "keymap" folder is any keymap's folder, like `/keyboards/planck/keymaps/default`. Below is a list of the useful `make` commands in QMK: @@ -80,8 +80,8 @@ Other, less useful functionality: There are 3 different `make` and `Makefile` locations: * root (`/`) -* keyboard (`/keyboard//`) -* keymap (`/keyboard//keymaps//`) +* keyboard (`/keyboards//`) +* keymap (`/keyboards//keymaps//`) The root contains the code used to automatically figure out which keymap or keymaps to compile based on your current directory and commandline arguments. It's considered stable, and shouldn't be modified. The keyboard one will contain the MCU set-up and default settings for your keyboard, and shouldn't be modified unless you are the producer of that keyboard. The keymap Makefile can be modified by users, and is optional. It is included automatically if it exists. You can see an example [here](/doc/keymap_makefile_example.mk) - the last few lines are the most important. The settings you set here will override any defaults set in the keyboard Makefile. **It is required if you want to run `make` in the keymap folder.** @@ -89,8 +89,8 @@ The root contains the code used to automatically figure out which keymap or keym There are 2 `config.h` locations: -* keyboard (`/keyboard//`) -* keymap (`/keyboard//keymaps//`) +* keyboard (`/keyboards//`) +* keymap (`/keyboards//keymaps//`) The keyboard `config.h` is included only if the keymap one doesn't exist. The format to use for your custom one [is here](/doc/keymap_config_h_example.h). If you want to override a setting from the parent `config.h` file, you need to do this: diff --git a/doc/CYGWIN_GUIDE.md b/doc/CYGWIN_GUIDE.md index ac13e745d7..05e7a55f76 100755 --- a/doc/CYGWIN_GUIDE.md +++ b/doc/CYGWIN_GUIDE.md @@ -235,7 +235,7 @@ If you did everything else right. This part should be a snap! Grab the latest so ``` $ cd ~/src $ git clone https://github.com/jackhumbert/qmk_firmware.git -$ cd qmk_firmware/keyboard/planck +$ cd qmk_firmware/keyboards/planck $ make ``` diff --git a/doc/FUSE.txt b/doc/FUSE.txt index 40055e5ab1..99ddd2d186 100644 --- a/doc/FUSE.txt +++ b/doc/FUSE.txt @@ -1,3 +1,12 @@ +Atmega32u4 Fuse/Lock Bits for Planck/Atomic/Preonic +========================= + + Low Fuse: 0x5E + High Fuse: 0x99 + Extended Fuse: 0xF3 + Lock Byte: 0xFF + + ATMega168P Fuse/Lock Bits ========================= This configuration is from usbasploader's Makefile. @@ -38,3 +47,4 @@ This configuration is from usbasploader's Makefile. # | | +----- LB 2..1 (No memory lock features enabled) # | +--------- BLB0 2..1 (No restrictions for SPM or LPM accessing the Application section) # +--------------- BLB1 2..1 (No restrictions for SPM or LPM accessing the Boot Loader section) + diff --git a/doc/HAND_WIRE.md b/doc/HAND_WIRE.md index 073dbf447e..bb3683cb9c 100644 --- a/doc/HAND_WIRE.md +++ b/doc/HAND_WIRE.md @@ -185,13 +185,13 @@ From here, you should have a working keyboard with the correct firmware. Before To start out, download [the firmware](https://github.com/jackhumbert/qmk_firmware/) - we'll be using my (Jack's) fork of TMK called QMK/Quantum. We'll be doing a lot from the Terminal/command prompt, so get that open, along with a decent text editor like [Sublime Text](http://www.sublimetext.com/). -The first thing we're going to do is create a new project using the script in the root directory of the firmware. In your terminal, run this command with `` replaced by the name of your project - it'll need to be different from any other project in the `keyboard/` folder: +The first thing we're going to do is create a new project using the script in the root directory of the firmware. In your terminal, run this command with `` replaced by the name of your project - it'll need to be different from any other project in the `keyboards/` folder: util/new_project.sh -You'll want to navigate to the `keyboard//` folder by typing, like the print-out from the script specifies: +You'll want to navigate to the `keyboards//` folder by typing, like the print-out from the script specifies: - cd keyboard/ + cd keyboards/ #### config.h @@ -286,7 +286,7 @@ After you've written out your entire keymap, you're ready to get the firmware co Once everything is installed, running `make` in the terminal should get you some output, and eventually a `.hex` file in that folder. If you're having trouble with this step, see the end of the guide for the trouble-shooting section. -Once you have your `.hex` file, open up the Teensy loader application, and click the file icon. From here, navigate to your `QMK/keyboard//` folder, and select the `.hex` file. Plug in your keyboard and press the button on the Teensy - you should see the LED on the device turn off once you do. The Teensy Loader app will change a little, and the buttons should be clickable - click the download button (down arrow), and then the reset button (right arrow), and your keyboard should be ready to go! +Once you have your `.hex` file, open up the Teensy loader application, and click the file icon. From here, navigate to your `QMK/keyboards//` folder, and select the `.hex` file. Plug in your keyboard and press the button on the Teensy - you should see the LED on the device turn off once you do. The Teensy Loader app will change a little, and the buttons should be clickable - click the download button (down arrow), and then the reset button (right arrow), and your keyboard should be ready to go! #### Testing your firmware diff --git a/doc/PCB_GUIDE.md b/doc/PCB_GUIDE.md index b36d8fb64c..3fad41dfb4 100644 --- a/doc/PCB_GUIDE.md +++ b/doc/PCB_GUIDE.md @@ -33,7 +33,7 @@ Note that, since it will be directly accessing USB hardware, the ## Verify Your Installation 1. Clone the following repository: https://github.com/jackhumbert/qmk_firmware -2. Open a Terminal and `cd` into `qmk_firmware/keyboard/planck` +2. Open a Terminal and `cd` into `qmk_firmware/keyboards/planck` 3. Run `make`. This should output a lot of information about the build process. ## Using the built-in functions @@ -73,7 +73,7 @@ If you see this make (e=2): The system cannot find the file specified. make: *** [dfu] Error 2 -when trying to 'make dfu' on Windows you need to copy the dfu-programmer.exe to qmk_firmware/keyboard/planck. +when trying to 'make dfu' on Windows you need to copy the dfu-programmer.exe to qmk_firmware/keyboards/planck. ## Quantum MK Firmware diff --git a/doc/TMK_README.md b/doc/TMK_README.md index 36ef84ac65..150b4f93bf 100644 --- a/doc/TMK_README.md +++ b/doc/TMK_README.md @@ -29,12 +29,12 @@ You can find some keyboard specific projects under `converter` and `keyboard` di ## Main projects ### OLKB products -* [planck](keyboard/planck/) - [Planck] Ortholinear 40% keyboard -* [preonic](keyboard/preonic/) - [Preonic] Ortholinear 50% keyboard -* [atomic](keyboard/atomic/) - [Atomic] Ortholinear 60% keyboard +* [planck](keyboards/planck/) - [Planck] Ortholinear 40% keyboard +* [preonic](keyboards/preonic/) - [Preonic] Ortholinear 50% keyboard +* [atomic](keyboards/atomic/) - [Atomic] Ortholinear 60% keyboard ### Ergodox EZ -* [ergodox_ez](keyboard/ergodox_ez) - [Ergodox_EZ] Assembled split keyboard +* [ergodox_ez](keyboards/ergodox_ez) - [Ergodox_EZ] Assembled split keyboard ## Other projects @@ -52,20 +52,20 @@ You can find some keyboard specific projects under `converter` and `keyboard` di * [ibm4704_usb](converter/ibm4704_usb) - [IBM 4704 keyboard Converter][GH_ibm4704] ### keyboard -* [hhkb](keyboard/hhkb/) - [Happy Hacking Keyboard pro][GH_hhkb] hasu's main board -* [gh60](keyboard/gh60/) - [GH60] DIY 60% keyboard [prototype][GH60_proto] hasu's second board -* [hbkb](keyboard/hbkb/) - [Happy Buckling spring keyboard][GH_hbkb](IBM Model M 60% mod) -* [hid_liber](keyboard/hid_liber/) - [HID liberation][HID_liber] controller (by alaricljs) -* [phantom](keyboard/phantom/) - [Phantom] keyboard (by Tranquilite) -* [IIgs_Standard](keyboard/IIgs/) - Apple [IIGS] keyboard mod(by JeffreySung) -* [macway](keyboard/macway/) - [Compact keyboard mod][GH_macway] [retired] -* [KMAC](keyboard/kmac/) - Korean custom keyboard -* [Lightsaber](keyboard/lightsaber/) - Korean custom keyboard -* [Infinity](keyboard/infinity/) - Massdrop [Infinity keyboard][Infinity] -* [NerD](keyboard/nerd/) - Korean custom keyboard -* [KittenPaw](keyboard/kitten_paw) - Custom Majestouch controller -* [Lightpad](keyboard/lightpad) - Korean custom keypad -* [ghost_squid](keyboard/ghost_squid/) - [The Ghost Squid][ghost_squid] controller for [Cooler Master QuickFire XT][cmxt] +* [hhkb](keyboards/hhkb/) - [Happy Hacking Keyboard pro][GH_hhkb] hasu's main board +* [gh60](keyboards/gh60/) - [GH60] DIY 60% keyboard [prototype][GH60_proto] hasu's second board +* [hbkb](keyboards/hbkb/) - [Happy Buckling spring keyboard][GH_hbkb](IBM Model M 60% mod) +* [hid_liber](keyboards/hid_liber/) - [HID liberation][HID_liber] controller (by alaricljs) +* [phantom](keyboards/phantom/) - [Phantom] keyboard (by Tranquilite) +* [IIgs_Standard](keyboards/IIgs/) - Apple [IIGS] keyboard mod(by JeffreySung) +* [macway](keyboards/macway/) - [Compact keyboard mod][GH_macway] [retired] +* [KMAC](keyboards/kmac/) - Korean custom keyboard +* [Lightsaber](keyboards/lightsaber/) - Korean custom keyboard +* [Infinity](keyboards/infinity/) - Massdrop [Infinity keyboard][Infinity] +* [NerD](keyboards/nerd/) - Korean custom keyboard +* [KittenPaw](keyboards/kitten_paw) - Custom Majestouch controller +* [Lightpad](keyboards/lightpad) - Korean custom keypad +* [ghost_squid](keyboards/ghost_squid/) - [The Ghost Squid][ghost_squid] controller for [Cooler Master QuickFire XT][cmxt] ### Extenal projects using tmk_keyboard * [ErgoDox_cub-uanic][cub-uanic] - Split Ergonomic Keyboard [ErgoDox][ergodox_org] @@ -92,7 +92,7 @@ You can find some keyboard specific projects under `converter` and `keyboard` di [IIGS]: http://en.wikipedia.org/wiki/Apple_IIGS [Infinity]: https://www.massdrop.com/buy/infinity-keyboard-kit [ghost_squid]: http://deskthority.net/wiki/Costar_replacement_controllers#The_Ghost_Squid -[cmxt]: http://gaming.coolermaster.com/en/products/keyboards/quickfirext/ +[cmxt]: http://gaming.coolermaster.com/en/products/keyboard/quickfirext/ [ergodox_org]: http://ergodox.org/ [cub-uanic]: https://github.com/cub-uanic/tmk_keyboard/tree/master/keyboard/ergodox [mcdox]: https://github.com/DavidMcEwan/mcdox @@ -113,7 +113,7 @@ Third party libraries like LUFA, PJRC and V-USB have their own license respectiv Build Firmware and Program Controller ------------------------------------- -See [doc/build.md](tmk_core/doc/build.md), or the README in the particular keyboard/* folder. +See [doc/build.md](tmk_core/doc/build.md), or the README in the particular keyboards/* folder. @@ -226,7 +226,7 @@ Files and Directories ------------------- ### Top * tmk_core/ - core library -* keyboard/ - keyboard projects +* keyboards/ - keyboard projects * converter/ - protocol converter projects * doc/ - documents diff --git a/doc/VAGRANT_GUIDE.md b/doc/VAGRANT_GUIDE.md index f7419ccda8..72223e8041 100644 --- a/doc/VAGRANT_GUIDE.md +++ b/doc/VAGRANT_GUIDE.md @@ -12,7 +12,7 @@ Other than having Vagrant and Virtualbox installed and possibly a restart of you Build Firmware and Program Controller ------------------------------------- -See [/doc/BUIDE_GUIDE.md](/doc/BUILD_GUIDE.md), or the README in the particular keyboard/* folder. +See [/doc/BUIDE_GUIDE.md](/doc/BUILD_GUIDE.md), or the README in the particular keyboards/* folder. Change your keymap ------------------ @@ -20,7 +20,7 @@ See [/doc/keymap.md](/doc/keymap.md). ## Flashing the firmware -The "easy" way to flash the firmware is using a tool from your host OS like the Teensy programming app. [ErgoDox EZ](/keyboard/ergodox_ez/readme.md) gives a great example. +The "easy" way to flash the firmware is using a tool from your host OS like the Teensy programming app. [ErgoDox EZ](/keyboards/ergodox_ez/readme.md) gives a great example. If you want to program via the command line you can uncomment the ['modifyvm'] lines in the Vagrantfile to enable the USB passthrough into Linux and then program using the command line tools like dfu-util/dfu-programmer or you can install the Teensy CLI version. \ No newline at end of file diff --git a/doc/keymap.md b/doc/keymap.md index 4d42fbe5cb..d1985e567c 100644 --- a/doc/keymap.md +++ b/doc/keymap.md @@ -378,7 +378,7 @@ Default Layer also has bitwise operations, they are executed when key is release #### 2.3.2 Examples ***TODO: sample implementation*** -See `keyboard/hhkb/keymap.c` for sample. +See `keyboards/hhkb/keymap.c` for sample. @@ -424,7 +424,7 @@ This C function is called every time key is operated, argument `id` selects acti } key_t; ***TODO: sample implementation*** -See `keyboard/hhkb/keymap.c` for sample. +See `keyboards/hhkb/keymap.c` for sample. diff --git a/keyboard/atomic/atomic_pcb.hex b/keyboard/atomic/atomic_pcb.hex deleted file mode 100644 index a40409e090..0000000000 Binary files a/keyboard/atomic/atomic_pcb.hex and /dev/null differ diff --git a/keyboard/ergodox_ez/keymaps/algernon/Makefile b/keyboard/ergodox_ez/keymaps/algernon/Makefile deleted file mode 100644 index 3db507c8f2..0000000000 --- a/keyboard/ergodox_ez/keymaps/algernon/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -BOOTMAGIC_ENABLE=no -COMMAND_ENABLE=no -SLEEP_LED_ENABLE=no -UNICODE_ENABLE=no - -ifndef QUANTUM_DIR - include ../../../../Makefile -endif diff --git a/keyboard/ergodox_ez/keymaps/algernon/images/base-layer.png b/keyboard/ergodox_ez/keymaps/algernon/images/base-layer.png deleted file mode 100644 index 1a7c0f4805..0000000000 Binary files a/keyboard/ergodox_ez/keymaps/algernon/images/base-layer.png and /dev/null differ diff --git a/keyboard/ergodox_ez/keymaps/algernon/images/emacs-layer.png b/keyboard/ergodox_ez/keymaps/algernon/images/emacs-layer.png deleted file mode 100644 index 1aa23cc00e..0000000000 Binary files a/keyboard/ergodox_ez/keymaps/algernon/images/emacs-layer.png and /dev/null differ diff --git a/keyboard/ergodox_ez/keymaps/algernon/images/experimental-layer.png b/keyboard/ergodox_ez/keymaps/algernon/images/experimental-layer.png deleted file mode 100644 index c5e695b8c1..0000000000 Binary files a/keyboard/ergodox_ez/keymaps/algernon/images/experimental-layer.png and /dev/null differ diff --git a/keyboard/ergodox_ez/keymaps/algernon/images/hun-layer.png b/keyboard/ergodox_ez/keymaps/algernon/images/hun-layer.png deleted file mode 100644 index f1e5f9ec07..0000000000 Binary files a/keyboard/ergodox_ez/keymaps/algernon/images/hun-layer.png and /dev/null differ diff --git a/keyboard/ergodox_ez/keymaps/algernon/images/one-handed-layer.png b/keyboard/ergodox_ez/keymaps/algernon/images/one-handed-layer.png deleted file mode 100644 index 283559b3a9..0000000000 Binary files a/keyboard/ergodox_ez/keymaps/algernon/images/one-handed-layer.png and /dev/null differ diff --git a/keyboard/ergodox_ez/keymaps/algernon/images/steno-layer.png b/keyboard/ergodox_ez/keymaps/algernon/images/steno-layer.png deleted file mode 100644 index e747bfb414..0000000000 Binary files a/keyboard/ergodox_ez/keymaps/algernon/images/steno-layer.png and /dev/null differ diff --git a/keyboard/planck/keymaps/default/compiled.hex b/keyboard/planck/keymaps/default/compiled.hex deleted file mode 100644 index 63f61e0ebd..0000000000 Binary files a/keyboard/planck/keymaps/default/compiled.hex and /dev/null differ diff --git a/keyboard/planck/keymaps/experimental/planck_experimental.hex b/keyboard/planck/keymaps/experimental/planck_experimental.hex deleted file mode 100644 index 76984a07cc..0000000000 Binary files a/keyboard/planck/keymaps/experimental/planck_experimental.hex and /dev/null differ diff --git a/keyboard/planck/planck_pcb_r3.hex b/keyboard/planck/planck_pcb_r3.hex deleted file mode 100644 index 11f523c058..0000000000 Binary files a/keyboard/planck/planck_pcb_r3.hex and /dev/null differ diff --git a/keyboard/planck/planck_pcb_r3_w_bootloader.hex b/keyboard/planck/planck_pcb_r3_w_bootloader.hex deleted file mode 100755 index c61dfb743a..0000000000 Binary files a/keyboard/planck/planck_pcb_r3_w_bootloader.hex and /dev/null differ diff --git a/keyboard/planck/planck_pcb_r4.hex b/keyboard/planck/planck_pcb_r4.hex deleted file mode 100644 index bd68d9e904..0000000000 Binary files a/keyboard/planck/planck_pcb_r4.hex and /dev/null differ diff --git a/keyboard/planck/planck_pcb_r4_w_bootloader.hex b/keyboard/planck/planck_pcb_r4_w_bootloader.hex deleted file mode 100644 index 140bf415f2..0000000000 Binary files a/keyboard/planck/planck_pcb_r4_w_bootloader.hex and /dev/null differ diff --git a/keyboard/preonic/preonic_pcb_r1.hex b/keyboard/preonic/preonic_pcb_r1.hex deleted file mode 100644 index eda1b1979f..0000000000 Binary files a/keyboard/preonic/preonic_pcb_r1.hex and /dev/null differ diff --git a/keyboard/preonic/preonic_pcb_r1_w_bootloader.hex b/keyboard/preonic/preonic_pcb_r1_w_bootloader.hex deleted file mode 100644 index c42365c436..0000000000 Binary files a/keyboard/preonic/preonic_pcb_r1_w_bootloader.hex and /dev/null differ diff --git a/keyboard/satan/keymaps/default/compiled.hex b/keyboard/satan/keymaps/default/compiled.hex deleted file mode 100644 index 8f4957d1c7..0000000000 Binary files a/keyboard/satan/keymaps/default/compiled.hex and /dev/null differ diff --git a/keyboard/satan/satan.c b/keyboard/satan/satan.c deleted file mode 100644 index 40bd9dcde4..0000000000 --- a/keyboard/satan/satan.c +++ /dev/null @@ -1,36 +0,0 @@ -#include "satan.h" - -#ifdef BACKLIGHT_ENABLE -#include "backlight.h" -#endif - -__attribute__ ((weak)) -void matrix_init_user(void) { - // leave these blank -}; - -__attribute__ ((weak)) -void matrix_scan_user(void) { - // leave these blank -}; - -void matrix_init_kb(void) { - // put your keyboard start-up code here - // runs once when the firmware starts up - if (matrix_init_user) { - (*matrix_init_user)(); - } - led_init_ports(); - - #ifdef BACKLIGHT_ENABLE - init_backlight_pin(); - #endif -}; - -void matrix_scan_kb(void) { - // put your looping keyboard code here - // runs every cycle (a lot) - if (matrix_scan_user) { - (*matrix_scan_user)(); - } -}; diff --git a/keyboard/alps64/Makefile b/keyboards/alps64/Makefile similarity index 100% rename from keyboard/alps64/Makefile rename to keyboards/alps64/Makefile diff --git a/keyboard/alps64/alps64.c b/keyboards/alps64/alps64.c similarity index 100% rename from keyboard/alps64/alps64.c rename to keyboards/alps64/alps64.c diff --git a/keyboard/alps64/alps64.h b/keyboards/alps64/alps64.h similarity index 100% rename from keyboard/alps64/alps64.h rename to keyboards/alps64/alps64.h diff --git a/keyboard/alps64/config.h b/keyboards/alps64/config.h similarity index 100% rename from keyboard/alps64/config.h rename to keyboards/alps64/config.h diff --git a/keyboard/alps64/keymaps/default/compiled.hex b/keyboards/alps64/keymaps/default/compiled.hex similarity index 100% rename from keyboard/alps64/keymaps/default/compiled.hex rename to keyboards/alps64/keymaps/default/compiled.hex diff --git a/keyboard/alps64/keymaps/default/keymap.c b/keyboards/alps64/keymaps/default/keymap.c similarity index 100% rename from keyboard/alps64/keymaps/default/keymap.c rename to keyboards/alps64/keymaps/default/keymap.c diff --git a/keyboard/alps64/led.c b/keyboards/alps64/led.c similarity index 100% rename from keyboard/alps64/led.c rename to keyboards/alps64/led.c diff --git a/keyboard/alps64/matrix.c b/keyboards/alps64/matrix.c similarity index 100% rename from keyboard/alps64/matrix.c rename to keyboards/alps64/matrix.c diff --git a/keyboard/arrow_pad/Makefile b/keyboards/arrow_pad/Makefile similarity index 100% rename from keyboard/arrow_pad/Makefile rename to keyboards/arrow_pad/Makefile diff --git a/keyboard/arrow_pad/README.md b/keyboards/arrow_pad/README.md similarity index 84% rename from keyboard/arrow_pad/README.md rename to keyboards/arrow_pad/README.md index f669ad6a12..bf9a64a452 100644 --- a/keyboard/arrow_pad/README.md +++ b/keyboards/arrow_pad/README.md @@ -7,7 +7,7 @@ For the full Quantum feature list, see [the parent README.md](/README.md). ## Building -Download or clone the whole firmware and navigate to the keyboard/arrow_pad folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use the Teensy Loader to program your .hex file. +Download or clone the whole firmware and navigate to the keyboards/arrow_pad folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use the Teensy Loader to program your .hex file. Depending on which keymap you would like to use, you will have to compile slightly differently. diff --git a/keyboard/arrow_pad/arrow_pad.c b/keyboards/arrow_pad/arrow_pad.c similarity index 100% rename from keyboard/arrow_pad/arrow_pad.c rename to keyboards/arrow_pad/arrow_pad.c diff --git a/keyboard/arrow_pad/arrow_pad.h b/keyboards/arrow_pad/arrow_pad.h similarity index 100% rename from keyboard/arrow_pad/arrow_pad.h rename to keyboards/arrow_pad/arrow_pad.h diff --git a/keyboard/arrow_pad/config.h b/keyboards/arrow_pad/config.h similarity index 100% rename from keyboard/arrow_pad/config.h rename to keyboards/arrow_pad/config.h diff --git a/keyboard/arrow_pad/keymaps/default/compiled.hex b/keyboards/arrow_pad/keymaps/default/compiled.hex similarity index 100% rename from keyboard/arrow_pad/keymaps/default/compiled.hex rename to keyboards/arrow_pad/keymaps/default/compiled.hex diff --git a/keyboard/arrow_pad/keymaps/default/keymap.c b/keyboards/arrow_pad/keymaps/default/keymap.c similarity index 100% rename from keyboard/arrow_pad/keymaps/default/keymap.c rename to keyboards/arrow_pad/keymaps/default/keymap.c diff --git a/keyboard/arrow_pad/keymaps/pad_21/Makefile b/keyboards/arrow_pad/keymaps/pad_21/Makefile similarity index 100% rename from keyboard/arrow_pad/keymaps/pad_21/Makefile rename to keyboards/arrow_pad/keymaps/pad_21/Makefile diff --git a/keyboard/arrow_pad/keymaps/pad_21/compiled.hex b/keyboards/arrow_pad/keymaps/pad_21/compiled.hex similarity index 100% rename from keyboard/arrow_pad/keymaps/pad_21/compiled.hex rename to keyboards/arrow_pad/keymaps/pad_21/compiled.hex diff --git a/keyboard/arrow_pad/keymaps/pad_21/config.h b/keyboards/arrow_pad/keymaps/pad_21/config.h similarity index 100% rename from keyboard/arrow_pad/keymaps/pad_21/config.h rename to keyboards/arrow_pad/keymaps/pad_21/config.h diff --git a/keyboard/arrow_pad/keymaps/pad_21/keymap.c b/keyboards/arrow_pad/keymaps/pad_21/keymap.c similarity index 100% rename from keyboard/arrow_pad/keymaps/pad_21/keymap.c rename to keyboards/arrow_pad/keymaps/pad_21/keymap.c diff --git a/keyboard/arrow_pad/keymaps/pad_24/Makefile b/keyboards/arrow_pad/keymaps/pad_24/Makefile similarity index 100% rename from keyboard/arrow_pad/keymaps/pad_24/Makefile rename to keyboards/arrow_pad/keymaps/pad_24/Makefile diff --git a/keyboard/arrow_pad/keymaps/pad_24/compiled.hex b/keyboards/arrow_pad/keymaps/pad_24/compiled.hex similarity index 100% rename from keyboard/arrow_pad/keymaps/pad_24/compiled.hex rename to keyboards/arrow_pad/keymaps/pad_24/compiled.hex diff --git a/keyboard/arrow_pad/keymaps/pad_24/config.h b/keyboards/arrow_pad/keymaps/pad_24/config.h similarity index 100% rename from keyboard/arrow_pad/keymaps/pad_24/config.h rename to keyboards/arrow_pad/keymaps/pad_24/config.h diff --git a/keyboard/arrow_pad/keymaps/pad_24/keymap.c b/keyboards/arrow_pad/keymaps/pad_24/keymap.c similarity index 100% rename from keyboard/arrow_pad/keymaps/pad_24/keymap.c rename to keyboards/arrow_pad/keymaps/pad_24/keymap.c diff --git a/keyboard/atomic/Makefile b/keyboards/atomic/Makefile similarity index 100% rename from keyboard/atomic/Makefile rename to keyboards/atomic/Makefile diff --git a/keyboard/atomic/README.md b/keyboards/atomic/README.md similarity index 84% rename from keyboard/atomic/README.md rename to keyboards/atomic/README.md index 0e42370ba6..9fe75f572e 100644 --- a/keyboard/atomic/README.md +++ b/keyboards/atomic/README.md @@ -8,7 +8,7 @@ For the full Quantum feature list, see [the parent README.md](/README.md). ## Building -Download or clone the whole firmware and navigate to the keyboard/atomic folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use `make dfu` to program your PCB once you hit the reset button. +Download or clone the whole firmware and navigate to the keyboards/atomic folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use `make dfu` to program your PCB once you hit the reset button. Depending on which keymap you would like to use, you will have to compile slightly differently. diff --git a/keyboard/atomic/atomic.c b/keyboards/atomic/atomic.c similarity index 100% rename from keyboard/atomic/atomic.c rename to keyboards/atomic/atomic.c diff --git a/keyboard/atomic/atomic.h b/keyboards/atomic/atomic.h similarity index 100% rename from keyboard/atomic/atomic.h rename to keyboards/atomic/atomic.h diff --git a/keyboard/atomic/config.h b/keyboards/atomic/config.h similarity index 100% rename from keyboard/atomic/config.h rename to keyboards/atomic/config.h diff --git a/keyboard/atomic/keymaps/abienz.c b/keyboards/atomic/keymaps/abienz.c similarity index 100% rename from keyboard/atomic/keymaps/abienz.c rename to keyboards/atomic/keymaps/abienz.c diff --git a/keyboard/atomic/keymaps/default/compiled.hex b/keyboards/atomic/keymaps/default/compiled.hex similarity index 100% rename from keyboard/atomic/keymaps/default/compiled.hex rename to keyboards/atomic/keymaps/default/compiled.hex diff --git a/keyboard/atomic/keymaps/default/keymap.c b/keyboards/atomic/keymaps/default/keymap.c similarity index 100% rename from keyboard/atomic/keymaps/default/keymap.c rename to keyboards/atomic/keymaps/default/keymap.c diff --git a/keyboard/atomic/keymaps/michelle.c b/keyboards/atomic/keymaps/michelle.c similarity index 100% rename from keyboard/atomic/keymaps/michelle.c rename to keyboards/atomic/keymaps/michelle.c diff --git a/keyboard/atomic/keymaps/pvc/Makefile b/keyboards/atomic/keymaps/pvc/Makefile similarity index 100% rename from keyboard/atomic/keymaps/pvc/Makefile rename to keyboards/atomic/keymaps/pvc/Makefile diff --git a/keyboard/atomic/keymaps/pvc/compiled.hex b/keyboards/atomic/keymaps/pvc/compiled.hex similarity index 100% rename from keyboard/atomic/keymaps/pvc/compiled.hex rename to keyboards/atomic/keymaps/pvc/compiled.hex diff --git a/keyboard/atomic/keymaps/pvc/config.h b/keyboards/atomic/keymaps/pvc/config.h similarity index 100% rename from keyboard/atomic/keymaps/pvc/config.h rename to keyboards/atomic/keymaps/pvc/config.h diff --git a/keyboard/atomic/keymaps/pvc/keymap.c b/keyboards/atomic/keymaps/pvc/keymap.c similarity index 100% rename from keyboard/atomic/keymaps/pvc/keymap.c rename to keyboards/atomic/keymaps/pvc/keymap.c diff --git a/keyboard/atreus/Makefile b/keyboards/atreus/Makefile similarity index 100% rename from keyboard/atreus/Makefile rename to keyboards/atreus/Makefile diff --git a/keyboard/atreus/README.md b/keyboards/atreus/README.md similarity index 98% rename from keyboard/atreus/README.md rename to keyboards/atreus/README.md index aacf2841f4..86e6e1f0c9 100644 --- a/keyboard/atreus/README.md +++ b/keyboards/atreus/README.md @@ -169,7 +169,7 @@ This requires [some hardware changes](https://www.reddit.com/r/MechanicalKeyboar ## Building -Download or clone the whole firmware and navigate to the keyboard/planck folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use `make dfu` to program your PCB once you hit the reset button. +Download or clone the whole firmware and navigate to the keyboards/planck folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use `make dfu` to program your PCB once you hit the reset button. Depending on which keymap you would like to use, you will have to compile slightly differently. diff --git a/keyboard/atreus/atreus.c b/keyboards/atreus/atreus.c similarity index 100% rename from keyboard/atreus/atreus.c rename to keyboards/atreus/atreus.c diff --git a/keyboard/atreus/atreus.h b/keyboards/atreus/atreus.h similarity index 100% rename from keyboard/atreus/atreus.h rename to keyboards/atreus/atreus.h diff --git a/keyboard/atreus/config.h b/keyboards/atreus/config.h similarity index 100% rename from keyboard/atreus/config.h rename to keyboards/atreus/config.h diff --git a/keyboard/atreus/keymaps/default/compiled.hex b/keyboards/atreus/keymaps/default/compiled.hex similarity index 100% rename from keyboard/atreus/keymaps/default/compiled.hex rename to keyboards/atreus/keymaps/default/compiled.hex diff --git a/keyboard/atreus/keymaps/default/keymap.c b/keyboards/atreus/keymaps/default/keymap.c similarity index 100% rename from keyboard/atreus/keymaps/default/keymap.c rename to keyboards/atreus/keymaps/default/keymap.c diff --git a/keyboard/atreus/keymaps/gerb/compiled.hex b/keyboards/atreus/keymaps/gerb/compiled.hex similarity index 100% rename from keyboard/atreus/keymaps/gerb/compiled.hex rename to keyboards/atreus/keymaps/gerb/compiled.hex diff --git a/keyboard/atreus/keymaps/gerb/keymap.c b/keyboards/atreus/keymaps/gerb/keymap.c similarity index 100% rename from keyboard/atreus/keymaps/gerb/keymap.c rename to keyboards/atreus/keymaps/gerb/keymap.c diff --git a/keyboard/bantam44/Makefile b/keyboards/bantam44/Makefile similarity index 100% rename from keyboard/bantam44/Makefile rename to keyboards/bantam44/Makefile diff --git a/keyboard/bantam44/README.md b/keyboards/bantam44/README.md similarity index 84% rename from keyboard/bantam44/README.md rename to keyboards/bantam44/README.md index cd059a66c9..a571e3d447 100644 --- a/keyboard/bantam44/README.md +++ b/keyboards/bantam44/README.md @@ -7,7 +7,7 @@ For the full Quantum feature list, see [the parent README.md](/README.md). ## Building -Download or clone the whole firmware and navigate to the keyboard/Bantam44 folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use the Teensy Loader to program your .hex file. +Download or clone the whole firmware and navigate to the keyboards/Bantam44 folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use the Teensy Loader to program your .hex file. Depending on which keymap you would like to use, you will have to compile slightly differently. diff --git a/keyboard/bantam44/bantam44.c b/keyboards/bantam44/bantam44.c similarity index 100% rename from keyboard/bantam44/bantam44.c rename to keyboards/bantam44/bantam44.c diff --git a/keyboard/bantam44/bantam44.h b/keyboards/bantam44/bantam44.h similarity index 100% rename from keyboard/bantam44/bantam44.h rename to keyboards/bantam44/bantam44.h diff --git a/keyboard/bantam44/config.h b/keyboards/bantam44/config.h similarity index 100% rename from keyboard/bantam44/config.h rename to keyboards/bantam44/config.h diff --git a/keyboard/bantam44/keymaps/default/compiled.hex b/keyboards/bantam44/keymaps/default/compiled.hex similarity index 100% rename from keyboard/bantam44/keymaps/default/compiled.hex rename to keyboards/bantam44/keymaps/default/compiled.hex diff --git a/keyboard/bantam44/keymaps/default/keymap.c b/keyboards/bantam44/keymaps/default/keymap.c similarity index 100% rename from keyboard/bantam44/keymaps/default/keymap.c rename to keyboards/bantam44/keymaps/default/keymap.c diff --git a/keyboard/clueboard1/Makefile b/keyboards/clueboard1/Makefile similarity index 100% rename from keyboard/clueboard1/Makefile rename to keyboards/clueboard1/Makefile diff --git a/keyboard/clueboard1/clueboard1.c b/keyboards/clueboard1/clueboard1.c similarity index 100% rename from keyboard/clueboard1/clueboard1.c rename to keyboards/clueboard1/clueboard1.c diff --git a/keyboard/clueboard1/clueboard1.h b/keyboards/clueboard1/clueboard1.h similarity index 100% rename from keyboard/clueboard1/clueboard1.h rename to keyboards/clueboard1/clueboard1.h diff --git a/keyboard/clueboard1/config.h b/keyboards/clueboard1/config.h similarity index 100% rename from keyboard/clueboard1/config.h rename to keyboards/clueboard1/config.h diff --git a/keyboard/clueboard1/keymaps/default/compiled.hex b/keyboards/clueboard1/keymaps/default/compiled.hex similarity index 100% rename from keyboard/clueboard1/keymaps/default/compiled.hex rename to keyboards/clueboard1/keymaps/default/compiled.hex diff --git a/keyboard/clueboard1/keymaps/default/keymap.c b/keyboards/clueboard1/keymaps/default/keymap.c similarity index 100% rename from keyboard/clueboard1/keymaps/default/keymap.c rename to keyboards/clueboard1/keymaps/default/keymap.c diff --git a/keyboard/clueboard1/led.c b/keyboards/clueboard1/led.c similarity index 100% rename from keyboard/clueboard1/led.c rename to keyboards/clueboard1/led.c diff --git a/keyboard/clueboard2/Makefile b/keyboards/clueboard2/Makefile similarity index 100% rename from keyboard/clueboard2/Makefile rename to keyboards/clueboard2/Makefile diff --git a/keyboard/clueboard2/backlight.c b/keyboards/clueboard2/backlight.c similarity index 100% rename from keyboard/clueboard2/backlight.c rename to keyboards/clueboard2/backlight.c diff --git a/keyboard/clueboard2/clueboard2.c b/keyboards/clueboard2/clueboard2.c similarity index 100% rename from keyboard/clueboard2/clueboard2.c rename to keyboards/clueboard2/clueboard2.c diff --git a/keyboard/clueboard2/clueboard2.h b/keyboards/clueboard2/clueboard2.h similarity index 100% rename from keyboard/clueboard2/clueboard2.h rename to keyboards/clueboard2/clueboard2.h diff --git a/keyboard/clueboard2/config.h b/keyboards/clueboard2/config.h similarity index 100% rename from keyboard/clueboard2/config.h rename to keyboards/clueboard2/config.h diff --git a/keyboard/clueboard2/keymaps/default/compiled.hex b/keyboards/clueboard2/keymaps/default/compiled.hex similarity index 100% rename from keyboard/clueboard2/keymaps/default/compiled.hex rename to keyboards/clueboard2/keymaps/default/compiled.hex diff --git a/keyboard/clueboard2/keymaps/default/keymap.c b/keyboards/clueboard2/keymaps/default/keymap.c similarity index 100% rename from keyboard/clueboard2/keymaps/default/keymap.c rename to keyboards/clueboard2/keymaps/default/keymap.c diff --git a/keyboard/clueboard2/keymaps/max/Makefile b/keyboards/clueboard2/keymaps/max/Makefile similarity index 100% rename from keyboard/clueboard2/keymaps/max/Makefile rename to keyboards/clueboard2/keymaps/max/Makefile diff --git a/keyboard/clueboard2/keymaps/max/compiled.hex b/keyboards/clueboard2/keymaps/max/compiled.hex similarity index 100% rename from keyboard/clueboard2/keymaps/max/compiled.hex rename to keyboards/clueboard2/keymaps/max/compiled.hex diff --git a/keyboard/clueboard2/keymaps/max/keymap.c b/keyboards/clueboard2/keymaps/max/keymap.c similarity index 100% rename from keyboard/clueboard2/keymaps/max/keymap.c rename to keyboards/clueboard2/keymaps/max/keymap.c diff --git a/keyboard/clueboard2/keymaps/skully/compiled.hex b/keyboards/clueboard2/keymaps/skully/compiled.hex similarity index 100% rename from keyboard/clueboard2/keymaps/skully/compiled.hex rename to keyboards/clueboard2/keymaps/skully/compiled.hex diff --git a/keyboard/clueboard2/keymaps/skully/keymap.c b/keyboards/clueboard2/keymaps/skully/keymap.c similarity index 100% rename from keyboard/clueboard2/keymaps/skully/keymap.c rename to keyboards/clueboard2/keymaps/skully/keymap.c diff --git a/keyboard/clueboard2/led.c b/keyboards/clueboard2/led.c similarity index 100% rename from keyboard/clueboard2/led.c rename to keyboards/clueboard2/led.c diff --git a/keyboard/cluepad/Makefile b/keyboards/cluepad/Makefile similarity index 100% rename from keyboard/cluepad/Makefile rename to keyboards/cluepad/Makefile diff --git a/keyboard/cluepad/backlight.c b/keyboards/cluepad/backlight.c similarity index 100% rename from keyboard/cluepad/backlight.c rename to keyboards/cluepad/backlight.c diff --git a/keyboard/cluepad/cluepad.c b/keyboards/cluepad/cluepad.c similarity index 100% rename from keyboard/cluepad/cluepad.c rename to keyboards/cluepad/cluepad.c diff --git a/keyboard/cluepad/cluepad.h b/keyboards/cluepad/cluepad.h similarity index 100% rename from keyboard/cluepad/cluepad.h rename to keyboards/cluepad/cluepad.h diff --git a/keyboard/cluepad/config.h b/keyboards/cluepad/config.h similarity index 100% rename from keyboard/cluepad/config.h rename to keyboards/cluepad/config.h diff --git a/keyboard/cluepad/keymaps/default/compiled.hex b/keyboards/cluepad/keymaps/default/compiled.hex similarity index 100% rename from keyboard/cluepad/keymaps/default/compiled.hex rename to keyboards/cluepad/keymaps/default/compiled.hex diff --git a/keyboard/cluepad/keymaps/default/keymap.c b/keyboards/cluepad/keymaps/default/keymap.c similarity index 100% rename from keyboard/cluepad/keymaps/default/keymap.c rename to keyboards/cluepad/keymaps/default/keymap.c diff --git a/keyboard/ergodox_ez/190hotfix.sh b/keyboards/ergodox_ez/190hotfix.sh similarity index 100% rename from keyboard/ergodox_ez/190hotfix.sh rename to keyboards/ergodox_ez/190hotfix.sh diff --git a/keyboard/ergodox_ez/Makefile b/keyboards/ergodox_ez/Makefile similarity index 100% rename from keyboard/ergodox_ez/Makefile rename to keyboards/ergodox_ez/Makefile diff --git a/keyboard/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h similarity index 100% rename from keyboard/ergodox_ez/config.h rename to keyboards/ergodox_ez/config.h diff --git a/keyboard/ergodox_ez/ergodox_ez.c b/keyboards/ergodox_ez/ergodox_ez.c similarity index 100% rename from keyboard/ergodox_ez/ergodox_ez.c rename to keyboards/ergodox_ez/ergodox_ez.c diff --git a/keyboard/ergodox_ez/ergodox_ez.h b/keyboards/ergodox_ez/ergodox_ez.h similarity index 100% rename from keyboard/ergodox_ez/ergodox_ez.h rename to keyboards/ergodox_ez/ergodox_ez.h diff --git a/keyboard/ergodox_ez/i2cmaster.h b/keyboards/ergodox_ez/i2cmaster.h similarity index 100% rename from keyboard/ergodox_ez/i2cmaster.h rename to keyboards/ergodox_ez/i2cmaster.h diff --git a/keyboard/ergodox_ez/keymaps/ab/compiled.hex b/keyboards/ergodox_ez/keymaps/ab/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/ab/compiled.hex rename to keyboards/ergodox_ez/keymaps/ab/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/ab/keyboard-layout.json b/keyboards/ergodox_ez/keymaps/ab/keyboard-layout.json similarity index 100% rename from keyboard/ergodox_ez/keymaps/ab/keyboard-layout.json rename to keyboards/ergodox_ez/keymaps/ab/keyboard-layout.json diff --git a/keyboard/ergodox_ez/keymaps/ab/keyboard-layout.png b/keyboards/ergodox_ez/keymaps/ab/keyboard-layout.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/ab/keyboard-layout.png rename to keyboards/ergodox_ez/keymaps/ab/keyboard-layout.png diff --git a/keyboard/ergodox_ez/keymaps/ab/keymap.c b/keyboards/ergodox_ez/keymaps/ab/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/ab/keymap.c rename to keyboards/ergodox_ez/keymaps/ab/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/ab/readme.md b/keyboards/ergodox_ez/keymaps/ab/readme.md similarity index 93% rename from keyboard/ergodox_ez/keymaps/ab/readme.md rename to keyboards/ergodox_ez/keymaps/ab/readme.md index 67d47151bc..6b1ac2be35 100644 --- a/keyboard/ergodox_ez/keymaps/ab/readme.md +++ b/keyboards/ergodox_ez/keymaps/ab/readme.md @@ -8,7 +8,7 @@ Beginner's keymap emulates standard QWERTY keyboard for beginners. Once you get * Easy on beginners. It has everything you need for your day to day usage. #### Cons -* Keys are not ergonomically placed to take full advantage of Ergodox-EZ. Take a look at this [Default Keymap](https://github.com/jackhumbert/qmk_firmware/blob/master/keyboard/ergodox_ez/keymaps/default/readme.md) +* Keys are not ergonomically placed to take full advantage of Ergodox-EZ. Take a look at this [Default Keymap](https://github.com/jackhumbert/qmk_firmware/blob/master/keyboards/ergodox_ez/keymaps/default/readme.md) * While multiple layers are possible, beginner's keymap only uses one additional layer for mouse, function and volume keys. #### Notes diff --git a/keyboard/ergodox_ez/keymaps/adnw_k_o_y/compiled.hex b/keyboards/ergodox_ez/keymaps/adnw_k_o_y/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/adnw_k_o_y/compiled.hex rename to keyboards/ergodox_ez/keymaps/adnw_k_o_y/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/adnw_k_o_y/keymap.c b/keyboards/ergodox_ez/keymaps/adnw_k_o_y/keymap.c similarity index 99% rename from keyboard/ergodox_ez/keymaps/adnw_k_o_y/keymap.c rename to keyboards/ergodox_ez/keymaps/adnw_k_o_y/keymap.c index e33037b330..052517d70e 100644 --- a/keyboard/ergodox_ez/keymaps/adnw_k_o_y/keymap.c +++ b/keyboards/ergodox_ez/keymaps/adnw_k_o_y/keymap.c @@ -1,7 +1,7 @@ #include "ergodox_ez.h" #include "debug.h" #include "action_layer.h" -#include "keymap_extras/keymap_german.h" +#include "keymap_german.h" #define BASE 0 // default layer #define SYMB 1 // symbols diff --git a/keyboard/ergodox_ez/keymaps/adnw_k_o_y/readme.md b/keyboards/ergodox_ez/keymaps/adnw_k_o_y/readme.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/adnw_k_o_y/readme.md rename to keyboards/ergodox_ez/keymaps/adnw_k_o_y/readme.md diff --git a/keyboard/ergodox_ez/keymaps/alexjj/compiled.hex b/keyboards/ergodox_ez/keymaps/alexjj/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/alexjj/compiled.hex rename to keyboards/ergodox_ez/keymaps/alexjj/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/alexjj/keymap.c b/keyboards/ergodox_ez/keymaps/alexjj/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/alexjj/keymap.c rename to keyboards/ergodox_ez/keymaps/alexjj/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/alexjj/readme.md b/keyboards/ergodox_ez/keymaps/alexjj/readme.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/alexjj/readme.md rename to keyboards/ergodox_ez/keymaps/alexjj/readme.md diff --git a/keyboard/ergodox_ez/keymaps/alexjj/rl-layout.jpg b/keyboards/ergodox_ez/keymaps/alexjj/rl-layout.jpg similarity index 100% rename from keyboard/ergodox_ez/keymaps/alexjj/rl-layout.jpg rename to keyboards/ergodox_ez/keymaps/alexjj/rl-layout.jpg diff --git a/keyboard/ergodox_ez/keymaps/algernon/.gitignore b/keyboards/ergodox_ez/keymaps/algernon/.gitignore similarity index 100% rename from keyboard/ergodox_ez/keymaps/algernon/.gitignore rename to keyboards/ergodox_ez/keymaps/algernon/.gitignore diff --git a/keyboard/ergodox_ez/keymaps/algernon/COPYING b/keyboards/ergodox_ez/keymaps/algernon/COPYING similarity index 100% rename from keyboard/ergodox_ez/keymaps/algernon/COPYING rename to keyboards/ergodox_ez/keymaps/algernon/COPYING diff --git a/keyboards/ergodox_ez/keymaps/algernon/Makefile b/keyboards/ergodox_ez/keymaps/algernon/Makefile new file mode 100644 index 0000000000..cd7e9e9d2a --- /dev/null +++ b/keyboards/ergodox_ez/keymaps/algernon/Makefile @@ -0,0 +1,26 @@ +BOOTMAGIC_ENABLE=no +COMMAND_ENABLE=no +SLEEP_LED_ENABLE=no +UNICODE_ENABLE=no +FORCE_NKRO ?= yes + +ifeq (${FORCE_NKRO},yes) +OPT_DEFS += -DFORCE_NKRO +endif + +KEYMAP_VERSION = $(shell \ + if [ -d "${KEYMAP_PATH}/.git" ]; then \ + cd "${KEYMAP_PATH}" && git describe --abbrev=6 --dirty --always --tags --match 'v*' 2>/dev/null; \ + else echo QMK; fi) + +KEYMAP_BRANCH = $(shell \ + if [ -d "${KEYMAP_PATH}/.git" ]; then \ + cd "${KEYMAP_PATH}"; \ + fi; \ + git rev-parse --abbrev-ref HEAD 2>/dev/null) + +OPT_DEFS += -DKEYMAP_VERSION=\"$(KEYMAP_VERSION)\\\#$(KEYMAP_BRANCH)\" + +ifndef QUANTUM_DIR + include ../../../../Makefile +endif diff --git a/keyboard/ergodox_ez/keymaps/algernon/config.h b/keyboards/ergodox_ez/keymaps/algernon/config.h similarity index 96% rename from keyboard/ergodox_ez/keymaps/algernon/config.h rename to keyboards/ergodox_ez/keymaps/algernon/config.h index 4cb878ebce..9bb1025be5 100644 --- a/keyboard/ergodox_ez/keymaps/algernon/config.h +++ b/keyboards/ergodox_ez/keymaps/algernon/config.h @@ -24,6 +24,4 @@ #undef LEADER_TIMEOUT #define LEADER_TIMEOUT 1000 -#define FORCE_NKRO - #endif diff --git a/keyboards/ergodox_ez/keymaps/algernon/images/base-layer.png b/keyboards/ergodox_ez/keymaps/algernon/images/base-layer.png new file mode 100644 index 0000000000..c4e298b6b7 Binary files /dev/null and b/keyboards/ergodox_ez/keymaps/algernon/images/base-layer.png differ diff --git a/keyboards/ergodox_ez/keymaps/algernon/images/experimental-layer.png b/keyboards/ergodox_ez/keymaps/algernon/images/experimental-layer.png new file mode 100644 index 0000000000..81155851b5 Binary files /dev/null and b/keyboards/ergodox_ez/keymaps/algernon/images/experimental-layer.png differ diff --git a/keyboards/ergodox_ez/keymaps/algernon/images/hun-layer.png b/keyboards/ergodox_ez/keymaps/algernon/images/hun-layer.png new file mode 100644 index 0000000000..104a9544d0 Binary files /dev/null and b/keyboards/ergodox_ez/keymaps/algernon/images/hun-layer.png differ diff --git a/keyboards/ergodox_ez/keymaps/algernon/images/nav-n-media-layer.png b/keyboards/ergodox_ez/keymaps/algernon/images/nav-n-media-layer.png new file mode 100644 index 0000000000..16d29e124d Binary files /dev/null and b/keyboards/ergodox_ez/keymaps/algernon/images/nav-n-media-layer.png differ diff --git a/keyboards/ergodox_ez/keymaps/algernon/images/one-handed-layer.png b/keyboards/ergodox_ez/keymaps/algernon/images/one-handed-layer.png new file mode 100644 index 0000000000..698d11e5f2 Binary files /dev/null and b/keyboards/ergodox_ez/keymaps/algernon/images/one-handed-layer.png differ diff --git a/keyboards/ergodox_ez/keymaps/algernon/images/steno-layer.png b/keyboards/ergodox_ez/keymaps/algernon/images/steno-layer.png new file mode 100644 index 0000000000..fe3c03c932 Binary files /dev/null and b/keyboards/ergodox_ez/keymaps/algernon/images/steno-layer.png differ diff --git a/keyboard/ergodox_ez/keymaps/algernon/keymap.c b/keyboards/ergodox_ez/keymaps/algernon/keymap.c similarity index 80% rename from keyboard/ergodox_ez/keymaps/algernon/keymap.c rename to keyboards/ergodox_ez/keymaps/algernon/keymap.c index 4eea6874c7..fdc63a8136 100644 --- a/keyboard/ergodox_ez/keymaps/algernon/keymap.c +++ b/keyboards/ergodox_ez/keymaps/algernon/keymap.c @@ -15,13 +15,14 @@ enum { BASE = 0, + EXPRM, + ARRW, APPSEL, HUN, - EMACS, + NMDIA, OHLFT, OHRGT, PLVR, - EXPRM }; /* Macros */ @@ -33,7 +34,6 @@ enum { A_PLVR, A_ESC, A_MPN, - A_COLN, // Function / number keys KF_1, // 1, F1 @@ -61,17 +61,6 @@ enum { A_MDL, A_MDR, - // Emacs layer keys - AE_VIS, // Visual mode - AE_PSTDEL, // Paste/Delete - AE_CPYC, // Copy/Cut - AE_EMACS, // Emacs copy & paste mode - AE_TERM, // Terminal copy & paste mode - AE_OTHER, // Other copy & paste mode - AE_INS, // Insert mode - AE_OVR, // Overwrite mode - AE_APPND, // Append - // Hungarian layer keys HU_AA, // Á HU_OO, // Ó @@ -102,11 +91,13 @@ enum { F_CTRL }; -/* States & timers */ +/* Custom keycodes */ -uint8_t m_visual_state = 0; -static uint16_t m_cutdel_timer; -static uint16_t m_copypaste_timer; +enum { + CT_CLN = 0x7101 +}; + +/* States & timers */ uint16_t gui_timer = 0; @@ -123,13 +114,8 @@ uint16_t oh_left_blink_timer = 0; uint8_t oh_right_blink = 0; uint16_t oh_right_blink_timer = 0; -enum { - CP_EMACS = 0, - CP_TERM = 1, - CP_OTHER = 2, -}; - -uint8_t cp_mode = CP_EMACS; +uint8_t ct_cln_count = 0; +uint16_t ct_cln_timer = 0; /* The Keymap */ @@ -138,18 +124,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* Keymap 0: Base Layer * * ,-----------------------------------------------------. ,-----------------------------------------------------. - * | `~ | 1 F1 | 2 F2 | 3 F3 | 4 F4 | 5 F5 | Plvr | | Apps | 6 F6 | 7 F7 | 8 F8 | 9 F9 | 0 F10| F11 | + * | `~ | 1 F1 | 2 F2 | 3 F3 | 4 F4 | 5 F5 | Plvr | | 1HND | 6 F6 | 7 F7 | 8 F8 | 9 F9 | 0 F10| F11 | * |-----------+------+------+------+------+-------------| |------+------+------+------+------+------+-----------| - * | Next/Prev | ' | , | . | P | Y | [ | | ] | F | G | C | R | L | = | + * | Next/Prev | ' | , | . | P | Y | [ | | ] | F | G | C | R | L | \ | * |-----------+------+------+------+------+------| | | |------+------+------+------+------+-----------| - * | Tab | A | O | E | U | I |------| |------| D | H | T | N | S | \ | + * | Tab | A | O | E | U | I |------| |------| D | H | T | N | S | = | * |-----------+------+------+------+------+------| ( | | ) |------+------+------+------+------+-----------| * | Play/Pause| / | Q | J | K | X | | | | B | M | W | V | Z | Stop | * `-----------+------+------+------+------+-------------' `-------------+------+------+------+------+-----------' - * | Home | End | Down | Up | : | | - | Left | Right| PgUp | PgDn | + * | | | Left | Up | : | | - | Down | Rght | | | * `-----------------------------------' `-----------------------------------' * ,-------------. ,-------------. - * | LAlt | GUI | |EMACS | 1HND | + * | LAlt | GUI | | MDIA | ARRW | * ,------|------|------| |------+------+------. * | | | Ctrl | | LEAD | | | * |Backsp|LShift|------| |------| Enter| Space| @@ -162,25 +148,116 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ,M(A_MPN) ,KC_QUOT ,KC_COMM ,KC_DOT ,KC_P ,KC_Y ,KC_LBRC ,KC_TAB ,KC_A ,KC_O ,KC_E ,KC_U ,KC_I ,KC_MPLY ,KC_SLSH ,KC_Q ,KC_J ,KC_K ,KC_X ,KC_LPRN -,KC_HOME ,KC_END ,KC_DOWN ,KC_UP ,M(A_COLN) +,KC_NO ,KC_NO ,KC_LEFT ,KC_UP ,CT_CLN ,F(F_ALT),F(F_GUI) ,F(F_CTRL) ,KC_BSPC,F(F_SFT),M(A_ESC) // right hand - ,KC_APP ,M(KF_6),M(KF_7),M(KF_8),M(KF_9) ,M(KF_10) ,KC_F11 - ,KC_RBRC ,KC_F ,KC_G ,KC_C ,KC_R ,KC_L ,KC_EQL - ,KC_D ,KC_H ,KC_T ,KC_N ,KC_S ,KC_BSLS - ,KC_RPRN ,KC_B ,KC_M ,KC_W ,KC_V ,KC_Z ,KC_MSTP - ,KC_MINS,KC_LEFT,KC_RGHT ,KC_PGUP ,KC_PGDN + ,M(OH_LEFT),M(KF_6),M(KF_7),M(KF_8),M(KF_9) ,M(KF_10) ,KC_F11 + ,KC_RBRC ,KC_F ,KC_G ,KC_C ,KC_R ,KC_L ,KC_BSLS + ,KC_D ,KC_H ,KC_T ,KC_N ,KC_S ,KC_EQL + ,KC_RPRN ,KC_B ,KC_M ,KC_W ,KC_V ,KC_Z ,KC_MSTP + ,KC_MINS,KC_DOWN,KC_RGHT ,KC_NO ,KC_NO - ,OSL(EMACS),M(OH_LEFT) + ,OSL(NMDIA),OSL(ARRW) ,KC_LEAD - ,F(F_HUN),KC_ENT ,KC_SPC + ,F(F_HUN) ,KC_ENT ,KC_SPC ), -/* Keymap 1: Application select layer +/* Keymap 1: Experimental layer + * + * ,-----------------------------------------------------. ,-----------------------------------------------------. + * | `~ | 1 F1 | 2 F2 | 3 F3 | 4 F4 | 5 F5 | Plvr | | 1HND | 6 F6 | 7 F7 | 8 F8 | 9 F9 | 0 F10| F11 | + * |-----------+------+------+------+------+-------------| |------+------+------+------+------+------+-----------| + * | Next/Prev | ' | , | . | P | Y | [ | | ] | L | F | C | R | J | = | + * |-----------+------+------+------+------+------| | | |------+------+------+------+------+-----------| + * | Tab | A | O | E | U | I |------| |------| D | H | T | N | S | \ | + * |-----------+------+------+------+------+------| ( | | ) |------+------+------+------+------+-----------| + * | Play/Pause| Z | G | V | K | X | | | | Q | M | W | B | / | Stop | + * `-----------+------+------+------+------+-------------' `-------------+------+------+------+------+-----------' + * | | | Left | Up | : | | - | Down | Rght | | | + * `-----------------------------------' `-----------------------------------' + * ,-------------. ,-------------. + * | LAlt | GUI | | MDIA | ARRW | + * ,------|------|------| |------+------+------. + * | | | Ctrl | | LEAD | | | + * |Backsp|LShift|------| |------| Enter| Space| + * | | | ESC | | HUN | | | + * `--------------------' `--------------------' + */ +[EXPRM] = KEYMAP( +// left hand + KC_GRV ,M(KF_1) ,M(KF_2) ,M(KF_3),M(KF_4),M(KF_5),M(A_PLVR) +,M(A_MPN) ,KC_QUOT ,KC_COMM ,KC_DOT ,KC_P ,KC_Y ,KC_LBRC +,KC_TAB ,KC_A ,KC_O ,KC_E ,KC_U ,KC_I +,KC_MPLY ,KC_Z ,KC_G ,KC_V ,KC_K ,KC_X ,KC_LPRN +,KC_NO ,KC_NO ,KC_LEFT ,KC_UP ,CT_CLN + + ,F(F_ALT),F(F_GUI) + ,F(F_CTRL) + ,KC_BSPC,F(F_SFT),M(A_ESC) + + // right hand + ,M(OH_LEFT),M(KF_6),M(KF_7),M(KF_8),M(KF_9) ,M(KF_10) ,KC_F11 + ,KC_RBRC ,KC_L ,KC_F ,KC_C ,KC_R ,KC_J ,KC_BSLS + ,KC_D ,KC_H ,KC_T ,KC_N ,KC_S ,KC_EQL + ,KC_RPRN ,KC_Q ,KC_M ,KC_W ,KC_B ,KC_SLSH ,KC_MSTP + ,KC_MINS,KC_DOWN,KC_RGHT ,KC_NO ,KC_NO + + ,OSL(NMDIA),OSL(ARRW) + ,KC_LEAD + ,F(F_HUN) ,KC_ENT ,KC_SPC + ), + +/* Keymap 2: Arrow layer + * + * ,-----------------------------------------------------. ,-----------------------------------------------------. + * | | | | | | | | | | | | | | | | + * |-----------+------+------+------+------+-------------| |------+------+------+------+------+------+-----------| + * | | | | | | | | | | | | | | | | + * |-----------+------+------+------+------+------| | | |------+------+------+------+------+-----------| + * | | | | | | |------| |------| | | | | | | + * |-----------+------+------+------+------+------| | | |------+------+------+------+------+-----------| + * | | | | | | | | | | | | | | | | + * `-----------+------+------+------+------+-------------' `-------------+------+------+------+------+-----------' + * | | | Home | PgUp | | | | PgDn | End | | | + * `----------------------------------' `----------------------------------' + * ,-------------. ,-------------. + * | | | | | | + * ,------|------|------| |------+------+------. + * | | | | | | | | + * | | |------| |------| | | + * | | | | | | | | + * `--------------------' `--------------------' + */ + +[ARRW] = KEYMAP( +// left hand + 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_TRNS ,KC_TRNS ,KC_HOME ,KC_PGUP ,KC_TRNS + + ,KC_TRNS ,KC_TRNS + ,KC_TRNS + ,KC_TRNS ,KC_TRNS ,KC_TRNS + + // right hand + ,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_TRNS ,KC_PGDN ,KC_END ,KC_TRNS ,KC_TRNS + + ,KC_TRNS ,KC_TRNS + ,KC_TRNS + ,KC_TRNS ,KC_TRNS ,KC_TRNS + ), + +/* Keymap 3: Application select layer * * ,-----------------------------------------------------. ,-----------------------------------------------------. * | |Music |Slack |Emacs |Term |Chrome| | | | | | | | | | @@ -227,7 +304,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), -/* Keymap 2: Hungarian Layer +/* Keymap 4: Hungarian Layer * * ,-----------------------------------------------------. ,-----------------------------------------------------. * | | | | | | | | | | | | | | | | @@ -251,73 +328,73 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [HUN] = KEYMAP( // left hand - KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_TRNS + KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,M(HU_OEE),KC_NO ,M(HU_UEE),KC_NO ,KC_NO ,KC_NO ,M(HU_AA),M(HU_OO) ,M(HU_EE),M(HU_UU) ,M(HU_II) -,KC_TRNS ,KC_NO ,M(HU_OE) ,KC_NO ,M(HU_UE) ,KC_NO ,KC_NO -,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_NO +,KC_NO ,KC_NO ,M(HU_OE) ,KC_NO ,M(HU_UE) ,KC_NO ,KC_NO +,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO - ,KC_TRNS ,KC_TRNS - ,KC_TRNS - ,KC_TRNS ,KC_TRNS ,KC_TRNS + ,KC_NO ,KC_NO + ,KC_NO + ,KC_NO ,KC_TRNS ,KC_TRNS // right hand ,KC_TRNS ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO - ,KC_NO ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS + ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,F(F_BSE),KC_TRNS ,KC_TRNS ), -/* Keymap 3: Spacemacs layer +/* Keymap 5: Navigation & Media layer * * ,-----------------------------------------------------. ,-----------------------------------------------------. - * | MS Slow | 1 F1 | 2 F2 | 3 F3 | 4 F4 | 5 F5 |ScrLCK| |ScrLCK| 6 F6 | 7 F7 | 8 F8 | 9 F9 | 0 F10| F11 | + * | MS Slow | | | | | |ScrLCK| |ScrLCK| | | | | | | * |-----------+------+------+------+------+-------------| |------+------+------+------+------+------+-----------| - * | MS Normal | | Home | Up | PgUp | |Visual| |Scroll| $ |MsUpL | MsUp |MsUpR | R |PrintScreen| - * |-----------+------+------+------+------+------| Mode | | Up |------+------+------+------+------+-----------| - * | MS Fast |APPEND| Left | Down | Right| INS |------| |------| D |MsLeft| MsDn |MsRght| | | - * |-----------+------+------+------+------+------| Cut | |Scroll|------+------+------+------+------+-----------| - * | Play/Pause| | End | Down | PgDn | X | Copy | | Down | |MsDnL | W |MsDnR | | Stop | + * | MS Normal | | Home | Up | PgUp | | | |Scroll| |MsUpL | MsUp |MsUpR | |PrintScreen| + * |-----------+------+------+------+------+------| | | Up |------+------+------+------+------+-----------| + * | MS Fast | | Left | Down | Right| |------| |------| |MsLeft| MsDn |MsRght| | | + * |-----------+------+------+------+------+------| | |Scroll|------+------+------+------+------+-----------| + * | Play/Pause| | End | Down | PgDn | | | | Down | |MsDnL | MsDn |MsDnR | | Stop | * `-----------+------+------+------+------+-------------' `-------------+------+------+------+------+-----------' - * |EmacsM|TermM |OtherM| | | |Vol Up|Vol Dn| Mute | | | + * | | | | | | | | | | | | * `----------------------------------' `----------------------------------' * ,-------------. ,-------------. - * | Alt | GUI | | BASE | MClk | + * | Mute | VlUp | | BASE | MClk | * ,------|------|------| |------+------+------. - * |Delete| | Ctrl | | Prev |Left |Right | - * | |LShift|------| |------| Click| Click| - * |Paste | | ESC | | Next | | | + * | | | VlDn | | Prev |Left |Right | + * | SPC | Enter|------| |------| Click| Click| + * | | | ESC | | Next | | | * `--------------------' `--------------------' */ -[EMACS] = KEYMAP( +[NMDIA] = KEYMAP( // left hand - KC_ACL0 ,M(KF_1) ,M(KF_2) ,M(KF_3) ,M(KF_4) ,M(KF_5) ,LGUI(KC_L) -,KC_ACL1 ,KC_NO ,KC_HOME ,KC_UP ,KC_PGUP ,KC_NO ,M(AE_VIS) -,KC_ACL2 ,M(AE_APPND) ,KC_LEFT ,KC_DOWN ,KC_RIGHT,M(AE_INS) -,KC_MPLY ,KC_NO ,KC_END ,KC_DOWN ,KC_PGDN ,KC_X ,M(AE_CPYC) -,M(AE_EMACS),M(AE_TERM) ,M(AE_OTHER),KC_NO ,KC_NO - ,KC_TRNS ,KC_TRNS - ,KC_TRNS - ,M(AE_PSTDEL),KC_TRNS ,KC_TRNS + KC_ACL0 ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,LGUI(KC_L) +,KC_ACL1 ,KC_NO ,KC_HOME ,KC_UP ,KC_PGUP ,KC_NO ,KC_NO +,KC_ACL2 ,KC_NO ,KC_LEFT ,KC_DOWN ,KC_RIGHT,KC_NO +,KC_MPLY ,KC_NO ,KC_END ,KC_DOWN ,KC_PGDN ,KC_NO ,KC_NO +,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO + ,KC_MUTE ,KC_VOLU + ,KC_VOLD + ,KC_SPC,KC_ENTER,M(A_ESC) // right hand - ,LGUI(KC_L),M(KF_6) ,M(KF_7) ,M(KF_8) ,M(KF_9) ,M(KF_10) ,M(KF_11) - ,KC_WH_U ,KC_DLR ,M(A_MUL),KC_MS_U ,M(A_MUR),M(AE_OVR),KC_PSCR - ,KC_D ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_NO ,KC_NO - ,KC_WH_D ,KC_NO ,M(A_MDL),KC_W ,M(A_MDR),KC_NO ,KC_MSTP - ,KC_VOLU ,KC_VOLD ,KC_MUTE ,KC_NO ,KC_NO + ,LGUI(KC_L),KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO + ,KC_WH_U ,KC_NO ,M(A_MUL),KC_MS_U ,M(A_MUR),KC_NO ,KC_PSCR + ,KC_NO ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_NO ,KC_NO + ,KC_WH_D ,KC_NO ,M(A_MDL),KC_MS_D ,M(A_MDR),KC_NO ,KC_MSTP + ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_NO ,KC_TRNS ,KC_MS_BTN3 ,KC_MPRV ,KC_MNXT ,KC_BTN1 ,KC_BTN2 ), -/* Keymap 5: One-handed, left side +/* Keymap 6: One-handed, left side * * ,-----------------------------------------------------. * | `~ | 1 F1 | 2 F2 | 3 F3 | 4 F4 | 5 F5 |A BSE| @@ -362,7 +439,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ,KC_NO ,KC_NO ,KC_NO ), -/* Keymap 6: One-handed, right side +/* Keymap 7: One-handed, right side * * ,-----------------------------------------------------. * | = F11 | 0 F10| 9 F9 | 8 F8 | 7 F7 | 6 F6 |A BSE| @@ -407,15 +484,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ,KC_NO ,KC_NO ,KC_NO ), -/* Keymap 7: Steno for Plover +/* Keymap 8: Steno for Plover * * ,--------------------------------------------------. ,--------------------------------------------------. * | | | | | | | BASE | | | | | | | | | * |--------+------+------+------+------+-------------| |------+------+------+------+------+------+--------| - * | | # | # | # | # | # | | | | # | # | # | # | # | # | + * | | # | # | # | # | # | # | | # | # | # | # | # | # | # | * |--------+------+------+------+------+------| | | |------+------+------+------+------+--------| * | | | T | P | H | |------| |------| | F | P | L | T | D | - * |--------+ S +------+------+------+ * | | | | * +------+------+------+------+--------| + * |--------+ S +------+------+------+ * | * | | * | * +------+------+------+------+--------| * | | | K | W | R | | | | | | R | B | G | S | Z | * `--------+------+------+------+------+-------------' `-------------+------+------+------+------+--------' * | | | | | | | | | | | | @@ -432,9 +509,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [PLVR] = KEYMAP( // left hand KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, M(A_PLVR), -KC_NO, PV_NUM, PV_NUM, PV_NUM, PV_NUM, PV_NUM, KC_NO, +KC_NO, PV_NUM, PV_NUM, PV_NUM, PV_NUM, PV_NUM, PV_NUM, KC_NO, PV_LS, PV_LT, PV_LP, PV_LH, PV_STAR, -KC_NO, PV_LS, PV_LK, PV_LW, PV_LR, PV_STAR, KC_NO, +KC_NO, PV_LS, PV_LK, PV_LW, PV_LR, PV_STAR, PV_STAR, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, @@ -442,61 +519,15 @@ KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, // right hand KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, PV_NUM, PV_NUM, PV_NUM, PV_NUM, PV_NUM, PV_NUM, + PV_NUM, PV_NUM, PV_NUM, PV_NUM, PV_NUM, PV_NUM, PV_NUM, PV_STAR, PV_RF, PV_RP, PV_RL, PV_RT, PV_RD, - KC_NO, PV_STAR, PV_RR, PV_RB, PV_RG, PV_RS, PV_RZ, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + PV_STAR, PV_STAR, PV_RR, PV_RB, PV_RG, PV_RS, PV_RZ, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,PV_E, PV_U ), -/* Keymap 8: Experimental layer - * - * ,-----------------------------------------------------. ,-----------------------------------------------------. - * | `~ | 1 F1 | 2 F2 | 3 F3 | 4 F4 | 5 F5 | Plvr | | Apps | 6 F6 | 7 F7 | 8 F8 | 9 F9 | 0 F10| F11 | - * |-----------+------+------+------+------+-------------| |------+------+------+------+------+------+-----------| - * | Next/Prev | ' | , | . | P | Y | [ | | ] | Q | F | C | R | J | = | - * |-----------+------+------+------+------+------| | | |------+------+------+------+------+-----------| - * | Tab | A | O | E | U | I |------| |------| D | H | T | N | S | \ | - * |-----------+------+------+------+------+------| ( | | ) |------+------+------+------+------+-----------| - * | Play/Pause| Z | K | V | G | X | | | | L | M | W | B | / | Stop | - * `-----------+------+------+------+------+-------------' `-------------+------+------+------+------+-----------' - * | Home | End | Down | Up | : | | - | Left | Right| PgUp | PgDn | - * `-----------------------------------' `-----------------------------------' - * ,-------------. ,-------------. - * | LAlt | GUI | |EMACS | 1HND | - * ,------|------|------| |------+------+------. - * | | | Ctrl | | LEAD | | | - * |Backsp|LShift|------| |------| Enter| Space| - * | | | ESC | | HUN | | | - * `--------------------' `--------------------' - */ -[EXPRM] = KEYMAP( -// left hand - KC_GRV ,M(KF_1) ,M(KF_2) ,M(KF_3),M(KF_4),M(KF_5),M(A_PLVR) -,M(A_MPN) ,KC_QUOT ,KC_COMM ,KC_DOT ,KC_P ,KC_Y ,KC_LBRC -,KC_TAB ,KC_A ,KC_O ,KC_E ,KC_U ,KC_I -,KC_MPLY ,KC_Z ,KC_K ,KC_V ,KC_G ,KC_X ,KC_LPRN -,KC_HOME ,KC_END ,KC_DOWN ,KC_UP ,M(A_COLN) - - ,F(F_ALT),F(F_GUI) - ,F(F_CTRL) - ,KC_BSPC,F(F_SFT),M(A_ESC) - - // right hand - ,KC_APP ,M(KF_6),M(KF_7),M(KF_8),M(KF_9) ,M(KF_10) ,KC_F11 - ,KC_RBRC ,KC_Q ,KC_F ,KC_C ,KC_R ,KC_J ,KC_EQL - ,KC_D ,KC_H ,KC_T ,KC_N ,KC_S ,KC_BSLS - ,KC_RPRN ,KC_L ,KC_M ,KC_W ,KC_B ,KC_SLSH ,KC_MSTP - ,KC_MINS,KC_LEFT,KC_RGHT ,KC_PGUP ,KC_PGDN - - ,OSL(EMACS),M(OH_LEFT) - ,KC_LEAD - ,F(F_HUN),KC_ENT ,KC_SPC - ), - - }; const uint16_t PROGMEM fn_actions[] = { @@ -616,26 +647,6 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) } break; - case A_COLN: - if (keyboard_report->mods & MOD_BIT(KC_LSFT) || - ((get_oneshot_mods() & MOD_BIT(KC_LSFT)) && !has_oneshot_mods_timed_out())) { - int oneshot = ((get_oneshot_mods() & MOD_BIT(KC_LSFT)) && !has_oneshot_mods_timed_out()); - - if (record->event.pressed) { - if (oneshot) - clear_oneshot_mods (); - unregister_code (KC_LSFT); - - register_code (KC_SCLN); - unregister_code (KC_SCLN); - if (!oneshot) - register_code (KC_LSFT); - } - } else { - return MACRODOWN (D(RSFT), T(SCLN), U(RSFT), END); - } - break; - case A_MPN: if (record->event.pressed) { if (keyboard_report->mods & MOD_BIT(KC_LSFT) || @@ -722,126 +733,6 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) mousekey_send(); break; - /* EMACS layer stuff */ - case AE_EMACS: - if (record->event.pressed) { - cp_mode = CP_EMACS; - } - break; - - case AE_TERM: - if (record->event.pressed) { - cp_mode = CP_TERM; - } - break; - - case AE_OTHER: - if (record->event.pressed) { - cp_mode = CP_OTHER; - } - break; - - case AE_VIS: - if (cp_mode == CP_EMACS && record->event.pressed) { - return MACRO(T(V), END); - } - break; - - case AE_CPYC: - if (record->event.pressed) { - m_copypaste_timer = timer_read (); - } else { - if (timer_elapsed (m_copypaste_timer) > TAPPING_TERM) { - // Long press: Cut - switch (cp_mode) { - case CP_EMACS: - return MACRO(T(X), END); - break; - case CP_TERM: - return MACRO(D(RCTRL), D(RSFT), T(X), U(RSFT), U(RCTRL), END); - break; - case CP_OTHER: - return MACRO(D(RCTRL), T(X), U(RCTRL), END); - break; - } - } else { - // Short press: Copy - switch (cp_mode) { - case CP_EMACS: - return MACRO(T(Y), END); - break; - case CP_TERM: - return MACRO(D(RCTRL), D(RSFT), T(C), U(RSFT), U(RCTRL), END); - break; - case CP_OTHER: - return MACRO(D(RCTRL), T(C), U(RCTRL), END); - break; - } - } - } - break; - - case AE_PSTDEL: - if (record->event.pressed) { - m_cutdel_timer = timer_read (); - } else { - if (timer_elapsed (m_cutdel_timer) > TAPPING_TERM) { - // Long press: Delete - switch (cp_mode) { - case CP_EMACS: - return MACRO(T(D), END); - break; - case CP_TERM: - case CP_OTHER: - return MACRO(T(DEL), END); - break; - } - } else { - // Short press: Paste - switch (cp_mode) { - case CP_EMACS: - if (keyboard_report->mods & MOD_BIT(KC_RSFT)) { - unregister_code (KC_RSFT); - return MACRO(U(RSFT), T(RBRC), T(P), D(RSFT), END); - } - else - return MACRO(T(P), END); - break; - case CP_TERM: - return MACRO(D(RCTRL), D(RSFT), T(V), U(RSFT), U(RCTRL), END); - break; - case CP_OTHER: - return MACRO(D(RCTRL), T(V), U(RCTRL), END); - break; - } - } - } - break; - - case AE_INS: - if (record->event.pressed) { - return MACRO(T(I), END); - } else { - layer_clear(); - } - break; - - case AE_OVR: - if (record->event.pressed) { - return MACRO(T(R), END); - } else { - layer_clear(); - } - break; - - case AE_APPND: - if (record->event.pressed) { - return MACRO(T(A), END); - } else { - layer_clear(); - } - break; - /* Plover base */ case A_PLVR: toggle_steno(record->event.pressed); @@ -872,7 +763,7 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) break; case APP_SLK: - return MACRODOWN(T(S), T(C), T(U), T(D), T(C), T(L), T(O), T(U), T(D), T(ENT), END); + return MACRODOWN(T(S), T(L), T(A), T(C), T(K), T(ENT), END); case APP_EMCS: return MACRODOWN(T(E), T(M), T(A), T(C), T(S), T(ENT), END); @@ -1000,6 +891,21 @@ void matrix_scan_user(void) { if (gui_timer && timer_elapsed (gui_timer) > TAPPING_TERM) unregister_code (KC_LGUI); + if (ct_cln_timer && timer_elapsed (ct_cln_timer) > TAPPING_TERM) { + if (ct_cln_count == 1) { + register_code (KC_RSFT); + register_code (KC_SCLN); + unregister_code (KC_SCLN); + unregister_code (KC_RSFT); + } else if (ct_cln_count == 2) { + register_code (KC_SCLN); + unregister_code (KC_SCLN); + } + + ct_cln_count = 0; + ct_cln_timer = 0; + } + if (layer != OHLFT) oh_left_blink = 0; if (layer != OHRGT) @@ -1008,7 +914,7 @@ void matrix_scan_user(void) { if (layer == HUN) { ergodox_right_led_2_on(); ergodox_right_led_3_on(); - } else if (layer == EMACS) { + } else if (layer == NMDIA) { ergodox_right_led_1_on(); ergodox_right_led_2_on(); } else if (layer == PLVR) { @@ -1055,7 +961,7 @@ void matrix_scan_user(void) { ergodox_right_led_1_on (); } else { ergodox_right_led_1_set (LED_BRIGHTNESS_LO); - if (layer != OHLFT && layer != EMACS && layer != PLVR && layer != EXPRM) + if (layer != OHLFT && layer != NMDIA && layer != PLVR && layer != EXPRM) ergodox_right_led_1_off (); } @@ -1065,7 +971,7 @@ void matrix_scan_user(void) { ergodox_right_led_2_on (); } else { ergodox_right_led_2_set (LED_BRIGHTNESS_LO); - if (layer != OHRGT && layer != HUN && layer != OHLFT && layer != EMACS && layer != PLVR && layer != EXPRM) + if (layer != OHRGT && layer != HUN && layer != OHLFT && layer != NMDIA && layer != PLVR && layer != EXPRM) ergodox_right_led_2_off (); } @@ -1087,11 +993,9 @@ void matrix_scan_user(void) { ang_do_unicode (); } -#ifdef QMK_VERSION SEQ_ONE_KEY (KC_V) { - SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION); + SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ (" QMK_VERSION "/" KEYMAP_VERSION ")"); } -#endif SEQ_ONE_KEY (KC_L) { /* λ */ @@ -1165,8 +1069,36 @@ void matrix_scan_user(void) { ergodox_right_led_2_off (); _delay_ms (100); ergodox_right_led_3_off (); - } } } } + +bool process_record_user (uint16_t keycode, keyrecord_t *record) { + switch(keycode) { + case CT_CLN: + if (record->event.pressed) { + ct_cln_count++; + ct_cln_timer = timer_read (); + } else { + } + return false; + break; + + default: + if (ct_cln_count == 1) { + register_code (KC_RSFT); + register_code (KC_SCLN); + unregister_code (KC_SCLN); + unregister_code (KC_RSFT); + } else if (ct_cln_count == 2) { + register_code (KC_SCLN); + unregister_code (KC_SCLN); + } + ct_cln_count = 0; + ct_cln_timer = 0; + break; + } + + return true; +} diff --git a/keyboard/ergodox_ez/keymaps/algernon/readme.md b/keyboards/ergodox_ez/keymaps/algernon/readme.md similarity index 50% rename from keyboard/ergodox_ez/keymaps/algernon/readme.md rename to keyboards/ergodox_ez/keymaps/algernon/readme.md index c9c481add2..6b7e8fa2e1 100644 --- a/keyboard/ergodox_ez/keymaps/algernon/readme.md +++ b/keyboards/ergodox_ez/keymaps/algernon/readme.md @@ -10,13 +10,29 @@ history of the layout, see my Some of the things in the layout only work when one uses Spacemacs and GNOME under Linux. Your mileage may vary. +## Table of Contents + +* [Layouts](#layouts) + - [Base layer](#base-layer) + - [Experimental layer](#experimental-layer) + - [Hungarian layer](#hungarian-layer) + - [Navigation and media layer](#navigation-and-media-layer) + - [One-handed layer](#one-handed-layer) + - [Steno layer](#steno-layer) + - [LED states](#led-states) +* [Building](#building) + - [Using on Windows](#using-on-windows) +* [Changelog](#changelog) +* [License](#license) + +# Layouts + ## Base layer [![Base layer](images/base-layer.png)](http://www.keyboard-layout-editor.com/#/gists/28f7eb305fdbff943613e1dc7aa9e82b) -At its core, this is a Dvorak layout, with some minor changes (for example, `-` -being on the left half, and on the innermost key of the bottom row on the -right). The more interesting parts are how certain keys behave: +At its core, this is a Dvorak layout, with some minor changes. The more +interesting parts are how certain keys behave: * The keys on the number row double as function keys, when held for a bit longer than an usual tap. This allows me to use the function keys without having to @@ -33,9 +49,13 @@ right). The more interesting parts are how certain keys behave: normal layout. * The `ESC` key also doubles as a one-shot cancel key: if tapped while any of the one-shot modifiers are in-flight (as in, single-tapped, and not expired - yet), it cancels all one-shot modifiers. Otherwise it sends the usual keycode. -* The **Emacs** and **Hun** layer keys are one-shot, the **1Hand** and **STENO** - keys are toggles. + yet), it cancels all one-shot modifiers. It also cancels the **Hun** layer, if + active. Otherwise it sends the usual keycode. +* The **Media**, **Arrow**, and **Hun** layer keys are one-shot, the **1Hand** + and **STENO** keys are toggles. +* Toggling the **Arrow** layer toggles between the cursor arrows and the paging + keys on the bottom row. +* Tapping the `:` key once yields `:`, tapping it twice yields `;`. * The **Lead** key allows me to type in a sequence of keys, and trigger some actions: - `LEAD u` enters unicode input mode, by sending the GTK+ key sequence that @@ -45,8 +65,19 @@ right). The more interesting parts are how certain keys behave: - `LEAD y` types `\o/`. - `LEAD w m` maximises the currently focused window. - `LEAD e` makes the [experimental layer](#experimental-layer) the default. - - `LEAD v` prints the firmware version, the keyboard and the keymap, if - compiled with a QMK version that has these available. + - `LEAD v` prints the firmware version, the keyboard and the keymap. + +## Experimental layer + +[![Experimental layer](images/experimental-layer.png)](http://www.keyboard-layout-editor.com/#/gists/6ff50bf71248e05aab5b3fec4fae3d08) + +While using the standard Dvorak layout, I encountered a number of +inconveniences, and on this layer, I am playing with ideas to make the layout +feel better. Initially, it was based on [Capewell-Dvorak][cpd], but that too, +had shortcomings I was not happy with. So now this is something inbetween, with +own observations thrown in. How it works out in the long run remains to be seen. + + [cpd]: http://www.michaelcapewell.com/projects/keyboard/layout_capewell-dvorak.htm ## Hungarian layer @@ -57,32 +88,12 @@ variant. For some, which can have other diatribes, the long one is on top, short's on bottom. Tapping any of the accented characters takes us back to the base layer. -## Emacs layer +## Navigation and media layer -[![Emacs layer](images/emacs-layer.png)](http://www.keyboard-layout-editor.com/#/gists/c59c453f9fe1a3238ba1494e7e5c6892) +[![Navigation and media layer](images/nav-n-media-layer.png)](http://www.keyboard-layout-editor.com/#/gists/c59c453f9fe1a3238ba1494e7e5c6892) -This layer is primarily for navigating text - and for some mousing and other -things, because there was space. Most of the keys should be pretty -self-explanatory, except for a few: - -* There are three keys on the bottom row of the left side, that change how some - of the other keys - explained just below - work. The keys are for *Emacs - mode* (the default), *Terminal mode*, and *Traditional mode*, respectively. -* The *Visual mode* key (the top big key on the left side) sends the `v` key in - *Emacs mode*, to enter Visual mode in Spacemacs. In all other modes, it is a - no-op. -* The *Copy/Cut* key (the bottom big key on the left side) sends the copy - command on tap, the cut one when held for longer than a normal tap. The **copy - command** is `y` in *Emacs mode*, `Ctrl-Shift-c` in *Terminal mode*, and - `Ctrl-c` in *Traditional mode*. The **cut command** is `x` in *Emacs mode*, - `Ctrl-Shift-x` in *Terminal Mode* and `Ctrl-x` in *Traditional mode*. -* The *Paste/Delete* key (the leftmost key on the left thumb cluster) sends the - paste command on tap, the delete one when held longer than a normal tap. The - **paste command** is `p` in *Emacs mode*, `Ctrl-Shift-v` in *Terminal mode*, - and `Ctrl-v` in *Traditional mode*. The **delete command** is `d` in *Emacs - mode*, and `DEL` in the other two. -* The `A`, `I` and `R` keys will - after sending themselves - clear the layer - back to the base layer. This allows a quick escape from the layer. +This layer is primarily for navigating with the cursor or the mouse, and some +media things. ## One-handed layer @@ -113,33 +124,50 @@ This is to be used with [Plover](http://www.openstenoproject.org/plover/), nothing really fancy here. The **STENO** key toggles the layer on and off, and sends the toggle command to Plover too. -## Experimental layer +## LED states -[![Experimental layer](images/experimental-layer.png)](http://www.keyboard-layout-editor.com/#/gists/6ff50bf71248e05aab5b3fec4fae3d08) +The primary purpose of the LEDs is to show the modifier status, a secondary, to +show which layer is active. Each modifier, `Shift`, `Alt` and `Control` each +have their designated LEDs: the *red*, *green* and *blue*, respectively. When a +modifier is in a one-shot state, the respective LED will turn on with a dimmer +light. If the modifier is toggled on, the brightness of the LED turns full. -While using the standard Dvorak layout, I encountered a number of -inconveniences, and on this layer, I am playing with ideas to make the layout -feel better. Initially, it was based on [Capewell-Dvorak][cpd], but that too, -had shortcomings I was not happy with. So now this is something inbetween, with -own observations thrown in. How it works out in the long run remains to be seen. +For the layers, the following rules apply: - [cpd]: http://www.michaelcapewell.com/projects/keyboard/layout_capewell-dvorak.htm +* When the [Experimental layer](#experimental-layer) is toggled on, LEDs will + light up from left to right in a sequence, then turn off. When the layer is + toggled off, the LEDs light up and turn off in the other direction. No LEDs + are on while the layer is active. +* When the [Hungarian layer](#hungarian-layer) is active, the *green* and *blue* + LEDs are on. +* When the [Navigation and media layer](#navigation-and-media-layer) is active, + the *red* and *green* ones are on. +* When the [One-handed layer](#one-handed-layer) is active, the *green* LED is + on and bright, and either the *red* or the *blue* one is going to slowly + blink, depending on the currently active side. +* For the [Steno layer](#steno-layer), all LEDs will be turned on. + +Unless noted otherwise, the layers use a dim light for the LEDs, while modifiers +use a stronger one, and modifiers override any layer preferences. For example, +when on the one-handed layer, with the left side active (*red* light blinking), +if `Shift` is on, the *red* light will be constantly on. # Building To make my workflow easier, this layout is maintained in [its own repository][algernon:ez-layout]. To build it, you will need the -[QMK][qmk] firmware checked out, and this repo either checked out, or symlinked -to `keyboard/ergodox_ez/algernon`. One way to achieve that is this: +[QMK][qmk] firmware checked out, and this repo either checked out to something +like `keyboards/ergodox_ez/algernon-master`. One way to achieve that is this: [algernon:ez-layout]: https://github.com/algernon/ergodox-layout [qmk]: https://github.com/jackhumbert/qmk_firmware ``` $ git clone https://github.com/jackhumbert/qmk_firmware.git -$ cd qmk_firmware/keyboard/ergodox_ez -$ git clone https://github.com/algernon/ergodox-layout.git keymaps/algernon -$ make KEYMAP=algernon +$ cd qmk_firmware +$ git clone https://github.com/algernon/ergodox-layout.git \ + keyboards/ergodox_ez/keymaps/algernon-master +$ make KEYBOARD=ergodox_ez KEYMAP=algernon-master ``` From time to time, updates may be submitted back to the QMK repository. If you @@ -147,10 +175,54 @@ are reading it there, you can build the firmware like any other firmware included with it (assuming you are in the root directory of the firmware): ``` -$ cd keyboard/ergodox_ez -$ make KEYMAP=algernon +$ make KEYBOARD=ergodox_ez KEYMAP=algernon ``` +## Using on Windows + +The keymap default to forcing NKRO, which seems to upset Windows, and except the +modifiers, none of them work. If you experience this problem, recompile the +firmware with `FORCE_NKRO=no` added to the `make` command line. + +# Changelog + +## v1.2 - 2016-06-22 + +* The forced NKRO mode can be easily toggled off at compile-time, to make the + firmware compatible with [certain operating systems](#using-on-windows). +* The `:;` key has changed behaviour: to access the `;` symbol, the key needs to + be double-tapped, instead of shifted. +* The `=` and `\` keys were swapped, `=` moved to the home row, on both the + [base](#base-layer) and the [experimental](#experimental-layer) layers. +* The arrow and navigation keys were redone, they are now more accessible, but + the navigation keys require an extra tap to access. +* The **Emacs** layer is gone, replaced by a simplified + [navigation and media](#navigation-and-media-layer) layer. +* `LEAD v` types the firmware version, and the keymap version. +* On the [experimental](#experimental-layer) layer, the `L` and `Q`, and the `K` + and `G` keys were swapped. +* The [Steno](#steno-layer) layer gained a few more `#` and `*` keys, to make it + easier on my fingers. + +## v1.1 - 2016-06-14 + +* The keyboard starts in NKRO mode, bootmagic and other things are disabled. +* A [Steno](#steno-layer) layer was added, to be used with Plover. +* An [experimental](#experimental-layer) layer was added, something halfway + between Dvorak and Capewell-Dvorak. A work in progress. +* `LEAD y` types `\o/`. +* Some keys on the [Base](#base-layer) layer have been moved around: + - `?` moved to the left pinky, left of `Q`. + - `=` shifted one row down, but `F11` stayed where it was. + - `-` on the left half was replaced by `Tab`. + - `Tab`'s original position is taken by a `Media Next`/`Media Prev` key. + - `:` now inputs `;` when shifted. +* `ESC` cancels the [Hungarian](#hungarian-layer) layer too, not just modifiers. + +## v1.0 - 2016-05-26 + +Initial version. + # License The layout, being a derivative of the original TMK firmware which is under the diff --git a/keyboard/ergodox_ez/keymaps/algernon/tools/max-focused b/keyboards/ergodox_ez/keymaps/algernon/tools/max-focused similarity index 100% rename from keyboard/ergodox_ez/keymaps/algernon/tools/max-focused rename to keyboards/ergodox_ez/keymaps/algernon/tools/max-focused diff --git a/keyboard/ergodox_ez/keymaps/andrew_osx/compiled.hex b/keyboards/ergodox_ez/keymaps/andrew_osx/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/andrew_osx/compiled.hex rename to keyboards/ergodox_ez/keymaps/andrew_osx/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/andrew_osx/keymap.c b/keyboards/ergodox_ez/keymaps/andrew_osx/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/andrew_osx/keymap.c rename to keyboards/ergodox_ez/keymaps/andrew_osx/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/bepo/README.md b/keyboards/ergodox_ez/keymaps/bepo/README.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/bepo/README.md rename to keyboards/ergodox_ez/keymaps/bepo/README.md diff --git a/keyboard/ergodox_ez/keymaps/bepo/bepo.png b/keyboards/ergodox_ez/keymaps/bepo/bepo.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/bepo/bepo.png rename to keyboards/ergodox_ez/keymaps/bepo/bepo.png diff --git a/keyboard/ergodox_ez/keymaps/bepo/compiled.hex b/keyboards/ergodox_ez/keymaps/bepo/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/bepo/compiled.hex rename to keyboards/ergodox_ez/keymaps/bepo/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/bepo/keymap.c b/keyboards/ergodox_ez/keymaps/bepo/keymap.c similarity index 99% rename from keyboard/ergodox_ez/keymaps/bepo/keymap.c rename to keyboards/ergodox_ez/keymaps/bepo/keymap.c index dac6b7b51a..921a94d63a 100644 --- a/keyboard/ergodox_ez/keymaps/bepo/keymap.c +++ b/keyboards/ergodox_ez/keymaps/bepo/keymap.c @@ -1,7 +1,7 @@ #include "ergodox_ez.h" #include "debug.h" #include "action_layer.h" -#include "keymap_extras/keymap_bepo.h" +#include "keymap_bepo.h" #define BASE 0 // default layer #define QWER 1 // qwerty compat layer diff --git a/keyboard/ergodox_ez/keymaps/coderkun_neo2/Makefile b/keyboards/ergodox_ez/keymaps/coderkun_neo2/Makefile similarity index 100% rename from keyboard/ergodox_ez/keymaps/coderkun_neo2/Makefile rename to keyboards/ergodox_ez/keymaps/coderkun_neo2/Makefile diff --git a/keyboard/ergodox_ez/keymaps/coderkun_neo2/compiled.hex b/keyboards/ergodox_ez/keymaps/coderkun_neo2/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/coderkun_neo2/compiled.hex rename to keyboards/ergodox_ez/keymaps/coderkun_neo2/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/coderkun_neo2/keymap.c b/keyboards/ergodox_ez/keymaps/coderkun_neo2/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/coderkun_neo2/keymap.c rename to keyboards/ergodox_ez/keymaps/coderkun_neo2/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/coderkun_neo2/readme.md b/keyboards/ergodox_ez/keymaps/coderkun_neo2/readme.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/coderkun_neo2/readme.md rename to keyboards/ergodox_ez/keymaps/coderkun_neo2/readme.md diff --git a/keyboard/ergodox_ez/keymaps/colemak/compiled.hex b/keyboards/ergodox_ez/keymaps/colemak/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/colemak/compiled.hex rename to keyboards/ergodox_ez/keymaps/colemak/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/colemak/keymap.c b/keyboards/ergodox_ez/keymaps/colemak/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/colemak/keymap.c rename to keyboards/ergodox_ez/keymaps/colemak/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/colemak/readme.md b/keyboards/ergodox_ez/keymaps/colemak/readme.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/colemak/readme.md rename to keyboards/ergodox_ez/keymaps/colemak/readme.md diff --git a/keyboard/ergodox_ez/keymaps/colemak_osx_pc_no/compiled.hex b/keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/colemak_osx_pc_no/compiled.hex rename to keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/colemak_osx_pc_no/keyboard-layout.png b/keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/keyboard-layout.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/colemak_osx_pc_no/keyboard-layout.png rename to keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/keyboard-layout.png diff --git a/keyboard/ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c b/keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c similarity index 99% rename from keyboard/ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c rename to keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c index da540c7a30..3b74d266f7 100644 --- a/keyboard/ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c +++ b/keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c @@ -1,7 +1,7 @@ #include "ergodox_ez.h" #include "debug.h" #include "action_layer.h" -#include "../../../../quantum/keymap_extras/keymap_norwegian.c" +#include "keymap_norwegian.h" #define BASE 0 // default layer #define BASE_MAC 1 // default layer mac diff --git a/keyboard/ergodox_ez/keymaps/colemak_osx_pc_no/readme.md b/keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/readme.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/colemak_osx_pc_no/readme.md rename to keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/readme.md diff --git a/keyboard/ergodox_ez/keymaps/csharp_dev/compiled.hex b/keyboards/ergodox_ez/keymaps/csharp_dev/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/csharp_dev/compiled.hex rename to keyboards/ergodox_ez/keymaps/csharp_dev/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/csharp_dev/csharp_dev.png b/keyboards/ergodox_ez/keymaps/csharp_dev/csharp_dev.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/csharp_dev/csharp_dev.png rename to keyboards/ergodox_ez/keymaps/csharp_dev/csharp_dev.png diff --git a/keyboard/ergodox_ez/keymaps/csharp_dev/csharp_dev_legend.png b/keyboards/ergodox_ez/keymaps/csharp_dev/csharp_dev_legend.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/csharp_dev/csharp_dev_legend.png rename to keyboards/ergodox_ez/keymaps/csharp_dev/csharp_dev_legend.png diff --git a/keyboard/ergodox_ez/keymaps/csharp_dev/keymap.c b/keyboards/ergodox_ez/keymaps/csharp_dev/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/csharp_dev/keymap.c rename to keyboards/ergodox_ez/keymaps/csharp_dev/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/csharp_dev/readme.md b/keyboards/ergodox_ez/keymaps/csharp_dev/readme.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/csharp_dev/readme.md rename to keyboards/ergodox_ez/keymaps/csharp_dev/readme.md diff --git a/keyboard/ergodox_ez/keymaps/dave/compiled.hex b/keyboards/ergodox_ez/keymaps/dave/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/dave/compiled.hex rename to keyboards/ergodox_ez/keymaps/dave/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/dave/keymap.c b/keyboards/ergodox_ez/keymaps/dave/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/dave/keymap.c rename to keyboards/ergodox_ez/keymaps/dave/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/dave/readme.md b/keyboards/ergodox_ez/keymaps/dave/readme.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/dave/readme.md rename to keyboards/ergodox_ez/keymaps/dave/readme.md diff --git a/keyboard/ergodox_ez/keymaps/default/compiled.hex b/keyboards/ergodox_ez/keymaps/default/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/default/compiled.hex rename to keyboards/ergodox_ez/keymaps/default/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/default/default.png b/keyboards/ergodox_ez/keymaps/default/default.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/default/default.png rename to keyboards/ergodox_ez/keymaps/default/default.png diff --git a/keyboard/ergodox_ez/keymaps/default/default_highres.png b/keyboards/ergodox_ez/keymaps/default/default_highres.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/default/default_highres.png rename to keyboards/ergodox_ez/keymaps/default/default_highres.png diff --git a/keyboard/ergodox_ez/keymaps/default/keymap.c b/keyboards/ergodox_ez/keymaps/default/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/default/keymap.c rename to keyboards/ergodox_ez/keymaps/default/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/default/readme.md b/keyboards/ergodox_ez/keymaps/default/readme.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/default/readme.md rename to keyboards/ergodox_ez/keymaps/default/readme.md diff --git a/keyboard/ergodox_ez/keymaps/default_osx/compiled.hex b/keyboards/ergodox_ez/keymaps/default_osx/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/default_osx/compiled.hex rename to keyboards/ergodox_ez/keymaps/default_osx/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/default_osx/default_osx_highres.png b/keyboards/ergodox_ez/keymaps/default_osx/default_osx_highres.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/default_osx/default_osx_highres.png rename to keyboards/ergodox_ez/keymaps/default_osx/default_osx_highres.png diff --git a/keyboard/ergodox_ez/keymaps/default_osx/keymap.c b/keyboards/ergodox_ez/keymaps/default_osx/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/default_osx/keymap.c rename to keyboards/ergodox_ez/keymaps/default_osx/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/default_osx/readme.md b/keyboards/ergodox_ez/keymaps/default_osx/readme.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/default_osx/readme.md rename to keyboards/ergodox_ez/keymaps/default_osx/readme.md diff --git a/keyboard/ergodox_ez/keymaps/dragon788/compiled.hex b/keyboards/ergodox_ez/keymaps/dragon788/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/dragon788/compiled.hex rename to keyboards/ergodox_ez/keymaps/dragon788/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/dragon788/keymap.c b/keyboards/ergodox_ez/keymaps/dragon788/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/dragon788/keymap.c rename to keyboards/ergodox_ez/keymaps/dragon788/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/dvorak/compiled.hex b/keyboards/ergodox_ez/keymaps/dvorak/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/dvorak/compiled.hex rename to keyboards/ergodox_ez/keymaps/dvorak/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/dvorak/dvorak.png b/keyboards/ergodox_ez/keymaps/dvorak/dvorak.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/dvorak/dvorak.png rename to keyboards/ergodox_ez/keymaps/dvorak/dvorak.png diff --git a/keyboard/ergodox_ez/keymaps/dvorak/keymap.c b/keyboards/ergodox_ez/keymaps/dvorak/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/dvorak/keymap.c rename to keyboards/ergodox_ez/keymaps/dvorak/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/README.md b/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/README.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/README.md rename to keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/README.md diff --git a/keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/compiled.hex b/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/compiled.hex rename to keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout0.png b/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout0.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout0.png rename to keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout0.png diff --git a/keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout1.png b/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout1.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout1.png rename to keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout1.png diff --git a/keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout2.png b/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout2.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout2.png rename to keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout2.png diff --git a/keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/keymap.c b/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/dvorak_intl_squisher/keymap.c rename to keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/dvorak_spanish/README.md b/keyboards/ergodox_ez/keymaps/dvorak_spanish/README.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/dvorak_spanish/README.md rename to keyboards/ergodox_ez/keymaps/dvorak_spanish/README.md diff --git a/keyboard/ergodox_ez/keymaps/dvorak_spanish/compiled.hex b/keyboards/ergodox_ez/keymaps/dvorak_spanish/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/dvorak_spanish/compiled.hex rename to keyboards/ergodox_ez/keymaps/dvorak_spanish/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/dvorak_spanish/keymap.c b/keyboards/ergodox_ez/keymaps/dvorak_spanish/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/dvorak_spanish/keymap.c rename to keyboards/ergodox_ez/keymaps/dvorak_spanish/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/emacs_osx_dk/compiled.hex b/keyboards/ergodox_ez/keymaps/emacs_osx_dk/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/emacs_osx_dk/compiled.hex rename to keyboards/ergodox_ez/keymaps/emacs_osx_dk/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/emacs_osx_dk/default_highres.png b/keyboards/ergodox_ez/keymaps/emacs_osx_dk/default_highres.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/emacs_osx_dk/default_highres.png rename to keyboards/ergodox_ez/keymaps/emacs_osx_dk/default_highres.png diff --git a/keyboard/ergodox_ez/keymaps/emacs_osx_dk/keymap.c b/keyboards/ergodox_ez/keymaps/emacs_osx_dk/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/emacs_osx_dk/keymap.c rename to keyboards/ergodox_ez/keymaps/emacs_osx_dk/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/emacs_osx_dk/readme.md b/keyboards/ergodox_ez/keymaps/emacs_osx_dk/readme.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/emacs_osx_dk/readme.md rename to keyboards/ergodox_ez/keymaps/emacs_osx_dk/readme.md diff --git a/keyboard/ergodox_ez/keymaps/erez_experimental/Makefile b/keyboards/ergodox_ez/keymaps/erez_experimental/Makefile similarity index 100% rename from keyboard/ergodox_ez/keymaps/erez_experimental/Makefile rename to keyboards/ergodox_ez/keymaps/erez_experimental/Makefile diff --git a/keyboard/ergodox_ez/keymaps/erez_experimental/compiled.hex b/keyboards/ergodox_ez/keymaps/erez_experimental/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/erez_experimental/compiled.hex rename to keyboards/ergodox_ez/keymaps/erez_experimental/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/erez_experimental/config.h b/keyboards/ergodox_ez/keymaps/erez_experimental/config.h similarity index 100% rename from keyboard/ergodox_ez/keymaps/erez_experimental/config.h rename to keyboards/ergodox_ez/keymaps/erez_experimental/config.h diff --git a/keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c b/keyboards/ergodox_ez/keymaps/erez_experimental/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/erez_experimental/keymap.c rename to keyboards/ergodox_ez/keymaps/erez_experimental/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/erez_experimental/readme.md b/keyboards/ergodox_ez/keymaps/erez_experimental/readme.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/erez_experimental/readme.md rename to keyboards/ergodox_ez/keymaps/erez_experimental/readme.md diff --git a/keyboard/ergodox_ez/keymaps/german-kinergo/compiled.hex b/keyboards/ergodox_ez/keymaps/german-kinergo/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/german-kinergo/compiled.hex rename to keyboards/ergodox_ez/keymaps/german-kinergo/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/german-kinergo/keymap.c b/keyboards/ergodox_ez/keymaps/german-kinergo/keymap.c similarity index 99% rename from keyboard/ergodox_ez/keymaps/german-kinergo/keymap.c rename to keyboards/ergodox_ez/keymaps/german-kinergo/keymap.c index 572e03a1d5..b1cecf0ddd 100644 --- a/keyboard/ergodox_ez/keymaps/german-kinergo/keymap.c +++ b/keyboards/ergodox_ez/keymaps/german-kinergo/keymap.c @@ -4,7 +4,7 @@ #include "ergodox_ez.h" #include "debug.h" #include "action_layer.h" -#include "keymap_extras/keymap_german.h" +#include "keymap_german.h" // Layer names #define BASE 0 // default layer diff --git a/keyboard/ergodox_ez/keymaps/german-kinergo/layout-code.png b/keyboards/ergodox_ez/keymaps/german-kinergo/layout-code.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/german-kinergo/layout-code.png rename to keyboards/ergodox_ez/keymaps/german-kinergo/layout-code.png diff --git a/keyboard/ergodox_ez/keymaps/german-kinergo/layout-media.png b/keyboards/ergodox_ez/keymaps/german-kinergo/layout-media.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/german-kinergo/layout-media.png rename to keyboards/ergodox_ez/keymaps/german-kinergo/layout-media.png diff --git a/keyboard/ergodox_ez/keymaps/german-kinergo/layout.png b/keyboards/ergodox_ez/keymaps/german-kinergo/layout.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/german-kinergo/layout.png rename to keyboards/ergodox_ez/keymaps/german-kinergo/layout.png diff --git a/keyboard/ergodox_ez/keymaps/german-kinergo/readme.md b/keyboards/ergodox_ez/keymaps/german-kinergo/readme.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/german-kinergo/readme.md rename to keyboards/ergodox_ez/keymaps/german-kinergo/readme.md diff --git a/keyboard/ergodox_ez/keymaps/german-manuneo/compile_keymap.py b/keyboards/ergodox_ez/keymaps/german-manuneo/compile_keymap.py similarity index 100% rename from keyboard/ergodox_ez/keymaps/german-manuneo/compile_keymap.py rename to keyboards/ergodox_ez/keymaps/german-manuneo/compile_keymap.py diff --git a/keyboard/ergodox_ez/keymaps/german-manuneo/compiled.hex b/keyboards/ergodox_ez/keymaps/german-manuneo/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/german-manuneo/compiled.hex rename to keyboards/ergodox_ez/keymaps/german-manuneo/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c b/keyboards/ergodox_ez/keymaps/german-manuneo/keymap.c similarity index 99% rename from keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c rename to keyboards/ergodox_ez/keymaps/german-manuneo/keymap.c index 131796fc5d..5fcc14d518 100644 --- a/keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c +++ b/keyboards/ergodox_ez/keymaps/german-manuneo/keymap.c @@ -1,7 +1,7 @@ #include "ergodox_ez.h" #include "action_layer.h" #include "keymap.h" -#include "keymap_extras/keymap_german.h" +#include "keymap_german.h" #define UC_ASYMPTOTICALLY_EQUAL_TO 0 #define UC_DIVISION_SIGN 1 diff --git a/keyboard/ergodox_ez/keymaps/german-manuneo/keymap.md b/keyboards/ergodox_ez/keymaps/german-manuneo/keymap.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/german-manuneo/keymap.md rename to keyboards/ergodox_ez/keymaps/german-manuneo/keymap.md diff --git a/keyboard/ergodox_ez/keymaps/german/compiled.hex b/keyboards/ergodox_ez/keymaps/german/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/german/compiled.hex rename to keyboards/ergodox_ez/keymaps/german/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/german/keymap.c b/keyboards/ergodox_ez/keymaps/german/keymap.c similarity index 99% rename from keyboard/ergodox_ez/keymaps/german/keymap.c rename to keyboards/ergodox_ez/keymaps/german/keymap.c index 7ec8d99cc0..3eab51f0e2 100644 --- a/keyboard/ergodox_ez/keymaps/german/keymap.c +++ b/keyboards/ergodox_ez/keymaps/german/keymap.c @@ -1,7 +1,7 @@ #include "ergodox_ez.h" #include "debug.h" #include "action_layer.h" -#include "keymap_extras/keymap_german.h" +#include "keymap_german.h" // Layer names #define BASE 0 // default layer diff --git a/keyboard/ergodox_ez/keymaps/j3rn/compiled.hex b/keyboards/ergodox_ez/keymaps/j3rn/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/j3rn/compiled.hex rename to keyboards/ergodox_ez/keymaps/j3rn/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/j3rn/keymap.c b/keyboards/ergodox_ez/keymaps/j3rn/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/j3rn/keymap.c rename to keyboards/ergodox_ez/keymaps/j3rn/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/j3rn/readme.md b/keyboards/ergodox_ez/keymaps/j3rn/readme.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/j3rn/readme.md rename to keyboards/ergodox_ez/keymaps/j3rn/readme.md diff --git a/keyboard/ergodox_ez/keymaps/jack/compiled.hex b/keyboards/ergodox_ez/keymaps/jack/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/jack/compiled.hex rename to keyboards/ergodox_ez/keymaps/jack/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/jack/keymap.c b/keyboards/ergodox_ez/keymaps/jack/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/jack/keymap.c rename to keyboards/ergodox_ez/keymaps/jack/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/jacobono/README.md b/keyboards/ergodox_ez/keymaps/jacobono/README.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/jacobono/README.md rename to keyboards/ergodox_ez/keymaps/jacobono/README.md diff --git a/keyboard/ergodox_ez/keymaps/jacobono/compiled.hex b/keyboards/ergodox_ez/keymaps/jacobono/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/jacobono/compiled.hex rename to keyboards/ergodox_ez/keymaps/jacobono/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/jacobono/img/colemak-default-layer.png b/keyboards/ergodox_ez/keymaps/jacobono/img/colemak-default-layer.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/jacobono/img/colemak-default-layer.png rename to keyboards/ergodox_ez/keymaps/jacobono/img/colemak-default-layer.png diff --git a/keyboard/ergodox_ez/keymaps/jacobono/img/number-dpad-layer.png b/keyboards/ergodox_ez/keymaps/jacobono/img/number-dpad-layer.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/jacobono/img/number-dpad-layer.png rename to keyboards/ergodox_ez/keymaps/jacobono/img/number-dpad-layer.png diff --git a/keyboard/ergodox_ez/keymaps/jacobono/img/symbol-layer.png b/keyboards/ergodox_ez/keymaps/jacobono/img/symbol-layer.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/jacobono/img/symbol-layer.png rename to keyboards/ergodox_ez/keymaps/jacobono/img/symbol-layer.png diff --git a/keyboard/ergodox_ez/keymaps/jacobono/keymap.c b/keyboards/ergodox_ez/keymaps/jacobono/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/jacobono/keymap.c rename to keyboards/ergodox_ez/keymaps/jacobono/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/jgarr/compiled.hex b/keyboards/ergodox_ez/keymaps/jgarr/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/jgarr/compiled.hex rename to keyboards/ergodox_ez/keymaps/jgarr/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/jgarr/keymap.c b/keyboards/ergodox_ez/keymaps/jgarr/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/jgarr/keymap.c rename to keyboards/ergodox_ez/keymaps/jgarr/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/kastyle/compiled.hex b/keyboards/ergodox_ez/keymaps/kastyle/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/kastyle/compiled.hex rename to keyboards/ergodox_ez/keymaps/kastyle/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/kastyle/keymap.c b/keyboards/ergodox_ez/keymaps/kastyle/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/kastyle/keymap.c rename to keyboards/ergodox_ez/keymaps/kastyle/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/kines-ish/compiled.hex b/keyboards/ergodox_ez/keymaps/kines-ish/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/kines-ish/compiled.hex rename to keyboards/ergodox_ez/keymaps/kines-ish/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/kines-ish/keymap.c b/keyboards/ergodox_ez/keymaps/kines-ish/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/kines-ish/keymap.c rename to keyboards/ergodox_ez/keymaps/kines-ish/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/kines-ish/readme.md b/keyboards/ergodox_ez/keymaps/kines-ish/readme.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/kines-ish/readme.md rename to keyboards/ergodox_ez/keymaps/kines-ish/readme.md diff --git a/keyboard/ergodox_ez/keymaps/mpiechotka/compiled.hex b/keyboards/ergodox_ez/keymaps/mpiechotka/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/mpiechotka/compiled.hex rename to keyboards/ergodox_ez/keymaps/mpiechotka/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/mpiechotka/keymap.c b/keyboards/ergodox_ez/keymaps/mpiechotka/keymap.c similarity index 99% rename from keyboard/ergodox_ez/keymaps/mpiechotka/keymap.c rename to keyboards/ergodox_ez/keymaps/mpiechotka/keymap.c index 0c4f85a3da..5bfef59955 100644 --- a/keyboard/ergodox_ez/keymaps/mpiechotka/keymap.c +++ b/keyboards/ergodox_ez/keymaps/mpiechotka/keymap.c @@ -1,7 +1,7 @@ #include "ergodox_ez.h" #include "debug.h" #include "action_layer.h" -#include "keymap_extras/keymap_colemak.h" +#include "keymap_colemak.h" enum { BASE = 0, diff --git a/keyboard/ergodox_ez/keymaps/mpiechotka/readme.md b/keyboards/ergodox_ez/keymaps/mpiechotka/readme.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/mpiechotka/readme.md rename to keyboards/ergodox_ez/keymaps/mpiechotka/readme.md diff --git a/keyboard/ergodox_ez/keymaps/msc/compiled.hex b/keyboards/ergodox_ez/keymaps/msc/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/msc/compiled.hex rename to keyboards/ergodox_ez/keymaps/msc/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/msc/img/code_layer.png b/keyboards/ergodox_ez/keymaps/msc/img/code_layer.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/msc/img/code_layer.png rename to keyboards/ergodox_ez/keymaps/msc/img/code_layer.png diff --git a/keyboard/ergodox_ez/keymaps/msc/img/main_layer.png b/keyboards/ergodox_ez/keymaps/msc/img/main_layer.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/msc/img/main_layer.png rename to keyboards/ergodox_ez/keymaps/msc/img/main_layer.png diff --git a/keyboard/ergodox_ez/keymaps/msc/img/media_layer.png b/keyboards/ergodox_ez/keymaps/msc/img/media_layer.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/msc/img/media_layer.png rename to keyboards/ergodox_ez/keymaps/msc/img/media_layer.png diff --git a/keyboard/ergodox_ez/keymaps/msc/keymap.c b/keyboards/ergodox_ez/keymaps/msc/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/msc/keymap.c rename to keyboards/ergodox_ez/keymaps/msc/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/msc/readme.md b/keyboards/ergodox_ez/keymaps/msc/readme.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/msc/readme.md rename to keyboards/ergodox_ez/keymaps/msc/readme.md diff --git a/keyboard/ergodox_ez/keymaps/naps62/README.md b/keyboards/ergodox_ez/keymaps/naps62/README.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/naps62/README.md rename to keyboards/ergodox_ez/keymaps/naps62/README.md diff --git a/keyboard/ergodox_ez/keymaps/naps62/compiled.hex b/keyboards/ergodox_ez/keymaps/naps62/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/naps62/compiled.hex rename to keyboards/ergodox_ez/keymaps/naps62/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/naps62/keymap.c b/keyboards/ergodox_ez/keymaps/naps62/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/naps62/keymap.c rename to keyboards/ergodox_ez/keymaps/naps62/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/ordinary/compiled.hex b/keyboards/ergodox_ez/keymaps/ordinary/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/ordinary/compiled.hex rename to keyboards/ergodox_ez/keymaps/ordinary/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/ordinary/keymap.c b/keyboards/ergodox_ez/keymaps/ordinary/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/ordinary/keymap.c rename to keyboards/ergodox_ez/keymaps/ordinary/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.png b/keyboards/ergodox_ez/keymaps/ordinary/ordinary-base.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.png rename to keyboards/ergodox_ez/keymaps/ordinary/ordinary-base.png diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.txt b/keyboards/ergodox_ez/keymaps/ordinary/ordinary-base.txt similarity index 100% rename from keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.txt rename to keyboards/ergodox_ez/keymaps/ordinary/ordinary-base.txt diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.png b/keyboards/ergodox_ez/keymaps/ordinary/ordinary-media.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.png rename to keyboards/ergodox_ez/keymaps/ordinary/ordinary-media.png diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.txt b/keyboards/ergodox_ez/keymaps/ordinary/ordinary-media.txt similarity index 100% rename from keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.txt rename to keyboards/ergodox_ez/keymaps/ordinary/ordinary-media.txt diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-special.png b/keyboards/ergodox_ez/keymaps/ordinary/ordinary-special.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/ordinary/ordinary-special.png rename to keyboards/ergodox_ez/keymaps/ordinary/ordinary-special.png diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-special.txt b/keyboards/ergodox_ez/keymaps/ordinary/ordinary-special.txt similarity index 100% rename from keyboard/ergodox_ez/keymaps/ordinary/ordinary-special.txt rename to keyboards/ergodox_ez/keymaps/ordinary/ordinary-special.txt diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.png b/keyboards/ergodox_ez/keymaps/ordinary/ordinary-symbol.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.png rename to keyboards/ergodox_ez/keymaps/ordinary/ordinary-symbol.png diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.txt b/keyboards/ergodox_ez/keymaps/ordinary/ordinary-symbol.txt similarity index 100% rename from keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.txt rename to keyboards/ergodox_ez/keymaps/ordinary/ordinary-symbol.txt diff --git a/keyboard/ergodox_ez/keymaps/ordinary/readme.md b/keyboards/ergodox_ez/keymaps/ordinary/readme.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/ordinary/readme.md rename to keyboards/ergodox_ez/keymaps/ordinary/readme.md diff --git a/keyboard/ergodox_ez/keymaps/osx_de/compiled.hex b/keyboards/ergodox_ez/keymaps/osx_de/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/osx_de/compiled.hex rename to keyboards/ergodox_ez/keymaps/osx_de/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/osx_de/keymap.c b/keyboards/ergodox_ez/keymaps/osx_de/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/osx_de/keymap.c rename to keyboards/ergodox_ez/keymaps/osx_de/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/osx_de/osx_de_highres.png b/keyboards/ergodox_ez/keymaps/osx_de/osx_de_highres.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/osx_de/osx_de_highres.png rename to keyboards/ergodox_ez/keymaps/osx_de/osx_de_highres.png diff --git a/keyboard/ergodox_ez/keymaps/osx_de/readme.md b/keyboards/ergodox_ez/keymaps/osx_de/readme.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/osx_de/readme.md rename to keyboards/ergodox_ez/keymaps/osx_de/readme.md diff --git a/keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/compiled.hex b/keyboards/ergodox_ez/keymaps/osx_de_adnw_koy/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/compiled.hex rename to keyboards/ergodox_ez/keymaps/osx_de_adnw_koy/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c b/keyboards/ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c similarity index 99% rename from keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c rename to keyboards/ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c index 20b085ed44..687a5cb8b5 100644 --- a/keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c +++ b/keyboards/ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c @@ -9,7 +9,7 @@ #include "keymap_nordic.h" #include "keymap_dvorak.h" #include "keymap_german.h" -#include "keymap_norwegian.c" +#include "keymap_norwegian.h" #include "keymap_fr_ch.h" #include "keymap_german_osx.h" #include "keymap_spanish.h" diff --git a/keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/osx_de_adnw_koy_highres.png b/keyboards/ergodox_ez/keymaps/osx_de_adnw_koy/osx_de_adnw_koy_highres.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/osx_de_adnw_koy_highres.png rename to keyboards/ergodox_ez/keymaps/osx_de_adnw_koy/osx_de_adnw_koy_highres.png diff --git a/keyboard/ergodox_ez/keymaps/osx_de_experimental/compiled.hex b/keyboards/ergodox_ez/keymaps/osx_de_experimental/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/osx_de_experimental/compiled.hex rename to keyboards/ergodox_ez/keymaps/osx_de_experimental/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c b/keyboards/ergodox_ez/keymaps/osx_de_experimental/keymap.c similarity index 99% rename from keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c rename to keyboards/ergodox_ez/keymaps/osx_de_experimental/keymap.c index 4a9ceb4ef7..21d695894a 100644 --- a/keyboard/ergodox_ez/keymaps/osx_de_experimental/keymap.c +++ b/keyboards/ergodox_ez/keymaps/osx_de_experimental/keymap.c @@ -7,7 +7,7 @@ #include "keymap_nordic.h" #include "keymap_dvorak.h" #include "keymap_german.h" -#include "keymap_norwegian.c" +#include "keymap_norwegian.h" #include "keymap_fr_ch.h" #include "keymap_german_osx.h" #include "keymap_spanish.h" diff --git a/keyboard/ergodox_ez/keymaps/osx_de_experimental/osx_de_experimental_highres.png b/keyboards/ergodox_ez/keymaps/osx_de_experimental/osx_de_experimental_highres.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/osx_de_experimental/osx_de_experimental_highres.png rename to keyboards/ergodox_ez/keymaps/osx_de_experimental/osx_de_experimental_highres.png diff --git a/keyboard/ergodox_ez/keymaps/osx_de_experimental/readme.md b/keyboards/ergodox_ez/keymaps/osx_de_experimental/readme.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/osx_de_experimental/readme.md rename to keyboards/ergodox_ez/keymaps/osx_de_experimental/readme.md diff --git a/keyboard/ergodox_ez/keymaps/osx_fr/compiled.hex b/keyboards/ergodox_ez/keymaps/osx_fr/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/osx_fr/compiled.hex rename to keyboards/ergodox_ez/keymaps/osx_fr/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/osx_fr/keymap.c b/keyboards/ergodox_ez/keymaps/osx_fr/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/osx_fr/keymap.c rename to keyboards/ergodox_ez/keymaps/osx_fr/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/osx_kinesis_pnut/compiled.hex b/keyboards/ergodox_ez/keymaps/osx_kinesis_pnut/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/osx_kinesis_pnut/compiled.hex rename to keyboards/ergodox_ez/keymaps/osx_kinesis_pnut/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/osx_kinesis_pnut/keymap.c b/keyboards/ergodox_ez/keymaps/osx_kinesis_pnut/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/osx_kinesis_pnut/keymap.c rename to keyboards/ergodox_ez/keymaps/osx_kinesis_pnut/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/plover/compiled.hex b/keyboards/ergodox_ez/keymaps/plover/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/plover/compiled.hex rename to keyboards/ergodox_ez/keymaps/plover/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/plover/keymap.c b/keyboards/ergodox_ez/keymaps/plover/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/plover/keymap.c rename to keyboards/ergodox_ez/keymaps/plover/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/plums/compiled.hex b/keyboards/ergodox_ez/keymaps/plums/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/plums/compiled.hex rename to keyboards/ergodox_ez/keymaps/plums/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/plums/keymap.c b/keyboards/ergodox_ez/keymaps/plums/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/plums/keymap.c rename to keyboards/ergodox_ez/keymaps/plums/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/plums/plums.png b/keyboards/ergodox_ez/keymaps/plums/plums.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/plums/plums.png rename to keyboards/ergodox_ez/keymaps/plums/plums.png diff --git a/keyboard/ergodox_ez/keymaps/plums/readme.md b/keyboards/ergodox_ez/keymaps/plums/readme.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/plums/readme.md rename to keyboards/ergodox_ez/keymaps/plums/readme.md diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/compiled.hex b/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-osx/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/compiled.hex rename to keyboards/ergodox_ez/keymaps/romanzolotarev-norman-osx/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/keymap.c b/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-osx/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/keymap.c rename to keyboards/ergodox_ez/keymaps/romanzolotarev-norman-osx/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/readme.md b/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-osx/readme.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/readme.md rename to keyboards/ergodox_ez/keymaps/romanzolotarev-norman-osx/readme.md diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/romanzolotarev-norman-osx.png b/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-osx/romanzolotarev-norman-osx.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/romanzolotarev-norman-osx/romanzolotarev-norman-osx.png rename to keyboards/ergodox_ez/keymaps/romanzolotarev-norman-osx/romanzolotarev-norman-osx.png diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/compiled.hex b/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/compiled.hex rename to keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/keymap.c b/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/keymap.c rename to keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/readme.md b/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/readme.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/readme.md rename to keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/readme.md diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/romanzolotarev-norman-plover-osx-hjkl.png b/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/romanzolotarev-norman-plover-osx-hjkl.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/romanzolotarev-norman-plover-osx-hjkl.png rename to keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/romanzolotarev-norman-plover-osx-hjkl.png diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/compiled.hex b/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/compiled.hex rename to keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c b/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c rename to keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md b/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md rename to keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.png b/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.png rename to keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.png diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/compiled.hex b/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/compiled.hex rename to keyboards/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/keymap.c b/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/keymap.c rename to keyboards/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/readme.md b/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/readme.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/readme.md rename to keyboards/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/readme.md diff --git a/keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/romanzolotarev-norman-qwerty-osx.png b/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/romanzolotarev-norman-qwerty-osx.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/romanzolotarev-norman-qwerty-osx.png rename to keyboards/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/romanzolotarev-norman-qwerty-osx.png diff --git a/keyboard/ergodox_ez/keymaps/sneako/README.md b/keyboards/ergodox_ez/keymaps/sneako/README.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/sneako/README.md rename to keyboards/ergodox_ez/keymaps/sneako/README.md diff --git a/keyboard/ergodox_ez/keymaps/sneako/compiled.hex b/keyboards/ergodox_ez/keymaps/sneako/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/sneako/compiled.hex rename to keyboards/ergodox_ez/keymaps/sneako/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/sneako/keymap.c b/keyboards/ergodox_ez/keymaps/sneako/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/sneako/keymap.c rename to keyboards/ergodox_ez/keymaps/sneako/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/software_neo2/compiled.hex b/keyboards/ergodox_ez/keymaps/software_neo2/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/software_neo2/compiled.hex rename to keyboards/ergodox_ez/keymaps/software_neo2/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/software_neo2/keymap.c b/keyboards/ergodox_ez/keymaps/software_neo2/keymap.c similarity index 99% rename from keyboard/ergodox_ez/keymaps/software_neo2/keymap.c rename to keyboards/ergodox_ez/keymaps/software_neo2/keymap.c index a734062f1c..2eaba0d7da 100644 --- a/keyboard/ergodox_ez/keymaps/software_neo2/keymap.c +++ b/keyboards/ergodox_ez/keymaps/software_neo2/keymap.c @@ -1,7 +1,7 @@ #include "ergodox_ez.h" #include "debug.h" #include "action_layer.h" -#include "keymap_extras/keymap_neo2.h" +#include "keymap_neo2.h" // Layer names #define BASE 0 // default layer diff --git a/keyboard/ergodox_ez/keymaps/supercoder/README.md b/keyboards/ergodox_ez/keymaps/supercoder/README.md similarity index 96% rename from keyboard/ergodox_ez/keymaps/supercoder/README.md rename to keyboards/ergodox_ez/keymaps/supercoder/README.md index ad531b3da7..97bf7f5835 100644 --- a/keyboard/ergodox_ez/keymaps/supercoder/README.md +++ b/keyboards/ergodox_ez/keymaps/supercoder/README.md @@ -23,7 +23,7 @@ your own: ``` $ git clone https://github.com/jackhumbert/qmk_firmware.git -$ cd qmk_firmware/keyboard/ergodox_ez +$ cd qmk_firmware/keyboards/ergodox_ez $ git clone https://github.com/algernon/ergodox-supercoder.git keymaps/supercoder $ make KEYMAP=supercoder ``` diff --git a/keyboard/ergodox_ez/keymaps/supercoder/compiled.hex b/keyboards/ergodox_ez/keymaps/supercoder/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/supercoder/compiled.hex rename to keyboards/ergodox_ez/keymaps/supercoder/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/supercoder/config_user.h b/keyboards/ergodox_ez/keymaps/supercoder/config_user.h similarity index 100% rename from keyboard/ergodox_ez/keymaps/supercoder/config_user.h rename to keyboards/ergodox_ez/keymaps/supercoder/config_user.h diff --git a/keyboard/ergodox_ez/keymaps/supercoder/images/layout.png b/keyboards/ergodox_ez/keymaps/supercoder/images/layout.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/supercoder/images/layout.png rename to keyboards/ergodox_ez/keymaps/supercoder/images/layout.png diff --git a/keyboard/ergodox_ez/keymaps/supercoder/images/supercoder_2000.jpg b/keyboards/ergodox_ez/keymaps/supercoder/images/supercoder_2000.jpg similarity index 100% rename from keyboard/ergodox_ez/keymaps/supercoder/images/supercoder_2000.jpg rename to keyboards/ergodox_ez/keymaps/supercoder/images/supercoder_2000.jpg diff --git a/keyboard/ergodox_ez/keymaps/supercoder/keymap.c b/keyboards/ergodox_ez/keymaps/supercoder/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/supercoder/keymap.c rename to keyboards/ergodox_ez/keymaps/supercoder/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/supercoder/makefile.mk b/keyboards/ergodox_ez/keymaps/supercoder/makefile.mk similarity index 100% rename from keyboard/ergodox_ez/keymaps/supercoder/makefile.mk rename to keyboards/ergodox_ez/keymaps/supercoder/makefile.mk diff --git a/keyboard/ergodox_ez/keymaps/techtomas/compiled.hex b/keyboards/ergodox_ez/keymaps/techtomas/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/techtomas/compiled.hex rename to keyboards/ergodox_ez/keymaps/techtomas/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/techtomas/keymap.c b/keyboards/ergodox_ez/keymaps/techtomas/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/techtomas/keymap.c rename to keyboards/ergodox_ez/keymaps/techtomas/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/techtomas/readme.md b/keyboards/ergodox_ez/keymaps/techtomas/readme.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/techtomas/readme.md rename to keyboards/ergodox_ez/keymaps/techtomas/readme.md diff --git a/keyboard/ergodox_ez/keymaps/tm2030/README.md b/keyboards/ergodox_ez/keymaps/tm2030/README.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/tm2030/README.md rename to keyboards/ergodox_ez/keymaps/tm2030/README.md diff --git a/keyboard/ergodox_ez/keymaps/tm2030/compiled.hex b/keyboards/ergodox_ez/keymaps/tm2030/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/tm2030/compiled.hex rename to keyboards/ergodox_ez/keymaps/tm2030/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/tm2030/keymap.c b/keyboards/ergodox_ez/keymaps/tm2030/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/tm2030/keymap.c rename to keyboards/ergodox_ez/keymaps/tm2030/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/tonyabra_osx/compiled.hex b/keyboards/ergodox_ez/keymaps/tonyabra_osx/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/tonyabra_osx/compiled.hex rename to keyboards/ergodox_ez/keymaps/tonyabra_osx/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/tonyabra_osx/keymap.c b/keyboards/ergodox_ez/keymaps/tonyabra_osx/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/tonyabra_osx/keymap.c rename to keyboards/ergodox_ez/keymaps/tonyabra_osx/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/tonyabra_osx/readme.md b/keyboards/ergodox_ez/keymaps/tonyabra_osx/readme.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/tonyabra_osx/readme.md rename to keyboards/ergodox_ez/keymaps/tonyabra_osx/readme.md diff --git a/keyboard/ergodox_ez/keymaps/townk_osx/compiled.hex b/keyboards/ergodox_ez/keymaps/townk_osx/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/townk_osx/compiled.hex rename to keyboards/ergodox_ez/keymaps/townk_osx/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/townk_osx/config.h b/keyboards/ergodox_ez/keymaps/townk_osx/config.h similarity index 100% rename from keyboard/ergodox_ez/keymaps/townk_osx/config.h rename to keyboards/ergodox_ez/keymaps/townk_osx/config.h diff --git a/keyboard/ergodox_ez/keymaps/townk_osx/keymap.c b/keyboards/ergodox_ez/keymaps/townk_osx/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/townk_osx/keymap.c rename to keyboards/ergodox_ez/keymaps/townk_osx/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/townk_osx/makefile.mk b/keyboards/ergodox_ez/keymaps/townk_osx/makefile.mk similarity index 100% rename from keyboard/ergodox_ez/keymaps/townk_osx/makefile.mk rename to keyboards/ergodox_ez/keymaps/townk_osx/makefile.mk diff --git a/keyboard/ergodox_ez/keymaps/townk_osx/readme.md b/keyboards/ergodox_ez/keymaps/townk_osx/readme.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/townk_osx/readme.md rename to keyboards/ergodox_ez/keymaps/townk_osx/readme.md diff --git a/keyboard/ergodox_ez/keymaps/townk_osx/townk_osx_base.png b/keyboards/ergodox_ez/keymaps/townk_osx/townk_osx_base.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/townk_osx/townk_osx_base.png rename to keyboards/ergodox_ez/keymaps/townk_osx/townk_osx_base.png diff --git a/keyboard/ergodox_ez/keymaps/townk_osx/townk_osx_fn.png b/keyboards/ergodox_ez/keymaps/townk_osx/townk_osx_fn.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/townk_osx/townk_osx_fn.png rename to keyboards/ergodox_ez/keymaps/townk_osx/townk_osx_fn.png diff --git a/keyboard/ergodox_ez/keymaps/townk_osx/townk_osx_keypad.png b/keyboards/ergodox_ez/keymaps/townk_osx/townk_osx_keypad.png similarity index 100% rename from keyboard/ergodox_ez/keymaps/townk_osx/townk_osx_keypad.png rename to keyboards/ergodox_ez/keymaps/townk_osx/townk_osx_keypad.png diff --git a/keyboard/ergodox_ez/keymaps/twey/compiled.hex b/keyboards/ergodox_ez/keymaps/twey/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/twey/compiled.hex rename to keyboards/ergodox_ez/keymaps/twey/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/twey/keymap.c b/keyboards/ergodox_ez/keymaps/twey/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/twey/keymap.c rename to keyboards/ergodox_ez/keymaps/twey/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/twey/readme.md b/keyboards/ergodox_ez/keymaps/twey/readme.md similarity index 100% rename from keyboard/ergodox_ez/keymaps/twey/readme.md rename to keyboards/ergodox_ez/keymaps/twey/readme.md diff --git a/keyboard/ergodox_ez/keymaps/workman_osx_mdw/compiled.hex b/keyboards/ergodox_ez/keymaps/workman_osx_mdw/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/workman_osx_mdw/compiled.hex rename to keyboards/ergodox_ez/keymaps/workman_osx_mdw/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/workman_osx_mdw/keymap.c b/keyboards/ergodox_ez/keymaps/workman_osx_mdw/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/workman_osx_mdw/keymap.c rename to keyboards/ergodox_ez/keymaps/workman_osx_mdw/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/zweihander-osx/compiled.hex b/keyboards/ergodox_ez/keymaps/zweihander-osx/compiled.hex similarity index 100% rename from keyboard/ergodox_ez/keymaps/zweihander-osx/compiled.hex rename to keyboards/ergodox_ez/keymaps/zweihander-osx/compiled.hex diff --git a/keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c b/keyboards/ergodox_ez/keymaps/zweihander-osx/keymap.c similarity index 100% rename from keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c rename to keyboards/ergodox_ez/keymaps/zweihander-osx/keymap.c diff --git a/keyboard/ergodox_ez/keymaps/zweihander-osx/readme.markdown b/keyboards/ergodox_ez/keymaps/zweihander-osx/readme.markdown similarity index 100% rename from keyboard/ergodox_ez/keymaps/zweihander-osx/readme.markdown rename to keyboards/ergodox_ez/keymaps/zweihander-osx/readme.markdown diff --git a/keyboard/ergodox_ez/matrix.c b/keyboards/ergodox_ez/matrix.c similarity index 100% rename from keyboard/ergodox_ez/matrix.c rename to keyboards/ergodox_ez/matrix.c diff --git a/keyboard/ergodox_ez/readme.md b/keyboards/ergodox_ez/readme.md similarity index 96% rename from keyboard/ergodox_ez/readme.md rename to keyboards/ergodox_ez/readme.md index 5f0becc6cf..b1e9d7eca5 100644 --- a/keyboard/ergodox_ez/readme.md +++ b/keyboards/ergodox_ez/readme.md @@ -17,7 +17,7 @@ This requires a little bit of familiarity with coding. 2. Clone the repository (download it) 3. Set up a build environment as per [the build guide](/doc/BUILD_GUIDE.md) - Using a Mac and have homebrew? just run `brew tap osx-cross/avr && brew install avr-libc` -4. Copy `keyboard/ergodox_ez/keymaps/default/keymap.c` into `keymaps/your_name/keymap.c` (for example, `keymaps/german/keymap.c`) +4. Copy `keyboards/ergodox_ez/keymaps/default/keymap.c` into `keymaps/your_name/keymap.c` (for example, `keymaps/german/keymap.c`) 5. Edit this file, changing keycodes to your liking (see "Finding the keycodes you need" below). Try to edit the comments as well, so the "text graphics" represent your layout correctly. See below for more tips on sharing your work. 6. Compile your firmware by running `make keymap=your_name`. For example, `make keymap=german`. This will result in a hex file, which will be called `ergodox_ez_your_name.hex`, e.g. `ergodox_ez_german.hex`. 6. Flash this hex file using the [Teensy loader](https://www.pjrc.com/teensy/loader.html) as described in step 4 in the "Easy Way" above. If you prefer you can automatically flash the hex file after successfull build by running `make teensy keymap=your_name`. diff --git a/keyboard/ergodox_ez/twimaster.c b/keyboards/ergodox_ez/twimaster.c similarity index 100% rename from keyboard/ergodox_ez/twimaster.c rename to keyboards/ergodox_ez/twimaster.c diff --git a/keyboard/ergodox_ez/util/compile_keymap.py b/keyboards/ergodox_ez/util/compile_keymap.py similarity index 100% rename from keyboard/ergodox_ez/util/compile_keymap.py rename to keyboards/ergodox_ez/util/compile_keymap.py diff --git a/keyboard/ergodox_ez/util/readme.md b/keyboards/ergodox_ez/util/readme.md similarity index 100% rename from keyboard/ergodox_ez/util/readme.md rename to keyboards/ergodox_ez/util/readme.md diff --git a/keyboard/gh60/Makefile b/keyboards/gh60/Makefile similarity index 100% rename from keyboard/gh60/Makefile rename to keyboards/gh60/Makefile diff --git a/keyboard/gh60/README.md b/keyboards/gh60/README.md similarity index 87% rename from keyboard/gh60/README.md rename to keyboards/gh60/README.md index bf209be8c6..35c13375ce 100644 --- a/keyboard/gh60/README.md +++ b/keyboards/gh60/README.md @@ -43,7 +43,7 @@ For the full Quantum feature list, see [the parent README.md](/README.md). ## Building -Download or clone the whole firmware and navigate to the keyboard/gh60_rev_c folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use the Teensy Loader to program your .hex file. +Download or clone the whole firmware and navigate to the keyboards/gh60_rev_c folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use the Teensy Loader to program your .hex file. Depending on which keymap you would like to use, you will have to compile slightly differently. diff --git a/keyboard/gh60/config.h b/keyboards/gh60/config.h similarity index 100% rename from keyboard/gh60/config.h rename to keyboards/gh60/config.h diff --git a/keyboard/gh60/gh60.c b/keyboards/gh60/gh60.c similarity index 100% rename from keyboard/gh60/gh60.c rename to keyboards/gh60/gh60.c diff --git a/keyboard/gh60/gh60.h b/keyboards/gh60/gh60.h similarity index 100% rename from keyboard/gh60/gh60.h rename to keyboards/gh60/gh60.h diff --git a/keyboard/gh60/gh60revc.jpg b/keyboards/gh60/gh60revc.jpg similarity index 100% rename from keyboard/gh60/gh60revc.jpg rename to keyboards/gh60/gh60revc.jpg diff --git a/keyboard/gh60/keymaps/default/compiled.hex b/keyboards/gh60/keymaps/default/compiled.hex similarity index 100% rename from keyboard/gh60/keymaps/default/compiled.hex rename to keyboards/gh60/keymaps/default/compiled.hex diff --git a/keyboard/gh60/keymaps/default/keymap.c b/keyboards/gh60/keymaps/default/keymap.c similarity index 100% rename from keyboard/gh60/keymaps/default/keymap.c rename to keyboards/gh60/keymaps/default/keymap.c diff --git a/keyboard/gh60/pinout.txt b/keyboards/gh60/pinout.txt similarity index 100% rename from keyboard/gh60/pinout.txt rename to keyboards/gh60/pinout.txt diff --git a/keyboard/hhkb/Makefile b/keyboards/hhkb/Makefile similarity index 100% rename from keyboard/hhkb/Makefile rename to keyboards/hhkb/Makefile diff --git a/keyboard/hhkb/README.md b/keyboards/hhkb/README.md similarity index 98% rename from keyboard/hhkb/README.md rename to keyboards/hhkb/README.md index 389407b3aa..2bfec7aa54 100644 --- a/keyboard/hhkb/README.md +++ b/keyboards/hhkb/README.md @@ -163,7 +163,7 @@ This requires [some hardware changes](https://www.reddit.com/r/MechanicalKeyboar ## Building -Download or clone the whole firmware and navigate to the keyboard/planck folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use `make dfu` to program your PCB once you hit the reset button. +Download or clone the whole firmware and navigate to the keyboards/planck folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use `make dfu` to program your PCB once you hit the reset button. Depending on which keymap you would like to use, you will have to compile slightly differently. diff --git a/keyboard/hhkb/config.h b/keyboards/hhkb/config.h similarity index 100% rename from keyboard/hhkb/config.h rename to keyboards/hhkb/config.h diff --git a/keyboard/hhkb/hhkb.c b/keyboards/hhkb/hhkb.c similarity index 100% rename from keyboard/hhkb/hhkb.c rename to keyboards/hhkb/hhkb.c diff --git a/keyboard/hhkb/hhkb.h b/keyboards/hhkb/hhkb.h similarity index 100% rename from keyboard/hhkb/hhkb.h rename to keyboards/hhkb/hhkb.h diff --git a/keyboard/hhkb/hhkb_avr.h b/keyboards/hhkb/hhkb_avr.h similarity index 100% rename from keyboard/hhkb/hhkb_avr.h rename to keyboards/hhkb/hhkb_avr.h diff --git a/keyboard/hhkb/keymaps/default/compiled.hex b/keyboards/hhkb/keymaps/default/compiled.hex similarity index 100% rename from keyboard/hhkb/keymaps/default/compiled.hex rename to keyboards/hhkb/keymaps/default/compiled.hex diff --git a/keyboard/hhkb/keymaps/default/keymap.c b/keyboards/hhkb/keymaps/default/keymap.c similarity index 100% rename from keyboard/hhkb/keymaps/default/keymap.c rename to keyboards/hhkb/keymaps/default/keymap.c diff --git a/keyboard/hhkb/keymaps/lxol/compiled.hex b/keyboards/hhkb/keymaps/lxol/compiled.hex similarity index 100% rename from keyboard/hhkb/keymaps/lxol/compiled.hex rename to keyboards/hhkb/keymaps/lxol/compiled.hex diff --git a/keyboard/hhkb/keymaps/lxol/keymap.c b/keyboards/hhkb/keymaps/lxol/keymap.c similarity index 100% rename from keyboard/hhkb/keymaps/lxol/keymap.c rename to keyboards/hhkb/keymaps/lxol/keymap.c diff --git a/keyboard/hhkb/matrix.c b/keyboards/hhkb/matrix.c similarity index 100% rename from keyboard/hhkb/matrix.c rename to keyboards/hhkb/matrix.c diff --git a/keyboard/jd45/Makefile b/keyboards/jd45/Makefile similarity index 100% rename from keyboard/jd45/Makefile rename to keyboards/jd45/Makefile diff --git a/keyboard/jd45/config.h b/keyboards/jd45/config.h similarity index 100% rename from keyboard/jd45/config.h rename to keyboards/jd45/config.h diff --git a/keyboard/jd45/jd45.c b/keyboards/jd45/jd45.c similarity index 100% rename from keyboard/jd45/jd45.c rename to keyboards/jd45/jd45.c diff --git a/keyboard/jd45/jd45.h b/keyboards/jd45/jd45.h similarity index 100% rename from keyboard/jd45/jd45.h rename to keyboards/jd45/jd45.h diff --git a/keyboard/jd45/keymaps/default/compiled.hex b/keyboards/jd45/keymaps/default/compiled.hex similarity index 100% rename from keyboard/jd45/keymaps/default/compiled.hex rename to keyboards/jd45/keymaps/default/compiled.hex diff --git a/keyboard/jd45/keymaps/default/keymap.c b/keyboards/jd45/keymaps/default/keymap.c similarity index 100% rename from keyboard/jd45/keymaps/default/keymap.c rename to keyboards/jd45/keymaps/default/keymap.c diff --git a/keyboard/jd45/keymaps/justin/compiled.hex b/keyboards/jd45/keymaps/justin/compiled.hex similarity index 100% rename from keyboard/jd45/keymaps/justin/compiled.hex rename to keyboards/jd45/keymaps/justin/compiled.hex diff --git a/keyboard/jd45/keymaps/justin/keymap.c b/keyboards/jd45/keymaps/justin/keymap.c similarity index 100% rename from keyboard/jd45/keymaps/justin/keymap.c rename to keyboards/jd45/keymaps/justin/keymap.c diff --git a/keyboard/kc60/Makefile b/keyboards/kc60/Makefile similarity index 100% rename from keyboard/kc60/Makefile rename to keyboards/kc60/Makefile diff --git a/keyboard/kc60/README.md b/keyboards/kc60/README.md similarity index 86% rename from keyboard/kc60/README.md rename to keyboards/kc60/README.md index 00d78d0a6b..1f03e200e4 100644 --- a/keyboard/kc60/README.md +++ b/keyboards/kc60/README.md @@ -5,7 +5,7 @@ KC60 (version 2.0) keyboard firmware For the full Quantum feature list, see [the parent README.md](/README.md). ## Building -Download or clone the whole firmware and navigate to the keyboard/kc60 folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use the Teensy Loader to program your .hex file. +Download or clone the whole firmware and navigate to the keyboards/kc60 folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use the Teensy Loader to program your .hex file. Depending on which keymap you would like to use, you will have to compile slightly differently. diff --git a/keyboard/kc60/config.h b/keyboards/kc60/config.h similarity index 100% rename from keyboard/kc60/config.h rename to keyboards/kc60/config.h diff --git a/keyboard/kc60/kc60.c b/keyboards/kc60/kc60.c similarity index 100% rename from keyboard/kc60/kc60.c rename to keyboards/kc60/kc60.c diff --git a/keyboard/kc60/kc60.h b/keyboards/kc60/kc60.h similarity index 100% rename from keyboard/kc60/kc60.h rename to keyboards/kc60/kc60.h diff --git a/keyboard/kc60/keymaps/default/compiled.hex b/keyboards/kc60/keymaps/default/compiled.hex similarity index 100% rename from keyboard/kc60/keymaps/default/compiled.hex rename to keyboards/kc60/keymaps/default/compiled.hex diff --git a/keyboard/kc60/keymaps/default/keymap.c b/keyboards/kc60/keymaps/default/keymap.c similarity index 100% rename from keyboard/kc60/keymaps/default/keymap.c rename to keyboards/kc60/keymaps/default/keymap.c diff --git a/keyboard/kc60/keymaps/sgoodwin/compiled.hex b/keyboards/kc60/keymaps/sgoodwin/compiled.hex similarity index 100% rename from keyboard/kc60/keymaps/sgoodwin/compiled.hex rename to keyboards/kc60/keymaps/sgoodwin/compiled.hex diff --git a/keyboard/kc60/keymaps/sgoodwin/keymap.c b/keyboards/kc60/keymaps/sgoodwin/keymap.c similarity index 100% rename from keyboard/kc60/keymaps/sgoodwin/keymap.c rename to keyboards/kc60/keymaps/sgoodwin/keymap.c diff --git a/keyboard/kc60/keymaps/stanleylai/Makefile b/keyboards/kc60/keymaps/stanleylai/Makefile similarity index 100% rename from keyboard/kc60/keymaps/stanleylai/Makefile rename to keyboards/kc60/keymaps/stanleylai/Makefile diff --git a/keyboard/kc60/keymaps/stanleylai/README.md b/keyboards/kc60/keymaps/stanleylai/README.md similarity index 100% rename from keyboard/kc60/keymaps/stanleylai/README.md rename to keyboards/kc60/keymaps/stanleylai/README.md diff --git a/keyboard/kc60/keymaps/stanleylai/base_layer.png b/keyboards/kc60/keymaps/stanleylai/base_layer.png similarity index 100% rename from keyboard/kc60/keymaps/stanleylai/base_layer.png rename to keyboards/kc60/keymaps/stanleylai/base_layer.png diff --git a/keyboard/kc60/keymaps/stanleylai/compiled.hex b/keyboards/kc60/keymaps/stanleylai/compiled.hex similarity index 100% rename from keyboard/kc60/keymaps/stanleylai/compiled.hex rename to keyboards/kc60/keymaps/stanleylai/compiled.hex diff --git a/keyboard/kc60/keymaps/stanleylai/config.h b/keyboards/kc60/keymaps/stanleylai/config.h similarity index 100% rename from keyboard/kc60/keymaps/stanleylai/config.h rename to keyboards/kc60/keymaps/stanleylai/config.h diff --git a/keyboard/kc60/keymaps/stanleylai/keymap.c b/keyboards/kc60/keymaps/stanleylai/keymap.c similarity index 100% rename from keyboard/kc60/keymaps/stanleylai/keymap.c rename to keyboards/kc60/keymaps/stanleylai/keymap.c diff --git a/keyboard/kc60/keymaps/stanleylai/rgb_layer.png b/keyboards/kc60/keymaps/stanleylai/rgb_layer.png similarity index 100% rename from keyboard/kc60/keymaps/stanleylai/rgb_layer.png rename to keyboards/kc60/keymaps/stanleylai/rgb_layer.png diff --git a/keyboard/kc60/keymaps/ws2812/Makefile b/keyboards/kc60/keymaps/ws2812/Makefile similarity index 100% rename from keyboard/kc60/keymaps/ws2812/Makefile rename to keyboards/kc60/keymaps/ws2812/Makefile diff --git a/keyboard/kc60/keymaps/ws2812/README.md b/keyboards/kc60/keymaps/ws2812/README.md similarity index 100% rename from keyboard/kc60/keymaps/ws2812/README.md rename to keyboards/kc60/keymaps/ws2812/README.md diff --git a/keyboard/kc60/keymaps/ws2812/compiled.hex b/keyboards/kc60/keymaps/ws2812/compiled.hex similarity index 100% rename from keyboard/kc60/keymaps/ws2812/compiled.hex rename to keyboards/kc60/keymaps/ws2812/compiled.hex diff --git a/keyboard/kc60/keymaps/ws2812/config.h b/keyboards/kc60/keymaps/ws2812/config.h similarity index 100% rename from keyboard/kc60/keymaps/ws2812/config.h rename to keyboards/kc60/keymaps/ws2812/config.h diff --git a/keyboard/kc60/keymaps/ws2812/keymap.c b/keyboards/kc60/keymaps/ws2812/keymap.c similarity index 100% rename from keyboard/kc60/keymaps/ws2812/keymap.c rename to keyboards/kc60/keymaps/ws2812/keymap.c diff --git a/keyboard/kc60/keymaps/ws2812/ws2812_example.jpg b/keyboards/kc60/keymaps/ws2812/ws2812_example.jpg similarity index 100% rename from keyboard/kc60/keymaps/ws2812/ws2812_example.jpg rename to keyboards/kc60/keymaps/ws2812/ws2812_example.jpg diff --git a/keyboard/kc60/keymaps/ws2812/ws2812_underside-lit.jpg b/keyboards/kc60/keymaps/ws2812/ws2812_underside-lit.jpg similarity index 100% rename from keyboard/kc60/keymaps/ws2812/ws2812_underside-lit.jpg rename to keyboards/kc60/keymaps/ws2812/ws2812_underside-lit.jpg diff --git a/keyboard/kc60/keymaps/ws2812/ws2812_underside.jpg b/keyboards/kc60/keymaps/ws2812/ws2812_underside.jpg similarity index 100% rename from keyboard/kc60/keymaps/ws2812/ws2812_underside.jpg rename to keyboards/kc60/keymaps/ws2812/ws2812_underside.jpg diff --git a/keyboard/kc60/keymaps/ws2812/ws2812_wiring.jpg b/keyboards/kc60/keymaps/ws2812/ws2812_wiring.jpg similarity index 100% rename from keyboard/kc60/keymaps/ws2812/ws2812_wiring.jpg rename to keyboards/kc60/keymaps/ws2812/ws2812_wiring.jpg diff --git a/keyboard/phantom/Makefile b/keyboards/phantom/Makefile similarity index 100% rename from keyboard/phantom/Makefile rename to keyboards/phantom/Makefile diff --git a/keyboard/phantom/config.h b/keyboards/phantom/config.h similarity index 100% rename from keyboard/phantom/config.h rename to keyboards/phantom/config.h diff --git a/keyboard/phantom/keymaps/default/compiled.hex b/keyboards/phantom/keymaps/default/compiled.hex similarity index 100% rename from keyboard/phantom/keymaps/default/compiled.hex rename to keyboards/phantom/keymaps/default/compiled.hex diff --git a/keyboard/phantom/keymaps/default/keymap.c b/keyboards/phantom/keymaps/default/keymap.c similarity index 100% rename from keyboard/phantom/keymaps/default/keymap.c rename to keyboards/phantom/keymaps/default/keymap.c diff --git a/keyboard/phantom/led.c b/keyboards/phantom/led.c similarity index 100% rename from keyboard/phantom/led.c rename to keyboards/phantom/led.c diff --git a/keyboard/phantom/phantom.c b/keyboards/phantom/phantom.c similarity index 100% rename from keyboard/phantom/phantom.c rename to keyboards/phantom/phantom.c diff --git a/keyboard/phantom/phantom.h b/keyboards/phantom/phantom.h similarity index 100% rename from keyboard/phantom/phantom.h rename to keyboards/phantom/phantom.h diff --git a/keyboard/phantom/pinout.jpg b/keyboards/phantom/pinout.jpg similarity index 100% rename from keyboard/phantom/pinout.jpg rename to keyboards/phantom/pinout.jpg diff --git a/keyboard/phantom/pinout.txt b/keyboards/phantom/pinout.txt similarity index 100% rename from keyboard/phantom/pinout.txt rename to keyboards/phantom/pinout.txt diff --git a/keyboard/planck/.gitignore b/keyboards/planck/.gitignore similarity index 100% rename from keyboard/planck/.gitignore rename to keyboards/planck/.gitignore diff --git a/keyboard/planck/Makefile b/keyboards/planck/Makefile similarity index 100% rename from keyboard/planck/Makefile rename to keyboards/planck/Makefile diff --git a/keyboard/planck/README.md b/keyboards/planck/README.md similarity index 89% rename from keyboard/planck/README.md rename to keyboards/planck/README.md index d9a1e3beee..47cfec0328 100644 --- a/keyboard/planck/README.md +++ b/keyboards/planck/README.md @@ -8,7 +8,7 @@ For the full Quantum feature list, see [the parent README.md](/README.md). ## Building -Download or clone the whole firmware and navigate to the keyboard/planck folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use `make dfu` to program your PCB once you hit the reset button. +Download or clone the whole firmware and navigate to the keyboards/planck folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use `make dfu` to program your PCB once you hit the reset button. Depending on which keymap you would like to use, you will have to compile slightly differently. diff --git a/keyboard/planck/config.h b/keyboards/planck/config.h similarity index 100% rename from keyboard/planck/config.h rename to keyboards/planck/config.h diff --git a/keyboard/planck/keymaps/.gitignore b/keyboards/planck/keymaps/.gitignore similarity index 100% rename from keyboard/planck/keymaps/.gitignore rename to keyboards/planck/keymaps/.gitignore diff --git a/keyboard/planck/keymaps/README.md b/keyboards/planck/keymaps/README.md similarity index 100% rename from keyboard/planck/keymaps/README.md rename to keyboards/planck/keymaps/README.md diff --git a/keyboard/planck/keymaps/alexey/Makefile b/keyboards/planck/keymaps/alexey/Makefile similarity index 100% rename from keyboard/planck/keymaps/alexey/Makefile rename to keyboards/planck/keymaps/alexey/Makefile diff --git a/keyboard/planck/keymaps/alexey/compiled.hex b/keyboards/planck/keymaps/alexey/compiled.hex similarity index 100% rename from keyboard/planck/keymaps/alexey/compiled.hex rename to keyboards/planck/keymaps/alexey/compiled.hex diff --git a/keyboard/planck/keymaps/alexey/keymap.c b/keyboards/planck/keymaps/alexey/keymap.c similarity index 100% rename from keyboard/planck/keymaps/alexey/keymap.c rename to keyboards/planck/keymaps/alexey/keymap.c diff --git a/keyboard/planck/keymaps/angerthosenear/Makefile b/keyboards/planck/keymaps/angerthosenear/Makefile similarity index 100% rename from keyboard/planck/keymaps/angerthosenear/Makefile rename to keyboards/planck/keymaps/angerthosenear/Makefile diff --git a/keyboard/planck/keymaps/angerthosenear/compiled.hex b/keyboards/planck/keymaps/angerthosenear/compiled.hex similarity index 100% rename from keyboard/planck/keymaps/angerthosenear/compiled.hex rename to keyboards/planck/keymaps/angerthosenear/compiled.hex diff --git a/keyboard/planck/keymaps/angerthosenear/keymap.c b/keyboards/planck/keymaps/angerthosenear/keymap.c similarity index 100% rename from keyboard/planck/keymaps/angerthosenear/keymap.c rename to keyboards/planck/keymaps/angerthosenear/keymap.c diff --git a/keyboard/planck/keymaps/austin/Makefile b/keyboards/planck/keymaps/austin/Makefile similarity index 100% rename from keyboard/planck/keymaps/austin/Makefile rename to keyboards/planck/keymaps/austin/Makefile diff --git a/keyboard/planck/keymaps/austin/compiled.hex b/keyboards/planck/keymaps/austin/compiled.hex similarity index 100% rename from keyboard/planck/keymaps/austin/compiled.hex rename to keyboards/planck/keymaps/austin/compiled.hex diff --git a/keyboard/planck/keymaps/austin/keymap.c b/keyboards/planck/keymaps/austin/keymap.c similarity index 100% rename from keyboard/planck/keymaps/austin/keymap.c rename to keyboards/planck/keymaps/austin/keymap.c diff --git a/keyboard/planck/keymaps/basic/Makefile b/keyboards/planck/keymaps/basic/Makefile similarity index 100% rename from keyboard/planck/keymaps/basic/Makefile rename to keyboards/planck/keymaps/basic/Makefile diff --git a/keyboard/planck/keymaps/basic/README.md b/keyboards/planck/keymaps/basic/README.md similarity index 100% rename from keyboard/planck/keymaps/basic/README.md rename to keyboards/planck/keymaps/basic/README.md diff --git a/keyboard/planck/keymaps/basic/compiled.hex b/keyboards/planck/keymaps/basic/compiled.hex similarity index 100% rename from keyboard/planck/keymaps/basic/compiled.hex rename to keyboards/planck/keymaps/basic/compiled.hex diff --git a/keyboard/planck/keymaps/basic/keymap.c b/keyboards/planck/keymaps/basic/keymap.c similarity index 100% rename from keyboard/planck/keymaps/basic/keymap.c rename to keyboards/planck/keymaps/basic/keymap.c diff --git a/keyboard/planck/keymaps/bone2planck/Makefile b/keyboards/planck/keymaps/bone2planck/Makefile similarity index 100% rename from keyboard/planck/keymaps/bone2planck/Makefile rename to keyboards/planck/keymaps/bone2planck/Makefile diff --git a/keyboard/planck/keymaps/bone2planck/compiled.hex b/keyboards/planck/keymaps/bone2planck/compiled.hex similarity index 100% rename from keyboard/planck/keymaps/bone2planck/compiled.hex rename to keyboards/planck/keymaps/bone2planck/compiled.hex diff --git a/keyboard/planck/keymaps/bone2planck/keymap.c b/keyboards/planck/keymaps/bone2planck/keymap.c similarity index 100% rename from keyboard/planck/keymaps/bone2planck/keymap.c rename to keyboards/planck/keymaps/bone2planck/keymap.c diff --git a/keyboard/planck/keymaps/brandon/Makefile b/keyboards/planck/keymaps/brandon/Makefile similarity index 100% rename from keyboard/planck/keymaps/brandon/Makefile rename to keyboards/planck/keymaps/brandon/Makefile diff --git a/keyboard/planck/keymaps/brandon/compiled.hex b/keyboards/planck/keymaps/brandon/compiled.hex similarity index 100% rename from keyboard/planck/keymaps/brandon/compiled.hex rename to keyboards/planck/keymaps/brandon/compiled.hex diff --git a/keyboard/planck/keymaps/brandon/keymap.c b/keyboards/planck/keymaps/brandon/keymap.c similarity index 100% rename from keyboard/planck/keymaps/brandon/keymap.c rename to keyboards/planck/keymaps/brandon/keymap.c diff --git a/keyboard/planck/keymaps/cbbrowne/.gitignore b/keyboards/planck/keymaps/cbbrowne/.gitignore similarity index 100% rename from keyboard/planck/keymaps/cbbrowne/.gitignore rename to keyboards/planck/keymaps/cbbrowne/.gitignore diff --git a/keyboard/planck/keymaps/cbbrowne/Makefile b/keyboards/planck/keymaps/cbbrowne/Makefile similarity index 100% rename from keyboard/planck/keymaps/cbbrowne/Makefile rename to keyboards/planck/keymaps/cbbrowne/Makefile diff --git a/keyboard/planck/keymaps/cbbrowne/config.h b/keyboards/planck/keymaps/cbbrowne/config.h similarity index 100% rename from keyboard/planck/keymaps/cbbrowne/config.h rename to keyboards/planck/keymaps/cbbrowne/config.h diff --git a/keyboard/planck/keymaps/cbbrowne/keymap.c b/keyboards/planck/keymaps/cbbrowne/keymap.c similarity index 100% rename from keyboard/planck/keymaps/cbbrowne/keymap.c rename to keyboards/planck/keymaps/cbbrowne/keymap.c diff --git a/keyboard/planck/keymaps/cbbrowne/readme.md b/keyboards/planck/keymaps/cbbrowne/readme.md similarity index 100% rename from keyboard/planck/keymaps/cbbrowne/readme.md rename to keyboards/planck/keymaps/cbbrowne/readme.md diff --git a/keyboard/planck/keymaps/charlie/Makefile b/keyboards/planck/keymaps/charlie/Makefile similarity index 100% rename from keyboard/planck/keymaps/charlie/Makefile rename to keyboards/planck/keymaps/charlie/Makefile diff --git a/keyboard/planck/keymaps/charlie/compiled.hex b/keyboards/planck/keymaps/charlie/compiled.hex similarity index 100% rename from keyboard/planck/keymaps/charlie/compiled.hex rename to keyboards/planck/keymaps/charlie/compiled.hex diff --git a/keyboard/planck/keymaps/charlie/keymap.c b/keyboards/planck/keymaps/charlie/keymap.c similarity index 100% rename from keyboard/planck/keymaps/charlie/keymap.c rename to keyboards/planck/keymaps/charlie/keymap.c diff --git a/keyboard/planck/keymaps/daniel/Makefile b/keyboards/planck/keymaps/daniel/Makefile similarity index 100% rename from keyboard/planck/keymaps/daniel/Makefile rename to keyboards/planck/keymaps/daniel/Makefile diff --git a/keyboard/planck/keymaps/daniel/compiled.hex b/keyboards/planck/keymaps/daniel/compiled.hex similarity index 100% rename from keyboard/planck/keymaps/daniel/compiled.hex rename to keyboards/planck/keymaps/daniel/compiled.hex diff --git a/keyboard/planck/keymaps/daniel/keymap.c b/keyboards/planck/keymaps/daniel/keymap.c similarity index 100% rename from keyboard/planck/keymaps/daniel/keymap.c rename to keyboards/planck/keymaps/daniel/keymap.c diff --git a/keyboard/planck/keymaps/david/Makefile b/keyboards/planck/keymaps/david/Makefile similarity index 100% rename from keyboard/planck/keymaps/david/Makefile rename to keyboards/planck/keymaps/david/Makefile diff --git a/keyboard/planck/keymaps/david/compiled.hex b/keyboards/planck/keymaps/david/compiled.hex similarity index 100% rename from keyboard/planck/keymaps/david/compiled.hex rename to keyboards/planck/keymaps/david/compiled.hex diff --git a/keyboard/planck/keymaps/david/keymap.c b/keyboards/planck/keymaps/david/keymap.c similarity index 100% rename from keyboard/planck/keymaps/david/keymap.c rename to keyboards/planck/keymaps/david/keymap.c diff --git a/keyboard/planck/keymaps/default/Makefile b/keyboards/planck/keymaps/default/Makefile similarity index 100% rename from keyboard/planck/keymaps/default/Makefile rename to keyboards/planck/keymaps/default/Makefile diff --git a/keyboard/planck/keymaps/default/README.md b/keyboards/planck/keymaps/default/README.md similarity index 100% rename from keyboard/planck/keymaps/default/README.md rename to keyboards/planck/keymaps/default/README.md diff --git a/keyboards/planck/keymaps/default/compiled.hex b/keyboards/planck/keymaps/default/compiled.hex new file mode 100644 index 0000000000..b7465d0998 Binary files /dev/null and b/keyboards/planck/keymaps/default/compiled.hex differ diff --git a/keyboard/planck/keymaps/default/keymap.c b/keyboards/planck/keymaps/default/keymap.c similarity index 100% rename from keyboard/planck/keymaps/default/keymap.c rename to keyboards/planck/keymaps/default/keymap.c diff --git a/keyboard/planck/keymaps/dzobert/Makefile b/keyboards/planck/keymaps/dzobert/Makefile similarity index 100% rename from keyboard/planck/keymaps/dzobert/Makefile rename to keyboards/planck/keymaps/dzobert/Makefile diff --git a/keyboard/planck/keymaps/dzobert/compiled.hex b/keyboards/planck/keymaps/dzobert/compiled.hex similarity index 100% rename from keyboard/planck/keymaps/dzobert/compiled.hex rename to keyboards/planck/keymaps/dzobert/compiled.hex diff --git a/keyboard/planck/keymaps/dzobert/keymap.c b/keyboards/planck/keymaps/dzobert/keymap.c similarity index 100% rename from keyboard/planck/keymaps/dzobert/keymap.c rename to keyboards/planck/keymaps/dzobert/keymap.c diff --git a/keyboard/planck/keymaps/experimental/Makefile b/keyboards/planck/keymaps/experimental/Makefile similarity index 100% rename from keyboard/planck/keymaps/experimental/Makefile rename to keyboards/planck/keymaps/experimental/Makefile diff --git a/keyboard/planck/keymaps/experimental/README.md b/keyboards/planck/keymaps/experimental/README.md similarity index 100% rename from keyboard/planck/keymaps/experimental/README.md rename to keyboards/planck/keymaps/experimental/README.md diff --git a/keyboard/planck/keymaps/experimental/compiled.hex b/keyboards/planck/keymaps/experimental/compiled.hex similarity index 100% rename from keyboard/planck/keymaps/experimental/compiled.hex rename to keyboards/planck/keymaps/experimental/compiled.hex diff --git a/keyboard/planck/keymaps/experimental/config.h b/keyboards/planck/keymaps/experimental/config.h similarity index 100% rename from keyboard/planck/keymaps/experimental/config.h rename to keyboards/planck/keymaps/experimental/config.h diff --git a/keyboard/planck/keymaps/experimental/keymap.c b/keyboards/planck/keymaps/experimental/keymap.c similarity index 100% rename from keyboard/planck/keymaps/experimental/keymap.c rename to keyboards/planck/keymaps/experimental/keymap.c diff --git a/keyboard/planck/keymaps/gabriel/Makefile b/keyboards/planck/keymaps/gabriel/Makefile similarity index 100% rename from keyboard/planck/keymaps/gabriel/Makefile rename to keyboards/planck/keymaps/gabriel/Makefile diff --git a/keyboard/planck/keymaps/gabriel/compiled.hex b/keyboards/planck/keymaps/gabriel/compiled.hex similarity index 100% rename from keyboard/planck/keymaps/gabriel/compiled.hex rename to keyboards/planck/keymaps/gabriel/compiled.hex diff --git a/keyboard/planck/keymaps/gabriel/keymap.c b/keyboards/planck/keymaps/gabriel/keymap.c similarity index 100% rename from keyboard/planck/keymaps/gabriel/keymap.c rename to keyboards/planck/keymaps/gabriel/keymap.c diff --git a/keyboard/planck/keymaps/jacob/Keyboard Layout.PNG b/keyboards/planck/keymaps/jacob/Keyboard Layout.PNG similarity index 100% rename from keyboard/planck/keymaps/jacob/Keyboard Layout.PNG rename to keyboards/planck/keymaps/jacob/Keyboard Layout.PNG diff --git a/keyboard/planck/keymaps/jacob/Makefile b/keyboards/planck/keymaps/jacob/Makefile similarity index 100% rename from keyboard/planck/keymaps/jacob/Makefile rename to keyboards/planck/keymaps/jacob/Makefile diff --git a/keyboard/planck/keymaps/jacob/compiled.hex b/keyboards/planck/keymaps/jacob/compiled.hex similarity index 100% rename from keyboard/planck/keymaps/jacob/compiled.hex rename to keyboards/planck/keymaps/jacob/compiled.hex diff --git a/keyboard/planck/keymaps/jacob/keymap.c b/keyboards/planck/keymaps/jacob/keymap.c similarity index 100% rename from keyboard/planck/keymaps/jacob/keymap.c rename to keyboards/planck/keymaps/jacob/keymap.c diff --git a/keyboard/planck/keymaps/jacob/readme.md b/keyboards/planck/keymaps/jacob/readme.md similarity index 100% rename from keyboard/planck/keymaps/jacob/readme.md rename to keyboards/planck/keymaps/jacob/readme.md diff --git a/keyboard/planck/keymaps/joe/Makefile b/keyboards/planck/keymaps/joe/Makefile similarity index 100% rename from keyboard/planck/keymaps/joe/Makefile rename to keyboards/planck/keymaps/joe/Makefile diff --git a/keyboard/planck/keymaps/joe/compiled.hex b/keyboards/planck/keymaps/joe/compiled.hex similarity index 100% rename from keyboard/planck/keymaps/joe/compiled.hex rename to keyboards/planck/keymaps/joe/compiled.hex diff --git a/keyboard/planck/keymaps/joe/keymap.c b/keyboards/planck/keymaps/joe/keymap.c similarity index 100% rename from keyboard/planck/keymaps/joe/keymap.c rename to keyboards/planck/keymaps/joe/keymap.c diff --git a/keyboard/planck/keymaps/kyle/Makefile b/keyboards/planck/keymaps/kyle/Makefile similarity index 100% rename from keyboard/planck/keymaps/kyle/Makefile rename to keyboards/planck/keymaps/kyle/Makefile diff --git a/keyboard/planck/keymaps/kyle/compiled.hex b/keyboards/planck/keymaps/kyle/compiled.hex similarity index 100% rename from keyboard/planck/keymaps/kyle/compiled.hex rename to keyboards/planck/keymaps/kyle/compiled.hex diff --git a/keyboard/planck/keymaps/kyle/keymap.c b/keyboards/planck/keymaps/kyle/keymap.c similarity index 100% rename from keyboard/planck/keymaps/kyle/keymap.c rename to keyboards/planck/keymaps/kyle/keymap.c diff --git a/keyboard/planck/keymaps/leo/Makefile b/keyboards/planck/keymaps/leo/Makefile similarity index 100% rename from keyboard/planck/keymaps/leo/Makefile rename to keyboards/planck/keymaps/leo/Makefile diff --git a/keyboard/planck/keymaps/leo/compiled.hex b/keyboards/planck/keymaps/leo/compiled.hex similarity index 100% rename from keyboard/planck/keymaps/leo/compiled.hex rename to keyboards/planck/keymaps/leo/compiled.hex diff --git a/keyboard/planck/keymaps/leo/keymap.c b/keyboards/planck/keymaps/leo/keymap.c similarity index 100% rename from keyboard/planck/keymaps/leo/keymap.c rename to keyboards/planck/keymaps/leo/keymap.c diff --git a/keyboard/planck/keymaps/lucas/Makefile b/keyboards/planck/keymaps/lucas/Makefile similarity index 100% rename from keyboard/planck/keymaps/lucas/Makefile rename to keyboards/planck/keymaps/lucas/Makefile diff --git a/keyboard/planck/keymaps/lucas/compiled.hex b/keyboards/planck/keymaps/lucas/compiled.hex similarity index 100% rename from keyboard/planck/keymaps/lucas/compiled.hex rename to keyboards/planck/keymaps/lucas/compiled.hex diff --git a/keyboard/planck/keymaps/lucas/keymap.c b/keyboards/planck/keymaps/lucas/keymap.c similarity index 99% rename from keyboard/planck/keymaps/lucas/keymap.c rename to keyboards/planck/keymaps/lucas/keymap.c index 7ac9c5cd08..2208780b18 100644 --- a/keyboard/planck/keymaps/lucas/keymap.c +++ b/keyboards/planck/keymaps/lucas/keymap.c @@ -9,7 +9,7 @@ If you have any question about this keymap feel free to shoot me a message on re */ #include "keymap.h" -#include "keymap_extras/keymap_german.h" +#include "keymap_german.h" #include "backlight.h" #include "debug.h" #include "action_layer.h" diff --git a/keyboard/planck/keymaps/lukas/Makefile b/keyboards/planck/keymaps/lukas/Makefile similarity index 100% rename from keyboard/planck/keymaps/lukas/Makefile rename to keyboards/planck/keymaps/lukas/Makefile diff --git a/keyboard/planck/keymaps/lukas/compiled.hex b/keyboards/planck/keymaps/lukas/compiled.hex similarity index 100% rename from keyboard/planck/keymaps/lukas/compiled.hex rename to keyboards/planck/keymaps/lukas/compiled.hex diff --git a/keyboard/planck/keymaps/lukas/keymap.c b/keyboards/planck/keymaps/lukas/keymap.c similarity index 100% rename from keyboard/planck/keymaps/lukas/keymap.c rename to keyboards/planck/keymaps/lukas/keymap.c diff --git a/keyboard/planck/keymaps/max/Makefile b/keyboards/planck/keymaps/max/Makefile similarity index 100% rename from keyboard/planck/keymaps/max/Makefile rename to keyboards/planck/keymaps/max/Makefile diff --git a/keyboard/planck/keymaps/max/compiled.hex b/keyboards/planck/keymaps/max/compiled.hex similarity index 100% rename from keyboard/planck/keymaps/max/compiled.hex rename to keyboards/planck/keymaps/max/compiled.hex diff --git a/keyboard/planck/keymaps/max/keymap.c b/keyboards/planck/keymaps/max/keymap.c similarity index 100% rename from keyboard/planck/keymaps/max/keymap.c rename to keyboards/planck/keymaps/max/keymap.c diff --git a/keyboard/planck/keymaps/mollat/Makefile b/keyboards/planck/keymaps/mollat/Makefile similarity index 100% rename from keyboard/planck/keymaps/mollat/Makefile rename to keyboards/planck/keymaps/mollat/Makefile diff --git a/keyboard/planck/keymaps/mollat/compiled.hex b/keyboards/planck/keymaps/mollat/compiled.hex similarity index 100% rename from keyboard/planck/keymaps/mollat/compiled.hex rename to keyboards/planck/keymaps/mollat/compiled.hex diff --git a/keyboard/planck/keymaps/mollat/keymap.c b/keyboards/planck/keymaps/mollat/keymap.c similarity index 100% rename from keyboard/planck/keymaps/mollat/keymap.c rename to keyboards/planck/keymaps/mollat/keymap.c diff --git a/keyboard/planck/keymaps/nico/Makefile b/keyboards/planck/keymaps/nico/Makefile similarity index 100% rename from keyboard/planck/keymaps/nico/Makefile rename to keyboards/planck/keymaps/nico/Makefile diff --git a/keyboard/planck/keymaps/nico/compiled.hex b/keyboards/planck/keymaps/nico/compiled.hex similarity index 100% rename from keyboard/planck/keymaps/nico/compiled.hex rename to keyboards/planck/keymaps/nico/compiled.hex diff --git a/keyboard/planck/keymaps/nico/keymap.c b/keyboards/planck/keymaps/nico/keymap.c similarity index 100% rename from keyboard/planck/keymaps/nico/keymap.c rename to keyboards/planck/keymaps/nico/keymap.c diff --git a/keyboard/planck/keymaps/pete/Makefile b/keyboards/planck/keymaps/pete/Makefile similarity index 100% rename from keyboard/planck/keymaps/pete/Makefile rename to keyboards/planck/keymaps/pete/Makefile diff --git a/keyboard/planck/keymaps/pete/README.md b/keyboards/planck/keymaps/pete/README.md similarity index 100% rename from keyboard/planck/keymaps/pete/README.md rename to keyboards/planck/keymaps/pete/README.md diff --git a/keyboard/planck/keymaps/pete/compiled.hex b/keyboards/planck/keymaps/pete/compiled.hex similarity index 100% rename from keyboard/planck/keymaps/pete/compiled.hex rename to keyboards/planck/keymaps/pete/compiled.hex diff --git a/keyboard/planck/keymaps/pete/keymap.c b/keyboards/planck/keymaps/pete/keymap.c similarity index 100% rename from keyboard/planck/keymaps/pete/keymap.c rename to keyboards/planck/keymaps/pete/keymap.c diff --git a/keyboard/planck/keymaps/pvc/Makefile b/keyboards/planck/keymaps/pvc/Makefile similarity index 100% rename from keyboard/planck/keymaps/pvc/Makefile rename to keyboards/planck/keymaps/pvc/Makefile diff --git a/keyboard/planck/keymaps/pvc/compiled.hex b/keyboards/planck/keymaps/pvc/compiled.hex similarity index 100% rename from keyboard/planck/keymaps/pvc/compiled.hex rename to keyboards/planck/keymaps/pvc/compiled.hex diff --git a/keyboard/planck/keymaps/pvc/config.h b/keyboards/planck/keymaps/pvc/config.h similarity index 100% rename from keyboard/planck/keymaps/pvc/config.h rename to keyboards/planck/keymaps/pvc/config.h diff --git a/keyboard/planck/keymaps/pvc/keymap.c b/keyboards/planck/keymaps/pvc/keymap.c similarity index 100% rename from keyboard/planck/keymaps/pvc/keymap.c rename to keyboards/planck/keymaps/pvc/keymap.c diff --git a/keyboard/planck/keymaps/tak3over/Makefile b/keyboards/planck/keymaps/tak3over/Makefile similarity index 100% rename from keyboard/planck/keymaps/tak3over/Makefile rename to keyboards/planck/keymaps/tak3over/Makefile diff --git a/keyboard/planck/keymaps/tak3over/compiled.hex b/keyboards/planck/keymaps/tak3over/compiled.hex similarity index 100% rename from keyboard/planck/keymaps/tak3over/compiled.hex rename to keyboards/planck/keymaps/tak3over/compiled.hex diff --git a/keyboard/planck/keymaps/tak3over/keymap.c b/keyboards/planck/keymaps/tak3over/keymap.c similarity index 100% rename from keyboard/planck/keymaps/tak3over/keymap.c rename to keyboards/planck/keymaps/tak3over/keymap.c diff --git a/keyboard/planck/keymaps/unicode/Makefile b/keyboards/planck/keymaps/unicode/Makefile similarity index 100% rename from keyboard/planck/keymaps/unicode/Makefile rename to keyboards/planck/keymaps/unicode/Makefile diff --git a/keyboard/planck/keymaps/unicode/compiled.hex b/keyboards/planck/keymaps/unicode/compiled.hex similarity index 100% rename from keyboard/planck/keymaps/unicode/compiled.hex rename to keyboards/planck/keymaps/unicode/compiled.hex diff --git a/keyboard/planck/keymaps/unicode/keymap.c b/keyboards/planck/keymaps/unicode/keymap.c similarity index 100% rename from keyboard/planck/keymaps/unicode/keymap.c rename to keyboards/planck/keymaps/unicode/keymap.c diff --git a/keyboard/planck/keymaps/yang/Makefile b/keyboards/planck/keymaps/yang/Makefile similarity index 100% rename from keyboard/planck/keymaps/yang/Makefile rename to keyboards/planck/keymaps/yang/Makefile diff --git a/keyboard/planck/keymaps/yang/WS2812-wiring.jpg b/keyboards/planck/keymaps/yang/WS2812-wiring.jpg similarity index 100% rename from keyboard/planck/keymaps/yang/WS2812-wiring.jpg rename to keyboards/planck/keymaps/yang/WS2812-wiring.jpg diff --git a/keyboard/planck/keymaps/yang/compiled.hex b/keyboards/planck/keymaps/yang/compiled.hex similarity index 100% rename from keyboard/planck/keymaps/yang/compiled.hex rename to keyboards/planck/keymaps/yang/compiled.hex diff --git a/keyboard/planck/keymaps/yang/keymap.c b/keyboards/planck/keymaps/yang/keymap.c similarity index 100% rename from keyboard/planck/keymaps/yang/keymap.c rename to keyboards/planck/keymaps/yang/keymap.c diff --git a/keyboard/planck/keymaps/yang/planck-with-rgb-underglow.jpg b/keyboards/planck/keymaps/yang/planck-with-rgb-underglow.jpg similarity index 100% rename from keyboard/planck/keymaps/yang/planck-with-rgb-underglow.jpg rename to keyboards/planck/keymaps/yang/planck-with-rgb-underglow.jpg diff --git a/keyboard/planck/old_keymap_files/common_keymaps/keymap_brett.c b/keyboards/planck/old_keymap_files/common_keymaps/keymap_brett.c similarity index 100% rename from keyboard/planck/old_keymap_files/common_keymaps/keymap_brett.c rename to keyboards/planck/old_keymap_files/common_keymaps/keymap_brett.c diff --git a/keyboard/planck/old_keymap_files/common_keymaps/keymap_dotcom.c b/keyboards/planck/old_keymap_files/common_keymaps/keymap_dotcom.c similarity index 100% rename from keyboard/planck/old_keymap_files/common_keymaps/keymap_dotcom.c rename to keyboards/planck/old_keymap_files/common_keymaps/keymap_dotcom.c diff --git a/keyboard/planck/old_keymap_files/common_keymaps/keymap_jack.c b/keyboards/planck/old_keymap_files/common_keymaps/keymap_jack.c similarity index 100% rename from keyboard/planck/old_keymap_files/common_keymaps/keymap_jack.c rename to keyboards/planck/old_keymap_files/common_keymaps/keymap_jack.c diff --git a/keyboard/planck/old_keymap_files/common_keymaps/keymap_joe.c b/keyboards/planck/old_keymap_files/common_keymaps/keymap_joe.c similarity index 100% rename from keyboard/planck/old_keymap_files/common_keymaps/keymap_joe.c rename to keyboards/planck/old_keymap_files/common_keymaps/keymap_joe.c diff --git a/keyboard/planck/old_keymap_files/common_keymaps/keymap_matthew.c b/keyboards/planck/old_keymap_files/common_keymaps/keymap_matthew.c similarity index 100% rename from keyboard/planck/old_keymap_files/common_keymaps/keymap_matthew.c rename to keyboards/planck/old_keymap_files/common_keymaps/keymap_matthew.c diff --git a/keyboard/planck/old_keymap_files/common_keymaps/keymap_mitch.c b/keyboards/planck/old_keymap_files/common_keymaps/keymap_mitch.c similarity index 100% rename from keyboard/planck/old_keymap_files/common_keymaps/keymap_mitch.c rename to keyboards/planck/old_keymap_files/common_keymaps/keymap_mitch.c diff --git a/keyboard/planck/old_keymap_files/common_keymaps/keymap_nathan.c b/keyboards/planck/old_keymap_files/common_keymaps/keymap_nathan.c similarity index 100% rename from keyboard/planck/old_keymap_files/common_keymaps/keymap_nathan.c rename to keyboards/planck/old_keymap_files/common_keymaps/keymap_nathan.c diff --git a/keyboard/planck/old_keymap_files/common_keymaps/keymap_paul.c b/keyboards/planck/old_keymap_files/common_keymaps/keymap_paul.c similarity index 100% rename from keyboard/planck/old_keymap_files/common_keymaps/keymap_paul.c rename to keyboards/planck/old_keymap_files/common_keymaps/keymap_paul.c diff --git a/keyboard/planck/old_keymap_files/common_keymaps/keymap_peasant.c b/keyboards/planck/old_keymap_files/common_keymaps/keymap_peasant.c similarity index 100% rename from keyboard/planck/old_keymap_files/common_keymaps/keymap_peasant.c rename to keyboards/planck/old_keymap_files/common_keymaps/keymap_peasant.c diff --git a/keyboard/planck/old_keymap_files/common_keymaps/keymap_reed.c b/keyboards/planck/old_keymap_files/common_keymaps/keymap_reed.c similarity index 97% rename from keyboard/planck/old_keymap_files/common_keymaps/keymap_reed.c rename to keyboards/planck/old_keymap_files/common_keymaps/keymap_reed.c index 6cc6e5d7ab..f721716fde 100644 --- a/keyboard/planck/old_keymap_files/common_keymaps/keymap_reed.c +++ b/keyboards/planck/old_keymap_files/common_keymaps/keymap_reed.c @@ -2,7 +2,7 @@ /* * BUILD: - * Simply run the command below in the keyboard/planck directory + * Simply run the command below in the keyboards/planck directory * to build against this keymap * * make KEYMAP=reed COMMON_KEYMAP=true diff --git a/keyboard/planck/old_keymap_files/common_keymaps/keymap_sean.c b/keyboards/planck/old_keymap_files/common_keymaps/keymap_sean.c similarity index 100% rename from keyboard/planck/old_keymap_files/common_keymaps/keymap_sean.c rename to keyboards/planck/old_keymap_files/common_keymaps/keymap_sean.c diff --git a/keyboard/planck/old_keymap_files/common_keymaps/keymap_shane.c b/keyboards/planck/old_keymap_files/common_keymaps/keymap_shane.c similarity index 100% rename from keyboard/planck/old_keymap_files/common_keymaps/keymap_shane.c rename to keyboards/planck/old_keymap_files/common_keymaps/keymap_shane.c diff --git a/keyboard/planck/old_keymap_files/common_keymaps/keymap_simon.c b/keyboards/planck/old_keymap_files/common_keymaps/keymap_simon.c similarity index 100% rename from keyboard/planck/old_keymap_files/common_keymaps/keymap_simon.c rename to keyboards/planck/old_keymap_files/common_keymaps/keymap_simon.c diff --git a/keyboard/planck/old_keymap_files/common_keymaps/keymap_tim.c b/keyboards/planck/old_keymap_files/common_keymaps/keymap_tim.c similarity index 100% rename from keyboard/planck/old_keymap_files/common_keymaps/keymap_tim.c rename to keyboards/planck/old_keymap_files/common_keymaps/keymap_tim.c diff --git a/keyboard/planck/old_keymap_files/common_keymaps/keymap_wilba.c b/keyboards/planck/old_keymap_files/common_keymaps/keymap_wilba.c similarity index 100% rename from keyboard/planck/old_keymap_files/common_keymaps/keymap_wilba.c rename to keyboards/planck/old_keymap_files/common_keymaps/keymap_wilba.c diff --git a/keyboard/planck/old_keymap_files/keymap_common.c b/keyboards/planck/old_keymap_files/keymap_common.c similarity index 100% rename from keyboard/planck/old_keymap_files/keymap_common.c rename to keyboards/planck/old_keymap_files/keymap_common.c diff --git a/keyboard/planck/old_keymap_files/keymap_common.h b/keyboards/planck/old_keymap_files/keymap_common.h similarity index 100% rename from keyboard/planck/old_keymap_files/keymap_common.h rename to keyboards/planck/old_keymap_files/keymap_common.h diff --git a/keyboard/planck/planck.c b/keyboards/planck/planck.c similarity index 100% rename from keyboard/planck/planck.c rename to keyboards/planck/planck.c diff --git a/keyboard/planck/planck.h b/keyboards/planck/planck.h similarity index 100% rename from keyboard/planck/planck.h rename to keyboards/planck/planck.h diff --git a/keyboard/preonic/Makefile b/keyboards/preonic/Makefile similarity index 100% rename from keyboard/preonic/Makefile rename to keyboards/preonic/Makefile diff --git a/keyboard/preonic/README.md b/keyboards/preonic/README.md similarity index 84% rename from keyboard/preonic/README.md rename to keyboards/preonic/README.md index 4a33a3e4e0..f99856fdd8 100644 --- a/keyboard/preonic/README.md +++ b/keyboards/preonic/README.md @@ -8,7 +8,7 @@ For the full Quantum feature list, see [the parent README.md](/README.md). ## Building -Download or clone the whole firmware and navigate to the keyboard/preonic folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use `make dfu` to program your PCB once you hit the reset button. +Download or clone the whole firmware and navigate to the keyboards/preonic folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use `make dfu` to program your PCB once you hit the reset button. Depending on which keymap you would like to use, you will have to compile slightly differently. diff --git a/keyboard/preonic/config.h b/keyboards/preonic/config.h similarity index 100% rename from keyboard/preonic/config.h rename to keyboards/preonic/config.h diff --git a/keyboard/preonic/keymaps/default/Makefile b/keyboards/preonic/keymaps/default/Makefile similarity index 100% rename from keyboard/preonic/keymaps/default/Makefile rename to keyboards/preonic/keymaps/default/Makefile diff --git a/keyboard/preonic/keymaps/default/README.md b/keyboards/preonic/keymaps/default/README.md similarity index 100% rename from keyboard/preonic/keymaps/default/README.md rename to keyboards/preonic/keymaps/default/README.md diff --git a/keyboard/preonic/keymaps/default/compiled.hex b/keyboards/preonic/keymaps/default/compiled.hex similarity index 100% rename from keyboard/preonic/keymaps/default/compiled.hex rename to keyboards/preonic/keymaps/default/compiled.hex diff --git a/keyboard/preonic/keymaps/default/keymap.c b/keyboards/preonic/keymaps/default/keymap.c similarity index 100% rename from keyboard/preonic/keymaps/default/keymap.c rename to keyboards/preonic/keymaps/default/keymap.c diff --git a/keyboard/preonic/preonic.c b/keyboards/preonic/preonic.c similarity index 100% rename from keyboard/preonic/preonic.c rename to keyboards/preonic/preonic.c diff --git a/keyboard/preonic/preonic.h b/keyboards/preonic/preonic.h similarity index 100% rename from keyboard/preonic/preonic.h rename to keyboards/preonic/preonic.h diff --git a/keyboard/retro_refit/Makefile b/keyboards/retro_refit/Makefile similarity index 100% rename from keyboard/retro_refit/Makefile rename to keyboards/retro_refit/Makefile diff --git a/keyboard/retro_refit/README.md b/keyboards/retro_refit/README.md similarity index 84% rename from keyboard/retro_refit/README.md rename to keyboards/retro_refit/README.md index d3c9d4197d..c64e1b8066 100644 --- a/keyboard/retro_refit/README.md +++ b/keyboards/retro_refit/README.md @@ -7,7 +7,7 @@ For the full Quantum feature list, see [the parent README.md](/README.md). ## Building -Download or clone the whole firmware and navigate to the keyboard/retro_refit folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use the Teensy Loader to program your .hex file. +Download or clone the whole firmware and navigate to the keyboards/retro_refit folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use the Teensy Loader to program your .hex file. Depending on which keymap you would like to use, you will have to compile slightly differently. diff --git a/keyboard/retro_refit/config.h b/keyboards/retro_refit/config.h similarity index 100% rename from keyboard/retro_refit/config.h rename to keyboards/retro_refit/config.h diff --git a/keyboard/retro_refit/keymaps/default/compiled.hex b/keyboards/retro_refit/keymaps/default/compiled.hex similarity index 100% rename from keyboard/retro_refit/keymaps/default/compiled.hex rename to keyboards/retro_refit/keymaps/default/compiled.hex diff --git a/keyboard/retro_refit/keymaps/default/keymap.c b/keyboards/retro_refit/keymaps/default/keymap.c similarity index 100% rename from keyboard/retro_refit/keymaps/default/keymap.c rename to keyboards/retro_refit/keymaps/default/keymap.c diff --git a/keyboard/retro_refit/retro_refit.c b/keyboards/retro_refit/retro_refit.c similarity index 100% rename from keyboard/retro_refit/retro_refit.c rename to keyboards/retro_refit/retro_refit.c diff --git a/keyboard/retro_refit/retro_refit.h b/keyboards/retro_refit/retro_refit.h similarity index 100% rename from keyboard/retro_refit/retro_refit.h rename to keyboards/retro_refit/retro_refit.h diff --git a/keyboard/satan/Makefile b/keyboards/satan/Makefile similarity index 97% rename from keyboard/satan/Makefile rename to keyboards/satan/Makefile index 8090c59c45..0ad71007e1 100644 --- a/keyboard/satan/Makefile +++ b/keyboards/satan/Makefile @@ -68,10 +68,6 @@ AUDIO_ENABLE ?= no UNICODE_ENABLE ?= no # Unicode BLUETOOTH_ENABLE ?= no # Enable Bluetooth with the Adafruit EZ-Key HID -#ifdef BACKLIGHT_ENABLE - SRC := backlight.c $(SRC) -#endif - ifndef QUANTUM_DIR include ../../Makefile endif diff --git a/keyboard/satan/backlight.c b/keyboards/satan/backlight.c similarity index 100% rename from keyboard/satan/backlight.c rename to keyboards/satan/backlight.c diff --git a/keyboard/satan/config.h b/keyboards/satan/config.h similarity index 98% rename from keyboard/satan/config.h rename to keyboards/satan/config.h index aea9254e8d..aa2dca1a6a 100644 --- a/keyboard/satan/config.h +++ b/keyboards/satan/config.h @@ -59,7 +59,7 @@ along with this program. If not, see . /* Backlight configuration */ -#define BACKLIGHT_LEVELS 1 +#define BACKLIGHT_LEVELS 4 /* Underlight configuration */ diff --git a/keyboard/satan/controller.jpg b/keyboards/satan/controller.jpg similarity index 100% rename from keyboard/satan/controller.jpg rename to keyboards/satan/controller.jpg diff --git a/keyboards/satan/keymaps/default/compiled.hex b/keyboards/satan/keymaps/default/compiled.hex new file mode 100644 index 0000000000..cd680d64dd Binary files /dev/null and b/keyboards/satan/keymaps/default/compiled.hex differ diff --git a/keyboard/satan/keymaps/default/keymap.c b/keyboards/satan/keymaps/default/keymap.c similarity index 100% rename from keyboard/satan/keymaps/default/keymap.c rename to keyboards/satan/keymaps/default/keymap.c diff --git a/keyboard/satan/led.c b/keyboards/satan/led.c similarity index 100% rename from keyboard/satan/led.c rename to keyboards/satan/led.c diff --git a/keyboard/satan/pinout.txt b/keyboards/satan/pinout.txt similarity index 100% rename from keyboard/satan/pinout.txt rename to keyboards/satan/pinout.txt diff --git a/keyboard/satan/power.jpg b/keyboards/satan/power.jpg similarity index 100% rename from keyboard/satan/power.jpg rename to keyboards/satan/power.jpg diff --git a/keyboards/satan/satan.c b/keyboards/satan/satan.c new file mode 100644 index 0000000000..092eb4665d --- /dev/null +++ b/keyboards/satan/satan.c @@ -0,0 +1,94 @@ +#include "satan.h" + +#ifdef BACKLIGHT_ENABLE +#include "backlight.h" +#endif + +__attribute__ ((weak)) +void matrix_init_user(void) { + // leave these blank +}; + +__attribute__ ((weak)) +void matrix_scan_user(void) { + // leave these blank +}; + + +#ifdef BACKLIGHT_ENABLE + +void backlight_init_ports() +{ + + // Setup PB6 as output and output low. + DDRB |= (1<<6); + PORTB &= ~(1<<6); + + // Use full 16-bit resolution. + ICR1 = 0xFFFF; + + // I could write a wall of text here to explain... but TL;DW + // Go read the ATmega32u4 datasheet. + // And this: http://blog.saikoled.com/post/43165849837/secret-konami-cheat-code-to-high-resolution-pwm-on + + // Pin PB6 = OCR1B (Timer 1, Channel C) + // Compare Output Mode = Clear on compare match, Channel C = COM1C1=1 COM1C0=0 + // (i.e. start high, go low when counter matches.) + // WGM Mode 14 (Fast PWM) = WGM13=1 WGM12=1 WGM11=1 WGM10=0 + // Clock Select = clk/1 (no prescaling) = CS12=0 CS11=0 CS10=1 + + TCCR1A = _BV(COM1B1) | _BV(WGM11); // = 0b00001010; + TCCR1B = _BV(WGM13) | _BV(WGM12) | _BV(CS10); // = 0b00011001; + + backlight_init(); +} + +void backlight_set(uint8_t level) +{ + // Prevent backlight blink on lowest level + PORTB &= ~(_BV(PORTB6)); + + if ( level == 0 ) + { + // Turn off PWM control on PB6, revert to output low. + TCCR1A &= ~(_BV(COM1B1)); + OCR1B = 0x0; + } + else if ( level == BACKLIGHT_LEVELS ) + { + // Turn on PWM control of PB6 + TCCR1A |= _BV(COM1B1); + // Set the brightness + OCR1B = 0xFFFF; + } + else + { + // Turn on PWM control of PB6 + TCCR1A |= _BV(COM1B1); + // Set the brightness + OCR1B = 0xFFFF >> ((BACKLIGHT_LEVELS - level) * ((BACKLIGHT_LEVELS + 1) / 2)); + } +} + +#endif + +void matrix_init_kb(void) { + // put your keyboard start-up code here + // runs once when the firmware starts up + if (matrix_init_user) { + (*matrix_init_user)(); + } + led_init_ports(); + + #ifdef BACKLIGHT_ENABLE + backlight_init_ports(); + #endif +}; + +void matrix_scan_kb(void) { + // put your looping keyboard code here + // runs every cycle (a lot) + if (matrix_scan_user) { + (*matrix_scan_user)(); + } +}; \ No newline at end of file diff --git a/keyboard/satan/satan.h b/keyboards/satan/satan.h similarity index 100% rename from keyboard/satan/satan.h rename to keyboards/satan/satan.h diff --git a/keyboard/sixkeyboard/Makefile b/keyboards/sixkeyboard/Makefile similarity index 100% rename from keyboard/sixkeyboard/Makefile rename to keyboards/sixkeyboard/Makefile diff --git a/keyboard/sixkeyboard/README.md b/keyboards/sixkeyboard/README.md similarity index 100% rename from keyboard/sixkeyboard/README.md rename to keyboards/sixkeyboard/README.md diff --git a/keyboard/sixkeyboard/config.h b/keyboards/sixkeyboard/config.h similarity index 100% rename from keyboard/sixkeyboard/config.h rename to keyboards/sixkeyboard/config.h diff --git a/keyboard/sixkeyboard/keymaps/default/compiled.hex b/keyboards/sixkeyboard/keymaps/default/compiled.hex similarity index 100% rename from keyboard/sixkeyboard/keymaps/default/compiled.hex rename to keyboards/sixkeyboard/keymaps/default/compiled.hex diff --git a/keyboard/sixkeyboard/keymaps/default/keymap.c b/keyboards/sixkeyboard/keymaps/default/keymap.c similarity index 100% rename from keyboard/sixkeyboard/keymaps/default/keymap.c rename to keyboards/sixkeyboard/keymaps/default/keymap.c diff --git a/keyboard/sixkeyboard/matrix.c b/keyboards/sixkeyboard/matrix.c similarity index 100% rename from keyboard/sixkeyboard/matrix.c rename to keyboards/sixkeyboard/matrix.c diff --git a/keyboard/sixkeyboard/sixkeyboard.c b/keyboards/sixkeyboard/sixkeyboard.c similarity index 100% rename from keyboard/sixkeyboard/sixkeyboard.c rename to keyboards/sixkeyboard/sixkeyboard.c diff --git a/keyboard/sixkeyboard/sixkeyboard.h b/keyboards/sixkeyboard/sixkeyboard.h similarity index 100% rename from keyboard/sixkeyboard/sixkeyboard.h rename to keyboards/sixkeyboard/sixkeyboard.h diff --git a/quantum/keymap_extras/keymap_neo2.h b/quantum/keymap_extras/keymap_neo2.h index b54cb74b90..80439af347 100644 --- a/quantum/keymap_extras/keymap_neo2.h +++ b/quantum/keymap_extras/keymap_neo2.h @@ -2,7 +2,7 @@ #define KEYMAP_NEO2 #include "keymap.h" -#include "keymap_extras/keymap_german.h" +#include "keymap_german.h" #define NEO_A KC_D #define NEO_B KC_N diff --git a/quantum/keymap_extras/keymap_norwegian.c b/quantum/keymap_extras/keymap_norwegian.h similarity index 100% rename from quantum/keymap_extras/keymap_norwegian.c rename to quantum/keymap_extras/keymap_norwegian.h diff --git a/quantum/quantum.c b/quantum/quantum.c index 49ac20d61f..006464e5a8 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -54,7 +54,7 @@ int offset = 7; bool leading = false; uint16_t leader_time = 0; -uint16_t leader_sequence[3] = {0, 0, 0}; +uint16_t leader_sequence[5] = {0, 0, 0, 0, 0}; uint8_t leader_sequence_size = 0; // Chording stuff @@ -335,6 +335,8 @@ bool process_record_quantum(keyrecord_t *record) { leader_sequence[0] = 0; leader_sequence[1] = 0; leader_sequence[2] = 0; + leader_sequence[3] = 0; + leader_sequence[4] = 0; return false; } if (leading && timer_elapsed(leader_time) < LEADER_TIMEOUT) { diff --git a/quantum/quantum.h b/quantum/quantum.h index e15003805b..1f78f37177 100644 --- a/quantum/quantum.h +++ b/quantum/quantum.h @@ -54,11 +54,13 @@ extern uint32_t default_layer_state; #ifndef LEADER_TIMEOUT #define LEADER_TIMEOUT 200 #endif - #define SEQ_ONE_KEY(key) if (leader_sequence[0] == (key) && leader_sequence[1] == 0 && leader_sequence[2] == 0) - #define SEQ_TWO_KEYS(key1, key2) if (leader_sequence[0] == (key1) && leader_sequence[1] == (key2) && leader_sequence[2] == 0) - #define SEQ_THREE_KEYS(key1, key2, key3) if (leader_sequence[0] == (key1) && leader_sequence[1] == (key2) && leader_sequence[2] == (key3)) + #define SEQ_ONE_KEY(key) if (leader_sequence[0] == (key) && leader_sequence[1] == 0 && leader_sequence[2] == 0 && leader_sequence[3] == 0 && leader_sequence[4] == 0) + #define SEQ_TWO_KEYS(key1, key2) if (leader_sequence[0] == (key1) && leader_sequence[1] == (key2) && leader_sequence[2] == 0 && leader_sequence[3] == 0 && leader_sequence[4] == 0) + #define SEQ_THREE_KEYS(key1, key2, key3) if (leader_sequence[0] == (key1) && leader_sequence[1] == (key2) && leader_sequence[2] == (key3) && leader_sequence[3] == 0 && leader_sequence[4] == 0) + #define SEQ_FOUR_KEYS(key1, key2, key3, key4) if (leader_sequence[0] == (key1) && leader_sequence[1] == (key2) && leader_sequence[2] == (key3) && leader_sequence[3] == (key4) && leader_sequence[4] == 0) + #define SEQ_FIVE_KEYS(key1, key2, key3, key4, key5) if (leader_sequence[0] == (key1) && leader_sequence[1] == (key2) && leader_sequence[2] == (key3) && leader_sequence[3] == (key4) && leader_sequence[4] == (key5)) - #define LEADER_EXTERNS() extern bool leading; extern uint16_t leader_time; extern uint16_t leader_sequence[3]; extern uint8_t leader_sequence_size + #define LEADER_EXTERNS() extern bool leading; extern uint16_t leader_time; extern uint16_t leader_sequence[5]; extern uint8_t leader_sequence_size #define LEADER_DICTIONARY() if (leading && timer_elapsed(leader_time) > LEADER_TIMEOUT) #endif diff --git a/quantum/template/README.md b/quantum/template/README.md index baaeef4731..d6b0ac936c 100644 --- a/quantum/template/README.md +++ b/quantum/template/README.md @@ -7,7 +7,7 @@ For the full Quantum feature list, see [the parent README.md](/doc/README.md). ## Building -Download or clone the whole firmware and navigate to the keyboard/%KEYBOARD% folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use the Teensy Loader to program your .hex file. +Download or clone the whole firmware and navigate to the keyboards/%KEYBOARD% folder. Once your dev env is setup, you'll be able to type `make` to generate your .hex - you can then use the Teensy Loader to program your .hex file. Depending on which keymap you would like to use, you will have to compile slightly differently. diff --git a/tmk_core/common/host.c b/tmk_core/common/host.c index e9b7916706..11a05c2ddd 100644 --- a/tmk_core/common/host.c +++ b/tmk_core/common/host.c @@ -86,7 +86,7 @@ void host_consumer_send(uint16_t report) (*driver->send_consumer)(report); } -uint16_t host_last_sysytem_report(void) +uint16_t host_last_system_report(void) { return last_system_report; } diff --git a/tmk_core/common/host.h b/tmk_core/common/host.h index 918af69e8f..9814b10d2d 100644 --- a/tmk_core/common/host.h +++ b/tmk_core/common/host.h @@ -47,7 +47,7 @@ void host_mouse_send(report_mouse_t *report); void host_system_send(uint16_t data); void host_consumer_send(uint16_t data); -uint16_t host_last_sysytem_report(void); +uint16_t host_last_system_report(void); uint16_t host_last_consumer_report(void); #ifdef __cplusplus diff --git a/tmk_core/protocol/lufa.mk b/tmk_core/protocol/lufa.mk index cd9450755d..0eeace44ec 100644 --- a/tmk_core/protocol/lufa.mk +++ b/tmk_core/protocol/lufa.mk @@ -47,6 +47,11 @@ LUFA_OPTS += -DUSE_STATIC_OPTIONS="(USB_DEVICE_OPT_FULLSPEED | USB_OPT_REG_ENABL LUFA_OPTS += -DFIXED_CONTROL_ENDPOINT_SIZE=8 LUFA_OPTS += -DFIXED_NUM_CONFIGURATIONS=1 +# Remote wakeup fix for ATmega32U2 https://github.com/tmk/tmk_keyboard/issues/361 +ifeq ($(MCU),atmega32u2) + LUFA_OPTS += -DNO_LIMITED_CONTROLLER_CONNECT +endif + OPT_DEFS += -DF_USB=$(F_USB)UL OPT_DEFS += -DARCH=ARCH_$(ARCH) OPT_DEFS += $(LUFA_OPTS) diff --git a/tmk_core/protocol/lufa/descriptor.c b/tmk_core/protocol/lufa/descriptor.c index 1fca8af39c..850a20fdb3 100644 --- a/tmk_core/protocol/lufa/descriptor.c +++ b/tmk_core/protocol/lufa/descriptor.c @@ -172,13 +172,13 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM ConsoleReport[] = HID_RI_COLLECTION(8, 0x01), /* Application */ HID_RI_USAGE(8, 0x75), /* Vendor Usage 0x75 */ HID_RI_LOGICAL_MINIMUM(8, 0x00), - HID_RI_LOGICAL_MAXIMUM(8, 0xFF), + HID_RI_LOGICAL_MAXIMUM(16, 0x00FF), HID_RI_REPORT_COUNT(8, CONSOLE_EPSIZE), HID_RI_REPORT_SIZE(8, 0x08), HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE), HID_RI_USAGE(8, 0x76), /* Vendor Usage 0x76 */ HID_RI_LOGICAL_MINIMUM(8, 0x00), - HID_RI_LOGICAL_MAXIMUM(8, 0xFF), + HID_RI_LOGICAL_MAXIMUM(16, 0x00FF), HID_RI_REPORT_COUNT(8, CONSOLE_EPSIZE), HID_RI_REPORT_SIZE(8, 0x08), HID_RI_OUTPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE | HID_IOF_NON_VOLATILE), diff --git a/tmk_core/protocol/vusb/vusb.c b/tmk_core/protocol/vusb/vusb.c index 7d0292ed17..eaa1c512d8 100644 --- a/tmk_core/protocol/vusb/vusb.c +++ b/tmk_core/protocol/vusb/vusb.c @@ -266,7 +266,7 @@ const PROGMEM uchar keyboard_hid_report[] = { 0x95, 0x06, // Report Count (6), 0x75, 0x08, // Report Size (8), 0x15, 0x00, // Logical Minimum (0), - 0x25, 0xFF, // Logical Maximum(255), + 0x25, 0xFF, 0x00 // Logical Maximum(255), 0x05, 0x07, // Usage Page (Key Codes), 0x19, 0x00, // Usage Minimum (0), 0x29, 0xFF, // Usage Maximum (255), @@ -336,7 +336,7 @@ const PROGMEM uchar mouse_hid_report[] = { 0xa1, 0x01, // COLLECTION (Application) 0x85, REPORT_ID_SYSTEM, // REPORT_ID (2) 0x15, 0x01, // LOGICAL_MINIMUM (0x1) - 0x25, 0xb7, // LOGICAL_MAXIMUM (0xb7) + 0x25, 0xb7, 0x00 // LOGICAL_MAXIMUM (0xb7) 0x19, 0x01, // USAGE_MINIMUM (0x1) 0x29, 0xb7, // USAGE_MAXIMUM (0xb7) 0x75, 0x10, // REPORT_SIZE (16) diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk index e9ef5ca7b5..07700283e7 100644 --- a/tmk_core/rules.mk +++ b/tmk_core/rules.mk @@ -622,7 +622,7 @@ show_path: @echo VPATH=$(VPATH) @echo SRC=$(SRC) -SUBDIRS := $(sort $(dir $(wildcard $(TOP_DIR)/keyboard/*/.))) +SUBDIRS := $(sort $(dir $(wildcard $(TOP_DIR)/keyboards/*/.))) all-keyboards-defaults-%: @for x in $(SUBDIRS) ; do \ printf "Compiling with default: $$x" | $(AWK_CMD); \ @@ -631,14 +631,14 @@ all-keyboards-defaults-%: all-keyboards-defaults: all-keyboards-defaults-all -KEYBOARDS := $(SUBDIRS:$(TOP_DIR)/keyboard/%/=/keyboard/%) +KEYBOARDS := $(SUBDIRS:$(TOP_DIR)/keyboards/%/=/keyboards/%) all-keyboards-all: $(addsuffix -all,$(KEYBOARDS)) all-keyboards-quick: $(addsuffix -quick,$(KEYBOARDS)) all-keyboards-clean: $(addsuffix -clean,$(KEYBOARDS)) all-keyboards: all-keyboards-all define make_keyboard -$(eval KEYBOARD=$(patsubst /keyboard/%,%,$1)) +$(eval KEYBOARD=$(patsubst /keyboards/%,%,$1)) $(eval KEYMAPS=$(notdir $(patsubst %/.,%,$(wildcard $(TOP_DIR)$1/keymaps/*/.)))) @for x in $(KEYMAPS) ; do \ printf "Compiling $(BOLD)$(KEYBOARD)$(NO_COLOR) with $(BOLD)$$x$(NO_COLOR)" | $(AWK) '{ printf "%-88s", $$0; }'; \ @@ -651,18 +651,18 @@ define make_keyboard_helper $(call make_keyboard,$(subst -$2,,$1),$2) endef -/keyboard/%-quick: +/keyboards/%-quick: $(call make_keyboard_helper,$@,quick) -/keyboard/%-all: +/keyboards/%-all: $(call make_keyboard_helper,$@,all) -/keyboard/%-clean: +/keyboards/%-clean: $(call make_keyboard_helper,$@,clean) -/keyboard/%: +/keyboards/%: $(call make_keyboard_helper,$@,all) all-keymaps-%: $(eval MAKECONFIG=$(call get_target,all-keymaps,$@)) - $(eval KEYMAPS=$(notdir $(patsubst %/.,%,$(wildcard $(TOP_DIR)/keyboard/$(KEYBOARD)/keymaps/*/.)))) + $(eval KEYMAPS=$(notdir $(patsubst %/.,%,$(wildcard $(TOP_DIR)/keyboards/$(KEYBOARD)/keymaps/*/.)))) @for x in $(KEYMAPS) ; do \ printf "Compiling $(BOLD)$(KEYBOARD)$(NO_COLOR) with $(BOLD)$$x$(NO_COLOR)" | $(AWK) '{ printf "%-88s", $$0; }'; \ LOG=$$($(MAKE) $(subst all-keymaps-,,$@) keyboard=$(KEYBOARD) keymap=$$x VERBOSE=$(VERBOSE) COLOR=$(COLOR) SILENT=true 2>&1) ; if [ $$? -gt 0 ]; then $(PRINT_ERROR_PLAIN); elif [ "$$LOG" != "" ] ; then $(PRINT_WARNING_PLAIN); else $(PRINT_OK); fi; \ diff --git a/util/new_project.sh b/util/new_project.sh index b85bbc31cf..9ab8d6fbbc 100755 --- a/util/new_project.sh +++ b/util/new_project.sh @@ -10,18 +10,18 @@ fi KEYBOARD=$1 KEYBOARD_UPPERCASE=$(echo $1 | awk '{print toupper($0)}') -mkdir keyboard/$1 -mkdir keyboard/$1/keymaps -mkdir keyboard/$1/keymaps/default -sed -e "s;%KEYBOARD%;$KEYBOARD;g" -e "s;%KEYBOARD_UPPERCASE%;$KEYBOARD_UPPERCASE;g" quantum/template/template.h > keyboard/$KEYBOARD/$KEYBOARD.h -sed -e "s;%KEYBOARD%;$KEYBOARD;g" quantum/template/template.c > keyboard/$KEYBOARD/$KEYBOARD.c -sed -e "s;%KEYBOARD%;$KEYBOARD;g" quantum/template/config.h > keyboard/$KEYBOARD/config.h -sed -e "s;%KEYBOARD%;$KEYBOARD;g" quantum/template/README.md > keyboard/$KEYBOARD/README.md -sed -e "s;%KEYBOARD%;$KEYBOARD;g" quantum/template/Makefile > keyboard/$KEYBOARD/Makefile -sed -e "s;%KEYBOARD%;$KEYBOARD;g" quantum/template/keymaps/default/keymap.c > keyboard/$KEYBOARD/keymaps/default/keymap.c +mkdir keyboards/$1 +mkdir keyboards/$1/keymaps +mkdir keyboards/$1/keymaps/default +sed -e "s;%KEYBOARD%;$KEYBOARD;g" -e "s;%KEYBOARD_UPPERCASE%;$KEYBOARD_UPPERCASE;g" quantum/template/template.h > keyboards/$KEYBOARD/$KEYBOARD.h +sed -e "s;%KEYBOARD%;$KEYBOARD;g" quantum/template/template.c > keyboards/$KEYBOARD/$KEYBOARD.c +sed -e "s;%KEYBOARD%;$KEYBOARD;g" quantum/template/config.h > keyboards/$KEYBOARD/config.h +sed -e "s;%KEYBOARD%;$KEYBOARD;g" quantum/template/README.md > keyboards/$KEYBOARD/README.md +sed -e "s;%KEYBOARD%;$KEYBOARD;g" quantum/template/Makefile > keyboards/$KEYBOARD/Makefile +sed -e "s;%KEYBOARD%;$KEYBOARD;g" quantum/template/keymaps/default/keymap.c > keyboards/$KEYBOARD/keymaps/default/keymap.c echo "######################################################" -echo "# keyboard/$KEYBOARD project created. To start" +echo "# keyboards/$KEYBOARD project created. To start" echo "# working on things, use the following command:" -echo "# cd keyboard/$KEYBOARD" +echo "# cd keyboards/$KEYBOARD" echo "######################################################"