Merge branch 'master' of https://github.com/nkolban/esp32-snippets.git

nkolban · nkolban · commit d1c89421991b · 2017-10-10T18:32:37.000-05:00
diff --git a/cpp_utils/Task.cpp b/cpp_utils/Task.cpp
@@ -24,9 +24,10 @@ static char tag[] = "Task";
  * @param [in] stackSize The size of the stack.
  * @return N/A.
  */
-Task::Task(std::string taskName, uint16_t stackSize) {
+Task::Task(std::string taskName, uint16_t stackSize, uint8_t priority) {
 	m_taskName  = taskName;
 	m_stackSize = stackSize;
+	m_priority  = priority;
 	m_taskData  = nullptr;
 	m_handle    = nullptr;
 } // Task
@@ -55,8 +56,8 @@ void Task::runTask(void* pTaskInstance) {
 	Task* pTask = (Task*)pTaskInstance;
 	ESP_LOGD(tag, ">> runTask: taskName=%s", pTask->m_taskName.c_str());
 	pTask->run(pTask->m_taskData);
-	pTask->stop();
 	ESP_LOGD(tag, "<< runTask: taskName=%s", pTask->m_taskName.c_str());
+	pTask->stop();
 } // runTask
 
 /**
@@ -70,7 +71,7 @@ void Task::start(void* taskData) {
 		ESP_LOGW(tag, "Task::start - There might be a task already running!");
 	}
 	m_taskData = taskData;
-	::xTaskCreate(&runTask, m_taskName.c_str(), m_stackSize, this, 5, &m_handle);
+	::xTaskCreate(&runTask, m_taskName.c_str(), m_stackSize, this, m_priority, &m_handle);
 } // start
 
 
@@ -97,3 +98,23 @@ void Task::stop() {
 void Task::setStackSize(uint16_t stackSize) {
 	m_stackSize = stackSize;
 } // setStackSize
+
+/**
+ * @brief Set the priority of the task.
+ *
+ * @param [in] priority The priority for the task.
+ * @return N/A.
+ */
+void Task::setPriority(uint8_t priority) {
+	m_priority = priority;
+} // setPriority
+
+/**
+ * @brief Set the name of the task.
+ *
+ * @param [in] name The name for the task.
+ * @return N/A.
+ */
+void Task::setName(std::string name) {
+	m_taskName = name;
+} // setName
diff --git a/cpp_utils/Task.h b/cpp_utils/Task.h
@@ -33,9 +33,11 @@
  */
 class Task {
 public:
-	Task(std::string taskName="Task", uint16_t stackSize=10000);
+	Task(std::string taskName="Task", uint16_t stackSize=10000, uint8_t priority=5);
 	virtual ~Task();
 	void setStackSize(uint16_t stackSize);
+	void setPriority(uint8_t priority);
+	void setName(std::string name);
 	void start(void* taskData=nullptr);
 	void stop();
 	/**
@@ -56,6 +58,7 @@ class Task {
 	static void runTask(void *data);
 	std::string m_taskName;
 	uint16_t    m_stackSize;
+	uint8_t     m_priority;
 };
 
 #endif /* COMPONENTS_CPP_UTILS_TASK_H_ */
