.gitignore

@@ -1,131 +0,0 @@
-
-# Created by https://www.gitignore.io/api/python
-# Edit at https://www.gitignore.io/?templates=python
-
-### Python ###
-# Byte-compiled / optimized / DLL files
-__pycache__/
-*.py[cod]
-*$py.class
-
-# C extensions
-*.so
-
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-pip-wheel-metadata/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
-
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
-
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
-
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-.hypothesis/
-.pytest_cache/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
-
-# PyBuilder
-target/
-
-# Jupyter Notebook
-.ipynb_checkpoints
-
-# IPython
-profile_default/
-ipython_config.py
-
-# pyenv
-.python-version
-
-# pipenv
-#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
-#   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don’t work, or not
-#   install all needed dependencies.
-#Pipfile.lock
-
-# celery beat schedule file
-celerybeat-schedule
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
-
-# End of https://www.gitignore.io/api/python
- 

README.md

@@ -1,7 +1,7 @@
 # LinVAM
 Linux Voice Activated Macro
 ## Status
-This project is currently a work-in-progress and is minimally functional only for english.
+This project is currently a work-in-progress and is minimally functional.
 
 Utilising Pocketsphinx, a lightweight voice to text engine you can specify voice commands for the tool to recognise and actions to perform.
 
@@ -14,22 +14,20 @@ Known bugs and planned additions
 - python3
 - PyQt5
 - python3-xlib
-- pyaudio
 - pocketsphinx
 - swig3.0
 ## Install
 - $ pip3 install PyQt5
 - $ pip3 install python3-xlib
-- $ pip3 install pyaudio
 - $ pip3 install pocketsphinx
 - $ sudo apt-get install swig3.0
 - $ sudo ln -s /usr/bin/swig3.0 /usr/bin/swig
-- $ git clone https://github.com/aidygus/LinVAM.git
+- $ git clone https://github.com/rose-jinyang/LinVAM.git
 ## Usage
 This script must be run with root privilege because it must hook and simulate input devices such as keyboard, mouse etc.
 - $ cd LinVAM
 - $ xhost +
-- $ sudo ./main.py
+- $ sudo python3 ./main.py
 
 ### Profiles
 Multiple profiles are supported.  To create a new profile for a specific task/game click new and the main profile editor window will be displayed

command.list

@@ -1,9 +1,9 @@
-recall ship /1e-30/
-cargo scoop /1e-30/
-balance power levels /1e-30/
+victor recall ship /1e-40/
+victor cargo scoop /1e-45/
+balance power levels /1e-60/
 power to weapons /1e-50/
-power to core /1e-40/
-power to shields /1e-40/
+power to engineering /1e-65/
+power to shields /1e-50/
 recall fighter /1e-40/
 fighter defend me /1e-50/
 fighter attack target /1e-60/
@@ -18,7 +18,7 @@ previous fire group /1e-60/
 switch hud mode /1e-30/
 toggle night vision /1e-40/
 toggle orbital lines /1e-50/
-full speed /1e-20/
+verity full speed /1e-20/
 approach speed /1e-20/
 full stop /1e-20/
 target next system /1e-50/
@@ -28,9 +28,9 @@ previous hostile target /1e-70/
 cycle next target /1e-50/
 cycle previous target /1e-70/
 victor full beams /1e-40/
-select wingman alpha /1e-60/
-select wingman beta /1e-60/
-select wingman charlie /1e-60/
+select first wingman /1e-45/
+select second wingman /1e-50/
+select third wingman /1e-45/
 select wing target /1e-50/
 target next subsystem /1e-50/
 target previous subsystem /1e-70/

main.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python3
 from PyQt5.QtCore import *
 from PyQt5.QtGui import *
 from PyQt5.QtWidgets import *
@@ -11,7 +10,6 @@ import pickle
 import time
 import keyboard
 import threading
-import signal
 
 class MainWnd(QWidget):
     def __init__(self, p_parent = None):
@@ -27,7 +25,6 @@ class MainWnd(QWidget):
         self.ui.listeningChk.stateChanged.connect(self.slotListeningEnabled)
         self.ui.ok.clicked.connect(self.slotOK)
         self.ui.cancel.clicked.connect(self.slotCancel)
-        signal.signal(signal.SIGINT, signal.SIG_DFL)
 
         if self.loadFromDatabase() > 0 :
         # if self.loadTestProfiles() > 0: