Skip to content

Commit 09453c2

Browse files
committed
hid config
1 parent 4036bbe commit 09453c2

File tree

23 files changed

+536
-24
lines changed

23 files changed

+536
-24
lines changed

protocol/cpp/include/solarxr_protocol/generated/all_generated.h

Lines changed: 71 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,9 @@ struct ResetsSettingsBuilder;
209209
struct StayAlignedSettings;
210210
struct StayAlignedSettingsBuilder;
211211

212+
struct HIDSettings;
213+
struct HIDSettingsBuilder;
214+
212215
struct TapDetectionSetupNotification;
213216
struct TapDetectionSetupNotificationBuilder;
214217

@@ -3667,6 +3670,7 @@ struct HardwareStatus FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
36673670
const solarxr_protocol::datatypes::LogData *log_data() const {
36683671
return GetPointer<const solarxr_protocol::datatypes::LogData *>(VT_LOG_DATA);
36693672
}
3673+
/// Runtime estimate in microseconds
36703674
flatbuffers::Optional<int64_t> battery_runtime_estimate() const {
36713675
return GetOptional<int64_t, int64_t>(VT_BATTERY_RUNTIME_ESTIMATE);
36723676
}
@@ -6768,7 +6772,8 @@ struct SettingsResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
67686772
VT_TAP_DETECTION_SETTINGS = 18,
67696773
VT_AUTO_BONE_SETTINGS = 20,
67706774
VT_RESETS_SETTINGS = 22,
6771-
VT_STAY_ALIGNED = 24
6775+
VT_STAY_ALIGNED = 24,
6776+
VT_HID_SETTINGS = 26
67726777
};
67736778
const solarxr_protocol::rpc::SteamVRTrackersSetting *steam_vr_trackers() const {
67746779
return GetPointer<const solarxr_protocol::rpc::SteamVRTrackersSetting *>(VT_STEAM_VR_TRACKERS);
@@ -6803,6 +6808,9 @@ struct SettingsResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
68036808
const solarxr_protocol::rpc::StayAlignedSettings *stay_aligned() const {
68046809
return GetPointer<const solarxr_protocol::rpc::StayAlignedSettings *>(VT_STAY_ALIGNED);
68056810
}
6811+
const solarxr_protocol::rpc::HIDSettings *hid_settings() const {
6812+
return GetPointer<const solarxr_protocol::rpc::HIDSettings *>(VT_HID_SETTINGS);
6813+
}
68066814
bool Verify(flatbuffers::Verifier &verifier) const {
68076815
return VerifyTableStart(verifier) &&
68086816
VerifyOffset(verifier, VT_STEAM_VR_TRACKERS) &&
@@ -6827,6 +6835,8 @@ struct SettingsResponse FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
68276835
verifier.VerifyTable(resets_settings()) &&
68286836
VerifyOffset(verifier, VT_STAY_ALIGNED) &&
68296837
verifier.VerifyTable(stay_aligned()) &&
6838+
VerifyOffset(verifier, VT_HID_SETTINGS) &&
6839+
verifier.VerifyTable(hid_settings()) &&
68306840
verifier.EndTable();
68316841
}
68326842
};
@@ -6868,6 +6878,9 @@ struct SettingsResponseBuilder {
68686878
void add_stay_aligned(flatbuffers::Offset<solarxr_protocol::rpc::StayAlignedSettings> stay_aligned) {
68696879
fbb_.AddOffset(SettingsResponse::VT_STAY_ALIGNED, stay_aligned);
68706880
}
6881+
void add_hid_settings(flatbuffers::Offset<solarxr_protocol::rpc::HIDSettings> hid_settings) {
6882+
fbb_.AddOffset(SettingsResponse::VT_HID_SETTINGS, hid_settings);
6883+
}
68716884
explicit SettingsResponseBuilder(flatbuffers::FlatBufferBuilder &_fbb)
68726885
: fbb_(_fbb) {
68736886
start_ = fbb_.StartTable();
@@ -6891,8 +6904,10 @@ inline flatbuffers::Offset<SettingsResponse> CreateSettingsResponse(
68916904
flatbuffers::Offset<solarxr_protocol::rpc::TapDetectionSettings> tap_detection_settings = 0,
68926905
flatbuffers::Offset<solarxr_protocol::rpc::AutoBoneSettings> auto_bone_settings = 0,
68936906
flatbuffers::Offset<solarxr_protocol::rpc::ResetsSettings> resets_settings = 0,
6894-
flatbuffers::Offset<solarxr_protocol::rpc::StayAlignedSettings> stay_aligned = 0) {
6907+
flatbuffers::Offset<solarxr_protocol::rpc::StayAlignedSettings> stay_aligned = 0,
6908+
flatbuffers::Offset<solarxr_protocol::rpc::HIDSettings> hid_settings = 0) {
68956909
SettingsResponseBuilder builder_(_fbb);
6910+
builder_.add_hid_settings(hid_settings);
68966911
builder_.add_stay_aligned(stay_aligned);
68976912
builder_.add_resets_settings(resets_settings);
68986913
builder_.add_auto_bone_settings(auto_bone_settings);
@@ -6920,7 +6935,8 @@ struct ChangeSettingsRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tabl
69206935
VT_TAP_DETECTION_SETTINGS = 18,
69216936
VT_AUTO_BONE_SETTINGS = 20,
69226937
VT_RESETS_SETTINGS = 22,
6923-
VT_STAY_ALIGNED = 24
6938+
VT_STAY_ALIGNED = 24,
6939+
VT_HID_SETTINGS = 26
69246940
};
69256941
const solarxr_protocol::rpc::SteamVRTrackersSetting *steam_vr_trackers() const {
69266942
return GetPointer<const solarxr_protocol::rpc::SteamVRTrackersSetting *>(VT_STEAM_VR_TRACKERS);
@@ -6955,6 +6971,9 @@ struct ChangeSettingsRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tabl
69556971
const solarxr_protocol::rpc::StayAlignedSettings *stay_aligned() const {
69566972
return GetPointer<const solarxr_protocol::rpc::StayAlignedSettings *>(VT_STAY_ALIGNED);
69576973
}
6974+
const solarxr_protocol::rpc::HIDSettings *hid_settings() const {
6975+
return GetPointer<const solarxr_protocol::rpc::HIDSettings *>(VT_HID_SETTINGS);
6976+
}
69586977
bool Verify(flatbuffers::Verifier &verifier) const {
69596978
return VerifyTableStart(verifier) &&
69606979
VerifyOffset(verifier, VT_STEAM_VR_TRACKERS) &&
@@ -6979,6 +6998,8 @@ struct ChangeSettingsRequest FLATBUFFERS_FINAL_CLASS : private flatbuffers::Tabl
69796998
verifier.VerifyTable(resets_settings()) &&
69806999
VerifyOffset(verifier, VT_STAY_ALIGNED) &&
69817000
verifier.VerifyTable(stay_aligned()) &&
7001+
VerifyOffset(verifier, VT_HID_SETTINGS) &&
7002+
verifier.VerifyTable(hid_settings()) &&
69827003
verifier.EndTable();
69837004
}
69847005
};
@@ -7020,6 +7041,9 @@ struct ChangeSettingsRequestBuilder {
70207041
void add_stay_aligned(flatbuffers::Offset<solarxr_protocol::rpc::StayAlignedSettings> stay_aligned) {
70217042
fbb_.AddOffset(ChangeSettingsRequest::VT_STAY_ALIGNED, stay_aligned);
70227043
}
7044+
void add_hid_settings(flatbuffers::Offset<solarxr_protocol::rpc::HIDSettings> hid_settings) {
7045+
fbb_.AddOffset(ChangeSettingsRequest::VT_HID_SETTINGS, hid_settings);
7046+
}
70237047
explicit ChangeSettingsRequestBuilder(flatbuffers::FlatBufferBuilder &_fbb)
70247048
: fbb_(_fbb) {
70257049
start_ = fbb_.StartTable();
@@ -7043,8 +7067,10 @@ inline flatbuffers::Offset<ChangeSettingsRequest> CreateChangeSettingsRequest(
70437067
flatbuffers::Offset<solarxr_protocol::rpc::TapDetectionSettings> tap_detection_settings = 0,
70447068
flatbuffers::Offset<solarxr_protocol::rpc::AutoBoneSettings> auto_bone_settings = 0,
70457069
flatbuffers::Offset<solarxr_protocol::rpc::ResetsSettings> resets_settings = 0,
7046-
flatbuffers::Offset<solarxr_protocol::rpc::StayAlignedSettings> stay_aligned = 0) {
7070+
flatbuffers::Offset<solarxr_protocol::rpc::StayAlignedSettings> stay_aligned = 0,
7071+
flatbuffers::Offset<solarxr_protocol::rpc::HIDSettings> hid_settings = 0) {
70477072
ChangeSettingsRequestBuilder builder_(_fbb);
7073+
builder_.add_hid_settings(hid_settings);
70487074
builder_.add_stay_aligned(stay_aligned);
70497075
builder_.add_resets_settings(resets_settings);
70507076
builder_.add_auto_bone_settings(auto_bone_settings);
@@ -8126,6 +8152,47 @@ inline flatbuffers::Offset<StayAlignedSettings> CreateStayAlignedSettings(
81268152
return builder_.Finish();
81278153
}
81288154

8155+
struct HIDSettings FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
8156+
typedef HIDSettingsBuilder Builder;
8157+
enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
8158+
VT_TRACKERSOVERHID = 4
8159+
};
8160+
bool trackersOverHID() const {
8161+
return GetField<uint8_t>(VT_TRACKERSOVERHID, 0) != 0;
8162+
}
8163+
bool Verify(flatbuffers::Verifier &verifier) const {
8164+
return VerifyTableStart(verifier) &&
8165+
VerifyField<uint8_t>(verifier, VT_TRACKERSOVERHID, 1) &&
8166+
verifier.EndTable();
8167+
}
8168+
};
8169+
8170+
struct HIDSettingsBuilder {
8171+
typedef HIDSettings Table;
8172+
flatbuffers::FlatBufferBuilder &fbb_;
8173+
flatbuffers::uoffset_t start_;
8174+
void add_trackersOverHID(bool trackersOverHID) {
8175+
fbb_.AddElement<uint8_t>(HIDSettings::VT_TRACKERSOVERHID, static_cast<uint8_t>(trackersOverHID), 0);
8176+
}
8177+
explicit HIDSettingsBuilder(flatbuffers::FlatBufferBuilder &_fbb)
8178+
: fbb_(_fbb) {
8179+
start_ = fbb_.StartTable();
8180+
}
8181+
flatbuffers::Offset<HIDSettings> Finish() {
8182+
const auto end = fbb_.EndTable(start_);
8183+
auto o = flatbuffers::Offset<HIDSettings>(end);
8184+
return o;
8185+
}
8186+
};
8187+
8188+
inline flatbuffers::Offset<HIDSettings> CreateHIDSettings(
8189+
flatbuffers::FlatBufferBuilder &_fbb,
8190+
bool trackersOverHID = false) {
8191+
HIDSettingsBuilder builder_(_fbb);
8192+
builder_.add_trackersOverHID(trackersOverHID);
8193+
return builder_.Finish();
8194+
}
8195+
81298196
/// See TapDetectionSettings::setup_mode
81308197
struct TapDetectionSetupNotification FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
81318198
typedef TapDetectionSetupNotificationBuilder Builder;

protocol/java/src/solarxr_protocol/datatypes/hardware_info/HardwareStatus.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ public final class HardwareStatus extends Table {
3838
public int batteryPctEstimate() { int o = __offset(16); return o != 0 ? bb.get(o + bb_pos) & 0xFF : 0; }
3939
public solarxr_protocol.datatypes.LogData logData() { return logData(new solarxr_protocol.datatypes.LogData()); }
4040
public solarxr_protocol.datatypes.LogData logData(solarxr_protocol.datatypes.LogData obj) { int o = __offset(18); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; }
41+
/**
42+
* Runtime estimate in microseconds
43+
*/
4144
public boolean hasBatteryRuntimeEstimate() { return 0 != __offset(20); }
4245
public long batteryRuntimeEstimate() { int o = __offset(20); return o != 0 ? bb.getLong(o + bb_pos) : 0L; }
4346

protocol/java/src/solarxr_protocol/rpc/ChangeSettingsRequest.java

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ public final class ChangeSettingsRequest extends Table {
3737
public solarxr_protocol.rpc.ResetsSettings resetsSettings(solarxr_protocol.rpc.ResetsSettings obj) { int o = __offset(22); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; }
3838
public solarxr_protocol.rpc.StayAlignedSettings stayAligned() { return stayAligned(new solarxr_protocol.rpc.StayAlignedSettings()); }
3939
public solarxr_protocol.rpc.StayAlignedSettings stayAligned(solarxr_protocol.rpc.StayAlignedSettings obj) { int o = __offset(24); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; }
40+
public solarxr_protocol.rpc.HIDSettings hidSettings() { return hidSettings(new solarxr_protocol.rpc.HIDSettings()); }
41+
public solarxr_protocol.rpc.HIDSettings hidSettings(solarxr_protocol.rpc.HIDSettings obj) { int o = __offset(26); return o != 0 ? obj.__assign(__indirect(o + bb_pos), bb) : null; }
4042

4143
public static int createChangeSettingsRequest(FlatBufferBuilder builder,
4244
int steamVrTrackersOffset,
@@ -49,8 +51,10 @@ public static int createChangeSettingsRequest(FlatBufferBuilder builder,
4951
int tapDetectionSettingsOffset,
5052
int autoBoneSettingsOffset,
5153
int resetsSettingsOffset,
52-
int stayAlignedOffset) {
53-
builder.startTable(11);
54+
int stayAlignedOffset,
55+
int hidSettingsOffset) {
56+
builder.startTable(12);
57+
ChangeSettingsRequest.addHidSettings(builder, hidSettingsOffset);
5458
ChangeSettingsRequest.addStayAligned(builder, stayAlignedOffset);
5559
ChangeSettingsRequest.addResetsSettings(builder, resetsSettingsOffset);
5660
ChangeSettingsRequest.addAutoBoneSettings(builder, autoBoneSettingsOffset);
@@ -65,7 +69,7 @@ public static int createChangeSettingsRequest(FlatBufferBuilder builder,
6569
return ChangeSettingsRequest.endChangeSettingsRequest(builder);
6670
}
6771

68-
public static void startChangeSettingsRequest(FlatBufferBuilder builder) { builder.startTable(11); }
72+
public static void startChangeSettingsRequest(FlatBufferBuilder builder) { builder.startTable(12); }
6973
public static void addSteamVrTrackers(FlatBufferBuilder builder, int steamVrTrackersOffset) { builder.addOffset(0, steamVrTrackersOffset, 0); }
7074
public static void addFiltering(FlatBufferBuilder builder, int filteringOffset) { builder.addOffset(1, filteringOffset, 0); }
7175
public static void addDriftCompensation(FlatBufferBuilder builder, int driftCompensationOffset) { builder.addOffset(2, driftCompensationOffset, 0); }
@@ -77,6 +81,7 @@ public static int createChangeSettingsRequest(FlatBufferBuilder builder,
7781
public static void addAutoBoneSettings(FlatBufferBuilder builder, int autoBoneSettingsOffset) { builder.addOffset(8, autoBoneSettingsOffset, 0); }
7882
public static void addResetsSettings(FlatBufferBuilder builder, int resetsSettingsOffset) { builder.addOffset(9, resetsSettingsOffset, 0); }
7983
public static void addStayAligned(FlatBufferBuilder builder, int stayAlignedOffset) { builder.addOffset(10, stayAlignedOffset, 0); }
84+
public static void addHidSettings(FlatBufferBuilder builder, int hidSettingsOffset) { builder.addOffset(11, hidSettingsOffset, 0); }
8085
public static int endChangeSettingsRequest(FlatBufferBuilder builder) {
8186
int o = builder.endTable();
8287
return o;
@@ -116,6 +121,8 @@ public void unpackTo(ChangeSettingsRequestT _o) {
116121
else _o.setResetsSettings(null);
117122
if (stayAligned() != null) _o.setStayAligned(stayAligned().unpack());
118123
else _o.setStayAligned(null);
124+
if (hidSettings() != null) _o.setHidSettings(hidSettings().unpack());
125+
else _o.setHidSettings(null);
119126
}
120127
public static int pack(FlatBufferBuilder builder, ChangeSettingsRequestT _o) {
121128
if (_o == null) return 0;
@@ -130,6 +137,7 @@ public static int pack(FlatBufferBuilder builder, ChangeSettingsRequestT _o) {
130137
int _autoBoneSettings = _o.getAutoBoneSettings() == null ? 0 : solarxr_protocol.rpc.AutoBoneSettings.pack(builder, _o.getAutoBoneSettings());
131138
int _resetsSettings = _o.getResetsSettings() == null ? 0 : solarxr_protocol.rpc.ResetsSettings.pack(builder, _o.getResetsSettings());
132139
int _stayAligned = _o.getStayAligned() == null ? 0 : solarxr_protocol.rpc.StayAlignedSettings.pack(builder, _o.getStayAligned());
140+
int _hidSettings = _o.getHidSettings() == null ? 0 : solarxr_protocol.rpc.HIDSettings.pack(builder, _o.getHidSettings());
133141
return createChangeSettingsRequest(
134142
builder,
135143
_steamVrTrackers,
@@ -142,7 +150,8 @@ public static int pack(FlatBufferBuilder builder, ChangeSettingsRequestT _o) {
142150
_tapDetectionSettings,
143151
_autoBoneSettings,
144152
_resetsSettings,
145-
_stayAligned);
153+
_stayAligned,
154+
_hidSettings);
146155
}
147156
}
148157

protocol/java/src/solarxr_protocol/rpc/ChangeSettingsRequestT.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ public class ChangeSettingsRequestT {
1919
private solarxr_protocol.rpc.AutoBoneSettingsT autoBoneSettings;
2020
private solarxr_protocol.rpc.ResetsSettingsT resetsSettings;
2121
private solarxr_protocol.rpc.StayAlignedSettingsT stayAligned;
22+
private solarxr_protocol.rpc.HIDSettingsT hidSettings;
2223

2324
public solarxr_protocol.rpc.SteamVRTrackersSettingT getSteamVrTrackers() { return steamVrTrackers; }
2425

@@ -64,6 +65,10 @@ public class ChangeSettingsRequestT {
6465

6566
public void setStayAligned(solarxr_protocol.rpc.StayAlignedSettingsT stayAligned) { this.stayAligned = stayAligned; }
6667

68+
public solarxr_protocol.rpc.HIDSettingsT getHidSettings() { return hidSettings; }
69+
70+
public void setHidSettings(solarxr_protocol.rpc.HIDSettingsT hidSettings) { this.hidSettings = hidSettings; }
71+
6772

6873
public ChangeSettingsRequestT() {
6974
this.steamVrTrackers = null;
@@ -77,6 +82,7 @@ public ChangeSettingsRequestT() {
7782
this.autoBoneSettings = null;
7883
this.resetsSettings = null;
7984
this.stayAligned = null;
85+
this.hidSettings = null;
8086
}
8187
}
8288

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
// automatically generated by the FlatBuffers compiler, do not modify
2+
3+
package solarxr_protocol.rpc;
4+
5+
import java.nio.*;
6+
import java.lang.*;
7+
import java.util.*;
8+
import com.google.flatbuffers.*;
9+
10+
@SuppressWarnings("unused")
11+
public final class HIDSettings extends Table {
12+
public static void ValidateVersion() { Constants.FLATBUFFERS_22_10_26(); }
13+
public static HIDSettings getRootAsHIDSettings(ByteBuffer _bb) { return getRootAsHIDSettings(_bb, new HIDSettings()); }
14+
public static HIDSettings getRootAsHIDSettings(ByteBuffer _bb, HIDSettings obj) { _bb.order(ByteOrder.LITTLE_ENDIAN); return (obj.__assign(_bb.getInt(_bb.position()) + _bb.position(), _bb)); }
15+
public void __init(int _i, ByteBuffer _bb) { __reset(_i, _bb); }
16+
public HIDSettings __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; }
17+
18+
public boolean trackersOverHid() { int o = __offset(4); return o != 0 ? 0!=bb.get(o + bb_pos) : false; }
19+
20+
public static int createHIDSettings(FlatBufferBuilder builder,
21+
boolean trackersOverHid) {
22+
builder.startTable(1);
23+
HIDSettings.addTrackersOverHid(builder, trackersOverHid);
24+
return HIDSettings.endHIDSettings(builder);
25+
}
26+
27+
public static void startHIDSettings(FlatBufferBuilder builder) { builder.startTable(1); }
28+
public static void addTrackersOverHid(FlatBufferBuilder builder, boolean trackersOverHid) { builder.addBoolean(0, trackersOverHid, false); }
29+
public static int endHIDSettings(FlatBufferBuilder builder) {
30+
int o = builder.endTable();
31+
return o;
32+
}
33+
34+
public static final class Vector extends BaseVector {
35+
public Vector __assign(int _vector, int _element_size, ByteBuffer _bb) { __reset(_vector, _element_size, _bb); return this; }
36+
37+
public HIDSettings get(int j) { return get(new HIDSettings(), j); }
38+
public HIDSettings get(HIDSettings obj, int j) { return obj.__assign(__indirect(__element(j), bb), bb); }
39+
}
40+
public HIDSettingsT unpack() {
41+
HIDSettingsT _o = new HIDSettingsT();
42+
unpackTo(_o);
43+
return _o;
44+
}
45+
public void unpackTo(HIDSettingsT _o) {
46+
boolean _oTrackersOverHid = trackersOverHid();
47+
_o.setTrackersOverHid(_oTrackersOverHid);
48+
}
49+
public static int pack(FlatBufferBuilder builder, HIDSettingsT _o) {
50+
if (_o == null) return 0;
51+
return createHIDSettings(
52+
builder,
53+
_o.getTrackersOverHid());
54+
}
55+
}
56+
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// automatically generated by the FlatBuffers compiler, do not modify
2+
3+
package solarxr_protocol.rpc;
4+
5+
import java.nio.*;
6+
import java.lang.*;
7+
import java.util.*;
8+
import com.google.flatbuffers.*;
9+
10+
public class HIDSettingsT {
11+
private boolean trackersOverHid;
12+
13+
public boolean getTrackersOverHid() { return trackersOverHid; }
14+
15+
public void setTrackersOverHid(boolean trackersOverHid) { this.trackersOverHid = trackersOverHid; }
16+
17+
18+
public HIDSettingsT() {
19+
this.trackersOverHid = false;
20+
}
21+
}
22+

0 commit comments

Comments
 (0)