5da04fb45b
Update to ChibiOS 20.3.4, support builds against trunk ( #14208 )
...
* Add support for building against ChibiOS svn/trunk.
* Swap to 21.6.x
* Update to latest branch revision as released version is broken.
* Updated configs.
* Conf updates.
* Updated ChibiOS
* Convert STM32L422 to actual L422 ChibiOS platform.
* Downgrade to 20.3.4 as ChibiOS 21.6.x is being aborted.
* Rollback L422-based boards.
2021-11-03 08:26:40 +11:00
0fa217a5b7
Align ChibiOS I2C defs with other drivers ( #14399 )
...
* Align ChibiOS I2C defs with other drivers
* Update keyboards/xelus/valor_frl_tkl/config.h
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
2021-09-12 15:41:33 +01:00
4791cfae1a
Remove width, height and key_count from info.json ( #14274 )
2021-09-12 14:04:56 +10:00
a03aa301de
Remove Full Bootmagic ( #13846 )
...
* disambiguate Bootmagic rules in keymaps
The files edited by this commit were added at a point in time where `BOOTMAGIC_ENABLE = yes` enabled full Bootmagic.
This commit edits the files to specify that full Bootmagic is intended.
* remove BOOTMAGIC_ENABLE=full setting
* unify commented BOOTMAGIC_ENABLE rules in keyboards
Explicitly sets `BOOTMAGIC_ENABLE = no` in keyboards where the rule was commented out.
Command:
```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;#[ \t]*\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-zA-Z]\+\).*;\1 = no # Virtual DIP switch configuration;g' {} +
```
* remove commented Bootmagic rules from keymap/user level
Command:
```
find keyboards/ layouts/ users/ -type f -name 'rules.mk' -exec sed -i -e '/#.*\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*/d' {} +
```
* update keyboard BOOTMAGIC_ENABLE rule formatting
Sets the formatting of BOOTMAGIC_ENABLE rules to `BOOTMAGIC_ENABLE = [value]`, without the inline comments (which will be replaced later).
Command:
```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' +
```
* update keyboards' BOOTMAGIC_ENABLE settings
Updates keyboard `rules.mk` files to use `BOOTMAGIC_ENABLE = lite` where `BOOTMAGIC_ENABLE = full` was being used.
Command:
```
find keyboards/ -type f -name 'rules.mk' -and -not -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = \)full;\1lite;g' '{}' +
```
* update keymap/user BOOTMAGIC_ENABLE settings
Updates keymap/user `rules.mk` files to use `BOOTMAGIC_ENABLE = lite` where `BOOTMAGIC_ENABLE = full` was being used.
Commands:
```
find keyboards/ -type f -name 'rules.mk' -and -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE[ \t=]\+\)full;\1lite;g' '{}' +
find layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE[ \t=]\+\)full;\1lite;g' '{}' +
```
* remove and replace inline comments in keyboards and keymap/user files
Removes and replaces the inline comments, which have been updated to read `Enable Bootmagic Lite`.
Commands:
```
find keyboards/ -type f -name 'rules.mk' -and -path '*/keymaps/*' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' +
find layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE\)[ \t=]\+\([a-z]\+\).*;\1 = \2;g' '{}' +
find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = lite\);\1 # Enable Bootmagic Lite;g' '{}' +
find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = yes\);\1 # Enable Bootmagic Lite;g' '{}' +
find keyboards/ layouts/community/ users/ -type f -name 'rules.mk' -exec sed -i -e 's;\(BOOTMAGIC_ENABLE = no\);\1 # Enable Bootmagic Lite;g' '{}' +
```
* rename improperly named makefiles
Some files intended to be used as makefiles had improper names causing them to not be used as intended when building.
This commit corrects the filenames of the affected files.
* update renamed file with new rule formatting
* update QMK's template files
Updates QMK's `rules.mk` templates to use the new inline comment.
* update QMK Docs
- remove documentation of full Bootmagic
- update links to Bootmagic Lite doc
- add doc for Magic Keycodes
* rules.mk patch for coarse/ixora and coarse/vinta
2021-08-06 23:59:56 -07:00
41a770ded3
[Keyboard] Fix SRC include for matrix/m20add issi driver ( #13826 )
2021-07-31 12:18:11 -07:00
7bcbeffc2d
Fix compile issues due to LED changes ( #13821 )
2021-07-31 17:30:13 +01:00
70fb3e1aaf
__flash? ( #13799 )
2021-07-31 14:35:30 +01:00
a8d64c8b89
Change `BOOTMAGIC_ENABLE=yes` to use Bootmagic Lite ( #12172 )
2021-04-12 21:18:52 +02:00
cce7b91cb1
Merge remote-tracking branch 'origin/master' into develop
2021-01-25 05:38:32 +00:00
c65aecc53a
Remove redundant I2C config defines from keyboards ( #11661 )
2021-01-25 16:37:53 +11:00
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
78fe155b72
Fix up comments showing how to execute config migration. ( #11621 )
2021-01-20 02:19:36 +11:00
3b1ffd2ede
ChibiOS enable memory allocations ( #11620 )
2021-01-19 14:50:51 +00:00
19c180ef88
ChibiOS conf migrations... take 10 ( #11617 )
...
* ChibiOS conf upgrade for akegata_denki/device_one
akegata_denki/device_one - 0d9f891416decbbb533c6c1147632ef7c55a2d9f
* ChibiOS conf upgrade for chavdai40
chavdai40/rev1 - 06bca6ec34948c8005e73254299488cdba3429f8
chavdai40/rev2 - f55650a8d7aa755eb72564e95a144910dd902a73
* ChibiOS conf upgrade for ergodox_stm32
ergodox_stm32 - 04433b80e4cd231c15163ace77428db72b5483ad
* ChibiOS conf upgrade for jm60
jm60 - a127e6cfccad74ed1a9e47e9213dc41cf0d26f1d
* ChibiOS conf upgrade for matrix/m20add
matrix/m20add - e2e556dad666ed9b1eea09e46d0eb14e19bda8b8
* ChibiOS conf upgrade for matrix/noah
matrix/noah - c6fd3caf0b7d444085283d4f0a9204ab283d5202
2021-01-20 00:35:24 +11:00
d85b27bbbc
Leftover early initialisation conversions ( #11615 )
...
* jm60
* ergodox_stm32
* F042 bootloader jumps.
* xiaomi/mk02 custom bootloader, no early-init bootloader jump for F072.
* matrix/m20add, matrix/noah
2021-01-20 00:23:07 +11:00
e0e67df933
ChibiOS conf migrations... take 9 ( #11598 )
...
* ChibiOS conf upgrade for akegata_denki/device_one
akegata_denki/device_one - 0d9f891416decbbb533c6c1147632ef7c55a2d9f
* ChibiOS conf upgrade for ergodox_stm32
ergodox_stm32 - 72aeab1612ef73555a73dd60d005e671a90d7e2f
* ChibiOS conf upgrade for jm60
jm60 - cc75e97727fadd939be4bdf7fa3714320465d3ef
* ChibiOS conf upgrade for matrix/m20add
matrix/m20add - b0dee0b4e8c0a94d55fea51c8699972f15483209
* ChibiOS conf upgrade for matrix/noah
matrix/noah - 57a1c09cd24716863ce862e0b9cbca2a9c6fcebf
* ChibiOS conf upgrade for nibiria/stream15
nibiria/stream15 - 610b151b02f5cac681c65fbd3f94a12312f99b82
* ChibiOS conf upgrade for xiaomi/mk02
xiaomi/mk02 - f92fcee777acc159c0af268e88b751fd1e33f74f
2021-01-18 13:16:59 +11:00
4394fc35ea
change matrix/m20add to use non-standard names for non-standard pins
2021-01-07 21:21:12 -08:00
9366ed7282
Normalise include statements in keyboard code ( #11185 )
2020-12-16 14:27:23 +11:00
b8443863c0
Remove references to ch-bootloader-jump.patch ( #10998 )
2020-11-22 21:12:30 +00:00
0140baf7e0
Add STM32F401/F411 to mcu_selection.mk ( #10278 )
...
* Reorder STM32 MCUs
* Add STM32F4xx to mcu_selection.mk
* Set MCU for phoenix and tkw/stoutgat/v2/f411
2020-09-18 20:00:18 -07:00
ac3dfa742a
[Keyboard] added matrix 8xv2.0 additional ( #9470 )
...
* added matrix 8xv2.0 additional keyboard
* Apply suggestions from code review
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
* add copyright and speed up the matrix scanning
* Update keyboards/matrix/m20add/rules.mk
Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>
Co-authored-by: Drashna Jaelre <drashna@live.com>
2020-08-22 13:45:06 -07:00
Nick Brassel
Joel Challis
Ryan
James Young
Drashna Jaelre
QMK Bot
Zach White
yulei