Version 0.5.0-dev.1.1

Cherry-pick 435ddbc to dev
Cherry-pick e483c95 to dev
Cherry-pick ae63c06 to dev
Cherry-pick 3695591 to dev
Cherry-pick 2004f8c to dev

Author: sgjesse

lib/dartino_embedded.platform

@@ -24,7 +24,6 @@ core: core/embedded_core.dart
 
 math: ../third_party/dart/sdk/lib/math/math.dart
 typed_data: ../third_party/dart/sdk/lib/typed_data/typed_data.dart
-developer: ../third_party/dart/sdk/lib/developer/developer.dart
 collection: ../third_party/dart/sdk/lib/collection/collection.dart
 
 _internal: ../third_party/dart/sdk/lib/internal/internal.dart

lib/dartino_mobile.platform

@@ -23,7 +23,6 @@ async: ../third_party/dart/sdk/lib/async/async.dart
 collection: ../third_party/dart/sdk/lib/collection/collection.dart
 convert: ../third_party/dart/sdk/lib/convert/convert.dart
 core: ../third_party/dart/sdk/lib/core/core.dart
-developer: ../third_party/dart/sdk/lib/developer/developer.dart
 math: ../third_party/dart/sdk/lib/math/math.dart
 typed_data: ../third_party/dart/sdk/lib/typed_data/typed_data.dart
 

pkg/dartino/lib/_embedder.yaml

@@ -14,6 +14,5 @@ embedded_libs:
   'dart:dartino._ffi': '../../../internal/dartino_lib/ffi/ffi_private.dart'
   'dart:dartino.os': '../../../lib/os/os.dart'
   'dart:dartino.service': '../../../lib/service/service.dart'
-  'dart:developer': '../../../third_party/dart/sdk/lib/developer/developer.dart'
   'dart:math': '../../../third_party/dart/sdk/lib/math/math.dart'
   'dart:typed_data': '../../../third_party/dart/sdk/lib/typed_data/typed_data.dart'

pkg/dartino_compiler/lib/src/verbs/debug_verb.dart

@@ -159,7 +159,7 @@ Future<int> serveDebuggerTask(
     SessionState state,
     Uri script,
     Uri base,
-    {Uri snapshotLocation}) {
+    {Uri snapshotLocation}) async {
   DartinoVmContext vmContext = state.vmContext;
   if (vmContext == null) {
     throwInternalError("Not connected to a dartino vm.");
@@ -169,11 +169,13 @@ Future<int> serveDebuggerTask(
     throwFatalError(DiagnosticKind.compileBeforeRun);
   }
 
+  int result = await new DebugServer()
+      .serveSingleShot(state, snapshotLocation: snapshotLocation);
+
   // Make sure current state's vmContext is not reused if invoked again.
   state.vmContext = null;
 
-  return new DebugServer()
-      .serveSingleShot(state, snapshotLocation: snapshotLocation);
+  return result;
 }
 
 Future<int> interactiveDebuggerTask(

pkg/dartino_compiler/lib/src/worker/developer.dart

@@ -261,11 +261,21 @@ Future<int> analyze(
     Uri base) async {
   Directory dartSdkDir = await locateDartSdkDirectory();
   String analyzerPath = join(dartSdkDir.path, 'bin', 'dartanalyzer');
+  Uri pkgsUri = state.settings.packages;
+
+  // If running within the repo, then use a different packages file
+  String relPath = 'pkg/dartino_compiler/lib/dartino_compiler.dart';
+  if (await new File.fromUri(pkgsUri.resolve(relPath)).exists()) {
+    pkgsUri = pkgsUri.resolve('pkg/dartino-sdk.packages');
+    if (!await new File.fromUri(pkgsUri).exists()) {
+      throwInternalError("Failed to find dartino-sdk.packages file");
+    }
+  }
 
   List<String> arguments = <String>[];
   arguments.add('--strong');
   arguments.add('--packages');
-  arguments.add(new File.fromUri(state.settings.packages).path);
+  arguments.add(new File.fromUri(pkgsUri).path);
   arguments.add(new File.fromUri(fileUri).path);
 
   state.log('Analyze: $analyzerPath ${arguments.join(' ')}');
@@ -1377,24 +1387,21 @@ Future<Device> readDevice(String deviceId) async {
     return parseDevice(jsonLikeData, uri, libraryDirectoryUri);
   } else {
     throw uri;
-    return null;
   }
 }
 
 Future<Directory> locateDartSdkDirectory() async {
   // In the SDK, the dart-sdk directory is in the internal directory.
-  Directory dartSdkDirectory =
-      new Directory.fromUri(executable.resolve(
-          '../internal/dart-sdk'));
-  if (!await dartSdkDirectory.exists()) {
-    // When running in a Git checkout...
-    dartSdkDirectory =
-        new Directory.fromUri(executable.resolve(
-                'dartino-sdk/internal/dart-sdk'));
-    assert(await dartSdkDirectory.exists());
-  }
-
-  return dartSdkDirectory;
+  Uri dartSdkUri = executable.resolve('../internal/dart-sdk');
+  Directory dartSdkDir = new Directory.fromUri(dartSdkUri);
+  if (await dartSdkDir.exists()) return dartSdkDir;
+
+  // In a Git checkout, the the dart-sdk directory is in third_party
+  String os = Platform.isMacOS ? 'mac' : Platform.operatingSystem;
+  dartSdkUri = executable.resolve('../../third_party/dart-sdk/$os/dart-sdk');
+  dartSdkDir = new Directory.fromUri(dartSdkUri);
+  assert(await dartSdkDir.exists());
+  return dartSdkDir;
 }
 
 // Creates a c-file containing the options options in an array.

pkg/gpio/lib/gpio.dart

@@ -4,13 +4,55 @@
 
 /// GPIO support providing access to controlling GPIO pins.
 ///
-/// Currently this has only been tested with a Raspberry Pi 2 and the
-/// STM32F746G-Discovery board.
+/// Currently this has been tested with the STM32F746G Discovery and
+/// STM32411RE Nucleo boards and on a Raspberry Pi 2.
 ///
-/// Access types
-/// ------------
-/// There are two ways of accessing the GPIO pins: direct access or
-/// access through a Sysfs driver.
+/// Usage on STM32F746G Discovery board
+/// -----------------------------------
+/// ```dart
+/// import 'dart:dartino';
+///
+/// import 'package:gpio/gpio.dart';
+/// import 'package:stm32/stm32f746g_disco.dart';
+///
+/// main() {
+///   // Initialize STM32F746G Discovery board and configure the pin.
+///   STM32F746GDiscovery board = new STM32F746GDiscovery();
+///   GpioOutputPin pin = board.gpio.initOutput(STM32F746GDiscovery.LED1);
+///
+///   // Toggle the pin every half second.
+///   while (true) {
+///     pin.toggle();
+///     sleep(500);
+///   }
+/// }
+/// ```
+///
+/// Usage on STM32411RE Nucleo board
+/// --------------------------------
+/// ```dart
+/// import 'dart:dartino';
+///
+/// import 'package:gpio/gpio.dart';
+/// import 'package:stm32/stm32f411re_nucleo.dart';
+///
+/// main() {
+///   // Initialize STM32411RE Nucleo board and configure the pin.
+///   STM32F411RENucleo board = new STM32F411RENucleo();
+///   GpioOutputPin pin = board.gpio.initOutput(STM32F411RENucleo.LED2);
+///
+///   // Toggle the pin every half second.
+///   while (true) {
+///     pin.toggle();
+///     sleep(500);
+///   }
+/// }
+/// ```
+///
+/// Usage on Raspberry Pi 2
+/// -----------------------
+/// On the Raspberry Pi 2 there are two ways of accessing the GPIO
+/// pins: direct access or access through a Sysfs driver.
 ///
 /// When direct access is used, the physical memory addresses, where the
 /// SoC registers for the GPIO pins are mapped, are accessed directly. If this
@@ -21,39 +63,27 @@
 /// by default. However this can be changed through udev rules, e.g. by
 /// adding a file to ` /etc/udev/rules.d`. In addition the Sysfs driver
 /// supports state change notifications.
-///
-/// Usage on Raspberry Pi 2
-/// -----------------------
 /// ```dart
+/// import 'dart:dartino';
+///
 /// import 'package:gpio/gpio.dart';
 /// import 'package:raspberry_pi/raspberry_pi.dart';
 ///
 /// main() {
-///   // Initialize Raspberry Pi and configure the pins.
+///   // Initialize Raspberry Pi and configure the pin.
 ///   RaspberryPi pi = new RaspberryPi();
 ///   Gpio gpio = pi.memoryMappedGPIO;
 ///   GpioOutputPin pin = gpio.initOutput(RaspberryPiPin.GPIO6);
 ///
-///   // Access pin.
-///   pin.state =  true;
-/// ```
-///
-/// Usage on STM32F746G Discovery board
-/// -----------------------------------
-/// ```dart
-/// import 'package:gpio/gpio.dart';
-/// import 'package:stm32/stm32f746g_disco.dart';
-///
-/// main() {
-///   // Initialize STM32F746G Discovery board and configure the pins.
-///   STM32F746GDiscovery board = new STM32F746GDiscovery();
-///   GpioOutputPin pin = board.gpio.initOutput(STM32F746GDiscovery.LED1);
-///
-///   // Access pin.
-///   pin.state =  true;
+///   // Toggle the pin every half second.
+///   while (true) {
+///     pin.toggle();
+///     sleep(500);
+///   }
+/// }
 /// ```
 ///
-/// See `samples/raspberry_pi/` and `samples/stm32f746g-discovery` for
+/// See `samples/raspberry_pi/` and `samples/stm32f746g-discovery`  and `samples/stm32f746g-discovery` for
 /// additional details.
 ///
 /// Reporting issues

pkg/nucleo_iks01a1/lib/nucleo_iks01a1.dart

@@ -9,6 +9,9 @@
 /// following example uses a STM32F764G Discovery board where the I2C
 /// bus on Arduino connector is I2C bus `1`, available as `i2c1`.
 ///
+/// Usage with STM32F746G Discovery board
+/// -------------------------------------
+/// ```dart
 /// import 'package:stm32/stm32f746g_disco.dart';
 /// import 'package:nucleo_iks01a1/nucleo_iks01a1.dart';
 ///
@@ -21,6 +24,7 @@
 ///   hts221.powerOn();
 ///   print('Temperature: ${hts221.readTemperature()}');
 /// }
+/// ```
 ///
 /// The library also contains the default I2C addresses of the sensors
 /// on the expansion board.

pkg/socket/lib/socket.dart

@@ -82,7 +82,6 @@ class Socket extends _SocketBase {
   }
 
   Socket._connect(String host, int port) {
-
     var address = sys.lookup(host);
     if (address == null) _error("Failed to lookup address '$host'");
     _fd = sys.socket(sys.AF_INET, sys.SOCK_STREAM, 0);
@@ -272,7 +271,15 @@ class Datagram {
 
 // TODO(karlklose): support IPv6 datagram sockets.
 class DatagramSocket extends _SocketBase {
-  DatagramSocket.bind(String host, int port) {
+  factory DatagramSocket.bind(String host, int port) {
+    if (Foreign.platform == Foreign.FREERTOS) {
+      return new stm32.DatagramSocket.bind(host, port);
+    } else {
+      return new DatagramSocket._bind(host, port);
+    }
+  }
+
+  DatagramSocket._bind(String host, int port) {
     InternetAddress address = sys.lookup(host);
     if (address == null) _error("Failed to lookup address '$host'");
     _fd = sys.socket(sys.AF_INET, sys.SOCK_DGRAM, 0);

pkg/stm32/lib/ethernet.dart

@@ -5,6 +5,7 @@
 library stm32.ethernet;
 
 import 'dart:dartino.ffi';
+import 'package:os/os.dart' as os show InternetAddress;
 
 final _initializeNetwork =
   ForeignLibrary.main.lookup("InitializeNetworkStack");
@@ -13,20 +14,22 @@ final _getEthernetAdapterStatus =
   ForeignLibrary.main.lookup("GetEthernetAdapterStatus");
 final _getNetworkAddressConfiguration =
   ForeignLibrary.main.lookup("GetNetworkAddressConfiguration");
-final _lookupHost = ForeignLibrary.main.lookup("LookupHost");
+final _lookupHost = ForeignLibrary.main.lookup("network_lookup_host");
 final _networkAddressMayHaveChanged = ForeignLibrary.main.lookup(
     "NetworkAddressMayHaveChanged");
 
 Ethernet ethernet = new Ethernet._internal();
 
 // TODO(karlklose): use the one in os.dart?
-class InternetAddress {
+class InternetAddress implements os.InternetAddress {
   final List<int> bytes;
 
   const InternetAddress(this.bytes);
 
   toString() => bytes.join('.');
 
+  bool get isIP4 => bytes.length == 4;
+
   static final InternetAddress localhost =
     const InternetAddress(const <int>[127, 0, 0, 1]);
 }
@@ -170,7 +173,7 @@ class _NetworkInterface implements NetworkInterface {
       case ETH_INTERFACE_INDEX:
         return (_getEthernetAdapterStatus.icall$0() & BMSR_LS_MASK) != 0;
       default:
-        throw new StateError('illegal adapted index: $index');
+        throw new StateError('illegal adapter index: $index');
     }
   }
 }