diff --git a/protocol/cpp/include/solarxr_protocol/generated/all_generated.h b/protocol/cpp/include/solarxr_protocol/generated/all_generated.h index e0ded2e2..edee7de9 100644 --- a/protocol/cpp/include/solarxr_protocol/generated/all_generated.h +++ b/protocol/cpp/include/solarxr_protocol/generated/all_generated.h @@ -7800,14 +7800,17 @@ struct TapDetectionSettings FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table VT_FULL_RESET_DELAY = 4, VT_FULL_RESET_ENABLED = 6, VT_FULL_RESET_TAPS = 8, - VT_YAW_RESET_DELAY = 10, - VT_YAW_RESET_ENABLED = 12, - VT_YAW_RESET_TAPS = 14, - VT_MOUNTING_RESET_DELAY = 16, - VT_MOUNTING_RESET_ENABLED = 18, - VT_MOUNTING_RESET_TAPS = 20, - VT_SETUP_MODE = 22, - VT_NUMBER_TRACKERS_OVER_THRESHOLD = 24 + VT_FULL_RESET_TRACKER = 10, + VT_YAW_RESET_DELAY = 12, + VT_YAW_RESET_ENABLED = 14, + VT_YAW_RESET_TAPS = 16, + VT_YAW_RESET_TRACKER = 18, + VT_MOUNTING_RESET_DELAY = 20, + VT_MOUNTING_RESET_ENABLED = 22, + VT_MOUNTING_RESET_TAPS = 24, + VT_MOUNTING_RESET_TRACKER = 26, + VT_SETUP_MODE = 28, + VT_NUMBER_TRACKERS_OVER_THRESHOLD = 30 }; flatbuffers::Optional full_reset_delay() const { return GetOptional(VT_FULL_RESET_DELAY); @@ -7818,6 +7821,9 @@ struct TapDetectionSettings FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table flatbuffers::Optional full_reset_taps() const { return GetOptional(VT_FULL_RESET_TAPS); } + flatbuffers::Optional full_reset_tracker() const { + return GetOptional(VT_FULL_RESET_TRACKER); + } flatbuffers::Optional yaw_reset_delay() const { return GetOptional(VT_YAW_RESET_DELAY); } @@ -7827,6 +7833,9 @@ struct TapDetectionSettings FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table flatbuffers::Optional yaw_reset_taps() const { return GetOptional(VT_YAW_RESET_TAPS); } + flatbuffers::Optional yaw_reset_tracker() const { + return GetOptional(VT_YAW_RESET_TRACKER); + } flatbuffers::Optional mounting_reset_delay() const { return GetOptional(VT_MOUNTING_RESET_DELAY); } @@ -7836,6 +7845,9 @@ struct TapDetectionSettings FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table flatbuffers::Optional mounting_reset_taps() const { return GetOptional(VT_MOUNTING_RESET_TAPS); } + flatbuffers::Optional mounting_reset_tracker() const { + return GetOptional(VT_MOUNTING_RESET_TRACKER); + } /// If true, disables reset behavior of tap detection and sends a /// TapDetectionSetupNotification, each time 2 taps are detected on any tracker flatbuffers::Optional setup_mode() const { @@ -7849,12 +7861,15 @@ struct TapDetectionSettings FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table VerifyField(verifier, VT_FULL_RESET_DELAY, 4) && VerifyField(verifier, VT_FULL_RESET_ENABLED, 1) && VerifyField(verifier, VT_FULL_RESET_TAPS, 1) && + VerifyField(verifier, VT_FULL_RESET_TRACKER, 1) && VerifyField(verifier, VT_YAW_RESET_DELAY, 4) && VerifyField(verifier, VT_YAW_RESET_ENABLED, 1) && VerifyField(verifier, VT_YAW_RESET_TAPS, 1) && + VerifyField(verifier, VT_YAW_RESET_TRACKER, 1) && VerifyField(verifier, VT_MOUNTING_RESET_DELAY, 4) && VerifyField(verifier, VT_MOUNTING_RESET_ENABLED, 1) && VerifyField(verifier, VT_MOUNTING_RESET_TAPS, 1) && + VerifyField(verifier, VT_MOUNTING_RESET_TRACKER, 1) && VerifyField(verifier, VT_SETUP_MODE, 1) && VerifyField(verifier, VT_NUMBER_TRACKERS_OVER_THRESHOLD, 1) && verifier.EndTable(); @@ -7874,6 +7889,9 @@ struct TapDetectionSettingsBuilder { void add_full_reset_taps(uint8_t full_reset_taps) { fbb_.AddElement(TapDetectionSettings::VT_FULL_RESET_TAPS, full_reset_taps); } + void add_full_reset_tracker(solarxr_protocol::datatypes::BodyPart full_reset_tracker) { + fbb_.AddElement(TapDetectionSettings::VT_FULL_RESET_TRACKER, static_cast(full_reset_tracker)); + } void add_yaw_reset_delay(float yaw_reset_delay) { fbb_.AddElement(TapDetectionSettings::VT_YAW_RESET_DELAY, yaw_reset_delay); } @@ -7883,6 +7901,9 @@ struct TapDetectionSettingsBuilder { void add_yaw_reset_taps(uint8_t yaw_reset_taps) { fbb_.AddElement(TapDetectionSettings::VT_YAW_RESET_TAPS, yaw_reset_taps); } + void add_yaw_reset_tracker(solarxr_protocol::datatypes::BodyPart yaw_reset_tracker) { + fbb_.AddElement(TapDetectionSettings::VT_YAW_RESET_TRACKER, static_cast(yaw_reset_tracker)); + } void add_mounting_reset_delay(float mounting_reset_delay) { fbb_.AddElement(TapDetectionSettings::VT_MOUNTING_RESET_DELAY, mounting_reset_delay); } @@ -7892,6 +7913,9 @@ struct TapDetectionSettingsBuilder { void add_mounting_reset_taps(uint8_t mounting_reset_taps) { fbb_.AddElement(TapDetectionSettings::VT_MOUNTING_RESET_TAPS, mounting_reset_taps); } + void add_mounting_reset_tracker(solarxr_protocol::datatypes::BodyPart mounting_reset_tracker) { + fbb_.AddElement(TapDetectionSettings::VT_MOUNTING_RESET_TRACKER, static_cast(mounting_reset_tracker)); + } void add_setup_mode(bool setup_mode) { fbb_.AddElement(TapDetectionSettings::VT_SETUP_MODE, static_cast(setup_mode)); } @@ -7914,12 +7938,15 @@ inline flatbuffers::Offset CreateTapDetectionSettings( flatbuffers::Optional full_reset_delay = flatbuffers::nullopt, flatbuffers::Optional full_reset_enabled = flatbuffers::nullopt, flatbuffers::Optional full_reset_taps = flatbuffers::nullopt, + flatbuffers::Optional full_reset_tracker = flatbuffers::nullopt, flatbuffers::Optional yaw_reset_delay = flatbuffers::nullopt, flatbuffers::Optional yaw_reset_enabled = flatbuffers::nullopt, flatbuffers::Optional yaw_reset_taps = flatbuffers::nullopt, + flatbuffers::Optional yaw_reset_tracker = flatbuffers::nullopt, flatbuffers::Optional mounting_reset_delay = flatbuffers::nullopt, flatbuffers::Optional mounting_reset_enabled = flatbuffers::nullopt, flatbuffers::Optional mounting_reset_taps = flatbuffers::nullopt, + flatbuffers::Optional mounting_reset_tracker = flatbuffers::nullopt, flatbuffers::Optional setup_mode = flatbuffers::nullopt, flatbuffers::Optional number_trackers_over_threshold = flatbuffers::nullopt) { TapDetectionSettingsBuilder builder_(_fbb); @@ -7928,10 +7955,13 @@ inline flatbuffers::Offset CreateTapDetectionSettings( if(full_reset_delay) { builder_.add_full_reset_delay(*full_reset_delay); } if(number_trackers_over_threshold) { builder_.add_number_trackers_over_threshold(*number_trackers_over_threshold); } if(setup_mode) { builder_.add_setup_mode(*setup_mode); } + if(mounting_reset_tracker) { builder_.add_mounting_reset_tracker(*mounting_reset_tracker); } if(mounting_reset_taps) { builder_.add_mounting_reset_taps(*mounting_reset_taps); } if(mounting_reset_enabled) { builder_.add_mounting_reset_enabled(*mounting_reset_enabled); } + if(yaw_reset_tracker) { builder_.add_yaw_reset_tracker(*yaw_reset_tracker); } if(yaw_reset_taps) { builder_.add_yaw_reset_taps(*yaw_reset_taps); } if(yaw_reset_enabled) { builder_.add_yaw_reset_enabled(*yaw_reset_enabled); } + if(full_reset_tracker) { builder_.add_full_reset_tracker(*full_reset_tracker); } if(full_reset_taps) { builder_.add_full_reset_taps(*full_reset_taps); } if(full_reset_enabled) { builder_.add_full_reset_enabled(*full_reset_enabled); } return builder_.Finish(); diff --git a/protocol/java/src/solarxr_protocol/rpc/TapDetectionSettings.java b/protocol/java/src/solarxr_protocol/rpc/TapDetectionSettings.java index caac8272..61ae46c2 100644 --- a/protocol/java/src/solarxr_protocol/rpc/TapDetectionSettings.java +++ b/protocol/java/src/solarxr_protocol/rpc/TapDetectionSettings.java @@ -21,66 +21,81 @@ public final class TapDetectionSettings extends Table { public boolean fullResetEnabled() { int o = __offset(6); return o != 0 ? 0!=bb.get(o + bb_pos) : false; } public boolean hasFullResetTaps() { return 0 != __offset(8); } public int fullResetTaps() { int o = __offset(8); return o != 0 ? bb.get(o + bb_pos) & 0xFF : 0; } - public boolean hasYawResetDelay() { return 0 != __offset(10); } - public float yawResetDelay() { int o = __offset(10); return o != 0 ? bb.getFloat(o + bb_pos) : 0f; } - public boolean hasYawResetEnabled() { return 0 != __offset(12); } - public boolean yawResetEnabled() { int o = __offset(12); return o != 0 ? 0!=bb.get(o + bb_pos) : false; } - public boolean hasYawResetTaps() { return 0 != __offset(14); } - public int yawResetTaps() { int o = __offset(14); return o != 0 ? bb.get(o + bb_pos) & 0xFF : 0; } - public boolean hasMountingResetDelay() { return 0 != __offset(16); } - public float mountingResetDelay() { int o = __offset(16); return o != 0 ? bb.getFloat(o + bb_pos) : 0f; } - public boolean hasMountingResetEnabled() { return 0 != __offset(18); } - public boolean mountingResetEnabled() { int o = __offset(18); return o != 0 ? 0!=bb.get(o + bb_pos) : false; } - public boolean hasMountingResetTaps() { return 0 != __offset(20); } - public int mountingResetTaps() { int o = __offset(20); return o != 0 ? bb.get(o + bb_pos) & 0xFF : 0; } + public boolean hasFullResetTracker() { return 0 != __offset(10); } + public int fullResetTracker() { int o = __offset(10); return o != 0 ? bb.get(o + bb_pos) & 0xFF : 0; } + public boolean hasYawResetDelay() { return 0 != __offset(12); } + public float yawResetDelay() { int o = __offset(12); return o != 0 ? bb.getFloat(o + bb_pos) : 0f; } + public boolean hasYawResetEnabled() { return 0 != __offset(14); } + public boolean yawResetEnabled() { int o = __offset(14); return o != 0 ? 0!=bb.get(o + bb_pos) : false; } + public boolean hasYawResetTaps() { return 0 != __offset(16); } + public int yawResetTaps() { int o = __offset(16); return o != 0 ? bb.get(o + bb_pos) & 0xFF : 0; } + public boolean hasYawResetTracker() { return 0 != __offset(18); } + public int yawResetTracker() { int o = __offset(18); return o != 0 ? bb.get(o + bb_pos) & 0xFF : 0; } + public boolean hasMountingResetDelay() { return 0 != __offset(20); } + public float mountingResetDelay() { int o = __offset(20); return o != 0 ? bb.getFloat(o + bb_pos) : 0f; } + public boolean hasMountingResetEnabled() { return 0 != __offset(22); } + public boolean mountingResetEnabled() { int o = __offset(22); return o != 0 ? 0!=bb.get(o + bb_pos) : false; } + public boolean hasMountingResetTaps() { return 0 != __offset(24); } + public int mountingResetTaps() { int o = __offset(24); return o != 0 ? bb.get(o + bb_pos) & 0xFF : 0; } + public boolean hasMountingResetTracker() { return 0 != __offset(26); } + public int mountingResetTracker() { int o = __offset(26); return o != 0 ? bb.get(o + bb_pos) & 0xFF : 0; } /** * If true, disables reset behavior of tap detection and sends a * TapDetectionSetupNotification, each time 2 taps are detected on any tracker */ - public boolean hasSetupMode() { return 0 != __offset(22); } - public boolean setupMode() { int o = __offset(22); return o != 0 ? 0!=bb.get(o + bb_pos) : false; } - public boolean hasNumberTrackersOverThreshold() { return 0 != __offset(24); } - public int numberTrackersOverThreshold() { int o = __offset(24); return o != 0 ? bb.get(o + bb_pos) & 0xFF : 0; } + public boolean hasSetupMode() { return 0 != __offset(28); } + public boolean setupMode() { int o = __offset(28); return o != 0 ? 0!=bb.get(o + bb_pos) : false; } + public boolean hasNumberTrackersOverThreshold() { return 0 != __offset(30); } + public int numberTrackersOverThreshold() { int o = __offset(30); return o != 0 ? bb.get(o + bb_pos) & 0xFF : 0; } public static int createTapDetectionSettings(FlatBufferBuilder builder, float fullResetDelay, boolean fullResetEnabled, int fullResetTaps, + int fullResetTracker, float yawResetDelay, boolean yawResetEnabled, int yawResetTaps, + int yawResetTracker, float mountingResetDelay, boolean mountingResetEnabled, int mountingResetTaps, + int mountingResetTracker, boolean setupMode, int numberTrackersOverThreshold) { - builder.startTable(11); + builder.startTable(14); TapDetectionSettings.addMountingResetDelay(builder, mountingResetDelay); TapDetectionSettings.addYawResetDelay(builder, yawResetDelay); TapDetectionSettings.addFullResetDelay(builder, fullResetDelay); TapDetectionSettings.addNumberTrackersOverThreshold(builder, numberTrackersOverThreshold); TapDetectionSettings.addSetupMode(builder, setupMode); + TapDetectionSettings.addMountingResetTracker(builder, mountingResetTracker); TapDetectionSettings.addMountingResetTaps(builder, mountingResetTaps); TapDetectionSettings.addMountingResetEnabled(builder, mountingResetEnabled); + TapDetectionSettings.addYawResetTracker(builder, yawResetTracker); TapDetectionSettings.addYawResetTaps(builder, yawResetTaps); TapDetectionSettings.addYawResetEnabled(builder, yawResetEnabled); + TapDetectionSettings.addFullResetTracker(builder, fullResetTracker); TapDetectionSettings.addFullResetTaps(builder, fullResetTaps); TapDetectionSettings.addFullResetEnabled(builder, fullResetEnabled); return TapDetectionSettings.endTapDetectionSettings(builder); } - public static void startTapDetectionSettings(FlatBufferBuilder builder) { builder.startTable(11); } + public static void startTapDetectionSettings(FlatBufferBuilder builder) { builder.startTable(14); } public static void addFullResetDelay(FlatBufferBuilder builder, float fullResetDelay) { builder.addFloat(0, fullResetDelay, 0f); } public static void addFullResetEnabled(FlatBufferBuilder builder, boolean fullResetEnabled) { builder.addBoolean(1, fullResetEnabled, false); } public static void addFullResetTaps(FlatBufferBuilder builder, int fullResetTaps) { builder.addByte(2, (byte) fullResetTaps, (byte) 0); } - public static void addYawResetDelay(FlatBufferBuilder builder, float yawResetDelay) { builder.addFloat(3, yawResetDelay, 0f); } - public static void addYawResetEnabled(FlatBufferBuilder builder, boolean yawResetEnabled) { builder.addBoolean(4, yawResetEnabled, false); } - public static void addYawResetTaps(FlatBufferBuilder builder, int yawResetTaps) { builder.addByte(5, (byte) yawResetTaps, (byte) 0); } - public static void addMountingResetDelay(FlatBufferBuilder builder, float mountingResetDelay) { builder.addFloat(6, mountingResetDelay, 0f); } - public static void addMountingResetEnabled(FlatBufferBuilder builder, boolean mountingResetEnabled) { builder.addBoolean(7, mountingResetEnabled, false); } - public static void addMountingResetTaps(FlatBufferBuilder builder, int mountingResetTaps) { builder.addByte(8, (byte) mountingResetTaps, (byte) 0); } - public static void addSetupMode(FlatBufferBuilder builder, boolean setupMode) { builder.addBoolean(9, setupMode, false); } - public static void addNumberTrackersOverThreshold(FlatBufferBuilder builder, int numberTrackersOverThreshold) { builder.addByte(10, (byte) numberTrackersOverThreshold, (byte) 0); } + public static void addFullResetTracker(FlatBufferBuilder builder, int fullResetTracker) { builder.addByte(3, (byte) fullResetTracker, (byte) 0); } + public static void addYawResetDelay(FlatBufferBuilder builder, float yawResetDelay) { builder.addFloat(4, yawResetDelay, 0f); } + public static void addYawResetEnabled(FlatBufferBuilder builder, boolean yawResetEnabled) { builder.addBoolean(5, yawResetEnabled, false); } + public static void addYawResetTaps(FlatBufferBuilder builder, int yawResetTaps) { builder.addByte(6, (byte) yawResetTaps, (byte) 0); } + public static void addYawResetTracker(FlatBufferBuilder builder, int yawResetTracker) { builder.addByte(7, (byte) yawResetTracker, (byte) 0); } + public static void addMountingResetDelay(FlatBufferBuilder builder, float mountingResetDelay) { builder.addFloat(8, mountingResetDelay, 0f); } + public static void addMountingResetEnabled(FlatBufferBuilder builder, boolean mountingResetEnabled) { builder.addBoolean(9, mountingResetEnabled, false); } + public static void addMountingResetTaps(FlatBufferBuilder builder, int mountingResetTaps) { builder.addByte(10, (byte) mountingResetTaps, (byte) 0); } + public static void addMountingResetTracker(FlatBufferBuilder builder, int mountingResetTracker) { builder.addByte(11, (byte) mountingResetTracker, (byte) 0); } + public static void addSetupMode(FlatBufferBuilder builder, boolean setupMode) { builder.addBoolean(12, setupMode, false); } + public static void addNumberTrackersOverThreshold(FlatBufferBuilder builder, int numberTrackersOverThreshold) { builder.addByte(13, (byte) numberTrackersOverThreshold, (byte) 0); } public static int endTapDetectionSettings(FlatBufferBuilder builder) { int o = builder.endTable(); return o; @@ -104,18 +119,24 @@ public void unpackTo(TapDetectionSettingsT _o) { _o.setFullResetEnabled(_oFullResetEnabled); Integer _oFullResetTaps = hasFullResetTaps() ? fullResetTaps() : null; _o.setFullResetTaps(_oFullResetTaps); + Integer _oFullResetTracker = hasFullResetTracker() ? fullResetTracker() : null; + _o.setFullResetTracker(_oFullResetTracker); Float _oYawResetDelay = hasYawResetDelay() ? yawResetDelay() : null; _o.setYawResetDelay(_oYawResetDelay); Boolean _oYawResetEnabled = hasYawResetEnabled() ? yawResetEnabled() : null; _o.setYawResetEnabled(_oYawResetEnabled); Integer _oYawResetTaps = hasYawResetTaps() ? yawResetTaps() : null; _o.setYawResetTaps(_oYawResetTaps); + Integer _oYawResetTracker = hasYawResetTracker() ? yawResetTracker() : null; + _o.setYawResetTracker(_oYawResetTracker); Float _oMountingResetDelay = hasMountingResetDelay() ? mountingResetDelay() : null; _o.setMountingResetDelay(_oMountingResetDelay); Boolean _oMountingResetEnabled = hasMountingResetEnabled() ? mountingResetEnabled() : null; _o.setMountingResetEnabled(_oMountingResetEnabled); Integer _oMountingResetTaps = hasMountingResetTaps() ? mountingResetTaps() : null; _o.setMountingResetTaps(_oMountingResetTaps); + Integer _oMountingResetTracker = hasMountingResetTracker() ? mountingResetTracker() : null; + _o.setMountingResetTracker(_oMountingResetTracker); Boolean _oSetupMode = hasSetupMode() ? setupMode() : null; _o.setSetupMode(_oSetupMode); Integer _oNumberTrackersOverThreshold = hasNumberTrackersOverThreshold() ? numberTrackersOverThreshold() : null; @@ -128,12 +149,15 @@ public static int pack(FlatBufferBuilder builder, TapDetectionSettingsT _o) { _o.getFullResetDelay(), _o.getFullResetEnabled(), _o.getFullResetTaps(), + _o.getFullResetTracker(), _o.getYawResetDelay(), _o.getYawResetEnabled(), _o.getYawResetTaps(), + _o.getYawResetTracker(), _o.getMountingResetDelay(), _o.getMountingResetEnabled(), _o.getMountingResetTaps(), + _o.getMountingResetTracker(), _o.getSetupMode(), _o.getNumberTrackersOverThreshold()); } diff --git a/protocol/java/src/solarxr_protocol/rpc/TapDetectionSettingsT.java b/protocol/java/src/solarxr_protocol/rpc/TapDetectionSettingsT.java index 87c3d870..ce58c655 100644 --- a/protocol/java/src/solarxr_protocol/rpc/TapDetectionSettingsT.java +++ b/protocol/java/src/solarxr_protocol/rpc/TapDetectionSettingsT.java @@ -11,12 +11,15 @@ public class TapDetectionSettingsT { private Float fullResetDelay; private Boolean fullResetEnabled; private Integer fullResetTaps; + private Integer fullResetTracker; private Float yawResetDelay; private Boolean yawResetEnabled; private Integer yawResetTaps; + private Integer yawResetTracker; private Float mountingResetDelay; private Boolean mountingResetEnabled; private Integer mountingResetTaps; + private Integer mountingResetTracker; private Boolean setupMode; private Integer numberTrackersOverThreshold; @@ -32,6 +35,10 @@ public class TapDetectionSettingsT { public void setFullResetTaps(Integer fullResetTaps) { this.fullResetTaps = fullResetTaps; } + public Integer getFullResetTracker() { return fullResetTracker; } + + public void setFullResetTracker(Integer fullResetTracker) { this.fullResetTracker = fullResetTracker; } + public Float getYawResetDelay() { return yawResetDelay; } public void setYawResetDelay(Float yawResetDelay) { this.yawResetDelay = yawResetDelay; } @@ -44,6 +51,10 @@ public class TapDetectionSettingsT { public void setYawResetTaps(Integer yawResetTaps) { this.yawResetTaps = yawResetTaps; } + public Integer getYawResetTracker() { return yawResetTracker; } + + public void setYawResetTracker(Integer yawResetTracker) { this.yawResetTracker = yawResetTracker; } + public Float getMountingResetDelay() { return mountingResetDelay; } public void setMountingResetDelay(Float mountingResetDelay) { this.mountingResetDelay = mountingResetDelay; } @@ -56,6 +67,10 @@ public class TapDetectionSettingsT { public void setMountingResetTaps(Integer mountingResetTaps) { this.mountingResetTaps = mountingResetTaps; } + public Integer getMountingResetTracker() { return mountingResetTracker; } + + public void setMountingResetTracker(Integer mountingResetTracker) { this.mountingResetTracker = mountingResetTracker; } + public Boolean getSetupMode() { return setupMode; } public void setSetupMode(Boolean setupMode) { this.setupMode = setupMode; } @@ -69,12 +84,15 @@ public TapDetectionSettingsT() { this.fullResetDelay = null; this.fullResetEnabled = null; this.fullResetTaps = null; + this.fullResetTracker = null; this.yawResetDelay = null; this.yawResetEnabled = null; this.yawResetTaps = null; + this.yawResetTracker = null; this.mountingResetDelay = null; this.mountingResetEnabled = null; this.mountingResetTaps = null; + this.mountingResetTracker = null; this.setupMode = null; this.numberTrackersOverThreshold = null; } diff --git a/protocol/kotlin/src/solarxr_protocol/rpc/TapDetectionSettings.kt b/protocol/kotlin/src/solarxr_protocol/rpc/TapDetectionSettings.kt index e3bf7000..49f1c856 100644 --- a/protocol/kotlin/src/solarxr_protocol/rpc/TapDetectionSettings.kt +++ b/protocol/kotlin/src/solarxr_protocol/rpc/TapDetectionSettings.kt @@ -31,34 +31,49 @@ class TapDetectionSettings : Table() { val o = __offset(8) return if(o != 0) bb.get(o + bb_pos).toUByte() else null } - val yawResetDelay : Float? + val fullResetTracker : UByte? get() { val o = __offset(10) + return if(o != 0) bb.get(o + bb_pos).toUByte() else null + } + val yawResetDelay : Float? + get() { + val o = __offset(12) return if(o != 0) bb.getFloat(o + bb_pos) else null } val yawResetEnabled : Boolean? get() { - val o = __offset(12) + val o = __offset(14) return if(o != 0) 0.toByte() != bb.get(o + bb_pos) else null } val yawResetTaps : UByte? get() { - val o = __offset(14) + val o = __offset(16) + return if(o != 0) bb.get(o + bb_pos).toUByte() else null + } + val yawResetTracker : UByte? + get() { + val o = __offset(18) return if(o != 0) bb.get(o + bb_pos).toUByte() else null } val mountingResetDelay : Float? get() { - val o = __offset(16) + val o = __offset(20) return if(o != 0) bb.getFloat(o + bb_pos) else null } val mountingResetEnabled : Boolean? get() { - val o = __offset(18) + val o = __offset(22) return if(o != 0) 0.toByte() != bb.get(o + bb_pos) else null } val mountingResetTaps : UByte? get() { - val o = __offset(20) + val o = __offset(24) + return if(o != 0) bb.get(o + bb_pos).toUByte() else null + } + val mountingResetTracker : UByte? + get() { + val o = __offset(26) return if(o != 0) bb.get(o + bb_pos).toUByte() else null } /** @@ -67,12 +82,12 @@ class TapDetectionSettings : Table() { */ val setupMode : Boolean? get() { - val o = __offset(22) + val o = __offset(28) return if(o != 0) 0.toByte() != bb.get(o + bb_pos) else null } val numberTrackersOverThreshold : UByte? get() { - val o = __offset(24) + val o = __offset(30) return if(o != 0) bb.get(o + bb_pos).toUByte() else null } companion object { @@ -86,23 +101,26 @@ class TapDetectionSettings : Table() { return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)) } @JvmStatic - fun createTapDetectionSettings(builder: FlatBufferBuilder, fullResetDelay: Float?, fullResetEnabled: Boolean?, fullResetTaps: UByte?, yawResetDelay: Float?, yawResetEnabled: Boolean?, yawResetTaps: UByte?, mountingResetDelay: Float?, mountingResetEnabled: Boolean?, mountingResetTaps: UByte?, setupMode: Boolean?, numberTrackersOverThreshold: UByte?) : Int { - builder.startTable(11) + fun createTapDetectionSettings(builder: FlatBufferBuilder, fullResetDelay: Float?, fullResetEnabled: Boolean?, fullResetTaps: UByte?, fullResetTracker: UByte?, yawResetDelay: Float?, yawResetEnabled: Boolean?, yawResetTaps: UByte?, yawResetTracker: UByte?, mountingResetDelay: Float?, mountingResetEnabled: Boolean?, mountingResetTaps: UByte?, mountingResetTracker: UByte?, setupMode: Boolean?, numberTrackersOverThreshold: UByte?) : Int { + builder.startTable(14) mountingResetDelay?.run { addMountingResetDelay(builder, mountingResetDelay) } yawResetDelay?.run { addYawResetDelay(builder, yawResetDelay) } fullResetDelay?.run { addFullResetDelay(builder, fullResetDelay) } numberTrackersOverThreshold?.run { addNumberTrackersOverThreshold(builder, numberTrackersOverThreshold) } setupMode?.run { addSetupMode(builder, setupMode) } + mountingResetTracker?.run { addMountingResetTracker(builder, mountingResetTracker) } mountingResetTaps?.run { addMountingResetTaps(builder, mountingResetTaps) } mountingResetEnabled?.run { addMountingResetEnabled(builder, mountingResetEnabled) } + yawResetTracker?.run { addYawResetTracker(builder, yawResetTracker) } yawResetTaps?.run { addYawResetTaps(builder, yawResetTaps) } yawResetEnabled?.run { addYawResetEnabled(builder, yawResetEnabled) } + fullResetTracker?.run { addFullResetTracker(builder, fullResetTracker) } fullResetTaps?.run { addFullResetTaps(builder, fullResetTaps) } fullResetEnabled?.run { addFullResetEnabled(builder, fullResetEnabled) } return endTapDetectionSettings(builder) } @JvmStatic - fun startTapDetectionSettings(builder: FlatBufferBuilder) = builder.startTable(11) + fun startTapDetectionSettings(builder: FlatBufferBuilder) = builder.startTable(14) @JvmStatic fun addFullResetDelay(builder: FlatBufferBuilder, fullResetDelay: Float) = builder.addFloat(0, fullResetDelay, 0.0) @JvmStatic @@ -110,21 +128,27 @@ class TapDetectionSettings : Table() { @JvmStatic fun addFullResetTaps(builder: FlatBufferBuilder, fullResetTaps: UByte) = builder.addByte(2, fullResetTaps.toByte(), 0) @JvmStatic - fun addYawResetDelay(builder: FlatBufferBuilder, yawResetDelay: Float) = builder.addFloat(3, yawResetDelay, 0.0) + fun addFullResetTracker(builder: FlatBufferBuilder, fullResetTracker: UByte) = builder.addByte(3, fullResetTracker.toByte(), 0) + @JvmStatic + fun addYawResetDelay(builder: FlatBufferBuilder, yawResetDelay: Float) = builder.addFloat(4, yawResetDelay, 0.0) + @JvmStatic + fun addYawResetEnabled(builder: FlatBufferBuilder, yawResetEnabled: Boolean) = builder.addBoolean(5, yawResetEnabled, false) + @JvmStatic + fun addYawResetTaps(builder: FlatBufferBuilder, yawResetTaps: UByte) = builder.addByte(6, yawResetTaps.toByte(), 0) @JvmStatic - fun addYawResetEnabled(builder: FlatBufferBuilder, yawResetEnabled: Boolean) = builder.addBoolean(4, yawResetEnabled, false) + fun addYawResetTracker(builder: FlatBufferBuilder, yawResetTracker: UByte) = builder.addByte(7, yawResetTracker.toByte(), 0) @JvmStatic - fun addYawResetTaps(builder: FlatBufferBuilder, yawResetTaps: UByte) = builder.addByte(5, yawResetTaps.toByte(), 0) + fun addMountingResetDelay(builder: FlatBufferBuilder, mountingResetDelay: Float) = builder.addFloat(8, mountingResetDelay, 0.0) @JvmStatic - fun addMountingResetDelay(builder: FlatBufferBuilder, mountingResetDelay: Float) = builder.addFloat(6, mountingResetDelay, 0.0) + fun addMountingResetEnabled(builder: FlatBufferBuilder, mountingResetEnabled: Boolean) = builder.addBoolean(9, mountingResetEnabled, false) @JvmStatic - fun addMountingResetEnabled(builder: FlatBufferBuilder, mountingResetEnabled: Boolean) = builder.addBoolean(7, mountingResetEnabled, false) + fun addMountingResetTaps(builder: FlatBufferBuilder, mountingResetTaps: UByte) = builder.addByte(10, mountingResetTaps.toByte(), 0) @JvmStatic - fun addMountingResetTaps(builder: FlatBufferBuilder, mountingResetTaps: UByte) = builder.addByte(8, mountingResetTaps.toByte(), 0) + fun addMountingResetTracker(builder: FlatBufferBuilder, mountingResetTracker: UByte) = builder.addByte(11, mountingResetTracker.toByte(), 0) @JvmStatic - fun addSetupMode(builder: FlatBufferBuilder, setupMode: Boolean) = builder.addBoolean(9, setupMode, false) + fun addSetupMode(builder: FlatBufferBuilder, setupMode: Boolean) = builder.addBoolean(12, setupMode, false) @JvmStatic - fun addNumberTrackersOverThreshold(builder: FlatBufferBuilder, numberTrackersOverThreshold: UByte) = builder.addByte(10, numberTrackersOverThreshold.toByte(), 0) + fun addNumberTrackersOverThreshold(builder: FlatBufferBuilder, numberTrackersOverThreshold: UByte) = builder.addByte(13, numberTrackersOverThreshold.toByte(), 0) @JvmStatic fun endTapDetectionSettings(builder: FlatBufferBuilder) : Int { val o = builder.endTable() diff --git a/protocol/rust/src/generated/solarxr_protocol/rpc/tap_detection_settings_generated.rs b/protocol/rust/src/generated/solarxr_protocol/rpc/tap_detection_settings_generated.rs index 79052ba2..eee8458e 100644 --- a/protocol/rust/src/generated/solarxr_protocol/rpc/tap_detection_settings_generated.rs +++ b/protocol/rust/src/generated/solarxr_protocol/rpc/tap_detection_settings_generated.rs @@ -28,14 +28,17 @@ impl<'a> TapDetectionSettings<'a> { pub const VT_FULL_RESET_DELAY: flatbuffers::VOffsetT = 4; pub const VT_FULL_RESET_ENABLED: flatbuffers::VOffsetT = 6; pub const VT_FULL_RESET_TAPS: flatbuffers::VOffsetT = 8; - pub const VT_YAW_RESET_DELAY: flatbuffers::VOffsetT = 10; - pub const VT_YAW_RESET_ENABLED: flatbuffers::VOffsetT = 12; - pub const VT_YAW_RESET_TAPS: flatbuffers::VOffsetT = 14; - pub const VT_MOUNTING_RESET_DELAY: flatbuffers::VOffsetT = 16; - pub const VT_MOUNTING_RESET_ENABLED: flatbuffers::VOffsetT = 18; - pub const VT_MOUNTING_RESET_TAPS: flatbuffers::VOffsetT = 20; - pub const VT_SETUP_MODE: flatbuffers::VOffsetT = 22; - pub const VT_NUMBER_TRACKERS_OVER_THRESHOLD: flatbuffers::VOffsetT = 24; + pub const VT_FULL_RESET_TRACKER: flatbuffers::VOffsetT = 10; + pub const VT_YAW_RESET_DELAY: flatbuffers::VOffsetT = 12; + pub const VT_YAW_RESET_ENABLED: flatbuffers::VOffsetT = 14; + pub const VT_YAW_RESET_TAPS: flatbuffers::VOffsetT = 16; + pub const VT_YAW_RESET_TRACKER: flatbuffers::VOffsetT = 18; + pub const VT_MOUNTING_RESET_DELAY: flatbuffers::VOffsetT = 20; + pub const VT_MOUNTING_RESET_ENABLED: flatbuffers::VOffsetT = 22; + pub const VT_MOUNTING_RESET_TAPS: flatbuffers::VOffsetT = 24; + pub const VT_MOUNTING_RESET_TRACKER: flatbuffers::VOffsetT = 26; + pub const VT_SETUP_MODE: flatbuffers::VOffsetT = 28; + pub const VT_NUMBER_TRACKERS_OVER_THRESHOLD: flatbuffers::VOffsetT = 30; #[inline] pub unsafe fn init_from_table(table: flatbuffers::Table<'a>) -> Self { @@ -52,10 +55,13 @@ impl<'a> TapDetectionSettings<'a> { if let Some(x) = args.full_reset_delay { builder.add_full_reset_delay(x); } if let Some(x) = args.number_trackers_over_threshold { builder.add_number_trackers_over_threshold(x); } if let Some(x) = args.setup_mode { builder.add_setup_mode(x); } + if let Some(x) = args.mounting_reset_tracker { builder.add_mounting_reset_tracker(x); } if let Some(x) = args.mounting_reset_taps { builder.add_mounting_reset_taps(x); } if let Some(x) = args.mounting_reset_enabled { builder.add_mounting_reset_enabled(x); } + if let Some(x) = args.yaw_reset_tracker { builder.add_yaw_reset_tracker(x); } if let Some(x) = args.yaw_reset_taps { builder.add_yaw_reset_taps(x); } if let Some(x) = args.yaw_reset_enabled { builder.add_yaw_reset_enabled(x); } + if let Some(x) = args.full_reset_tracker { builder.add_full_reset_tracker(x); } if let Some(x) = args.full_reset_taps { builder.add_full_reset_taps(x); } if let Some(x) = args.full_reset_enabled { builder.add_full_reset_enabled(x); } builder.finish() @@ -84,6 +90,13 @@ impl<'a> TapDetectionSettings<'a> { unsafe { self._tab.get::(TapDetectionSettings::VT_FULL_RESET_TAPS, None)} } #[inline] + pub fn full_reset_tracker(&self) -> Option { + // Safety: + // Created from valid Table for this object + // which contains a valid value in this slot + unsafe { self._tab.get::(TapDetectionSettings::VT_FULL_RESET_TRACKER, None)} + } + #[inline] pub fn yaw_reset_delay(&self) -> Option { // Safety: // Created from valid Table for this object @@ -105,6 +118,13 @@ impl<'a> TapDetectionSettings<'a> { unsafe { self._tab.get::(TapDetectionSettings::VT_YAW_RESET_TAPS, None)} } #[inline] + pub fn yaw_reset_tracker(&self) -> Option { + // Safety: + // Created from valid Table for this object + // which contains a valid value in this slot + unsafe { self._tab.get::(TapDetectionSettings::VT_YAW_RESET_TRACKER, None)} + } + #[inline] pub fn mounting_reset_delay(&self) -> Option { // Safety: // Created from valid Table for this object @@ -125,6 +145,13 @@ impl<'a> TapDetectionSettings<'a> { // which contains a valid value in this slot unsafe { self._tab.get::(TapDetectionSettings::VT_MOUNTING_RESET_TAPS, None)} } + #[inline] + pub fn mounting_reset_tracker(&self) -> Option { + // Safety: + // Created from valid Table for this object + // which contains a valid value in this slot + unsafe { self._tab.get::(TapDetectionSettings::VT_MOUNTING_RESET_TRACKER, None)} + } /// If true, disables reset behavior of tap detection and sends a /// TapDetectionSetupNotification, each time 2 taps are detected on any tracker #[inline] @@ -153,12 +180,15 @@ impl flatbuffers::Verifiable for TapDetectionSettings<'_> { .visit_field::("full_reset_delay", Self::VT_FULL_RESET_DELAY, false)? .visit_field::("full_reset_enabled", Self::VT_FULL_RESET_ENABLED, false)? .visit_field::("full_reset_taps", Self::VT_FULL_RESET_TAPS, false)? + .visit_field::("full_reset_tracker", Self::VT_FULL_RESET_TRACKER, false)? .visit_field::("yaw_reset_delay", Self::VT_YAW_RESET_DELAY, false)? .visit_field::("yaw_reset_enabled", Self::VT_YAW_RESET_ENABLED, false)? .visit_field::("yaw_reset_taps", Self::VT_YAW_RESET_TAPS, false)? + .visit_field::("yaw_reset_tracker", Self::VT_YAW_RESET_TRACKER, false)? .visit_field::("mounting_reset_delay", Self::VT_MOUNTING_RESET_DELAY, false)? .visit_field::("mounting_reset_enabled", Self::VT_MOUNTING_RESET_ENABLED, false)? .visit_field::("mounting_reset_taps", Self::VT_MOUNTING_RESET_TAPS, false)? + .visit_field::("mounting_reset_tracker", Self::VT_MOUNTING_RESET_TRACKER, false)? .visit_field::("setup_mode", Self::VT_SETUP_MODE, false)? .visit_field::("number_trackers_over_threshold", Self::VT_NUMBER_TRACKERS_OVER_THRESHOLD, false)? .finish(); @@ -169,12 +199,15 @@ pub struct TapDetectionSettingsArgs { pub full_reset_delay: Option, pub full_reset_enabled: Option, pub full_reset_taps: Option, + pub full_reset_tracker: Option, pub yaw_reset_delay: Option, pub yaw_reset_enabled: Option, pub yaw_reset_taps: Option, + pub yaw_reset_tracker: Option, pub mounting_reset_delay: Option, pub mounting_reset_enabled: Option, pub mounting_reset_taps: Option, + pub mounting_reset_tracker: Option, pub setup_mode: Option, pub number_trackers_over_threshold: Option, } @@ -185,12 +218,15 @@ impl<'a> Default for TapDetectionSettingsArgs { full_reset_delay: None, full_reset_enabled: None, full_reset_taps: None, + full_reset_tracker: None, yaw_reset_delay: None, yaw_reset_enabled: None, yaw_reset_taps: None, + yaw_reset_tracker: None, mounting_reset_delay: None, mounting_reset_enabled: None, mounting_reset_taps: None, + mounting_reset_tracker: None, setup_mode: None, number_trackers_over_threshold: None, } @@ -215,6 +251,10 @@ impl<'a: 'b, 'b> TapDetectionSettingsBuilder<'a, 'b> { self.fbb_.push_slot_always::(TapDetectionSettings::VT_FULL_RESET_TAPS, full_reset_taps); } #[inline] + pub fn add_full_reset_tracker(&mut self, full_reset_tracker: super::datatypes::BodyPart) { + self.fbb_.push_slot_always::(TapDetectionSettings::VT_FULL_RESET_TRACKER, full_reset_tracker); + } + #[inline] pub fn add_yaw_reset_delay(&mut self, yaw_reset_delay: f32) { self.fbb_.push_slot_always::(TapDetectionSettings::VT_YAW_RESET_DELAY, yaw_reset_delay); } @@ -227,6 +267,10 @@ impl<'a: 'b, 'b> TapDetectionSettingsBuilder<'a, 'b> { self.fbb_.push_slot_always::(TapDetectionSettings::VT_YAW_RESET_TAPS, yaw_reset_taps); } #[inline] + pub fn add_yaw_reset_tracker(&mut self, yaw_reset_tracker: super::datatypes::BodyPart) { + self.fbb_.push_slot_always::(TapDetectionSettings::VT_YAW_RESET_TRACKER, yaw_reset_tracker); + } + #[inline] pub fn add_mounting_reset_delay(&mut self, mounting_reset_delay: f32) { self.fbb_.push_slot_always::(TapDetectionSettings::VT_MOUNTING_RESET_DELAY, mounting_reset_delay); } @@ -239,6 +283,10 @@ impl<'a: 'b, 'b> TapDetectionSettingsBuilder<'a, 'b> { self.fbb_.push_slot_always::(TapDetectionSettings::VT_MOUNTING_RESET_TAPS, mounting_reset_taps); } #[inline] + pub fn add_mounting_reset_tracker(&mut self, mounting_reset_tracker: super::datatypes::BodyPart) { + self.fbb_.push_slot_always::(TapDetectionSettings::VT_MOUNTING_RESET_TRACKER, mounting_reset_tracker); + } + #[inline] pub fn add_setup_mode(&mut self, setup_mode: bool) { self.fbb_.push_slot_always::(TapDetectionSettings::VT_SETUP_MODE, setup_mode); } @@ -267,12 +315,15 @@ impl core::fmt::Debug for TapDetectionSettings<'_> { ds.field("full_reset_delay", &self.full_reset_delay()); ds.field("full_reset_enabled", &self.full_reset_enabled()); ds.field("full_reset_taps", &self.full_reset_taps()); + ds.field("full_reset_tracker", &self.full_reset_tracker()); ds.field("yaw_reset_delay", &self.yaw_reset_delay()); ds.field("yaw_reset_enabled", &self.yaw_reset_enabled()); ds.field("yaw_reset_taps", &self.yaw_reset_taps()); + ds.field("yaw_reset_tracker", &self.yaw_reset_tracker()); ds.field("mounting_reset_delay", &self.mounting_reset_delay()); ds.field("mounting_reset_enabled", &self.mounting_reset_enabled()); ds.field("mounting_reset_taps", &self.mounting_reset_taps()); + ds.field("mounting_reset_tracker", &self.mounting_reset_tracker()); ds.field("setup_mode", &self.setup_mode()); ds.field("number_trackers_over_threshold", &self.number_trackers_over_threshold()); ds.finish() diff --git a/protocol/typescript/src/solarxr-protocol/rpc/tap-detection-settings.ts b/protocol/typescript/src/solarxr-protocol/rpc/tap-detection-settings.ts index 10cbc4b8..c9473cd2 100644 --- a/protocol/typescript/src/solarxr-protocol/rpc/tap-detection-settings.ts +++ b/protocol/typescript/src/solarxr-protocol/rpc/tap-detection-settings.ts @@ -2,6 +2,7 @@ import * as flatbuffers from 'flatbuffers'; +import { BodyPart } from '../../solarxr-protocol/datatypes/body-part.js'; export class TapDetectionSettings implements flatbuffers.IUnpackableObject { @@ -37,33 +38,48 @@ fullResetTaps():number|null { return offset ? this.bb!.readUint8(this.bb_pos + offset) : null; } -yawResetDelay():number|null { +fullResetTracker():BodyPart|null { const offset = this.bb!.__offset(this.bb_pos, 10); + return offset ? this.bb!.readUint8(this.bb_pos + offset) : null; +} + +yawResetDelay():number|null { + const offset = this.bb!.__offset(this.bb_pos, 12); return offset ? this.bb!.readFloat32(this.bb_pos + offset) : null; } yawResetEnabled():boolean|null { - const offset = this.bb!.__offset(this.bb_pos, 12); + const offset = this.bb!.__offset(this.bb_pos, 14); return offset ? !!this.bb!.readInt8(this.bb_pos + offset) : null; } yawResetTaps():number|null { - const offset = this.bb!.__offset(this.bb_pos, 14); + const offset = this.bb!.__offset(this.bb_pos, 16); + return offset ? this.bb!.readUint8(this.bb_pos + offset) : null; +} + +yawResetTracker():BodyPart|null { + const offset = this.bb!.__offset(this.bb_pos, 18); return offset ? this.bb!.readUint8(this.bb_pos + offset) : null; } mountingResetDelay():number|null { - const offset = this.bb!.__offset(this.bb_pos, 16); + const offset = this.bb!.__offset(this.bb_pos, 20); return offset ? this.bb!.readFloat32(this.bb_pos + offset) : null; } mountingResetEnabled():boolean|null { - const offset = this.bb!.__offset(this.bb_pos, 18); + const offset = this.bb!.__offset(this.bb_pos, 22); return offset ? !!this.bb!.readInt8(this.bb_pos + offset) : null; } mountingResetTaps():number|null { - const offset = this.bb!.__offset(this.bb_pos, 20); + const offset = this.bb!.__offset(this.bb_pos, 24); + return offset ? this.bb!.readUint8(this.bb_pos + offset) : null; +} + +mountingResetTracker():BodyPart|null { + const offset = this.bb!.__offset(this.bb_pos, 26); return offset ? this.bb!.readUint8(this.bb_pos + offset) : null; } @@ -72,17 +88,17 @@ mountingResetTaps():number|null { * TapDetectionSetupNotification, each time 2 taps are detected on any tracker */ setupMode():boolean|null { - const offset = this.bb!.__offset(this.bb_pos, 22); + const offset = this.bb!.__offset(this.bb_pos, 28); return offset ? !!this.bb!.readInt8(this.bb_pos + offset) : null; } numberTrackersOverThreshold():number|null { - const offset = this.bb!.__offset(this.bb_pos, 24); + const offset = this.bb!.__offset(this.bb_pos, 30); return offset ? this.bb!.readUint8(this.bb_pos + offset) : null; } static startTapDetectionSettings(builder:flatbuffers.Builder) { - builder.startObject(11); + builder.startObject(14); } static addFullResetDelay(builder:flatbuffers.Builder, fullResetDelay:number) { @@ -97,36 +113,48 @@ static addFullResetTaps(builder:flatbuffers.Builder, fullResetTaps:number) { builder.addFieldInt8(2, fullResetTaps, 0); } +static addFullResetTracker(builder:flatbuffers.Builder, fullResetTracker:BodyPart) { + builder.addFieldInt8(3, fullResetTracker, 0); +} + static addYawResetDelay(builder:flatbuffers.Builder, yawResetDelay:number) { - builder.addFieldFloat32(3, yawResetDelay, 0); + builder.addFieldFloat32(4, yawResetDelay, 0); } static addYawResetEnabled(builder:flatbuffers.Builder, yawResetEnabled:boolean) { - builder.addFieldInt8(4, +yawResetEnabled, 0); + builder.addFieldInt8(5, +yawResetEnabled, 0); } static addYawResetTaps(builder:flatbuffers.Builder, yawResetTaps:number) { - builder.addFieldInt8(5, yawResetTaps, 0); + builder.addFieldInt8(6, yawResetTaps, 0); +} + +static addYawResetTracker(builder:flatbuffers.Builder, yawResetTracker:BodyPart) { + builder.addFieldInt8(7, yawResetTracker, 0); } static addMountingResetDelay(builder:flatbuffers.Builder, mountingResetDelay:number) { - builder.addFieldFloat32(6, mountingResetDelay, 0); + builder.addFieldFloat32(8, mountingResetDelay, 0); } static addMountingResetEnabled(builder:flatbuffers.Builder, mountingResetEnabled:boolean) { - builder.addFieldInt8(7, +mountingResetEnabled, 0); + builder.addFieldInt8(9, +mountingResetEnabled, 0); } static addMountingResetTaps(builder:flatbuffers.Builder, mountingResetTaps:number) { - builder.addFieldInt8(8, mountingResetTaps, 0); + builder.addFieldInt8(10, mountingResetTaps, 0); +} + +static addMountingResetTracker(builder:flatbuffers.Builder, mountingResetTracker:BodyPart) { + builder.addFieldInt8(11, mountingResetTracker, 0); } static addSetupMode(builder:flatbuffers.Builder, setupMode:boolean) { - builder.addFieldInt8(9, +setupMode, 0); + builder.addFieldInt8(12, +setupMode, 0); } static addNumberTrackersOverThreshold(builder:flatbuffers.Builder, numberTrackersOverThreshold:number) { - builder.addFieldInt8(10, numberTrackersOverThreshold, 0); + builder.addFieldInt8(13, numberTrackersOverThreshold, 0); } static endTapDetectionSettings(builder:flatbuffers.Builder):flatbuffers.Offset { @@ -134,7 +162,7 @@ static endTapDetectionSettings(builder:flatbuffers.Builder):flatbuffers.Offset { return offset; } -static createTapDetectionSettings(builder:flatbuffers.Builder, fullResetDelay:number|null, fullResetEnabled:boolean|null, fullResetTaps:number|null, yawResetDelay:number|null, yawResetEnabled:boolean|null, yawResetTaps:number|null, mountingResetDelay:number|null, mountingResetEnabled:boolean|null, mountingResetTaps:number|null, setupMode:boolean|null, numberTrackersOverThreshold:number|null):flatbuffers.Offset { +static createTapDetectionSettings(builder:flatbuffers.Builder, fullResetDelay:number|null, fullResetEnabled:boolean|null, fullResetTaps:number|null, fullResetTracker:BodyPart|null, yawResetDelay:number|null, yawResetEnabled:boolean|null, yawResetTaps:number|null, yawResetTracker:BodyPart|null, mountingResetDelay:number|null, mountingResetEnabled:boolean|null, mountingResetTaps:number|null, mountingResetTracker:BodyPart|null, setupMode:boolean|null, numberTrackersOverThreshold:number|null):flatbuffers.Offset { TapDetectionSettings.startTapDetectionSettings(builder); if (fullResetDelay !== null) TapDetectionSettings.addFullResetDelay(builder, fullResetDelay); @@ -142,18 +170,24 @@ static createTapDetectionSettings(builder:flatbuffers.Builder, fullResetDelay:nu TapDetectionSettings.addFullResetEnabled(builder, fullResetEnabled); if (fullResetTaps !== null) TapDetectionSettings.addFullResetTaps(builder, fullResetTaps); + if (fullResetTracker !== null) + TapDetectionSettings.addFullResetTracker(builder, fullResetTracker); if (yawResetDelay !== null) TapDetectionSettings.addYawResetDelay(builder, yawResetDelay); if (yawResetEnabled !== null) TapDetectionSettings.addYawResetEnabled(builder, yawResetEnabled); if (yawResetTaps !== null) TapDetectionSettings.addYawResetTaps(builder, yawResetTaps); + if (yawResetTracker !== null) + TapDetectionSettings.addYawResetTracker(builder, yawResetTracker); if (mountingResetDelay !== null) TapDetectionSettings.addMountingResetDelay(builder, mountingResetDelay); if (mountingResetEnabled !== null) TapDetectionSettings.addMountingResetEnabled(builder, mountingResetEnabled); if (mountingResetTaps !== null) TapDetectionSettings.addMountingResetTaps(builder, mountingResetTaps); + if (mountingResetTracker !== null) + TapDetectionSettings.addMountingResetTracker(builder, mountingResetTracker); if (setupMode !== null) TapDetectionSettings.addSetupMode(builder, setupMode); if (numberTrackersOverThreshold !== null) @@ -166,12 +200,15 @@ unpack(): TapDetectionSettingsT { this.fullResetDelay(), this.fullResetEnabled(), this.fullResetTaps(), + this.fullResetTracker(), this.yawResetDelay(), this.yawResetEnabled(), this.yawResetTaps(), + this.yawResetTracker(), this.mountingResetDelay(), this.mountingResetEnabled(), this.mountingResetTaps(), + this.mountingResetTracker(), this.setupMode(), this.numberTrackersOverThreshold() ); @@ -182,12 +219,15 @@ unpackTo(_o: TapDetectionSettingsT): void { _o.fullResetDelay = this.fullResetDelay(); _o.fullResetEnabled = this.fullResetEnabled(); _o.fullResetTaps = this.fullResetTaps(); + _o.fullResetTracker = this.fullResetTracker(); _o.yawResetDelay = this.yawResetDelay(); _o.yawResetEnabled = this.yawResetEnabled(); _o.yawResetTaps = this.yawResetTaps(); + _o.yawResetTracker = this.yawResetTracker(); _o.mountingResetDelay = this.mountingResetDelay(); _o.mountingResetEnabled = this.mountingResetEnabled(); _o.mountingResetTaps = this.mountingResetTaps(); + _o.mountingResetTracker = this.mountingResetTracker(); _o.setupMode = this.setupMode(); _o.numberTrackersOverThreshold = this.numberTrackersOverThreshold(); } @@ -198,12 +238,15 @@ constructor( public fullResetDelay: number|null = null, public fullResetEnabled: boolean|null = null, public fullResetTaps: number|null = null, + public fullResetTracker: BodyPart|null = null, public yawResetDelay: number|null = null, public yawResetEnabled: boolean|null = null, public yawResetTaps: number|null = null, + public yawResetTracker: BodyPart|null = null, public mountingResetDelay: number|null = null, public mountingResetEnabled: boolean|null = null, public mountingResetTaps: number|null = null, + public mountingResetTracker: BodyPart|null = null, public setupMode: boolean|null = null, public numberTrackersOverThreshold: number|null = null ){} @@ -214,12 +257,15 @@ pack(builder:flatbuffers.Builder): flatbuffers.Offset { this.fullResetDelay, this.fullResetEnabled, this.fullResetTaps, + this.fullResetTracker, this.yawResetDelay, this.yawResetEnabled, this.yawResetTaps, + this.yawResetTracker, this.mountingResetDelay, this.mountingResetEnabled, this.mountingResetTaps, + this.mountingResetTracker, this.setupMode, this.numberTrackersOverThreshold ); diff --git a/schema/rpc.fbs b/schema/rpc.fbs index c54f1504..3ed5141b 100644 --- a/schema/rpc.fbs +++ b/schema/rpc.fbs @@ -274,12 +274,15 @@ table TapDetectionSettings { full_reset_delay: float = null; full_reset_enabled: bool = null; full_reset_taps: uint8 = null; + full_reset_tracker: solarxr_protocol.datatypes.BodyPart = null; yaw_reset_delay: float = null; yaw_reset_enabled: bool = null; yaw_reset_taps: uint8 = null; + yaw_reset_tracker: solarxr_protocol.datatypes.BodyPart = null; mounting_reset_delay: float = null; mounting_reset_enabled: bool = null; mounting_reset_taps: uint8 = null; + mounting_reset_tracker: solarxr_protocol.datatypes.BodyPart = null; /// If true, disables reset behavior of tap detection and sends a /// TapDetectionSetupNotification, each time 2 taps are detected on any tracker setup_mode: bool = null;