diff -ruN nut-2.0.0.orig/data/driver.list nut-2.0.0/data/driver.list --- nut-2.0.0.orig/data/driver.list 2004-05-14 01:07:48.000000000 +0100 +++ nut-2.0.0/data/driver.list 2004-05-14 01:34:35.000000000 +0100 @@ -179,3 +179,9 @@ "Victron/IMV" "(various)" "" "victronups" "Victron/IMV" "Lite" "crack cable" "genericups upstype=10" + +"Mustek" "Powermust" "400VA Plus" "powermust" +"Mustek" "Powermust" "600VA Plus" "powermust" +"Mustek" "Powermust" "800VA Pro" "powermust" +"Mustek" "Powermust" "1000VA Plus" "powermust" +"OnLite" "AQUA" "50" "powermust" diff -ruN nut-2.0.0.orig/drivers/Makefile.drvbuild nut-2.0.0/drivers/Makefile.drvbuild --- nut-2.0.0.orig/drivers/Makefile.drvbuild 2004-05-14 01:07:48.000000000 +0100 +++ nut-2.0.0/drivers/Makefile.drvbuild 2004-05-14 01:08:56.000000000 +0100 @@ -53,3 +53,5 @@ $(CC) $(CFLAGS) -o ippon ippon.o main.o serial.o dstate.o ../common/state.o ../common/upsconf.o ../common/parseconf.o $(LIBOBJ) cyberpower1100: cyberpower1100.o main.o serial.o dstate.o ../common/state.o ../common/upsconf.o ../common/parseconf.o $(LIBDEP) $(CC) $(CFLAGS) -o cyberpower1100 cyberpower1100.o main.o serial.o dstate.o ../common/state.o ../common/upsconf.o ../common/parseconf.o $(LIBOBJ) +powermust: powermust.o main.o serial.o dstate.o ../common/state.o ../common/upsconf.o ../common/parseconf.o $(LIBDEP) + $(CC) $(CFLAGS) -o powermust powermust.o main.o serial.o dstate.o ../common/state.o ../common/upsconf.o ../common/parseconf.o $(LIBOBJ) diff -ruN nut-2.0.0.orig/drivers/Makefile.in nut-2.0.0/drivers/Makefile.in --- nut-2.0.0.orig/drivers/Makefile.in 2004-05-14 01:07:48.000000000 +0100 +++ nut-2.0.0/drivers/Makefile.in 2004-05-14 01:08:56.000000000 +0100 @@ -12,7 +12,7 @@ PROGS = bestups fentonups apcsmart everups belkin masterguard powercom \ cyberpower tripplite victronups genericups mge-utalk bestuferrups \ isbmex etapro liebert sms esupssmart tripplitesu blazer safenet \ - belkinunv oneac ippon cyberpower1100 + belkinunv oneac ippon cyberpower1100 powermust LIBDEP = @LIBOBJ@ LIBOBJ = $(LIBDEP) @NETLIBS@ @SERLIBS@ diff -ruN nut-2.0.0.orig/drivers/powermust.c nut-2.0.0/drivers/powermust.c --- nut-2.0.0.orig/drivers/powermust.c 1970-01-01 01:00:00.000000000 +0100 +++ nut-2.0.0/drivers/powermust.c 2004-05-14 02:31:41.000000000 +0100 @@ -0,0 +1,474 @@ +/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: t; -*- + * + * Copyright (C) 2003 Carlos Rodrigues + * + * powermust.c created on 4/10/2003 + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * 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 "main.h" +#include "serial.h" + +#include +#include + + +#define ENDCHAR '\r' +#define IGNCHARS "(#" + +#define DRV_VERSION "0.11" + +#define RECV_BUFFER_LEN 128 + +/* The expected reply lengths (without IGNCHARS) */ +#define F_CMD_REPLY_LEN 20 +#define Q1_CMD_REPLY_LEN 45 + +#define IDENT_MAXTRIES 5 +#define IDENT_MINSUCCESS 2 + +#define SEND_PACE 5000 /* 5ms interval between chars */ +#define READ_TIMEOUT 1 /* 1 second timeout on read */ + +#define MAX_START_DELAY 9999 +#define MAX_SHUTDOWN_DELAY 99 + +#define N_FLAGS 8 + +/* The UPS status flags */ +#define FL_ON_BATT 0 +#define FL_LOW_BATT 1 +#define FL_BOOST_TRIM 2 +#define FL_FAILED 3 +#define FL_UPS_TYPE 4 +#define FL_BATT_TEST 5 +#define FL_LOAD_OFF 6 +#define FL_BEEPER_ON 7 /* seemingly not used */ + +/* + * Battery voltage limits + * + * These are hardcoded values for the PowerMust 600VA Plus (12V) and the + * 1000VA Plus (24V). If you have another model and these values should + * be different, let me know. + */ +#define BATT_VOLT_MIN_12 9.7 /* Estimate by looking at Commander Pro */ +#define BATT_VOLT_MAX_12 13.7 +#define BATT_VOLT_MIN_24 19.4 /* Estimate from LB at 22.2V (using same factor as 12V models) */ +#define BATT_VOLT_MAX_24 27.4 + + +/* The values returned by the UPS for a "F" query */ +typedef struct { + float volt; + float current; + float battvolt; + float freq; +} FirmwareValues; + + +/* The values returned by the UPS for a "Q1" query */ +typedef struct { + float ivolt; + float fvolt; + float ovolt; + float load; + float freq; + float battvolt; + float temp; + char flags[N_FLAGS + 1]; +} QueryValues; + + +/* Defined in upsdrv_initups */ +static float battvolt_min; +static float battvolt_max; + +/* Minimum and maximum voltage seen on input */ +static float ivolt_min = INT_MAX; +static float ivolt_max = -1; + +/* In minutes: */ +static short start_delay = 3; /* wait this amount of time to come back online */ +static short shutdown_delay = 2; /* wait until going offline */ + + +static float batt_charge_pct(float battvolt); +static int check_ups(void); +static int get_firmware_values(FirmwareValues *values); +static int run_query(QueryValues *values); +int instcmd(const char *cmdname, const char *extra); +int setvar(const char *varname, const char *val); + + +/* I know, macros should evaluate their arguments only once */ +#define CLAMP(x, min, max) (((x) < (min)) ? (min) : (((x) > (max)) ? (max) : (x))) + + +static float batt_charge_pct(float battvolt) +{ + float value; + + battvolt = CLAMP(battvolt, battvolt_min, battvolt_max); + value = (battvolt - battvolt_min) / (battvolt_max - battvolt_min); + + return value * 100; +} + + +static int check_ups(void) +{ + char buffer[RECV_BUFFER_LEN]; + int ret; + + ser_send_pace(upsfd, SEND_PACE, "F%c", ENDCHAR); + ret = ser_get_line(upsfd, buffer, RECV_BUFFER_LEN, ENDCHAR, IGNCHARS, READ_TIMEOUT, 0); + if (ret < F_CMD_REPLY_LEN) { + return -1; + } + + ser_send_pace(upsfd, SEND_PACE, "Q1%c", ENDCHAR); + ret = ser_get_line(upsfd, buffer, RECV_BUFFER_LEN, ENDCHAR, IGNCHARS, READ_TIMEOUT, 0); + if (ret < Q1_CMD_REPLY_LEN) { + return -1; + } + + return 0; +} + + +static int get_firmware_values(FirmwareValues *values) +{ + char buffer[RECV_BUFFER_LEN]; + int ret; + + ser_send_pace(upsfd, SEND_PACE, "F%c", ENDCHAR); + ret = ser_get_line(upsfd, buffer, RECV_BUFFER_LEN, ENDCHAR, IGNCHARS, READ_TIMEOUT, 0); + if (ret < F_CMD_REPLY_LEN) { + return -1; + } + + sscanf(buffer, "%f %f %f %f", &values->volt, &values->current, + &values->battvolt, &values->freq); + + return 0; +} + + +static int run_query(QueryValues *values) +{ + char buffer[RECV_BUFFER_LEN]; + int ret; + + ser_send_pace(upsfd, SEND_PACE, "Q1%c", ENDCHAR); + ret = ser_get_line(upsfd, buffer, RECV_BUFFER_LEN, ENDCHAR, IGNCHARS, READ_TIMEOUT, 0); + if (ret < Q1_CMD_REPLY_LEN) { + return -1; + } + + sscanf(buffer, "%f %f %f %f %f %f %f %s", &values->ivolt, &values->fvolt, &values->ovolt, + &values->load, &values->freq, &values->battvolt, &values->temp, values->flags); + + return 0; +} + + +void upsdrv_initinfo(void) +{ + dstate_setinfo("driver.version.internal", "%s", DRV_VERSION); + dstate_setinfo("ups.mfr", "Mustek"); + dstate_setinfo("ups.model", "PowerMust"); + + dstate_addcmd("test.battery.start"); + dstate_addcmd("shutdown.return"); + dstate_addcmd("shutdown.stayoff"); + dstate_addcmd("shutdown.stop"); + dstate_addcmd("load.on"); + dstate_addcmd("load.off"); + dstate_addcmd("reset.input.minmax"); + + upsh.instcmd = instcmd; + upsh.setvar = setvar; + + /* clean up a possible shutdown in progress */ + ser_send_pace(upsfd, SEND_PACE, "C%c", ENDCHAR); +} + + +void upsdrv_updateinfo(void) +{ + QueryValues query; + + if (run_query(&query) < 0) { + /* + * Query wasn't successful (we got some weird + * response), however we won't fatalx() as this + * happens sometimes when the ups is offline. + * + * Some fault tolerance is good, we just assume + * that the UPS is just taking a nap. ;) + */ + dstate_datastale(); + + return; + } + + dstate_setinfo("input.voltage", "%.1f", query.ivolt); + dstate_setinfo("input.voltage.fault", "%.1f", query.fvolt); + dstate_setinfo("output.voltage", "%.1f", query.ovolt); + dstate_setinfo("ups.load", "%.1f", query.load); + dstate_setinfo("output.frequency", "%.1f", query.freq); + dstate_setinfo("battery.voltage", "%.1f", query.battvolt); + + /* this value seems to be bogus, it always reports 37.8 */ + /*dstate_setinfo("ups.temperature", "%.1f", query.temp);*/ + + dstate_setinfo("battery.charge", "%.1f", batt_charge_pct(query.battvolt)); + + /* For debug purposes (I know it isn't good to create new variables) */ + /*dstate_setinfo("ups.flags", query.flags);*/ + + status_init(); + + if (query.flags[FL_LOAD_OFF] == '1') { + status_set("OFF"); + } else if (query.flags[FL_ON_BATT] == '1' || query.flags[FL_BATT_TEST] == '1') { + status_set("OB"); + } else { + status_set("OL"); + + if (query.flags[FL_BOOST_TRIM] == '1') { + if (query.ivolt < query.ovolt) { + status_set("BOOST"); + } else if (query.ivolt > query.ovolt) { + status_set("TRIM"); + } else { + status_set("BYPASS"); + } + } + } + + if (query.flags[FL_LOW_BATT] == '1') { + status_set("LB"); + } + + if (query.flags[FL_FAILED] == '1') { + status_set("FAILED"); + } + + status_commit(); + + /* Update minimum and maximum input voltage levels only when on line */ + if (query.flags[FL_ON_BATT] == '0') { + if (query.ivolt < ivolt_min) { + ivolt_min = query.ivolt; + } + + if (query.ivolt > ivolt_max) { + ivolt_max = query.ivolt; + } + + dstate_setinfo("input.voltage.minimum", "%.1f", ivolt_min); + dstate_setinfo("input.voltage.maximum", "%.1f", ivolt_max); + } + + dstate_dataok(); +} + + +void upsdrv_shutdown(void) +{ + upslogx(LOG_INFO, "Shutting down UPS immediately."); + + ser_send_pace(upsfd, SEND_PACE, "C%c", ENDCHAR); + ser_send_pace(upsfd, SEND_PACE, "S00R0001%c", ENDCHAR); +} + + +int instcmd(const char *cmdname, const char *extra) +{ + if (strcasecmp(cmdname, "test.battery.start") == 0) { + ser_send_pace(upsfd, SEND_PACE, "C%c", ENDCHAR); + ser_send_pace(upsfd, SEND_PACE, "T%c", ENDCHAR); + + upslogx(LOG_INFO, "Start battery test for 10 seconds."); + + return STAT_INSTCMD_HANDLED; + } + + if (strcasecmp(cmdname, "shutdown.return") == 0) { + ser_send_pace(upsfd, SEND_PACE, "C%c", ENDCHAR); + ser_send_pace(upsfd, SEND_PACE, "S%02dR%04d%c", shutdown_delay, start_delay, ENDCHAR); + + upslogx(LOG_INFO, "Shutdown (return) initiated."); + + return STAT_INSTCMD_HANDLED; + } + + if (strcasecmp(cmdname, "shutdown.stayoff") == 0) { + ser_send_pace(upsfd, SEND_PACE, "C%c", ENDCHAR); + ser_send_pace(upsfd, SEND_PACE, "S%02dR0000%c", shutdown_delay, ENDCHAR); + + upslogx(LOG_INFO, "Shutdown (stayoff) initiated."); + + return STAT_INSTCMD_HANDLED; + } + + if (strcasecmp(cmdname, "shutdown.stop") == 0) { + ser_send_pace(upsfd, SEND_PACE, "C%c", ENDCHAR); + + upslogx(LOG_INFO, "Shutdown canceled."); + + return STAT_INSTCMD_HANDLED; + } + + if (strcasecmp(cmdname, "load.on") == 0) { + ser_send_pace(upsfd, SEND_PACE, "C%c", ENDCHAR); + + upslogx(LOG_INFO, "Turning load on."); + + return STAT_INSTCMD_HANDLED; + } + + if (strcasecmp(cmdname, "load.off") == 0) { + ser_send_pace(upsfd, SEND_PACE, "C%c", ENDCHAR); + ser_send_pace(upsfd, SEND_PACE, "S00R0000%c", ENDCHAR); + + upslogx(LOG_INFO, "Turning load off."); + + return STAT_INSTCMD_HANDLED; + } + + if (strcasecmp(cmdname, "reset.input.minmax") == 0) { + ivolt_min = INT_MAX; + ivolt_max = -1; + + dstate_setinfo("input.voltage.minimum", "%.1f", ivolt_min); + dstate_setinfo("input.voltage.maximum", "%.1f", ivolt_max); + + upslogx(LOG_INFO, "Resetting minimum and maximum input voltage values."); + + return STAT_INSTCMD_HANDLED; + } + + upslogx(LOG_NOTICE, "instcmd: unknown command [%s]", cmdname); + + return STAT_INSTCMD_UNKNOWN; +} + + +int setvar(const char *varname, const char *val) +{ + int delay; + + if (sscanf(val, "%d", &delay) != 1) { + return STAT_SET_UNKNOWN; + } + + if (strcasecmp(varname, "ups.delay.start") == 0) { + delay = CLAMP(delay, 0, MAX_START_DELAY); + start_delay = delay; + dstate_setinfo( "ups.delay.start", "%d", delay); + + dstate_dataok(); + + return STAT_SET_HANDLED; + } + + if (strcasecmp(varname, "ups.delay.shutdown") == 0) { + delay = CLAMP(delay, 0, MAX_SHUTDOWN_DELAY); + shutdown_delay = delay; + dstate_setinfo( "ups.delay.shutdown", "%d", delay); + + dstate_dataok(); + + return STAT_SET_HANDLED; + } + + return STAT_SET_UNKNOWN; +} + + +void upsdrv_help(void) +{ +} + + +void upsdrv_makevartable(void) +{ +} + + +void upsdrv_banner(void) +{ + printf("Network UPS Tools - Mustek PowerMust UPS driver %s (%s)\n", DRV_VERSION, UPS_VERSION); + printf("Carlos Rodrigues (c) 2003, 2004\n\n"); +} + + +void upsdrv_initups(void) +{ + int i; + int success = 0; + FirmwareValues values; + + upsfd = ser_open(device_path); + ser_set_speed(upsfd, device_path, B2400); + + for (i = 0; i < IDENT_MAXTRIES; i++) { + if (check_ups() == 0) { + success++; + } + } + + if (success < IDENT_MINSUCCESS) { + fatalx("Mustek PowerMust UPS not detected."); + } + upslogx(LOG_INFO, "Mustek PowerMust UPS detected."); + + if (get_firmware_values(&values) < 0) { + fatalx("Error reading firmware values from UPS!"); + } + + if (values.battvolt == 12) { + battvolt_min = BATT_VOLT_MIN_12; + battvolt_max = BATT_VOLT_MAX_12; + } else { /* 24V battery */ + battvolt_min = BATT_VOLT_MIN_24; + battvolt_max = BATT_VOLT_MAX_24; + } + + dstate_setinfo("output.voltage.target.battery", "%.1f", values.volt); + dstate_setinfo("battery.voltage.nominal", "%.1f", values.battvolt); + + dstate_setinfo("ups.delay.start", "%d", start_delay); + dstate_setflags("ups.delay.start", ST_FLAG_RW | ST_FLAG_STRING); + dstate_setaux("ups.delay.start", start_delay); + + dstate_setinfo("ups.delay.shutdown", "%d", shutdown_delay); + dstate_setflags("ups.delay.shutdown", ST_FLAG_RW | ST_FLAG_STRING); + dstate_setaux("ups.delay.shutdown", shutdown_delay); +} + + +void upsdrv_cleanup(void) +{ + ser_close(upsfd, device_path); +} + + +/* EOF - powermust.c */ diff -ruN nut-2.0.0.orig/man/Makefile.in nut-2.0.0/man/Makefile.in --- nut-2.0.0.orig/man/Makefile.in 2004-05-14 01:07:48.000000000 +0100 +++ nut-2.0.0/man/Makefile.in 2004-05-14 01:48:27.000000000 +0100 @@ -41,7 +41,8 @@ snmp-ups.8 \ tripplite.8 \ tripplitesu.8 \ - victronups.8 + victronups.8 \ + powermust.8 SNMPPAGES = snmp-ups.8 diff -ruN nut-2.0.0.orig/man/powermust.8 nut-2.0.0/man/powermust.8 --- nut-2.0.0.orig/man/powermust.8 1970-01-01 01:00:00.000000000 +0100 +++ nut-2.0.0/man/powermust.8 2004-05-14 01:56:12.000000000 +0100 @@ -0,0 +1,72 @@ +.TH POWERMUST 8 "Fri May 14 2004" "" "Network UPS Tools (NUT)" +.SH NAME +powermust \- Driver for Mustek PowerMust series UPS equipment +.SH NOTE +This man page only documents the hardware-specific features of the +powermust driver. For information about the core driver, see +\fBnutupsdrv\fR(8). + +.SH SUPPORTED HARDWARE +The powermust driver is known to work with the following UPSes: + + Mustek PowerMust 400VA Plus (12V) + Mustek PowerMust 600VA Plus (12V) + Mustek PowerMust 800VA Pro (12V) + Mustek PowerMust 1000VA Plus (24V) + OnLite AQUA 50 (12V) + +It may also work with other UPSes in the PowerMust series, but they +haven't been tested. + +.SH EXTRA ARGUMENTS + +This driver does not support any extra settings in the +\fBups.conf\fR(5). + +.SH UPS COMMANDS + +This driver supports some extra commands (see \fBupscmd\fR(8)): + +.IP shutdown.return +Turn off the load and return when power is back + +.IP shutdown.stayoff +Turn off the load and remain off + +.IP shutdown.stop +Stop a shutdown in progress + +.IP load.on +Turn on the load immediately + +.IP load.off +Turn off the load immediately + +.IP reset.input.minmax +Reset minimum and maximum input voltage status + +.SH USER VARIABLES + +The behavior of the driver can be controlled by some user definable +variables (see \fBupsrw\fR(8)): + +.IP ups.delay.shutdown +Interval to wait after shutdown with delay command (seconds) + +.IP ups.delay.start +Interval to wait before (re)starting the load (seconds) + +.SH BUGS + +No known bugs at the moment. + +.SH AUTHOR +Carlos Rodrigues + +.SH SEE ALSO + +.SS The core driver: +\fBnutupsdrv\fR(8) + +.SS Internet resources: +The NUT (Network UPS Tools) home page: http://www.networkupstools.org/ diff -ruN nut-2.0.0.orig/README nut-2.0.0/README --- nut-2.0.0.orig/README 2004-05-14 01:07:48.000000000 +0100 +++ nut-2.0.0/README 2004-05-14 02:02:09.000000000 +0100 @@ -305,6 +305,8 @@ victronups - IMV/Victron hardware + powermust - Mustek Powermust (and OnLite 50) units + For another take on this list, try the web page: http://random.networkupstools.org/compat/