===================================================================
RCS file: /cvs/nagios/check_hw_sensors/check_hw_sensors,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- nagios/check_hw_sensors/check_hw_sensors	2009/11/24 17:54:54	1.42
+++ nagios/check_hw_sensors/check_hw_sensors	2010/04/27 19:43:40	1.43
@@ -17,7 +17,7 @@
 
 my $NAGIOS_OUTPUT = 1;
 
-our $VERSION = q{$Revision: 1.42 $}; $VERSION =~ s/^\D+([\d\.]+)\D+$/v$1/xms;
+our $VERSION = q{$Revision: 1.43 $}; $VERSION =~ s/^\D+([\d\.]+)\D+$/v$1/xms;
 
 my $LICENSE = <<'EOL';
 Copyright (c) 2009 Andrew Fresh <andrew@afresh1.com>
@@ -128,7 +128,7 @@
         regex => qr/\sraw$/xms,
     },
     {   type  => 'percent',
-        regex => qr/\s\%$/xms,
+        regex => qr/\d\%$/xms,
     },
     {   type  => 'lux',
         regex => qr/\slx$/xms,
@@ -139,6 +139,16 @@
     {   type  => 'timedelta',
         regex => qr/\ssecs$/xms,
     },
+    # These below are newer than TYPE_MAP is ever used, so really, useless
+    {   type  => 'humidity',
+        regex => qr/\d\%$/xms,
+    },
+    {   type  => 'frequency',
+        regex => qr/\s Hz$/xms,
+    },
+    {   type  => 'angle',
+        regex => qr/\s degrees$/xms,
+    },
 );
 
 my $CHECK_SENSOR = $BASE;
@@ -385,6 +395,7 @@
         amps watthour amphour
         integer raw percent
         lux temp timedelta
+        humidity frequency angle
         )
         )
     {