Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.1.4 #9

Merged
merged 2 commits into from
Jan 31, 2025
Merged

v1.1.4 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a40bfa
Fix wrong bit set for IN transfers
kauwua Jan 14, 2025
ef5b27e
Handle CLEAR_HALT
kauwua Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions hydradancer/firmware_hydradancer/User/definitions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
#define CHECK_HYDRADANCER_READY 57
#define DO_BUS_RESET 58
#define CONFIGURED 59
#define CLEAR_HALT 60

#define EVENT_BUS_RESET 0x0
#define EVENT_IN_BUFFER_AVAILABLE 0x1
Expand Down
18 changes: 17 additions & 1 deletion hydradancer/firmware_hydradancer/User/usb_control_handlers.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ static bool _usb_control_endp_rx_callback(uint8_t* data)
break;
}
endp_tx_set_new_buffer(&usb_device_0, endpoint_mapping_reverse[ep_queue_member->ep_num], ep_queue_member->ptr, ep_queue_member->size);
hydradancer_status_set_in(endpoint_mapping_reverse[ep_queue_member->ep_num]);
hydradancer_status_clear_in(endpoint_mapping_reverse[ep_queue_member->ep_num]);
return true;
}

Expand Down Expand Up @@ -198,6 +198,22 @@ uint16_t usb_control_endp0_user_handled_control_request(USB_SETUP* request, uint
}
return 0;
}
else if (request->bRequest == CLEAR_HALT)
{
LOG("CLEAR_HALT ep %d dir %d \r\n", request->wValue.bw.bb1, request->wValue.bw.bb0);

uint32_t ep = 0;
if (request->wValue.bw.bb0 == 0)
{
ep = 1U << ((request->wValue.bw.bb1 - 1) * 2 + 1);
}
else
{
ep = 1U << ((request->wValue.bw.bb1 - 1) * 2);
}
usb2_setup_endpoints_in_mask(ep);
return 0;
}
else if (request->bRequest == CHECK_HYDRADANCER_READY)
{
*buf = (uint8_t*)&boards_ready;
Expand Down