Fix show fail safe for error

- Shows a fail safe text when a device is connected which is later on overwritten
- Allows to show that a device is not supported in the case of an error

Author: RockyZeroFour

src/gfx_main.c

@@ -469,13 +469,20 @@ void gfx_task(void)
                 gfx_set_device_label(usb_host_get_manuf_string(),
                                      usb_host_get_product_string(),
                                      usb_host_get_vidpid_string());
-                gfx_set_byte_offsets_text();
+
+                // Fail safe text in the case there is an error
+                lv_checkbox_set_text(hid_offsets_label, "DEVICE IS NOT SUPPORTED");
+                lv_obj_align_to(hid_offsets_label, productname_label, LV_ALIGN_OUT_BOTTOM_RIGHT, 0, 5);
                 break;
 
             case GFX_EVENT_HID_DEVICE_DISCONNECTED:
                 gfx_set_device_label("", "No USB device connected", "");
                 gfx_set_byte_offsets_text();
                 break;
+
+            case GFX_EVENT_HID_DEVICE_READY:
+                gfx_set_byte_offsets_text();
+                break;
         }
 
         // free event memory
@@ -496,3 +503,14 @@ void gfx_set_trigger_ready(bool state)
         lv_obj_clear_state(trigger_ready_cb, LV_STATE_CHECKED);
     }
 }
+
+void gfx_send_event(gfx_event_t type, int32_t value)
+{
+    // Send a message to the gfx thread, to refresh the device info
+    struct gfx_event *evt;
+    evt = osPoolAlloc(gfxevt_pool); // Allocate memory for the message
+    evt->type = type;
+    evt->value = value;
+
+    osMessagePut(msgQGfxTask, (uint32_t)evt, 0U);
+}

src/gfx_main.h

@@ -29,6 +29,7 @@ typedef enum gfx_event_type {
     GFX_EVENT_MEASUREMENT,
     GFX_EVENT_HID_DEVICE_CONNECTED,
     GFX_EVENT_HID_DEVICE_DISCONNECTED,
+    GFX_EVENT_HID_DEVICE_READY,
 } gfx_event_t;
 
 struct gfx_event {
@@ -41,5 +42,6 @@ void gfx_task(void);
 void gfx_set_device_label(const char * manufacturer, const char * productname, const char *vidpid);
 void gfx_set_trigger_ready(bool state);
 void gfx_set_byte_offsets_text();
+void gfx_send_event(gfx_event_t type, int32_t value);
 
 #endif //XLAT_F7_FW_GFX_H

src/usb/usb_host.c

@@ -70,36 +70,31 @@ static void USBH_UserProcess  (USBH_HandleTypeDef *phost, uint8_t id)
         case HOST_USER_SELECT_CONFIGURATION:
             break;
 
-        case HOST_USER_DISCONNECTION: {
+        case HOST_USER_DISCONNECTION:
             // Clear offsets
             xlat_clear_locations();
-            // Send a message to the gfx thread, to refresh the device info
-            struct gfx_event *evt;
-            evt = osPoolAlloc(gfxevt_pool); // Allocate memory for the message
-            evt->type = GFX_EVENT_HID_DEVICE_DISCONNECTED;
-            evt->value = 0;
-            osMessagePut(msgQGfxTask, (uint32_t)evt, 0U);
+
+            gfx_send_event(GFX_EVENT_HID_DEVICE_DISCONNECTED, 0);
             break;
+
+        case HOST_USER_CLASS_SELECTED:
+        case HOST_USER_NO_SUPPORTED_CLASS: {
+              // Compose vidpid string
+              uint16_t vid = phost->device.DevDesc.idVendor;
+              uint16_t pid = phost->device.DevDesc.idProduct;
+              memset(vidpid_string, 0, sizeof(vidpid_string));
+              snprintf(vidpid_string, sizeof(vidpid_string), "0x%04X:%04X", vid, pid);
+              vidpid_string[sizeof(vidpid_string) - 1] = '\0';
+
+              gfx_send_event(GFX_EVENT_HID_DEVICE_CONNECTED, 0);
+              break;
         }
 
-        case HOST_USER_NO_SUPPORTED_CLASS:
-        case HOST_USER_CLASS_ACTIVE: {
-            // Compose vidpid string
-            uint16_t vid = phost->device.DevDesc.idVendor;
-            uint16_t pid = phost->device.DevDesc.idProduct;
-            printf("USB device connected: 0x%04X:%04X\n", vid, pid);
-            memset(vidpid_string, 0, sizeof(vidpid_string));
-            snprintf(vidpid_string, sizeof(vidpid_string), "0x%04X:%04X", vid, pid);
-            vidpid_string[sizeof(vidpid_string) - 1] = '\0';
-
-            // Send a message to the gfx thread, to refresh the device info
-            struct gfx_event *evt;
-            evt = osPoolAlloc(gfxevt_pool); // Allocate memory for the message
-            evt->type = GFX_EVENT_HID_DEVICE_CONNECTED;
-            evt->value = 0;
-            osMessagePut(msgQGfxTask, (uint32_t)evt, 0U);
+        case HOST_USER_CLASS_ACTIVE:
+            printf("USB device ready\n");
+
+            gfx_send_event(GFX_EVENT_HID_DEVICE_READY, 0);
             break;
-        }
 
         case HOST_USER_CONNECTION:
         default:
@@ -136,4 +131,4 @@ char * usb_host_get_manuf_string(void)
 char * usb_host_get_vidpid_string(void)
 {
     return vidpid_string;
-}
+}

src/xlat.c

@@ -267,12 +267,7 @@ static int calculate_gpio_to_usb_time(void)
 
     xlat_add_latency_measurement(us, LATENCY_GPIO_TO_USB);
 
-    // send a message to the gfx thread, to refresh the plot
-    struct gfx_event *evt;
-    evt = osPoolAlloc(gfxevt_pool); // Allocate memory for the message
-    evt->type = GFX_EVENT_MEASUREMENT;
-    evt->value = us;
-    osMessagePut(msgQGfxTask, (uint32_t)evt, 0U);
+    gfx_send_event(GFX_EVENT_MEASUREMENT, us);
 
     return 0;
 }
@@ -760,12 +755,7 @@ void xlat_parse_hid_descriptor(uint8_t *desc, size_t desc_size)
     // Find click and motion data offsets
     check_offsets();
 
-    // Send a message to the gfx thread, to refresh the device info
-    struct gfx_event *evt;
-    evt = osPoolAlloc(gfxevt_pool); // Allocate memory for the message
-    evt->type = GFX_EVENT_HID_DEVICE_CONNECTED;
-    evt->value = 0;
-    osMessagePut(msgQGfxTask, (uint32_t)evt, 0U);
+    gfx_send_event(GFX_EVENT_HID_DEVICE_CONNECTED, 0);
 }
 
 hid_data_location_t * xlat_get_button_location(void)