Merge branch 'feature/c++'

examples/Makefile

@@ -22,10 +22,10 @@ build-examples: $(EXAMPLES_BUILD)
 rebuild-examples: $(EXAMPLES_REBUILD)
 
 %.dummybuild:
-	make -C $(dir $@)
+	$(MAKE) -C $(dir $@)
 
 %.dummyrebuild:
-	make -C $(dir $@) rebuild
+	$(MAKE) -C $(dir $@) rebuild
 
 .PHONY: warning rebuild-examples build-examples
 .NOTPARALLEL:

examples/cpp_01_tasks/Makefile

@@ -0,0 +1,5 @@
+# Simple makefile for simple example
+PROGRAM=cpp_01_tasks
+OTA=0
+EXTRA_COMPONENTS=extras/cpp_support
+include ../../common.mk

examples/cpp_01_tasks/main.cpp

@@ -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
+ * 
+ */
+
+#include "task.hpp"
+#include "queue.hpp"
+
+#include "espressif/esp_common.h"
+
+/******************************************************************************************************************
+ * task_1_t
+ *
+ */
+class task_1_t: public esp_open_rtos::thread::task_t
+{
+public:
+    esp_open_rtos::thread::queue_t<uint32_t> queue;
+    
+private:
+    void task()
+    {
+        printf("task_1_t::task(): start\n");
+
+        uint32_t count = 0;
+
+        while(true) {
+            sleep(1000);
+            queue.post(count);
+            count++;
+        }
+    }    
+};
+/******************************************************************************************************************
+ * task_2_t
+ *
+ */
+class task_2_t: public esp_open_rtos::thread::task_t
+{
+public:
+    esp_open_rtos::thread::queue_t<uint32_t> queue;
+    
+private:
+    void task()
+    {
+        printf("task_2_t::task(): start\n");
+
+        while(true) {
+            uint32_t count;
+
+            if(queue.receive(count, 1500) == 0) {
+                printf("task_2_t::task(): got %u\n", count);
+            } 
+            else {
+                printf("task_2_t::task(): no msg\n");
+            }
+        }
+    }    
+};
+/******************************************************************************************************************
+ * globals
+ *
+ */
+task_1_t task_1;
+task_2_t task_2;
+
+esp_open_rtos::thread::queue_t<uint32_t> MyQueue;
+
+/**
+ * 
+ */
+extern "C" void user_init(void)
+{
+    sdk_uart_div_modify(0, UART_CLK_FREQ / 115200);
+	
+    MyQueue.queue_create(10);
+    
+    task_1.queue = MyQueue;
+    task_2.queue = MyQueue;
+    
+    task_1.task_create("tsk1");
+    task_2.task_create("tsk2");
+}

examples/simple_cplusplus/Makefile

@@ -0,0 +1,3 @@
+# Simple makefile for simple example
+PROGRAM=simple
+include ../../common.mk

examples/simple_cplusplus/simple.cpp

@@ -0,0 +1,64 @@
+/* A very basic C++ example, really just proof of concept for C++
+
+   This sample code is in the public domain.
+ */
+#include "espressif/esp_common.h"
+#include "espressif/sdk_private.h"
+#include "FreeRTOS.h"
+#include "task.h"
+#include "queue.h"
+
+class Counter
+{
+private:
+  uint32_t _count;
+public:
+  Counter(uint32_t initial_count)
+  {
+    this->_count = initial_count;
+    printf("Counter initialised with count %d\r\n", initial_count);
+  }
+
+  void Increment()
+  {
+    _count++;
+  }
+
+  uint32_t getCount()
+  {
+    return _count;
+  }
+};
+
+static Counter static_counter(99);
+
+void task1(void *pvParameters)
+{
+  Counter local_counter = Counter(12);
+  Counter *new_counter = new Counter(24);
+  while(1) {
+    Counter *counter = NULL;
+    switch(rand() % 3) {
+    case 0:
+      counter = &local_counter;
+      break;
+    case 1:
+      counter = &static_counter;
+      break;
+    default:
+      counter = new_counter;
+      break;
+    }
+    counter->Increment();
+    printf("local counter %d static counter %d newly allocated counter %d\r\n", local_counter.getCount(),
+	   static_counter.getCount(), new_counter->getCount());
+    vTaskDelay(100);
+  }
+}
+
+extern "C" void user_init(void)
+{
+    sdk_uart_div_modify(0, UART_CLK_FREQ / 115200);
+    printf("SDK version:%s\n", sdk_system_get_sdk_version());
+    xTaskCreate(task1, (signed char *)"tsk1", 256, NULL, 2, NULL);
+}