v0.1.4-beta pair to G-Series LIGHTSPEED receivers

RoganDawes · Aug 20, 2019 · a0f44aa · a0f44aa
1 parent 6b58f4e
commit a0f44aa
Show file tree

Hide file tree

Showing 13 changed files with 34,909 additions and 34,893 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-# LOGITacker v0.1.3-beta
+# LOGITacker v0.1.4-beta
 
 - experimental Logitech LIGHTSPEED support (G-Series, tested with G603)
 - adjusted device listing with `devices` command (prints more data, especially for devices obtained from sniffed pairing)

diff --git a/apr-dongle/blank/config/sdk_config.h b/apr-dongle/blank/config/sdk_config.h
@@ -1975,7 +1975,7 @@
 // <i> Note: This value is not editable in Configuration Wizard.
 // <i> Serial number that is defined the same way like in @ref APP_USBD_STRINGS_MANUFACTURER.
 #ifndef APP_USBD_STRING_SERIAL
-#define APP_USBD_STRING_SERIAL APP_USBD_STRING_DESC("v0.1.3-beta")
+#define APP_USBD_STRING_SERIAL APP_USBD_STRING_DESC("v0.1.4-beta")
 #endif
 
 // </e>

diff --git a/build/logitacker_aprdongle.hex b/build/logitacker_aprdongle.hex
diff --git a/build/logitacker_aprdongle.uf2 b/build/logitacker_aprdongle.uf2
diff --git a/build/logitacker_mdk.hex b/build/logitacker_mdk.hex
diff --git a/build/logitacker_mdk_dongle.hex b/build/logitacker_mdk_dongle.hex
diff --git a/build/logitacker_pca10059.hex b/build/logitacker_pca10059.hex
diff --git a/logitacker/logitacker.h b/logitacker/logitacker.h
@@ -11,7 +11,7 @@ extern "C" {
 #include "nrf_esb_illegalmod.h"
 #include "logitacker_keyboard_map.h"
 
-#define VERSION_STRING "v0.1.3-beta"
+#define VERSION_STRING "v0.1.4-beta"
 
 //#define PAIRING_REQ_MARKER_BYTE 0xee // byte used as device ID in pairing requests
 #define ACTIVE_ENUM_INNER_LOOP_MAX 20 //how many CAPS presses / key releases get send

diff --git a/logitacker/logitacker_devices.h b/logitacker/logitacker_devices.h
@@ -14,6 +14,7 @@
 
 
 #define LOGITACKER_DEVICE_PROTOCOL_UNIFYING 0x04
+#define LOGITACKER_DEVICE_PROTOCOL_LIGHTSPEED 0x0C
 
 typedef enum {
  LOGITACKER_DEVICE_UNIFYING_TYPE_UNKNOWN = 0x00,

diff --git a/logitacker/logitacker_processor_pair_device.c b/logitacker/logitacker_processor_pair_device.c
@@ -357,10 +357,21 @@ void processor_pair_device_create_req1_pay(logitacker_processor_pair_device_ctx_
  memcpy(&self->tmp_tx_payload.data[3], pseudo_device_address, 5); // 3..7 pseudo device's current RF address
  self->tmp_tx_payload.data[8] = 0x08; //likely default keep-alive interval
  memcpy(&self->tmp_tx_payload.data[9], self->device_pairing_info.device_wpid, 2); //WPID of device
- self->tmp_tx_payload.data[11] = LOGITACKER_DEVICE_PROTOCOL_UNIFYING; //likely protocol (0x04 == Unifying ?)
- self->tmp_tx_payload.data[12] = 0x00; //unknown 0x00 for some devices (mouse, keyboard), 0x02 for others (mouse Anywhere MX 2, presenter)
+ if (g_logitacker_global_config.workmode == OPTION_LOGITACKER_WORKMODE_UNIFYING) {
+ self->tmp_tx_payload.data[11] = LOGITACKER_DEVICE_PROTOCOL_UNIFYING; //likely protocol (0x04 == Unifying ?)
+ self->tmp_tx_payload.data[12] = 0x00; //unknown 0x00 for some devices (mouse, keyboard), 0x02 for others (mouse Anywhere MX 2, presenter)
+ } else {
+ self->tmp_tx_payload.data[11] = LOGITACKER_DEVICE_PROTOCOL_LIGHTSPEED;
+ self->tmp_tx_payload.data[12] = 0x02; //unknown 0x00 for some devices (mouse, keyboard), 0x02 for others (mouse Anywhere MX 2, presenter)
+ }
+
  self->tmp_tx_payload.data[13] = self->device_pairing_info.device_type;
- self->tmp_tx_payload.data[14] = self->device_pairing_info.device_caps; // should have LOGITACKER_DEVICE_CAPS_UNIFYING_COMPATIBLE set and LOGITACKER_DEVICE_CAPS_LINK_ENCRYPTION unset
+ if (g_logitacker_global_config.workmode == OPTION_LOGITACKER_WORKMODE_UNIFYING) {
+ self->tmp_tx_payload.data[14] = self->device_pairing_info.device_caps; // should have LOGITACKER_DEVICE_CAPS_UNIFYING_COMPATIBLE set and LOGITACKER_DEVICE_CAPS_LINK_ENCRYPTION unset
+ } else {
+ self->tmp_tx_payload.data[14] = 0xB3; // should have LOGITACKER_DEVICE_CAPS_UNIFYING_COMPATIBLE set and LOGITACKER_DEVICE_CAPS_LINK_ENCRYPTION unset
+ }
+
  //15 is unknown
 
  self->tmp_tx_payload.pipe = 0; // first request is sent on pipe 0 (dongle pairing address)

diff --git a/mdk-dongle/blank/config/sdk_config.h b/mdk-dongle/blank/config/sdk_config.h
@@ -1975,7 +1975,7 @@
 // <i> Note: This value is not editable in Configuration Wizard.
 // <i> Serial number that is defined the same way like in @ref APP_USBD_STRINGS_MANUFACTURER.
 #ifndef APP_USBD_STRING_SERIAL
-#define APP_USBD_STRING_SERIAL APP_USBD_STRING_DESC("v0.1.3-beta")
+#define APP_USBD_STRING_SERIAL APP_USBD_STRING_DESC("v0.1.4-beta")
 #endif
 
 // </e>

diff --git a/mdk/blank/config/sdk_config.h b/mdk/blank/config/sdk_config.h
@@ -1975,7 +1975,7 @@
 // <i> Note: This value is not editable in Configuration Wizard.
 // <i> Serial number that is defined the same way like in @ref APP_USBD_STRINGS_MANUFACTURER.
 #ifndef APP_USBD_STRING_SERIAL
-#define APP_USBD_STRING_SERIAL APP_USBD_STRING_DESC("v0.1.3-beta")
+#define APP_USBD_STRING_SERIAL APP_USBD_STRING_DESC("v0.1.4-beta")
 #endif
 
 // </e>

diff --git a/pca10059/blank/config/sdk_config.h b/pca10059/blank/config/sdk_config.h
@@ -1975,7 +1975,7 @@
 // <i> Note: This value is not editable in Configuration Wizard.
 // <i> Serial number that is defined the same way like in @ref APP_USBD_STRINGS_MANUFACTURER.
 #ifndef APP_USBD_STRING_SERIAL
-#define APP_USBD_STRING_SERIAL APP_USBD_STRING_DESC("v0.1.3-beta")
+#define APP_USBD_STRING_SERIAL APP_USBD_STRING_DESC("v0.1.4-beta")
 #endif
 
 // </e>