Skip to content

fix(nvs): clean up includes and remove accidental include of same file #585

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
finger563 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(nvs): clean up includes and remove accidental include of same file #585

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
18 changes: 6 additions & 12 deletions components/nvs/include/nvs.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@

#include <string>

#include <nvs.h>
#include <nvs_flash.h>
#include <nvs_handle.hpp>

#include "base_component.hpp"
#include "nvs_errc.hpp"
#include "nvs_handle_espp.hpp"

namespace espp {
Expand Down Expand Up @@ -60,7 +54,7 @@ class Nvs : public BaseComponent {
/// @param[in] ns_name Namespace of the variable to erase
/// @param[out] ec Saves a std::error_code representing success or failure
bool erase(std::string_view ns_name, std::error_code &ec) {
NvsHandle handle(ns_name.data(), ec);
espp::NvsHandle handle(ns_name.data(), ec);
if (ec)
return false;

Expand All @@ -75,7 +69,7 @@ class Nvs : public BaseComponent {
/// @param[in] key NVS Key of the variable to erase
/// @param[out] ec Saves a std::error_code representing success or failure
bool erase(std::string_view ns_name, std::string_view key, std::error_code &ec) {
NvsHandle handle(ns_name.data(), ec);
espp::NvsHandle handle(ns_name.data(), ec);
if (ec)
return false;

Expand All @@ -89,7 +83,7 @@ class Nvs : public BaseComponent {
/// @param[in] ns_name Namespace of the variable to get a handle to
/// @param[out] ec Saves a std::error_code representing success or failure
/// @return NvsHandle for the given namespace
NvsHandle get_handle(std::string_view ns_name, std::error_code &ec) {
espp::NvsHandle get_handle(std::string_view ns_name, std::error_code &ec) {
return NvsHandle(ns_name, ec);
}

Expand Down Expand Up @@ -133,7 +127,7 @@ class Nvs : public BaseComponent {
/// @details Saves the key/variable pair, and commits the NVS.
template <typename T>
void set_var(const char *ns_name, const char *key, T value, std::error_code &ec) {
NvsHandle handle(ns_name, ec);
espp::NvsHandle handle(ns_name, ec);
if (ec)
return;

Expand All @@ -152,7 +146,7 @@ class Nvs : public BaseComponent {
/// @details Read the key/variable pair
template <typename T>
void get_var(const char *ns_name, const char *key, T &value, std::error_code &ec) {
NvsHandle handle(ns_name, ec);
espp::NvsHandle handle(ns_name, ec);
if (ec)
return;

Expand All @@ -170,7 +164,7 @@ class Nvs : public BaseComponent {
template <typename T>
void get_or_set_var(const char *ns_name, const char *key, T &value, T default_value,
std::error_code &ec) {
NvsHandle handle(ns_name, ec);
espp::NvsHandle handle(ns_name, ec);
if (ec)
return;

Expand Down
1 change: 0 additions & 1 deletion components/nvs/include/nvs_handle_espp.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

#include "base_component.hpp"
#include "nvs_errc.hpp"
#include "nvs_handle_espp.hpp"

namespace espp {
/**
Expand Down