fix(lib): update so lib build works (#227)

* Update logger so return type of get_time() is std::string instead of auto, to help lib building
* Update lib to have interfaces and include/src files updated for base_peripheral, base_component, and logger.cpp
* Update python examples with updated APIs for task configs

Author: finger563

components/logger/include/logger.hpp

@@ -286,7 +286,7 @@ class Logger {
    *   Get the current time in seconds since the start of the logging system.
    *   @return time in seconds since the start of the logging system.
    */
-  static auto get_time() {
+  static std::string get_time() {
 #if defined(ESP_PLATFORM)
     // use esp_timer_get_time to get the time in microseconds
     uint64_t time = esp_timer_get_time();

lib/CMakeLists.txt

@@ -17,6 +17,8 @@ set(EXTERNAL "../external")
 set(ESPP_INCLUDES
   ${EXTERNAL}/fmt/include
   ${EXTERNAL}/alpaca/include
+  ${COMPONENTS}/base_component/include
+  ${COMPONENTS}/base_peripheral/include
   ${COMPONENTS}/ftp/include
   ${COMPONENTS}/format/include
   ${COMPONENTS}/logger/include
@@ -28,6 +30,7 @@ set(ESPP_INCLUDES
 )
 
 set(ESPP_SOURCES
+  ${COMPONENTS}/logger/src/logger.cpp
   lib.cpp
 )
 

lib/bind.cpp

@@ -32,21 +32,27 @@ PYBIND11_MODULE(espp, m) {
   //       std::mutex and std::condition_variable which pybind does not support.
   //       Therefore we use the SimpleConfig, whose callback function has no
   //       arguments and return bool
-  py::class_<Task::SimpleConfig>(m, "TaskSimpleConfig")
-      .def(py::init<const std::string &, Task::simple_callback_fn, size_t, size_t, int,
-                    Logger::Verbosity>(),
-           py::arg("name"), py::arg("callback"), py::arg("stack_size") = 4 * 1024,
-           py::arg("priority") = 0, py::arg("core_id") = -1,
-           py::arg("verbosity") = Logger::Verbosity::WARN);
+  py::class_<Task::BaseConfig>(m, "TaskBaseConfig")
+      .def(py::init<const std::string &, size_t, size_t, int>(), py::arg("name"),
+           py::arg("stack_size") = 4 * 1024, py::arg("priority") = 0, py::arg("core_id") = -1);
   py::class_<Task::Config>(m, "TaskConfig")
       .def(py::init<const std::string &, Task::callback_fn, size_t, size_t, int,
                     Logger::Verbosity>(),
            py::arg("name"), py::arg("callback"), py::arg("stack_size") = 4 * 1024,
            py::arg("priority") = 0, py::arg("core_id") = -1,
            py::arg("verbosity") = Logger::Verbosity::WARN);
+  py::class_<Task::SimpleConfig>(m, "TaskSimpleConfig")
+      .def(py::init<Task::simple_callback_fn, Task::BaseConfig, Logger::Verbosity>(),
+           py::arg("callback"), py::arg("task_config"),
+           py::arg("verbosity") = Logger::Verbosity::WARN);
+  py::class_<Task::AdvancedConfig>(m, "TaskAdvancedConfig")
+      .def(py::init<Task::callback_fn, Task::BaseConfig, Logger::Verbosity>(), py::arg("callback"),
+           py::arg("task_config"), py::arg("verbosity") = Logger::Verbosity::WARN);
 
   py::class_<Task>(m, "Task")
+      .def(py::init<const Task::Config &>())
       .def(py::init<const Task::SimpleConfig &>())
+      .def(py::init<const Task::AdvancedConfig &>())
       .def("start", &Task::start)
       .def("stop", &Task::stop)
       .def("is_started", &Task::is_started)

python/task.py

@@ -21,8 +21,9 @@ def task_func():
     return False # we don't want to stop the task
 
 task = espp.Task(espp.TaskSimpleConfig(
-    "test task", #name
-    task_func
+    task_func, #function
+    # config
+    espp.TaskBaseConfig("test task")
 ))
 task.start()
 

python/udp_client.py

@@ -30,8 +30,9 @@ def task_func():
     return False # we don't want to stop the task
 
 task = espp.Task(espp.TaskSimpleConfig(
-    "test task", #name
-    task_func
+    task_func, #function
+    # config
+    espp.TaskBaseConfig("test task")
 ))
 task.start()