Fix issues after rebase

Author: RedFantom

libmk/libmk.c

@@ -178,18 +178,6 @@ const unsigned char LIBMK_LAYOUT[2][3][LIBMK_MAX_ROWS][LIBMK_MAX_COLS] = {
 };
 
 
-const char* LIBMK_MODEL_STRINGS[] = {
-    "MasterKeys Pro L RGB", // 0
-    "MasterKeys Pro S RGB", // 1
-    "MasterKeys Pro L White", // 2
-    "MasterKeys Pro M White", // 3
-    "Unknown Model", // 4
-    "MasterKeys Pro M RGB", // 5
-    "Unknown Model", // 6
-    "MasterKeys Pro S White",
-};
-
-
 bool libmk_init(void) {
     int result = libusb_init(&Context);
 #ifdef LIBMK_USB_DEBUG
@@ -472,9 +460,9 @@ int libmk_enable_control(LibMK_Handle* handle) {
 
 
 int libmk_send_control_packet(LibMK_Handle* handle) {
-    r = libmk_set_control_mode(handle, LIBMK_CUSTOM_CTRL);
+    int r = libmk_set_control_mode(handle, LIBMK_CUSTOM_CTRL);
     if (r != LIBMK_SUCCESS)
-        return LIBMK_ERR_SEND;
+        return r;
     LibMK_Firmware* fw;
     r = libmk_get_firmware_version(handle, &fw);
     if (r != LIBMK_SUCCESS) {
@@ -565,40 +553,16 @@ int libmk_set_full_color(LibMK_Handle* handle,
 
 
 int libmk_send_packet(LibMK_Handle* handle, unsigned char* packet) {
-<<<<<<< HEAD
-=======
-    /** Send a single packet of data to the specified device
-     *
-     * Calls libmk_send_recv_packet but instructs it not to care about
-     * receiving a response.
-    */
     return libmk_send_recv_packet(handle, packet, true);
 }
 
 
 int libmk_send_recv_packet(
         LibMK_Handle* handle, unsigned char* packet, bool response_required) {
-    /** Send a single packet of data to the specified device
-     *
-     * The device operates in INTERRUPT mode, expects 64 bytes of data
-     * every time. First sends the packet to the device OUT endpoint,
-     * then reads a packet from the device IN endpoint. If the packet
-     * was correctly formatted, this received packet has the same header
-     * as the packet sent. If the header is HEADER_ERROR, then a
-     * protocol error has occurred and the packet was rejected.
-     *
-     * response_required: Boolean argument that determines whether an
-     *   acknowledgement packet is required from the keyboard. Nearly
-     *   all operations yield a confirmation packet, but some do not. If
-     *   it is not required, the function will still attempt to retrieve
-     *   a response, but not care if it is not available.
-    */
     if (handle == NULL)
         handle = DeviceHandle;
     if (handle == NULL)
         return LIBMK_ERR_DEV_NOT_SET;
-    
->>>>>>> 748c903... Fix errors during profile control
     int t, result;
     int r = libusb_interrupt_transfer(
         handle->handle, LIBMK_EP_OUT | LIBUSB_ENDPOINT_OUT,

libmk/libmk.h

@@ -50,7 +50,7 @@ typedef enum LibMK_Result {
     LIBMK_ERR_TRANSFER = -10, ///< Failed to transfer data to or from device
     LIBMK_ERR_DESCR = -11, ///< Failed to get libusb device descriptor
     LIBMK_ERR_PROTOCOL = -13, ///< Keyboard interaction protocol error
-    LIBMK_ERR_INV_ARGS = -14, ///< Invalid arguments passed by caller
+    LIBMK_ERR_INVALID_ARG = -14, ///< Invalid arguments passed by caller
 } LibMK_Result;
 
 
@@ -127,7 +127,6 @@ typedef enum LibMK_Model {
 } LibMK_Model;
 
 
-<<<<<<< HEAD
 /** @brief Struct describing a supported USB device
  *
  * This struct may be used as a linked list. Holds information required

masterkeys/__init__.py

@@ -103,8 +103,9 @@ def detect_devices():
     """
     Detect supported connected devices and return a tuple of models
     
-    :return: tuple[int] identifying models
-    :raises: RuntimeError upon internal Python error
+    :return: Tuple of integers (:class:``.Model``)
+    :rtype: Tuple[int, ...]
+    :raises: ``RuntimeError`` upon internal Python error
     """
     return _mk.detect_devices()
 
@@ -221,6 +222,7 @@ def get_device_ident():
     # type: () -> int
     """
     Return the bDevice USB descriptor value for the controlled keyboard
+
     :return: bDevice USB descriptor value or result code (<0)
     :rtype: int
     """
@@ -234,6 +236,11 @@ def set_all_led_color_dict(keys):
 
     The keys should be specified in a dictionary of the format
     {(row, col): (r, g, b)}
+
+    :param keys: Dictionary containing key color data
+    :type keys: Dict[Tuple[int, int], Tuple[int, int, int]]
+    :return: Result code (:class:``.ResultCode``)
+    :rtype: int
     """
     layout = build_layout_list()
     for (row, col), (r, g, b) in keys.items():
@@ -243,7 +250,12 @@ def set_all_led_color_dict(keys):
 
 def build_layout_list():
     # type: () -> List[List[Tuple[int, int, int], ...], ...]
-    """Return a list of the right proportions for full LED layout"""
+    """
+    Return a list of the right proportions for full LED layout
+
+    :return: Empty layout list
+    :rtype: List[List[Tuple[int, int, int], ...], ...]
+    """
     layout = list()
     for i in range(MAX_ROWS):
         column = list()