782e48887c
Bump wifi-connect
2020-12-22 22:16:24 +01:00
b143cbc21a
Disable nodered service by default
2020-10-11 14:51:00 +02:00
bef18116f1
Addition of and switch to ovos branded splash screen
2020-10-11 14:32:29 +02:00
9e992aaa49
Merge pull request #39 from emphasize/change_login_branding
...
Changes the terminal branding/welcome screen
2020-10-06 21:24:51 +02:00
cea47b56c2
Start with rebranding to OpenVoiceOS (OVOS).
2020-10-06 21:23:38 +02:00
a9bbdf6b4b
Changes the terminal branding/welcome screen
2020-10-04 21:10:20 +02:00
2a1675594e
MycroftOS: Test with resampling everything to 48000
2020-09-18 14:51:30 +02:00
ee4be20395
MycroftOS: Split systemd tmpfiles configuration into mycroft and pulse conf files
2020-09-17 15:33:53 +02:00
94fbaafcbd
MycroftOS: Change priority skills names
2020-09-17 15:06:05 +02:00
e5be5fbdde
MycroftOS: Rename mycroftos enclosure skill
2020-09-16 20:00:01 +02:00
a821b78172
MycroftOS: Rename mycroftos GUI skill
2020-09-16 19:57:49 +02:00
560f20060f
MycroftOS: Update mycroft-volume skill
2020-09-16 19:49:48 +02:00
baa7435c33
MycroftOS: Add node-red launcher scripts and service file.
2020-09-15 09:37:39 +02:00
6c8cdfd4eb
MycroftOS: Change default listener to MycroftOS
2020-09-14 16:25:13 +02:00
2838dc9625
MycroftOS: Small changes in default sink/source naming
2020-09-14 16:24:12 +02:00
52081a49b1
MucroftOS: Make pulse device the default listener device.
2020-09-04 14:04:55 +02:00
284d5dabd6
MycroftOS: Bump python-mycroft to latest 20.8.0 version.
2020-09-03 14:54:15 +02:00
a88dc814a6
MycroftOS: Combine all sinks into one and make it the default.
...
This will make the sound being outputted to all sinks, so it should
not matter what you connect. Sound is directed to all available sinks
HDMI and Headphones (and/or usbcards/HATs) both output the same sound.
2020-08-31 19:27:59 +02:00
19e8d56ee7
MycroftOS: Remove NetworkManager dispatcher files
2020-07-28 14:48:23 +02:00
d8ba4dfed8
MycroftOS: Initial try of vconsole.conf
2020-07-28 14:11:45 +02:00
1707717f72
MycroftOS: Update dbus and rpcbind sockets to correct legacy paths
2020-07-28 12:59:56 +02:00
46869eb0ed
MycroftOS: Changes and fixes to systemd / splash system.
2020-07-27 15:28:56 +02:00
d5741471ca
MycroftOS: Change /var/run to /run for pulse tmpfiles
2020-07-27 13:56:23 +02:00
7df45ec2f7
MycroftOS: Remove os-release from rootfs overlay.
...
This needs to be written in a post image script.
2020-07-27 13:49:40 +02:00
094e1d3478
MycroftOS: Remove old inittab settings.
2020-07-27 12:29:24 +02:00
1bbedfc52a
MycroftOS: Add local Mimic2 cache.
...
- Big thanks to Gez for uploading these.
2020-07-21 11:17:04 +02:00
898f265f9c
MycroftOS: Turn On/Off wifi if LAN connection is up.
2020-07-21 10:45:54 +02:00
1dffc1df50
MycroftOS: Auto start wifi-connect at boot if no active wifi is present.
2020-07-21 10:30:41 +02:00
4609fabd4a
MycroftOS: Little bit of rebranding of wifi-connect
2020-07-21 09:59:06 +02:00
c8803ca3bc
MycroftOS: Change wifi-connect logo's
2020-07-21 09:49:35 +02:00
2beaab7a25
MycroftOS: Migrating to new wifi-connect system.
2020-07-21 09:24:45 +02:00
6b92a68a3e
MycroftOS: More timesync changes.
2020-07-21 08:18:22 +02:00
b978459f29
MycroftOS: More network fixes
2020-07-20 22:04:47 +02:00
414ecb8c59
MycroftOS: Don't enable wpa_supplicant by default (anymore)
2020-07-20 12:32:36 +02:00
5da8f467d3
MycroftOS: Addition of default NetworkManager files.
2020-07-20 11:42:02 +02:00
94b8c0e41e
MycroftOS: Disable headless wifi-app for now.
2020-06-11 15:06:57 +02:00
706f58a378
MycroftOS: Add default baresip config for MycroftOS install.
...
- sound through pulseaudio and right modules pathh
2020-06-09 12:26:00 +02:00
87a014ec1b
MycroftOS: Make use of wpa_supplicant default config file
2020-06-01 16:23:13 +02:00
3b85e873c1
MycroftOS: GUI: Launch mycroft-gui onto a weston wayland compositor
2020-06-01 15:41:14 +02:00
79e24e02a9
MycroftOS: GUI: Don't show resting screen if not paired yet
2020-05-30 18:56:42 +02:00
b9d54091fa
MycroftOS: GUII: Update skill-mycroft-gui
2020-05-30 18:50:52 +02:00
fe07bf5bfb
MycroftOS: Refactoring wifi setup system
2020-05-28 09:12:54 +02:00
99f2b2f535
MycroftOS: Remove splash screens as they are no longer used.
2020-05-25 19:58:51 +02:00
857c44a74d
MycroftOS: Update enclosure skill.
2020-05-25 19:57:26 +02:00
cde24f07fe
MycroftOS: Update enclosure skill
2020-05-24 20:43:38 +02:00
fef13a4c43
MycroftOS: GUI: Update enclosure and gui skills
2020-05-24 19:54:10 +02:00
b9ce602cb5
MycroftOS: GUI: Try to fix preinstalled skills
2020-05-24 15:07:23 +02:00
f89119e4f0
MycroftOS: GUI: Add of updated volume skill and mark2-skill
2020-05-24 14:21:26 +02:00
036d70a505
MycroftOS: GUI: Make sure the splash starts after DRM
2020-05-17 20:09:09 +02:00
b3d1c011ef
MycroftOS: GUI: Add mycroft-gui systemd service file
2020-05-17 17:38:09 +02:00
e73b5bbd00
MycroftOS: GUI: Changes/fixes to the splash update.
...
As the mycroft services run as the mycroft user the splash updates
need to be done via sudo/root.
2020-05-17 17:34:03 +02:00
c50bcb13f9
MycroftOS: Remove deprecated umask from pulseaudio startup
2020-05-15 10:57:34 +02:00
a734eac671
MycroftOS: GUI: Small changes to the splash system
2020-05-15 10:56:24 +02:00
8a365bf730
MycroftOS: GUI: Enable the splash quit service at the end of boot process.
2020-05-15 10:29:14 +02:00
0f8f5e5eee
MycroftOS: Remove hostname.service drop-in splash file.
2020-04-22 14:33:08 +02:00
2667ad6204
MycroftOS: More changes to the splash system
2020-04-21 13:05:55 +02:00
7656ac027a
MycroftOS: More changes for the splash screen.
2020-04-21 09:36:05 +02:00
22c8c79444
MycroftOS: Remove framebuffer screen from enclosure skill.
...
- This make testing the splash easier.
2020-04-20 13:54:24 +02:00
441c69fd06
MycroftOS: Remove cork module loading and unloading
2020-04-20 13:47:43 +02:00
52695dfb5a
MycroftOS: Start pulseaudio after avahi
2020-04-20 13:40:53 +02:00
7267b980c6
MycroftOS: Enable seeed-voicecard by default
2020-04-20 13:17:51 +02:00
4d2786c8e8
MycroftOS: Create tmpfiles.d pulse cookie directory at boot
2020-04-20 12:25:06 +02:00
faa2787ecd
MycroftOS: Fix dbus pulse configuration
2020-04-20 12:01:11 +02:00
afbb248517
MycroftOS: Small changes to systemd-preset to make development easier.
2020-04-20 11:25:40 +02:00
ddb6c3c82b
MycroftOS: Limit Journald in files and filesize
2020-04-16 13:10:54 +02:00
98f30ff704
MycroftOS: Disable coredump
2020-04-16 13:05:59 +02:00
93b0571fba
MycroftOS: Decrease wait for network online timeout
2020-04-16 12:37:58 +02:00
7aca1dd279
MycroftOS: Bring btspeaker service inline with latest systemd changes
2020-04-16 12:04:05 +02:00
e0161a3717
MycroftOS: Disable getty by default
2020-04-16 11:41:50 +02:00
00e090edc5
MycroftOS: Migrate splash updates into systemd drop-in files
...
This for better management and in preperation for easy BAR update
2020-04-16 10:59:59 +02:00
44961dd8a0
MycroftOS: Remove wpa_supplicant patch as systemd now takes care of it.
2020-04-15 16:33:50 +02:00
bbf4dd3fbf
MycroftOS: Implementation of os-release file
2020-04-15 16:11:35 +02:00
b4050b329e
MycroftOS: Make use of systemd preset files for enabling default services.
2020-04-15 15:43:36 +02:00
2b6e6b94b8
MycroftOS: Set systemd default to disable via preset.
2020-04-15 14:37:00 +02:00
3bc68902ae
Merge branch 'feature/rpi4_64' into develop
2020-04-15 09:07:21 +02:00
cb5a4b31a7
MycroftOS: Add of eth0.network
2020-04-14 21:08:11 +02:00
bb0a9ea186
MycroftOS: Change dhcp.network file to reflect buildroot change.
...
5ba81d0109 (diff-531b504c55961e72523bdd2f4ff62f39)
2020-04-14 19:57:45 +02:00
eb1e78b817
MycroftOS: Split rootfs overlay into board specifics folders
2020-04-12 15:35:10 +02:00
d85a55f71a
MycroftOS: Add dbus config for systemwide pulseaudio.
2020-04-06 13:34:16 +02:00
d32532947f
MycroftOS: Make alsa a bit more forgiving for usb cards.
2020-04-06 11:31:06 +02:00
cbd014a0b5
MycroftOS: Bump enclosure skill
2020-01-16 21:36:08 +01:00
554fc0003e
MycroftOS: Bump enclosure skill once again
2020-01-16 15:46:42 +01:00
8bce3b0fe7
MycroftOS: Bump mycroftos-enclosure-skill again
2020-01-15 22:52:27 +01:00
257df74090
MycroftOS: Bump mycroft-enclosure-skill
2020-01-15 11:46:20 +01:00
9ee6bea5cd
MycroftOS: Addition of Music Player Daemon (mpd).
...
- Folders are in /opt/mpd/
- Configuration in /etc/mpd.conf
- commented section to output to Snapcast if wanted
- NOT enabled by default, can be started/enabled by;
sudo systemctl start/enable mpd.service
2020-01-13 14:31:02 +01:00
34ab4ad2b3
Intermediate mycroftos-enclosure-skill bump
2020-01-13 08:04:35 +01:00
6d2105a8d0
MycroftOS: Pulse audio fixes and tweaks (mostly for BT distortions)
2020-01-11 19:38:16 +01:00
c53f0b297e
MycroftOS: Remove service name from advertised names.
...
They are not biting each other anyway and making it is obvious anayway
2020-01-10 19:20:15 +01:00
9d84ce2239
MycroftOS: Add mycroftos-enclosure-skill to priority skills
2020-01-08 09:15:18 +01:00
f13b367b22
MycroftOS: Remove spaces from airplay name.
2020-01-07 14:39:59 +01:00
53307696cb
MycroftOS: Update mycroftos-enclosure skill
2020-01-07 14:36:28 +01:00
f95dec9fa5
MycroftOS: Fixes / Changes in file/folder permissions at first boot.
2020-01-07 14:35:20 +01:00
64bac8c138
MycroftOS: Try to enable/disable Airplay via enclosure-skill
2020-01-06 21:12:43 +01:00
d5b81abe22
Revert "MycroftOS: Decrease pulseaudio latency by disabling tsched."
...
This reverts commit e1c343a762
2020-01-06 19:54:27 +01:00
2789b9af69
MycroftOS: Fix folder permissions on first boot for default already installed skills
2020-01-06 19:22:24 +01:00
29ae2c3557
MycroftOS: Let's make snd_bcm2835 play nice with USB cards
...
- Make the USB card default before bcm2835 if present.
2020-01-06 16:36:49 +01:00
b2998369c2
MycroftOS: Initial start of implementing Airplay support.
2020-01-06 15:15:52 +01:00
c1b3bb8b0e
MycroftOS: Add mycroftos-enclosure-skill for FB visuals.
2020-01-06 11:44:25 +01:00
dc7396e46e
MycroftOS: Show wifisetup FB visual when starting the wifisetup.
2020-01-06 11:41:32 +01:00
3e6ec89558
MycroftOS: Mimic a captive portal to auto start a browser on wifi connect.
2019-12-31 16:59:43 +01:00
34a89c5541
MycroftOS: Implementation of MycroftOS-WiFiSetup system.
...
- Start an Acces Point if no wlan is configured.
- Start a small flask webserver to configure the wifi.
2019-12-29 14:03:51 +01:00
8e897038b7
MycroftOS: Make the HDMI bootup screen pretty again
2019-12-22 19:29:30 +01:00
1dfae2d035
MycroftOS: Loading the mycroft-cli-client to soon is fixed
...
- Therefor start the ncurses cli client by default again
2019-12-22 13:14:57 +01:00
4061037d0b
MycroftOS: Some of tweaks and fises.
2019-12-21 23:43:56 +01:00
e1c343a762
MycroftOS: Decrease pulseaudio latency by disabling tsched.
...
- This decreases teh latency from 828899 usec to 91376 usec
a factor of ~10 which feels a lot snappier with for instance
the listener sound. (testing needs to prove possible other
related glitches.)
2019-12-20 21:09:29 +01:00
ef7f547531
MycroftOS: Fix wifi.
2019-12-20 21:05:12 +01:00
9cfca493ac
MycroftOS: Disable Echo Cancellation (for now).
2019-12-17 12:12:27 +01:00
a3e71e7602
MycroftOS: Remove export for node, replace with LC_ALL.
2019-12-17 09:27:02 +01:00
f45287d34d
MycroftOS: Add patched volume skill by default.
...
- This will change later on when the enclosure code is ready
and take care of the volume control. For now we use ALSA
and added the MycroftOS to ALSA_PLATFORMS
2019-12-08 15:30:58 +01:00
e1862c63aa
MycroftOS: Don's start mycroft-cli-client by default.
...
- Also in preperation to showing a help section with typical
commands available for MycroftOS.
2019-12-08 14:23:02 +01:00
b6d1742913
MycroftOS: Use paplay instead of aplay for WAV playback.
2019-11-26 08:27:51 +01:00
ed27ec8fad
MycroftOS: System changes related to sound and restoring them.
2019-11-17 14:30:43 +01:00
21e1081440
MycroftOS: Enabling avahi zero conf of pulseaudio
2019-11-15 14:37:59 +01:00
093e2d9c52
MycroftOS: Enabling anonymous pulse access + network sound
2019-11-15 12:20:47 +01:00
712ceed32a
MycroftOS: Enabling Acoustic Echo Cancellation
2019-11-15 09:25:53 +01:00
cb528f6e57
MycroftOS: Addition of mycroft-config script.
2019-11-13 09:58:57 +01:00
7a54a0d8cf
MycroftOS: Force all ALSA sound request to be forwarded to pulseaudio
2019-11-13 08:33:51 +01:00
0e7948a1cd
MycroftOS: Small cosmetic chenage to the cli_login visuals
2019-11-11 09:43:04 +01:00
97d9cf26cf
MycroftOS: Addition of default pulseaudio settings for MycroftOS
2019-11-11 09:39:36 +01:00
7d574f5432
MycroftOS: Changes to default system mycroft.conf
...
- Make Mimic2 the default TTS
- Make TTS duckable
(Make MycroftOS more inline with Mark-1 and Mark-2)
2019-11-11 09:10:44 +01:00
5ccd33e78f
MycroftOS: Different OS layout changes
...
- Prepare system script to run at boot to prepare the system.
Now used to restore sound configuration files to default before
udev takes over and configures the system for what it sees.
Later can be used to prepare the system for read-only OS similar
as I have done during my Kodi developemtn years.
- Sound config changes to default settings.
- Remove forgotten wifi-setup system.
2019-11-11 08:53:55 +01:00
918e873de4
MycroftOS: Start mycroft-cli-client automatically when loging in
...
- Plus a bit of nice to have MOTD from PiCroft
2019-11-05 13:59:27 +01:00
4b12d08faa
MycroftOS: Addition of MycroftOS specific pulse audio .pa files
2019-11-05 13:41:03 +01:00
7ab92f2898
MycroftOS: Fix spi/i2s/gpio access for non root users
...
Similar system as raspbian via udev rules to change teh group.
Adding the mycroft user to those groups.
2019-11-03 13:42:06 +01:00
f625deed3d
MycroftOS: Step away from using the NPM wifi setup system
...
Never realised that Mycroft A.I. had there own ,mycroft-wifi-setup
package created; https://github.com/MycroftAI/mycroft-wifi-setup
Will start uising that one instead to be more inline with the
Mark-1 and Mark-II systems.
2019-10-27 12:43:50 +01:00
6ca98e19f4
MycroftOS: Forgot to bump max core version string to 19.8
2019-10-26 14:24:38 +02:00
38caead28d
MycroftOS: Addition of BASH profile scripts
2019-10-25 12:26:53 +02:00
34ff40ca17
Merge branch 'feature/wifi-setup' of https://github.com/j1nx/MycroftOS into feature/wifi-setup
2019-09-27 09:52:37 +02:00
471002d23c
MycroftOS: Revert back to default audio (pulse) config for mycroft
2019-09-21 12:39:33 +02:00
bf24e48ffc
Merge remote-tracking branch 'origin/develop' into feature/wifi-setup
2019-09-16 13:57:24 +02:00
b8b18cebf4
MycroftOS: First steps in using npm and nvm
2019-09-16 13:43:48 +02:00
5dceef03f7
MycroftOS: Fix stupid quoting error in mycroft.conf
2019-09-12 18:16:12 +02:00
7eb848f661
MycroftOS: Define enclosure platform and version.
2019-09-11 14:32:29 +02:00
c72abbf659
MycroftOS: Add default /home/mycroft/.mycroft/mycroft.conf
2019-09-10 10:18:25 +02:00
3bbdddfa01
MycroftOS: Multiple fixes, tweakes, changes and/or reverts.
...
Basically a bunch of staged stuff of before the upgrade of
buildroot and mycroft. If I remember it all correctly;
- Change the folder permissions setup from device_table to
systemd.
- Remove the mycroft user setup from the mycroft.service
package into a systemwide buildroot user_table.txt
- Fix respeaker stuff for systemd system
- Fix sudo system for the mycroft user
- Allow mycroft to SSH into the system. Disallow root login.
- Probably some other fixes and tweaks I forgot about....
2019-09-09 15:25:51 +02:00
469f4473bf
MycroftOS: Remove /var/log from tmpfs
...
- This to keep the log files at reboot
2019-06-11 15:41:50 +02:00
1763c6be2c
MycroftOS: Fix sudoers construction for mycroft user
2019-02-08 12:14:52 +01:00
8506d56142
MycroftOS: Small changes for the mycroft user
...
- No passwd / just a system user just like pulse
- Therefor also no SSH login needed.
2019-02-07 11:13:33 +01:00
d6379f9f99
MycroftOS: Multiple fixes and tweaks.
...
- install locale binary from glibc into target
- allow mycroft to SSH into the box
- add of sudo command / binary
- folder permission issues
2019-02-06 13:03:03 +01:00
5fbdef2618
MycroftOS: Switch from root to mycroft user.
2019-02-05 12:41:17 +01:00
9f374a530a
MycroftOS: Initial work on boot/halt splashes
2019-02-05 12:27:37 +01:00
4fc960f306
MycroftOS: Remove old ALSA init script.
2019-02-05 08:51:03 +01:00
032566548a
MycroftOS: Mycroft A.I. service package
...
- Systemd support for Mycroft A.I.
- Remove old init.d system files
- Update start/stop-mycroft.sh files
2019-02-04 12:55:48 +01:00
f0711f0972
MycroftOS: Remove module loading init script.
...
- Loading the modules is now properly dynamically handled by udev+systemd
2019-02-02 12:06:18 +01:00
4f4945ef88
MycroftOS: Remove SDresize init script as it doesn't work with systemd
...
- Didn't work at boottime anyway
- Need to be recreated utilizing systemd
2019-02-02 11:58:26 +01:00
4ada46d528
MycroftOS: Remove Splash init script as it doesn't work with systemd
...
- Need to be recreated utilizing systemd
2019-02-02 11:56:11 +01:00
c336a9d9eb
MycroftOS: Enabling the SPI driver for the ReSpeaker HAT Skill
2019-01-31 13:43:50 +01:00
08961a192b
MycroftOS: Addition of precise-engine and model, pre installed. #23
2019-01-31 11:03:53 +01:00
1e6df9e8c9
MycroftOS: Small changes to default /etc/mycroft/mycroft.conf
...
- Log level back to DEBUG, will be INFO at release
- Don't mute the microphone when playing
2019-01-31 09:13:15 +01:00
71cdd452cc
MycroftOS: Add default /etc/pip.conf with;
...
piwheels added as extra url (however python3.7 is not yet supported)
only binaries for all (this should fix #11 )
2019-01-28 11:39:34 +01:00
cc4a893520
Merge branch 'develop' into feature/wifi-setup
2018-11-15 08:56:20 +01:00
b8735eeb72
MycroftOS: Allow root login over SSH
2018-11-14 14:12:47 +01:00
aa1d662121
MycroftOS: Buildroot: Multiple changes and fixes
...
- Make sure there is no getty being spawned on TTY1
- Switch from Dropbear to Openssh so we can disable locale being sent over
2018-11-12 13:20:09 +01:00
b0f77559fb
Merge branch 'develop' into feature/wifi-setup
2018-11-10 10:13:17 +01:00
844ddd29e4
MycroftOS: Switch boot splash to 720p
2018-11-09 09:44:50 +01:00
0d1ea12fc0
MycroftOS: Show a boot splash as early as possible in the bootproces
...
A clean "empty splash.png at boot however the same fbv code can be
used later on in the develoment and proces to show the user where
in the boot / configuration proces we are at.
- "Connect to wifi SSID" user information for the wifi configuration
- But also possible other cofiguration step later on in the wizard
2018-11-06 13:59:01 +01:00
42e80786a7
MycroftOS: Buildroot: Pulseaudio it is...
...
- Enabling pulseaudio and pulsectl
- But not systemwide
(more info: https://community.mycroft.ai/t/pulseaudio-to-be-or-not-to-be/5009 )
2018-11-06 09:29:53 +01:00
aaf99dfc36
MycroftOS: Buildroot: Change script to startup script
...
- Script worked manually on the CLI so converting it to init.d script.
2018-11-06 09:02:54 +01:00
9f30517a4b
MycroftOS: Buildroot: At first boot expand data partition over the whole SD card.
2018-11-04 22:37:29 +01:00
1c626523ac
Merge branch 'develop' into feature/auto-expand-fs
2018-11-04 22:34:52 +01:00
21d0ae11d3
MycroftOS: Buildroot: Add empty /root/.mycroft_cli.conf
2018-11-04 20:20:34 +01:00
0a81b17fe8
Buildroot: Remove pulseaudio configuration file.
2018-11-04 17:20:48 +01:00
820e7d502f
MycroftOS: Buildroot: Check for /.mycroft and if not exist create it
...
- This is a work around for #9 untill I figure out what exactly is
causing it.
2018-11-04 17:17:56 +01:00
2998441e43
Buildroot: Bump Mycroft to 18.08.4
...
- Removed config path patch
- Removed /.mycroft symlink
- Added /root/.mycroft folder in rootfs overlay
2018-11-01 15:42:02 +01:00
0619a03993
MycroftOS: Initial start of wifi-setup
2018-11-01 10:24:32 +01:00
c6f8f7af20
MycroftOS: Initial start of auto expand filesystem at first boot
2018-10-31 19:39:32 +01:00
55846e484a
MycroftOS: Implementation of a very first initial bootable version
...
- Add Buildroot patches to downgrade / upgrade package dependencies
in line with the Mycroft A.I. software stack requirements.
- Add buildroot additional package dependencies in line with the
Mycroft A.I. software stack requirements.
- Update rpi3 defconfig file.
- Implement initial root_fs overlay filestructure.
- Addition of some quick and dirty helper scripts.
- Update of README to reflect these changes.
2018-10-30 15:55:12 +01:00
b68a2beb9e
MycroftOS: Initial setup for rpi3
2018-10-26 19:51:01 +02:00
b8aed86e23
MycroftOS: Initial buildroot-external setup
2018-10-26 15:43:30 +02:00
j1nx
emphasize
Peter Steenbergen