Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Hardware team - Remove excess print statements #374

Merged
merged 6 commits into from Apr 11, 2020
Merged

Hardware team - Remove excess print statements #374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ced1bf2
Merge pull request #347 from gcivil-nyu-org/master
ab7289 Apr 10, 2020
67a42fd
updated find_port file to use logger instead of print statements
ab7289 Apr 11, 2020
d40d93d
removed print statements from logger class
ab7289 Apr 11, 2020
d41dace
commented out last print statement
ab7289 Apr 11, 2020
7691410
Merge pull request #372 from gcivil-nyu-org/bug/print-logs
ab7289 Apr 11, 2020
6c6ebe4
Merge pull request #379 from gcivil-nyu-org/master
ab7289 Apr 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 20 additions & 11 deletions hardware/CommunicationsPi/find_port.py
View file
Open in desktop
Expand Up @@ -4,6 +4,8 @@
import serial
import serial.tools.list_ports

from .utils import get_logger


def is_usb_serial(port, args):
if port.vid is None:
Expand Down Expand Up @@ -42,8 +44,8 @@ def extra_info(port):
def get_port():
for port in serial.tools.list_ports.comports():
if is_usb_serial(port, None):
print(port)
print(port.device)
# print(port)
# print(port.device)
return "port found"
return

Expand Down Expand Up @@ -108,31 +110,38 @@ def main():
)
args = parser.parse_args(sys.argv[1:])

logger = get_logger("PORT_LOGGER", file_name="PORT_LOG_FILE")

if args.verbose:
print("pyserial version = {}".format(serial.__version__))
print(" vid =", args.vid)
print(" pid =", args.pid)
print("serial =", args.serial)
print("vendor =", args.vendor)
logger.info("pyserial version = {}".format(serial.__version__))
logger.info(f" vid = {args.vid}")
logger.info(f" pid = {args.pid}")
logger.info(f"serial = {args.serial}")
logger.info(f"vendor = {args.vendor}")
# print("pyserial version = {}".format(serial.__version__))
# print(" vid =", args.vid)
# print(" pid =", args.pid)
# print("serial =", args.serial)
# print("vendor =", args.vendor)

if args.list:
detected = False
for port in serial.tools.list_ports.comports():
if is_usb_serial(port, args):
print(
logger.info(
"USB Serial Device {:04x}:{:04x}{} found @{}\r".format(
port.vid, port.pid, extra_info(port), port.device
)
)
detected = True
if not detected:
print("No USB Serial devices detected.\r")
logger.warn("No USB Serial devices detected.\r")
return

for port in serial.tools.list_ports.comports():
if is_usb_serial(port, args):
print(port)
print(port.device)
logger.info(port)
logger.info(port.device)
return
sys.exit(1)

Expand Down
8 changes: 4 additions & 4 deletions hardware/CommunicationsPi/logger.py
View file
Open in desktop
Expand Up @@ -35,17 +35,17 @@ def get_logger_file(self, file_name):
return d + "/" + file_name

def info(self, msg, extra=None):
print(msg)
# print(msg)
self.logger.info(msg, extra=extra)

def error(self, msg, extra=None):
print(msg)
# print(msg)
self.logger.error(msg, extra=extra)

def debug(self, msg, extra=None):
print(msg)
# print(msg)
self.logger.debug(msg, extra=extra)

def warn(self, msg, extra=None):
print(msg)
# print(msg)
self.logger.warn(msg, extra=extra)
1 change: 1 addition & 0 deletions hardware/env
View file
Open in desktop
Expand Up @@ -7,3 +7,4 @@ TRANSMITTER_LOG_FILE=transmitter.log
RECEIVER_LOG_FILE=receiver.log
LAN_SERVER_LOG_FILE=lan_server.log
LAN_CLIENT_LOG_FILE=lan_client.log
PORT_LOG_FILE=port.log