From 71a4f5166f5491dc0982a18d62c63e28b3a52faa Mon Sep 17 00:00:00 2001 From: jacqueline Date: Wed, 23 Nov 2022 17:21:56 +1100 Subject: [PATCH] Start on a couple of include issues --- src/cbor/include/cbor_decoder.hpp | 3 +++ src/cbor/include/cbor_encoder.hpp | 4 +++- src/tasks/tasks.cpp | 6 +++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/cbor/include/cbor_decoder.hpp b/src/cbor/include/cbor_decoder.hpp index 258d7c0e..879a1efa 100644 --- a/src/cbor/include/cbor_decoder.hpp +++ b/src/cbor/include/cbor_decoder.hpp @@ -1,8 +1,11 @@ #pragma once #include + #include +#include "cbor.h" + namespace cbor { static auto parse_stdstring(CborValue* val, std::string* out) -> CborError { diff --git a/src/cbor/include/cbor_encoder.hpp b/src/cbor/include/cbor_encoder.hpp index 9479a3b6..8f5214f6 100644 --- a/src/cbor/include/cbor_encoder.hpp +++ b/src/cbor/include/cbor_encoder.hpp @@ -1,7 +1,9 @@ #pragma once #include -#include "esp-idf/components/cbor/tinycbor/src/cbor.h" + +#include "cbor.h" + namespace cbor { class Encoder { diff --git a/src/tasks/tasks.cpp b/src/tasks/tasks.cpp index 34100353..32de431a 100644 --- a/src/tasks/tasks.cpp +++ b/src/tasks/tasks.cpp @@ -1,4 +1,4 @@ -#include "tasks.cpp" +#include "tasks.hpp" -static const UBaseType_t kTaskPriorityLvgl = 4; -static const UBaseType_t kTaskPriorityAudio = 5; +const UBaseType_t kTaskPriorityLvgl = 4; +const UBaseType_t kTaskPriorityAudio = 5;