From d5187d30176a249c3d83d00120fd7087d9275871 Mon Sep 17 00:00:00 2001 From: GameTec_live Date: Mon, 16 Oct 2023 20:01:42 +0200 Subject: [PATCH 1/3] doc: finally add linux --- docs/cli.md | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/docs/cli.md b/docs/cli.md index 07f9f112..b54326db 100644 --- a/docs/cli.md +++ b/docs/cli.md @@ -106,7 +106,35 @@ To run again after installing, just do the following: ### Linux -*Coming Soon* +1. Install the dependencies + - Ubuntu / Debian: `sudo apt install cmake make python3 python3-pip git ninja-build python3-venv` + - Arch: `sudo pacman -S cmake make python3-pip git ninja` + +2. Clone the Repository by typing `git clone https://github.com/RfidResearchGroup/ChameleonUltra.git` + +3. Now go into the newly created folder with `cd ChameleonUltra/software/src` + +4. Build the required config by running `cmake .` + +5. And the binaries with `cmake --build .` + +6. Copy the binaries by running `cp -r ../bin/* ../script/` + +7. Go into the script folder with `cd ../script/` + +8. Create a virtual enviroment with `python3 -m venv venv` + +9. Activate it with `source venv/bin/activate` + +10. Install python requirements with `pip3 install -r requirements.txt` + +11. Finally run the CLI with `python3 chameleon_cli_main.py` + +To run again after installing, just do the following: + +1. Activate venv by running `source venv/bin/activate` + +2. Run the CLI with `python3 chameleon_cli_main.py` ### MacOS From 3456d4c15dc101a6385d1245df830132066e687b Mon Sep 17 00:00:00 2001 From: GameTec_live Date: Mon, 16 Oct 2023 21:09:14 +0200 Subject: [PATCH 2/3] doc: remove unnescesary cp --- docs/cli.md | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/docs/cli.md b/docs/cli.md index b54326db..beb5cc47 100644 --- a/docs/cli.md +++ b/docs/cli.md @@ -40,13 +40,11 @@ Using ProxSpace to build the CLI is the easiest and most comfortable way to get 12. And the binaries with `cmake --build .` -13. Copy the binaries by running `cp -r ~/ChameleonUltra/software/bin/* ~/ChameleonUltra/software/script/` +13. Go into the script folder with `cd ~/ChameleonUltra/software/script/` -14. Go into the script folder with `cd ~/ChameleonUltra/software/script/` - -15. Install python requirements with `pip install -r requirements.txt` +14. Install python requirements with `pip install -r requirements.txt` -16. Finally run the CLI with `python chameleon_cli_main.py` +15. Finally run the CLI with `python chameleon_cli_main.py` To use after installing, just do the following: @@ -107,8 +105,8 @@ To run again after installing, just do the following: ### Linux 1. Install the dependencies - - Ubuntu / Debian: `sudo apt install cmake make python3 python3-pip git ninja-build python3-venv` - - Arch: `sudo pacman -S cmake make python3-pip git ninja` + - Ubuntu / Debian: `sudo apt install cmake make python3 python3-pip git ninja-build python3-venv build-essential` + - Arch: `sudo pacman -S cmake make python3-pip git ninja base-devel` 2. Clone the Repository by typing `git clone https://github.com/RfidResearchGroup/ChameleonUltra.git` @@ -118,17 +116,15 @@ To run again after installing, just do the following: 5. And the binaries with `cmake --build .` -6. Copy the binaries by running `cp -r ../bin/* ../script/` - -7. Go into the script folder with `cd ../script/` +6. Go into the script folder with `cd ../script/` -8. Create a virtual enviroment with `python3 -m venv venv` +7. Create a virtual enviroment with `python3 -m venv venv` -9. Activate it with `source venv/bin/activate` +8. Activate it with `source venv/bin/activate` -10. Install python requirements with `pip3 install -r requirements.txt` +9. Install python requirements with `pip3 install -r requirements.txt` -11. Finally run the CLI with `python3 chameleon_cli_main.py` +10. Finally run the CLI with `python3 chameleon_cli_main.py` To run again after installing, just do the following: From 070db3d773b57664002c8fd49508876b23fe7a60 Mon Sep 17 00:00:00 2001 From: GameTec_live Date: Mon, 16 Oct 2023 21:09:26 +0200 Subject: [PATCH 3/3] fix: escape sequence --- software/script/chameleon_cli_unit.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/software/script/chameleon_cli_unit.py b/software/script/chameleon_cli_unit.py index 5c8e8eb7..ec6b5b48 100644 --- a/software/script/chameleon_cli_unit.py +++ b/software/script/chameleon_cli_unit.py @@ -486,7 +486,7 @@ def on_exec(self, args: argparse.Namespace): " where {$_.DeviceID -like '*VID_6868&PID_8686*'} |" " Select-Object -First 1 FriendlyName |" " % FriendlyName |" - " select-string COM\d+ |" + " select-string COM\\d+ |" "% { $_.matches.value }"], stdout=subprocess.PIPE) res = process.communicate()[0] _comport = res.decode('utf-8').strip()