Skip to content

Add Tap reset trackers #207

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

Open
Aed-1 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add Tap reset trackers #207

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 38 additions & 8 deletions protocol/cpp/include/solarxr_protocol/generated/all_generated.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<float> full_reset_delay() const {
return GetOptional<float, float>(VT_FULL_RESET_DELAY);
Expand All @@ -7818,6 +7821,9 @@ struct TapDetectionSettings FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table
flatbuffers::Optional<uint8_t> full_reset_taps() const {
return GetOptional<uint8_t, uint8_t>(VT_FULL_RESET_TAPS);
}
flatbuffers::Optional<solarxr_protocol::datatypes::BodyPart> full_reset_tracker() const {
return GetOptional<uint8_t, solarxr_protocol::datatypes::BodyPart>(VT_FULL_RESET_TRACKER);
}
flatbuffers::Optional<float> yaw_reset_delay() const {
return GetOptional<float, float>(VT_YAW_RESET_DELAY);
}
Expand All @@ -7827,6 +7833,9 @@ struct TapDetectionSettings FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table
flatbuffers::Optional<uint8_t> yaw_reset_taps() const {
return GetOptional<uint8_t, uint8_t>(VT_YAW_RESET_TAPS);
}
flatbuffers::Optional<solarxr_protocol::datatypes::BodyPart> yaw_reset_tracker() const {
return GetOptional<uint8_t, solarxr_protocol::datatypes::BodyPart>(VT_YAW_RESET_TRACKER);
}
flatbuffers::Optional<float> mounting_reset_delay() const {
return GetOptional<float, float>(VT_MOUNTING_RESET_DELAY);
}
Expand All @@ -7836,6 +7845,9 @@ struct TapDetectionSettings FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table
flatbuffers::Optional<uint8_t> mounting_reset_taps() const {
return GetOptional<uint8_t, uint8_t>(VT_MOUNTING_RESET_TAPS);
}
flatbuffers::Optional<solarxr_protocol::datatypes::BodyPart> mounting_reset_tracker() const {
return GetOptional<uint8_t, solarxr_protocol::datatypes::BodyPart>(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<bool> setup_mode() const {
Expand All @@ -7849,12 +7861,15 @@ struct TapDetectionSettings FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table
VerifyField<float>(verifier, VT_FULL_RESET_DELAY, 4) &&
VerifyField<uint8_t>(verifier, VT_FULL_RESET_ENABLED, 1) &&
VerifyField<uint8_t>(verifier, VT_FULL_RESET_TAPS, 1) &&
VerifyField<uint8_t>(verifier, VT_FULL_RESET_TRACKER, 1) &&
VerifyField<float>(verifier, VT_YAW_RESET_DELAY, 4) &&
VerifyField<uint8_t>(verifier, VT_YAW_RESET_ENABLED, 1) &&
VerifyField<uint8_t>(verifier, VT_YAW_RESET_TAPS, 1) &&
VerifyField<uint8_t>(verifier, VT_YAW_RESET_TRACKER, 1) &&
VerifyField<float>(verifier, VT_MOUNTING_RESET_DELAY, 4) &&
VerifyField<uint8_t>(verifier, VT_MOUNTING_RESET_ENABLED, 1) &&
VerifyField<uint8_t>(verifier, VT_MOUNTING_RESET_TAPS, 1) &&
VerifyField<uint8_t>(verifier, VT_MOUNTING_RESET_TRACKER, 1) &&
VerifyField<uint8_t>(verifier, VT_SETUP_MODE, 1) &&
VerifyField<uint8_t>(verifier, VT_NUMBER_TRACKERS_OVER_THRESHOLD, 1) &&
verifier.EndTable();
Expand All @@ -7874,6 +7889,9 @@ struct TapDetectionSettingsBuilder {
void add_full_reset_taps(uint8_t full_reset_taps) {
fbb_.AddElement<uint8_t>(TapDetectionSettings::VT_FULL_RESET_TAPS, full_reset_taps);
}
void add_full_reset_tracker(solarxr_protocol::datatypes::BodyPart full_reset_tracker) {
fbb_.AddElement<uint8_t>(TapDetectionSettings::VT_FULL_RESET_TRACKER, static_cast<uint8_t>(full_reset_tracker));
}
void add_yaw_reset_delay(float yaw_reset_delay) {
fbb_.AddElement<float>(TapDetectionSettings::VT_YAW_RESET_DELAY, yaw_reset_delay);
}
Expand All @@ -7883,6 +7901,9 @@ struct TapDetectionSettingsBuilder {
void add_yaw_reset_taps(uint8_t yaw_reset_taps) {
fbb_.AddElement<uint8_t>(TapDetectionSettings::VT_YAW_RESET_TAPS, yaw_reset_taps);
}
void add_yaw_reset_tracker(solarxr_protocol::datatypes::BodyPart yaw_reset_tracker) {
fbb_.AddElement<uint8_t>(TapDetectionSettings::VT_YAW_RESET_TRACKER, static_cast<uint8_t>(yaw_reset_tracker));
}
void add_mounting_reset_delay(float mounting_reset_delay) {
fbb_.AddElement<float>(TapDetectionSettings::VT_MOUNTING_RESET_DELAY, mounting_reset_delay);
}
Expand All @@ -7892,6 +7913,9 @@ struct TapDetectionSettingsBuilder {
void add_mounting_reset_taps(uint8_t mounting_reset_taps) {
fbb_.AddElement<uint8_t>(TapDetectionSettings::VT_MOUNTING_RESET_TAPS, mounting_reset_taps);
}
void add_mounting_reset_tracker(solarxr_protocol::datatypes::BodyPart mounting_reset_tracker) {
fbb_.AddElement<uint8_t>(TapDetectionSettings::VT_MOUNTING_RESET_TRACKER, static_cast<uint8_t>(mounting_reset_tracker));
}
void add_setup_mode(bool setup_mode) {
fbb_.AddElement<uint8_t>(TapDetectionSettings::VT_SETUP_MODE, static_cast<uint8_t>(setup_mode));
}
Expand All @@ -7914,12 +7938,15 @@ inline flatbuffers::Offset<TapDetectionSettings> CreateTapDetectionSettings(
flatbuffers::Optional<float> full_reset_delay = flatbuffers::nullopt,
flatbuffers::Optional<bool> full_reset_enabled = flatbuffers::nullopt,
flatbuffers::Optional<uint8_t> full_reset_taps = flatbuffers::nullopt,
flatbuffers::Optional<solarxr_protocol::datatypes::BodyPart> full_reset_tracker = flatbuffers::nullopt,
flatbuffers::Optional<float> yaw_reset_delay = flatbuffers::nullopt,
flatbuffers::Optional<bool> yaw_reset_enabled = flatbuffers::nullopt,
flatbuffers::Optional<uint8_t> yaw_reset_taps = flatbuffers::nullopt,
flatbuffers::Optional<solarxr_protocol::datatypes::BodyPart> yaw_reset_tracker = flatbuffers::nullopt,
flatbuffers::Optional<float> mounting_reset_delay = flatbuffers::nullopt,
flatbuffers::Optional<bool> mounting_reset_enabled = flatbuffers::nullopt,
flatbuffers::Optional<uint8_t> mounting_reset_taps = flatbuffers::nullopt,
flatbuffers::Optional<solarxr_protocol::datatypes::BodyPart> mounting_reset_tracker = flatbuffers::nullopt,
flatbuffers::Optional<bool> setup_mode = flatbuffers::nullopt,
flatbuffers::Optional<uint8_t> number_trackers_over_threshold = flatbuffers::nullopt) {
TapDetectionSettingsBuilder builder_(_fbb);
Expand All @@ -7928,10 +7955,13 @@ inline flatbuffers::Offset<TapDetectionSettings> 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();
Expand Down
76 changes: 50 additions & 26 deletions protocol/java/src/solarxr_protocol/rpc/TapDetectionSettings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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());
}
Expand Down
Loading