yohan/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,100 Commits 1 Branch 0 Tags 99 MiB
1ff5fb000f
Commit Graph

2073 Commits

Author SHA1 Message Date
jpetermans
967cf0f6d4 Merge remote-tracking branch 'upstream/master' into user_led_configuration 2017-05-08 15:24:50 -07:00
jpetermans
5df74f3ba7 updated keymap for new led functions 2017-05-08 15:13:02 -07:00
jpetermans
2c5b551970 CLeaned out debug code 2017-05-08 14:35:08 -07:00
jpetermans
52f671c23e small code cleanup 2017-05-08 11:57:40 -07:00
Erez Zukerman
153eb95ab2 Merge pull request #1279 from awpr/master 
Change to per-key eager debouncing for ErgoDox EZ.
 2017-05-07 21:52:00 -04:00
Jack Humbert
b11a5be62c Merge pull request #1278 from shieldsd/master 
Add new keymap for dshields.
 2017-05-07 20:18:23 -04:00
Jack Humbert
0b050f6c33 Merge pull request #1280 from tobsn/patch-1 
lowercase .jpg
 2017-05-07 20:17:47 -04:00
Jack Humbert
05b356dea7 Merge pull request #1282 from coderkun/coderkun_neo2 
Merge changes for coderkun’s Neo2 layout
 2017-05-07 20:16:30 -04:00
TerryMathews
84a358845b Fix compile error 2017-05-07 18:00:06 -04:00
Adam Lee
d099266853 [Miuni32] Rm accidentally committed file 2017-05-07 14:42:21 -07:00
Adam Lee
ba90cf422c Merge remote-tracking branch 'bigtunaio/layouts/adam-lee' into dev 2017-05-07 14:40:37 -07:00
Adam Lee
29df2be2a9 Merge remote-tracking branch 'upstream/master' into dev 2017-05-07 14:35:43 -07:00
TerryMathews
3381254c65 Establish support for Bathroom Epiphanies Tiger Lily controller 
Replacement controller for Filco Majestouch 2 104 key keyboard. BE
advises code will also work with the Black Petal controller - I don't
have one to test with. Tests working perfectly on my Filco.
 2017-05-07 17:23:19 -04:00
dbroqua
230c70e285 - Initial commit for branch DK60 2017-05-07 22:56:27 +02:00
coderkun
d28d390ad6 Update README for keymap “coderkun_neo2” 2017-05-06 12:25:24 +02:00
coderkun
49046f621b Merge tag '0.5.43' into coderkun_neo2 2017-05-06 12:19:45 +02:00
coderkun
9e7448ea89 Fix F-keys on right hand to start on first key 2017-05-06 12:17:51 +02:00
Tobias O
b2083e21a2 lowercase .jpg I think 
i guess that fixes the image link - currently its broken
 2017-05-05 23:55:06 +02:00
Daniel Shields
cb60fe393f Add new keymap for dshields. 2017-05-05 14:41:13 +01:00
Jack Humbert
2704c163da Merge pull request #1272 from Thor77/ps2avrGB-keymap-kc-prefix 
[ps2avrGB] Add KEYMAP without KC-prefix
 2017-05-04 15:07:57 -04:00
Jack Humbert
3af95509b5 Merge pull request #1273 from Vifon/pr_1267_fix 
Add DYN_REC_STOP to the dynamic macros, cleanup PR #1267
 2017-05-04 15:07:04 -04:00
tengg
425f0a768b revise HHKB bootloader_size to 4096 such that sw reset works (#1274) 2017-05-04 10:27:35 -07:00
Thor77
7f3b1232c4 Use KC_KEYMAP for default-keymap 
and remove obsolete explicit line-separator "\"
 2017-05-03 22:13:46 +02:00
Thor77
38b076d22d Add KEYMAP without KC_##-prefix 
and rename old variant to KEYMAP_KC
 2017-05-03 22:01:02 +02:00
jpetermans
b27fb216ef Testing initial blink support 2017-04-30 16:27:46 -07:00
Jack Humbert
26b51383b2 Merge pull request #1266 from ryanmaclean/patch-5 
Adding AMJ60 ANSI Maximized Layout
 2017-04-30 16:57:14 -04:00
Jack Humbert
29026ec023 Merge pull request #1268 from priyadi/promethium 
Promethium keymap update
 2017-04-30 11:18:54 -04:00
Jack Humbert
d1d2b87f97 fixes s60_x keyboard 2017-04-30 10:48:17 -04:00
Priyadi Iman Nurcahyo
343f8d368e Simple RGB backlight theming 2017-04-30 18:04:58 +07:00
Priyadi Iman Nurcahyo
2f28652dcc Syntax fix 2017-04-30 18:03:03 +07:00
Weiyi Lou
c8ac556e63 Update vifon keymap to use DYN_REC_STOP 2017-04-30 19:48:07 +10:00
Weiyi Lou
1201d4910f Add cinaeco hhkb keymap 2017-04-30 19:30:39 +10:00
Ryan MacLean
ff512ea5b4 Addind Sample Maxed Out Keymap 
Keeping hold space for fn1, adding three other user-mappable keys.
 2017-04-29 16:18:26 -07:00
Ryan MacLean
9122b34a47 Adding Maximized Layout 
Both split shifts and HHKB split backspace.
 2017-04-29 16:16:21 -07:00
dbroqua
7180e195e8 Merge branch 'master' of https://github.com/Dbroqua/qmk_firmware 2017-04-29 15:04:01 +02:00
dbroqua
838aae1645 - Fixed bugs in rules.mk for S60-X 
- Updated dbroqua layout for S60-X (added backlight)
 2017-04-29 15:02:54 +02:00
Priyadi Iman Nurcahyo
d8f1949029 Promethium update: demo LED, fix PS2 delay, fix LED ordering, change click frequency 2017-04-29 13:21:27 +07:00
htang156
425e7348d8 Modified ht_156 keymap 2017-04-27 23:12:43 -07:00
jpetermans
b3945c103c Simplified processing in led_controller; more control at user level. 2017-04-26 23:12:25 -07:00
Jack Humbert
26bbfd7812 Merge pull request #1259 from laelath/master 
Added a proper README to the lae3 keymap
 2017-04-26 19:22:36 -04:00
Andrew Pritchard
cd30a60d0e Change to per-key eager debouncing for ErgoDox EZ. 
Empirically, waiting for N consecutive identical scans as a debouncing
strategy doesn't work very well for the ErgoDox EZ where scans are very
slow compared to most keyboards.  Instead, debounce the signals by
eagerly reporting a change as soon as one scan observes it, but then
ignoring further changes from that key for the next N scans.

This is implemented by keeping an extra matrix of uint8 countdowns, such
that only keys whose countdown is currently zero are eligible to change.
When we do observe a change, we bump that key's countdown to DEBOUNCE.
During each scan, every nonzero countdown is decremented.

With this approach to debouncing, much higher debounce constants are
tolerable, because latency does not increase with the constant, and
debounce countdowns on one key do not interfere with events on other
keys.  The only negative effect of increasing the constant is that the
minimum duration of a keypress increases.  Perhaps I'm just extremely
unlucky w.r.t. key switch quality, but I saw occasional bounces even
with DEBOUNCE=10; with 15, I've seen none so far.  That's around 47ms,
which seems like an absolutely insane amount of time for a key to be
bouncy, but at least it works.
 2017-04-26 15:29:39 -07:00
laelath
196740a0bb Expanded lae3 keymap readme 2017-04-26 13:56:01 -07:00
Jack Humbert
5a809ac178 Merge pull request #1258 from smt/smt/hhkb 
Add smt keymap for HHKB
 2017-04-26 15:30:36 -04:00
Jack Humbert
7bd4559b4b Merge pull request #1231 from Dbroqua/master 
S60-X RGB support
 2017-04-25 14:09:41 -04:00
Jack Humbert
9fa7a788d3 Merge pull request #1253 from laelath/master 
Added lae3 keymap
 2017-04-25 14:08:52 -04:00
Jack Humbert
627dd8a73c Merge pull request #1255 from ryanmaclean/patch-4 
Initial Ortholinear Commit for AMJPad
 2017-04-25 14:08:16 -04:00
Josh Black
d6386b108b Add RAMA x Machine Industries M10A to the keyboards directory 2017-04-25 19:00:44 +01:00
Stephen Tudor
4cc41de50b Add smt keymap for HHKB 2017-04-24 11:16:14 -04:00
Justin Frank
e2a5dfdba6 Switched Alt and GUI key places 2017-04-23 19:38:40 -07:00
Ryan MacLean
d27ff5ccf6 Adding Right Layout 2017-04-22 22:34:14 -07:00
Ryan MacLean
2e62ff9807 Initial Ortho Commit (LEFT SIDE) 
Using only one layer, and activating it with two keys at the moment. 
As with previous comments, this isn't final, but is a good starting point for a one-handed keyboard, half a Planck-like ortholinear keyboard, or a sample to show a layout with a function layer.
 2017-04-22 20:49:34 -07:00
Justin Frank
7f3224b117 Added lae3 keymap 2017-04-22 15:15:17 -07:00
Solomon
187c78f3cb Added an additional clueboard layout. (#1252) 
* Current building keymap

* Working media keys

* Added mute key. Fixed volume. Fixed media

* Updating readme

* Swapped readme order
 2017-04-22 06:25:41 -07:00
skullY
973e91078b Tweak the shift_fn keymap so it works 2017-04-21 21:46:01 -07:00
dbroqua
215dd126d0 - Moved S60-X RGB in sub project for S60-X 2017-04-19 22:12:23 +02:00
Jack Humbert
460b5f8751 Merge pull request #1246 from reversebias/master 
Initial support for the Mitosis Keyboard
 2017-04-19 08:43:28 -04:00
reversebias
43fd889d7e Update readme.md 2017-04-19 22:39:44 +10:00
Jack Humbert
95242fe0f1 Merge pull request #1245 from fredizzimo/fix_lcd_pin_configuration 
Fix LCD SS pin configuration
 2017-04-19 07:50:03 -04:00
Jack Humbert
4760b26bec Merge pull request #1244 from ryanmaclean/patch-3 
Adding Maximized Keymap
 2017-04-19 07:49:46 -04:00
Jack Humbert
ff4ad46dca Merge pull request #1243 from Xyverz/master 
Removed LT macros
 2017-04-19 07:47:56 -04:00
cam
43964438fb First Commit 2017-04-19 20:27:49 +10:00
reversebias
3c3be98a06 Delete temp 2017-04-19 20:15:44 +10:00
reversebias
e27c50669a Create temp 2017-04-19 20:12:50 +10:00
Priyadi Iman Nurcahyo
f9d226ca50 tune clicks 2017-04-19 12:35:05 +07:00
Priyadi Iman Nurcahyo
3c7db55ec5 Merge remote-tracking branch 'upstream/master' into promethium 2017-04-19 12:04:15 +07:00
Priyadi Iman Nurcahyo
ce0efa6b9a Fix LED sequence; bug fixes 2017-04-19 12:03:48 +07:00
Fred Sundvik
430a8e1750 Fix LCD SS pin configuration 
There was a typo, so the attempted configuration proably didn't do
what it should have done. I think it left the pin floating, and
could cause the LCD problems issue-1230.
 2017-04-19 07:59:39 +03:00
Ryan MacLean
34130d56f1 Adding Sample Max Layout 2017-04-18 21:54:58 -07:00
Ryan MacLean
0a8df2c5e3 Adding Maximized Keymap 
For use with grid layout pads.
 2017-04-18 21:53:10 -07:00
Xyverz
b844fe7efd LT doesn't work with tri_layer. Removed it from this keymap. 2017-04-18 20:36:26 -07:00
Xyverz
3a00aafd39 swapped RAISE with LOWER in layer-tapping macros. 2017-04-18 18:15:46 -07:00
dbroqua
fecb932945 - Fixed bug in keymap for s60-X RGB 2017-04-18 22:26:32 +02:00
Jack Humbert
be0afd24bf Merge pull request #1239 from priyadi/promethium 
Keymap updates
 2017-04-18 16:17:27 -04:00
Jack Humbert
7a16a30e6a Merge pull request #1236 from Xyverz/master 
Revamp TV44 keymap.
 2017-04-18 16:08:16 -04:00
Jack Humbert
a25d4a90c3 Merge pull request #1235 from siroken3/siroken3 
Siroken3
 2017-04-18 16:06:27 -04:00
Priyadi Iman Nurcahyo
5bc0c4a011 Fix Planck compatibility 2017-04-19 02:55:19 +07:00
Priyadi Iman Nurcahyo
3fa0b66289 Keymap updates and some adjustment for latest version of QMK 2017-04-19 02:52:57 +07:00
Priyadi Iman Nurcahyo
93b2f23bba Promethium rev2 
* 10 more indicator LEDs
* Piezo buzzer
* Uses HC138 decoder to free up 5 pins
* Trackpoint buttons are now part of matrix
 2017-04-19 01:38:08 +07:00
Stick
8665ed3efc small changes 2017-04-18 09:46:07 -05:00
Xyverz
41d45afd2a Fixed a weird diff mishap. 2017-04-17 21:54:02 -07:00
Xyverz
e11cb44926 Merge branch 'tv44_revamp' 2017-04-17 20:20:27 -07:00
Xyverz
a3aadd888f Updated my TV44 keymap to be more planck-like. 
Used the current default planck keymap as a guide.
 2017-04-17 20:15:57 -07:00
David Baldwynn
acd63bc03c Fixed dvorak layout for Atreus50 2017-04-17 12:05:47 -07:00
Xyverz
a343188dcf macros to make keymap reading easier. 2017-04-16 21:52:49 -07:00
Xyverz
a22286e834 Added keymap to TV44 Revamp 2017-04-16 21:09:23 -07:00
htang156
4634e3802c Added simple macros to test. 2017-04-16 17:39:04 -07:00
htang156
c4f93e237e Added media layer for ht_156 2017-04-16 16:08:31 -07:00
htang156
f9aa75fe95 Added ht_156 keymap files 2017-04-16 15:31:05 -07:00
Adam YH Lee
9d4050586d Merge branch 'master' into layouts/adam-lee 2017-04-16 15:20:31 -07:00
Adam YH Lee
857600aa4b Merge branch 'master' into dev 2017-04-16 15:19:20 -07:00
Adam YH Lee
7e930626eb Add a personal layout for adam 
Collectively we should keep on working on the "default" layout.
I am adding my own layout to freely explore adjustments
and new features.
 2017-04-16 15:06:08 -07:00
Adam YH Lee
22afddb8e8 Replace RALT with RSFT 2017-04-16 14:50:25 -07:00
htang156
3bfe4cdb4f Added END and other keymap file formatting. 2017-04-16 14:19:51 -07:00
htang156
1bab72383c Added DEL and F1 to F12 keys 2017-04-16 14:10:29 -07:00
htang156
ccabf70aeb Added keymap commets to default layout. 2017-04-16 13:40:03 -07:00
jpetermans
046f1baf30 more stable lock led process, added debugging code 2017-04-15 14:37:55 -07:00
dbroqua
b133b74897 - Added S-60-X RGB directory (based on qmk.sized.io work) 2017-04-15 16:34:33 +02:00
jpetermans
c0ec1756af Added backlight step functionality 2017-04-14 18:20:12 -07:00
Adam YH Lee
a9f4596062 Add TAB, N, LSFT on Layer 2 2017-04-14 00:02:25 -07:00
Adam YH Lee
f076f16e13 Add KC_T on Layer 2 2017-04-13 23:50:57 -07:00
Adam YH Lee
4810a4a812 Add LCTL + L on Layer 2 2017-04-13 23:47:50 -07:00
Thomas Fitzsimmons
bc7b1843ba Fix KEYMAP_YORUIAN macro 
Fix the ordering of the arguments to the KEYMAP macro.
 2017-04-14 02:06:58 -04:00
jpetermans
ec1e936dfb fixed bit shift in led_set_bit 2017-04-13 17:51:37 -07:00
jpetermans
1b1adf35bb more flexible led processing functions, all and on/off/toggle 
functioning
 2017-04-13 17:15:24 -07:00
Fred Sundvik
94b14bdd6a Add missing serial_link.h include 
Which fixes a warning when building Ergodox Infinity as a righthand
master.
 2017-04-13 23:00:27 +03:00
Adam YH Lee
f90321bdcb Update keymap - hopefully more usable 2017-04-13 09:25:05 -07:00
Fred Sundvik
08b9eb26c5 Fix warnings in CMD-Preonic 
The startup_sound is defined using MUSICAL_NOTEs, since non-constant
initializer expressions are not allowed in C.
 2017-04-13 16:00:29 +03:00
Fred Sundvik
a619b93e38 Fix warnings in planck/lucas keymap 
Register the unshifted version DE_LESS, rather than the shifted DE_MORE
 2017-04-13 16:00:29 +03:00
Fred Sundvik
df30d18458 Fix warnings in kitten_paw/ickerwx keymap 2017-04-13 16:00:29 +03:00
Fred Sundvik
bbe8876c8d Rename MS-sculpt-mobile to MS_scuplpt_mobile 
Subprojects with "-" have problems, since the build system creates
a define containing the subproject name, and "-" is illegal in
macro names.
 2017-04-13 16:00:29 +03:00
Fred Sundvik
738b8d2b9c Add SKIP_VERSION option to speed up compilation 2017-04-13 16:00:29 +03:00
Fred Sundvik
e950d4e12f Fix frosty_flake warning when print is disabled 2017-04-13 16:00:29 +03:00
Fred Sundvik
2d1528c69f Fix keymap yoruian on Infinity 2017-04-13 16:00:29 +03:00
Fred Sundvik
12159e782c Fix overflow warning in ordinary keymap 2017-04-13 16:00:29 +03:00
Fred Sundvik
db6d7207b5 Fix overflow warnings in dvorak_programmer 2017-04-13 16:00:29 +03:00
jpetermans
15635817b5 Updated lock led init 2017-04-12 23:32:38 -07:00
Adam YH Lee
dddbcc2af3 Replace double quote with comma 2017-04-12 22:11:08 -07:00
Adam YH Lee
592ff53e41 Enable RGB Animation 2017-04-12 21:19:00 -07:00
Adam YH Lee
73625a603a Merge branch 'master' into miuni32-OA 2017-04-12 20:58:36 -07:00
Johannes Larsson
835adb7848 colemak layout maybe 2017-04-12 23:11:51 +02:00
Jack Humbert
d3301c0f8b Merge pull request #1220 from joedevivo/master 
mimic atreus firmware defaults
 2017-04-12 15:42:46 -04:00
Jack Humbert
456570efa4 Merge pull request #1212 from Xyverz/master 
atreus keymap overhaul
 2017-04-12 12:46:08 -04:00
Jack Humbert
30ad505dd0 Merge pull request #1213 from nstickney/master 
ErgoDox Familiar layout
 2017-04-12 12:45:45 -04:00
Jack Humbert
0de2597f7c Merge pull request #1216 from Khord/master 
Added breathing macros/mappings and removed mappings to unused layouts
 2017-04-12 12:45:03 -04:00
Jack Humbert
b7f1ea967a Merge pull request #1222 from kamisamamizu/patch-1 
Fixed position of BSLS and BSPC on the xd60
 2017-04-12 12:44:11 -04:00
kamisamamizu
446b34edec Fixed position of BSLS and BSPC 
They were in the incorrect positions before.
 2017-04-12 12:18:38 +02:00
Adam YH Lee
91b11bb4dd Update default layout 
This is a 2U Spacebar layout. Spacebar is between V and B.

Issue:

	- RGB MOD does not seem to do anything
 2017-04-12 01:12:16 -07:00
jpetermans
0881f2dbfa fixed write_led_page col shift, added option for lock led display 2017-04-11 23:33:48 -07:00
jpetermans
d8e9c183be led init code missing pwm writes for Frame 1 2017-04-10 22:23:45 -07:00
jpetermans
dda858c437 revised led controller code to allow for more options 
unable to switch picture displays
 2017-04-10 17:36:47 -07:00
Joe DeVivo
dc96fa24e4 mimic atreus firmware defaults 2017-04-10 17:19:27 -07:00
Fred Sundvik
65b7bf6878 Extract Ergodox default visualizer into simple_visualizer 
It's good enough if you only want to change the lcd text and color.
 2017-04-09 18:34:59 +03:00
Fred Sundvik
c5d2b7ff16 Rename led test to led_keyframes and move animation to Ergodox 2017-04-09 18:34:59 +03:00
Fred Sundvik
306353bf06 Create a file for shared Ergodox Infinity animations 2017-04-09 18:34:59 +03:00
Fred Sundvik
c6ca996f4e Combine startup and resume animations 2017-04-09 18:34:59 +03:00
Fred Sundvik
ed1710589f Fix suspend not disabling backlight 2017-04-09 18:34:59 +03:00
Fred Sundvik
3074269c4a Move the logo drawing keyframe to lcd_keyframes 2017-04-09 18:34:59 +03:00
Fred Sundvik
df67169d42 Move LCD logo to visualizer resources 2017-04-09 18:34:59 +03:00
Fred Sundvik
3eb8785e87 Add automatic flush for the LCD screen 2017-04-09 18:34:59 +03:00
Fred Sundvik
995002fa91 LCD initialization sequence according to the docs 
The LCD initialization show now be much better and faster with no
flickering at the startup.

Also fix the contrast control.
 2017-04-09 18:34:59 +03:00
Fred Sundvik
3994fb1e79 Yet another try to fix the LCD corruption 
It turns out that the ChibiOS K20 SPI driver doesn't handle the
chip select, so it needs to be done manually. Acquiring the bus is
not enough since the pin was in the wrong mode. This is now fixed.

Also increase the frequency of the SPI from around 200kHz to nearly
20 Mhz.
 2017-04-09 18:34:59 +03:00
Fred Sundvik
b7041d06ae Move common visualizer keyframes into visualizer_keyframes.h 2017-04-09 18:34:59 +03:00
Fred Sundvik
64d63ab422 Remove the need to manually enable the visualizer 2017-04-09 18:34:59 +03:00
Fred Sundvik
1e7585e767 Separated backlight and LCD disable/enable 
Also moved them to correct places
 2017-04-09 18:34:59 +03:00
Fred Sundvik
5ba228b684 Move LCD backlight keyframes to its own file 2017-04-09 18:34:59 +03:00
Fred Sundvik
5815c5d317 Move LCD keyframes to its own file 2017-04-09 18:34:59 +03:00
Fred Sundvik
05bc4880dd Tweaks to the Ergodox default visualizer 
No animation, display led statuses and layer name on the same screen
Don't display layer bitmap
Fully saturated colors for caps, less saturated ones normally
 2017-04-09 18:34:59 +03:00
Fred Sundvik
fa6da78ff3 Simple layer display on Infinity Ergodox default layout 2017-04-09 18:34:59 +03:00
Fred Sundvik
65e8127c91 Add visualizer for Ergodox default 2017-04-09 18:34:59 +03:00
Fred Sundvik
5fbaf31dc2 Brightness for Ergodox Infinity emulated LEDs 2017-04-09 18:34:59 +03:00
Fred Sundvik
39385144e7 Emulate Ergodox EZ leds by LCD colors 2017-04-09 18:34:59 +03:00
Fred Sundvik
9a4ce28683 Display layer bitmap and keyboard led states on the LCD 2017-04-09 18:34:59 +03:00
Fred Sundvik
951b6f33a0 CIE 1931 for the LCD backlight 2017-04-09 18:34:59 +03:00
Fred Sundvik
f113f95440 Move CIE1931 and breathing tables to its own file 2017-04-09 18:34:59 +03:00
Fred Sundvik
bc97413bf7 Disable LEDs on Infinity Ergodox 2017-04-09 18:34:59 +03:00
Fred Sundvik
e6f7a8a47a Display QMK logo at startup of Infinity Ergodox 2017-04-09 18:34:59 +03:00
Fred Sundvik
a8f5897b97 Add support for blitting to the Infinity LCD 2017-04-09 18:34:59 +03:00
Fred Sundvik
2b24d35846 Hopefully finally fix the corrupt LCD 
The SPI bus is now selected and deselected before each set of commands.
Also speed up things by buffering many commands into a single batch.
 2017-04-09 18:34:59 +03:00
Fred Sundvik
f5c8941652 UGFX is compiled once per keyboard instead of keymap 2017-04-09 18:34:59 +03:00
Fred Sundvik
bb86be1f1f Remove unneeded makefile include 2017-04-09 18:34:59 +03:00
Fred Sundvik
aee9b10e92 Add a keyboard specific visualizer 2017-04-09 18:34:59 +03:00
Dylan Khor
a875299d9a Added breathing macros and removed mappings to unused layouts 2017-04-09 02:02:40 -04:00
Xyverz
a11053bda8 Cleaned up the keymap: 
Added MOD_TAP aliases for keymap.c readability.
Updated README to document said changes.
Added additional Dvorak layer to make using the CMD key easier on Macs.
 2017-04-08 22:53:46 -07:00
Xyverz
9237b95ebe More missed keycodes; added PSCR, SLCK, and PAUS to ADJUST layer. 2017-04-07 19:42:05 -07:00
Xyverz
6b0842760b Corrected a missed typo in the readme. 2017-04-07 19:23:27 -07:00
jpetermans
a2ac883779 add ability to toggle individual led by address 2017-04-07 15:58:17 -07:00
Stick
bcf70c0203 ErgoDox Familiar layout v1 2017-04-07 16:04:43 -05:00
Xyverz
3607522c12 More tweaks to keymap and readme. 2017-04-06 22:26:13 -07:00
Xyverz
303bc6999e Merge remote-tracking branch 'upstream/master' 2017-04-06 22:07:34 -07:00
Xyverz
8813365ec5 Added readme 2017-04-06 22:03:17 -07:00
Xyverz
3a5f9faca9 Reworked Atreus keymap, added README 2017-04-06 22:02:38 -07:00
jpetermans
af13e9a12d Moved led page arrays to keymap.c and added keymap header to define 
individual led addresses
 2017-04-06 16:27:51 -07:00
jpetermans
d89114400c Small keymap tweak and clean up. 2017-04-06 15:22:13 -07:00
jpetermans
56be300757 Add Kinetis_i2c settings consistent with whitefox mcuconf 2017-04-06 14:23:14 -07:00
jpetermans
91f2e9fb5e match hal settings to whitefox, fix make rules 2017-04-06 13:53:18 -07:00
jpetermans
02ef122cbb Add led_controller.h to user keymap.c 2017-04-06 13:51:33 -07:00
jpetermans
f66361d678 add led init function to header for use in keymap.c 2017-04-06 13:48:31 -07:00
jpetermans
da4c2d2e3e Adjust led_controller.c matrix sttings and init function 2017-04-06 13:46:54 -07:00
jpetermans
b73c935d36 Added tmk whitefox led files 2017-04-06 13:45:15 -07:00
jpetermans
dfb0a512a0 Added personal configs and keymap to infinity60/keymaps 2017-04-06 13:43:22 -07:00
Stick
7e38541124 Merge remote-tracking branch 'upstream/master' 2017-04-06 13:52:53 -05:00
Adam Lee
8e7be3adda Set Bootloader Size to 4K 
Use Atmel's default bootloader size, rather than Teensy 2.0's [1].

[1] https://github.com/qmk/qmk_firmware/pull/1207#discussion_r109712786
 2017-04-04 10:21:32 -07:00
Adam YH Lee
236826e7c1 Merge branch 'miuni32-OA' 2017-04-03 20:36:13 -07:00
Adam YH Lee
e18768aa77 Add B1gtuna Miuni32 
Miuni32 is a 30% ortholinear board.
Please visit www.bigtuna.io for more information.
 2017-04-03 20:34:10 -07:00
Jack Humbert
d75a44a02b Merge pull request #1206 from Dan-Saunders/patch-2 
Create twolayer.c
 2017-04-03 21:13:29 -04:00
Jack Humbert
27aa185222 Merge branch 'master' into master 2017-04-03 21:06:40 -04:00
Stick
bee9183e7f Merge remote-tracking branch 'upstream/master' 2017-04-03 16:59:27 -05:00
Dan Saunders
1454d466e7 Create twolayer.c 
fixed issue where Default.c "function key" does not work (actually it's changing my LED steps). Changed layout to be more user friendly for people that use the standard spacebar milled top plate.
 2017-04-03 15:14:45 -06:00
Jack Humbert
3ac9259742 Merge pull request #1204 from nooges/lets-split-fixes 
Let's split fixes
 2017-04-03 16:17:55 -04:00
Danny Nguyen
fbd9d04559 Include use of either TRS or TRRS 2017-04-03 16:16:46 -04:00
Erez Zukerman
13c882a1fb disables space cadet rollover 2017-04-03 15:11:42 -04:00
Danny Nguyen
ed9c18e866 Remove flip-half from keymap 2017-04-03 14:00:33 -04:00
Danny Nguyen
133ed52466 Update Let’s Split readme 2017-04-03 13:24:20 -04:00
Danny Nguyen
e3aeab356a Move SSD1306 function declarations to header file 2017-04-03 13:24:20 -04:00
Danny Nguyen
d90ac76295 Move defines for RGB to after the config.h include 2017-04-03 13:24:20 -04:00
Danny Nguyen
563961328b Rename COMPACT_KEYMAP to KC_KEYMAP and move to lets_split.h 2017-04-03 13:24:20 -04:00
Danny Nguyen
d0cfaba6d2 Revise KEYMAP macro to make left and right halves more clear 2017-04-03 13:24:11 -04:00
ishtob
4e51c1e3ca Update ssd1306.c 2017-04-03 13:17:41 -04:00
Danny Nguyen
48f4c5997b Move defines for RGB to after the config.h include 2017-04-03 12:06:28 -04:00
Danny Nguyen
344ebbac43 Revert removal of avrdude make option 2017-04-03 11:32:54 -04:00
Jack Humbert
da53f3a529 Merge pull request #1194 from tong92/master 
Adds tong92's keymap to tv44
 2017-04-02 22:30:11 -04:00
Jack Humbert
8b3fa01667 Merge pull request #1195 from fudanchii/kbod 
Handwired 60% keyboard with 8x8 matrix
 2017-04-02 22:29:54 -04:00
Jack Humbert
ef4a7a0aa0 Merge pull request #1196 from Dbroqua/master 
GH60 - MX HHKB with 7U spacebar
 2017-04-02 22:29:24 -04:00
Xyverz
c034b61b1a Merge remote-tracking branch 'upstream/master' 2017-04-02 14:49:39 -07:00
Xyverz
7873046479 removed my handwired boards to a new branch. 2017-04-02 14:48:33 -07:00
Damien
3e41cde9f9 Merge pull request #19 from qmk/master 
Merge from qmk
 2017-04-02 23:29:12 +02:00
dbroqua
e7347ff0de Merge remote-tracking branch 'origin/master' 2017-04-02 23:27:57 +02:00
dbroqua
9e72b7e7e9 - Added MX HHKB like for gh60 with 7u space bar 2017-04-02 23:25:26 +02:00
Nurahmadie
649d08742a Use tap-toggle to move between layers. 
- Add PDOT key
 2017-04-02 18:27:28 +07:00
Nurahmadie
15ddaa7f19 Fix layer stuck, and add numpad support 2017-04-02 18:27:28 +07:00
Nurahmadie
f5d78c739d Forgot semicolon, and add reference link 2017-04-02 18:27:28 +07:00
Nurahmadie
10105f645a Add README 2017-04-02 18:27:28 +07:00
Nurahmadie
c9dd11d5ab Enable alt-F4 without [Fn] 
- Add led indicator when keymap not on base layer \o/
 2017-04-02 18:27:28 +07:00
Nurahmadie
af7430b896 Add capslock led, and audio buttons 
- Also change layer switch to momentary
 2017-04-02 18:27:28 +07:00
Nurahmadie
7614c6b7a7 Remove lead keys, fix some typos, rearrange layers 2017-04-02 18:27:28 +07:00
Nurahmadie
8b206e1e75 Add initial keymap 
*crossfingers*
 2017-04-02 18:27:28 +07:00
Nurahmadie
f8ed4ed573 Initial work for my kbod support in qmk_firmware 
- Wiring layout done

No actual keymap yet
 2017-04-02 18:27:27 +07:00
=
e508b5e04e Adds tong92's keymap to tv44 2017-04-02 18:27:24 +09:00
coderkun
049f906b5e Fix keymap “coderkun_neo” to use LALT instead of RALT 2017-04-01 12:17:41 +02:00
coderkun
021edb6ec6 Add several Unicode symbols to keymap “coderkun_neo2” 2017-04-01 12:06:27 +02:00
coderkun
c74f47555c Add keymap diagrams to readme of keymap “coderkun_neo2” 2017-04-01 11:15:20 +02:00
coderkun
605c4129cc Merge branch 'master' into coderkun_neo2 2017-04-01 10:56:29 +02:00
nielsenz
d1e66e2e07 Worked around some new Makefile issues. 2017-03-30 20:10:34 -07:00
Callum Oakley
b9225a28f2 changed hotkey cluster to accomodate awkward software... again 2017-03-30 19:08:15 -07:00
Callum Oakley
200ae0c519 changed hotkey cluster to accomodate awkward software 2017-03-30 19:08:15 -07:00
Xyverz
571f39da66 Tidied up keymaps, Makefiles that actually work, Clueboard make v1.0 2017-03-29 22:32:39 -07:00
Zay950
2366ebfbbd Merge branch 'master' into to_push 2017-03-29 12:00:38 -07:00
Jack Humbert
942f2ccee4 Merge pull request #1183 from Rovanion/real-master 
Added instructions for how to build and flash the firmware with teensy_cli
 2017-03-29 09:45:22 -04:00
Rovanion Luckey
d6e51d2008 Added link to the teensy linux page. 2017-03-29 09:34:20 +02:00
Jack Humbert
b83ae5ae5c Merge pull request #1182 from henxing/default_atreus_layout 
Default atreus layout
 2017-03-28 14:12:41 -04:00
Ole Anders
6de7e5d8dc typo removed {3 ... 2017-03-28 18:45:26 +02:00
Ole Anders
85cac39529 fixed capitalization issue (checkTime => checktime) 2017-03-28 18:41:04 +02:00
Hugh Enxing
3fdc45b4e9 Merge branch 'master' into default_atreus_layout 2017-03-28 12:11:49 -04:00
Ole Anders
411cd4fae2 moved checktime out of function 2017-03-28 17:30:15 +02:00
Ole Anders
f504082f7f declaring checktime before the function it is used in. 2017-03-28 17:17:08 +02:00
Ole Anders
256abc64d5 fixed function to not accept any arguments. 
As per Pramod's comment on stack overflow:

In C int foo() and int foo(void) are different functions. int foo()
accepts an arbitrary number of arguments, while int foo(void) accepts 0
arguments. In C++ they mean the same thing. I suggest that you use void
consistently when you mean no arguments.
 2017-03-28 17:08:01 +02:00
Ole Anders
1b821eca66 removed varable trace option from makefile 2017-03-28 16:55:25 +02:00
Ole Anders
37b7539af3 slight cleanup as per recommendation 2017-03-28 16:52:56 +02:00
Ole Anders
c72ca58528 Moved key_timer out of function. 2017-03-28 16:50:44 +02:00
Ole Anders
48dfc77718 removed a carriage return 2017-03-28 15:58:46 +02:00
Ole Anders
62faa20ef6 Merge remote-tracking branch 'refs/remotes/qmk/master' 2017-03-28 15:55:33 +02:00
Ole Anders
d5ee0194ab fixed #1139 issues 
A fix described by jackhumbert has been sorted out now.
 2017-03-28 15:43:04 +02:00
Jack Humbert
5e4daf1c6d Merge pull request #1174 from nooges/atreus50 
Add Atreus50 keyboard
 2017-03-28 09:34:26 -04:00
Jack Humbert
7e37daa2ce Merge pull request #1112 from newsboytko/newsboytko/midi-keycodes 
Flesh out MIDI support
 2017-03-28 09:26:54 -04:00
Jack Humbert
cc2fb56ed8 Merge pull request #1167 from smt/smt/satan 
Add smt keymap for Satan 'GH60'
 2017-03-28 09:18:55 -04:00
Jack Humbert
fa09189195 Merge pull request #1162 from Khord/master 
My customized keymap + some tunes for the song list
 2017-03-28 09:17:16 -04:00
Danny Nguyen
71857ebc3f Move Atreus50 to hardwired directory and update README 2017-03-28 09:17:09 -04:00
Jack Humbert
6e688ad5c2 Merge pull request #1172 from nooges/hexwire-fixes 
Let's Split hexwire keymap fixes
 2017-03-28 09:16:47 -04:00
Jack Humbert
99b7b50130 Merge pull request #1157 from jtbarrett/tada68_default 
Update readme and default layout for TADA68
 2017-03-28 09:15:57 -04:00
Jack Humbert
c948404739 Merge pull request #1180 from mattdibi/master 
Italian layout for ergodox keyboard
 2017-03-28 09:14:03 -04:00
Jack Humbert
8a0cf32cf5 Merge pull request #1171 from ishtob/master 
SSD1306 I2C OLED display support for let's split
 2017-03-28 09:13:41 -04:00
Jack Humbert
0f986a1951 Merge pull request #1168 from newsboytko/newsboytko/frosty-flake 
Support Frosty Flake Controller (CM Storm QFR)
 2017-03-28 09:10:55 -04:00
Jack Humbert
a7811781c5 Merge pull request #1178 from cheesemacfly/master 
XD60 different layout
 2017-03-28 09:10:02 -04:00
Jack Humbert
417202109b Merge pull request #1163 from jprMesh/atreus62_KC_KEYMAP 
Added KC_KEYMAP macro for old style keymaps in Atreus62
 2017-03-28 09:09:35 -04:00
mattdibi
2104900030 Removed images from ergodox ez italian layout 2017-03-28 10:19:25 +02:00
mattdibi
221b27c508 Fixed layout title in ergodox ez italian keymap 2017-03-28 10:15:18 +02:00
mattdibi
b9b9a59f22 Fixed italian kymap readme 2017-03-28 10:13:29 +02:00
mattdibi
512eb5e1d5 Updated readme 2017-03-28 10:10:24 +02:00
mattdibi
b6b85ed413 Added italian layout 2017-03-28 09:56:07 +02:00
Stick
b6280d0cac unsatisfied with ESC/GRV/TAB positioning 2017-03-27 21:56:47 -05:00
Stick
a47e916635 Merge remote-tracking branch 'upstream/master' 2017-03-27 21:19:36 -05:00
Stick
a03d946d0c fixed unicode input issue 2017-03-27 21:18:12 -05:00
Nicolas Guelpa
a32436d5a1 Create README.md 2017-03-26 15:20:44 -04:00
Nicolas Guelpa
a89ee25db8 Add files via upload 2017-03-26 15:16:55 -04:00
Nicolas Guelpa
c0a6c5f806 fixing layout 2017-03-26 15:07:19 -04:00
Nicolas Guelpa
739249ff0d Adding different layer 2017-03-24 20:18:59 -04:00
Hugh Enxing
25f2295ba8 Swapped placement of Ctrl and Alt keys to match Technomancy's 
default layout
 2017-03-24 14:31:02 -04:00
Danny Nguyen
8775a13658 Add RGB support 2017-03-23 14:46:58 -04:00
Danny Nguyen
63e47a6425 Add RGB support for Let’s Split v1 2017-03-23 12:23:20 -04:00
Danny Nguyen
0520341ce4 Cleanup keymap 2017-03-23 11:31:07 -04:00
Danny Nguyen
edfb50ea56 Initial commit for Atreus50 with working audio 2017-03-23 09:42:32 -04:00
Danny Nguyen
e5c5902e95 Move keymap into config file 2017-03-23 08:51:29 -04:00
Danny Nguyen
f3e3ff29a3 Add Makefile in keymap dir 2017-03-23 08:46:35 -04:00
Danny Nguyen
91776772fd Remove line for hands selection via EEPROM, reduce tap duration from 200ms to 150ms 2017-03-23 08:46:35 -04:00
ishtob
2573e581a5 Update readme.md 2017-03-22 15:56:45 -04:00
ishtob
d5f56e91e4 Update i2c.c 2017-03-22 15:50:52 -04:00
ishtob
bb413383ee Update i2c.c 2017-03-22 15:50:18 -04:00
ishtob
092416325b Update i2c.c 2017-03-22 15:49:21 -04:00
ishtob
be0cfbb97e Update i2c.c 2017-03-22 15:48:56 -04:00
ishtob
732a7f2be9 Update matrix.c 2017-03-22 15:47:53 -04:00
ishtob
ebb46694e5 Update split_util.c 2017-03-22 15:45:45 -04:00
ishtob
1f7b8a0343 Update matrix.c 2017-03-22 15:45:15 -04:00
ishtob
d1865db599 OLED code cleanup 2017-03-22 15:19:01 -04:00
ishtob
80270a2791 Add files via upload 2017-03-22 15:14:33 -04:00
ishtob
30f4507492 OLED code cleanup 2017-03-22 15:11:03 -04:00
ishtob
65317a3a02 Added OLED SSD1306 support to I2C 2017-03-22 15:04:11 -04:00
ishtob
423c68c210 Merged Fliphalf, now defined in config, added OLED 
Can now use the following in the keymap config.h to call the flipped matrix

```
#define FLIPHALF
```
 2017-03-22 15:02:49 -04:00
ishtob
3a7083d810 Delete rules.mk 2017-03-22 15:00:00 -04:00
ishtob
a4bdd6d084 Delete rev2fliphalf.h 2017-03-22 14:59:54 -04:00
ishtob
d012b01108 Delete rev2fliphalf.c 2017-03-22 14:59:42 -04:00
ishtob
6167d7937c Delete config.h 2017-03-22 14:59:32 -04:00
ishtob
dfb5a0e8f4 Delete Makefile 2017-03-22 14:59:20 -04:00
ishtob
f0962bce50 Add files via upload 2017-03-22 14:55:13 -04:00
skullY
7a9437a2e3 Fix a typo 2017-03-21 22:24:34 -07:00
skullY
452949f913 Add #1170 to all the clueboard keymaps 2017-03-21 22:06:47 -07:00
tengg
3cba7a43d9 typo fixed 2017-03-22 00:33:44 -04:00
tengg
a89998b977 fix typo 2017-03-22 00:28:59 -04:00
tengg
9e0ca927f9 fixed a bug related to mod + Grave with combined ESC/Grave key 
This only applies to keymaps that has combined esc/grave. Here we call it theKEY.
Think about the motion when we do shift + theKEY (typing ~), or CMD + theKEY (switching window on MAC). Based on the original code, we must do following sequence:  press shift -> press theKEY -> release theKEY -> release shift. However, it is very possible and natural that we do this stroke sequence instead: press shift -> press theKEY -> release shift -> release theKEY.

If we do the 2nd stroke sequence, the code will del_key(ESC) instead of (GRV) when we release theKEY. This caused some inconvenient issues and ghost typing.

By adding a flag, this issue is eliminated and will not affect any other functions.
 2017-03-22 00:03:30 -04:00
Stephen Tudor
dce3847ebb Use single _FUNC layer. Move RESET and base layout-changing keys to _FUNC. 2017-03-20 14:12:43 -04:00
Dylan Khor
0ec07ddc1c Merge branch 'master' of https://github.com/Khord/qmk_firmware 2017-03-20 13:16:19 -04:00
Dylan Khor
d7f2bd2964 add pgup, pgdn, home, end 2017-03-20 13:14:48 -04:00
Stephen Tudor
34c5f8094e Remove tap-dance. Raise will be accessed via holding shift while lower is active 2017-03-20 07:43:45 -04:00
Stephen Tudor
b10d950708 Use normal backtick in ESC spot - I've mapped ESC to caps lock 2017-03-20 07:43:24 -04:00
Stephen Tudor
3399e39297 Fix shift tap-dance (can't use one-shot layer) 2017-03-20 07:26:28 -04:00
Gabriel Young
b37f510f32 clean up config 2017-03-19 21:19:05 -07:00
Gabriel Young
a3a304db9a clean up docs and provide defaults for keymap 2017-03-19 21:11:17 -07:00
Gabriel Young
db2da37561 update docs 2017-03-19 20:56:45 -07:00
Gabriel Young
df874a228a fix whitespace 2017-03-19 20:46:56 -07:00
Gabriel Young
7e9ca9a976 support LEDs 2017-03-19 20:45:10 -07:00
Gabriel Young
a43ae7c92f Swap rows and columns to match the schematic 2017-03-19 20:34:53 -07:00
Gabriel Young
4a97ef6c48 start to define keymap; annoying because rows and columns are swapped from schematic 2017-03-19 19:55:55 -07:00
Gabriel Young
d7fc236540 successfully read data from the matrix 2017-03-19 15:59:21 -07:00
Dylan Khor
561da65606 Missing comma 2017-03-19 00:14:43 +00:00
Dylan Khor
ca544ecfb6 Don't feel like tap dancing arrows anymore 2017-03-19 00:07:48 +00:00
Gabriel Young
19fd20261b sketch out frosty flake matrix using custom matrix.c based on kitten paw 2017-03-18 16:19:10 -07:00
Gabriel Young
3766f902a0 boilerplate project created with new_project.sh 2017-03-18 15:38:03 -07:00
jprmesh
e123ed8d5f Added KC_KEYMAP macro for old style keymaps in Atreus62 2017-03-17 09:23:55 -04:00
Dylan Khor
e03ddbe118 tap dance working for esc and arrows 2017-03-16 18:13:53 +00:00
Dylan Khor
4b1d0c5859 remove const 2017-03-16 17:36:31 +00:00
Dylan Khor
c7cddfc539 test td changes 2017-03-16 13:27:26 -04:00
Dylan Khor
6ca1c49d38 test fixes for tap dane 2017-03-16 13:07:01 -04:00
Dylan Khor
0c8f71e3c7 test tap dance 2017-03-16 12:44:56 -04:00
Dylan Khor
24d1745951 add config.h for customization 2017-03-16 12:24:31 -04:00
Jack Humbert
c36a4496eb Update config.h 2017-03-15 23:51:56 -04:00
Jack Humbert
c043d1cc47 Update config.h 2017-03-15 23:49:38 -04:00
Dylan Khor
0c0a8ee187 test 2017-03-16 03:46:26 +00:00
Dylan Khor
73a70a2c1c Add Makefile 2017-03-15 23:09:17 -04:00
Dylan Khor
cf28f7bfda Add custom keycap 2017-03-15 23:07:29 -04:00
Jack Humbert
b794719952 Merge pull request #1090 from qmk/backlight_softpwm 
Adds soft PWM backlight for non-timed ports
 2017-03-15 11:17:07 -04:00
Jack Humbert
ce6dcc2b5d Merge pull request #1146 from khogeland/master 
Colemak layout for Clueboard
 2017-03-15 11:13:16 -04:00
Jack Humbert
71d6d7b22c Merge pull request #1147 from nooges/numpad20 
Add handwired 20-key Numpad
 2017-03-15 11:12:52 -04:00
Jack Humbert
8c184847f7 Merge pull request #1150 from nooges/ortho5x13 
Add handwired 5x13 ortholinear keyboard
 2017-03-15 11:12:30 -04:00
Jack Humbert
8685d73893 Merge pull request #1148 from nooges/hexwire-lets-split 
Add Hexwire layout for Let's Split
 2017-03-15 11:12:01 -04:00
Jack Humbert
09ee922a63 Merge pull request #1155 from deadcyclo/master 
Worked on deadcyclo layout
 2017-03-15 11:11:35 -04:00
Jack Humbert
b4a3e5ebea Merge pull request #1145 from smt/smt/lets_split 
Add smt keymap for Let's Split (based on serial)
 2017-03-15 11:00:06 -04:00
Jack Humbert
3554b93cbd Merge pull request #1144 from milestogo/sculpt2 
Microsoft sculpt mobile handwire and new shortcuts macro library
 2017-03-15 10:59:34 -04:00
Jack Humbert
2e34d4bd85 update for infinity 2017-03-15 10:57:24 -04:00
Danny Nguyen
52ea58805a Add RGB underglow, move keys to allow Adjust layer to be reached 2017-03-14 09:51:48 -04:00
nstickney
d9efa02cfb added README.md 2017-03-12 22:43:44 -05:00
nstickney
1753c9383e Merge remote-tracking branch 'upstream/master' 2017-03-12 14:51:43 -05:00
nstickney
9895e376e7 added US-International support 2017-03-12 14:51:33 -05:00
James Barrett
96bde794d8 Update readme and default layout for TADA68 
Add the default function layer mappings for the keyboard.

Provide flashing instructions in the readme.
 2017-03-11 22:09:50 -08:00
Brendan Johan Lee
0d71e631ed [deadcyclo layout] fix an error in layer illustration 2017-03-11 12:27:46 +01:00
Brendan Johan Lee
e66b31a648 [deadcyclo layout] Added second unicode layer, more sane layer switches 2017-03-11 12:22:38 +01:00
Dennis Trümper
e3f934ed91 remove typo from folder name 2017-03-11 12:09:30 +01:00
Dennis Trümper
edb8fcc810 update documentation 2017-03-11 11:44:39 +01:00
Dennis Trümper
303f5aed41 change layer 3 on right thumb back to layer 1 2017-03-11 10:31:22 +01:00
Dennis Trümper
f75c7266a3 working but some documentation needed 2017-03-11 00:02:39 +01:00
Stephen Tudor
b19e34c81e Forsake spacefn in favor of left shift tapdance. Move media controls. 2017-03-10 16:10:05 -05:00
Stephen Tudor
5ae0cfeef5 Add smt keymap for Satan 'GH60' 2017-03-09 13:58:33 -05:00