Commit Graph

3035 Commits

Author SHA1 Message Date
nachie
931a52d1ae Support for the Paladin64 PCB (#2639)
* Support for the Paladin64 PCB

* Paladin64: Added readme. Added the bootloader option to rules.mk

* Fixed the formatting

* fixed the flash command
2018-03-28 23:20:15 -04:00
Harry Mills
b5e899ede7 Adding Haegin's keyboard layout for the ergodox and minidox (#2637)
* Add Haegin's keymap

* Potential improvements to the keyboard

* Add haegin minidox layout

* Add Haegin's keyboard to ergodox layouts

* Update Haegin's minidox keymap
2018-03-28 12:03:32 -07:00
Jason Janse van Rensburg
01c72e8dce changed super key to left super key (#2631) 2018-03-27 13:58:09 -07:00
Michael F. Lamb
b61974b301 mitosis:datagrok: minor layout improvements (#2366)
* mitosis/datagrok: make qwerty the default layout

* mitosis/datagrok: update readme to match qwerty default

* mitosis:datagrok: remove redundant name for transparent

meh, decided i don't need an extra key to represent "key that is
transparent because it's a modifier on a layer below." it's a maintenance
burden when moving other keys around

* mitosis:datagrok: add num lock on Blue + QWERTY T

* mitosis:datagrok: tap lshift = tab

we use tab completion a lot so let's get it onto an unmodified key somehow

* mitosis:datagrok: update readme

* mitosis:datagrok: improve notes in README

* mitosis:datagrok: note numlock in README
2018-03-27 09:18:28 -07:00
Benjamin Daschel
9f5a4af09c XD60 ANSI (GH60) layout (#2624)
* configure layer 0 layout for xd60 as ANSI 60%

* update keymap with function key immediately right of spacebar;
shuffle mapping in function layer to my liking

* update readme
2018-03-27 09:04:09 -07:00
Martin Lechner
1305d8de80 [TADA68] Added mac layout with german umlaute on ansi. (#2615) 2018-03-27 09:01:32 -07:00
bjacques
55d0b1f048 Create new 'tada68/iso-uk' layout tailored for boards with the big fat iso enter key (#2612) 2018-03-27 09:00:52 -07:00
mechmerlin
d3a0c7e3a6 qmk configurator support for e6v2. Let it be known that this is one of the keymaps I've seen done right 2018-03-27 11:47:32 -04:00
mechmerlin
b773d94477 Add qmk configurator support for KBD75
Also changed KEYMAP to KEYMAP_ALL to be more explicit that it's
a layout supporting ALL possible layouts.
2018-03-27 11:39:03 -04:00
dankm
19a1fbaca2 Better non-Linux support (#2524)
* grep -> $(GREP)

Some UNIXy systems (FreeBSD for example) don't use GNU grep by default.
Allow the user to specify which grep implementation to use so that
GNU grep can be specified.

* Allow using versioned avr-gcc command

Don't hardcode "avr-gcc", and allow strings such as "avr-gcc8", or
"avr-gcc-7.3.0" to match checks for "avr-gcc".
2018-03-26 16:08:08 -04:00
Otto Rask
b922a550dc Add pearl README, add rask's Pearl layout 2018-03-26 13:34:53 -04:00
Drashna Jaelre
0c665696d7
Update to drashna files (#2587)
* Add Colemak Mod-DH vars

* Add Norman Layot vars

* Set Shift Indicator to include CAPS Lock as well

* Change MEH to GUI

* Add Enter to Macro layer

* Switch raise and lower layers to make more sense (to me)

* Replace unused quote on Ergodox

* Add One Shot defines

* Dim indicator LEDs

* Add short codes for KC_SECRET

* Fix typos

* Update OLKB code in userspace

* Add global userspace config.h

* add compile fix

* Automatically include  from userspace

* update readme

* Re-add QMK Scan loop

* Add EEPROM reset code to all keymaps

* Shorten fauxclick sound

* Use layouts instead of keymap, when possible

* Add OSM detection to ergodox

* Convert Viterbi to LAYOUT macro

* Clean up game macros

* Because I accidently removed the C6 AUDIO define from my viterbi... Whoops

* Minor formatting

* Fix Woodpad because it's still there

* Move Ergodox keymap into layouts folder

* Add build date to version macro

* Remove PREVENT_STUCK_MODIFIERS from config
2018-03-25 13:01:15 -07:00
Joshua Coffey
a09a042b8f New keymap and more songs (#2609)
* Added some new songs and my own keymap

* Made Dodger keymap safe to use with backlight disabled

* edited layer switching and added more songs

* changed keymap to lowercase
2018-03-25 12:58:40 -07:00
RobertDhaene
3d587b1d2f Merge in some custom keymaps from forked repository (#2605)
* Inital layout

* Fix the backspace

* add a number pad

* move the backlight to the adjust layer; move ctrl and delete.

* Update from main repo

* Add initial files for custom keymap

* Light keymap mod

* Change the submodules to match the upstream fork's master branch
2018-03-25 12:56:36 -07:00
MechMerlin
d9c6e7487b Refactor/v60 type r keymap/layout (#2593)
* Add a proper ANSI layout

Changed v60_type_r.h to have a proper ANSI layout
Modify keymaps to reflect above changes
Fix comments

* Add new layout to info.json
2018-03-25 00:59:36 -04:00
MechMerlin
fa0d97a37f info.json configurator support for popular 65% keyboards (#2589)
* Support for tada68 ansi layout.

Avoiding the iso layout as it doesn't seem correct

* whitefox support for configurator

* configurator support for jc65 PCB featuring both the qmk and ps2avrgb versions
2018-03-25 00:59:17 -04:00
Wilba6582
59a784500b Initial support for RAMA M6-A (#2600)
* Initial commit of RAMA M6-A firmware.

* Added LED support

* Added Knops support

* Fixed compile error for knops keymap.

* updated readme.md

* updated readme.md

* updated readme.md
2018-03-25 00:58:55 -04:00
WarmCat
00dfa73e4c Added basic support for JJ50 (preonic-like based on atmega32A) (#2546)
* Added support for JJ50 from KPRepublic, no rgb or backlight control yet. Added as a layout of ymd96 at the moment (same microprocessor). Basic keymap with three layers to get started.

* Added support for JJ50
2018-03-24 13:03:24 -04:00
myrtle
4adc333455 Fix mechmini2 ortho keymapping layout
A misconfiguration in the ortho layout, K306 key was registered as k305
2018-03-24 12:52:42 -04:00
Danny
4e92dceed8 Add Fourier Keyboard (#2596)
* Initial commit of Fourier keyboard

* Revise keymap, add key to bottom row

* Fix readme
2018-03-24 12:50:44 -04:00
Danny Nguyen
f77ecb8960 Add Laplace keyboard 2018-03-24 12:50:16 -04:00
Takeshi ISHII
824d584d8c New keymap for The Helix keyboard("five_rows") (#2592)
* duplicate keyboards/helix/rev2/keymaps/default to keyboards/helix/rev2/keymaps/five_rows

* OLED Layer display 'Qwerty','Colemak','Dvorak'

* set Qwerty, Lower, Raise map

* set Colemak map

* set Dvorak map

* OLED Layer display 'Raise','Lower' change to 'Extra char','Function'

* fix ExtraChar Layer Shift-key disable

* Raise,Lower,Adjust layer modify

some key change KC_TRNS to KC_NO
add KANA, EISU key

* refine keymaps/five_rows/{config.h,rules.mk} for easy and safe customize

* modify Adjust layer: all function into left hand, remove F1..F12,DEL

* Add Helix five_rows keymap README.md and README_jp.md

* Raise Layer modify: enable Raise(Extr)+Lower(Func)==Adjust

* fix image file url in README.md,README_jp.md

* change Layer display on OLED

* change OLED display base name position
2018-03-23 16:08:37 -07:00
Yida Xu
3a49ad06cd New keymaps for bananasplit (#2586)
* New bananasplit keymap with toggable capslock led.

* Update comments.

* Update readme.md

* Updated keymap name

* update some keys.

* new layout for bananasplit

* update comment

* Update readme.md
2018-03-23 16:07:10 -07:00
Takeshi ISHII
f56ded3214 add README.md into keyboards/helix/rev2/keymaps/led_test/ (#2582) 2018-03-23 16:04:49 -07:00
john McCormick
6b060bb9ad Add atlacat keymap (#2581) 2018-03-23 16:04:19 -07:00
XP
8575249411 Add a basic keymap for Contra. (#2564) 2018-03-23 16:02:44 -07:00
24-bit-8
8621fd8bbd ekis_isa keymap for HHKB'ish layout (#2562) 2018-03-23 16:01:57 -07:00
J. Eric Mason
ec5cc02bf0 Preonic Ergodox-Like Mac keymap: Bucktooth (#2553)
* Preonic Ergodox-Like Mac keymap: Bucktooth

This is a layout unlike most Preonics, it is taken partially from
Ergodox and classic C64 keyboards with a ton of Mac-specific features.

* Fix Mouse Left keycode
2018-03-23 15:59:56 -07:00
akrob
6706e1af6c Add new keymap for iris transmogrified (#2361)
* Create config.h

* Create rules.mk

* Create keymap.c
2018-03-23 15:57:22 -07:00
MechMerlin
426c71de74 Add new bfake "FaceW" keymap (#2360)
* Add mechmerlin keymap and readme for facew board

* Fix keymap
- Backspace as on the wrong key
- HHKB backspace changed to backslash

* Update keymap.c

Change TO to TG for toggle.
2018-03-23 15:56:36 -07:00
David Collom
b3e7149a65 yet another keymap (#2356)
* added keymap

* added readme
2018-03-23 15:55:46 -07:00
That-Canadian
c3c4164faf That-Canadian Preonic layout (#2462)
* Line ending stuff again

* Added my own person keymap to preonic folder

* Updated my preonic keymap

* Updated my preonic keymap
2018-03-23 15:54:02 -07:00
Florian
c808680436 initial branch (#2379)
* initial branch

* lazy-push

* Fix schema

Updated README, readded DVORAK to keymap.
Updated dir name to lowercase.

* removed executable bit

* testing switched L_GUI position
2018-03-23 15:51:32 -07:00
Drashna Jaelre
f0932a8716 Update info.json for Ergodox EZ (#2577) 2018-03-21 03:09:51 -04:00
Drashna Jaelre
f7505ef67c Update info.json for orthodox (#2576) 2018-03-21 03:09:28 -04:00
MechMerlin
971b837009 Edit info.json (#2575)
GH60 had the ansi layout taken care of.
This commit adds hhkb, iso, and the "basic" KEYMAP layout.
2018-03-21 03:09:12 -04:00
MechMerlin
e021f44378 Update info.json (#2574)
Change name from LAYOUT to KEYMAP.
2018-03-21 03:08:54 -04:00
MechMerlin
63b1946bfe Configurator support for minivan (tv44) (#2573)
Support all 4 layouts supported by the tv44 pcb.
2018-03-20 23:01:03 -04:00
Drashna Jaelre
780ff68674 Create info.json for Ergodox EZ (#2572)
* Create info.json for Ergodox EZ

* Add Orthodox info.json too
2018-03-20 23:00:47 -04:00
MechMerlin
004df55d7f Add configurator support (info.json) for Input Club K-Type (#2571)
* Add configurator support for Input Club K-Type

* update info.json to remove bootloader and add mcu
2018-03-20 23:00:17 -04:00
U-LANDSRAAD\drashna
4ec03111cc Add Pretty Keymaps to Ergodox EZ 2018-03-20 20:23:08 -04:00
MechMerlin
1fbddc6613 Configurator Support(info.json) for 1up Keyboards Sweet16 (#2570)
* Configurator Support

- Add info.json to support existing layouts
- Add comment in sweet16.h to remind people to change info.json if
  the layout changes.

* Fix dlaroe's keymap
2018-03-20 20:22:42 -04:00
MechMerlin
2d8fda614e Configurator/dz60 support for info.json (#2568)
* Add info.json file for qmk_configurator

Unfortunately none of these keymaps look like a board I've seen in
the wild. Some further tweaks will have to be done to the keymaps
directly.

* add comment indicating need to edit info.json when keymap changes
2018-03-20 11:50:03 -04:00
mechmerlin
6268656e01 add info.json to support both layouts on the contra 2018-03-20 00:56:05 -04:00
Drashna Jaelre
ff728a8a01 [Proposal?] Allow RGB Underglow to turn off when host is idle/asleep (#2104)
* Add RGB Underglow Sleeping

* Add RGBLIGHT_SLEEP to toggle/control RGB light behavior

* Update rgb docs

* Update for RGB disable command
2018-03-19 23:59:58 -04:00
mechmerlin
37cc088486 Add info.json file to work with qmk_configurator 2018-03-19 23:40:12 -04:00
MechMerlin
500b060e3d Fix info.json issues to display properly in config.qmk.fm (#2552)
* Fix info.json issues to display properly in config.qmk.fm

* rename LAYOUT to KEYMAP to match .h file
2018-03-19 22:43:06 -04:00
dlaroe
4ca65bb6c6 retry of PR #2540 (#2554)
* reforked, untarred keymaps, added CRS and renamed my keymap folders

* Update readme.md

corrected a typo
2018-03-18 00:21:01 -04:00
Alexander Fougner
3acaad6600 Initial support for The Unloved Bastard 2018-03-16 16:41:32 -04:00
Kenny Hung
bb5c98699f Duplicate KC space to UK (#2541)
* Fix tilde in xd75 skewwhiffy

* Small tidy up

* Tidy up Colemak row

* Tidy up navigation layer

* Symbols layer redefined

* Fix UK Quote issue

* Use UK_QUOT rather than KC_QUOT
2018-03-16 16:39:51 -04:00
U-LANDSRAAD\drashna
682c8a260a Fix audio issues with Split keyboards that missed previously 2018-03-16 16:38:05 -04:00
Pittyolo
729e99961c Updated keymap for my Nyquist layout 2018-03-16 16:37:02 -04:00
adiron
04d72590af New keymap for XD75re ("adi") (#2530)
* My XD75 keymap

* Proper readme for `adi` keymap for xd75re
2018-03-16 16:36:41 -04:00
Matthew Yee
4dc3a01fcb Added my keymap (#2529)
* Added my keymap

* maybe that wasn't quite right.

* Reduced the tap time to register layer

* changed the tapping term that fits my typing speed a little better

* Added retro tapping and reduced tapping term duration
2018-03-16 16:36:17 -04:00
Brian Choromanski
a3047f1ab3 Added choromanski keymap (#2528)
* Added ergodox layout

* Added preonic layout

* Added readme for exgodox layout

* fixed errors with formatting readme

* Added edited preonic keymap & readme
2018-03-16 16:35:44 -04:00
Joe Wasson
23ac2a02ef Add keycodes for swap-hands feature. 2018-03-16 16:33:43 -04:00
Joe Wasson
7230923b05 Rename ONEHAND_ENABLE to SWAP_HANDS_ENABLE for consistency 2018-03-16 16:33:43 -04:00
Twentylives
598ab478be new handwired keyboard - Dactyl Manuform (#2516)
* adding new handwired keyboard: dactyl-manuform

* adding qwerty layout

* updating readme file.
2018-03-16 16:32:18 -04:00
James OFarrell
241421efd4 Added support for ca66 2018-03-16 16:30:43 -04:00
Takeshi ISHII
3d1801e63a Helix keyboard led test as a keymap (#2513)
* duplicate keyboards/helix/rev2/keymaps/default to keyboards/helix/rev2/keymaps/led_test

* OLED & RGB LED on

* duplicate quantum/rgblight.[ch] to keyboards/helix/rev2/keymaps/led_test

* rgblight.c modify for RGB test
2018-03-16 16:28:07 -04:00
Otto Rask
ea070950e7 Add underglow animation support to rask's UK78 (#2512)
* Add rask's Satan layout

* Add rask's Satan layout

* Add rask's BananaSplit60 layout

* Add rask's BS60 readme

* Fix rask's BS60 readme image

* Fix rask's BS60 readme image again

* Add rask's UK78 layout

* Change RGui to be LGui to fix locale switching

On Ubuntu the keyboard seemingly lost RGui when toggling
between typing languages. With LGui toggling works normally.

* Add rask's ErgoDox Infinity layout

* Modify ErgoDox layout and add readme for it

* Add rask's UK78 layout readme

* Add undnerglow animation to rask's UK78 firmware
2018-03-16 16:27:03 -04:00
Drashna Jaelre
54f1cdfb1e Add teensy revision folder for Orthodox Rev3 (#2510)
* Add Rev3 Teensy for Orthodox

* MOve bootloader defines into revision folders

* Finishing touches
2018-03-16 16:26:21 -04:00
Louis Orleans
f139c3db8d layout(preonic): update to dudeofawesome's layout (#2507)
* 🎉 duplicate default Preonic keymap

*  add Workman layout

* 🚚 swap backspace and delete

*  enable hold enter for shift

* 🚚 swap media play and next

* 💄 use Planck startup sound

* 💄 add Workman layer sound

*  add numpad layer

* 💄 add new workman sound

* 📝 add README

* 🎨 fix layout formatting

* 📝 add image of numpad layer

* 📦 changing chibios submodule version

to match upstream/master's version

*  add caps lock key on adjust layer

*  reworking numpad layer to match a real numpad

*  add double tap to activate numpad

* 📝 fix layout comments

* 📝 update numpad layer render

*  adding operator keys to left hand on numpad

* 🎨 shorten numpad keycodes

* 🎨 remove redundant breaks

* 📝 update numpad layer render

* 🎨 fix indentation

* 🔧 add rules file

* 🔊 play sound when switching to numpad layer

* 🔨 use userspace sounds
2018-03-16 16:22:33 -04:00
Louis Orleans
48321c3eee layout(infinity ergodox): update dudeofawesome's layout (#2506)
* 🎉 Building simple flasher

* 🎉 Flashing works

* 🎨 Cleaning up

* 🐛 Being more specific with board identity

* 🐛 Flashing correct keymap

* 🎉 Adding keymap

*  Updating keymap

* 🚨 RGB

*  Revert "🚨 RGB"

This reverts commit 9ceabfb267f8daedaad929231229c703abc12ec4.

*  Improvements to flasher

*  Layout tweaks

* 💄 Messing around with LCD

* 💄 Enabling LCD backlight matching

* 🔧 Updating layout

* 🐛 Fixing console logging

* 🎨 Cleaning up indentation

* 🔧 Adding editorconfig

*  Adding game layer

* 💄 Changing numpad layout

* 🔥 redoing entire layout

It's now more similar to the Planck default layout

*  add workman and dvorak layouts

* 🐛 fix numpad

* 🐛 fix layer orders

* 🐛 fix layer toggling

* 🐛 fix tri-layer switching

* 🐛 fix LCD colors for adjustment layers

* 🔥 remove old flasher project

* 🔥 remove simple_visualizer

* 💄 update LCD colors

* 📝 fix layout comments

* 💄  swapping 2u buttons

* 🔥🔧 removing editorconfig

* 🚨 using 2 spaces

* 📝 add README

*  Revert "💄 Enabling LCD backlight matching"

This reverts commit 51577903dfdc9fea5d33e9ab8cfa9b854e7ae19e.

*  Revert "💄 Messing around with LCD"

This reverts commit fdd9acdae514a3e0e4a7153225053680744980e5.

* 🐛 fix thumb inconsistency in QWERTY

* 🐛 fix media keys

*  add F# shortcuts to vertical 1.5u buttons

*  hold enter for RShift

*  hold for numpad

* 🎨 remove unnecessary breaks

* 🎨 reoganizing layers

*  add Colmak layer

* 🚧🔧 add basic config

*  use more standard numpad layout

* 💄 change layer orders

*  add caps lock on adjust layer

* 🔥 disable space cadet

* 📝 update README

* 🔨 use userspace config

* 🎨 clean up a bit

* 🐛 undefine tapping toggle from base config

* 🔨 rename LED functions
2018-03-16 16:21:22 -04:00
lucwastiaux
e424944a57 update to Ergodox / Atreus Dvorak 42 key layouts (#2504)
* 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
2018-03-16 16:21:00 -04:00
Brian Choromanski
6c74d734c2 Fixed various keymaps and the allocation of "key_combos" (#2526)
* Fixed plank keymaps so that they will compile for planck light

* tv44:budi now compiles

* s60_x:amnesia0287 now compiles

* Fixed allocation of key_combos so that narze keymap for planck can compile correctly

* Disabled rgb on ergodone and infinity

* Enabled tap dance so it compiles

* Added return statement so it compiles

* If compiling on light disable extra functionality

* Properly redefined variable so it compiles
2018-03-16 16:20:09 -04:00
U-LANDSRAAD\drashna
ad1a868701 Move Narze keymap into Ergodox Infinity folder 2018-03-14 22:01:52 -04:00
U-LANDSRAAD\drashna
9db908f7d1 Fix Preonic layout 2018-03-14 21:54:33 -04:00
ajp10304
added1f062 Planck ajp10304 (#2519)
* Planck ajp10304 layout clean up

* Planck ajp10304 layout add Mac layer extensions

* JJ40 ajp10304 layout add Mac layer extensions
2018-03-13 02:22:35 -04:00
uplus
e8e999dcc0 Fix preonic/rev2 bootloader config 2018-03-13 02:22:10 -04:00
Brian Choromanski
4464d90f4d Fixed plank keymaps so that they will compile for planck light 2018-03-13 02:21:18 -04:00
Joe Wasson
2dacf25f28 Add layout support for contra. 2018-03-12 14:22:56 -04:00
Joe Wasson
bfa34d02b0 Add default keymap for contra 2018-03-12 14:22:56 -04:00
adiron
fdeb7f7665 Added Contra keyboard support (#2501)
* Added Contra keyboard support

The configuration came from a source distribution of the firmware on the
Contra's official website.

I have also included a simple MIDI keymap. (And it works!)

* Changes to Contra config and README

* Readme has been changed as requested by jackhumbert
* Config has been changed to add the Cartel and Contra names to
  the USB configuration.
2018-03-09 14:27:31 -05:00
sparkyman215
141a52982e update ymdk96 files 2018-03-09 13:34:37 -05:00
Danny
ac5326595c Add Viterbi fido keymap (#2454)
* Add fido Viterbi keymap

* Cleanup rules files

* Remove unused WIP code
2018-03-09 13:32:50 -05:00
hypnocrat
400f410c45 XD75 keymap - Germanized (#2441)
* Added a heavily customized German keymap to the XD75RE

* A heavily customized alternative layout for the XD75, for German users

* Fixed capitalization, removed unnecessary files

* Hopefully fixed capitalization, some keymap changes
2018-03-09 13:32:03 -05:00
Brian Choromanski
8d6eadf261 Patched some keyboards that won't compile (#2453) 2018-03-09 13:31:42 -05:00
Louis Orleans
0e6e059ef3 layout(planck): dudeofawesome's layout (#2457)
* layout(planck): new layout initial commit

* feat(planck): add workman layout

* fix(planck): switching to workman

* layout(planck): swapping mnext and mplay

* feat(planck): prep for RGB

* perf(planck): remove plover

saves 256 bytes of memory

* perf(planck): remove colemak

saves 128 bytes

* layout(planck): swapping enter and quote

* perf(planck): disable console

frees 1664 bytes

* feat(planck): RGB under-lighting

* refactor(planck): change RGB pin

Uses pin labeled PB2

* feat(planck): add RGB keycodes

* feat(planck): re-enable audio

* style(planck): fixing indentation

Because who indents like that?

* style(planck): clean up keycodes

* layout(planck): remove del

* feat(planck): add tap-space to layer keys

* docs(planck): specify pin on PCB for RGB

* bug(planck): reducing tap time

* Revert "bug(planck): reducing tap time"

This reverts commit 62606b2dc62c5adcc06cfb5978d7e5305411a658.

* Revert "feat(planck): add tap-space to layer keys"

This reverts commit c74de5a4aa45c5563dcaa463395654c29f50eda3.

* perf(planck): remove backlit case

* feat(planck): swap enter and quote

* bug(planck): moving right shift

* doc(planck): update README

* chore(planck): remove makefile

* 🔨 add userspace config

* 📝 update layer ascii art

* 🔥 disable RGB lighting

*  add Colemak

*  add numpad layer

*  add caps lock on adjust layer

* 📝 update layer renders

* 🔥 remove workman sound def

* 🔨 add userspace config

* 📝 update layer ascii art

* 🔥 disable RGB lighting

*  add Colemak

*  add numpad layer

*  add caps lock on adjust layer

* 📝 update layer renders

* 🔥 remove workman sound def
2018-03-09 13:31:08 -05:00
MakotoKurauchi
3313473004 Usb max power (#2502)
* add some comment about Helix customize and auto-setup RGBLIGHT_LIMIT_VAL

* add define USB_MAX_POWER_CONSUMPTION
2018-03-09 13:15:37 -05:00
edwardbrowncross
eba4b08a4a Add the OK60 keyboard (#2488)
* Add the OK60 keyboard

* Fix ok60 incorrect ANSI keymap signature
Add support for default ansi and iso 60 keymaps
2018-03-09 13:14:50 -05:00
Oscillope
7d9dc61504 Fixes for JJ40 and Oscillope keymap (#2496)
* Add navigation layer for hjkl arrow keys

* Fix Oscillope keymap after jj40.h changes. Also fix jj40.c so that it can build without rgblight if you don't want that enabled.
2018-03-08 21:31:08 -05:00
That-Canadian
2bdf1731c3 Canadian planck (#2463)
* Line ending stuff again

* Added my personal Planck layout (finally)
2018-03-08 10:31:27 -05:00
MakotoKurauchi
955b17189a Move rows config to keymap (#2464)
* Fork from Let's Split

* Organizing files

* Delete some keymaps

* I2C and serial enabled at the same time

* Change readme

* add #define HELIX_ROWS for multiple rows

* Delete avrdude flashing script

* Delete makefiles

* Subproject elimination

* Fix lufa path

* Remove PLAY_NOTE_ARRAY usages to get rid of warning.

Fix conflicting function name

* Mousekey change default to off

* Fix to oled display adjust

* make rev2

change pin assign
change keymap

* use master_buffer

* Timing adjustment

* Organizing files

* Change Keymap

* Change Keymap

Add EISU and KANA
Correct 4rows

* NKRO default to disable

* EXTRAKEY_ENABLE default to disable

* add rgb reset key

* rgb custom function enable

*  Extend font

* add RGBLED_POWER

default folder to helix/rev2
RGB_ENABLE to no

* renamed directory

* Disable RGBLIGHT_CUSTOM_DRIVER

* Disable LOCKING_SUPPORT_ENABLE

* Update bootloader setting

* Change readme

* Fixed argument error

* Move rows config to keymap
2018-03-07 17:34:42 -05:00
Lukas Klingsbo
821b492667 Swedish layout for iris 2018-03-07 17:07:05 -05:00
Cole Markham
bd1ad405bf Update Meira for revision 1.1 to enable backlighting by default (#2468)
* Update Meira for revision 1.1 to enable backlighting by default

* Updates to fix other keymaps
2018-03-07 17:06:41 -05:00
Maarten Dekkers
03df19d3f6 Fixed keymap, added capslock led for maartenwut's kbd66 keymap (#2473)
* Fixed keymap, added capslock led

* Removed macro
2018-03-07 17:06:04 -05:00
Sebastian Kaim
bec8d58ad8 Fixed compilation of the ps2avrGB keyboard/firmware (resolving #2425) (#2478)
* Fixed compilation of the ps2avrGB keyboard/firmware

This commit fixes the silent compilation error for the ps2avrGB
keyboard/firmware. This error was caused by a lacking default
keymap which it did not have because all keyboards based on it were
moved to another directory. I also added the required config.h
options so it's possible to compile it again and (probably)
flash it on a b.mini.

Lastly, I updated the README to reflect the current state.

This commit fixes #2425

* Referenced the pearl in the ps2avrGB REAMDE

Added a reference to the pearl keyboard in the README of the ps2avrGB keyboard as it is originally based on the firmware as well.
2018-03-07 17:05:02 -05:00
Blake Newman
6c473c5f38 layout(preonic): blake-newman's layout (#2483)
* layout(preonic): blake-newman's layout

- Add keymap
  - Add Number Pad layout
  - Reconfigure other layouts to my opinionated style
- Add `readme.md` with layout information

* layout(preonic): blake-newman's layout

- Move enter to `raise + space` / `lower + space`
- Replace `enter` to `right shift`
- Explicitly map modifier keys
2018-03-07 17:00:44 -05:00
Corey T Kump
b688c2c0b3 Corvec's Planck layout 2018-03-07 16:58:51 -05:00
Kenny Hung
586aa15cef A small tidy up (#2490)
* Add extra RGUI key to make keyboard more MAC friendly

* Remove enumerators for no longer used layers in layout Skewwhiffy for XD75

* Make layer numbers even better
2018-03-07 16:56:31 -05:00
Pawnerd
12c8ee956d Add knops configurator support (#2474)
* Committed initial version of the knops configurator.

* Added support for the Knops v1.1
2018-03-04 21:29:38 -05:00
Ivan Choi
0092be5925 adding my keymap (#2443) 2018-03-01 07:51:57 -08:00
Maarten Dekkers
381f4e6404 Updated and added maartenwut's layouts (#2444) 2018-03-01 07:51:11 -08:00
Louis Orleans
d7f46f3466 layout(preonic): dudeofawesome's layout (#2449)
* 🎉 duplicate default Preonic keymap

*  add Workman layout

* 🚚 swap backspace and delete

*  enable hold enter for shift

* 🚚 swap media play and next

* 💄 use Planck startup sound

* 💄 add Workman layer sound

*  add numpad layer

* 💄 add new workman sound

* 📝 add README

* 🎨 fix layout formatting

* 📝 add image of numpad layer

* 📦 changing chibios submodule version

to match upstream/master's version

*  add caps lock key on adjust layer

*  reworking numpad layer to match a real numpad

*  add double tap to activate numpad

* 📝 fix layout comments

* 📝 update numpad layer render

*  adding operator keys to left hand on numpad

* 🎨 shorten numpad keycodes
2018-03-01 07:48:15 -08:00
Drashna Jaelre
452d23da52 Update to drashna keymaps and userspace (#2450)
* Add OSL keycodes and macro handling

* Re-add AVRDUDE target

* Userspace document cleanup and commenting

* Fix Orthodox keymap layout (cosmetic)

* Add caveat for KEYMAP Macros

* Minor tweaks

* Enable Bootmagic in Ergodox EZ

* Minor tweaks
2018-03-01 07:46:57 -08:00
Brian Choromanski
7f7f763598 Fixed dead links (#2451)
* Fixed typo of 'confid.h' to 'config.h'

* Fixed broken links in docs

* Fixed a lot of dead links
2018-03-01 07:45:47 -08:00
Gam3cat
2b8a82fb9d M10-A, M65-A, GonNerd keymaps (#2418)
* adding my keymap

* update keymap

* adding gamecat keymap for jc65 keyboard

* updating jc65-gamecat keymap

* updating jc65-gamecat keymap

* updating jc65-gamecat keymap

* updating jc65-gamecat keymap

* M10a keymap and M65a updates

* keymap updates

* keymap updates

* M10a/M65a keymap updates

* M10a/M65a keymap updates

* Delete test.txt

* M65 keymap update

* M65 keymap update

* M65 keymap update

* M65/M10 keymap updates

* M65 keymap update

* M65 keymap update

* M65 keymap update

* M65 keymap update

* M65 keymap update

* M65/M10 keymap update

* M65 keymap update

* M65 keymap update

* M65 keymap update

* M65 keymap update

* M65 keymap update

* Set theme jekyll-theme-cayman

* Set theme jekyll-theme-slate

* M65 keymap update

* M10a/M65a keymap updates

* M10a keymap update

* M65a keymap update

* M65a keymap update

* M65a keymap update

* M65a readme update

* M65a/M10a updates

* M65a readme updates

* M65a/M10a updates

* M65A update

* M65A update

* M65A update

* M65A update

* M65A/M10A keymap update

* M10A keymap update

* Set theme jekyll-theme-tactile

* M10A keymap update

* M65A keymap.c update

* M65 keymap added LED backlight toggle, inc/dec to adjust layer.

* M65 keymap/readme updates.

* M65 keymap fix

* M65 keymap update

* remove theme

* fix comments/readme

* update keymap

* LED backlight update, guess based on reading atmega32u4 documentation for DDRB/PORTB regs, believe DDRB should only be written to once not every time CAPS is hit, but really not too sure.

* LED backlight update, guess based on reading atmega32u4 documentation for DDRB/PORTB regs, believe DDRB should only be written to once not every time CAPS is hit, but really not too sure.

* M65 keymap update

* Updated M65, M10, and gonNerd keymaps.

* update

* del

* keymap updates M65, M10, gonnerd

* update keymaps

* adding back readme that somehow got removed.
2018-02-28 16:44:27 -05:00
Jason Gorman
19b02bf267 Merge of e6v2 stuff as well as my personal keymaps (#2434)
* Checkin of tada keymap and initial commit for e6v2.

* checking in other remaining changes before trying to merge

* Reverting pin change. This was done based on the json orginally provided by exclusive, but it was later determined my map was the correct one based on user testing

* fix extra key for ansi keymap. Didn't include fn as standard ansi shift is not split but still had it in keymap

* Fix default help file and add reset to default
2018-02-28 16:22:53 -05:00
skullY
298ac18dfa remove duplicate #define 2018-02-25 17:41:43 -08:00
skullY
c6ce959f49 Test a shrug macro 2018-02-25 17:40:18 -08:00
Yan-Fa Li
3b801880a0 Custom keymap for clueboard 60
My customized keymap for the clueboard 60.

 - Maps MT(LCTL,ESC) to Caps lock
 - Swaps ALT and GUI for OSX
 - Adds layer for WASD key navigation
2018-02-23 13:25:23 -05:00
Alejandro Blanco
21a37a5245 ErgoDox layout similar to Truly Ergonomic 2018-02-23 13:23:55 -05:00
Sean-Li Murmann
3cff95c8df new customized ErgodoxEz keymap with easy to remember modifiers. (#2400)
* First pass keyboard setup!

* More variation

* Final layer for today

* Added brace to middle key
2018-02-23 13:22:50 -05:00
Isaac Hookom
93eabc4b2c new xd60 layout (#2405)
* new xd60 layout

* fix kc_slsh
2018-02-23 13:22:32 -05:00
ajp10304
01f91bf6f4 JJ40 AJP10304 layout (#2407)
* JJ40 AJP10304 layout
Updated AJP10304 readme.md with formatting

* Revert default JJ40 keymap
2018-02-23 13:21:56 -05:00
Michael Wamsley
2c1ba03a98 Add additional 'tada68' layout. 2018-02-23 13:17:00 -05:00
lucwastiaux
27d32378b5 Update Dvorak 42 key layouts (#2420)
* 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
2018-02-23 13:16:40 -05:00
scott-t-wilson
3f3d0551cd Lfkeyboards updates (#2421)
* Update smk65 fn layer, add iso

* Added Fn layer to ISO keymap

* Fix error when backlight is disabled but lighting isn't

* Remove broke mini1800 iso map

* Add keymaps

* Add LFKPad

* Add split delete to lfk78

* Typo

* Custom keymap
2018-02-23 13:16:10 -05:00
Graham P Heath
f746174874 Graham's Keymaps. (#2422)
* 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
2018-02-23 13:15:34 -05:00
wanleg
3b4d26e344 flashing instructions, keymap changes
* added flashing instructions for Linux & Windows
* minor keymap changes
2018-02-23 13:14:22 -05:00
deadencryption
ee176f2b27 Adds dead encryption keymap 2018-02-23 13:13:09 -05:00
Mason McAllaster
c72c1db68b Planck/NIU_Mini - Mason Layout - Fixing comments, adding missed keys 2018-02-23 13:12:27 -05:00
James Shackleford
d469aaa166 tada68: layout: add new layout 'tshack' (#2431)
* Move to a more cross-platform grep command

* Use sed to strip out AVR_SIZE instead

* tada68: layout: add new layout tshack

Adds "James Shackleford's UNIX layout" for the Tada68
2018-02-23 13:12:04 -05:00
Jason Barnachea
0e92d99cdc Readme img link updates (#2410)
* QMK and JC65 pcb img links updated

link fixes

* personal keymap updates

new v32u4 keymap, updated v32a keymap

* Update readme.md
2018-02-19 14:07:59 -05:00
Danny
3d92b21a3b Update dilly default keymap (#2413)
* Move DEL to correct layer

* Move BNM to the left by one and move Backspace, add more stuff to layers
2018-02-19 13:50:35 -05:00
rempired
78f5a2a3dc 1up60rgb Keyboard Support (#2404)
* Add files via upload

* Update keymap.c

* Update keymap.c

* Update 1up60rgb.c

* Tidy up the code a bit for submission into QMK Master
- Create readme file
- Fix compile issue with standard keymap
- Create default keymap
- Remove unused Makefile

* Keymap Adjustments

* Reworked alternate layouts

* Reworked keymaps

* Update keymap.c

* Update readme.md

Add carriage return to make README cleaner
2018-02-18 02:09:40 -05:00
Danny Nguyen
f67c59aa7b Move hexwire layout into 4x12 layout folder 2018-02-18 02:04:56 -05:00
Danny Nguyen
2a5da62728 Add Dilly keyboard 2018-02-18 02:04:22 -05:00
GlenPickle
d1ea398fb9 Added Chimera LS and Chimera Ergo (#2335)
* Added Chimera Ortho keymap

* added readme

* fixed hardware link

* Added KC_KEYMAP

* resolving conflict

* Added Chimera LS and Chimera Ergo

* Added rules file

* fixed rule files

* Added Chimera Ortho keymap

* Added KC_KEYMAP

* Added Chimera LS and Chimera Ergo

* fixed rule files

* fixed rule files

* fixed image links

* Added KC_KEYMAP

* Added Chimera LS and Chimera Ergo

* Added Chimera Ortho keymap

* fixed rule files

* fixed rule files

* fixed image links

* Fixed KEYMAP vs KC_KEYMAP
2018-02-16 12:03:53 -05:00
Yan-Fa li
bfc2b1205a u/yanfali custom keymap for Iris
Based heavily on the keymap by hexwire.

 1. Moved LALT to LCTL; I don't need CTL because of ESCC.
 1. Moved RAISE to old LALT.
 1. Moved ENTER to old RAISE.
 1. Move QUOTE to old ENTER.
 1. Moved PLUS to old QUOTE.
 1. replaced music next and volume up with browser forward and back
    through history
2018-02-16 12:02:33 -05:00
Pittyolo
7b5c6a895e Update keymap.c 2018-02-16 12:02:14 -05:00
tameone
4f55a7aca1 Iris: Create info.json (#2396)
* Create info.json

* Update info.json
2018-02-16 12:01:51 -05:00
Drashna Jaelre
b0e8de1c97 Fix EE HANDS on splits losing handedness if RGB is enabled (#2399)
* Fix EE HANDS on splits losing handedness if RGB is enabled

* Because I'm an idiot and did a bad cut/paste job
2018-02-16 12:00:39 -05:00
ChrissiQ
1af8f1f201 Let's Split: Minor keymap fixes 2018-02-16 12:00:08 -05:00
Oryhara
b89e318d35 adding my stuff back after hard reset 2018-02-12 16:37:40 -05:00
Fred Sundvik
50038882e0 Set unused USB serial buffer to 1 byte to save memory 2018-02-12 15:48:44 -05:00
Drashna Jaelre
6f5e88277b Update to drashna keymaps (#2381)
* Add to list of predefined rgb colors

* Change layer colors, to reflect new options

* Use Tag Toggle instead

* Clean up macros and add breathing indication for OSM Layer

* Get Viteri Macropad working properly

* Disable unused action features

* Use I2C because that's smaller, apparently

* Remove viterbi-half code
2018-02-12 15:46:35 -05:00
Kayle Knops
6f1d5f73a4 Committed initial version of the knops configurator. 2018-02-12 15:45:05 -05:00
skullydazed
994d94140e
Clueboard hotswap support (#2376) 2018-02-10 17:09:47 -08:00
skullydazed
fa72d4aa5a
Modernize clueboard, add 66_ansi and 66_iso layouts (#2377) 2018-02-10 17:08:37 -08:00
yiancar
88a7fa762f New keyboard: Cu75 (#2374)
* Added Modular keyboards L,R and NUM

Created code modules for the 3 modules of the modular keyboard.
Original idea by MechboardsUK. Uses i2c implementation similar to lets
split

* Remove modular from master

This is to fix incorrect branching

* Addition of cu75

Addition of cu75 keyboard, uses libraries from LFKeyboards directory which are path linked to reduce file duplication.

Minor fix on cu24 readme

* Minor Readme Fix
2018-02-10 17:47:15 -05:00
IslandMan93
cd0c089b49 Diverge 3 initial commit
woo it works

use lets split code

Final working. Uses serial

Update license
2018-02-10 17:28:49 -05:00
Raymond Douglas
5bdc5c1190 Added raylas keymap for TADA68 2018-02-10 17:26:54 -05:00
Jason Barnachea
a972b26274 Add JC65 ps2avrGB keyboard (#2351)
* Adds JC65 ps2avrGB keyboard

* Adds default keymap

* Adds personal keymap

* Backlight On/off support

Migrated code from the BFake. Functionality only on BL_ON, BL_OFF,
BL_TOGG.

* Backlighting config adjustment

Only 1 level supported.

* Personal keymap update

BL toggle added and RGB layer updates.

* Renamed jc65 ps2avrgb directory

Renamed directory for more clarity.

* Default keymap and default rules

* Personal keymap and personal rules

* Group JC65 QMK and PS2 versions

Group JC65 QMK and PS2 versions, Split directories, Readme for parent
folder.

* Default keycaps and personal keymaps re-added

Default and personal keymaps re-added. Keymaps, Readme, Rules.mk, and
config.h

* v32a default keymap rules

Default to no.

* RGB and Backlight default settings

Set to yes.

* Rules.mk defaults for personal keymap

Rules.mk defaults for personal keymap

* Revised keyboard readme make paths

Revised.

* Path correction

* jc65 default folder set

set default pcb to qmk version

* default rules for v32a

set to enable backlight and rgb by default.
2018-02-10 17:24:54 -05:00
Fred Sundvik
8c2ae4a470 Fix reset for STM32 devices 2018-02-10 17:13:38 -05:00
Drashna Jaelre
6835ae8209 Add the ability to disable Music Mode completely (#2339)
* Skip process_music in NO_MUSIC_MODE is defined

* Skip matrix_scan_music if NO_MUSIC_MODE is defined

* Skip music_all_notes_off if NO_MUSIC_MODE is defined

* Leave matrix_scan_music in, because it reduces firmware size by 150b....

* Add docs for NO_MUSIC_MODE
2018-02-08 15:16:06 -05:00
fredizzimo
53ff8a31b6 Merge ChibiOS and LUFA descriptor support (#2362)
* Move lufa descriptor to protocol/usb_descriptor

* Try to compile usb_descriptor on ChibiOS

* Add lufa_utils for ChibiOS

Lufa USB descriptors for ChibiOS

* More lufa_util compatibility fixes

* First compiling version of shared USB descriptor

* Send the usb descriptors

* Fix the CONSOLE output on ChibiOS

* Add errors for unsupported interfaces

* Enable support for vitual serial port USB descriptors

* Implement virtual serial port for ChibiOS

* Cleanup the lufa_utils

Use the default lufa header files

* Add raw hid support for ChibiOS

This is completely untested

* Enable midi compilation on ChibiOS

* Move midi functionality out of lufa.c

* Don't register sysex callback when not needed

* ChibiOS compilation fixes

* Update ChibiOS submodule

* Fix the Midi USB descriptor

It didn't work properly when both Midi and Virtual serial port was enabled.

* Add MIDI support for ChibiOS

* Fix USB descriptor strings on ChibiOS

* Use serial usb driver for raw hid

* Generalize the ChibiOS stream like drivers

This makes the initialization much more simple and eliminates a lot of
the code duplication.

* Convert console output to chibios stream driver

* Fixes for ChibiOS update

* Update the ChibiOS contrib submodule

To include the usb data toggle synchronization fixes

* Fix duplicate reset enumeration on ChibiOS

* Add missing include

* Add number of endpoints check for ChibiOS

* Enable serial USB driver on all keyboards

* Add missing includes when API is enabled withot midi

* Add another missing inlcude
2018-02-08 15:07:46 -05:00
jetpacktuxedo
7d79412f99 Fixed my minivan F-keys 2018-02-08 13:44:41 -05:00
Niles Christensen
57dde3ddba Makes layers consistent with comments 2018-02-08 13:42:58 -05:00
Danny Nguyen
8afbd649f0 Replace Right key on base layer with RShift, convert adjust to KC_KEYMAP format 2018-02-08 13:42:31 -05:00
Legonut
ad01e3c03a New keyboard added "Zen" (#2347)
* New keyboard added

Zen is a split ortholinear currently in group buy.

* remove bad keymap

Keymap was throwing errors

* remove other bad keymap

I should have checked these before haha

* small fix to update folder name

* renamed temp

* renamed to zen

* update folder name

* Slim down matrix code

Suggested by drashna

* move KC_NO

* Update keymap

* change from rev2 to rev1
2018-02-06 23:44:10 -05:00
QMK Bot
f26e6fca8a convert to unix line-endings [skip ci] 2018-02-07 04:05:15 +00:00
KeLorean
0e31d85b8e made changes to my kelorean planck keymap (#2343)
* Planck-swapped up/down arrows,s65x-add dvorak

* Added Dvorak as first layer of default keymap

* planck-swap up and down arrows. s65x-added dvorak

* added colemak to kelorean s65x keymap

* made more changes to kelorean keymap

* just tryinng to fix bc i was not connected upstrem
2018-02-06 23:01:29 -05:00
U-LANDSRAAD\drashna
84a713b05c Remove _quantum functions from custom matrix.c code 2018-02-06 12:25:30 -05:00
KeLorean
2908c0f927 made kelorean keymaps for planck and s65x (#2331)
* Planck-swapped up/down arrows,s65x-add dvorak

* Added Dvorak as first layer of default keymap

* planck-swap up and down arrows. s65x-added dvorak

* added colemak to kelorean s65x keymap
2018-02-04 13:44:58 -05:00
Drashna Jaelre
598384bc10 Update to drashna userspace (Keymap Templating) (#2338)
* Change tapping term to be longer

* Make Audio/Underglow settings permanent

* Use wait_ms rather than _delay_ms

* Readd One Shot Mods

* Switch to Imperial March startup sound

* Move OSM to it's own layer

* Minor Formatting Tweaks

* Keymap Templates and formatting fixes
2018-02-04 13:44:02 -05:00
Harley Laue
ac82cd1ba7 Added personal nyquist & levinson layouts 2018-02-04 13:40:22 -05:00
f3d3
31f5229191 Added dz60 custom layout (#2302)
* Add files via upload

* Update keymap.c

* Delete keymap.c

* Added dz60 banana-split layout

* Added dz60 custom layout

Added layout for dz60 with split spacebar, arrows and other customizations.
2018-02-03 15:22:30 -05:00
jirgn
2f65ab183d just a planck layout (#2320)
* added jirgn keymap from dotfiles

* added jirgn s keymap as copy from default

* [TASK] removed unnecessary colemak and dvorak layouts

* [TASK] added right shift with tab to enter

* [TASK] added ctrl keys beside homerow

* [TASK] added Navigation Layer

removed unnecessary BACKLIT
removed Media Controls in Base Layers

* [TASK] added left Navigation mode  fixed some doc

* [Fix] locked navigation layer by adding a transparent key for nav_mod
keys

* [TASK] added some more symbols and removed lower F1-F12 keys

* [TASK] added some README and a layout design

* [FIX] forced for adding to repo

* [FIX] forced for adding to repo

* [FIX] problem with layerswitching and hanging ctrl

* removed image from repo

* removed github image link with permalink from layout designer

* removed github image link with permalink from layout designer

* replaced image with permalink to layout editor
2018-02-03 15:22:00 -05:00