Merge pull request #5 from arduino/dev

Dev

Author: ubidefeo

README.md

@@ -3,6 +3,7 @@
 A module to simplify and help writing MicroPython programs using the setup()/loop() paradigm.
 
 ## Commands
+
 This module also wraps machine functions in easy-to-use methods
 
 ### pin_mode(PIN_NUMBER/ID, MODE)
@@ -31,7 +32,6 @@ digital_read('A3')
 
 return a value of `1` or `0` depending on the signal attached to the specified pins, for instance a button or a digital sensor.
 
-
 ### digital_write(PIN_NUMBER/ID, VALUE)
 
 Writes the digital value (`HIGH|LOW|True|False|1|0`) to the pin with Number or ID specified.
@@ -45,7 +45,6 @@ digital_write('A3', 0)
 
 Will set the pin to the specified value.
 
-
 ### analog_read(PIN_NUMBER/ID)
 
 Reads the analog value for the Voltage applied to the pinpin with Number or ID specified.
@@ -75,7 +74,7 @@ analog_write('A3', 64)
 Will generate a modulated signal on the specified Pin.
 Can be used to control small motors with low current needs as well as servo motors.
 
-#### IMPORTANT:
+#### IMPORTANT
 
 The numeric value for PIN_NUMBER is usually the processor's GPIO number, while values enclosed in quotes are "named pins" and are platform/implementation specific, not guaranteed to be valid.
 A `ValueError` exception with label "invalid pin" is thrown if the pin number or ID is not valid.
@@ -85,7 +84,6 @@ A `ValueError` exception with label "invalid pin" is thrown if the pin number or
 Will halt the execution of your program for the amount of _milliseconds_ specified in the parameter.
 It is to be considered a code-blocking command.
 
-
 ## Usage
 
 The structure of an Arduino MicroPython program will look as follows:
@@ -134,9 +132,11 @@ This brings the implemented runtime commands to the three described below
 Is run _once_ and should contain initialisation code.
 
 ### loop()
+
 Is run indefinitely until the program stops.
 
 ### cleanup()
+
 Is run _once_ when the program stops.
 It should contain code such as resetting the value of variables, stopping timers, causing threads to stop running.
 
@@ -161,6 +161,7 @@ start(setup, loop)
 ## Utilities
 
 Some utility methods are provided and are still in development:
+
 * `map(x, in_min, in_max, out_min, out_max)`
   will remap the value `x` from its input range to an output range
 * `mapi(x, in_min, in_max, out_min, out_max)`
@@ -187,4 +188,3 @@ create_sketch('main')
 
 If the destination `.py` file exists, a timestamp in _microseconds_ will be appended to the name.
 The method returns the Python file's full path.
-

arduino/arduino.py

@@ -129,10 +129,19 @@ def cleanup():
   print()
 
 
-def frame_counter(_arg):
+def frame_counter():
   global frame_count
   frame_count += 1
-  sleep_ms(1)
+  try:
+    sleep_ms(1)
+    return True
+  except (Exception, KeyboardInterrupt) as e:
+    if cleanup is not None:
+        cleanup()
+    if not isinstance(e, KeyboardInterrupt):
+      raise e
+    return False
+    
 
 # RUNTIME
 def start(setup=None, loop=None, cleanup = None, preload = None):
@@ -144,10 +153,11 @@ def start(setup=None, loop=None, cleanup = None, preload = None):
     try:
       if loop is not None:
         loop()
-      ticks_st = ticks_us()
-      while True:
-        if ticks_us() - ticks_st > 1000:
+      if not frame_counter():
+        if cleanup is not None:
+          cleanup()
           break
+      
     except (Exception, KeyboardInterrupt) as e:
       if cleanup is not None:
         cleanup()

install.sh

@@ -1,15 +1,19 @@
 #!/bin/bash
 #
-# Install mrequests to a MicroPython board using mpremote
+# Install Arduino Runtime to a MicroPython board using mpremote.
+# This script accepts an optional argument to compile .py files to .mpy.
+# Simply run the script with the optional argument:
+#
+# ./install.sh mpy
 
-MODULES=('__init__.py' 'amp_fields.py' 'arduino_utils.py' 'common.py' 'network_utils.py')
 
-SRCDIR="arduino"
-LIBDIR="lib"
 PKGDIR="arduino"
+SRCDIR=$PKGDIR
+LIBDIR="lib"
 
-# Create the root lib folder
-# Will generate an error in the output if it already exists
+# File system operations such as "mpremote mkdir" or "mpremote rm"
+# will generate an error if the folder exists or if the file does not exist.
+# These errors can be ignored.
 # 
 # Traceback (most recent call last):
 #   File "<stdin>", line 2, in <module>