Make meta data option known

merbanan · Dec 5, 2018 · cd222b7 · cd222b7 · frief · Dec 6, 2018
1 parent 31a09e1
commit cd222b7
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -59,6 +59,7 @@ Usage:	= General options =
 	[-F] kv|json|csv|syslog|null Produce decoded output in given format. Not yet supported by all drivers.
 		 Append output to file with :<filename> (e.g. -F csv:log.csv), defaults to stdout.
 		 Specify host/port for syslog with e.g. -F syslog:127.0.0.1:1514
+	[-M level] Add metadata on modulation, frequency, RSSI, SNR, and noise to every output line.
 	[-K] FILE|PATH|<tag> Add an expanded token or fixed tag to every output line.
 	[-C] native|si|customary Convert units in decoded output.
 	[-T] Specify number of seconds to run
@@ -105,7 +106,7 @@ Supported device protocols:
     [36]  Efergy e2 classic
     [37]* Inovalley kw9015b, TFA Dostmann 30.3161 (Rain and temperature sensor)
     [38]  Generic temperature sensor 1
-    [39]  WG-PB12V1
+    [39]  WG-PB12V1 Temperature Sensor
     [40]  Acurite 592TXR Temp/Humidity, 5n1 Weather Station, 6045 Lightning
     [41]  Acurite 986 Refrigerator / Freezer Thermometer
     [42]  HIDEKI TS04 Temperature, Humidity, Wind and Rain Sensor
@@ -124,7 +125,7 @@ Supported device protocols:
     [55]  Acurite 606TX Temperature Sensor
     [56]  TFA pool temperature sensor
     [57]  Kedsum Temperature & Humidity Sensor
-    [58]  blyss DC5-UK-WH (433.92 MHz)
+    [58]  Blyss DC5-UK-WH
     [59]  Steelmate TPMS
     [60]  Schrader TPMS
     [61]* LightwaveRF

diff --git a/rtl_433.example.conf b/rtl_433.example.conf
@@ -116,8 +116,8 @@ include_only 0
 #out_block_size
 
 # as command line option:
-#   [-M] Report meta, add meta data to each event
-#report_meta
+#   [-M level] Add metadata on modulation, frequency, RSSI, SNR, and noise to every output line.
+#report_meta level
 
 # as command line option:
 #   [-y <code>] Verify decoding of demodulated test data (e.g. "{25}fb2dd58") with enabled devices

diff --git a/src/rtl_433.c b/src/rtl_433.c
@@ -186,6 +186,7 @@ static void usage(r_device *devices, unsigned num_devices, int exit_code)
             "\t[-F] kv|json|csv|syslog|null Produce decoded output in given format. Not yet supported by all drivers.\n"
             "\t\t Append output to file with :<filename> (e.g. -F csv:log.csv), defaults to stdout.\n"
             "\t\t Specify host/port for syslog with e.g. -F syslog:127.0.0.1:1514\n"
+            "\t[-M level] Add metadata on modulation, frequency, RSSI, SNR, and noise to every output line.\n"
             "\t[-K] FILE|PATH|<tag> Add an expanded token or fixed tag to every output line.\n"
             "\t[-C] native|si|customary Convert units in decoded output.\n"
             "\t[-T] Specify number of seconds to run\n"
@@ -1167,7 +1168,10 @@ static void parse_conf_option(struct app_cfg *cfg, int opt, char *arg)
         usage(NULL, 0, 1);
         break;
     case 'M':
-        cfg->report_meta = atobv(arg, 1);
+        if (strcasecmp(arg, "level") == 0)
+            cfg->report_meta = 1;
+        else
+            cfg->report_meta = atobv(arg, 1);
         break;
     case 'D':
         if (!arg)