Merge pull request #4 from project-capo/feature_location

Add client for location mechanism

protoc.sh

@@ -3,10 +3,10 @@
 set -x
 
 export ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-export AMBER_DIR=${ROOT_DIR}/src/amber
+export AMBER_DIR=${ROOT_DIR}/src/amber/client
 export COMMON_DIR=${AMBER_DIR}/common
 
 protoc -I ${COMMON_DIR} --python_out=${COMMON_DIR} ${COMMON_DIR}/drivermsg.proto
-for pp in hokuyo ninedof roboclaw dummy; do
+for pp in hokuyo location ninedof roboclaw dummy; do
     protoc -I ${COMMON_DIR} -I ${AMBER_DIR}/${pp} --python_out=${AMBER_DIR}/${pp} ${AMBER_DIR}/${pp}/${pp}.proto
 done

repair.sh

@@ -2,4 +2,4 @@
 
 export __dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-find ${__dir} -name *pb2.py -exec sed -i 's/^import drivermsg_pb2/from amber.common import drivermsg_pb2/g' {} \;
+find ${__dir} -name *pb2.py -exec sed -i 's/^import drivermsg_pb2/from amber.client.common import drivermsg_pb2/g' {} \;

setup.py

@@ -12,37 +12,44 @@
 
 setup(
     name='amber-python-clients',
-    packages=['amber', 'amber.common', 'amber.dummy', 'amber.hokuyo', 'amber.ninedof', 'amber.roboclaw', 'amber.tests'],
+    packages=['amber', 'amber.client', 'amber.client.common',
+              'amber.client.dummy', 'amber.client.hokuyo',
+              'amber.client.ninedof', 'amber.client.roboclaw',
+              'amber.client.examples'],
     package_dir={'amber': 'src/amber',
-                 'amber.common': 'src/amber/common',
-                 'amber.dummy': 'src/amber/dummy',
-                 'amber.hokuyo': 'src/amber/hokuyo',
-                 'amber.ninedof': 'src/amber/ninedof',
-                 'amber.roboclaw': 'src/amber/roboclaw',
-                 'amber.tests': 'src/amber/tests'},
-    package_data={'': ['src/amber/common/amber.ini',
-                       'src/amber/dummy/dummy.ini',
-                       'src/amber/hokuyo/hokuyo.ini',
-                       'src/amber/ninedof/ninedof.ini',
-                       'src/amber/roboclaw/roboclaw.ini']},
+                 'amber.client': 'src/amber/client',
+                 'amber.client.common': 'src/amber/client/common',
+                 'amber.client.dummy': 'src/amber/client/dummy',
+                 'amber.client.hokuyo': 'src/amber/client/hokuyo',
+                 'amber.client.location': 'src/amber/client/location',
+                 'amber.client.ninedof': 'src/amber/client/ninedof',
+                 'amber.client.roboclaw': 'src/amber/client/roboclaw',
+                 'amber.client.examples': 'src/amber/client/examples'},
+    package_data={'': ['src/amber/client/common/amber.ini',
+                       'src/amber/client/dummy/dummy.ini',
+                       'src/amber/client/hokuyo/hokuyo.ini',
+                       'src/amber/client/location/location.ini',
+                       'src/amber/client/ninedof/ninedof.ini',
+                       'src/amber/client/roboclaw/roboclaw.ini']},
     data_files=[
         ('', [
-            'src/amber/common/amber.ini',
-            'src/amber/dummy/dummy.ini',
-            'src/amber/hokuyo/hokuyo.ini',
-            'src/amber/ninedof/ninedof.ini',
-            'src/amber/roboclaw/roboclaw.ini',
+            'src/amber/client/common/amber.ini',
+            'src/amber/client/dummy/dummy.ini',
+            'src/amber/client/hokuyo/hokuyo.ini',
+            'src/amber/client/location/location.ini',
+            'src/amber/client/ninedof/ninedof.ini',
+            'src/amber/client/roboclaw/roboclaw.ini'
         ]),
     ],
     include_package_data=True,
     install_requires=required,
-    version='1.26',
+    version='1.27.1',
     description='Amber clients in python',
     author=u'Paweł Suder',
     author_email='pawel@suder.info',
     url='http://project-capo.github.io/',
     download_url='http://github.com/project-capo/amber-python-clients/',
-    keywords=['amber', 'hokuyo', 'roboclaw', 'ninedof', 'panda'],
+    keywords=['amber', 'dummy', 'hokuyo', 'location', 'ninedof', 'roboclaw', 'panda'],
     classifiers=[
         'Programming Language :: Python',
         'Development Status :: 4 - Beta',

src/amber/common/amber_client.py → src/amber/client/common/amber_client.py

@@ -5,7 +5,7 @@
 import struct
 import threading
 
-from amber.common import runtime
+from amber.client.common import runtime
 import drivermsg_pb2
 
 

src/amber/common/drivermsg.proto → src/amber/client/common/drivermsg.proto

@@ -1,5 +1,5 @@
 package amber;
-option java_package = "pl.edu.agh.amber.common.proto";
+option java_package = "pl.edu.agh.amber.client.common.proto";
 option java_outer_classname = "CommonProto";
 
 option optimize_for = SPEED;

src/amber/client/dummy/__init__.py

@@ -0,0 +1 @@
+__author__ = 'paoolo'

src/amber/dummy/dummy.proto → src/amber/client/dummy/dummy.proto

@@ -1,5 +1,5 @@
 package amber.dummy_proto;
-option java_package = "pl.edu.agh.amber.dummy.proto";
+option java_package = "pl.edu.agh.amber.client.dummy.proto";
 option java_outer_classname = "DummyProto";
 
 import "drivermsg.proto";

src/amber/dummy/dummy.py → src/amber/client/dummy/dummy.py

@@ -2,8 +2,8 @@
 import logging.config
 import os
 
-from amber.common import amber_proxy, future_object
-from amber.common import drivermsg_pb2
+from amber.client.common import amber_proxy, future_object
+from amber.client.common import drivermsg_pb2
 import dummy_pb2
 
 

src/amber/tests/dummy_example.py → src/amber/client/examples/dummy_example.py

@@ -1,8 +1,8 @@
 import time
 
-from amber.common import amber_client
-from amber.common.listener import Listener
-from amber.dummy import dummy
+from amber.client.common import amber_client
+from amber.client.common.listener import Listener
+from amber.client.dummy import dummy
 
 
 __author__ = 'paoolo'

src/amber/tests/hokuyo_example.py → src/amber/client/examples/hokuyo_example.py

@@ -1,8 +1,8 @@
 import time
 
-from amber.common import amber_client
-from amber.common.listener import Listener
-from amber.hokuyo import hokuyo
+from amber.client.common import amber_client
+from amber.client.common.listener import Listener
+from amber.client.hokuyo import hokuyo
 
 
 __author__ = 'paoolo'

src/amber/tests/ninedof_example.py → src/amber/client/examples/ninedof_example.py

@@ -1,8 +1,8 @@
 import time
 
-from amber.common import amber_client
-from amber.common.listener import Listener
-from amber.ninedof import ninedof
+from amber.client.common import amber_client
+from amber.client.common.listener import Listener
+from amber.client.ninedof import ninedof
 
 
 __author__ = 'paoolo'

src/amber/tests/roboclaw_example.py → src/amber/client/examples/roboclaw_example.py

@@ -1,7 +1,7 @@
 import time
 
-from amber.common import amber_client
-from amber.roboclaw import roboclaw
+from amber.client.common import amber_client
+from amber.client.roboclaw import roboclaw
 
 __author__ = 'paoolo'
 

src/amber/hokuyo/hokuyo.proto → src/amber/client/hokuyo/hokuyo.proto

@@ -1,5 +1,5 @@
 package amber.hokuyo_proto;
-option java_package = "pl.edu.agh.amber.hokuyo.proto";
+option java_package = "pl.edu.agh.amber.client.hokuyo.proto";
 option java_outer_classname = "HokuyoProto";
 
 import "drivermsg.proto";

src/amber/hokuyo/hokuyo.py → src/amber/client/hokuyo/hokuyo.py

@@ -2,8 +2,8 @@
 import logging.config
 import os
 
-from amber.common import amber_proxy, future_object
-from amber.common import drivermsg_pb2
+from amber.client.common import amber_proxy, future_object
+from amber.client.common import drivermsg_pb2
 import hokuyo_pb2
 
 

src/amber/client/location/__init__.py

@@ -0,0 +1 @@
+__author__ = 'paoolo'

src/amber/client/location/location.ini

@@ -0,0 +1,34 @@
+[loggers]
+keys = root,LocationProxy,AmberClient
+
+[handlers]
+keys = consoleHandler
+
+[formatters]
+keys = simpleFormatter
+
+[logger_root]
+level = WARNING
+handlers = consoleHandler
+
+[logger_AmberClient]
+level = INFO
+handlers = consoleHandler
+qualname = AmberClient
+propagate = 0
+
+[logger_LocationProxy]
+level = INFO
+handlers = consoleHandler
+qualname = LocationProxy
+propagate = 0
+
+[handler_consoleHandler]
+class = StreamHandler
+level = WARNING
+formatter = simpleFormatter
+args = (sys.stdout,)
+
+[formatter_simpleFormatter]
+format = %(asctime)s - %(name)s - %(levelname)s - %(message)s
+datefmt =

src/amber/client/location/location.proto

@@ -0,0 +1,18 @@
+package amber.location_proto;
+option java_package = "pl.edu.agh.amber.client.location.proto";
+option java_outer_classname = "LocationProto";
+
+import "drivermsg.proto";
+
+extend amber.DriverMsg {
+    optional bool get_location = 60;
+    optional Location currentLocation = 61;
+}
+
+message Location {
+    optional double x = 1;
+    optional double y = 2;
+    optional double p = 3;
+    optional double alfa = 4;
+    optional double timeStamp = 5;
+}