From 0bc8287f145ca8ea283a7f193a4432cadf6aa785 Mon Sep 17 00:00:00 2001 From: suut Date: Sat, 24 Jan 2026 01:44:58 +0100 Subject: [PATCH] Better Android detection --- software/script/chameleon_com.py | 9 ++++++--- software/script/requirements.android.txt | 2 -- 2 files changed, 6 insertions(+), 5 deletions(-) delete mode 100644 software/script/requirements.android.txt diff --git a/software/script/chameleon_com.py b/software/script/chameleon_com.py index 24ef149..47972d6 100644 --- a/software/script/chameleon_com.py +++ b/software/script/chameleon_com.py @@ -1,3 +1,4 @@ +import sys import queue import struct import threading @@ -5,13 +6,15 @@ import time import platform from typing import Union from enum import Enum, auto -if platform.system() != 'Android': - import serial +import serial import socket +import platform from chameleon_utils import CR, CG, CC, CY, color_string from chameleon_enum import Command, Status +ANDROID = 'android' in platform.release() + # each thread is waiting for its data for 100 ms before looping again THREAD_BLOCKING_TIMEOUT = 0.1 @@ -101,7 +104,7 @@ class ChameleonCom: self.transport.connect((host, int(port))) self.transport_type = TransportType.SOCKET else: - if platform.system() == 'Android': + if ANDROID: sys.exit(color_string(CR, 'COM port is not supported on Android, make a USB-serial to TCP communication bridge')) self.transport = serial.Serial(port=port, baudrate=115200) self.transport_type = TransportType.SERIAL diff --git a/software/script/requirements.android.txt b/software/script/requirements.android.txt deleted file mode 100644 index 6d08f94..0000000 --- a/software/script/requirements.android.txt +++ /dev/null @@ -1,2 +0,0 @@ -colorama==0.4.6 -prompt-toolkit==3.0.39