diff --git a/.gitignore b/.gitignore index 04b79f1c..3127051e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,3 @@ -/hid/.platformio/ -/hid/.pio/ /pkg/ /src/ /site/ diff --git a/Makefile b/Makefile index 9a992bab..6abed680 100644 --- a/Makefile +++ b/Makefile @@ -211,8 +211,8 @@ keymap: testenv --volume `pwd`:/src \ -it $(TESTENV_IMAGE) bash -c "cd src \ && ./genmap.py keymap.csv kvmd/keyboard/mappings.py.mako kvmd/keyboard/mappings.py \ - && ./genmap.py keymap.csv hid/lib/drivers/usb-keymap.h.mako hid/lib/drivers/usb-keymap.h \ - && ./genmap.py keymap.csv hid/lib/drivers-avr/ps2/keymap.h.mako hid/lib/drivers-avr/ps2/keymap.h \ + && ./genmap.py keymap.csv hid/arduino/lib/drivers/usb-keymap.h.mako hid/arduino/lib/drivers/usb-keymap.h \ + && ./genmap.py keymap.csv hid/arduino/lib/drivers-avr/ps2/keymap.h.mako hid/arduino/lib/drivers-avr/ps2/keymap.h \ " @@ -250,11 +250,11 @@ push: clean: rm -rf testenv/run/*.{pid,sock} build site dist pkg src v*.tar.gz *.pkg.tar.{xz,zst} *.egg-info kvmd-*.tar.gz find kvmd testenv/tests -name __pycache__ | xargs rm -rf - make -C hid clean + make -C hid/arduino clean clean-all: testenv clean - make -C hid clean-all + make -C hid/arduino clean-all - $(DOCKER) run --rm \ --volume `pwd`:/src \ -it $(TESTENV_IMAGE) bash -c "cd src && rm -rf testenv/{.ssl,.tox,.mypy_cache,.coverage}" diff --git a/hid/.gitignore b/hid/arduino/.gitignore similarity index 78% rename from hid/.gitignore rename to hid/arduino/.gitignore index 816b2920..05b843bc 100644 --- a/hid/.gitignore +++ b/hid/arduino/.gitignore @@ -1,3 +1,4 @@ +/.platformio/ /.pio/ /.current /.vscode/ diff --git a/hid/Makefile b/hid/arduino/Makefile similarity index 100% rename from hid/Makefile rename to hid/arduino/Makefile diff --git a/hid/avrdude-rpi.conf b/hid/arduino/avrdude-rpi.conf similarity index 100% rename from hid/avrdude-rpi.conf rename to hid/arduino/avrdude-rpi.conf diff --git a/hid/avrdude.py b/hid/arduino/avrdude.py similarity index 100% rename from hid/avrdude.py rename to hid/arduino/avrdude.py diff --git a/hid/lib/.gitignore b/hid/arduino/lib/.gitignore similarity index 100% rename from hid/lib/.gitignore rename to hid/arduino/lib/.gitignore diff --git a/hid/lib/drivers-avr/eeprom.h b/hid/arduino/lib/drivers-avr/eeprom.h similarity index 100% rename from hid/lib/drivers-avr/eeprom.h rename to hid/arduino/lib/drivers-avr/eeprom.h diff --git a/hid/lib/drivers-avr/factory.cpp b/hid/arduino/lib/drivers-avr/factory.cpp similarity index 100% rename from hid/lib/drivers-avr/factory.cpp rename to hid/arduino/lib/drivers-avr/factory.cpp diff --git a/hid/lib/drivers-avr/ps2/hid.h b/hid/arduino/lib/drivers-avr/ps2/hid.h similarity index 100% rename from hid/lib/drivers-avr/ps2/hid.h rename to hid/arduino/lib/drivers-avr/ps2/hid.h diff --git a/hid/lib/drivers-avr/ps2/keymap.h b/hid/arduino/lib/drivers-avr/ps2/keymap.h similarity index 100% rename from hid/lib/drivers-avr/ps2/keymap.h rename to hid/arduino/lib/drivers-avr/ps2/keymap.h diff --git a/hid/lib/drivers-avr/ps2/keymap.h.mako b/hid/arduino/lib/drivers-avr/ps2/keymap.h.mako similarity index 100% rename from hid/lib/drivers-avr/ps2/keymap.h.mako rename to hid/arduino/lib/drivers-avr/ps2/keymap.h.mako diff --git a/hid/lib/drivers-avr/spi.cpp b/hid/arduino/lib/drivers-avr/spi.cpp similarity index 100% rename from hid/lib/drivers-avr/spi.cpp rename to hid/arduino/lib/drivers-avr/spi.cpp diff --git a/hid/lib/drivers-avr/spi.h b/hid/arduino/lib/drivers-avr/spi.h similarity index 100% rename from hid/lib/drivers-avr/spi.h rename to hid/arduino/lib/drivers-avr/spi.h diff --git a/hid/lib/drivers-avr/usb/hid.h b/hid/arduino/lib/drivers-avr/usb/hid.h similarity index 100% rename from hid/lib/drivers-avr/usb/hid.h rename to hid/arduino/lib/drivers-avr/usb/hid.h diff --git a/hid/lib/drivers-stm32/README.md b/hid/arduino/lib/drivers-stm32/README.md similarity index 100% rename from hid/lib/drivers-stm32/README.md rename to hid/arduino/lib/drivers-stm32/README.md diff --git a/hid/lib/drivers-stm32/backup-register.h b/hid/arduino/lib/drivers-stm32/backup-register.h similarity index 100% rename from hid/lib/drivers-stm32/backup-register.h rename to hid/arduino/lib/drivers-stm32/backup-register.h diff --git a/hid/lib/drivers-stm32/bluepill_sch.png b/hid/arduino/lib/drivers-stm32/bluepill_sch.png similarity index 100% rename from hid/lib/drivers-stm32/bluepill_sch.png rename to hid/arduino/lib/drivers-stm32/bluepill_sch.png diff --git a/hid/lib/drivers-stm32/board-stm32.h b/hid/arduino/lib/drivers-stm32/board-stm32.h similarity index 100% rename from hid/lib/drivers-stm32/board-stm32.h rename to hid/arduino/lib/drivers-stm32/board-stm32.h diff --git a/hid/lib/drivers-stm32/factory.cpp b/hid/arduino/lib/drivers-stm32/factory.cpp similarity index 100% rename from hid/lib/drivers-stm32/factory.cpp rename to hid/arduino/lib/drivers-stm32/factory.cpp diff --git a/hid/lib/drivers-stm32/usb/hid-wrapper-stm32.h b/hid/arduino/lib/drivers-stm32/usb/hid-wrapper-stm32.h similarity index 100% rename from hid/lib/drivers-stm32/usb/hid-wrapper-stm32.h rename to hid/arduino/lib/drivers-stm32/usb/hid-wrapper-stm32.h diff --git a/hid/lib/drivers-stm32/usb/keyboard-stm32.h b/hid/arduino/lib/drivers-stm32/usb/keyboard-stm32.h similarity index 100% rename from hid/lib/drivers-stm32/usb/keyboard-stm32.h rename to hid/arduino/lib/drivers-stm32/usb/keyboard-stm32.h diff --git a/hid/lib/drivers-stm32/usb/mouse-absolute-stm32.h b/hid/arduino/lib/drivers-stm32/usb/mouse-absolute-stm32.h similarity index 100% rename from hid/lib/drivers-stm32/usb/mouse-absolute-stm32.h rename to hid/arduino/lib/drivers-stm32/usb/mouse-absolute-stm32.h diff --git a/hid/lib/drivers-stm32/usb/mouse-relative-stm32.h b/hid/arduino/lib/drivers-stm32/usb/mouse-relative-stm32.h similarity index 100% rename from hid/lib/drivers-stm32/usb/mouse-relative-stm32.h rename to hid/arduino/lib/drivers-stm32/usb/mouse-relative-stm32.h diff --git a/hid/lib/drivers/aum.h b/hid/arduino/lib/drivers/aum.h similarity index 100% rename from hid/lib/drivers/aum.h rename to hid/arduino/lib/drivers/aum.h diff --git a/hid/lib/drivers/board.h b/hid/arduino/lib/drivers/board.h similarity index 100% rename from hid/lib/drivers/board.h rename to hid/arduino/lib/drivers/board.h diff --git a/hid/lib/drivers/connection.h b/hid/arduino/lib/drivers/connection.h similarity index 100% rename from hid/lib/drivers/connection.h rename to hid/arduino/lib/drivers/connection.h diff --git a/hid/lib/drivers/driver.h b/hid/arduino/lib/drivers/driver.h similarity index 100% rename from hid/lib/drivers/driver.h rename to hid/arduino/lib/drivers/driver.h diff --git a/hid/lib/drivers/factory.h b/hid/arduino/lib/drivers/factory.h similarity index 100% rename from hid/lib/drivers/factory.h rename to hid/arduino/lib/drivers/factory.h diff --git a/hid/lib/drivers/keyboard.h b/hid/arduino/lib/drivers/keyboard.h similarity index 100% rename from hid/lib/drivers/keyboard.h rename to hid/arduino/lib/drivers/keyboard.h diff --git a/hid/lib/drivers/mouse.h b/hid/arduino/lib/drivers/mouse.h similarity index 100% rename from hid/lib/drivers/mouse.h rename to hid/arduino/lib/drivers/mouse.h diff --git a/hid/lib/drivers/serial.h b/hid/arduino/lib/drivers/serial.h similarity index 100% rename from hid/lib/drivers/serial.h rename to hid/arduino/lib/drivers/serial.h diff --git a/hid/lib/drivers/storage.h b/hid/arduino/lib/drivers/storage.h similarity index 100% rename from hid/lib/drivers/storage.h rename to hid/arduino/lib/drivers/storage.h diff --git a/hid/lib/drivers/tools.cpp b/hid/arduino/lib/drivers/tools.cpp similarity index 100% rename from hid/lib/drivers/tools.cpp rename to hid/arduino/lib/drivers/tools.cpp diff --git a/hid/lib/drivers/tools.h b/hid/arduino/lib/drivers/tools.h similarity index 100% rename from hid/lib/drivers/tools.h rename to hid/arduino/lib/drivers/tools.h diff --git a/hid/lib/drivers/usb-keymap.h b/hid/arduino/lib/drivers/usb-keymap.h similarity index 100% rename from hid/lib/drivers/usb-keymap.h rename to hid/arduino/lib/drivers/usb-keymap.h diff --git a/hid/lib/drivers/usb-keymap.h.mako b/hid/arduino/lib/drivers/usb-keymap.h.mako similarity index 100% rename from hid/lib/drivers/usb-keymap.h.mako rename to hid/arduino/lib/drivers/usb-keymap.h.mako diff --git a/hid/patch.py b/hid/arduino/patch.py similarity index 100% rename from hid/patch.py rename to hid/arduino/patch.py diff --git a/hid/patches/arduino-get-plugged-endpoint.patch b/hid/arduino/patches/arduino-get-plugged-endpoint.patch similarity index 100% rename from hid/patches/arduino-get-plugged-endpoint.patch rename to hid/arduino/patches/arduino-get-plugged-endpoint.patch diff --git a/hid/patches/arduino-main-no-usb.patch b/hid/arduino/patches/arduino-main-no-usb.patch similarity index 100% rename from hid/patches/arduino-main-no-usb.patch rename to hid/arduino/patches/arduino-main-no-usb.patch diff --git a/hid/patches/arduino-optional-cdc.patch b/hid/arduino/patches/arduino-optional-cdc.patch similarity index 100% rename from hid/patches/arduino-optional-cdc.patch rename to hid/arduino/patches/arduino-optional-cdc.patch diff --git a/hid/patches/hid-no-singletones.patch b/hid/arduino/patches/hid-no-singletones.patch similarity index 100% rename from hid/patches/hid-no-singletones.patch rename to hid/arduino/patches/hid-no-singletones.patch diff --git a/hid/patches/hid-shut-up.patch b/hid/arduino/patches/hid-shut-up.patch similarity index 100% rename from hid/patches/hid-shut-up.patch rename to hid/arduino/patches/hid-shut-up.patch diff --git a/hid/patches/hid-win98.patch b/hid/arduino/patches/hid-win98.patch similarity index 100% rename from hid/patches/hid-win98.patch rename to hid/arduino/patches/hid-win98.patch diff --git a/hid/patches/platformio-stm32f1-no-serial-usb.patch b/hid/arduino/patches/platformio-stm32f1-no-serial-usb.patch similarity index 100% rename from hid/patches/platformio-stm32f1-no-serial-usb.patch rename to hid/arduino/patches/platformio-stm32f1-no-serial-usb.patch diff --git a/hid/platformio-avr.ini b/hid/arduino/platformio-avr.ini similarity index 100% rename from hid/platformio-avr.ini rename to hid/arduino/platformio-avr.ini diff --git a/hid/platformio-stm32.ini b/hid/arduino/platformio-stm32.ini similarity index 100% rename from hid/platformio-stm32.ini rename to hid/arduino/platformio-stm32.ini diff --git a/hid/src/main.cpp b/hid/arduino/src/main.cpp similarity index 100% rename from hid/src/main.cpp rename to hid/arduino/src/main.cpp diff --git a/hid/src/outputs.h b/hid/arduino/src/outputs.h similarity index 100% rename from hid/src/outputs.h rename to hid/arduino/src/outputs.h diff --git a/hid/src/proto.h b/hid/arduino/src/proto.h similarity index 100% rename from hid/src/proto.h rename to hid/arduino/src/proto.h