Merge pull request #22 from auscompgeek/team

Add --team option to specify server to connect to

Author: virtuald

example/aiohttp_server.py

@@ -14,7 +14,7 @@
 import asyncio
 from aiohttp import web
 
-from networktables import NetworkTable
+from networktables import NetworkTables
 from pynetworktables2js import nt2js_static_resources, networktables_websocket
 
 import logging
@@ -25,15 +25,17 @@
 
 def init_networktables(options):
 
-    if options.dashboard:
-        logger.info("Connecting to networktables in Dashboard mode")
-        NetworkTable.setDashboardMode()
+    if options.team:
+        logger.info("Connecting to NetworkTables for team %s", options.team)
+        NetworkTables.startClientTeam(options.team)
     else:
         logger.info("Connecting to networktables at %s", options.robot)
-        NetworkTable.setIPAddress(options.robot)
-        NetworkTable.setClientMode()
+        NetworkTables.initialize(server=options.robot)
+
+    if options.dashboard:
+        logger.info("Enabling driver station override mode")
+        NetworkTables.startDSClient()
 
-    NetworkTable.initialize()
     logger.info("Networktables Initialized")
 
 @asyncio.coroutine
@@ -45,7 +47,7 @@ def forward_request(request):
     # Setup options here
     parser = OptionParser()
 
-    parser.add_option('-p', '--port', default=8888,
+    parser.add_option('-p', '--port', type=int, default=8888,
                       help='Port to run web server on')
 
     parser.add_option('-v', '--verbose', default=False, action='store_true',
@@ -54,6 +56,8 @@ def forward_request(request):
     parser.add_option('--robot', default='127.0.0.1',
                       help="Robot's IP address")
 
+    parser.add_option('--team', type=int, help='Team number of robot to connect to')
+
     parser.add_option('--dashboard', default=False, action='store_true',
                       help='Use this instead of --robot to receive the IP from the driver station. WARNING: It will not work if you are not on the same host as the DS!')
 
@@ -64,8 +68,8 @@ def forward_request(request):
                         format=log_format,
                         level=logging.DEBUG if options.verbose else logging.INFO)
 
-    if options.dashboard and options.robot != '127.0.0.1':
-        parser.error("Cannot specify --robot and --dashboard")
+    if options.team and options.robot != '127.0.0.1':
+        parser.error("--robot and --team are mutually exclusive")
 
     # Setup NetworkTables
     init_networktables(options)
@@ -94,4 +98,3 @@ def forward_request(request):
         loop.run_forever()
     except KeyboardInterrupt:
         pass
-

example/tornado_server.py

@@ -14,7 +14,7 @@
 import tornado.web
 from tornado.ioloop import IOLoop
 
-from networktables import NetworkTable
+from networktables import NetworkTables
 from pynetworktables2js import get_handlers, NonCachingStaticFileHandler
 
 import logging
@@ -23,46 +23,55 @@
 log_datefmt = "%H:%M:%S"
 log_format = "%(asctime)s:%(msecs)03d %(levelname)-8s: %(name)-20s: %(message)s"
 
+
 def init_networktables(options):
+    NetworkTables.setNetworkIdentity(options.identity)
 
-    if options.dashboard:
-        logger.info("Connecting to networktables in Dashboard mode")
-        NetworkTable.setDashboardMode()
+    if options.team:
+        logger.info("Connecting to NetworkTables for team %s", options.team)
+        NetworkTables.startClientTeam(options.team)
     else:
         logger.info("Connecting to networktables at %s", options.robot)
-        NetworkTable.setIPAddress(options.robot)
-        NetworkTable.setClientMode()
-    
-    NetworkTable.initialize()
+        NetworkTables.initialize(server=options.robot)
+
+    if options.dashboard:
+        logger.info("Enabling driver station override mode")
+        NetworkTables.startDSClient()
+
     logger.info("Networktables Initialized")
 
 
-if __name__ == '__main__':
+def main():
 
     # Setup options here
     parser = OptionParser()
 
-    parser.add_option('-p', '--port', default=8888, 
+    parser.add_option('-p', '--port', type=int, default=8888,
                       help='Port to run web server on')
 
     parser.add_option('-v', '--verbose', default=False, action='store_true', 
                       help='Enable verbose logging')
 
     parser.add_option('--robot', default='127.0.0.1', 
                       help="Robot's IP address")
+
+    parser.add_option('--team', type=int, help='Team number of robot to connect to')
 
     parser.add_option('--dashboard', default=False, action='store_true',
                       help='Use this instead of --robot to receive the IP from the driver station. WARNING: It will not work if you are not on the same host as the DS!')
 
+    parser.add_option('--identity', default='pynetworktables2js',
+                      help='Identity to send to NT server')
+
     options, args = parser.parse_args()
 
     # Setup logging
     logging.basicConfig(datefmt=log_datefmt,
                         format=log_format,
                         level=logging.DEBUG if options.verbose else logging.INFO)
 
-    if options.dashboard and options.robot != '127.0.0.1':
-        parser.error("Cannot specify --robot and --dashboard")
+    if options.team and options.robot != '127.0.0.1':
+        parser.error("--robot and --team are mutually exclusive")
 
     # Setup NetworkTables
     init_networktables(options)
@@ -76,7 +85,7 @@ def init_networktables(options):
         exit(1)
 
     if not exists(index_html):
-        logger.warn("%s not found" % index_html)
+        logger.warn("%s not found", index_html)
 
     app = tornado.web.Application(
         get_handlers() + [
@@ -90,3 +99,7 @@ def init_networktables(options):
 
     app.listen(options.port)
     IOLoop.current().start()
+
+
+if __name__ == '__main__':
+    main()

pynetworktables2js/__main__.py

@@ -32,15 +32,21 @@
 log_datefmt = "%H:%M:%S"
 log_format = "%(asctime)s:%(msecs)03d %(levelname)-8s: %(name)-20s: %(message)s"
 
+
 def init_networktables(options):
+    NetworkTables.setNetworkIdentity(options.identity)
+
+    if options.team:
+        logger.info("Connecting to NetworkTables for team %s", options.team)
+        NetworkTables.startClientTeam(options.team)
+    else:
+        logger.info("Connecting to NetworkTables at %s", options.robot)
+        NetworkTables.initialize(server=options.robot)
 
     #if options.dashboard:
     #    logger.info("Connecting to networktables in Dashboard mode")
     #    NetworkTables.setDashboardMode()
-    #else:
-    logger.info("Connecting to networktables at %s", options.robot)
-    NetworkTables.setNetworkIdentity(options.identity)
-    NetworkTables.initialize(server=options.robot)
+
     logger.info("Networktables Initialized")
 
 
@@ -49,14 +55,16 @@ def main():
     # Setup options here
     parser = OptionParser()
 
-    parser.add_option('-p', '--port', default=8888, 
+    parser.add_option('-p', '--port', type='int', default=8888,
                       help='Port to run web server on')
 
     parser.add_option('-v', '--verbose', default=False, action='store_true', 
                       help='Enable verbose logging')
 
     parser.add_option('--robot', default='127.0.0.1', 
                       help="Robot's IP address")
+
+    parser.add_option('--team', type='int', help='Team number of robot to connect to')
 
     #parser.add_option('--dashboard', default=False, action='store_true',
     #                  help='Use this instead of --robot to receive the IP from the driver station. WARNING: It will not work if you are not on the same host as the DS!')
@@ -71,8 +79,8 @@ def main():
                         format=log_format,
                         level=logging.DEBUG if options.verbose else logging.INFO)
 
-    #if options.dashboard and options.robot != '127.0.0.1':
-    #    parser.error("Cannot specify --robot and --dashboard")
+    if options.team and options.robot != '127.0.0.1':
+        parser.error("--robot and --team are mutually exclusive")
 
     # Setup NetworkTables
     init_networktables(options)

requirements.txt

@@ -1,2 +1,2 @@
 tornado>=4.0
-pynetworktables>=2018.0.0
+pynetworktables>=2018.0.1