Slight refactoring after receiving PR

WootingKb · Apr 30, 2024 · 2166074 · 2166074
1 parent ca00497
commit 2166074
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 16 deletions.
diff --git a/src/gfx_main.c b/src/gfx_main.c
@@ -298,9 +298,9 @@ void gfx_set_byte_offsets_text(void)
     uint8_t               interface = xlat_get_found_interface();
 
     if (button->found && x->found && y->found && XLAT_MODE_KEY != xlat_get_mode()) {
-        sprintf(text, "Mouse Data (#%d): id@%d click@%d motion@%d,%d", interface, xlat_get_reportid(), button->byte_offset, x->byte_offset, y->byte_offset);
+        sprintf(text, "Mouse Data (#%d): id%d click@%d motion@%d,%d", interface, xlat_get_reportid(), button->byte_offset, x->byte_offset, y->byte_offset);
     } else if (key->found && XLAT_MODE_KEY == xlat_get_mode()) {
-        sprintf(text, "Keyboard Data (#%d): id@%d pressed@%d", interface, xlat_get_reportid(), key->byte_offset);
+        sprintf(text, "Keyboard Data (#%d): id%d pressed@%d", interface, xlat_get_reportid(), key->byte_offset);
     } else {
         // offsets not found
         sprintf(text, (XLAT_MODE_KEY == xlat_get_mode()) ? "Keyboard Data: offsets not found" : "Mouse Data: offsets not found");

diff --git a/src/gfx_settings.c b/src/gfx_settings.c
@@ -98,16 +98,18 @@ static void event_handler(lv_event_t* e)
                 // Motion [M]
                 case 1:
                     xlat_set_mode(XLAT_MODE_MOTION);
-                break;
+                    break;
 
-                // Key [K]
+                    // Key [K]
                 case 2:
                     xlat_set_mode(XLAT_MODE_KEY);
-                break;
+                    break;
 
-                // Click [M]
+                    // Click [M]
+                case 3:
                 default:
                     xlat_set_mode(XLAT_MODE_CLICK);
+                    break;
             }
         }
         else if (obj == (lv_obj_t *)interface_dropdown) {
@@ -118,11 +120,12 @@ static void event_handler(lv_event_t* e)
                 // Auto
                 case 0:
                     xlat_set_interface_selection(XLAT_INTERFACE_AUTO);
-                break;
+                    break;
 
                 // Any specific interface number
                 default:
                     xlat_set_interface_selection(XLAT_INTERFACE_0 + sel - 1);
+                    break;
             }
         }
         else {
@@ -275,10 +278,11 @@ void gfx_settings_create_page(lv_obj_t *previous_screen)
     switch (interface_selection) {
         case XLAT_INTERFACE_AUTO:
             interface_index = 0;
-        break;
+            break;
 
         default:
             interface_index = 1 + interface_selection - XLAT_INTERFACE_0;
+            break;
     }
 
     lv_dropdown_set_selected((lv_obj_t *) interface_dropdown, interface_index);

diff --git a/src/usb/usbh_core.c b/src/usb/usbh_core.c
@@ -482,7 +482,6 @@ USBH_StatusTypeDef USBH_Process(USBH_HandleTypeDef *phost)
   __IO USBH_StatusTypeDef status = USBH_FAIL;
   uint8_t idx = 0U;
   uint8_t i = 0U;
-  bool stop = false;
 
   /* check for Host pending port disconnect event */
   if (phost->device.is_disconnected == 1U)
@@ -709,15 +708,15 @@ USBH_StatusTypeDef USBH_Process(USBH_HandleTypeDef *phost)
       {
         phost->pActiveClass = NULL;
 
-        for (idx = 0U, stop = false; idx < USBH_MAX_NUM_SUPPORTED_CLASS && !stop; idx++)
+        for (idx = 0U; idx < USBH_MAX_NUM_SUPPORTED_CLASS; idx++)
         {
           // Check if the device has an interface where the class is supported
-          for (i = 0U; i < USBH_MAX_NUM_INTERFACES && !stop; i++)
+          for (i = 0U; i < USBH_MAX_NUM_INTERFACES; i++)
           {
             if (phost->pClass[idx]->ClassCode == phost->device.CfgDesc.Itf_Desc[i].bInterfaceClass)
             {
               phost->pActiveClass = phost->pClass[idx];
-              stop = true;
+              break;
             }
           }
         }

diff --git a/src/usb/usbh_hid.c b/src/usb/usbh_hid.c
@@ -69,7 +69,10 @@ static USBH_StatusTypeDef USBH_HID_InterfaceInit(USBH_HandleTypeDef *phost)
     // Handle the AUTO interface detection mode
     if (XLAT_INTERFACE_AUTO == xlat_get_interface_selection()) {
         // First try to find a Mouse or Keyboard interface depending on the detection mode, specifically:
-        interface = USBH_FindInterface(phost, phost->pActiveClass->ClassCode, HID_BOOT_CODE, (XLAT_MODE_KEY == xlat_get_mode()) ? HID_KEYBRD_BOOT_CODE : HID_MOUSE_BOOT_CODE);
+        interface = USBH_FindInterface(phost,
+                                       phost->pActiveClass->ClassCode,
+                                       HID_BOOT_CODE,
+                                       (XLAT_MODE_KEY == xlat_get_mode()) ? HID_KEYBRD_BOOT_CODE : HID_MOUSE_BOOT_CODE);
 
         // Broaden the search criteria to no specific protocol
         if (interface == 0xFFU) {
@@ -272,8 +275,7 @@ static USBH_StatusTypeDef USBH_HID_ClassRequest(USBH_HandleTypeDef *phost)
             if (classReqStatus == USBH_OK) {
                 HID_Handle->ctl_state = USBH_HID_REQ_IDLE;
 
-                if (phost->pUser != NULL)
-                {
+                if (phost->pUser != NULL) {
                     /* all requests performed*/
                     phost->pUser(phost, HOST_USER_CLASS_ACTIVE);
                 }

diff --git a/src/xlat.c b/src/xlat.c
@@ -393,7 +393,7 @@ void xlat_usb_hid_event(void)
     uint8_t hid_raw_data[64];
 
     if (USBH_HID_GetRawData(phost, hid_raw_data) == USBH_OK) {
-        // check reportId for ULX
+        // check reportId
         if (hid_reportid && (hid_raw_data[0] != hid_reportid)) {
             // ignore
             goto out;