From 1ee15ce3a54e401f290c83d76fd7edb607d88e4c Mon Sep 17 00:00:00 2001
From: Kevin Matz <kevin.matz@gmail.com>
Date: Mon, 5 Aug 2019 11:14:00 -0400
Subject: [PATCH] move robot module to firmware package directory

---
 ArmCtlListener.py             | 2 +-
 README.md                     | 4 ++--
 armCtl.py                     | 2 +-
 firmware/__init__.py          | 0
 robot.py => firmware/robot.py | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 create mode 100644 firmware/__init__.py
 rename robot.py => firmware/robot.py (100%)

diff --git a/ArmCtlListener.py b/ArmCtlListener.py
index 83afe30..205d489 100644
--- a/ArmCtlListener.py
+++ b/ArmCtlListener.py
@@ -18,7 +18,7 @@ __status__ = "Prototype"
 import logging
 from language.ArmControlParser import ArmControlParser
 from language.ArmControlListener import ArmControlListener
-from robot import Robot
+from firmware.robot import Robot
 from time import sleep
 
 logger = logging.getLogger('__main__')
diff --git a/README.md b/README.md
index a3300b7..be22405 100644
--- a/README.md
+++ b/README.md
@@ -12,9 +12,9 @@ Whilst an expansive scope, the principal development and implementation happened
   * firmware/armCtl/armCtl.ino
  1. A streaming serial command & control protocol to communicate with the Arduino from a computer.
  1. A Python3 module that is a threaded serial reader/writer, and state machine for the arm.
-  * robot.py
+  * firmware/robot.py
  1. An Antlr4 domain-specific scripting language for maneuvering the robot.
-  * ArmControl.g4
+  * language/ArmControl.g4
  1. A Python3 implementation of that language for the Robot module.
   * ArmCtlListener.py
  1. A Python3 module to interface the scripting language to the robot module.  When called directly, this module also provides an interactive shell for the scripting language.
diff --git a/armCtl.py b/armCtl.py
index a5f50c6..0416ad5 100755
--- a/armCtl.py
+++ b/armCtl.py
@@ -18,6 +18,7 @@ import configparser
 import logging
 import sys
 
+from firmware.robot import Robot
 from antlr4 import CommonTokenStream
 from antlr4 import InputStream
 from antlr4 import ParseTreeWalker
@@ -25,7 +26,6 @@ from antlr4.error.ErrorListener import ErrorListener
 from language.ArmControlLexer import ArmControlLexer
 from language.ArmControlParser import ArmControlParser
 from ArmCtlListener import ArmCtlListener
-from robot import Robot
 
 
 # define an error listener that raises SyntaxError exceptions
diff --git a/firmware/__init__.py b/firmware/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/robot.py b/firmware/robot.py
similarity index 100%
rename from robot.py
rename to firmware/robot.py