From 43a6e822e6afcf5488fd183987dee222d1992f97 Mon Sep 17 00:00:00 2001 From: Philippe Teuwen Date: Sun, 15 Oct 2023 00:58:42 +0200 Subject: [PATCH] cli: move color shortcuts to chameleon_util --- software/script/chameleon_cli_main.py | 10 +--------- software/script/chameleon_cli_unit.py | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/software/script/chameleon_cli_main.py b/software/script/chameleon_cli_main.py index 5440100..beec263 100755 --- a/software/script/chameleon_cli_main.py +++ b/software/script/chameleon_cli_main.py @@ -10,15 +10,7 @@ import pathlib import prompt_toolkit from prompt_toolkit.formatted_text import ANSI from prompt_toolkit.history import FileHistory - -# Colorama shorthands -CR = colorama.Fore.RED -CG = colorama.Fore.GREEN -CB = colorama.Fore.BLUE -CC = colorama.Fore.CYAN -CY = colorama.Fore.YELLOW -CM = colorama.Fore.MAGENTA -C0 = colorama.Style.RESET_ALL +from chameleon_utils import CR, CG, CB, CC, CY, CM, C0 ULTRA = r""" ╦ ╦╦ ╔╦╗╦═╗╔═╗ diff --git a/software/script/chameleon_cli_unit.py b/software/script/chameleon_cli_unit.py index e1ea135..bf55090 100644 --- a/software/script/chameleon_cli_unit.py +++ b/software/script/chameleon_cli_unit.py @@ -3,7 +3,6 @@ import os import re import subprocess import argparse -import colorama import timeit import sys import time @@ -19,15 +18,8 @@ import chameleon_cmd import chameleon_status from chameleon_utils import ArgumentParserNoExit, ArgsParserError, UnexpectedResponseError from chameleon_utils import CLITree +from chameleon_utils import CR, CG, CB, CC, CY, CM, C0 -# Colorama shorthands -CR = colorama.Fore.RED -CG = colorama.Fore.GREEN -CB = colorama.Fore.BLUE -CC = colorama.Fore.CYAN -CY = colorama.Fore.YELLOW -CM = colorama.Fore.MAGENTA -C0 = colorama.Style.RESET_ALL # NXP IDs based on https://www.nxp.com/docs/en/application-note/AN10833.pdf type_id_SAK_dict = {0x00: "MIFARE Ultralight Classic/C/EV1/Nano | NTAG 2xx",