Ante Laurijssen
78a4cfd453
Modifications to readme.md and deletion of keyboard layout images
2017-06-12 20:13:17 -04:00
Jack Humbert
6b5d67fcc6
Merge pull request #1389 from geofflane/keyboard_s65_x_2
...
Keyboard S65-X Support #2
2017-06-12 17:08:27 -04:00
Geoff Lane
0440c0f072
Add ISO layout for S65-X
2017-06-12 16:57:01 -04:00
Geoff Lane
568c662c14
Fix media controls in default layout
2017-06-12 16:19:57 -04:00
Geoff Lane
96b0382fb4
Fix backslash and some of the docs
2017-06-12 16:16:42 -04:00
Martin Gondermann
a5b5279da9
Add MIDI layer to magicmonty keymap ( #1386 )
...
* Add MIDI layer
* Respect brightness level on layer signalling
* Add hotkey in control layer for signalling state
* Update layout.png
* Remove image and replace it with imgur link
2017-06-12 08:48:01 -07:00
Jack Humbert
23c448b21d
remove .hex, .PNG, .jpg
2017-06-11 22:16:42 -04:00
Jack Humbert
a7ce482d14
remove the rest of the .pngs
2017-06-11 21:24:23 -04:00
Ante Laurijssen
54d48140cd
-MIDI Chords now using process_record_user instead of F(n) keys
...
-Morse Code shift keys implemented
2017-06-11 16:00:40 -04:00
Jack Humbert
c02f9a6ee4
remove most .pngs
2017-06-11 15:36:28 -04:00
Geoff Lane
b1e01e9d1f
Support Sentraq S65-X
...
Add initial support for ANSI layout of S65-X.
Includes support for controlling RGB underlighting.
2017-06-10 21:09:38 -04:00
Jack Humbert
ca01d94005
convert docs to lowercase and underscores
2017-06-10 14:58:24 -04:00
Jack Humbert
d81135410c
Merge pull request #1382 from binaryplease/handwired_binaryplease
...
Handwired binaryplease
2017-06-09 21:09:52 -04:00
binaryplease
1502c9c935
put colemak and qwert switching on the top right
2017-06-10 02:44:28 +02:00
binaryplease
0c1dc91d74
removed swapping keys in adjust layer
2017-06-10 02:42:27 +02:00
binaryplease
e3f657dfeb
commented out unused layers
2017-06-10 02:01:51 +02:00
Jack Humbert
d2aec1625d
removes some images
2017-06-09 14:05:33 -04:00
Jack Humbert
728f2f8d00
Merge pull request #1378 from nicinabox/fix-ls-avrdude
...
Let's Split avrdude portability fix
2017-06-09 10:35:33 -04:00
Jack Humbert
fc39a288ed
remove mechmini keymap from ps2avrGB
2017-06-09 10:25:20 -04:00
Jack Humbert
8c4a59611a
due diligence, etc
2017-06-09 10:22:58 -04:00
Nic Aitch
3b38e6954a
Use single brackets for portability with other shells
2017-06-09 09:14:44 -05:00
Jack Humbert
9ac2ed280c
move mechmini to own folder
2017-06-09 10:11:34 -04:00
skullY
2a667eba2a
Cleanup the Clueboard readme files.
2017-06-08 20:42:37 -07:00
Martin Gondermann
e4eb4eaa16
Fix layer LED signalling in magicmonty keymap ( #1373 )
...
* Fix layer LED signalling in magicmonty keymap
* Include the breathing modes in layer signalling
* Reverts mode to 1 as the other modes flicker
* Add Cursor keys on VIM positions and PAUSE to function layer
2017-06-08 19:55:34 -07:00
Mathias Andersson
1b02b2006e
Add support for KMAC
2017-06-08 19:35:27 +02:00
Stick
4b50ab029d
Revert "ugly workaround for ErgoDoxEZ LED bugs: turn 'em all off"
...
This reverts commit f397402e10
2017-06-08 08:59:33 -05:00
Stick
5a70cb30ee
trying to fix LEDs
2017-06-08 08:59:30 -05:00
Stick
3af2bca1fc
Merge remote-tracking branch 'upstream/master'
2017-06-08 08:52:32 -05:00
Ante Laurijssen
7146dfea6e
Created special shift keys for Morse layer that change variable value, enabling to send “shifted” special morse code characters.
2017-06-07 23:57:14 -04:00
Ante Laurijssen
8f80f35186
Working on Morse Code Macros
2017-06-07 22:01:28 -04:00
chilifries
c9e0068cf2
Added support for Mechmini v1
2017-06-07 16:24:40 -07:00
Jack Humbert
84012d8243
Merge pull request #1359 from agbell/PR
...
Permissive Hold, and two keymaps
2017-06-07 18:47:29 -04:00
Stick
035f7bb1bf
Merge remote-tracking branch 'upstream/master'
2017-06-07 15:55:52 -05:00
Martin Gondermann
8cc0035ea0
Add new keyboard layout for the ClueBoard ( #1371 )
2017-06-07 08:18:26 -07:00
Jack Humbert
5d83d320cb
Merge pull request #1366 from abperiasamy/refine-layout
...
Replace enter with quote and few reorgs
2017-06-06 12:35:26 -04:00
Daniel Shields
ad7a5bdc4f
Additional tap dance keys/functions for planck/keymap/dshields
2017-06-06 13:09:55 +01:00
Ante Laurijssen
1b8ed53f21
Added a couple of custom keys and updated layer image
2017-06-05 22:17:35 -04:00
Fred Sundvik
b51a0db6ed
Add backlight support to the default Ergodox Infinity animations
2017-06-03 22:04:10 +03:00
Fred Sundvik
2a7f9a7e46
Add backlight control to the IS31FL3731 driver
2017-06-03 21:30:52 +03:00
Adam Bell
4ab61344f5
Adding permissive_hold
2017-06-03 10:28:46 -04:00
Adam Bell
587b0de6e5
adding lets split keymap
2017-06-03 10:28:46 -04:00
Adam Bell
82de4d039d
Ergodox Adam keymap
2017-06-03 10:28:36 -04:00
Fred Sundvik
0f9bfafb9e
Turn off LED matrix by default
2017-06-03 15:31:02 +03:00
Fred Sundvik
a916f4e8b8
Let BACKLIGHT_ENABLE control the Infinity LEDs
2017-06-03 14:34:50 +03:00
Ante Laurijssen
9cfa37bb3d
Improvements and corrections to morse code macros layer
2017-06-02 22:57:57 -04:00
Stick
f397402e10
ugly workaround for ErgoDoxEZ LED bugs: turn 'em all off
2017-06-02 20:02:02 -05:00
Stick
4cf17210b6
moved alt out from under space
2017-06-02 19:51:29 -05:00
Stick
4ba9917f82
Merge remote-tracking branch 'upstream/master'
2017-06-02 19:50:54 -05:00
Daniel Shields
7cbd16c902
Initial commit for gherkin keyboard support. Compiles but untested.
2017-06-02 14:45:42 +01:00
Jack Humbert
9069edd934
Merge pull request #1347 from nooges/nyquist
...
Add Nyquist keyboard support
2017-06-01 12:58:33 -04:00
Jack Humbert
ec3e684123
Merge pull request #1350 from originerd/add-originerd-planck-keymap
...
Add originerd planck keymap
2017-06-01 11:19:40 -04:00
Jack Humbert
05e6dd6527
Merge pull request #1351 from Alfrheim/fixing_dvorak_layout
...
replacing one R for a T
2017-06-01 11:19:20 -04:00
Jack Humbert
cf77c42c72
Merge pull request #1353 from 333fred/333fred-layout
...
ergodox/333fred layout
2017-06-01 11:18:56 -04:00
Danny Nguyen
aae727d9ec
Update keymap layout comments
2017-06-01 11:15:21 -04:00
Daniel Shields
db0ac3bcb3
Tweak reported power consumption to work with iOS
2017-06-01 09:18:33 +01:00
Danny Nguyen
db82b17d6e
Remove OLED code and set I2C rate back to 100kHz
2017-06-01 01:26:06 -04:00
Fredric Silberberg
dded79a412
Update licensing on visualizer.c
2017-05-31 18:07:02 -07:00
Fredric Silberberg
cfaf34daec
Updated readme
2017-05-31 17:57:38 -07:00
Fredric Silberberg
aa1b1c5756
Added several new macros
2017-05-31 17:42:50 -07:00
Fredric Silberberg
f35c82ccb2
Fixed numpad 0 layout
2017-05-31 10:27:39 -07:00
Alfrheim
974a77a07c
replacing one R for a T
2017-05-31 15:19:37 +02:00
Jitae Kim
c33c2bbade
Add originerd planck keymap
2017-05-31 22:00:44 +09:00
Fredric Silberberg
4eba71841e
Use code blocks for keyboard layouts
2017-05-30 23:56:28 -07:00
Fredric Silberberg
95ae256482
Completed iteration 1 of my layout
2017-05-30 23:52:20 -07:00
jpetermans
9af272e4bb
Update lock led processing and remove debug msgs
2017-05-30 21:52:44 -07:00
Jack Humbert
57cfb5f1ae
Merge pull request #1348 from Dbroqua/master
...
Added DK60 keyboard
2017-05-30 23:12:11 -04:00
Ante Laurijssen
fbaf964a85
Improvements to Midi and keymap
2017-05-30 21:27:00 -04:00
Fredric Silberberg
949540d601
Added initial keymap files
2017-05-30 18:01:09 -07:00
dbroqua
c5d3faace5
Merge remote-tracking branch 'origin/feature/DK60'
2017-05-30 23:10:14 +02:00
dbroqua
a381eb01f5
- Updated copyright
2017-05-30 23:09:39 +02:00
Danny Nguyen
7a433a7f3d
Update copyright info
2017-05-30 16:52:02 -04:00
Danny Nguyen
fbec02c148
Remove Let’s Split plate files
2017-05-30 16:42:04 -04:00
Damien Broqua
061bb4a0b8
Merge remote-tracking branch 'origin/feature/DK60'
2017-05-30 22:17:20 +02:00
Damien Broqua
05f5243426
- Updated readme
2017-05-30 22:17:03 +02:00
Damien Broqua
55d6750254
Merge remote-tracking branch 'origin/feature/DK60'
2017-05-30 22:15:07 +02:00
Damien Broqua
e280f7aad7
- Added Capslock/Esc led
2017-05-30 22:13:34 +02:00
Nick Choi
3c4022c41b
hmm?
2017-05-30 14:19:57 -04:00
Nick Choi
2c9f846608
Merge pull request #2 from qmk/master
...
pull in new qmk changes
2017-05-30 14:17:48 -04:00
Danny Nguyen
be204f9cdd
Update readme
2017-05-30 13:29:30 -04:00
Damien Broqua
f06f883589
- Some changes on DK60
2017-05-30 16:59:56 +02:00
Ante Laurijssen
06684555d2
Another typo...
2017-05-29 22:16:17 -04:00
Ante Laurijssen
cd4ccee703
Corrected typo in readme.md
2017-05-29 22:13:52 -04:00
Ante Laurijssen
1ef911d150
Added a few images
2017-05-29 22:11:48 -04:00
Ante Laurijssen
4c48c29c0e
Added MIDI_CHORD layer and other little fixes.
...
Updated readme.md
2017-05-29 22:09:06 -04:00
Nick Choi
5393bc6f4e
switched to uint8 and 16
2017-05-29 21:25:50 -04:00
Danny Nguyen
4a8da0cb45
Modify pinout and layouts for Nyquist
2017-05-29 16:20:06 -04:00
Danny Nguyen
aeade1b197
Fork Let’s Split files
2017-05-29 16:04:46 -04:00
Priyadi Iman Nurcahyo
7eebdd4760
Jokrik's Clueboard layout ( #1340 )
2017-05-29 09:10:34 -07:00
binaryplease
3ea5726739
redefined options in config.h
2017-05-29 13:53:13 +02:00
Erez Zukerman
41fa638aa8
Adds prevent stuck modifiers to EZ default
2017-05-28 20:05:37 -04:00
binaryplease
a83662329d
overwriting optins in makefile and configuration
2017-05-29 01:28:18 +02:00
binaryplease
64e4c47ae4
disabled backlight and audio
2017-05-29 01:14:25 +02:00
binaryplease
58af88eb51
copied default planck keymap to handwired_binaryplease;
2017-05-29 00:52:38 +02:00
Ante Laurijssen
a584675735
Midi Chord Function is now working! But some chords lag...
2017-05-28 08:14:17 -04:00
Jack Humbert
d24da945d1
Merge pull request #1319 from Johannes-Larsson/master
...
Add planck/johannes layout
2017-05-26 18:33:25 -04:00
ariasuni
e87691fa5d
Fix undefined reference errors with avr-gcc 7.1
2017-05-27 00:25:35 +02:00
Nick Choi
66e9cf9718
clarified tap
2017-05-26 15:59:34 -04:00
dbroqua
6b994ecd82
- Added schematic for Trackpoint demonstration
2017-05-26 21:27:11 +02:00
dbroqua
81e85a1a4e
- Added integration of IBM Trackpoint
2017-05-26 20:35:31 +02:00
Ante Laurijssen
6b1f707ce9
Still working on these MIDI CHORDS!
2017-05-26 09:54:40 -04:00
Nick Choi
1bff72c009
-
2017-05-26 00:19:12 -04:00
Nick Choi
d462409762
tenative readme for variable timing tap
2017-05-26 00:18:59 -04:00
Ante Laurijssen
b4b06f81b5
More changes to keymap.c to try and get midi chords to work
2017-05-25 23:03:33 -04:00
Nick Choi
aeb3a34636
moved specific tap term to its own function
...
included custom_tapping_term in action struct
2017-05-25 16:26:30 -04:00
jpetermans
ac97870801
reduce recurring writes to lock leds
2017-05-25 13:00:21 -07:00
Nick Choi
e695b5a33b
Added per case tapping term, updated FF-nikchi keymap.
2017-05-25 00:41:00 -04:00
Nick Choi
17a378715e
Tapping Term and Memes TD for FF
2017-05-24 23:43:02 -04:00
Ante Laurijssen
1a0dfbbc96
More updates to keymap.c - still errors with midi when trying to compile
2017-05-24 21:15:41 -04:00
Johannes Larsson
6d08de5c67
readme, media keys fix
2017-05-24 21:35:31 +02:00
jpetermans
083267680d
Restore deleted MEMO.txt from master
2017-05-24 12:26:56 -07:00
Johannes Larsson
e4f1b238b3
revert changes to config.h
2017-05-24 21:24:13 +02:00
jpetermans
e6c9b07e1c
Merge branch 'user_led_configuration' into infinity60
...
Conflicts:
keyboards/infinity60/keymaps/jpetermans/keymap.c
2017-05-24 12:07:18 -07:00
jpetermans
2dcd6c38fa
Merge remote-tracking branch 'upstream/master' into infinity60
2017-05-24 11:51:20 -07:00
jpetermans
f54b4771eb
keymap example update and tweak to set_led_bit function
2017-05-24 11:20:50 -07:00
Jack Humbert
7a4ec3bd92
Merge pull request #1316 from nikchi/master
...
FrostyFlake Keymap
2017-05-24 13:59:30 -04:00
Johannes Larsson
690957cdbd
media keys and stuff
2017-05-24 19:00:56 +02:00
Nick Choi
006ba4bf36
moved unicodemap rules to localer make
2017-05-24 12:36:36 -04:00
Johannes Larsson
b9cf386b21
Merge branch 'master' of https://github.com/qmk/qmk_firmware
2017-05-24 17:58:11 +02:00
Erez Zukerman
a965e5b735
tweaks default mouse speed constants
2017-05-24 07:56:41 -04:00
Nick Choi
ef1714f443
more emoji function comments
2017-05-24 00:35:04 -04:00
Nick Choi
6536b1ce2a
Tap dancing emoji support 😩 😩
2017-05-23 23:52:48 -04:00
Nick Choi
b3eeb9d84a
removed s
2017-05-23 18:47:06 -04:00
Nick Choi
0e174fcb48
Merge branch 'master' of https://github.com/nikchi/qmk_firmware
2017-05-23 13:13:23 -04:00
Nick Choi
3ed2147a88
preonic map
2017-05-23 13:13:20 -04:00
Nick Choi
ec86fac6ee
Merge pull request #1 from qmk/master
...
pull new to mine
2017-05-23 13:08:44 -04:00
Ante Laurijssen
4d783d0e69
More work on my keymap.c and added .png images of my different layers.
2017-05-22 23:30:25 -04:00
Johannes Larsson
4f1007952b
merge
2017-05-22 15:27:57 +02:00
Johannes Larsson
53b094934f
matrix layout
2017-05-22 15:25:53 +02:00
Ante Laurijssen
06433eb1a0
More work on keymap.c and config.h
2017-05-21 22:37:20 -04:00
Ante Laurijssen
34a1bf9e20
Merge https://github.com/qmk/qmk_firmware
...
Update my qmk_firmware fork
2017-05-21 08:44:52 -04:00
Ante Laurijssen
b766407cbe
Continuing work on keymap.c
2017-05-21 08:40:42 -04:00
jerryen
9c284786e7
Workaround for the macOS caps lock delay ( #1308 )
...
* Add 80ms delay for KC_CAPS when used as a tap key
Workaround for the macOS caps lock delay
* Revert "Increase TAPPING_TERM for the Clueboard"
This reverts commit a74e69e9fa
2017-05-19 17:24:47 -07:00
Jack Humbert
85df687348
m10a lowercase
2017-05-18 18:55:07 -04:00
Erez Zukerman
0d8c73dc8d
Merge pull request #1303 from cwesterlund/dvorak_dev_swe
...
Created a dvorak keymap for Swedish developers using Visual Studio
2017-05-18 15:31:16 -07:00
Ante Laurijssen
c686793b59
Merge https://github.com/qmk/qmk_firmware
...
Update from QMK main
2017-05-17 23:06:57 -04:00
tengg
aaa01d0a4e
ESC/GRAVE/TILDE better handling ( #1307 )
...
* revise HHKB bootloader_size to 4096 such that sw reset works
* cleanup esr/grave/tilde handling function
2017-05-17 18:20:01 -07:00
Ante Laurijssen
26c6f6a85c
Added Space Cadet Rollover Disable to config.h
2017-05-16 22:08:45 -04:00
skullY
a74e69e9fa
Increase TAPPING_TERM for the Clueboard
2017-05-16 13:09:23 -07:00
skullY
3c5b915078
Make KC_GRV accessible
2017-05-16 13:02:22 -07:00
Christian Westerlund
fcef83a5d0
Created a dvorak keymap for Swedish developers using Visual Studio
2017-05-16 15:15:42 +02:00
Ante Laurijssen
814b570ba1
Working on keymap.c file...
2017-05-15 22:56:33 -04:00
Nick Choi
5d965a8d41
emojis and reorg
2017-05-15 02:19:50 -04:00
Nick Choi
eb660ef218
emoji support but
2017-05-15 01:52:45 -04:00
Nick Choi
b2b72058e5
change readme
2017-05-15 00:12:04 -04:00
Nick Choi
888026ae73
nikchi flake
2017-05-15 00:10:25 -04:00
Ante Laurijssen
ee0b34feaf
Started working on custom midi chord function
2017-05-14 20:07:35 -04:00
Ante Laurijssen
f006ebebbd
Initial push of my keymap
2017-05-14 16:07:44 -04:00
Jack Humbert
04069c94cc
Merge pull request #1297 from khogeland/satan-colemak
...
Colemak layout for GH60 Satan
2017-05-12 16:24:51 -04:00
Kevin Hogeland
b767719fc8
Colemak layout GH60 Satan
2017-05-12 12:03:09 -07:00
Nikolaus Wittenstein
8ddbf7f59f
Fix spelling of "persistent"
...
Fixes #1201 .
2017-05-11 15:32:35 -04:00
Jack Humbert
b412bb8d8c
Merge pull request #1283 from TerryMathews/master
...
Establish support for Bathroom Epiphanies Tiger Lily controller
2017-05-11 14:34:02 -04:00
Daniel Shields
eb3f80b924
Add new features to dshields keymap.
...
- one shot layers, dynamic macros and tap dance keys
- add a basic readme.md and layout image.
2017-05-11 09:16:55 +01:00
jpetermans
164a6c994b
reorder mailbox msg data; formatting
2017-05-10 15:53:59 -07:00
jpetermans
a144968807
remove breath functions from keymap
2017-05-08 16:38:44 -07:00
jpetermans
16774333ad
last readme fix
2017-05-08 16:28:04 -07:00
jpetermans
5fc5661147
third readme fix attempt
2017-05-08 16:19:11 -07:00
jpetermans
d1ff2bb9db
readme fix
2017-05-08 16:17:40 -07:00
jpetermans
821f72eae9
documentation cleanup
2017-05-08 16:15:20 -07:00
Stephen Tudor
9a8904a9c0
Add smt keymap for Clueboard (HHKB-style layout) ( #1286 )
...
* Add keymap for smt Clueboard (HHKB layout)
* Add readme for smt Clueboard (HHKB) keymap
* Flesh out the keymap a bit more to support Colemak & Dvorak
* Update README with layout image
2017-05-08 15:32:15 -07:00
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
