From 4c4e6fd6f95b5336987022f7e46543d21593bdfd Mon Sep 17 00:00:00 2001
From: Peter Wu <lekensteyn@gmail.com>
Date: Tue, 4 Jun 2013 23:17:50 +0200
Subject: [PATCH 1/3] doc/k360: add another recv+kbd, fixup recv serial

Bug in ltunify made the serial number shift by one byte.
---
 docs/devices/k360.txt | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/devices/k360.txt b/docs/devices/k360.txt
index bc0ec049..3162ee51 100644
--- a/docs/devices/k360.txt
+++ b/docs/devices/k360.txt
@@ -1,14 +1,17 @@
 Receiver
 LZ22175-DJ
+LZ30965-DJ (another receiver)
 M/N:C-U0007
 (ltunify)
-Serial number: 0353B192
+Serial number: 53B19204
+Serial number: 82C3964B (another receiver)
 Firmware version: 012.001.00019
 Bootloader version: BL.002.014
 (solaar-cli)
 -: Unifying Receiver
    Device path  : /dev/hidraw2
    Serial       : 53B19204
+   Serial       : 82C3964B (another receiver)
      Firmware   : 12.01.B0019
      Bootloader : 02.14
    Has 1 paired device(s) out of a maximum of 6
@@ -18,6 +21,7 @@ Keyboard
 K360
 P/N: 820-003472
 S/N: 1223CE0521E8
+S/N: 1311CE0097D8 (another keyboard)
 M/N: Y-R0017
 (ltunify)
 HID++ version: 2.0
@@ -50,6 +54,7 @@ Total number of HID++ 2.0 features: 12
    Polling rate : 20 ms
    Wireless PID : 4004
    Serial number: 60BA944E
+   Serial number: 0D2694C9 (another keyboard)
      Firmware   : RQK 36.00.B0007
    The power switch is located on the top case
    Supports 13 HID++ 2.0 features:

From 2d981cd73795523601cca1ac0d57e83d1c38196b Mon Sep 17 00:00:00 2001
From: Peter Wu <lekensteyn@gmail.com>
Date: Wed, 5 Jun 2013 00:21:45 +0200
Subject: [PATCH 2/3] docs: add mk700

---
 docs/devices.md        |  1 +
 docs/devices/mk700.txt | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 docs/devices/mk700.txt

diff --git a/docs/devices.md b/docs/devices.md
index fb63c745..5d7d2d82 100644
--- a/docs/devices.md
+++ b/docs/devices.md
@@ -67,6 +67,7 @@ Keyboards:
 | K400 Touch       | 2.0   | yes     |                                         |
 | K750 Solar       | 2.0   | yes     | FN swap, Lux reading, light button      |
 | K800 Illuminated | 1.0   | yes     | FN swap, reprog keys                    |
+| MK700            | 1.0   | yes     | FN swap, reprog keys                    |
 
 
 Mice:
diff --git a/docs/devices/mk700.txt b/docs/devices/mk700.txt
new file mode 100644
index 00000000..c2e088cd
--- /dev/null
+++ b/docs/devices/mk700.txt
@@ -0,0 +1,26 @@
+# Enabled Notifications
+# 10 - battery status
+# 02 + 01 - remap FN keys (multimedia + power buttons)
+>> (   1.412) [10 02 8100 130000] '\x10\x02\x81\x00\x13\x00\x00'
+<< (   0.011) [10 02 8101 000000] '\x10\x02\x81\x01\x00\x00\x00'
+>> (   0.276) [10 02 8101 000000] '\x10\x02\x81\x01\x00\x00\x00'
+
+# Battery status
+<< (   6.033) [10 02 8107 000000] '\x10\x02\x81\x07\x00\x00\x00'
+>> (   6.344) [10 02 8107 070000] '\x10\x02\x81\x07\x07\x00\x00'
+
+# FN status
+<< (   8.055) [10 02 8109 000000] '\x10\x02\x81\t\x00\x00\x00'
+>> (   8.144) [10 02 8109 000000] '\x10\x02\x81\t\x00\x00\x00'
+
+# ?
+<< ( 208.316) [10 02 81D0 000000] '\x10\x02\x81\xd0\x00\x00\x00'
+>> ( 208.353) [10 02 81D0 000000] '\x10\x02\x81\xd0\x00\x00\x00'
+
+# version info
+<< ( 237.436) [10 02 81F1 000000] '\x10\x02\x81\xf1\x00\x00\x00'
+>> ( 237.744) [10 02 8F81 F10300] '\x10\x02\x8f\x81\xf1\x03\x00'
+
+# ?
+<< ( 239.459) [10 02 81F3 000000] '\x10\x02\x81\xf3\x00\x00\x00'
+>> ( 239.766) [10 02 81F3 000000] '\x10\x02\x81\xf3\x00\x00\x00'

From 59459ebbd67979e2fe670b8fb9b414d7ee91354d Mon Sep 17 00:00:00 2001
From: Peter Wu <lekensteyn@gmail.com>
Date: Wed, 5 Jun 2013 00:32:44 +0200
Subject: [PATCH 3/3] Fix crash in Python3 due to excess space

The error message was:

    TabError: inconsistent use of tabs and spaces in indentation
---
 lib/solaar/ui/icons.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/solaar/ui/icons.py b/lib/solaar/ui/icons.py
index 76ea7d30..a9b88fd7 100644
--- a/lib/solaar/ui/icons.py
+++ b/lib/solaar/ui/icons.py
@@ -186,7 +186,7 @@ def icon_file(name, size=_LARGE_SIZE):
 	if _default_theme.has_icon(name):
 		theme_icon = _default_theme.lookup_icon(name, size, 0)
 		file_name = theme_icon.get_filename()
- 		_log.debug("icon %s(%d) => %s", name, size, file_name)
+		_log.debug("icon %s(%d) => %s", name, size, file_name)
 		return file_name
 
 	_log.warn("icon %s(%d) not found in current theme", name, size)