Merge branch 'to_ver_030' into touch_events

Author: eigen-value

arduino_alvik/__init__.py

@@ -0,0 +1 @@
+from .arduino_alvik import *

arduino_alvik.py renamed to arduino_alvik/arduino_alvik.py

@@ -1,18 +1,17 @@
 import sys
 import gc
 import struct
-
 from machine import I2C
-from uart import uart
 import _thread
 from time import sleep_ms
 
 from ucPack import ucPack
 
-from conversions import *
-from pinout_definitions import *
-from robot_definitions import *
-from constants import *
+from .uart import uart
+from .conversions import *
+from .pinout_definitions import *
+from .robot_definitions import *
+from .constants import *
 
 
 class ArduinoAlvik:

constants.py renamed to arduino_alvik/constants.py

@@ -16,19 +16,15 @@ if /i "%1"=="-h" (
 )
 
 :install
-python -m mpremote %port_string% fs rm :arduino_alvik.py
-python -m mpremote %port_string% fs rm :constants.py
-python -m mpremote %port_string% fs rm :conversions.py
-python -m mpremote %port_string% fs rm :pinout_definitions.py
-python -m mpremote %port_string% fs rm :robot_definitions.py
-python -m mpremote %port_string% fs rm :uart.py
 
-python -m mpremote %port_string% fs cp arduino_alvik.py :arduino_alvik.py
-python -m mpremote %port_string% fs cp constants.py :constants.py
-python -m mpremote %port_string% fs cp conversions.py :conversions.py
-python -m mpremote %port_string% fs cp pinout_definitions.py :pinout_definitions.py
-python -m mpremote %port_string% fs cp robot_definitions.py :robot_definitions.py
-python -m mpremote %port_string% fs cp uart.py :uart.py
+python -m mpremote %port_string% fs mkdir lib/arduino_alvik
+python -m mpremote %port_string% fs cp arduino_alvik/__init__.py :lib/arduino_alvik/__init__.py
+python -m mpremote %port_string% fs cp arduino_alvik/arduino_alvik.py :lib/arduino_alvik/arduino_alvik.py
+python -m mpremote %port_string% fs cp arduino_alvik/constants.py :lib/arduino_alvik/constants.py
+python -m mpremote %port_string% fs cp arduino_alvik/conversions.py :lib/arduino_alvik/conversions.py
+python -m mpremote %port_string% fs cp arduino_alvik/pinout_definitions.py :lib/arduino_alvik/pinout_definitions.py
+python -m mpremote %port_string% fs cp arduino_alvik/robot_definitions.py :lib/arduino_alvik/robot_definitions.py
+python -m mpremote %port_string% fs cp arduino_alvik/uart.py :lib/arduino_alvik/uart.py
 
 echo Installing dependencies
 python -m mpremote %port_string% mip install github:arduino/ucPack-mpy

conversions.py renamed to arduino_alvik/conversions.py

@@ -42,19 +42,14 @@ fi
 # Uncomment the following line on windows machines
 # python_command="python"
 
-$python_command -m mpremote $connect_string fs rm :arduino_alvik.py
-$python_command -m mpremote $connect_string fs rm :constants.py
-$python_command -m mpremote $connect_string fs rm :conversions.py
-$python_command -m mpremote $connect_string fs rm :pinout_definitions.py
-$python_command -m mpremote $connect_string fs rm :robot_definitions.py
-$python_command -m mpremote $connect_string fs rm :uart.py
-
-$python_command -m mpremote $connect_string fs cp arduino_alvik.py :arduino_alvik.py
-$python_command -m mpremote $connect_string fs cp constants.py :constants.py
-$python_command -m mpremote $connect_string fs cp conversions.py :conversions.py
-$python_command -m mpremote $connect_string fs cp pinout_definitions.py :pinout_definitions.py
-$python_command -m mpremote $connect_string fs cp robot_definitions.py :robot_definitions.py
-$python_command -m mpremote $connect_string fs cp uart.py :uart.py
+$python_command -m mpremote $connect_string fs mkdir lib/arduino_alvik
+$python_command -m mpremote $connect_string fs cp arduino_alvik/__init__.py :lib/arduino_alvik/__init__.py
+$python_command -m mpremote $connect_string fs cp arduino_alvik/arduino_alvik.py :lib/arduino_alvik/arduino_alvik.py
+$python_command -m mpremote $connect_string fs cp arduino_alvik/constants.py :lib/arduino_alvik/constants.py
+$python_command -m mpremote $connect_string fs cp arduino_alvik/conversions.py :lib/arduino_alvik/conversions.py
+$python_command -m mpremote $connect_string fs cp arduino_alvik/pinout_definitions.py :lib/arduino_alvik/pinout_definitions.py
+$python_command -m mpremote $connect_string fs cp arduino_alvik/robot_definitions.py :lib/arduino_alvik/robot_definitions.py
+$python_command -m mpremote $connect_string fs cp arduino_alvik/uart.py :lib/arduino_alvik/uart.py
 
 echo "Installing dependencies"
 $python_command -m mpremote $connect_string mip install github:arduino/ucPack-mpy

pinout_definitions.py renamed to arduino_alvik/pinout_definitions.py

@@ -1,7 +1,15 @@
 {
     "urls": [
+        ["arduino_alvik/__init__.py", "github:arduino/arduino_alvik/arduino_alvik/__init__.py"],
+        ["arduino_alvik/arduino_alvik.py", "github:arduino/arduino_alvik/arduino_alvik/arduino_alvik.py"],
+        ["arduino_alvik/constants.py", "github:arduino/arduino_alvik/arduino_alvik/constants.py"],
+        ["arduino_alvik/conversions.py", "github:arduino/arduino_alvik/arduino_alvik/conversions.py"],
+        ["arduino_alvik/pinout_definitions.py", "github:arduino/arduino_alvik/arduino_alvik/pinout_definitions.py"],
+        ["arduino_alvik/robot_definitions.py", "github:arduino/arduino_alvik/arduino_alvik/robot_definitions.py"],
+        ["arduino_alvik/uart.py", "github:arduino/arduino_alvik/arduino_alvik/uart.py"]
     ],
     "deps": [
+        ["github:arduino/ucPack-mpy", "latest"]
     ],
-    "version": "0.2.0"
+    "version": "0.3.0"
 }