From 33c2117df768f984fcafff076777e7e32d9fcd9c Mon Sep 17 00:00:00 2001 From: alessandro90 Date: Sat, 6 Jul 2019 18:21:43 +0200 Subject: [PATCH 1/2] Modify readme.md --- README.md | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index be6743b..33719d8 100644 --- a/README.md +++ b/README.md @@ -6,14 +6,13 @@ ## ARTEMIS. In a nutshell. -In short, ARTEMIS is a signals hunter software and a useful aid for radio listeners! The analysis of real-time spectra (from your SDR, for instance is made simple: you can take advantage using one of the largest RF signal database (with over 370 records). Compare several signals properties (such as frequency, bandwidth, modulation, etc.) and verify what you are searching for through a waterfall/audio sample. A collection of filters allows you to narrow your search, making the identification of unknown signals, odd buzzes or weird noises way easier. +In short, ARTEMIS is a signals hunter software and a useful aid for radio listeners! The analysis of real-time spectra (from your SDR, for instance) is made simple: you can take advantage using one of the largest RF signal database (with over 370 records). Compare several signals properties (such as frequency, bandwidth, modulation, etc.) and verify what you are searching for through a waterfall/audio sample. A collection of filters allows you to narrow your search, making the identification of unknown signals, odd buzzes or weird noises way easier. ## Table of contents - - [Installation](#installation) + - [Run the software](#Run-the-software) - [Run from binary](#Run-from-binary) - [Run from source code](#Run-from-source-code-OS-independent) - - [Run using deploy script](#Run-using-deploy-script) - [Database](#database) - [Syntax](#syntax) - [Multiple Items fields (Location, Modulation)](#multiple-items-fields-location-modulation) @@ -21,21 +20,22 @@ In short, ARTEMIS is a signals hunter software and a useful aid for radio listen - [License](#license) - [Thanks](#thanks) -## Installation -The power of the new Artemis is the native multi-environment capability. To achieve this point, the entire code has been written in python. The procedure of Artemis 3 deployment is very similar among the different main operative systems (Windows, Linux or MacOS) but, in principle, any OS capable of running python scripts has all the necessary features to run Artemis smoothly. +## Run the software -## Run from binary +Artemis 3 is entirely written in Python, so if you already have Python 3.7.0+ installed in your system, you can directly run the main script. Otherwise you can download a binary executable (see below). + +### Run from binary **If you don't know what you want or you are not sure where to look, this is for you.** -Basically, this is the easiest, smooth, and clean way to run Artemis 3. Python 3.7 and the libraries are not required because they are already contained into the bundle. -For more information, follow the main page of Artemis 3: https://aresvalley.com/artemis/ (detailed documentation at the end of the main page) +Basically, this is the easiest, smooth, and clean way to run Artemis 3. A Python installation is not required. +For more information, follow [the main page of Artemis 3](https://aresvalley.com/artemis/) (detailed documentation at the end of the main page) -## Run from source code (OS independent) -Run the software from the source code with the Python interpreter is the simplest and natural way to run Artemis 3. The main drawback: this is not the most convenient or fast way to launch the software. Requirements: -- Python 3 (>3.7.0+) +### Run from source code +Run the software from the source code with the Python interpreter is the simplest and natural way to run Artemis 3. Requirements: +- Python (ver. 3.7.0+) - Python libraries (in `requirements/requirements.txt`) -1. Download and install Python 3 (>3.7.0+) from the official website (https://www.python.org/downloads/). Be sure to select the flag `Add Python 3.x to PATH` during the first part of the installation. +1. Download and install Python (ver. 3.7.0+) from the official [website](https://www.python.org/downloads/). Be sure to select the flag `Add Python 3.x to PATH` during the first part of the installation. 2. Install the necessary Python libraries with PIP. Open a console in Artemis/requirements folder and type: @@ -49,12 +49,6 @@ pip install -r requirements.txt --user python3 artemis.py ``` -## Run using deploy script - -This is a third option to run Artemis 3 on your pc. The method of installation is based on an automatic script that set privileges, install dependencies and create a working shortcut to your desktop/menu. - -**For the sake of completeness, the documentation is available in `unused_installation_scripts`, but we strongly discourage any attempt to use it.** - ## Database The database (db.csv) is directly extracted from sigidwiki.com with a DB parser and reworked to a standard format defined as follow. Artemis DB is a human-readable csv file where the delimiter is the character `*` (Asterisk, Unicode: U+002A). The new entry (separation between signals) is the End Of Line (EOL) escape sequence `\n`. Every signal is directly connected to spectra and audio sample stored in **Spectra** and **Audio** folders, respectively. Every signal is composed of 12 columns: @@ -131,8 +125,8 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY You should have received a copy of the GNU General Public License along with this program. If not, see: www.gnu.org/licenses ## Thanks -* **Marco D.T.** - *Artemis I-II programmer, DB parsing, Website* -* **Alessandro C.** - *Artemis III lead programmer* +* **Marco D.T.** - *Artemis I-II developer, DB parsing, Website* +* [**Alessandro C.**](https://github.com/alessandro90 "GitHub profile") - *Artemis III lead developer* * **Paolo R. (IZ1MLL)** - *Lead β Tester, RF specialist* * **Carl C.** - *Sigidwiki admin, β Tester, Signals expert* * **Marco B.** - *macOS deployment, β Tester* From 7f08e2c9d9fbe51a22423fc07a4631a7e4a601b2 Mon Sep 17 00:00:00 2001 From: Marco Date: Mon, 8 Jul 2019 12:25:40 +0200 Subject: [PATCH 2/2] Updated Thanks --- README.md | 13 +++++++------ unused_installation_scripts/README.md | 13 +++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 33719d8..5e210c9 100644 --- a/README.md +++ b/README.md @@ -125,9 +125,10 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY You should have received a copy of the GNU General Public License along with this program. If not, see: www.gnu.org/licenses ## Thanks -* **Marco D.T.** - *Artemis I-II developer, DB parsing, Website* -* [**Alessandro C.**](https://github.com/alessandro90 "GitHub profile") - *Artemis III lead developer* -* **Paolo R. (IZ1MLL)** - *Lead β Tester, RF specialist* -* **Carl C.** - *Sigidwiki admin, β Tester, Signals expert* -* **Marco B.** - *macOS deployment, β Tester* -* **Francesco C., Pierpaolo P., Luca XYZ, Paolo XYZ, Daniele XYZ** - *β Tester* +* **Marco Dalla Tiezza** - *Artemis I-II developer, DB parsing, Website* +* [**Alessandro Ceccato**](https://github.com/alessandro90 "GitHub profile") - *Artemis III lead developer* +* **Paolo Romani (IZ1MLL)** - *Lead β Tester, RF specialist* +* **Carl Colena** - *Sigidwiki admin, β Tester, Signals expert* +* **Marco Bortoli** - *macOS deployment, β Tester* +* **Pierpaolo Pravatto** - *Wiki page, β Tester* +* **Francesco Capostagno, Luca, Pietro** - *β Tester* diff --git a/unused_installation_scripts/README.md b/unused_installation_scripts/README.md index 2f9142a..0c598f6 100644 --- a/unused_installation_scripts/README.md +++ b/unused_installation_scripts/README.md @@ -69,9 +69,10 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY You should have received a copy of the GNU General Public License along with this program. If not, see: www.gnu.org/licenses ## Thanks -* **Marco D.T.** - *Artemis I-II programmer, DB parsing, Website* -* **Alessandro C.** - *Artemis III lead programmer* -* **Paolo R. (IZ1MLL)** - *Lead β Tester, RF specialist* -* **Carl C.** - *Sigidwiki admin, β Tester, Signals expert* -* **Marco B.** - *macOS deployment, β Tester* -* **Francesco C., Pierpaolo P., Luca XYZ, Paolo XYZ, Daniele XYZ** - *β Tester* +* **Marco Dalla Tiezza** - *Artemis I-II developer, DB parsing, Website* +* [**Alessandro Ceccato**](https://github.com/alessandro90 "GitHub profile") - *Artemis III lead developer* +* **Paolo Romani (IZ1MLL)** - *Lead β Tester, RF specialist* +* **Carl Colena** - *Sigidwiki admin, β Tester, Signals expert* +* **Marco Bortoli** - *macOS deployment, β Tester* +* **Pierpaolo Pravatto** - *Wiki page, β Tester* +* **Francesco Capostagno, Luca, Pietro** - *β Tester*