Splits up ps2avrGB boards into their own folders (#2014)
* move underglow led count from parent to child * Added pearl support * Added personal keymap for pearl * start splitting up ps2avrGB boards * clean up ps2avrgb boards * Move keycodes to their own section * Clarify `KC_PWR` vs `KC_POWER`. Fixes #1994. * Cleaned uppersonal userspace and keymaps (#1998) * Cleanup of keymaps * Remove Tap Dance from Orthodox keymap * Cleaned up userspace and keymaps * Added sample (template)userspace files to my folder * Document the Teensy hardware reset problem * add mfluid keymap to atreus62 * Update hand_wire.md Change "Resin" to "Rosin" * Add keyboard: mt40 (#2001) * add keyboard: chinese planck clone * rename chinese_planck to mt40 * add image for the mt40 board * lets_split: Fix matrix_init for ROW2COL Signed-off-by: Marian Rusu <rusumarian91@gmail.com> * Add Keymap for Whitefox Truefox layout * Add keyboard: ACR60 (#1999) * base acr60 keyboard folder created * mitch acr60 keymap updates, documentation * latest keymap updates * slight modifications to layer switching * Changes to Atreus and Ergodox EZ Dvorak 42key layout (#1997) * importing 42 key dvorak layout * added comment for build instructions * adding atreus dvorak 42 key layout * added readme * add readme * build instructions * additional MEH shortcuts * added shifted symbols on symbols layer * working extra symbols on COMBINED layer * bring atreus layout inline with the ergodox one * add necessary macros * working ls macro * added more shell macros * added screen rename / screen number macros * add ctrl-a key in shell-nav to use screen more easily * added shell screen layer * assign screen switching macros to screen layer * define all screen switching macros * more screen-related shortcuts added on shell screen layer * change shell nav bottom right row to match base layer (backspace / delete) * remove some mappings on SHELL_NAV layer as they are now in the screen layer * added more screen macros * changes to COMBINED layer (pipe on the right) and modified shell nav * moved pipe/backslash to then right * documented SHELL_SCREEN layer * put backspace/delete on SHELL_NAV layer * add an explicit lisence file for github to pickup * Updated keymaps to allow base layer alternation for QWERTY, Colemak & Dvorak (#1962) * First commit of the Terminus_Mini firmware and the DivergeJM version of the Nyquist firmware * Fix terminus_mini & nyquist/DivergeJM readme files Previously an outdated copy of the default readme. Updated to match the Nyquist/DivergeJM format (DivergeJM is a split 5x12 implementation of the terminus_mini layout) * Update makefiles to rules.mk Renamed both Makefiles to rules.mk, removed references to makefiles * Updated rules.mk Inadvertantly removed important code from the rules.mk in previous commit. This has been restored. Also disabled Tap_Dance in both rules.mk files * Moved terminus_mini to handwired Realised that existing directory was not appropriate for the terminus_mini project, moved to handwired. * New Frosty Flake layout for QFR TKL Added a TKL layout for the Frosty Flake with a navigation cluster on LOWER under the left hand and a similarly functioning MOUSE layer that includes mouse navigation functionality. * README fix & keymap update for 3 keyboards Fixed the markdown for the handwired/terminus_mini:default, Nyqyist:DivergeJM & frosty_flake:QFR_JM. Added TAPPING_TERM = 150 to config.h for all keyboards Switched LT(LOWER) and LAlt on the mod row for ortholinear boards. * Update readme for QFR_JM to include make instructions * Revert "Merge branch 'master' of https://github.com/mogranjm/qmk_firmware" This reverts commit a45f264ada09acc14fb85390407bc7ff5bb021e3, reversing changes made to 62349c33410671a33d4041d50cf27de1d6bdd9cf. * Revert "Revert "Merge branch 'master' of https://github.com/mogranjm/qmk_firmware"" This reverts commit eae54fb3be2c60dffd704261f84bab98c9e06f93. * Added QWERTY support to the QFR_JM Implemented variable default base layer from the Planck default keymap. * Update README to reflect QWERTY support * Nyquist:DivergeJM - Update RESET location Add a reset button to both hands, accessible when halves are disconnected. * Typo fix * Update DivergeJM Switched master to Left hand, Moved Reset key to a different location * Added macros to send R pointer & dplyr pipe Macros added as a string of keypresses, couldn't figure out how to get SEND_STRING to work. * Added ADJUST -> QWERTY, DVORAK, COLEMAK Re-implemented update_tri_layer fuctionality to reset base layer for Terminus_Mini & DivergeJM Nyquist keymaps to QWERTY, DVORAK or COLEMAK via the ADJUST layer. Updated ReadMe files accordingly. * Fix base layout diagram for Terminus_Mini Remove split from diagram * Changed the R operators to SEND_STRING, rather than keypress macros * Added Dvorak to the QFR_JM keymap * fixed duplicate row in Nyquist keymap * Fix readme - LAlt location on mouse layer * Set EE_HANDS to allow either Nyquist hand to work as master. * Update R operator strings, clean up layering for terminus_mini, QFR_JM and DivergeJM "<-" to " <- " "%>%" to " %>% " Also played around with the layering, removed unnecessary TAP_TOGGLE for LOWER and shuffled FUNCTION and MOUSE momentary actions to reflect layer order. * Update bottom alpha row to output symbols on LOWER This row now outputs the following (z -> /) when in the LOWER layer: <- %>% { [ ` | ] } . / * Updated readme files for QFR_JM, terminus_mini & DivergeJM QFR_JM readme reflects correct LOWER bottom row symbol output, terminus_mini & DivergeJM reflect correct command line make instructions. * Add media keys to QFR_JM LOWER - Replicate QFR default functionality * Fix issue with Mouse layering Stuck on mouse layer because the wrong macro was assigned to the 'exit layer' key. Reassigned that key. * Changed " <- " to "<- " for QFR_JM, terminus_mini & DivergeJM * Add "KC_MAKE" to userspace example * QMK DFU bootloader generation (#2009) * adds :bootloader target * update planck and preonic revisions * remove references to .h files for planck * update preonic keymap * only add keyboard.h files that exist * add production target * hook things up with the new lufa variables * update rules for planck/preonic * back backlight key turn of status led when pressed * add manufacturer/product strings to bootloader * fix push script * Added support for let's split kailh socket version (#2010) * Added support for socket version of the let's split * renamed files * socket-version-works * fix up lets_split keymaps * fix up lets_split keymaps * shrink preonic by a bit * fix lets_split keyboards * update travis script * update travis script * update version silencing
This commit is contained in:
Jack Humbert
GitHub
parent
92d47a55d4
commit
f2c32b3ea4
42 changed files with 2737 additions and 92 deletions
|
|
@ -1,13 +1,16 @@
|
|||
/*
|
||||
Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 2 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@ You should have received a copy of the GNU General Public License
|
|||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef KEYMAP_COMMON_H
|
||||
#define KEYMAP_COMMON_H
|
||||
#ifndef MECHMINI_H
|
||||
#define MECHMINI_H
|
||||
|
||||
#include "keycode.h"
|
||||
#include "action.h"
|
||||
|
|
|
|||
|
|
@ -1,74 +0,0 @@
|
|||
#!/usr/bin/env python
|
||||
# Copyright 2017 Luiz Ribeiro <luizribeiro@gmail.com>
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# This program is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
from __future__ import print_function
|
||||
|
||||
import os
|
||||
import sys
|
||||
import time
|
||||
import usb
|
||||
|
||||
if len(sys.argv) < 2:
|
||||
print('Usage: %s <firmware.hex>' % sys.argv[0])
|
||||
sys.exit(1)
|
||||
|
||||
print('Searching for ps2avrGB... ', end='')
|
||||
|
||||
dev = usb.core.find(idVendor=0x20A0, idProduct=0x422D)
|
||||
if dev is None:
|
||||
raise ValueError('Device not found')
|
||||
|
||||
print('Found', end='\n\n')
|
||||
|
||||
print('Device Information:')
|
||||
print(' idVendor: %d (0x%04x)' % (dev.idVendor, dev.idVendor))
|
||||
print(' idProduct: %d (0x%04x)' % (dev.idProduct, dev.idProduct))
|
||||
print('Manufacturer: %s' % (dev.iManufacturer))
|
||||
print('Serial: %s' % (dev.iSerialNumber))
|
||||
print('Product: %s' % (dev.iProduct), end='\n\n')
|
||||
|
||||
print('Transferring control to bootloader... ', end='')
|
||||
|
||||
dev.set_configuration()
|
||||
|
||||
request_type = usb.util.build_request_type(
|
||||
usb.util.CTRL_OUT,
|
||||
usb.util.CTRL_TYPE_CLASS,
|
||||
usb.util.CTRL_RECIPIENT_DEVICE)
|
||||
|
||||
USBRQ_HID_SET_REPORT = 0x09
|
||||
HID_REPORT_OPTION = 0x0301
|
||||
|
||||
|
||||
try:
|
||||
dev.ctrl_transfer(
|
||||
request_type,
|
||||
USBRQ_HID_SET_REPORT,
|
||||
HID_REPORT_OPTION,
|
||||
0,
|
||||
[0, 0, 0xFF] + [0] * 5
|
||||
)
|
||||
except usb.core.USBError:
|
||||
# for some reason I keep getting USBError, but it works!
|
||||
pass
|
||||
|
||||
# wait a bit until bootloader starts up
|
||||
time.sleep(2)
|
||||
|
||||
print('OK')
|
||||
print('Programming...')
|
||||
if os.system('bootloadHID -r "%s"' % sys.argv[1]) == 0:
|
||||
print('\nDone!')
|
||||
64
keyboards/mechmini/readme.md
Normal file
64
keyboards/mechmini/readme.md
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
mechmini
|
||||
========
|
||||
|
||||
A compact ortholinear/staggered keyboard.
|
||||
|
||||
Keyboard Maintainer: QMK Community
|
||||
Hardware Supported: mechmini PCB
|
||||
Hardware Availability: https://mechkeys.ca/collections/keyboards/products/mechmini-2-0-pcb
|
||||
|
||||
Make example for this keyboard (after setting up your build environment):
|
||||
|
||||
make mechmini:default
|
||||
|
||||
See [build environment setup](https://docs.qmk.fm/build_environment_setup.html) then the [make instructions](https://docs.qmk.fm/make_instructions.html) for more information.
|
||||
|
||||
## Mechmini Notes
|
||||
|
||||
Note that this is a complete replacement for the firmware, so you won't be
|
||||
using Bootmapper Client to change any keyboard settings, since not all the
|
||||
USB report options are supported.
|
||||
|
||||
## Installing
|
||||
|
||||
First, install the requirements. These commands are for OSX, but all you
|
||||
need is the AVR toolchain and `bootloadHID` for flashing:
|
||||
|
||||
```
|
||||
$ brew cask install crosspack-avr
|
||||
$ brew install --HEAD https://raw.githubusercontent.com/robertgzr/homebrew-tap/master/bootloadhid.rb
|
||||
```
|
||||
|
||||
In order to use the `./program` script, which can reboot the board into
|
||||
the bootloader, you'll need Python 2 with PyUSB installed:
|
||||
|
||||
```
|
||||
$ pip install pyusb
|
||||
```
|
||||
|
||||
Then, with the keyboard plugged in, simply run this command from the
|
||||
`qmk_firmware` directory:
|
||||
|
||||
```
|
||||
$ make mechmini:program
|
||||
```
|
||||
|
||||
If you prefer, you can just build it and flash the firmware directly with
|
||||
`bootloadHID` if you boot the board while holding down `L_Ctrl` to keep it
|
||||
in the bootloader:
|
||||
|
||||
```
|
||||
$ make mechmini
|
||||
$ bootloadHID -r mechmini_default.hex
|
||||
```
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
From my experience, it's really hard to brick these boards. But these
|
||||
tricks have been useful when it got stuck in a weird scenario.
|
||||
|
||||
1. Try plugging the board in while pressing `L_Ctrl`. This will force it
|
||||
to boot only the bootloader without loading the firmware. Once this is
|
||||
done, just reflash the board with the original firmware.
|
||||
2. Sometimes USB hubs can act weird, so try connecting the board directly
|
||||
to your computer or plugging/unplugging the USB hub.
|
||||
|
|
@ -20,9 +20,6 @@ PROTOCOL = VUSB
|
|||
# unsupported features for now
|
||||
NO_UART = yes
|
||||
NO_SUSPEND_POWER_DOWN = yes
|
||||
BACKLIGHT_ENABLE = no
|
||||
RGBLIGHT_ENABLE = yes
|
||||
DISABLE_WS2812 = yes
|
||||
|
||||
# processor frequency
|
||||
F_CPU = 12000000
|
||||
|
|
@ -33,7 +30,7 @@ MOUSEKEY_ENABLE = yes
|
|||
EXTRAKEY_ENABLE = yes
|
||||
CONSOLE_ENABLE = yes
|
||||
COMMAND_ENABLE = yes
|
||||
|
||||
BACKLIGHT_ENABLE = no
|
||||
RGBLIGHT_ENABLE = yes
|
||||
RGBLIGHT_CUSTOM_DRIVER = yes
|
||||
|
||||
|
|
@ -45,4 +42,4 @@ CUSTOM_MATRIX = yes
|
|||
SRC = matrix.c i2c.c
|
||||
|
||||
# programming options
|
||||
PROGRAM_CMD = ./keyboards/mechmini/program $(TARGET).hex
|
||||
PROGRAM_CMD = ./util/atmega32a_program.py $(TARGET).hex
|
||||
Loading…
Add table
Add a link
Reference in a new issue