lagertonne/nut
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Imported Upstream version 2.7.1

Browse source
This commit is contained in:
Laurent Bigonville 2013-11-24 16:00:12 +01:00
parent a1fa151fc7
commit 0121794af9
451 changed files with 41339 additions and 10887 deletions
Download patch file Download diff file Expand all files Collapse all files

66
drivers/powerp-txt.c
View file

@ -5,6 +5,7 @@
* Copyright (C)
* 2007 Doug Reynolds <mav@wastegate.net>
* 2007-2008 Arjen de Korte <adkorte-guest@alioth.debian.org>
* 2012 Timothy Pearson <kb9vqf@pearsoncomputing.net>
*
* 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
@ -33,13 +34,21 @@
#include "powerp-txt.h"
typedef struct {
float i_volt;
float o_volt;
int o_load;
int b_chrg;
int u_temp;
float i_freq;
unsigned char flags[2];
float i_volt;
float o_volt;
int o_load;
int b_chrg;
int u_temp;
float i_freq;
unsigned char flags[2];
unsigned char has_b_volt;
float b_volt;
unsigned char has_o_freq;
float o_freq;
unsigned char has_runtime;
int runtime;
int c_unknwn;
float q_unknwn;
} status_t;
static int ondelay = 1; /* minutes */
@ -402,6 +411,40 @@ static int powpan_status(status_t *status)
&status->b_chrg, &status->u_temp, &status->i_freq,
status->flags);
if (ret >= 7) {
status->has_b_volt = 0;
status->has_o_freq = 0;
status->has_runtime = 0;
}
else {
ret = ser_get_buf_len(upsfd, powpan_answer+35, 23, SER_WAIT_SEC, SER_WAIT_USEC);
if (ret < 0) {
upsdebug_with_errno(3, "read");
upsdebug_hex(4, " \\_", powpan_answer+35, 23);
return -1;
}
if (ret == 0) {
upsdebugx(3, "read: timeout");
upsdebug_hex(4, " \\_", powpan_answer+35, 23);
return -1;
}
upsdebug_hex(3, "read", powpan_answer, ret);
ret = sscanf(powpan_answer, "#I%fO%fL%dB%dV%fT%dF%fH%fR%dC%dQ%fS%2c\r",
&status->i_volt, &status->o_volt, &status->o_load,
&status->b_chrg, &status->b_volt, &status->u_temp,
&status->i_freq, &status->o_freq, &status->runtime,
&status->c_unknwn, &status->q_unknwn, status->flags);
status->has_b_volt = 1;
status->has_o_freq = 1;
status->has_runtime = 1;
dstate_setinfo("battery.voltage.nominal", "%g", 72.0);
dstate_setinfo("output.voltage.nominal", "%g", 120.0);
}
if (ret < 7) {
upsdebugx(4, "Parsing status string failed");
return -1;
@ -424,6 +467,15 @@ static int powpan_updateinfo(void)
dstate_setinfo("input.frequency", "%.1f", status.i_freq);
dstate_setinfo("ups.temperature", "%d", status.u_temp);
dstate_setinfo("battery.charge", "%d", status.b_chrg);
if (status.has_b_volt) {
dstate_setinfo("battery.voltage", "%.1f", status.b_volt);
}
if (status.has_o_freq) {
dstate_setinfo("output.frequency", "%.1f", status.o_freq);
}
if (status.has_runtime) {
dstate_setinfo("battery.runtime", "%d", status.runtime*60);
}
status_init();