Skip to content

Commit c7d299d

Browse files
krantlukipuki
authored andcommitted
Update to meshtastic/protobufs v2.5.23
1 parent 798f193 commit c7d299d

File tree

4 files changed

+1383
-248
lines changed

4 files changed

+1383
-248
lines changed

build.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ fn main() -> std::io::Result<()> {
6363
{
6464
config.type_attribute(".", "#[serde(rename_all = \"camelCase\")]");
6565
config.type_attribute(".", "#[allow(clippy::doc_lazy_continuation)]");
66+
config.type_attribute(".", "#[allow(clippy::empty_docs)]");
6667
}
6768

6869
config.out_dir(gen_dir);

src/connections/stream_api.rs

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -179,10 +179,6 @@ impl<State> ConnectedStreamApi<State> {
179179
PacketDestination::Node(id) => id,
180180
};
181181

182-
// NOTE(canardleteer): We don't warn on deprecation here, because it
183-
// remains valid for many active nodes, and
184-
// remains a part of the generated interface.
185-
#[allow(deprecated)]
186182
let mut mesh_packet = protobufs::MeshPacket {
187183
payload_variant: Some(protobufs::mesh_packet::PayloadVariant::Decoded(
188184
protobufs::Data {
@@ -191,24 +187,15 @@ impl<State> ConnectedStreamApi<State> {
191187
want_response,
192188
reply_id: reply_id.unwrap_or(0),
193189
emoji: emoji.unwrap_or(0),
194-
dest: 0, // TODO change this
195-
request_id: 0, // TODO change this
196-
source: 0, // TODO change this
190+
..Default::default()
197191
},
198192
)),
199-
rx_time: 0, // * not transmitted
200-
rx_snr: 0.0, // * not transmitted
201-
hop_limit: 0, // * not transmitted
202-
priority: 0, // * not transmitted
203-
rx_rssi: 0, // * not transmitted
204-
delayed: 0, // * not transmitted [deprecated since protobufs v2.2.19]
205-
hop_start: 0, // * set on device
206-
via_mqtt: false,
207193
from: own_node_id.id(),
208194
to: packet_destination.id(),
209195
id: generate_rand_id(),
210196
want_ack,
211197
channel: channel.channel(),
198+
..Default::default()
212199
};
213200

214201
if echo_response {
@@ -889,6 +876,7 @@ impl ConnectedStreamApi<state::Configured> {
889876
) -> Result<(), Error> {
890877
let config_packet = protobufs::AdminMessage {
891878
payload_variant: Some(protobufs::admin_message::PayloadVariant::SetConfig(config)),
879+
session_passkey: Vec::new(),
892880
};
893881

894882
let byte_data: EncodedMeshPacketData = config_packet.encode_to_vec().into();
@@ -965,6 +953,7 @@ impl ConnectedStreamApi<state::Configured> {
965953
payload_variant: Some(protobufs::admin_message::PayloadVariant::SetModuleConfig(
966954
module_config,
967955
)),
956+
session_passkey: Vec::new(),
968957
};
969958

970959
let byte_data: EncodedMeshPacketData = module_config_packet.encode_to_vec().into();
@@ -1041,6 +1030,7 @@ impl ConnectedStreamApi<state::Configured> {
10411030
payload_variant: Some(protobufs::admin_message::PayloadVariant::SetChannel(
10421031
channel_config,
10431032
)),
1033+
session_passkey: Vec::new(),
10441034
};
10451035

10461036
let byte_data: EncodedMeshPacketData = channel_packet.encode_to_vec().into();
@@ -1108,6 +1098,7 @@ impl ConnectedStreamApi<state::Configured> {
11081098
) -> Result<(), Error> {
11091099
let user_packet = protobufs::AdminMessage {
11101100
payload_variant: Some(protobufs::admin_message::PayloadVariant::SetOwner(user)),
1101+
session_passkey: Vec::new(),
11111102
};
11121103

11131104
let byte_data: EncodedMeshPacketData = user_packet.encode_to_vec().into();
@@ -1191,6 +1182,7 @@ impl ConnectedStreamApi<state::Configured> {
11911182
payload_variant: Some(protobufs::admin_message::PayloadVariant::BeginEditSettings(
11921183
true,
11931184
)),
1185+
session_passkey: Vec::new(),
11941186
};
11951187

11961188
let mut packet_buf = vec![];
@@ -1248,6 +1240,7 @@ impl ConnectedStreamApi<state::Configured> {
12481240
payload_variant: Some(
12491241
protobufs::admin_message::PayloadVariant::CommitEditSettings(true),
12501242
),
1243+
session_passkey: Vec::new(),
12511244
};
12521245

12531246
let mut packet_buf = vec![];

0 commit comments

Comments
 (0)