summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sbin/sysctl/sysctl.c7
-rw-r--r--share/snmp/OPENBSD-SENSORS-MIB.txt10
-rw-r--r--sys/sys/sensors.h4
-rw-r--r--usr.bin/systat/sensors.c7
-rw-r--r--usr.sbin/sensorsd/sensorsd.c10
-rw-r--r--usr.sbin/snmpd/mib.c7
6 files changed, 31 insertions, 14 deletions
diff --git a/sbin/sysctl/sysctl.c b/sbin/sysctl/sysctl.c
index 6e0e680032a..8bd235d9226 100644
--- a/sbin/sysctl/sysctl.c
+++ b/sbin/sysctl/sysctl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sysctl.c,v 1.238 2018/11/06 07:55:08 otto Exp $ */
+/* $OpenBSD: sysctl.c,v 1.239 2018/12/10 13:35:54 landry Exp $ */
/* $NetBSD: sysctl.c,v 1.9 1995/09/30 07:12:50 thorpej Exp $ */
/*
@@ -2654,7 +2654,7 @@ print_sensor(struct sensor *s)
printf("%3.4f degrees", s->value / 1000000.0);
break;
case SENSOR_DISTANCE:
- printf("%.2f mm", s->value / 1000.0);
+ printf("%.3f m", s->value / 1000000.0);
break;
case SENSOR_PRESSURE:
printf("%.2f Pa", s->value / 1000.0);
@@ -2662,6 +2662,9 @@ print_sensor(struct sensor *s)
case SENSOR_ACCEL:
printf("%2.4f m/s^2", s->value / 1000000.0);
break;
+ case SENSOR_VELOCITY:
+ printf("%4.3f m/s", s->value / 1000000.0);
+ break;
default:
printf("unknown");
}
diff --git a/share/snmp/OPENBSD-SENSORS-MIB.txt b/share/snmp/OPENBSD-SENSORS-MIB.txt
index b631c9431d1..2faed474e7e 100644
--- a/share/snmp/OPENBSD-SENSORS-MIB.txt
+++ b/share/snmp/OPENBSD-SENSORS-MIB.txt
@@ -1,4 +1,4 @@
--- $OpenBSD: OPENBSD-SENSORS-MIB.txt,v 1.6 2016/09/02 12:17:33 tb Exp $
+-- $OpenBSD: OPENBSD-SENSORS-MIB.txt,v 1.7 2018/12/10 13:35:54 landry Exp $
--
-- Copyright (c) 2006-2007 Joel Knight <knight.joel@gmail.com>
--
@@ -26,7 +26,7 @@ IMPORTS
FROM SNMPv2-CONF;
sensorsMIBObjects MODULE-IDENTITY
- LAST-UPDATED "201209200000Z"
+ LAST-UPDATED "201812100000Z"
ORGANIZATION "OpenBSD"
CONTACT-INFO
"Editor: Reyk Floeter
@@ -39,6 +39,9 @@ sensorsMIBObjects MODULE-IDENTITY
DESCRIPTION
"The MIB module for gathering information from
OpenBSD's kernel sensor framework."
+ REVISION "201812100000Z"
+ DESCRIPTION
+ "Add new sensor types."
REVISION "201209200000Z"
DESCRIPTION
"Add new sensor types."
@@ -136,7 +139,8 @@ sensorType OBJECT-TYPE
angle(17),
distance(18),
pressure(19),
- accel(20)
+ accel(20),
+ velocity(21)
}
MAX-ACCESS read-only
STATUS current
diff --git a/sys/sys/sensors.h b/sys/sys/sensors.h
index 0cb3b62d6d0..15725a6ef58 100644
--- a/sys/sys/sensors.h
+++ b/sys/sys/sensors.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sensors.h,v 1.35 2017/04/08 04:06:01 deraadt Exp $ */
+/* $OpenBSD: sensors.h,v 1.36 2018/12/10 13:35:54 landry Exp $ */
/*
* Copyright (c) 2003, 2004 Alexander Yurchenko <grange@openbsd.org>
@@ -52,6 +52,7 @@ enum sensor_type {
SENSOR_DISTANCE, /* distance (uMeter) */
SENSOR_PRESSURE, /* pressure (mPa) */
SENSOR_ACCEL, /* acceleration (u m/s^2) */
+ SENSOR_VELOCITY, /* velocity (u m/s) */
SENSOR_MAX_TYPES
};
@@ -78,6 +79,7 @@ static const char * const sensor_type_s[SENSOR_MAX_TYPES + 1] = {
"distance",
"pressure",
"acceleration",
+ "velocity",
"undefined"
};
#endif /* !_KERNEL */
diff --git a/usr.bin/systat/sensors.c b/usr.bin/systat/sensors.c
index 971a139562e..89b6628aedc 100644
--- a/usr.bin/systat/sensors.c
+++ b/usr.bin/systat/sensors.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sensors.c,v 1.30 2015/01/16 00:03:38 deraadt Exp $ */
+/* $OpenBSD: sensors.c,v 1.31 2018/12/10 13:35:54 landry Exp $ */
/*
* Copyright (c) 2007 Deanna Phillips <deanna@openbsd.org>
@@ -280,7 +280,7 @@ showsensor(struct sensinfo *s)
tbprintf("%3.4f degrees", s->sn_value / 1000000.0);
break;
case SENSOR_DISTANCE:
- tbprintf("%.2f mm", s->sn_value / 1000.0);
+ tbprintf("%.3f m", s->sn_value / 1000000.0);
break;
case SENSOR_PRESSURE:
tbprintf("%.2f Pa", s->sn_value / 1000.0);
@@ -288,6 +288,9 @@ showsensor(struct sensinfo *s)
case SENSOR_ACCEL:
tbprintf("%2.4f m/s^2", s->sn_value / 1000000.0);
break;
+ case SENSOR_VELOCITY:
+ tbprintf("%4.3f m/s", s->sn_value / 1000000.0);
+ break;
default:
tbprintf("%10lld", s->sn_value);
break;
diff --git a/usr.sbin/sensorsd/sensorsd.c b/usr.sbin/sensorsd/sensorsd.c
index fd6fb67728e..f122a7315a4 100644
--- a/usr.sbin/sensorsd/sensorsd.c
+++ b/usr.sbin/sensorsd/sensorsd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sensorsd.c,v 1.62 2018/10/22 16:20:09 deraadt Exp $ */
+/* $OpenBSD: sensorsd.c,v 1.63 2018/12/10 13:35:54 landry Exp $ */
/*
* Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
@@ -692,7 +692,7 @@ print_sensor(enum sensor_type type, int64_t value)
snprintf(fbuf, RFBUFSIZ, "%lld", value);
break;
case SENSOR_DISTANCE:
- snprintf(fbuf, RFBUFSIZ, "%.2f mm", value / 1000.0);
+ snprintf(fbuf, RFBUFSIZ, "%.3f m", value / 1000000.0);
break;
case SENSOR_PRESSURE:
snprintf(fbuf, RFBUFSIZ, "%.2f Pa", value / 1000.0);
@@ -700,6 +700,9 @@ print_sensor(enum sensor_type type, int64_t value)
case SENSOR_ACCEL:
snprintf(fbuf, RFBUFSIZ, "%2.4f m/s^2", value / 1000000.0);
break;
+ case SENSOR_VELOCITY:
+ snprintf(fbuf, RFBUFSIZ, "%4.3f m/s", value / 1000000.0);
+ break;
default:
snprintf(fbuf, RFBUFSIZ, "%lld ???", value);
}
@@ -813,13 +816,14 @@ get_val(char *buf, int upper, enum sensor_type type)
case SENSOR_LUX:
case SENSOR_FREQ:
case SENSOR_ACCEL:
+ case SENSOR_DISTANCE:
+ case SENSOR_VELOCITY:
rval = val * 1000 * 1000;
break;
case SENSOR_TIMEDELTA:
rval = val * 1000 * 1000 * 1000;
break;
case SENSOR_HUMIDITY:
- case SENSOR_DISTANCE:
case SENSOR_PRESSURE:
rval = val * 1000.0;
break;
diff --git a/usr.sbin/snmpd/mib.c b/usr.sbin/snmpd/mib.c
index 104b8a6b0f4..f30b6ed1726 100644
--- a/usr.sbin/snmpd/mib.c
+++ b/usr.sbin/snmpd/mib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mib.c,v 1.91 2018/08/31 05:20:36 jsg Exp $ */
+/* $OpenBSD: mib.c,v 1.92 2018/12/10 13:35:54 landry Exp $ */
/*
* Copyright (c) 2012 Joel Knight <joel@openbsd.org>
@@ -2658,7 +2658,7 @@ static const char * const sensor_drive_s[SENSOR_DRIVE_STATES] = {
static const char * const sensor_unit_s[SENSOR_MAX_TYPES + 1] = {
"degC", "RPM", "V DC", "V AC", "Ohm", "W", "A", "Wh", "Ah",
"", "", "%", "lx", "", "sec", "%RH", "Hz", "degree",
- "mm", "Pa", "m/s^2", ""
+ "m", "Pa", "m/s^2", "m/s", ""
};
const char *
@@ -2690,6 +2690,8 @@ mib_sensorvalue(struct sensor *s)
case SENSOR_LUX:
case SENSOR_FREQ:
case SENSOR_ACCEL:
+ case SENSOR_VELOCITY:
+ case SENSOR_DISTANCE:
ret = asprintf(&v, "%.2f", s->value / 1000000.0);
break;
case SENSOR_INDICATOR:
@@ -2699,7 +2701,6 @@ mib_sensorvalue(struct sensor *s)
case SENSOR_HUMIDITY:
ret = asprintf(&v, "%.2f", s->value / 1000.0);
break;
- case SENSOR_DISTANCE:
case SENSOR_PRESSURE:
ret = asprintf(&v, "%.2f", s->value / 1000.0);
break;
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.