Header files re-arrangement

extras/cpp_support/component.mk

@@ -0,0 +1,8 @@
+# Component makefile for extras/cpp_support
+INC_DIRS += $(ROOT)extras/cpp_support/include
+
+# args for passing into compile rule generation
+# extras/mqtt-client_INC_DIR =  $(ROOT)extras/mqtt-client
+# extras/mqtt-client_SRC_DIR =  $(ROOT)extras/mqtt-client
+
+# $(eval $(call component_compile_rules,extras/mqtt-client))

extras/cpp_support/include/countdown.hpp

@@ -0,0 +1,102 @@
+/* 
+ * The MIT License (MIT)
+ * 
+ * ESP8266 FreeRTOS Firmware
+ * Copyright (c) 2015 Michael Jacobsen (github.com/mikejac)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * https://github.com/SuperHouse/esp-open-rtos
+ * 
+ */
+
+#ifndef ESP_OPEN_RTOS_TIMER_HPP
+#define	ESP_OPEN_RTOS_TIMER_HPP
+
+#include "FreeRTOS.h"
+#include "task.h"
+
+namespace esp_open_rtos {
+namespace timer {
+
+#define __millis()  (xTaskGetTickCount() * portTICK_RATE_MS)
+
+/******************************************************************************************************************
+ * countdown_t
+ *
+ */
+class countdown_t
+{
+public:
+    /**
+     * 
+     */
+    countdown_t()
+    {  
+	interval_end_ms = 0L;
+    }
+    /**
+     * 
+     * @param ms
+     */
+    countdown_t(int ms)
+    {
+        countdown_ms(ms);   
+    }
+    /**
+     * 
+     * @return 
+     */
+    bool expired()
+    {
+        return (interval_end_ms > 0L) && (__millis() >= interval_end_ms);
+    }
+    /**
+     * 
+     * @param ms
+     */
+    void countdown_ms(unsigned long ms)  
+    {
+        interval_end_ms = __millis() + ms;
+    }
+    /**
+     * 
+     * @param seconds
+     */
+    void countdown(int seconds)
+    {
+        countdown_ms((unsigned long)seconds * 1000L);
+    }
+    /**
+     * 
+     * @return 
+     */
+    int left_ms()
+    {
+        return interval_end_ms - __millis();
+    }
+    
+private:
+    portTickType interval_end_ms;
+};
+
+} // namespace timer {
+} // namespace esp_open_rtos {
+
+#endif

extras/cpp_support/include/cplusplus.hpp

@@ -0,0 +1,75 @@
+/* 
+ * The MIT License (MIT)
+ * 
+ * ESP8266 FreeRTOS Firmware
+ * Copyright (c) 2015 Michael Jacobsen (github.com/mikejac)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * https://github.com/SuperHouse/esp-open-rtos
+ * 
+ */
+ 
+#ifndef ESP_OPEN_RTOS_CPLUSPLUS_HPP
+#define	ESP_OPEN_RTOS_CPLUSPLUS_HPP
+
+#include <stdlib.h>
+
+/******************************************************************************************************************
+ * C++ new and delete operators
+ *
+ */
+
+/**
+ * 
+ * @param size
+ * @return 
+ */
+inline void *operator new(size_t size) 
+{
+    return malloc(size);
+}
+/**
+ * 
+ * @param size
+ * @return 
+ */
+inline void *operator new[](size_t size) 
+{
+    return malloc(size);
+}
+/**
+ * 
+ * @param ptr
+ */
+inline void operator delete(void * ptr)
+{
+    free(ptr);
+}
+/**
+ * 
+ * @param ptr
+ */
+inline void operator delete[](void * ptr) 
+{
+    free(ptr);
+}
+
+#endif	/* ESP_OPEN_RTOS_CPLUSPLUS_HPP */
+

extras/cpp_support/include/mutex.hpp

@@ -0,0 +1,97 @@
+/* 
+ * The MIT License (MIT)
+ * 
+ * ESP8266 FreeRTOS Firmware
+ * Copyright (c) 2015 Michael Jacobsen (github.com/mikejac)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * https://github.com/SuperHouse/esp-open-rtos
+ * 
+ */
+
+#ifndef ESP_OPEN_RTOS_MUTEX_HPP
+#define	ESP_OPEN_RTOS_MUTEX_HPP
+
+#include "semphr.h"
+
+namespace esp_open_rtos {
+namespace thread {
+
+/******************************************************************************************************************
+ * class mutex_t
+ *
+ */
+class mutex_t
+{
+public:
+    /**
+     * 
+     */
+    inline mutex_t()
+    {
+        mutex = xSemaphoreCreateMutex();
+    }
+    /**
+     * 
+     */
+    inline ~mutex_t()
+    {
+        vQueueDelete(mutex);
+    }
+    /**
+     * 
+     * @return 
+     */
+    inline int lock()
+    {
+        return (xSemaphoreTake(mutex, portMAX_DELAY) == pdTRUE) ? 0 : -1;
+    }
+    /**
+     * 
+     * @param ms
+     * @return 
+     */
+    inline int try_lock(unsigned long ms)
+    {
+        return (xSemaphoreTake(mutex, ms / portTICK_RATE_MS) == pdTRUE) ? 0 : -1;
+    }
+    /**
+     * 
+     * @return 
+     */
+    inline int unlock()
+    {
+        return (xSemaphoreGive(mutex) == pdTRUE) ? 0 : -1;
+    }
+
+private:
+    xSemaphoreHandle    mutex;
+
+    // Disable copy construction and assignment.
+    mutex_t (const mutex_t&);
+    const mutex_t &operator = (const mutex_t&);
+};
+
+} //namespace thread {
+} //namespace esp_open_rtos {
+
+
+#endif	/* ESP_OPEN_RTOS_MUTEX_HPP */
+

extras/cpp_support/include/queue.hpp

@@ -0,0 +1,127 @@
+/* 
+ * The MIT License (MIT)
+ * 
+ * ESP8266 FreeRTOS Firmware
+ * Copyright (c) 2015 Michael Jacobsen (github.com/mikejac)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * https://github.com/SuperHouse/esp-open-rtos
+ * 
+ */
+
+#ifndef ESP_OPEN_RTOS_QUEUE_HPP
+#define	ESP_OPEN_RTOS_QUEUE_HPP
+
+#include "FreeRTOS.h"
+#include "queue.h"
+
+namespace esp_open_rtos {
+namespace thread {
+
+/******************************************************************************************************************
+ * class queue_t
+ *
+ */
+template<class Data>
+class queue_t
+{
+public:
+    /**
+     * 
+     */
+    inline queue_t()
+    {
+        queue = 0;
+    }
+    /**
+     * 
+     * @param uxQueueLength
+     * @param uxItemSize
+     * @return 
+     */
+    inline int create(unsigned portBASE_TYPE uxQueueLength)
+    {
+        queue = xQueueCreate(uxQueueLength, sizeof(Data));
+        
+        if(queue == NULL) {
+            return -1;
+        }
+        else {
+            return 0;
+        }
+    }
+    /**
+     * 
+     * @param data
+     * @param ms
+     * @return 
+     */
+    inline void destroy()
+    {
+        vQueueDelete(queue);
+        queue = 0;
+    }
+    /**
+     * 
+     * @param data
+     * @param ms
+     * @return 
+     */
+    inline int post(const Data& data, unsigned long ms = 0)
+    {
+        return (xQueueSend(queue, &data, ms / portTICK_RATE_MS) == pdTRUE) ? 0 : -1;
+    }
+    /**
+     * 
+     * @param data
+     * @param ms
+     * @return 
+     */
+    inline int receive(Data& data, unsigned long ms = 0)
+    {
+        return (xQueueReceive(queue, &data, ms / portTICK_RATE_MS) == pdTRUE) ? 0 : -1;
+    }
+    /**
+     * 
+     * @param other
+     * @return 
+     */
+    const queue_t &operator = (const queue_t& other)
+    {
+        if(this != &other) {        // protect against invalid self-assignment
+            queue = other.queue;
+        }
+        
+        return *this;
+    }
+
+private:
+    xQueueHandle queue;
+
+    // Disable copy construction.
+    queue_t (const queue_t&);
+};
+
+} //namespace thread {
+} //namespace esp_open_rtos {
+
+
+#endif	/* ESP_OPEN_RTOS_QUEUE_HPP */
+

extras/cpp_support/include/task.hpp

@@ -0,0 +1,106 @@
+/* 
+ * The MIT License (MIT)
+ * 
+ * ESP8266 FreeRTOS Firmware
+ * Copyright (c) 2015 Michael Jacobsen (github.com/mikejac)
+ * 
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ * 
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * https://github.com/SuperHouse/esp-open-rtos
+ * 
+ */
+
+#ifndef ESP_OPEN_RTOS_TASK_HPP
+#define	ESP_OPEN_RTOS_TASK_HPP
+
+#include "FreeRTOS.h"
+#include "task.h"
+
+namespace esp_open_rtos {
+namespace thread {
+
+/******************************************************************************************************************
+ * task_t
+ *
+ */
+class task_t
+{
+public:
+    /**
+     * 
+     */
+    task_t()
+    {}
+    /**
+     * 
+     * @param pcName
+     * @param usStackDepth
+     * @param uxPriority
+     * @return 
+     */
+    int task_create(const char* const pcName, unsigned short usStackDepth = 256, unsigned portBASE_TYPE uxPriority = 2)
+    {
+        return xTaskCreate(task_t::_task, (signed char *)pcName, usStackDepth, this, uxPriority, NULL);
+    }
+    
+protected:
+    /**
+     * 
+     * @param ms
+     */
+    void sleep(unsigned long ms)
+    {
+        vTaskDelay(ms / portTICK_RATE_MS);
+    }
+    /**
+     * 
+     * @return 
+     */
+    inline unsigned long millis()
+    {
+        return xTaskGetTickCount() * portTICK_RATE_MS;
+    }
+    
+private:
+    /**
+     * 
+     */
+    virtual void task() = 0;
+    /**
+     * 
+     * @param pvParameters
+     */
+    static void _task(void* pvParameters)
+    {
+        if(pvParameters != 0) {
+            ((task_t*)(pvParameters))->task();
+        }
+    }
+    
+    // no copy and no = operator
+    task_t(const task_t&);
+    task_t &operator=(const task_t&);    
+};
+
+} //namespace thread {
+} //namespace esp_open_rtos {
+
+
+#endif	/* ESP_OPEN_RTOS_TASK_HPP */
+