Updated to new esp-idf

This commit is contained in:
2023-02-27 17:27:04 +01:00
parent 8a44b1ecf7
commit 32bdd0911d
6 changed files with 15 additions and 16 deletions
+1 -1
View File
@@ -76,7 +76,7 @@ char *toString(const espchrono::seconds32 &val)
}
template<>
char *toString(const tl::expected<espchrono::seconds32, std::string> &val)
char *toString(const std::expected<espchrono::seconds32, std::string> &val)
{
return val ? ::QTest::toString(*val) : ::QTest::toString("(invalid)");
}
+2 -2
View File
@@ -25,7 +25,7 @@ Q_DECLARE_METATYPE(espchrono::utc_clock::time_point)
Q_DECLARE_METATYPE(espchrono::local_clock::time_point)
Q_DECLARE_METATYPE(espchrono::DateTime)
Q_DECLARE_METATYPE(espchrono::LocalDateTime)
using X = tl::expected<espchrono::seconds32, std::string>;
using X = std::expected<espchrono::seconds32, std::string>;
Q_DECLARE_METATYPE(X)
extern const espchrono::time_zone testTimeZone;
@@ -85,5 +85,5 @@ template<>
char *toString(const espchrono::seconds32 &val);
template<>
char *toString(const tl::expected<espchrono::seconds32, std::string> &val);
char *toString(const std::expected<espchrono::seconds32, std::string> &val);
} // namespace QTest
+4 -4
View File
@@ -227,13 +227,13 @@ private slots:
void test_parseDaypoint_data()
{
using result_t = tl::expected<espchrono::seconds32, std::string>;
using result_t = std::expected<espchrono::seconds32, std::string>;
QTest::addColumn<std::string>("input");
QTest::addColumn<result_t>("expected");
QTest::addRow("bullshit") << "bullshit"s << result_t{tl::make_unexpected("invalid daypoint (bullshit)")};
QTest::addRow("missing_minute") << "00:"s << result_t{tl::make_unexpected("invalid daypoint (00:)")};
QTest::addRow("bullshit") << "bullshit"s << result_t{std::unexpected("invalid daypoint (bullshit)")};
QTest::addRow("missing_minute") << "00:"s << result_t{std::unexpected("invalid daypoint (00:)")};
QTest::addRow("zero") << "00:00"s << result_t{0s};
QTest::addRow("zero3") << "00:00:00"s << result_t{0s};
QTest::addRow("random") << "12:34:56"s << result_t{12h+34min+56s};
@@ -244,7 +244,7 @@ private slots:
void test_parseDaypoint()
{
using result_t = tl::expected<espchrono::seconds32, std::string>;
using result_t = std::expected<espchrono::seconds32, std::string>;
QFETCH(std::string, input);
QFETCH(result_t, expected);