b63d192df7
power: add websocket notification
...
Signed-off-by: Jordan Ruthe <jordanruthe@gmail.com>
2020-10-27 18:08:56 -04:00
7554a599b4
paneldue: Convert "modifed" attribute of metadata to a string
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-10-21 17:54:36 -04:00
f2fb8d33d4
file_manager: store file "modified" time as unix time
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-10-21 17:53:08 -04:00
8a6503da8a
datastore: Add timestamp (in unix time) field to each line in the gcode store
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-10-18 16:52:08 -04:00
ab35346f24
moonraker: Add method to retreive host info
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-10-13 07:53:40 -04:00
28844cb41d
PanelDue: Dump recieved gcode queue on restart
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-10-11 09:09:17 -04:00
8fcccfd46e
moonraker: Add "/server/restart" endpoint
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-10-11 09:09:17 -04:00
f220e1b2ee
moonraker: remove stale objects from subscription tracking
...
This prevents moonraker from subscribing to unknown printer objects on startup.
SIgned-off-by: Eric Callahan <arksine.code@gmail.com>
2020-10-10 08:52:44 -04:00
346c3ad2a0
PanelDue: Make checksums optional
...
Some displays which emulate PD firmware do not use checksums.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-10-08 14:28:15 -04:00
7a013a42f7
machine: Use shutdown -r command to reboot
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-10-05 18:23:58 -04:00
264e708c1d
file_manager: fix typo in directory check
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-10-05 18:16:10 -04:00
620fb356cc
file_manager: Update the internal file list when `get_directory` is called
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-10-05 17:57:18 -04:00
7e3f236393
data_store: add "/server/gcode_store" endpoint
...
Clients may use this API to fetch up to 1000 lines of cached gocde responses.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-09-28 14:57:44 -04:00
b8fc6f5130
plugins: rename "temperature_store" plugin to "data_store".
...
This is in preparation for additional storage functionality.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-09-28 14:08:40 -04:00
756492f349
moonraker: add "/server/info" endpoint
...
This method provides basic server information, such as loaded plugins and the state of the UDS connection to Klippy.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-09-26 08:34:05 -04:00
6905515f3d
shell_command: add ability to cancel a running process
...
Also adds an indefinite timeout if the timeout is specified as "None".
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-09-26 06:14:35 -04:00
3d1faebf15
moonraker: load_plugin() fix
...
Make sure that the correct config section is loaded when "load_plugin" is called.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-09-26 06:09:08 -04:00
8b08b03fbf
app: add max_upload_size configuration option
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-09-11 06:27:48 -04:00
36c82d0c7f
file_manager: simplify directory registration
...
Now that the file_manager directly handles DELETE file requests, it is not necessary have the HTTP file handler perform any checks. Thus it is no longer required to pass a "can_delete" parameter.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-09-07 12:38:15 -04:00
ae49dfe8f2
file_manager: add websocket method for file delete
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-09-07 12:38:15 -04:00
7078d5c980
file_manager: update delete_file method
...
This method is now the primary means of deleting files, as it includes checks to make sure that the delete is allowed.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-09-07 12:38:15 -04:00
059f5d6a73
app: allow local handlers to select their supported protocol
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-09-07 12:38:15 -04:00
c523f35c5e
Fixing paths on power plugin\
...
Signed off by: Jordan Ruthe
2020-09-05 14:17:45 -04:00
8eaef1e559
power: Refactor APIs
...
Register APIs in the "machine/gpio_power" namespace.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-09-03 14:01:34 -04:00
5904c2daf5
temperature_store: Update API registration
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-09-03 14:01:34 -04:00
33b965644b
machine: Update API registration
...
Signed-off- by: Eric Callahan <arksine.code@gmail.com>
2020-09-03 14:01:34 -04:00
34008569dd
klippy_apis: Update API registration
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-09-03 14:01:34 -04:00
371c15aa33
file_manager: update API registration
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-09-03 14:01:34 -04:00
b034485ce8
authorization: update API registration
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-09-03 14:01:34 -04:00
76ea4d25a4
app: refactor websocket handler registration
...
Websocket APIs are now generated using traditional namespaces, for example "printer.gcode.script" rather than "post_printer_gcode_script". Local endpoints that register multiple requests methods will have the method prefixed (ie:. "server.files.get_directory", "server.files.post_directory", "server.files.delete_directory")
Signed-off-by: Eric Callahan
2020-09-03 14:01:34 -04:00
fdec6277eb
moonraker: handle Klippy disconnects during initialization
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-09-03 12:27:13 -04:00
2a34986acb
file_manager: check for unsuccessful attempt at metadata extraction
...
If the metadata script encoutners an error it will return an empty dict for the "metadata" item. Do not update the metadata storage or send a notification if the dict is empty.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-09-02 17:13:25 -04:00
28977bd579
moonraker: Don't use a PeriodicCallback for the init routine
...
The init function blocks, making it reentrant. Use "call_later" instead.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-09-01 08:49:52 -04:00
f9b1e2922d
moonraker: speed up intialization procedure
...
Attempt to reconnect every 250ms when disconnected. Once connected, attempt to initialize every 250ms.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-09-01 07:41:53 -04:00
960334d087
moonraker: stop the background logger prior to exiting
...
This allows all records on the queue to be logged before exiting the program.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-31 15:30:30 -04:00
2c5bb4710e
websockets: Add metadata update notification
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-30 15:30:38 -04:00
304e861a28
file_manager: refactor metadata extraction
...
Move logic for managine metadata to its own class. Allow 3 retries if extraction fails, and send a printer event if metadata is updated due to an added file.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-30 15:28:21 -04:00
16269c1a49
temperature_store: correctly handle subscribed diffs
...
When processing a status update, default the temperature and target to the last received value.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-29 14:12:23 -04:00
5b87c43535
moonraker: send "client_info" after initial connection to Klippy
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-26 07:34:29 -04:00
1aa12e4ff1
utils: Add support for a QueueLogger
...
Logging to a file has the potential to block a the main thread, a QueueLogger resolves this by forwarding logging request to a secondary thread.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-19 10:59:07 -04:00
f338bccc3b
paneldue: Add support for the piezo buzzer
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-18 08:48:57 -04:00
5a6f1ae062
websockets: don't handle ServerError in local callbacks
...
They can propogate back to the JSONRPC.execute_method() where they will be correctly handled.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-17 20:16:03 -04:00
2848b4e9c1
paneldue: 'gcode' status is now in 'gcode_move'
...
Also toolhead.status is no longer available, use idle_timeout.state.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-17 19:55:53 -04:00
279d53afde
moonraker: rework klippy state events
...
Emit specific events for each klippy state rather than one for all of them.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-16 18:08:41 -04:00
56bd9a61ea
moonraker: reorganize initialization
...
This optimized version should initialize faster as it doesn't rely on an additional Periodic Callback when Klippy is detected as ready.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-16 18:08:41 -04:00
76493215c5
moonraker: move klippy connection logic to its own class
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-16 18:08:41 -04:00
8840434c7c
paneldue: use klippy_apis module
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-16 18:08:41 -04:00
6fb4cdca62
termperature_store: use klippy_apis module
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-15 14:19:19 -04:00
4a57dba586
moonraker: update protocol for data received from klippy
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-15 14:19:19 -04:00
291f2b0e91
klippy_apis: new module replacing deprecated "gcode_apis"
...
Like gcode_apis, the klippy_apis module registers Web API aliases for particular gcodes. In addition, this module presents an interface where moonraker can call Klippy APIs directly.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-15 14:19:19 -04:00
43b057c40c
moonraker: klippy requests no longer take a "request method"
...
Klippy rpc methods now accept either GET or POST, the method will be executed.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-15 08:38:06 -04:00
5b6d4371c8
moonraker: convert missed legacy strings to f-strings
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-13 19:23:17 -04:00
7cae2f4aac
paneldue: add confirmation box option to macros
...
This allows users to specify a "confirmed_macros" that wil pop up a message box requiring confirmation before proceeding. Useful for restart and firmware_restart to prevent accidental execution.
Also do not raise an exception when Klippy disconnects after a restart or firmware_restart.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-12 17:25:54 -04:00
a7147a44ca
moonraker: refactor "make_request"
...
The make_request() method is now awaitable and returns the result directly vs the previous behavior of returning a request that was awaited.
There is no longer a need to check the result to see if it is an error, exceptions are raised if an error is detected.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-12 08:43:37 -04:00
e78a2e3e41
gcode_apis: handle restart exceptions
...
It is expected that the Klippy will disconnect when a restart request is sent. Handle those exceptions so they return an acknowledgement.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-11 20:50:58 -04:00
2c332a968f
file_manager: require base paths be located within home directory
...
They however cannot be the home directory.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-11 20:34:20 -04:00
1d520310ac
utils: update git describe arguments
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-11 14:28:59 -04:00
7cd22804dd
moonraker: replace legacy string interpolation with f-strings
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-11 14:28:41 -04:00
7441da4b57
file_manager: refactor notify_filelist_changed()
...
This brings more consistency to the notification.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-11 14:21:27 -04:00
6dc43f7e12
moonraker: replace "check_available" with "check_available_objects"
...
There "check_available" endpoint no longer exists in Klippy, so use "objects/list" instead. If Klippy is not properly configured Moonraker will log the result.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-11 08:38:28 -04:00
0775f3d0c6
moonraker: Connect to Klippy as a client
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-11 08:38:28 -04:00
e1addb16fd
utils: remove unused SocketLoggingHandler
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-11 08:38:28 -04:00
62e5f85473
moonraker: use tornado's iostream wrapper for klippy connection
...
This reduces the amount of code needed to handle the connection and adds more robust error handling. This also prepares moonraker for the eventual transition of Klippy hosting the server socket.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-11 08:38:28 -04:00
b92000dd46
moonraker: Use file_manager to update mutable endpoints
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-11 08:38:28 -04:00
a4638f6c21
moonraker: Improve connection error logging
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-11 08:38:28 -04:00
0abfc76871
temperature_store: Add configparser support
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-11 08:38:28 -04:00
470cc13b0e
shell_command: Add configparser support
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-11 08:38:28 -04:00
6b45c0c1d8
power: Add configparser support
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-11 08:38:28 -04:00
f114985dc6
paneldue: Add configparser support
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-11 08:38:28 -04:00
52907155d2
machine: Add configparser support
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-11 08:38:28 -04:00
5853f3f447
gcode_apis: Add configparser support
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-11 08:38:27 -04:00
98b3c990e0
file_manager: Add configparser support
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-11 08:38:27 -04:00
e5cb27f5b7
authorization: Add configparser support
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-11 08:38:27 -04:00
de462b1d0f
app: Add configparser support
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-11 08:38:27 -04:00
7a94fb3a6b
moonraker: Add configparser support
...
Rather than receive its configuration from Klippy, moonraker will receive its configuration from a config file. By default this file is located at ~/moonraker.conf.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-11 08:38:27 -04:00
e2850ee77e
paneldue: fix incorrect default baudrate
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-05 21:10:30 -04:00
9c76875896
file_manager: use print_stats to determine if an operation is safe
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-05 14:02:06 -04:00
d19737f4c5
moonraker: don't timeout requests to Klippy
...
Klippy requests typically only timeout when the connection between Klippy and the Server is disconnected. Rather returning a timeout, send an error if there are any pending requests when a disconnection is detected.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-05 11:20:26 -04:00
d235139e6b
paneldue: use the new "print_stats" module to check printing state
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-05 11:20:26 -04:00
f082d4dd44
paneldue: Update to fetch status from Klipper's print_stats object
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-05 11:20:26 -04:00
89fa9ba47e
gcode_apis: update "print start" API to use SDCARD_PRINT_FILE gcode
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-05 11:20:26 -04:00
43d54f078e
file_manager: Restrict full access to "gcodes" and "config" paths
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-05 11:05:55 -04:00
d572a13655
file_manager: refactor config file handling
...
Remove the "primary_config" option from the upload handler, as we no longer allow writes to printer.cfg unless it is located in the config path. We now assume that the config path is the main config, so all files there are located at /server/files/config/*.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-05 11:05:00 -04:00
e93e4521a4
websockets: don't alter dictionary during iteration of "view"
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-04 11:32:42 -04:00
6c69dbdca9
moonraker: fix load_plugin()
...
Respect the default parameter if a plugin's path is not found.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-04 11:32:42 -04:00
d768a30d47
temperature_store: remove stale temperature sensors from the "last_temps" dict
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-04 11:32:42 -04:00
4191aac63f
moonraker: remove unnecessary "check_ready" request.
...
There is no longer a need for Moonraker to check in with Klippy's `moonraker/check_ready` request. It can now simply check in with the "info" request.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-01 08:28:35 -04:00
f0e388ccdc
file_manager: Add support for config examples
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-01 06:05:19 -04:00
c14221a7c7
app: Add mimetype for .cfg files
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-01 06:05:19 -04:00
b6f8ba775c
file_manager: implement file_list_changed notifcation
...
This notification is moved from moonraker.py. Instead of sending a filelist, it now updates the file list and sends all relevant information to the client.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-01 06:05:19 -04:00
e0fb261c12
file_manager: refactor upload logic
...
Break gcode and config file uploads into their own functions. Add a 'primary_config' argument to config file uploads. If set to true, the upload will overwrite printer.cfg.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-01 06:05:19 -04:00
8b5c8786b4
file_manager: Verify that uploads are not written to folders outside of the "base" directory
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-01 06:05:19 -04:00
9743772b45
file_manager: Add support for configuration files
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-01 06:05:19 -04:00
bf1a666e20
file_manager: Allow the self.file_paths to contain paths to files
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-01 06:05:19 -04:00
f0fa1295a7
file_manager: handle file upload processing
...
This implentation allows for uploads to different local paths by specifying a "root" argument in the form.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-08-01 06:05:19 -04:00
2ae4034b97
moonraker: Add some additional logging during init
...
This logging may be useful in helping users troubleshoot problems stemming from Klippy based errors.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-07-31 12:49:25 -04:00
1e018e9b92
temperature_store: directly request sensor data
...
Sensor information is no longer provided by the response to the "check_ready" remote procedure call. The temperature store now fetches the sensor data itself and sets up the subscription.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-07-31 08:42:07 -04:00
973b1ffa7d
moonraker: enable debug logging via the command line
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-07-31 06:22:31 -04:00
efb9a9f649
power: remove blocking call to time.sleep()
...
Replace with coroutine friendly gen.sleep()
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-07-29 20:34:05 -04:00
92d7d7c2b7
power: restrict lines to 80 chars, remove trailing whitespace
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-07-29 17:46:27 -04:00
470f1af475
authorization: refactor trusted ip checks to use ipaddress module
...
This adds support for both IPv4 and IPv6 authorization.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-07-28 11:03:29 -04:00
4ea3bae516
moonraker: Implement custom logger
...
Implement a custom logging handler so the Git version is logged on Rollover.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-07-27 16:49:48 -04:00
f34b76ae73
moonraker: Verify python executable version
...
Moonraker requires Python 3.7 or greater.
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-07-27 14:56:23 -04:00
c589287e0b
power: printer power on/off control plugin
...
Sign-off-by: Jordan Ruthe <jordanruthe@gmail.com>
2020-07-27 14:08:48 -04:00
7ff36a2fd2
app: Add support for the "path" form argument to the Upload Handler
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-07-15 07:21:55 -04:00
879ddea0e5
file_manager: quote file name passed to metadata process
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-07-14 07:49:08 -04:00
1d1edf33c3
file_manager: Use sys.executable to identify python env
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-07-14 07:39:05 -04:00
6c58bba8c5
file_manager: Add debug logging to metadata response
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-07-14 07:22:19 -04:00
91419db726
moonraker: Add support for debug logging
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-07-14 07:22:19 -04:00
1baa85d109
shell_command: Fix logging
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-07-14 07:22:19 -04:00
29e7df38d0
file_manager: Add move and copy APIs
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-07-14 07:00:52 -04:00
45bed374ea
moonraker: explicitly declare "None" when calling dict.pop()
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-07-13 15:13:34 -04:00
5754609203
file_manager: reject requests to delete a "root" directory
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-07-04 15:22:08 -04:00
0e79b6f3f7
file_manager: add JSON-RPC "directory" APIs
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-07-04 14:33:17 -04:00
d1c740b900
moonraker: add initial source
...
Signed-off-by: Eric Callahan <arksine.code@gmail.com>
2020-07-02 12:24:15 -04:00
Jordan Ruthe