Nick Brassel
bdb757e189
ChibiOS conf migrations... take 11 ( #11646 )
...
* Allow forcing re-migration.
* ChibiOS conf upgrade for acheron/arctic
acheron/arctic - 2aedbe9103fff6c37e596c33c9ed337957647368
* ChibiOS conf upgrade for acheron/austin
acheron/austin - c2f4e3b7fc9f1c3d64f47d139bc58367afeca1b7
* ChibiOS conf upgrade for acheron/keebspcb
acheron/keebspcb - 1ba976e409732bfa5c0487dd33e20bec06852ce4
* ChibiOS conf upgrade for acheron/lasgweloth
acheron/lasgweloth - 01a2e70d0d86de0ff05d0b898a6e3b4428ee1581
* ChibiOS conf upgrade for aeboards/ext65/rev2
aeboards/ext65/rev2 - 3c9a45cafb4ed6d9672aaff4548b105193633a87
* ChibiOS conf upgrade for ai03/vega
ai03/vega - 1bd0dfccb99baa69bacd2d55f2bfa72019b8bf80
* ChibiOS conf upgrade for akegata_denki/device_one
akegata_denki/device_one - a013823188660f5fca37c5763f160f8646aed7a7
* ChibiOS conf upgrade for at_at/660m
at_at/660m - 9999583e8bec2772046132a22818482d24e18c84
* ChibiOS conf upgrade for box75
box75 - 1126206109a942237eea96f3a9608e3c9ed55f8e
* ChibiOS conf upgrade for bt66tech/bt66tech60
bt66tech/bt66tech60 - b69120638a8b2c86c008fd0592be918383d8a454
* ChibiOS conf upgrade for cannonkeys/an_c
cannonkeys/an_c - c755f6caaccbe2b30d95661a3d441b836534c29f
* ChibiOS conf upgrade for cannonkeys/atlas
cannonkeys/atlas - 1a18c55492a834b82715516ea4cd4d3d94508743
* ChibiOS conf upgrade for cannonkeys/chimera65
cannonkeys/chimera65 - 6bf226ef353da9106c381a8ac95a9b90529327e5
* ChibiOS conf upgrade for cannonkeys/db60
cannonkeys/db60 - 07e3246f8e3adc5b6918809e6a5aa1ad064b9a09
* ChibiOS conf upgrade for cannonkeys/devastatingtkl
cannonkeys/devastatingtkl - 907d258e29eb7e35b1f868c1ea6148bfd1e3a3f2
* ChibiOS conf upgrade for cannonkeys/instant60
cannonkeys/instant60 - ac876ff6746b08839a3936dd4126b52683b763f4
* ChibiOS conf upgrade for cannonkeys/instant65
cannonkeys/instant65 - 3b8c89ec5fecbdb35cccb00c45e64a798528dbda
* ChibiOS conf upgrade for cannonkeys/iron165
cannonkeys/iron165 - 0814ec4067d9857b0134e38384f272cf7172fb03
* ChibiOS conf upgrade for cannonkeys/obliterated75
cannonkeys/obliterated75 - 0f376e5d9a232c62e9c60f8fdc81d12732352ddc
* ChibiOS conf upgrade for cannonkeys/onyx
cannonkeys/onyx - d35134ebe09046b91ab176035d3742d80b23ed8e
* ChibiOS conf upgrade for cannonkeys/ortho48
cannonkeys/ortho48 - 828dbfbb013ff4fefe75044b3c9fd31fec5e95a1
* ChibiOS conf upgrade for cannonkeys/ortho60
cannonkeys/ortho60 - 2aca4dd4234e0dac828f5fa15ae5b3bc3c0605dc
* ChibiOS conf upgrade for cannonkeys/ortho75
cannonkeys/ortho75 - 4af8aaaded0ff53e9c01473f5968cc169f268647
* ChibiOS conf upgrade for cannonkeys/practice60
cannonkeys/practice60 - e01df551d9483eeb3f825fcc453317fe65f674b5
* ChibiOS conf upgrade for cannonkeys/practice65
cannonkeys/practice65 - 156163789d4c96cdd4787895788c1d02a2367f5c
* ChibiOS conf upgrade for cannonkeys/rekt1800
cannonkeys/rekt1800 - 15882afb6373dea3e5f7ed13c19744ee2463f3bf
* ChibiOS conf upgrade for cannonkeys/sagittarius
cannonkeys/sagittarius - f49fee611ffcc02cb3dc7f249fc8c83f136907b9
* ChibiOS conf upgrade for cannonkeys/satisfaction75
cannonkeys/satisfaction75 - 2c9fbbea3a38820774f6ff436ef51017b545475a
* ChibiOS conf upgrade for cannonkeys/savage65
cannonkeys/savage65 - ddd764be363c46f3e9b1a16151bd02d8f66b2dd4
* ChibiOS conf upgrade for cannonkeys/tmov2
cannonkeys/tmov2 - 7af36cd2a42015838b77697624e90008ffa72778
* ChibiOS conf upgrade for cannonkeys/tsukuyomi
cannonkeys/tsukuyomi - a120bea5dacb2cd6f143458cece46d2860ea196d
* ChibiOS conf upgrade for cheshire/curiosity
cheshire/curiosity - 93d8fe3b7a8e028d4b015941ee71b50afe86bc8a
* ChibiOS conf upgrade for coarse/cordillera
coarse/cordillera - 7d986d3f534786f302cbf74a5e6b7e51ffe60093
* ChibiOS conf upgrade for converter/siemens_tastatur
converter/siemens_tastatur - 3f79f1467bbc56f284aceafd76ab5c6a1cbb68f4
* ChibiOS conf upgrade for cutie_club/borsdorf
cutie_club/borsdorf - f8c6015b7aacfd5edef4f22f719eea30660005e7
* ChibiOS conf upgrade for dekunukem/duckypad
dekunukem/duckypad - d9c162d0867d3925cca2e653a3a3870eac2d23d2
* ChibiOS conf upgrade for ebastler/isometria_75/rev1
ebastler/isometria_75/rev1 - 2ecdd00b8c6cc794a7014747185b88374d5766c0
* ChibiOS conf upgrade for ergodox_infinity
ergodox_infinity - 76736c701db22e890764481c25bd38badf32a1cf
* ChibiOS conf upgrade for ergodox_stm32
ergodox_stm32 - a7bdb0b7822617ca0f9d316a082874ac0fef5964
* ChibiOS conf upgrade for function96
function96 - 1b9e394a86dab24b85d160afe9281b5e7652afe2
* ChibiOS conf upgrade for geekboards/macropad_v2
geekboards/macropad_v2 - de261e46a42cc7b7ff793e26200669f94b1dbb18
* ChibiOS conf upgrade for generic_panda/panda65_01
generic_panda/panda65_01 - 592d2443033875e0309506aa8cb5212389054458
* ChibiOS conf upgrade for handwired/ck4x4
handwired/ck4x4 - 9d7d4af7f2d787afd638e976334cd37c490040d7
* ChibiOS conf upgrade for handwired/onekey/blackpill_f401
handwired/onekey/blackpill_f401 - c9257a30203b3a0e5aa18b35e07281fcd043ab5d
* ChibiOS conf upgrade for handwired/onekey/blackpill_f411
handwired/onekey/blackpill_f411 - dfccc2c6b245cfb561faba60c9f3fc7af8c3db30
* ChibiOS conf upgrade for handwired/onekey/bluepill
handwired/onekey/bluepill - 393f4b94e9a0fbc9cd00de1acde346ad72250b4a
* ChibiOS conf upgrade for handwired/onekey/stm32f0_disco
handwired/onekey/stm32f0_disco - d827881f9bed09fd41c7c4e9d066e96b6643a099
* ChibiOS conf upgrade for handwired/onekey/teensy_32
handwired/onekey/teensy_32 - dd90f6c823da80ba43afa41249a2bdbbab98b04c
* ChibiOS conf upgrade for handwired/onekey/teensy_lc
handwired/onekey/teensy_lc - 34596f2eeb62403cce532d20cf893ebd77fe2d05
* ChibiOS conf upgrade for handwired/pill60/blackpill_f401
handwired/pill60/blackpill_f401 - 20bbccb5058085076357f4fa956eede2c0af86e8
* ChibiOS conf upgrade for handwired/pill60/blackpill_f411
handwired/pill60/blackpill_f411 - e03a4c3ec3b9ba65b8067126a039a8eb2cd10e51
* ChibiOS conf upgrade for handwired/pill60/bluepill
handwired/pill60/bluepill - 2fb721fb4376cde2067eed1c0c8acbf3bf5851c3
* ChibiOS conf upgrade for handwired/riblee_f401
handwired/riblee_f401 - 2823cd98d64c91b146dae343a32176d51772952b
* ChibiOS conf upgrade for handwired/riblee_f411
handwired/riblee_f411 - 5cf7589c9a11c4ed14e7d28676ac836fbb07d013
* ChibiOS conf upgrade for handwired/sono1
handwired/sono1 - d972acee03efb4917fc42f7d72c0a416b67ebd4a
* ChibiOS conf upgrade for handwired/t111
handwired/t111 - f947c1d59025fe04e7d7b999d80e20277be4366c
* ChibiOS conf upgrade for handwired/twadlee/tp69
handwired/twadlee/tp69 - 48ab62464ba1f2651f4468cbec7c6058e3b8c158
* ChibiOS conf upgrade for handwired/z150
handwired/z150 - 35e85696845e965d7f2dcdb372ed20c17d42c2bb
* ChibiOS conf upgrade for hub20
hub20 - f094036a182169b5a73f89f09f2ccaa3e5fc9e7e
* ChibiOS conf upgrade for iron180
iron180 - 5efb6f21c848b3c964795d9debddceac7628933d
* ChibiOS conf upgrade for jm60
jm60 - dbbdbe8b27b3c1d0a25981b2f75728d163d5d299
* ChibiOS conf upgrade for keebio/bdn9/rev2
keebio/bdn9/rev2 - 0031632523dddfc8f7b3a02cf9c5990ebbb3856d
* ChibiOS conf upgrade for keebio/choconum
keebio/choconum - 4484ef6936a497610ca5ae4d378bc07b2bc1b1c7
* ChibiOS conf upgrade for matrix/m20add
matrix/m20add - 6068aeff5b14c26de8838180f4397800abe9f1aa
* ChibiOS conf upgrade for matrix/noah
matrix/noah - fcde175fb1d3f5bf0716ac5a880c2cc9ab4bbf7f
* ChibiOS conf upgrade for misterknife/knife66
misterknife/knife66 - e7f3ceffb94fb8e680da2af27fa7cb1a0a52b699
* ChibiOS conf upgrade for misterknife/knife66_iso
misterknife/knife66_iso - ee027db939c098f908f70f02ffa9cc3952139f70
* ChibiOS conf upgrade for nebula12
nebula12 - 2f3a25b6675dcd0fabe75e7bb63038d3cac19610
* ChibiOS conf upgrade for nemui
nemui - 4030faa372512f766fd747876cb28176302453f9
* ChibiOS conf upgrade for nibiria/stream15
nibiria/stream15 - fd7b09affa208403099ef9bff1b756fac0d4f918
* ChibiOS conf upgrade for nightingale_studios/hailey
nightingale_studios/hailey - 496a44b2f789cc59a6110c7c1c41d57e59c722be
* ChibiOS conf upgrade for planck/rev6
planck/rev6 - 6fb8f0bc21b4ab774ce3d339fdf6f25d96059f10
* ChibiOS conf upgrade for primekb/meridian
primekb/meridian - 8021ed99e8bdf92faab806780186cc924dd59e50
* ChibiOS conf upgrade for projectkb/alice
projectkb/alice - ad7678d475a14c54f28b62d1c1b15f5b4c4448bc
* ChibiOS conf upgrade for projectkb/signature87
projectkb/signature87 - de61338b0a5c477f39c000df8117dd3017c2643d
* ChibiOS conf upgrade for ramonimbao/squishy65
ramonimbao/squishy65 - 2ea1a8b18c39d0e193bbbf5836191874d3aafc53
* ChibiOS conf upgrade for ramonimbao/wete
ramonimbao/wete - a80b3b309f06566adcdf20234d81c1d5aa599b00
* ChibiOS conf upgrade for rart/rartlice
rart/rartlice - c8c80c302428d62bb8b08e3185509a233a94f5f0
* ChibiOS conf upgrade for retro_75
retro_75 - 7434e266bba43ded8ca1ff75d77faa506473ca91
* ChibiOS conf upgrade for rocketboard_16
rocketboard_16 - 1182a8730a84b58eba5a470286b6db6134d36f54
* ChibiOS conf upgrade for satt/vision
satt/vision - c85a28a8d7e321511a17a7e7084d0a7876d1779a
* ChibiOS conf upgrade for technika
technika - 7c59de348f0ec5f6ac9e260806a87aaf16fbafa2
* ChibiOS conf upgrade for tkc/godspeed75
tkc/godspeed75 - e447b39dca393736fbf289049699d5b4748bb8c6
* ChibiOS conf upgrade for tkw/stoutgat/v2/f411
tkw/stoutgat/v2/f411 - 58e9b909379ad107affbff0508e3923264b75426
* ChibiOS conf upgrade for viktus/styrka
viktus/styrka - 36bf0921be79a8b037fdc25343584574a312be60
* ChibiOS conf upgrade for westfoxtrot/prophet
westfoxtrot/prophet - 80036c8f986c8d3261d6b0748d2057eccab6430b
* ChibiOS conf upgrade for whitefox
whitefox - c9eccac0196c3e2e2ea6c90d3036283a3eabff2c
* ChibiOS conf upgrade for wolfmarkclub/wm1
wolfmarkclub/wm1 - 0d22a426255b829a7805bd6a3ff927198b1e31b4
* ChibiOS conf upgrade for xelus/kangaroo
xelus/kangaroo - fdb1ffb66f4841f662e968929f058d4fd403c97e
* ChibiOS conf upgrade for xelus/trinityxttkl
xelus/trinityxttkl - a9641e5b39b7bb38351b9109f0f381837b2e8e79
* ChibiOS conf upgrade for xelus/valor_frl_tkl
xelus/valor_frl_tkl - 6c3b577852736a68727ec319c30712b3088e65cd
* ChibiOS conf upgrade for xiaomi/mk02
xiaomi/mk02 - 4c1406ebfee73551a844ef7ab29fc5788d7e875c
* ChibiOS conf upgrade for zoo/wampus
zoo/wampus - 930c903e85478e220a235f45593c03512c66bc2a
* ChibiOS conf upgrade for zvecr/split_blackpill
zvecr/split_blackpill - c0e3e1583262e4cb0ebfe2efa6356ed6c5c957ca
2021-01-21 17:00:53 +11:00
Nick Brassel
78fe155b72
Fix up comments showing how to execute config migration. ( #11621 )
2021-01-20 02:19:36 +11:00
QMK Bot
1ade5aa922
Merge remote-tracking branch 'origin/master' into develop
2021-01-13 01:56:46 +00:00
Rob Hilgefort
b297f1ce8d
[Keymap] rjhilgefort's Ergodox Infinity ( #11345 )
...
* initial commit- copy of default
* beginnings of ergodox layout conversion
* from scratch 2020 RJH ergodox layout!
* remove extra line in keymap
* only shift to layers, led work
* Fleshed out readme
* tweak alt placement
* updated readme
* PR feedback, updated default layer
* Update keyboards/ergodox_infinity/keymaps/rjhilgefort/keymap.c
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-01-12 17:56:18 -08:00
Ryan
415d683ea7
Remove unused action_get_macro() usages in user files ( #11165 )
2021-01-11 01:25:45 -08:00
Nick Brassel
75111e967f
Disable subsystems repo-wide. ( #11449 )
2021-01-10 09:52:49 +11:00
QMK Bot
2e0f2025bd
Merge remote-tracking branch 'origin/master' into develop
2020-12-16 03:27:52 +00:00
Ryan
9366ed7282
Normalise include statements in keyboard code ( #11185 )
2020-12-16 14:27:23 +11:00
Nick Brassel
f1fef16e4d
ChibiOS upgrade: keyboard conf migrations (phase 1) ( #10418 )
...
* ChibiOS conf upgrade for acheron/arctic
acheron/arctic - 8d3d233f15bf5d396e29abb94f943a89b0b828d1
* ChibiOS conf upgrade for acheron/austin
acheron/austin - beabc6204533de80704684de9ff7790895f319e1
* ChibiOS conf upgrade for acheron/keebspcb
acheron/keebspcb - e14a96e99aab54aefebc1d3d24d64b0082db7842
* ChibiOS conf upgrade for aeboards/ext65/rev2
aeboards/ext65/rev2 - 0b97daef994903585be2768b6aaffc4da97ec617
* ChibiOS conf upgrade for ai03/vega
ai03/vega - 7e5f208278309681fd1db8b2629890b813fdf938
* ChibiOS conf upgrade for at_at/660m
at_at/660m - e30393b6546454f9939c1187aa9c6539f1ef76c1
* ChibiOS conf upgrade for bt66tech/bt66tech60
bt66tech/bt66tech60 - a7f4e8a224132830447d12c92d146997f9b56b7d
* ChibiOS conf upgrade for cannonkeys/an_c
cannonkeys/an_c - e7320dc09377fdad749e382b3986f2241633214b
* ChibiOS conf upgrade for cannonkeys/atlas
cannonkeys/atlas - 063a8eaea7e68607b725ad06777c49d34686b433
* ChibiOS conf upgrade for cannonkeys/chimera65
cannonkeys/chimera65 - 01ce66c862a5cd98183b10e992939a55038779bc
* ChibiOS conf upgrade for cannonkeys/db60
cannonkeys/db60 - 45636d0b3cf951cef51a5b19678e2da549efd14f
* ChibiOS conf upgrade for cannonkeys/devastatingtkl
cannonkeys/devastatingtkl - 709e0155c421991fad283d38c28f850320ed4730
* ChibiOS conf upgrade for cannonkeys/instant60
cannonkeys/instant60 - 7e530e10794183d684a328f01b9b0743907440c7
* ChibiOS conf upgrade for cannonkeys/instant65
cannonkeys/instant65 - c8de288708d0586337cb7137ae54d97e1ddc90a6
* ChibiOS conf upgrade for cannonkeys/iron165
cannonkeys/iron165 - 3a3c0273e227fd15ab3527e4aa557b94d0b69248
* ChibiOS conf upgrade for cannonkeys/obliterated75
cannonkeys/obliterated75 - cdf834802ae77b1bbd4876eb8c34c19a83ad95cd
* ChibiOS conf upgrade for cannonkeys/ortho48
cannonkeys/ortho48 - 3432ff13c83a6358eca44b37f72b18882eeda699
* ChibiOS conf upgrade for cannonkeys/ortho60
cannonkeys/ortho60 - 95be42a23798cc8f9b04175d4892b712d871a52d
* ChibiOS conf upgrade for cannonkeys/ortho75
cannonkeys/ortho75 - e1149893fd01e853124808b45d521b61a7638eb9
* ChibiOS conf upgrade for cannonkeys/practice60
cannonkeys/practice60 - 6e4da87f0a766cf2665e9b4aa8e3ab33017cf745
* ChibiOS conf upgrade for cannonkeys/practice65
cannonkeys/practice65 - c436c06829123503073b3a9c5a1c0acfc2dbe2e5
* ChibiOS conf upgrade for cannonkeys/rekt1800
cannonkeys/rekt1800 - 43e8e21b62531534afeaa241f4c683fbdb60a8e0
* ChibiOS conf upgrade for cannonkeys/satisfaction75
cannonkeys/satisfaction75 - 28ff9a8a11ad1de9d09ec85fab2af906b7c27d6a
* ChibiOS conf upgrade for cannonkeys/savage65
cannonkeys/savage65 - 53eaefae56020b536d4934686506d5d1fe51b6e0
* ChibiOS conf upgrade for cannonkeys/tmov2
cannonkeys/tmov2 - 8b1ced8ff7dc368afa268104cd5192bb1bfc8a1c
* ChibiOS conf upgrade for chavdai40
chavdai40/rev1 - b166af66b084077764b705c9428725cde0b0ce51
chavdai40/rev2 - 0048c8ec8c28f1dfa5d1a37348524899595d8325
* ChibiOS conf upgrade for cheshire/curiosity
cheshire/curiosity - f1636e53638ce2e798070e6e622fd88a08982d5a
* ChibiOS conf upgrade for clueboard/60
clueboard/60 - bb5057d4a2976b6530fe2e345a4153de2f7c042d
* ChibiOS conf upgrade for clueboard/66_hotswap/gen1
clueboard/66_hotswap/gen1 - 03fe10f4de7b67e5f1cf0a7d576f82676adf4261
* ChibiOS conf upgrade for clueboard/66/rev4
clueboard/66/rev4 - 878e38a34f97b32d9d109a6d98f98bc385d84864
* ChibiOS conf upgrade for coarse/cordillera
coarse/cordillera - 5cae5c643e96d03bddcbb73e76e225ea5f82fef3
* ChibiOS conf upgrade for converter/siemens_tastatur
converter/siemens_tastatur - 48f82cd227836878967dfa0fe0411f7d877a124c
* ChibiOS conf upgrade for ergodox_infinity
ergodox_infinity - 8df21d6129eef47d7a5ced92715e5bdbfb0151e5
* ChibiOS conf upgrade for function96
function96 - deecdcdca34c88058f820f0e2bc9f112458c85c5
* ChibiOS conf upgrade for generic_panda/panda65_01
generic_panda/panda65_01 - 8522d8107edcf71758f3be7298c0bc18fa7f6706
* ChibiOS conf upgrade for hadron/ver3
hadron/ver3 - 632af7727b767720c699abdff770edc9682928ee
* ChibiOS conf upgrade for handwired/ck4x4
handwired/ck4x4 - a4cb9b5b8c3a162083677b14b105edbc1bca2baf
* ChibiOS conf upgrade for handwired/co60/rev6
handwired/co60/rev6 - be1688eeabd83a7f576d9e4e23e24d56b8dc251b
* ChibiOS conf upgrade for handwired/co60/rev7
handwired/co60/rev7 - d196c5772859ddee695bda5b0e9f0944a0f350f8
* ChibiOS conf upgrade for handwired/onekey/blackpill_f401
handwired/onekey/blackpill_f401 - 8387bfd56888fc1605d293dc0071b4ec94b23991
* ChibiOS conf upgrade for handwired/onekey/blackpill_f411
handwired/onekey/blackpill_f411 - 855efdb2f60c384edf64773c0f4ff4b7ea8ae4c9
* ChibiOS conf upgrade for handwired/onekey/bluepill
handwired/onekey/bluepill - 60d8555b174dbdabae196a4cc5eccfee4bdd9529
* ChibiOS conf upgrade for handwired/onekey/stm32f0_disco
handwired/onekey/stm32f0_disco - 9bc12e29f5a4e4b9ec0f34987559e5e11de4bb48
* ChibiOS conf upgrade for handwired/onekey/teensy_32
handwired/onekey/teensy_32 - 17459dd8e71b3a33270037878bdbd04151af196b
* ChibiOS conf upgrade for handwired/onekey/teensy_lc
handwired/onekey/teensy_lc - 3a9aed4681c287176efe31c988340ca43ad27a9d
* ChibiOS conf upgrade for handwired/pill60/blackpill_f401
handwired/pill60/blackpill_f401 - 5b652354ae957e86e211dcef29f8f27320b31180
* ChibiOS conf upgrade for handwired/pill60/blackpill_f411
handwired/pill60/blackpill_f411 - 580255c171e95b5bca53b14a13ae018a73d18414
* ChibiOS conf upgrade for handwired/pill60/bluepill
handwired/pill60/bluepill - 29109b54137ea94ac266c604991cff87516689ff
* ChibiOS conf upgrade for handwired/riblee_f401
handwired/riblee_f401 - dc68c31d7ca8ae0fad7e7ad8bdd63406155ff363
* ChibiOS conf upgrade for handwired/riblee_f411
handwired/riblee_f411 - cf0fadff4c98d41cf9bdddbe1ead15c79be941b9
* ChibiOS conf upgrade for handwired/steamvan/rev1
handwired/steamvan/rev1 - 743b395ac87b918b6be4614c9e120e80a9f049d4
* ChibiOS conf upgrade for handwired/t111
handwired/t111 - 99b61ae5692ee4b2101673d1a896cd7a5831bcfa
* ChibiOS conf upgrade for handwired/twadlee/tp69
handwired/twadlee/tp69 - 3ab2753c40e947a726ece6c825493ebc87ecf20e
* ChibiOS conf upgrade for handwired/z150
handwired/z150 - 78808b0c8671e2386b9ba65dbd647d613d92f253
* ChibiOS conf upgrade for hs60/v2
hs60/v2/ansi - 7bcd152c269803de8f96416ba26e939c0420ceae
hs60/v2/hhkb - d77f393d2811bd104b05c4530bf1083d75856b7a
hs60/v2/iso - 5d3d20de919fca3b64cb7548cad46e8d35d7cc04
* ChibiOS conf upgrade for infinity60
infinity60 - dbcbb2f58ee499252b0879d68d9beec08a8433bc
* ChibiOS conf upgrade for k_type
k_type - 492f476177da95495442d1e173391e3c17324a70
* ChibiOS conf upgrade for keebio/bdn9/rev2
keebio/bdn9/rev2 - 4dbb5d606b3d9060ad01a437978220fe0f1fc5b2
* ChibiOS conf upgrade for keebio/choconum
keebio/choconum - 1521e634088a30114cd12b7b6bbd2cca5331c822
* ChibiOS conf upgrade for keebwerk/mega
keebwerk/mega/ansi - 10e32718c7bfff2f6bd8dd2159a15bef0f4acbf9
* ChibiOS conf upgrade for misterknife/knife66
misterknife/knife66 - cf2f3d26103036d79bf7fcec204e13899e33fbe3
* ChibiOS conf upgrade for nack
nack - ba7f421d5670e672c5c14fd5f80c0f86447c1468
* ChibiOS conf upgrade for nebula12
nebula12 - aedb11fa894dc19513462f054a9fa00f5c195adc
* ChibiOS conf upgrade for nebula68
nebula68 - 6bed6afb2fd84ef9069b757f1d1e87fc1cbe290c
* ChibiOS conf upgrade for nemui
nemui - 86ed80ea8565d7d0f39512a9032cc5e1b306fcff
* ChibiOS conf upgrade for nk65
nk65 - 75b2484741a96dcbff14e94c44443bb33ad73dce
* ChibiOS conf upgrade for nk87
nk87 - f719a739a3d2c0969c79c1ace5fe9a7d6f05cc22
* ChibiOS conf upgrade for peiorisboards/ixora
peiorisboards/ixora - b5adf1090fb4c6278d8990ce9132727a13ca3cd7
* ChibiOS conf upgrade for phoenix
phoenix - 21bfb14c52451899dadf545b78a8e88b22a420f0
* ChibiOS conf upgrade for polilla
polilla - 3ba5f326b268362c9aba570b1510e1c61009ba96
* ChibiOS conf upgrade for primekb/meridian
primekb/meridian - df266e25c682a8ed3318faa186805683014ccec4
* ChibiOS conf upgrade for projectkb/alice
projectkb/alice - eee7210f618588b2c5c6367c8a0318427d09da52
* ChibiOS conf upgrade for projectkb/signature87
projectkb/signature87 - 617430e601981f0bb5fbcce42eee53107d5161b8
* ChibiOS conf upgrade for ramonimbao/squishy65
ramonimbao/squishy65 - 88e4cd3db8db61ccf9daed5405cf5eeb32f8043e
* ChibiOS conf upgrade for ramonimbao/wete
ramonimbao/wete - f0e90d943d8749e802b6bba619ce943b568a7f65
* ChibiOS conf upgrade for rart/rartlice
rart/rartlice - f7a6b58e6cadd4102fcf5f89d054d1fbdc5809d0
* ChibiOS conf upgrade for retro_75
retro_75 - 34c7b291fb2443bf8cb69fb9ee676190c736bf00
* ChibiOS conf upgrade for rocketboard_16
rocketboard_16 - 24e6503a7a5259934a80dd96dd37d3281b4240d3
* ChibiOS conf upgrade for satt/vision
satt/vision - c926d6433d8b2dc1d74623184255016bdd36ae22
* ChibiOS conf upgrade for tkc/candybar
tkc/candybar/lefty - 2f269cbed5dcec61bb0c7904a46436f110dc0ae1
tkc/candybar/righty - 9b1448b2ccbcf8a4d1e5ad74d8ad5933003ee9a2
* ChibiOS conf upgrade for tkc/godspeed75
tkc/godspeed75 - 2cfed58d44a7eef8f341ff24e0136511e03aa78d
* ChibiOS conf upgrade for tkw/stoutgat/v2/f411
tkw/stoutgat/v2/f411 - b094651ec61c79099de3e6e4991319816ac464c1
* ChibiOS conf upgrade for viktus/styrka
viktus/styrka - f3f678ea55126c9965f24da6fffc9bbbd8b24aa9
* ChibiOS conf upgrade for vinta
vinta - e5403dc6bbf47f35a53cf43b1b1d130f05552f16
* ChibiOS conf upgrade for westfoxtrot/prophet
westfoxtrot/prophet - 0e4d6987ffa6430720804e7bc1502ab6c3dcb879
* ChibiOS conf upgrade for whitefox
whitefox - 5ca6de6fb09d8c2cfa996b65732fcd55391053ff
* ChibiOS conf upgrade for wolfmarkclub/wm1
wolfmarkclub/wm1 - 2d8294e29b08f5af5406988a284483d1694ed36c
* ChibiOS conf upgrade for xelus/kangaroo
xelus/kangaroo - f9697ba27d4e6c36a1cfd9e2657eac35dfa3be99
* ChibiOS conf upgrade for xelus/trinityxttkl
xelus/trinityxttkl - a457601b446ea9b4e9e28d2ba304a4bcdb934257
* ChibiOS conf upgrade for xelus/valor_frl_tkl
xelus/valor_frl_tkl - 27ec14b9ee0e5cb2d026af500d16b17d4c2885e2
* ChibiOS conf upgrade for zoo/wampus
zoo/wampus - 926487c1f50c1c5eb0608ca7dc1184881d54d35e
* ChibiOS conf upgrade for zvecr/split_blackpill
zvecr/split_blackpill - 02f4393d01e0a70c94af48fa979ff0229732e8ca
* ChibiOS conf upgrade for zvecr/zv48/f401
zvecr/zv48/f401 - 8b1766a24f943b9b0ba756c6fe340ba69d5e14e3
* ChibiOS conf upgrade for zvecr/zv48/f411
zvecr/zv48/f411 - 09ba645092eb7f3d41da0d5e6727f2f4f97033c0
2020-12-05 21:13:58 +11:00
Ryan
3afe0ea9b9
ST7565 tidyup ( #10907 )
2020-11-26 23:44:17 +11:00
Joakim Tufvegren
cacf495c91
Ergodox Infinity: Add EE_HANDS support. ( #9527 )
...
Including a guide to set these EEPROM values (in the readme).
2020-10-11 01:48:52 +01:00
Joakim Tufvegren
6eab8a0b61
[Keyboard] Make WPM sync between halves on Ergodox Infinity ( #9526 )
...
* Make WPM able to sync between keyboard halves on Ergodox Infinity.
* Fix mixed indentation in ergodox_infinity.c.
2020-09-19 16:25:20 -07:00
Ryan
b89b2030af
Kiibohd bootloader, take 2 ( #10129 )
2020-08-29 14:30:02 -07:00
Ryan
9ef4526a2f
Remove unused CORTEX_VTOR_INIT ( #10053 )
2020-08-29 14:30:02 -07:00
Drashna Jaelre
9d3b26a475
Update features to use Custom Tapping Term when appropriate ( #6259 )
...
* Update Space Cadet to use Custom Tapping Term functionality
* Detect correct keycode for space cadet tapping term
* Update tap dancing to use global custom tapping term
* Update documentation for Tap Dances
* formatting pass
* Apply suggestions from code review
Co-Authored-By: fauxpark <fauxpark@gmail.com>
* Update docs/feature_tap_dance.md
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* Update for future
* Update user keymaps for space cadet
* Fix typos
* Clean up tapping term stuff
* Fix compiler issue if NO_ACTION_TAPPING is enabled
Co-authored-by: fauxpark <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2020-08-29 14:30:02 -07:00
Pete Sevander
b0335b2731
Bigger combo index ( #9318 )
...
* Add change log
* Change combo index from uint8_t to uint16_t
2020-08-29 14:30:02 -07:00
Nick Brassel
70ce4ba56f
Revert "Add Kiibohd bootloader type to bootloader.mk ( #9908 )" ( #10126 )
...
This reverts commit e2d4cd1a41
2020-08-21 15:42:28 -07:00
Ryan
e2d4cd1a41
Add Kiibohd bootloader type to bootloader.mk ( #9908 )
2020-08-12 12:28:20 +10:00
James Young
26eef35f07
2020 February 29 Breaking Changes Update ( #8064 )
2020-02-29 11:59:30 -08:00
Ryan
66d7fc34b2
Add Arm Teensys to mcu_selection.mk ( #8026 )
...
* Add Arm Teensys to mcu_selection.mk
* Roll back halfkeyboard keymap changes
* Remove extra newline
2020-02-21 17:12:15 +11:00
ridingqwerty
66fe3001e4
Trim firmware sizes from default rules.mk, part 1 ( #8027 )
...
* Removed reference to firmware size in 0-9,a-f board-level and default keymap 'rules.mk' files
* Correct some 'rules.mk' in boards buried under vendor folders
* PR8027 patch
Co-authored-by: GeorgeKoenig <35542036+GeorgeKoenig@users.noreply.github.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
2020-01-29 12:51:25 -05:00
Joel Challis
9a0245b778
Fix boards which were overriding backlight without setting custom ( #7970 )
2020-01-27 22:31:54 +00:00
Pentti Laitinen
6799937a3c
[Keymap] Updating Nordic ergo keymap ( #7107 )
...
* Update ergodox infinity nordic_ergo keymap
- Add missing important keys to base layer.
- Move arrow keys around as the original position was not optimal.
- Fix some code styling issues.
* Fix indentation to 4 spaces
* More code style fixes
- Formated the methods in the nordic ergo keymap.
* Fix QMK code style issues
- Change layer defines to enums.
- Split enums to multi-line.
- Remove non required switch case.
2019-10-23 00:54:14 -07:00
Louis Orleans
c5ffd182c8
[Keymap] update my keymap for Infinity Ergodox ( #6864 )
...
* 🎉 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
* 💩 someone commited Windows line endings
* ✨ left hand thumb is space
* ♻️ extract layers def to new file
* 🔥 remove unnecessary hooks
* ✨ 💄 set LCD text and color by layer
* 💄 update keymap
removing layer buttons that I don't really use
* ✨ set backlight to full brightness on boot
* 🔥 remove unnecessary includes
2019-10-04 20:32:52 -07:00
Manassarn "Noom" Manoonchai
f8e4f7ea80
[Keymap] Add Z-layer to narze layouts ( #6806 )
...
* Revert raise/backspace mod tap to just backspace
* Add Dev layer
* Use Dev layer on holding z key
* Add Dev layer for Ergodox
2019-09-25 12:57:49 -07:00
Manassarn Manoonchai
9dae7f7d85
[Keymap] Update to narze keymaps ( #6694 )
...
Use Right GUI as backspace key & 1ms polling interval on narze keymaps
* Refactor & reimplement mod tap macros
* Reduce tapping term
* Update readme
* Add narze userspace
* Make use of narze userspace
* Extract Superduper mode
* Refactor Superduper mode
* (Ergodox Infinity) Prevent stuck modifiers
* Update ergodox_infinity/narze likewise
* Add warning for building Infinity with docker
* Fix include eeprom.h in superduper
* Try enabling superduper mode with combo for ergodox infinity
* Apply suggestions on #4546
* Convert to 4 spaces
* Map backlight step key
* Replace PLAY_NOTE_ARRAY
* Fix superduper toggle
* Re enable audio in planck rev4
* Use perform_space_cadet
* Remove superduper mod tap triggers
* Add readme for planck light firmware flashing command
* Remove unused layers
* Remove unused keycodes
* Add backlight toggle
* Remove unused songs & use DEFAULT_LAYER_SONGS
* Update readme
* Move includes to header file
* Set RGUI & raise as backspace & unbind actual backspace
* tmp
* Fix qwerty doc
* Use 1ms polling rate
2019-09-09 21:44:08 -07:00
Manassarn Manoonchai
c21281c593
[Keymap] Add narze userspace ( #6652 )
...
* Refactor & reimplement mod tap macros
* Reduce tapping term
* Update readme
* Add narze userspace
* Make use of narze userspace
* Extract Superduper mode
* Refactor Superduper mode
* (Ergodox Infinity) Prevent stuck modifiers
* Update ergodox_infinity/narze likewise
* Add warning for building Infinity with docker
* Fix include eeprom.h in superduper
* Try enabling superduper mode with combo for ergodox infinity
* Apply suggestions on #4546
* Convert to 4 spaces
* Map backlight step key
* Replace PLAY_NOTE_ARRAY
* Fix superduper toggle
* Re enable audio in planck rev4
* Use perform_space_cadet
* Remove superduper mod tap triggers
* Add readme for planck light firmware flashing command
* Remove unused layers
* Remove unused keycodes
* Add backlight toggle
* Remove unused songs & use DEFAULT_LAYER_SONGS
* Update readme
* Move includes to header file
2019-09-07 08:06:30 -07:00
Konstantin Đorđević
267a85c885
Remove KC_DELT alias in favor of KC_DEL ( #6327 )
...
* Remove KC_DELT alias in favor of KC_DEL
* Add changelog
2019-08-30 15:01:52 -07:00
Drashna Jaelre
4003d077ce
Add a universal flash command for cli ( #6224 )
...
* Add universal flash command
* Add bootloader info to I:C boards
* Add support for ATSAM
* Add messages for flash target
* Message cleanup
* Add USB ASP Flashing target
* Make usbasp target more universal
* Add phoney target for usbasp
* Clarify error message when bootloader isn't matched
2019-08-20 15:39:24 -07:00
fauxpark
f14629ed1c
Remove/migrate action_get_macro()s from default keymaps ( #5625 )
...
* Remove/migrate action_get_macro()s from default keymaps
* Leave these breaks alone
2019-07-15 23:04:02 -07:00
Drashna Jaelre
41beecfc18
Add DFU Suffix for ARM boards ( #5763 )
...
* Add DFU Suffix for ARM boards
* Blindly flash DFU SUFFIX ARGS for now
* Fix commented out check
* Fix DFU Suffix Argument check
Thank you jack!
* Update Travis CI Scripts to include dfu-util
So we can get dfu-suffix as well
* Manually add dfu-suffix package
* Use external repo for newer version of dfu-util
One that includes dfu-suffix
* Update .travis.yml
* Silence unnecessary output from dfu-suffix
2019-05-03 08:24:22 -07:00
noroadsleft
69f757c3a2
Fix Ergodox Infinity keyboard dimensions in info.json
2019-04-13 01:27:42 -07:00
Drashna Jaelre
0072fdd799
Cleanup Default Keymaps ( #5442 )
...
* Cleanup Default Keymaps to conform to QMK Firmware standards
* Minor fixes
* Revert some changes
2019-03-19 12:57:40 -07:00
fauxpark
545f95c8f4
Migrate ACTION_LAYER_TAP_TOGGLEs to TT()
2019-02-18 08:52:51 -08:00
fauxpark
3b2a484a5b
Remove redundant KC_TRNS and KC_NO fillers in remaining keymaps ( #5154 )
2019-02-17 07:38:46 -08:00
fauxpark
9e4ac6cf29
Migrate fn_actions for default keymaps ( #4935 )
...
* Migrate fn_actions for default keymaps
* Rename the Grave/Escape Shift masks
* No need for shift_esc_shift_mask
* Change breaks to return false
* Right align pointers
* Add default case
* Separate cases with empty lines
2019-02-14 20:07:13 -08:00
Konstantin Đorđević
4d9b11af14
Fix Command feature: use get_mods() instead of keyboard_report->mods ( #4955 )
...
* Remove unnecessary IS_COMMAND definition in clueboard/66/rev4
* Replace keyboard_report->mods with get_mods() in IS_COMMAND definitions
* Update docs to use get_mods() instead of keyboard_report->mods
* Replace keyboard_report->mods with get_mods() in tmk_core/protocol/usb_hid/test
For some reason, this occurrence used KB_LSHIFT and KB_RSHIFT, which don't exist
* Replace keyboard_report->mods with get_mods() in Massdrop keyboards (as per @patrickmt)
2019-01-27 00:28:40 -08:00
gromwalh
e22c399245
Ergodox Infinity: Swapped Row and Column in comments ( #4247 )
...
When comparing the pins in this file to the Ergodox Infinity schematic, it seems that the first section is describing the rows and the second section is describing the columns.
2018-10-26 14:12:40 -07:00
Drashna Jaelre
00b6f14821
Replace outdated RGB/Audio information
2018-10-22 14:55:05 -04:00
James D. Marble
76f0b3cc70
Add missing F-keys to ergodox_infinity input_club
...
F11 and F12 were in the ascii art, but not the actual mapping.
This corrects the error.
2018-10-02 22:41:18 -07:00
Joe Wasson
743449472e
Make PREVENT_STUCK_MODIFIERS the default ( #3107 )
...
* Remove chording as it is not documented, not used, and needs work.
* Make Leader Key an optional feature.
* Switch from `PREVENT_STUCK_MODIFIERS` to `STRICT_LAYER_RELEASE`
* Remove `#define PREVENT_STUCK_MODIFIERS` from keymaps.
2018-09-17 13:48:02 -04:00
noroadsleft
1912f36177
Configurator layout repair for Ergodone, Ergodox Infinity and ErgoTravel ( #3173 )
...
* Ergodone refactor
* Ergodox Infinity refactor
* Ergotravel refactor
* Ergotravel configurator layout update
* Fixing include on Ergodox Infinity narze keymap
2018-06-13 07:58:23 -07:00
Oryhara
87abed6865
Sweeping Visualizer for Ergodox Inifinity ( #3136 )
...
* started work on halfkeyboard
* update to keymap
* halfkey layouts complete for dvorak and qwerty
* added plover layout to halfkeyboard mapping
* fixed error in dvorak layout right hand
* fixed error in dvorak layout right hand, comments updated
* thing
* added minus and equals to normal layouts
* added minus and equals to normal layouts
* adde visualizer matching halfkeyboard mappings
* adde visualizer matching halfkeyboard mappings
* updated keymaps for mirror handedness functionality for all layers. Also added visualizer code for distinct color for each layer, and LCD text displaying the current layer.
* had a KC_TILD where should have had KC_GRAV
* its spelled KC_GRAVE
* mouskeys and some visualizer work.
* added LED backlight visuals
* trying to get visualizer working
* 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
* consolidated my custom animations into visualizer.c in my keymap directory
* LED backlight keys animation KITT scanner
* moved my custom rules.mk to my keymap folder
* undoing changes i shouldn't have done
* more fixes
* updated comments on the visulizer code
* steno keys added to plover layout
* updated halfkeyboard rules to allow steno mode
* adding my stuff back after hard reset
* added a plover layout back in for androud steno app
* fixed layer toggle typo
* merged again
* visualizer decided to have a conflict again. fixed.
* keymap change to add mouse keys and put layer switching on shortcuts layer
* made the ergodox LEDs scan left to right and back again
* visualizer work
* KITTSCANNER finally
* fixed right hand shortcuts layer and removed handedness switching for base layer so jump in gaming works corrrectly
* added another sweep that goes full on over both boards then full off in both directions
* added function key layer and cleaned up some layer switching
2018-06-06 09:52:56 -07:00
Daniel Gordon
a75bd221f2
Updates to gordon keymaps ( #3082 )
...
Added rules.mk for the infinity
* Moved tap dance enums to gordon.h
* Moved tap dance aliases to gordon.h
Moved TD to user space
* Added config file with preventing mods sticking
* Added a few keys to keymap
2018-05-30 08:10:22 -07:00
Drashna Jaelre
4dc89d974b
Fix Ergodox EZ Info.json files ( #2979 )
...
* Fix Ergodox EZ Info.json files
* Ugh, column stagger!
* Whoops, added offset to wrong axis
* Add changes to Ergodone and Ergodox Infinity
2018-05-20 21:34:18 -07:00
Drashna Jaelre
7cb3c0e466
Add pretty layout to all ergodox clones ( #2686 )
...
* Add pretty layout to all ergodox clones
* Info.json cleanup for EZ
* Add info.json for ergodone
* info.json cleanup
2018-04-21 17:00:43 -04:00
Josh Asplund
5ec3bd9e40
Adds default IC keymap ( #2677 )
2018-04-19 09:30:45 -07:00
fredizzimo
e9d32b60b7
Add a custom USB driver for ARM ( #2750 )
...
* Copy Chibios serial_usb_driver into the chibios/protocol
It's renamed to usb_driver to avoid name conflicts
* Make the usb driver compile
* Disable ChibiOS serial usb driver for all keyboards
* Change usb_main to use QMKUSBDriver
* Initialize the usb driver buffers
* Add support for fixed size queues
* Fix USB driver initialization
* Don't transfer an empty packet for fixed size streams
2018-04-15 20:42:53 -04:00
skullY
f10a0ae547
Remove bootloader from info.jsons
2018-04-11 21:32:09 -07:00
skullydazed
f4a9e98383
Pull information from config.h and rules.mk ( #2711 )
...
* Pull information from config.h and rules.mk
* Readd the kbd75 maintainer
2018-04-07 16:13:48 -07:00
