Skip to content
Snippets Groups Projects
Commit 247e57bb authored by Mark Tearle's avatar Mark Tearle
Browse files

Fix the code to connect to the virtual vend thing again

parent 9d8efc1c
No related merge requests found
......@@ -10,7 +10,7 @@ from traceback import format_tb
if USE_DB: import pg
from time import time, sleep
from popen2 import popen2
#from LATClient import LATClient, LATClientException
from LATClient import LATClient, LATClientException
from SerialClient import SerialClient, SerialClientException
from VendingMachine import VendingMachine, VendingException
from MessageKeeper import MessageKeeper
......@@ -424,15 +424,16 @@ def run_forever(rfh, wfh, options, cf):
last_timeout_refresh = None
def connect_to_vend(options, cf):
# Open vending machine via serial.
logging.info('Connecting to vending machine using serial')
serialclient = SerialClient(port = '/dev/ttyS1', baud = 9600)
return serialclient.get_fh()
if options.use_lat:
logging.info('Connecting to vending machine using LAT')
latclient = LATClient(service = cf.ServiceName, password = cf.ServicePassword, server_name = cf.ServerName, connect_password = cf.ConnectPassword, priv_password = cf.PrivPassword)
rfh, wfh = latclient.get_fh()
elif options.use_serial:
# Open vending machine via serial.
logging.info('Connecting to vending machine using serial')
serialclient = SerialClient(port = '/dev/ttyS1', baud = 9600)
rfh,wfh = serialclient.get_fh()
else:
#(rfh, wfh) = popen2('../../virtualvend/vvend.py')
logging.info('Connecting to virtual vending machine on %s:%d'%(options.host,options.port))
......@@ -449,7 +450,9 @@ def parse_args():
op = OptionParser(usage="%prog [OPTION]...")
op.add_option('-f', '--config-file', default='/etc/dispense/servers.conf', metavar='FILE', dest='config_file', help='use the specified config file instead of /etc/dispense/servers.conf')
op.add_option('--virtualvend', action='store_false', default=True, dest='use_lat', help='use the virtual vending server instead of LAT')
op.add_option('--serial', action='store_true', default=True, dest='use_serial', help='use the serial port')
op.add_option('--lat', action='store_true', default=False, dest='use_lat', help='use LAT')
op.add_option('--virtualvend', action='store_false', default=True, dest='use_serial', help='use the virtual vending server instead of LAT')
op.add_option('-n', '--hostname', dest='host', default='localhost', help='the hostname to connect to for virtual vending machine mode (default: localhost)')
op.add_option('-p', '--port', dest='port', default=5150, type='int', help='the port number to connect to (default: 5150)')
op.add_option('-l', '--log-file', metavar='FILE', dest='log_file', default='', help='log output to the specified file')
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment