Merge pull request #1230 from networkupstools/minuteman-HID

networkupstools · Dec 21, 2021 · 45f9f11 · 45f9f11
2 parents 9e6a5ab + 19238bc
commit 45f9f11
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/drivers/tripplite-hid.c b/drivers/tripplite-hid.c
@@ -29,7 +29,7 @@
 #include "tripplite-hid.h"
 #include "usb-common.h"
 
-#define TRIPPLITE_HID_VERSION "TrippLite HID 0.82"
+#define TRIPPLITE_HID_VERSION "TrippLite HID 0.83"
 /* FIXME: experimental flag to be put in upsdrv_info */
 
 
@@ -74,6 +74,9 @@ static void *smart1500lcdt_scale(USBDevice_t *device)
 /* Hewlett Packard */
 #define HP_VENDORID 0x03f0
 
+/* Delta/Minuteman */
+#define DELTA_VENDORID 0x05dd
+
 /* USB IDs device table */
 static usb_device_id_t tripplite_usb_device_table[] = {
 	/* e.g. TrippLite AVR550U */
@@ -149,6 +152,9 @@ static usb_device_id_t tripplite_usb_device_table[] = {
 	/* HP R/T 2200 INTL (like SMART2200RMXL2U) */
 	{ USB_DEVICE(HP_VENDORID, 0x1f0a), battery_scale_1dot0 },
 
+	/* Delta/Minuteman Enterprise Plus E1500RM2U */
+	{ USB_DEVICE(DELTA_VENDORID, 0xa011), battery_scale_1dot0 },
+
 	/* Terminating entry */
 	{ 0, 0, NULL }
 };

diff --git a/scripts/upower/95-upower-hid.rules b/scripts/upower/95-upower-hid.rules
@@ -92,6 +92,7 @@ ATTRS{idVendor}=="0592", ATTRS{idProduct}=="0004", ENV{UPOWER_BATTERY_TYPE}="ups
 
 # Delta UPS
 ATTRS{idVendor}=="05dd", ATTRS{idProduct}=="041b", ENV{UPOWER_BATTERY_TYPE}="ups"
+ATTRS{idVendor}=="05dd", ATTRS{idProduct}=="a011", ENV{UPOWER_BATTERY_TYPE}="ups"
 
 # Phoenixtec Power Co., Ltd
 ATTRS{idVendor}=="06da", ATTRS{idProduct}=="ffff", ENV{UPOWER_BATTERY_TYPE}="ups"