Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 42fcfc3930 | |||
| 60f2bb743d | |||
| f8902bd258 | |||
| f7125127f1 | |||
| f8fe363999 | |||
| bbd667e30c | |||
| 32506bf1bb | |||
| 45a231af0c | |||
| 1f7ad8a73e | |||
| 2faca28631 | |||
| d99eed2ed0 | |||
| a5a481e322 | |||
| 21daea7028 | |||
| 51e80c2f52 | |||
| 567ef9637e |
@@ -0,0 +1,12 @@
|
|||||||
|
[bumpversion]
|
||||||
|
current_version = 0.3.2
|
||||||
|
commit = True
|
||||||
|
tag = True
|
||||||
|
tag_name = {new_version}
|
||||||
|
message = New release: {current_version} → {new_version}
|
||||||
|
|
||||||
|
[bumpversion:file:.bumpversion.cfg]
|
||||||
|
|
||||||
|
[bumpversion:file:qmk_cli/__init__.py]
|
||||||
|
|
||||||
|
[bumpversion:file:setup.cfg]
|
||||||
@@ -44,14 +44,13 @@ jobs:
|
|||||||
- name: (MSYS2) Install Python dependencies
|
- name: (MSYS2) Install Python dependencies
|
||||||
shell: msys2 {0}
|
shell: msys2 {0}
|
||||||
run: |
|
run: |
|
||||||
python3 -m pip install wheel
|
python3 -m pip install -U setuptools wheel
|
||||||
- name: (MSYS2) Install QMK CLI from source
|
- name: (MSYS2) Install QMK CLI from source
|
||||||
shell: msys2 {0}
|
shell: msys2 {0}
|
||||||
run: |
|
run: |
|
||||||
python3 -m pip install -r requirements.txt
|
python3 -m pip install -U build
|
||||||
python3 setup.py sdist bdist_wheel
|
python3 -m build
|
||||||
cd ..
|
python3 -m pip install dist/qmk-*.tar.gz
|
||||||
python3 -m pip install --force-reinstall --no-index --no-deps --find-links qmk_cli/dist qmk
|
|
||||||
- name: (MSYS2) Run qmk setup -y
|
- name: (MSYS2) Run qmk setup -y
|
||||||
shell: msys2 {0}
|
shell: msys2 {0}
|
||||||
run: qmk setup -y
|
run: qmk setup -y
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ jobs:
|
|||||||
run: ./ci_tests
|
run: ./ci_tests
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: |
|
run: |
|
||||||
python -m pip install --upgrade pip
|
python3 -m pip install --upgrade pip
|
||||||
pip install setuptools wheel
|
pip install setuptools wheel
|
||||||
pip install -r requirements-dev.txt
|
pip install -r requirements-dev.txt
|
||||||
- name: Bump version
|
- name: Bump version
|
||||||
@@ -45,7 +45,7 @@ jobs:
|
|||||||
TWINE_USERNAME: qmk
|
TWINE_USERNAME: qmk
|
||||||
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
|
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
|
||||||
run: |
|
run: |
|
||||||
python setup.py sdist bdist_wheel
|
python3 -m build
|
||||||
twine upload dist/*
|
twine upload dist/*
|
||||||
- name: Log in to Docker Hub
|
- name: Log in to Docker Hub
|
||||||
uses: docker/login-action@v1.10.0
|
uses: docker/login-action@v1.10.0
|
||||||
@@ -58,3 +58,7 @@ jobs:
|
|||||||
context: .
|
context: .
|
||||||
push: true
|
push: true
|
||||||
tags: qmkfm/qmk_cli:latest
|
tags: qmkfm/qmk_cli:latest
|
||||||
|
- name: Trigger OS package builds
|
||||||
|
run: ./trigger_packages
|
||||||
|
env:
|
||||||
|
QMK_BOT_TOKEN: ${{ secrets.QMK_BOT_TOKEN }}
|
||||||
|
|||||||
+2
-2
@@ -1,10 +1,10 @@
|
|||||||
FROM qmkfm/base_container
|
FROM qmkfm/base_container
|
||||||
|
|
||||||
# Copy package in
|
# Copy package in
|
||||||
COPY dist /tmp
|
ADD dist /tmp/dist
|
||||||
|
|
||||||
# Install python packages
|
# Install python packages
|
||||||
RUN python3 -m pip uninstall qmk || true
|
RUN python3 -m pip uninstall -y qmk || true
|
||||||
RUN python3 -m pip install --upgrade pip setuptools wheel nose2 && \
|
RUN python3 -m pip install --upgrade pip setuptools wheel nose2 && \
|
||||||
python3 -m pip install /tmp/dist/qmk-*.whl && \
|
python3 -m pip install /tmp/dist/qmk-*.whl && \
|
||||||
rm -rf /tmp/dist
|
rm -rf /tmp/dist
|
||||||
|
|||||||
@@ -8,10 +8,11 @@ A program to help users work with [QMK Firmware](https://qmk.fm/).
|
|||||||
* Interact with your qmk_firmware tree from any location
|
* Interact with your qmk_firmware tree from any location
|
||||||
* Use `qmk clone` to pull down anyone's `qmk_firmware` fork
|
* Use `qmk clone` to pull down anyone's `qmk_firmware` fork
|
||||||
* Setup your build environment with `qmk setup`
|
* Setup your build environment with `qmk setup`
|
||||||
|
* Use `qmk console` to get debugging information from your keyboard(s)
|
||||||
* Check that your environment is correctly setup with `qmk doctor`
|
* Check that your environment is correctly setup with `qmk doctor`
|
||||||
* Integrates with qmk_firmware for additional functionality:
|
* Integrates with qmk_firmware for additional functionality:
|
||||||
* `qmk compile`
|
* `qmk compile`
|
||||||
* `qmk console`
|
* `qmk info`
|
||||||
* `qmk flash`
|
* `qmk flash`
|
||||||
* `qmk lint`
|
* `qmk lint`
|
||||||
* ...and many more!
|
* ...and many more!
|
||||||
|
|||||||
@@ -0,0 +1,6 @@
|
|||||||
|
[build-system]
|
||||||
|
requires = [
|
||||||
|
"setuptools>=42",
|
||||||
|
"wheel"
|
||||||
|
]
|
||||||
|
build-backend = "setuptools.build_meta"
|
||||||
+1
-1
@@ -1,3 +1,3 @@
|
|||||||
"""A program to help you work with qmk_firmware."""
|
"""A program to help you work with qmk_firmware."""
|
||||||
|
|
||||||
__version__ = '0.2.1'
|
__version__ = '0.3.2'
|
||||||
|
|||||||
@@ -3,5 +3,6 @@
|
|||||||
We list each subcommand here explicitly because all the reliable ways of searching for modules are slow and delay startup.
|
We list each subcommand here explicitly because all the reliable ways of searching for modules are slow and delay startup.
|
||||||
"""
|
"""
|
||||||
from . import clone # noqa
|
from . import clone # noqa
|
||||||
|
from . import console # noqa
|
||||||
from . import env # noqa
|
from . import env # noqa
|
||||||
from . import setup # noqa
|
from . import setup # noqa
|
||||||
|
|||||||
@@ -0,0 +1,358 @@
|
|||||||
|
"""Acquire debugging information from usb hid devices
|
||||||
|
|
||||||
|
cli implementation of https://www.pjrc.com/teensy/hid_listen.html
|
||||||
|
"""
|
||||||
|
from functools import lru_cache
|
||||||
|
from pathlib import Path
|
||||||
|
from platform import platform
|
||||||
|
from threading import Thread
|
||||||
|
from time import sleep, strftime
|
||||||
|
|
||||||
|
from milc import cli
|
||||||
|
from milc.questions import yesno
|
||||||
|
|
||||||
|
LOG_COLOR = {
|
||||||
|
'next': 0,
|
||||||
|
'colors': [
|
||||||
|
'{fg_blue}',
|
||||||
|
'{fg_cyan}',
|
||||||
|
'{fg_green}',
|
||||||
|
'{fg_magenta}',
|
||||||
|
'{fg_red}',
|
||||||
|
'{fg_yellow}',
|
||||||
|
],
|
||||||
|
}
|
||||||
|
|
||||||
|
KNOWN_BOOTLOADERS = {
|
||||||
|
# VID , PID
|
||||||
|
('03EB', '2FEF'): 'atmel-dfu: ATmega16U2',
|
||||||
|
('03EB', '2FF0'): 'atmel-dfu: ATmega32U2',
|
||||||
|
('03EB', '2FF3'): 'atmel-dfu: ATmega16U4',
|
||||||
|
('03EB', '2FF4'): 'atmel-dfu: ATmega32U4',
|
||||||
|
('03EB', '2FF9'): 'atmel-dfu: AT90USB64',
|
||||||
|
('03EB', '2FFA'): 'atmel-dfu: AT90USB162',
|
||||||
|
('03EB', '2FFB'): 'atmel-dfu: AT90USB128',
|
||||||
|
('03EB', '6124'): 'Microchip SAM-BA',
|
||||||
|
('0483', 'DF11'): 'stm32-dfu: STM32 BOOTLOADER',
|
||||||
|
('16C0', '05DC'): 'USBasp: USBaspLoader',
|
||||||
|
('16C0', '05DF'): 'bootloadHID: HIDBoot',
|
||||||
|
('16C0', '0478'): 'halfkay: Teensy Halfkay',
|
||||||
|
('1B4F', '9203'): 'caterina: Pro Micro 3.3V',
|
||||||
|
('1B4F', '9205'): 'caterina: Pro Micro 5V',
|
||||||
|
('1B4F', '9207'): 'caterina: LilyPadUSB',
|
||||||
|
('1C11', 'B007'): 'kiibohd: Kiibohd DFU Bootloader',
|
||||||
|
('1EAF', '0003'): 'stm32duino: Maple 003',
|
||||||
|
('1FFB', '0101'): 'caterina: Polou A-Star 32U4 Bootloader',
|
||||||
|
('2341', '0036'): 'caterina: Arduino Leonardo',
|
||||||
|
('2341', '0037'): 'caterina: Arduino Micro',
|
||||||
|
('239A', '000C'): 'caterina: Adafruit Feather 32U4',
|
||||||
|
('239A', '000D'): 'caterina: Adafruit ItsyBitsy 32U4 3v',
|
||||||
|
('239A', '000E'): 'caterina: Adafruit ItsyBitsy 32U4 5v',
|
||||||
|
('239A', '000E'): 'caterina: Adafruit ItsyBitsy 32U4 5v',
|
||||||
|
('2A03', '0036'): 'caterina: Arduino Leonardo',
|
||||||
|
('2A03', '0037'): 'caterina: Arduino Micro',
|
||||||
|
('314B', '0106'): 'apm32-dfu: APM32 DFU ISP Mode'
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def install_deps():
|
||||||
|
"""Install the necessary dependencies for qmk console.
|
||||||
|
"""
|
||||||
|
this_platform = platform().lower()
|
||||||
|
|
||||||
|
if 'darwin' in this_platform or 'macos' in this_platform:
|
||||||
|
command = ['brew', 'install', 'hidapi']
|
||||||
|
elif 'linux' in this_platform:
|
||||||
|
command = ['sudo', 'apt', 'install', '-y', 'libhidapi-hidraw0', 'libusb-dev']
|
||||||
|
elif 'windows' in this_platform:
|
||||||
|
command = ['pacboy', 'sync', '--needed', '--noconfirm', '--disable-download-timeout', 'hidapi:x']
|
||||||
|
else:
|
||||||
|
cli.log.error('Unsupported platform: %s', this_platform)
|
||||||
|
|
||||||
|
if yesno("Would you like to run `%s` to install the necessary package?", ' '.join(command)):
|
||||||
|
cli.run(command, capture_output=False)
|
||||||
|
return True
|
||||||
|
|
||||||
|
|
||||||
|
@lru_cache(maxsize=0)
|
||||||
|
def import_usb_core():
|
||||||
|
"""Attempts to import the usb.core module.
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
import usb.core
|
||||||
|
return usb.core
|
||||||
|
|
||||||
|
except ImportError as e:
|
||||||
|
cli.log.error('Could not import usb.core: %s', e)
|
||||||
|
|
||||||
|
if install_deps():
|
||||||
|
return import_usb_core()
|
||||||
|
|
||||||
|
raise
|
||||||
|
|
||||||
|
|
||||||
|
def import_hid():
|
||||||
|
"""Attempts to import the hid module.
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
import hid
|
||||||
|
return hid
|
||||||
|
|
||||||
|
except ImportError as e:
|
||||||
|
cli.log.error('Could not import hid: %s', e)
|
||||||
|
|
||||||
|
if install_deps():
|
||||||
|
return import_hid()
|
||||||
|
|
||||||
|
raise
|
||||||
|
|
||||||
|
|
||||||
|
class MonitorDevice(object):
|
||||||
|
def __init__(self, hid_device, numeric):
|
||||||
|
self.hid = import_hid()
|
||||||
|
self.hid_device = hid_device
|
||||||
|
self.numeric = numeric
|
||||||
|
self.device = self.hid.Device(path=hid_device['path'])
|
||||||
|
self.current_line = ''
|
||||||
|
|
||||||
|
cli.log.info('Console Connected: %(color)s%(manufacturer_string)s %(product_string)s{style_reset_all} (%(color)s%(vendor_id)04X:%(product_id)04X:%(index)d{style_reset_all})', hid_device)
|
||||||
|
|
||||||
|
def read(self, size, encoding='ascii', timeout=1):
|
||||||
|
"""Read size bytes from the device.
|
||||||
|
"""
|
||||||
|
return self.device.read(size, timeout).decode(encoding)
|
||||||
|
|
||||||
|
def read_line(self):
|
||||||
|
"""Read from the device's console until we get a \n.
|
||||||
|
"""
|
||||||
|
while '\n' not in self.current_line:
|
||||||
|
self.current_line += self.read(32).replace('\x00', '')
|
||||||
|
|
||||||
|
lines = self.current_line.split('\n', 1)
|
||||||
|
self.current_line = lines[1]
|
||||||
|
|
||||||
|
return lines[0]
|
||||||
|
|
||||||
|
def run_forever(self):
|
||||||
|
while True:
|
||||||
|
try:
|
||||||
|
message = {**self.hid_device, 'text': self.read_line()}
|
||||||
|
identifier = (int2hex(message['vendor_id']), int2hex(message['product_id'])) if self.numeric else (message['manufacturer_string'], message['product_string'])
|
||||||
|
message['identifier'] = ':'.join(identifier)
|
||||||
|
message['ts'] = '{style_dim}{fg_green}%s{style_reset_all} ' % (strftime(cli.config.general.datetime_fmt),) if cli.args.timestamp else ''
|
||||||
|
|
||||||
|
cli.echo('%(ts)s%(color)s%(identifier)s:%(index)d{style_reset_all}: %(text)s' % message)
|
||||||
|
|
||||||
|
except self.hid.HIDException:
|
||||||
|
break
|
||||||
|
|
||||||
|
|
||||||
|
class FindDevices(object):
|
||||||
|
def __init__(self, vid, pid, index, numeric):
|
||||||
|
self.hid = import_hid()
|
||||||
|
self.vid = vid
|
||||||
|
self.pid = pid
|
||||||
|
self.index = index
|
||||||
|
self.numeric = numeric
|
||||||
|
|
||||||
|
def run_forever(self):
|
||||||
|
"""Process messages from our queue in a loop.
|
||||||
|
"""
|
||||||
|
live_devices = {}
|
||||||
|
live_bootloaders = {}
|
||||||
|
|
||||||
|
while True:
|
||||||
|
try:
|
||||||
|
for device in list(live_devices):
|
||||||
|
if not live_devices[device]['thread'].is_alive():
|
||||||
|
cli.log.info('Console Disconnected: %(color)s%(manufacturer_string)s %(product_string)s{style_reset_all} (%(color)s%(vendor_id)04X:%(product_id)04X:%(index)d{style_reset_all})', live_devices[device])
|
||||||
|
del live_devices[device]
|
||||||
|
|
||||||
|
for device in self.find_devices():
|
||||||
|
if device['path'] not in live_devices:
|
||||||
|
device['color'] = LOG_COLOR['colors'][LOG_COLOR['next']]
|
||||||
|
LOG_COLOR['next'] = (LOG_COLOR['next'] + 1) % len(LOG_COLOR['colors'])
|
||||||
|
live_devices[device['path']] = device
|
||||||
|
|
||||||
|
try:
|
||||||
|
monitor = MonitorDevice(device, self.numeric)
|
||||||
|
device['thread'] = Thread(target=monitor.run_forever, daemon=True)
|
||||||
|
|
||||||
|
device['thread'].start()
|
||||||
|
except Exception as e:
|
||||||
|
device['e'] = e
|
||||||
|
device['e_name'] = e.__class__.__name__
|
||||||
|
cli.log.error("Could not connect to %(color)s%(manufacturer_string)s %(product_string)s{style_reset_all} (%(color)s:%(vendor_id)04X:%(product_id)04X:%(index)d): %(e_name)s: %(e)s", device)
|
||||||
|
if cli.config.general.verbose:
|
||||||
|
cli.log.exception(e)
|
||||||
|
del live_devices[device['path']]
|
||||||
|
|
||||||
|
if cli.args.bootloaders:
|
||||||
|
for device in self.find_bootloaders():
|
||||||
|
if device.address in live_bootloaders:
|
||||||
|
live_bootloaders[device.address]._qmk_found = True
|
||||||
|
else:
|
||||||
|
name = KNOWN_BOOTLOADERS[(int2hex(device.idVendor), int2hex(device.idProduct))]
|
||||||
|
cli.log.info('Bootloader Connected: {style_bright}{fg_magenta}%s', name)
|
||||||
|
device._qmk_found = True
|
||||||
|
live_bootloaders[device.address] = device
|
||||||
|
|
||||||
|
for device in list(live_bootloaders):
|
||||||
|
if live_bootloaders[device]._qmk_found:
|
||||||
|
live_bootloaders[device]._qmk_found = False
|
||||||
|
else:
|
||||||
|
name = KNOWN_BOOTLOADERS[(int2hex(live_bootloaders[device].idVendor), int2hex(live_bootloaders[device].idProduct))]
|
||||||
|
cli.log.info('Bootloader Disconnected: {style_bright}{fg_magenta}%s', name)
|
||||||
|
del live_bootloaders[device]
|
||||||
|
|
||||||
|
sleep(.1)
|
||||||
|
|
||||||
|
except KeyboardInterrupt:
|
||||||
|
break
|
||||||
|
|
||||||
|
def is_bootloader(self, hid_device):
|
||||||
|
"""Returns true if the device in question matches a known bootloader vid/pid.
|
||||||
|
"""
|
||||||
|
return (int2hex(hid_device.idVendor), int2hex(hid_device.idProduct)) in KNOWN_BOOTLOADERS
|
||||||
|
|
||||||
|
def is_console_hid(self, hid_device):
|
||||||
|
"""Returns true when the usage page indicates it's a teensy-style console.
|
||||||
|
"""
|
||||||
|
return hid_device['usage_page'] == 0xFF31 and hid_device['usage'] == 0x0074
|
||||||
|
|
||||||
|
def is_filtered_device(self, hid_device):
|
||||||
|
"""Returns True if the device should be included in the list of available consoles.
|
||||||
|
"""
|
||||||
|
return int2hex(hid_device['vendor_id']) == self.vid and int2hex(hid_device['product_id']) == self.pid
|
||||||
|
|
||||||
|
def find_devices_by_report(self, hid_devices):
|
||||||
|
"""Returns a list of available teensy-style consoles by doing a brute-force search.
|
||||||
|
|
||||||
|
Some versions of linux don't report usage and usage_page. In that case we fallback to reading the report (possibly inaccurately) ourselves.
|
||||||
|
"""
|
||||||
|
devices = []
|
||||||
|
|
||||||
|
for device in hid_devices:
|
||||||
|
path = device['path'].decode('utf-8')
|
||||||
|
|
||||||
|
if path.startswith('/dev/hidraw'):
|
||||||
|
number = path[11:]
|
||||||
|
report = Path(f'/sys/class/hidraw/hidraw{number}/device/report_descriptor')
|
||||||
|
|
||||||
|
if report.exists():
|
||||||
|
rp = report.read_bytes()
|
||||||
|
|
||||||
|
if rp[1] == 0x31 and rp[3] == 0x09:
|
||||||
|
devices.append(device)
|
||||||
|
|
||||||
|
return devices
|
||||||
|
|
||||||
|
def find_bootloaders(self):
|
||||||
|
"""Returns a list of available bootloader devices.
|
||||||
|
"""
|
||||||
|
import usb.core
|
||||||
|
|
||||||
|
return list(filter(self.is_bootloader, usb.core.find(find_all=True)))
|
||||||
|
|
||||||
|
def find_devices(self):
|
||||||
|
"""Returns a list of available teensy-style consoles.
|
||||||
|
"""
|
||||||
|
hid_devices = self.hid.enumerate()
|
||||||
|
devices = list(filter(self.is_console_hid, hid_devices))
|
||||||
|
|
||||||
|
if not devices:
|
||||||
|
devices = self.find_devices_by_report(hid_devices)
|
||||||
|
|
||||||
|
if self.vid and self.pid:
|
||||||
|
devices = list(filter(self.is_filtered_device, devices))
|
||||||
|
|
||||||
|
# Add index numbers
|
||||||
|
device_index = {}
|
||||||
|
for device in devices:
|
||||||
|
id = ':'.join((int2hex(device['vendor_id']), int2hex(device['product_id'])))
|
||||||
|
|
||||||
|
if id not in device_index:
|
||||||
|
device_index[id] = 0
|
||||||
|
|
||||||
|
device_index[id] += 1
|
||||||
|
device['index'] = device_index[id]
|
||||||
|
|
||||||
|
return devices
|
||||||
|
|
||||||
|
|
||||||
|
def int2hex(number):
|
||||||
|
"""Returns a string representation of the number as hex.
|
||||||
|
"""
|
||||||
|
return "%04X" % number
|
||||||
|
|
||||||
|
|
||||||
|
def list_devices(device_finder):
|
||||||
|
"""Show the user a nicely formatted list of devices.
|
||||||
|
"""
|
||||||
|
devices = device_finder.find_devices()
|
||||||
|
|
||||||
|
if devices:
|
||||||
|
cli.log.info('Available devices:')
|
||||||
|
for dev in devices:
|
||||||
|
color = LOG_COLOR['colors'][LOG_COLOR['next']]
|
||||||
|
LOG_COLOR['next'] = (LOG_COLOR['next'] + 1) % len(LOG_COLOR['colors'])
|
||||||
|
cli.log.info("\t%s%s:%s:%d{style_reset_all}\t%s %s", color, int2hex(dev['vendor_id']), int2hex(dev['product_id']), dev['index'], dev['manufacturer_string'], dev['product_string'])
|
||||||
|
|
||||||
|
if cli.args.bootloaders:
|
||||||
|
bootloaders = device_finder.find_bootloaders()
|
||||||
|
|
||||||
|
if bootloaders:
|
||||||
|
cli.log.info('Available Bootloaders:')
|
||||||
|
|
||||||
|
for dev in bootloaders:
|
||||||
|
cli.log.info("\t%s:%s\t%s", int2hex(dev.idVendor), int2hex(dev.idProduct), KNOWN_BOOTLOADERS[(int2hex(dev.idVendor), int2hex(dev.idProduct))])
|
||||||
|
|
||||||
|
|
||||||
|
@cli.argument('--bootloaders', arg_only=True, default=True, action='store_boolean', help='displaying bootloaders.')
|
||||||
|
@cli.argument('-d', '--device', help='Device to select - uses format <pid>:<vid>[:<index>].')
|
||||||
|
@cli.argument('-l', '--list', arg_only=True, action='store_true', help='List available hid_listen devices.')
|
||||||
|
@cli.argument('-n', '--numeric', arg_only=True, action='store_true', help='Show VID/PID instead of names.')
|
||||||
|
@cli.argument('-t', '--timestamp', arg_only=True, action='store_true', help='Print the timestamp for received messages as well.')
|
||||||
|
@cli.argument('-w', '--wait', type=int, default=1, help="How many seconds to wait between checks (Default: 1)")
|
||||||
|
@cli.subcommand('Acquire debugging information from usb hid devices.')
|
||||||
|
def console(cli):
|
||||||
|
"""Acquire debugging information from usb hid devices
|
||||||
|
"""
|
||||||
|
vid = None
|
||||||
|
pid = None
|
||||||
|
index = 1
|
||||||
|
|
||||||
|
if cli.config.console.device:
|
||||||
|
device = cli.config.console.device.split(':')
|
||||||
|
|
||||||
|
if len(device) == 2:
|
||||||
|
vid, pid = device
|
||||||
|
|
||||||
|
elif len(device) == 3:
|
||||||
|
vid, pid, index = device
|
||||||
|
|
||||||
|
if not index.isdigit():
|
||||||
|
cli.log.error('Device index must be a number! Got "%s" instead.', index)
|
||||||
|
exit(1)
|
||||||
|
|
||||||
|
index = int(index)
|
||||||
|
|
||||||
|
if index < 1:
|
||||||
|
cli.log.error('Device index must be greater than 0! Got %s', index)
|
||||||
|
exit(1)
|
||||||
|
|
||||||
|
else:
|
||||||
|
cli.log.error('Invalid format for device, expected "<pid>:<vid>[:<index>]" but got "%s".', cli.config.console.device)
|
||||||
|
cli.print_help()
|
||||||
|
exit(1)
|
||||||
|
|
||||||
|
vid = vid.upper()
|
||||||
|
pid = pid.upper()
|
||||||
|
|
||||||
|
device_finder = FindDevices(vid, pid, index, cli.args.numeric)
|
||||||
|
|
||||||
|
if cli.args.list:
|
||||||
|
return list_devices(device_finder)
|
||||||
|
|
||||||
|
print('Looking for devices...', flush=True)
|
||||||
|
device_finder.run_forever()
|
||||||
@@ -1,20 +1,19 @@
|
|||||||
bleach==3.3.1
|
bleach==4.0.0
|
||||||
|
build==0.6.0.post1
|
||||||
bump2version==1.0.1
|
bump2version==1.0.1
|
||||||
bumpversion==0.6.0
|
bumpversion==0.6.0
|
||||||
certifi==2021.5.30
|
certifi==2021.5.30
|
||||||
cffi==1.14.6
|
cffi==1.14.6
|
||||||
chardet==4.0.0
|
chardet==4.0.0
|
||||||
colorama==0.4.4
|
|
||||||
cryptography==3.4.7
|
cryptography==3.4.7
|
||||||
docutils==0.17.1
|
docutils==0.17.1
|
||||||
idna==2.10
|
idna==2.10
|
||||||
importlib-metadata==4.6.1
|
importlib-metadata==4.6.3
|
||||||
jeepney==0.7.0
|
jeepney==0.7.1
|
||||||
keyring==23.0.1
|
keyring==23.0.1
|
||||||
packaging==21.0
|
packaging==21.0
|
||||||
pkginfo==1.7.1
|
pkginfo==1.7.1
|
||||||
pycparser==2.20
|
pycparser==2.20
|
||||||
Pygments==2.9.0
|
|
||||||
pyparsing==2.4.7
|
pyparsing==2.4.7
|
||||||
readme-renderer==29.0
|
readme-renderer==29.0
|
||||||
requests==2.26.0
|
requests==2.26.0
|
||||||
@@ -22,8 +21,8 @@ requests-toolbelt==0.9.1
|
|||||||
rfc3986==1.5.0
|
rfc3986==1.5.0
|
||||||
SecretStorage==3.3.1
|
SecretStorage==3.3.1
|
||||||
six==1.16.0
|
six==1.16.0
|
||||||
tqdm==4.61.2
|
tqdm==4.62.0
|
||||||
twine==3.4.1
|
twine==3.4.2
|
||||||
urllib3==1.26.6
|
urllib3==1.26.6
|
||||||
webencodings==0.5.1
|
webencodings==0.5.1
|
||||||
zipp==3.5.0
|
zipp==3.5.0
|
||||||
|
|||||||
@@ -1,13 +1,5 @@
|
|||||||
[bumpversion]
|
#[bumpversion]
|
||||||
current_version = 0.2.1
|
# Bumpversion config has been moved to .bumpversion.cfg
|
||||||
commit = True
|
|
||||||
tag = True
|
|
||||||
tag_name = {new_version}
|
|
||||||
message = New release: {current_version} → {new_version}
|
|
||||||
|
|
||||||
[bumpversion:file:qmk_cli/__init__.py]
|
|
||||||
|
|
||||||
[bumpversion:file:setup.cfg]
|
|
||||||
|
|
||||||
[bdist_wheel]
|
[bdist_wheel]
|
||||||
universal = 1
|
universal = 1
|
||||||
@@ -16,17 +8,58 @@ universal = 1
|
|||||||
ignore = E501,E226
|
ignore = E501,E226
|
||||||
|
|
||||||
[metadata]
|
[metadata]
|
||||||
|
name = qmk
|
||||||
|
version = 0.3.2
|
||||||
author = skullydazed
|
author = skullydazed
|
||||||
author-email = skullydazed@gmail.com
|
author_email = skullydazed@gmail.com
|
||||||
description-file = README.md
|
description = A program to help users work with QMK Firmware.
|
||||||
dist-name = qmk
|
long_description = file: README.md
|
||||||
license_file = LICENSE
|
long_description_content_type = text/markdown
|
||||||
module = qmk_cli
|
license = MIT License
|
||||||
home-page = https://github.com/qmk/qmk_cli
|
project_urls =
|
||||||
requires-python = >=3.7
|
Bug Tracker = https://github.com/qmk/qmk_cli/issues
|
||||||
|
Documentation = https://docs.qmk.fm/#/cli
|
||||||
|
Homepage = https://qmk.fm/
|
||||||
|
Source = https://github.com/qmk/qmk_cli/
|
||||||
|
classifiers =
|
||||||
|
Development Status :: 3 - Alpha
|
||||||
|
Environment :: Console
|
||||||
|
Intended Audience :: Developers
|
||||||
|
Intended Audience :: System Administrators
|
||||||
|
Intended Audience :: End Users/Desktop
|
||||||
|
License :: OSI Approved :: MIT License
|
||||||
|
Natural Language :: English
|
||||||
|
Programming Language :: Python :: 3 :: Only
|
||||||
|
Topic :: Scientific/Engineering
|
||||||
|
Topic :: Software Development
|
||||||
|
Topic :: Utilities
|
||||||
|
|
||||||
[entry_points]
|
[options]
|
||||||
qmk = qmk_cli.script_qmk:main
|
install_requires =
|
||||||
|
appdirs==1.4.4
|
||||||
|
argcomplete==1.12.3
|
||||||
|
attrs==21.2.0
|
||||||
|
colorama==0.4.4
|
||||||
|
coverage==5.5
|
||||||
|
halo==0.0.31
|
||||||
|
hid==1.0.4
|
||||||
|
log-symbols==0.0.14
|
||||||
|
mccabe==0.6.1
|
||||||
|
milc==1.5.0
|
||||||
|
pycodestyle==2.7.0
|
||||||
|
pyflakes==2.3.1
|
||||||
|
pyrsistent==0.18.0
|
||||||
|
pyusb==1.2.1
|
||||||
|
setuptools>=45
|
||||||
|
six==1.16.0
|
||||||
|
spinners==0.0.24
|
||||||
|
termcolor==1.1.0
|
||||||
|
packages = find:
|
||||||
|
python_requiures = >=3.7
|
||||||
|
|
||||||
|
[options.entry_points]
|
||||||
|
console_scripts =
|
||||||
|
qmk = qmk_cli.script_qmk:main
|
||||||
|
|
||||||
[yapf]
|
[yapf]
|
||||||
align_closing_bracket_with_visual_indent = True
|
align_closing_bracket_with_visual_indent = True
|
||||||
|
|||||||
@@ -1,69 +0,0 @@
|
|||||||
from configparser import ConfigParser
|
|
||||||
from setuptools import setup, find_packages
|
|
||||||
|
|
||||||
setup_cfg = ConfigParser()
|
|
||||||
setup_cfg.read('setup.cfg')
|
|
||||||
metadata = setup_cfg['metadata']
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
|
||||||
with open('README.md', encoding='utf-8') as readme_file:
|
|
||||||
long_description = readme_file.read()
|
|
||||||
setup(
|
|
||||||
name=metadata['dist-name'],
|
|
||||||
description='A program to help users work with QMK Firmware.',
|
|
||||||
entry_points={
|
|
||||||
'console_scripts': ['%s = %s' % i for i in setup_cfg['entry_points'].items()],
|
|
||||||
},
|
|
||||||
license='MIT License',
|
|
||||||
url=metadata['home-page'],
|
|
||||||
version=setup_cfg['bumpversion']['current_version'],
|
|
||||||
author=metadata['author'],
|
|
||||||
author_email=metadata['author-email'],
|
|
||||||
maintainer=metadata['author'],
|
|
||||||
maintainer_email=metadata['author-email'],
|
|
||||||
long_description=long_description,
|
|
||||||
long_description_content_type="text/markdown",
|
|
||||||
packages=find_packages(),
|
|
||||||
py_modules=['qmk_cli'],
|
|
||||||
classifiers=[
|
|
||||||
'Development Status :: 3 - Alpha',
|
|
||||||
'Environment :: Console',
|
|
||||||
'Intended Audience :: Developers',
|
|
||||||
'Intended Audience :: System Administrators',
|
|
||||||
'Intended Audience :: End Users/Desktop',
|
|
||||||
'License :: OSI Approved :: MIT License',
|
|
||||||
'Natural Language :: English',
|
|
||||||
'Programming Language :: Python :: 3 :: Only',
|
|
||||||
'Topic :: Scientific/Engineering',
|
|
||||||
'Topic :: Software Development',
|
|
||||||
'Topic :: Utilities',
|
|
||||||
],
|
|
||||||
python_requires=metadata['requires-python'],
|
|
||||||
install_requires=[
|
|
||||||
"appdirs==1.4.4",
|
|
||||||
"argcomplete==1.12.3",
|
|
||||||
"attrs==21.2.0",
|
|
||||||
"colorama==0.4.4",
|
|
||||||
"coverage==5.5",
|
|
||||||
"qmk-dotty-dict==1.3.0.post1",
|
|
||||||
"flake8==3.9.2",
|
|
||||||
"halo==0.0.31",
|
|
||||||
"hid==1.0.4",
|
|
||||||
"hjson==3.0.2",
|
|
||||||
"jsonschema==3.2.0",
|
|
||||||
"log-symbols==0.0.14",
|
|
||||||
"mccabe==0.6.1",
|
|
||||||
"milc==1.4.2",
|
|
||||||
"nose2==0.10.0",
|
|
||||||
"pycodestyle==2.7.0",
|
|
||||||
"pyflakes==2.3.1",
|
|
||||||
"Pygments==2.9.0",
|
|
||||||
"pyrsistent==0.18.0",
|
|
||||||
"pyusb==1.2.1",
|
|
||||||
"setuptools>=45",
|
|
||||||
"six==1.16.0",
|
|
||||||
"spinners==0.0.24",
|
|
||||||
"termcolor==1.1.0",
|
|
||||||
"yapf==0.31.0"
|
|
||||||
]
|
|
||||||
)
|
|
||||||
Executable
+29
@@ -0,0 +1,29 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""Trigger workflows that build QMK packages.
|
||||||
|
"""
|
||||||
|
from os import environ
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
import requests
|
||||||
|
|
||||||
|
# Pull in environment vars
|
||||||
|
gh_user = environ.get('GH_USERNAME', 'qmk-bot')
|
||||||
|
gh_pat = environ.get('QMK_BOT_TOKEN', '')
|
||||||
|
gh_repo_owner = environ.get('REPO_OWNER', 'qmk')
|
||||||
|
gh_repo_name = environ.get('REPO_NAME', 'qmk_fpm')
|
||||||
|
gh_ref = environ.get('GITHUB_REF', 'main')
|
||||||
|
gh_workflow_ids = environ.get('WORKFLOW_IDS', 'debian-buster-publish.yml,fedora-33-publish.yml,fedora-35-publish.yml,fedora-32-publish.yml,fedora-34-publish.yml,ubuntu-focal-publish.yml').split(',')
|
||||||
|
gh_api_url = environ.get('GITHUB_API_URL', 'https://api.github.com')
|
||||||
|
gh_workflow_args = {'ref': gh_ref}
|
||||||
|
gh_workflow_headers = {'Accept': 'application/vnd.github.v3+json'}
|
||||||
|
|
||||||
|
for gh_workflow_id in gh_workflow_ids:
|
||||||
|
gh_workflow_endpoint = f'{gh_api_url}/repos/{gh_repo_owner}/{gh_repo_name}/actions/workflows/{gh_workflow_id}/dispatches'
|
||||||
|
print(f'Triggering {gh_workflow_id} workflow at: {gh_workflow_endpoint}')
|
||||||
|
workflow_dispatch = requests.post(gh_workflow_endpoint, headers=gh_workflow_headers, json=gh_workflow_args, auth=(gh_user, gh_pat))
|
||||||
|
if workflow_dispatch.status_code != 204:
|
||||||
|
print(f'Error from GitHub API, status_code {workflow_dispatch.status_code}!')
|
||||||
|
print(workflow_dispatch.text)
|
||||||
|
exit(1)
|
||||||
|
|
||||||
|
exit(0)
|
||||||
Reference in New Issue
Block a user