Merge branch 'master' of ssh://git.ucw.cz/home/mj/GIT/home-hw

diff --cc USB-IDS
index 104179f2c4a1ea91cb5c45ba607c8c7ceb99cdbe,974405582ff046f3b67eb7075c8ae0135d5266da..13b5637c2a8820312024f41e68a23bce3680f6fe
--- 1/USB-IDS
--- 2/USB-IDS
+++ b/USB-IDS
@@@ -19,7 -19,8 +19,10 @@@ USB IDs used by our gadget
  4242:0011     Heart monitor collar
  4242:0012     Waiting Room controller bootloader
  4242:0013     Waiting Room controller
 +4242:0014     X-mas LED Strip bootloader
 +4242:0015     X-mas LED Strip
  cafe:cafe     KSP Space Alert thermometer
  cafe:caff     KSP Space Alert accelerometer
+ cafe:cb00     KSP Neopixel Strip bootloader
+ cafe:cb01     KSP Neopixel Strip
+ cafe:cb02     KSP Waiting Room controller