Updated to new esp-idf
This commit is contained in:
1 parent
fab6ebf0b4
commit
379533571f
7 files changed
+25
-30
No files matched your search
@@ -36,7 +36,6 @@ set(dependencies
|
||||
espwifistack
|
||||
date
|
||||
espchrono
|
||||
expected
|
||||
fmt
|
||||
nvs_flash
|
||||
)
|
||||
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
// system includes
|
||||
#include <string>
|
||||
#include <expected>
|
||||
|
||||
// 3rdparty lib includes
|
||||
#include <tl/expected.hpp>
|
||||
#include <fmt/core.h>
|
||||
|
||||
// local includes
|
||||
@@ -16,7 +16,7 @@ template<int MAX_LENGTH>
|
||||
ConfigConstraintReturnType StringMaxSize(const std::string &str)
|
||||
{
|
||||
if (str.size() > MAX_LENGTH)
|
||||
return tl::make_unexpected(fmt::format("String length {} exceeds maximum {}", str.size(), MAX_LENGTH));
|
||||
return std::unexpected(fmt::format("String length {} exceeds maximum {}", str.size(), MAX_LENGTH));
|
||||
return {};
|
||||
}
|
||||
|
||||
@@ -24,14 +24,14 @@ template<int MIN_LENGTH, int MAX_LENGTH>
|
||||
ConfigConstraintReturnType StringMinMaxSize(const std::string &str)
|
||||
{
|
||||
if (str.size() < MIN_LENGTH || str.size() > MAX_LENGTH)
|
||||
return tl::make_unexpected(fmt::format("String length {} exceeds range {} to {}", str.size(), MIN_LENGTH, MAX_LENGTH));
|
||||
return std::unexpected(fmt::format("String length {} exceeds range {} to {}", str.size(), MIN_LENGTH, MAX_LENGTH));
|
||||
return {};
|
||||
}
|
||||
|
||||
inline ConfigConstraintReturnType StringEmpty(const std::string &str)
|
||||
{
|
||||
if (!str.empty())
|
||||
return tl::make_unexpected("String has to be empty");
|
||||
return std::unexpected("String has to be empty");
|
||||
return {};
|
||||
}
|
||||
|
||||
@@ -49,7 +49,7 @@ ConfigConstraintReturnType StringOr(const std::string &str)
|
||||
const auto result1 = callback1(str);
|
||||
if (result1)
|
||||
return {};
|
||||
return tl::make_unexpected(fmt::format("None of the following 2 constraints succeded: {} | {}", result0.error(), result1.error()));
|
||||
return std::unexpected(fmt::format("None of the following 2 constraints succeded: {} | {}", result0.error(), result1.error()));
|
||||
}
|
||||
|
||||
template<ConfigWrapper<std::string>::ConstraintCallback callback0, ConfigWrapper<std::string>::ConstraintCallback callback1, ConfigWrapper<std::string>::ConstraintCallback callback2>
|
||||
@@ -64,16 +64,16 @@ ConfigConstraintReturnType StringOr(const std::string &str)
|
||||
const auto result2 = callback2(str);
|
||||
if (result2)
|
||||
return {};
|
||||
return tl::make_unexpected(fmt::format("None of the following 3 constraints succeded: {} | {} | {}", result0.error(), result1.error(), result2.error()));
|
||||
return std::unexpected(fmt::format("None of the following 3 constraints succeded: {} | {} | {}", result0.error(), result1.error(), result2.error()));
|
||||
}
|
||||
|
||||
template<ConfigWrapper<std::string>::ConstraintCallback callback0, ConfigWrapper<std::string>::ConstraintCallback callback1>
|
||||
ConfigConstraintReturnType StringAnd(const std::string &str)
|
||||
{
|
||||
if (const auto result = callback0(str); !result)
|
||||
return tl::make_unexpected(result.error());
|
||||
return std::unexpected(result.error());
|
||||
if (const auto result = callback1(str); !result)
|
||||
return tl::make_unexpected(result.error());
|
||||
return std::unexpected(result.error());
|
||||
return {};
|
||||
}
|
||||
|
||||
@@ -81,11 +81,11 @@ template<ConfigWrapper<std::string>::ConstraintCallback callback0, ConfigWrapper
|
||||
ConfigConstraintReturnType StringAnd(const std::string &str)
|
||||
{
|
||||
if (const auto result = callback0(str); !result)
|
||||
return tl::make_unexpected(result.error());
|
||||
return std::unexpected(result.error());
|
||||
if (const auto result = callback1(str); !result)
|
||||
return tl::make_unexpected(result.error());
|
||||
return std::unexpected(result.error());
|
||||
if (const auto result = callback2(str); !result)
|
||||
return tl::make_unexpected(result.error());
|
||||
return std::unexpected(result.error());
|
||||
return {};
|
||||
}
|
||||
|
||||
@@ -93,7 +93,7 @@ template<typename T, T ... ALLOWED_VALUES>
|
||||
ConfigConstraintReturnType OneOf(typename ConfigWrapper<T>::value_t val)
|
||||
{
|
||||
if (!((ALLOWED_VALUES == val) || ...))
|
||||
return tl::make_unexpected("Value not one of the allowed ones");
|
||||
return std::unexpected("Value not one of the allowed ones");
|
||||
return {};
|
||||
}
|
||||
|
||||
@@ -101,7 +101,7 @@ template<typename T, T MIN_VALUE>
|
||||
ConfigConstraintReturnType MinValue(typename ConfigWrapper<T>::value_t val)
|
||||
{
|
||||
if (val < MIN_VALUE)
|
||||
return tl::make_unexpected(fmt::format("Value {} exceeds minimum {}", val, MIN_VALUE));
|
||||
return std::unexpected(fmt::format("Value {} exceeds minimum {}", val, MIN_VALUE));
|
||||
return {};
|
||||
}
|
||||
|
||||
@@ -109,7 +109,7 @@ template<typename T, T MAX_VALUE>
|
||||
ConfigConstraintReturnType MaxValue(typename ConfigWrapper<T>::value_t val)
|
||||
{
|
||||
if (val > MAX_VALUE)
|
||||
return tl::make_unexpected(fmt::format("Value {} exceeds maximum {}", val, MAX_VALUE));
|
||||
return std::unexpected(fmt::format("Value {} exceeds maximum {}", val, MAX_VALUE));
|
||||
return {};
|
||||
}
|
||||
|
||||
@@ -117,7 +117,7 @@ template<typename T, T MIN_VALUE, T MAX_VALUE>
|
||||
ConfigConstraintReturnType MinMaxValue(typename ConfigWrapper<T>::value_t val)
|
||||
{
|
||||
if (val < MIN_VALUE || val > MAX_VALUE)
|
||||
return tl::make_unexpected(fmt::format("Value {} exceeds range {} to {}", val, MIN_VALUE, MAX_VALUE));
|
||||
return std::unexpected(fmt::format("Value {} exceeds range {} to {}", val, MIN_VALUE, MAX_VALUE));
|
||||
return {};
|
||||
}
|
||||
|
||||
@@ -125,7 +125,7 @@ template<typename T>
|
||||
ConfigConstraintReturnType MinMaxValue(typename ConfigWrapper<T>::value_t val, T MIN_VALUE, T MAX_VALUE)
|
||||
{
|
||||
if (val < MIN_VALUE || val > MAX_VALUE)
|
||||
return tl::make_unexpected(fmt::format("Value {} exceeds range {} to {}", val, MIN_VALUE, MAX_VALUE));
|
||||
return std::unexpected(fmt::format("Value {} exceeds range {} to {}", val, MIN_VALUE, MAX_VALUE));
|
||||
return {};
|
||||
}
|
||||
|
||||
@@ -133,7 +133,7 @@ template<typename T, T MIN_VALUE, T MAX_VALUE>
|
||||
ConfigConstraintReturnType MinMaxOrZeroValue(typename ConfigWrapper<T>::value_t val)
|
||||
{
|
||||
if (val != 0 && (val < MIN_VALUE || val > MAX_VALUE))
|
||||
return tl::make_unexpected(fmt::format("Value {} exceeds constraint 0 or range {} to {}", val, MIN_VALUE, MAX_VALUE));
|
||||
return std::unexpected(fmt::format("Value {} exceeds constraint 0 or range {} to {}", val, MIN_VALUE, MAX_VALUE));
|
||||
return {};
|
||||
}
|
||||
} // namespace espconfig
|
||||
@@ -2,9 +2,9 @@
|
||||
|
||||
// system includes
|
||||
#include <string>
|
||||
#include <expected>
|
||||
|
||||
// 3rdparty lib includes
|
||||
#include <tl/expected.hpp>
|
||||
#include <fmt/core.h>
|
||||
|
||||
// local includes
|
||||
@@ -16,7 +16,7 @@ inline ConfigConstraintReturnType MinTimeSyncInterval(espchrono::milliseconds32
|
||||
{
|
||||
using namespace std::chrono_literals;
|
||||
if (val < 15s)
|
||||
return tl::make_unexpected("SNTPv4 RFC 4330 enforces a minimum update time of 15 seconds");
|
||||
return std::unexpected("SNTPv4 RFC 4330 enforces a minimum update time of 15 seconds");
|
||||
return {};
|
||||
}
|
||||
} // namespace espconfig
|
||||
@@ -166,7 +166,7 @@ ConfigStatusReturnType ConfigManager<ConfigContainer>::reset()
|
||||
});
|
||||
|
||||
if (!message.empty())
|
||||
return tl::make_unexpected(std::move(message));
|
||||
return std::unexpected(std::move(message));
|
||||
|
||||
return {};
|
||||
}
|
||||
|
||||
+1
-3
@@ -3,9 +3,7 @@
|
||||
// system includes
|
||||
#include <string>
|
||||
#include <type_traits>
|
||||
|
||||
// 3rdparty lib includes
|
||||
#include <tl/expected.hpp>
|
||||
#include <expected>
|
||||
|
||||
// local includes
|
||||
#include "configwrapperinterface.h"
|
||||
|
||||
@@ -153,7 +153,7 @@ ConfigStatusReturnType ConfigWrapper<T>::forceReset(nvs_handle_t nvsHandle)
|
||||
}
|
||||
|
||||
if (result != ESP_OK)
|
||||
return tl::make_unexpected(std::string{"nvs_erase_key() failed with "} + esp_err_to_name(result));
|
||||
return std::unexpected(std::string{"nvs_erase_key() failed with "} + esp_err_to_name(result));
|
||||
|
||||
return {};
|
||||
}
|
||||
@@ -173,7 +173,7 @@ ConfigStatusReturnType ConfigWrapper<T>::writeToFlash(nvs_handle_t nvsHandle, va
|
||||
m_touched = true;
|
||||
|
||||
if (result != ESP_OK)
|
||||
return tl::make_unexpected(std::string{"nvs_set() failed with "} + esp_err_to_name(result));
|
||||
return std::unexpected(std::string{"nvs_set() failed with "} + esp_err_to_name(result));
|
||||
return {};
|
||||
}
|
||||
|
||||
|
||||
@@ -2,19 +2,17 @@
|
||||
|
||||
// system includes
|
||||
#include <string>
|
||||
#include <expected>
|
||||
|
||||
// esp-idf includes
|
||||
#include <nvs.h>
|
||||
|
||||
// 3rdparty lib includes
|
||||
#include <tl/expected.hpp>
|
||||
|
||||
// local includes
|
||||
#include "cppmacros.h"
|
||||
|
||||
namespace espconfig {
|
||||
|
||||
using ConfigStatusReturnType = tl::expected<void, std::string>;
|
||||
using ConfigStatusReturnType = std::expected<void, std::string>;
|
||||
|
||||
class ConfigWrapperInterface
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user