diff --git a/htdocs/lib/MessagePanel.js b/htdocs/lib/MessagePanel.js index ce69f969..d87c4ca1 100644 --- a/htdocs/lib/MessagePanel.js +++ b/htdocs/lib/MessagePanel.js @@ -571,14 +571,14 @@ DscMessagePanel.prototype.pushMessage = function(msg) { // Format timestamp var timestamp = msg.time? '' + msg.time + '' - : msg.timestamp? Utils.HHMMSS(new Date(msg.timestamp)) - : Utils.HHMMSS(new Date()); + : msg.timestamp? Utils.HHMMSS(new Date(msg.timestamp * 1000)) + : ''; // Format debugging data var symbols = ''; if (msg.data) { symbols = msg.data.replace( - /(.*)\|(.*)/, ' $1|$2 …' + /(.*)\|(.*)/, ' $1 | $2 …' ); } diff --git a/owrx/dsc.py b/owrx/dsc.py index 9ff4896e..09a6e149 100644 --- a/owrx/dsc.py +++ b/owrx/dsc.py @@ -26,8 +26,7 @@ class DscParser(TextParser): # Expect JSON data in text form out = json.loads(msg) # Add mode name, time stamp, frequency, and color to identify sender - out["mode"] = "DSC" - out["timestamp"] = self.getUtcTime() + out["mode"] = "DSC" if self.frequency != 0: out["frequency"] = self.frequency if "src" in out: