diff --git a/apps/ios/cleverrc/Info.plist b/apps/ios/cleverrc/Info.plist index 09e1c8a2..8a892ff2 100644 --- a/apps/ios/cleverrc/Info.plist +++ b/apps/ios/cleverrc/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString 1.0 CFBundleVersion - 3 + 5 LSRequiresIPhoneOS UILaunchStoryboardName diff --git a/apps/ios/cleverrc/ViewController.swift b/apps/ios/cleverrc/ViewController.swift index 46c67b76..b8fb8721 100644 --- a/apps/ios/cleverrc/ViewController.swift +++ b/apps/ios/cleverrc/ViewController.swift @@ -63,12 +63,12 @@ class ViewController: UIViewController, WKScriptMessageHandler { // Got notification message print(message) let m = message.body as! NSDictionary; - let level = m["level"] as! Int + let level = m["severity"] as! Int if level == 4 { - let banner = NotificationBanner(title: m["msg"] as! String, style: .warning) + let banner = NotificationBanner(title: m["text"] as! String, style: .warning) banner.show() } else { - let banner = NotificationBanner(title: m["msg"] as! String, style: .danger) + let banner = NotificationBanner(title: m["text"] as! String, style: .danger) banner.show() } } diff --git a/apps/ios/cleverrc/telemetry.js b/apps/ios/cleverrc/telemetry.js index 6b35c585..41e04612 100644 --- a/apps/ios/cleverrc/telemetry.js +++ b/apps/ios/cleverrc/telemetry.js @@ -62,15 +62,15 @@ new ROSLIB.Topic({ new ROSLIB.Topic({ ros: ros, - name: '/rosout_agg', - messageType: 'rosgraph_msgs/Log' + name: '/mavros/statustext/recv', + messageType: 'mavros_msgs/StatusText' }).subscribe(function(message) { var BLACKLIST = ['CMD: ', 'PR: ', 'DROPPED', 'Clock skew detected', 'MANUAL CONTROL LOST']; - if (message.level >= 4) { + if (message.severity <= 4) { if (BLACKLIST.some(function(e) { - return message.msg.indexOf(e) != -1; + return message.text.indexOf(e) != -1; })) { - console.log('Filtered out message ' + message.msg); + console.log('Filtered out message ' + message.text); return; } callNativeApp('notification', message);