Merge pull request #313 from nuccleon/master

Issue #285
volkszaehler · May 4, 2017 · 0762a93 · 0762a93
2 parents ddc24a5 + 99c5a7e
commit 0762a93
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/etc/vzlogger_generic.schema.json b/etc/vzlogger_generic.schema.json
@@ -508,6 +508,11 @@
                             "enum": ["8n1", "7n1", "7e1", "7o1"],
                             "default": "8n1",
                             "description": "parity used for serial communication"
+                        },
+                        "use_local_time": {
+                            "type": "boolean",
+                            "default": false,
+                            "description": "use the local time for reading timestamp?"
                         }
                     },
                 "required": ["protocol", "device", "baudrate", "parity"]
@@ -545,6 +550,11 @@
                             "enum": ["8n1", "7n1", "7e1", "7o1"],
                             "default": "8n1",
                             "description": "parity used for serial communication"
+                        },
+                        "use_local_time": {
+                            "type": "boolean",
+                            "default": false,
+                            "description": "use the local time for reading timestamp?"
                         }
                     },
                 "required": ["protocol", "host", "baudrate", "parity"]

diff --git a/include/protocols/MeterSML.hpp b/include/protocols/MeterSML.hpp
@@ -61,7 +61,8 @@ class MeterSML : public vz::protocol::Protocol {
 	speed_t _baudrate;
 	parity_type_t _parity;
 	std::string _pull;
-
+	bool _use_local_time;
+
 	int _fd;	/* file descriptor of port */
 	struct termios _old_tio;	/* required to reset port */
 

diff --git a/src/protocols/MeterSML.cpp b/src/protocols/MeterSML.cpp
@@ -93,7 +93,13 @@ MeterSML::MeterSML(std::list<Option> options)
 		/* using default value if not specified */
 		_pull = "";
 	}
-
+	try {
+		_use_local_time = optlist.lookup_bool(options, "use_local_time");
+	}
+	catch (vz::OptionNotFoundException &e) {
+		/* using default value if not specified */
+		_use_local_time = false;
+	}
 
 	/* baudrate */
 	int baudrate = 9600; /* default to avoid compiler warning */
@@ -265,7 +271,7 @@ bool MeterSML::_parse(sml_list *entry, Reading *rd) {
 
 		// TODO handle SML_TIME_SEC_INDEX or time by SML File/Message
 		struct timeval tv;
-		if (entry->val_time) { /* use time from meter */
+		if (!_use_local_time && entry->val_time) { /* use time from meter */
 			tv.tv_sec = *entry->val_time->data.timestamp;
 			tv.tv_usec = 0;
 		}