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.

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

Fix sr3xx firmware image size and recovery checks #8876

Merged
merged 2 commits into from
May 13, 2021

Conversation

ev-mp
Copy link
Collaborator

@ev-mp ev-mp commented Apr 21, 2021

Adjust recognized FW sizes for SR3xx
Modify SR3xx recovery device condition for Win10 1909
Tracked on DSO-16985

@ev-mp ev-mp force-pushed the sr3xx_fix branch 2 times, most recently from 8c13db9 to 42641e8 Compare April 21, 2021 14:46
@ev-mp ev-mp changed the base branch from 57 to development April 21, 2021 14:47
@ev-mp ev-mp requested a review from maloel April 21, 2021 14:49
src/rs.cpp Outdated
VALIDATE_FIXED_SIZE(image_size, unsigned_fw_size); // check if the given FW size matches the expected FW size
// check if the given FW size matches the expected FW size
auto fw_image_sz = { unsigned_fw_size, unsigned_sr300_size };
if (std::find(fw_image_sz.begin(), fw_image_sz.end(), image_size) == fw_image_sz.end())
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's three times now... maybe this should be abstracted into a helper function?

Copy link
Collaborator

@maloel maloel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, but see my comment

ev-mp added 2 commits May 12, 2021 09:24
Modify SR3xx recovery type to be based on PID only (MF classes has changed as of build 1909)
@ev-mp ev-mp merged commit 73d1ed5 into IntelRealSense:development May 13, 2021
@ev-mp ev-mp deleted the sr3xx_fix branch May 24, 2021 05:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants