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

Add capability to override the official SW update server url #6593

Conversation

Nir-Az
Copy link
Collaborator

@Nir-Az Nir-Az commented Jun 15, 2020

image

image

@Nir-Az Nir-Az force-pushed the sw_update_add_testing_URL_to_viewer_UI branch from f14f7e5 to 3ec2879 Compare June 15, 2020 11:43
Copy link
Collaborator

@ev-mp ev-mp left a comment

Choose a reason for hiding this comment

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

There are multiple formatting changes that are not essential in viewer.cpp - and some of them "break" the previous alignment like in lines 1463-1467.
can you drop those and leave only the new code?

@@ -161,6 +163,8 @@ namespace rs2
static const char* allow_rc_firmware { "update.allow_rc_firmware" };
static const char* recommend_updates { "update.recommend_updates" };
static const char* recommend_calibration { "update.recommend_calibration" };
static const char* sw_updates_url { "update.sw_update_url" };
static const char* sw_updates_operational_server { "update.sw_update_oprational_server" };
Copy link
Collaborator

Choose a reason for hiding this comment

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

oprational public/official

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

changed to official

@@ -161,6 +163,8 @@ namespace rs2
static const char* allow_rc_firmware { "update.allow_rc_firmware" };
static const char* recommend_updates { "update.recommend_updates" };
static const char* recommend_calibration { "update.recommend_calibration" };
static const char* sw_updates_url { "update.sw_update_url" };
static const char* sw_updates_operational_server { "update.sw_update_oprational_server" };
Copy link
Collaborator

Choose a reason for hiding this comment

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

operational public

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Changed to official

common/viewer.cpp Outdated Show resolved Hide resolved
common/viewer.cpp Outdated Show resolved Hide resolved
@Nir-Az Nir-Az force-pushed the sw_update_add_testing_URL_to_viewer_UI branch from 3ec2879 to 1ca7930 Compare June 15, 2020 13:53
@Nir-Az Nir-Az force-pushed the sw_update_add_testing_URL_to_viewer_UI branch from 1ca7930 to bc9c472 Compare June 16, 2020 06:32
@ev-mp ev-mp changed the title add operational or custom SW update server url add capability to override the official SW update server url Jun 16, 2020
@ev-mp ev-mp changed the title add capability to override the official SW update server url Add capability to override the official SW update server url Jun 16, 2020
Copy link
Collaborator

@ev-mp ev-mp left a comment

Choose a reason for hiding this comment

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

LGTM

@ev-mp ev-mp merged commit 51e85b4 into IntelRealSense:development Jun 16, 2020
@Nir-Az Nir-Az deleted the sw_update_add_testing_URL_to_viewer_UI branch July 29, 2020 12:37
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.

None yet

2 participants