Browse Source

Fixed usb read loops not reading until timeout (#16827)

* the size variable was redeclared (hiding the variable of the outside scope) and therefore the while check was always false, so the compiler just removed the do while loop, but it would be better to read all data and only exit the task, after this is done
Sascha 3 năm trước cách đây
mục cha
commit
bf67abb046

+ 3 - 3
tmk_core/protocol/chibios/usb_main.c

@@ -1074,7 +1074,7 @@ void console_task(void) {
     uint8_t buffer[CONSOLE_EPSIZE];
     uint8_t buffer[CONSOLE_EPSIZE];
     size_t  size = 0;
     size_t  size = 0;
     do {
     do {
-        size_t size = chnReadTimeout(&drivers.console_driver.driver, buffer, sizeof(buffer), TIME_IMMEDIATE);
+        size = chnReadTimeout(&drivers.console_driver.driver, buffer, sizeof(buffer), TIME_IMMEDIATE);
         if (size > 0) {
         if (size > 0) {
             console_receive(buffer, size);
             console_receive(buffer, size);
         }
         }
@@ -1102,7 +1102,7 @@ void raw_hid_task(void) {
     uint8_t buffer[RAW_EPSIZE];
     uint8_t buffer[RAW_EPSIZE];
     size_t  size = 0;
     size_t  size = 0;
     do {
     do {
-        size_t size = chnReadTimeout(&drivers.raw_driver.driver, buffer, sizeof(buffer), TIME_IMMEDIATE);
+        size = chnReadTimeout(&drivers.raw_driver.driver, buffer, sizeof(buffer), TIME_IMMEDIATE);
         if (size > 0) {
         if (size > 0) {
             raw_hid_receive(buffer, size);
             raw_hid_receive(buffer, size);
         }
         }
@@ -1125,7 +1125,7 @@ void midi_ep_task(void) {
     uint8_t buffer[MIDI_STREAM_EPSIZE];
     uint8_t buffer[MIDI_STREAM_EPSIZE];
     size_t  size = 0;
     size_t  size = 0;
     do {
     do {
-        size_t size = chnReadTimeout(&drivers.midi_driver.driver, buffer, sizeof(buffer), TIME_IMMEDIATE);
+        size = chnReadTimeout(&drivers.midi_driver.driver, buffer, sizeof(buffer), TIME_IMMEDIATE);
         if (size > 0) {
         if (size > 0) {
             MIDI_EventPacket_t event;
             MIDI_EventPacket_t event;
             recv_midi_packet(&event);
             recv_midi_packet(&event);