diff --git a/usermods/INA219/Readme.md b/usermods/INA219/Readme.md
new file mode 100644
index 0000000000..727c365321
--- /dev/null
+++ b/usermods/INA219/Readme.md
@@ -0,0 +1,132 @@
+# INA219 WLED Usermod
+
+This Usermod integrates the INA219 sensor with WLED to monitor energy consumption. It can read voltage, current, power, and calculate daily, monthly and total energy usage.
+
+## Features
+
+- Monitors bus voltage, shunt voltage, current, and power.
+- Calculates total energy consumed in kilowatt-hours (kWh).
+- Supports MQTT publishing of sensor data.
+- Publishes energy data to Home Assistant for easy integration.
+- Displays daily, monthly and total energy used in the WLED GUI under the info section.
+- Configurable through WLED's web interface.
+
+## Screenshots
+
+| Info screen                                    | Settings page												   | Home Assistant 											|
+|------------------------------------------------|-----------------------------------------------------------------|------------------------------------------------------------|
+| ![Info screen](./img/info.png "Info screen")   | ![Settings page](./img/usermod_settings.png "Settings page")    | ![Settings page](./img/homeassistant.png "Home Assistant") |
+
+## Configuration Parameters
+
+| Parameter                     | Description                                                | Default Value  | Possible Values                                        |
+|-------------------------------|------------------------------------------------------------|----------------|--------------------------------------------------------|
+| `INA219_ENABLED`              | Enable or disable the INA219 Usermod                       | `false`        | `true`, `false`                                        |
+| `INA219_SDA_PIN`              | I2C data pin (SDA)                                         | `8`            | See options below for available GPIO pins.             |
+| `INA219_SCL_PIN`              | I2C clock pin (SCL)                                        | `9`            | See options below for available GPIO pins.             |
+| `INA219_I2C_ADDRESS`          | I2C address of the INA219 sensor                           | `0x40`         | See options below for available addresses.             |
+| `INA219_CHECK_INTERVAL`       | Interval for checking sensor values (seconds)              | `5`            | Any positive integer                                   |
+| `INA219_CONVERSION_TIME`      | ADC conversion time (12-bit, 16-bit, etc.)                 | `BIT_MODE_12`  | See options below for available modes.                 |
+| `INA219_DECIMAL_FACTOR`       | Number of decimal places for current and power readings    | `3`            | See options below for decimal places.                  |
+| `INA219_SHUNT_RESISTOR`       | Value of the shunt resistor in ohms                        | `0.1`          | Any positive float value matching your INA219 resistor |
+| `INA219_CORRECTION_FACTOR`    | Correction factor for measurements                         | `1.0`          | Any positive float value                               |
+| `INA219_MQTT_PUBLISH`         | Publish sensor data to MQTT                                | `false`        | `true`, `false`                                        |
+| `INA219_MQTT_PUBLISH_ALWAYS`  | Always publish values, regardless of change                | `false`        | `true`, `false`                                        |
+| `INA219_HA_DISCOVERY`         | Enable Home Assistant discovery for sensors                | `false`        | `true`, `false`                                        |
+
+		### Options for `INA219_CONVERSION_TIME`
+
+		The `conversionTime` parameter can be set to the following ADC modes:
+
+		| Value             | Description                |
+		|-------------------|----------------------------|
+		| `BIT_MODE_9`      | 9-Bit (84 µs)              |
+		| `BIT_MODE_10`     | 10-Bit (148 µs)            |
+		| `BIT_MODE_11`     | 11-Bit (276 µs)            |
+		| `BIT_MODE_12`     | 12-Bit (532 µs)            |
+		| `SAMPLE_MODE_2`   | 2 samples (1.06 ms)        |
+		| `SAMPLE_MODE_4`   | 4 samples (2.13 ms)        |
+		| `SAMPLE_MODE_8`   | 8 samples (4.26 ms)        |
+		| `SAMPLE_MODE_16`  | 16 samples (8.51 ms)       |
+		| `SAMPLE_MODE_32`  | 32 samples (17.02 ms)      |
+		| `SAMPLE_MODE_64`  | 64 samples (34.05 ms)      |
+		| `SAMPLE_MODE_128` | 128 samples (68.10 ms)     |
+
+		### Options for `INA219_DECIMAL_FACTOR`
+
+		The `decimalFactor` parameter can be set to:
+
+		| Decimal Places | Value | Example         |
+		|----------------|-------|------------------|
+		| 0              | 0     | 100              |
+		| 1              | 1     | 100.0            |
+		| 2              | 2     | 100.00           |
+		| 3              | 3     | 100.000          |
+
+		### Options for `INA219_I2C_ADDRESS`
+
+		The `i2cAddress` parameter can be set to the following options:
+
+		| Address             | Description                        | Value   |
+		|---------------------|------------------------------------|---------|
+		| `0x40`              | 0x40 - Default                     | 0x40    |
+		| `0x41`              | 0x41 - A0 soldered                 | 0x41    |
+		| `0x44`              | 0x44 - A1 soldered                 | 0x44    |
+		| `0x45`              | 0x45 - A0 and A1 soldered          | 0x45    |
+
+		### Options for `INA219_SDA_PIN` and `INA219_SCL_PIN`
+
+		The `SDA` and `SCL` pins can be set to any valid and unused GPIO pin, with defaults as follows:
+
+		- **Default SDA Pin**: `8`
+		- **Default SCL Pin**: `9`
+
+		Example GPIO pin values for configuration:
+
+		| GPIO Pin | Description  |
+		|----------|--------------|
+		| `8`      | Default SDA  |
+		| `9`      | Default SCL  |
+		| Other GPIO pins are available, depending on hardware.
+
+## Usage
+
+1. Include this usermod in your WLED project by adding `#define USERMOD_INA219` to the `my_config.h` file.
+
+2. **Dependencies**  
+   These libraries must be added under `lib_deps` in your `platformio.ini` (or `platform_override.ini`):
+   - `wollewald/INA219_WE@~1.3.8` (by [wollewald](https://github.com/wollewald/INA219_WE))
+   - `Wire`
+
+3. Configure the parameters in the web interface or via the JSON config file.
+
+4. Monitor your energy consumption through the WLED interface or via MQTT.
+
+5. Optional to predefine options:
+
+		#define INA219_ENABLED             false
+		#define INA219_SDA_PIN             8
+		#define INA219_SCL_PIN             9
+		#define INA219_I2C_ADDRESS         0x40
+		#define INA219_CHECK_INTERVAL      5
+		#define INA219_CONVERSION_TIME     BIT_MODE_12 
+		#define INA219_DECIMAL_FACTOR      3
+		#define INA219_SHUNT_RESISTOR      0.1
+		#define INA219_CORRECTION_FACTOR   1.0
+		#define INA219_MQTT_PUBLISH        false
+		#define INA219_MQTT_PUBLISH_ALWAYS false
+		#define INA219_HA_DISCOVERY        false
+
+## Energy Calculation
+
+- **Total Energy** is calculated continuously.
+- **Daily Energy** resets after 24 hours.
+- **Monthly Energy** resets after 30 days.
+
+To reset daily or monthly energy calculations, you can implement corresponding functions within your main application.
+
+## Dependencies
+
+Ensure you have the required libraries installed:
+
+- [INA219_WE](https://github.com/wollewald/INA219_WE)
diff --git a/usermods/INA219/img/homeassistant.png b/usermods/INA219/img/homeassistant.png
new file mode 100644
index 0000000000..64259fc511
Binary files /dev/null and b/usermods/INA219/img/homeassistant.png differ
diff --git a/usermods/INA219/img/info.png b/usermods/INA219/img/info.png
new file mode 100644
index 0000000000..82caaa08f6
Binary files /dev/null and b/usermods/INA219/img/info.png differ
diff --git a/usermods/INA219/img/usermod_settings.png b/usermods/INA219/img/usermod_settings.png
new file mode 100644
index 0000000000..3ba51aac52
Binary files /dev/null and b/usermods/INA219/img/usermod_settings.png differ
diff --git a/usermods/INA219/usermod_ina219.h b/usermods/INA219/usermod_ina219.h
new file mode 100644
index 0000000000..33fa8bf098
--- /dev/null
+++ b/usermods/INA219/usermod_ina219.h
@@ -0,0 +1,721 @@
+#pragma once
+
+#include "wled.h"
+#include <Wire.h>
+#include <INA219_WE.h>
+
+class UsermodINA219 : public Usermod {
+private:
+    static const char _name[];  // Name of the usermod
+
+    bool initDone = false;  // Flag to check if initialization is complete
+    unsigned long lastCheck = 0;  // Timestamp for the last check
+
+    // Configurable settings for the INA219 Usermod
+	// Enabled setting
+    #ifdef INA219_ENABLED
+    	bool enabled = INA219_ENABLED;
+    #else
+    	bool enabled = false; // Default disabled value
+    #endif
+
+    // I2C Address (default is 0x40 if not defined)
+    #ifdef INA219_I2C_ADDRESS
+    	uint8_t _i2cAddress = INA219_I2C_ADDRESS;
+    #else
+    	uint8_t _i2cAddress = 0x40; // Default I2C address
+    #endif
+
+    // Check Interval (in seconds)
+    #ifdef INA219_CHECK_INTERVAL
+    	uint16_t _checkInterval = INA219_CHECK_INTERVAL;
+    	uint16_t checkInterval = _checkInterval * 1000; // Convert to milliseconds
+    #else
+    	uint16_t _checkInterval = 5; // Default 5 seconds
+    	uint16_t checkInterval = _checkInterval * 1000; // Default 5 seconds
+    #endif
+
+    // Conversion Time
+    #ifdef INA219_CONVERSION_TIME
+    	INA219_ADC_MODE conversionTime = static_cast<INA219_ADC_MODE>(INA219_CONVERSION_TIME); // Cast from int if defined
+    #else
+    	INA219_ADC_MODE conversionTime = BIT_MODE_12; // Default 12-bit resolution
+    #endif
+
+    // Decimal factor for current/power readings
+    #ifdef INA219_DECIMAL_FACTOR
+    	uint8_t _decimalFactor = INA219_DECIMAL_FACTOR;
+    #else
+    	uint8_t _decimalFactor = 3; // Default 3 decimal places
+    #endif
+
+    // Shunt Resistor value
+    #ifdef INA219_SHUNT_RESISTOR
+    	float shuntResistor = INA219_SHUNT_RESISTOR;
+    #else
+    	float shuntResistor = 0.1; // Default 0.1 ohms
+    #endif
+
+    // Correction factor
+    #ifdef INA219_CORRECTION_FACTOR
+    	float correctionFactor = INA219_CORRECTION_FACTOR;
+    #else
+    	float correctionFactor = 1.0; // Default correction factor
+    #endif
+
+    // MQTT Publish Settings
+    #ifdef INA219_MQTT_PUBLISH
+    	bool mqttPublish = INA219_MQTT_PUBLISH;
+	bool mqttPublishSent = !INA219_MQTT_PUBLISH;
+    #else
+    	bool mqttPublish = false; // Default: false (do not publish to MQTT)
+	bool mqttPublishSent = true;
+    #endif
+
+    #ifdef INA219_MQTT_PUBLISH_ALWAYS
+    	bool mqttPublishAlways = INA219_MQTT_PUBLISH_ALWAYS;
+    #else
+    	bool mqttPublishAlways = false; // Default: false (only publish changes)
+    #endif
+
+    #ifdef INA219_HA_DISCOVERY
+    	bool haDiscovery = INA219_HA_DISCOVERY;
+	bool haDiscoverySent = !INA219_HA_DISCOVERY;
+    #else
+    	bool haDiscovery = false; // Default: false (Home Assistant discovery disabled)
+	bool haDiscoverySent = true;
+    #endif
+
+    // I2C SDA and SCL pins (default SDA = 8, SCL = 9 if not defined)
+    #ifdef INA219_SDA_PIN
+    	int8_t _sdaPin = INA219_SDA_PIN;
+    #else
+    	int8_t _sdaPin = 8; // Default SDA pin
+    #endif
+
+    #ifdef INA219_SCL_PIN
+    	int8_t _sclPin = INA219_SCL_PIN;
+    #else
+    	int8_t _sclPin = 9; // Default SCL pin
+    #endif
+	
+    // Variables to store sensor readings
+    float busVoltage = 0;
+    float current = 0;
+    float current_mA = 0;
+    float power = 0;
+    float power_mW = 0;
+    float shuntVoltage = 0;
+    float loadVoltage = 0;
+    bool overflow = false;
+	
+	//Last sent variables
+    float last_sent_shuntVoltage = 0;
+    float last_sent_busVoltage = 0;
+    float last_sent_loadVoltage = 0;
+    float last_sent_current = 0;
+    float last_sent_current_mA = 0;
+    float last_sent_power = 0;
+    float last_sent_power_mW = 0;
+    bool last_sent_overflow = false;
+
+    float dailyEnergy_kWh = 0.0; // Daily energy in kWh
+    float monthlyEnergy_kWh = 0.0; // Monthly energy in kWh
+    float totalEnergy_kWh = 0.0; // Total energy in kWh
+    unsigned long lastPublishTime = 0; // Track the last publish time
+
+    // Variables to store last reset timestamps
+    unsigned long dailyResetTime = 0; // Reset time in seconds
+    unsigned long monthlyResetTime = 0; // Reset time in seconds
+
+    // Variables to track last sent readings
+    float _lastCurrentSent = 0;
+    float _lastVoltageSent = 0;
+    float _lastPowerSent = 0;
+    float _lastShuntVoltageSent = 0;
+
+    INA219_WE *_ina219 = nullptr; // INA219 sensor object
+
+    // Function to truncate decimals based on the configured decimal factor
+    float truncateDecimals(float val) {
+        // If _decimalFactor is 0, round to the nearest whole number
+        if (_decimalFactor == 0) {
+            return roundf(val); 
+        }
+        // For decimal factors 1 and above, round to the appropriate number of decimal places
+        float factor = pow(10, _decimalFactor); 
+        return roundf(val * factor) / factor;
+    }
+
+    // Function to update INA219 settings
+    void updateINA219Settings() {
+		// End current I2C if already initialized
+		Wire.end();
+		
+		// Reinitialize I2C with the potentially updated SDA and SCL pins
+		Wire.begin(_sdaPin, _sclPin);
+		
+		// Reinitialize the INA219 instance with updated settings
+        if (_ina219 != nullptr) {
+            delete _ina219;
+        }
+        _ina219 = new INA219_WE(_i2cAddress);
+        if (!_ina219->init()) {
+            DEBUG_PRINTLN(F("INA219 initialization failed!"));
+            return;
+        }
+        _ina219->setShuntSizeInOhms(shuntResistor);
+        _ina219->setADCMode(conversionTime);
+        _ina219->setCorrectionFactor(correctionFactor);
+    }
+
+public:
+    // Destructor to clean up the INA219 object
+    ~UsermodINA219() {
+        delete _ina219;
+        _ina219 = nullptr;
+    }
+
+    // ADC mode enumeration
+    enum class ADCMode {
+        BIT_MODE_9 = 0,
+        BIT_MODE_10 = 1,
+        BIT_MODE_11 = 2,
+        BIT_MODE_12 = 3,
+        SAMPLE_MODE_2 = 9,
+        SAMPLE_MODE_4 = 10,
+        SAMPLE_MODE_8 = 11,
+        SAMPLE_MODE_16 = 12,
+        SAMPLE_MODE_32 = 13,
+        SAMPLE_MODE_64 = 14,
+        SAMPLE_MODE_128 = 15
+    };
+
+    // Setup function called once on boot or restart
+    void setup() override {		
+        updateINA219Settings();  // Configure INA219 settings
+        initDone = true;  // Mark initialization as complete
+    }
+
+    // Loop function called continuously
+    void loop() override {
+        // Check if the usermod is enabled and the check interval has elapsed
+        if (enabled && millis() - lastCheck > checkInterval) {
+            lastCheck = millis();  // Update last check timestamp
+
+            // Read sensor values
+            shuntVoltage = truncateDecimals(_ina219->getShuntVoltage_mV());
+            busVoltage = truncateDecimals(_ina219->getBusVoltage_V());
+            current_mA = truncateDecimals(_ina219->getCurrent_mA());
+            current = truncateDecimals(_ina219->getCurrent_mA() / 1000.0);  // Convert from mA to A
+            power_mW = truncateDecimals(_ina219->getBusPower());
+            power = truncateDecimals(_ina219->getBusPower() / 1000.0);      // Convert from mW to W
+            loadVoltage = truncateDecimals(busVoltage + (shuntVoltage / 1000));
+            overflow = truncateDecimals(_ina219->getOverflow());
+
+            // Update energy values based on power for this duration
+            updateEnergy(power, lastCheck - lastPublishTime);
+            lastPublishTime = lastCheck;  // Update last publish time
+
+        #ifndef WLED_DISABLE_MQTT     
+            // Publish to MQTT if enabled
+			if (WLED_MQTT_CONNECTED) {
+				if (mqttPublish) {
+					if (mqttPublishAlways || hasValueChanged()) {
+						publishMqtt(shuntVoltage, busVoltage, loadVoltage, current, current_mA, power, power_mW, overflow);
+						
+						last_sent_shuntVoltage = shuntVoltage;
+						last_sent_busVoltage = busVoltage;
+						last_sent_loadVoltage = loadVoltage;
+						last_sent_current = current;
+						last_sent_current_mA = current_mA;
+						last_sent_power = power;
+						last_sent_power_mW = power_mW;
+						last_sent_overflow = overflow;
+						
+						mqttPublishSent = true;
+					}
+				} else if (!mqttPublish && mqttPublishSent) {
+					char sensorTopic[128];
+					snprintf_P(sensorTopic, 127, "%s/sensor/ina219", mqttDeviceTopic);  // Discovery config topic for each sensor
+
+					// Publish an empty message with retain to delete the sensor from Home Assistant
+					mqtt->publish(sensorTopic, 0, true, "");
+					
+					mqttPublishSent = false;
+				}
+			}
+
+            // Optionally publish to Home Assistant via MQTT discovery
+            if (haDiscovery && !haDiscoverySent) {
+				if (WLED_MQTT_CONNECTED) {
+					char topic[128];
+					snprintf_P(topic, 127, "%s/sensor/ina219", mqttDeviceTopic);  // Common topic for all INA219 data
+
+					mqttCreateHassSensor(F("Current"), topic, F("current"), F("A"), F("current"), F("sensor"));
+					mqttCreateHassSensor(F("Voltage"), topic, F("voltage"), F("V"), F("bus_voltage_V"), F("sensor"));
+					mqttCreateHassSensor(F("Power"), topic, F("power"), F("W"), F("power"), F("sensor"));
+					mqttCreateHassSensor(F("Shunt Voltage"), topic, F("voltage"), F("mV"), F("shunt_voltage_mV"), F("sensor"));
+					mqttCreateHassSensor(F("Shunt Resistor"), topic, F(""), F("Ω"), F("shunt_resistor_Ohms"), F("sensor"));
+					//mqttCreateHassSensor(F("Overflow"), topic, F(""), F(""), F("overflow"), F("binary_sensor")); //Binary Sensor does not show value in Home Assistant, so switching to sensor
+					mqttCreateHassSensor(F("Overflow"), topic, F(""), F(""), F("overflow"), F("sensor"));
+					mqttCreateHassSensor(F("Daily Energy"), topic, F("energy"), F("kWh"), F("daily_energy_kWh"), F("sensor"));
+					mqttCreateHassSensor(F("Monthly Energy"), topic, F("energy"), F("kWh"), F("monthly_energy_kWh"), F("sensor"));
+					mqttCreateHassSensor(F("Total Energy"), topic, F("energy"), F("kWh"), F("total_energy_kWh"), F("sensor"));
+			
+					// Mark as sent to avoid repeating
+					haDiscoverySent = true;
+				}
+			} else if (!haDiscovery && haDiscoverySent) {
+				if (WLED_MQTT_CONNECTED) {
+					// Remove previously created sensors
+					mqttRemoveHassSensor(F("Current"), F("sensor"));
+					mqttRemoveHassSensor(F("Voltage"), F("sensor"));
+					mqttRemoveHassSensor(F("Power"), F("sensor"));
+					mqttRemoveHassSensor(F("Shunt-Voltage"), F("sensor"));
+					mqttRemoveHassSensor(F("Daily-Energy"), F("sensor"));
+					mqttRemoveHassSensor(F("Monthly-Energy"), F("sensor"));
+					mqttRemoveHassSensor(F("Total-Energy"), F("sensor"));
+					mqttRemoveHassSensor(F("Shunt-Resistor"), F("sensor"));
+					//mqttRemoveHassSensor(F("Overflow"), F("binary_sensor"));
+					mqttRemoveHassSensor(F("Overflow"), F("sensor"));
+					
+					// Mark as sent to avoid repeating
+					haDiscoverySent = false;
+				}
+			}
+        #endif
+        }
+    }
+	
+	bool hasSignificantChange(float oldValue, float newValue, float threshold = 0.01f) {
+		return fabsf(oldValue - newValue) > threshold;
+	}
+	
+	bool hasValueChanged() {
+		return hasSignificantChange(last_sent_shuntVoltage, shuntVoltage) ||
+			   hasSignificantChange(last_sent_busVoltage, busVoltage) ||
+			   hasSignificantChange(last_sent_loadVoltage, loadVoltage) ||
+			   hasSignificantChange(last_sent_current, current) ||
+			   hasSignificantChange(last_sent_current_mA, current_mA) ||
+			   hasSignificantChange(last_sent_power, power) ||
+			   hasSignificantChange(last_sent_power_mW, power_mW) ||
+			   (last_sent_overflow != overflow);
+	}
+
+#ifndef WLED_DISABLE_MQTT
+    /**
+     * Function to publish sensor data to MQTT
+     */
+	bool onMqttMessage(char* topic, char* payload) override {
+		if (!WLED_MQTT_CONNECTED) return false;
+		if (enabled) {
+			// Check if the message is for the correct topic
+			if (strcmp_P(topic, PSTR("/sensor/ina219")) == 0) {
+				StaticJsonDocument<512> jsonDoc;
+		
+				// Parse the JSON payload
+				DeserializationError error = deserializeJson(jsonDoc, payload);
+				if (error) {
+					return false;
+				}
+		
+				// Update the energy values
+				dailyEnergy_kWh = jsonDoc["daily_energy_kWh"];
+				monthlyEnergy_kWh = jsonDoc["monthly_energy_kWh"];
+				totalEnergy_kWh = jsonDoc["total_energy_kWh"];
+				dailyResetTime = jsonDoc["dailyResetTime"];
+				monthlyResetTime = jsonDoc["monthlyResetTime"];
+		
+				return true;
+			}
+		}
+	    return false;
+	}
+	
+	/**
+	 * Subscribe to MQTT topic for controlling usermod
+	 */
+	void onMqttConnect(bool sessionPresent) override {
+		if (!enabled) return;
+		if (WLED_MQTT_CONNECTED) {
+			char subuf[64];
+			if (mqttDeviceTopic[0] != 0) {
+				strcpy(subuf, mqttDeviceTopic);
+				strcat_P(subuf, PSTR("/sensor/ina219"));
+				mqtt->subscribe(subuf, 0);
+			}
+		}
+	}
+	#endif
+		
+	/**
+	 * Function to publish INA219 sensor data to MQTT
+	 */
+	void publishMqtt(float shuntVoltage, float busVoltage, float loadVoltage, 
+	                 float current, float current_mA, float power, 
+	                 float power_mW, bool overflow) {
+	    // Publish to MQTT only if the WLED MQTT feature is enabled
+	    #ifndef WLED_DISABLE_MQTT     
+
+		if (WLED_MQTT_CONNECTED) {
+			// Create a JSON document to hold sensor data
+			StaticJsonDocument<1024> jsonDoc;
+		
+			// Populate the JSON document with sensor readings
+			jsonDoc["shunt_voltage_mV"] = shuntVoltage; // Shunt voltage in millivolts
+			jsonDoc["bus_voltage_V"] = busVoltage;       // Bus voltage in volts
+			jsonDoc["load_voltage_V"] = loadVoltage;     // Load voltage in volts
+			jsonDoc["current"] = current;                 // Current in unspecified units
+			jsonDoc["current_mA"] = current_mA;          // Current in milliamperes
+			jsonDoc["power"] = power;                     // Power in unspecified units
+			jsonDoc["power_mW"] = power_mW;               // Power in milliwatts
+			jsonDoc["overflow"] = overflow;               // Overflow status (true/false)
+			//jsonDoc["overflow"] = overflow ? "on" : "off"; 
+			jsonDoc["shunt_resistor_Ohms"] = shuntResistor; // Shunt resistor value in Ohms
+			
+			// Energy calculations
+			jsonDoc["daily_energy_kWh"] = dailyEnergy_kWh; // Daily energy in kilowatt-hours
+			jsonDoc["monthly_energy_kWh"] = monthlyEnergy_kWh; // Monthly energy in kilowatt-hours
+			jsonDoc["total_energy_kWh"] = totalEnergy_kWh; // Total energy in kilowatt-hours
+			
+			// Reset timestamps
+			jsonDoc["dailyResetTime"] = dailyResetTime;   // Timestamp of the last daily reset
+			jsonDoc["monthlyResetTime"] = monthlyResetTime; // Timestamp of the last monthly reset
+				
+			// Serialize the JSON document into a character buffer
+			char buffer[1024];
+			size_t payload_size;
+			payload_size = serializeJson(jsonDoc, buffer);
+			
+			// Construct the MQTT topic using the device topic
+			char topic[128];
+			snprintf_P(topic, sizeof(topic), "%s/sensor/ina219", mqttDeviceTopic);
+			
+			// Publish the serialized JSON data to the specified MQTT topic
+			mqtt->publish(topic, 0, true, buffer, payload_size);
+		}
+	    #endif
+	}
+	
+	/**
+	 * Function to create Home Assistant sensor configuration
+	 */
+	void mqttCreateHassSensor(const String &name, const String &topic, 
+	                           const String &deviceClass, const String &unitOfMeasurement, 
+	                           const String &jsonKey, const String &SensorType) {
+	    // Sanitize the name by replacing spaces with hyphens
+	    String sanitizedName = name;
+	    sanitizedName.replace(' ', '-');
+		
+		String sanitizedMqttClientID = sanitizeMqttClientID(mqttClientID);
+	    
+	    // Create a JSON document for the sensor configuration
+	    StaticJsonDocument<1024> doc;
+	
+	    // Populate the JSON document with sensor configuration details
+	    doc[F("name")] = name;                                // Sensor name
+	    doc[F("state_topic")] = topic;                        // Topic for sensor state
+	    doc[F("unique_id")] = String(sanitizedMqttClientID) + "-" + sanitizedName; // Unique ID for the sensor
+	    
+	    // Template to extract specific value from JSON
+	    doc[F("value_template")] = String("{{ value_json.") + jsonKey + String(" }}");  
+	    if (unitOfMeasurement != "")
+	        doc[F("unit_of_measurement")] = unitOfMeasurement; // Optional unit of measurement
+	    if (deviceClass != "")
+	        doc[F("device_class")] = deviceClass;              // Optional device class
+	    if (SensorType != "binary_sensor")
+	        doc[F("expire_after")] = 1800;                     // Expiration time for non-binary sensors
+	
+	    // Device details nested object
+	    JsonObject device = doc.createNestedObject(F("device"));
+	    device[F("name")] = serverDescription;                // Server description as device name
+	    device[F("identifiers")] = "wled-sensor-" + String(sanitizedMqttClientID); // Unique identifier for the device
+	    device[F("manufacturer")] = F(WLED_BRAND);           // Manufacturer name
+	    device[F("model")] = F(WLED_PRODUCT_NAME);           // Product model name
+	    device[F("sw_version")] = versionString;              // Software version
+	    
+	    // Serialize the JSON document into a temporary string
+		char buffer[1024];
+		size_t payload_size;
+	    payload_size = serializeJson(doc, buffer);
+	
+		char topic_S[128];
+		snprintf_P(topic_S, sizeof(topic_S), "homeassistant/%s/%s/%s/config", SensorType, sanitizedMqttClientID, sanitizedName);
+	    
+	    // Debug output for the Home Assistant topic and configuration
+	    DEBUG_PRINTLN(topic_S);
+	    DEBUG_PRINTLN(buffer);
+	
+	    // Publish the sensor configuration to Home Assistant
+	    mqtt->publish(topic_S, 0, true, buffer, payload_size);
+	}
+	
+	void mqttRemoveHassSensor(const String &name, const String &SensorType) {
+		char sensorTopic[128];
+		snprintf_P(sensorTopic, 127, "homeassistant/%s/%s/%s/config", SensorType.c_str(), sanitizeMqttClientID(mqttClientID).c_str(), name.c_str());  // Discovery config topic for each sensor
+
+		// Publish an empty message with retain to delete the sensor from Home Assistant
+		mqtt->publish(sensorTopic, 0, true, "");
+	}
+	
+	// Function to sanitize the mqttClientID with nicer replacements
+	String sanitizeMqttClientID(const String &clientID) {
+		String sanitizedID;
+
+		// Loop through the string
+		for (unsigned int i = 0; i < clientID.length(); i++) {
+			char c = clientID[i]; // Get the character directly
+
+			// Handle specific cases for accented letters using byte values
+			if (c == '\xC3' && i + 1 < clientID.length()) {
+				if (clientID[i + 1] == '\xBC') { // ü
+					//sanitizedID += "ue"; // Replace ü with ue
+					sanitizedID += "u"; // Replace ü with ue
+					i++; // Skip the next byte
+				} else if (clientID[i + 1] == '\x9C') { // Ü
+					//sanitizedID += "Ue"; // Replace Ü with Ue
+					sanitizedID += "U"; // Replace Ü with Ue
+					i++; // Skip the next byte
+				} else if (clientID[i + 1] == '\xA4') { // ä
+					//sanitizedID += "ae"; // Replace ä with ae
+					sanitizedID += "a"; // Replace ä with ae
+					i++; // Skip the next byte
+				} else if (clientID[i + 1] == '\xC4') { // Ä
+					//sanitizedID += "Ae"; // Replace Ä with Ae
+					sanitizedID += "A"; // Replace Ä with Ae
+					i++; // Skip the next byte
+				} else if (clientID[i + 1] == '\xB6') { // ö
+					//sanitizedID += "oe"; // Replace ö with oe
+					sanitizedID += "o"; // Replace ö with oe
+					i++; // Skip the next byte
+				} else if (clientID[i + 1] == '\xD6') { // Ö
+					//sanitizedID += "Oe"; // Replace Ö with Oe
+					sanitizedID += "O"; // Replace Ö with Oe
+					i++; // Skip the next byte
+				} else if (clientID[i + 1] == '\x9F') { // ß
+					//sanitizedID += "ss"; // Replace ß with ss
+					sanitizedID += "s"; // Replace ß with ss
+					i++; // Skip the next byte
+				}
+			}
+			// Allow valid characters [a-zA-Z0-9_-]
+			else if ((c >= 'a' && c <= 'z') || 
+					 (c >= 'A' && c <= 'Z') || 
+					 (c >= '0' && c <= '9') || 
+					 c == '-' || c == '_') {
+				sanitizedID += c; // Directly append valid characters
+			}
+			// Replace any other invalid character with an underscore
+			else {
+				sanitizedID += '_'; // Replace invalid character with underscore
+			}
+		}
+		return sanitizedID; // Return the sanitized client ID
+	}
+
+	/**
+	 * Function to update energy calculations based on power and duration
+	 */
+	void updateEnergy(float power, unsigned long durationMs) {
+	    // Convert duration from milliseconds to hours
+	    float durationHours = durationMs / 3600000.0;
+	    
+	    // Convert power from watts to kilowatt-hours (kWh)
+	    float energy_kWh = (power / 1000.0) * durationHours;
+	
+	    // Update total energy consumed
+	    totalEnergy_kWh += energy_kWh;
+	
+	    // Update daily energy consumption
+	    if (dailyResetTime >= 86400) { // 86400 seconds = 24 hours
+	        dailyEnergy_kWh = 0;        // Reset daily energy to zero
+	        dailyResetTime = 0;         // Reset daily reset time to zero
+	    }
+	    dailyEnergy_kWh += energy_kWh;  // Add to daily energy
+	    dailyResetTime += durationMs / 1000; // Increment daily reset time in seconds
+	
+	    // Update monthly energy consumption
+	    if (monthlyResetTime >= 2592000) { // 2592000 seconds = 30 days
+	        monthlyEnergy_kWh = 0;       // Reset monthly energy to zero
+	        monthlyResetTime = 0;        // Reset monthly reset time to zero
+	    }
+	    monthlyEnergy_kWh += energy_kWh; // Add to monthly energy
+	    monthlyResetTime += durationMs / 1000; // Increment monthly reset time in seconds
+	}
+	
+	/**
+	 * Function to add energy consumption data to a JSON object for reporting
+	 */
+	void addToJsonInfo(JsonObject &root) {
+	    JsonObject user = root[F("u")];
+	    if (user.isNull()) {
+	        user = root.createNestedObject(F("u")); // Create a nested object for user data
+	    }
+	
+	    // Create a nested array for energy data
+	    JsonArray energy_json_seperator = user.createNestedArray(F("------------------------------------"));
+				
+	    JsonArray energy_json = user.createNestedArray(F("Energy Consumption:"));
+	
+	    if (!enabled) {
+	        energy_json.add(F("disabled")); // Indicate that the module is disabled
+	    } else {	
+	        // Create a nested array for daily energy
+	        JsonArray dailyEnergy_json = user.createNestedArray(F("Daily Energy"));
+	        dailyEnergy_json.add(dailyEnergy_kWh); // Add daily energy in kWh
+	        dailyEnergy_json.add(F(" kWh")); // Add unit of measurement
+	
+	        // Create a nested array for monthly energy
+	        JsonArray monthlyEnergy_json = user.createNestedArray(F("Monthly Energy"));
+	        monthlyEnergy_json.add(monthlyEnergy_kWh); // Add monthly energy in kWh
+	        monthlyEnergy_json.add(F(" kWh")); // Add unit of measurement
+			
+	        // Create a nested array for total energy
+	        JsonArray totalEnergy_json = user.createNestedArray(F("Total Energy"));
+	        totalEnergy_json.add(totalEnergy_kWh); // Add total energy in kWh
+	        totalEnergy_json.add(F(" kWh")); // Add unit of measurement
+	    }
+	}
+	
+	/**
+	 * Function to add the current state of energy consumption to a JSON object
+	 */
+	void addToJsonState(JsonObject& root) override {
+	    if (!initDone) return;  // Prevent crashes on boot if initialization is not done
+	
+	    JsonObject usermod = root[FPSTR(_name)];
+	    if (usermod.isNull()) {
+	        usermod = root.createNestedObject(FPSTR(_name)); // Create nested object for the usermod
+	    }
+	
+	    // Add energy consumption data to the usermod JSON object
+	    usermod["totalEnergy_kWh"] = totalEnergy_kWh;
+	    usermod["dailyEnergy_kWh"] = dailyEnergy_kWh;
+	    usermod["monthlyEnergy_kWh"] = monthlyEnergy_kWh;
+	    usermod["dailyResetTime"] = dailyResetTime;
+	    usermod["monthlyResetTime"] = monthlyResetTime;
+	}
+	
+	/**
+	 * Function to read energy consumption data from a JSON object
+	 */
+	void readFromJsonState(JsonObject& root) override {
+	    if (!initDone) return; // Prevent crashes on boot if initialization is not done
+	
+	    JsonObject usermod = root[FPSTR(_name)];
+	    if (!usermod.isNull()) {
+	        // Read values from JSON or retain existing values if not present
+	        totalEnergy_kWh = usermod["totalEnergy_kWh"] | totalEnergy_kWh;
+	        dailyEnergy_kWh = usermod["dailyEnergy_kWh"] | dailyEnergy_kWh;
+	        monthlyEnergy_kWh = usermod["monthlyEnergy_kWh"] | monthlyEnergy_kWh;
+	        dailyResetTime = usermod["dailyResetTime"] | dailyResetTime;
+	        monthlyResetTime = usermod["monthlyResetTime"] | monthlyResetTime;
+	    }
+	}
+	
+	/**
+	 * Function to handle settings in the Usermod menu
+	 */
+	void addToConfig(JsonObject& root) override {
+	    JsonObject top = root.createNestedObject(F("INA219")); // Create nested object for INA219 settings
+	    top["Enabled"] = enabled;                             // Store enabled status
+		top["sda_pin"] = _sdaPin;                           // Store selected SDA pin
+		top["scl_pin"] = _sclPin;                           // Store selected SCL pin
+	    top["i2c_address"] = static_cast<uint8_t>(_i2cAddress); // Store I2C address
+	    top["check_interval"] = checkInterval / 1000;       // Store check interval in seconds
+	    top["conversion_time"] = conversionTime;             // Store conversion time
+	    top["decimals"] = _decimalFactor;                    // Store decimal factor
+	    top["shunt_resistor"] = shuntResistor;              // Store shunt resistor value
+	
+	    #ifndef WLED_DISABLE_MQTT
+	        // Store MQTT settings if MQTT is not disabled
+	        top["mqtt_publish"] = mqttPublish;
+	        top["mqtt_publish_always"] = mqttPublishAlways;
+	        top["ha_discovery"] = haDiscovery;
+	    #endif
+	}
+	
+	/**
+	 * Function to append configuration options to the Usermod menu
+	 */
+	void appendConfigData() override {
+	    // Append the dropdown for I2C address selection
+	    oappend(F("dd=addDropdown('INA219','i2c_address');"));
+	    oappend(F("addOption(dd,'0x40 - Default',0x40, true);")); // Default option
+	    oappend(F("addOption(dd,'0x41 - A0 soldered',0x41);"));
+	    oappend(F("addOption(dd,'0x44 - A1 soldered',0x44);"));
+	    oappend(F("addOption(dd,'0x45 - A0 and A1 soldered',0x45);"));
+	
+	    // Append the dropdown for ADC mode (resolution + samples)
+	    oappend(F("ct=addDropdown('INA219','conversion_time');"));
+	    oappend("addOption(ct,'9-Bit (84 µs)',0);");
+	    oappend("addOption(ct,'10-Bit (148 µs)',1);");
+	    oappend("addOption(ct,'11-Bit (276 µs)',2);");
+	    oappend("addOption(ct,'12-Bit (532 µs)',3, true);"); // Default option
+	    oappend("addOption(ct,'2 samples (1.06 ms)',9);");
+	    oappend("addOption(ct,'4 samples (2.13 ms)',10);");
+	    oappend("addOption(ct,'8 samples (4.26 ms)',11);");
+	    oappend("addOption(ct,'16 samples (8.51 ms)',12);");
+	    oappend("addOption(ct,'32 samples (17.02 ms)',13);");
+	    oappend("addOption(ct,'64 samples (34.05 ms)',14);");
+	    oappend("addOption(ct,'128 samples (68.10 ms)',15);");
+	
+	    // Append the dropdown for decimal precision (0 to 10)
+	    oappend(F("df=addDropdown('INA219','decimals');"));
+	    for (int i = 0; i <= 3; i++) {
+	        oappend(String("addOption(df,'" + String(i) + "'," + String(i) + (i == 2 ? ", true);" : ");")).c_str());  // Default to 2 decimals
+	    }
+	}
+	
+	/**
+	 * Function to read settings from the Usermod menu configuration
+	 */
+	bool readFromConfig(JsonObject& root) override {
+	    JsonObject top = root[FPSTR(_name)];
+	
+	    bool configComplete = !top.isNull(); // Check if the configuration exists
+	
+	    // Read configuration values and update local variables
+	    configComplete &= getJsonValue(top["Enabled"], enabled);
+		configComplete &= getJsonValue(top["sda_pin"], _sdaPin);   // Read selected SDA pin
+		configComplete &= getJsonValue(top["scl_pin"], _sclPin);   // Read selected SCL pin
+	    configComplete &= getJsonValue(top[F("i2c_address")], _i2cAddress);
+	
+	    // Read check interval and convert to milliseconds if necessary
+	    if (getJsonValue(top[F("check_interval")], checkInterval)) {
+	        if (1 <= checkInterval && checkInterval <= 600)
+	            checkInterval *= 1000; // Convert seconds to milliseconds
+	        else
+	            checkInterval = _checkInterval * 1000; // Fallback to defined value
+	    } else {
+	        configComplete = false; // Configuration is incomplete
+	    }
+	    
+	    // Read other configuration values
+	    configComplete &= getJsonValue(top["conversion_time"], conversionTime);
+	    configComplete &= getJsonValue(top["decimals"], _decimalFactor);
+	    configComplete &= getJsonValue(top["shunt_resistor"], shuntResistor);
+	
+	    #ifndef WLED_DISABLE_MQTT
+	        configComplete &= getJsonValue(top["mqtt_publish"], mqttPublish);
+	        configComplete &= getJsonValue(top["mqtt_publish_always"], mqttPublishAlways);
+	        configComplete &= getJsonValue(top["ha_discovery"], haDiscovery);
+			
+			haDiscoverySent = !haDiscovery;
+	    #endif
+	    
+	    updateINA219Settings(); // Apply any updated settings to the INA219
+	
+	    return configComplete; // Return whether the configuration was complete
+	}
+	
+	/**
+	 * Function to get the unique identifier for this usermod
+	 */
+	uint16_t getId() override {
+	    return USERMOD_ID_INA219; // Return the unique identifier for the INA219 usermod
+	}
+};
+
+const char UsermodINA219::_name[] PROGMEM = "INA219";
diff --git a/wled00/const.h b/wled00/const.h
index 07873deca1..0f345de300 100644
--- a/wled00/const.h
+++ b/wled00/const.h
@@ -203,6 +203,7 @@
 #define USERMOD_ID_LD2410                52     //Usermod "usermod_ld2410.h"
 #define USERMOD_ID_POV_DISPLAY           53     //Usermod "usermod_pov_display.h"
 #define USERMOD_ID_PIXELS_DICE_TRAY      54     //Usermod "pixels_dice_tray.h"
+#define USERMOD_ID_INA219       		     55     //Usermod "usermod_ina219.h"
 
 //Access point behavior
 #define AP_BEHAVIOR_BOOT_NO_CONN          0     //Open AP when no connection after boot
diff --git a/wled00/usermods_list.cpp b/wled00/usermods_list.cpp
index 36bd122a51..6a5be5e98f 100644
--- a/wled00/usermods_list.cpp
+++ b/wled00/usermods_list.cpp
@@ -182,6 +182,10 @@
   #include "../usermods/Internal_Temperature_v2/usermod_internal_temperature.h"
 #endif
 
+#ifdef USERMOD_INA219
+  #include "../usermods/INA219/usermod_ina219.h"
+#endif
+
 #if defined(WLED_USE_SD_MMC) || defined(WLED_USE_SD_SPI)
 // This include of SD.h and SD_MMC.h must happen here, else they won't be
 // resolved correctly (when included in mod's header only)
@@ -470,4 +474,8 @@ void registerUsermods()
   #ifdef USERMOD_POV_DISPLAY
   UsermodManager::add(new PovDisplayUsermod());
   #endif
+  
+  #ifdef USERMOD_INA219
+  UsermodManager::add(new UsermodINA219());
+  #endif
 }