<br><font size=2 face="sans-serif">Hi Henning,</font>
<br>
<br><font size=2 face="sans-serif">you should get in touch with Carlos,
who his developing a generic</font>
<br><font size=2 face="sans-serif">megatec driver (available from svn:
http://eu1.networkupstools.org/source.html)</font>
<br>
<br><font size=2 face="sans-serif">Arnaud</font>
<br><font size=2 face="sans-serif">--</font>
<br><font size=2 face="sans-serif">Linux / Unix Expert - MGE UPS SYSTEMS
- R&D Dpt</font>
<br><font size=2 face="sans-serif">Network UPS Tools (NUT) Project Leader
- http://www.networkupstools.org/</font>
<br><font size=2 face="sans-serif">Debian Developer - http://people.debian.org/~aquette/</font>
<br><font size=2 face="sans-serif">OpenSource Developer - http://arnaud.quette.free.fr/</font>
<br>
<br>
<br>
<br>
<table width=100%>
<tr valign=top>
<td width=40%><font size=1 face="sans-serif"><b>Henning Brauer <henning@openbsd.org></b>
</font>
<p><font size=1 face="sans-serif">04/26/06 12:19 AM</font>
<td width=59%>
<table width=100%>
<tr valign=top>
<td>
<div align=right><font size=1 face="sans-serif">A</font></div>
<td><font size=1 face="sans-serif">arnaud.quette@mgeups.com</font>
<tr valign=top>
<td>
<div align=right><font size=1 face="sans-serif">cc</font></div>
<td><font size=1 face="sans-serif">bernd@cvs.openbsd.org, Henning Brauer
<henning@cvs.openbsd.org></font>
<tr valign=top>
<td>
<div align=right><font size=1 face="sans-serif">Objet</font></div>
<td><font size=1 face="sans-serif">nut 2.0 fentonups</font></table>
<br>
<table>
<tr valign=top>
<td>
<td></table>
<br></table>
<br>
<br>
<br><font size=2><tt>this allows the model to be forced for the fentonups
driver. I have a <br>
UPS that does not respond to I, but otherwise perfectly follows the <br>
fenton protocol. this makes it work.<br>
the Xanto S3000R is a rackmount 2U UPS, online, 3000VA, which requires<br>
and external 2U battery pack. The manufacturer is www.online-usv.de<br>
<br>
<brahe@paploo:59>$ sudo ./fentonups -x model=XS3000R /dev/ttym1 <br>
Network UPS Tools - Fenton UPS driver 1.21 (2.0.0)<br>
Detected Xanto S3000R on /dev/ttym1<br>
<brahe@paploo:61>$ upsc UPS-3@localhost<br>
battery.charge: 100.0<br>
battery.voltage: 2.26<br>
driver.name: fentonups<br>
driver.parameter.model: XS3000R<br>
driver.version: 2.0.0<br>
driver.version.internal: 1.21<br>
input.frequency: 50.0<br>
input.transfer.high: 275<br>
input.transfer.low: 165<br>
input.voltage: 228.8<br>
output.voltage: 230.0<br>
ups.load: 052<br>
ups.mfr: Online<br>
ups.model: Xanto S3000R<br>
ups.status: OL<br>
ups.temperature: 28.0<br>
<br>
$OpenBSD$<br>
--- drivers/fentonups.c.orig
Tue Apr 25 23:33:03 2006<br>
+++ drivers/fentonups.c
Wed Apr 26 00:11:06 2006<br>
@@ -33,14 +33,17 @@ static
float
lowvolt = 0, voltrange;<br>
static
int
lownorm, highnorm;<br>
<br>
/* handle devices which don't give a properly formatted I string */<br>
-static int check_mtab2(const char *raw)<br>
+static int check_mtab2(const char *raw, int israw)<br>
{<br>
int
i;<br>
char
*cooked;<br>
<br>
-
/* trim off the leading # and any trailing spaces */<br>
-
cooked = xstrdup(&raw[1]);<br>
-
rtrim(cooked, ' ');<br>
+
if (israw) {<br>
+
/*
trim off the leading # and any trailing spaces */<br>
+
cooked
= xstrdup(&raw[1]);<br>
+
rtrim(cooked,
' ');<br>
+
} else<br>
+
cooked
= xstrdup(raw);<br>
<br>
for
(i = 0; mtab2[i].id != NULL; i++) {<br>
if (!strcmp(cooked, mtab2[i].id)) {<br>
@@ -74,7 +77,7 @@ static void guessmodel(const char *raw)<br>
char
mch, *mstr;<br>
<br>
/*
first see if it's in the mtab2 */<br>
-
if (check_mtab2(raw))<br>
+
if (check_mtab2(raw, 1))<br>
return;<br>
<br>
mch
= raw[17];<br>
@@ -175,28 +178,36 @@ static char *get_id(void)<br>
void upsdrv_initinfo(void)<br>
{<br>
int
modelnum, i, ret;<br>
-
char
temp[256], model[32], *raw;<br>
+
char
temp[256], qmodel[32], *model, *raw = NULL;<br>
<br>
-
raw = get_id();<br>
+
model = getval("model");<br>
<br>
-
if (!raw)<br>
-
fatalx("Unable
to detect a Fenton or Megatec protocol UPS");<br>
+
if (!model) {<br>
+
raw
= get_id();<br>
<br>
-
snprintf(temp, sizeof(temp), "%s", raw);<br>
+
if
(!raw)<br>
+
fatalx("Unable to detect a Fenton or Megatec protocol UPS");<br>
<br>
-
temp[11] = 0;<br>
-
temp[27] = 0;<br>
+
snprintf(temp,
sizeof(temp), "%s", raw);<br>
<br>
-
/* manufacturer */<br>
-
rtrim(&temp[1], ' ');<br>
-
dstate_setinfo("ups.mfr", &temp[1], 0, 0);<br>
+
temp[11]
= 0;<br>
+
temp[27]
= 0;<br>
<br>
-
/* L660A = PowerPal (L) @ 660 VA, American (A) version (115V) */<br>
+
/*
manufacturer */<br>
+
rtrim(&temp[1],
' ');<br>
+
dstate_setinfo("ups.mfr",
&temp[1], 0, 0);<br>
<br>
-
/* grab full model string */<br>
-
rtrim(&temp[17], ' ');<br>
-
snprintf(model, sizeof(model), "%s", &temp[17]);<br>
+
/*
L660A = PowerPal (L) @ 660 VA, American (A) version (115V) */<br>
<br>
+
/*
grab full model string */<br>
+
rtrim(&temp[17],
' ');<br>
+
snprintf(qmodel,
sizeof(qmodel), "%s", &temp[17]);<br>
+
model
= qmodel;<br>
+
}<br>
+<br>
+
if (!model)<br>
+
fatalx("unable
to determine model");<br>
+<br>
modelnum
= -1;<br>
<br>
/*
figure out official model name and voltage info from table */<br>
@@ -210,20 +221,27 @@ void upsdrv_initinfo(void)<br>
}<br>
}<br>
<br>
-
/* table lookup fails -> guess */<br>
-
if (modelnum == -1)<br>
-
guessmodel(raw);<br>
-
else {<br>
-
dstate_setinfo("ups.model",
"%s", modeltab[modelnum].desc);<br>
+
if (model && modelnum == -1)<br>
+
if
(check_mtab2(model, 0) == 0)<br>
+
fatalx("no such model: %s", model);<br>
<br>
-
dstate_setinfo("input.transfer.low",
"%d", <br>
-
modeltab[modelnum].lowxfer);<br>
+
if (raw) {<br>
+
/*
table lookup fails -> guess */<br>
+
if
(modelnum == -1)<br>
+
guessmodel(raw);<br>
+
else
{<br>
+
dstate_setinfo("ups.model", "%s",<br>
+
modeltab[modelnum].desc);<br>
<br>
-
dstate_setinfo("input.transfer.high",
"%d",<br>
-
modeltab[modelnum].highxfer);<br>
+
dstate_setinfo("input.transfer.low", "%d", <br>
+
modeltab[modelnum].lowxfer);<br>
<br>
-
lownorm
= modeltab[modelnum].lownorm;<br>
-
highnorm
= modeltab[modelnum].highnorm;<br>
+
dstate_setinfo("input.transfer.high", "%d",<br>
+
modeltab[modelnum].highxfer);<br>
+<br>
+
lownorm = modeltab[modelnum].lownorm;<br>
+
highnorm = modeltab[modelnum].highnorm;<br>
+
}<br>
}<br>
<br>
/*
now add instant command support info */<br>
@@ -231,7 +249,8 @@ void upsdrv_initinfo(void)<br>
dstate_addcmd("test.battery.stop");<br>
<br>
printf("Detected
%s on %s\n", dstate_getinfo("ups.model"), device_path);<br>
-
free(raw);<br>
+
if (raw)<br>
+
free(raw);<br>
<br>
/*
paranoia - cancel any shutdown that might already be running */<br>
ret
= ser_send(upsfd, "C\r");<br>
@@ -406,6 +425,7 @@ void upsdrv_help(void)<br>
<br>
void upsdrv_makevartable(void)<br>
{<br>
+
addvar(VAR_VALUE, "model", "force model");<br>
}<br>
<br>
void upsdrv_banner(void)<br>
$OpenBSD$<br>
--- drivers/fentonups.h.orig
Tue Apr 25 23:32:16 2006<br>
+++ drivers/fentonups.h
Wed Apr 26 00:09:19 2006<br>
@@ -81,5 +81,6 @@ struct {<br>
{
"WELI 500 1.0", "Giant Power", "MT650", 10.6,
3.7, 170, 180, 270, 280, 0 },<br>
{
"SMART-UPS 1800VA T18Q16AG",
"Effekta", "MT 2000 RM",<br>
50.0, 19.5, 171, 200, 260, 278, 1 },<br>
+
{ "XS3000R", "Online", "Xanto S3000R", 1.81,
0.44, 165, 200, 240, 275, 1 },<br>
{
NULL, NULL,
NULL, 0, 0, 0, 0,
0, 0, 0 }<br>
};<br>
</tt></font>
<br><pre>
</pre>