Skip to content

Commit 28a64d3

Browse files
authored
Fix portin/out snake case (#93)
fix portin/out format
1 parent 6524cdb commit 28a64d3

File tree

3 files changed

+42
-42
lines changed

3 files changed

+42
-42
lines changed

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

+20-20
Original file line numberDiff line numberDiff line change
@@ -4670,27 +4670,27 @@ struct OSCSettings FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
46704670
typedef OSCSettingsBuilder Builder;
46714671
enum FlatBuffersVTableOffset FLATBUFFERS_VTABLE_UNDERLYING_TYPE {
46724672
VT_ENABLED = 4,
4673-
VT_PORTIN = 6,
4674-
VT_PORTOUT = 8,
4673+
VT_PORT_IN = 6,
4674+
VT_PORT_OUT = 8,
46754675
VT_ADDRESS = 10
46764676
};
46774677
bool enabled() const {
46784678
return GetField<uint8_t>(VT_ENABLED, 0) != 0;
46794679
}
4680-
uint16_t portIn() const {
4681-
return GetField<uint16_t>(VT_PORTIN, 0);
4680+
uint16_t port_in() const {
4681+
return GetField<uint16_t>(VT_PORT_IN, 0);
46824682
}
4683-
uint16_t portOut() const {
4684-
return GetField<uint16_t>(VT_PORTOUT, 0);
4683+
uint16_t port_out() const {
4684+
return GetField<uint16_t>(VT_PORT_OUT, 0);
46854685
}
46864686
const flatbuffers::String *address() const {
46874687
return GetPointer<const flatbuffers::String *>(VT_ADDRESS);
46884688
}
46894689
bool Verify(flatbuffers::Verifier &verifier) const {
46904690
return VerifyTableStart(verifier) &&
46914691
VerifyField<uint8_t>(verifier, VT_ENABLED, 1) &&
4692-
VerifyField<uint16_t>(verifier, VT_PORTIN, 2) &&
4693-
VerifyField<uint16_t>(verifier, VT_PORTOUT, 2) &&
4692+
VerifyField<uint16_t>(verifier, VT_PORT_IN, 2) &&
4693+
VerifyField<uint16_t>(verifier, VT_PORT_OUT, 2) &&
46944694
VerifyOffset(verifier, VT_ADDRESS) &&
46954695
verifier.VerifyString(address()) &&
46964696
verifier.EndTable();
@@ -4704,11 +4704,11 @@ struct OSCSettingsBuilder {
47044704
void add_enabled(bool enabled) {
47054705
fbb_.AddElement<uint8_t>(OSCSettings::VT_ENABLED, static_cast<uint8_t>(enabled), 0);
47064706
}
4707-
void add_portIn(uint16_t portIn) {
4708-
fbb_.AddElement<uint16_t>(OSCSettings::VT_PORTIN, portIn, 0);
4707+
void add_port_in(uint16_t port_in) {
4708+
fbb_.AddElement<uint16_t>(OSCSettings::VT_PORT_IN, port_in, 0);
47094709
}
4710-
void add_portOut(uint16_t portOut) {
4711-
fbb_.AddElement<uint16_t>(OSCSettings::VT_PORTOUT, portOut, 0);
4710+
void add_port_out(uint16_t port_out) {
4711+
fbb_.AddElement<uint16_t>(OSCSettings::VT_PORT_OUT, port_out, 0);
47124712
}
47134713
void add_address(flatbuffers::Offset<flatbuffers::String> address) {
47144714
fbb_.AddOffset(OSCSettings::VT_ADDRESS, address);
@@ -4727,29 +4727,29 @@ struct OSCSettingsBuilder {
47274727
inline flatbuffers::Offset<OSCSettings> CreateOSCSettings(
47284728
flatbuffers::FlatBufferBuilder &_fbb,
47294729
bool enabled = false,
4730-
uint16_t portIn = 0,
4731-
uint16_t portOut = 0,
4730+
uint16_t port_in = 0,
4731+
uint16_t port_out = 0,
47324732
flatbuffers::Offset<flatbuffers::String> address = 0) {
47334733
OSCSettingsBuilder builder_(_fbb);
47344734
builder_.add_address(address);
4735-
builder_.add_portOut(portOut);
4736-
builder_.add_portIn(portIn);
4735+
builder_.add_port_out(port_out);
4736+
builder_.add_port_in(port_in);
47374737
builder_.add_enabled(enabled);
47384738
return builder_.Finish();
47394739
}
47404740

47414741
inline flatbuffers::Offset<OSCSettings> CreateOSCSettingsDirect(
47424742
flatbuffers::FlatBufferBuilder &_fbb,
47434743
bool enabled = false,
4744-
uint16_t portIn = 0,
4745-
uint16_t portOut = 0,
4744+
uint16_t port_in = 0,
4745+
uint16_t port_out = 0,
47464746
const char *address = nullptr) {
47474747
auto address__ = address ? _fbb.CreateString(address) : 0;
47484748
return solarxr_protocol::rpc::CreateOSCSettings(
47494749
_fbb,
47504750
enabled,
4751-
portIn,
4752-
portOut,
4751+
port_in,
4752+
port_out,
47534753
address__);
47544754
}
47554755

protocol/rust/src/generated/solarxr_protocol/rpc/oscsettings_generated.rs

+20-20
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ impl<'a> flatbuffers::Follow<'a> for OSCSettings<'a> {
2727

2828
impl<'a> OSCSettings<'a> {
2929
pub const VT_ENABLED: flatbuffers::VOffsetT = 4;
30-
pub const VT_PORTIN: flatbuffers::VOffsetT = 6;
31-
pub const VT_PORTOUT: flatbuffers::VOffsetT = 8;
30+
pub const VT_PORT_IN: flatbuffers::VOffsetT = 6;
31+
pub const VT_PORT_OUT: flatbuffers::VOffsetT = 8;
3232
pub const VT_ADDRESS: flatbuffers::VOffsetT = 10;
3333

3434
#[inline]
@@ -42,8 +42,8 @@ impl<'a> OSCSettings<'a> {
4242
) -> flatbuffers::WIPOffset<OSCSettings<'bldr>> {
4343
let mut builder = OSCSettingsBuilder::new(_fbb);
4444
if let Some(x) = args.address { builder.add_address(x); }
45-
builder.add_portOut(args.portOut);
46-
builder.add_portIn(args.portIn);
45+
builder.add_port_out(args.port_out);
46+
builder.add_port_in(args.port_in);
4747
builder.add_enabled(args.enabled);
4848
builder.finish()
4949
}
@@ -57,18 +57,18 @@ impl<'a> OSCSettings<'a> {
5757
unsafe { self._tab.get::<bool>(OSCSettings::VT_ENABLED, Some(false)).unwrap()}
5858
}
5959
#[inline]
60-
pub fn portIn(&self) -> u16 {
60+
pub fn port_in(&self) -> u16 {
6161
// Safety:
6262
// Created from valid Table for this object
6363
// which contains a valid value in this slot
64-
unsafe { self._tab.get::<u16>(OSCSettings::VT_PORTIN, Some(0)).unwrap()}
64+
unsafe { self._tab.get::<u16>(OSCSettings::VT_PORT_IN, Some(0)).unwrap()}
6565
}
6666
#[inline]
67-
pub fn portOut(&self) -> u16 {
67+
pub fn port_out(&self) -> u16 {
6868
// Safety:
6969
// Created from valid Table for this object
7070
// which contains a valid value in this slot
71-
unsafe { self._tab.get::<u16>(OSCSettings::VT_PORTOUT, Some(0)).unwrap()}
71+
unsafe { self._tab.get::<u16>(OSCSettings::VT_PORT_OUT, Some(0)).unwrap()}
7272
}
7373
#[inline]
7474
pub fn address(&self) -> Option<&'a str> {
@@ -87,26 +87,26 @@ impl flatbuffers::Verifiable for OSCSettings<'_> {
8787
use self::flatbuffers::Verifiable;
8888
v.visit_table(pos)?
8989
.visit_field::<bool>("enabled", Self::VT_ENABLED, false)?
90-
.visit_field::<u16>("portIn", Self::VT_PORTIN, false)?
91-
.visit_field::<u16>("portOut", Self::VT_PORTOUT, false)?
90+
.visit_field::<u16>("port_in", Self::VT_PORT_IN, false)?
91+
.visit_field::<u16>("port_out", Self::VT_PORT_OUT, false)?
9292
.visit_field::<flatbuffers::ForwardsUOffset<&str>>("address", Self::VT_ADDRESS, false)?
9393
.finish();
9494
Ok(())
9595
}
9696
}
9797
pub struct OSCSettingsArgs<'a> {
9898
pub enabled: bool,
99-
pub portIn: u16,
100-
pub portOut: u16,
99+
pub port_in: u16,
100+
pub port_out: u16,
101101
pub address: Option<flatbuffers::WIPOffset<&'a str>>,
102102
}
103103
impl<'a> Default for OSCSettingsArgs<'a> {
104104
#[inline]
105105
fn default() -> Self {
106106
OSCSettingsArgs {
107107
enabled: false,
108-
portIn: 0,
109-
portOut: 0,
108+
port_in: 0,
109+
port_out: 0,
110110
address: None,
111111
}
112112
}
@@ -122,12 +122,12 @@ impl<'a: 'b, 'b> OSCSettingsBuilder<'a, 'b> {
122122
self.fbb_.push_slot::<bool>(OSCSettings::VT_ENABLED, enabled, false);
123123
}
124124
#[inline]
125-
pub fn add_portIn(&mut self, portIn: u16) {
126-
self.fbb_.push_slot::<u16>(OSCSettings::VT_PORTIN, portIn, 0);
125+
pub fn add_port_in(&mut self, port_in: u16) {
126+
self.fbb_.push_slot::<u16>(OSCSettings::VT_PORT_IN, port_in, 0);
127127
}
128128
#[inline]
129-
pub fn add_portOut(&mut self, portOut: u16) {
130-
self.fbb_.push_slot::<u16>(OSCSettings::VT_PORTOUT, portOut, 0);
129+
pub fn add_port_out(&mut self, port_out: u16) {
130+
self.fbb_.push_slot::<u16>(OSCSettings::VT_PORT_OUT, port_out, 0);
131131
}
132132
#[inline]
133133
pub fn add_address(&mut self, address: flatbuffers::WIPOffset<&'b str>) {
@@ -152,8 +152,8 @@ impl core::fmt::Debug for OSCSettings<'_> {
152152
fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
153153
let mut ds = f.debug_struct("OSCSettings");
154154
ds.field("enabled", &self.enabled());
155-
ds.field("portIn", &self.portIn());
156-
ds.field("portOut", &self.portOut());
155+
ds.field("port_in", &self.port_in());
156+
ds.field("port_out", &self.port_out());
157157
ds.field("address", &self.address());
158158
ds.finish()
159159
}

schema/rpc.fbs

+2-2
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ table VRCOSCSettings {
147147
/// OSC Settings that are used in *any* osc application.
148148
table OSCSettings {
149149
enabled: bool;
150-
portIn: uint16;
151-
portOut: uint16;
150+
port_in: uint16;
151+
port_out: uint16;
152152
address: string;
153153
}
154154

0 commit comments

Comments
 (0)