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

Imported Upstream version 2.7.3

Browse source
This commit is contained in:
Arnaud Quette 2015-04-30 15:53:36 +02:00
parent a356b56d11
commit fd413a3168
283 changed files with 14978 additions and 6511 deletions
Download patch file Download diff file Expand all files Collapse all files

48
drivers/openups-hid.c
View file

@ -26,17 +26,53 @@
#include "main.h" /* for getval() */
#include "usb-common.h"
#define OPENUPS_HID_VERSION "openUPS HID 0.1"
#define OPENUPS_HID_VERSION "openUPS HID 0.4"
/* Minibox */
#define OPENUPS_VENDORID 0x04d8
/* constants for converting HID read values to real values */
static const double vin_scale_d004 = 0.03545 * 100;
static const double vout_scale_d004 = 0.02571 * 100;
/* static const double vbat_scale = 0.00857 * 100; */
static const double ccharge_scale_d004 = 0.8274 / 10;
static const double cdischarge_scale_d004 = 16.113 / 10;
static double vin_scale = 1;
static double vout_scale= 1;
static double ccharge_scale = 1;
static double cdischarge_scale = 1;
static char openups_scratch_buf[20];
static void *get_voltage_multiplier(USBDevice_t *device)
{
switch(device->ProductID) {
case 0xd004:
vin_scale = vin_scale_d004;
vout_scale= vout_scale_d004;
ccharge_scale= ccharge_scale_d004;
cdischarge_scale= cdischarge_scale_d004;
break;
case 0xd005:
vin_scale = 0.1;
vout_scale = 0.1;
ccharge_scale = 0.1; /* unverified */
cdischarge_scale = 0.1; /* unverified */
break;
}
upsdebugx(1, "vin_scale = %g; vout_scale = %g\n", vin_scale, vout_scale);
return NULL;
}
/* USB IDs device table */
static usb_device_id_t openups_usb_device_table[] = {
static /* const */ usb_device_id_t openups_usb_device_table[] = {
/* openUPS Intelligent UPS (minimum required firmware 1.4) */
{USB_DEVICE(OPENUPS_VENDORID, 0xd004), NULL},
{USB_DEVICE(OPENUPS_VENDORID, 0xd004), get_voltage_multiplier},
{USB_DEVICE(OPENUPS_VENDORID, 0xd005), get_voltage_multiplier},
/* Terminating entry */
{-1, -1, NULL}
@ -45,7 +81,7 @@ static usb_device_id_t openups_usb_device_table[] = {
/* Thermistor table used for temperature lookups
* taken from the windows monitoring application
*/
static unsigned int therm_tbl[] =
static const unsigned int therm_tbl[] =
{
(unsigned int)0x31,
(unsigned int)0x40,
@ -83,7 +119,7 @@ static unsigned int therm_tbl[] =
(unsigned int)0x3CC
};
static unsigned int therm_tbl_size = sizeof(therm_tbl)/sizeof(therm_tbl[0]);
static const unsigned int therm_tbl_size = sizeof(therm_tbl)/sizeof(therm_tbl[0]);
static const char *openups_charging_fun(double value);
static const char *openups_discharging_fun(double value);
@ -225,7 +261,7 @@ static const char *openups_temperature_fun(double value)
unsigned int d1 = therm_tbl[pos];
unsigned int d2 = therm_tbl[pos + 1];
float temp = (float) (thermistor - d1) * (t2 - t1) / (d2 - d1) + t1;
double temp = (double) (thermistor - d1) * (t2 - t1) / (d2 - d1) + t1;
snprintf(openups_scratch_buf, sizeof(openups_scratch_buf), "%.2f", temp);
}
}