Skip to content

Commit

Permalink
Merge pull request #4666 from radfordi/sync-options
Browse files Browse the repository at this point in the history 
Sync Wrapper Options
  • Loading branch information
@dorodnic
dorodnic authored Aug 20, 2019
2 parents fadcd4d + 48caf65 commit 9ee4317
Show file tree
Hide file tree
Showing 5 changed files with 129 additions and 2 deletions.
18 changes: 17 additions & 1 deletion wrappers/matlab/option.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,22 @@
stereo_baseline (40)
auto_exposure_converge_step (41)
inter_cam_sync_mode (42)
count (43)
stream_filter (43)
stream_format_filter (44)
stream_index_filter (45)
emitter_on_off (46)
zero_order_point_x (47)
zero_order_point_y (48)
lld_temperature (49)
mc_temperature (50)
ma_temperature (51)
apd_temperature (52)
hardware_preset (53)
global_time_enabled (54)
enable_mapping (55)
enable_relocalization (56)
enable_pose_jumping (57)
enable_dynamic_calibration (58)
count (59)
end
end
64 changes: 64 additions & 0 deletions wrappers/nodejs/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4545,6 +4545,22 @@ const option = {
* <br>Equivalent to its uppercase counterpart.
*/
option_inter_cam_sync_mode: 'inter-cam-sync-mode',
option_stream_filter: 'stream-filter',
option_stream_format_filter: 'stream-format-filter',
option_stream_index_filter: 'stream-index-filter',
option_emitter_on_off: 'emitter-on-off',
option_zero_order_point_x: 'zero-order-point-x',
option_zero_order_point_y: 'zero-order-point-y',
option_lld_temperature: 'lld-temperature',
option_mc_temperature: 'mc-temperature',
option_ma_temperature: 'ma-temperature',
option_apd_temperature: 'apd-temperature',
option_hardware_preset: 'hardware-preset',
option_global_time_enabled: 'global-time-enabled',
option_enable_mapping: 'enable-mapping',
option_enable_relocalization: 'enable-relocalization',
option_enable_pose_jumping: 'enable-pose-jumping',
option_enable_dynamic_calibration: 'enable-dynamic-calibration',
/**
* Enable / disable color backlight compensatio.<br>Equivalent to its lowercase counterpart.
* @type {Integer}
Expand Down Expand Up @@ -4791,6 +4807,22 @@ const option = {
* @type {Integer}
*/
OPTION_INTER_CAM_SYNC_MODE: RS2.RS2_OPTION_INTER_CAM_SYNC_MODE,
OPTION_STREAM_FILTER: RS2.RS2_OPTION_STREAM_FILTER,
OPTION_STREAM_FORMAT_FILTER: RS2.RS2_OPTION_STREAM_FORMAT_FILTER,
OPTION_STREAM_INDEX_FILTER: RS2.RS2_OPTION_STREAM_INDEX_FILTER,
OPTION_EMITTER_ON_OFF: RS2.RS2_OPTION_EMITTER_ON_OFF,
OPTION_ZERO_ORDER_POINT_X: RS2.RS2_OPTION_ZERO_ORDER_POINT_X,
OPTION_ZERO_ORDER_POINT_Y: RS2.RS2_OPTION_ZERO_ORDER_POINT_Y,
OPTION_LLD_TEMPERATURE: RS2.RS2_OPTION_LLD_TEMPERATURE,
OPTION_MC_TEMPERATURE: RS2.RS2_OPTION_MC_TEMPERATURE,
OPTION_MA_TEMPERATURE: RS2.RS2_OPTION_MA_TEMPERATURE,
OPTION_HARDWARE_PRESET: RS2.RS2_OPTION_HARDWARE_PRESET,
OPTION_GLOBAL_TIME_ENABLED: RS2.RS2_OPTION_GLOBAL_TIME_ENABLED,
OPTION_APD_TEMPERATURE: RS2.RS2_OPTION_APD_TEMPERATURE,
OPTION_ENABLE_MAPPING: RS2.RS2_OPTION_ENABLE_MAPPING,
OPTION_ENABLE_RELOCALIZATION: RS2.RS2_OPTION_ENABLE_RELOCALIZATION,
OPTION_ENABLE_POSE_JUMPING: RS2.RS2_OPTION_ENABLE_POSE_JUMPING,
OPTION_ENABLE_DYNAMIC_CALIBRATION: RS2.RS2_OPTION_ENABLE_DYNAMIC_CALIBRATION,
/**
* Number of enumeration values. Not a valid input: intended to be used in for-loops.
* @type {Integer}
Expand Down Expand Up @@ -4893,6 +4925,38 @@ const option = {
return this.option_auto_exposure_converge_step;
case this.OPTION_INTER_CAM_SYNC_MODE:
return this.option_inter_cam_sync_mode;
case this.OPTION_STREAM_FILTER:
return this.option_stream_filter;
case this.OPTION_STREAM_FORMAT_FILTER:
return this.option_stream_format_filter;
case this.OPTION_STREAM_INDEX_FILTER:
return this.option_stream_index_filter;
case this.OPTION_EMITTER_ON_OFF:
return this.option_emitter_on_off;
case this.OPTION_ZERO_ORDER_POINT_X:
return this.option_zero_order_point_x;
case this.OPTION_ZERO_ORDER_POINT_Y:
return this.option_zero_order_point_y;
case this.OPTION_LLD_TEMPERATURE:
return this.option_lld_temperature;
case this.OPTION_MC_TEMPERATURE:
return this.option_mc_temperature;
case this.OPTION_MA_TEMPERATURE:
return this.option_ma_temperature;
case this.OPTION_HARDWARE_PRESET:
return this.option_hardware_preset;
case this.OPTION_GLOBAL_TIME_ENABLED:
return this.option_global_time_enabled;
case this.OPTION_APD_TEMPERATURE:
return this.option_apd_temperature;
case this.OPTION_ENABLE_MAPPING:
return this.option_enable_mapping;
case this.OPTION_ENABLE_RELOCALIZATION:
return this.option_enable_relocalization;
case this.OPTION_ENABLE_POSE_JUMPING:
return this.option_enable_pose_jumping;
case this.OPTION_ENABLE_DYNAMIC_CALIBRATION:
return this.option_enable_dynamic_calibration;
default:
throw new TypeError(
'option.optionToString(option) expects a valid value as the 1st argument');
Expand Down
16 changes: 16 additions & 0 deletions wrappers/nodejs/src/addon.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4682,6 +4682,22 @@ void InitModule(v8::Local<v8::Object> exports) {
_FORCE_SET_ENUM(RS2_OPTION_STEREO_BASELINE);
_FORCE_SET_ENUM(RS2_OPTION_AUTO_EXPOSURE_CONVERGE_STEP);
_FORCE_SET_ENUM(RS2_OPTION_INTER_CAM_SYNC_MODE);
_FORCE_SET_ENUM(RS2_OPTION_STREAM_FILTER);
_FORCE_SET_ENUM(RS2_OPTION_STREAM_FORMAT_FILTER);
_FORCE_SET_ENUM(RS2_OPTION_STREAM_INDEX_FILTER);
_FORCE_SET_ENUM(RS2_OPTION_EMITTER_ON_OFF);
_FORCE_SET_ENUM(RS2_OPTION_ZERO_ORDER_POINT_X);
_FORCE_SET_ENUM(RS2_OPTION_ZERO_ORDER_POINT_Y);
_FORCE_SET_ENUM(RS2_OPTION_LLD_TEMPERATURE);
_FORCE_SET_ENUM(RS2_OPTION_MC_TEMPERATURE);
_FORCE_SET_ENUM(RS2_OPTION_MA_TEMPERATURE);
_FORCE_SET_ENUM(RS2_OPTION_HARDWARE_PRESET);
_FORCE_SET_ENUM(RS2_OPTION_GLOBAL_TIME_ENABLED);
_FORCE_SET_ENUM(RS2_OPTION_APD_TEMPERATURE);
_FORCE_SET_ENUM(RS2_OPTION_ENABLE_MAPPING);
_FORCE_SET_ENUM(RS2_OPTION_ENABLE_RELOCALIZATION);
_FORCE_SET_ENUM(RS2_OPTION_ENABLE_POSE_JUMPING);
_FORCE_SET_ENUM(RS2_OPTION_ENABLE_DYNAMIC_CALIBRATION);
_FORCE_SET_ENUM(RS2_OPTION_COUNT);

// rs2_camera_info
Expand Down
16 changes: 15 additions & 1 deletion wrappers/python/pybackend.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,24 @@ PYBIND11_MODULE(NAME, m) {
.value("filter_smooth_delta", RS2_OPTION_FILTER_SMOOTH_DELTA)
.value("filter_holes_fill", RS2_OPTION_HOLES_FILL)
.value("stereo_baseline", RS2_OPTION_STEREO_BASELINE)
.value("auto_exposure_converge_step", RS2_OPTION_AUTO_EXPOSURE_CONVERGE_STEP)
.value("inter_cam_sync_mode", RS2_OPTION_INTER_CAM_SYNC_MODE)
.value("stream_filter", RS2_OPTION_STREAM_FILTER)
.value("stream_format_filter", RS2_OPTION_STREAM_FORMAT_FILTER)
.value("stream_index_filter", RS2_OPTION_STREAM_INDEX_FILTER)
.value("emitter_on_off", RS2_OPTION_EMITTER_ON_OFF)
.value("zero_order_point_x", RS2_OPTION_ZERO_ORDER_POINT_X)
.value("zero_order_point_y", RS2_OPTION_ZERO_ORDER_POINT_Y)
.value("lld_temperature", RS2_OPTION_LLD_TEMPERATURE)
.value("mc_temperature", RS2_OPTION_MC_TEMPERATURE)
.value("ma_temperature", RS2_OPTION_MA_TEMPERATURE)
.value("hardware_preset", RS2_OPTION_HARDWARE_PRESET)
.value("global_time_enabled", RS2_OPTION_GLOBAL_TIME_ENABLED)
.value("apd_temperature", RS2_OPTION_APD_TEMPERATURE)
.value("enable_mapping", RS2_OPTION_ENABLE_MAPPING)
.value("enable_pose_jumping", RS2_OPTION_ENABLE_POSE_JUMPING)
.value("enable_relocalization", RS2_OPTION_ENABLE_RELOCALIZATION)
.value("enable_pose_jumping", RS2_OPTION_ENABLE_POSE_JUMPING)
.value("enable_dynamic_calibration", RS2_OPTION_ENABLE_DYNAMIC_CALIBRATION)
.value("count", RS2_OPTION_COUNT);

py::enum_<platform::power_state> power_state(m, "power_state");
Expand Down
17 changes: 17 additions & 0 deletions wrappers/unrealengine4/Plugins/RealSense/Source/RealSense/Public/RealSenseTypes.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,23 @@ enum class ERealSenseOptionType : uint8
HOLES_FILL , /**< Enhance depth data post-processing with holes filling where appropriate*/
STEREO_BASELINE , /**< The distance in mm between the first and the second imagers in stereo-based depth cameras*/
AUTO_EXPOSURE_CONVERGE_STEP , /**< Allows dynamically ajust the converge step value of the target exposure in Auto-Exposure algorithm*/
INTER_CAM_SYNC_MODE , /**< Impose Inter-camera HW synchronization mode. Applicable for D400/Rolling Shutter SKUs */
STREAM_FILTER , /**< Select a stream to process */
STREAM_FORMAT_FILTER , /**< Select a stream format to process */
STREAM_INDEX_FILTER , /**< Select a stream index to process */
EMITTER_ON_OFF , /**< When supported, this option make the camera to switch the emitter state every frame. 0 for disabled, 1 for enabled */
ZERO_ORDER_POINT_X , /**< Zero order point x*/
ZERO_ORDER_POINT_Y , /**< Zero order point y*/
LLD_TEMPERATURE , /**< LLD temperature*/
MC_TEMPERATURE , /**< MC temperature*/
MA_TEMPERATURE , /**< MA temperature*/
HARDWARE_PRESET , /**< Hardware stream configuration */
GLOBAL_TIME_ENABLED , /**< disable global time */
APD_TEMPERATURE , /**< APD temperature*/
ENABLE_MAPPING , /**< Enable an internal map */
ENABLE_RELOCALIZATION , /**< Enable appearance based relocalization */
ENABLE_POSE_JUMPING , /**< Enable position jumping */
ENABLE_DYNAMIC_CALIBRATION , /**< Enable dynamic calibration */
};

UENUM(Blueprintable)
Expand Down

0 comments on commit 9ee4317

Please sign in to comment.