1
0
Fork 0
forked from forks/qmk_firmware
Commit graph

3948 commits

Author SHA1 Message Date
Jarred Steenvoorden 5c2ac733af Keymap: Adding my DZ60, Satan, XD75 kemaps and updates to userspace (#4039)
* Update userspace with common config.h

* Add my dz60, satan and xd75 keyboard keymaps

* Fixing executable bits changed during last upstream merge

* Cleanup unnecessary files and defines

* Remove unnecessary defines from userspace config
2018-10-02 08:14:37 -07:00
Drashna Jaelre 1a33054a35 Reduce firmware size of KBD8x to fix Travis Compile issues 2018-10-02 11:08:21 -04:00
Rebecca Le 9f2e39732f Keyboard: Add support for the KBD4x (#4036)
* Generate a new project for the KBD4x

* Specify the possible layouts for the KBD4x - MIT and grid

* Fill out the readme for the KBD4x

* Configure the default keymap and wiring configuration as specified on http://qmkeyboard.cn/

* Add info.json for QMK Configurator

* Enable backlight support for the KBD4x

* Standardise on LAYOUT_planck_mit/LAYOUT_ortho_4x12 layout names

* Add whitespace so the Readme will render correctly

* Disable mouse keys support for the KBD4x to make the firmware small enough
2018-10-01 20:43:43 -07:00
noroadsleft abcf64ecbd Keyboard: DZ60 cleanup (#3994)
* DZ60: Deleted K214 from LAYOUT_all

* DZ60: Delete matrix LAYOUT_2_shifts; replace with LAYOUT_all

After the deletion of K214 from LAYOUT_all, LAYOUT_all and LAYOUT_2_shifts are identical.

Deprecated LAYOUT_2_shifts in favor of LAYOUT_all.

* DZ60: refactor 256k_HHKB and itsaferbie keymaps to use LAYOUT_60_hhkb macro

Both keymaps previously used the LAYOUT_hhkb macro. After comparing the macros, the only difference between them was that LAYOUT_hhkb included the place of the ISO Backslash key. Neither keymap used this key, so both were refactored to use LAYOUT_60_hhkb instead.

LAYOUT_hhkb is now essentially unused by any keymaps in the repo. (More on that in a moment.)

* DZ60: bugfix for dbroqua keymap

This keymap had two layers that used the LAYOUT_true_hhkb macro and a third that used LAYOUT_hhkb. These macros have the same number of keys, but represent different physical layouts. As the "main" layers used LAYOUT_true_hhkb, switched the third layer to LAYOUT_true_hhkb as well.

The LAYOUT_hhkb macro is now unused by any DZ60 keymaps in the repo, and can be safely deleted.

* DZ60: bugfix for 60_ansi_arrow_fkeys, 60_plus_arrows, and stephengrier keymaps

All three keymaps had one layer in LAYOUT_all and one in LAYOUT_directional. Only difference between these macros is LAYOUT_all excludes the ISO Backslash position. As none of the keymaps used this position, all layers were switched to use LAYOUT_directional.

* DZ60: added layout mock-ups to dz60.h

Documenting the physical layouts that go with each matrix.

* DZ60: replace TMK SHIFT_ESC with QMK Grave Escape

Replaced all instances of keycodes that called TMK's ACTION_FUNCTION(SHIFT_ESC) with QMK's KC_GESC, and added config.h files so KC_GESC behaves as the deprecated TMK function did, except for the default keymap, which I thought should have the QMK standard behavior.

* DZ60: delete SHIFT_ESC code blocks

Deleted ACTION_FUNCTION(SHIFT_ESC) code blocks from keymaps that didn't use the functionality it provided.

* DZ60: deleted unused MODS_CTRL_MASk definitions

Was used in the now-deleted SHIFT_ESC code blocks. Interestingly named MODS_CTRL_MASK when it was actually checking the Shift keys. *shrug*

* DZ60: refactor jkbone keymap to use process_record_user

Replaced TMK action_function keycodes with QMK process_record_user equivalents.

* DZ60: delete unused layout macros

The macros LAYOUT_hhkb, LAYOUT_directional_625_space, and LAYOUT_60_ansi_split_bs_rshift_5x1u were unused by any keymaps in the repo, and have thus been deleted.

* DZ60: refactor iso_6u_space and iso_7u_space keymaps

Both keymaps refactored to use the LAYOUT_60_iso macro.

* DZ60: refactor dz60.h

Updated the notation of the switch arguments. Format is now:

`k<row><column>`

where `<row>` is `[0-4]` and `<column>` is `[0-9a-e]`.

* DZ60: refactor LAYOUT_60_iso_5x1u matrix

Updated matrix so `KC_ENT` belongs on the home row, which is consistent with LAYOUT_60_iso for the DZ60 as well as the ISO community layouts.

* DZ60: fix white space in dz60.h

I hate when indentation is inconsistent within a file.
2018-10-01 20:35:09 -07:00
Drashna Jaelre 1512a6bfd4 Keymap: Update to drashna keymaps and userspace (#3992)
* Enabled unicode support and send_unicode function

* Unicode cleanup

* More unicode tweaking

* Update EEPROM stuff

* Account for keyboard macros

* Switch Equal to Plus on Ergodox

* more tweaks

* Minor Unicode tweaks

* Correct matrix printing for keylogger

* Fix unicode functions

* Fix unicode mode set since it actually uses EEPROM

* Re-add DISABLE_LEADER

* Ergodox is easier to hit the tapping term, fix that

* Fix stupid type on unicode mode check

* Preliminary CRKBD/HeliDox support

* Fixes to Helidox

* Cleanup userspace from old merge stuff

* Remove CCCV sounds

* Make Mode NOEEPROM Again
2018-10-01 21:00:14 -04:00
Drashna Jaelre e885c793bc Add Function level EECONFIG code for EEPROM (#3084)
* Add Function level EEPROM configuration

Add kb and user functions for EEPROM, and example of how to use it.

* Bug fixes and demo

* Additional cleanup

* Add EEPROM reset macro to example

* Forgot init function in list

* Move eeconfig_init_quantum function to quantum.c and actually set default layer

* See if removing weak quantum function fixes issue

* Fix travis compile error

* Remove ifdef blocks from EECONFIG so settings are always set

* Fix for ARM EEPROM updates

* Fix merge issues

* Fix potential STM32 EEPROM issues
2018-10-01 20:53:14 -04:00
Daniel Shields da6c58175a Make digital rain RGB matrix effect #define configurable. 2018-10-01 12:54:37 -04:00
MechMerlin 285ed08867 Keyboard: Rename macropad to treasure/type9 (#4035)
* rename macropad keyboard to type9 under the treasure directory

* fixup the readme

* rename macropad to type9

* moar renames
2018-10-01 09:34:20 -07:00
Andrew Kannan 45a4a0a7fc Keyboard: Adding initial luddite keyboard framework (#4029)
* Adding initial luddite keyboard framework

* Use pragma and update readme

* Remove duplicate macro definitions
2018-10-01 09:25:16 -07:00
Drashna Jaelre 3907ed034b Fix YMDK NP21 keyboard to use proper keyboard level functions (#3042)
* Use proper function levels

* Add matrix init functions

* Convert KEYMAP to LAYOUT

Or @mechmerlin is going to hunt me down and harm me... probably :)

* Fix conflict issues
2018-10-01 11:09:57 -04:00
noroadsleft a398d2cece Keymap: Add noroadsleft keymap for KC60 (#3876)
* Add personal KC60 keymap

* Update personal KC60 keymap

* Keymap update 2018-05-30 01:53 UTC-7

* Added macro: T_PEEKR

* Added macro for MacOS Select All; modified MacOS function layer

* Added git branch-name macro

* Added GitHub signature macro

* Added readme files

* Added Quake 2 and System layers

* Refactored keymap readme

* Refactored to add userspace files; added Colemak layer

* Minor code cleanup; updated readme files

* Reverted use of userspace

Decided not to make use of the Userspace feature at this time. Reverted its addition, and updated the readme files where needed (they were linking to userspace files).

* Updated per review comments by @drashna

* Refactor buggy macros

I'm still not sure these work properly

* Fix Windows shortcuts

* Fix Mac shortcuts, possibly

Untested; still may be broken.

* Remove PREVENT_STUCK_MODIFIERS from config.h

Deprecated by #3107
2018-09-30 22:06:29 -07:00
OlliGranlund a6c85f1c23 Keymap: add olligranlund Iris + satan layouts (#4031)
* init

* function layout planning

* nordic keymap v1.0

* Added latest satan layouts, updated readmes

* Cleaning code

* Renamed ISO -> iso
2018-09-30 13:50:16 -07:00
Erovia a7d46f1b0f Keymap: Add ErgoDone keymap with QWERTY and COLEMAK Mod-DH (#3884)
* Custom keymap for the ErgoDone

The keymap supports QWERTY and COLEMAK MOD-DH with LED indication.

* Enable Space Cadet Shift

* Fix after-boot layer indicator LED

* Implement keyboard suspend, move layer LED handling to function, unify
identation

* Add readme.md with layout

* Optimize LED handling, add include guard

Read the default layer via the proper EEPROM function, so the calling of
bootmagic() is no longer necessary.
Fix bug when the CapsLock LED wasn't working anymore after a layer
switch.
2018-09-30 11:14:06 -07:00
Wilba6582 66ef1e3d67 RAMA M6-B and IS31FL3218 driver (#4021)
* Initial RAMA M6-B commit.

* Moved IS31FL3218 driver, minor cleanups

* Refactor, added dynamic keymap.

* Added dynamic keymaps to RAMA M6-A

* Refactor M6-A and M6-B to use common code.

* Formatting

* Cleanup

* Cleanup

* Changes from review
2018-09-30 11:35:10 -04:00
Wilba6582 6734cd9c5c Keyboard: Zeal60: Fix getting backlight values "id_*_indicator_row_col" (#4030) 2018-09-30 07:31:23 -07:00
Alexander Kagno 3875d6f581 Keymap: Added Leader Key Functionality (#4025)
* deleting arkag branch, forcibly moving changes over to master

* fade_color function added, not tested

* added half functions some stuff

* surround_type function implemented and working.

* added flashing function and removed fading, flashing supports infinite flashing along with controlled number flashes

* added a fade state machine and functionality

* build optimizations, changed fade to bounce between bounds rather than roll over, added a HALMAK layout

* changes to sleep breath function, changed how I will switch to HALMAK

* support for halmak added

* support for activity detection added, condensed fading and flashing state machines, removed support for HALMAK and COLEMAK because arkag is stupid

* changed sleep and inactive behaviors, now the color shifting reverses on state change, yay! save_color and reset_color are made to enable layer color changing to look cooler.

* reformatted some if statements in state detection

* changes to force fade to pause on boot, or plug in.

* Attempting to move over to userspace, pushing to repository for help

* userspace stuff....

* userspace stuff....

* layout changes, working userspace,

Removed left side shift and replaced it with a MT() for LSFT and SPC. Userspace seems to be working properly now! HURRAY

* Layout change

Removed space/shift and reset modifiers to what they were originally. Added homerow modifiers.

* Removed excessive tabs in files

* Moved mods on homerow around...

* changes recommended by @drashna

* removed homerow mods, more flashy lighting!

* changed delays for lighting.

* velocikey code retro fit into userspace to match typing speed

currently "working" but isn't as reactive as I want.

* Readme and other documentation hidden throughout code

* Added a pretty picture

* pretty picture actually added

* More readme updates

* Velocikey now working inside my userspace!

* Changed repo macro and fixed readme

* Removed media layer, moved media control to LAZY layer

* fixed more merge issues when I had to merge...

* implemented some leader key stuff

* removed merge garbage...

* changes requested by @drashna, leader key switch from macros
2018-09-29 17:51:06 -07:00
Yan-Fa Li 170507896d Keyboard: Update info.json to match LAYOUT (#4027)
* Update info.json to match LAYOUT

* update mf68_ble info.json

LAYOUT -> LAYOUT_68_ansi
2018-09-29 16:16:21 -07:00
izzy84075 92d95ba1e1 Keyboard: Add basic support for the YD68 / YD68v2 PCBs. (#4020)
* Add basic support for the YD68 / YD68v2.

Keymap and WS2812 underlighting work. Capslock LED should work, though I don't have one populated to test. Backlight LEDs are not set up, as they're not on a hardware PWM pin, could be set up as software.

* Fix Imgur link

* Fix default keymap to match the stock firmware

* Fix the Hardware Supported line and add a short description
2018-09-29 12:44:54 -07:00
noroadsleft 68854f0735 Keyboard: converter/hp_46010a: rename layout macro to LAYOUT (#4024)
Messed up in my previous PR (#4017) by providing the wrong matrix name.

Fixing by changing the matrix name instead, because there's only one at this point. Thought it made more sense this way.
2018-09-29 12:44:12 -07:00
Takeshi ISHII cd215209ef Helix led_test keymap reduce size (#4023)
* Helix: make rgblight modes selectable.

No change in build result.

* edit the comment of helix/rev2/keymaps/default/keymap.c

* Helix led_test keymap: reduced the size.
2018-09-29 10:40:54 -07:00
marksard 4f64951080 Keymap: Fixed a possible of buffer overflow. (#4016)
Update inline funnction to static inline function.
Fixed error of if enabe ADJUST_MACRO_ENABLE.
2018-09-29 10:25:03 -07:00
Shaleen Jain 1da2f8d546 Keymap: tada68: add shalzz's layout (#4019) 2018-09-29 08:49:51 -07:00
noroadsleft 9f8bbe2f3f Keyboard: converter/hp_46010a: Configurator support (#4017) 2018-09-29 08:47:16 -07:00
Drashna Jaelre 20a10bd084 Size fix for Hadron, take 2 (#4009)
* Add Link Time Optimization to reduce firmware size

* Disable Mousekeys on Hadron to save room
2018-09-28 22:23:13 -04:00
Drashna Jaelre 3d767e4aab Disable Moueskeys to reduce Vitamins Included firmware size 2018-09-28 22:22:53 -04:00
Drashna Jaelre ab83aedfab Second attempt to reduce the size of the USB BLE Converter (#4010)
* Disable Leader to reduce firmware size for Travis

* Additionaly fixes to USB_USB\BLE Keyboard converter

* Disable One Shots to get USB to USB BLE converter to fit
2018-09-28 22:22:31 -04:00
patrickmt 239f02408e Massdrop keyboard updates for SEND_STRING, syscalls, stdio, debug prints, Auto Shift (#3973)
* Update for SEND_STRING usage

Update for SEND_STRING usage.
Sending keyboard reports (kbd, nkro) now obey the minimum polling time.
While attempting to send a keyboard report and waiting for a USB poll, other functions of the keyboard, including LED effects and power management, will continue to operate at their intended intervals.

* Updates for send string, syscalls, stdio, debug prints, auto shift

Now properly waiting for previous keys sent over USB to complete before sending new.
Added heap to linker and now compiling with syscalls support.
Removed custom string functions and now using stdio.
dprintf now works as intended through virtser device.

* CTRL and ALT keymap updates

CTRL mac keymap updated
ALT default and mac keymap updated
ALT rules.mk added Auto Shift with default no

* Code cleanup as per discussion with vomindoraan

Code cleanup as per discussion with vomindoraan
2018-09-28 21:32:15 -04:00
Ethan Madden cb468e0307 Keymap: Clicky frequency modulation (#4012)
Also worked around my busted dipswitch 2...
2018-09-28 12:44:15 -07:00
Wilba6582 daa11dc414 Changed VID/PID, added commands, refactoring 2018-09-28 12:36:55 -04:00
Drashna Jaelre 9ade35a9fe Optimize size of USB_USB BLE Converter 2018-09-28 10:47:20 -04:00
Drashna Jaelre ebc143297c Optimize size of Pearl keyboard 2018-09-28 10:47:05 -04:00
Drashna Jaelre 8847b2abbf Optimize size of Vitamins_Included keyboard 2018-09-28 10:46:47 -04:00
Drashna Jaelre a4bdab6837 Optimize size of Hadron keyboard 2018-09-28 10:22:08 -04:00
Drashna Jaelre 31afdd81a1 Optimize size of JC65/v32a keyboard 2018-09-28 10:21:51 -04:00
Wilba6582 a173eda6d2 Improved dynamic keymaps (#3972)
* Improved dynamic keymaps

* K&R sucks
2018-09-28 00:09:14 -04:00
James Laird-Wah b382076ad1 Keyboard: keyboardio model01: rgbmatrix support (#3989)
* model01: implement RGB matrix feature

LEDs can still be individually controlled if this is switched off.

* model01: use fast banked LED setting commands

* model01: update default keymap to use RGB matrix

* model01: update RGB matrix support to match common_features.mk

* rgb_matrix: include <string.h>

This was missing after commit 4d5705ea6c
which introduces a use of memset().

* model01: make g_rgb_leds weak

This allows users to override which LEDs are configured as
modifiers, or tweak the x/y coordinates, should they so choose.
2018-09-27 20:53:36 -07:00
Ethan Madden 246d539f29 Keymap: add clicky support to jetpacktuxedo keymap (#3990)
controlled by dip 3 with pitch modulated by the knob
2018-09-27 18:09:23 -07:00
Pekaso a65085a893 Keyboard: [Fortitude60] LED fix and Serial improvement (#3982)
* arrangement Underglow

* modified serial function references from helix

* Remove defines (ws2812_*REG)
2018-09-27 18:06:19 -07:00
Daniel Shields 8b2591c707 Keymap: Clean-up of dshields keymaps. (#3983) 2018-09-27 11:47:26 -07:00
Wilba6582 13e166d9c4 RAMA U80-A, wilba.tech WT60-A, WT65-A, WT80-A, IS31FL3736 driver (#3925)
* Initial commit of RAMA U80-A

* Initial commit of RAMA U80-A

* Moved IS31FL3736 driver, minor cleanups

* Superficial stuff

* Review changes

* Refactored to use common code.
2018-09-27 10:40:44 -04:00
James Laird-Wah f70f45ee67 RGB Matrix refactoring to open up for new drivers (#3913)
* rgb_matrix: use a driver ops struct

This is intended to avoid #ifdef proliferation on adding more drivers,
eg. model01, which use different architectures.

* rgb_matrix: document driver struct members

* rgb_matrix: remove unused LED testing code

* rgb_matrix: don't build into IS31x drivers unless being used

* rgb_matrix: refactor make config options

This ensures that the necessary files are included for any custom
RGB_MATRIX_ENABLE value, without having to add entries here for specific
boards. This particularly affects model01 because its controller is
integrated and won't be used anywhere else, so it's preferable not to
put it in common_features.mk.

This now validates the value of RGB_MATRIX_ENABLE.

It was necessary to fix an error in ergodox_ez rules.mk using the wrong
comment separator, yielding an invalid value.

* IS31x drivers: don't write the control registers all the time

This is only needed when they are changed. This is done in init() and
board- or keymap-specific code is free to make further changes.

* rgb_matrix: move structs from chip drivers to rgb_matrix_drivers.c

This approach is specific to the rgb_matrix functionality, so keep it
neatly separated from the raw chip drivers.
2018-09-27 10:40:18 -04:00
MechMerlin 12ad59f99d Keyboard: Treasure Macropad (#3988)
* port macropad over to qmk

* add bootloader size
2018-09-26 22:09:05 -07:00
mtdjr 96648a133d Keymap: mtdjr userspace changes and Nyquist keymap addition (#3940)
* holefully correct error in mtdjr userspace for layer_state_set_user

* return state and wrap rgb actions in their own conditional

* mtdjr nyquist and userspace updates

* mtdjr updates as requested
2018-09-26 12:23:30 -07:00
MechMerlin dbdbbbd5c9 Keyboard: Refactor XMMX keyboard to XMMX and Toad (#3955)
* pull out toad keyboard and get it compiling

* refactor xmmx

* use the correct LAYOUT macros

* move LED code out to toad.c file

* move LED code out to xmmx.c file

* adjust for correct number of columns and pins used

* remove led set user
2018-09-26 12:17:54 -07:00
Kosuke Adachi e2eee47e20 Keyboard: Crkbd stands for Corne Keyboard, not helidox (#3985) 2018-09-26 11:13:19 -07:00
Konstantin Đorđević 722f06ff8c Keymap: Update whitefox/konstantin keymap (#3980)
* Rename constexpr keymap folder to konstantin

* Replace numpad comma with Unicode comma

* Rename tap dance constants

* Move record->event.pressed check into switch

* Use RShift as a dedicated Fn key
2018-09-26 11:08:56 -07:00
KOBAYASHI Daisuke f3551747b3 Keymap: Add Koba's keymap for Ergo42. (#3965)
* Keymap: Add Koba's keymap for Ergo42.

* Fix: Remove unnecessary #define.

* Fix: Rename readme files to lowercase.
2018-09-26 11:04:31 -07:00
Savio Fernandes 7f1268f35e Keymap: add artbycrunk iris layout (#3964)
* version 1

* version 1.1

* version 1.2
2018-09-26 11:03:42 -07:00
holtenc 627ee050b4 Keyboard: Remove BACKLIGHT BREATHING as default config for Prime Keyboards (#3979)
* initial commit

* Update readme.md

* Update keymap.c

added comment for description of function to control LED as layer indicator

* corrected formatting as requested.

* format for configurator

* corrected info.json to propertly reflect layout in Configurator

* updated layouts to reflect physical keyboard

* comment out BACKLIGHT BREATHING in config.h
2018-09-25 15:48:01 -07:00
wanleg 223081bf2b Keymap: 4x4 pro micro (#3976)
* 4x4 - pro micro version

* pro-micro setup on 4x4

* tap dance LCTL/RESET key

* remove test file

* more research

* revert a couple un-intended edits

* opt_defs version of adding custom rules.mk variables

* cleanup

* cleanup

* cleanup

* cleanup

* layout edits

* layout edits

* keymap edit

* numpad layout change

* got tap dance layer-switch working

* keymap changes

* temporary revert

* restore previous settings

* misc fixes

* layer order change

* fix layout matrix

* Update tapdances.c
2018-09-25 15:39:41 -07:00
Alexander Kagno 61f9541066 Keymap: Velocikey implemented at userspace, readme is more helpful (#3974)
* deleting arkag branch, forcibly moving changes over to master

* fade_color function added, not tested

* added half functions some stuff

* surround_type function implemented and working.

* added flashing function and removed fading, flashing supports infinite flashing along with controlled number flashes

* added a fade state machine and functionality

* build optimizations, changed fade to bounce between bounds rather than roll over, added a HALMAK layout

* changes to sleep breath function, changed how I will switch to HALMAK

* support for halmak added

* support for activity detection added, condensed fading and flashing state machines, removed support for HALMAK and COLEMAK because arkag is stupid

* changed sleep and inactive behaviors, now the color shifting reverses on state change, yay! save_color and reset_color are made to enable layer color changing to look cooler.

* reformatted some if statements in state detection

* changes to force fade to pause on boot, or plug in.

* Attempting to move over to userspace, pushing to repository for help

* userspace stuff....

* userspace stuff....

* layout changes, working userspace,

Removed left side shift and replaced it with a MT() for LSFT and SPC. Userspace seems to be working properly now! HURRAY

* Layout change

Removed space/shift and reset modifiers to what they were originally. Added homerow modifiers.

* Removed excessive tabs in files

* Moved mods on homerow around...

* changes recommended by @drashna

* removed homerow mods, more flashy lighting!

* changed delays for lighting.

* velocikey code retro fit into userspace to match typing speed

currently "working" but isn't as reactive as I want.

* Readme and other documentation hidden throughout code

* Added a pretty picture

* pretty picture actually added

* More readme updates

* Velocikey now working inside my userspace!

* Changed repo macro and fixed readme

* Removed media layer, moved media control to LAZY layer

* fixed more merge issues when I had to merge...
2018-09-25 15:38:04 -07:00
johanntang 118e948e35 Keyboard: added mehkee96 support -JT (#3957)
* added mehkee96 support -JT

* making requested changes -JT

* fixes -jt

* fixed info.json -JT

* tidy up info.json comments from noroadsleft -JT
2018-09-25 15:23:31 -07:00
takashi kono 6347a654de Keymap: Ergo42: biacco-winjp (#3935)
* create: biacco jis keymap for windows for Ergo42

* fix: biacco-winjp: change #ifndef to #pragma once.

* fix: following: 3935#pullrequestreview-157941685
2018-09-25 15:18:11 -07:00
BenRLewis 9dc19fdb6d Keymap: FollowingGhosts v60r layout (#3926)
* First version of FollowingGhosts' custom layout

* Added copyright etc.

* Fixed readme and added space cadet shift

* Moved from RGB to HSV, updated readme and added media keys

* Updated pragma

* Added play/pause and updated config

* Added pragma back
2018-09-25 15:11:11 -07:00
Ethan Madden a54f09d4f3 Keymap: jetpacktuxedo planck keymap (#3896)
* added my planck keymap

based on a blend of my minivan keymap and the planck default keymap.

* moved pipe to better match minivan keymap

* updated as per @drashna

also moved my keymap a bit after adding the quad encoder and underglow
(which doesn't even work on arm right now lol)

* a few smaller tweaks
2018-09-25 15:06:48 -07:00
MechMerlin b7e25f9ec4 Keyboard: DZ60 Bug: layout_directional is shifted to the left by one (#3978)
* layout_directional is shifted to the left by one

* forgot to adjust the physical layout
2018-09-24 20:39:17 -07:00
noroadsleft 9012f4c2e0 Keyboard: Crkbd: Configurator support and readme formatting (#3971) 2018-09-23 20:50:08 -07:00
noroadsleft 07d317ab88 Keyboard: Crkbd: move I2C and Serial defines to keyboard's config.h (#3970)
* Crkbd: move I2C and Serial defines to keyboard's config.h

per @drashna on Discord

* Crkbd: remove misleading comment re: I2C and Serial

USE_I2C and USE_SERIAL are usually a "one or the other"-type deal, but this keyboard uses both.
2018-09-23 18:47:43 -07:00
listofoptions ce057ea474 Keyboard: HP 46010A converter (#3967)
* funged git history, restarting

* tested and working (message typed on this)

* updated documentation to include wiring directions

* formatting

* updated matrix and default layout a bit

* getting ready for merge into main repo

* getting ready for merge into main repo v2

* cleaning

* cleaning repo of extranious files

* updated documentation
2018-09-23 18:46:53 -07:00
MechMerlin 57ec309d3e Keyboard: Panc60 (#3961)
* initial check in

* figure out the column pins

* temporary keymap

* guess the row pins

* fix matrix.c compilation errors

* use the LAYOUT_60_hhkb macro and tweak the keymap a little bit

* update readme

* Put my name everywhere

* Add QMK Configurator support

* figured out the row pins

* update readme to have reset info

* Fill in some blanks that are documentation related

* Update matrix.c

* add kb functions

* forego kbfirmware labeling

* add arrows and caps lock to function layer.

* add a LAYOUT_60 and LAYOUT_all macro

* missed a comma

* add configurator support for the two new LAYOUT macros

* Jack helped me with a new custom matrix

* add 60_ansi into rules.mk
2018-09-23 13:48:48 -07:00
Alexander Kagno 35e76539e7 Keymap: Arkag Userspace and MechMini2 Layout (#3958)
* deleting arkag branch, forcibly moving changes over to master

* fade_color function added, not tested

* added half functions some stuff

* surround_type function implemented and working.

* added flashing function and removed fading, flashing supports infinite flashing along with controlled number flashes

* added a fade state machine and functionality

* build optimizations, changed fade to bounce between bounds rather than roll over, added a HALMAK layout

* changes to sleep breath function, changed how I will switch to HALMAK

* support for halmak added

* support for activity detection added, condensed fading and flashing state machines, removed support for HALMAK and COLEMAK because arkag is stupid

* changed sleep and inactive behaviors, now the color shifting reverses on state change, yay! save_color and reset_color are made to enable layer color changing to look cooler.

* reformatted some if statements in state detection

* changes to force fade to pause on boot, or plug in.

* Attempting to move over to userspace, pushing to repository for help

* userspace stuff....

* userspace stuff....

* layout changes, working userspace,

Removed left side shift and replaced it with a MT() for LSFT and SPC. Userspace seems to be working properly now! HURRAY

* Layout change

Removed space/shift and reset modifiers to what they were originally. Added homerow modifiers.

* Removed excessive tabs in files

* Moved mods on homerow around...

* changes recommended by @drashna
2018-09-22 08:43:28 -07:00
Danny 747cf78b5d Add nano keymap for modding Spooka light (#3953) 2018-09-20 15:37:18 -07:00
Jumail Mundekkat 99c1c5bfe9 Keyboard: Added Prime_L, Prime_O and Prime_M, moved Prime_R into primekb folder (#3907)
* Added template copies for prime_l
Added first set of files for prime_m and prime_o
Temporarily storing kbfirmware dumps in tmp

* Completed base for prime_m, prime_o and prime_l
Moved prime_r into primekb folder

* Added in QMK Configurator layout files for new PrimeKB keyboards
Slight modification to layout header files
Added my name to licensing

* Updated primekb readmes

* Removed temporary working files

* Updated default keymap for Prime_O

* Added link to Newbs Guide in prime_r readme
2018-09-20 15:36:11 -07:00
Danny cfdc23bbae Keyboard: Add Quefrency 65 support in configurator (#3950)
* Fix Quefrency configurator layout to support new key added

* Add configurator support for Quefrency 65
2018-09-20 08:00:18 -07:00
Simon Dagfinrud 4c22e92ce8 Keymap: Fix tada68:iso-nor to match latest ISO_layout (#3946) 2018-09-19 16:34:08 -07:00
Daniel Shields 6cab514036 Keymap: Initial commit of dshields keymap for the model01 keyboard. (#3942) 2018-09-19 16:33:00 -07:00
MechMerlin 5b4bcfa7f2 Keyboard: Move Bathroom Epiphany boards into its own directory (#3936)
* make bpiphany directory with simple readme file

* move unloved_bastard to bpiphany directory

* move frosty_flake to bpiphany directory

* move pegasushoof to bpiphany directory

* move tiger_lily to bpiphany directory

* add a little more info to readme

* move kitten_paw to bpiphany directory

* update make instructions

* update intro text

* add missing routines to matrix.c of unloved_bastard

* add missing routines
2018-09-19 16:25:58 -07:00
Rys Sommefeldt 14be5258a6 Keymap: rys Tada68 ISO UK layout (#3934)
* rys Tada68 ISO UK layout

* Bring _FL more in line with my favoute WhiteFox layout

* Whoops, fix - to _

* remove empty config.h

* Remove legacy block
2018-09-19 16:23:23 -07:00
holtenc 2bdeccd7ba Keyboard: Add Prime_EXL prototype to 'handwired' (#3932)
* initial commit

* Update readme.md

* Update keymap.c

added comment for description of function to control LED as layer indicator

* corrected formatting as requested.

* format for configurator

* corrected info.json to propertly reflect layout in Configurator

* updated layouts to reflect physical keyboard
2018-09-19 16:20:36 -07:00
itsdrdick 77433b1a31 Keyboard: Add evil80 keyboard (#3921)
* Add evil80 keyboard

* Delete rules.mk

* Update config.h

* Update keymap.c

* Update keymap.c
2018-09-19 16:16:18 -07:00
Joe Wasson c23233f41a Keymap: Talljoe's keymap for oddball keyboards (#3910)
* Create layout for JD45

* Tweak layout to better support JD45 and add more tap dancing.

* Add Maltron and tweak layout for 40% enter compatibility.

* Switch back to `BL_TOGGLE` for backlight.

* More tweaks

* Rename talljoe_gherkin to talljoe-gherkin

* Make NAV layer tab C_S_T also.

* Add missing RESET key.

* Add Talljoe layout for minivan.

* MTI is not for me

* Tweak keymap.

* Add talljoe keymap to Atreus.

* Minor tweaks.

* Fix talljoe keymaps to work with new Zeal60 commit.
2018-09-19 16:13:58 -07:00
Simon Dagfinrud 71fe973190 Keyboard: Add ISO-NOR keymap for TADA68 (#3944) 2018-09-19 11:42:58 -07:00
skullydazed 92f67719cc Keyboard: Fix the LAYOUT_iso macro for tada68 (#3943) 2018-09-19 11:41:40 -07:00
nachie 23da333ae3 Keyboard: Added support for GSKT-00 (#3911)
* Added QMK support for GSKT-00, PaladinSplit, PaladinTKL and PaladinPad pcbs

* Remove the paladin boards from this PR

* Changed gskt00 as per review comments. Added two new default layouts, 60_ansi_tsangan and 60_iso_tsangan

* Fix the layouts/default/60_iso_tsangan/layout.json file

* Removed ? from rules.mk, removed unused fn_actions from keymaps. Changed the 60_iso_tsangan to work correctly

* Removed PREVENT_STUCK_MODIFIERS
2018-09-17 16:00:40 -07:00
James Laird-Wah 03b8ce206d Keyboard: add Keyboardio Model 01 (#3900)
* Keyboard: add Keyboardio Model01

This port implements key scanning and everything in their default
keymap.

It doesn't implement mouse warping; QMK can't do that (yet).

LED control is mostly not implemented. The ability to set all LEDs is
included because they can get stuck on coming from the bootloader
otherwise. Single LED control is also implemented for numpad indication.
The scanners also support batch LED transfer which is what you'd need if
you wanted to do fast effects. Gamma correction is also not implemented,
but is present in the original firmware. The necessary info for further
implementation is in the KeyboardioScanner module for Kaleidoscope.

To install on your keyboard:

    make model01:avrdude

When prompted, hold the "prog" key on the keyboard to put it into
programming mode. This can also be achieved by holding the "prog" key
while plugging in the keyboard. This works even if the firmware is
corrupt or missing.

Hot plugging the halves seems to work fine, but there is no explicit
support for eg. making sure the matrix scan rate is reconfigured.

* model01: clean up includes and include guards

Uses #pragma once everywhere.

* model01: split LED and matrix code

This makes space if someone wants to implement better LED support
later on, the keyboard is a lot more capable than the current code.

* model01: separate I2C timeouts for matrix vs. LED

If the scanners have no data they don't ACK reads and just time out.
So we want a pretty short timeout to keep scan rates high.

Meanwhile the LED transfers might take longer - I don't know though,
so here we are conservative.

* model01: implement better LED control

- gamma correction from the manufacturer's firmware
- suitable delays to allow back to back LED writes
    - this is fast enough to write the whole keyboard without noticeable
    delay, in my experience
- minor bug fix: RHS Fn key was not addressable

* model01: add license to wire-protocol-constants.h

* model01: replace gamma LUT

The original was of unclear license origin. This one is functionally
identical and includes a generator should people wish to adjust it.

* model01: use the already-present CIE1931 lightness curve

...rather than baking in another gamma curve.

It's said that CIE1931 is the right thing to be using rather than gamma.
OK. Let it be so.

* model01: call matrix_init_user() from matrix_init_kb()

* model01: remove inapplicable config options from rules.mk

* model01: readme.md: update build environment links
2018-09-17 15:49:20 -07:00
Merlin04 ec64be6622 Keyboard: Fix pin numbers for Fractal keyboard (#3743)
* Added support for the Fractal keyboard

* Try to fix the issue

* Add support for the Fractal keyboard.

* Fix errors with files

* Update config.h
2018-09-17 15:18:19 -07:00
Olivier Poitrey cb8d352cb3 Keymap: dz60/macos_arrow: fix rev3 broken media layer (#3928)
Last rev broke the media layer because of a typo in layer definition.
Switched to an enum to avoid similar future typos.
2018-09-17 15:10:00 -07:00
Pascal Greilich 3f680a93eb Keyboard: Tada68 readme img (#3918)
* a new planck layout

* layout images

* layout images 2

* typo

* update include following PR comment

* updates following PR commments 2

* updates following PR comments

* layout images

* better layout names
2018-09-17 14:09:41 -07:00
Anthony Wharton ed2dd3b59c Keyboard: Add YMD96 instructions for Linux + Backlight Fixes (#3908)
* Add flashing instructions for Linux

* Make device/manufacturer name consistent for ymd96

* Disable command mode by default for YMD96

* Add function call to fix backlight for YMD96

* Add personal YMD96 config

* Replace include with QMK macro

* Move KEYMAP macro to keymap-level folder

* Move custom KEYMAP macro to global LAYOUT_iso macro

* Change transparent keymappings to global definition

* Remove unecessary import and change to pragma once

 - (instead of repeated ifdef)

* Remove global keymap/layout definition
2018-09-17 13:55:49 -07:00
wanleg fe3bfd91c1 Keymap: Big switch config (#3904)
* bigswitch keymap

* bigswitch keymap

* bigswitch keymap

* bigswitch keymap

* recommended edits made

* forgot to revert this change with the others
2018-09-17 13:41:59 -07:00
Joe Wasson 743449472e Make PREVENT_STUCK_MODIFIERS the default (#3107)
* Remove chording as it is not documented, not used, and needs work.

* Make Leader Key an optional feature.

* Switch from `PREVENT_STUCK_MODIFIERS` to `STRICT_LAYER_RELEASE`

* Remove `#define PREVENT_STUCK_MODIFIERS` from keymaps.
2018-09-17 13:48:02 -04:00
omkbd b65e214375 Keyboard: add ergodash mini keyboard (#3901)
* add ergodash mini

add ergodash mini (4rows version)
fix keymap and readme

* fix

replace include guard
remove includes

* fix audio
2018-09-15 10:57:46 -07:00
Olivier Poitrey 6bf2c07715 Keymap: dz60/macos_arrow: rev3 (#3909)
* Arrow keys are now arranged on hjkl (vi style)
* The escape key is moved on capslock, shared with func layer switch
* The grave key is now dedicated (not shared with escape)
* Add a new numpad layer that can be activated with the spacebar
* Fix layout mismatch between layers
* Use bult-in underscore KC_TRNS alias
2018-09-15 10:50:38 -07:00
Pascal Greilich 232ef75783 Keymap: A new alternative layout for planck (#3894)
* a new planck layout

* layout images

* layout images 2

* typo

* update include following PR comment

* updates following PR commments 2

* updates following PR comments
2018-09-15 10:15:36 -07:00
Naoki Katahira 9712501bf3 Keyboard: Add Lily58 Keyboard (#3893)
* add Lily58

* file fix
2018-09-15 10:14:39 -07:00
Graham P Heath db35065e14 Keymap: Grahampheath: telophase fix and keymaps (#3888)
* add my config

* fix backlight, clean up that code

* group background code, restore static var

* qwerty is supposed to be in the middle

* wrap layer change backlight in ifdef

* backlight levels and some more 'emojis'.

* Restructure to make it possible to press cmd ent on the right side of the board with one hand.

* Expose the period through the number layer. Add Hyper keys to mouse layer

* reduce mouse speed

* add a : -P  key

* Thumbs up and down, remove some keys that are duplicated via function keys, clean up

* fix build issues

* add various emoji

* duplicate default Meira keymaps

* Miera updates

* add documented but unmapped emoji

* Sound for the Meira, was stumped by a file size! Thanks drashna!

* add docs

* docs

* revert lib changes...

* clean up

* clean up

* remove make file

* Fixes missing key

* clean up

* add my lets split

* add more emoji

* add the telophase board (unofficially, I guess...)

* add missing files

* add/reset files

* Review feedback implementation: Not needed. Add #define FLIP_HALF to your config.h file instead.

* Review feedback implementation: All of these includes should be replaced with #include QMK_KEYBOARD_H.

* Review feedback implementation: [FAILING] You may want to use LAYOUT_ortho_4x12 instead, and move this to /layouts/community/ortho_4x12/ instead. That way, you can use the same keymap for all of the boards.

* clean up

* add a key for command tilde (osx loves it)

* at least its building again

* remove adjusts and migrate layer switching to MO(_LAYER)

* update the telophase readme

* update the telophase readme

* grahampheaths -> grahampheath

* ONEHAND_ENABLE -> SWAP_HANDS_ENABLE

* convert lets split to use ortho_4x12

* Move lets split keyboard layout into community/ortho_4x12

* make telophase use LAYOUT()

* I did it?!

* Add clap and grin

* swap tabs and back and forward

* whitespace

* Add ellipsis and thanks emoji

* Move flip_half to telophase config (conflicts with lets split layout)

* Use #pragma once instead of config_user_h

* remove unused stuff
2018-09-15 10:12:11 -07:00
Wilba6582 48a992f1c0 Zeal60/Zeal65/M60-A implementation (#3879)
* Initial version of zeal60

* WIP

* Fixes issue #900

* Adding RGB underglow functionality.
Fixed a compile-time conflict caused by enabling RGB underglow functionality.

* Refactor RPC protocol

* Fix last merge

* README for RGB underglow updated.

* Additional README changes.

* Adding RGBW strip software-based current-limiting functionality.

* RGBW current-limiting functionality should be handled by RGBSTRIP_MAX_CURRENT_PER_LIGHT instead.

* Updated README to reflect implementation of built-in current limiting.

* Keymap readability improvements.

* Minor keymap improvements.

* Fixed LED driver init sequence, formatting

* Dimming implementation tested, working.

* Stab LEDs synced with spacebar hits in effects.

* RGB underglow tested and functional. Simplified README for RGB underglow.

* Undid accidental file deletion from previous merge conflict. Safer values for RGB underglow.

* Improved arrow key positions in keymap.

* Added functionality to correct uneven RGB underglow. Refactored related code.

* Reverted to safer values for underglow.

* Changes for v0.3

* Custom LED brightness scaling will take place after current adjustment in order to avoid being overridden.

* Create keymap.c

Added split backspace and split shift to ISO layout

* Create config.h

Turned on LEDs for new layout

* Fixed bug where left spacebar stabilizer LED (LC06) would adopt color of row above.

* Added hhkb_wilba keymap

* Update keymap.c

* Update keymap.c

* Update keymap.c

* Added indicators, full param setting via host

* Added "mousekey" layout

* Added Zeal65 support, factory test mode

* Keycode safe range changed, caused bugs

* Bumped EEPROM version due to change in QMK keycodes

* Disable HHKB "blocked" LEDs if KC_NO in keymap

* Added "disable_hhkb_blocker_leds"

* Required overridden function for keymaps in EEPROM

* Added polar coordinate mapping, effect speed

* Force Raw HID interface number to 1 always

* Fixed last merge from master

* Added effect speed to default keymaps

* add BACKLIGHT_ prefix to vars

* add BACKLIGHT_ prefix to vars

* Keymap speed effect; keymap improvements/fixes
Readme updated to match changes

* Refactored to use common IS31FL3731/I2C drivers

* Fixed make rules, backlight disabled feature

* Make split rightshift default for Zeal65

* Added M60-A as a "version" of Zeal60.

* Renamed IS31FL3731 driver functions

* Fix suspend_wakeup_init_kb() being defined twice

* First pass refactor dynamic keymaps

* Updated to changed I2C and ISSI drivers

* Refactor zeal_color.* usage to quantum/color.*

* Updated Zeal65, fixed dynamic_keymap

* Major refactoring of Zeal60 backlight and API

* Lots of little cleanups

* Added readme.md

* Added readme.md

* Added LAYOUT_60*() macros, refactored and cleaned up default keymaps

* Fix compile error in suspend.c

* Added Zeal65 LAYOUT macros, info.json

* Added rama/m60_a, deleted zeal60/keymaps/m60_a

* Fixed rama/m60_a/keymaps/proto

* Fixed compilation error for suspend.c

* Requested changes for PR

* Fixed readme.md images

* Another readme.md fix

* Added drashna's requested changes
2018-09-13 14:37:13 -04:00
MechMerlin ce122c4981 Keyboard: Shuffle keyboards into thevankeyboards directory (#3895)
* move tv44 to thevankeyboards directory

* move bananasplit to thevankeyboards

* move roadkit to thevankeyboards directory

* add a basic readme

* update readmes to correct the make instructions and add more help text

* rename tv44 to minivan as per Jack's suggestions

* update readme

* rename tv44 to minivan

* update tv44 to minivan

* change includes for tv44 to minivan

* remove extra includes
2018-09-13 09:40:43 -07:00
MechMerlin cd3518b802 Keyboard: Reorganize Alf keyboards into Alf Directory (#3892)
* rename alf_x2 to alf

* rename to x2

* rename dependencies

* Fix readme

* moved x2 into alf directory

* update readme for make instructions

* move dc60 to alf directory

* update dc60 readme for make instructions

* change readme txt as per noroadsleft PR comment
2018-09-13 09:21:02 -07:00
blindassassin111 7ff4faf3be Keyboard: Fixing Omnikey lock light issue (#3891) 2018-09-13 09:19:37 -07:00
patrickmt b8a0d3de3d Keyboard: ALT keymap update and LED driver brightness mismatch fix (#3890)
* ALT keymap update

Added additional End key on layer 1 to match key cap

* LED driver update addressing PR #3871

Update sync between IS31FL3733 drivers is causing varying behavior in keyboards including brightness mismatch and slight flicker at very low rgb values. Visually, disabling sync is not noticeable. Ref PR #3871 by guarnacciaa.
2018-09-13 09:17:26 -07:00
Stephen Tudor 132c44bab1 Keymap: Fix Dvorak mapping for left/right brace (#3889) 2018-09-13 09:16:39 -07:00
lucwastiaux 87faf55b01 Keymap: Cleanups on the ergodox EZ / atreus dvorak 42 key layouts (#3887)
* add SCREEN_NAV layer for copy/pasting within screen

* working readreg/paste macros

* working read reg / paste macros

* write log and tran patterns, and expand

* add ls -la shortcut, add tab on combined layer

* put delete word on the right pinky key on shell_nav layer

* add TAB on the right side, add reset key

* added Cloud9 macros

* add cloud9 shortcuts to atreus layout

* added BROWSER_CONTROL layer

* finalized browser control layer

* adding comment

* add browser control layer to atreus

* add flashing command line

* remove the tab on combined layer

* remove the tomouse

* remove mouse layer, change log/tran expand patterns, cleanups

* add dumptlog macro

* add "delete to home" shortcut

* fix conflict

* remove unneeded mouse layer

* add meh shortcuts on the browser_control layer

* add/modify some macros

* explain the various layers

* putty paste is right mouse button
2018-09-13 09:12:03 -07:00
Erovia f1612b7fa1 Keymap: Add Contra keymap with QWERTY and COLEMAK Mod-DH (#3883)
* Add own personal Contra layout

* Enable auto-shifting

* Enable tap dancing and implement Space Cadet-like shift with LSHIFT and ENTER

* Implement Colemak Mod-DH layout, clean up Adjust layer

* Implement keyboard and keymap refactor

More info: https://github.com/qmk/qmk_firmware/pull/3191

* Update the readme.md and keymap.c files for Colemak

* Add include guard, make layout description cleaner
2018-09-13 09:07:21 -07:00
noroadsleft 5dd4b2af53 Keyboard: Updated info.json for Duck Jetfire (#3866)
* Updated info.json for Duck Jetfire

Generated a new info.json file. @mechmerlin asked my help in debugging this file. Firmware works as expected if built from source, but not if built from the Configurator.

* Corrected the position of the arrow keys in LAYOUT_all
2018-09-13 09:04:55 -07:00
Jeremy Herve e11e4a91ac Keymap: Redox: add a new Colemak keymap, macOS oriented. (#3861)
* Add my own keymap to the list of available Redox keymaps.

This keymap is a Colemak keymap, and is meant to be used on Mac OS.
More information can be found in the readme.

* Fix "macOS" typo and remove mention of the license.

This directory inherits the project's license.

* Add missing custom keycode.

* Address feedback from PR review

- Remove deprecated code
- Remove RGB logic since it is overwritten by code running later.
2018-09-10 07:39:05 -07:00
sK0pe 63852e7a68 Keymap: Adjusted keymaps for standardisation (#3874)
* Added HHKB with 7U space bar
There are backlight changers on the function Z, X and C, mediat controls
have been removed.

* Fixed the default layout and added a keymap
GUI and ALT keys were swapped.
My own keymap which adds calculator, removes power, removes eject.

* Adjusted naming convention of hhkb layout layer

Fixed as per required from code review.

* Updated for qmk configurator

I didn't realise that there was a new standardisation across all the keymaps to accommodate the configurator.

Hopefully fixed now.
2018-09-09 19:47:14 -07:00
MechMerlin fa1e674bbb 65% and 68 key community layouts (#3872)
* rename 68_ansi layout to 65_ansi layout

* more renames and readme change

* add company names

* add community layouts for 68_ansi

* add 68_ansi support for mf68 type boards

* update readme
2018-09-09 19:45:59 -07:00
Damien 7b8e5d4555 Keymap: Updated my FC660C config (#3870)
* - Fixed DK60 version in config.h

* - Updated dk60 readme with new QMK rules

* - Fixed wording in readme

* Added dbroqua layout for DZ60

I've also updated dz60.h to add "true HHKD" keymap definition (6U
spacebar).

With the default HHKB definition r_alt was not mapped and when I pressed
r_menu it was r_alt.

Regards

* Updated dbroqua layout for HHKB keyboard

Added default configuration and alternate (swap gui/alt keys).

Save user choice in keyboard memory (like plank, thanks for this
feature!).

* Added dbroqua layout for Iris keyboard

* Updated layout and fixed includes

* Added personal layout for FC660C

* Inverted ESC & GRV
2018-09-09 19:43:45 -07:00
noroadsleft 38c916a368 Keyboard: Updated readmes for 1upkeyboards (#3864)
Corrected the make examples by adding the parent directory.

Updated the QMK Docs links for the build environment setup and the make instructions. Added links to the Newbs Guide.
2018-09-09 19:33:30 -07:00
Yasuhiro Shimizu 93b5c98fbb Keymap: remove unnecessary readme from my helix keymap (#3860) 2018-09-09 19:23:24 -07:00
patrickmt e68c8f2ac6 Keyboard: CTRL LED scan code mapping fix (#3867)
* CTRL LED scan code mapping fix

Fixed scan codes to properly align with key wiring

* Update scan codes for caps and scroll lock lighting

Update scan codes for caps and scroll lock lighting according to previous scan code mapping update
2018-09-07 14:22:12 -07:00
Danny 7f7c278c3e Keyboard: Add support for Quefrency 65% right half (#3865)
* Add support for Quefrency 65% right half

* Add support for additional thumb key on Rev. 1.1 PCB
2018-09-06 12:49:13 -07:00
TheOneTrueTrench e0c9f1d9b9 Keymap: Added new Marianas keymap for DZ60 (#3858)
* Added new Marianas keymap for DZ60

* Included suggestions to remove unnecessary line regarding MODS_CTRL_MASK, and added names for layers.

Added enum to define names for layers, and removed unused #DEFINE
2018-09-06 08:08:16 -07:00
Matthew Treadwell c3b3f33c6a Keymap: Update personal keymap (#3855)
* Updated personal keymap

* simplified keymap based on suggestions
2018-09-05 16:39:00 -07:00
Michael F. Lamb e72d07c22b Keymap: mitosis/datagrok: bug fix (#3854)
I don't know how this slipped past the test suite in the last merge, but
this syntax I tried is invalid and doesn't compile. Fixed.
2018-09-05 13:52:29 -07:00
Luke Stanley 155850187d Keyboard: Add IBM 122-key Terminal keyboard and my Ergodox EZ keymap (Programmer's Dvorak + Gaming/QWERTY layer) (#3850)
* added my lukaus keymap (programmers dvorak with QWERTY, function, and mouse/keypad layers)

* updated ergodox_ez keymap and initial commit for IBM Model M 122 key

* added my lukaus keymap (programmers dvorak with QWERTY, function, and mouse/keypad layers)

* updated ergodox_ez keymap and initial commit for IBM Model M 122 key

* Add keyboard information and separated my custom layout from the default

* Add readme to Lukaus' Ergodox EZ keymap

* added my lukaus keymap (programmers dvorak with QWERTY, function, and mouse/keypad layers)

* updated ergodox_ez keymap and initial commit for IBM Model M 122 key

* added my lukaus keymap (programmers dvorak with QWERTY, function, and mouse/keypad layers)

* updated ergodox_ez keymap and initial commit for IBM Model M 122 key

* Add keyboard information and separated my custom layout from the default

* Add readme to Lukaus' Ergodox EZ keymap

* added my lukaus keymap (programmers dvorak with QWERTY, function, and mouse/keypad layers)

* updated ergodox_ez keymap and initial commit for IBM Model M 122 key

* Fix merge conflict again?

* updated ergodox_ez keymap and initial commit for IBM Model M 122 key

* Add keyboard information and separated my custom layout from the default

* Add readme to Lukaus' Ergodox EZ keymap

* added my lukaus keymap (programmers dvorak with QWERTY, function, and mouse/keypad layers)

* added my lukaus keymap (programmers dvorak with QWERTY, function, and mouse/keypad layers)

* updated ergodox_ez keymap and initial commit for IBM Model M 122 key

* updated ergodox_ez keymap and initial commit for IBM Model M 122 key

* Add keyboard information and separated my custom layout from the default

* update keymap

* Update rules.mk to remove redundant commented line

* Fix missing key on default layout for IBM Model M 122 key

* Fix issues identified by drashna and noroadsleft

* Update readme for IBM 122 key
2018-09-05 13:45:19 -07:00
antonio miranda 2b09900bdc Keymap: Add am keymap (#3843)
* Add am keymap

* Add configuration to play nice with stuck modifiers

This is in particular useful with emacs since its easy to get ctrl stuck

* Deactivate mouse keys and backlight

* Add control/esc and shift/enter taps

* Remove DVORAK and PLOVER

I won't be using this soon, so getting some free space

* Raiser and Lower ideas from jeebak

* Add cursor and mouse layers

* Enable mouse keys

* Switch underscore with minus

* Disable audio and fix warnings

* Update to the upstream changes

* VIM line motion symbols on the raise layer

* Enable sound and freeup some media keys on layers

* Fix whitespace on keymap

* Code review changes

* Improve keymap documentation

* Improve keymap to match to the default one

* Restore DEFAULT_FOLDER to the default value

* Fix config.h unescaped line
2018-09-05 13:41:27 -07:00
patrickmt e5465e1c57 CTRL and ALT updates
Added support to enter bootloader from software (bootloader version must be newer than "v2.18Jun 22 2018 17:28:08" until workaround for older is created).
Updated CTRL and ALT keymaps for entering bootloader with Fn+b held for >500ms.
Added basic MacOS keymap for ALT.
USB sleep LED indicator now turns off after 1 second.
Slowed down debug LED code printing.
2018-09-05 11:14:31 -07:00
MechMerlin 1a907a1627 Keyboard: formatting changes for readme and enable bootmagic (#3851) 2018-09-04 13:29:58 -07:00
Michael F. Lamb 224b4dea98 mitosis:datagrok add layer select, more layouts (#3835)
* mitosis:datagrok: fix typo'd inconsistent brace arrangement

(thank you @cari66ean)

* mitosis:datagrok: add makefile argument MITOSIS_DATAGROK_SLOWUART

* mitosis:datagrok: return backspace to opposite space, use TT(), more

- move backspace back to its position opposite space
- move del to red+backspace
- move tab back to tap-leftshift
- move printscreen/scrolllock/pause to blue+left pinky column
- use TT() instead of MO() to stick a layer on if wanted
- indentation that my text editor wants
- default to no audio; i can enable it at compile time.

* mitosis:datagrok: modularize features, add default layer rotator key

* mitosis: add MITOSIS_DATAGROK_BOTTOMSPACE makefile argument

* mitosis:datagrok: README improvements; document new features

* mitosis:datagrok: dot. not "number pad dot." in numbers layer

* mitosis:datagrok remove unnecessary _user audio code

* mitosis:datagrok: return to MO() for red/blue, keep TT() for purple

in this way, the LED still updates quickly when red or blue is pressed,
but we can still lock the purple layer on for 10-key numpad operation
with red+tapping blue.

* mitosis:datagrok: add colemak and dvorak default layers

* mitosis:datagrok update readme re: available default layouts

* mitosis: remove unneeded code that was overriding led_set_user

also, add some comments

* mitosis:datagrok: updated led setting code for new layers

also, place into led_set_user where it belongs, not matrix_scan_user.

* mitosis:datagrok: update LEDs when setting the default layer

maybe this should go into default_layer_set?

* mitosis:datagrok update readme with new imgur links + other improvements

* mitosis:datagrok fix typo in image urls

* mitosis:datagrok remove useless #include (ty @drashna)

* mitosis:datagrok undo unnecessary change to quantum/quantum.h

i can put the extern float definition in my own keymap code. (ty @drashna)

* mitosis:datagrok move customized layout to my keymap

no need to modify keyboard-level mitosis.h. (ty @drashna)

* mitosis:datagrok update comment describing my led indicator logic

* datagrok:mitosis update readme to document LED indicator.
2018-09-04 08:55:31 -07:00
Emīls Delle 40718d2ca3 Keymap: Create ISO HHKB keymapping for GH60 (#3832)
* Create ISO HHKB keymapping for GH60

* Add media controls to Fn layer

* Use M(x) instead of F(x), add Copyright text
2018-09-04 08:52:52 -07:00
marksard 0533ea4a20 Keymap: Added a keymap like a JIS keyboard for JJ 40. (#3847) 2018-09-04 08:52:00 -07:00
Elisiano Petrini 714c82cc2e Keymap: Massdrop CTRL: add basic MacOS support (#3842)
* swap KC_LALT with KC_LGUI
* replace KC_RALT with KC_RGUI

This makes the keyboard more mac friendly out of the box (I'm aware this
that this could partially be done in software with the preferences but
hey, where's the fun in that).
2018-09-03 16:57:57 -07:00
Xyverz f48e20c1eb Keymap: Updates to xyverz keymaps (#3841)
* fixing ortho_4x12 configs

* Using upstream/master version instead

* Additions and Corrections

Corrected the Kinesis/Stapelberg's .c file to allow LEDs to work
Removed excess cruft from my Kinesis keymap to reflect this change
Other minor tweaks and adjustments to my ortho_4x12 and 5x12 layouts

* Rules for vitamins_included

Added a section to disable RGB underglow for the Let's Split
   Vitamins Included board.

* fixing ortho_4x12 configs

* Using upstream/master version instead

* Additions and Corrections

Corrected the Kinesis/Stapelberg's .c file to allow LEDs to work
Removed excess cruft from my Kinesis keymap to reflect this change
Other minor tweaks and adjustments to my ortho_4x12 and 5x12 layouts

* Creating my own userspace

* Added Rorschach keymap

* renamed userspace folder

I renamed my userspace folder since I'm not ready to start using
it just yet, and I want to get my keyboards programmed. This is
a temporary thing and will be fixed later as I get time.

* adding files in "new" folder

* Disabling LEDs on Pro Micro

* Modifications to Kinesis keymap

* More kinesis tweaks

* removed userspace from master

Created a new branch for my userspace stuff. I'll work on it there.

* Moved keymap to separate branch

Moved the Rorschach keymap I was working on to a separate branch
for development purposes. Not ready to push it up to upstream
master.
2018-09-03 16:57:06 -07:00
Christon DeWan 07fac2fbbf Keymap: xtonhasvim Levinson (#3837)
* pulled in levinson from staging.

* simplified trilayer handling

and some other linting that bit me in the last code review

* formatting
2018-09-03 16:50:11 -07:00
Christon DeWan dd29b64256 Keyboard: Add support for Diverge TM2 (#3829)
* pulling in diverge tm2 from staging branch

* cleaned up comments, docs, licenses

* refactored apparent grid to make 2u spacebars more obvious

* various delinting from noroadsleft review

* most of drashna's feedback responded to

- lots of lint swept
- used more modern tri-layer functions
- still need to adopt modern split support.

* switch to common split code. remove comment cruft

* tapping force hold makes LT way more usable for rapid ,  sequences
2018-09-03 16:35:27 -07:00
marksard 35efcc9f39 Keyboard: Improvement of crkbd communication functions (based on helix-keyboard) (#3798)
* improvement of crkbd communication functions (based on  helix-keyboard)

* Removed unnecessary code.

* Changed read restriction from #define to #pragma once.

* Changed from sizeof to defined size.

* moved lib folder to crkbdroot.
removed warning of ws2812.d
2018-09-03 16:34:16 -07:00
Damien 479bf78f3e Keymap: Added personal layout for FC660C (#3834)
* - Fixed DK60 version in config.h

* - Updated dk60 readme with new QMK rules

* - Fixed wording in readme

* Added dbroqua layout for DZ60

I've also updated dz60.h to add "true HHKD" keymap definition (6U
spacebar).

With the default HHKB definition r_alt was not mapped and when I pressed
r_menu it was r_alt.

Regards

* Updated dbroqua layout for HHKB keyboard

Added default configuration and alternate (swap gui/alt keys).

Save user choice in keyboard memory (like plank, thanks for this
feature!).

* Added dbroqua layout for Iris keyboard

* Updated layout and fixed includes

* Added personal layout for FC660C
2018-09-02 08:35:04 -07:00
Travis Carr 83df69488d Fix bad key label in ascii art (#3830)
Just fixed a key that was wrong in the Tokyo60 ASCII art
2018-09-02 08:29:13 -07:00
Pranav Singh 7e5a0def3a Keymap: new planck keymap (#3809)
* Add files via upload

* new planck keymap

* new planck keymap

* readme file updated

* deleted files from qmkfirmware folder

* re-added readme file to /qmk_firmware

* Fix main readme (hopefully)
2018-09-01 10:02:10 -07:00
Brad 0dcd60eeed Keymap: added keys to broswen keymap (#3825)
* added PGUP and PGDN to my keymap

* added VOLU VOLD and MUTE to keymap
2018-09-01 09:59:20 -07:00
Yasuhiro Shimizu ffc2dc0359 Keymap: add yshrsmz keymaps (#3770)
* add ergo42 keymap

* add helix keymap

* add keymap for lets_split

* Add keymap for nyquist

* update keymaps to address review comments

- remove unneeded include
- use `#pragma once`
2018-09-01 09:38:29 -07:00
Jon Olsson 8eb674b257 Keymap: Nojjan atreus (#3822)
* Add support for my Falbatech Atreus

This is currently the default Atreus keyboard layout, but I will
eventually customize it to match my Ergodox layout.

* Address review comments

* More review comments fixed

* More review comments fixed
2018-09-01 09:23:10 -07:00
Salt-Peanuts dedffb5f6d Keymap: Cleaned up Rorschach keymap (#3823) 2018-09-01 09:22:21 -07:00
patrickmt 2aa27f0c78 Keyboard: Rename alt67 to alt (#3824)
Renamed keyboard alt67 to alt and adjusted necessary files where alt67 appeared.
CTRL keymap fixed enum structure name.
usb2422 removed stray define no longer used.
2018-09-01 09:21:48 -07:00
Danny acc06a0848 Keyboard: Add Tragicforce 68 (#3807)
* Fork MF68 to Tragicforce 68

* Set pinouts and key layout

* Reformat keymap, update comments/notes

* Cleanup rules.mk
2018-08-31 11:13:55 -07:00
Christon DeWan 78ef62764b Keymap: I got my intern a KBParadise V60 Type R... (#3813)
* new mode for v60

xtonhasvim. still working on it:

- need to get indicator lights going
- and fun layer properly fleshed out.

* status lighting, proper fun layer

copied fun layout from keycaps to maximize accessibility

* enable power return

* support brightness adjustment for indicators

* refined brightness setting.

is saved in eeprom now

* readme. and fixed tilde

* more modifiers fall through fun layer

* i mean, this kinda works..

* much more reliable way of restoring lights

* responded to feedback
2018-08-31 08:28:14 -07:00
blindassassin111 4e45119796 Keyboard: Adding Z-150 PCB firmware (#3793)
* Adding the AT101 PCB firmware

* Fixed AT101 keymap error

* Fixing AT101 firmware

* More Fixes for AT101 firmware

* Rename AT101_Blackheart.c to at101_blackheart.c

* Rename AT101_Blackheart.h to at101_blackheart.h

* Update readme.md

* Renaming AT101 folder pt1

* Renaming AT101 folder pt2

* Fixing AT101 LED function name

* Redoing AT101 folder naming pt2

Last round had issues, should be the last rename.

* Fixing missing comma in at101_blackheart.h

* Adding Z-150 PCB

* Adding Z-150 readme file

* Fixing Z-150 firmware errors

* Fixing Z-150 layout error

* Fixing Z-150 firmware errors

* Fixing Z-150 Issues

Still unsure where the extra "\" is that through the error.

* Fixing more Z-150 errors

* Finally fixing the Z-150 error

* Fixed Z-150 layout naming

* Removed Z-150 layout fillers
2018-08-31 08:15:09 -07:00
Daniel Shields f9eedd7ce7 Keymap: Add backlight controls for Planck Light in dshields keymap (#3801) 2018-08-31 08:12:37 -07:00
patrickmt 2cd80f84a4 Keyboard: CTRL and ALT keyboard json fix (#3816)
Fixed incorrect layout names
2018-08-31 07:38:06 -07:00
Salt-Peanuts be94e5e591 Keymap: Updated keymap with the "pretty" layout (#3812) 2018-08-30 15:38:31 -07:00
patrickmt b61653739b Keyboard: CTRL and ALT updates (#3810)
Update to CTRL and ALT keyboard files
2018-08-30 13:49:17 -07:00
wanleg 2fcfd5cff7 Keymap: Wanleg updates (#3794)
* various edits and minor additions

* updates

* updates

* updates

* lets_split LEDs off instructions

* lets_split LEDs off instructions

* turn off lets_split LEDs in userspace

* one-hand setup for right side
2018-08-30 09:34:14 -07:00
Lars Herbach 2b707f3470 Keymap: Added new tada68 keymap (#3788)
* Initial Commit

* Removed duplicate lines
2018-08-30 09:23:33 -07:00
Sascha Grunert 11f49d6388 Keymap: Update keymap including LAYOUT_planck_grid (#3779)
* Update keymap including LAYOUT_planck_grid

* Change include
2018-08-29 18:19:43 -07:00
Takeshi ISHII 97d09ef8fa Keyboard: remove old comment from keyboards/helix/rules.mk (#3795)
remove 2 lines from keyboards/helix/rules.mk

 | -# if firmware size over limit, try this option
 | -# CFLAGS += -flto
 | -

see keyboards/helix/[rev2|pico]/keymaps/EACH_MAP/rules.mk:

 | Link_Time_Optimization = no # if firmware size over limit, try this option
 :
 :
 :
 | ifeq ($(strip $(Link_Time_Optimization)),yes)
 |    EXTRAFLAGS += -flto -DUSE_Link_Time_Optimization
 | endif
2018-08-29 18:12:09 -07:00
patrickmt 3cafc4e7c6 Keyboard: Update CTRL and ALT keyboard readme (#3796)
* Massdrop keyboards readme update

Massdrop keyboards readme update for flashing instructions

* ctrl and alt keyboard readme update

Updating make command in Massdrop CTRL and ALT keyboard readme files to reflect directory change
2018-08-29 18:11:32 -07:00
TerryMathews d12d058bae Autodetect lack of screen presence
This is the simplest, most efficient way I could come up with to silence
the "Failed to start write 60" error that occurs when QMK tries to talk
to a screen that doesn't exist.

iota_gfx_init passes a success boolean. We catch that into a global bool
(we could rewrite multiple functions to pass this as an argument, but
given the number of keyboards using this code it seemed less disruptive
this way) and then use that as a conditional on running the
iota_gfx_task in matrix_scan_user.

Tl;dr: if the screen doesn't init, the screen write code doesn't run.
2018-08-29 21:03:23 -04:00
patrickmt 972388447b Massdrop keyboards readme update (#3791)
Massdrop keyboards readme update for flashing instructions
2018-08-29 14:11:58 -07:00
mechmerlin 6794a5c9dc move massdrop boards into its own directory for configurator visibility 2018-08-29 16:38:12 -04:00
patrickmt 30680c6eb3 Massdrop keyboard support (#3780)
* Massdrop SAMD51

Massdrop SAMD51 keyboards initial project upload

* Removing relocated files

Removing files that were relocated and not deleted from previous location

* LED queue fix and cleaning

Cleaned some white space or comments.
Fix for LED I2C command queue.
Cleaned up interrupts.
Added debug function for printing numbers to scope through m15 line.

* Factory programmed serial usage

Ability to use factory programmed serial in hub and keyboard usb descriptors

* USB serial number and bugfix

Added support for factory programmed serial and usage.
Incorporated bootloader's conditional compiling to align project closer.
Fixed issue when USB device attempted to send before enabled.
General white space and comment cleanup.

* Project cleanup

Cleaned up project in terms of white space, commented code, and unecessary files.
NKRO keyboard is now using correct setreport although KBD was fine to use.
Fixed broken linkage to __xprintf for serial debug statements.

* Fix for extra keys

Fixed possible USB hang on extra keys report set missing

* I2C cleanup

I2C cleanup and file renames necessary for master branch merge

* Boot tracing and clocks cleanup

Added optional boot debug trace mode through debug LED codes.
General clock code cleanup.

* Relocate ARM/Atmel headers

Moved ARM/Atmel header folder from drivers to lib and made necessary makefile changes.

* Pull request changes

Pull request changes

* Keymap and compile flag fix

Keymap fix for momentary layer.
Potential compile flag fix for Travis CI failure.

* va_list include fix

Fix for va_list compile failure

* Include file case fixes

Fixes for include files with incorrect case

* ctrl and alt67 keyboard readme

Added ctrl and alt67 keyboard readme files
2018-08-29 15:07:52 -04:00
frederik-h a6c770432f Keymap: Add german layout for redox keyboard (#3695)
*     Add german layout for redox keyboard

    A german layout for the redox keyboard which tries
    to stay close to the default english redox layout
    while acommodating the umlauts at their usual position.

* Fix keycodes in german redox keymap

The keycode for Y was wrong.

* Minor changes

* Remove #ifdef include guard by #pragma once
* Remove unnecessary include from rules.mk

* Review changes

Remove unnecessary code fragments that
were pointed out in the review
of PR #3695 by @drashna.
2018-08-29 12:01:49 -07:00
blindassassin111 190fcdde26 Keyboard: Adding the AT101 PCB (#3785)
* Adding the AT101 PCB firmware

* Fixed AT101 keymap error

* Fixing AT101 firmware

* More Fixes for AT101 firmware

* Rename AT101_Blackheart.c to at101_blackheart.c

* Rename AT101_Blackheart.h to at101_blackheart.h

* Update readme.md

* Renaming AT101 folder pt1

* Renaming AT101 folder pt2

* Fixing AT101 LED function name

* Redoing AT101 folder naming pt2

Last round had issues, should be the last rename.

* Fixing missing comma in at101_blackheart.h
2018-08-29 11:58:09 -07:00
Drashna Jaelre e4bbe057f2 Yet another update to drashna keymaps and userspace (#3787)
* Make tap function inline

* Use better makefile keyboard detection

* Remove Copy-Paste macro

* Add F11/F12 to Iris

* Minor tweaks to userspace config

* Set audio clicky randomness to 1.5
* Set NO_DEBUG to only be set if console is not enabled

* Move NO_MUSIC_MODE to userspace config.h

* Reduce Ergodox Debounce

* Add Planck Light config

* Use OSM for ortho 4x12

* Music Mode changes for planck light

* Cleanup do to shutdown user and other fixes in Master

* Add and use 'shutdown_user' fzunction

* Remove global NO_MUSIC_MODE define

* Add NO_MUSIC_MODE to individual keymaps

* Change layer colors

* Remove NO_PRINT and NO_DEBUG from userspace config.h

Since these are automatically disabled if the console isn't enabled.

* Remove backlight code if backlight isn't enabled

* Remove Twinkle from Ergodox

* Disable RGB twinkling and enable PSM

* Clean up RGB matrix code

* Clean up planck light indicators

* Clean up tap code

* Rules cleanup for ortho 4x12

* Fix up userspace template

* Revert "Clean up tap code"

This reverts commit 09f64d6d67aa021c3b5ac86a9a739a5ca2b9c1ec.

* Organize includes

* userspace cleanup

* Fix modifier spelling error

* Fix userspace rules

* Disable Permissive Hold again

* Minor clean up

* Fix Tap stuff

* Viterbi Updates for file size
2018-08-29 13:42:15 -04:00
Boy_314 661ca4440c Keymap: Boy_314's Preonic and XD75 Layouts (#3781)
* fixed arrow keys and left control

* added right shift

* latest version

* reverted arrow keys

* edited readme

* added osu layer

* updated osu layout

* updated osu layout

* added full arrow keys to osu layout

* in case i mess up creating macros

* added the best meme key in the world

* added plover steno layer

* updated boy314 layout

* removed unused layers

* added boy314 xd75 layout, inspired by preonic layout

* added boy314 xd75 layout, inspired by preonic layout

* version 2 of boy314's xd75 layout

* added readme notes

* updated readme for boy314 xd75 layout

* qwerty support, brackets on bottom row, caps lock underglow

* fixed readme/

* small changes to allow merging

* minor changes to format

* fixed up default readme
2018-08-28 18:17:52 -07:00
Alex Ong 9bd6d6112d Keyboard: xealous (#3731)
* Keyboard: HandWired/XeaL60

* Updated rules.mk

* Mapping for layout was flipped

* Figured out how to re-map bad pins.

* Updated Keymap

* Enabled audio, Forced NKRO

* Added QMK_KEYS_PER_SCAN

* Removed more unnecessary files, since split_keyboards are in main QMK branch already.

* Simplified rules.mk in rev1

* Removed i2c from matrix.c

* Re-formatted to 4 spaces per tab,

* Changed note for NUMPAD

* Added I2C support back!

* Fixed keyboard mappings. Both sides work

* Moved i2c configuration from keymaps/default/config.h to config.h

* Changed SCL_CLOCK to 400000L

* Added DEBUG_MATRIX_SCAN_RATE for future optimization efforts

* Removed row2col code to clean up matrix.c

* Scan rate from 2100 -> 4200 by using Nop instead of waiting 30us between columns.

* Further optimized column reading via optimized_col_reader.

* Immediate key-recognition

* Switched back to own implementation of SPLIT_KEYBOARD. Will optimize so that slave interrupts master.

* Moved scanrate debug messages to another file.

* Made matrix_scanrate.c compile if CONSOLE_ENABLE is off. Updated to latest i2c.c

* Latest i2c uses a few bytes for lighting information

* Optimizations in i2c.h to determine buffer size.

* Disabled a whole bunch of features. TODO: Test that keyboard still works fine.

* Minimum #define NO_ACTION's with still working keyboard

* Fixed matrix not working due to offsets not being respected

* Added numlock button for keymap.

* Use I2C_KEYMAP_START offset

* Removed serial, Backlight and RGB support

* Removed need for split_flags.

* Added audio on and off for numlock.

* Renamed from xeal60 to xealous, simplified build system.

* Used more shared split_common code.

* Updated audio code.

* moved tone_qwerty and tone_numpad to config.h. Removed keymaps/default/config.h

* Added more shortcut keys in _FN layer. Increased debounce to 6ms due to fencepost error.

* DF used with incorrect argument. Custom_keycodes no longer required.

* Fixed bug in update_debounce_counters which was resulting in no debouncing!

* Removed unnecessary #include
2018-08-28 17:08:07 -07:00
Daniel Burkholder af5f59636e Keyboard: Dactyl - Only initialize relevant variables (#3771)
This small change prevents an unused variable from being initialized, throwing a warning during compilation, thus ending fatally.

[07:47:10] [Daniels-MacBook-Pro-3] [dburkhol] [ /Users/dburkhol/git/qmk_firmware ] [develop ]
: make handwired/dactyl:default
QMK Firmware 0.6.97
Making handwired/dactyl with keymap default

avr-gcc (GCC) 7.3.0
Copyright (C) 2017 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

Size before:
   text    data     bss     dec     hex filename
      0   19972       0   19972    4e04 .build/handwired_dactyl_default.hex

Compiling: keyboards/handwired/dactyl/twimaster.c                                                   [OK]
Compiling: keyboards/handwired/dactyl/matrix.c                                                     keyboards/handwired/dactyl/matrix.c:52:22: error: 'expander_col_pins' defined but not used [-Werror=unused-const-variable=]
 static const uint8_t expander_col_pins[MATRIX_COLS] = MATRIX_EXPANDER_COL_PINS;
                      ^~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
 [ERRORS]
 |
 |
 |
make[1]: *** [.build/obj_handwired_dactyl_default/matrix.o] Error 1
make: *** [handwired/dactyl:default] Error 1
Make finished with errors
2018-08-28 17:06:51 -07:00
xton 3892829d74 Keymap: xtonhasvim updates (#3768)
* cherrypicking file changes just for updates

* removed unused heat foo

* avoid defining own min/max

* add license

* formatting
2018-08-28 16:54:17 -07:00
Eduardo Lourenço Pinto Neto 3c20983055 Keymap: Adding keymap to the XD60 (#3767)
* Created keymap based on Default base layer and GK64 function layer

* Update readme.md
2018-08-28 16:53:10 -07:00
MechMerlin b1935c5e0d Putting my ducks in a row: Eagle/Viper V2 into Duck directory (#3766)
* mv eagle_viper into duck

* delete files

* remove eagle_viper .c and .h
2018-08-28 16:52:30 -07:00
MechMerlin 3916b06168 Putting my ducks in a row: Octagon V1/V2 (#3765)
* Move octagon directory into duck diretory and fix as many compile issues as I can

* fix formatting

* fix layout75 matrix

* edit readme for build instructions
2018-08-28 16:52:00 -07:00
Jacob Jerrell 444def8411 Keymap: Bocaj - Create Userspace and Ergodox Layout (#3750)
* Bocaj Layout Revamp

* Pull in Upstream (#1)

* Various tweaks for some Input:Club build processes

* change KEYMAP to LAYOUT for all new keyboards made using this script

* Add support for rev3 of the Atom47 (#2672)

* Added support for rev3 of the Atom47

* Updated Atom47 readme's

* Fix redefine error on rev2 and add maartenwut's keymap

* Fix redefine error on LEdiodes keymap

* Add Nyquist keymap (#2692)

* nyquist

* danielhklein nyquist setup

* shift left controls

* remove readme

* cleanup before pr

* ready for pr

* Adds Phantom TKL support (#2696)

* Add an info.json to phantom keyboard

* Add layouts

 - KEYMAP_WINKEYLESS
 - KEYMAP_7BIT
 - KEYMAP_ISO
 - KEYMAP_ISO_WINKEYLESS

* Add key_counts

* Add 2 missing F-Row keys

* Add TKC1800 info.json

Created an info.json for the tkc1800.

* Clueboard 60 info.json

 - adds
   - LAYOUT_60_ansi
   - LAYOUT_60_iso
   - KEYMAP_AEK
   - KEYMAP
   - LAYOUT_60_ansi_split_bs_rshift

* Add the Speedo keyboard

* Fix KC60 info.json file (#2707)

* change KEYMAP to LAYOUT in all the KC60 files

* Redo the info.json file

* Small fixes to TKC1800

 - adjust F-row to use 0.25 spacing
 - split left shift
 - add key_count

* Fix some Configurator Warnings regarding LAYOUT vs KEYMAP (#2708)

* change diverge 3 KC_KEYMAP to LAYOUT

* Change KEYMAP to LAYOUT for handwired arrow pad

* change M10A to LAYOUT for m10-a

* Change KC_KEYMAP to LAYOUT_kc and KEYMAP to LAYOUT for mf68

* change KC_KEYMAP to LAYOUT for nano

* Refactor to LAYOUT

* refactor to LAYOUT-ansi and LAYOUT_iso for s65

* LAYOUT conversions for lfkkeyboards

* missed a few renames

* mini1800 for lfkeyobards support of LAYOUT

* Improve state/chord handling and clean up namespace

Some values that can never, ever, change were held in local
variables, rather than in PROGMEM. Fixed.

Change "pressed" to a signed int so the test for < 0 makes
sense, and to avoid possible weird failure modes in the
case where a key release comes in when pressed is already
zero. (Shouldn't happen, sure, but computers are weird.)

A lot of things in process_steno had external linkage for no
particular reason. They've been marked static. Stuff still
builds.

Distinguish between currently-held keys and keys that have
been held, and expose these values through a nicely-named API
so other code could, say, check on the current set of steno
chording in order to make displays. Also in passing fix up the
"state" value having external linkage so it could clash with
other people's variable declarations.

The API also provides hooks for key processing and steno chord
events, so you can monitor those events without having to
run in matrix_scan_user and recheck the values directly. Also
document these.

There is no path through processing a key that doesn't
end with a return false, so the nested return foo() are
gone and we just return false.

* Pull information from config.h and rules.mk (#2711)

* Pull information from config.h and rules.mk

* Readd the kbd75 maintainer

* Remove obsolete info.json entries (#2712)

* Clean up some long-standing errors when populating the API (#2715)

* More Configurator Warning Fixes (#2716)

* mf68_ble did not have the correct .c and .h files

* Fix JC65 KEYMAP to LAYOUT

* Change KEYMAP to LAYOUT for s60_x

* Convert KEYMAP to LAYOUT for lets_split boards

* Convert KEYMAP to LAYOUT

* more fixes to keymap for iris

* convert KEYMAP to LAYOUT for levinson keyboard

* change losinggeneration's KEYMAP to LAYOUT

* convert KEYMAP to LAYOUT

* convert KEYMAP to LAYOUT for nyquist

* convert KEYMAP to LAYOUT

* convert KEYMAP to LAYOUT for viterbi

* convert KEYMAP to LAYOUT

* convert KEYMAP and its subsidiries to the LAYOUT standard

* convert KEYMAP and its subsidiries to the new LAYOUT standard

* Normacos keymap for let's split keyboard (#2691)

* Cheers let's split keymap

* fixed typo on norman layer of cheers keymap for let's split

* fixed right handed mappings for home row

* cheers keymap for let's split redefinition

* updated Cheers keymap for let's split

* cheers keymap for let's split updated with some terminal macros

* renamed cheers let's split keymap to a more appropriate normacos

* updated normacos keymap doc / removed non functional keys

* reset let's split rules to default values

* added more spotlight search macros

* normalized keymap comments

* Moved numpad on lower layer

* hhkb jp personal keymap (#2698)

* Add JJ40 Cockpit personal keymap (#2713)

* Add JJ40 Cockpit keymap

* Fix lower layer symbols

* Add readme for "major" keyboards to eliminate more QMK Configurator errors (#2718)

* add readme to ktype keyboard

* add readme to m10a

* add readme to mini1800

* add readme to parent directory

* Revert "Pull in Upstream (#1)"

This reverts commit eeba0cec17.

* Updates to Bocaj Files

- Gave up on Tap Dance for ' -> '
+ Added another 'Secret'
+ Add ' -> ' to the Swap Hands key
+ Add Swap Hands to the ' -> ' key
+ Made Hand Swapping a momentary toggle
- Removed Auto Shift
+ Added Layer Toggle to KC_QUOTE for the _TOOLS layer
- Disabled Tap Dance

* Merge remote-tracking branch 'upstream/master'

* Updates to Bocaj

Added Game Layers, Removed Unused Macros

* Removed 'secrets.h'

* Updates to Bocaj

Remove 'secrets'.
Remove 'sendstring_workman.h' and set related layer back to qwerty due to macro compatibility issues

* Total revisioning of keymap and layout structure

* Missed readme.md file

* Bocaj - Permissive Hold setting enabled

* Switching from ErgoDox EZ centric configuration to the layout/user approach

* Bocaj - Create Userspace and Ergodox layout

* Update settings.json
2018-08-28 16:48:41 -07:00
ishtob 2410f02359 Fixes STM32F303XC timer issue for Planck Rev 6 (#3777)
* Adding my personal planck keymap

* Adding readme.md to my keymap

* Create my userspace

add users/ishtob/

* Moved macros off keymap

macros now exsists in my userspace, moved them off keyboard specific keymaps

* Create my userspace

add users/ishtob/

* rebase from main QMK repo

* fixed compile error with planck rev6 keymap

* fixed compile error with planck rev6 keymap

* Revert "Merge branch 'master' of https://github.com/ishtob/qmk_firmware"

This reverts commit 6c8a9a6eec, reversing
changes made to 5c598d9a53.

* fixed issue where compile errors if private macro file is not present

* Revert "fixed issue where compile errors if private macro file is not present"

This reverts commit e0035df48f.

* Fixed STM32 timer issue with Planck Rev6 with tap mods

* Revert "fixed compile error with planck rev6 keymap"

This reverts commit 5c598d9a53.

* Revert "Revert "fixed compile error with planck rev6 keymap""

This reverts commit c36896ca71.

* Fixed compile issues with my personal userspace and keymap utilizing the userspace
2018-08-27 17:10:22 -04:00
Michael F. Lamb c63d9ee0d5 mitosis: minor readme improvements (#3762)
* minor improvements to top-level mitosis keyboard readme

* typo

* trivial readme change
2018-08-26 12:00:22 -07:00
Michael F. Lamb 95e9ef27be add linebreaks to "Keyboard Maintainer:..." blocks where missing (#3763) 2018-08-26 11:59:52 -07:00
MechMerlin a63d4774f5 Keyboard: Putting all my ducks in a row: Lightsaver (#3758) 2018-08-26 09:30:49 -07:00
MechMerlin 1ee545014a Keyboard: Make a 1upkeyboards directory for visibility (#3759) 2018-08-26 09:30:12 -07:00
Doug Raffle 91cf4b00c5 Keymap: initial migration of raffle planck (#3748)
* initial migration of raffle planck

* cleaned up includes per merge per drashna

* removed unicode shrug attempt

* cleaned up include.
2018-08-25 18:01:07 -07:00
MechMerlin e16b39f0c2 Keyboard: Duck Jetfire QMK Support (#3752)
* Initial Commit

Port from xauser's jetfire code. Does not compile yet

* fix up keymap from uint8 to uin16

* update rules file to contain custom matrix

* Good stopping point

Still lots of compile errors but I'm getting there.

* fix a few more compile errors

* move a few functions around to help with compiling

* Finally got it all to compile

* Get rid of that old KEYMAP macro

* edit readme

* Put my name everywhere and some minor code clean ups

* start to remove that kc nonsense

* fix keymap compilation issues

* add reset key info

* better human readable formatting

* match the duck default layout

* add confgurator support

* clarify reset key

* might be a good idea to use the correct pin

* get the riight keycode for RGB

* include an ALL layout

* I tried to fix the formatting....sigh

* add functons to ensure Configurator compile-ability

* move jetfire to duck directory

* Moved and renamed things as per Drashna's PR comments as his back was hurting as he reviewed this
2018-08-25 18:00:20 -07:00
Doug Raffle a68057852b Keymap: initial migration of raffle 1up60rgb (#3747)
* initial migration of raffle 1up60rgb

* updated include statement
2018-08-25 17:13:07 -07:00
Luciano Malavasi f6bd5d793a Keymap: PyroL Let's Split keymap + Alpha keymap modifications (#3753)
* keymap + alpha

* some fixes

* keymap + alpha

* some fixes

* drashna changes

* linked main Alpha repo in keyboards/alpha readme

* missed a spot

* there's another function called FUNC lol

* keymap + alpha

* some fixes

* keymap + alpha

* drashna changes
2018-08-25 17:11:53 -07:00
MechMerlin 0e17a44b46 Keyboard: Change the default LAYOUT to LAYOUT_60_hhkb for tokyo60 (#3751) 2018-08-25 13:20:18 -07:00
MechMerlin 1e7d08d2e3 Keyboard: Tokyo60 Cleanup: QMK Configurator support (#3749)
* use LAYOUT_60_hhkb

* cleanups

* more minute clean ups

* fix some capitilization issues

* add configurator support
2018-08-25 13:00:09 -07:00
Alvin C b806cc9eea Keyboard: add tokyo60 (#2861)
* adding tokyo60 to qmk

* updating readme

* updating keymap and power consumption for mobile
2018-08-25 12:16:05 -07:00
Njiall 26dacd51fc Keyboard: Added gamepad layout to cospad (#3714) 2018-08-25 10:35:24 -07:00
Salt-Peanuts 7e8c0a368b Keymap: Added my keymap for Rorschach keyboard; minor updates to my Kinesis files. (#3734)
* Added keymap for Rorschach

* Rorschach update

* Minor updates to Kinesis files

* Minor fixes

* Minor fixes for Rorschach
2018-08-25 09:29:43 -07:00
Barry Huang 028a4feeed Keyboard: readme.md update (#3581)
for correct site link
2018-08-25 09:26:24 -07:00
Budi Dharmawan a9b6ebcd89 Keymap: update to budi's tv44 (#3587)
* update to budi's tv44

* update august - budi's tv44
2018-08-25 09:04:40 -07:00
Danny b6d8524794 Keyboard: add Wavelet (#3739)
* Add Wavelet keyboard

* Fix build error for keyboards w/o Planck MIT layout

* Add swap hands support
2018-08-25 08:46:42 -07:00
MechMerlin 067091d9c2 Introduce new 75_ansi standard layout (#3738)
* introduce new layout 75_ansi

* use the new 75_ansi layout for my octagon v2
2018-08-24 08:54:16 -07:00
Alex Schroeder 37d3055264 Keyboard: Support PCBDOWN variants for Atreus keyboard (#3735) 2018-08-24 08:53:03 -07:00
zwnk c6eccb39e0 Keyboard: dactyl_manuform 5x7 aka Ergodox-ish added (#3691)
* dactyl_manuform 5x7 aka Ergodox added

* LAYOUTS = ergodox removed

* README updated

* README updated again

* zip file removed
2018-08-23 11:48:30 -07:00
MechMerlin 5d8d350976 Keyboard: Finish up the HSE now that I have a board to play with! (#3728)
* fix up readmes

* update keymap to match configurator default

* add more info
2018-08-22 20:14:52 -07:00
marksard 6076ed85be Keyboard: Partial refactor of the crkbd code (#3600)
* Add display to LED-parameters function
* Improvement of update timing for OLED display (Need TWI_Init)
2018-08-22 09:51:37 -07:00
noroadsleft 9d27d55443 Keyboard: Blockey refactor (#3722)
* Matrix refactor

Edited for readability.

* Keymap refactor

Deleted TMK-syntax macro block. Edited for readability.

* Readme cleanup

Edited image link (link previously referenced a single-image album).

* Configurator support
2018-08-22 09:00:40 -07:00
noroadsleft 4951fc52be Keyboard: AL1 Configurator fix: misplaced arrow keys (#3716)
* Configurator fix: misplaced arrow keys

* rules.mk: set backlight and RGB rules
2018-08-22 08:59:00 -07:00
noroadsleft 356fe590e6 Keyboard: AMJ96 Refactor and Configurator update (#3707)
* AMJ96 Refactor

LAYOUT matrix and default keymap refactored to use full-length keycodes (instead of shorthand).

* Configurator update

Minor physical layout update and made the labels more sensible.

* Readme update

White space correction.

* Default keymap update: #include QMK_KEYBOARD_H

* rules.mk update

Disabled the following options as my local test compile's .hex ended up too big to fit in the available flash space:

MOUSEKEY_ENABLE
EXTRAKEY_ENABLE
BACKLIGHT_ENABLE
RGBLIGHT_ENABLE

If this is undesirable, suggestions are welcome.

* Config/rules update

Re-enabled MOUSEKEY_ENABLE, EXTRAKEY_ENABLE, BACKLIGHT_ENABLE, and RGBLIGHT_ENABLE and disabled COMMAND_ENABLE in rules.mk; enabled NO_ACTION_MACRO and NO_ACTION_FUNCTION per @drashna

* Swapped `___` for `XXX` in amj96.h per @mechmerlin
2018-08-22 08:58:12 -07:00
Kjili c8cd1ebc45 Keyboard: Fix tada68 Linux readme (#3717)
Remove confusing mention of a "Windows" computer.
2018-08-21 19:08:17 -07:00
Kyle Peatt a4294a153b Keymap: Added personal keymap for bface (#3719)
* [keymap] Added personal keymap for bface

* Add readme

* [keymap] Added personal keymap for bface

Add readme

Remove right shift slash test
2018-08-21 19:07:18 -07:00
noroadsleft 343dc1be7f Keyboard: UT47 Configurator support and readme cleanup (#3708)
* Configurator support

* Readme cleanup
2018-08-21 08:45:42 -07:00
noroadsleft cffaf0acf4 Keyboard: Configurator render fix for AMJPad (#3706)
- `LAYOUT` updated to `LAYOUT_numpad_6x4`
- `LAYOUT_all` update to `LAYOUT_ortho_6x4`
2018-08-21 08:42:18 -07:00
noroadsleft 3f8654c85d Keyboard: AMJ60 LAYOUT_iso matrix fix (#3705)
LAYOUT_iso matrix was invalid.
2018-08-21 08:41:40 -07:00
noroadsleft 8720c6628a Keyboard: Alf X2 matrix fix (#3704)
Invalid syntax in LAYOUT_split_arrows matrix macro.
2018-08-21 08:41:12 -07:00
noroadsleft e1be79d7c9 Keyboard: Corrected LFK65_HS LAYOUT_all matrix (#3703)
Switch `k3D` was listed as `K3D` in the parameter list, causing a compile error (undeclared variable).
2018-08-21 08:40:25 -07:00
MechMerlin d0b55b59f9 Keyboard: bface update (#3702)
* add configurator support

* update bface code to more modern QMK standards

* update readme

* update readme

* Make changes thanks to noroadsleft's PR comments
2018-08-21 08:39:25 -07:00
Stephen Grier 9d99fd8418 Keymap: Adding stephengrier keymap for the DZ60 PCB (#3700) 2018-08-21 08:38:26 -07:00
Christoffer Holmberg 220ea4c9b7 Keymap: Nordic layouts for ErgoDox, Planck (#3693)
* first verion of skug

* zudvp layer added and new thumb cluster

* move del to arrw cluster and switch places of algr and no_circ

* first verion of skug

* zudvp layer added and new thumb cluster

* move del to arrw cluster and switch places of algr and no_circ

* rework layouts

* Adds SYMB layer toggle to 'ä'

Closes #2

Also moves ctrl away from '-' and 'z' to the outer bottom corners
and removes redundant SYMB layer binds from there

* Adds mouse movement to right hand on ARRW layer

Closes #3

* Fix typoed keycodes

* planck qwerty nordic

* Update README.md

* Update README.md

* Implemented changes to planck layout requested by drashna

* Implemented changes to ergodox layout requested by drashna

NOTE: `version.h` is still required.
2018-08-21 08:37:29 -07:00
noroadsleft dbef2ad6b9 Keymap: Update 333fred's keymap for Zen (#3690)
Reset file to upstream/master, update only macro name (KEYMAP to LAYOUT).
2018-08-20 09:45:15 -07:00
MechMerlin e2755c11b3 Keyboard: forgot to rename the layout 1up60hse correctly (#3699) 2018-08-19 19:35:14 -07:00
noroadsleft 2091280bbb Keyboard: Fix Configurator rendering for Big Series 2-, 3-, and 4-key boards (#3698) 2018-08-19 19:33:49 -07:00
Sebastian Kaim 4a3eb3bdd4 [WIP] Added support for the b.face keyboard (#2493)
* Added support for the b.face keyboard

This commit adds support for the 60% keyboard from winkeyless, the
b.face. The basic keyboard layout as well as the RGB backlighting
works as expected; the per-key LEDs can be turned on or off but not
yet dimmed. A default 60% US-layout is included.

* Added link to the bface in the ps2avrGB README
2018-08-19 19:32:35 -07:00
Graham P Heath 10c636a1ee Keyboard: add Telophase board (and Graham's keymaps) (#3244)
* add my config

* fix backlight, clean up that code

* group background code, restore static var

* qwerty is supposed to be in the middle

* wrap layer change backlight in ifdef

* backlight levels and some more 'emojis'.

* Restructure to make it possible to press cmd ent on the right side of the board with one hand.

* Expose the period through the number layer. Add Hyper keys to mouse layer

* reduce mouse speed

* add a : -P  key

* Thumbs up and down, remove some keys that are duplicated via function keys, clean up

* fix build issues

* add various emoji

* duplicate default Meira keymaps

* Miera updates

* add documented but unmapped emoji

* Sound for the Meira, was stumped by a file size! Thanks drashna!

* add docs

* docs

* revert lib changes...

* clean up

* clean up

* remove make file

* Fixes missing key

* clean up

* add my lets split

* add more emoji

* add the telophase board (unofficially, I guess...)

* add missing files

* add/reset files

* Review feedback implementation: Not needed. Add #define FLIP_HALF to your config.h file instead.

* Review feedback implementation: All of these includes should be replaced with #include QMK_KEYBOARD_H.

* Review feedback implementation: [FAILING] You may want to use LAYOUT_ortho_4x12 instead, and move this to /layouts/community/ortho_4x12/ instead. That way, you can use the same keymap for all of the boards.

* clean up

* add a key for command tilde (osx loves it)

* at least its building again

* remove adjusts and migrate layer switching to MO(_LAYER)

* update the telophase readme

* update the telophase readme

* grahampheaths -> grahampheath

* ONEHAND_ENABLE -> SWAP_HANDS_ENABLE

* convert lets split to use ortho_4x12

* Move lets split keyboard layout into community/ortho_4x12

* make telophase use LAYOUT()

* I did it?!

* Add clap and grin

* swap tabs and back and forward

* whitespace
2018-08-19 13:29:11 -07:00
eucalyn 99da48c72b Keyboard: add mint60 keyboard (#3543)
* add mint60

* change source by reviews
2018-08-19 13:26:42 -07:00
aydenvis 4cc1edbb67 Keyboard: Add QWERTYYdox keyboard (#3636)
* Add files via upload

* Update readme.md

* Update readme.md

* Update readme.md

* Add files via upload

* Delete split_util.h

* Delete split_util.c

* Delete serial.h

* Delete serial.c

* Delete matrix.c

* Delete i2c.h

* Delete i2c.c

* Update rules.mk

* Update config.h

* Update readme.md

* Update readme.md
2018-08-19 13:23:13 -07:00
wanleg d87ef88de0 Keyboard: add 5x5 board support (#3694)
* 5x5 board support

* 5x5 work

* 5x5board config

* add 5x5 board support
2018-08-19 13:18:19 -07:00
Fredric Silberberg 8bc771a842 Added arrow layout. 2018-08-19 13:09:31 -07:00
MechMerlin ee238f1219 Keyboard: add 1up60hse (#3687)
* initial commit

* update readme

* enable/disable some keyboard features and add 60_ansi community layout support

* put my name everywhere

* can't use numbers for defines

* enable lighting

* put in a default keymap, use the correct pins, and put in a switch matrix

* update switch matrix to use KXY hex notation

* add QMK Configurator support

* add the rest of my name

* update where to get this keyboard
2018-08-19 13:04:03 -07:00
Biacco42 c55313509f Keyboard: Update Ergo42 default keymap (#3686) 2018-08-19 12:53:41 -07:00
Biacco42 78a01068a4 Keymap: Remove needless lines / files for Ergo42 (#3685) 2018-08-19 12:52:23 -07:00