diff --git a/addons/hw_escpos/controllers/main.py b/addons/hw_escpos/controllers/main.py index 78ed77a2318..d284d05dfdd 100644 --- a/addons/hw_escpos/controllers/main.py +++ b/addons/hw_escpos/controllers/main.py @@ -14,8 +14,6 @@ import usb.core from openerp.tools.translate import _ from .. import escpos from ..escpos import printer -#import escpos -#import escpos.printer from PIL import Image from openerp import http @@ -29,6 +27,13 @@ class EscposDriver(hw_proxy.Proxy): supported_printers = [ { 'vendor' : 0x04b8, 'product' : 0x0e03, 'name' : 'Epson TM-T20' } ] + + def connected_usb_devices(self,devices): + connected = [] + for device in devices: + if usb.core.find(idVendor=device['vendor'], idProduct=device['product']) != None: + connected.append(device) + return connected def get_escpos_printer(self): printers = self.connected_usb_devices(self.supported_printers) diff --git a/addons/hw_proxy/controllers/main.py b/addons/hw_proxy/controllers/main.py index 967323ae0d6..6ddf94843fd 100644 --- a/addons/hw_proxy/controllers/main.py +++ b/addons/hw_proxy/controllers/main.py @@ -7,30 +7,21 @@ import openerp import time import random import subprocess -import usb.core -import escpos -import escpos.printer import werkzeug import werkzeug.wrappers +_logger = logging.getLogger(__name__) + from openerp import http from openerp.http import request from openerp.addons.web.controllers.main import manifest_list, module_boot, html_template -_logger = logging.getLogger(__name__) class Proxy(http.Controller): def __init__(self): self.scale = 'closed' self.scale_weight = 0.0 - def connected_usb_devices(self,devices): - connected = [] - for device in devices: - if usb.core.find(idVendor=device['vendor'], idProduct=device['product']) != None: - connected.append(device) - return connected - @http.route('/hw_proxy/hello', type='http', auth='admin') def helloajx(self): return request.make_response('ping', {