diff options
author | dakkar <dakkar@thenautilus.net> | 2019-02-22 12:39:08 +0000 |
---|---|---|
committer | dakkar <dakkar@thenautilus.net> | 2019-02-22 12:39:08 +0000 |
commit | 67a9dbb8e33e2bbb785e6a16a6ce5837c1a46c97 (patch) | |
tree | 0f5b064f03372305369a41b10e157aa89552e2f0 /sensor/patchedBLE/src/FreeRTOS.h | |
parent | uni-init BLE before sleeping (diff) | |
parent | Merge pull request #23 from tatsutaigu/master (diff) | |
download | thermostat-67a9dbb8e33e2bbb785e6a16a6ce5837c1a46c97.tar.gz thermostat-67a9dbb8e33e2bbb785e6a16a6ce5837c1a46c97.tar.bz2 thermostat-67a9dbb8e33e2bbb785e6a16a6ce5837c1a46c97.zip |
Merge commit 'b232e7f5f0e87f36afbc2f4e03a2c49c48dd47bc'
Diffstat (limited to 'sensor/patchedBLE/src/FreeRTOS.h')
-rw-r--r-- | sensor/patchedBLE/src/FreeRTOS.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sensor/patchedBLE/src/FreeRTOS.h b/sensor/patchedBLE/src/FreeRTOS.h index ab0e83d..b861c87 100644 --- a/sensor/patchedBLE/src/FreeRTOS.h +++ b/sensor/patchedBLE/src/FreeRTOS.h @@ -23,7 +23,7 @@ class FreeRTOS { public: static void sleep(uint32_t ms); - static void startTask(void task(void *), std::string taskName, void *param=nullptr, int stackSize = 2048); + static void startTask(void task(void*), std::string taskName, void* param = nullptr, uint32_t stackSize = 2048); static void deleteTask(TaskHandle_t pTask = nullptr); static uint32_t getTimeSinceStart(); @@ -36,10 +36,10 @@ public: void give(uint32_t value); void giveFromISR(); void setName(std::string name); - bool take(std::string owner="<Unknown>"); - bool take(uint32_t timeoutMs, std::string owner="<Unknown>"); + bool take(std::string owner = "<Unknown>"); + bool take(uint32_t timeoutMs, std::string owner = "<Unknown>"); std::string toString(); - uint32_t wait(std::string owner="<Unknown>"); + uint32_t wait(std::string owner = "<Unknown>"); private: SemaphoreHandle_t m_semaphore; @@ -48,6 +48,7 @@ public: std::string m_owner; uint32_t m_value; bool m_usePthreads; + }; }; @@ -62,7 +63,7 @@ public: void* receive(size_t* size, TickType_t wait = portMAX_DELAY); void returnItem(void* item); - uint32_t send(void* data, size_t length, TickType_t wait = portMAX_DELAY); + bool send(void* data, size_t length, TickType_t wait = portMAX_DELAY); private: RingbufHandle_t m_handle; }; |