Skip to content
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

Rsdk 9697 support multiple nvs #376

Merged
merged 11 commits into from
Jan 13, 2025
Merged

Rsdk 9697 support multiple nvs #376

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
53637d7
iterate over storage
npmenard Jan 8, 2025
312ff5f
pass object to store as reference
npmenard Jan 8, 2025
75d8b32
remove partition_name
npmenard Jan 8, 2025
fd4d2ed
remove dead code
npmenard Jan 8, 2025
7c17538
or
npmenard Jan 8, 2025
9fc0988
remove stray comments
npmenard Jan 9, 2025
14acb1a
When storing object over multiple key, clean up behind us when we are
npmenard Jan 10, 2025
7a87760
Merge remote-tracking branch 'origin/main' into RSDK-9697-support-mul…
npmenard Jan 10, 2025
875ace7
add ffi bindings
npmenard Jan 13, 2025
f096bf2
comments
npmenard Jan 13, 2025
f17dea5
todo
npmenard Jan 13, 2025
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
2 changes: 1 addition & 1 deletion micro-rdk-ffi/src/ffi/runtime.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ pub unsafe extern "C" fn viam_server_start(ctx: *mut viam_server_context) -> via
None
}.expect("has_robot_config set in cfg, but build-time configuration failed to set robot credentials");
ram_storage
.store_robot_credentials(cloud_conf)
.store_robot_credentials(&cloud_conf)
.expect("Failed to store cloud config");
if ROBOT_APP_ADDRESS.is_some() {
ram_storage
Expand Down
4 changes: 2 additions & 2 deletions micro-rdk-server/esp32/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ mod esp32 {
if SSID.is_some() && PASS.is_some() {
log::info!("Storing static values from build time wifi configuration to NVS");
storage
.store_wifi_credentials(WifiCredentials::new(
.store_wifi_credentials(&WifiCredentials::new(
SSID.unwrap().to_string(),
PASS.unwrap().to_string(),
))
Expand All @@ -96,7 +96,7 @@ mod esp32 {
log::info!("Storing static values from build time robot configuration to NVS");
storage
.store_robot_credentials(
RobotCredentials::new(
&RobotCredentials::new(
ROBOT_ID.unwrap().to_string(),
ROBOT_SECRET.unwrap().to_string(),
)
Expand Down
2 changes: 1 addition & 1 deletion micro-rdk-server/native/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ mod native {
log::info!("Storing static values from build time robot configuration");
storage
.store_robot_credentials(
RobotCredentials::new(
&RobotCredentials::new(
ROBOT_ID.unwrap().to_string(),
ROBOT_SECRET.unwrap().to_string(),
)
Expand Down
10 changes: 5 additions & 5 deletions micro-rdk/src/common/conn/viam.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ where
.await
.map(|cert_resp| {
let cert: TlsCertificate = cert_resp.into();
match self.storage.store_tls_certificate(cert.clone()) {
match self.storage.store_tls_certificate(&cert) {
Ok(_) => {
log::debug!("stored TLS certificate received by app");
}
Expand Down Expand Up @@ -1290,7 +1290,7 @@ mod tests {
secret: "".to_string(),
app_address: LOCALHOST_URI.to_owned(),
};
assert!(ram_storage.store_robot_credentials(creds).is_ok());
assert!(ram_storage.store_robot_credentials(&creds).is_ok());

let mdns = NativeMdns::new("".to_owned(), network.get_ip());
assert!(mdns.is_ok());
Expand Down Expand Up @@ -1350,7 +1350,7 @@ mod tests {
secret: "".to_string(),
app_address: LOCALHOST_URI.to_owned(),
};
assert!(ram_storage.store_robot_credentials(creds).is_ok());
assert!(ram_storage.store_robot_credentials(&creds).is_ok());

let mdns = NativeMdns::new("".to_owned(), network.get_ip());
assert!(mdns.is_ok());
Expand Down Expand Up @@ -1460,7 +1460,7 @@ mod tests {
app_address: LOCALHOST_URI.to_owned(),
};

assert!(ram_storage.store_robot_credentials(creds).is_ok());
assert!(ram_storage.store_robot_credentials(&creds).is_ok());

let mdns = NativeMdns::new("".to_owned(), network.get_ip());
assert!(mdns.is_ok());
Expand Down Expand Up @@ -1787,7 +1787,7 @@ mod tests {
_ => panic!("oops expected ipv4"),
};

ram_storage.store_robot_credentials(creds).unwrap();
ram_storage.store_robot_credentials(&creds).unwrap();

let mut a = ViamServerBuilder::new(ram_storage);
let mdns = NativeMdns::new("".to_owned(), Ipv4Addr::new(0, 0, 0, 0)).unwrap();
Expand Down
Loading
Loading