Skip to content

drivers: delta-hid: Add Delta HID subdriver #807

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jimklimov merged 31 commits into from
May 8, 2021
Merged

drivers: delta-hid: Add Delta HID subdriver #807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
a5e3f40
drivers: delta-hid: Add Delta HID subdriver
lukakovacica Jul 2, 2020
00acf84
drivers: delta-hid: Update entry flags appropriately
lukakovacica Jul 21, 2020
00c1c3e
Merge branch 'master' into nut-rebase
jimklimov Oct 9, 2020
617ac54
Merge branch 'master' into nut-rebase
jimklimov Oct 9, 2020
5a0f929
Merge branch 'master' into nut-rebase
jimklimov Nov 29, 2020
8413ab7
Merge branch 'master' into nut-rebase
jimklimov Apr 20, 2021
840be82
Merge branch 'master' into nut-rebase
jimklimov Apr 20, 2021
863c8bd
Update delta-hid.c
jimklimov Apr 20, 2021
67c2df5
Rename delta-hid.c/.h to delta_ups-hid.c/.h and sync vendor label for…
jimklimov Apr 21, 2021
1476fda
drivers/delta_ups-hid.c/.h: sync PR #807 code with master branch: ren…
jimklimov Apr 21, 2021
5a2617f
drivers/delta_ups-hid.c/.h: sync PR #807 code with master branch: ind…
jimklimov Apr 21, 2021
8f29d26
drivers/delta_ups-hid.c/.h: sync PR #807 code with master branch: ind…
jimklimov Apr 21, 2021
a29a2c3
drivers/delta_ups-hid.c/.h: sync PR #807 code with master branch: ind…
jimklimov Apr 21, 2021
c4562a3
drivers/delta_ups-hid.c/.h: sync PR #807 code with master branch: mov…
jimklimov Apr 21, 2021
f0f56c8
drivers/delta_ups-hid.c/.h: sync PR #807 code with master branch: imp…
jimklimov Apr 21, 2021
b28bce6
drivers/delta_ups-hid.c/.h: sync PR #807 code with master branch: imp…
jimklimov Apr 21, 2021
42e7e08
drivers/delta_ups-hid.c/.h: sync PR #807 code with master branch: cha…
jimklimov Apr 21, 2021
9acb236
drivers/delta_ups-hid.c/.h: sync PR #807 code with master branch: imp…
jimklimov Apr 21, 2021
8fb4a49
drivers/delta_ups-hid.c/.h: sync PR #807 code with master branch: imp…
jimklimov Apr 21, 2021
0ebe54f
drivers/delta_ups-hid.c/.h: sync PR #807 code with master branch: set…
jimklimov Apr 21, 2021
211e5c4
drivers/delta_ups-hid.c/.h: sync PR #807 code with master branch: set…
jimklimov Apr 21, 2021
8a77e5a
drivers/delta_ups-hid.c/.h: sync PR #807 code with master branch: com…
jimklimov Apr 21, 2021
370443e
drivers/delta_ups-hid.c/.h: sync PR #807 code with master branch: rem…
jimklimov Apr 21, 2021
7614240
drivers/delta_ups-hid.c/.h: sync PR #807 code with master branch: syn…
jimklimov Apr 21, 2021
1efcc41
Merge remote-tracking branch 'opensource/master' into PR-807
jimklimov Apr 21, 2021
cd09cfb
Merge remote-tracking branch 'LukaKovacica/nut-rebase' into PR-807
jimklimov Apr 21, 2021
b447663
Merge remote-tracking branch 'opensource/master' into PR-807
jimklimov Apr 23, 2021
8398d81
drivers/usbhid-ups.c: order includes and subdrivers alphabetically
jimklimov Apr 23, 2021
6a2a65b
drivers/delta_ups-hid.c: fix initialization of delta_ups_type_info[]
jimklimov Apr 23, 2021
e91b75e
drivers/nutdrv_qx.c: fabula_hunnox_subdriver(): annotate NUT_UNUSED_V…
jimklimov Apr 23, 2021
4a24894
Merge branch 'master' into nut-rebase
jimklimov Apr 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
194 changes: 139 additions & 55 deletions drivers/delta_ups-hid.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
/* delta_ups-hid.c - data to monitor Delta UPS USB/HID devices with NUT
/* delta_ups-hid.c - data mapping subdriver to monitor Delta UPS USB/HID devices with NUT
*
* Copyright (C)
* 2021 Jungeon Kim <me@jungeon.kim>
* 2003 - 2012 Arnaud Quette <ArnaudQuette@Eaton.com>
* 2005 - 2006 Peter Selinger <selinger@users.sourceforge.net>
* 2008 - 2009 Arjen de Korte <adkorte-guest@alioth.debian.org>
* 2013 Charles Lepple <clepple+nut@gmail.com>
* 2020 Luka Kovacic <luka.kovacic@builtin.io>
* 2021 Jungeon Kim <me@jungeon.kim>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand All @@ -13,44 +18,83 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/

#include "usbhid-ups.h"
#include "delta_ups-hid.h"
#include "main.h" /* for getval() */
#include "usb-common.h"

#define DELTA_UPS_HID_VERSION "Delta UPS HID 0.1"
#define DELTA_UPS_HID_VERSION "Delta UPS HID 0.5"

/* Delta UPS */
#define DELTA_UPS_VENDORID 0x05dd
#define DELTA_UPS_VENDORID 0x05dd

/* USB IDs device table */
static usb_device_id_t delta_ups_usb_device_table[] = {
/* Delta RT Series, Single Phase, 1/2/3 kVA */
/* Delta UPS Amplon R Series, Single Phase UPS, 1/2/3 kVA */
{ USB_DEVICE(DELTA_UPS_VENDORID, 0x041b), NULL },

/* Terminating entry */
{ -1, -1, NULL }
};

static usage_lkp_t delta_ups_usage_lkp[] = {
{ "DeltaCustom", 0xffff0010 },
/* --------------------------------------------------------------- */
/* Vendor-specific usage table */
/* --------------------------------------------------------------- */

/* DELTA usage table */
static usage_lkp_t delta_ups_usage_lkp[] = {
{ "DELTA1", 0x00000000 },
{ "DELTA2", 0xff000055 },
/* { "DELTA3", 0xffff0010 }, */
{ "DeltaCustom", 0xffff0010 },
{ "DELTA4", 0xffff0056 },
/* { "DELTA5", 0xffff0057 }, */
{ "DeltaConfigTransferLowMax", 0xffff0057 },
/* { "DELTA6", 0xffff0058 }, */
{ "DeltaConfigTransferLowMin", 0xffff0058 },
/* { "DELTA7", 0xffff0059 }, */
{ "DeltaConfigTransferHighMax", 0xffff0059 },
/* { "DELTA8", 0xffff005a }, */
{ "DeltaConfigTransferHighMin", 0xffff005a },
{ "DeltaConfigStartPowerRestoreDelay", 0xffff0081 },
{ "DeltaOutputSource", 0xffff0091 },
{ "DELTA9", 0xffff0060 },
/* { "DELTA10", 0xffff0061 }, */
{ "DeltaConfigExternalBatteryPack", 0xffff0061 },
{ "DELTA11", 0xffff0062 },
{ "DELTA12", 0xffff0063 },
{ "DELTA13", 0xffff0064 },
{ "DELTA14", 0xffff0065 },
{ "DELTA15", 0xffff0066 },
{ "DELTA16", 0xffff0067 },
{ "DELTA17", 0xffff0068 },
/* { "DELTA18", 0xffff0075 }, */
{ "DeltaModelName", 0xffff0075 },
{ "DELTA19", 0xffff0076 },
/* { "DELTA20", 0xffff007c }, */
{ "DeltaUPSType", 0xffff007c },
{ "DELTA21", 0xffff007d },
/* { "DELTA22", 0xffff0081 }, */
{ "DeltaConfigStartPowerRestoreDelay", 0xffff0081 },
/* { "DELTA23", 0xffff0091 }, */
{ "DeltaOutputSource", 0xffff0091 },
{ "DELTA24", 0xffff0092 },
{ "DELTA25", 0xffff0093 },
{ "DELTA26", 0xffff0094 },
{ "DELTA27", 0xffff0095 },
{ "DELTA28", 0xffff0096 },
{ "DELTA29", 0xffff0097 },
{ "DELTA30", 0xffff0098 },
{ "DELTA31", 0xffff0099 },
{ "DELTA32", 0xffff009a },
/* { "DELTA33", 0xffff009b }, */
{ "DeltaConfigSensitivity", 0xffff009b },
/* { "DELTA34", 0xffff009c }, */
{ "DeltaConfigStartPowerRestore", 0xffff009c },
{ "DeltaConfigExternalBatteryPack", 0xffff0061 },

/* Terminating entry */
{ NULL, 0 }
Expand All @@ -62,6 +106,10 @@ static usage_tables_t delta_ups_utab[] = {
NULL,
};

/* --------------------------------------------------------------- */
/* Helper lookup tables and mapping functions */
/* --------------------------------------------------------------- */

static info_lkp_t delta_ups_sensitivity_info[] = {
{ 0, "normal", NULL, NULL },
{ 1, "reduced", NULL, NULL },
Expand Down Expand Up @@ -113,63 +161,89 @@ static info_lkp_t delta_ups_output_source_info[] = {
{ 0, NULL, NULL, NULL }
};

/* --------------------------------------------------------------- */
/* HID2NUT lookup table */
/* --------------------------------------------------------------- */

static hid_info_t delta_ups_hid2nut[] = {
{ "input.sensitivity", ST_FLAG_RW, 0, "UPS.DeltaCustom.[1].DeltaConfigSensitivity", NULL, "%s", 0, delta_ups_sensitivity_info },
{ "input.voltage.nominal", 0, 0, "UPS.PowerSummary.Input.ConfigVoltage", NULL, "%.1f", HU_FLAG_SEMI_STATIC, NULL },
{ "input.voltage", 0, 0, "UPS.PowerSummary.Input.Voltage", NULL, "%.1f", HU_FLAG_QUICK_POLL, NULL },
{ "input.transfer.low", ST_FLAG_RW, 0, "UPS.PowerConverter.Output.LowVoltageTransfer", NULL, "%.0f", 0, NULL },
{ "input.transfer.high", ST_FLAG_RW, 0, "UPS.PowerConverter.Output.HighVoltageTransfer", NULL, "%.0f", 0, NULL },
{ "input.transfer.low.min", 0, 0, "UPS.PowerConverter.Output.DeltaConfigTransferLowMin", NULL, "%.0f", HU_FLAG_STATIC, NULL },
{ "input.transfer.low.max", 0, 0, "UPS.PowerConverter.Output.DeltaConfigTransferLowMax", NULL, "%.0f", HU_FLAG_STATIC, NULL },
{ "input.transfer.high.min", 0, 0, "UPS.PowerConverter.Output.DeltaConfigTransferHighMin", NULL, "%.0f", HU_FLAG_STATIC, NULL },
{ "input.transfer.high.max", 0, 0, "UPS.PowerConverter.Output.DeltaConfigTransferHighMax", NULL, "%.0f", HU_FLAG_STATIC, NULL },
{ "input.voltage", 0, 0, "UPS.PowerConverter.Input.Voltage", NULL, "%.1f", HU_FLAG_QUICK_POLL, NULL },
{ "input.transfer.low", ST_FLAG_RW, 0, "UPS.PowerConverter.Output.LowVoltageTransfer", NULL, "%.1f", 0, NULL },
{ "input.transfer.high", ST_FLAG_RW, 0, "UPS.PowerConverter.Output.HighVoltageTransfer", NULL, "%.1f", 0, NULL },
{ "input.transfer.low.min", 0, 0, "UPS.PowerConverter.Output.DeltaConfigTransferLowMin", NULL, "%.1f", HU_FLAG_STATIC, NULL },
{ "input.transfer.low.max", 0, 0, "UPS.PowerConverter.Output.DeltaConfigTransferLowMax", NULL, "%.1f", HU_FLAG_STATIC, NULL },
{ "input.transfer.high.min", 0, 0, "UPS.PowerConverter.Output.DeltaConfigTransferHighMin", NULL, "%.1f", HU_FLAG_STATIC, NULL },
{ "input.transfer.high.max", 0, 0, "UPS.PowerConverter.Output.DeltaConfigTransferHighMax", NULL, "%.1f", HU_FLAG_STATIC, NULL },
/* FIXME: Check vs hardware, is this an "input" or "outlet/outpu" value after all? */
{ "input.source", 0, 0, "UPS.OutletSystem.Outlet.DeltaOutputSource", NULL, "%s", 0, delta_ups_output_source_info },
{ "input.frequency", 0, 0, "UPS.PowerConverter.Input.Frequency", NULL, "%.1f", 0, NULL },
{ "input.frequency", 0, 0, "UPS.PowerConverter.Input.Frequency", NULL, "%.1f", HU_FLAG_QUICK_POLL, NULL },

{ "battery.voltage.nominal", 0, 0, "UPS.BatterySystem.Battery.ConfigVoltage", NULL, "%.0f", HU_FLAG_STATIC, NULL },
{ "battery.voltage", 0, 0, "UPS.BatterySystem.Battery.Voltage", NULL, "%.1f", 0, NULL },
{ "battery.charge", 0, 0, "UPS.BatterySystem.Battery.RemainingCapacity", NULL, "%.1f", 0, NULL },
{ "battery.voltage.nominal", 0, 0, "UPS.BatterySystem.Battery.ConfigVoltage", NULL, "%.1f", HU_FLAG_STATIC, NULL },
{ "battery.voltage", 0, 0, "UPS.BatterySystem.Battery.Voltage", NULL, "%.1f", HU_FLAG_QUICK_POLL, NULL },
{ "battery.charge", 0, 0, "UPS.PowerSummary.RemainingCapacity", NULL, "%.0f", HU_FLAG_QUICK_POLL, NULL },
{ "battery.charge", 0, 0, "UPS.BatterySystem.Battery.RemainingCapacity", NULL, "%.0f", 0, NULL },
{ "battery.charge.low", ST_FLAG_RW | ST_FLAG_STRING, 5, "UPS.PowerSummary.RemainingCapacityLimit", NULL, "%.0f", HU_FLAG_SEMI_STATIC, NULL },
{ "battery.charge.warning", 0, 0, "UPS.PowerSummary.WarningCapacityLimit", NULL, "%.0f", 0, NULL },
{ "battery.temperature", 0, 0, "UPS.BatterySystem.Temperature", NULL, "%s", 0, kelvin_celsius_conversion },
{ "battery.runtime", 0, 0, "UPS.PowerSummary.RunTimeToEmpty", NULL, "%.0f", 0, NULL },
{ "battery.capacity", 0, 0, "UPS.PowerSummary.FullChargeCapacity", NULL, "%.0f", 0, NULL },

{ "output.voltage.nominal", 0, 0, "UPS.Flow.ConfigVoltage", NULL, "%.0f", HU_FLAG_STATIC, NULL },
{ "output.frequency.nominal", 0, 0, "UPS.Flow.ConfigFrequency", NULL, "%.0f", HU_FLAG_STATIC, NULL },
{ "output.voltage", 0, 0, "UPS.PowerConverter.Output.Voltage", NULL, "%.1f", 0, NULL },
{ "output.frequency", 0, 0, "UPS.PowerConverter.Output.Frequency", NULL, "%.1f", 0, NULL },
{ "output.current", 0, 0, "UPS.PowerConverter.Output.Current", NULL, "%.1f", 0, NULL },

{ "ups.beeper.status", 0, 0, "UPS.PowerSummary.AudibleAlarmControl", NULL, "%s", 0, beeper_info },
/* { "battery.charge.low", 0, 0, "UPS.PowerSummary.RemainingCapacityLimit", NULL, "%.0f", HU_FLAG_SEMI_STATIC, NULL }, */
{ "battery.charge.warning", 0, 0, "UPS.PowerSummary.WarningCapacityLimit", NULL, "%.0f", HU_FLAG_SEMI_STATIC, NULL },
{ "battery.temperature", 0, 0, "UPS.BatterySystem.Temperature", NULL, "%s", HU_FLAG_QUICK_POLL, kelvin_celsius_conversion },
{ "battery.runtime", 0, 0, "UPS.PowerSummary.RunTimeToEmpty", NULL, "%.0f", HU_FLAG_QUICK_POLL, NULL },
{ "battery.type", 0, 0, "UPS.PowerSummary.iDeviceChemistry", NULL, "%s", HU_FLAG_STATIC, stringid_conversion },
{ "battery.capacity", 0, 0, "UPS.PowerSummary.DesignCapacity", NULL, "%.0f", HU_FLAG_SEMI_STATIC, NULL },
{ "battery.capacity", 0, 0, "UPS.PowerSummary.FullChargeCapacity", NULL, "%.0f", HU_FLAG_SEMI_STATIC, NULL },

{ "output.voltage.nominal", 0, 0, "UPS.Flow.ConfigVoltage", NULL, "%.1f", HU_FLAG_SEMI_STATIC, NULL },
{ "output.frequency.nominal", 0, 0, "UPS.Flow.ConfigFrequency", NULL, "%.1f", HU_FLAG_SEMI_STATIC, NULL },
{ "output.voltage", 0, 0, "UPS.PowerConverter.Output.Voltage", NULL, "%.1f", HU_FLAG_QUICK_POLL, NULL },
{ "output.frequency", 0, 0, "UPS.PowerConverter.Output.Frequency", NULL, "%.1f", HU_FLAG_QUICK_POLL, NULL },
{ "output.current", 0, 0, "UPS.PowerConverter.Output.Current", NULL, "%.1f", HU_FLAG_QUICK_POLL, NULL },

{ "ups.beeper.status", 0, 0, "UPS.PowerSummary.AudibleAlarmControl", NULL, "%s", HU_FLAG_QUICK_POLL, beeper_info },
{ "ups.test.result", 0, 0, "UPS.BatterySystem.Test", NULL, "%s", 0, test_read_info },
{ "ups.type", 0, 0, "UPS.DeltaCustom.[1].DeltaUPSType", NULL, "%s", HU_FLAG_STATIC, delta_ups_type_info },
{ "ups.start.auto", ST_FLAG_RW, 0, "UPS.DeltaCustom.[1].DeltaConfigStartPowerRestore", NULL, "%s", 0, yes_no_info },
{ "ups.power.nominal", 0, 0, "UPS.Flow.ConfigApparentPower", NULL, "%.0f", HU_FLAG_STATIC, NULL },
{ "ups.realpower", 0, 0, "UPS.PowerConverter.Output.ActivePower", NULL, "%.1f", 0, NULL },
{ "ups.load", 0, 0, "UPS.OutletSystem.Outlet.PercentLoad", NULL, "%.1f", 0, NULL },
{ "ups.delay.start", ST_FLAG_RW, 0, "UPS.OutletSystem.Outlet.DeltaConfigStartPowerRestoreDelay", NULL, "%.0f", 0, NULL},
{ "ups.timer.start", 0, 0, "UPS.OutletSystem.Outlet.DelayBeforeStartup", NULL, "%.0f", HU_FLAG_QUICK_POLL, NULL},
{ "ups.timer.shutdown", 0, 0, "UPS.OutletSystem.Outlet.DelayBeforeShutdown", NULL, "%.0f", HU_FLAG_QUICK_POLL, NULL},
{ "ups.realpower", 0, 0, "UPS.OutletSystem.Outlet.ActivePower", NULL, "%.1f", HU_FLAG_QUICK_POLL, NULL },
{ "ups.realpower", 0, 0, "UPS.PowerConverter.Output.ActivePower", NULL, "%.1f", HU_FLAG_QUICK_POLL, NULL },
{ "ups.load", 0, 0, "UPS.OutletSystem.Outlet.PercentLoad", NULL, "%.1f", HU_FLAG_QUICK_POLL, NULL },
/* Per comments to PR #807 these 3 declarations are populated elsewhere,
* by delta_ups_format_*() functions hooks; see:
* https://github.com/networkupstools/nut/pull/807#discussion_r501496383
*/
/* { "ups.mfr", 0, 0, "UPS.PowerSummary.iManufacturer", NULL, "%s", HU_FLAG_STATIC, stringid_conversion },
{ "ups.model", 0, 0, "UPS.PowerSummary.iProduct", NULL, "%s", HU_FLAG_STATIC, stringid_conversion },
{ "ups.serial", 0, 0, "UPS.PowerSummary.iSerialNumber", NULL, "%s", HU_FLAG_STATIC, stringid_conversion },
*/
{ "ups.delay.start", ST_FLAG_RW, 0, "UPS.OutletSystem.Outlet.DeltaConfigStartPowerRestoreDelay", NULL, "%.0f", 0, NULL },
/* mge-hid.c simlar configurable settings:
{ "ups.delay.start", ST_FLAG_RW | ST_FLAG_STRING, 10, "UPS.PowerSummary.DelayBeforeStartup", NULL, DEFAULT_ONDELAY, HU_FLAG_ABSENT, NULL },
{ "ups.delay.shutdown", ST_FLAG_RW | ST_FLAG_STRING, 10, "UPS.PowerSummary.DelayBeforeShutdown", NULL, DEFAULT_OFFDELAY, HU_FLAG_ABSENT, NULL },
...
{ "ups.timer.shutdown", 0, 0, "UPS.PowerSummary.DelayBeforeShutdown", NULL, "%.0f", HU_FLAG_QUICK_POLL, NULL },
*/
{ "ups.timer.start", 0, 0, "UPS.OutletSystem.Outlet.DelayBeforeStartup", NULL, "%.0f", HU_FLAG_QUICK_POLL, NULL },
{ "ups.timer.shutdown", 0, 0, "UPS.OutletSystem.Outlet.DelayBeforeShutdown", NULL, "%.0f", HU_FLAG_QUICK_POLL, NULL },
{ "ups.timer.reboot", 0, 0, "UPS.OutletSystem.Outlet.DelayBeforeReboot", NULL, "%.0f", HU_FLAG_QUICK_POLL, NULL },

{ "BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.Good", NULL, NULL, HU_FLAG_QUICK_POLL, off_info },
{ "BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.InternalFailure", NULL, NULL, HU_FLAG_QUICK_POLL, commfault_info},
{ "BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.ShutdownImminent", NULL, NULL, HU_FLAG_QUICK_POLL, shutdownimm_info},
{ "BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.ACPresent", NULL, NULL, HU_FLAG_QUICK_POLL, online_info},
{ "BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.BelowRemainingCapacityLimit", NULL, NULL, HU_FLAG_QUICK_POLL, lowbatt_info},
{ "BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.InternalFailure", NULL, NULL, HU_FLAG_QUICK_POLL, commfault_info },
{ "BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.ShutdownImminent", NULL, NULL, HU_FLAG_QUICK_POLL, shutdownimm_info },
{ "BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.ACPresent", NULL, NULL, HU_FLAG_QUICK_POLL, online_info },
{ "BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.BelowRemainingCapacityLimit", NULL, NULL, HU_FLAG_QUICK_POLL, lowbatt_info },
{ "BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.FullyCharged", NULL, NULL, HU_FLAG_QUICK_POLL, fullycharged_info },
{ "BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.Charging", NULL, NULL, HU_FLAG_QUICK_POLL, charging_info},
{ "BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.Discharging", NULL, NULL, HU_FLAG_QUICK_POLL, discharging_info},
{ "BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.FullyDischarged", NULL, NULL, 0, depleted_info },
{ "BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.NeedReplacement", NULL, NULL, 0, replacebatt_info},
{ "BOOL", 0, 0, "UPS.PowerConverter.PresentStatus.VoltageOutOfRange", NULL, NULL, 0, vrange_info },
{ "BOOL", 0, 0, "UPS.PowerConverter.PresentStatus.Buck", NULL, NULL, 0, trim_info },
{ "BOOL", 0, 0, "UPS.PowerConverter.PresentStatus.Boost", NULL, NULL, 0, boost_info },
{ "BOOL", 0, 0, "UPS.PowerConverter.PresentStatus.Overload", NULL, NULL, 0, overload_info },
{ "BOOL", 0, 0, "UPS.PowerConverter.PresentStatus.Used", NULL, NULL, 0, nobattery_info },
{ "BOOL", 0, 0, "UPS.PowerConverter.PresentStatus.OverTemperature", NULL, NULL, 0, overheat_info },
{ "BOOL", 0, 0, "UPS.PowerConverter.PresentStatus.InternalFailure", NULL, NULL, 0, commfault_info },
{ "BOOL", 0, 0, "UPS.PowerConverter.PresentStatus.AwaitingPower", NULL, NULL, 0, awaitingpower_info },
{ "BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.Charging", NULL, NULL, HU_FLAG_QUICK_POLL, charging_info },
{ "BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.Discharging", NULL, NULL, HU_FLAG_QUICK_POLL, discharging_info },
{ "BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.FullyDischarged", NULL, NULL, HU_FLAG_QUICK_POLL, depleted_info },
{ "BOOL", 0, 0, "UPS.PowerSummary.PresentStatus.NeedReplacement", NULL, NULL, HU_FLAG_QUICK_POLL, replacebatt_info },
{ "BOOL", 0, 0, "UPS.PowerConverter.PresentStatus.VoltageOutOfRange", NULL, NULL, HU_FLAG_QUICK_POLL, vrange_info },
{ "BOOL", 0, 0, "UPS.PowerConverter.PresentStatus.Buck", NULL, NULL, HU_FLAG_QUICK_POLL, trim_info },
{ "BOOL", 0, 0, "UPS.PowerConverter.PresentStatus.Boost", NULL, NULL, HU_FLAG_QUICK_POLL, boost_info },
{ "BOOL", 0, 0, "UPS.PowerConverter.PresentStatus.Overload", NULL, NULL, HU_FLAG_QUICK_POLL, overload_info },
{ "BOOL", 0, 0, "UPS.PowerConverter.PresentStatus.Used", NULL, NULL, HU_FLAG_QUICK_POLL, nobattery_info },
{ "BOOL", 0, 0, "UPS.PowerConverter.PresentStatus.OverTemperature", NULL, NULL, HU_FLAG_QUICK_POLL, overheat_info },
{ "BOOL", 0, 0, "UPS.PowerConverter.PresentStatus.InternalFailure", NULL, NULL, HU_FLAG_QUICK_POLL, commfault_info },
{ "BOOL", 0, 0, "UPS.PowerConverter.PresentStatus.AwaitingPower", NULL, NULL, HU_FLAG_QUICK_POLL, awaitingpower_info },

{ "beeper.on", 0, 0, "UPS.PowerSummary.AudibleAlarmControl", NULL, "2", HU_TYPE_CMD, NULL },
{ "beeper.off", 0, 0, "UPS.PowerSummary.AudibleAlarmControl", NULL, "3", HU_TYPE_CMD, NULL },
Expand All @@ -194,7 +268,7 @@ static hid_info_t delta_ups_hid2nut[] = {
};

static const char *delta_ups_format_mfr(HIDDevice_t *hd) {
return hd->Vendor;
return hd->Vendor ? hd->Vendor : "Delta";
}

static const char *delta_ups_format_model(HIDDevice_t *hd) {
Expand All @@ -212,13 +286,23 @@ static const char *delta_ups_format_serial(HIDDevice_t *hd) {
return hd->Serial;
}

/* this function allows the subdriver to "claim" a device: return 1 if
* the device is supported by this subdriver, else 0. */
static int delta_ups_claim(HIDDevice_t *hd) {
int status = is_usb_device_supported(delta_ups_usb_device_table, hd);

switch (status) {
case SUPPORTED:
return 1;

case POSSIBLY_SUPPORTED:
/* by default, reject, unless the productid option is given */
if (getval("productid")) {
return 1;
}
possibly_supported("Delta", hd);
return 0;

case NOT_SUPPORTED:
default:
return 0;
Expand Down
9 changes: 5 additions & 4 deletions drivers/delta_ups-hid.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
/* delta_ups-hid.h - data to monitor Delta UPS USB/HID devices with NUT
/* delta_ups-hid.h - data mapping subdriver to monitor Delta UPS USB/HID devices with NUT
*
* Copyright (C)
* 2021 Jungeon Kim <me@jungeon.kim>
* 2003 - 2009 Arnaud Quette <ArnaudQuette@Eaton.com>
* 2005 - 2006 Peter Selinger <selinger@users.sourceforge.net>
* 2008 - 2009 Arjen de Korte <adkorte-guest@alioth.debian.org>
* 2021 Jungeon Kim <me@jungeon.kim>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand All @@ -13,11 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/

#ifndef DELTA_UPS_HID_H
Expand Down