Skip to content

Commit

Permalink
drivers/mge-hid.c, data/driver.list.in, docs/nut.dict, NEWS.adoc: add…
Browse files Browse the repository at this point in the history
…ed support for 0x09d6:0x0001 (KSTAR) UPSes using MGE HID [#2661]

Signed-off-by: Jim Klimov <[email protected]>
  • Loading branch information
jimklimov committed Dec 16, 2024
1 parent c641cff commit a043604
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 2 deletions.
2 changes: 2 additions & 0 deletions NEWS.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,8 @@ https://github.com/networkupstools/nut/milestone/11
would now report `battery.voltage` and `battery.voltage.nominal`. [#2380]
* Added `ups.beeper.status` support for Masterpower MF-UPS650VA using the
MGE HID subdriver. [#2662]
* Added support for `0x09D6:0x0001` devices using the MGE HID subdriver
assuming devices made by KSTAR (alternately using MGE vendor ID). [#2661]
* `powercom-hid` subdriver sent UPS shutdown commands in wrong byte order,
at least for devices currently in the field. A toggle was added to set
the old behavior (if some devices do need it), while a fix is applied
Expand Down
3 changes: 3 additions & 0 deletions data/driver.list.in
Original file line number Diff line number Diff line change
Expand Up @@ -687,6 +687,8 @@

"Masterguard" "ups" "1" "(various)" "" "masterguard"

"MasterPower" "ups" "3" "MF-UPS650VA" "USB" "usbhid-ups" # https://github.com/networkupstools/nut/issues/2661 - Note there are two VendorID:ProductID for KSTAR making this device

"Maxxtro" "ups" "2" "UPS 600 VA" "serial port" "blazer_ser"

"Mecer" "ups" "2" "ME-1000-WTU" "USB" "nutdrv_qx" # http://www.comx-computers.co.za/download/mecer/ME-1000-WTU.pdf
Expand Down Expand Up @@ -886,6 +888,7 @@
"Microline" "ups" "2" "C-Lion Innova Combo 10K/20K (3/1)" "USB" "blazer_usb"

"Micropower" "ups" "2" "LCD 1000" "USB" "blazer_usb"
#"Micropower" "ups" "3" "0x09d6:0x0001" "USB" "usbhid-ups" # assuming, per https://github.com/networkupstools/nut/issues/2661 and https://alioth-lists.debian.net/pipermail/nut-upsuser/2023-April/013224.html

"Microsol" "ups" "4" "Solis 1.0" "1000VA" "solis"
"Microsol" "ups" "4" "Solis 1.5" "1500VA" "solis"
Expand Down
3 changes: 2 additions & 1 deletion docs/nut.dict
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
personal_ws-1.1 en 3269 utf-8
personal_ws-1.1 en 3270 utf-8
AAC
AAS
ABI
Expand Down Expand Up @@ -553,6 +553,7 @@ KOLFF
KRT
KRTL
KRTS
KSTAR
KTTS
Kain
Kaminski
Expand Down
9 changes: 8 additions & 1 deletion drivers/mge-hid.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
# endif
#endif

#define MGE_HID_VERSION "MGE HID 1.51"
#define MGE_HID_VERSION "MGE HID 1.52"

/* (prev. MGE Office Protection Systems, prev. MGE UPS SYSTEMS) */
/* Eaton */
Expand All @@ -76,6 +76,9 @@
/* IBM */
#define IBM_VENDORID 0x04b3

/* KSTAR under Berkeley Varitronics Systems ID */
#define KSTAR_VENDORID 0x09d6

#if !((defined SHUT_MODE) && SHUT_MODE)
#include "usb-common.h"

Expand Down Expand Up @@ -106,6 +109,10 @@ static usb_device_id_t mge_usb_device_table[] = {
/* 6000 VA LCD 4U Rack UPS; 5396-1Kx */
{ USB_DEVICE(IBM_VENDORID, 0x0001), NULL },

/* MasterPower MF-UPS650VA under KSTAR vendorid (can also be under MGE)
* MicroPower models were also reported */
{ USB_DEVICE(KSTAR_VENDORID, 0x0001), NULL },

/* Terminating entry */
{ 0, 0, NULL }
};
Expand Down

0 comments on commit a043604

Please sign in to comment.