commit c773147389f0fe416a73df415451f523caffd121
author Chase Latta <chaselatta@google.com> Mon Apr 15 23:04:52 2019 +0000
committer CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Mon Apr 15 23:04:52 2019 +0000
tree a7d4fddf35c7bcd79dbeb488cc9661a2cf99e0da
parent ca83f61dc43cc2bc0dda1d2a6d47e088667d42e7

[system_dashboard] move to fidl_async

Change-Id: I92810fe16248cd80add73857a6e63b2f5e7dedfb

bin/system_dashboard/BUILD.gn

diff --git a/bin/system_dashboard/BUILD.gn b/bin/system_dashboard/BUILD.gn
index e33f25a..c56c101 100644
--- a/bin/system_dashboard/BUILD.gn
+++ b/bin/system_dashboard/BUILD.gn
@@ -22,7 +22,6 @@
     "//sdk/fidl/fuchsia.scpi",
     "//third_party/dart-pkg/pub/flutter_staggered_grid_view",
     "//topaz/public/dart/widgets:lib.widgets",
-    "//topaz/public/lib/app/dart",
-    "//topaz/public/lib/schemas/dart",
+    "//topaz/public/dart/fuchsia_services",
   ]
 }

bin/system_dashboard/lib/src/system_info_model.dart

diff --git a/bin/system_dashboard/lib/src/system_info_model.dart b/bin/system_dashboard/lib/src/system_info_model.dart
index bc724f2..9423ca7 100644
--- a/bin/system_dashboard/lib/src/system_info_model.dart
+++ b/bin/system_dashboard/lib/src/system_info_model.dart
@@ -4,8 +4,8 @@
 
 import 'dart:async';
 import 'package:lib.widgets/model.dart';
-import 'package:fidl_fuchsia_scpi/fidl.dart' as scpi;
-import 'package:lib.app.dart/app.dart';
+import 'package:fidl_fuchsia_scpi/fidl_async.dart' as scpi;
+import 'package:fuchsia_services/services.dart';
 
 export 'package:lib.widgets/model.dart'
     show ScopedModel, Model, ScopedModelDescendant;
@@ -25,20 +25,22 @@
 
   static const Duration _systemInformationUpdatePeriod = Duration(seconds: 4);
 
-  final scpi.SystemControllerProxy _systemControllerProxy = scpi.SystemControllerProxy();
+  final scpi.SystemControllerProxy _systemControllerProxy =
+      scpi.SystemControllerProxy();
 
   SystemInfoModel() {
-    StartupContext startupContext = StartupContext.fromStartupInfo();
-    connectToService(startupContext.environmentServices, _systemControllerProxy.ctrl);
+    StartupContext.fromStartupInfo()
+        .incoming
+        .connectToService(_systemControllerProxy);
 
     int powerDomain = 0;
-    _systemControllerProxy.getDvfsInfo(powerDomain, (scpi.Status status, List<scpi.DvfsOpp> opps) {
-      _bigClusterOpps = opps;
+    _systemControllerProxy.getDvfsInfo(powerDomain).then((result) {
+      _bigClusterOpps = result.opps;
     });
 
     powerDomain = 1;
-    _systemControllerProxy.getDvfsInfo(powerDomain, (scpi.Status status, List<scpi.DvfsOpp> opps) {
-      _smallClusterOpps = opps;
+    _systemControllerProxy.getDvfsInfo(powerDomain).then((result) {
+      _smallClusterOpps = result.opps;
     });
 
     _updateSysInformation();
@@ -62,21 +64,22 @@
   }
 
   void _updateSysInformation() {
-    _systemControllerProxy.getSystemStatus((scpi.Status status, scpi.SystemStatus systemStatus) {
+    _systemControllerProxy.getSystemStatus().then((result) {
+      final systemStatus = result.sysStatus;
       _temperature = systemStatus.temperature;
       _fanLevel = systemStatus.fanLevel;
       _bigClusterFrequency =
-        (_bigClusterOpps[systemStatus.bigClusterOpIndex].freqHz)/1000000000;
+          (_bigClusterOpps[systemStatus.bigClusterOpIndex].freqHz) / 1000000000;
       _littleClusterFrequency =
-        (_smallClusterOpps[systemStatus.smallClusterOpIndex].freqHz)/1000000000;
+          (_smallClusterOpps[systemStatus.smallClusterOpIndex].freqHz) /
+              1000000000;
       _bigClusterVoltage =
-        (_bigClusterOpps[systemStatus.bigClusterOpIndex].voltMv)/1000;
+          (_bigClusterOpps[systemStatus.bigClusterOpIndex].voltMv) / 1000;
       _littleClusterVoltage =
-        (_smallClusterOpps[systemStatus.smallClusterOpIndex].voltMv)/1000;
+          (_smallClusterOpps[systemStatus.smallClusterOpIndex].voltMv) / 1000;
       _cpuUtilization = systemStatus.cpuUtilization;
       _memoryUtilization = systemStatus.memoryUtilization;
       _update();
     });
   }
-
 }