Imported Upstream version 2.6.1

This commit is contained in:
Arnaud Quette 2011-06-01 22:31:49 +02:00
parent 459aaf9392
commit a367d9bc54
178 changed files with 4651 additions and 3279 deletions

View file

@ -42,7 +42,6 @@ DIST_COMMON = $(dist_data_DATA) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/driver.list.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/ax_create_stdint_h.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 \

View file

@ -3,12 +3,13 @@
# This file is optional. You may delete it to save resources, but
# clients will receive "Unavailable" for any description requests.
#
# *** NOTE *** : When updating this file, also update docs/new-names.txt
# *** NOTE *** : When updating this file, also update docs/nut-names.txt
VARDESC ups.alarm "UPS alarms"
VARDESC ups.status "UPS status"
VARDESC ups.time "Internal UPS clock time"
VARDESC ups.date "Internal UPS clock date"
VARDESC ups.efficiency "Efficiency of the UPS"
VARDESC ups.model "UPS model"
VARDESC ups.mfr "UPS manufacturer"
VARDESC ups.mfr.date "UPS manufacturing date"

View file

@ -184,6 +184,7 @@
"Delta" "ups" "1" "GES602N" "" "belkin"
"Deltec" "ups" "1" "PowerRite Pro II" "" "genericups upstype=15"
"Deltec" "ups" "4" "PRM 450/700/1000/1500" "" "upscode2"
"Digital Loggers" "pdu" "1" "LPC, EPCR2, DIN" "8 outlets" "powerman-pdu (experimental)"
@ -196,6 +197,7 @@
"Dynex" "ups" "2" "DX-800U" "USB" "usbhid-ups"
"Eaton" "ups" "5" "Protection Station 500/650/800 VA" "USB" "usbhid-ups"
"Eaton" "ups" "5" "Ellipse ECO 650/800/1200/1600 VA" "USB" "usbhid-ups"
"Eaton" "ups" "5" "Ellipse ASR USBS 600/750/1000/1500 VA" "USB cable" "usbhid-ups"
"Eaton" "ups" "5" "Ellipse MAX USBS 600/850/1100/1500 VA" "USB cable" "usbhid-ups"
"Eaton" "ups" "5" "Evolution 650/850/1150/1550/2000 VA" "USB port" "usbhid-ups"
@ -204,6 +206,7 @@
"Eaton" "ups" "5" "EX 2200/3000/3000 XL VA" "USB port" "usbhid-ups"
"Eaton" "ups" "5" "EX 1000 RT2U / 1500 RT2U" "USB port" "usbhid-ups"
"Eaton" "ups" "5" "MX 5/8/10/15/20 kVA" "USB port" "usbhid-ups"
"Eaton" "ups" "5" "5 PX" "USB port" "usbhid-ups"
"Eaton" "ups" "5" "Nova AVR 625/1250" "USB" "usbhid-ups"
"Eaton" "ups" "5" "Ellipse ASR USBS 600/750/1000/1500 VA" "Serial cable" "mge-shut or newmge-shut"
"Eaton" "ups" "5" "Ellipse MAX USBS 600/850/1100/1500 VA" "Serial cable" "mge-shut or newmge-shut"
@ -213,12 +216,14 @@
"Eaton" "ups" "5" "EX 2200/3000/3000 XL VA" "Serial port" "mge-shut or newmge-shut"
"Eaton" "ups" "5" "EX 1000 RT2U / 1500 RT2U" "Serial port" "mge-shut or newmge-shut"
"Eaton" "ups" "5" "MX 5/8/10/15/20 kVA" "Serial port" "mge-shut or newmge-shut"
"Eaton" "ups" "5" "5 PX" "Serial port" "mge-shut or newmge-shut"
"Eaton" "ups" "5" "EX RT 1:1 7/11 kVA" "" "mge-shut or newmge-shut"
"Eaton" "ups" "5" "EX RT 3:1 5/7/11 kVA" "" "mge-shut or newmge-shut"
"Eaton" "ups" "5" "EX RT (XML/HTTP)" "NMC Transverse card (ref 66074)" "netxml-ups (experimental)"
"Eaton" "ups" "5" "EX RT (SNMP)" "NMC Transverse card (ref 66074)" "snmp-ups (experimental)"
"Eaton" "ups" "5" "E Series NV UPS 400-2000 VA" "" "blazer_usb"
"Eaton" "ups" "5" "E Series DX UPS 1-20 kVA" "" "mge-utalk"
"Eaton" "ups" "4" "NetUPS SE 450/700/1000/1500" "" "upscode2"
"Eaton" "ups" "5" "BladeUPS (SNMP)" "ConnectUPS Web/SNMP Card" "snmp-ups (experimental)"
"Eaton" "ups" "5" "various models (XML/HTTP mode)" "NMC Minislot (Ref 66102)" "netxml-ups (experimental)"
"Eaton" "ups" "5" "various models (SNMP mode)" "NMC Minislot (Ref 66102)" "snmp-ups (experimental)"
@ -227,6 +232,7 @@
"Eaton" "pdu" "5" "ePDU Managed" "" "snmp-ups (experimental)"
"Eaton" "pdu" "5" "ePDU Monitored" "" "snmp-ups or netxml-ups"
"Eaton" "ups" "5" "Powerware 9130" "" "bcmxcp or usbhid-ups"
"Eaton" "ups" "5" "Powerware 9140" "" "bcmxcp or usbhid-ups"
"Eaton" "ups" "5" "Powerware 5130" "" "usbhid-ups"
"Eaton" "ups" "5" "9395" "Serial port" "bcmxcp"
"Eaton" "ups" "5" "Best Ferrups" "older ConnectUPS" "snmp-ups"
@ -247,6 +253,7 @@
"Ever-Power" "ups" "1" "625/1000" "" "safenet"
"Exide" "ups" "1" "NetUPS SE" "" "genericups upstype=15"
"Exide" "ups" "4" "NetUPS SE 450/700/1000/1500" "" "upscode2"
"Fenton Technologies" "ups" "1" "PowerPal" "P-series" "safenet"
"Fenton Technologies" "ups" "5" "PowerPal" "L-series" "blazer_ser"
@ -274,6 +281,8 @@
"Gamatronic" "ups" "5" "MS" "" "gamatronic"
"Gamatronic" "ups" "5" "µPS3/1" "" "gamatronic"
"GE" "ups" "2" "EP series" "" "blazer_usb"
"Geek Squad" "ups" "2" "GS1285U" "USB" "usbhid-ups"
"Gemini" "ups" "1" "UPS625/UPS1000" "" "safenet"
@ -303,7 +312,8 @@
"Inform" "ups" "1" "GUARD" "Line Interactive AP model" "powercom"
"Inform" "ups" "2" "Guard S 1500AP" "" "blazer_ser"
"Inform" "ups" "2" "Informer Compact 1000VA" "" "blazer_ser"
"Inform" "ups" "2" "Informer Compact 1000-2000-3000 VA" "" "blazer_ser"
"Inform" "ups" "2" "Sinus SS 210" "" "blazer_ser"
"Infosec" "ups" "2" "iPEL 350" "" "blazer_ser"
"Infosec" "ups" "2" "iPEL 500" "" "blazer_ser"
@ -313,6 +323,8 @@
"Infosec" "ups" "2" "XP 500" "USB" "blazer_usb"
"Infosec" "ups" "2" "XP 1000" "" "blazer_ser"
"IPAR" "ups" "2" "Mini Energy ME 800" "" "blazer_usb"
"IPMI" "pdu" "1" "" "" "powerman-pdu (experimental)"
"Ippon" "ups" "2" "Back Power Pro 400/500/600/700/800" "" "blazer_ser"
@ -554,6 +566,7 @@
"Mustek" "ups" "2" "Powermust" "2000VA USB" "blazer_ser"
"Mustek" "ups" "2" "Powermust Office 650" "USB" "blazer_usb"
"Mustek" "ups" "2" "PowerMust 424 / 636 / 848" "USB" "blazer_usb"
"Mustek" "ups" "2" "Yukai PowerMust" "1000 USB (PID: 5161)" "blazer_usb"
"Mustek" "ups" "2" "Various" "" "blazer_ser"
"Neus" "ups" "2" "400va / 600va" "" "blazer_ser"
@ -562,6 +575,8 @@
"Nitram" "ups" "1" "Elite 2002" "" "genericups upstype=16"
"Nitram" "ups" "1" "Elite 2005" "" "powerpanel"
"NUMERIC" "ups" "2" "3000 SW" "" "blazer_ser"
"Oneac" "ups" "1" "ON400" "advanced interface" "oneac"
"Oneac" "ups" "1" "ON600" "advanced interface" "oneac"
"Oneac" "ups" "1" "ON900" "advanced interface" "oneac"
@ -662,7 +677,7 @@
"Repotec" "ups" "1" "RPT-800A" "" "genericups upstype=13"
"Repotec" "ups" "1" "RPT-162A" "" "genericups upstype=13"
"Rocketfish" "ups" "2" "RF-1000VA / RF-1025VA" "" "usbhid-ups"
"Rocketfish" "ups" "2" "RF-1000VA / RF-1025VA" "" "usbhid-ups"
"SmartLabs" "pdu" "1" "2412S Power Line Modem" "for X10/Insteon" "powerman-pdu (experimental)"
@ -692,8 +707,9 @@
"SuperPower" "ups" "2" "HP360, Hope-550" "" "blazer_ser"
"SVEN" "ups" "2" "Power Pro+ series" "USB" "blazer_usb"
"SVEN" "ups" "2" "Power Smart RM 2000" "USB" "blazer_usb"
"SVEN" "ups" "2" "Power Pro+ series" "USB" "blazer_usb (USB ID 05b8:0000)"
"SVEN" "ups" "1" "Power Pro+ series" "USB" "richcomm_usb (USB ID 0925:1234)"
"SVEN" "ups" "2" "Power Smart RM 2000" "USB" "blazer_usb (USB ID 05b8:0000)"
"Sweex" "ups" "1" "500/1000" "smart - shipped with SafeNet" "safenet"
"Sweex" "ups" "1" "500/1000" "" "genericups upstype=7"
@ -722,6 +738,8 @@
"Tripp-Lite" "ups" "2" "AVR750U" "USB" "usbhid-ups"
"Tripp-Lite" "ups" "2" "ECO550UPS" "USB" "usbhid-ups"
"Tripp-Lite" "ups" "2" "SmartOnline SU1500RTXL2ua" "USB" "usbhid-ups"
"Tripp-Lite" "ups" "2" "Smart1000LCD" "USB" "usbhid-ups"
"Tripp-Lite" "ups" "2" "Smart1500LCD" "USB" "usbhid-ups"
"Tripp-Lite" "ups" "2" "smart2200RMXL2U" "USB, newer models" "usbhid-ups"
"Trust" "ups" "2" "UPS 1000 Management PW-4105" "" "blazer_ser"
@ -755,6 +773,8 @@
"Viewsonic" "ups" "1" "PowerES" "420E" "optiups"
"Vivaldi" "ups" "1" "EA200 LED" "USB" "richcomm_usb"
"WinPower" "ups" "2" "CPM-800" "" "blazer_ser"
"WTI" "pdu" "1" "RPS-10" "10 outlets" "powerman-pdu (experimental)"

View file

@ -40,7 +40,6 @@ DIST_COMMON = README $(am__dist_html_DATA_DIST) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/header.html.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compare_version.m4 \
$(top_srcdir)/m4/ax_create_stdint_h.m4 \
$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
$(top_srcdir)/m4/lt~obsolete.m4 \